Stabilize GitHub API rate limits with token caching and GraphQL migration

apps/dashboard/src/components/issues/detail/issue-detail-page.tsx

@@ -1,6 +1,7 @@
 import { Skeleton } from "@diffkit/ui/components/skeleton";
 import { useQuery } from "@tanstack/react-query";
 import { getRouteApi } from "@tanstack/react-router";
+import { useMemo } from "react";
 import {
 	DetailPageLayout,
 	DetailPageSkeletonLayout,
@@ -10,6 +11,8 @@ import {
 	githubIssuePageQueryOptions,
 	githubQueryKeys,
 } from "#/lib/github.query";
+import { githubRevalidationSignalKeys } from "#/lib/github-revalidation";
+import { useGitHubSignalRefresh } from "#/lib/use-github-signal-refresh";
 import { useHasMounted } from "#/lib/use-has-mounted";
 import { useRegisterTab } from "#/lib/use-register-tab";
 import { IssueDetailActivitySection } from "./issue-detail-activity";
@@ -22,13 +25,35 @@ export function IssueDetailPage() {
 	const { user } = routeApi.useRouteContext();
 	const { owner, repo, issueId } = routeApi.useParams();
 	const issueNumber = Number(issueId);
-	const scope = { userId: user.id };
+	const scope = useMemo(() => ({ userId: user.id }), [user.id]);
+	const input = useMemo(
+		() => ({ owner, repo, issueNumber }),
+		[owner, repo, issueNumber],
+	);
 	const hasMounted = useHasMounted();
+	const pageQueryKey = useMemo(
+		() => githubQueryKeys.issues.page(scope, input),
+		[scope, input],
+	);
+	const webhookRefreshTargets = useMemo(
+		() => [
+			{
+				queryKey: pageQueryKey,
+				signalKeys: [githubRevalidationSignalKeys.issueEntity(input)],
+			},
+		],
+		[pageQueryKey, input],
+	);
 
 	const pageQuery = useQuery({
-		...githubIssuePageQueryOptions(scope, { owner, repo, issueNumber }),
+		...githubIssuePageQueryOptions(scope, input),
 		enabled: hasMounted,
 	});
+	useGitHubSignalRefresh({
+		enabled:
+			hasMounted && pageQuery.data !== undefined && !pageQuery.isFetching,
+		targets: webhookRefreshTargets,
+	});
 
 	const issue = pageQuery.data?.detail;
 	const comments = pageQuery.data?.comments;
@@ -62,11 +87,7 @@ export function IssueDetailPage() {
 						events={events}
 						commentPagination={commentPagination}
 						eventPagination={eventPagination}
-						pageQueryKey={githubQueryKeys.issues.page(scope, {
-							owner,
-							repo,
-							issueNumber,
-						})}
+						pageQueryKey={pageQueryKey}
 						isFetching={pageQuery.isFetching}
 						owner={owner}
 						repo={repo}

apps/dashboard/src/components/layouts/dashboard-layout.tsx

@@ -6,7 +6,6 @@ import {
 	githubMyIssuesQueryOptions,
 	githubMyPullsQueryOptions,
 } from "#/lib/github.query";
-import { useGitHubRevalidation } from "#/lib/use-github-revalidation";
 import { useHasMounted } from "#/lib/use-has-mounted";
 import { useMediaQuery } from "#/lib/use-media-query";
 import { DashboardBottomBar } from "./dashboard-bottombar";
@@ -42,7 +41,6 @@ export function DashboardLayout() {
 	const { user } = routeApi.useRouteContext();
 	const scope = { userId: user.id };
 	const hasMounted = useHasMounted();
-	useGitHubRevalidation(user.id);
 
 	const pullsQuery = useQuery({
 		...githubMyPullsQueryOptions(scope),

apps/dashboard/src/components/layouts/dashboard-tabs.tsx

@@ -116,14 +116,6 @@ export function DashboardTabs({ tabsReady, routerRef }: DashboardTabsProps) {
 		}
 	}, [pathname, scrollRef, updateScrollState]);
 
-	useEffect(() => {
-		if (!tabsReady || openTabs.length === 0) return;
-
-		void Promise.allSettled(
-			openTabs.map((tab) => preloadRouteOnce(routerRef.current, tab.url)),
-		);
-	}, [tabsReady, openTabs, routerRef]);
-
 	const handleCloseTab = useCallback(
 		(id: string, tabUrl: string) => {
 			const isActive = pathname === tabUrl;

apps/dashboard/src/components/pulls/detail/pull-detail-activity.tsx

@@ -222,7 +222,7 @@ function getInvolvedUsers(
 	return users;
 }
 
-// ── Merge status section — owns its own polling query ────────────────
+// ── Merge status section ─────────────────────────────────────────────
 
 function MergeStatusSection({
 	scope,
@@ -237,7 +237,6 @@ function MergeStatusSection({
 }) {
 	const statusQuery = useQuery({
 		...githubPullStatusQueryOptions(scope, { owner, repo, pullNumber }),
-		refetchOnWindowFocus: "always",
 	});
 
 	const status = statusQuery.data ?? null;

apps/dashboard/src/components/pulls/detail/pull-detail-page.tsx

@@ -1,6 +1,7 @@
 import { Skeleton } from "@diffkit/ui/components/skeleton";
 import { useQuery } from "@tanstack/react-query";
 import { getRouteApi } from "@tanstack/react-router";
+import { useMemo } from "react";
 import {
 	DetailPageLayout,
 	DetailPageSkeletonLayout,
@@ -11,6 +12,8 @@ import {
 	githubQueryKeys,
 	githubViewerQueryOptions,
 } from "#/lib/github.query";
+import { githubRevalidationSignalKeys } from "#/lib/github-revalidation";
+import { useGitHubSignalRefresh } from "#/lib/use-github-signal-refresh";
 import { useHasMounted } from "#/lib/use-has-mounted";
 import { useRegisterTab } from "#/lib/use-register-tab";
 import { PullBodySection } from "./pull-body-section";
@@ -24,17 +27,43 @@ export function PullDetailPage() {
 	const { user } = routeApi.useRouteContext();
 	const { owner, repo, pullId } = routeApi.useParams();
 	const pullNumber = Number(pullId);
-	const scope = { userId: user.id };
+	const scope = useMemo(() => ({ userId: user.id }), [user.id]);
+	const input = useMemo(
+		() => ({ owner, repo, pullNumber }),
+		[owner, repo, pullNumber],
+	);
 	const hasMounted = useHasMounted();
+	const pageQueryKey = useMemo(
+		() => githubQueryKeys.pulls.page(scope, input),
+		[scope, input],
+	);
+	const webhookRefreshTargets = useMemo(
+		() => [
+			{
+				queryKey: pageQueryKey,
+				signalKeys: [githubRevalidationSignalKeys.pullEntity(input)],
+			},
+			{
+				queryKey: githubQueryKeys.pulls.status(scope, input),
+				signalKeys: [githubRevalidationSignalKeys.pullEntity(input)],
+			},
+		],
+		[pageQueryKey, scope, input],
+	);
 
 	const pageQuery = useQuery({
-		...githubPullPageQueryOptions(scope, { owner, repo, pullNumber }),
+		...githubPullPageQueryOptions(scope, input),
 		enabled: hasMounted,
 	});
 	const viewerQuery = useQuery({
 		...githubViewerQueryOptions(scope),
 		enabled: hasMounted,
 	});
+	useGitHubSignalRefresh({
+		enabled:
+			hasMounted && pageQuery.data !== undefined && !pageQuery.isFetching,
+		targets: webhookRefreshTargets,
+	});
 
 	const pr = pageQuery.data?.detail;
 	const comments = pageQuery.data?.comments;
@@ -88,11 +117,7 @@ export function PullDetailPage() {
 						events={events}
 						commentPagination={commentPagination}
 						eventPagination={eventPagination}
-						pageQueryKey={githubQueryKeys.pulls.page(scope, {
-							owner,
-							repo,
-							pullNumber,
-						})}
+						pageQueryKey={pageQueryKey}
 						isFetching={pageQuery.isFetching}
 						pr={pr}
 						owner={owner}

apps/dashboard/src/components/pulls/review/review-page.tsx

@@ -52,6 +52,8 @@ import type {
 	PullFileSummary,
 	PullReviewComment,
 } from "#/lib/github.types";
+import { githubRevalidationSignalKeys } from "#/lib/github-revalidation";
+import { useGitHubSignalRefresh } from "#/lib/use-github-signal-refresh";
 import { useRegisterTab } from "#/lib/use-register-tab";
 import { checkPermissionWarning } from "#/lib/warning-store";
 import type { ReviewDiffPaneHandle } from "./review-diff-pane";
@@ -95,9 +97,44 @@ export function ReviewPage() {
 	const { user } = routeApi.useRouteContext();
 	const { owner, repo, pullId } = routeApi.useParams();
 	const pullNumber = Number(pullId);
-	const scope = { userId: user.id };
+	const scope = useMemo(() => ({ userId: user.id }), [user.id]);
 	const queryClient = useQueryClient();
-	const input = { owner, repo, pullNumber };
+	const input = useMemo(
+		() => ({ owner, repo, pullNumber }),
+		[owner, repo, pullNumber],
+	);
+	const pageQueryKey = useMemo(
+		() => githubQueryKeys.pulls.page(scope, input),
+		[scope, input],
+	);
+	const fileSummariesQueryKey = useMemo(
+		() => githubQueryKeys.pulls.fileSummaries(scope, input),
+		[scope, input],
+	);
+	const filesQueryKey = useMemo(
+		() => githubQueryKeys.pulls.files(scope, input),
+		[scope, input],
+	);
+	const reviewCommentsQueryKey = useMemo(
+		() => githubQueryKeys.pulls.reviewComments(scope, input),
+		[scope, input],
+	);
+	const pullSignalKey = githubRevalidationSignalKeys.pullEntity(input);
+	const webhookRefreshTargets = useMemo(
+		() => [
+			{ queryKey: pageQueryKey, signalKeys: [pullSignalKey] },
+			{ queryKey: fileSummariesQueryKey, signalKeys: [pullSignalKey] },
+			{ queryKey: filesQueryKey, signalKeys: [pullSignalKey] },
+			{ queryKey: reviewCommentsQueryKey, signalKeys: [pullSignalKey] },
+		],
+		[
+			pageQueryKey,
+			fileSummariesQueryKey,
+			filesQueryKey,
+			reviewCommentsQueryKey,
+			pullSignalKey,
+		],
+	);
 	const diffPaneRef = useRef<ReviewDiffPaneHandle>(null);
 
 	// Stable store for active file — updates bypass ReviewPage renders entirely
@@ -116,7 +153,7 @@ export function ReviewPage() {
 	});
 
 	const filesQuery = useInfiniteQuery({
-		queryKey: githubQueryKeys.pulls.files(scope, input),
+		queryKey: filesQueryKey,
 		initialPageParam: 1,
 		queryFn: ({ pageParam }) =>
 			getPullFiles({
@@ -137,6 +174,15 @@ export function ReviewPage() {
 		enabled: hasDiffPayload,
 		refetchOnWindowFocus: false,
 	});
+	useGitHubSignalRefresh({
+		enabled:
+			pageQuery.data !== undefined &&
+			!pageQuery.isFetching &&
+			!fileSummariesQuery.isFetching &&
+			!filesQuery.isFetching &&
+			!reviewCommentsQuery.isFetching,
+		targets: webhookRefreshTargets,
+	});
 
 	const pr = pageQuery.data?.detail ?? null;
 	const sidebarFiles = fileSummariesQuery.data ?? [];

apps/dashboard/src/lib/auth-runtime.ts

@@ -21,7 +21,9 @@ export async function getGitHubClientByUserId(
 		throttle: { enabled: false },
 	});
 
-	configureGitHubRequestPolicies(octokit);
+	configureGitHubRequestPolicies(octokit, {
+		tokenLabel: `oauth:user:${userId}`,
+	});
 
 	return octokit;
 }
@@ -40,7 +42,9 @@ export async function getGitHubAppUserClientByUserId(
 		throttle: { enabled: false },
 	});
 
-	configureGitHubRequestPolicies(octokit);
+	configureGitHubRequestPolicies(octokit, {
+		tokenLabel: `app-user:${userId}`,
+	});
 
 	return octokit;
 }

apps/dashboard/src/lib/github-cache-invalidation.test.ts

@@ -11,7 +11,11 @@ describe("getGitHubWebhookRevalidationSignalKeys", () => {
 				},
 				pull_request: { number: 42 },
 			}),
-		).toEqual(["pulls.mine", "pull:stylessh/havana#42"]);
+		).toEqual([
+			"pulls.mine",
+			"repoMeta:stylessh/havana",
+			"pull:stylessh/havana#42",
+		]);
 	});
 
 	it("treats issue comments on pull requests as pull signals", () => {
@@ -42,7 +46,22 @@ describe("getGitHubWebhookRevalidationSignalKeys", () => {
 					number: 9,
 				},
 			}),
-		).toEqual(["issues.mine", "issue:stylessh/havana#9"]);
+		).toEqual([
+			"issues.mine",
+			"repoMeta:stylessh/havana",
+			"issue:stylessh/havana#9",
+		]);
+	});
+
+	it("maps push webhook events to repo metadata and code signals", () => {
+		expect(
+			getGitHubWebhookRevalidationSignalKeys("push", {
+				repository: {
+					name: "havana",
+					owner: { login: "stylessh" },
+				},
+			}),
+		).toEqual(["repoMeta:stylessh/havana", "repoCode:stylessh/havana"]);
 	});
 
 	it("extracts pull signals from check_run webhook payloads", () => {