mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
jif-oai
9c5dfa7b1a
## Why Extension tools were split across two public runtime contracts: `codex-tool-api` exposed `ToolBundle` plus its own call/spec/error types, while core native tools used `codex_tools::ToolExecutor`. That made contributed tool specs and execution behavior easy to drift apart and added another crate boundary for what should be one executable-tool seam. This PR makes `ToolExecutor` the single runtime contract and keeps extension-specific pinning in `codex-extension-api`. ## Remaining todo https://github.com/openai/codex/pull/22369/changes#diff-b935ea8245c3ce568a30cff660175fa6390b66b872ae409e1e2e965738250741R5 Either generic `Invocation` or sub-extract the `ToolCall` and clean `ToolInvocation` ## What changed - Removed the `codex-tool-api` workspace crate and its dependencies from core and `codex-extension-api`. - Made `codex_tools::ToolExecutor` object-safe with `async_trait` so extension contributors can return a dyn executor. - Added the extension-facing aliases under `ext/extension-api/src/contributors/tools.rs`, including `ExtensionToolExecutor = dyn ToolExecutor<ToolCall, Output = ExtensionToolOutput>`. - Changed `ToolContributor::tools` to return extension executors directly instead of `ToolBundle`s. - Updated core’s extension tool handler/registry/router path to adapt those extension executors into the existing native `ToolInvocation` runtime path. - Added focused coverage for extension tools being registered, model-visible, dispatchable, and not replacing built-in tools. ## Verification - `cargo test -p codex-tools` - `cargo test -p codex-extension-api`
89 lines
3.7 KiB
Rust
89 lines
3.7 KiB
Rust
//! Shared tool definitions and Responses API tool primitives that can live
|
|
//! outside `codex-core`.
|
|
|
|
mod code_mode;
|
|
mod dynamic_tool;
|
|
mod function_call_error;
|
|
mod image_detail;
|
|
mod json_schema;
|
|
mod mcp_tool;
|
|
mod request_plugin_install;
|
|
mod responses_api;
|
|
mod tool_call;
|
|
mod tool_config;
|
|
mod tool_definition;
|
|
mod tool_discovery;
|
|
mod tool_executor;
|
|
mod tool_output;
|
|
mod tool_payload;
|
|
mod tool_spec;
|
|
|
|
pub use code_mode::augment_tool_spec_for_code_mode;
|
|
pub use code_mode::code_mode_name_for_tool_name;
|
|
pub use code_mode::collect_code_mode_exec_prompt_tool_definitions;
|
|
pub use code_mode::collect_code_mode_tool_definitions;
|
|
pub use code_mode::tool_spec_to_code_mode_tool_definition;
|
|
pub use codex_protocol::ToolName;
|
|
pub use dynamic_tool::parse_dynamic_tool;
|
|
pub use function_call_error::FunctionCallError;
|
|
pub use image_detail::can_request_original_image_detail;
|
|
pub use image_detail::normalize_output_image_detail;
|
|
pub use image_detail::sanitize_original_image_detail;
|
|
pub use json_schema::AdditionalProperties;
|
|
pub use json_schema::JsonSchema;
|
|
pub use json_schema::JsonSchemaPrimitiveType;
|
|
pub use json_schema::JsonSchemaType;
|
|
pub use json_schema::parse_tool_input_schema;
|
|
pub use mcp_tool::mcp_call_tool_result_output_schema;
|
|
pub use mcp_tool::parse_mcp_tool;
|
|
pub use request_plugin_install::REQUEST_PLUGIN_INSTALL_APPROVAL_KIND_VALUE;
|
|
pub use request_plugin_install::REQUEST_PLUGIN_INSTALL_PERSIST_ALWAYS_VALUE;
|
|
pub use request_plugin_install::REQUEST_PLUGIN_INSTALL_PERSIST_KEY;
|
|
pub use request_plugin_install::RequestPluginInstallArgs;
|
|
pub use request_plugin_install::RequestPluginInstallMeta;
|
|
pub use request_plugin_install::RequestPluginInstallResult;
|
|
pub use request_plugin_install::all_requested_connectors_picked_up;
|
|
pub use request_plugin_install::build_request_plugin_install_elicitation_request;
|
|
pub use request_plugin_install::verified_connector_install_completed;
|
|
pub use responses_api::FreeformTool;
|
|
pub use responses_api::FreeformToolFormat;
|
|
pub use responses_api::LoadableToolSpec;
|
|
pub use responses_api::ResponsesApiNamespace;
|
|
pub use responses_api::ResponsesApiNamespaceTool;
|
|
pub use responses_api::ResponsesApiTool;
|
|
pub use responses_api::coalesce_loadable_tool_specs;
|
|
pub use responses_api::default_namespace_description;
|
|
pub use responses_api::dynamic_tool_to_responses_api_tool;
|
|
pub use responses_api::mcp_tool_to_deferred_responses_api_tool;
|
|
pub use responses_api::mcp_tool_to_responses_api_tool;
|
|
pub use responses_api::tool_definition_to_responses_api_tool;
|
|
pub use tool_call::ToolCall;
|
|
pub use tool_config::ShellCommandBackendConfig;
|
|
pub use tool_config::ToolEnvironmentMode;
|
|
pub use tool_config::ToolUserShellType;
|
|
pub use tool_config::ToolsConfig;
|
|
pub use tool_config::ToolsConfigParams;
|
|
pub use tool_config::UnifiedExecShellMode;
|
|
pub use tool_config::ZshForkConfig;
|
|
pub use tool_config::request_user_input_available_modes;
|
|
pub use tool_definition::ToolDefinition;
|
|
pub use tool_discovery::DiscoverablePluginInfo;
|
|
pub use tool_discovery::DiscoverableTool;
|
|
pub use tool_discovery::DiscoverableToolAction;
|
|
pub use tool_discovery::DiscoverableToolType;
|
|
pub use tool_discovery::REQUEST_PLUGIN_INSTALL_TOOL_NAME;
|
|
pub use tool_discovery::RequestPluginInstallEntry;
|
|
pub use tool_discovery::TOOL_SEARCH_DEFAULT_LIMIT;
|
|
pub use tool_discovery::TOOL_SEARCH_TOOL_NAME;
|
|
pub use tool_discovery::ToolSearchSourceInfo;
|
|
pub use tool_discovery::collect_request_plugin_install_entries;
|
|
pub use tool_discovery::filter_request_plugin_install_discoverable_tools_for_client;
|
|
pub use tool_executor::ToolExecutor;
|
|
pub use tool_output::JsonToolOutput;
|
|
pub use tool_output::ToolOutput;
|
|
pub use tool_payload::ToolPayload;
|
|
pub use tool_spec::ResponsesApiWebSearchFilters;
|
|
pub use tool_spec::ResponsesApiWebSearchUserLocation;
|
|
pub use tool_spec::ToolSpec;
|
|
pub use tool_spec::create_tools_json_for_responses_api;
|