Merge branch 'main' into jif/client-2

# Conflicts:
#	codex-rs/core/src/client.rs
#	codex-rs/core/src/client/chat_completions.rs
#	codex-rs/core/src/client_common.rs

codex-rs/exec/src/cli.rs

@@ -52,6 +52,10 @@ pub struct Cli {
     #[arg(long = "skip-git-repo-check", default_value_t = false)]
     pub skip_git_repo_check: bool,
 
+    /// Additional directories that should be writable alongside the primary workspace.
+    #[arg(long = "add-dir", value_name = "DIR", value_hint = clap::ValueHint::DirPath)]
+    pub add_dir: Vec<PathBuf>,
+
     /// Path to a JSON Schema file describing the model's final response shape.
     #[arg(long = "output-schema", value_name = "FILE")]
     pub output_schema: Option<PathBuf>,

codex-rs/exec/src/lib.rs

@@ -61,6 +61,7 @@ pub async fn run_main(cli: Cli, codex_linux_sandbox_exe: Option<PathBuf>) -> any
         dangerously_bypass_approvals_and_sandbox,
         cwd,
         skip_git_repo_check,
+        add_dir,
         color,
         last_message_file,
         json: json_mode,
@@ -179,7 +180,7 @@ pub async fn run_main(cli: Cli, codex_linux_sandbox_exe: Option<PathBuf>) -> any
         show_raw_agent_reasoning: oss.then_some(true),
         tools_web_search_request: None,
         experimental_sandbox_command_assessment: None,
-        additional_writable_roots: Vec::new(),
+        additional_writable_roots: add_dir,
     };
     // Parse `-c` overrides.
     let cli_kv_overrides = match config_overrides.parse_overrides() {

codex-rs/exec/tests/suite/add_dir.rs

@@ -0,0 +1,72 @@
+#![cfg(not(target_os = "windows"))]
+#![allow(clippy::expect_used, clippy::unwrap_used)]
+
+use core_test_support::responses;
+use core_test_support::test_codex_exec::test_codex_exec;
+
+/// Verify that the --add-dir flag is accepted and the command runs successfully.
+/// This test confirms the CLI argument is properly wired up.
+#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+async fn accepts_add_dir_flag() -> anyhow::Result<()> {
+    let test = test_codex_exec();
+
+    let server = responses::start_mock_server().await;
+    let body = responses::sse(vec![
+        responses::ev_response_created("response_1"),
+        responses::ev_assistant_message("response_1", "Task completed"),
+        responses::ev_completed("response_1"),
+    ]);
+    responses::mount_sse_once(&server, body).await;
+
+    // Create temporary directories to use with --add-dir
+    let temp_dir1 = tempfile::tempdir()?;
+    let temp_dir2 = tempfile::tempdir()?;
+
+    test.cmd_with_server(&server)
+        .arg("--skip-git-repo-check")
+        .arg("--sandbox")
+        .arg("workspace-write")
+        .arg("--add-dir")
+        .arg(temp_dir1.path())
+        .arg("--add-dir")
+        .arg(temp_dir2.path())
+        .arg("test with additional directories")
+        .assert()
+        .code(0);
+
+    Ok(())
+}
+
+/// Verify that multiple --add-dir flags can be specified.
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn accepts_multiple_add_dir_flags() -> anyhow::Result<()> {
+    let test = test_codex_exec();
+
+    let server = responses::start_mock_server().await;
+    let body = responses::sse(vec![
+        responses::ev_response_created("response_1"),
+        responses::ev_assistant_message("response_1", "Multiple directories accepted"),
+        responses::ev_completed("response_1"),
+    ]);
+    responses::mount_sse_once(&server, body).await;
+
+    let temp_dir1 = tempfile::tempdir()?;
+    let temp_dir2 = tempfile::tempdir()?;
+    let temp_dir3 = tempfile::tempdir()?;
+
+    test.cmd_with_server(&server)
+        .arg("--skip-git-repo-check")
+        .arg("--sandbox")
+        .arg("workspace-write")
+        .arg("--add-dir")
+        .arg(temp_dir1.path())
+        .arg("--add-dir")
+        .arg(temp_dir2.path())
+        .arg("--add-dir")
+        .arg(temp_dir3.path())
+        .arg("test with three directories")
+        .assert()
+        .code(0);
+
+    Ok(())
+}

codex-rs/exec/tests/suite/mod.rs

@@ -1,4 +1,5 @@
 // Aggregates all former standalone integration tests as modules.
+mod add_dir;
 mod apply_patch;
 mod auth_env;
 mod originator;

codex-rs/exec/tests/suite/output_schema.rs

@@ -4,7 +4,6 @@
 use core_test_support::responses;
 use core_test_support::test_codex_exec::test_codex_exec;
 use serde_json::Value;
-use wiremock::matchers::any;
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn exec_includes_output_schema_in_request() -> anyhow::Result<()> {
@@ -28,7 +27,7 @@ async fn exec_includes_output_schema_in_request() -> anyhow::Result<()> {
         responses::ev_assistant_message("m1", "fixture hello"),
         responses::ev_completed("resp1"),
     ]);
-    let response_mock = responses::mount_sse_once_match(&server, any(), body).await;
+    let response_mock = responses::mount_sse_once(&server, body).await;
 
     test.cmd_with_server(&server)
         .arg("--skip-git-repo-check")

codex-rs/exec/tests/suite/server_error_exit.rs

@@ -3,7 +3,6 @@
 
 use core_test_support::responses;
 use core_test_support::test_codex_exec::test_codex_exec;
-use wiremock::matchers::any;
 
 /// Verify that when the server reports an error, `codex-exec` exits with a
 /// non-zero status code so automation can detect failures.
@@ -21,7 +20,7 @@ async fn exits_non_zero_when_server_reports_error() -> anyhow::Result<()> {
             "error": {"code": "rate_limit_exceeded", "message": "synthetic server error"}
         }
     })]);
-    responses::mount_sse_once_match(&server, any(), body).await;
+    responses::mount_sse_once(&server, body).await;
 
     test.cmd_with_server(&server)
         .arg("--skip-git-repo-check")