From 13e887a52bdbc7ae7b88fb8232db1d321bc76854 Mon Sep 17 00:00:00 2001
From: starr-openai <starr@openai.com>
Date: Tue, 5 May 2026 14:42:38 -0700
Subject: [PATCH] codex: restore legacy shell workdir resolution

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

diff --git a/codex-rs/core/src/tools/handlers/mod.rs b/codex-rs/core/src/tools/handlers/mod.rs
index bced9b3546..629dcfc9f5 100644
--- a/codex-rs/core/src/tools/handlers/mod.rs
+++ b/codex-rs/core/src/tools/handlers/mod.rs
@@ -80,6 +80,18 @@ where
     parse_arguments(arguments)
 }
 
+fn resolve_workdir_base_path(
+    arguments: &str,
+    cwd: &AbsolutePathBuf,
+) -> Result<AbsolutePathBuf, FunctionCallError> {
+    let target_args: EnvironmentTargetArgs = parse_arguments(arguments)?;
+    Ok(target_args
+        .workdir
+        .as_deref()
+        .filter(|workdir| !workdir.is_empty())
+        .map_or_else(|| cwd.clone(), |workdir| cwd.join(workdir)))
+}
+
 #[derive(Debug, Deserialize)]
 struct EnvironmentTargetArgs {
     #[serde(default)]