mirror of
https://github.com/openai/codex.git
synced 2026-05-15 16:53:05 +00:00
7bbe3b6011
This updates code-mode tool rendering so MCP tools can surface
structured output types from their `outputSchema`.
What changed:
- Detect MCP tool-call result wrappers from the output schema shape
instead of relying on tool-name parsing or provenance flags.
- Render shared TypeScript aliases once for MCP tool results
(`CallToolResult`, `ContentBlock`, etc.) so multiple MCP tool
declarations stay compact.
- Type `structuredContent` from the tool definition's `outputSchema`
instead of rendering it as `unknown`.
- Update the shared MCP aliases to match the MCP draft `CallToolResult`
schema more closely.
Example:
- Before: `declare const tools: { mcp__rmcp__echo(args: { env_var?:
string; message: string; }): Promise<{ _meta?: unknown; content:
Array<unknown>; isError?: boolean; structuredContent?: unknown; }>; };`
- After: `declare const tools: { mcp__rmcp__echo(args: { env_var?:
string; message: string; }): Promise<CallToolResult<{ echo: string; env:
string | null; }>>; };`
65 lines
2.1 KiB
Rust
65 lines
2.1 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": {
|
|
"type": "object"
|
|
}
|
|
},
|
|
"structuredContent": structured_content_schema,
|
|
"isError": {
|
|
"type": "boolean"
|
|
},
|
|
"_meta": {
|
|
"type": "object"
|
|
}
|
|
},
|
|
"required": ["content"],
|
|
"additionalProperties": false
|
|
})
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "mcp_tool_tests.rs"]
|
|
mod tests;
|