From 0dcc8c9c2fa6180c7debfc574eb6bf4d24239e13 Mon Sep 17 00:00:00 2001
From: Michael Bolin <mbolin@openai.com>
Date: Thu, 4 Jun 2026 10:47:40 -0700
Subject: [PATCH] app-server: support CLI config overrides

---
 codex-rs/app-server/src/main.rs       | 10 +++++++++-
 codex-rs/app-server/src/main_tests.rs | 25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 codex-rs/app-server/src/main_tests.rs

diff --git a/codex-rs/app-server/src/main.rs b/codex-rs/app-server/src/main.rs
index 2435c532e8..2412f8c3cf 100644
--- a/codex-rs/app-server/src/main.rs
+++ b/codex-rs/app-server/src/main.rs
@@ -19,6 +19,9 @@ const DISABLE_MANAGED_CONFIG_ENV_VAR: &str = "CODEX_APP_SERVER_DISABLE_MANAGED_C
 #[derive(Debug, Parser)]
 #[command(version)]
 struct AppServerArgs {
+    #[command(flatten)]
+    config_overrides: CliConfigOverrides,
+
     /// Transport endpoint URL. Supported values: `stdio://` (default),
     /// `unix://`, `unix://PATH`, `ws://IP:PORT`, `off`.
     #[arg(
@@ -58,6 +61,7 @@ struct AppServerArgs {
 fn main() -> anyhow::Result<()> {
     arg0_dispatch_or_else(|arg0_paths: Arg0DispatchPaths| async move {
         let AppServerArgs {
+            config_overrides,
             listen,
             session_source,
             auth,
@@ -84,7 +88,7 @@ fn main() -> anyhow::Result<()> {
 
         run_main_with_transport_options(
             arg0_paths,
-            CliConfigOverrides::default(),
+            config_overrides,
             loader_overrides,
             strict_config,
             /*default_analytics_enabled*/ false,
@@ -123,3 +127,7 @@ fn managed_config_path_from_debug_env() -> Option<PathBuf> {
 
     None
 }
+
+#[cfg(test)]
+#[path = "main_tests.rs"]
+mod tests;
diff --git a/codex-rs/app-server/src/main_tests.rs b/codex-rs/app-server/src/main_tests.rs
new file mode 100644
index 0000000000..3fe10bc6fa
--- /dev/null
+++ b/codex-rs/app-server/src/main_tests.rs
@@ -0,0 +1,25 @@
+use super::AppServerArgs;
+use clap::Parser;
+use pretty_assertions::assert_eq;
+
+#[test]
+fn app_server_accepts_cli_config_overrides() {
+    let args = AppServerArgs::try_parse_from([
+        "codex-app-server",
+        "-c",
+        "model=\"gpt-5-codex\"",
+        "--config",
+        "sandbox_mode=\"read-only\"",
+        "--listen",
+        "off",
+    ])
+    .expect("parse app-server args");
+
+    assert_eq!(
+        args.config_overrides.raw_overrides,
+        vec![
+            "model=\"gpt-5-codex\"".to_string(),
+            "sandbox_mode=\"read-only\"".to_string(),
+        ]
+    );
+}