mirror of
https://github.com/openai/codex.git
synced 2026-05-02 04:11:39 +03:00
## Why The previous extraction steps moved shared tool-schema parsing into `codex-tools`, but `codex-core` still owned the generic Responses API tool models and the last adapter layer that turned parsed tool definitions into `ResponsesApiTool` values. That left `core/src/tools/spec.rs` and `core/src/client_common.rs` holding a chunk of tool-shaping code that does not need session state, runtime plumbing, or any other `codex-core`-specific dependency. As a result, `codex-tools` owned the parsed tool definition, but `codex-core` still owned the generic wire model that those definitions are converted into. This change moves that boundary one step further. `codex-tools` now owns the reusable Responses/tool wire structs and the shared conversion helpers for dynamic tools, MCP tools, and deferred MCP aliases. `codex-core` continues to own `ToolSpec` orchestration and the remaining web-search-specific request shapes. ## What changed - added `tools/src/responses_api.rs` to own `ResponsesApiTool`, `FreeformTool`, `ToolSearchOutputTool`, namespace output types, and the shared `ToolDefinition -> ResponsesApiTool` adapter helpers - added `tools/src/responses_api_tests.rs` for deferred-loading behavior, adapter coverage, and namespace serialization coverage - rewired `core/src/tools/spec.rs` to use the extracted dynamic/MCP adapter helpers instead of defining those conversions locally - rewired `core/src/tools/handlers/tool_search.rs` to use the extracted deferred MCP adapter and namespace output types directly - slimmed `core/src/client_common.rs` so it now keeps `ToolSpec` and the web-search-specific wire types, while reusing the extracted tool models from `codex-tools` - moved the extracted seam tests out of `core` and updated `codex-rs/tools/README.md` plus `tools/src/lib.rs` to reflect the expanded `codex-tools` boundary ## Test plan - `cargo test -p codex-tools` - `cargo test -p codex-core --lib tools::spec::` - `cargo test -p codex-core --lib tools::handlers::tool_search::` - `just fix -p codex-tools -p codex-core` - `just argument-comment-lint` ## References - [#15923](https://github.com/openai/codex/pull/15923) `codex-tools: extract shared tool schema parsing` - [#15928](https://github.com/openai/codex/pull/15928) `codex-tools: extract MCP schema adapters` - [#15944](https://github.com/openai/codex/pull/15944) `codex-tools: extract dynamic tool adapters` - [#15953](https://github.com/openai/codex/pull/15953) `codex-tools: introduce named tool definitions`
103 lines
2.9 KiB
Rust
103 lines
2.9 KiB
Rust
use crate::JsonSchema;
|
|
use crate::ToolDefinition;
|
|
use crate::parse_dynamic_tool;
|
|
use crate::parse_mcp_tool;
|
|
use codex_protocol::dynamic_tools::DynamicToolSpec;
|
|
use serde::Deserialize;
|
|
use serde::Serialize;
|
|
use serde_json::Value;
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
|
pub struct FreeformTool {
|
|
pub name: String,
|
|
pub description: String,
|
|
pub format: FreeformToolFormat,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
|
pub struct FreeformToolFormat {
|
|
pub r#type: String,
|
|
pub syntax: String,
|
|
pub definition: String,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, PartialEq)]
|
|
pub struct ResponsesApiTool {
|
|
pub name: String,
|
|
pub description: String,
|
|
/// TODO: Validation. When strict is set to true, the JSON schema,
|
|
/// `required` and `additional_properties` must be present. All fields in
|
|
/// `properties` must be present in `required`.
|
|
pub strict: bool,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub defer_loading: Option<bool>,
|
|
pub parameters: JsonSchema,
|
|
#[serde(skip)]
|
|
pub output_schema: Option<Value>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, PartialEq)]
|
|
#[serde(tag = "type")]
|
|
pub enum ToolSearchOutputTool {
|
|
#[allow(dead_code)]
|
|
#[serde(rename = "function")]
|
|
Function(ResponsesApiTool),
|
|
#[serde(rename = "namespace")]
|
|
Namespace(ResponsesApiNamespace),
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, PartialEq)]
|
|
pub struct ResponsesApiNamespace {
|
|
pub name: String,
|
|
pub description: String,
|
|
pub tools: Vec<ResponsesApiNamespaceTool>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, PartialEq)]
|
|
#[serde(tag = "type")]
|
|
pub enum ResponsesApiNamespaceTool {
|
|
#[serde(rename = "function")]
|
|
Function(ResponsesApiTool),
|
|
}
|
|
|
|
pub fn dynamic_tool_to_responses_api_tool(
|
|
tool: &DynamicToolSpec,
|
|
) -> Result<ResponsesApiTool, serde_json::Error> {
|
|
Ok(tool_definition_to_responses_api_tool(parse_dynamic_tool(
|
|
tool,
|
|
)?))
|
|
}
|
|
|
|
pub fn mcp_tool_to_responses_api_tool(
|
|
name: String,
|
|
tool: &rmcp::model::Tool,
|
|
) -> Result<ResponsesApiTool, serde_json::Error> {
|
|
Ok(tool_definition_to_responses_api_tool(
|
|
parse_mcp_tool(tool)?.renamed(name),
|
|
))
|
|
}
|
|
|
|
pub fn mcp_tool_to_deferred_responses_api_tool(
|
|
name: String,
|
|
tool: &rmcp::model::Tool,
|
|
) -> Result<ResponsesApiTool, serde_json::Error> {
|
|
Ok(tool_definition_to_responses_api_tool(
|
|
parse_mcp_tool(tool)?.renamed(name).into_deferred(),
|
|
))
|
|
}
|
|
|
|
pub fn tool_definition_to_responses_api_tool(tool_definition: ToolDefinition) -> ResponsesApiTool {
|
|
ResponsesApiTool {
|
|
name: tool_definition.name,
|
|
description: tool_definition.description,
|
|
strict: false,
|
|
defer_loading: tool_definition.defer_loading.then_some(true),
|
|
parameters: tool_definition.input_schema,
|
|
output_schema: tool_definition.output_schema,
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "responses_api_tests.rs"]
|
|
mod tests;
|