From 538c9910596fed8dfc4849063b246c9b08e6b317 Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sat, 17 Jan 2026 14:19:54 -0800
Subject: [PATCH 1/4] fix(desktop): poll PR status for all open workspaces

Previously, GitHub PR status was only fetched when hovering over a
workspace or for the active workspace. This adds background polling
for all open worktree workspaces so PR badges update automatically.

The polling is designed to be completely non-blocking with silent
failures and deferred initial fetches.
---
 .../WorkspaceSidebar/WorkspaceSidebar.tsx     |  4 ++
 .../screens/main/hooks/usePRStatus/index.ts   |  1 +
 .../hooks/usePRStatus/usePRStatusPolling.ts   | 53 +++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 apps/desktop/src/renderer/screens/main/hooks/usePRStatus/usePRStatusPolling.ts

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebar.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebar.tsx
index abec0753976..31d41673a82 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebar.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebar.tsx
@@ -1,5 +1,6 @@
 import { useMemo } from "react";
 import { useWorkspaceShortcuts } from "renderer/hooks/useWorkspaceShortcuts";
+import { usePRStatusPolling } from "renderer/screens/main/hooks/usePRStatus";
 import { PortsList } from "./PortsList";
 import { ProjectSection } from "./ProjectSection";
 import { WorkspaceSidebarFooter } from "./WorkspaceSidebarFooter";
