Merge remote-tracking branch 'origin/v0.14.0rc' into feature/bug-complete-fix-for-the-plan-mode-system-inside-sbyt

apps/ui/src/components/views/board-view/worktree-panel/hooks/use-worktrees.ts

@@ -95,12 +95,20 @@ export function useWorktrees({
   );
 
   // fetchWorktrees for backward compatibility - now just triggers a refetch
-  const fetchWorktrees = useCallback(async () => {
-    await queryClient.invalidateQueries({
-      queryKey: queryKeys.worktrees.all(projectPath),
-    });
-    return refetch();
-  }, [projectPath, queryClient, refetch]);
+  // The silent option is accepted but not used (React Query handles loading states)
+  // Returns removed worktrees array if any were detected, undefined otherwise
+  const fetchWorktrees = useCallback(
+    async (_options?: {
+      silent?: boolean;
+    }): Promise<Array<{ path: string; branch: string }> | undefined> => {
+      await queryClient.invalidateQueries({
+        queryKey: queryKeys.worktrees.all(projectPath),
+      });
+      const result = await refetch();
+      return result.data?.removedWorktrees;
+    },
+    [projectPath, queryClient, refetch]
+  );
 
   const currentWorktreePath = currentWorktree?.path ?? null;
   const selectedWorktree = currentWorktreePath

apps/ui/src/components/views/board-view/worktree-panel/worktree-panel.tsx

@@ -383,13 +383,13 @@ export function WorktreePanel({
 
   const isMobile = useIsMobile();
 
-  // Periodic interval check (5 seconds) to detect branch changes on disk
-  // Reduced from 1s to 5s to minimize GPU/CPU usage from frequent re-renders
+  // Periodic interval check (30 seconds) to detect branch changes on disk
+  // Reduced polling to lessen repeated worktree list calls while keeping UI reasonably fresh
   const intervalRef = useRef<NodeJS.Timeout | null>(null);
   useEffect(() => {
     intervalRef.current = setInterval(() => {
       fetchWorktrees({ silent: true });
-    }, 5000);
+    }, 30000);
 
     return () => {
       if (intervalRef.current) {