mirror of
https://github.com/openai/codex.git
synced 2026-05-26 22:15:13 +00:00
## Why The tool runtime path still had a typed output associated type on `ToolExecutor`, plus a core-only `RegisteredTool` adapter and extension-only executor aliases. That made every new shared tool runtime carry extra adapter plumbing before it could participate in core dispatch, extension tools, hook payloads, telemetry, and model-visible spec generation. This PR moves output erasure to the shared executor boundary so core and extension tools can use the same execution contract directly. ## What Changed - Changed `codex_tools::ToolExecutor` to return `Box<dyn ToolOutput>` instead of an associated `Output` type. - Removed the extension-specific `ExtensionToolExecutor` / `ExtensionToolOutput` aliases and exposed `ToolExecutor<ToolCall>` plus `ToolOutput` through `codex-extension-api`. - Reworked core tool registration around `CoreToolRuntime` and `ToolRegistry::from_tools`, removing the extra `RegisteredTool` / `ToolRegistryBuilder` layer. - Consolidated model-visible spec planning and registry construction in `core/src/tools/spec_plan.rs`, including deferred tool search and code-mode-only filtering. - Added `ToolOutput` helpers for post-tool-use hook ids and inputs so MCP, unified exec, extension, and other boxed outputs preserve the same hook payload behavior. - Updated core handlers, memories tools, and the related registry/spec/router tests to use the simplified contract. ## Test Coverage - Updated coverage for tool spec planning, registry lookup, deferred tool search registration, extension tool routing, post-tool-use hook payloads, dispatch tracing, guardian output extraction, and memories extension tool execution.
499 lines
15 KiB
Rust
499 lines
15 KiB
Rust
use crate::context_manager::truncate_function_output_payload;
|
|
use crate::original_image_detail::sanitize_original_image_detail;
|
|
use crate::session::session::Session;
|
|
use crate::session::turn_context::TurnContext;
|
|
use crate::tools::TELEMETRY_PREVIEW_MAX_BYTES;
|
|
use crate::tools::TELEMETRY_PREVIEW_MAX_LINES;
|
|
use crate::tools::TELEMETRY_PREVIEW_TRUNCATION_NOTICE;
|
|
use crate::turn_diff_tracker::TurnDiffTracker;
|
|
use crate::unified_exec::resolve_max_tokens;
|
|
use codex_protocol::mcp::CallToolResult;
|
|
use codex_protocol::models::FunctionCallOutputBody;
|
|
use codex_protocol::models::FunctionCallOutputContentItem;
|
|
use codex_protocol::models::FunctionCallOutputPayload;
|
|
use codex_protocol::models::ResponseInputItem;
|
|
use codex_protocol::models::function_call_output_content_items_to_text;
|
|
use codex_tools::LoadableToolSpec;
|
|
use codex_tools::ToolName;
|
|
use codex_utils_output_truncation::TruncationPolicy;
|
|
use codex_utils_output_truncation::formatted_truncate_text;
|
|
use codex_utils_string::take_bytes_at_char_boundary;
|
|
use serde::Serialize;
|
|
use serde_json::Value as JsonValue;
|
|
use std::sync::Arc;
|
|
use std::time::Duration;
|
|
use tokio::sync::Mutex;
|
|
use tokio_util::sync::CancellationToken;
|
|
|
|
pub use codex_tools::ToolOutput;
|
|
pub use codex_tools::ToolPayload;
|
|
|
|
pub(crate) fn boxed_tool_output<T>(output: T) -> Box<dyn ToolOutput>
|
|
where
|
|
T: ToolOutput + 'static,
|
|
{
|
|
Box::new(output)
|
|
}
|
|
|
|
pub type SharedTurnDiffTracker = Arc<Mutex<TurnDiffTracker>>;
|
|
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
pub enum ToolCallSource {
|
|
Direct,
|
|
CodeMode {
|
|
/// Runtime cell that issued the nested tool request.
|
|
cell_id: String,
|
|
/// Code-mode's per-cell tool invocation id. This is useful for
|
|
/// debugging the JS/runtime bridge, but it is not the Codex tool call id
|
|
/// because the runtime id only needs to be unique within one cell.
|
|
runtime_tool_call_id: String,
|
|
},
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct ToolInvocation {
|
|
pub session: Arc<Session>,
|
|
pub turn: Arc<TurnContext>,
|
|
pub cancellation_token: CancellationToken,
|
|
pub tracker: SharedTurnDiffTracker,
|
|
pub call_id: String,
|
|
pub tool_name: ToolName,
|
|
pub source: ToolCallSource,
|
|
pub payload: ToolPayload,
|
|
}
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct McpToolOutput {
|
|
pub result: CallToolResult,
|
|
pub tool_input: JsonValue,
|
|
pub wall_time: Duration,
|
|
pub original_image_detail_supported: bool,
|
|
pub truncation_policy: TruncationPolicy,
|
|
}
|
|
|
|
impl ToolOutput for McpToolOutput {
|
|
fn log_preview(&self) -> String {
|
|
let payload = self.response_payload();
|
|
let preview = payload.body.to_text().unwrap_or_else(|| {
|
|
serde_json::to_string(&self.result.content)
|
|
.unwrap_or_else(|err| format!("failed to serialize mcp result: {err}"))
|
|
});
|
|
telemetry_preview(&preview)
|
|
}
|
|
|
|
fn success_for_logging(&self) -> bool {
|
|
self.result.success()
|
|
}
|
|
|
|
fn to_response_item(&self, call_id: &str, _payload: &ToolPayload) -> ResponseInputItem {
|
|
ResponseInputItem::FunctionCallOutput {
|
|
call_id: call_id.to_string(),
|
|
output: self.response_payload(),
|
|
}
|
|
}
|
|
|
|
fn code_mode_result(&self, _payload: &ToolPayload) -> JsonValue {
|
|
serde_json::to_value(&self.result).unwrap_or_else(|err| {
|
|
JsonValue::String(format!("failed to serialize mcp result: {err}"))
|
|
})
|
|
}
|
|
|
|
fn post_tool_use_input(&self, _payload: &ToolPayload) -> Option<JsonValue> {
|
|
Some(self.tool_input.clone())
|
|
}
|
|
|
|
fn post_tool_use_response(&self, _call_id: &str, _payload: &ToolPayload) -> Option<JsonValue> {
|
|
serde_json::to_value(&self.result).ok()
|
|
}
|
|
}
|
|
|
|
impl McpToolOutput {
|
|
fn response_payload(&self) -> FunctionCallOutputPayload {
|
|
let mut payload = self.result.as_function_call_output_payload();
|
|
if let Some(items) = payload.content_items_mut() {
|
|
sanitize_original_image_detail(self.original_image_detail_supported, items);
|
|
}
|
|
|
|
let wall_time_seconds = self.wall_time.as_secs_f64();
|
|
let header = format!("Wall time: {wall_time_seconds:.4} seconds\nOutput:");
|
|
|
|
match &mut payload.body {
|
|
FunctionCallOutputBody::Text(text) => {
|
|
if text.is_empty() {
|
|
*text = header;
|
|
} else {
|
|
*text = format!("{header}\n{text}");
|
|
}
|
|
}
|
|
FunctionCallOutputBody::ContentItems(items) => {
|
|
items.insert(0, FunctionCallOutputContentItem::InputText { text: header });
|
|
}
|
|
}
|
|
|
|
// This is the context-injection form, so keep it aligned with the
|
|
// function-call output truncation that conversation history already
|
|
// applies. Code-mode consumers still get the raw `CallToolResult`.
|
|
//
|
|
// The text is serialized again inside the Responses payload, so allow
|
|
// a small buffer for JSON escaping and wrapper overhead.
|
|
truncate_function_output_payload(&payload, self.truncation_policy * 1.2)
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct ToolSearchOutput {
|
|
pub tools: Vec<LoadableToolSpec>,
|
|
}
|
|
|
|
impl ToolOutput for ToolSearchOutput {
|
|
fn log_preview(&self) -> String {
|
|
let tools = self
|
|
.tools
|
|
.iter()
|
|
.map(|tool| {
|
|
serde_json::to_value(tool).unwrap_or_else(|err| {
|
|
JsonValue::String(format!("failed to serialize tool_search output: {err}"))
|
|
})
|
|
})
|
|
.collect();
|
|
telemetry_preview(&JsonValue::Array(tools).to_string())
|
|
}
|
|
|
|
fn success_for_logging(&self) -> bool {
|
|
true
|
|
}
|
|
|
|
fn to_response_item(&self, call_id: &str, _payload: &ToolPayload) -> ResponseInputItem {
|
|
ResponseInputItem::ToolSearchOutput {
|
|
call_id: call_id.to_string(),
|
|
status: "completed".to_string(),
|
|
execution: "client".to_string(),
|
|
tools: self
|
|
.tools
|
|
.iter()
|
|
.map(|tool| {
|
|
serde_json::to_value(tool).unwrap_or_else(|err| {
|
|
JsonValue::String(format!("failed to serialize tool_search output: {err}"))
|
|
})
|
|
})
|
|
.collect(),
|
|
}
|
|
}
|
|
}
|
|
|
|
pub struct FunctionToolOutput {
|
|
pub body: Vec<FunctionCallOutputContentItem>,
|
|
pub success: Option<bool>,
|
|
pub post_tool_use_response: Option<JsonValue>,
|
|
}
|
|
|
|
impl FunctionToolOutput {
|
|
pub fn from_text(text: String, success: Option<bool>) -> Self {
|
|
Self {
|
|
body: vec![FunctionCallOutputContentItem::InputText { text }],
|
|
success,
|
|
post_tool_use_response: None,
|
|
}
|
|
}
|
|
|
|
pub fn from_content(
|
|
content: Vec<FunctionCallOutputContentItem>,
|
|
success: Option<bool>,
|
|
) -> Self {
|
|
Self {
|
|
body: content,
|
|
success,
|
|
post_tool_use_response: None,
|
|
}
|
|
}
|
|
|
|
pub fn into_text(self) -> String {
|
|
function_call_output_content_items_to_text(&self.body).unwrap_or_default()
|
|
}
|
|
}
|
|
|
|
impl ToolOutput for FunctionToolOutput {
|
|
fn log_preview(&self) -> String {
|
|
telemetry_preview(
|
|
&function_call_output_content_items_to_text(&self.body).unwrap_or_default(),
|
|
)
|
|
}
|
|
|
|
fn success_for_logging(&self) -> bool {
|
|
self.success.unwrap_or(true)
|
|
}
|
|
|
|
fn to_response_item(&self, call_id: &str, payload: &ToolPayload) -> ResponseInputItem {
|
|
function_tool_response(call_id, payload, self.body.clone(), self.success)
|
|
}
|
|
|
|
fn post_tool_use_response(&self, _call_id: &str, _payload: &ToolPayload) -> Option<JsonValue> {
|
|
self.post_tool_use_response.clone()
|
|
}
|
|
}
|
|
|
|
pub struct ApplyPatchToolOutput {
|
|
pub text: String,
|
|
}
|
|
|
|
impl ApplyPatchToolOutput {
|
|
pub fn from_text(text: String) -> Self {
|
|
Self { text }
|
|
}
|
|
}
|
|
|
|
impl ToolOutput for ApplyPatchToolOutput {
|
|
fn log_preview(&self) -> String {
|
|
telemetry_preview(&self.text)
|
|
}
|
|
|
|
fn success_for_logging(&self) -> bool {
|
|
true
|
|
}
|
|
|
|
fn to_response_item(&self, call_id: &str, payload: &ToolPayload) -> ResponseInputItem {
|
|
function_tool_response(
|
|
call_id,
|
|
payload,
|
|
vec![FunctionCallOutputContentItem::InputText {
|
|
text: self.text.clone(),
|
|
}],
|
|
Some(true),
|
|
)
|
|
}
|
|
|
|
fn post_tool_use_response(&self, _call_id: &str, _payload: &ToolPayload) -> Option<JsonValue> {
|
|
Some(JsonValue::String(self.text.clone()))
|
|
}
|
|
|
|
fn code_mode_result(&self, _payload: &ToolPayload) -> JsonValue {
|
|
JsonValue::Object(serde_json::Map::new())
|
|
}
|
|
}
|
|
|
|
pub struct AbortedToolOutput {
|
|
pub message: String,
|
|
}
|
|
|
|
impl ToolOutput for AbortedToolOutput {
|
|
fn log_preview(&self) -> String {
|
|
telemetry_preview(&self.message)
|
|
}
|
|
|
|
fn success_for_logging(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
fn to_response_item(&self, call_id: &str, payload: &ToolPayload) -> ResponseInputItem {
|
|
match payload {
|
|
ToolPayload::ToolSearch { .. } => ResponseInputItem::ToolSearchOutput {
|
|
call_id: call_id.to_string(),
|
|
status: "completed".to_string(),
|
|
execution: "client".to_string(),
|
|
tools: Vec::new(),
|
|
},
|
|
_ => function_tool_response(
|
|
call_id,
|
|
payload,
|
|
vec![FunctionCallOutputContentItem::InputText {
|
|
text: self.message.clone(),
|
|
}],
|
|
/*success*/ None,
|
|
),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq)]
|
|
pub struct ExecCommandToolOutput {
|
|
pub event_call_id: String,
|
|
pub chunk_id: String,
|
|
pub wall_time: Duration,
|
|
/// Raw bytes returned for this unified exec call before any truncation.
|
|
pub raw_output: Vec<u8>,
|
|
pub max_output_tokens: Option<usize>,
|
|
pub process_id: Option<i32>,
|
|
pub exit_code: Option<i32>,
|
|
pub original_token_count: Option<usize>,
|
|
pub hook_command: Option<String>,
|
|
}
|
|
|
|
impl ToolOutput for ExecCommandToolOutput {
|
|
fn log_preview(&self) -> String {
|
|
telemetry_preview(&self.response_text())
|
|
}
|
|
|
|
fn success_for_logging(&self) -> bool {
|
|
true
|
|
}
|
|
|
|
fn to_response_item(&self, call_id: &str, payload: &ToolPayload) -> ResponseInputItem {
|
|
function_tool_response(
|
|
call_id,
|
|
payload,
|
|
vec![FunctionCallOutputContentItem::InputText {
|
|
text: self.response_text(),
|
|
}],
|
|
Some(true),
|
|
)
|
|
}
|
|
|
|
fn post_tool_use_id(&self, call_id: &str) -> String {
|
|
if self.event_call_id.is_empty() {
|
|
call_id.to_string()
|
|
} else {
|
|
self.event_call_id.clone()
|
|
}
|
|
}
|
|
|
|
fn post_tool_use_input(&self, _payload: &ToolPayload) -> Option<JsonValue> {
|
|
self.hook_command
|
|
.as_ref()
|
|
.map(|command| serde_json::json!({ "command": command }))
|
|
}
|
|
|
|
fn post_tool_use_response(&self, _call_id: &str, _payload: &ToolPayload) -> Option<JsonValue> {
|
|
if self.process_id.is_some() || self.hook_command.is_none() {
|
|
return None;
|
|
}
|
|
|
|
Some(JsonValue::String(self.truncated_output()))
|
|
}
|
|
|
|
fn code_mode_result(&self, _payload: &ToolPayload) -> JsonValue {
|
|
#[derive(Serialize)]
|
|
struct UnifiedExecCodeModeResult {
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
chunk_id: Option<String>,
|
|
wall_time_seconds: f64,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
exit_code: Option<i32>,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
session_id: Option<i32>,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
original_token_count: Option<usize>,
|
|
output: String,
|
|
}
|
|
|
|
let result = UnifiedExecCodeModeResult {
|
|
chunk_id: (!self.chunk_id.is_empty()).then(|| self.chunk_id.clone()),
|
|
wall_time_seconds: self.wall_time.as_secs_f64(),
|
|
exit_code: self.exit_code,
|
|
session_id: self.process_id,
|
|
original_token_count: self.original_token_count,
|
|
output: self.truncated_output(),
|
|
};
|
|
|
|
serde_json::to_value(result).unwrap_or_else(|err| {
|
|
JsonValue::String(format!("failed to serialize exec result: {err}"))
|
|
})
|
|
}
|
|
}
|
|
|
|
impl ExecCommandToolOutput {
|
|
pub(crate) fn truncated_output(&self) -> String {
|
|
let text = String::from_utf8_lossy(&self.raw_output).to_string();
|
|
let max_tokens = resolve_max_tokens(self.max_output_tokens);
|
|
formatted_truncate_text(&text, TruncationPolicy::Tokens(max_tokens))
|
|
}
|
|
|
|
fn response_text(&self) -> String {
|
|
let mut sections = Vec::new();
|
|
|
|
if !self.chunk_id.is_empty() {
|
|
sections.push(format!("Chunk ID: {}", self.chunk_id));
|
|
}
|
|
|
|
let wall_time_seconds = self.wall_time.as_secs_f64();
|
|
sections.push(format!("Wall time: {wall_time_seconds:.4} seconds"));
|
|
|
|
if let Some(exit_code) = self.exit_code {
|
|
sections.push(format!("Process exited with code {exit_code}"));
|
|
}
|
|
|
|
if let Some(process_id) = &self.process_id {
|
|
sections.push(format!("Process running with session ID {process_id}"));
|
|
}
|
|
|
|
if let Some(original_token_count) = self.original_token_count {
|
|
sections.push(format!("Original token count: {original_token_count}"));
|
|
}
|
|
|
|
sections.push("Output:".to_string());
|
|
sections.push(self.truncated_output());
|
|
|
|
sections.join("\n")
|
|
}
|
|
}
|
|
|
|
fn function_tool_response(
|
|
call_id: &str,
|
|
payload: &ToolPayload,
|
|
body: Vec<FunctionCallOutputContentItem>,
|
|
success: Option<bool>,
|
|
) -> ResponseInputItem {
|
|
let body = match body.as_slice() {
|
|
[FunctionCallOutputContentItem::InputText { text }] => {
|
|
FunctionCallOutputBody::Text(text.clone())
|
|
}
|
|
_ => FunctionCallOutputBody::ContentItems(body),
|
|
};
|
|
|
|
if matches!(payload, ToolPayload::Custom { .. }) {
|
|
return ResponseInputItem::CustomToolCallOutput {
|
|
call_id: call_id.to_string(),
|
|
name: None,
|
|
output: FunctionCallOutputPayload { body, success },
|
|
};
|
|
}
|
|
|
|
ResponseInputItem::FunctionCallOutput {
|
|
call_id: call_id.to_string(),
|
|
output: FunctionCallOutputPayload { body, success },
|
|
}
|
|
}
|
|
|
|
fn telemetry_preview(content: &str) -> String {
|
|
let truncated_slice = take_bytes_at_char_boundary(content, TELEMETRY_PREVIEW_MAX_BYTES);
|
|
let truncated_by_bytes = truncated_slice.len() < content.len();
|
|
|
|
let mut preview = String::new();
|
|
let mut lines_iter = truncated_slice.lines();
|
|
for idx in 0..TELEMETRY_PREVIEW_MAX_LINES {
|
|
match lines_iter.next() {
|
|
Some(line) => {
|
|
if idx > 0 {
|
|
preview.push('\n');
|
|
}
|
|
preview.push_str(line);
|
|
}
|
|
None => break,
|
|
}
|
|
}
|
|
let truncated_by_lines = lines_iter.next().is_some();
|
|
|
|
if !truncated_by_bytes && !truncated_by_lines {
|
|
return content.to_string();
|
|
}
|
|
|
|
if preview.len() < truncated_slice.len()
|
|
&& truncated_slice
|
|
.as_bytes()
|
|
.get(preview.len())
|
|
.is_some_and(|byte| *byte == b'\n')
|
|
{
|
|
preview.push('\n');
|
|
}
|
|
|
|
if !preview.is_empty() && !preview.ends_with('\n') {
|
|
preview.push('\n');
|
|
}
|
|
preview.push_str(TELEMETRY_PREVIEW_TRUNCATION_NOTICE);
|
|
|
|
preview
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "context_tests.rs"]
|
|
mod tests;
|