mirror of
https://github.com/openai/codex.git
synced 2026-10-30 19:18:49 +00:00
Charlie Marsh
f3803587c9
## Why MCP tool parsing eagerly cloned structured output schemas and built full call-result envelopes. Cloning tool definitions also copied their output-schema JSON, even before a consumer needed it. ## What changed - Introduce `ToolOutputSchema` with immutable `Arc` storage so tool definitions share output schemas when cloned. - Retain MCP structured output schemas and materialize the call-result envelope only when JSON is requested. - Update code-mode consumers and schema mutation sites to materialize JSON explicitly, reusing uniquely owned storage when possible. - Move structured content into the MCP envelope without an extra clone, preserving property order. ## Testing Add tests for JSON preservation, mutation isolation, equality between lazy and materialized schemas, reuse of uniquely owned storage, and equivalent code-mode definitions. GitOrigin-RevId: e98ba4c2f0efedc99f7cbc7bba206cc63a3bd8f4
87 lines
2.8 KiB
Rust
87 lines
2.8 KiB
Rust
use crate::ToolDefinition;
|
|
use crate::ToolOutputSchema;
|
|
use crate::parse_tool_input_schema;
|
|
use codex_utils_string::take_bytes_at_char_boundary;
|
|
use serde_json::Value as JsonValue;
|
|
use serde_json::json;
|
|
|
|
const MAX_MCP_TOOL_DESCRIPTION_BYTES: usize = 1_000;
|
|
|
|
pub fn parse_mcp_tool(tool: &rmcp::model::Tool) -> Result<ToolDefinition, serde_json::Error> {
|
|
parse_mcp_tool_with_description_limit(tool, /*description_limit*/ None)
|
|
}
|
|
|
|
pub fn parse_agent_plugin_mcp_tool(
|
|
tool: &rmcp::model::Tool,
|
|
) -> Result<ToolDefinition, serde_json::Error> {
|
|
parse_mcp_tool_with_description_limit(tool, Some(MAX_MCP_TOOL_DESCRIPTION_BYTES))
|
|
}
|
|
|
|
fn parse_mcp_tool_with_description_limit(
|
|
tool: &rmcp::model::Tool,
|
|
description_limit: Option<usize>,
|
|
) -> 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)?;
|
|
Ok(ToolDefinition {
|
|
name: tool.name.to_string(),
|
|
description: tool
|
|
.description
|
|
.as_deref()
|
|
.map(|description| match description_limit {
|
|
Some(limit) => take_bytes_at_char_boundary(description, limit).to_string(),
|
|
None => description.to_string(),
|
|
})
|
|
.unwrap_or_default(),
|
|
input_schema,
|
|
output_schema: Some(ToolOutputSchema::from_mcp_output_schema(
|
|
tool.output_schema.clone(),
|
|
)),
|
|
defer_loading: false,
|
|
})
|
|
}
|
|
|
|
pub fn mcp_call_tool_result_output_schema(structured_content_schema: JsonValue) -> JsonValue {
|
|
let mut schema = json!({
|
|
"type": "object",
|
|
"properties": {
|
|
"content": {
|
|
"type": "array",
|
|
"items": {
|
|
"type": "object"
|
|
}
|
|
},
|
|
"structuredContent": null,
|
|
"isError": {
|
|
"type": "boolean"
|
|
},
|
|
"_meta": {
|
|
"type": "object"
|
|
}
|
|
},
|
|
"required": ["content"],
|
|
"additionalProperties": false
|
|
});
|
|
// Replacing the placeholder keeps the existing property order while moving
|
|
// the supplied schema instead of cloning it through json!.
|
|
schema["properties"]["structuredContent"] = structured_content_schema;
|
|
schema
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "mcp_tool_tests.rs"]
|
|
mod tests;
|