mirror of
https://github.com/openai/codex.git
synced 2026-05-16 17:23:57 +00:00
Deferred dynamic tools need to round-trip a namespace so a tool returned by `tool_search` can be called through the same registry key that core uses for dispatch. This change adds namespace support for dynamic tool specs/calls, persists it through app-server thread state, and routes dynamic tool calls by full `ToolName` while still sending the app the leaf tool name. Deferred dynamic tools must provide a namespace; non-deferred dynamic tools may remain top-level. It also introduces `LoadableToolSpec` as the shared function-or-namespace Responses shape used by both `tool_search` output and dynamic tool registration, so dynamic tools use the same wrapping logic in both paths. Validation: - `cargo test -p codex-tools` - `cargo test -p codex-core tool_search` --------- Co-authored-by: Sayan Sisodiya <sayan@openai.com>
176 lines
5.6 KiB
Rust
176 lines
5.6 KiB
Rust
use super::LoadableToolSpec;
|
|
use super::ResponsesApiNamespace;
|
|
use super::ResponsesApiNamespaceTool;
|
|
use super::ResponsesApiTool;
|
|
use super::dynamic_tool_to_responses_api_tool;
|
|
use super::mcp_tool_to_deferred_responses_api_tool;
|
|
use super::tool_definition_to_responses_api_tool;
|
|
use crate::JsonSchema;
|
|
use crate::ToolDefinition;
|
|
use crate::ToolName;
|
|
use codex_protocol::dynamic_tools::DynamicToolSpec;
|
|
use pretty_assertions::assert_eq;
|
|
use serde_json::json;
|
|
use std::collections::BTreeMap;
|
|
|
|
#[test]
|
|
fn tool_definition_to_responses_api_tool_omits_false_defer_loading() {
|
|
assert_eq!(
|
|
tool_definition_to_responses_api_tool(ToolDefinition {
|
|
name: "lookup_order".to_string(),
|
|
description: "Look up an order".to_string(),
|
|
input_schema: JsonSchema::object(
|
|
BTreeMap::from([(
|
|
"order_id".to_string(),
|
|
JsonSchema::string(/*description*/ None),
|
|
)]),
|
|
Some(vec!["order_id".to_string()]),
|
|
Some(false.into())
|
|
),
|
|
output_schema: Some(json!({"type": "object"})),
|
|
defer_loading: false,
|
|
}),
|
|
ResponsesApiTool {
|
|
name: "lookup_order".to_string(),
|
|
description: "Look up an order".to_string(),
|
|
strict: false,
|
|
defer_loading: None,
|
|
parameters: JsonSchema::object(
|
|
BTreeMap::from([(
|
|
"order_id".to_string(),
|
|
JsonSchema::string(/*description*/ None),
|
|
)]),
|
|
Some(vec!["order_id".to_string()]),
|
|
Some(false.into())
|
|
),
|
|
output_schema: Some(json!({"type": "object"})),
|
|
}
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn dynamic_tool_to_responses_api_tool_preserves_defer_loading() {
|
|
let tool = DynamicToolSpec {
|
|
namespace: None,
|
|
name: "lookup_order".to_string(),
|
|
description: "Look up an order".to_string(),
|
|
input_schema: json!({
|
|
"type": "object",
|
|
"properties": {
|
|
"order_id": {"type": "string"}
|
|
},
|
|
"required": ["order_id"],
|
|
"additionalProperties": false,
|
|
}),
|
|
defer_loading: true,
|
|
};
|
|
|
|
assert_eq!(
|
|
dynamic_tool_to_responses_api_tool(&tool).expect("convert dynamic tool"),
|
|
ResponsesApiTool {
|
|
name: "lookup_order".to_string(),
|
|
description: "Look up an order".to_string(),
|
|
strict: false,
|
|
defer_loading: Some(true),
|
|
parameters: JsonSchema::object(
|
|
BTreeMap::from([(
|
|
"order_id".to_string(),
|
|
JsonSchema::string(/*description*/ None),
|
|
)]),
|
|
Some(vec!["order_id".to_string()]),
|
|
Some(false.into())
|
|
),
|
|
output_schema: None,
|
|
}
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn mcp_tool_to_deferred_responses_api_tool_sets_defer_loading() {
|
|
let tool = rmcp::model::Tool {
|
|
name: "lookup_order".to_string().into(),
|
|
title: None,
|
|
description: Some("Look up an order".to_string().into()),
|
|
input_schema: std::sync::Arc::new(rmcp::model::object(json!({
|
|
"type": "object",
|
|
"properties": {
|
|
"order_id": {"type": "string"}
|
|
},
|
|
"required": ["order_id"],
|
|
"additionalProperties": false,
|
|
}))),
|
|
output_schema: None,
|
|
annotations: None,
|
|
execution: None,
|
|
icons: None,
|
|
meta: None,
|
|
};
|
|
|
|
assert_eq!(
|
|
mcp_tool_to_deferred_responses_api_tool(
|
|
&ToolName::namespaced("mcp__codex_apps__", "lookup_order"),
|
|
&tool,
|
|
)
|
|
.expect("convert deferred tool"),
|
|
ResponsesApiTool {
|
|
name: "lookup_order".to_string(),
|
|
description: "Look up an order".to_string(),
|
|
strict: false,
|
|
defer_loading: Some(true),
|
|
parameters: JsonSchema::object(
|
|
BTreeMap::from([(
|
|
"order_id".to_string(),
|
|
JsonSchema::string(/*description*/ None),
|
|
)]),
|
|
Some(vec!["order_id".to_string()]),
|
|
Some(false.into())
|
|
),
|
|
output_schema: None,
|
|
}
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn loadable_tool_spec_namespace_serializes_with_deferred_child_tools() {
|
|
let namespace = LoadableToolSpec::Namespace(ResponsesApiNamespace {
|
|
name: "mcp__codex_apps__calendar".to_string(),
|
|
description: "Plan events".to_string(),
|
|
tools: vec![ResponsesApiNamespaceTool::Function(ResponsesApiTool {
|
|
name: "create_event".to_string(),
|
|
description: "Create a calendar event.".to_string(),
|
|
strict: false,
|
|
defer_loading: Some(true),
|
|
parameters: JsonSchema::object(
|
|
Default::default(),
|
|
/*required*/ None,
|
|
/*additional_properties*/ None,
|
|
),
|
|
output_schema: None,
|
|
})],
|
|
});
|
|
|
|
let value = serde_json::to_value(namespace).expect("serialize namespace");
|
|
|
|
assert_eq!(
|
|
value,
|
|
json!({
|
|
"type": "namespace",
|
|
"name": "mcp__codex_apps__calendar",
|
|
"description": "Plan events",
|
|
"tools": [
|
|
{
|
|
"type": "function",
|
|
"name": "create_event",
|
|
"description": "Create a calendar event.",
|
|
"strict": false,
|
|
"defer_loading": true,
|
|
"parameters": {
|
|
"type": "object",
|
|
"properties": {}
|
|
}
|
|
}
|
|
]
|
|
})
|
|
);
|
|
}
|