ship: iteration 3 — disable stale recovery actions

Author: arul28

apps/desktop/src/renderer/components/chat/AgentChatMessageList.tsx

@@ -2643,6 +2643,7 @@ function renderEvent(
     surfaceProfile?: ChatSurfaceProfile;
     assistantLabel?: string;
     turnActive?: boolean;
+    sessionTurnActive?: boolean;
     sessionEnded?: boolean;
     onOpenWorkspacePath?: (path: string | WorkspacePathLocation) => void;
     respondingApprovalIds?: Set<string>;
@@ -3687,7 +3688,7 @@ function renderEvent(
           {recovery ? (
             <ProviderFailureRecoveryCard
               recovery={recovery}
-              disabled={Boolean(options?.turnActive)}
+              disabled={Boolean(options?.sessionTurnActive)}
               onRetry={options?.onRetryProviderFailure
                 ? () => options.onRetryProviderFailure?.(event.turnId ?? null)
                 : undefined}
@@ -4167,6 +4168,7 @@ type EventRowProps = {
   surfaceProfile?: ChatSurfaceProfile;
   assistantLabel?: string;
   turnActive?: boolean;
+  sessionTurnActive?: boolean;
   sessionEnded?: boolean;
   isLatestWorkLog?: boolean;
   onOpenWorkspacePath?: (path: string | WorkspacePathLocation) => void;
@@ -4202,6 +4204,7 @@ const EventRow = React.memo(function EventRow({
   surfaceProfile = "standard",
   assistantLabel,
   turnActive,
+  sessionTurnActive,
   sessionEnded,
   isLatestWorkLog,
   onOpenWorkspacePath,
@@ -4272,6 +4275,7 @@ const EventRow = React.memo(function EventRow({
             surfaceProfile,
             assistantLabel,
             turnActive,
+            sessionTurnActive,
             sessionEnded,
             onOpenWorkspacePath,
             respondingApprovalIds,
@@ -4600,6 +4604,7 @@ function AgentChatMessageListMain({
     surfaceMode = "standard",
   surfaceProfile = "standard",
   assistantLabel,
+  sessionTurnActive = false,
   onOpenWorkspacePath,
   respondingApprovalIds,
   pendingApprovalIds,
@@ -4626,6 +4631,7 @@ function AgentChatMessageListMain({
   surfaceMode?: ChatSurfaceMode;
   surfaceProfile?: ChatSurfaceProfile;
   assistantLabel?: string;
+  sessionTurnActive?: boolean;
   onOpenWorkspacePath?: (path: string, laneId?: string | null) => void;
   onInsertDraft?: (text: string) => void;
   onRevealChatTerminal?: (terminal: { terminalId: string; ptyId: string; label: string }) => void;
@@ -5431,6 +5437,7 @@ function AgentChatMessageListMain({
           surfaceProfile={surfaceProfile}
           assistantLabel={assistantLabel}
           turnActive={rowTurnActive}
+          sessionTurnActive={sessionTurnActive}
           sessionEnded={sessionEnded}
           isLatestWorkLog={isLatestWorkLog}
           onOpenWorkspacePath={openWorkspacePath}
@@ -5469,6 +5476,7 @@ function AgentChatMessageListMain({
         surfaceProfile={surfaceProfile}
         assistantLabel={assistantLabel}
         turnActive={rowTurnActive}
+        sessionTurnActive={sessionTurnActive}
         sessionEnded={sessionEnded}
         isLatestWorkLog={isLatestWorkLog}
         onOpenWorkspacePath={openWorkspacePath}
@@ -5490,7 +5498,7 @@ function AgentChatMessageListMain({
         assistantTurnCopy={assistantTurnCopy}
       />
     );
-  }, [activeTurnId, anchoredRowKey, assistantLabel, assistantTurnCopyByRowKey, surfaceMode, surfaceProfile, groupedRows, latestWorkLogIndex, turnModelState, handleApproval, handleMeasure, openWorkspacePath, handleNavigateSuggestion, handleReviewChanges, onCodexRecovery, onRetryProviderFailure, onChooseProviderFailureModel, onInsertDraft, onRevealChatTerminal, onRewindFiles, turnDiffSummaries, respondingApprovalIds, pendingApprovalIds, resolvedInputStates, laneId, sessionId, sessionEnded, runtimeName, mosaic, scrollToRowKey]);
+  }, [activeTurnId, anchoredRowKey, assistantLabel, assistantTurnCopyByRowKey, surfaceMode, surfaceProfile, groupedRows, latestWorkLogIndex, turnModelState, handleApproval, handleMeasure, openWorkspacePath, handleNavigateSuggestion, handleReviewChanges, onCodexRecovery, onRetryProviderFailure, onChooseProviderFailureModel, onInsertDraft, onRevealChatTerminal, onRewindFiles, turnDiffSummaries, respondingApprovalIds, pendingApprovalIds, resolvedInputStates, laneId, sessionId, sessionTurnActive, sessionEnded, runtimeName, mosaic, scrollToRowKey]);
 
   // Compute the bottom spacer height for virtualized mode.
   const bottomSpacerHeight = useMemo(() => {

apps/desktop/src/renderer/components/chat/AgentChatPane.test.tsx

@@ -2656,7 +2656,43 @@ describe("AgentChatPane submit recovery", () => {
     await waitFor(() => expect(modelTrigger.getAttribute("aria-expanded")).toBe("true"));
     fireEvent.click(modelTrigger);
 
-    fireEvent.click(screen.getByRole("button", { name: "Retry turn" }));
+    const retryButton = screen.getByRole("button", { name: "Retry turn" }) as HTMLButtonElement;
+    const chooseModelButton = screen.getByRole("button", { name: "Choose model" }) as HTMLButtonElement;
+    act(() => {
+      emitChatEvent({
+        sessionId: session.sessionId,
+        timestamp: "2026-07-10T18:18:54.000Z",
+        sequence: 6,
+        event: { type: "status", turnStatus: "started", turnId: "turn-next" },
+      });
+    });
+    await waitFor(() => {
+      expect(retryButton.disabled).toBe(true);
+      expect(chooseModelButton.disabled).toBe(true);
+    });
+    fireEvent.click(retryButton);
+    expect(send).not.toHaveBeenCalled();
+
+    act(() => {
+      emitChatEvent({
+        sessionId: session.sessionId,
+        timestamp: "2026-07-10T18:18:55.000Z",
+        sequence: 7,
+        event: { type: "status", turnStatus: "completed", turnId: "turn-next" },
+      });
+      emitChatEvent({
+        sessionId: session.sessionId,
+        timestamp: "2026-07-10T18:18:55.001Z",
+        sequence: 8,
+        event: { type: "done", status: "completed", turnId: "turn-next", model: "gpt-5.4" },
+      });
+    });
+    await waitFor(() => {
+      expect(retryButton.disabled).toBe(false);
+      expect(chooseModelButton.disabled).toBe(false);
+    });
+
+    fireEvent.click(retryButton);
     await waitFor(() => {
       expect(send).toHaveBeenCalledWith(expect.objectContaining({
         sessionId: session.sessionId,
@@ -2670,8 +2706,8 @@ describe("AgentChatPane submit recovery", () => {
     act(() => {
       emitChatEvent({
         sessionId: session.sessionId,
-        timestamp: "2026-07-10T18:18:54.000Z",
-        sequence: 6,
+        timestamp: "2026-07-10T18:18:56.000Z",
+        sequence: 9,
         event: { type: "system_notice", noticeKind: "info", message: "Session metadata refreshed." },
       });
     });

apps/desktop/src/renderer/components/chat/AgentChatPane.tsx

@@ -11109,6 +11109,7 @@ export function AgentChatPane({
                         : subagentView
                           ? subagentTranscriptLoading || subagentViewSnapshot?.status === "running"
                           : turnActive && selectedSession?.status !== "ended"}
+                      sessionTurnActive={turnActive}
                       sessionEnded={selectedSession?.status === "ended"}
                       className="min-h-0 border-0"
                       surfaceMode={surfaceMode}
@@ -11143,7 +11144,7 @@ export function AgentChatPane({
                       onCodexRecovery={(args: AgentChatRecoverCodexTurnArgs) =>
                         window.ade.agentChat.recoverCodexTurn(args)}
                       onRetryProviderFailure={(failedTurnId) => {
-                        if (!selectedSessionId) return;
+                        if (!selectedSessionId || turnActive) return;
                         void resendLastUserMessage(selectedSessionId, failedTurnId);
                       }}
                       onChooseProviderFailureModel={() => {