mirror of
https://github.com/openai/codex.git
synced 2026-10-28 16:06:15 +00:00
## Why `#16193` moved the pure `tool_search` and `tool_suggest` spec builders into `codex-tools`, but `codex-core` still owned the shared discoverable-tool model that those builders and the `tool_suggest` runtime both depend on. This change continues the migration by moving that reusable model boundary out of `codex-core` as well, so the discovery/suggestion stack uses one shared set of types and `core/src/tools` no longer needs its own `discoverable.rs` module. ## What changed - Moved `DiscoverableTool`, `DiscoverablePluginInfo`, and `filter_tool_suggest_discoverable_tools_for_client()` into `codex-rs/tools/src/tool_discovery.rs` alongside the extracted discovery/suggestion spec builders. - Added `codex-app-server-protocol` as a `codex-tools` dependency so the shared discoverable-tool model can own the connector-side `AppInfo` variant directly. - Updated `core/src/tools/handlers/tool_suggest.rs`, `core/src/tools/spec.rs`, `core/src/tools/router.rs`, `core/src/connectors.rs`, and `core/src/codex.rs` to consume the shared `codex-tools` model instead of the old core-local declarations. - Changed `core/src/plugins/discoverable.rs` to return `DiscoverablePluginInfo` directly, moved the pure client-filter coverage into `tool_discovery_tests.rs`, and deleted the old `core/src/tools/discoverable.rs` module. - Updated `codex-rs/tools/README.md` so the crate boundary documents that `codex-tools` now owns the discoverable-tool models in addition to the discovery/suggestion spec builders. ## Test plan - `cargo test -p codex-tools` - `CARGO_TARGET_DIR=/tmp/codex-core-discoverable-model cargo test -p codex-core --lib tools::handlers::tool_suggest::` - `CARGO_TARGET_DIR=/tmp/codex-core-discoverable-model cargo test -p codex-core --lib tools::spec::` - `CARGO_TARGET_DIR=/tmp/codex-core-discoverable-model cargo test -p codex-core --lib plugins::discoverable::` - `just bazel-lock-check` - `just argument-comment-lint` ## References - #16193 - #16154 - #15923 - #15928 - #15944 - #15953 - #16031 - #16047 - #16129 - #16132 - #16138 - #16141
118 lines
3.4 KiB
Rust
118 lines
3.4 KiB
Rust
pub mod code_mode;
|
|
pub mod context;
|
|
pub mod events;
|
|
pub(crate) mod handlers;
|
|
pub mod js_repl;
|
|
pub(crate) mod network_approval;
|
|
pub mod orchestrator;
|
|
pub mod parallel;
|
|
pub mod registry;
|
|
pub mod router;
|
|
pub mod runtimes;
|
|
pub mod sandboxing;
|
|
pub mod spec;
|
|
|
|
use crate::exec::ExecToolCallOutput;
|
|
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 ...]";
|
|
|
|
/// 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()
|
|
}
|
|
}
|