From cea0afbe4d9d37848ffcb875ff5d3b8f3a133aee Mon Sep 17 00:00:00 2001
From: starr-openai <starr@openai.com>
Date: Thu, 16 Apr 2026 13:52:51 -0700
Subject: [PATCH] Keep requested cwd precedence in app-server

Co-authored-by: Codex <noreply@openai.com>
---
 codex-rs/app-server/src/codex_message_processor.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/codex-rs/app-server/src/codex_message_processor.rs b/codex-rs/app-server/src/codex_message_processor.rs
index 4003d96079..3d5af206f9 100644
--- a/codex-rs/app-server/src/codex_message_processor.rs
+++ b/codex-rs/app-server/src/codex_message_processor.rs
@@ -2401,7 +2401,7 @@ impl CodexMessageProcessor {
         request_trace: Option<W3cTraceContext>,
         environment_id: Option<String>,
     ) {
-        let explicit_cwd = typesafe_overrides.cwd.clone();
+        let requested_cwd = typesafe_overrides.cwd.clone();
         let mut config = match derive_config_from_params(
             &cli_overrides,
             config_overrides.clone(),
@@ -2436,7 +2436,7 @@ impl CodexMessageProcessor {
             )
         );
 
-        if explicit_cwd.is_some()
+        if requested_cwd.is_some()
             && !config.active_project.is_trusted()
             && (requested_sandbox_trusts_project
                 || matches!(
@@ -2505,7 +2505,7 @@ impl CodexMessageProcessor {
             };
         }
 
-        if explicit_cwd.is_none() {
+        if requested_cwd.is_none() {
             match listener_task_context
                 .thread_manager
                 .environment_manager()