From 06e9f90387ef8877735fe196675d4d9b9cf09884 Mon Sep 17 00:00:00 2001
From: Thomas Obermueller <thomas@posthog.com>
Date: Mon, 18 May 2026 15:36:59 +0000
Subject: [PATCH] fix(sessions): show inline banner on cloud stream disconnect

When the cloud SSE stream gives up after exhausted reconnect attempts,
the task UI rendered a fullscreen error overlay on top of the already
populated ConversationView, hiding all cached events. The session data
was still in memory (and logs on disk), so the overlay was the only
thing blocking access to the conversation.

Plumb the existing `retryable` flag from CloudTaskErrorUpdate through
the session store onto AgentSession. When `hasError && errorRetryable
&& events.length > 0`, render a small red banner above the conversation
with the error title and a Retry button instead of the fullscreen
overlay. Hard errors (no events yet, non-retryable) keep the existing
overlay path.

Generated-By: PostHog Code
Task-Id: 0be36564-39e9-475b-8d1c-c74911ebecde
---
 .../sessions/components/SessionView.tsx       | 54 ++++++++++++++++++-
 .../sessions/hooks/useSessionViewState.ts     |  1 +
 .../features/sessions/service/service.ts      |  4 ++
 .../features/sessions/stores/sessionStore.ts  |  1 +
 .../task-detail/components/TaskLogsPanel.tsx  |  2 +
 5 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/apps/code/src/renderer/features/sessions/components/SessionView.tsx b/apps/code/src/renderer/features/sessions/components/SessionView.tsx
