mirror of
https://github.com/openai/codex.git
synced 2026-11-17 14:58:36 +00:00
Keep unified exec output collection bounded (#32150)
## Why Unified exec can drain process output multiple times while waiting for a command. Collecting those drains into an uncapped buffer allows large commands to exceed the output collection limit. ## What changed - Accumulate drained output through the capped head/tail buffer so collection remains bounded while preserving the beginning and end of the stream. - Include a `... N bytes omitted ...` marker when the collection cap drops output. - Calculate the original token estimate from all observed bytes and preserve omission metadata through truncation and sandbox-denial responses. ## Testing - Cover repeated drains, previously omitted output, omission markers, and large-output summaries. GitOrigin-RevId: c6e2efeb875ed8f35914365eab7431f25fd3484c
This commit is contained in:
1 parent
54c44b9ed4
commit
6138909d6e
13 files changed
+413
-121
No files matched your search
@@ -434,6 +434,7 @@ fn exec_command_tool_output_formats_truncated_response() {
|
||||
process_id: None,
|
||||
exit_code: Some(0),
|
||||
original_token_count: Some(10),
|
||||
output_omitted_bytes: None,
|
||||
hook_command: None,
|
||||
}
|
||||
.to_response_item("call-42", &payload);
|
||||
@@ -461,3 +462,42 @@ fn exec_command_tool_output_formats_truncated_response() {
|
||||
other => panic!("expected FunctionCallOutput, got {other:?}"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn exec_command_tool_output_preserves_omission_metadata_when_truncated() {
|
||||
let payload = ToolPayload::Function {
|
||||
arguments: "{}".to_string(),
|
||||
};
|
||||
let marker = format_output_omission_marker(/*omitted_bytes*/ 123_456);
|
||||
let raw_output = format!(
|
||||
"HEAD-{}\n{marker}\nTAIL-{}",
|
||||
"a".repeat(/*n*/ 100),
|
||||
"z".repeat(/*n*/ 100)
|
||||
)
|
||||
.into_bytes();
|
||||
let response = ExecCommandToolOutput {
|
||||
event_call_id: "call-omitted".to_string(),
|
||||
chunk_id: "abc123".to_string(),
|
||||
wall_time: std::time::Duration::from_millis(/*millis*/ 1250),
|
||||
raw_output,
|
||||
truncation_policy: TruncationPolicy::Tokens(10_000),
|
||||
max_output_tokens: Some(4),
|
||||
process_id: None,
|
||||
exit_code: Some(0),
|
||||
original_token_count: Some(42_000),
|
||||
output_omitted_bytes: NonZeroUsize::new(/*n*/ 123_456),
|
||||
hook_command: None,
|
||||
}
|
||||
.to_response_item("call-omitted", &payload);
|
||||
|
||||
let ResponseInputItem::FunctionCallOutput { output, .. } = response else {
|
||||
panic!("expected FunctionCallOutput");
|
||||
};
|
||||
let text = output
|
||||
.body
|
||||
.to_text()
|
||||
.expect("exec output should serialize as text");
|
||||
assert!(text.contains("Original token count: 42000"));
|
||||
assert!(text.contains("Warning: truncated output (original token count: 42000)"));
|
||||
assert_eq!(text.matches(&marker).count(), 1);
|
||||
}
|
||||
Reference in new issue
Block a user