Michael Bolin 6fcc528a43 fix: provide tolerance for apply_patch tool (#993) ...

As explained in detail in the doc comment for `ParseMode::Lenient`, we
have observed that GPT-4.1 does not always generate a valid invocation
of `apply_patch`. Fortunately, the error is predictable, so we introduce
some new logic to the `codex-apply-patch` crate to recover from this
error.

Because we would like to avoid this becoming a de facto standard (as it
would be incompatible if `apply_patch` were provided as an actual
executable, unless we also introduced the lenient behavior in the
executable, as well), we require passing `ParseMode::Lenient` to
`parse_patch_text()` to make it clear that the caller is opting into
supporting this special case.

Note the analogous change to the TypeScript CLI was
https://github.com/openai/codex/pull/930. In addition to changing the
accepted input to `apply_patch`, it also introduced additional
instructions for the model, which we include in this PR.

Note that `apply-patch` does not depend on either `regex` or
`regex-lite`, so some of the checks are slightly more verbose to avoid
introducing this dependency.

That said, this PR does not leverage the existing
`extract_heredoc_body_from_apply_patch_command()`, which depends on
`tree-sitter` and `tree-sitter-bash`:


https://github.com/openai/codex/blob/5a5aa899143f9b9ef606692c401b010368b15bdb/codex-rs/apply-patch/src/lib.rs#L191-L246

though perhaps it should.

6fcc528a43 · 2025-06-03 09:06:38 -07:00

History

..

src

fix: provide tolerance for apply_patch tool (#993)

2025-06-03 09:06:38 -07:00

apply_patch_tool_instructions.md

fix: provide tolerance for apply_patch tool (#993)

2025-06-03 09:06:38 -07:00

Cargo.toml

chore: replace regex with regex-lite, where appropriate (#1200)

2025-06-02 17:11:45 -07:00