mirror of
https://github.com/openai/codex.git
synced 2026-04-30 09:26:44 +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::`
61 lines
2.0 KiB
Rust
61 lines
2.0 KiB
Rust
use crate::ToolDefinition;
|
|
use crate::parse_tool_input_schema;
|
|
use serde_json::Value as JsonValue;
|
|
use serde_json::json;
|
|
|
|
pub fn parse_mcp_tool(tool: &rmcp::model::Tool) -> Result<ToolDefinition, serde_json::Error> {
|
|
let mut serialized_input_schema = serde_json::Value::Object(tool.input_schema.as_ref().clone());
|
|
|
|
// OpenAI models mandate the "properties" field in the schema. Some MCP
|
|
// servers omit it (or set it to null), so we insert an empty object to
|
|
// match the behavior of the Agents SDK.
|
|
if let serde_json::Value::Object(obj) = &mut serialized_input_schema
|
|
&& obj.get("properties").is_none_or(serde_json::Value::is_null)
|
|
{
|
|
obj.insert(
|
|
"properties".to_string(),
|
|
serde_json::Value::Object(serde_json::Map::new()),
|
|
);
|
|
}
|
|
|
|
let input_schema = parse_tool_input_schema(&serialized_input_schema)?;
|
|
let structured_content_schema = tool
|
|
.output_schema
|
|
.as_ref()
|
|
.map(|output_schema| serde_json::Value::Object(output_schema.as_ref().clone()))
|
|
.unwrap_or_else(|| JsonValue::Object(serde_json::Map::new()));
|
|
|
|
Ok(ToolDefinition {
|
|
name: tool.name.to_string(),
|
|
description: tool.description.clone().map(Into::into).unwrap_or_default(),
|
|
input_schema,
|
|
output_schema: Some(mcp_call_tool_result_output_schema(
|
|
structured_content_schema,
|
|
)),
|
|
defer_loading: false,
|
|
})
|
|
}
|
|
|
|
pub fn mcp_call_tool_result_output_schema(structured_content_schema: JsonValue) -> JsonValue {
|
|
json!({
|
|
"type": "object",
|
|
"properties": {
|
|
"content": {
|
|
"type": "array",
|
|
"items": {}
|
|
},
|
|
"structuredContent": structured_content_schema,
|
|
"isError": {
|
|
"type": "boolean"
|
|
},
|
|
"_meta": {}
|
|
},
|
|
"required": ["content"],
|
|
"additionalProperties": false
|
|
})
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "mcp_tool_tests.rs"]
|
|
mod tests;
|