add timed out message back in to shell output

Author: dylan-hurd-oai

codex-rs/core/src/tools/mod.rs

@@ -70,9 +70,19 @@ pub fn format_exec_output_for_model_freeform(
     // round to 1 decimal place
     let duration_seconds = ((exec_output.duration.as_secs_f32()) * 10.0).round() / 10.0;
 
-    let total_lines = exec_output.aggregated_output.text.lines().count();
+    let content = 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()
+    };
+
+    let total_lines = content.lines().count();
 
-    let formatted_output = truncate_text(&exec_output.aggregated_output.text, truncation_policy);
+    let formatted_output = truncate_text(&content, truncation_policy);
 
     let mut sections = Vec::new();
 

codex-rs/core/tests/suite/shell_command.rs

@@ -219,7 +219,7 @@ async fn shell_command_times_out_with_timeout_ms() -> anyhow::Result<()> {
         .replace('\r', "\n")
         .trim_end_matches('\n')
         .to_string();
-    let expected_pattern = r"(?s)^Exit code: 124\nWall time: [0-9]+(?:\.[0-9]+)? seconds\nOutput:(?:\ncommand timed out after [0-9]+ milliseconds)?\n?$";
+    let expected_pattern = r"(?s)^Exit code: 124\nWall time: [0-9]+(?:\.[0-9]+)? seconds\nOutput:\ncommand timed out after [0-9]+ milliseconds\n?$";
     assert_regex_match(expected_pattern, &normalized_output);
 
     Ok(())