index b95675e7d..bdd446685 100644
--- a/apps/code/src/renderer/features/sessions/components/SessionView.tsx
+++ b/apps/code/src/renderer/features/sessions/components/SessionView.tsx
@@ -63,6 +63,7 @@ interface SessionViewProps {
   hasError?: boolean;
   errorTitle?: string;
   errorMessage?: string;
+  errorRetryable?: boolean;
   onRetry?: () => void;
   onNewSession?: () => void;
   isInitializing?: boolean;
@@ -78,6 +79,48 @@ interface SessionViewProps {
 const DEFAULT_ERROR_MESSAGE =
   "Failed to resume this session. The working directory may have been deleted. Please start a new session.";
 
+interface CloudStreamDisconnectedBannerProps {
+  errorTitle?: string;
+  errorMessage?: string;
+  onRetry?: () => void;
+}
+
+function CloudStreamDisconnectedBanner({
+  errorTitle,
+  errorMessage,
+  onRetry,
+}: CloudStreamDisconnectedBannerProps) {
+  return (
+    <Flex
+      align="center"
+      justify="between"
+      gap="3"
+      py="2"
+      px="3"
+      className="shrink-0 border-(--red-5) border-b bg-(--red-2)"
+    >
+      <Flex align="center" gap="2" className="min-w-0">
+        <Warning size={14} weight="duotone" color="var(--red-9)" />
+        {errorTitle && (
+          <Text className="shrink-0 font-medium text-(--red-12) text-[13px]">
+            {errorTitle}
+          </Text>
+        )}
+        {errorMessage && (
+          <Text color="gray" className="truncate text-[13px]">
+            {errorMessage}
+          </Text>
+        )}
+      </Flex>
+      {onRetry && (
+        <Button variant="soft" size="1" color="red" onClick={onRetry}>
+          Retry
+        </Button>
+      )}
+    </Flex>
+  );
+}
+
 /**
  * When an allow_always permission is granted outside a mode-switch prompt,
  * ratchet the session to the closest "auto-accept edits" preset offered by
@@ -116,6 +159,7 @@ export function SessionView({
   hasError = false,
   errorTitle,
   errorMessage = DEFAULT_ERROR_MESSAGE,
+  errorRetryable = false,
   onRetry,
   onNewSession,
   isInitializing = false,
@@ -137,6 +181,7 @@ export function SessionView({
   const currentModeId = modeOption?.currentValue;
   const handoffInProgress =
     useSessionForTask(taskId)?.handoffInProgress ?? false;
+  const showInlineBanner = hasError && errorRetryable && events.length > 0;
 
   useEffect(() => {
     if (allowBypassPermissions) return;
@@ -524,6 +569,13 @@ export function SessionView({
             ) : (
               <>
                 <DropZoneOverlay isVisible={isDraggingFile} />
+                {showInlineBanner && (
+                  <CloudStreamDisconnectedBanner
+                    errorTitle={errorTitle}
+                    errorMessage={errorMessage}
+                    onRetry={onRetry}
+                  />
+                )}
                 <ConversationView
                   events={events}
                   isPromptPending={isPromptPending}
@@ -537,7 +589,7 @@ export function SessionView({
 
                 <PlanStatusBar plan={latestPlan} />
 
-                {hasError ? (
+                {hasError && !showInlineBanner ? (
                   <Flex
                     align="center"
                     justify="center"
diff --git a/apps/code/src/renderer/features/sessions/hooks/useSessionViewState.ts b/apps/code/src/renderer/features/sessions/hooks/useSessionViewState.ts
index 19bbdf26c..976834e26 100644
--- a/apps/code/src/renderer/features/sessions/hooks/useSessionViewState.ts
+++ b/apps/code/src/renderer/features/sessions/hooks/useSessionViewState.ts
@@ -67,5 +67,6 @@ export function useSessionViewState(taskId: string, task: Task) {
     errorMessage:
       session?.errorMessage ??
       (isCloud ? session?.cloudErrorMessage : undefined),
+    errorRetryable: session?.errorRetryable,
   };
 }
diff --git a/apps/code/src/renderer/features/sessions/service/service.ts b/apps/code/src/renderer/features/sessions/service/service.ts
index bcfda3422..a927c20e9 100644
--- a/apps/code/src/renderer/features/sessions/service/service.ts
+++ b/apps/code/src/renderer/features/sessions/service/service.ts
@@ -3127,11 +3127,13 @@ export class SessionService {
 
     const previousErrorTitle = session.errorTitle;
     const previousErrorMessage = session.errorMessage;
+    const previousErrorRetryable = session.errorRetryable;
 
     sessionStoreSetters.updateSession(session.taskRunId, {
       status: "disconnected",
       errorTitle: undefined,
       errorMessage: undefined,
+      errorRetryable: undefined,
       isPromptPending: false,
     });
 
@@ -3145,6 +3147,7 @@ export class SessionService {
         status: "error",
         errorTitle: previousErrorTitle,
         errorMessage: previousErrorMessage,
+        errorRetryable: previousErrorRetryable,
       });
       throw error;
     }
@@ -3170,6 +3173,7 @@ export class SessionService {
         errorMessage:
           update.errorMessage ??
           "Lost connection to the cloud run. Retry to reconnect.",
+        errorRetryable: update.retryable,
         isPromptPending: false,
       });
       return;
diff --git a/apps/code/src/renderer/features/sessions/stores/sessionStore.ts b/apps/code/src/renderer/features/sessions/stores/sessionStore.ts
index 23257d7a7..ea39f9783 100644
--- a/apps/code/src/renderer/features/sessions/stores/sessionStore.ts
+++ b/apps/code/src/renderer/features/sessions/stores/sessionStore.ts
@@ -50,6 +50,7 @@ export interface AgentSession {
   status: "connecting" | "connected" | "disconnected" | "error";
   errorTitle?: string;
   errorMessage?: string;
+  errorRetryable?: boolean;
   isPromptPending: boolean;
   isCompacting: boolean;
   promptStartedAt: number | null;
diff --git a/apps/code/src/renderer/features/task-detail/components/TaskLogsPanel.tsx b/apps/code/src/renderer/features/task-detail/components/TaskLogsPanel.tsx
index 38ec43c01..d9254db4d 100644
--- a/apps/code/src/renderer/features/task-detail/components/TaskLogsPanel.tsx
+++ b/apps/code/src/renderer/features/task-detail/components/TaskLogsPanel.tsx
@@ -60,6 +60,7 @@ export function TaskLogsPanel({ taskId, task, hideInput }: TaskLogsPanelProps) {
     cloudStatus,
     errorTitle,
     errorMessage,
+    errorRetryable,
   } = useSessionViewState(taskId, task);
 
   useSessionConnection({
@@ -145,6 +146,7 @@ export function TaskLogsPanel({ taskId, task, hideInput }: TaskLogsPanelProps) {
               hasError={hasError}
               errorTitle={errorTitle}
               errorMessage={errorMessage ?? undefined}
+              errorRetryable={errorRetryable}
               hideInput={hideInput}
               onRetry={handleRetry}
               onNewSession={isCloud ? undefined : handleNewSession}