Support negotiated server-side truncation in Code Mode clients (#58125)

## Why

Host-side truncation can bound Code Mode output before it crosses the transport, including script errors that would otherwise exceed the frame limit.

## What changed

- Negotiate server-side output truncation for stdio and gRPC sessions, with client-side fallback for older hosts.
- Forward output budgets for execution, waiting, and termination when server-side truncation is selected. Avoid truncating host-formatted output or appending script errors a second time.
- Preserve the negotiated mode across reconnects and reject hosts that cannot maintain it.

## Testing

Add transport and integration coverage for output budgets, oversized script errors, reconnect compatibility, and preservation of output-limit notices with a zero-token budget.

GitOrigin-RevId: 2075101e4845eca64f45491c27a3b326788645c8
This commit is contained in:
Sean Huang
2026-10-29 16:57:12 +00:00
committed by copyberry
parent 3062f7aa4a
commit 09db085f94
21 changed files with 751 additions and 154 deletions
@@ -165,6 +165,7 @@ impl CodeModeExecuteHandler {
&step_context.settings.model_info,
response,
args.max_output_tokens,
exec.session.services.code_mode_service.output_truncation(),
wall_time,
exec.turn.config.code_mode.experimental_show_cell_overhead,
))
+18 -7
View File
@@ -15,6 +15,7 @@ use std::time::Duration;
use codex_code_mode::CellId;
use codex_code_mode::CodeModeNestedToolCall;
use codex_code_mode::CodeModeOutputTruncation;
use codex_code_mode::CodeModeSession;
use codex_code_mode::CodeModeSessionProvider;
use codex_code_mode::CodeModeToolKind;
@@ -126,6 +127,13 @@ impl CodeModeService {
Arc::clone(&self.session_provider)
}
fn output_truncation(&self) -> CodeModeOutputTruncation {
self.session
.get()
.map(|session| session.output_truncation())
.unwrap_or_default()
}
pub(crate) async fn execute(
&self,
mut request: codex_code_mode::ExecuteRequest,
@@ -155,9 +163,9 @@ impl CodeModeService {
pub(crate) async fn terminate(
&self,
cell_id: CellId,
request: codex_code_mode::TerminateRequest,
) -> Result<codex_code_mode::WaitOutcome, String> {
self.session().await?.terminate(cell_id.into()).await
self.session().await?.terminate(request).await
}
pub(crate) async fn interrupt_active_cells(&self) {
@@ -263,6 +271,7 @@ fn handle_runtime_response(
model_info: &codex_protocol::openai_models::ModelInfo,
response: RuntimeResponse,
max_output_tokens: Option<usize>,
output_truncation: CodeModeOutputTruncation,
wall_time: Duration,
experimental_show_cell_overhead: bool,
) -> CodeModeToolOutput {
@@ -284,12 +293,14 @@ fn handle_runtime_response(
let mut content_items = into_function_call_output_content_items(content_items);
sanitize_image_detail_items(supports_original, &mut content_items);
let success = error_text.is_none();
if let Some(error_text) = error_text {
content_items.push(FunctionCallOutputContentItem::InputText {
text: format!("Script error:\n{error_text}"),
});
if output_truncation == CodeModeOutputTruncation::Client {
if let Some(error_text) = error_text {
content_items.push(FunctionCallOutputContentItem::InputText {
text: format!("Script error:\n{error_text}"),
});
}
content_items = truncate_code_mode_result(content_items, max_output_tokens);
}
content_items = truncate_code_mode_result(content_items, max_output_tokens);
CodeModeToolOutput::new(
FunctionToolOutput::from_content(content_items, Some(success)),
script_status,
@@ -130,7 +130,10 @@ impl CodeModeWaitHandler {
exec.session
.services
.code_mode_service
.terminate(cell_id.clone())
.terminate(codex_code_mode::TerminateRequest {
cell_id: cell_id.clone(),
max_output_tokens: args.max_tokens,
})
.await
} else {
exec.session
@@ -140,7 +143,7 @@ impl CodeModeWaitHandler {
codex_code_mode::WaitRequest {
cell_id: cell_id.clone(),
yield_time_ms: args.yield_time_ms,
max_output_tokens: None,
max_output_tokens: args.max_tokens,
},
step_context.preempt.clone(),
)
@@ -208,6 +211,7 @@ impl CodeModeWaitHandler {
&step_context.settings.model_info,
wait_response.into(),
args.max_tokens,
exec.session.services.code_mode_service.output_truncation(),
wall_time,
exec.turn.config.code_mode.experimental_show_cell_overhead,
)))