mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
a292faae5a
Follow-up to #27356. ## Stack note This PR changes Codex's internal dynamic-tool shape while leaving `thread/start` unchanged. App-server therefore converts the existing per-tool input into explicit functions and namespaces before passing it to core. [#27371](https://github.com/openai/codex/pull/27371) updates `thread/start` to use the same explicit shape and removes this temporary conversion. ## Why Dynamic tools repeat namespace metadata on every function. Core should keep one explicit namespace with its member tools so descriptions and membership stay consistent across sessions and runtime planning. ## What changed - Represent dynamic tools as top-level functions or explicit namespaces in protocol and session state. - Read old flat rollout metadata and write the canonical hierarchy. - Flatten namespace members only when registering callable tools. - Keep `thread/start.dynamicTools` flat for now and normalize it at the app-server boundary. New builds can read old rollout metadata. Older builds cannot read newly written hierarchical metadata. ## Test plan - `just test -p codex-app-server thread_start_normalizes_legacy_dynamic_tools_into_model_request` - `just test -p codex-protocol session_meta_normalizes_legacy_dynamic_tools` - `just test -p codex-core resume_restores_dynamic_tools_from_rollout_with_sqlite_enabled` - `just test -p codex-core tool_search_returns_deferred_dynamic_tool_and_routes_follow_up_call` - `just test -p codex-core code_mode_can_call_hidden_dynamic_tools` - `just test -p codex-tools`
169 lines
5.4 KiB
Rust
169 lines
5.4 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::DynamicToolFunctionSpec;
|
|
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 = DynamicToolFunctionSpec {
|
|
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::new(
|
|
"lookup_order",
|
|
"Look up an order",
|
|
std::sync::Arc::new(rmcp::model::object(json!({
|
|
"type": "object",
|
|
"properties": {
|
|
"order_id": {"type": "string"}
|
|
},
|
|
"required": ["order_id"],
|
|
"additionalProperties": false,
|
|
}))),
|
|
);
|
|
|
|
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": {}
|
|
}
|
|
}
|
|
]
|
|
})
|
|
);
|
|
}
|