fix: harden windows runtime recovery paths

Author: pallyoung

apps/server/src/services/agent.rs

@@ -7,6 +7,7 @@ const DEFAULT_PTY_ROWS: u16 = 30;
 struct AgentLifecycleFallbackState {
     emitted_tool_started: bool,
     emitted_turn_completed: bool,
+    claude_session_id: Option<String>,
 }
 
 fn initial_pty_size(cols: Option<u16>, rows: Option<u16>) -> PtySize {
@@ -21,29 +22,40 @@ fn initial_pty_size(cols: Option<u16>, rows: Option<u16>) -> PtySize {
 fn fallback_agent_lifecycle_from_output(
     state: &mut AgentLifecycleFallbackState,
     text: &str,
-) -> Option<(&'static str, &'static str, &'static str)> {
+) -> Option<(&'static str, &'static str, String)> {
     if state.emitted_tool_started || text.trim().is_empty() {
         return None;
     }
     state.emitted_tool_started = true;
-    Some((
-        "tool_started",
-        "AgentProcessOutput",
-        r#"{"source":"agent_process_output"}"#,
-    ))
+    let data = state
+        .claude_session_id
+        .as_deref()
+        .map(|session_id| {
+            json!({
+                "source": "agent_process_output",
+                "session_id": session_id,
+            })
+        })
+        .unwrap_or_else(|| {
+            json!({
+                "source": "agent_process_output",
+            })
+        })
+        .to_string();
+    Some(("tool_started", "AgentProcessOutput", data))
 }
 
 fn fallback_agent_lifecycle_from_exit(
     state: &mut AgentLifecycleFallbackState,
-) -> Option<(&'static str, &'static str, &'static str)> {
+) -> Option<(&'static str, &'static str, String)> {
     if state.emitted_turn_completed || !state.emitted_tool_started {
         return None;
     }
     state.emitted_turn_completed = true;
     Some((
         "turn_completed",
         "AgentProcessExit",
-        r#"{"source":"agent_process_exit"}"#,
+        r#"{"source":"agent_process_exit"}"#.to_string(),
     ))
 }
 
@@ -237,7 +249,10 @@ pub(crate) fn agent_start(
     let workspace_id_out = workspace_id.clone();
     let session_out = session_id.clone();
     let session_out_num = session_id_num;
-    let lifecycle_fallback_state = Arc::new(Mutex::new(AgentLifecycleFallbackState::default()));
+    let lifecycle_fallback_state = Arc::new(Mutex::new(AgentLifecycleFallbackState {
+        claude_session_id: effective_claude_session_id.clone(),
+        ..Default::default()
+    }));
     let app_handle = app.clone();
     let state_handle = app.clone();
     let lifecycle_fallback_state_out = lifecycle_fallback_state.clone();
@@ -262,7 +277,7 @@ pub(crate) fn agent_start(
                                 &session_out,
                                 kind,
                                 source_event,
-                                data,
+                                &data,
                             );
                         }
                     }
@@ -298,7 +313,7 @@ pub(crate) fn agent_start(
                     &session_id,
                     kind,
                     source_event,
-                    data,
+                    &data,
                 );
             }
         }
@@ -451,7 +466,7 @@ mod tests {
             Some((
                 "tool_started",
                 "AgentProcessOutput",
-                r#"{"source":"agent_process_output"}"#,
+                r#"{"source":"agent_process_output"}"#.to_string(),
             )),
         );
         assert_eq!(
@@ -460,6 +475,24 @@ mod tests {
         );
     }
 
+    #[test]
+    fn fallback_agent_lifecycle_carries_known_claude_session_id() {
+        let mut state = AgentLifecycleFallbackState {
+            claude_session_id: Some("claude-resume-known".to_string()),
+            ..Default::default()
+        };
+
+        assert_eq!(
+            fallback_agent_lifecycle_from_output(&mut state, "fixture-running\n"),
+            Some((
+                "tool_started",
+                "AgentProcessOutput",
+                r#"{"session_id":"claude-resume-known","source":"agent_process_output"}"#
+                    .to_string(),
+            )),
+        );
+    }
+
     #[test]
     fn fallback_agent_lifecycle_only_emits_completion_after_output_started() {
         let mut state = AgentLifecycleFallbackState::default();
@@ -471,7 +504,7 @@ mod tests {
             Some((
                 "turn_completed",
                 "AgentProcessExit",
-                r#"{"source":"agent_process_exit"}"#,
+                r#"{"source":"agent_process_exit"}"#.to_string(),
             )),
         );
         assert_eq!(fallback_agent_lifecycle_from_exit(&mut state), None);

apps/web/src/features/workspace/WorkspaceScreen.tsx

@@ -265,6 +265,7 @@ const REQUIRED_RUNTIME_COMMANDS = [
   id: RuntimeRequirementStatus["id"];
   command: string;
 }>;
+const ROUTE_RUNTIME_ATTACH_RECOVERY_DELAYS_MS = [0, 1_000, 3_000, 7_000] as const;
 
 type RuntimeRequirementSpec = {
   id: RuntimeRequirementStatus["id"];
@@ -768,11 +769,15 @@ export default function WorkspaceScreen({ locale, appSettings, onOpenSettings }:
           });
         }
         attachRouteRuntime();
-        const timer = window.setTimeout(attachRouteRuntime, 1000);
+        const timers = ROUTE_RUNTIME_ATTACH_RECOVERY_DELAYS_MS
+          .filter((delayMs) => delayMs > 0)
+          .map((delayMs) => window.setTimeout(attachRouteRuntime, delayMs));
         void ensureWorkspaceTerminal(routeWorkspaceId);
         return () => {
           cancelled = true;
-          window.clearTimeout(timer);
+          timers.forEach((timer) => {
+            window.clearTimeout(timer);
+          });
         };
       }
 
@@ -796,6 +801,21 @@ export default function WorkspaceScreen({ locale, appSettings, onOpenSettings }:
           return;
         }
         if (!runtimeSnapshot) {
+          const snapshot = await withServiceFallback(() => getWorkspaceSnapshot(routeWorkspaceId), null);
+          if (cancelled || !isWorkspaceSyncVersionCurrent(routeWorkspaceId, syncVersion)) {
+            return;
+          }
+          if (snapshot) {
+            updateState((current) => upsertWorkspaceSnapshot(
+              current,
+              snapshot,
+              locale,
+              appSettings,
+              uiState,
+            ));
+            void ensureWorkspaceTerminal(routeWorkspaceId);
+            return;
+          }
           navigate("/workspace", { replace: true });
           return;
         }