fix: stabilize session title and recovery replay

pallyoung · pallyoung · commit b57fde576634 · 2026-03-28T23:36:02.000+08:00
diff --git a/apps/server/src/services/agent.rs b/apps/server/src/services/agent.rs
@@ -3,6 +3,12 @@ use crate::*;
 const DEFAULT_PTY_COLS: u16 = 120;
 const DEFAULT_PTY_ROWS: u16 = 30;
 
+#[derive(Default)]
+struct AgentLifecycleFallbackState {
+    emitted_tool_started: bool,
+    emitted_turn_completed: bool,
+}
+
 fn initial_pty_size(cols: Option<u16>, rows: Option<u16>) -> PtySize {
     PtySize {
         rows: rows.filter(|value| *value > 0).unwrap_or(DEFAULT_PTY_ROWS),
@@ -12,6 +18,27 @@ 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)> {
+    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"}"#))
+}
+
+fn fallback_agent_lifecycle_from_exit(
+    state: &mut AgentLifecycleFallbackState,
+) -> Option<(&'static str, &'static str, &'static str)> {
+    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"}"#))
+}
+
 fn terminate_agent_runtime(runtime: Arc<AgentRuntime>) {
     if let Ok(mut writer) = runtime.writer.lock() {
         *writer = None;
@@ -202,8 +229,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 app_handle = app.clone();
     let state_handle = app.clone();
+    let lifecycle_fallback_state_out = lifecycle_fallback_state.clone();
     std::thread::spawn(move || {
         let mut reader = reader;
         let mut buf = [0u8; 4096];
@@ -215,6 +244,20 @@ pub(crate) fn agent_start(
                     if text.is_empty() {
                         continue;
                     }
+                    if let Ok(mut lifecycle_state) = lifecycle_fallback_state_out.lock() {
+                        if let Some((kind, source_event, data)) =
+                            fallback_agent_lifecycle_from_output(&mut lifecycle_state, &text)
+                        {
+                            emit_agent_lifecycle(
+                                &app_handle,
+                                &workspace_id_out,
+                                &session_out,
+                                kind,
+                                source_event,
+                                data,
+                            );
+                        }
+                    }
                     emit_agent(
                         &app_handle,
                         &workspace_id_out,
@@ -232,10 +275,25 @@ pub(crate) fn agent_start(
 
     let app_handle = app.clone();
     let state_handle = app.clone();
+    let lifecycle_fallback_state_out = lifecycle_fallback_state.clone();
     std::thread::spawn(move || {
         if let Ok(mut child) = runtime.child.lock() {
             let _ = child.wait();
         }
+        if let Ok(mut lifecycle_state) = lifecycle_fallback_state_out.lock() {
+            if let Some((kind, source_event, data)) =
+                fallback_agent_lifecycle_from_exit(&mut lifecycle_state)
+            {
+                emit_agent_lifecycle(
+                    &app_handle,
+                    &workspace_id,
+                    &session_id,
+                    kind,
+                    source_event,
+                    data,
+                );
+            }
+        }
         emit_agent(&app_handle, &workspace_id, &session_id, "exit", "exited");
         let state: State<AppState> = state_handle.state();
         let should_mark_idle = if let Ok(mut agents) = state.agents.lock() {
@@ -256,6 +314,43 @@ pub(crate) fn agent_start(
     Ok(AgentStartResult { started: true })
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn fallback_agent_lifecycle_marks_first_output_as_tool_started_once() {
+        let mut state = AgentLifecycleFallbackState::default();
+
+        assert_eq!(
+            fallback_agent_lifecycle_from_output(&mut state, "fixture-running\n"),
+            Some((
+                "tool_started",
+                "AgentProcessOutput",
+                r#"{"source":"agent_process_output"}"#,
+            )),
+        );
+        assert_eq!(fallback_agent_lifecycle_from_output(&mut state, "fixture-still-running\n"), None);
+    }
+
+    #[test]
+    fn fallback_agent_lifecycle_only_emits_completion_after_output_started() {
+        let mut state = AgentLifecycleFallbackState::default();
+        assert_eq!(fallback_agent_lifecycle_from_exit(&mut state), None);
+
+        let _ = fallback_agent_lifecycle_from_output(&mut state, "fixture-running\n");
+        assert_eq!(
+            fallback_agent_lifecycle_from_exit(&mut state),
+            Some((
+                "turn_completed",
+                "AgentProcessExit",
+                r#"{"source":"agent_process_exit"}"#,
+            )),
+        );
+        assert_eq!(fallback_agent_lifecycle_from_exit(&mut state), None);
+    }
+}
+
 pub(crate) fn agent_send(
     workspace_id: String,
     session_id: String,
diff --git a/apps/web/src/features/agents/agent-runtime-actions.ts b/apps/web/src/features/agents/agent-runtime-actions.ts
@@ -344,6 +344,43 @@ export const commitAgentSessionTitle = ({
   return title;
 };
 
+type PreviewAgentSessionTitleArgs = {
+  tabId: string;
+  sessionId: string;
+  rawInput: string;
+  locale: Locale;
+  t: Translator;
+  updateTab: UpdateTab;
+};
+
+export const previewAgentSessionTitle = ({
+  tabId,
+  sessionId,
+  rawInput,
+  locale,
+  t,
+  updateTab,
+}: PreviewAgentSessionTitleArgs): string | null => {
+  const title = sessionTitleFromInput(rawInput);
+  if (!title) return null;
+
+  let applied = false;
+  updateTab(tabId, (tab) => ({
+    ...tab,
+    sessions: tab.sessions.map((session) => {
+      if (session.id !== sessionId) return session;
+      const canReplace = session.isDraft
+        || session.title === t("draftSessionTitle")
+        || isGeneratedSessionTitleForId(session.title, session.id);
+      if (!canReplace) return session;
+      applied = true;
+      return { ...session, title };
+    }),
+  }));
+
+  return applied ? title : null;
+};
+
 export const noteAgentStartupEvent = (
   refs: AgentRuntimeRefs,
   tabId: string,
diff --git a/apps/web/src/features/agents/index.ts b/apps/web/src/features/agents/index.ts
@@ -15,6 +15,7 @@ export {
   markAgentRuntimeStarted,
   noteAgentStartupEvent,
   noteAgentStartupLifecycle,
+  previewAgentSessionTitle,
   setAgentTerminalRef,
   setDraftPromptInputRef,
   syncAgentPaneSize,
diff --git a/apps/web/src/features/workspace/WorkspaceScreen.tsx b/apps/web/src/features/workspace/WorkspaceScreen.tsx
@@ -58,6 +58,7 @@ import {
   fitAgentTerminals,
   isAgentRuntimeRunning,
   markAgentRuntimeStarted,
+  previewAgentSessionTitle,
   setAgentTerminalRef,
   setDraftPromptInputRef,
   syncAgentPaneSize,
@@ -409,6 +410,10 @@ export default function WorkspaceScreen({ locale, appSettings, onOpenSettings }:
   const [slashSkillItems, setSlashSkillItems] = useState<ClaudeSlashSkillEntry[]>([]);
   const [bootstrapReady, setBootstrapReady] = useState(false);
   const [controllerActionBusy, setControllerActionBusy] = useState<"takeover" | "reject" | null>(null);
+  const [agentRecoveryBusy, setAgentRecoveryBusy] = useState<{
+    sessionId: string;
+    kind: "resume" | "restart";
+  } | null>(null);
   const [optimisticTakeoverWorkspaceId, setOptimisticTakeoverWorkspaceId] = useState<string | null>(null);
   const t = useMemo(() => createTranslator(locale), [locale]);
   const deviceId = useMemo(() => getOrCreateDeviceId(), []);
@@ -1697,10 +1702,22 @@ export default function WorkspaceScreen({ locale, appSettings, onOpenSettings }:
   const onRecoverActiveSession = async () => {
     const currentTab = stateRef.current.tabs.find((tab) => tab.id === activeTab.id) ?? activeTab;
     const session = currentTab.sessions.find((item) => item.id === activePaneSession.id) ?? activePaneSession;
-    const started = await agentStartMaybe(currentTab, session, currentTab.activePaneId);
-    if (!started) return;
-    if (started.started && started.startupToken !== null) {
-      await waitForAgentStartupDrain(agentRuntimeRefs, currentTab.id, session.id, started.startupToken);
+    const recoveryAction = resolveAgentRecoveryAction(currentTab.controller, session);
+    if (!recoveryAction) return;
+    setAgentRecoveryBusy({
+      sessionId: session.id,
+      kind: recoveryAction.kind,
+    });
+    try {
+      const started = await agentStartMaybe(currentTab, session, currentTab.activePaneId);
+      if (!started) return;
+      if (started.started && started.startupToken !== null) {
+        await waitForAgentStartupDrain(agentRuntimeRefs, currentTab.id, session.id, started.startupToken);
+      }
+    } finally {
+      setAgentRecoveryBusy((current) => (
+        current?.sessionId === session.id ? null : current
+      ));
     }
   };
 
@@ -2226,13 +2243,30 @@ export default function WorkspaceScreen({ locale, appSettings, onOpenSettings }:
 
   const onSubmitDraftPrompt = async (paneId: string, submittedValue?: string) => {
     if (!guardWorkspaceMutation("agent_input")) return;
+    const activeTabSnapshot = stateRef.current.tabs.find((tab) => tab.id === stateRef.current.activeTabId);
+    const paneSessionId = activeTabSnapshot
+      ? (findPaneSessionId(activeTabSnapshot.paneLayout, paneId) ?? activeTabSnapshot.activeSessionId)
+      : null;
+    const currentSessionSnapshot = paneSessionId && activeTabSnapshot
+      ? activeTabSnapshot.sessions.find((session) => session.id === paneSessionId) ?? null
+      : null;
     const content = (
       submittedValue
       ?? draftPromptInputRefs.current.get(paneId)?.value
       ?? draftPromptInputs[paneId]
       ?? ""
     ).trim();
     if (!content) return;
+    if (activeTabSnapshot && currentSessionSnapshot) {
+      previewAgentSessionTitle({
+        tabId: activeTabSnapshot.id,
+        sessionId: currentSessionSnapshot.id,
+        rawInput: content,
+        locale,
+        t,
+        updateTab,
+      });
+    }
     setDraftPromptInputs((current) => ({
       ...current,
       [paneId]: ""
@@ -2496,6 +2530,10 @@ export default function WorkspaceScreen({ locale, appSettings, onOpenSettings }:
     ? (hasTerminalOutput ? "live" : "steady")
     : "idle";
   const agentRecoveryAction = resolveAgentRecoveryAction(activeTab.controller, isArchiveView ? null : activePaneSession);
+  const activeAgentRecoveryBusy = !isArchiveView && agentRecoveryBusy?.sessionId === activePaneSession.id
+    ? agentRecoveryBusy
+    : null;
+  const visibleAgentRecoveryAction = agentRecoveryAction ?? activeAgentRecoveryBusy;
   const terminalRecoveryAction = resolveTerminalRecoveryAction(activeTab.controller, activeTerminal);
   const workspaceStatusBanner = isObserverMode ? (
     <div
@@ -2549,17 +2587,17 @@ export default function WorkspaceScreen({ locale, appSettings, onOpenSettings }:
         </button>
       </div>
     </div>
-  ) : (agentRecoveryAction || terminalRecoveryAction) ? (
+  ) : (visibleAgentRecoveryAction || terminalRecoveryAction) ? (
     <>
-      {agentRecoveryAction && (
+      {visibleAgentRecoveryAction && (
         <div
           className="workspace-status-banner recovery"
           data-testid="workspace-agent-recovery-banner"
         >
           <div className="workspace-status-banner-copy">
             <span className="workspace-status-banner-title">{t("workspaceAgentRecoveryTitle")}</span>
             <span className="workspace-status-banner-text">
-              {agentRecoveryAction.kind === "resume"
+              {visibleAgentRecoveryAction.kind === "resume"
                 ? t("workspaceAgentResumeBody")
                 : t("workspaceAgentRestartBody")}
             </span>
@@ -2572,9 +2610,9 @@ export default function WorkspaceScreen({ locale, appSettings, onOpenSettings }:
               onClick={() => {
                 void onRecoverActiveSession();
               }}
-              disabled={controllerActionBusy !== null}
+              disabled={controllerActionBusy !== null || activeAgentRecoveryBusy !== null}
             >
-              {agentRecoveryAction.kind === "resume"
+              {visibleAgentRecoveryAction.kind === "resume"
                 ? t("workspaceAgentResumeAction")
                 : t("workspaceAgentRestartAction")}
             </button>
diff --git a/tests/agent-session-title.test.ts b/tests/agent-session-title.test.ts
