mirror of
https://github.com/openai/codex.git
synced 2026-05-24 04:54:52 +00:00
c9e46ed639
## Why `ToolRouter::tool_supports_parallel()` was still consulting configured specs when a handler lookup missed, even though parallel schedulability is really a property of the executable handler. Keeping that metadata on `ConfiguredToolSpec` duplicated state between the model-visible spec layer and the runtime handler layer. This change makes handlers the sole source of truth for parallel tool support and removes the extra spec wrapper that only existed to carry duplicated metadata. ## What changed - removed `ConfiguredToolSpec` and store plain `ToolSpec` values in the registry/router builder path - changed `ToolRouter::tool_supports_parallel()` to consult only the handler registry and fall back to `false` - simplified spec collection and test helpers to operate directly on `ToolSpec` - updated router/spec tests to cover handler-owned parallel behavior and the no-handler fallback ## Validation - `cargo test -p codex-tools` - `cargo test -p codex-core mcp_parallel_support_uses_handler_data` - `cargo test -p codex-core deferred_responses_api_tool_serializes_with_defer_loading` - `cargo test -p codex-core tools_without_handlers_do_not_support_parallel` - `cargo test -p codex-core request_plugin_install_can_be_registered_without_search_tool` ## Docs No documentation updates needed.
83 lines
3.7 KiB
Rust
83 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 image_detail;
|
|
mod json_schema;
|
|
mod mcp_tool;
|
|
mod request_plugin_install;
|
|
mod responses_api;
|
|
mod tool_config;
|
|
mod tool_definition;
|
|
mod tool_discovery;
|
|
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 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_loadable_tool_spec;
|
|
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_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::ToolSearchResultSource;
|
|
pub use tool_discovery::ToolSearchSource;
|
|
pub use tool_discovery::ToolSearchSourceInfo;
|
|
pub use tool_discovery::collect_request_plugin_install_entries;
|
|
pub use tool_discovery::collect_tool_search_source_infos;
|
|
pub use tool_discovery::filter_request_plugin_install_discoverable_tools_for_client;
|
|
pub use tool_discovery::tool_search_result_source_to_loadable_tool_spec;
|
|
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;
|