From cab64a4abf06be00df8138bbbdeaf84450a53d55 Mon Sep 17 00:00:00 2001
From: Alan Daniel <stylesshjs@gmail.com>
Date: Wed, 8 Apr 2026 11:52:32 -0400
Subject: [PATCH 1/2] Improve dashboard caching and preloading

---
 .../components/layouts/dashboard-topbar.tsx   | 127 ++--
 .../src/components/pulls/pull-request-row.tsx |  11 +-
 apps/dashboard/src/lib/auth-runtime.ts        |  76 +++
 apps/dashboard/src/lib/auth.functions.ts      |  12 +-
 apps/dashboard/src/lib/github-cache-policy.ts |  12 +-
 apps/dashboard/src/lib/github-cache.test.ts   |   3 +
 apps/dashboard/src/lib/github-cache.ts        |  32 +-
 apps/dashboard/src/lib/github.functions.ts    | 541 +++++++++++-------
 apps/dashboard/src/lib/github.query.ts        |  67 ++-
 apps/dashboard/src/lib/github.server.ts       |   6 +-
 apps/dashboard/src/lib/github.types.ts        |  11 +
 apps/dashboard/src/lib/query-client.tsx       | 108 +++-
 apps/dashboard/src/lib/route-preload.ts       |  32 ++
 apps/dashboard/src/lib/tab-store.ts           |  10 +-
 .../$owner/$repo/issues.$issueId.tsx          | 138 ++++-
 .../_protected/$owner/$repo/pull.$pullId.tsx  | 148 ++++-
 .../dashboard/src/routes/_protected/index.tsx |   8 +
 .../src/routes/_protected/issues.tsx          |   6 +
 .../dashboard/src/routes/_protected/pulls.tsx |   4 +
 .../src/routes/_protected/reviews.tsx         |   4 +
 20 files changed, 1007 insertions(+), 349 deletions(-)
 create mode 100644 apps/dashboard/src/lib/auth-runtime.ts
 create mode 100644 apps/dashboard/src/lib/route-preload.ts

diff --git a/apps/dashboard/src/components/layouts/dashboard-topbar.tsx b/apps/dashboard/src/components/layouts/dashboard-topbar.tsx
index 22f47f4..6da67d4 100644
--- a/apps/dashboard/src/components/layouts/dashboard-topbar.tsx
+++ b/apps/dashboard/src/components/layouts/dashboard-topbar.tsx
@@ -25,6 +25,7 @@ import { Link, useRouter } from "@tanstack/react-router";
 import { useTheme } from "next-themes";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { signOutToLogin } from "#/lib/auth-actions";
