mirror of
https://github.com/openai/codex.git
synced 2026-10-25 23:57:40 +00:00
## What changed - Allow namespace tool specs to contain custom freeform tools alongside function tools. - Include namespaced custom tools in deferred tool search and expose them to code mode with names such as `editor__apply_patch`. - Route custom payloads to matching extension tools while preserving function-only payload validation. ## Testing - Add serialization, tool search, code-mode definition, and end-to-end dispatch coverage for namespaced custom tools. GitOrigin-RevId: be64d35f6ae54685c5a9fcf45a732320742ea7e5
179 lines
5.8 KiB
Rust
179 lines
5.8 KiB
Rust
use super::augment_tool_spec_for_code_mode;
|
|
use super::tool_spec_to_code_mode_tool_definition;
|
|
use crate::AdditionalProperties;
|
|
use crate::FreeformTool;
|
|
use crate::FreeformToolFormat;
|
|
use crate::JsonSchema;
|
|
use crate::ResponsesApiNamespace;
|
|
use crate::ResponsesApiNamespaceTool;
|
|
use crate::ResponsesApiTool;
|
|
use crate::ToolName;
|
|
use crate::ToolSpec;
|
|
use pretty_assertions::assert_eq;
|
|
use serde_json::json;
|
|
use std::collections::BTreeMap;
|
|
|
|
#[test]
|
|
fn augment_tool_spec_for_code_mode_augments_function_tools() {
|
|
assert_eq!(
|
|
augment_tool_spec_for_code_mode(ToolSpec::Function(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(AdditionalProperties::Boolean(false))
|
|
),
|
|
output_schema: Some(json!({
|
|
"type": "object",
|
|
"properties": {
|
|
"ok": {"type": "boolean"}
|
|
},
|
|
"required": ["ok"],
|
|
})),
|
|
})),
|
|
ToolSpec::Function(ResponsesApiTool {
|
|
name: "lookup_order".to_string(),
|
|
description: r#"Look up an order
|
|
|
|
exec tool declaration:
|
|
```ts
|
|
declare const tools: { lookup_order(args: { order_id: string; }): Promise<{ ok: boolean; }>; };
|
|
```"#
|
|
.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(AdditionalProperties::Boolean(false))
|
|
),
|
|
output_schema: Some(json!({
|
|
"type": "object",
|
|
"properties": {
|
|
"ok": {"type": "boolean"}
|
|
},
|
|
"required": ["ok"],
|
|
})),
|
|
})
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn augment_tool_spec_for_code_mode_preserves_exec_tool_description() {
|
|
assert_eq!(
|
|
augment_tool_spec_for_code_mode(ToolSpec::Freeform(FreeformTool {
|
|
name: codex_code_mode::PUBLIC_TOOL_NAME.to_string(),
|
|
description: "Run code".to_string(),
|
|
defer_loading: None,
|
|
format: FreeformToolFormat {
|
|
r#type: "grammar".to_string(),
|
|
syntax: "lark".to_string(),
|
|
definition: "start: \"exec\"".to_string(),
|
|
},
|
|
})),
|
|
ToolSpec::Freeform(FreeformTool {
|
|
name: codex_code_mode::PUBLIC_TOOL_NAME.to_string(),
|
|
description: "Run code".to_string(),
|
|
defer_loading: None,
|
|
format: FreeformToolFormat {
|
|
r#type: "grammar".to_string(),
|
|
syntax: "lark".to_string(),
|
|
definition: "start: \"exec\"".to_string(),
|
|
},
|
|
})
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn tool_spec_to_code_mode_tool_definition_returns_augmented_nested_tools() {
|
|
let spec = ToolSpec::Freeform(FreeformTool {
|
|
name: "apply_patch".to_string(),
|
|
description: "Apply a patch".to_string(),
|
|
defer_loading: None,
|
|
format: FreeformToolFormat {
|
|
r#type: "grammar".to_string(),
|
|
syntax: "lark".to_string(),
|
|
definition: "start: \"patch\"".to_string(),
|
|
},
|
|
});
|
|
|
|
assert_eq!(
|
|
tool_spec_to_code_mode_tool_definition(&spec),
|
|
Some(codex_code_mode::ToolDefinition {
|
|
name: "apply_patch".to_string(),
|
|
tool_name: ToolName::plain("apply_patch"),
|
|
description: r#"Apply a patch
|
|
|
|
exec tool declaration:
|
|
```ts
|
|
declare const tools: { apply_patch(input: string): Promise<unknown>; };
|
|
```"#
|
|
.to_string(),
|
|
kind: codex_code_mode::CodeModeToolKind::Freeform,
|
|
input_schema: None,
|
|
output_schema: None,
|
|
})
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn tool_spec_to_code_mode_tool_definition_supports_namespaced_custom_tools() {
|
|
let spec = ToolSpec::Namespace(ResponsesApiNamespace {
|
|
name: "editor".to_string(),
|
|
description: "Editing tools".to_string(),
|
|
tools: vec![ResponsesApiNamespaceTool::Custom(FreeformTool {
|
|
name: "apply_patch".to_string(),
|
|
description: "Apply a patch".to_string(),
|
|
defer_loading: None,
|
|
format: FreeformToolFormat {
|
|
r#type: "grammar".to_string(),
|
|
syntax: "lark".to_string(),
|
|
definition: "start: \"patch\"".to_string(),
|
|
},
|
|
})],
|
|
});
|
|
|
|
assert_eq!(
|
|
tool_spec_to_code_mode_tool_definition(&spec),
|
|
Some(codex_code_mode::ToolDefinition {
|
|
name: "editor__apply_patch".to_string(),
|
|
tool_name: ToolName::namespaced("editor", "apply_patch"),
|
|
description: r#"Apply a patch
|
|
|
|
exec tool declaration:
|
|
```ts
|
|
declare const tools: { editor__apply_patch(input: string): Promise<unknown>; };
|
|
```"#
|
|
.to_string(),
|
|
kind: codex_code_mode::CodeModeToolKind::Freeform,
|
|
input_schema: None,
|
|
output_schema: None,
|
|
})
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn tool_spec_to_code_mode_tool_definition_skips_unsupported_variants() {
|
|
assert_eq!(
|
|
tool_spec_to_code_mode_tool_definition(&ToolSpec::ToolSearch {
|
|
execution: "sync".to_string(),
|
|
description: "Search".to_string(),
|
|
parameters: JsonSchema::object(
|
|
BTreeMap::new(),
|
|
/*required*/ None,
|
|
/*additional_properties*/ None
|
|
),
|
|
}),
|
|
None
|
|
);
|
|
}
|