merge

Author: jonathanlab

apps/array/src/renderer/features/sessions/components/ConversationView.tsx

@@ -12,10 +12,7 @@ import {
   isJsonRpcResponse,
 } from "@shared/types/session-events";
 import { useMemo } from "react";
-import {
-  GitActionMessage,
-  parseGitActionMessage,
-} from "./GitActionMessage";
+import { GitActionMessage, parseGitActionMessage } from "./GitActionMessage";
 import { GitActionResult } from "./GitActionResult";
 import { SessionFooter } from "./SessionFooter";
 import {

apps/array/src/renderer/features/sessions/components/ModelSelector.tsx

@@ -22,7 +22,7 @@ export function ModelSelector({
   const defaultModel = useSettingsStore((state) => state.defaultModel);
   const setDefaultModel = useSettingsStore((state) => state.setDefaultModel);
   const { setSessionModel } = useSessionActions();
-  const session = useSessionForTask(taskId ?? "");
+  const session = useSessionForTask(taskId);
 
   // Use session model if available, otherwise fall back to default
   const activeModel = session?.model ?? defaultModel;

apps/array/src/renderer/features/sessions/hooks/useKeyboardShortcut.ts

@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useEffect, useLayoutEffect, useRef } from "react";
 
 interface Options {
   enabled?: boolean;
@@ -10,17 +10,22 @@ export function useKeyboardShortcut(
   options: Options = {},
 ): void {
   const { enabled = true } = options;
+  const callbackRef = useRef(callback);
+
+  useLayoutEffect(() => {
+    callbackRef.current = callback;
+  });
 
   useEffect(() => {
     if (!enabled) return;
 
     function handleKeyDown(e: KeyboardEvent) {
       if (e.key === key) {
-        callback();
+        callbackRef.current();
       }
     }
 
     window.addEventListener("keydown", handleKeyDown);
     return () => window.removeEventListener("keydown", handleKeyDown);
-  }, [key, callback, enabled]);
+  }, [key, enabled]);
 }

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

@@ -563,9 +563,11 @@ const useStore = create<SessionStore>()(
 
 export const useSessions = () => useStore((s) => s.sessions);
 export const useSessionActions = () => useStore((s) => s.actions);
-export const useSessionForTask = (taskId: string) =>
+export const useSessionForTask = (taskId: string | undefined) =>
   useStore((s) =>
-    Object.values(s.sessions).find((session) => session.taskId === taskId),
+    taskId
+      ? Object.values(s.sessions).find((session) => session.taskId === taskId)
+      : undefined,
   );
 export const getSessionActions = () => useStore.getState().actions;