feat: update git commands and improve diff loading with timeout handling

packages/ui/src/hooks/useGitPollingHook.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { useGitStore } from '@/stores/useGitStore';
 import { useDirectoryStore } from '@/stores/useDirectoryStore';
 import { useRuntimeAPIs } from '@/hooks/useRuntimeAPIs';
+import { useSessionStore } from '@/stores/useSessionStore';
 
 /**
  * Background git polling hook - monitors git status regardless of which tab is open.
@@ -9,23 +10,35 @@ import { useRuntimeAPIs } from '@/hooks/useRuntimeAPIs';
  */
 export function useGitPolling() {
     const { git } = useRuntimeAPIs();
-    const currentDirectory = useDirectoryStore((state) => state.currentDirectory);
+    const fallbackDirectory = useDirectoryStore((state) => state.currentDirectory);
+    const { currentSessionId, sessions, worktreeMetadata: worktreeMap } = useSessionStore();
     const { setActiveDirectory, startPolling, stopPolling, fetchAll } = useGitStore();
 
+    const effectiveDirectory = React.useMemo(() => {
+        const worktreeMetadata = currentSessionId
+            ? worktreeMap.get(currentSessionId) ?? undefined
+            : undefined;
+
+        const currentSession = sessions.find((session) => session.id === currentSessionId);
+        const sessionDirectory = (currentSession as { directory?: string | null } | undefined)?.directory ?? null;
+
+        return worktreeMetadata?.path ?? sessionDirectory ?? fallbackDirectory ?? null;
+    }, [currentSessionId, sessions, worktreeMap, fallbackDirectory]);
+
     React.useEffect(() => {
-        if (!currentDirectory || !git) {
+        if (!effectiveDirectory || !git) {
             stopPolling();
             return;
         }
 
-        setActiveDirectory(currentDirectory);
+        setActiveDirectory(effectiveDirectory);
 
-        fetchAll(currentDirectory, git);
+        fetchAll(effectiveDirectory, git);
 
         startPolling(git);
 
         return () => {
             stopPolling();
         };
-    }, [currentDirectory, git, setActiveDirectory, startPolling, stopPolling, fetchAll]);
+    }, [effectiveDirectory, git, setActiveDirectory, startPolling, stopPolling, fetchAll]);
 }