mirror of
https://github.com/openai/codex.git
synced 2026-05-28 15:00:16 +00:00
## Why `ToolName::display()` made it too easy to flatten tool identity and accidentally compare rendered strings. Tool identity should stay structural until a legacy string boundary actually requires the flattened spelling. ## What - Removes `ToolName::display()` and relies on the existing `Display` impl for messages and errors. - Adds structural ordering for `ToolName` and uses it for sorting/deduping deferred tools. - Carries `ToolName` through tool/sandbox plumbing, flattening only at legacy boundaries such as hook payloads, telemetry tags, and Responses tool names. - Updates MCP normalization tests to assert `ToolName` structure instead of rendered strings. ## Testing - `cargo test -p codex-mcp test_normalize_tools` - `cargo test -p codex-core unavailable_tool` - `just fix -p codex-protocol` - `just fix -p codex-mcp` - `just fix -p codex-core`
141 lines
4.4 KiB
Rust
141 lines
4.4 KiB
Rust
pub(crate) mod code_mode;
|
|
pub(crate) mod context;
|
|
pub(crate) mod events;
|
|
pub(crate) mod handlers;
|
|
pub(crate) mod hook_names;
|
|
pub(crate) mod hosted_spec;
|
|
pub(crate) mod network_approval;
|
|
pub(crate) mod orchestrator;
|
|
pub(crate) mod parallel;
|
|
pub(crate) mod registry;
|
|
pub(crate) mod router;
|
|
pub(crate) mod runtimes;
|
|
pub(crate) mod sandboxing;
|
|
pub(crate) mod spec;
|
|
pub(crate) mod spec_plan;
|
|
pub(crate) mod spec_plan_types;
|
|
pub(crate) mod tool_dispatch_trace;
|
|
pub(crate) mod tool_search_entry;
|
|
|
|
use std::borrow::Cow;
|
|
|
|
use codex_protocol::exec_output::ExecToolCallOutput;
|
|
use codex_tools::ToolName;
|
|
use codex_utils_output_truncation::TruncationPolicy;
|
|
use codex_utils_output_truncation::formatted_truncate_text;
|
|
use codex_utils_output_truncation::truncate_text;
|
|
pub use router::ToolRouter;
|
|
use serde::Serialize;
|
|
|
|
// Telemetry preview limits: keep log events smaller than model budgets.
|
|
pub(crate) const TELEMETRY_PREVIEW_MAX_BYTES: usize = 2 * 1024; // 2 KiB
|
|
pub(crate) const TELEMETRY_PREVIEW_MAX_LINES: usize = 64; // lines
|
|
pub(crate) const TELEMETRY_PREVIEW_TRUNCATION_NOTICE: &str =
|
|
"[... telemetry preview truncated ...]";
|
|
|
|
/// Legacy boundaries such as hook payloads, telemetry tags, and Responses tool
|
|
/// names still require a single flattened string. Keep comparisons and sorting
|
|
/// on `ToolName` itself; use this only when crossing those boundaries.
|
|
pub(crate) fn flat_tool_name(tool_name: &ToolName) -> Cow<'_, str> {
|
|
match tool_name.namespace.as_deref() {
|
|
Some(namespace) => {
|
|
let mut name = String::with_capacity(namespace.len() + tool_name.name.len());
|
|
name.push_str(namespace);
|
|
name.push_str(&tool_name.name);
|
|
Cow::Owned(name)
|
|
}
|
|
None => Cow::Borrowed(tool_name.name.as_str()),
|
|
}
|
|
}
|
|
|
|
/// Format the combined exec output for sending back to the model.
|
|
/// Includes exit code and duration metadata; truncates large bodies safely.
|
|
pub fn format_exec_output_for_model_structured(
|
|
exec_output: &ExecToolCallOutput,
|
|
truncation_policy: TruncationPolicy,
|
|
) -> String {
|
|
let ExecToolCallOutput {
|
|
exit_code,
|
|
duration,
|
|
..
|
|
} = exec_output;
|
|
|
|
#[derive(Serialize)]
|
|
struct ExecMetadata {
|
|
exit_code: i32,
|
|
duration_seconds: f32,
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
struct ExecOutput<'a> {
|
|
output: &'a str,
|
|
metadata: ExecMetadata,
|
|
}
|
|
|
|
// round to 1 decimal place
|
|
let duration_seconds = ((duration.as_secs_f32()) * 10.0).round() / 10.0;
|
|
|
|
let formatted_output = format_exec_output_str(exec_output, truncation_policy);
|
|
|
|
let payload = ExecOutput {
|
|
output: &formatted_output,
|
|
metadata: ExecMetadata {
|
|
exit_code: *exit_code,
|
|
duration_seconds,
|
|
},
|
|
};
|
|
|
|
#[expect(clippy::expect_used)]
|
|
serde_json::to_string(&payload).expect("serialize ExecOutput")
|
|
}
|
|
|
|
pub fn format_exec_output_for_model_freeform(
|
|
exec_output: &ExecToolCallOutput,
|
|
truncation_policy: TruncationPolicy,
|
|
) -> String {
|
|
// round to 1 decimal place
|
|
let duration_seconds = ((exec_output.duration.as_secs_f32()) * 10.0).round() / 10.0;
|
|
|
|
let content = build_content_with_timeout(exec_output);
|
|
|
|
let total_lines = content.lines().count();
|
|
|
|
let formatted_output = truncate_text(&content, truncation_policy);
|
|
|
|
let mut sections = Vec::new();
|
|
|
|
sections.push(format!("Exit code: {}", exec_output.exit_code));
|
|
sections.push(format!("Wall time: {duration_seconds} seconds"));
|
|
if total_lines != formatted_output.lines().count() {
|
|
sections.push(format!("Total output lines: {total_lines}"));
|
|
}
|
|
|
|
sections.push("Output:".to_string());
|
|
sections.push(formatted_output);
|
|
|
|
sections.join("\n")
|
|
}
|
|
|
|
pub fn format_exec_output_str(
|
|
exec_output: &ExecToolCallOutput,
|
|
truncation_policy: TruncationPolicy,
|
|
) -> String {
|
|
let content = build_content_with_timeout(exec_output);
|
|
|
|
// Truncate for model consumption before serialization.
|
|
formatted_truncate_text(&content, truncation_policy)
|
|
}
|
|
|
|
/// Extracts exec output content and prepends a timeout message if the command timed out.
|
|
fn build_content_with_timeout(exec_output: &ExecToolCallOutput) -> String {
|
|
if exec_output.timed_out {
|
|
format!(
|
|
"command timed out after {} milliseconds\n{}",
|
|
exec_output.duration.as_millis(),
|
|
exec_output.aggregated_output.text
|
|
)
|
|
} else {
|
|
exec_output.aggregated_output.text.clone()
|
|
}
|
|
}
|