From 52b025f591bd120fed23cf1dc95ecc2c52e0178e Mon Sep 17 00:00:00 2001 From: starr-openai Date: Thu, 7 May 2026 19:39:40 -0700 Subject: [PATCH] codex: fix multi-env apply_patch grammar on Windows Co-authored-by: Codex --- codex-rs/core/src/tools/handlers/apply_patch_spec.rs | 1 + codex-rs/core/src/tools/handlers/apply_patch_spec_tests.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/codex-rs/core/src/tools/handlers/apply_patch_spec.rs b/codex-rs/core/src/tools/handlers/apply_patch_spec.rs index c44059ce86..1b1b0bfbb2 100644 --- a/codex-rs/core/src/tools/handlers/apply_patch_spec.rs +++ b/codex-rs/core/src/tools/handlers/apply_patch_spec.rs @@ -111,6 +111,7 @@ pub fn create_apply_patch_freeform_tool(multi_environment: bool) -> ToolSpec { syntax: "lark".to_string(), definition: if multi_environment { APPLY_PATCH_LARK_GRAMMAR + .replace("\r\n", "\n") .replace(APPLY_PATCH_STRICT_START, APPLY_PATCH_WITH_ENV_START) .replace( APPLY_PATCH_BEGIN_PATCH_RULE, diff --git a/codex-rs/core/src/tools/handlers/apply_patch_spec_tests.rs b/codex-rs/core/src/tools/handlers/apply_patch_spec_tests.rs index 5298d86669..07f0c54b29 100644 --- a/codex-rs/core/src/tools/handlers/apply_patch_spec_tests.rs +++ b/codex-rs/core/src/tools/handlers/apply_patch_spec_tests.rs @@ -5,6 +5,7 @@ use std::collections::BTreeMap; fn multi_environment_apply_patch_grammar() -> String { APPLY_PATCH_LARK_GRAMMAR + .replace("\r\n", "\n") .replace(APPLY_PATCH_STRICT_START, APPLY_PATCH_WITH_ENV_START) .replace( APPLY_PATCH_BEGIN_PATCH_RULE,