[codex] Remove tool search bucket limit override#22381
Merged
Merged
Conversation
pakrym-oai
approved these changes
May 12, 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
tool_searchstill carries the server-specific result-cap path added in #17684 forcomputer-use: when the model omittedlimit, a matching result expanded the search to 20 and thenlimit_results_by_bucketapplied per-bucket caps. That makes default result handling depend on a one-off server exception instead of the singleTOOL_SEARCH_DEFAULT_LIMITpath.This PR removes that custom branch so omitted
limitvalues use the ordinary global default consistently. The implementation being retired is the pre-change bucketed search path intool_search.rs.What changed
ToolSearchHandler::searchback to one BM25 search with the resolved limit.limit_results_by_bucket, thecomputer-useconstants, and the omitted-limit plumbing that only existed for the override.ToolSearchEntry::limit_bucketmetadata from deferred MCP and dynamic search entries.tool_searchresult limits.Validation
cargo test -p codex-core tool_search--test allsearch-tool fixture phase then failed before sending mocked response requests intool_search_indexes_only_enabled_non_app_mcp_toolsandtool_search_uses_non_app_mcp_server_instructions_as_namespace_description.cargo test -p codex-coretools::handlers::multi_agents::tests::tool_handlers_cascade_close_and_resume_and_keep_explicitly_closed_subtrees_closedwith a stack overflow.