[codex] Hide deferred tools from code mode prompt#23605
Merged
pakrym-oai merged 2 commits intoMay 20, 2026
Conversation
…de-mode-deferred-tool-prompt
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
code_mode_only_guides_all_tools_search_and_calls_deferred_app_toolswas failing because code-mode prompt generation used the same nested tool spec list for both the model-visibleexecguide and the runtimeALL_TOOLSsurface. That allowed deferred MCP/app tools, such ascalendar_timezone_option_99, to leak into theexecdescription even though they should only be discoverable throughALL_TOOLSat runtime.What changed
Split code-mode nested tool planning into two sets in
core/src/tools/spec_plan.rs:tools[...]andALL_TOOLScan call themexecprompt docs only render non-deferred tools, so deferred app tools stay out of the model-visible guideValidation
cargo test -p codex-core --test all code_mode_only_guides_all_tools_search_and_calls_deferred_app_tools -- --nocapturecargo test -q -p codex-core --test all code_mode_only_guides_all_tools_search_and_calls_deferred_app_tools