mirror of
https://github.com/openai/codex.git
synced 2026-05-25 05:24:37 +00:00
caee620a53
## Why This continues the `codex-tools` migration by moving one more piece of generic tool-definition bookkeeping out of `codex-core`. The earlier extraction steps moved shared schema parsing into `codex-tools`, but `core/src/tools/spec.rs` still had to supply tool names separately and perform ad hoc rewrites for deferred MCP aliases. That meant the crate boundary was still awkward: the parsed shape coming back from `codex-tools` was missing part of the definition that `codex-core` ultimately needs to assemble a `ResponsesApiTool`. This change introduces a named `ToolDefinition` in `codex-tools` so both MCP tools and dynamic tools cross the crate boundary in the same reusable model. `codex-core` still owns the final `ResponsesApiTool` assembly, but less of the generic tool-definition shaping logic stays behind in `core`. ## What changed - replaced `ParsedToolDefinition` with a named `ToolDefinition` in `codex-rs/tools/src/tool_definition.rs` - added `codex-rs/tools/src/tool_definition_tests.rs` for `renamed()` and `into_deferred()` - updated `parse_dynamic_tool()` and `parse_mcp_tool()` to return `ToolDefinition` - simplified `codex-rs/core/src/tools/spec.rs` so it adapts `ToolDefinition` into `ResponsesApiTool` instead of rewriting names and deferred fields inline - updated parser tests and `codex-rs/tools/README.md` to reflect the named tool-definition model ## Test plan - `cargo test -p codex-tools` - `cargo test -p codex-core --lib tools::spec::`
24 lines
625 B
Rust
24 lines
625 B
Rust
use crate::ToolDefinition;
|
|
use crate::parse_tool_input_schema;
|
|
use codex_protocol::dynamic_tools::DynamicToolSpec;
|
|
|
|
pub fn parse_dynamic_tool(tool: &DynamicToolSpec) -> Result<ToolDefinition, serde_json::Error> {
|
|
let DynamicToolSpec {
|
|
name,
|
|
description,
|
|
input_schema,
|
|
defer_loading,
|
|
} = tool;
|
|
Ok(ToolDefinition {
|
|
name: name.clone(),
|
|
description: description.clone(),
|
|
input_schema: parse_tool_input_schema(input_schema)?,
|
|
output_schema: None,
|
|
defer_loading: *defer_loading,
|
|
})
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "dynamic_tool_tests.rs"]
|
|
mod tests;
|