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, environment_id: Option, ) { - 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()