review fixes

Author: charlesvien

apps/code/src/renderer/features/command-center/components/CommandCenterSessionView.tsx

@@ -18,17 +18,8 @@ export function CommandCenterSessionView({
 }: CommandCenterSessionViewProps) {
   const { requestFocus } = useDraftStore((s) => s.actions);
 
-  useSessionConnection({ taskId, task });
-
-  const {
-    handleSendPrompt,
-    handleCancelPrompt,
-    handleRetry,
-    handleNewSession,
-    handleBashCommand,
-  } = useSessionCallbacks({ taskId, task });
-
   const {
+    session,
     repoPath,
     isCloud,
     isRunning,
@@ -43,6 +34,16 @@ export function CommandCenterSessionView({
     errorMessage,
   } = useSessionViewState(taskId, task);
 
+  useSessionConnection({ taskId, task, session, repoPath, isCloud });
+
+  const {
+    handleSendPrompt,
+    handleCancelPrompt,
+    handleRetry,
+    handleNewSession,
+    handleBashCommand,
+  } = useSessionCallbacks({ taskId, task, session, repoPath });
+
   useEffect(() => {
     requestFocus(taskId);
   }, [taskId, requestFocus]);

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

@@ -1,6 +1,5 @@
 import { tryExecuteCodeCommand } from "@features/message-editor/commands";
 import { useDraftStore } from "@features/message-editor/stores/draftStore";
-import { useCwd } from "@features/sidebar/hooks/useCwd";
 import { useTaskViewed } from "@features/sidebar/hooks/useTaskViewed";
 import { trpcClient } from "@renderer/trpc/client";
 import type { Task } from "@shared/types";
@@ -9,21 +8,24 @@ import { logger } from "@utils/logger";
 import { toast } from "@utils/toast";
 import { useCallback, useRef } from "react";
 import { getSessionService } from "../service/service";
-import { sessionStoreSetters, useSessionForTask } from "../stores/sessionStore";
+import type { AgentSession } from "../stores/sessionStore";
+import { sessionStoreSetters } from "../stores/sessionStore";
 
 const log = logger.scope("session-callbacks");
 
 interface UseSessionCallbacksOptions {
   taskId: string;
   task: Task;
+  session: AgentSession | undefined;
+  repoPath: string | null;
 }
 
 export function useSessionCallbacks({
   taskId,
   task,
+  session,
+  repoPath,
 }: UseSessionCallbacksOptions) {
-  const session = useSessionForTask(taskId);
-  const repoPath = useCwd(taskId);
   const { markActivity, markAsViewed } = useTaskViewed();
   const { requestFocus, setPendingContent } = useDraftStore((s) => s.actions);
 

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

@@ -1,14 +1,12 @@
-import { useCwd } from "@features/sidebar/hooks/useCwd";
 import { useTaskViewed } from "@features/sidebar/hooks/useTaskViewed";
-import { useWorkspace } from "@features/workspace/hooks/useWorkspace";
 import { useConnectivity } from "@hooks/useConnectivity";
 import { trpcClient } from "@renderer/trpc/client";
 import type { Task } from "@shared/types";
 import { useQueryClient } from "@tanstack/react-query";
 import { logger } from "@utils/logger";
 import { useEffect } from "react";
 import { getSessionService } from "../service/service";
-import { useSessionForTask } from "../stores/sessionStore";
+import type { AgentSession } from "../stores/sessionStore";
 import { useChatTitleGenerator } from "./useChatTitleGenerator";
 
 const log = logger.scope("session-connection");
@@ -18,22 +16,22 @@ const connectingTasks = new Set<string>();
 interface UseSessionConnectionOptions {
   taskId: string;
   task: Task;
+  session: AgentSession | undefined;
+  repoPath: string | null;
+  isCloud: boolean;
 }
 
 export function useSessionConnection({
   taskId,
   task,
+  session,
+  repoPath,
+  isCloud,
 }: UseSessionConnectionOptions) {
-  const session = useSessionForTask(taskId);
-  const repoPath = useCwd(taskId);
-  const workspace = useWorkspace(taskId);
   const queryClient = useQueryClient();
   const { markActivity } = useTaskViewed();
   const { isOnline } = useConnectivity();
 
-  const isCloud =
-    workspace?.mode === "cloud" || task.latest_run?.environment === "cloud";
-
   useChatTitleGenerator(taskId);
 
   useEffect(() => {
@@ -111,5 +109,9 @@ export function useSessionConnection({
       .finally(() => {
         connectingTasks.delete(taskId);
       });
+
+    return () => {
+      connectingTasks.delete(taskId);
+    };
   }, [task, taskId, repoPath, session, markActivity, isOnline, isCloud]);
 }

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

@@ -6,7 +6,7 @@ import { useSessionForTask } from "../stores/sessionStore";
 
 export function useSessionViewState(taskId: string, task: Task) {
   const session = useSessionForTask(taskId);
-  const repoPath = useCwd(taskId);
+  const repoPath = useCwd(taskId) ?? null;
   const workspace = useWorkspace(taskId);
 
   const isCloud =

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

@@ -36,16 +36,6 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
 
   const { requestFocus } = useDraftStore((s) => s.actions);
 
-  useSessionConnection({ taskId, task });
-
-  const {
-    handleSendPrompt,
-    handleCancelPrompt,
-    handleRetry,
-    handleNewSession,
-    handleBashCommand,
-  } = useSessionCallbacks({ taskId, task });
-
   const {
     session,
     repoPath,
@@ -64,6 +54,16 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
     errorMessage,
   } = useSessionViewState(taskId, task);
 
+  useSessionConnection({ taskId, task, session, repoPath, isCloud });
+
+  const {
+    handleSendPrompt,
+    handleCancelPrompt,
+    handleRetry,
+    handleNewSession,
+    handleBashCommand,
+  } = useSessionCallbacks({ taskId, task, session, repoPath });
+
   const cloudStage = session?.cloudStage ?? null;
   const cloudOutput = session?.cloudOutput ?? null;
   const cloudErrorMessage = session?.cloudErrorMessage ?? null;