@@ -14,6 +15,9 @@ export function WorkspaceSidebar({
 }: WorkspaceSidebarProps) {
 	const { groups } = useWorkspaceShortcuts();
 
+	// Poll GitHub PR status for all open worktree workspaces in the background
+	usePRStatusPolling();
+
 	// Calculate shortcut base indices for each project group using cumulative offsets
 	const projectShortcutIndices = useMemo(
 		() =>
diff --git a/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/index.ts b/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/index.ts
index f552343f7ed..3d6b146c958 100644
--- a/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/index.ts
+++ b/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/index.ts
@@ -1 +1,2 @@
 export { usePRStatus } from "./usePRStatus";
+export { usePRStatusPolling } from "./usePRStatusPolling";
diff --git a/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/usePRStatusPolling.ts b/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/usePRStatusPolling.ts
new file mode 100644
index 00000000000..3974667ef03
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/usePRStatusPolling.ts
@@ -0,0 +1,53 @@
+import { electronTrpc } from "renderer/lib/electron-trpc";
+
+/** Polling interval for background PR status updates (30 seconds) */
+const PR_POLLING_INTERVAL_MS = 30_000;
+
+/** Stale time to prevent unnecessary refetches (25 seconds) */
+const STALE_TIME_MS = 25_000;
+
+/**
+ * Background hook that polls GitHub PR status for all open worktree workspaces.
+ * This enables PR status badges to update automatically across all workspaces,
+ * not just the active one.
+ *
+ * Designed to be completely non-blocking:
+ * - Queries run in background with no suspense
+ * - Failures are silently ignored (retries disabled)
+ * - Initial fetch is deferred to avoid blocking render
+ *
+ * Should be called once at the app level (e.g., in WorkspaceSidebar).
+ */
+export function usePRStatusPolling() {
+	const { data: groups = [] } =
+		electronTrpc.workspaces.getAllGrouped.useQuery();
+
+	// Get all worktree workspace IDs (branch workspaces don't have PRs)
+	const worktreeWorkspaceIds = groups
+		.flatMap((group) => group.workspaces)
+		.filter((workspace) => workspace.type === "worktree")
+		.map((workspace) => workspace.id);
+
+	// Poll GitHub status for each worktree workspace (non-blocking)
+	electronTrpc.useQueries((t) =>
+		worktreeWorkspaceIds.map((workspaceId) =>
+			t.workspaces.getGitHubStatus(
+				{ workspaceId },
+				{
+					// Polling configuration
+					refetchInterval: PR_POLLING_INTERVAL_MS,
+					refetchOnWindowFocus: false,
+					refetchOnMount: false,
+					refetchOnReconnect: false,
+
+					// Non-blocking configuration
+					staleTime: STALE_TIME_MS,
+					retry: false, // Don't retry failures - silent fail
+
+					// Use cached data while fetching
+					placeholderData: (previousData) => previousData,
+				},
+			),
+		),
+	);
+}

From b49e42eb658f0678dcf64bae4d5d951ff3d2cb01 Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sat, 17 Jan 2026 16:31:37 -0800
Subject: [PATCH 2/4] chore: clean up comments

---
 .../WorkspaceSidebar/WorkspaceSidebar.tsx     |  2 --
 .../hooks/usePRStatus/usePRStatusPolling.ts   | 25 +++----------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebar.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebar.tsx
index 31d41673a82..07d595388ba 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebar.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebar.tsx
@@ -14,8 +14,6 @@ export function WorkspaceSidebar({
 	isCollapsed = false,
 }: WorkspaceSidebarProps) {
 	const { groups } = useWorkspaceShortcuts();
-
-	// Poll GitHub PR status for all open worktree workspaces in the background
 	usePRStatusPolling();
 
 	// Calculate shortcut base indices for each project group using cumulative offsets
diff --git a/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/usePRStatusPolling.ts b/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/usePRStatusPolling.ts
index 3974667ef03..14a4ba674c6 100644
--- a/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/usePRStatusPolling.ts
+++ b/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/usePRStatusPolling.ts
@@ -1,50 +1,33 @@
 import { electronTrpc } from "renderer/lib/electron-trpc";
 
-/** Polling interval for background PR status updates (30 seconds) */
 const PR_POLLING_INTERVAL_MS = 30_000;
-
-/** Stale time to prevent unnecessary refetches (25 seconds) */
 const STALE_TIME_MS = 25_000;
 
 /**
- * Background hook that polls GitHub PR status for all open worktree workspaces.
- * This enables PR status badges to update automatically across all workspaces,
- * not just the active one.
- *
- * Designed to be completely non-blocking:
- * - Queries run in background with no suspense
- * - Failures are silently ignored (retries disabled)
- * - Initial fetch is deferred to avoid blocking render
- *
- * Should be called once at the app level (e.g., in WorkspaceSidebar).
+ * Polls GitHub PR status for all open worktree workspaces.
+ * Must be non-blocking to avoid degrading sidebar responsiveness.
  */
 export function usePRStatusPolling() {
 	const { data: groups = [] } =
 		electronTrpc.workspaces.getAllGrouped.useQuery();
 
-	// Get all worktree workspace IDs (branch workspaces don't have PRs)
+	// Branch workspaces don't have PRs
 	const worktreeWorkspaceIds = groups
 		.flatMap((group) => group.workspaces)
 		.filter((workspace) => workspace.type === "worktree")
 		.map((workspace) => workspace.id);
 
-	// Poll GitHub status for each worktree workspace (non-blocking)
 	electronTrpc.useQueries((t) =>
 		worktreeWorkspaceIds.map((workspaceId) =>
 			t.workspaces.getGitHubStatus(
 				{ workspaceId },
 				{
-					// Polling configuration
 					refetchInterval: PR_POLLING_INTERVAL_MS,
 					refetchOnWindowFocus: false,
 					refetchOnMount: false,
 					refetchOnReconnect: false,
-
-					// Non-blocking configuration
 					staleTime: STALE_TIME_MS,
-					retry: false, // Don't retry failures - silent fail
-
-					// Use cached data while fetching
+					retry: false,
 					placeholderData: (previousData) => previousData,
 				},
 			),

From da0f4ad71cefe706e8b051611941f54f882167fd Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sat, 17 Jan 2026 16:33:46 -0800
Subject: [PATCH 3/4] refactor: consolidate PR status queries to use background
 polling cache

---
 .../WorkspaceListItem/WorkspaceListItem.tsx       | 15 +++------------
 .../Sidebar/ChangesView/ChangesView.tsx           |  6 ++----
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
index 0c107874352..638d429d20d 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
@@ -16,7 +16,7 @@ import { toast } from "@superset/ui/sonner";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
 import { cn } from "@superset/ui/utils";
 import { useMatchRoute, useNavigate } from "@tanstack/react-router";
-import { useMemo, useState } from "react";
+import { useMemo } from "react";
 import { useDrag, useDrop } from "react-dnd";
 import { HiMiniXMark } from "react-icons/hi2";
 import { LuEye, LuEyeOff, LuFolder, LuFolderGit2 } from "react-icons/lu";
@@ -79,7 +79,6 @@ export function WorkspaceListItem({
 	const navigate = useNavigate();
 	const matchRoute = useMatchRoute();
 	const reorderWorkspaces = useReorderWorkspaces();
-	const [hasHovered, setHasHovered] = useState(false);
 	const rename = useWorkspaceRename(id, name);
 	const tabs = useTabsStore((s) => s.tabs);
 	const panes = useTabsStore((s) => s.panes);
@@ -108,12 +107,12 @@ export function WorkspaceListItem({
 	const { showDeleteDialog, setShowDeleteDialog, handleDeleteClick } =
 		useWorkspaceDeleteHandler();
 
-	// Lazy-load GitHub status on hover to avoid N+1 queries
+	// Reads from cache populated by usePRStatusPolling
 	const { data: githubStatus } =
 		electronTrpc.workspaces.getGitHubStatus.useQuery(
 			{ workspaceId: id },
 			{
-				enabled: hasHovered && type === "worktree",
+				enabled: type === "worktree",
 				staleTime: GITHUB_STATUS_STALE_TIME,
 			},
 		);
@@ -144,12 +143,6 @@ export function WorkspaceListItem({
 		}
 	};
 
-	const handleMouseEnter = () => {
-		if (!hasHovered) {
-			setHasHovered(true);
-		}
-	};
-
 	const handleOpenInFinder = () => {
 		if (worktreePath) {
 			openInFinder.mutate(worktreePath);
@@ -205,7 +198,6 @@ export function WorkspaceListItem({
 			<button
 				type="button"
 				onClick={handleClick}
-				onMouseEnter={handleMouseEnter}
 				className={cn(
 					"relative flex items-center justify-center size-8 rounded-md",
 					"hover:bg-muted/50 transition-colors",
@@ -308,7 +300,6 @@ export function WorkspaceListItem({
 					handleClick();
 				}
 			}}
-			onMouseEnter={handleMouseEnter}
 			onDoubleClick={isBranchWorkspace ? undefined : rename.startRename}
 			className={cn(
 				"flex items-center w-full pl-3 pr-2 text-sm",
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/Sidebar/ChangesView/ChangesView.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/Sidebar/ChangesView/ChangesView.tsx
index 9c598663b06..41e01c59e2b 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/Sidebar/ChangesView/ChangesView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/Sidebar/ChangesView/ChangesView.tsx
@@ -61,13 +61,11 @@ export function ChangesView({
 		},
 	);
 
+	// Reads from cache populated by usePRStatusPolling
 	const { data: githubStatus, refetch: refetchGithubStatus } =
 		electronTrpc.workspaces.getGitHubStatus.useQuery(
 			{ workspaceId: workspaceId ?? "" },
-			{
-				enabled: !!workspaceId,
-				refetchInterval: 10000,
-			},
+			{ enabled: !!workspaceId },
 		);
 
 	const handleRefresh = () => {

From b7a4ddcd293636ec9ce6a4c2f93c07d8b319223b Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Sat, 17 Jan 2026 16:40:21 -0800
Subject: [PATCH 4/4] refactor: batch PR status fetching with single gh pr list
 call per repo

---
 .../workspaces/procedures/git-status.ts       |  56 +++++-
 .../routers/workspaces/utils/github/github.ts | 163 ++++++++++++++++++
 .../routers/workspaces/utils/github/index.ts  |   2 +-
 .../hooks/usePRStatus/usePRStatusPolling.ts   |  42 ++---
 4 files changed, 239 insertions(+), 24 deletions(-)

diff --git a/apps/desktop/src/lib/trpc/routers/workspaces/procedures/git-status.ts b/apps/desktop/src/lib/trpc/routers/workspaces/procedures/git-status.ts
index 85688e7050a..891e3c7f9f2 100644
--- a/apps/desktop/src/lib/trpc/routers/workspaces/procedures/git-status.ts
+++ b/apps/desktop/src/lib/trpc/routers/workspaces/procedures/git-status.ts
@@ -1,5 +1,5 @@
-import { workspaces, worktrees } from "@superset/local-db";
-import { and, eq, isNull } from "drizzle-orm";
+import { projects, workspaces, worktrees } from "@superset/local-db";
+import { and, eq, inArray, isNull } from "drizzle-orm";
 import { localDb } from "main/lib/local-db";
 import { z } from "zod";
 import { publicProcedure, router } from "../../..";
@@ -15,7 +15,7 @@ import {
 	getDefaultBranch,
 	refreshDefaultBranch,
 } from "../utils/git";
-import { fetchGitHubPRStatus } from "../utils/github";
+import { fetchGitHubPRStatus, fetchGitHubPRStatusBatch } from "../utils/github";
 
 export const createGitStatusProcedures = () => {
 	return router({
@@ -113,6 +113,56 @@ export const createGitStatusProcedures = () => {
 				return freshStatus;
 			}),
 
+		getGitHubStatusBatch: publicProcedure
+			.input(z.object({ workspaceIds: z.array(z.string()) }))
+			.query(async ({ input }) => {
+				if (input.workspaceIds.length === 0) {
+					return {};
+				}
+
+				// Get all workspaces with their worktrees and projects in one query
+				const workspaceData = localDb
+					.select({
+						workspace: workspaces,
+						worktree: worktrees,
+						project: projects,
+					})
+					.from(workspaces)
+					.innerJoin(worktrees, eq(workspaces.worktreeId, worktrees.id))
+					.innerJoin(projects, eq(workspaces.projectId, projects.id))
+					.where(
+						and(
+							inArray(workspaces.id, input.workspaceIds),
+							isNull(workspaces.deletingAt),
+						),
+					)
+					.all();
+
+				const worktreeInfos = workspaceData.map((row) => ({
+					workspaceId: row.workspace.id,
+					worktreePath: row.worktree.path,
+					branch: row.worktree.branch,
+					repoPath: row.project.mainRepoPath,
+				}));
+
+				const results = await fetchGitHubPRStatusBatch(worktreeInfos);
+
+				// Update DB cache for each result
+				for (const row of workspaceData) {
+					const status = results.get(row.workspace.id);
+					if (status) {
+						localDb
+							.update(worktrees)
+							.set({ githubStatus: status })
+							.where(eq(worktrees.id, row.worktree.id))
+							.run();
+					}
+				}
+
+				// Convert Map to plain object for serialization
+				return Object.fromEntries(results);
+			}),
+
 		getWorktreeInfo: publicProcedure
 			.input(z.object({ workspaceId: z.string() }))
 			.query(({ input }) => {
diff --git a/apps/desktop/src/lib/trpc/routers/workspaces/utils/github/github.ts b/apps/desktop/src/lib/trpc/routers/workspaces/utils/github/github.ts
index 48868425e9d..340d277e88d 100644
--- a/apps/desktop/src/lib/trpc/routers/workspaces/utils/github/github.ts
+++ b/apps/desktop/src/lib/trpc/routers/workspaces/utils/github/github.ts
@@ -1,9 +1,11 @@
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import type { CheckItem, GitHubStatus } from "@superset/local-db";
+import { z } from "zod";
 import { branchExistsOnRemote } from "../git";
 import { execWithShellEnv } from "../shell-env";
 import {
+	GHCheckContextSchema,
 	type GHPRResponse,
 	GHPRResponseSchema,
 	GHRepoResponseSchema,
@@ -15,6 +17,167 @@ const execFileAsync = promisify(execFile);
 const cache = new Map<string, { data: GitHubStatus; timestamp: number }>();
 const CACHE_TTL_MS = 10_000;
 
+// Cache for batch PR list per repo (30 second TTL)
+const prListCache = new Map<
+	string,
+	{ data: Map<string, GHPRListItem>; timestamp: number }
+>();
+const PR_LIST_CACHE_TTL_MS = 30_000;
+
+// Schema for gh pr list response (extends GHPRResponse with headRefName)
+const GHPRListItemSchema = z.object({
+	number: z.number(),
+	title: z.string(),
+	url: z.string(),
+	state: z.enum(["OPEN", "CLOSED", "MERGED"]),
+	isDraft: z.boolean(),
+	headRefName: z.string(),
+	mergedAt: z.string().nullable(),
+	additions: z.number(),
+	deletions: z.number(),
+	reviewDecision: z
+		.enum(["APPROVED", "CHANGES_REQUESTED", "REVIEW_REQUIRED", ""])
+		.nullable(),
+	statusCheckRollup: z.array(GHCheckContextSchema).nullable(),
+});
+const GHPRListSchema = z.array(GHPRListItemSchema);
+type GHPRListItem = z.infer<typeof GHPRListItemSchema>;
+
+/**
+ * Fetches all open PRs for a repo in a single gh call.
+ * Results are cached for 30 seconds per repo.
+ */
+async function fetchAllPRsForRepo(
+	repoPath: string,
+): Promise<Map<string, GHPRListItem>> {
+	const cached = prListCache.get(repoPath);
+	if (cached && Date.now() - cached.timestamp < PR_LIST_CACHE_TTL_MS) {
+		return cached.data;
+	}
+
+	try {
+		const { stdout } = await execWithShellEnv(
+			"gh",
+			[
+				"pr",
+				"list",
+				"--author",
+				"@me",
+				"--state",
+				"all",
+				"--limit",
+				"50",
+				"--json",
+				"number,title,url,state,isDraft,headRefName,mergedAt,additions,deletions,reviewDecision,statusCheckRollup",
+			],
+			{ cwd: repoPath },
+		);
+
+		const raw = JSON.parse(stdout);
+		const result = GHPRListSchema.safeParse(raw);
+		if (!result.success) {
+			console.error("[GitHub] PR list schema validation failed:", result.error);
+			return new Map();
+		}
+
+		// Index by branch name for fast lookup
+		const prMap = new Map<string, GHPRListItem>();
+		for (const pr of result.data) {
+			prMap.set(pr.headRefName, pr);
+		}
+
+		prListCache.set(repoPath, { data: prMap, timestamp: Date.now() });
+		return prMap;
+	} catch {
+		return new Map();
+	}
+}
+
+interface WorktreeInfo {
+	workspaceId: string;
+	worktreePath: string;
+	branch: string;
+	repoPath: string;
+}
+
+/**
+ * Batch fetch GitHub PR status for multiple worktrees.
+ * Groups by repo and fetches all PRs per repo in one call.
+ */
+export async function fetchGitHubPRStatusBatch(
+	worktrees: WorktreeInfo[],
+): Promise<Map<string, GitHubStatus | null>> {
+	const results = new Map<string, GitHubStatus | null>();
+
+	// Group worktrees by repo
+	const byRepo = new Map<string, WorktreeInfo[]>();
+	for (const wt of worktrees) {
+		const existing = byRepo.get(wt.repoPath) ?? [];
+		existing.push(wt);
+		byRepo.set(wt.repoPath, existing);
+	}
+
+	// Fetch PRs for each repo in parallel
+	await Promise.all(
+		Array.from(byRepo.entries()).map(async ([repoPath, repoWorktrees]) => {
+			const [repoUrl, prMap] = await Promise.all([
+				getRepoUrl(repoPath),
+				fetchAllPRsForRepo(repoPath),
+			]);
+
+			// Skip if we couldn't get repo URL
+			if (!repoUrl) {
+				for (const wt of repoWorktrees) {
+					results.set(wt.workspaceId, null);
+				}
+				return;
+			}
+
+			// Check branch existence in parallel for all worktrees in this repo
+			const branchChecks = await Promise.all(
+				repoWorktrees.map((wt) =>
+					branchExistsOnRemote(wt.worktreePath, wt.branch),
+				),
+			);
+
+			for (let i = 0; i < repoWorktrees.length; i++) {
+				const wt = repoWorktrees[i];
+				const pr = prMap.get(wt.branch);
+				const branchCheck = branchChecks[i];
+
+				const status: GitHubStatus = {
+					pr: pr ? convertPRListItemToStatus(pr) : null,
+					repoUrl,
+					branchExistsOnRemote: branchCheck.status === "exists",
+					lastRefreshed: Date.now(),
+				};
+
+				results.set(wt.workspaceId, status);
+				cache.set(wt.worktreePath, { data: status, timestamp: Date.now() });
+			}
+		}),
+	);
+
+	return results;
+}
+
+function convertPRListItemToStatus(
+	pr: GHPRListItem,
+): NonNullable<GitHubStatus["pr"]> {
+	return {
+		number: pr.number,
+		title: pr.title,
+		url: pr.url,
+		state: mapPRState(pr.state, pr.isDraft),
+		mergedAt: pr.mergedAt ? new Date(pr.mergedAt).getTime() : undefined,
+		additions: pr.additions,
+		deletions: pr.deletions,
+		reviewDecision: mapReviewDecision(pr.reviewDecision),
+		checksStatus: computeChecksStatus(pr.statusCheckRollup),
+		checks: parseChecks(pr.statusCheckRollup),
+	};
+}
+
 /**
  * Fetches GitHub PR status for a worktree using the `gh` CLI.
  * Returns null if `gh` is not installed, not authenticated, or on error.
diff --git a/apps/desktop/src/lib/trpc/routers/workspaces/utils/github/index.ts b/apps/desktop/src/lib/trpc/routers/workspaces/utils/github/index.ts
index 75fcdd5296d..713107491aa 100644
--- a/apps/desktop/src/lib/trpc/routers/workspaces/utils/github/index.ts
+++ b/apps/desktop/src/lib/trpc/routers/workspaces/utils/github/index.ts
@@ -1 +1 @@
-export { fetchGitHubPRStatus } from "./github";
+export { fetchGitHubPRStatus, fetchGitHubPRStatusBatch } from "./github";
diff --git a/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/usePRStatusPolling.ts b/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/usePRStatusPolling.ts
index 14a4ba674c6..4509233c9b8 100644
--- a/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/usePRStatusPolling.ts
+++ b/apps/desktop/src/renderer/screens/main/hooks/usePRStatus/usePRStatusPolling.ts
@@ -1,10 +1,11 @@
+import { useMemo } from "react";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 
 const PR_POLLING_INTERVAL_MS = 30_000;
 const STALE_TIME_MS = 25_000;
 
 /**
- * Polls GitHub PR status for all open worktree workspaces.
+ * Polls GitHub PR status for all open worktree workspaces using a single batch call.
  * Must be non-blocking to avoid degrading sidebar responsiveness.
  */
 export function usePRStatusPolling() {
@@ -12,25 +13,26 @@ export function usePRStatusPolling() {
 		electronTrpc.workspaces.getAllGrouped.useQuery();
 
 	// Branch workspaces don't have PRs
-	const worktreeWorkspaceIds = groups
-		.flatMap((group) => group.workspaces)
-		.filter((workspace) => workspace.type === "worktree")
-		.map((workspace) => workspace.id);
+	const worktreeWorkspaceIds = useMemo(
+		() =>
+			groups
+				.flatMap((group) => group.workspaces)
+				.filter((workspace) => workspace.type === "worktree")
+				.map((workspace) => workspace.id),
+		[groups],
+	);
 
-	electronTrpc.useQueries((t) =>
-		worktreeWorkspaceIds.map((workspaceId) =>
-			t.workspaces.getGitHubStatus(
-				{ workspaceId },
-				{
-					refetchInterval: PR_POLLING_INTERVAL_MS,
-					refetchOnWindowFocus: false,
-					refetchOnMount: false,
-					refetchOnReconnect: false,
-					staleTime: STALE_TIME_MS,
-					retry: false,
-					placeholderData: (previousData) => previousData,
-				},
-			),
-		),
+	// Single batch call instead of N individual calls
+	electronTrpc.workspaces.getGitHubStatusBatch.useQuery(
+		{ workspaceIds: worktreeWorkspaceIds },
+		{
+			enabled: worktreeWorkspaceIds.length > 0,
+			refetchInterval: PR_POLLING_INTERVAL_MS,
+			refetchOnWindowFocus: false,
+			refetchOnMount: false,
+			refetchOnReconnect: false,
+			staleTime: STALE_TIME_MS,
+			retry: false,
+		},
 	);
 }