From 1943bb005ce6bb46278862590a23d20f2b685259 Mon Sep 17 00:00:00 2001 From: starr-openai Date: Thu, 7 May 2026 19:14:05 -0700 Subject: [PATCH] codex: preserve local MCP patch approval shape Co-authored-by: Codex --- codex-rs/mcp-server/src/patch_approval.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/codex-rs/mcp-server/src/patch_approval.rs b/codex-rs/mcp-server/src/patch_approval.rs index ef42af9bc9..e4a73e1855 100644 --- a/codex-rs/mcp-server/src/patch_approval.rs +++ b/codex-rs/mcp-server/src/patch_approval.rs @@ -64,10 +64,10 @@ pub(crate) async fn handle_patch_approval_request( if let Some(r) = &reason { message_lines.push(r.clone()); } - let codex_environment_id = (!environment_id.is_empty() - && environment_id != codex_exec_server::LOCAL_ENVIRONMENT_ID) - .then_some(environment_id); - let codex_cwd = cwd; + let include_environment_context = + !environment_id.is_empty() && environment_id != codex_exec_server::LOCAL_ENVIRONMENT_ID; + let codex_environment_id = include_environment_context.then_some(environment_id); + let codex_cwd = include_environment_context.then_some(cwd).flatten(); if let Some(environment_id) = codex_environment_id.as_deref() { message_lines.push(format!("Environment: {environment_id}")); }