clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-06-01 19:02:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to commoncli type so clap can merge

Browse Source
This commit is contained in:
Channing Conger
2025-11-17 16:56:00 -08:00
parent 52f0056368
commit e70beb5b93
9 changed files with 336 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
codex-rs/app-server/src/lib.rs
View File

@@ -44,6 +44,7 @@ const CHANNEL_CAPACITY: usize = 128;
pub async fn run_main(
codex_linux_sandbox_exe: Option<PathBuf>,
cli_config_overrides: CliConfigOverrides,
config_overrides: ConfigOverrides,
) -> IoResult<()> {
// Set up channels.
let (incoming_tx, mut incoming_rx) = mpsc::channel::<JSONRPCMessage>(CHANNEL_CAPACITY);
@@ -80,7 +81,7 @@ pub async fn run_main(
format!("error parsing -c overrides: {e}"),
)
})?;
let config = Config::load_with_cli_overrides(cli_kv_overrides, ConfigOverrides::default())
let config = Config::load_with_cli_overrides(cli_kv_overrides, config_overrides)
.await
.map_err(|e| {
std::io::Error::new(ErrorKind::InvalidData, format!("error loading config: {e}"))

7
codex-rs/app-server/src/main.rs
View File

@@ -4,7 +4,12 @@ use codex_common::CliConfigOverrides;
fn main() -> anyhow::Result<()> {
arg0_dispatch_or_else(|codex_linux_sandbox_exe| async move {
run_main(codex_linux_sandbox_exe, CliConfigOverrides::default()).await?;
run_main(
codex_linux_sandbox_exe,
CliConfigOverrides::default(),
codex_core::config::ConfigOverrides::default(),
)
.await?;
Ok(())
})
}