mirror of
https://github.com/openai/codex.git
synced 2026-09-13 11:47:17 +00: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::`
127 lines
3.6 KiB
Rust
127 lines
3.6 KiB
Rust
use super::mcp_call_tool_result_output_schema;
|
|
use super::parse_mcp_tool;
|
|
use crate::JsonSchema;
|
|
use crate::ToolDefinition;
|
|
use pretty_assertions::assert_eq;
|
|
use std::collections::BTreeMap;
|
|
|
|
fn mcp_tool(name: &str, description: &str, input_schema: serde_json::Value) -> rmcp::model::Tool {
|
|
rmcp::model::Tool {
|
|
name: name.to_string().into(),
|
|
title: None,
|
|
description: Some(description.to_string().into()),
|
|
input_schema: std::sync::Arc::new(rmcp::model::object(input_schema)),
|
|
output_schema: None,
|
|
annotations: None,
|
|
execution: None,
|
|
icons: None,
|
|
meta: None,
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn parse_mcp_tool_inserts_empty_properties() {
|
|
let tool = mcp_tool(
|
|
"no_props",
|
|
"No properties",
|
|
serde_json::json!({
|
|
"type": "object"
|
|
}),
|
|
);
|
|
|
|
assert_eq!(
|
|
parse_mcp_tool(&tool).expect("parse MCP tool"),
|
|
ToolDefinition {
|
|
name: "no_props".to_string(),
|
|
description: "No properties".to_string(),
|
|
input_schema: JsonSchema::Object {
|
|
properties: BTreeMap::new(),
|
|
required: None,
|
|
additional_properties: None,
|
|
},
|
|
output_schema: Some(mcp_call_tool_result_output_schema(serde_json::json!({}))),
|
|
defer_loading: false,
|
|
}
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn parse_mcp_tool_preserves_top_level_output_schema() {
|
|
let mut tool = mcp_tool(
|
|
"with_output",
|
|
"Has output schema",
|
|
serde_json::json!({
|
|
"type": "object"
|
|
}),
|
|
);
|
|
tool.output_schema = Some(std::sync::Arc::new(rmcp::model::object(
|
|
serde_json::json!({
|
|
"properties": {
|
|
"result": {
|
|
"properties": {
|
|
"nested": {}
|
|
}
|
|
}
|
|
},
|
|
"required": ["result"]
|
|
}),
|
|
)));
|
|
|
|
assert_eq!(
|
|
parse_mcp_tool(&tool).expect("parse MCP tool"),
|
|
ToolDefinition {
|
|
name: "with_output".to_string(),
|
|
description: "Has output schema".to_string(),
|
|
input_schema: JsonSchema::Object {
|
|
properties: BTreeMap::new(),
|
|
required: None,
|
|
additional_properties: None,
|
|
},
|
|
output_schema: Some(mcp_call_tool_result_output_schema(serde_json::json!({
|
|
"properties": {
|
|
"result": {
|
|
"properties": {
|
|
"nested": {}
|
|
}
|
|
}
|
|
},
|
|
"required": ["result"]
|
|
}))),
|
|
defer_loading: false,
|
|
}
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn parse_mcp_tool_preserves_output_schema_without_inferred_type() {
|
|
let mut tool = mcp_tool(
|
|
"with_enum_output",
|
|
"Has enum output schema",
|
|
serde_json::json!({
|
|
"type": "object"
|
|
}),
|
|
);
|
|
tool.output_schema = Some(std::sync::Arc::new(rmcp::model::object(
|
|
serde_json::json!({
|
|
"enum": ["ok", "error"]
|
|
}),
|
|
)));
|
|
|
|
assert_eq!(
|
|
parse_mcp_tool(&tool).expect("parse MCP tool"),
|
|
ToolDefinition {
|
|
name: "with_enum_output".to_string(),
|
|
description: "Has enum output schema".to_string(),
|
|
input_schema: JsonSchema::Object {
|
|
properties: BTreeMap::new(),
|
|
required: None,
|
|
additional_properties: None,
|
|
},
|
|
output_schema: Some(mcp_call_tool_result_output_schema(serde_json::json!({
|
|
"enum": ["ok", "error"]
|
|
}))),
|
|
defer_loading: false,
|
|
}
|
|
);
|
|
}
|