mirror of
https://github.com/openai/codex.git
synced 2026-05-01 03:42:05 +03:00
## 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::`
31 lines
691 B
Rust
31 lines
691 B
Rust
use crate::JsonSchema;
|
|
use serde_json::Value as JsonValue;
|
|
|
|
/// Tool metadata and schemas that downstream crates can adapt into higher-level
|
|
/// tool specs.
|
|
#[derive(Debug, PartialEq)]
|
|
pub struct ToolDefinition {
|
|
pub name: String,
|
|
pub description: String,
|
|
pub input_schema: JsonSchema,
|
|
pub output_schema: Option<JsonValue>,
|
|
pub defer_loading: bool,
|
|
}
|
|
|
|
impl ToolDefinition {
|
|
pub fn renamed(mut self, name: String) -> Self {
|
|
self.name = name;
|
|
self
|
|
}
|
|
|
|
pub fn into_deferred(mut self) -> Self {
|
|
self.output_schema = None;
|
|
self.defer_loading = true;
|
|
self
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "tool_definition_tests.rs"]
|
|
mod tests;
|