fix: properly recover from idle kill (#1758)

Author: jonathanlab

apps/code/src/renderer/features/sessions/hooks/useSessionConnection.ts

@@ -4,11 +4,14 @@ import { trpcClient } from "@renderer/trpc/client";
 import type { Task } from "@shared/types";
 import { getCloudUrlFromRegion } from "@shared/utils/urls";
 import { useQueryClient } from "@tanstack/react-query";
+import { logger } from "@utils/logger";
 import { useEffect } from "react";
 import { getSessionService } from "../service/service";
-import type { AgentSession } from "../stores/sessionStore";
+import { type AgentSession, sessionStoreSetters } from "../stores/sessionStore";
 import { useChatTitleGenerator } from "./useChatTitleGenerator";
 
+const log = logger.scope("session-connection");
+
 const connectingTasks = new Set<string>();
 const activityRecorded = new Set<string>();
 
@@ -112,6 +115,27 @@ export function useSessionConnection({
     if (isCloud) return;
     if (isSuspended) return;
 
+    if (session?.status === "error" && session?.idleKilled) {
+      const taskRunId = session.taskRunId;
+      connectingTasks.add(taskId);
+      getSessionService()
+        .clearSessionError(taskId, repoPath)
+        .catch((error) => {
+          log.error("Auto-reconnect after idle kill failed", error);
+          sessionStoreSetters.updateSession(taskRunId, {
+            idleKilled: false,
+            errorMessage:
+              "Session disconnected due to inactivity. Click Retry to reconnect.",
+          });
+        })
+        .finally(() => {
+          connectingTasks.delete(taskId);
+        });
+      return () => {
+        connectingTasks.delete(taskId);
+      };
+    }
+
     if (
       session?.status === "connected" ||
       session?.status === "connecting" ||

apps/code/src/renderer/features/sessions/hooks/useSessionViewState.ts

@@ -17,7 +17,7 @@ export function useSessionViewState(taskId: string, task: Task) {
     (!cloudStatus || cloudStatus === "queued" || cloudStatus === "in_progress");
   const isCloudRunTerminal = isCloud && !isCloudRunNotTerminal;
 
-  const hasError = session?.status === "error";
+  const hasError = session?.status === "error" && !session?.idleKilled;
   const isRunning = isCloud ? !hasError : session?.status === "connected";
 
   const events = session?.events ?? [];

apps/code/src/renderer/features/sessions/service/service.ts

@@ -585,11 +585,11 @@ export class SessionService {
     this.unsubscribeFromChannel(taskRunId);
     sessionStoreSetters.updateSession(taskRunId, {
       status: "error",
-      errorMessage:
-        "Session disconnected due to inactivity. Click Retry to reconnect.",
+      errorMessage: "Session disconnected due to inactivity. Reconnecting…",
       isPromptPending: false,
       isCompacting: false,
       promptStartedAt: null,
+      idleKilled: true,
     });
   }
 

apps/code/src/renderer/features/sessions/stores/sessionStore.ts

@@ -78,6 +78,7 @@ export interface AgentSession {
   contextSize?: number;
   /** Pre-computed conversation summary for commit/PR generation context */
   conversationSummary?: string;
+  idleKilled?: boolean;
 }
 
 // --- Config Option Helpers ---