From 9c337efe5865fa67240f28c87033d4f4ff0631df Mon Sep 17 00:00:00 2001
From: starr-openai <starr@openai.com>
Date: Mon, 20 Apr 2026 16:04:31 -0700
Subject: [PATCH] Use selected environment cwd for unified exec

Co-authored-by: Codex <noreply@openai.com>
---
 codex-rs/core/src/tools/handlers/unified_exec.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codex-rs/core/src/tools/handlers/unified_exec.rs b/codex-rs/core/src/tools/handlers/unified_exec.rs
index 728f183ab0..cb08851b7b 100644
--- a/codex-rs/core/src/tools/handlers/unified_exec.rs
+++ b/codex-rs/core/src/tools/handlers/unified_exec.rs
@@ -358,7 +358,7 @@ impl ToolHandler for UnifiedExecHandler {
                             environment: tool_environment.environment,
                             yield_time_ms,
                             max_output_tokens,
-                            workdir,
+                            workdir: Some(cwd.clone()),
                             network: context.turn.network.clone(),
                             tty,
                             sandbox_permissions: effective_additional_permissions