+import { preloadRouteOnce } from "#/lib/route-preload";
 import { removeTab, type Tab, useTabs } from "#/lib/tab-store";
 
 interface DashboardTopbarProps {
@@ -59,6 +60,8 @@ const tabIconMap = {
 	issue: IssuesIcon,
 } as const;
 
+const primaryNavRoutes = ["/", "/pulls", "/issues", "/reviews"] as const;
+
 export function DashboardTopbar({
 	user,
 	tabsReady,
@@ -124,8 +127,24 @@ export function DashboardTopbar({
 		},
 	];
 
+	useEffect(() => {
+		if (!tabsReady) return;
+
+		void Promise.allSettled(
+			primaryNavRoutes.map((to) => router.preloadRoute({ to })),
+		);
+	}, [router, tabsReady]);
+
+	useEffect(() => {
+		if (!tabsReady || openTabs.length === 0) return;
+
+		void Promise.allSettled(
+			openTabs.map((tab) => preloadRouteOnce(router, tab.url)),
+		);
+	}, [router, tabsReady, openTabs]);
+
 	return (
-		<nav className="flex items-center gap-3 px-3 py-2">
+		<nav className="flex min-w-0 items-center gap-3 overflow-hidden px-3 py-2">
 			<DropdownMenu>
 				<DropdownMenuTrigger asChild>
 					<button
@@ -196,9 +215,9 @@ export function DashboardTopbar({
 
 			<div
 				aria-hidden={!tabsReady}
-				className={`flex items-center gap-0.5 transition-[opacity,transform] duration-300 ease-out ${
+				className={`shrink-0 items-center gap-0.5 transition-[opacity,transform] duration-300 ease-out ${
 					tabsReady
-						? "translate-y-0 opacity-100"
+						? "flex translate-y-0 opacity-100"
 						: "pointer-events-none -translate-y-0.5 opacity-0"
 				}`}
 			>
@@ -213,6 +232,7 @@ export function DashboardTopbar({
 					>
 						<Link
 							to={item.to as string}
+							preload={false}
 							activeOptions={{ exact: true }}
 							activeProps={{ className: "active" }}
 						>
@@ -232,54 +252,56 @@ export function DashboardTopbar({
 				))}
 			</div>
 
-			{openTabs.length > 0 && (
-				<div
-					aria-hidden={!tabsReady}
-					className={`flex items-center gap-3 transition-[opacity,transform] duration-300 ease-out ${
-						tabsReady
-							? "translate-y-0 opacity-100"
-							: "pointer-events-none -translate-y-0.5 opacity-0"
-					}`}
-				>
-					<div className="h-4 border-l border-border/50" />
-					<div className="relative min-w-0">
-						<div
-							className={`pointer-events-none absolute inset-y-0 left-0 z-10 w-6 bg-gradient-to-r from-muted to-transparent transition-opacity ${canScrollLeft ? "opacity-100" : "opacity-0"}`}
-						/>
-						<div
-							className={`pointer-events-none absolute inset-y-0 right-0 z-10 w-6 bg-gradient-to-l from-muted to-transparent transition-opacity ${canScrollRight ? "opacity-100" : "opacity-0"}`}
-						/>
-						{/* biome-ignore lint/a11y/noStaticElementInteractions: scroll container needs onScroll for gradient visibility */}
-						<div
-							ref={scrollRef}
-							onScroll={updateScrollState}
-							onMouseEnter={updateScrollState}
-							className="no-scrollbar flex items-center gap-0.5 overflow-x-auto"
-						>
-							{openTabs.map((tab) => {
-								const Icon = tabIconMap[tab.type];
-								return (
-									<DetailTab
-										key={tab.id}
-										tab={tab}
-										icon={Icon}
-										onClose={(id) => {
-											const isActive =
-												router.state.location.pathname === tab.url;
-											removeTab(id);
-											if (isActive) {
-												void router.navigate({ to: "/" });
-											}
-										}}
-									/>
-								);
-							})}
+			<div className="min-w-0 flex-1 overflow-hidden">
+				{openTabs.length > 0 && (
+					<div
+						aria-hidden={!tabsReady}
+						className={`flex min-w-0 items-center gap-3 overflow-hidden transition-[opacity,transform] duration-300 ease-out ${
+							tabsReady
+								? "translate-y-0 opacity-100"
+								: "pointer-events-none -translate-y-0.5 opacity-0"
+						}`}
+					>
+						<div className="h-4 shrink-0 border-l border-border/50" />
+						<div className="relative min-w-0 flex-1 overflow-hidden">
+							<div
+								className={`pointer-events-none absolute inset-y-0 left-0 z-10 w-6 bg-gradient-to-r from-muted to-transparent transition-opacity ${canScrollLeft ? "opacity-100" : "opacity-0"}`}
+							/>
+							<div
+								className={`pointer-events-none absolute inset-y-0 right-0 z-10 w-6 bg-gradient-to-l from-muted to-transparent transition-opacity ${canScrollRight ? "opacity-100" : "opacity-0"}`}
+							/>
+							{/* biome-ignore lint/a11y/noStaticElementInteractions: scroll container needs onScroll for gradient visibility */}
+							<div
+								ref={scrollRef}
+								onScroll={updateScrollState}
+								onMouseEnter={updateScrollState}
+								className="no-scrollbar flex w-0 min-w-full items-center gap-0.5 overflow-x-auto"
+							>
+								{openTabs.map((tab) => {
+									const Icon = tabIconMap[tab.type];
+									return (
+										<DetailTab
+											key={tab.id}
+											tab={tab}
+											icon={Icon}
+											onClose={(id) => {
+												const isActive =
+													router.state.location.pathname === tab.url;
+												removeTab(id);
+												if (isActive) {
+													void router.navigate({ to: "/" });
+												}
+											}}
+										/>
+									);
+								})}
+							</div>
 						</div>
 					</div>
-				</div>
-			)}
+				)}
+			</div>
 
-			<div className="ml-auto">
+			<div className="shrink-0">
 				<Button
 					variant="ghost"
 					size="icon"
@@ -301,9 +323,18 @@ function DetailTab({
 	icon: typeof GitPullRequestIcon;
 	onClose: (id: string) => void;
 }) {
+	const router = useRouter();
+	const preloadTab = () => {
+		void preloadRouteOnce(router, tab.url);
+	};
+
 	return (
 		<Link
 			to={tab.url}
+			preload={false}
+			onMouseEnter={preloadTab}
+			onFocus={preloadTab}
+			onTouchStart={preloadTab}
 			activeOptions={{ exact: true }}
 			activeProps={{ className: "active" }}
 			className="group relative flex h-8 shrink-0 items-center gap-1.5 rounded-md px-3 text-[13px] font-medium text-muted-foreground transition-colors hover:bg-surface-1 hover:text-foreground [&.active]:bg-surface-1 [&.active]:text-foreground"
diff --git a/apps/dashboard/src/components/pulls/pull-request-row.tsx b/apps/dashboard/src/components/pulls/pull-request-row.tsx
index 08462f3..2c7684e 100644
--- a/apps/dashboard/src/components/pulls/pull-request-row.tsx
+++ b/apps/dashboard/src/components/pulls/pull-request-row.tsx
@@ -9,13 +9,14 @@ import {
 import { Markdown } from "@quickhub/ui/components/markdown";
 import { cn } from "@quickhub/ui/lib/utils";
 import { useQuery } from "@tanstack/react-query";
-import { Link } from "@tanstack/react-router";
+import { Link, useRouter } from "@tanstack/react-router";
 import { useState } from "react";
 import {
 	type GitHubQueryScope,
 	githubPullCommentsQueryOptions,
 } from "#/lib/github.query";
 import type { PullSummary } from "#/lib/github.types";
+import { preloadRouteOnce } from "#/lib/route-preload";
 
 export function formatRelativeTime(dateStr: string): string {
 	const seconds = Math.floor((Date.now() - new Date(dateStr).getTime()) / 1000);
@@ -55,6 +56,10 @@ export function PullRequestRow({
 	const { icon: Icon, color } = getPrStateProps(pr);
 	const href = `/${pr.repository.owner}/${pr.repository.name}/pull/${pr.number}`;
 	const [expanded, setExpanded] = useState(false);
+	const router = useRouter();
+	const preloadDetail = () => {
+		void preloadRouteOnce(router, href);
+	};
 
 	const commentsQuery = useQuery({
 		...githubPullCommentsQueryOptions(scope, {
@@ -69,6 +74,10 @@ export function PullRequestRow({
 		<div className="rounded-lg">
 			<Link
 				to={href}
+				preload={false}
+				onMouseEnter={preloadDetail}
+				onFocus={preloadDetail}
+				onTouchStart={preloadDetail}
 				className={cn(
 					"group flex items-start gap-3 rounded-lg px-3 py-2.5 transition-colors hover:[&:not(:has([data-action]:hover))]:bg-surface-1",
 					expanded && "bg-surface-1",
diff --git a/apps/dashboard/src/lib/auth-runtime.ts b/apps/dashboard/src/lib/auth-runtime.ts
new file mode 100644
index 0000000..1818501
--- /dev/null
+++ b/apps/dashboard/src/lib/auth-runtime.ts
@@ -0,0 +1,76 @@
+import { env } from "cloudflare:workers";
+import { getRequest } from "@tanstack/react-start/server";
+import { betterAuth } from "better-auth";
+import { drizzleAdapter } from "better-auth/adapters/drizzle";
+import { tanstackStartCookies } from "better-auth/tanstack-start";
+import { and, eq } from "drizzle-orm";
+import { drizzle } from "drizzle-orm/d1";
+import type { Octokit as OctokitType } from "octokit";
+import { Octokit } from "octokit";
+import { getDb } from "../db";
+import * as schema from "../db/schema";
+import { account } from "../db/schema";
+
+const authDb = drizzle(env.DB, { schema });
+
+function createAuth() {
+	return betterAuth({
+		baseURL: env.BETTER_AUTH_URL,
+		secret: env.BETTER_AUTH_SECRET,
+		database: drizzleAdapter(authDb, {
+			provider: "sqlite",
+		}),
+		socialProviders: {
+			github: {
+				clientId: env.GITHUB_CLIENT_ID,
+				clientSecret: env.GITHUB_CLIENT_SECRET,
+				scope: [
+					"read:user",
+					"user:email",
+					"repo",
+					"notifications",
+					"workflow",
+					"read:project",
+					"security_events",
+					"admin:repo_hook",
+				],
+			},
+		},
+		plugins: [tanstackStartCookies()],
+	});
+}
+
+let authInstance: ReturnType<typeof createAuth> | undefined;
+
+function getAuth() {
+	if (!authInstance) {
+		authInstance = createAuth();
+	}
+
+	return authInstance;
+}
+
+export async function getRequestSession() {
+	return getAuth().api.getSession({ headers: getRequest().headers });
+}
+
+export async function getGitHubClientByUserId(
+	userId: string,
+): Promise<OctokitType> {
+	const db = getDb();
+	const githubAccount = await db
+		.select()
+		.from(account)
+		.where(and(eq(account.userId, userId), eq(account.providerId, "github")))
+		.get();
+
+	if (!githubAccount?.accessToken) {
+		throw new Error("No GitHub account linked");
+	}
+
+	return new Octokit({
+		auth: githubAccount.accessToken,
+		retry: { enabled: false },
+		throttle: { enabled: false },
+	});
+}
diff --git a/apps/dashboard/src/lib/auth.functions.ts b/apps/dashboard/src/lib/auth.functions.ts
index d04ed89..a325f0e 100644
--- a/apps/dashboard/src/lib/auth.functions.ts
+++ b/apps/dashboard/src/lib/auth.functions.ts
@@ -2,15 +2,7 @@ import { createServerFn } from "@tanstack/react-start";
 
 export const getSession = createServerFn({ method: "GET" }).handler(
 	async () => {
-		const [{ getRequest }, { getAuth }] = await Promise.all([
-			import("@tanstack/react-start/server"),
-			import("./auth.server"),
-		]);
-		const request = getRequest();
-		const auth = getAuth();
-		const session = await auth.api.getSession({
-			headers: request.headers,
-		});
-		return session;
+		const { getRequestSession } = await import("./auth-runtime");
+		return getRequestSession();
 	},
 );
diff --git a/apps/dashboard/src/lib/github-cache-policy.ts b/apps/dashboard/src/lib/github-cache-policy.ts
index 9ac4aa3..c37b95c 100644
--- a/apps/dashboard/src/lib/github-cache-policy.ts
+++ b/apps/dashboard/src/lib/github-cache-policy.ts
@@ -12,7 +12,15 @@ export const githubCachePolicy = {
 		gcTimeMs: 60 * 60 * 1000,
 	},
 	detail: {
-		staleTimeMs: 5 * 60 * 1000,
-		gcTimeMs: 6 * 60 * 60 * 1000,
+		staleTimeMs: 30 * 1000,
+		gcTimeMs: 10 * 60 * 1000,
+	},
+	activity: {
+		staleTimeMs: 20 * 1000,
+		gcTimeMs: 10 * 60 * 1000,
+	},
+	status: {
+		staleTimeMs: 15 * 1000,
+		gcTimeMs: 5 * 60 * 1000,
 	},
 } as const;
diff --git a/apps/dashboard/src/lib/github-cache.test.ts b/apps/dashboard/src/lib/github-cache.test.ts
index fde485b..9f0083d 100644
--- a/apps/dashboard/src/lib/github-cache.test.ts
+++ b/apps/dashboard/src/lib/github-cache.test.ts
@@ -115,6 +115,7 @@ describe("getOrRevalidateGitHubResource", () => {
 	});
 
 	it("deduplicates concurrent stale refreshes for the same cache key", async () => {
+		const inFlightCache = new Map<string, Promise<unknown>>();
 		const store = createMemoryStore([
 			buildEntry({
 				resource: "pulls.mine.reviewRequested",
@@ -136,6 +137,7 @@ describe("getOrRevalidateGitHubResource", () => {
 		);
 
 		const promiseA = getOrRevalidateGitHubResource({
+			inFlightCache,
 			userId: "user-1",
 			resource: "pulls.mine.reviewRequested",
 			params: { role: "review-requested" },
@@ -145,6 +147,7 @@ describe("getOrRevalidateGitHubResource", () => {
 			fetcher,
 		});
 		const promiseB = getOrRevalidateGitHubResource({
+			inFlightCache,
 			userId: "user-1",
 			resource: "pulls.mine.reviewRequested",
 			params: { role: "review-requested" },
diff --git a/apps/dashboard/src/lib/github-cache.ts b/apps/dashboard/src/lib/github-cache.ts
index 7803e17..d5304da 100644
--- a/apps/dashboard/src/lib/github-cache.ts
+++ b/apps/dashboard/src/lib/github-cache.ts
@@ -52,10 +52,31 @@ type GetOrRevalidateGitHubResourceOptions<TData> = {
 		conditionals: GitHubConditionalHeaders,
 	) => Promise<GitHubFetchResult<TData>>;
 	store?: GitHubCacheStore;
+	inFlightCache?: Map<string, Promise<unknown>>;
 	now?: () => number;
 };
 
-const inFlightGitHubCacheReads = new Map<string, Promise<unknown>>();
+const requestScopedInFlightGitHubCacheReads = new WeakMap<
+	Request,
+	Map<string, Promise<unknown>>
+>();
+
+async function getRequestScopedInFlightCache() {
+	try {
+		const { getRequest } = await import("@tanstack/react-start/server");
+		const request = getRequest();
+		let inFlightCache = requestScopedInFlightGitHubCacheReads.get(request);
+
+		if (!inFlightCache) {
+			inFlightCache = new Map<string, Promise<unknown>>();
+			requestScopedInFlightGitHubCacheReads.set(request, inFlightCache);
+		}
+
+		return inFlightCache;
+	} catch {
+		return null;
+	}
+}
 
 function parseNullableInt(value: string | null | undefined) {
 	if (!value) {
@@ -184,12 +205,15 @@ export async function getOrRevalidateGitHubResource<TData>({
 	fetcher,
 	now = Date.now,
 	store,
+	inFlightCache,
 }: GetOrRevalidateGitHubResourceOptions<TData>): Promise<TData> {
 	const resolvedStore = store ?? (await getGitHubCacheStore());
 	const paramsJson = stableSerialize(params);
 	const cacheKey = buildGitHubCacheKey({ userId, resource, paramsJson });
+	const resolvedInFlightCache =
+		inFlightCache ?? (await getRequestScopedInFlightCache());
 
-	const existingInFlight = inFlightGitHubCacheReads.get(cacheKey);
+	const existingInFlight = resolvedInFlightCache?.get(cacheKey);
 	if (existingInFlight) {
 		return existingInFlight as Promise<TData>;
 	}
@@ -247,11 +271,11 @@ export async function getOrRevalidateGitHubResource<TData>({
 		return result.data;
 	})();
 
-	inFlightGitHubCacheReads.set(cacheKey, task);
+	resolvedInFlightCache?.set(cacheKey, task);
 
 	try {
 		return await task;
 	} finally {
-		inFlightGitHubCacheReads.delete(cacheKey);
+		resolvedInFlightCache?.delete(cacheKey);
 	}
 }
diff --git a/apps/dashboard/src/lib/github.functions.ts b/apps/dashboard/src/lib/github.functions.ts
index 1b777ba..8789ae3 100644
--- a/apps/dashboard/src/lib/github.functions.ts
+++ b/apps/dashboard/src/lib/github.functions.ts
@@ -5,11 +5,13 @@ import type {
 	GitHubLabel,
 	IssueComment,
 	IssueDetail,
+	IssuePageData,
 	IssueSummary,
 	MyIssuesResult,
 	MyPullsResult,
 	PullComment,
 	PullDetail,
+	PullPageData,
 	PullStatus,
 	PullSummary,
 	RepositoryRef,
@@ -24,7 +26,11 @@ import {
 import { githubCachePolicy } from "./github-cache-policy";
 
 type GitHubClient = OctokitType;
-type AuthSession = NonNullable<Awaited<ReturnType<typeof getSession>>>;
+type AuthSession = {
+	user: {
+		id: string;
+	};
+};
 type GitHubContext = {
 	session: AuthSession;
 	octokit: GitHubClient;
@@ -382,27 +388,18 @@ function mapIssueSearchItems(items: SearchItem[]) {
 		.filter((item): item is IssueSummary => Boolean(item));
 }
 
-async function getSession() {
-	const [{ getRequest }, { getAuth }] = await Promise.all([
-		import("@tanstack/react-start/server"),
-		import("./auth.server"),
-	]);
-	const request = getRequest();
-	const auth = getAuth();
-	return auth.api.getSession({ headers: request.headers });
-}
-
 async function getGitHubContext(): Promise<GitHubContext | null> {
-	const session = await getSession();
+	const { getGitHubClientByUserId, getRequestSession } = await import(
+		"./auth-runtime"
+	);
+	const session = await getRequestSession();
 	if (!session) {
 		return null;
 	}
 
 	return {
 		session,
-		octokit: await (await import("./github.server")).getGitHubClient(
-			session.user.id,
-		),
+		octokit: await getGitHubClientByUserId(session.user.id),
 	};
 }
 
@@ -545,6 +542,309 @@ async function getCachedGitHubRequest<TGitHubData, TResult>({
 	});
 }
 
+async function getCachedPullResponse({
+	context,
+	data,
+	resource,
+	freshForMs,
+}: {
+	context: GitHubContext;
+	data: PullFromRepoInput;
+	resource: string;
+	freshForMs: number;
+}) {
+	return getCachedGitHubRequest<RepoPullDetail, RepoPullDetail>({
+		context,
+		resource,
+		params: data,
+		freshForMs,
+		request: (headers) =>
+			context.octokit.rest.pulls.get({
+				owner: data.owner,
+				repo: data.repo,
+				pull_number: data.pullNumber,
+				headers,
+			}),
+		mapData: (pull) => pull,
+	});
+}
+
+async function getPullDetailResult(
+	context: GitHubContext,
+	data: PullFromRepoInput,
+): Promise<PullDetail> {
+	const pull = await getCachedPullResponse({
+		context,
+		data,
+		resource: "pulls.detail.raw",
+		freshForMs: githubCachePolicy.detail.staleTimeMs,
+	});
+
+	return mapPullDetail(pull, buildRepositoryRef(data.owner, data.repo));
+}
+
+async function getPullCommentsResult(
+	context: GitHubContext,
+	data: PullFromRepoInput,
+): Promise<PullComment[]> {
+	type IssueComment = Awaited<
+		ReturnType<GitHubClient["rest"]["issues"]["listComments"]>
+	>["data"][number];
+
+	return getCachedGitHubRequest<IssueComment[], PullComment[]>({
+		context,
+		resource: "pulls.comments",
+		params: data,
+		freshForMs: githubCachePolicy.activity.staleTimeMs,
+		request: (headers) =>
+			context.octokit.rest.issues.listComments({
+				owner: data.owner,
+				repo: data.repo,
+				issue_number: data.pullNumber,
+				per_page: 10,
+				headers,
+			}),
+		mapData: (comments) =>
+			comments.map((comment) => ({
+				id: comment.id,
+				body: comment.body ?? "",
+				createdAt: comment.created_at,
+				author: comment.user
+					? {
+							login: comment.user.login,
+							avatarUrl: comment.user.avatar_url,
+							url: comment.user.html_url,
+							type: comment.user.type ?? "User",
+						}
+					: null,
+			})),
+	});
+}
+
+async function computePullStatus(
+	context: GitHubContext,
+	data: PullFromRepoInput,
+	pull: RepoPullDetail,
+): Promise<PullStatus> {
+	const [reviewsResponse, checksResponse] = await Promise.all([
+		context.octokit.rest.pulls.listReviews({
+			owner: data.owner,
+			repo: data.repo,
+			pull_number: data.pullNumber,
+			per_page: 100,
+		}),
+		context.octokit.rest.checks
+			.listForRef({
+				owner: data.owner,
+				repo: data.repo,
+				ref: pull.head.sha,
+				per_page: 100,
+			})
+			.catch(() => null),
+	]);
+
+	const latestReviews = new Map<
+		string,
+		{ id: number; state: string; author: GitHubActor | null }
+	>();
+	for (const review of reviewsResponse.data) {
+		if (!review.user?.login || review.state === "COMMENTED") {
+			continue;
+		}
+
+		latestReviews.set(review.user.login, {
+			id: review.id,
+			state: review.state,
+			author: mapActor(review.user),
+		});
+	}
+
+	const checkRuns = checksResponse?.data.check_runs ?? [];
+	let passed = 0;
+	let failed = 0;
+	let pending = 0;
+	let skipped = 0;
+	for (const check of checkRuns) {
+		if (check.status !== "completed") {
+			pending += 1;
+		} else if (
+			check.conclusion === "success" ||
+			check.conclusion === "neutral"
+		) {
+			passed += 1;
+		} else if (check.conclusion === "skipped") {
+			skipped += 1;
+		} else {
+			failed += 1;
+		}
+	}
+
+	let behindBy: number | null = null;
+	try {
+		const comparison = await context.octokit.rest.repos.compareCommits({
+			owner: data.owner,
+			repo: data.repo,
+			base: pull.head.sha,
+			head: pull.base.ref,
+		});
+		behindBy = comparison.data.ahead_by;
+	} catch {
+		behindBy = null;
+	}
+
+	const permissions = pull.base.repo.permissions;
+	const canUpdateBranch =
+		permissions?.push === true || permissions?.admin === true;
+
+	return {
+		reviews: Array.from(latestReviews.values()),
+		checks: {
+			total: checkRuns.length,
+			passed,
+			failed,
+			pending,
+			skipped,
+		},
+		mergeable: pull.mergeable,
+		mergeableState:
+			typeof pull.mergeable_state === "string" ? pull.mergeable_state : null,
+		behindBy,
+		baseRefName: pull.base.ref,
+		canUpdateBranch,
+	};
+}
+
+async function getPullStatusResult(
+	context: GitHubContext,
+	data: PullFromRepoInput,
+	pull?: RepoPullDetail,
+): Promise<PullStatus> {
+	return getOrRevalidateGitHubResource<PullStatus>({
+		userId: context.session.user.id,
+		resource: "pulls.status.v1",
+		params: data,
+		freshForMs: githubCachePolicy.status.staleTimeMs,
+		fetcher: async () => {
+			const pullForStatus =
+				pull ??
+				(await getCachedPullResponse({
+					context,
+					data,
+					resource: "pulls.status.raw",
+					freshForMs: githubCachePolicy.status.staleTimeMs,
+				}));
+
+			return {
+				kind: "success",
+				data: await computePullStatus(context, data, pullForStatus),
+				metadata: createGitHubResponseMetadata(200, {}),
+			};
+		},
+	});
+}
+
+async function getPullPageDataResult(
+	context: GitHubContext,
+	data: PullFromRepoInput,
+): Promise<PullPageData> {
+	const pull = await getCachedPullResponse({
+		context,
+		data,
+		resource: "pulls.detail.raw",
+		freshForMs: githubCachePolicy.detail.staleTimeMs,
+	});
+
+	const [comments, status] = await Promise.all([
+		getPullCommentsResult(context, data),
+		getPullStatusResult(context, data, pull),
+	]);
+
+	return {
+		detail: mapPullDetail(pull, buildRepositoryRef(data.owner, data.repo)),
+		comments,
+		status,
+	};
+}
+
+async function getIssueDetailResult(
+	context: GitHubContext,
+	data: IssueFromRepoInput,
+): Promise<IssueDetail | null> {
+	return getCachedGitHubRequest<RepoIssueDetail, IssueDetail | null>({
+		context,
+		resource: "issues.detail",
+		params: data,
+		freshForMs: githubCachePolicy.detail.staleTimeMs,
+		request: (headers) =>
+			context.octokit.rest.issues.get({
+				owner: data.owner,
+				repo: data.repo,
+				issue_number: data.issueNumber,
+				headers,
+			}),
+		mapData: (issue) => {
+			if (issue.pull_request) {
+				return null;
+			}
+
+			return mapIssueDetail(issue, buildRepositoryRef(data.owner, data.repo));
+		},
+	});
+}
+
+async function getIssueCommentsResult(
+	context: GitHubContext,
+	data: IssueFromRepoInput,
+): Promise<IssueComment[]> {
+	type RawIssueComment = Awaited<
+		ReturnType<GitHubClient["rest"]["issues"]["listComments"]>
+	>["data"][number];
+
+	return getCachedGitHubRequest<RawIssueComment[], IssueComment[]>({
+		context,
+		resource: "issues.comments",
+		params: data,
+		freshForMs: githubCachePolicy.activity.staleTimeMs,
+		request: (headers) =>
+			context.octokit.rest.issues.listComments({
+				owner: data.owner,
+				repo: data.repo,
+				issue_number: data.issueNumber,
+				per_page: 30,
+				headers,
+			}),
+		mapData: (comments) =>
+			comments.map((comment) => ({
+				id: comment.id,
+				body: comment.body ?? "",
+				createdAt: comment.created_at,
+				author: comment.user
+					? {
+							login: comment.user.login,
+							avatarUrl: comment.user.avatar_url,
+							url: comment.user.html_url,
+							type: comment.user.type ?? "User",
+						}
+					: null,
+			})),
+	});
+}
+
+async function getIssuePageDataResult(
+	context: GitHubContext,
+	data: IssueFromRepoInput,
+): Promise<IssuePageData> {
+	const [detail, comments] = await Promise.all([
+		getIssueDetailResult(context, data),
+		getIssueCommentsResult(context, data),
+	]);
+
+	return {
+		detail,
+		comments,
+	};
+}
+
 async function runWithConcurrency<TValue>(
 	tasks: Array<() => Promise<TValue>>,
 	concurrency = 2,
@@ -852,21 +1152,7 @@ export const getPullFromRepo = createServerFn({ method: "GET" })
 			return null;
 		}
 
-		return getCachedGitHubRequest<RepoPullDetail, PullDetail | null>({
-			context,
-			resource: "pulls.detail",
-			params: data,
-			freshForMs: githubCachePolicy.detail.staleTimeMs,
-			request: (headers) =>
-				context.octokit.rest.pulls.get({
-					owner: data.owner,
-					repo: data.repo,
-					pull_number: data.pullNumber,
-					headers,
-				}),
-			mapData: (pull) =>
-				mapPullDetail(pull, buildRepositoryRef(data.owner, data.repo)),
-		});
+		return getPullDetailResult(context, data);
 	});
 
 export const getPullComments = createServerFn({ method: "GET" })
@@ -877,38 +1163,7 @@ export const getPullComments = createServerFn({ method: "GET" })
 			return [];
 		}
 
-		type IssueComment = Awaited<
-			ReturnType<GitHubClient["rest"]["issues"]["listComments"]>
-		>["data"][number];
-
-		return getCachedGitHubRequest<IssueComment[], PullComment[]>({
-			context,
-			resource: "pulls.comments",
-			params: data,
-			freshForMs: githubCachePolicy.detail.staleTimeMs,
-			request: (headers) =>
-				context.octokit.rest.issues.listComments({
-					owner: data.owner,
-					repo: data.repo,
-					issue_number: data.pullNumber,
-					per_page: 10,
-					headers,
-				}),
-			mapData: (comments) =>
-				comments.map((c) => ({
-					id: c.id,
-					body: c.body ?? "",
-					createdAt: c.created_at,
-					author: c.user
-						? {
-								login: c.user.login,
-								avatarUrl: c.user.avatar_url,
-								url: c.user.html_url,
-								type: c.user.type ?? "User",
-							}
-						: null,
-				})),
-		});
+		return getPullCommentsResult(context, data);
 	});
 
 export const getMyIssues = createServerFn({ method: "GET" }).handler(
@@ -1047,26 +1302,7 @@ export const getIssueFromRepo = createServerFn({ method: "GET" })
 			return null;
 		}
 
-		return getCachedGitHubRequest<RepoIssueDetail, IssueDetail | null>({
-			context,
-			resource: "issues.detail",
-			params: data,
-			freshForMs: githubCachePolicy.detail.staleTimeMs,
-			request: (headers) =>
-				context.octokit.rest.issues.get({
-					owner: data.owner,
-					repo: data.repo,
-					issue_number: data.issueNumber,
-					headers,
-				}),
-			mapData: (issue) => {
-				if (issue.pull_request) {
-					return null;
-				}
-
-				return mapIssueDetail(issue, buildRepositoryRef(data.owner, data.repo));
-			},
-		});
+		return getIssueDetailResult(context, data);
 	});
 
 export const getIssueComments = createServerFn({ method: "GET" })
@@ -1077,38 +1313,18 @@ export const getIssueComments = createServerFn({ method: "GET" })
 			return [];
 		}
 
-		type RawIssueComment = Awaited<
-			ReturnType<GitHubClient["rest"]["issues"]["listComments"]>
-		>["data"][number];
+		return getIssueCommentsResult(context, data);
+	});
 
-		return getCachedGitHubRequest<RawIssueComment[], IssueComment[]>({
-			context,
-			resource: "issues.comments",
-			params: data,
-			freshForMs: githubCachePolicy.detail.staleTimeMs,
-			request: (headers) =>
-				context.octokit.rest.issues.listComments({
-					owner: data.owner,
-					repo: data.repo,
-					issue_number: data.issueNumber,
-					per_page: 30,
-					headers,
-				}),
-			mapData: (comments) =>
-				comments.map((c) => ({
-					id: c.id,
-					body: c.body ?? "",
-					createdAt: c.created_at,
-					author: c.user
-						? {
-								login: c.user.login,
-								avatarUrl: c.user.avatar_url,
-								url: c.user.html_url,
-								type: c.user.type ?? "User",
-							}
-						: null,
-				})),
-		});
+export const getIssuePageData = createServerFn({ method: "GET" })
+	.inputValidator(identityValidator<IssueFromRepoInput>)
+	.handler(async ({ data }): Promise<IssuePageData | null> => {
+		const context = await getGitHubContext();
+		if (!context) {
+			return null;
+		}
+
+		return getIssuePageDataResult(context, data);
 	});
 
 export const getPullStatus = createServerFn({ method: "GET" })
@@ -1119,99 +1335,18 @@ export const getPullStatus = createServerFn({ method: "GET" })
 			return null;
 		}
 
-		const pullResponse = await context.octokit.rest.pulls.get({
-			owner: data.owner,
-			repo: data.repo,
-			pull_number: data.pullNumber,
-		});
-		const pull = pullResponse.data;
-
-		const [reviewsResponse, checksResponse] = await Promise.all([
-			context.octokit.rest.pulls.listReviews({
-				owner: data.owner,
-				repo: data.repo,
-				pull_number: data.pullNumber,
-				per_page: 100,
-			}),
-			context.octokit.rest.checks
-				.listForRef({
-					owner: data.owner,
-					repo: data.repo,
-					ref: pull.head.sha,
-					per_page: 100,
-				})
-				.catch(() => null),
-		]);
-
-		const reviews = reviewsResponse.data;
-
-		const latestReviews = new Map<
-			string,
-			{ id: number; state: string; author: GitHubActor | null }
-		>();
-		for (const review of reviews) {
-			if (!review.user?.login) continue;
-			if (review.state === "COMMENTED") continue;
-			latestReviews.set(review.user.login, {
-				id: review.id,
-				state: review.state,
-				author: mapActor(review.user),
-			});
-		}
-
-		const checkRuns = checksResponse?.data.check_runs ?? [];
-		let passed = 0;
-		let failed = 0;
-		let pending = 0;
-		let skipped = 0;
-		for (const check of checkRuns) {
-			if (check.status !== "completed") {
-				pending += 1;
-			} else if (
-				check.conclusion === "success" ||
-				check.conclusion === "neutral"
-			) {
-				passed += 1;
-			} else if (check.conclusion === "skipped") {
-				skipped += 1;
-			} else {
-				failed += 1;
-			}
-		}
+		return getPullStatusResult(context, data);
+	});
 
-		let behindBy: number | null = null;
-		try {
-			const comparison = await context.octokit.rest.repos.compareCommits({
-				owner: data.owner,
-				repo: data.repo,
-				base: pull.head.sha,
-				head: pull.base.ref,
-			});
-			behindBy = comparison.data.ahead_by;
-		} catch {
-			behindBy = null;
+export const getPullPageData = createServerFn({ method: "GET" })
+	.inputValidator(identityValidator<PullFromRepoInput>)
+	.handler(async ({ data }): Promise<PullPageData | null> => {
+		const context = await getGitHubContext();
+		if (!context) {
+			return null;
 		}
 
-		const permissions = pull.base.repo.permissions;
-		const canUpdateBranch =
-			permissions?.push === true || permissions?.admin === true;
-
-		return {
-			reviews: Array.from(latestReviews.values()),
-			checks: {
-				total: checkRuns.length,
-				passed,
-				failed,
-				pending,
-				skipped,
-			},
-			mergeable: pull.mergeable,
-			mergeableState:
-				typeof pull.mergeable_state === "string" ? pull.mergeable_state : null,
-			behindBy,
-			baseRefName: pull.base.ref,
-			canUpdateBranch,
-		};
+		return getPullPageDataResult(context, data);
 	});
 
 export const updatePullBranch = createServerFn({ method: "POST" })
diff --git a/apps/dashboard/src/lib/github.query.ts b/apps/dashboard/src/lib/github.query.ts
index c992d8b..2edd7e1 100644
--- a/apps/dashboard/src/lib/github.query.ts
+++ b/apps/dashboard/src/lib/github.query.ts
@@ -3,12 +3,14 @@ import {
 	getGitHubViewer,
 	getIssueComments,
 	getIssueFromRepo,
+	getIssuePageData,
 	getIssuesFromRepo,
 	getIssuesFromUser,
 	getMyIssues,
 	getMyPulls,
 	getPullComments,
 	getPullFromRepo,
+	getPullPageData,
 	getPullStatus,
 	getPullsFromRepo,
 	getPullsFromUser,
@@ -88,6 +90,10 @@ const persistedMeta = {
 	persist: true,
 } as const;
 
+const tabPersistedMeta = {
+	persist: "tab",
+} as const;
+
 export const githubQueryKeys = {
 	all: ["github"] as const,
 	viewer: (scope: GitHubQueryScope) =>
@@ -103,6 +109,8 @@ export const githubQueryKeys = {
 			["github", scope.userId, "pulls", "user", input] as const,
 		repo: (scope: GitHubQueryScope, input: PullsFromRepoQueryInput) =>
 			["github", scope.userId, "pulls", "repo", input] as const,
+		page: (scope: GitHubQueryScope, input: PullFromRepoQueryInput) =>
+			["github", scope.userId, "pulls", "page", input] as const,
 		detail: (scope: GitHubQueryScope, input: PullFromRepoQueryInput) =>
 			["github", scope.userId, "pulls", "detail", input] as const,
 		comments: (scope: GitHubQueryScope, input: PullFromRepoQueryInput) =>
@@ -117,6 +125,8 @@ export const githubQueryKeys = {
 			["github", scope.userId, "issues", "user", input] as const,
 		repo: (scope: GitHubQueryScope, input: IssuesFromRepoQueryInput) =>
 			["github", scope.userId, "issues", "repo", input] as const,
+		page: (scope: GitHubQueryScope, input: IssueFromRepoQueryInput) =>
+			["github", scope.userId, "issues", "page", input] as const,
 		detail: (scope: GitHubQueryScope, input: IssueFromRepoQueryInput) =>
 			["github", scope.userId, "issues", "detail", input] as const,
 		comments: (scope: GitHubQueryScope, input: IssueFromRepoQueryInput) =>
@@ -189,7 +199,23 @@ export function githubPullDetailQueryOptions(
 		queryFn: () => getPullFromRepo({ data: input }),
 		staleTime: githubCachePolicy.detail.staleTimeMs,
 		gcTime: githubCachePolicy.detail.gcTimeMs,
-		meta: persistedMeta,
+		refetchOnMount: "always",
+		meta: tabPersistedMeta,
+	});
+}
+
+export function githubPullPageQueryOptions(
+	scope: GitHubQueryScope,
+	input: PullFromRepoQueryInput,
+) {
+	return queryOptions({
+		queryKey: githubQueryKeys.pulls.page(scope, input),
+		queryFn: () => getPullPageData({ data: input }),
+		staleTime: githubCachePolicy.status.staleTimeMs,
+		gcTime: githubCachePolicy.detail.gcTimeMs,
+		refetchOnMount: "always",
+		refetchOnWindowFocus: "always",
+		meta: tabPersistedMeta,
 	});
 }
 
@@ -200,9 +226,10 @@ export function githubPullCommentsQueryOptions(
 	return queryOptions({
 		queryKey: githubQueryKeys.pulls.comments(scope, input),
 		queryFn: () => getPullComments({ data: input }),
-		staleTime: githubCachePolicy.detail.staleTimeMs,
-		gcTime: githubCachePolicy.detail.gcTimeMs,
-		meta: persistedMeta,
+		staleTime: githubCachePolicy.activity.staleTimeMs,
+		gcTime: githubCachePolicy.activity.gcTimeMs,
+		refetchOnMount: "always",
+		meta: tabPersistedMeta,
 	});
 }
 
@@ -213,9 +240,10 @@ export function githubPullStatusQueryOptions(
 	return queryOptions({
 		queryKey: githubQueryKeys.pulls.status(scope, input),
 		queryFn: () => getPullStatus({ data: input }),
-		staleTime: githubCachePolicy.detail.staleTimeMs,
-		gcTime: githubCachePolicy.detail.gcTimeMs,
-		meta: persistedMeta,
+		staleTime: githubCachePolicy.status.staleTimeMs,
+		gcTime: githubCachePolicy.status.gcTimeMs,
+		refetchOnMount: "always",
+		meta: tabPersistedMeta,
 	});
 }
 
@@ -264,7 +292,23 @@ export function githubIssueDetailQueryOptions(
 		queryFn: () => getIssueFromRepo({ data: input }),
 		staleTime: githubCachePolicy.detail.staleTimeMs,
 		gcTime: githubCachePolicy.detail.gcTimeMs,
-		meta: persistedMeta,
+		refetchOnMount: "always",
+		meta: tabPersistedMeta,
+	});
+}
+
+export function githubIssuePageQueryOptions(
+	scope: GitHubQueryScope,
+	input: IssueFromRepoQueryInput,
+) {
+	return queryOptions({
+		queryKey: githubQueryKeys.issues.page(scope, input),
+		queryFn: () => getIssuePageData({ data: input }),
+		staleTime: githubCachePolicy.activity.staleTimeMs,
+		gcTime: githubCachePolicy.detail.gcTimeMs,
+		refetchOnMount: "always",
+		refetchOnWindowFocus: "always",
+		meta: tabPersistedMeta,
 	});
 }
 
@@ -275,8 +319,9 @@ export function githubIssueCommentsQueryOptions(
 	return queryOptions({
 		queryKey: githubQueryKeys.issues.comments(scope, input),
 		queryFn: () => getIssueComments({ data: input }),
-		staleTime: githubCachePolicy.detail.staleTimeMs,
-		gcTime: githubCachePolicy.detail.gcTimeMs,
-		meta: persistedMeta,
+		staleTime: githubCachePolicy.activity.staleTimeMs,
+		gcTime: githubCachePolicy.activity.gcTimeMs,
+		refetchOnMount: "always",
+		meta: tabPersistedMeta,
 	});
 }
diff --git a/apps/dashboard/src/lib/github.server.ts b/apps/dashboard/src/lib/github.server.ts
index 0c757fa..9f70f21 100644
--- a/apps/dashboard/src/lib/github.server.ts
+++ b/apps/dashboard/src/lib/github.server.ts
@@ -17,5 +17,9 @@ export async function getGitHubClient(userId: string): Promise<OctokitType> {
 		throw new Error("No GitHub account linked");
 	}
 
-	return new Octokit({ auth: githubAccount.accessToken });
+	return new Octokit({
+		auth: githubAccount.accessToken,
+		retry: { enabled: false },
+		throttle: { enabled: false },
+	});
 }
diff --git a/apps/dashboard/src/lib/github.types.ts b/apps/dashboard/src/lib/github.types.ts
index a3b62e9..68cf14d 100644
--- a/apps/dashboard/src/lib/github.types.ts
+++ b/apps/dashboard/src/lib/github.types.ts
@@ -118,6 +118,11 @@ export type IssueComment = {
 	author: GitHubActor | null;
 };
 
+export type IssuePageData = {
+	detail: IssueDetail | null;
+	comments: IssueComment[];
+};
+
 export type PullCheckRun = {
 	id: number;
 	name: string;
@@ -146,3 +151,9 @@ export type PullStatus = {
 	baseRefName: string;
 	canUpdateBranch: boolean;
 };
+
+export type PullPageData = {
+	detail: PullDetail | null;
+	comments: PullComment[];
+	status: PullStatus | null;
+};
diff --git a/apps/dashboard/src/lib/query-client.tsx b/apps/dashboard/src/lib/query-client.tsx
index edaebae..98170b4 100644
--- a/apps/dashboard/src/lib/query-client.tsx
+++ b/apps/dashboard/src/lib/query-client.tsx
@@ -4,8 +4,9 @@ import {
 	QueryClient,
 	QueryClientProvider,
 } from "@tanstack/react-query";
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { githubCachePolicy } from "./github-cache-policy";
+import { readStoredTabs, type Tab, useTabs } from "./tab-store";
 
 const GITHUB_QUERY_CACHE_STORAGE_KEY = "quickhub:github-query-cache:v1";
 const GITHUB_QUERY_CACHE_MAX_AGE_MS = githubCachePolicy.viewer.gcTimeMs;
@@ -16,18 +17,111 @@ type PersistedGitHubQueryCache = {
 	clientState: unknown;
 };
 
-function shouldPersistGitHubQuery(query: {
+type PersistBehavior = true | "tab";
+
+type PersistableGitHubQuery = {
 	state: { status: string };
 	meta?: Record<string, unknown>;
 	queryKey: readonly unknown[];
-}) {
+};
+
+function isPullQueryKeyInput(
+	value: unknown,
+): value is { owner: string; repo: string; pullNumber: number } {
+	return Boolean(
+		value &&
+			typeof value === "object" &&
+			typeof (value as { owner?: unknown }).owner === "string" &&
+			typeof (value as { repo?: unknown }).repo === "string" &&
+			typeof (value as { pullNumber?: unknown }).pullNumber === "number",
+	);
+}
+
+function isIssueQueryKeyInput(
+	value: unknown,
+): value is { owner: string; repo: string; issueNumber: number } {
+	return Boolean(
+		value &&
+			typeof value === "object" &&
+			typeof (value as { owner?: unknown }).owner === "string" &&
+			typeof (value as { repo?: unknown }).repo === "string" &&
+			typeof (value as { issueNumber?: unknown }).issueNumber === "number",
+	);
+}
+
+function matchesTabQuery(queryKey: readonly unknown[], tab: Tab) {
+	const resourceType = queryKey[2];
+	const resourceName = queryKey[3];
+	const input = queryKey[4];
+	const [owner, repo] = tab.repo.split("/");
+
+	if (tab.type === "pull") {
+		return (
+			resourceType === "pulls" &&
+			(resourceName === "page" ||
+				resourceName === "detail" ||
+				resourceName === "comments" ||
+				resourceName === "status") &&
+			isPullQueryKeyInput(input) &&
+			input.owner === owner &&
+			input.repo === repo &&
+			input.pullNumber === tab.number
+		);
+	}
+
 	return (
-		query.state.status === "success" &&
-		query.meta?.persist === true &&
-		query.queryKey[0] === "github"
+		resourceType === "issues" &&
+		(resourceName === "page" ||
+			resourceName === "detail" ||
+			resourceName === "comments") &&
+		isIssueQueryKeyInput(input) &&
+		input.owner === owner &&
+		input.repo === repo &&
+		input.issueNumber === tab.number
 	);
 }
 
+function shouldPersistGitHubQuery(query: PersistableGitHubQuery) {
+	const persist = query.meta?.persist as PersistBehavior | undefined;
+
+	if (query.state.status !== "success" || query.queryKey[0] !== "github") {
+		return false;
+	}
+
+	if (persist === true) {
+		return true;
+	}
+
+	if (persist === "tab") {
+		return readStoredTabs().some((tab) => matchesTabQuery(query.queryKey, tab));
+	}
+
+	return false;
+}
+
+function pruneClosedTabQueries(queryClient: QueryClient, tabs: Tab[]) {
+	queryClient.removeQueries({
+		predicate: (query) =>
+			query.queryKey[0] === "github" &&
+			query.meta?.persist === "tab" &&
+			!tabs.some((tab) => matchesTabQuery(query.queryKey, tab)),
+	});
+}
+
+function usePruneClosedTabQueries(queryClient: QueryClient) {
+	const tabs = useTabs();
+	const tabsRef = useRef(tabs);
+
+	useEffect(() => {
+		if (tabsRef.current === tabs) {
+			return;
+		}
+
+		tabsRef.current = tabs;
+		pruneClosedTabQueries(queryClient, tabs);
+	}, [queryClient, tabs]);
+}
+
 function restorePersistedGitHubQueryCache(queryClient: QueryClient) {
 	if (typeof window === "undefined") {
 		return;
@@ -116,8 +210,10 @@ function persistGitHubQueryCache(queryClient: QueryClient) {
 
 function GitHubQueryPersistence({ queryClient }: { queryClient: QueryClient }) {
 	useEffect(() => {
+		pruneClosedTabQueries(queryClient, readStoredTabs());
 		return persistGitHubQueryCache(queryClient);
 	}, [queryClient]);
+	usePruneClosedTabQueries(queryClient);
 
 	return null;
 }
diff --git a/apps/dashboard/src/lib/route-preload.ts b/apps/dashboard/src/lib/route-preload.ts
new file mode 100644
index 0000000..d0623d8
--- /dev/null
+++ b/apps/dashboard/src/lib/route-preload.ts
@@ -0,0 +1,32 @@
+const completedRoutePreloads = new Set<string>();
+const inFlightRoutePreloads = new Map<string, Promise<unknown>>();
+
+export function preloadRouteOnce(
+	router: {
+		preloadRoute: (options: { to: string }) => Promise<unknown>;
+	},
+	to: string,
+) {
+	if (completedRoutePreloads.has(to)) {
+		return Promise.resolve();
+	}
+
+	const existingTask = inFlightRoutePreloads.get(to);
+	if (existingTask) {
+		return existingTask;
+	}
+
+	const task = router
+		.preloadRoute({ to })
+		.then((result) => {
+			completedRoutePreloads.add(to);
+			return result;
+		})
+		.finally(() => {
+			inFlightRoutePreloads.delete(to);
+		});
+
+	inFlightRoutePreloads.set(to, task);
+
+	return task;
+}
diff --git a/apps/dashboard/src/lib/tab-store.ts b/apps/dashboard/src/lib/tab-store.ts
index 9d22ba9..c2cb67a 100644
--- a/apps/dashboard/src/lib/tab-store.ts
+++ b/apps/dashboard/src/lib/tab-store.ts
@@ -12,12 +12,12 @@ export interface Tab {
 	iconColor: string;
 }
 
-const STORAGE_KEY = "quickhub:tabs";
+export const TABS_STORAGE_KEY = "quickhub:tabs";
 
-function loadTabs(): Tab[] {
+export function readStoredTabs(): Tab[] {
 	if (typeof window === "undefined") return [];
 	try {
-		const raw = localStorage.getItem(STORAGE_KEY);
+		const raw = localStorage.getItem(TABS_STORAGE_KEY);
 		return raw ? JSON.parse(raw) : [];
 	} catch {
 		return [];
@@ -26,11 +26,11 @@ function loadTabs(): Tab[] {
 
 function persistTabs() {
 	try {
-		localStorage.setItem(STORAGE_KEY, JSON.stringify(tabs));
+		localStorage.setItem(TABS_STORAGE_KEY, JSON.stringify(tabs));
 	} catch {}
 }
 
-let tabs: Tab[] = loadTabs();
+let tabs: Tab[] = readStoredTabs();
 const listeners = new Set<() => void>();
 
 function emitChange() {
diff --git a/apps/dashboard/src/routes/_protected/$owner/$repo/issues.$issueId.tsx b/apps/dashboard/src/routes/_protected/$owner/$repo/issues.$issueId.tsx
index 18b0277..46202d1 100644
--- a/apps/dashboard/src/routes/_protected/$owner/$repo/issues.$issueId.tsx
+++ b/apps/dashboard/src/routes/_protected/$owner/$repo/issues.$issueId.tsx
@@ -1,5 +1,6 @@
 import { IssuesIcon } from "@quickhub/icons";
 import { Markdown } from "@quickhub/ui/components/markdown";
+import { Skeleton } from "@quickhub/ui/components/skeleton";
 import {
 	Tooltip,
 	TooltipContent,
@@ -9,12 +10,8 @@ import { cn } from "@quickhub/ui/lib/utils";
 import { useQuery } from "@tanstack/react-query";
 import { createFileRoute, Link } from "@tanstack/react-router";
 import { useState } from "react";
-import { DashboardContentLoading } from "#/components/layouts/dashboard-content-loading";
 import { formatRelativeTime } from "#/components/pulls/pull-request-row";
-import {
-	githubIssueCommentsQueryOptions,
-	githubIssueDetailQueryOptions,
-} from "#/lib/github.query";
+import { githubIssuePageQueryOptions } from "#/lib/github.query";
 import type { GitHubActor, IssueDetail } from "#/lib/github.types";
 import { useHasMounted } from "#/lib/use-has-mounted";
 import { useRegisterTab } from "#/lib/use-register-tab";
@@ -22,6 +19,29 @@ import { useRegisterTab } from "#/lib/use-register-tab";
 export const Route = createFileRoute(
 	"/_protected/$owner/$repo/issues/$issueId",
 )({
+	loader: async ({ context, params, preload }) => {
+		const issueNumber = Number(params.issueId);
+		const scope = { userId: context.user.id };
+		const pageOptions = githubIssuePageQueryOptions(scope, {
+			owner: params.owner,
+			repo: params.repo,
+			issueNumber,
+		});
+
+		if (!preload) {
+			return;
+		}
+
+		const primeQuery = (options: { queryKey: readonly unknown[] }) => {
+			if (context.queryClient.getQueryData(options.queryKey) !== undefined) {
+				return Promise.resolve();
+			}
+
+			return context.queryClient.ensureQueryData(options);
+		};
+
+		await Promise.all([primeQuery(pageOptions)]);
+	},
 	component: IssueDetailPage,
 });
 
@@ -54,17 +74,13 @@ function IssueDetailPage() {
 	const scope = { userId: user.id };
 	const hasMounted = useHasMounted();
 
-	const detailQuery = useQuery({
-		...githubIssueDetailQueryOptions(scope, { owner, repo, issueNumber }),
+	const pageQuery = useQuery({
+		...githubIssuePageQueryOptions(scope, { owner, repo, issueNumber }),
 		enabled: hasMounted,
 	});
 
-	const commentsQuery = useQuery({
-		...githubIssueCommentsQueryOptions(scope, { owner, repo, issueNumber }),
-		enabled: hasMounted && detailQuery.data != null,
-	});
-
-	const issue = detailQuery.data;
+	const issue = pageQuery.data?.detail;
+	const comments = pageQuery.data?.comments;
 
 	useRegisterTab(
 		issue
@@ -79,13 +95,8 @@ function IssueDetailPage() {
 			: null,
 	);
 
-	if (detailQuery.error) throw detailQuery.error;
-
-	if (hasMounted && detailQuery.isPending) {
-		return <DashboardContentLoading />;
-	}
-
-	if (!issue) return null;
+	if (pageQuery.error) throw pageQuery.error;
+	if (!issue) return <IssueDetailPageSkeleton />;
 
 	const stateConfig = getIssueStateConfig(issue);
 
@@ -182,14 +193,14 @@ function IssueDetailPage() {
 					<div className="flex flex-col">
 						<div className="flex items-center justify-between gap-2 rounded-lg bg-surface-1 px-4 py-2.5">
 							<h2 className="text-xs font-medium">Activity</h2>
-							{commentsQuery.data && (
+							{comments && (
 								<span className="text-xs tabular-nums text-muted-foreground">
-									{commentsQuery.data.length}
+									{comments.length}
 								</span>
 							)}
 						</div>
 
-						{commentsQuery.isFetching && !commentsQuery.data && (
+						{pageQuery.isFetching && !comments && (
 							<div className="flex items-center justify-center py-8">
 								<svg
 									className="size-4 animate-spin text-muted-foreground"
@@ -215,15 +226,15 @@ function IssueDetailPage() {
 							</div>
 						)}
 
-						{commentsQuery.data && commentsQuery.data.length === 0 && (
+						{comments && comments.length === 0 && (
 							<p className="py-4 text-sm text-muted-foreground">
 								No comments yet.
 							</p>
 						)}
 
-						{commentsQuery.data && commentsQuery.data.length > 0 && (
+						{comments && comments.length > 0 && (
 							<div className="relative flex flex-col pl-8 before:absolute before:left-4 before:top-0 before:h-full before:w-px before:bg-[linear-gradient(to_bottom,var(--color-border)_80%,transparent)]">
-								{commentsQuery.data.map((comment, i) => (
+								{comments.map((comment, i) => (
 									<div
 										key={comment.id}
 										className={cn(
@@ -287,10 +298,7 @@ function IssueDetailPage() {
 
 					{/* Participants */}
 					<SidebarSection title="Participants">
-						<ParticipantsList
-							issue={issue}
-							comments={commentsQuery.data ?? []}
-						/>
+						<ParticipantsList issue={issue} comments={comments ?? []} />
 					</SidebarSection>
 
 					{/* Milestone */}
@@ -438,3 +446,73 @@ function CommentBox() {
 		</div>
 	);
 }
+
+function IssueDetailPageSkeleton() {
+	return (
+		<div className="h-full overflow-auto">
+			<div className="mx-auto grid max-w-7xl gap-16 px-6 py-10 xl:grid-cols-[minmax(0,1fr)_minmax(16rem,20rem)]">
+				<div className="flex min-w-0 flex-col gap-8">
+					<div className="flex flex-col gap-3">
+						<Skeleton className="h-4 w-48 rounded-md" />
+						<div className="flex items-start gap-3">
+							<Skeleton className="mt-1 size-5 rounded-full" />
+							<div className="flex min-w-0 flex-1 flex-col gap-2">
+								<Skeleton className="h-8 w-3/4 rounded-md" />
+								<div className="flex gap-2">
+									<Skeleton className="h-6 w-16 rounded-full" />
+									<Skeleton className="h-6 w-48 rounded-full" />
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<div className="flex flex-wrap gap-1.5">
+						<Skeleton className="h-6 w-20 rounded-full" />
+						<Skeleton className="h-6 w-24 rounded-full" />
+					</div>
+
+					<div className="rounded-lg border bg-surface-0 p-5">
+						<div className="flex flex-col gap-2">
+							<Skeleton className="h-4 w-full rounded-md" />
+							<Skeleton className="h-4 w-[92%] rounded-md" />
+							<Skeleton className="h-4 w-[78%] rounded-md" />
+							<Skeleton className="h-4 w-[66%] rounded-md" />
+						</div>
+					</div>
+
+					<div className="flex flex-col">
+						<div className="flex items-center justify-between gap-2 rounded-lg bg-surface-1 px-4 py-2.5">
+							<Skeleton className="h-4 w-14 rounded-md" />
+							<Skeleton className="h-4 w-6 rounded-md" />
+						</div>
+						<div className="relative flex flex-col gap-5 py-5 pl-8 before:absolute before:left-4 before:top-0 before:h-full before:w-px before:bg-[linear-gradient(to_bottom,var(--color-border)_80%,transparent)]">
+							{["activity-1", "activity-2", "activity-3"].map((key) => (
+								<div key={key} className="flex flex-col gap-2">
+									<div className="flex items-center gap-2">
+										<Skeleton className="size-4 rounded-full" />
+										<Skeleton className="h-4 w-24 rounded-md" />
+										<Skeleton className="h-4 w-16 rounded-md" />
+									</div>
+									<Skeleton className="h-4 w-[88%] rounded-md" />
+									<Skeleton className="h-4 w-[72%] rounded-md" />
+								</div>
+							))}
+						</div>
+					</div>
+				</div>
+
+				<aside className="flex h-fit flex-col gap-6 xl:sticky xl:top-10">
+					{["meta-1", "meta-2", "meta-3", "meta-4"].map((key) => (
+						<div key={key} className="flex flex-col gap-2.5">
+							<Skeleton className="h-4 w-24 rounded-md" />
+							<div className="flex flex-col gap-2">
+								<Skeleton className="h-4 w-full rounded-md" />
+								<Skeleton className="h-4 w-[85%] rounded-md" />
+							</div>
+						</div>
+					))}
+				</aside>
+			</div>
+		</div>
+	);
+}
diff --git a/apps/dashboard/src/routes/_protected/$owner/$repo/pull.$pullId.tsx b/apps/dashboard/src/routes/_protected/$owner/$repo/pull.$pullId.tsx
index 5f4abf7..2ac4ed1 100644
--- a/apps/dashboard/src/routes/_protected/$owner/$repo/pull.$pullId.tsx
+++ b/apps/dashboard/src/routes/_protected/$owner/$repo/pull.$pullId.tsx
@@ -16,19 +16,41 @@ import { cn } from "@quickhub/ui/lib/utils";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { createFileRoute, Link } from "@tanstack/react-router";
 import { useState } from "react";
-import { DashboardContentLoading } from "#/components/layouts/dashboard-content-loading";
 import { formatRelativeTime } from "#/components/pulls/pull-request-row";
 import { updatePullBranch } from "#/lib/github.functions";
 import {
-	githubPullCommentsQueryOptions,
-	githubPullDetailQueryOptions,
+	githubPullPageQueryOptions,
 	githubPullStatusQueryOptions,
 } from "#/lib/github.query";
 import type { GitHubActor, PullDetail, PullStatus } from "#/lib/github.types";
+import { githubCachePolicy } from "#/lib/github-cache-policy";
 import { useHasMounted } from "#/lib/use-has-mounted";
 import { useRegisterTab } from "#/lib/use-register-tab";
 
 export const Route = createFileRoute("/_protected/$owner/$repo/pull/$pullId")({
+	loader: async ({ context, params, preload }) => {
+		const pullNumber = Number(params.pullId);
+		const scope = { userId: context.user.id };
+		const pageOptions = githubPullPageQueryOptions(scope, {
+			owner: params.owner,
+			repo: params.repo,
+			pullNumber,
+		});
+
+		if (!preload) {
+			return;
+		}
+
+		const primeQuery = (options: { queryKey: readonly unknown[] }) => {
+			if (context.queryClient.getQueryData(options.queryKey) !== undefined) {
+				return Promise.resolve();
+			}
+
+			return context.queryClient.ensureQueryData(options);
+		};
+
+		await Promise.all([primeQuery(pageOptions)]);
+	},
 	component: PullDetailPage,
 });
 
@@ -72,22 +94,24 @@ function PullDetailPage() {
 	const scope = { userId: user.id };
 	const hasMounted = useHasMounted();
 
-	const detailQuery = useQuery({
-		...githubPullDetailQueryOptions(scope, { owner, repo, pullNumber }),
+	const pageQuery = useQuery({
+		...githubPullPageQueryOptions(scope, { owner, repo, pullNumber }),
 		enabled: hasMounted,
 	});
 
-	const commentsQuery = useQuery({
-		...githubPullCommentsQueryOptions(scope, { owner, repo, pullNumber }),
-		enabled: hasMounted && detailQuery.data != null,
-	});
-
 	const statusQuery = useQuery({
 		...githubPullStatusQueryOptions(scope, { owner, repo, pullNumber }),
-		enabled: hasMounted && detailQuery.data != null,
+		enabled: hasMounted && pageQuery.data?.detail != null,
+		initialData: pageQuery.data?.status ?? undefined,
+		initialDataUpdatedAt: pageQuery.dataUpdatedAt,
+		refetchOnMount: false,
+		refetchOnWindowFocus: "always",
+		refetchInterval: githubCachePolicy.status.staleTimeMs,
 	});
 
-	const pr = detailQuery.data;
+	const pr = pageQuery.data?.detail;
+	const comments = pageQuery.data?.comments;
+	const status = statusQuery.data ?? pageQuery.data?.status ?? null;
 
 	useRegisterTab(
 		pr
@@ -102,13 +126,8 @@ function PullDetailPage() {
 			: null,
 	);
 
-	if (detailQuery.error) throw detailQuery.error;
-
-	if (hasMounted && detailQuery.isPending) {
-		return <DashboardContentLoading />;
-	}
-
-	if (!pr) return null;
+	if (pageQuery.error) throw pageQuery.error;
+	if (!pr) return <PullDetailPageSkeleton />;
 
 	const stateConfig = getPrStateConfig(pr);
 	const StateIcon = stateConfig.icon;
@@ -242,14 +261,14 @@ function PullDetailPage() {
 					<div className="flex flex-col">
 						<div className="flex items-center justify-between gap-2 rounded-lg bg-surface-1 px-4 py-2.5">
 							<h2 className="text-xs font-medium">Activity</h2>
-							{commentsQuery.data && (
+							{comments && (
 								<span className="text-xs tabular-nums text-muted-foreground">
-									{commentsQuery.data.length}
+									{comments.length}
 								</span>
 							)}
 						</div>
 
-						{commentsQuery.isFetching && !commentsQuery.data && (
+						{pageQuery.isFetching && !comments && (
 							<div className="flex items-center justify-center py-8">
 								<svg
 									className="size-4 animate-spin text-muted-foreground"
@@ -275,15 +294,15 @@ function PullDetailPage() {
 							</div>
 						)}
 
-						{commentsQuery.data && commentsQuery.data.length === 0 && (
+						{comments && comments.length === 0 && (
 							<p className="py-4 text-sm text-muted-foreground">
 								No comments yet.
 							</p>
 						)}
 
-						{commentsQuery.data && commentsQuery.data.length > 0 && (
+						{comments && comments.length > 0 && (
 							<div className="relative flex flex-col pl-8 before:absolute before:left-4 before:top-0 before:h-full before:w-px before:bg-[linear-gradient(to_bottom,var(--color-border)_80%,transparent)]">
-								{commentsQuery.data.map((comment, i) => (
+								{comments.map((comment, i) => (
 									<div
 										key={comment.id}
 										className={cn(
@@ -319,9 +338,9 @@ function PullDetailPage() {
 						{/* Status card */}
 						{!pr.isMerged && pr.state !== "closed" && (
 							<div className="mt-6">
-								{statusQuery.data ? (
+								{status ? (
 									<MergeStatusCard
-										status={statusQuery.data}
+										status={status}
 										owner={owner}
 										repo={repo}
 										pullNumber={pullNumber}
@@ -358,7 +377,7 @@ function PullDetailPage() {
 
 					{/* Participants */}
 					<SidebarSection title="Participants">
-						<ParticipantsList pr={pr} comments={commentsQuery.data ?? []} />
+						<ParticipantsList pr={pr} comments={comments ?? []} />
 					</SidebarSection>
 
 					{/* Details */}
@@ -679,6 +698,79 @@ function MergeStatusSkeleton() {
 	);
 }
 
+function PullDetailPageSkeleton() {
+	return (
+		<div className="h-full overflow-auto">
+			<div className="mx-auto grid max-w-7xl gap-16 px-6 py-10 xl:grid-cols-[minmax(0,1fr)_minmax(16rem,20rem)]">
+				<div className="flex min-w-0 flex-col gap-8">
+					<div className="flex flex-col gap-3">
+						<Skeleton className="h-3 w-32" />
+						<div className="flex items-start gap-3">
+							<Skeleton className="mt-1 size-5 rounded-full" />
+							<div className="flex min-w-0 flex-1 flex-col gap-2">
+								<Skeleton className="h-7 w-3/5" />
+								<div className="flex flex-wrap items-center gap-2">
+									<Skeleton className="h-5 w-14 rounded-full" />
+									<Skeleton className="h-4 w-64" />
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<div className="flex items-center gap-3 rounded-lg bg-surface-1 px-4 py-2.5">
+						<Skeleton className="h-4 w-20" />
+						<Skeleton className="h-4 w-16" />
+						<Skeleton className="h-4 w-24" />
+					</div>
+
+					<div className="rounded-lg border bg-surface-0 p-5">
+						<div className="flex flex-col gap-3">
+							<Skeleton className="h-4 w-full" />
+							<Skeleton className="h-4 w-5/6" />
+							<Skeleton className="h-4 w-2/3" />
+							<Skeleton className="h-4 w-3/4" />
+						</div>
+					</div>
+
+					<div className="flex flex-col gap-6">
+						<div className="flex items-center justify-between gap-2 rounded-lg bg-surface-1 px-4 py-2.5">
+							<Skeleton className="h-4 w-16" />
+							<Skeleton className="h-4 w-6" />
+						</div>
+						<div className="flex flex-col gap-4 pl-8">
+							{[0, 1, 2].map((item) => (
+								<div key={item} className="flex flex-col gap-2">
+									<div className="flex items-center gap-2">
+										<Skeleton className="size-4 rounded-full" />
+										<Skeleton className="h-3.5 w-24" />
+										<Skeleton className="h-3.5 w-16" />
+									</div>
+									<Skeleton className="h-4 w-5/6" />
+									<Skeleton className="h-4 w-2/3" />
+								</div>
+							))}
+						</div>
+						<MergeStatusSkeleton />
+					</div>
+				</div>
+
+				<aside className="flex h-fit flex-col gap-6 xl:sticky xl:top-10">
+					{[0, 1, 2].map((section) => (
+						<div key={section} className="flex flex-col gap-2.5">
+							<Skeleton className="h-3 w-20" />
+							<div className="flex flex-col gap-2">
+								<Skeleton className="h-4 w-full" />
+								<Skeleton className="h-4 w-5/6" />
+								<Skeleton className="h-4 w-2/3" />
+							</div>
+						</div>
+					))}
+				</aside>
+			</div>
+		</div>
+	);
+}
+
 function UpdateBranchButton({
 	owner,
 	repo,
diff --git a/apps/dashboard/src/routes/_protected/index.tsx b/apps/dashboard/src/routes/_protected/index.tsx
index 628c6ff..86afb86 100644
--- a/apps/dashboard/src/routes/_protected/index.tsx
+++ b/apps/dashboard/src/routes/_protected/index.tsx
@@ -11,6 +11,14 @@ import {
 import { useHasMounted } from "#/lib/use-has-mounted";
 
 export const Route = createFileRoute("/_protected/")({
+	loader: async ({ context }) => {
+		const scope = { userId: context.user.id };
+
+		await Promise.all([
+			context.queryClient.ensureQueryData(githubMyPullsQueryOptions(scope)),
+			context.queryClient.ensureQueryData(githubMyIssuesQueryOptions(scope)),
+		]);
+	},
 	component: OverviewPage,
 });
 
diff --git a/apps/dashboard/src/routes/_protected/issues.tsx b/apps/dashboard/src/routes/_protected/issues.tsx
index 9ad6f94..8c0e769 100644
--- a/apps/dashboard/src/routes/_protected/issues.tsx
+++ b/apps/dashboard/src/routes/_protected/issues.tsx
@@ -16,6 +16,12 @@ import type { IssueSummary, MyIssuesResult } from "#/lib/github.types";
 import { useHasMounted } from "#/lib/use-has-mounted";
 
 export const Route = createFileRoute("/_protected/issues")({
+	loader: async ({ context }) => {
+		const scope = { userId: context.user.id };
+		await context.queryClient.ensureQueryData(
+			githubMyIssuesQueryOptions(scope),
+		);
+	},
 	component: IssuesPage,
 });
 
diff --git a/apps/dashboard/src/routes/_protected/pulls.tsx b/apps/dashboard/src/routes/_protected/pulls.tsx
index ce41310..62fb1b8 100644
--- a/apps/dashboard/src/routes/_protected/pulls.tsx
+++ b/apps/dashboard/src/routes/_protected/pulls.tsx
@@ -22,6 +22,10 @@ import type { MyPullsResult, PullSummary } from "#/lib/github.types";
 import { useHasMounted } from "#/lib/use-has-mounted";
 
 export const Route = createFileRoute("/_protected/pulls")({
+	loader: async ({ context }) => {
+		const scope = { userId: context.user.id };
+		await context.queryClient.ensureQueryData(githubMyPullsQueryOptions(scope));
+	},
 	component: PullRequestsPage,
 });
 
diff --git a/apps/dashboard/src/routes/_protected/reviews.tsx b/apps/dashboard/src/routes/_protected/reviews.tsx
index 5ccc6cf..f177ba5 100644
--- a/apps/dashboard/src/routes/_protected/reviews.tsx
+++ b/apps/dashboard/src/routes/_protected/reviews.tsx
@@ -8,6 +8,10 @@ import { githubMyPullsQueryOptions } from "#/lib/github.query";
 import { useHasMounted } from "#/lib/use-has-mounted";
 
 export const Route = createFileRoute("/_protected/reviews")({
+	loader: async ({ context }) => {
+		const scope = { userId: context.user.id };
+		await context.queryClient.ensureQueryData(githubMyPullsQueryOptions(scope));
+	},
 	component: ReviewsPage,
 });
 

From 1e2adf8e0924436345417608ec7abd63628736e9 Mon Sep 17 00:00:00 2001
From: Alan Daniel <stylesshjs@gmail.com>
Date: Wed, 8 Apr 2026 12:00:29 -0400
Subject: [PATCH 2/2] Refine dashboard detail route loading

---
 .../components/layouts/dashboard-layout.tsx    | 18 +-----------------
 apps/dashboard/src/lib/github.functions.ts     |  6 +-----
 apps/dashboard/src/lib/github.query.ts         |  2 +-
 apps/dashboard/src/lib/github.types.ts         |  1 -
 .../$owner/$repo/issues.$issueId.tsx           |  6 +-----
 .../_protected/$owner/$repo/pull.$pullId.tsx   | 11 ++---------
 6 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/apps/dashboard/src/components/layouts/dashboard-layout.tsx b/apps/dashboard/src/components/layouts/dashboard-layout.tsx
index 06f1456..ff5be16 100644
--- a/apps/dashboard/src/components/layouts/dashboard-layout.tsx
+++ b/apps/dashboard/src/components/layouts/dashboard-layout.tsx
@@ -1,6 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
 import { getRouteApi, Outlet } from "@tanstack/react-router";
-import { useEffect, useState } from "react";
 import {
 	githubMyIssuesQueryOptions,
 	githubMyPullsQueryOptions,
@@ -14,17 +13,6 @@ export function DashboardLayout() {
 	const { user } = routeApi.useRouteContext();
 	const scope = { userId: user.id };
 	const hasMounted = useHasMounted();
-	const [isContentVisible, setIsContentVisible] = useState(false);
-
-	useEffect(() => {
-		const frameId = window.requestAnimationFrame(() => {
-			setIsContentVisible(true);
-		});
-
-		return () => {
-			window.cancelAnimationFrame(frameId);
-		};
-	}, []);
 
 	const pullsQuery = useQuery({
 		...githubMyPullsQueryOptions(scope),
@@ -61,11 +49,7 @@ export function DashboardLayout() {
 			/>
 			<div className="flex flex-1 flex-col overflow-hidden p-2 pt-0">
 				<div className="flex-1 overflow-hidden rounded-xl border bg-card shadow-[0_1px_4px_0_rgba(0,0,0,0.03)]">
-					<div
-						className={`h-full transition-opacity duration-300 ease-out ${
-							isContentVisible ? "opacity-100" : "opacity-0"
-						}`}
-					>
+					<div className="h-full">
 						<Outlet />
 					</div>
 				</div>
diff --git a/apps/dashboard/src/lib/github.functions.ts b/apps/dashboard/src/lib/github.functions.ts
index 8789ae3..57142d5 100644
--- a/apps/dashboard/src/lib/github.functions.ts
+++ b/apps/dashboard/src/lib/github.functions.ts
@@ -754,15 +754,11 @@ async function getPullPageDataResult(
 		freshForMs: githubCachePolicy.detail.staleTimeMs,
 	});
 
-	const [comments, status] = await Promise.all([
-		getPullCommentsResult(context, data),
-		getPullStatusResult(context, data, pull),
-	]);
+	const comments = await getPullCommentsResult(context, data);
 
 	return {
 		detail: mapPullDetail(pull, buildRepositoryRef(data.owner, data.repo)),
 		comments,
-		status,
 	};
 }
 
diff --git a/apps/dashboard/src/lib/github.query.ts b/apps/dashboard/src/lib/github.query.ts
index 2edd7e1..583db02 100644
--- a/apps/dashboard/src/lib/github.query.ts
+++ b/apps/dashboard/src/lib/github.query.ts
@@ -211,7 +211,7 @@ export function githubPullPageQueryOptions(
 	return queryOptions({
 		queryKey: githubQueryKeys.pulls.page(scope, input),
 		queryFn: () => getPullPageData({ data: input }),
-		staleTime: githubCachePolicy.status.staleTimeMs,
+		staleTime: githubCachePolicy.activity.staleTimeMs,
 		gcTime: githubCachePolicy.detail.gcTimeMs,
 		refetchOnMount: "always",
 		refetchOnWindowFocus: "always",
diff --git a/apps/dashboard/src/lib/github.types.ts b/apps/dashboard/src/lib/github.types.ts
index 68cf14d..3fa9c0d 100644
--- a/apps/dashboard/src/lib/github.types.ts
+++ b/apps/dashboard/src/lib/github.types.ts
@@ -155,5 +155,4 @@ export type PullStatus = {
 export type PullPageData = {
 	detail: PullDetail | null;
 	comments: PullComment[];
-	status: PullStatus | null;
 };
diff --git a/apps/dashboard/src/routes/_protected/$owner/$repo/issues.$issueId.tsx b/apps/dashboard/src/routes/_protected/$owner/$repo/issues.$issueId.tsx
index 46202d1..e3e4c94 100644
--- a/apps/dashboard/src/routes/_protected/$owner/$repo/issues.$issueId.tsx
+++ b/apps/dashboard/src/routes/_protected/$owner/$repo/issues.$issueId.tsx
@@ -19,7 +19,7 @@ import { useRegisterTab } from "#/lib/use-register-tab";
 export const Route = createFileRoute(
 	"/_protected/$owner/$repo/issues/$issueId",
 )({
-	loader: async ({ context, params, preload }) => {
+	loader: async ({ context, params }) => {
 		const issueNumber = Number(params.issueId);
 		const scope = { userId: context.user.id };
 		const pageOptions = githubIssuePageQueryOptions(scope, {
@@ -28,10 +28,6 @@ export const Route = createFileRoute(
 			issueNumber,
 		});
 
-		if (!preload) {
-			return;
-		}
-
 		const primeQuery = (options: { queryKey: readonly unknown[] }) => {
 			if (context.queryClient.getQueryData(options.queryKey) !== undefined) {
 				return Promise.resolve();
diff --git a/apps/dashboard/src/routes/_protected/$owner/$repo/pull.$pullId.tsx b/apps/dashboard/src/routes/_protected/$owner/$repo/pull.$pullId.tsx
index 2ac4ed1..94422b2 100644
--- a/apps/dashboard/src/routes/_protected/$owner/$repo/pull.$pullId.tsx
+++ b/apps/dashboard/src/routes/_protected/$owner/$repo/pull.$pullId.tsx
@@ -28,7 +28,7 @@ import { useHasMounted } from "#/lib/use-has-mounted";
 import { useRegisterTab } from "#/lib/use-register-tab";
 
 export const Route = createFileRoute("/_protected/$owner/$repo/pull/$pullId")({
-	loader: async ({ context, params, preload }) => {
+	loader: async ({ context, params }) => {
 		const pullNumber = Number(params.pullId);
 		const scope = { userId: context.user.id };
 		const pageOptions = githubPullPageQueryOptions(scope, {
@@ -37,10 +37,6 @@ export const Route = createFileRoute("/_protected/$owner/$repo/pull/$pullId")({
 			pullNumber,
 		});
 
-		if (!preload) {
-			return;
-		}
-
 		const primeQuery = (options: { queryKey: readonly unknown[] }) => {
 			if (context.queryClient.getQueryData(options.queryKey) !== undefined) {
 				return Promise.resolve();
@@ -102,16 +98,13 @@ function PullDetailPage() {
 	const statusQuery = useQuery({
 		...githubPullStatusQueryOptions(scope, { owner, repo, pullNumber }),
 		enabled: hasMounted && pageQuery.data?.detail != null,
-		initialData: pageQuery.data?.status ?? undefined,
-		initialDataUpdatedAt: pageQuery.dataUpdatedAt,
-		refetchOnMount: false,
 		refetchOnWindowFocus: "always",
 		refetchInterval: githubCachePolicy.status.staleTimeMs,
 	});
 
 	const pr = pageQuery.data?.detail;
 	const comments = pageQuery.data?.comments;
-	const status = statusQuery.data ?? pageQuery.data?.status ?? null;
+	const status = statusQuery.data ?? null;
 
 	useRegisterTab(
 		pr