Fix: use function apply_patch tool for Bedrock model#19416
Merged
Conversation
pakrym-oai
approved these changes
Apr 24, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
openai.gpt-5.4-cmbis served through the Amazon Bedrock provider, whose request validator currently acceptsfunctionandmcptool specs but rejects Responsescustomtools. The CMB catalog entry reuses the bundledgpt-5.4metadata, which marksapply_patch_tool_typeasfreeform. That causes Codex to include anapply_patchtool withtype: "custom", so even heavily disabled sessions can fail before the model runs with:This is provider-specific: the model should still expose
apply_patch, but for Bedrock it needs to use the JSON/function tool shape instead of the freeform/custom shape.What Changed
openai.gpt-5.4-cmbstatic catalog entry to setapply_patch_tool_typetofunctionafter inheriting the rest of thegpt-5.4model metadata.gpt-5.4metadata except for this Bedrock-specific tool shape override.Verification
cargo test -p codex-model-providerjust fix -p codex-model-provider