mirror of
https://github.com/openai/codex.git
synced 2026-11-18 22:20:48 +00:00
## Why Fixed schema budgets can strip parameter descriptions from large MCP tools or render their Code Mode input types as `unknown`. Allow larger budgets to preserve that guidance. ## What changed - Add `mcp_servers.<name>.tool_input_schema_max_bytes` to configure the UTF-8 byte threshold for best-effort input schema compaction, retaining the 5,000-byte default. - Add `features.code_mode.tool_input_schema_max_bytes` for rendered input types. Use the largest of the 16,000-byte default, the Code Mode setting, and the ordinary MCP server's explicit setting. - Apply rendering budgets to prompt declarations and the runtime tool catalog, and avoid reusing cached declarations after the Code Mode budget changes. ## Testing Add coverage for UTF-8 compaction thresholds, budget precedence, configuration round trips, and preservation of parameter guidance in both the Code Mode prompt and `ALL_TOOLS`. GitOrigin-RevId: 0ef2823a614d4794e636f518b09c0b03a5239b45
110 lines
3.5 KiB
Rust
110 lines
3.5 KiB
Rust
use crate::ToolDefinition;
|
|
use crate::ToolOutputSchema;
|
|
use crate::json_schema::parse_tool_input_schema_with_max_bytes;
|
|
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, /*schema_max_bytes*/ None,
|
|
)
|
|
}
|
|
|
|
pub(crate) fn parse_mcp_tool_with_schema_max_bytes(
|
|
tool: &rmcp::model::Tool,
|
|
schema_max_bytes: usize,
|
|
) -> Result<ToolDefinition, serde_json::Error> {
|
|
parse_mcp_tool_with_description_limit(
|
|
tool,
|
|
/*description_limit*/ None,
|
|
Some(schema_max_bytes),
|
|
)
|
|
}
|
|
|
|
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),
|
|
/*schema_max_bytes*/ None,
|
|
)
|
|
}
|
|
|
|
fn parse_mcp_tool_with_description_limit(
|
|
tool: &rmcp::model::Tool,
|
|
description_limit: Option<usize>,
|
|
schema_max_bytes: 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 = if let Some(budget) = schema_max_bytes {
|
|
parse_tool_input_schema_with_max_bytes(&serialized_input_schema, budget)?
|
|
} else {
|
|
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;
|