From 7eb107f797549a855349ab5914d99eaa5af27ac7 Mon Sep 17 00:00:00 2001 From: starr-openai Date: Mon, 11 May 2026 10:25:49 -0700 Subject: [PATCH] Allow default apply_patch environment Let multi-environment apply_patch calls without an explicit environment_id fall through to the primary turn environment, matching the optional parser contract and existing resolve_tool_environment(None) behavior. Co-authored-by: Codex --- codex-rs/core/src/tools/handlers/apply_patch.rs | 4 ---- codex-rs/core/src/tools/handlers/apply_patch_tests.rs | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/codex-rs/core/src/tools/handlers/apply_patch.rs b/codex-rs/core/src/tools/handlers/apply_patch.rs index 5babf855a1..54dcffaf46 100644 --- a/codex-rs/core/src/tools/handlers/apply_patch.rs +++ b/codex-rs/core/src/tools/handlers/apply_patch.rs @@ -589,10 +589,6 @@ fn require_environment_id( "apply_patch environment selection is unavailable for this turn".to_string(), )), Some(environment_id) => Ok(Some(environment_id.to_string())), - None if allow_environment_id => Err(FunctionCallError::RespondToModel( - "apply_patch environment_id is required when multiple environments are available" - .to_string(), - )), None => Ok(None), } } diff --git a/codex-rs/core/src/tools/handlers/apply_patch_tests.rs b/codex-rs/core/src/tools/handlers/apply_patch_tests.rs index e1c43fc31c..ef710c282b 100644 --- a/codex-rs/core/src/tools/handlers/apply_patch_tests.rs +++ b/codex-rs/core/src/tools/handlers/apply_patch_tests.rs @@ -207,10 +207,7 @@ fn reconcile_environment_id_requires_selection_when_enabled() { require_environment_id( /*parsed_environment_id*/ None, /*allow_environment_id*/ true ), - Err(FunctionCallError::RespondToModel( - "apply_patch environment_id is required when multiple environments are available" - .to_string(), - )) + Ok(None) ); }