fix: preserve command stream boundaries and lifecycle evidence

crates/worker/src/controller.rs

@@ -543,6 +543,9 @@ fn protocol_command_snapshot(snapshot: WorkdirCommandSnapshot) -> ProtocolComman
         command_id: snapshot.command_id,
         tool_call_id: snapshot.tool_call_id,
         status: protocol_command_status(snapshot.status),
+        started_at_ms: snapshot.started_at_ms,
+        observed_at_ms: snapshot.observed_at_ms,
+        last_output_at_ms: snapshot.last_output_at_ms,
         stdout: ProtocolCommandStreamSlice {
             start_offset: snapshot.stdout.start_offset,
             end_offset: snapshot.stdout.end_offset,
@@ -564,9 +567,11 @@ fn protocol_command_event(event: WorkdirCommandEvent) -> ProtocolCommandEvent {
         WorkdirCommandEvent::Started {
             command_id,
             tool_call_id,
+            observed_at_ms,
         } => ProtocolCommandEvent::Started {
             command_id,
             tool_call_id,
+            observed_at_ms,
         },
         WorkdirCommandEvent::Output {
             command_id,
@@ -574,6 +579,7 @@ fn protocol_command_event(event: WorkdirCommandEvent) -> ProtocolCommandEvent {
             start_offset,
             end_offset,
             content,
+            observed_at_ms,
         } => ProtocolCommandEvent::Output {
             command_id,
             stream: match stream {
@@ -583,15 +589,22 @@ fn protocol_command_event(event: WorkdirCommandEvent) -> ProtocolCommandEvent {
             start_offset,
             end_offset,
             content,
+            observed_at_ms,
         },
         WorkdirCommandEvent::Terminal {
             command_id,
             status,
             exit_code,
+            stdout_end_offset,
+            stderr_end_offset,
+            observed_at_ms,
         } => ProtocolCommandEvent::Terminal {
             command_id,
             status: protocol_command_status(status),
             exit_code,
+            stdout_end_offset,
+            stderr_end_offset,
+            observed_at_ms,
         },
     }
 }

crates/worker/src/in_flight.rs

@@ -245,6 +245,7 @@ impl InFlightInner {
             CommandEvent::Started {
                 command_id,
                 tool_call_id,
+                observed_at_ms,
             } => {
                 self.commands
                     .retain(|command| command.command_id != *command_id);
@@ -252,6 +253,9 @@ impl InFlightInner {
                     command_id: command_id.clone(),
                     tool_call_id: tool_call_id.clone(),
                     status: CommandStatus::Running,
+                    started_at_ms: *observed_at_ms,
+                    observed_at_ms: *observed_at_ms,
+                    last_output_at_ms: None,
                     stdout: CommandStreamSlice::default(),
                     stderr: CommandStreamSlice::default(),
                     exit_code: None,
@@ -263,6 +267,7 @@ impl InFlightInner {
                 start_offset,
                 end_offset,
                 content,
+                observed_at_ms,
             } => {
                 let command = match self
                     .commands
@@ -275,6 +280,9 @@ impl InFlightInner {
                             command_id: command_id.clone(),
                             tool_call_id: None,
                             status: CommandStatus::Running,
+                            started_at_ms: *observed_at_ms,
+                            observed_at_ms: *observed_at_ms,
+                            last_output_at_ms: Some(*observed_at_ms),
                             stdout: CommandStreamSlice::default(),
                             stderr: CommandStreamSlice::default(),
                             exit_code: None,
@@ -282,6 +290,8 @@ impl InFlightInner {
                         self.commands.last_mut().expect("command was inserted")
                     }
                 };
+                command.observed_at_ms = *observed_at_ms;
+                command.last_output_at_ms = Some(*observed_at_ms);
                 let target = match stream {
                     CommandStream::Stdout => &mut command.stdout,
                     CommandStream::Stderr => &mut command.stderr,
@@ -685,6 +695,7 @@ mod tests {
         in_flight.publish_command_event(CommandEvent::Started {
             command_id: "command-1".into(),
             tool_call_id: Some("tool-1".into()),
+            observed_at_ms: 100,
         });
         in_flight.publish_command_event(CommandEvent::Output {
             command_id: "command-1".into(),
@@ -692,6 +703,7 @@ mod tests {
             start_offset: 0,
             end_offset: 5,
             content: "ready".into(),
+            observed_at_ms: 110,
         });
 
         let guard = in_flight.snapshot_guard();
@@ -718,6 +730,9 @@ mod tests {
             command_id: "command-1".into(),
             status: CommandStatus::TimedOut,
             exit_code: None,
+            stdout_end_offset: 5,
+            stderr_end_offset: 0,
+            observed_at_ms: 200,
         });
         let guard = in_flight.snapshot_guard();
         assert!(snapshot_from_guard(&guard).commands.is_empty());

crates/worker/tests/controller_test.rs

@@ -291,6 +291,7 @@ async fn controller_projects_workdir_command_events_and_snapshot_state() {
                     protocol::CommandEvent::Started {
                         command_id,
                         tool_call_id,
+                        ..
                     },
             } => {
                 assert_eq!(command_id, command.0);
@@ -330,6 +331,7 @@ async fn controller_projects_workdir_command_events_and_snapshot_state() {
                     command_id,
                     status: protocol::CommandStatus::Completed,
                     exit_code: Some(0),
+                    ..
                 }
             } if command_id == &command.0
         )