mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
9f71d57a65
## Why This is another small step in the `codex-core` -> `codex-tools` migration described in `AGENTS.md`. `core/src/tools/spec.rs` and `core/src/tools/code_mode/mod.rs` were both hand-rolling the same pure transformation: convert visible `ToolSpec`s into code-mode nested tool definitions, then sort and deduplicate by tool name. That logic does not depend on core runtime state or handlers, so keeping it in `codex-core` makes `spec.rs` harder to peel out later than it needs to be. ## What Changed - Add `collect_code_mode_tool_definitions()` to `codex-rs/tools/src/code_mode.rs`. - Reuse that helper from `codex-rs/core/src/tools/spec.rs` when assembling the `exec` tool description. - Reuse the same helper from `codex-rs/core/src/tools/code_mode/mod.rs` when exposing nested tool metadata to the code-mode runtime. This is intended to be a straight refactor with no behavior change and no new test surface. ## Verification - `cargo test -p codex-tools` - `cargo test -p codex-core tools::spec::tests` - `cargo test -p codex-core code_mode_only_`
157 lines
5.1 KiB
Rust
157 lines
5.1 KiB
Rust
use crate::FreeformTool;
|
|
use crate::FreeformToolFormat;
|
|
use crate::JsonSchema;
|
|
use crate::ResponsesApiTool;
|
|
use crate::ToolSpec;
|
|
use codex_code_mode::CodeModeToolKind;
|
|
use codex_code_mode::ToolDefinition as CodeModeToolDefinition;
|
|
use std::collections::BTreeMap;
|
|
|
|
/// Augment tool descriptions with code-mode-specific exec samples.
|
|
pub fn augment_tool_spec_for_code_mode(spec: ToolSpec) -> ToolSpec {
|
|
let Some(description) = code_mode_tool_definition_for_spec(&spec)
|
|
.map(codex_code_mode::augment_tool_definition)
|
|
.map(|definition| definition.description)
|
|
else {
|
|
return spec;
|
|
};
|
|
|
|
match spec {
|
|
ToolSpec::Function(mut tool) => {
|
|
tool.description = description;
|
|
ToolSpec::Function(tool)
|
|
}
|
|
ToolSpec::Freeform(mut tool) => {
|
|
tool.description = description;
|
|
ToolSpec::Freeform(tool)
|
|
}
|
|
other => other,
|
|
}
|
|
}
|
|
|
|
/// Convert a supported nested tool spec into the code-mode runtime shape,
|
|
/// including the code-mode-specific description sample.
|
|
pub fn tool_spec_to_code_mode_tool_definition(spec: &ToolSpec) -> Option<CodeModeToolDefinition> {
|
|
let definition = code_mode_tool_definition_for_spec(spec)?;
|
|
codex_code_mode::is_code_mode_nested_tool(&definition.name)
|
|
.then(|| codex_code_mode::augment_tool_definition(definition))
|
|
}
|
|
|
|
pub fn collect_code_mode_tool_definitions<'a>(
|
|
specs: impl IntoIterator<Item = &'a ToolSpec>,
|
|
) -> Vec<CodeModeToolDefinition> {
|
|
let mut tool_definitions = specs
|
|
.into_iter()
|
|
.filter_map(tool_spec_to_code_mode_tool_definition)
|
|
.collect::<Vec<_>>();
|
|
tool_definitions.sort_by(|left, right| left.name.cmp(&right.name));
|
|
tool_definitions.dedup_by(|left, right| left.name == right.name);
|
|
tool_definitions
|
|
}
|
|
|
|
pub fn create_wait_tool() -> ToolSpec {
|
|
let properties = BTreeMap::from([
|
|
(
|
|
"cell_id".to_string(),
|
|
JsonSchema::String {
|
|
description: Some("Identifier of the running exec cell.".to_string()),
|
|
},
|
|
),
|
|
(
|
|
"yield_time_ms".to_string(),
|
|
JsonSchema::Number {
|
|
description: Some(
|
|
"How long to wait (in milliseconds) for more output before yielding again."
|
|
.to_string(),
|
|
),
|
|
},
|
|
),
|
|
(
|
|
"max_tokens".to_string(),
|
|
JsonSchema::Number {
|
|
description: Some(
|
|
"Maximum number of output tokens to return for this wait call.".to_string(),
|
|
),
|
|
},
|
|
),
|
|
(
|
|
"terminate".to_string(),
|
|
JsonSchema::Boolean {
|
|
description: Some("Whether to terminate the running exec cell.".to_string()),
|
|
},
|
|
),
|
|
]);
|
|
|
|
ToolSpec::Function(ResponsesApiTool {
|
|
name: codex_code_mode::WAIT_TOOL_NAME.to_string(),
|
|
description: format!(
|
|
"Waits on a yielded `{}` cell and returns new output or completion.\n{}",
|
|
codex_code_mode::PUBLIC_TOOL_NAME,
|
|
codex_code_mode::build_wait_tool_description().trim()
|
|
),
|
|
strict: false,
|
|
parameters: JsonSchema::Object {
|
|
properties,
|
|
required: Some(vec!["cell_id".to_string()]),
|
|
additional_properties: Some(false.into()),
|
|
},
|
|
output_schema: None,
|
|
defer_loading: None,
|
|
})
|
|
}
|
|
|
|
pub fn create_code_mode_tool(
|
|
enabled_tools: &[(String, String)],
|
|
code_mode_only_enabled: bool,
|
|
) -> ToolSpec {
|
|
const CODE_MODE_FREEFORM_GRAMMAR: &str = r#"
|
|
start: pragma_source | plain_source
|
|
pragma_source: PRAGMA_LINE NEWLINE SOURCE
|
|
plain_source: SOURCE
|
|
|
|
PRAGMA_LINE: /[ \t]*\/\/ @exec:[^\r\n]*/
|
|
NEWLINE: /\r?\n/
|
|
SOURCE: /[\s\S]+/
|
|
"#;
|
|
|
|
ToolSpec::Freeform(FreeformTool {
|
|
name: codex_code_mode::PUBLIC_TOOL_NAME.to_string(),
|
|
description: codex_code_mode::build_exec_tool_description(
|
|
enabled_tools,
|
|
code_mode_only_enabled,
|
|
),
|
|
format: FreeformToolFormat {
|
|
r#type: "grammar".to_string(),
|
|
syntax: "lark".to_string(),
|
|
definition: CODE_MODE_FREEFORM_GRAMMAR.to_string(),
|
|
},
|
|
})
|
|
}
|
|
|
|
fn code_mode_tool_definition_for_spec(spec: &ToolSpec) -> Option<CodeModeToolDefinition> {
|
|
match spec {
|
|
ToolSpec::Function(tool) => Some(CodeModeToolDefinition {
|
|
name: tool.name.clone(),
|
|
description: tool.description.clone(),
|
|
kind: CodeModeToolKind::Function,
|
|
input_schema: serde_json::to_value(&tool.parameters).ok(),
|
|
output_schema: tool.output_schema.clone(),
|
|
}),
|
|
ToolSpec::Freeform(tool) => Some(CodeModeToolDefinition {
|
|
name: tool.name.clone(),
|
|
description: tool.description.clone(),
|
|
kind: CodeModeToolKind::Freeform,
|
|
input_schema: None,
|
|
output_schema: None,
|
|
}),
|
|
ToolSpec::LocalShell {}
|
|
| ToolSpec::ImageGeneration { .. }
|
|
| ToolSpec::ToolSearch { .. }
|
|
| ToolSpec::WebSearch { .. } => None,
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "code_mode_tests.rs"]
|
|
mod tests;
|