mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
Shijie Rao
78ce61c78e
## Summary
- Ensure direct namespaced MCP tool groups are emitted with a non-empty
namespace description even when namespace metadata is missing or blank.
- Add regression coverage for missing MCP namespace descriptions.
## Cause
Latest `main` can serialize a direct namespaced MCP tool group with an
empty top-level `description`. The namespace description path used
`unwrap_or_default()` when `tool_namespaces` did not include metadata
for that namespace, so the outbound Responses API payload could contain
a tool like `{"type":"namespace","description":""}`. The Responses API
rejects that because namespace tool descriptions must be a non-empty
string.
## Fix
- Add a fallback namespace description: `Tools in the <namespace>
namespace.`
- Preserve provided namespace descriptions after trimming, but treat
blank descriptions as missing.
### Issue I am seeing
This is what I am seeing on the local build.
<img width="1593" height="488" alt="Screenshot 2026-04-15 at 10 55 55
AM"
src="https://github.com/user-attachments/assets/bab668ba-bf17-4c71-be4e-b102202fce57"
/>
---------
Co-authored-by: Sayan Sisodiya <sayan@openai.com>
111 lines
3.1 KiB
Rust
111 lines
3.1 KiB
Rust
use crate::JsonSchema;
|
|
use crate::ToolDefinition;
|
|
use crate::ToolName;
|
|
use crate::parse_dynamic_tool;
|
|
use crate::parse_mcp_tool;
|
|
use codex_protocol::dynamic_tools::DynamicToolSpec;
|
|
use serde::Deserialize;
|
|
use serde::Serialize;
|
|
use serde_json::Value;
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
|
pub struct FreeformTool {
|
|
pub name: String,
|
|
pub description: String,
|
|
pub format: FreeformToolFormat,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
|
pub struct FreeformToolFormat {
|
|
pub r#type: String,
|
|
pub syntax: String,
|
|
pub definition: String,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, PartialEq)]
|
|
pub struct ResponsesApiTool {
|
|
pub name: String,
|
|
pub description: String,
|
|
/// TODO: Validation. When strict is set to true, the JSON schema,
|
|
/// `required` and `additional_properties` must be present. All fields in
|
|
/// `properties` must be present in `required`.
|
|
pub strict: bool,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub defer_loading: Option<bool>,
|
|
pub parameters: JsonSchema,
|
|
#[serde(skip)]
|
|
pub output_schema: Option<Value>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, PartialEq)]
|
|
#[serde(tag = "type")]
|
|
#[allow(clippy::large_enum_variant)]
|
|
pub enum ToolSearchOutputTool {
|
|
#[allow(dead_code)]
|
|
#[serde(rename = "function")]
|
|
Function(ResponsesApiTool),
|
|
#[serde(rename = "namespace")]
|
|
Namespace(ResponsesApiNamespace),
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, PartialEq)]
|
|
pub struct ResponsesApiNamespace {
|
|
pub name: String,
|
|
pub description: String,
|
|
pub tools: Vec<ResponsesApiNamespaceTool>,
|
|
}
|
|
|
|
pub(crate) fn default_namespace_description(namespace_name: &str) -> String {
|
|
format!("Tools in the {namespace_name} namespace.")
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, PartialEq)]
|
|
#[serde(tag = "type")]
|
|
pub enum ResponsesApiNamespaceTool {
|
|
#[serde(rename = "function")]
|
|
Function(ResponsesApiTool),
|
|
}
|
|
|
|
pub fn dynamic_tool_to_responses_api_tool(
|
|
tool: &DynamicToolSpec,
|
|
) -> Result<ResponsesApiTool, serde_json::Error> {
|
|
Ok(tool_definition_to_responses_api_tool(parse_dynamic_tool(
|
|
tool,
|
|
)?))
|
|
}
|
|
|
|
pub fn mcp_tool_to_responses_api_tool(
|
|
tool_name: &ToolName,
|
|
tool: &rmcp::model::Tool,
|
|
) -> Result<ResponsesApiTool, serde_json::Error> {
|
|
Ok(tool_definition_to_responses_api_tool(
|
|
parse_mcp_tool(tool)?.renamed(tool_name.name.clone()),
|
|
))
|
|
}
|
|
|
|
pub fn mcp_tool_to_deferred_responses_api_tool(
|
|
tool_name: &ToolName,
|
|
tool: &rmcp::model::Tool,
|
|
) -> Result<ResponsesApiTool, serde_json::Error> {
|
|
Ok(tool_definition_to_responses_api_tool(
|
|
parse_mcp_tool(tool)?
|
|
.renamed(tool_name.name.clone())
|
|
.into_deferred(),
|
|
))
|
|
}
|
|
|
|
pub fn tool_definition_to_responses_api_tool(tool_definition: ToolDefinition) -> ResponsesApiTool {
|
|
ResponsesApiTool {
|
|
name: tool_definition.name,
|
|
description: tool_definition.description,
|
|
strict: false,
|
|
defer_loading: tool_definition.defer_loading.then_some(true),
|
|
parameters: tool_definition.input_schema,
|
|
output_schema: tool_definition.output_schema,
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "responses_api_tests.rs"]
|
|
mod tests;
|