Simplify tool executor and registry plumbing#22636
Open
jif-oai wants to merge 3 commits into
Open
Conversation
Collaborator
Author
|
@codex review |
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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
The tool runtime path still had a typed output associated type on
ToolExecutor, plus a core-onlyRegisteredTooladapter and extension-only executor aliases. That made every new shared tool runtime carry extra adapter plumbing before it could participate in core dispatch, extension tools, hook payloads, telemetry, and model-visible spec generation.This PR moves output erasure to the shared executor boundary so core and extension tools can use the same execution contract directly.
What Changed
codex_tools::ToolExecutorto returnBox<dyn ToolOutput>instead of an associatedOutputtype.ExtensionToolExecutor/ExtensionToolOutputaliases and exposedToolExecutor<ToolCall>plusToolOutputthroughcodex-extension-api.CoreToolRuntimeandToolRegistry::from_tools, removing the extraRegisteredTool/ToolRegistryBuilderlayer.core/src/tools/spec_plan.rs, including deferred tool search and code-mode-only filtering.ToolOutputhelpers for post-tool-use hook ids and inputs so MCP, unified exec, extension, and other boxed outputs preserve the same hook payload behavior.Test Coverage