review fixes

Author: charlesvien

apps/code/src/main/services/agent/service.ts

@@ -821,6 +821,7 @@ export class AgentService extends TypedEventEmitter<AgentServiceEvents> {
       };
 
       this.sessions.set(taskRunId, session);
+      this.recordActivity(taskRunId);
       if (isRetry) {
         log.info("Session created after auth retry", { taskRunId });
       }

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

@@ -127,11 +127,10 @@ export class SessionService {
     this.idleKilledSubscription =
       trpcVanilla.agent.onSessionIdleKilled.subscribe(undefined, {
         onData: (event) => {
-          const { taskRunId } = event as { taskRunId: string; taskId: string };
+          const { taskRunId } = event;
           log.info("Session idle-killed by main process", { taskRunId });
           this.unsubscribeFromChannel(taskRunId);
           sessionStoreSetters.removeSession(taskRunId);
-          removePersistedConfigOptions(taskRunId);
         },
         onError: (err) => {
           log.debug("Idle-killed subscription error", { error: err });
@@ -1617,9 +1616,7 @@ export class SessionService {
       throw new Error("Unable to reach server. Please check your connection.");
     }
 
-    const prefetchedLogs = logUrl
-      ? await this.fetchSessionLogs(logUrl, taskRunId)
-      : { rawEntries: [] as StoredLogEntry[], adapter: undefined };
+    const prefetchedLogs = await this.fetchSessionLogs(logUrl, taskRunId);
 
     // Determine sessionId: undefined = use from logs, null = strip (fresh), string = use as-is
     const sessionId =

apps/code/src/renderer/features/task-detail/components/TaskLogsPanel.tsx

@@ -212,6 +212,30 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
       });
   }, [task, repoPath, session, markActivity, isOnline, isCloud]);
 
+  // Safety net: reconnect disconnected local sessions when the window regains focus.
+  useEffect(() => {
+    if (isCloud) return;
+    const handleFocus = () => {
+      if (!repoPath || isConnecting.current) return;
+      const currentSession = sessionStoreSetters.getSessionByTaskId(taskId);
+      if (
+        currentSession?.status === "connected" ||
+        currentSession?.status === "connecting" ||
+        currentSession?.status === "error"
+      ) {
+        return;
+      }
+      isConnecting.current = true;
+      getSessionService()
+        .connectToTask({ task, repoPath })
+        .finally(() => {
+          isConnecting.current = false;
+        });
+    };
+    window.addEventListener("focus", handleFocus);
+    return () => window.removeEventListener("focus", handleFocus);
+  }, [taskId, task, repoPath, isCloud]);
+
   const handleSendPrompt = useCallback(
     async (text: string) => {
       const handled = await tryExecuteCodeCommand(text, {

packages/agent/src/adapters/claude/tools.ts

@@ -26,7 +26,12 @@ export const SEARCH_TOOLS: Set<string> = new Set(["Glob", "Grep", "LS"]);
 
 export const WEB_TOOLS: Set<string> = new Set(["WebSearch", "WebFetch"]);
 
-export const AGENT_TOOLS: Set<string> = new Set(["Task", "TodoWrite", "Skill"]);
+export const AGENT_TOOLS: Set<string> = new Set([
+  "Task",
+  "Agent",
+  "TodoWrite",
+  "Skill",
+]);
 
 const BASE_ALLOWED_TOOLS = [
   ...READ_TOOLS,