diff --git a/bun.lock b/bun.lock
index 1aa91d5..192bd4a 100644
--- a/bun.lock
+++ b/bun.lock
@@ -6,6 +6,10 @@
       "name": "pulldash",
       "dependencies": {
         "@hono/node-server": "^2.0.2",
+        "@tanstack/query-async-storage-persister": "^5.101.1",
+        "@tanstack/react-query": "^5.101.1",
+        "@tanstack/react-query-devtools": "^5.101.1",
+        "@tanstack/react-query-persist-client": "^5.101.1",
         "hono": "^4.10.7",
       },
       "devDependencies": {
@@ -259,6 +263,20 @@
 
     "@swc/helpers": ["@swc/helpers@0.5.15", "", { "dependencies": { "tslib": "^2.8.0" } }, "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g=="],
 
+    "@tanstack/query-async-storage-persister": ["@tanstack/query-async-storage-persister@5.101.1", "", { "dependencies": { "@tanstack/query-core": "5.101.1", "@tanstack/query-persist-client-core": "5.101.1" } }, "sha512-QuHhCTLyQjiVFUYRW5xtgeuiP1NEmqL5wnuFgPGeO6SjTLKeN9VnAhAKsKzde3AcEZEe4PL7FehfKbVhM/9kLA=="],
+
+    "@tanstack/query-core": ["@tanstack/query-core@5.101.1", "", {}, "sha512-Y6Y92dkXtNqx67m2pMSxUsA3zOCwv862JexZRP8/EPwvKXMPu9m8rv43spiXWzOUIggQ3SQApttALStzhA8B4g=="],
+
+    "@tanstack/query-devtools": ["@tanstack/query-devtools@5.101.1", "", {}, "sha512-37RQ9U2PxlXQiv1era2t+uHgVhmiyvxqTMu30+KoVf0rufiucu6rpGRKFJk61Wh5OAZFKqCQd6lxTzFWfLZiuQ=="],
+
+    "@tanstack/query-persist-client-core": ["@tanstack/query-persist-client-core@5.101.1", "", { "dependencies": { "@tanstack/query-core": "5.101.1" } }, "sha512-rR5Er6jmdI3Oo8o6Wc0ceM6glDU4umgePu2IxM3Gy2UvPqcQONduxxxSzU1+F17mpS09XHqHKmj0Irhfb2cGYg=="],
+
+    "@tanstack/react-query": ["@tanstack/react-query@5.101.1", "", { "dependencies": { "@tanstack/query-core": "5.101.1" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-ZnONUuQKJe1bJMStXUL1s5uKN9FcfC28j5cK+iDZcdSHtUv1wtin1cGc/Oewhf2Oc4eKY7lggtpvT/AbMmhHew=="],
+
+    "@tanstack/react-query-devtools": ["@tanstack/react-query-devtools@5.101.1", "", { "dependencies": { "@tanstack/query-devtools": "5.101.1" }, "peerDependencies": { "@tanstack/react-query": "^5.101.1", "react": "^18 || ^19" } }, "sha512-OXFR9XKdEslraq3cpl3kCUeNvTIq/xGWEZiFZdn2bLB/q4WxSALMEDKYZ5yYjMQytsfnQxwQYqV4qtVEf0nuog=="],
+
+    "@tanstack/react-query-persist-client": ["@tanstack/react-query-persist-client@5.101.1", "", { "dependencies": { "@tanstack/query-persist-client-core": "5.101.1" }, "peerDependencies": { "@tanstack/react-query": "^5.101.1", "react": "^18 || ^19" } }, "sha512-bBSne+3+28EZ/Ch5a06J0YQi6d5yaT2G+vyHAyhzwzYA1FAEAFe6Ou6TsNVQaT6ef6pFShU73FL/NB4guTWNng=="],
+
     "@tanstack/react-virtual": ["@tanstack/react-virtual@3.14.3", "", { "dependencies": { "@tanstack/virtual-core": "3.17.1" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-k/cnHPVaOfn46hSbiY6n4Dzf4QjCGWSF40zR5QIIYUqPAjpA6TN7InfYmcMiDVQGP2iUn9xsRbAl8u1v3UmeVQ=="],
 
     "@tanstack/virtual-core": ["@tanstack/virtual-core@3.17.1", "", {}, "sha512-VZyW2Uiml5tmBZwPGrSD3Sz73OxzljQMCmzYHsUTPEuTsERf5xwa+uWb01xEzkz3ZSYTjj8NEb/mKHvgKxyZdA=="],
diff --git a/package.json b/package.json
index 4473963..2132682 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,10 @@
   },
   "dependencies": {
     "@hono/node-server": "^2.0.2",
+    "@tanstack/query-async-storage-persister": "^5.101.1",
+    "@tanstack/react-query": "^5.101.1",
+    "@tanstack/react-query-devtools": "^5.101.1",
+    "@tanstack/react-query-persist-client": "^5.101.1",
     "hono": "^4.10.7"
   },
   "devDependencies": {
diff --git a/scripts/build-browser.ts b/scripts/build-browser.ts
index 1d9fe59..37fc969 100644
--- a/scripts/build-browser.ts
+++ b/scripts/build-browser.ts
@@ -8,6 +8,7 @@ const isWatch = process.argv.includes("--watch");
 const REPO_URL = process.env.REPO_URL ?? "https://github.com/jennings/pulldash";
 const define = {
   __REPO_URL__: JSON.stringify(REPO_URL),
+  __DEV__: JSON.stringify(isWatch),
 };
 
 async function build() {
diff --git a/src/browser/components/home.tsx b/src/browser/components/home.tsx
index de1e25d..aa65790 100644
--- a/src/browser/components/home.tsx
+++ b/src/browser/components/home.tsx
@@ -1,4 +1,6 @@
 import { useState, useEffect, useCallback, useMemo } from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { queries } from "../lib/queries";
 import {
   Search,
   GitPullRequest,
@@ -43,8 +45,6 @@ import {
 import {
   useGitHubStore,
   useGitHubReady,
-  usePRList,
-  usePRListActions,
   getCachedTeams,
   type PRSearchResult,
 } from "../contexts/github";
@@ -326,9 +326,7 @@ export function Home() {
   const github = useGitHubStore();
   const { isAuthenticated } = useAuth();
 
-  // Data store
-  const prList = usePRList();
-  const { fetchPRList, refreshPRList } = usePRListActions();
+  const queryClient = useQueryClient();
 
   // Filter config
   const [config, setConfig] = useState<FilterConfig>(getFilterConfig);
@@ -361,21 +359,29 @@ export function Home() {
     saveFilterConfig(config);
   }, [config]);
 
-  useEffect(() => {
-    if (githubReady) {
-      fetchPRList(searchQueries, page, perPage);
-    }
-  }, [fetchPRList, searchQueries, page, perPage, githubReady]);
-
   // Reset page when config changes
   useEffect(() => {
     setPage(1);
   }, [config.repos, config.state]);
 
+  // PR list via React Query
+  const {
+    data: prListData,
+    isFetching: loadingPrs,
+    isPending: prListPending,
+    dataUpdatedAt,
+  } = useQuery({
+    ...queries.prList(searchQueries, page, perPage),
+    enabled: githubReady,
+  });
+
+  const refreshPRList = useCallback(() => {
+    queryClient.invalidateQueries({ queryKey: ["pr-list"] });
+  }, [queryClient]);
+
   // Convenience accessors
-  const prs = prList.items;
-  const loadingPrs = prList.loading;
-  const totalCount = prList.totalCount;
+  const prs = prListData?.items ?? [];
+  const totalCount = prListData?.totalCount ?? 0;
 
   // Client-side filter for UPDATED PRs
   const filteredPrs = useMemo(() => {
@@ -1045,8 +1051,8 @@ export function Home() {
               )}
             </span>
             <div className="flex items-center gap-2">
-              {prList.lastFetchedAt && !loadingPrs && (
-                <RefreshCountdown lastFetchedAt={prList.lastFetchedAt} />
+              {dataUpdatedAt > 0 && !loadingPrs && (
+                <RefreshCountdown lastFetchedAt={dataUpdatedAt} />
               )}
               <button
                 onClick={refreshPRList}
@@ -1066,8 +1072,7 @@ export function Home() {
 
           {/* PR List */}
           <div className="flex-1 overflow-auto">
-            {loadingPrs ||
-            (config.repos.length > 0 && prs.length === 0 && !prList.error) ? (
+            {loadingPrs || (config.repos.length > 0 && prListPending) ? (
               <PRListSkeleton count={8} />
             ) : prs.length === 0 ? (
               <div className="flex flex-col items-center justify-center py-20 text-center">
diff --git a/src/browser/components/pr-overview.tsx b/src/browser/components/pr-overview.tsx
index ffd5275..4f85ec1 100644
--- a/src/browser/components/pr-overview.tsx
+++ b/src/browser/components/pr-overview.tsx
@@ -59,8 +59,11 @@ import { usePRReviewSelector, usePRReviewStore } from "../contexts/pr-review";
 import { getTimeAgo, formatDateTime } from "../lib/dates";
 import { parseDiffCached, type ParsedDiff } from "../lib/diff";
 import type { ReviewComment } from "@/api/types";
+import { useQuery } from "@tanstack/react-query";
+import { queries } from "../lib/queries";
 import {
   useGitHub,
+  useGitHubReady,
   useCurrentUser,
   type Review as GitHubReview,
   type IssueComment as GitHubIssueComment,
@@ -204,9 +207,13 @@ export const PROverview = memo(function PROverview() {
   const canResolveThread = canWrite && hasWritePermission;
 
   // Reviewers and Assignees state
-  const [collaborators, setCollaborators] = useState<
-    Array<{ login: string; avatar_url: string }>
-  >([]);
+  const { ready } = useGitHubReady();
+  const { data: collaboratorsRaw = [], isLoading: loadingCollaborators } =
+    useQuery({ ...queries.collaborators(owner, repo), enabled: ready });
+  const collaborators = collaboratorsRaw.map((c) => ({
+    login: c.login || "",
+    avatar_url: c.avatar_url || "",
+  }));
   const [showReviewersPicker, setShowReviewersPicker] = useState(false);
   const [showAssigneesPicker, setShowAssigneesPicker] = useState(false);
   const [reviewersPickerPosition, setReviewersPickerPosition] = useState({
@@ -217,7 +224,6 @@ export const PROverview = memo(function PROverview() {
     top: 0,
     left: 0,
   });
-  const [loadingCollaborators, setLoadingCollaborators] = useState(false);
   const [reviewerSearchQuery, setReviewerSearchQuery] = useState("");
   const [assigneeSearchQuery, setAssigneeSearchQuery] = useState("");
   const reviewersButtonRef = useRef<HTMLButtonElement>(null);
@@ -366,25 +372,6 @@ export const PROverview = memo(function PROverview() {
     await store.updateBranch();
   }, [store]);
 
-  // Fetch collaborators when picker is opened
-  const fetchCollaborators = useCallback(async () => {
-    if (collaborators.length > 0) return;
-    setLoadingCollaborators(true);
-    try {
-      const data = await github.getRepoCollaborators(owner, repo);
-      setCollaborators(
-        data.map((c) => ({
-          login: c.login || "",
-          avatar_url: c.avatar_url || "",
-        }))
-      );
-    } catch (error) {
-      console.error("Failed to fetch collaborators:", error);
-    } finally {
-      setLoadingCollaborators(false);
-    }
-  }, [github, owner, repo, collaborators.length]);
-
   const handleToggleReviewersPicker = useCallback(() => {
     if (!showReviewersPicker && reviewersButtonRef.current) {
       const rect = reviewersButtonRef.current.getBoundingClientRect();
@@ -392,14 +379,13 @@ export const PROverview = memo(function PROverview() {
         top: rect.bottom + 4,
         left: Math.min(rect.left, window.innerWidth - 280),
       });
-      fetchCollaborators();
       setReviewerSearchQuery("");
       // Focus the search input after a short delay to allow the picker to render
       setTimeout(() => reviewerSearchInputRef.current?.focus(), 50);
     }
     setShowReviewersPicker(!showReviewersPicker);
     setShowAssigneesPicker(false);
-  }, [showReviewersPicker, fetchCollaborators]);
+  }, [showReviewersPicker]);
 
   const handleToggleAssigneesPicker = useCallback(() => {
     if (!showAssigneesPicker && assigneesButtonRef.current) {
@@ -408,14 +394,13 @@ export const PROverview = memo(function PROverview() {
         top: rect.bottom + 4,
         left: Math.min(rect.left, window.innerWidth - 280),
       });
-      fetchCollaborators();
       setAssigneeSearchQuery("");
       // Focus the search input after a short delay to allow the picker to render
       setTimeout(() => assigneeSearchInputRef.current?.focus(), 50);
     }
     setShowAssigneesPicker(!showAssigneesPicker);
     setShowReviewersPicker(false);
-  }, [showAssigneesPicker, fetchCollaborators]);
+  }, [showAssigneesPicker]);
 
   // Helper to refetch PR and update store
   const refetchPR = useCallback(async () => {
@@ -532,7 +517,7 @@ export const PROverview = memo(function PROverview() {
         });
 
         // 3. Invalidate cache so future fetches get fresh data
-        github.invalidateCache(`pr:${owner}/${repo}/${pr.number}`);
+        github.invalidatePR(owner, repo, pr.number);
 
         // 4. Refetch timeline (reviewer request creates event)
         refetchTimeline();
@@ -558,7 +543,7 @@ export const PROverview = memo(function PROverview() {
         });
 
         // 3. Invalidate cache so future fetches get fresh data
-        github.invalidateCache(`pr:${owner}/${repo}/${pr.number}`);
+        github.invalidatePR(owner, repo, pr.number);
 
         // 4. Refetch timeline
         refetchTimeline();
@@ -605,7 +590,7 @@ export const PROverview = memo(function PROverview() {
         });
 
         // 3. Invalidate cache so future fetches get fresh data
-        github.invalidateCache(`pr:${owner}/${repo}/${pr.number}`);
+        github.invalidatePR(owner, repo, pr.number);
 
         // 4. Refetch timeline (assignee change creates event)
         refetchTimeline();
@@ -629,7 +614,7 @@ export const PROverview = memo(function PROverview() {
         });
 
         // 3. Invalidate cache so future fetches get fresh data
-        github.invalidateCache(`pr:${owner}/${repo}/${pr.number}`);
+        github.invalidatePR(owner, repo, pr.number);
 
         // 4. Refetch timeline
         refetchTimeline();
@@ -676,7 +661,7 @@ export const PROverview = memo(function PROverview() {
       });
 
       // 3. Invalidate cache so future fetches get fresh data
-      github.invalidateCache(`pr:${owner}/${repo}/${pr.number}`);
+      github.invalidatePR(owner, repo, pr.number);
 
       // 4. Refetch timeline
       refetchTimeline();
@@ -2504,7 +2489,7 @@ export const PROverview = memo(function PROverview() {
                   store.setPr({ ...pr, labels: newLabels });
 
                   // 3. Invalidate cache so future fetches get fresh data
-                  github.invalidateCache(`pr:${owner}/${repo}/${pr.number}`);
+                  github.invalidatePR(owner, repo, pr.number);
 
                   // 4. Refetch timeline (label change creates event)
                   github
@@ -2647,28 +2632,15 @@ function LabelsSection({
   onLabelToggle,
   canWrite = true,
 }: LabelsSectionProps) {
-  const github = useGitHub();
+  const { ready } = useGitHubReady();
+  const { data: repoLabels = [], isLoading: loadingLabels } = useQuery({
+    ...queries.labels(owner, repo),
+    enabled: ready,
+  });
   const [showPicker, setShowPicker] = useState(false);
-  const [repoLabels, setRepoLabels] = useState<
-    Array<{ name: string; color: string; description?: string | null }>
-  >([]);
-  const [loadingLabels, setLoadingLabels] = useState(false);
   const [pickerPosition, setPickerPosition] = useState({ top: 0, left: 0 });
   const buttonRef = useRef<HTMLButtonElement>(null);
 
-  const fetchLabels = useCallback(async () => {
-    if (repoLabels.length > 0) return;
-    setLoadingLabels(true);
-    try {
-      const labels = await github.getRepoLabels(owner, repo);
-      setRepoLabels(labels);
-    } catch (error) {
-      console.error("Failed to fetch labels:", error);
-    } finally {
-      setLoadingLabels(false);
-    }
-  }, [github, owner, repo, repoLabels.length]);
-
   const handleTogglePicker = useCallback(() => {
     if (!showPicker && buttonRef.current) {
       const rect = buttonRef.current.getBoundingClientRect();
@@ -2676,10 +2648,9 @@ function LabelsSection({
         top: rect.bottom + 4,
         left: Math.min(rect.left, window.innerWidth - 280),
       });
-      fetchLabels();
     }
     setShowPicker(!showPicker);
-  }, [showPicker, fetchLabels]);
+  }, [showPicker]);
 
   const handleToggleLabel = useCallback(
     async (labelName: string, labelColor: string) => {
diff --git a/src/browser/contexts/auth.tsx b/src/browser/contexts/auth.tsx
index def229f..20cce99 100644
--- a/src/browser/contexts/auth.tsx
+++ b/src/browser/contexts/auth.tsx
@@ -185,11 +185,11 @@ function clearAllStorage(): void {
       localStorage.removeItem(key);
     }
 
-    // Remove gh_cache:* keys
+    // Remove legacy pr-* preference keys
     const toRemove: string[] = [];
     for (let i = 0; i < localStorage.length; i++) {
       const k = localStorage.key(i);
-      if (k?.startsWith("gh_cache:") || k?.startsWith("pr-")) {
+      if (k?.startsWith("pr-")) {
         toRemove.push(k);
       }
     }
@@ -206,13 +206,6 @@ function clearAllStorage(): void {
     } catch {
       // IndexedDB may not be available
     }
-
-    // Delete Service Worker cache
-    try {
-      caches.delete("pulldash-v1");
-    } catch {
-      // Cache API may not be available
-    }
   } catch {
     // Ignore storage errors
   }
diff --git a/src/browser/contexts/github.tsx b/src/browser/contexts/github.tsx
index c1de314..8687171 100644
--- a/src/browser/contexts/github.tsx
+++ b/src/browser/contexts/github.tsx
@@ -7,10 +7,14 @@ import {
   useSyncExternalStore,
   type ReactNode,
 } from "react";
+import { useQuery } from "@tanstack/react-query";
 import { Octokit } from "@octokit/core";
 import type { components } from "@octokit/openapi-types";
 import { useAuth } from "./auth";
 import * as PersistentCache from "../lib/persistent-cache";
+import { setOctokit } from "../lib/github-client";
+import { queryClient } from "../lib/query-client";
+import { queries } from "../lib/queries";
 
 export type UserTeam = { org: string; slug: string };
 let userTeamsCache: UserTeam[] | null = null;
@@ -248,155 +252,6 @@ export interface PendingReview {
   };
 }
 
-// ============================================================================
-// Persistent Cache with Stale-While-Revalidate
-// ============================================================================
-
-interface CacheEntry<T> {
-  data: T;
-  timestamp: number;
-}
-
-interface PendingRequest<T> {
-  promise: Promise<T>;
-  timestamp: number;
-}
-
-const DEFAULT_CACHE_TTL = 30_000; // 30 seconds
-const STORAGE_PREFIX = "gh_cache:";
-
-class RequestCache {
-  private cache = new Map<string, CacheEntry<unknown>>();
-  private pending = new Map<string, PendingRequest<unknown>>();
-  private persistKeys = new Set<string>(); // Keys that should be persisted
-
-  constructor() {
-    // Load persisted cache on startup
-    this.loadFromStorage();
-  }
-
-  private loadFromStorage() {
-    try {
-      for (let i = 0; i < localStorage.length; i++) {
-        const key = localStorage.key(i);
-        if (key?.startsWith(STORAGE_PREFIX)) {
-          const cacheKey = key.slice(STORAGE_PREFIX.length);
-          const stored = localStorage.getItem(key);
-          if (stored) {
-            const entry = JSON.parse(stored) as CacheEntry<unknown>;
-            this.cache.set(cacheKey, entry);
-            this.persistKeys.add(cacheKey);
-          }
-        }
-      }
-    } catch {
-      // Ignore storage errors
-    }
-  }
-
-  private saveToStorage(key: string, entry: CacheEntry<unknown>) {
-    try {
-      localStorage.setItem(STORAGE_PREFIX + key, JSON.stringify(entry));
-      this.persistKeys.add(key);
-    } catch {
-      // Ignore storage errors (quota exceeded, etc.)
-    }
-  }
-
-  private removeFromStorage(key: string) {
-    try {
-      localStorage.removeItem(STORAGE_PREFIX + key);
-      this.persistKeys.delete(key);
-    } catch {
-      // Ignore
-    }
-  }
-
-  /**
-   * Get cached data. Returns null if no cache or cache is stale.
-   */
-  get<T>(key: string, ttl = DEFAULT_CACHE_TTL): T | null {
-    const entry = this.cache.get(key);
-    if (!entry) return null;
-    if (Date.now() - entry.timestamp > ttl) {
-      this.cache.delete(key);
-      this.removeFromStorage(key);
-      return null;
-    }
-    return entry.data as T;
-  }
-
-  /**
-   * Get cached data even if stale (for SWR pattern).
-   * Returns { data, isStale } or null if no cache exists.
-   */
-  getStale<T>(
-    key: string,
-    freshTtl = DEFAULT_CACHE_TTL
-  ): { data: T; isStale: boolean } | null {
-    const entry = this.cache.get(key);
-    if (!entry) return null;
-    const isStale = Date.now() - entry.timestamp > freshTtl;
-    return { data: entry.data as T, isStale };
-  }
-
-  set<T>(key: string, data: T, persist = false): void {
-    const entry = { data, timestamp: Date.now() };
-    this.cache.set(key, entry);
-    if (persist || this.persistKeys.has(key)) {
-      this.saveToStorage(key, entry);
-    }
-  }
-
-  getPending<T>(key: string): Promise<T> | null {
-    const pending = this.pending.get(key);
-    if (!pending) return null;
-    return pending.promise as Promise<T>;
-  }
-
-  setPending<T>(key: string, promise: Promise<T>): void {
-    this.pending.set(key, { promise, timestamp: Date.now() });
-    promise.finally(() => this.pending.delete(key));
-  }
-
-  clearPending(key: string): void {
-    this.pending.delete(key);
-  }
-
-  invalidate(pattern?: string): void {
-    if (!pattern) {
-      // Clear all memory cache
-      this.cache.clear();
-      // Clear all pending requests
-      this.pending.clear();
-      // Clear persisted cache
-      for (const key of this.persistKeys) {
-        this.removeFromStorage(key);
-      }
-      return;
-    }
-    for (const key of this.cache.keys()) {
-      if (key.includes(pattern)) {
-        this.cache.delete(key);
-        this.removeFromStorage(key);
-      }
-    }
-    // Also clear pending requests matching the pattern
-    for (const key of this.pending.keys()) {
-      if (key.includes(pattern)) {
-        this.pending.delete(key);
-      }
-    }
-  }
-
-  /**
-   * Check if we have any cached data (fresh or stale) for a key.
-   */
-  has(key: string): boolean {
-    return this.cache.has(key);
-  }
-}
-
 // ============================================================================
 // GraphQL Batcher - Combines multiple queries within a time window
 // ============================================================================
@@ -489,14 +344,6 @@ class GraphQLBatcher {
 // State Types
 // ============================================================================
 
-interface PRListState {
-  items: PRSearchResult[];
-  totalCount: number;
-  loading: boolean;
-  error: string | null;
-  lastFetchedAt: number | null;
-}
-
 interface PRCheckState {
   status: CheckStatus | null;
   loading: boolean;
@@ -518,10 +365,6 @@ export interface CurrentUserData {
 interface GitHubState {
   ready: boolean;
   error: string | null;
-  currentUser: CurrentUserData | null;
-  prList: PRListState;
-  prListQueries: string[];
-  prListPage: number;
   prChecks: Map<string, PRCheckState>;
 }
 
@@ -535,25 +378,15 @@ function createGitHubStore() {
   let state: GitHubState = {
     ready: false,
     error: null,
-    currentUser: null,
-    prList: {
-      items: [],
-      totalCount: 0,
-      loading: false,
-      error: null,
-      lastFetchedAt: null,
-    },
-    prListQueries: [],
-    prListPage: 1,
     prChecks: new Map(),
   };
 
   const listeners = new Set<Listener>();
-  const cache = new RequestCache();
+  // In-flight dedup for immutable (SHA-keyed) fetches that go directly to PersistentCache
+  const immutablePending = new Map<string, Promise<unknown>>();
   let octokit: Octokit | null = null;
   let batcher: GraphQLBatcher | null = null;
   let onUnauthorized: (() => void) | null = null;
-  let prListAbortController: AbortController | null = null;
   let onRateLimited: (() => void) | null = null;
 
   function setOnUnauthorized(callback: () => void) {
@@ -620,281 +453,30 @@ function createGitHubStore() {
   // Initialization
   // ---------------------------------------------------------------------------
 
-  function extractUserData(
-    user: components["schemas"]["private-user"]
-  ): CurrentUserData {
-    return {
-      id: user.id,
-      login: user.login,
-      name: user.name ?? null,
-      email: user.email ?? null,
-      avatar_url: user.avatar_url,
-      html_url: user.html_url,
-      bio: user.bio ?? null,
-      company: user.company ?? null,
-      location: user.location ?? null,
-    };
-  }
-
   function initialize(token: string) {
-    // Load cached user immediately for instant UI
-    const cachedUser =
-      cache.getStale<components["schemas"]["private-user"]>("user:current");
-    if (cachedUser) {
-      setState({ currentUser: extractUserData(cachedUser.data) });
-    }
-
     octokit = new Octokit({ auth: token });
     wrapOctokitWithHooks(octokit);
     batcher = new GraphQLBatcher(octokit);
+    setOctokit(octokit);
 
     setState({ ready: true, error: null });
 
-    // Revalidate current user and teams in background
-    fetchCurrentUser();
+    // Revalidate teams in background
     fetchUserTeams();
   }
 
   function reset() {
     octokit = null;
     batcher = null;
-    cache.invalidate();
+    setOctokit(null);
+    queryClient.clear();
     setState({
       ready: false,
       error: null,
-      currentUser: null,
-      prList: {
-        items: [],
-        totalCount: 0,
-        loading: false,
-        error: null,
-        lastFetchedAt: null,
-      },
-      prListQueries: [],
-      prListPage: 1,
       prChecks: new Map(),
     });
   }
 
-  // ---------------------------------------------------------------------------
-  // Current User (with SWR)
-  // ---------------------------------------------------------------------------
-
-  async function fetchCurrentUser() {
-    if (!octokit) return;
-
-    const cacheKey = "user:current";
-    const FRESH_TTL = 300_000; // 5 minutes
-
-    // Check for stale data - return immediately if we have any
-    const stale = cache.getStale<components["schemas"]["private-user"]>(
-      cacheKey,
-      FRESH_TTL
-    );
-    if (stale) {
-      setState({ currentUser: extractUserData(stale.data) });
-      // If fresh, don't revalidate
-      if (!stale.isStale) return;
-    }
-
-    // Check for pending request
-    const pending =
-      cache.getPending<components["schemas"]["private-user"]>(cacheKey);
-    if (pending) {
-      const user = await pending;
-      setState({ currentUser: extractUserData(user) });
-      return;
-    }
-
-    // Fetch fresh data (in background if we had stale data)
-    const promise = octokit.request("GET /user").then((r) => {
-      cache.set(cacheKey, r.data, true); // persist to localStorage
-      return r.data;
-    });
-    cache.setPending(cacheKey, promise);
-
-    try {
-      const user = await promise;
-      setState({
-        currentUser: extractUserData(
-          user as components["schemas"]["private-user"]
-        ),
-      });
-    } catch {
-      // Ignore - we may have stale data to show
-    }
-  }
-
-  // ---------------------------------------------------------------------------
-  // PR List
-  // ---------------------------------------------------------------------------
-
-  async function fetchPRList(
-    queries: string[],
-    page = 1,
-    perPage = 30,
-    options?: { backgroundRefresh?: boolean }
-  ) {
-    if (!octokit || !batcher) return;
-
-    const { backgroundRefresh = false } = options ?? {};
-
-    // Abort any in-flight request
-    prListAbortController?.abort();
-    const abortController = new AbortController();
-    prListAbortController = abortController;
-
-    if (queries.length === 0) {
-      setState({
-        prList: {
-          items: [],
-          totalCount: 0,
-          loading: false,
-          error: null,
-          lastFetchedAt: Date.now(),
-        },
-        prListQueries: queries,
-        prListPage: page,
-      });
-      return;
-    }
-
-    const cacheKey = `prlist:${queries.sort().join("|")}:${page}:${perPage}`;
-    const FRESH_TTL = 30_000; // 30 seconds
-
-    // Check for stale data - show immediately if we have any
-    const stale = cache.getStale<{
-      items: PRSearchResult[];
-      totalCount: number;
-    }>(cacheKey, FRESH_TTL);
-    if (stale) {
-      setState({
-        prList: {
-          ...stale.data,
-          // Don't show loading state for background refreshes
-          loading: backgroundRefresh ? false : stale.isStale,
-          error: null,
-          lastFetchedAt: Date.now(),
-        },
-        prListQueries: queries,
-        prListPage: page,
-      });
-      // If fresh, don't revalidate
-      if (!stale.isStale) return;
-    } else if (!backgroundRefresh) {
-      // Only show loading state if this is not a background refresh
-      setState((s) => ({
-        prList: { ...s.prList, loading: true, error: null },
-        prListQueries: queries,
-        prListPage: page,
-      }));
-    }
-
-    try {
-      // Fetch PRs with caching, passing the abort signal
-      const results = await Promise.all(
-        queries.map((q) => searchPRs(q, page, perPage, abortController.signal))
-      );
-
-      // Check if aborted before processing results
-      if (abortController.signal.aborted) return;
-
-      // Combine and dedupe by PR id
-      const seen = new Set<number>();
-      const combined: PRSearchResult[] = [];
-      let total = 0;
-
-      for (const data of results) {
-        total += data.total_count || 0;
-        for (const pr of data.items || []) {
-          if (!seen.has(pr.id)) {
-            seen.add(pr.id);
-            combined.push(pr as PRSearchResult);
-          }
-        }
-      }
-
-      // Sort by updated_at descending
-      combined.sort(
-        (a, b) =>
-          new Date(b.updated_at).getTime() - new Date(a.updated_at).getTime()
-      );
-
-      // Enrich with GraphQL data
-      const prIdentifiers = combined
-        .map((item) => {
-          const match = item.repository_url?.match(/repos\/([^/]+)\/([^/]+)/);
-          if (match && item.number) {
-            return { owner: match[1], repo: match[2], number: item.number };
-          }
-          return null;
-        })
-        .filter(
-          (x): x is { owner: string; repo: string; number: number } =>
-            x !== null
-        );
-
-      if (prIdentifiers.length > 0) {
-        try {
-          const enrichmentMap = await getPREnrichment(prIdentifiers);
-
-          // Check if aborted after enrichment
-          if (abortController.signal.aborted) return;
-
-          for (const item of combined) {
-            const match = item.repository_url?.match(/repos\/([^/]+)\/([^/]+)/);
-            if (match && item.number) {
-              const key = `${match[1]}/${match[2]}/${item.number}`;
-              const enrichment = enrichmentMap.get(key);
-              if (enrichment) {
-                Object.assign(item, enrichment);
-              }
-            }
-          }
-        } catch (enrichmentError) {
-          console.error("PR enrichment failed:", enrichmentError);
-        }
-      }
-
-      // Final check before updating state
-      if (abortController.signal.aborted) return;
-
-      // Cache the result (persist for instant load next time)
-      cache.set(cacheKey, { items: combined, totalCount: total }, true);
-
-      setState({
-        prList: {
-          items: combined,
-          totalCount: total,
-          loading: false,
-          error: null,
-          lastFetchedAt: Date.now(),
-        },
-      });
-    } catch (e) {
-      // Ignore abort errors - they're expected when switching filters
-      if (e instanceof Error && e.name === "AbortError") return;
-
-      // Only update error state if not aborted
-      if (abortController.signal.aborted) return;
-
-      setState((s) => ({
-        prList: {
-          ...s.prList,
-          loading: false,
-          error: e instanceof Error ? e.message : "Failed to fetch PRs",
-        },
-      }));
-    }
-  }
-
-  function refreshPRList() {
-    const { prListQueries, prListPage } = state;
-    if (prListQueries.length > 0) {
-      fetchPRList(prListQueries, prListPage, 30, { backgroundRefresh: true });
-    }
-  }
-
   // ---------------------------------------------------------------------------
   // PR Checks
   // ---------------------------------------------------------------------------
@@ -1032,48 +614,17 @@ function createGitHubStore() {
   // API Methods (with caching and deduplication)
   // ---------------------------------------------------------------------------
 
-  async function searchPRs(
-    query: string,
-    page = 1,
-    perPage = 30,
-    signal?: AbortSignal
-  ) {
-    if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `search:prs:${query}:${page}:${perPage}`;
-
-    const cached =
-      cache.get<
-        Awaited<
-          ReturnType<typeof octokit.request<"GET /search/issues">>
-        >["data"]
-      >(cacheKey);
-    if (cached) return cached;
-
-    const pending =
-      cache.getPending<
-        Awaited<
-          ReturnType<typeof octokit.request<"GET /search/issues">>
-        >["data"]
-      >(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request("GET /search/issues", {
-        q: query,
-        sort: "updated",
-        order: "desc",
-        per_page: perPage,
-        page,
-        request: { signal },
-      })
-      .then((res) => {
-        cache.set(cacheKey, res.data);
-        return res.data;
-      });
+  function invalidatePR(owner: string, repo: string, number: number) {
+    // Prefix match: invalidates the PR header AND every sub-query
+    // (files, commits, push-versions, comments, reviews, conversation, timeline).
+    queryClient.invalidateQueries({
+      queryKey: ["pull-request", owner, repo, number],
+    });
+    queryClient.invalidateQueries({ queryKey: ["pr-list"] });
+  }
 
-    cache.setPending(cacheKey, promise);
-    return promise;
+  function searchPRs(query: string, page = 1, perPage = 30) {
+    return queryClient.fetchQuery(queries.searchPRs(query, page, perPage));
   }
 
   async function fetchUserTeams() {
@@ -1129,146 +680,32 @@ function createGitHubStore() {
     }
   }
 
-  async function searchRepos(query: string) {
-    if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `search:repos:${query}`;
-
-    const cached =
-      cache.get<
-        Awaited<
-          ReturnType<typeof octokit.request<"GET /search/repositories">>
-        >["data"]
-      >(cacheKey);
-    if (cached) return cached;
-
-    const pending =
-      cache.getPending<
-        Awaited<
-          ReturnType<typeof octokit.request<"GET /search/repositories">>
-        >["data"]
-      >(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request("GET /search/repositories", {
-        q: query,
-        order: "desc",
-        per_page: 10,
-      })
-      .then((res) => {
-        cache.set(cacheKey, res.data);
-        return res.data;
-      });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+  function searchRepos(query: string) {
+    return queryClient.fetchQuery(queries.searchRepos(query));
   }
 
-  async function searchUsers(query: string) {
-    if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `search:users:${query}`;
-
-    type UserSearchResult = Awaited<
-      ReturnType<typeof octokit.request<"GET /search/users">>
-    >["data"];
-
-    const cached = cache.get<UserSearchResult>(cacheKey);
-    if (cached) return cached;
-
-    const pending = cache.getPending<UserSearchResult>(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request("GET /search/users", {
-        q: query,
-        per_page: 8,
-      })
-      .then((res) => {
-        cache.set(cacheKey, res.data);
-        return res.data;
-      });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+  function searchUsers(query: string) {
+    return queryClient.fetchQuery(queries.searchUsers(query));
   }
 
-  async function getPR(
+  function getPR(
     owner: string,
     repo: string,
     number: number
   ): Promise<PullRequest> {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `pr:${owner}/${repo}/${number}`;
-
-    const cached = cache.get<PullRequest>(cacheKey);
-    if (cached) return cached;
-
-    const pending = cache.getPending<PullRequest>(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request("GET /repos/{owner}/{repo}/pulls/{pull_number}", {
-        owner,
-        repo,
-        pull_number: number,
-        headers: {
-          // Request full media type to get both body and body_html with signed attachment URLs
-          accept: "application/vnd.github.full+json",
-        },
-      })
-      .then((res) => {
-        cache.set(cacheKey, res.data as PullRequest);
-        return res.data as PullRequest;
-      });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+    return queryClient.fetchQuery(queries.pullRequest(owner, repo, number));
   }
 
-  async function getPRFiles(
+  function getPRFiles(
     owner: string,
     repo: string,
     number: number
   ): Promise<PullRequestFile[]> {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `pr:${owner}/${repo}/${number}:files`;
-
-    const cached = cache.get<PullRequestFile[]>(cacheKey);
-    if (cached) return cached;
-
-    const pending = cache.getPending<PullRequestFile[]>(cacheKey);
-    if (pending) return pending;
-
-    const promise = (async () => {
-      const files: PullRequestFile[] = [];
-      let page = 1;
-
-      while (true) {
-        const { data } = await octokit!.request(
-          "GET /repos/{owner}/{repo}/pulls/{pull_number}/files",
-          {
-            owner,
-            repo,
-            pull_number: number,
-            per_page: 100,
-            page,
-          }
-        );
-        files.push(...data);
-        if (data.length < 100) break;
-        page++;
-      }
-
-      cache.set(cacheKey, files);
-      return files;
-    })();
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+    return queryClient.fetchQuery(
+      queries.pullRequestFiles(owner, repo, number)
+    );
   }
 
   async function getCommitFiles(
@@ -1281,18 +718,12 @@ function createGitHubStore() {
 
     const cacheKey = `commit:${owner}/${repo}/${sha}:files`;
 
-    const cached = cache.get<PullRequestFile[]>(cacheKey);
-    if (cached) return cached;
+    const persistent = await PersistentCache.get<PullRequestFile[]>(cacheKey);
+    if (persistent) return persistent;
 
-    if (prKey) {
-      const persistent = await PersistentCache.get<PullRequestFile[]>(cacheKey);
-      if (persistent) {
-        cache.set(cacheKey, persistent);
-        return persistent;
-      }
-    }
-
-    const pending = cache.getPending<PullRequestFile[]>(cacheKey);
+    const pending = immutablePending.get(cacheKey) as
+      | Promise<PullRequestFile[]>
+      | undefined;
     if (pending) return pending;
 
     const promise = octokit
@@ -1303,12 +734,12 @@ function createGitHubStore() {
       })
       .then((res) => {
         const files = (res.data.files ?? []) as PullRequestFile[];
-        cache.set(cacheKey, files);
         if (prKey) PersistentCache.put(cacheKey, files, prKey);
         return files;
-      });
+      })
+      .finally(() => immutablePending.delete(cacheKey));
 
-    cache.setPending(cacheKey, promise);
+    immutablePending.set(cacheKey, promise);
     return promise;
   }
 
@@ -1322,16 +753,13 @@ function createGitHubStore() {
 
     const cacheKey = `commit:${owner}/${repo}:${ref}`;
 
-    const cached = cache.get<PRCommit>(cacheKey);
-    if (cached) return cached;
+    const persistent = await PersistentCache.get<PRCommit>(cacheKey);
+    if (persistent) return persistent;
 
-    if (prKey) {
-      const persistent = await PersistentCache.get<PRCommit>(cacheKey);
-      if (persistent) {
-        cache.set(cacheKey, persistent);
-        return persistent;
-      }
-    }
+    const pending = immutablePending.get(cacheKey) as
+      | Promise<PRCommit>
+      | undefined;
+    if (pending) return pending;
 
     const promise = octokit
       .request("GET /repos/{owner}/{repo}/commits/{ref}", {
@@ -1341,12 +769,12 @@ function createGitHubStore() {
       })
       .then((res) => {
         const data = res.data as PRCommit;
-        cache.set(cacheKey, data);
         if (prKey) PersistentCache.put(cacheKey, data, prKey);
         return data;
-      });
+      })
+      .finally(() => immutablePending.delete(cacheKey));
 
-    cache.setPending(cacheKey, promise);
+    immutablePending.set(cacheKey, promise);
     return promise;
   }
 
@@ -1359,25 +787,14 @@ function createGitHubStore() {
     if (!octokit) throw new Error("Not initialized");
 
     const cacheKey = `git-commit:${owner}/${repo}:${ref}`;
+    type RawCommit = { verification: { payload: string } | null };
 
-    const cached = cache.get<{ verification: { payload: string } | null }>(
-      cacheKey
-    );
-    if (cached) return cached;
+    const persistent = await PersistentCache.get<RawCommit>(cacheKey);
+    if (persistent) return persistent;
 
-    if (prKey) {
-      const persistent = await PersistentCache.get<{
-        verification: { payload: string } | null;
-      }>(cacheKey);
-      if (persistent) {
-        cache.set(cacheKey, persistent);
-        return persistent;
-      }
-    }
-
-    const pending = cache.getPending<{
-      verification: { payload: string } | null;
-    }>(cacheKey);
+    const pending = immutablePending.get(cacheKey) as
+      | Promise<RawCommit>
+      | undefined;
     if (pending) return pending;
 
     const promise = octokit
@@ -1387,15 +804,13 @@ function createGitHubStore() {
         ref,
       })
       .then((res) => {
-        const data = res.data as {
-          verification: { payload: string } | null;
-        };
-        cache.set(cacheKey, data);
+        const data = res.data as RawCommit;
         if (prKey) PersistentCache.put(cacheKey, data, prKey);
         return data;
-      });
+      })
+      .finally(() => immutablePending.delete(cacheKey));
 
-    cache.setPending(cacheKey, promise);
+    immutablePending.set(cacheKey, promise);
     return promise;
   }
 
@@ -1410,18 +825,12 @@ function createGitHubStore() {
 
     const cacheKey = `merge:${owner}/${repo}/${mergeSha}:${parentSha}:files`;
 
-    const cached = cache.get<PullRequestFile[]>(cacheKey);
-    if (cached) return cached;
-
-    if (prKey) {
-      const persistent = await PersistentCache.get<PullRequestFile[]>(cacheKey);
-      if (persistent) {
-        cache.set(cacheKey, persistent);
-        return persistent;
-      }
-    }
+    const persistent = await PersistentCache.get<PullRequestFile[]>(cacheKey);
+    if (persistent) return persistent;
 
-    const pending = cache.getPending<PullRequestFile[]>(cacheKey);
+    const pending = immutablePending.get(cacheKey) as
+      | Promise<PullRequestFile[]>
+      | undefined;
     if (pending) return pending;
 
     const promise = octokit
@@ -1432,12 +841,12 @@ function createGitHubStore() {
       })
       .then((res) => {
         const files = (res.data.files ?? []) as PullRequestFile[];
-        cache.set(cacheKey, files);
         if (prKey) PersistentCache.put(cacheKey, files, prKey);
         return files;
-      });
+      })
+      .finally(() => immutablePending.delete(cacheKey));
 
-    cache.setPending(cacheKey, promise);
+    immutablePending.set(cacheKey, promise);
     return promise;
   }
 
@@ -1452,18 +861,12 @@ function createGitHubStore() {
 
     const cacheKey = `rawdiff:${owner}/${repo}/${baseSha}...${headSha}`;
 
-    const cached = cache.get<string>(cacheKey);
-    if (cached) return cached;
+    const persistent = await PersistentCache.get<string>(cacheKey);
+    if (persistent) return persistent;
 
-    if (prKey) {
-      const persistent = await PersistentCache.get<string>(cacheKey);
-      if (persistent) {
-        cache.set(cacheKey, persistent);
-        return persistent;
-      }
-    }
-
-    const pending = cache.getPending<string>(cacheKey);
+    const pending = immutablePending.get(cacheKey) as
+      | Promise<string>
+      | undefined;
     if (pending) return pending;
 
     const promise = octokit
@@ -1475,12 +878,12 @@ function createGitHubStore() {
       })
       .then((res) => {
         const text = res.data as unknown as string;
-        cache.set(cacheKey, text);
         if (prKey) PersistentCache.put(cacheKey, text, prKey);
         return text;
-      });
+      })
+      .finally(() => immutablePending.delete(cacheKey));
 
-    cache.setPending(cacheKey, promise);
+    immutablePending.set(cacheKey, promise);
     return promise;
   }
 
@@ -1495,18 +898,12 @@ function createGitHubStore() {
 
     const cacheKey = `compare:${owner}/${repo}/${baseSha}...${headSha}:files`;
 
-    const cached = cache.get<PullRequestFile[]>(cacheKey);
-    if (cached) return cached;
+    const persistent = await PersistentCache.get<PullRequestFile[]>(cacheKey);
+    if (persistent) return persistent;
 
-    if (prKey) {
-      const persistent = await PersistentCache.get<PullRequestFile[]>(cacheKey);
-      if (persistent) {
-        cache.set(cacheKey, persistent);
-        return persistent;
-      }
-    }
-
-    const pending = cache.getPending<PullRequestFile[]>(cacheKey);
+    const pending = immutablePending.get(cacheKey) as
+      | Promise<PullRequestFile[]>
+      | undefined;
     if (pending) return pending;
 
     const promise = octokit
@@ -1518,60 +915,24 @@ function createGitHubStore() {
       })
       .then((res) => {
         const files = (res.data.files ?? []) as PullRequestFile[];
-        cache.set(cacheKey, files);
         if (prKey) PersistentCache.put(cacheKey, files, prKey);
         return files;
-      });
+      })
+      .finally(() => immutablePending.delete(cacheKey));
 
-    cache.setPending(cacheKey, promise);
+    immutablePending.set(cacheKey, promise);
     return promise;
   }
 
-  async function getPRComments(
+  function getPRComments(
     owner: string,
     repo: string,
     number: number
   ): Promise<ReviewComment[]> {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `pr:${owner}/${repo}/${number}:comments`;
-
-    const cached = cache.get<ReviewComment[]>(cacheKey);
-    if (cached) return cached;
-
-    const pending = cache.getPending<ReviewComment[]>(cacheKey);
-    if (pending) return pending;
-
-    const promise = (async () => {
-      const comments: ReviewComment[] = [];
-      let page = 1;
-
-      while (true) {
-        const { data } = await octokit!.request(
-          "GET /repos/{owner}/{repo}/pulls/{pull_number}/comments",
-          {
-            owner,
-            repo,
-            pull_number: number,
-            per_page: 100,
-            page,
-            headers: {
-              // Request full media type to get both body and body_html with signed attachment URLs
-              accept: "application/vnd.github.full+json",
-            },
-          }
-        );
-        comments.push(...(data as ReviewComment[]));
-        if (data.length < 100) break;
-        page++;
-      }
-
-      cache.set(cacheKey, comments);
-      return comments;
-    })();
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+    return queryClient.fetchQuery(
+      queries.pullRequestComments(owner, repo, number)
+    );
   }
 
   async function createPRComment(
@@ -1620,42 +981,21 @@ function createGitHubStore() {
       result = data;
     }
 
-    cache.invalidate(`pr:${owner}/${repo}/${number}:comments`);
-    return result;
-  }
-
-  async function getPRReviews(
-    owner: string,
-    repo: string,
-    number: number
-  ): Promise<Review[]> {
-    if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `pr:${owner}/${repo}/${number}:reviews`;
-
-    const cached = cache.get<Review[]>(cacheKey);
-    if (cached) return cached;
-
-    const pending = cache.getPending<Review[]>(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request("GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews", {
-        owner,
-        repo,
-        pull_number: number,
-        headers: {
-          // Request full media type to get both body and body_html with signed attachment URLs
-          accept: "application/vnd.github.full+json",
-        },
-      })
-      .then((res) => {
-        cache.set(cacheKey, res.data as Review[]);
-        return res.data as Review[];
-      });
+    queryClient.invalidateQueries({
+      queryKey: queries.pullRequestComments(owner, repo, number).queryKey,
+    });
+    return result;
+  }
 
-    cache.setPending(cacheKey, promise);
-    return promise;
+  function getPRReviews(
+    owner: string,
+    repo: string,
+    number: number
+  ): Promise<Review[]> {
+    if (!octokit) throw new Error("Not initialized");
+    return queryClient.fetchQuery(
+      queries.pullRequestReviews(owner, repo, number)
+    );
   }
 
   async function createPRReview(
@@ -1690,7 +1030,7 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    invalidatePR(owner, repo, number);
     return data;
   }
 
@@ -1716,7 +1056,7 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    invalidatePR(owner, repo, number);
     return data;
   }
 
@@ -1737,89 +1077,19 @@ function createGitHubStore() {
         review_id: reviewId,
       }
     );
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    invalidatePR(owner, repo, number);
   }
 
-  async function getPRChecksForSha(owner: string, repo: string, sha: string) {
+  function getPRChecksForSha(owner: string, repo: string, sha: string) {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `checks:${owner}/${repo}/${sha}`;
-
-    type ChecksResult = { checkRuns: CheckRun[]; status: CombinedStatus };
-
-    const cached = cache.get<ChecksResult>(cacheKey, 15_000);
-    if (cached) return cached;
-
-    const pending = cache.getPending<ChecksResult>(cacheKey);
-    if (pending) return pending;
-
-    const promise = Promise.all([
-      octokit.request("GET /repos/{owner}/{repo}/commits/{ref}/check-runs", {
-        owner,
-        repo,
-        ref: sha,
-      }),
-      octokit.request("GET /repos/{owner}/{repo}/commits/{ref}/status", {
-        owner,
-        repo,
-        ref: sha,
-      }),
-    ]).then(([checkRunsRes, statusRes]) => {
-      const result = {
-        checkRuns: checkRunsRes.data.check_runs,
-        status: statusRes.data,
-      };
-      cache.set(cacheKey, result);
-      return result;
-    });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+    return queryClient.fetchQuery(queries.checksByCommit(owner, repo, sha));
   }
 
-  async function getWorkflowRunsForSha(
-    owner: string,
-    repo: string,
-    sha: string
-  ) {
+  function getWorkflowRunsForSha(owner: string, repo: string, sha: string) {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `workflow-runs:${owner}/${repo}/${sha}`;
-
-    type WorkflowRunsResult = {
-      workflow_runs: Array<{
-        id: number;
-        name: string;
-        status: string;
-        conclusion: string | null;
-        html_url: string;
-        head_sha: string;
-      }>;
-    };
-
-    const cached = cache.get<WorkflowRunsResult>(cacheKey, 15_000);
-    if (cached) return cached;
-
-    const pending = cache.getPending<WorkflowRunsResult>(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request("GET /repos/{owner}/{repo}/actions/runs", {
-        owner,
-        repo,
-        head_sha: sha,
-        per_page: 50,
-      })
-      .then((res) => {
-        const result = {
-          workflow_runs: res.data.workflow_runs,
-        };
-        cache.set(cacheKey, result);
-        return result;
-      });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+    return queryClient.fetchQuery(
+      queries.workflowRunsByCommit(owner, repo, sha)
+    );
   }
 
   async function approveWorkflowRun(
@@ -1838,8 +1108,7 @@ function createGitHubStore() {
       }
     );
 
-    // Invalidate workflow runs cache for this repo
-    cache.invalidate(`workflow-runs:${owner}/${repo}`);
+    queryClient.invalidateQueries({ queryKey: ["workflow-runs", owner, repo] });
   }
 
   async function mergePR(
@@ -1866,7 +1135,7 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    invalidatePR(owner, repo, number);
     return data;
   }
 
@@ -1881,7 +1150,7 @@ function createGitHubStore() {
       `mutation ($input: DequeuePullRequestInput!) { dequeuePullRequest(input: $input) { mergeQueueEntry { id } } }`,
       { input: { id: prNodeId } }
     );
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    invalidatePR(owner, repo, number);
   }
 
   async function enqueuePullRequest(
@@ -1895,35 +1164,14 @@ function createGitHubStore() {
       `mutation ($input: EnqueuePullRequestInput!) { enqueuePullRequest(input: $input) { mergeQueueEntry { id } } }`,
       { input: { pullRequestId: prNodeId } }
     );
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    invalidatePR(owner, repo, number);
   }
 
-  async function getPRCommits(owner: string, repo: string, number: number) {
+  function getPRCommits(owner: string, repo: string, number: number) {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `pr:${owner}/${repo}/${number}:commits`;
-
-    const cached = cache.get<components["schemas"]["commit"][]>(cacheKey);
-    if (cached) return cached;
-
-    const pending =
-      cache.getPending<components["schemas"]["commit"][]>(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request("GET /repos/{owner}/{repo}/pulls/{pull_number}/commits", {
-        owner,
-        repo,
-        pull_number: number,
-        per_page: 100,
-      })
-      .then((res) => {
-        cache.set(cacheKey, res.data);
-        return res.data;
-      });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+    return queryClient.fetchQuery(
+      queries.pullRequestCommits(owner, repo, number)
+    );
   }
 
   async function getCommitsForHeadSha(
@@ -1936,21 +1184,14 @@ function createGitHubStore() {
     if (!octokit) throw new Error("Not initialized");
 
     const cacheKey = `compare:${owner}/${repo}/${baseSha}...${headSha}:commits`;
+    type CommitList = components["schemas"]["commit"][];
 
-    const cached = cache.get<components["schemas"]["commit"][]>(cacheKey);
-    if (cached) return cached;
+    const persistent = await PersistentCache.get<CommitList>(cacheKey);
+    if (persistent) return persistent;
 
-    if (prKey) {
-      const persistent =
-        await PersistentCache.get<components["schemas"]["commit"][]>(cacheKey);
-      if (persistent) {
-        cache.set(cacheKey, persistent);
-        return persistent;
-      }
-    }
-
-    const pending =
-      cache.getPending<components["schemas"]["commit"][]>(cacheKey);
+    const pending = immutablePending.get(cacheKey) as
+      | Promise<CommitList>
+      | undefined;
     if (pending) return pending;
 
     const promise = octokit
@@ -1961,13 +1202,13 @@ function createGitHubStore() {
         per_page: 100,
       })
       .then((res) => {
-        const commits = res.data.commits as components["schemas"]["commit"][];
-        cache.set(cacheKey, commits);
+        const commits = res.data.commits as CommitList;
         if (prKey) PersistentCache.put(cacheKey, commits, prKey);
         return commits;
-      });
+      })
+      .finally(() => immutablePending.delete(cacheKey));
 
-    cache.setPending(cacheKey, promise);
+    immutablePending.set(cacheKey, promise);
     return promise;
   }
 
@@ -1989,7 +1230,7 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    invalidatePR(owner, repo, number);
     return data;
   }
 
@@ -2011,37 +1252,12 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    invalidatePR(owner, repo, number);
   }
 
-  async function getRepoCollaborators(owner: string, repo: string) {
+  function getRepoCollaborators(owner: string, repo: string) {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `repo:${owner}/${repo}:collaborators`;
-
-    const cached = cache.get<components["schemas"]["collaborator"][]>(
-      cacheKey,
-      300_000
-    );
-    if (cached) return cached;
-
-    const pending =
-      cache.getPending<components["schemas"]["collaborator"][]>(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request("GET /repos/{owner}/{repo}/collaborators", {
-        owner,
-        repo,
-        per_page: 100,
-      })
-      .then((res) => {
-        cache.set(cacheKey, res.data);
-        return res.data;
-      });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+    return queryClient.fetchQuery(queries.collaborators(owner, repo));
   }
 
   async function addAssignees(
@@ -2062,7 +1278,7 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${issueNumber}`);
+    invalidatePR(owner, repo, issueNumber);
     return data;
   }
 
@@ -2084,60 +1300,12 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${issueNumber}`);
+    invalidatePR(owner, repo, issueNumber);
   }
 
-  async function getRepoLabels(owner: string, repo: string) {
+  function getRepoLabels(owner: string, repo: string) {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `repo:${owner}/${repo}:labels`;
-
-    const cached = cache.get<
-      Array<{ name: string; color: string; description: string | null }>
-    >(cacheKey, 300_000);
-    if (cached) return cached;
-
-    const pending =
-      cache.getPending<
-        Array<{ name: string; color: string; description: string | null }>
-      >(cacheKey);
-    if (pending) return pending;
-
-    const promise = (async () => {
-      // Manually paginate to get all labels
-      const allLabels: Array<{
-        name: string;
-        color: string;
-        description: string | null;
-      }> = [];
-      let page = 1;
-      while (true) {
-        const { data: labels } = await octokit.request(
-          "GET /repos/{owner}/{repo}/labels",
-          {
-            owner,
-            repo,
-            per_page: 100,
-            page,
-          }
-        );
-        for (const l of labels) {
-          allLabels.push({
-            name: l.name,
-            color: l.color,
-            description: l.description ?? null,
-          });
-        }
-        if (labels.length < 100) break;
-        page++;
-      }
-      cache.set(cacheKey, allLabels);
-      cache.clearPending(cacheKey);
-      return allLabels;
-    })();
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+    return queryClient.fetchQuery(queries.labels(owner, repo));
   }
 
   async function addLabels(
@@ -2158,7 +1326,7 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${issueNumber}`);
+    invalidatePR(owner, repo, issueNumber);
     return data;
   }
 
@@ -2180,7 +1348,7 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${issueNumber}`);
+    invalidatePR(owner, repo, issueNumber);
   }
 
   async function convertToDraft(owner: string, repo: string, number: number) {
@@ -2198,7 +1366,7 @@ function createGitHubStore() {
       { input: { pullRequestId: prData.repository.pullRequest.id } }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    invalidatePR(owner, repo, number);
   }
 
   async function markReadyForReview(
@@ -2220,7 +1388,7 @@ function createGitHubStore() {
       { input: { pullRequestId: prData.repository.pullRequest.id } }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    invalidatePR(owner, repo, number);
   }
 
   async function updateBranch(owner: string, repo: string, number: number) {
@@ -2235,7 +1403,7 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    invalidatePR(owner, repo, number);
     return data;
   }
 
@@ -2250,40 +1418,11 @@ function createGitHubStore() {
     | "rocket"
     | "eyes";
 
-  async function getIssueReactions(
-    owner: string,
-    repo: string,
-    issueNumber: number
-  ) {
+  function getIssueReactions(owner: string, repo: string, issueNumber: number) {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `reactions:issue:${owner}/${repo}/${issueNumber}`;
-
-    const cached = cache.get<components["schemas"]["reaction"][]>(
-      cacheKey,
-      300_000
+    return queryClient.fetchQuery(
+      queries.issueReactions(owner, repo, issueNumber)
     );
-    if (cached) return cached;
-
-    const pending =
-      cache.getPending<components["schemas"]["reaction"][]>(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request("GET /repos/{owner}/{repo}/issues/{issue_number}/reactions", {
-        owner,
-        repo,
-        issue_number: issueNumber,
-        per_page: 100,
-      })
-      .then((res) => {
-        const data = res.data as components["schemas"]["reaction"][];
-        cache.set(cacheKey, data);
-        return data;
-      });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
   }
 
   async function addIssueReaction(
@@ -2304,7 +1443,9 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`reactions:issue:${owner}/${repo}/${issueNumber}`);
+    queryClient.invalidateQueries({
+      queryKey: queries.issueReactions(owner, repo, issueNumber).queryKey,
+    });
     return data;
   }
 
@@ -2326,46 +1467,16 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`reactions:issue:${owner}/${repo}/${issueNumber}`);
+    queryClient.invalidateQueries({
+      queryKey: queries.issueReactions(owner, repo, issueNumber).queryKey,
+    });
   }
 
-  async function getCommentReactions(
-    owner: string,
-    repo: string,
-    commentId: number
-  ) {
+  function getCommentReactions(owner: string, repo: string, commentId: number) {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `reactions:comment:${owner}/${repo}/${commentId}`;
-
-    const cached = cache.get<components["schemas"]["reaction"][]>(
-      cacheKey,
-      300_000
+    return queryClient.fetchQuery(
+      queries.commentReactions(owner, repo, commentId)
     );
-    if (cached) return cached;
-
-    const pending =
-      cache.getPending<components["schemas"]["reaction"][]>(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request(
-        "GET /repos/{owner}/{repo}/issues/comments/{comment_id}/reactions",
-        {
-          owner,
-          repo,
-          comment_id: commentId,
-          per_page: 100,
-        }
-      )
-      .then((res) => {
-        const data = res.data as components["schemas"]["reaction"][];
-        cache.set(cacheKey, data);
-        return data;
-      });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
   }
 
   async function addCommentReaction(
@@ -2386,7 +1497,9 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`reactions:comment:${owner}/${repo}/${commentId}`);
+    queryClient.invalidateQueries({
+      queryKey: queries.commentReactions(owner, repo, commentId).queryKey,
+    });
     return data;
   }
 
@@ -2408,47 +1521,21 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`reactions:comment:${owner}/${repo}/${commentId}`);
+    queryClient.invalidateQueries({
+      queryKey: queries.commentReactions(owner, repo, commentId).queryKey,
+    });
   }
 
   // Pull Request Review Comment Reactions (different from issue comments)
-  async function getReviewCommentReactions(
+  function getReviewCommentReactions(
     owner: string,
     repo: string,
     commentId: number
   ) {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `reactions:review-comment:${owner}/${repo}/${commentId}`;
-
-    const cached = cache.get<components["schemas"]["reaction"][]>(
-      cacheKey,
-      300_000
+    return queryClient.fetchQuery(
+      queries.reviewCommentReactions(owner, repo, commentId)
     );
-    if (cached) return cached;
-
-    const pending =
-      cache.getPending<components["schemas"]["reaction"][]>(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request(
-        "GET /repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions",
-        {
-          owner,
-          repo,
-          comment_id: commentId,
-          per_page: 100,
-        }
-      )
-      .then((res) => {
-        const data = res.data as components["schemas"]["reaction"][];
-        cache.set(cacheKey, data);
-        return data;
-      });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
   }
 
   async function addReviewCommentReaction(
@@ -2469,7 +1556,9 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`reactions:review-comment:${owner}/${repo}/${commentId}`);
+    queryClient.invalidateQueries({
+      queryKey: queries.reviewCommentReactions(owner, repo, commentId).queryKey,
+    });
     return data;
   }
 
@@ -2491,7 +1580,9 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`reactions:review-comment:${owner}/${repo}/${commentId}`);
+    queryClient.invalidateQueries({
+      queryKey: queries.reviewCommentReactions(owner, repo, commentId).queryKey,
+    });
   }
 
   async function closePR(owner: string, repo: string, number: number) {
@@ -2507,7 +1598,11 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    queryClient.setQueryData(
+      queries.pullRequest(owner, repo, number).queryKey,
+      data as PullRequest
+    );
+    invalidatePR(owner, repo, number);
     return data;
   }
 
@@ -2531,7 +1626,11 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    queryClient.setQueryData(
+      queries.pullRequest(owner, repo, number).queryKey,
+      data as PullRequest
+    );
+    invalidatePR(owner, repo, number);
     return data as PullRequest;
   }
 
@@ -2563,7 +1662,11 @@ function createGitHubStore() {
       }
     );
 
-    cache.invalidate(`pr:${owner}/${repo}/${number}`);
+    queryClient.setQueryData(
+      queries.pullRequest(owner, repo, number).queryKey,
+      data as PullRequest
+    );
+    invalidatePR(owner, repo, number);
     return data;
   }
 
@@ -2593,38 +1696,15 @@ function createGitHubStore() {
     });
   }
 
-  async function getPRConversation(
+  function getPRConversation(
     owner: string,
     repo: string,
     number: number
   ): Promise<IssueComment[]> {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `pr:${owner}/${repo}/${number}:conversation`;
-
-    const cached = cache.get<IssueComment[]>(cacheKey);
-    if (cached) return cached;
-
-    const pending = cache.getPending<IssueComment[]>(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request("GET /repos/{owner}/{repo}/issues/{issue_number}/comments", {
-        owner,
-        repo,
-        issue_number: number,
-        headers: {
-          // Request full media type to get both body and body_html with signed attachment URLs
-          accept: "application/vnd.github.full+json",
-        },
-      })
-      .then((res) => {
-        cache.set(cacheKey, res.data as IssueComment[]);
-        return res.data as IssueComment[];
-      });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+    return queryClient.fetchQuery(
+      queries.pullRequestConversation(owner, repo, number)
+    );
   }
 
   async function createPRConversationComment(
@@ -2644,51 +1724,21 @@ function createGitHubStore() {
         body,
       }
     );
-    cache.invalidate(`pr:${owner}/${repo}/${number}:conversation`);
+    queryClient.invalidateQueries({
+      queryKey: queries.pullRequestConversation(owner, repo, number).queryKey,
+    });
     return data;
   }
 
-  async function getPRTimeline(
+  function getPRTimeline(
     owner: string,
     repo: string,
     number: number
   ): Promise<TimelineEvent[]> {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `pr:${owner}/${repo}/${number}:timeline`;
-
-    const cached = cache.get<TimelineEvent[]>(cacheKey);
-    if (cached) return cached;
-
-    const pending = cache.getPending<TimelineEvent[]>(cacheKey);
-    if (pending) return pending;
-
-    const promise = (async () => {
-      const events: TimelineEvent[] = [];
-      let page = 1;
-
-      while (true) {
-        const { data } = await octokit!.request(
-          "GET /repos/{owner}/{repo}/issues/{issue_number}/timeline",
-          {
-            owner,
-            repo,
-            issue_number: number,
-            per_page: 100,
-            page,
-          }
-        );
-        events.push(...(data as TimelineEvent[]));
-        if (data.length < 100) break;
-        page++;
-      }
-
-      cache.set(cacheKey, events);
-      return events;
-    })();
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+    return queryClient.fetchQuery(
+      queries.pullRequestTimeline(owner, repo, number)
+    );
   }
 
   async function getFileContent(
@@ -2702,18 +1752,12 @@ function createGitHubStore() {
 
     const cacheKey = `file:${owner}/${repo}/${ref}/${path}`;
 
-    const cached = cache.get<string>(cacheKey, 300_000);
-    if (cached) return cached;
-
-    if (prKey) {
-      const persistent = await PersistentCache.get<string>(cacheKey);
-      if (persistent !== null) {
-        cache.set(cacheKey, persistent);
-        return persistent;
-      }
-    }
+    const persistent = await PersistentCache.get<string>(cacheKey);
+    if (persistent !== null) return persistent;
 
-    const pending = cache.getPending<string>(cacheKey);
+    const pending = immutablePending.get(cacheKey) as
+      | Promise<string>
+      | undefined;
     if (pending) return pending;
 
     const promise = (async () => {
@@ -2729,7 +1773,6 @@ function createGitHubStore() {
           }
         );
         const content = response.data as unknown as string;
-        cache.set(cacheKey, content);
         if (prKey) PersistentCache.put(cacheKey, content, prKey);
         return content;
       } catch (error: unknown) {
@@ -2739,107 +1782,26 @@ function createGitHubStore() {
           "status" in error &&
           error.status === 404
         ) {
-          cache.set(cacheKey, "");
           if (prKey) PersistentCache.put(cacheKey, "", prKey);
           return "";
         }
         throw error;
       }
-    })();
+    })().finally(() => immutablePending.delete(cacheKey));
 
-    cache.setPending(cacheKey, promise);
+    immutablePending.set(cacheKey, promise);
     return promise;
   }
 
-  async function getPushVersions(
+  function getPushVersions(
     owner: string,
     repo: string,
     number: number
   ): Promise<PushVersion[]> {
-    if (!batcher) throw new Error("Not initialized");
-
-    const cacheKey = `pr:${owner}/${repo}/${number}:push-versions`;
-
-    const cached = cache.get<PushVersion[]>(cacheKey);
-    if (cached) return cached;
-
-    const pending = cache.getPending<PushVersion[]>(cacheKey);
-    if (pending) return pending;
-
-    interface ForcePushNode {
-      createdAt: string;
-      beforeCommit: { oid: string } | null;
-      afterCommit: { oid: string } | null;
-    }
-
-    const promise = batcher
-      .query<{
-        repository: {
-          pullRequest: {
-            createdAt: string;
-            timelineItems: { nodes: ForcePushNode[] };
-          };
-        };
-      }>(
-        `query GetPushVersions($owner: String!, $repo: String!, $number: Int!) {
-          repository(owner: $owner, name: $repo) {
-            pullRequest(number: $number) {
-              createdAt
-              timelineItems(itemTypes: [HEAD_REF_FORCE_PUSHED_EVENT], first: 100) {
-                nodes {
-                  ... on HeadRefForcePushedEvent {
-                    createdAt
-                    beforeCommit { oid }
-                    afterCommit { oid }
-                  }
-                }
-              }
-            }
-          }
-        }`,
-        { owner, repo, number }
-      )
-      .then((data) => {
-        const prData = data.repository.pullRequest;
-        const events = (prData.timelineItems.nodes || [])
-          .filter((e) => e.createdAt)
-          .sort(
-            (a, b) =>
-              new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()
-          );
-
-        if (events.length === 0) {
-          cache.set(cacheKey, []);
-          return [];
-        }
-
-        const versions: PushVersion[] = [];
-
-        if (events[0].beforeCommit) {
-          versions.push({
-            version: 1,
-            sha: events[0].beforeCommit.oid,
-            pushedAt: prData.createdAt,
-          });
-        }
-
-        for (const event of events) {
-          if (event.afterCommit) {
-            versions.push({
-              version: versions.length + 1,
-              sha: event.afterCommit.oid,
-              pushedAt: event.createdAt,
-              beforeSha: event.beforeCommit?.oid,
-            });
-          }
-        }
-
-        cache.set(cacheKey, versions);
-        return versions;
-      });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
+    if (!octokit) throw new Error("Not initialized");
+    return queryClient.fetchQuery(
+      queries.pullRequestPushVersions(owner, repo, number)
+    );
   }
 
   // ---------------------------------------------------------------------------
@@ -3550,29 +2512,9 @@ function createGitHubStore() {
     );
   }
 
-  async function getUserProfile(login: string): Promise<UserProfile> {
+  function getUserProfile(login: string): Promise<UserProfile> {
     if (!octokit) throw new Error("Not initialized");
-
-    const cacheKey = `user:${login}`;
-    const cached = cache.get<UserProfile>(cacheKey);
-    if (cached) return cached;
-
-    const pending = cache.getPending<UserProfile>(cacheKey);
-    if (pending) return pending;
-
-    const promise = octokit
-      .request("GET /users/{username}", { username: login })
-      .then((res) => {
-        cache.set(cacheKey, res.data);
-        return res.data as UserProfile;
-      });
-
-    cache.setPending(cacheKey, promise);
-    return promise;
-  }
-
-  function invalidateCache(pattern?: string) {
-    cache.invalidate(pattern);
+    return queryClient.fetchQuery(queries.userByLogin(login));
   }
 
   return {
@@ -3584,8 +2526,6 @@ function createGitHubStore() {
     setOnUnauthorized,
     setOnRateLimited,
     // State actions
-    fetchPRList,
-    refreshPRList,
     fetchPRChecks,
     refreshAllPRChecks,
     getPRCheckKey,
@@ -3670,7 +2610,7 @@ function createGitHubStore() {
     updateIssueComment,
     deleteIssueComment,
     getUserProfile,
-    invalidateCache,
+    invalidatePR,
   };
 }
 
@@ -3732,15 +2672,8 @@ export function GitHubProvider({ children }: { children: ReactNode }) {
     }
   }, [store, token, isAuthenticated]);
 
-  // Auto-refresh PR list every 60 seconds
-  useEffect(() => {
-    const interval = setInterval(() => {
-      if (store.getState().ready) {
-        store.refreshPRList();
-      }
-    }, 60_000);
-    return () => clearInterval(interval);
-  }, [store]);
+  // Auto-refresh PR list every 60 seconds (React Query handles this via staleTime + refetchOnWindowFocus)
+  // The prList query is managed by React Query; no manual interval needed here.
 
   // Auto-refresh PR checks every 30 seconds
   useEffect(() => {
@@ -3786,19 +2719,9 @@ export function useGitHubReady() {
 }
 
 export function useCurrentUser(): CurrentUserData | null {
-  return useGitHubSelector((s) => s.currentUser);
-}
-
-export function usePRList() {
-  return useGitHubSelector((s) => s.prList);
-}
-
-export function usePRListActions() {
-  const store = useGitHubStore();
-  return {
-    fetchPRList: store.fetchPRList,
-    refreshPRList: store.refreshPRList,
-  };
+  const { ready } = useGitHubReady();
+  const { data } = useQuery({ ...queries.currentUser(), enabled: ready });
+  return data ?? null;
 }
 
 export function usePRChecks(owner: string, repo: string, number: number) {
@@ -3823,7 +2746,7 @@ export function usePRChecks(owner: string, repo: string, number: number) {
 export function useRefreshAll() {
   const store = useGitHubStore();
   return useCallback(() => {
-    store.refreshPRList();
+    queryClient.invalidateQueries({ queryKey: ["pr-list"] });
     store.refreshAllPRChecks();
   }, [store]);
 }
diff --git a/src/browser/contexts/pr-review/index.test.ts b/src/browser/contexts/pr-review/index.test.ts
index cb4cf24..a641b27 100644
--- a/src/browser/contexts/pr-review/index.test.ts
+++ b/src/browser/contexts/pr-review/index.test.ts
@@ -39,7 +39,7 @@ function createMockGitHubStore(): GitHubStore {
       viewerPermission: null,
       viewerCanMergeAsAdmin: false,
     }),
-    invalidateCache: () => {},
+    invalidatePR: () => {},
     getPR: async () => createMockPR(),
     mergePR: async () => ({ merged: true }),
     closePR: async () => {},
@@ -735,7 +735,7 @@ function createMockGitHubStoreWithVersions(
       viewerPermission: null,
       viewerCanMergeAsAdmin: false,
     }),
-    invalidateCache: () => {},
+    invalidatePR: () => {},
     getPR: async () => createMockPR(),
     mergePR: async () => ({ merged: true }),
     closePR: async () => {},
diff --git a/src/browser/contexts/pr-review/index.tsx b/src/browser/contexts/pr-review/index.tsx
index 7642b2b..157f462 100644
--- a/src/browser/contexts/pr-review/index.tsx
+++ b/src/browser/contexts/pr-review/index.tsx
@@ -35,6 +35,7 @@ import {
   groupCommitsIntoVersions,
 } from "@/browser/contexts/github";
 import { diffService } from "@/browser/lib/diff";
+import { queryClient } from "@/browser/lib/query-client";
 
 // ============================================================================
 // File Sorting (match file tree order)
@@ -717,6 +718,7 @@ export class PRReviewStore {
 
   private async refreshFiles(): Promise<void> {
     const { owner, repo, pr, selectedHeadSha, compareToSha } = this.state;
+    const prKey = `${owner}/${repo}/${pr.number}`;
 
     const resetBase = {
       loadedDiffs: {},
@@ -730,10 +732,10 @@ export class PRReviewStore {
 
       const [prevFiles, currFiles] = await Promise.all([
         this.github
-          .getPRFilesForRange(owner, repo, pr.base.sha, compareToSha)
+          .getPRFilesForRange(owner, repo, pr.base.sha, compareToSha, prKey)
           .catch(() => [] as PullRequestFile[]),
         this.github
-          .getPRFilesForRange(owner, repo, pr.base.sha, headSha)
+          .getPRFilesForRange(owner, repo, pr.base.sha, headSha, prKey)
           .catch(() => [] as PullRequestFile[]),
       ]);
 
@@ -770,7 +772,7 @@ export class PRReviewStore {
       });
     } else if (selectedHeadSha) {
       const files = await this.github
-        .getPRFilesForRange(owner, repo, pr.base.sha, selectedHeadSha)
+        .getPRFilesForRange(owner, repo, pr.base.sha, selectedHeadSha, prKey)
         .catch(() => [] as PullRequestFile[]);
       this.set({
         ...resetBase,
@@ -3497,7 +3499,13 @@ export class PRReviewStore {
         const filesByVersion = await Promise.all(
           mergedVersions.map(async (pv) => {
             const files = await this.github
-              .getPRFilesForRange(owner, repo, pr.base.sha, pv.sha)
+              .getPRFilesForRange(
+                owner,
+                repo,
+                pr.base.sha,
+                pv.sha,
+                `${owner}/${repo}/${pr.number}`
+              )
               .catch(() => [] as PullRequestFile[]);
             return {
               version: pv.version,
@@ -3834,8 +3842,8 @@ export class PRReviewStore {
    * Invalidate all caches for a PR (main PR + all related data)
    */
   private invalidatePRCaches(owner: string, repo: string, prNumber: number) {
-    // Invalidate all PR-related caches (using pattern matching)
-    this.github.invalidateCache(`pr:${owner}/${repo}/${prNumber}`);
+    this.github.invalidatePR(owner, repo, prNumber);
+    queryClient.invalidateQueries({ queryKey: ["search", "prs"] });
   }
 
   /**
@@ -3965,8 +3973,7 @@ export class PRReviewStore {
     try {
       await this.github.updateBranch(owner, repo, pr.number);
 
-      // Invalidate cache BEFORE refetch so we get fresh data
-      this.github.invalidateCache(`pr:${owner}/${repo}/${pr.number}`);
+      this.github.invalidatePR(owner, repo, pr.number);
 
       // Refetch PR to get updated state (branch update changes many fields)
       const updatedPR = await this.github.getPR(owner, repo, pr.number);
diff --git a/src/browser/contexts/pr-review/useCurrentUserLoader.ts b/src/browser/contexts/pr-review/useCurrentUserLoader.ts
index 47fd4c2..3dd90a6 100644
--- a/src/browser/contexts/pr-review/useCurrentUserLoader.ts
+++ b/src/browser/contexts/pr-review/useCurrentUserLoader.ts
@@ -1,16 +1,15 @@
 import { useEffect } from "react";
-import { useGitHubStore, useGitHubSelector } from "@/browser/contexts/github";
+import { useGitHubSelector, useCurrentUser } from "@/browser/contexts/github";
 import { usePRReviewStore } from ".";
 
 export function useCurrentUserLoader() {
   const store = usePRReviewStore();
-  const github = useGitHubStore();
   const ready = useGitHubSelector((s) => s.ready);
-  const currentUser = github.getState().currentUser?.login ?? null;
+  const currentUser = useCurrentUser();
 
   useEffect(() => {
     if (ready && currentUser) {
-      store.setCurrentUser(currentUser);
+      store.setCurrentUser(currentUser.login);
     }
   }, [ready, currentUser, store]);
 }
diff --git a/src/browser/contexts/pr-review/useReviewActions.ts b/src/browser/contexts/pr-review/useReviewActions.ts
index 59457eb..d8b171a 100644
--- a/src/browser/contexts/pr-review/useReviewActions.ts
+++ b/src/browser/contexts/pr-review/useReviewActions.ts
@@ -60,8 +60,7 @@ export function useReviewActions() {
         });
       }
 
-      // Invalidate timeline cache so we get fresh data
-      github.invalidateCache(`pr:${owner}/${repo}/${pr.number}`);
+      github.invalidatePR(owner, repo, pr.number);
 
       // Refresh comments, reviews, and timeline
       const [newComments, reviews, timeline] = await Promise.all([
diff --git a/src/browser/index.tsx b/src/browser/index.tsx
index b32ba97..4e389ac 100644
--- a/src/browser/index.tsx
+++ b/src/browser/index.tsx
@@ -8,6 +8,9 @@ import { CommandPaletteProvider } from "./components/command-palette";
 import { AppShell } from "./components/app-shell";
 import { WelcomeDialog } from "./components/welcome-dialog";
 import { initTheme } from "./theme";
+import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client";
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+import { queryClient, persister } from "./lib/query-client";
 import "./index.css";
 
 // Initialize theme before rendering to avoid flash
@@ -19,27 +22,38 @@ if ("serviceWorker" in navigator) {
 }
 
 createRoot(document.getElementById("app")!).render(
-  <ThemeProvider>
-    <AuthProvider>
-      <GitHubProvider>
-        <BrowserRouter>
-          <TabProvider>
-            <CommandPaletteProvider>
-              <Routes>
-                {/* Home */}
-                <Route path="/" element={<AppShell />} />
-                {/* PR review - URL like /:owner/:repo/pull/:number */}
-                <Route
-                  path="/:owner/:repo/pull/:number"
-                  element={<AppShell />}
-                />
-              </Routes>
-              {/* Auth dialog - shown when not authenticated */}
-              <WelcomeDialog />
-            </CommandPaletteProvider>
-          </TabProvider>
-        </BrowserRouter>
-      </GitHubProvider>
-    </AuthProvider>
-  </ThemeProvider>
+  <PersistQueryClientProvider
+    client={queryClient}
+    persistOptions={{
+      persister,
+      dehydrateOptions: {
+        shouldDehydrateQuery: (query) => query.meta?.persist === true,
+      },
+    }}
+  >
+    <ThemeProvider>
+      <AuthProvider>
+        <GitHubProvider>
+          <BrowserRouter>
+            <TabProvider>
+              <CommandPaletteProvider>
+                <Routes>
+                  {/* Home */}
+                  <Route path="/" element={<AppShell />} />
+                  {/* PR review - URL like /:owner/:repo/pull/:number */}
+                  <Route
+                    path="/:owner/:repo/pull/:number"
+                    element={<AppShell />}
+                  />
+                </Routes>
+                {/* Auth dialog - shown when not authenticated */}
+                <WelcomeDialog />
+              </CommandPaletteProvider>
+            </TabProvider>
+          </BrowserRouter>
+        </GitHubProvider>
+      </AuthProvider>
+    </ThemeProvider>
+    {__DEV__ && <ReactQueryDevtools initialIsOpen={false} />}
+  </PersistQueryClientProvider>
 );
diff --git a/src/browser/lib/github-client.ts b/src/browser/lib/github-client.ts
new file mode 100644
index 0000000..5944ab4
--- /dev/null
+++ b/src/browser/lib/github-client.ts
@@ -0,0 +1,12 @@
+import { Octokit } from "@octokit/core";
+
+let _octokit: Octokit | null = null;
+
+export function setOctokit(instance: Octokit | null) {
+  _octokit = instance;
+}
+
+export function getOctokit(): Octokit {
+  if (!_octokit) throw new Error("Not authenticated");
+  return _octokit;
+}
diff --git a/src/browser/lib/queries.ts b/src/browser/lib/queries.ts
new file mode 100644
index 0000000..9d51177
--- /dev/null
+++ b/src/browser/lib/queries.ts
@@ -0,0 +1,817 @@
+// Query factory conventions:
+//
+// - Each factory returns `queryOptions({ queryKey, queryFn, ... })` for use with
+//   `useQuery`, `prefetchQuery`, `queryClient.getQueryData`, etc.
+//
+// - Derived / filtered views use `select` on the same query rather than a
+//   separate query key, e.g.:
+//     useQuery({ ...queries.currentUser(), select: (u) => u.login })
+//
+// - Queries with `meta: { persist: true }` are persisted to IndexedDB across
+//   sessions via PersistQueryClientProvider. Use for slow-changing data (user
+//   profile, collaborators, labels) but NOT for fast-moving data (PR list).
+//
+// - Mutations follow this pattern:
+//     useMutation({
+//       mutationFn: myMutationFn,
+//       onSuccess: (result, variables) => {
+//         queryClient.setQueryData(queries.foo(id).queryKey, (old) => update(old, result));
+//       },
+//       onSettled: () => queryClient.invalidateQueries({ queryKey: queries.foo(id).queryKey }),
+//     })
+
+import { keepPreviousData, queryOptions } from "@tanstack/react-query";
+import { getOctokit } from "./github-client";
+import type {
+  CurrentUserData,
+  IssueComment,
+  PRSearchResult,
+  PullRequest,
+  PullRequestFile,
+  PushVersion,
+  Review,
+  ReviewComment,
+  TimelineEvent,
+  UserProfile,
+} from "../contexts/github";
+import type { components } from "@octokit/openapi-types";
+
+type AnyUser =
+  | components["schemas"]["private-user"]
+  | components["schemas"]["public-user"];
+
+function toCurrentUserData(user: AnyUser): CurrentUserData {
+  return {
+    id: user.id,
+    login: user.login,
+    name: user.name ?? null,
+    email: user.email ?? null,
+    avatar_url: user.avatar_url,
+    html_url: user.html_url,
+    bio: user.bio ?? null,
+    company: user.company ?? null,
+    location: user.location ?? null,
+  };
+}
+
+export const queries = {
+  currentUser: () =>
+    queryOptions({
+      queryKey: ["user", "current"],
+      queryFn: async ({ signal }) => {
+        const r = await getOctokit().request("GET /user", {
+          request: { signal },
+        });
+        return toCurrentUserData(r.data);
+      },
+      staleTime: 5 * 60_000,
+      meta: { persist: true },
+    }),
+
+  checksByCommit: (owner: string, repo: string, sha: string) =>
+    queryOptions({
+      queryKey: ["checks", owner, repo, sha],
+      queryFn: async ({ signal }) => {
+        const [checkRunsRes, statusRes] = await Promise.all([
+          getOctokit().request(
+            "GET /repos/{owner}/{repo}/commits/{ref}/check-runs",
+            { owner, repo, ref: sha, request: { signal } }
+          ),
+          getOctokit().request(
+            "GET /repos/{owner}/{repo}/commits/{ref}/status",
+            { owner, repo, ref: sha, request: { signal } }
+          ),
+        ]);
+        return {
+          checkRuns: checkRunsRes.data
+            .check_runs as components["schemas"]["check-run"][],
+          status:
+            statusRes.data as components["schemas"]["combined-commit-status"],
+        };
+      },
+      staleTime: 15_000,
+    }),
+
+  workflowRunsByCommit: (owner: string, repo: string, sha: string) =>
+    queryOptions({
+      queryKey: ["workflow-runs", owner, repo, sha],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request(
+          "GET /repos/{owner}/{repo}/actions/runs",
+          { owner, repo, head_sha: sha, per_page: 50, request: { signal } }
+        );
+        return {
+          workflow_runs: res.data.workflow_runs as Array<{
+            id: number;
+            name: string | null;
+            status: string | null;
+            conclusion: string | null;
+            html_url: string;
+            head_sha: string;
+          }>,
+        };
+      },
+      staleTime: 15_000,
+    }),
+
+  collaborators: (owner: string, repo: string) =>
+    queryOptions({
+      queryKey: ["collaborators", owner, repo],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request(
+          "GET /repos/{owner}/{repo}/collaborators",
+          { owner, repo, per_page: 100, request: { signal } }
+        );
+        return res.data as components["schemas"]["collaborator"][];
+      },
+      staleTime: 5 * 60_000,
+      meta: { persist: true },
+    }),
+
+  labels: (owner: string, repo: string) =>
+    queryOptions({
+      queryKey: ["labels", owner, repo],
+      queryFn: async ({ signal }) => {
+        const allLabels: Array<{
+          name: string;
+          color: string;
+          description: string | null;
+        }> = [];
+        let page = 1;
+        while (true) {
+          const { data } = await getOctokit().request(
+            "GET /repos/{owner}/{repo}/labels",
+            { owner, repo, per_page: 100, page, request: { signal } }
+          );
+          for (const l of data) {
+            allLabels.push({
+              name: l.name,
+              color: l.color,
+              description: l.description ?? null,
+            });
+          }
+          if (data.length < 100) break;
+          page++;
+        }
+        return allLabels;
+      },
+      staleTime: 5 * 60_000,
+      meta: { persist: true },
+    }),
+
+  searchPRs: (query: string, page = 1, perPage = 30) =>
+    queryOptions({
+      queryKey: ["search", "prs", query, page, perPage],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request("GET /search/issues", {
+          q: query,
+          sort: "updated",
+          order: "desc",
+          per_page: perPage,
+          page,
+          request: { signal },
+        });
+        return res.data;
+      },
+      staleTime: 30_000,
+      placeholderData: keepPreviousData,
+    }),
+
+  searchRepos: (query: string) =>
+    queryOptions({
+      queryKey: ["search", "repos", query],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request("GET /search/repositories", {
+          q: query,
+          order: "desc",
+          per_page: 10,
+          request: { signal },
+        });
+        return res.data;
+      },
+      staleTime: 60_000,
+    }),
+
+  searchUsers: (query: string) =>
+    queryOptions({
+      queryKey: ["search", "users", query],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request("GET /search/users", {
+          q: query,
+          per_page: 8,
+          request: { signal },
+        });
+        return res.data;
+      },
+      staleTime: 60_000,
+    }),
+
+  pullRequest: (owner: string, repo: string, number: number) =>
+    queryOptions({
+      queryKey: ["pull-request", owner, repo, number],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request(
+          "GET /repos/{owner}/{repo}/pulls/{pull_number}",
+          {
+            owner,
+            repo,
+            pull_number: number,
+            headers: { accept: "application/vnd.github.full+json" },
+            request: { signal },
+          }
+        );
+        return res.data as PullRequest;
+      },
+      staleTime: 30_000,
+    }),
+
+  pullRequestFiles: (owner: string, repo: string, number: number) =>
+    queryOptions({
+      queryKey: ["pull-request", owner, repo, number, "files"],
+      queryFn: async ({ signal }) => {
+        const files: PullRequestFile[] = [];
+        let page = 1;
+        while (true) {
+          const { data } = await getOctokit().request(
+            "GET /repos/{owner}/{repo}/pulls/{pull_number}/files",
+            {
+              owner,
+              repo,
+              pull_number: number,
+              per_page: 100,
+              page,
+              request: { signal },
+            }
+          );
+          files.push(...data);
+          if (data.length < 100) break;
+          page++;
+        }
+        return files;
+      },
+      staleTime: 30_000,
+    }),
+
+  pullRequestCommits: (owner: string, repo: string, number: number) =>
+    queryOptions({
+      queryKey: ["pull-request", owner, repo, number, "commits"],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request(
+          "GET /repos/{owner}/{repo}/pulls/{pull_number}/commits",
+          {
+            owner,
+            repo,
+            pull_number: number,
+            per_page: 100,
+            request: { signal },
+          }
+        );
+        return res.data as components["schemas"]["commit"][];
+      },
+      staleTime: 30_000,
+    }),
+
+  pullRequestPushVersions: (owner: string, repo: string, number: number) =>
+    queryOptions({
+      queryKey: ["pull-request", owner, repo, number, "push-versions"],
+      queryFn: async ({ signal }) => {
+        interface ForcePushNode {
+          createdAt: string;
+          beforeCommit: { oid: string } | null;
+          afterCommit: { oid: string } | null;
+        }
+        const data = await getOctokit().graphql<{
+          repository: {
+            pullRequest: {
+              createdAt: string;
+              timelineItems: { nodes: ForcePushNode[] };
+            };
+          };
+        }>(
+          `query GetPushVersions($owner: String!, $repo: String!, $number: Int!) {
+            repository(owner: $owner, name: $repo) {
+              pullRequest(number: $number) {
+                createdAt
+                timelineItems(itemTypes: [HEAD_REF_FORCE_PUSHED_EVENT], first: 100) {
+                  nodes {
+                    ... on HeadRefForcePushedEvent {
+                      createdAt
+                      beforeCommit { oid }
+                      afterCommit { oid }
+                    }
+                  }
+                }
+              }
+            }
+          }`,
+          { owner, repo, number, request: { signal } }
+        );
+
+        const prData = data.repository.pullRequest;
+        const events = (prData.timelineItems.nodes || [])
+          .filter((e) => e.createdAt)
+          .sort(
+            (a, b) =>
+              new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()
+          );
+
+        if (events.length === 0) return [] as PushVersion[];
+
+        const versions: PushVersion[] = [];
+
+        if (events[0].beforeCommit) {
+          versions.push({
+            version: 1,
+            sha: events[0].beforeCommit.oid,
+            pushedAt: prData.createdAt,
+          });
+        }
+
+        for (const event of events) {
+          if (event.afterCommit) {
+            versions.push({
+              version: versions.length + 1,
+              sha: event.afterCommit.oid,
+              pushedAt: event.createdAt,
+              beforeSha: event.beforeCommit?.oid,
+            });
+          }
+        }
+
+        return versions;
+      },
+      staleTime: 30_000,
+    }),
+
+  pullRequestComments: (owner: string, repo: string, number: number) =>
+    queryOptions({
+      queryKey: ["pull-request", owner, repo, number, "comments"],
+      queryFn: async ({ signal }) => {
+        const comments: ReviewComment[] = [];
+        let page = 1;
+        while (true) {
+          const { data } = await getOctokit().request(
+            "GET /repos/{owner}/{repo}/pulls/{pull_number}/comments",
+            {
+              owner,
+              repo,
+              pull_number: number,
+              per_page: 100,
+              page,
+              headers: { accept: "application/vnd.github.full+json" },
+              request: { signal },
+            }
+          );
+          comments.push(...(data as ReviewComment[]));
+          if (data.length < 100) break;
+          page++;
+        }
+        return comments;
+      },
+      staleTime: 30_000,
+    }),
+
+  pullRequestReviews: (owner: string, repo: string, number: number) =>
+    queryOptions({
+      queryKey: ["pull-request", owner, repo, number, "reviews"],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request(
+          "GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews",
+          {
+            owner,
+            repo,
+            pull_number: number,
+            headers: { accept: "application/vnd.github.full+json" },
+            request: { signal },
+          }
+        );
+        return res.data as Review[];
+      },
+      staleTime: 30_000,
+    }),
+
+  pullRequestConversation: (owner: string, repo: string, number: number) =>
+    queryOptions({
+      queryKey: ["pull-request", owner, repo, number, "conversation"],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request(
+          "GET /repos/{owner}/{repo}/issues/{issue_number}/comments",
+          {
+            owner,
+            repo,
+            issue_number: number,
+            headers: { accept: "application/vnd.github.full+json" },
+            request: { signal },
+          }
+        );
+        return res.data as IssueComment[];
+      },
+      staleTime: 30_000,
+    }),
+
+  pullRequestTimeline: (owner: string, repo: string, number: number) =>
+    queryOptions({
+      queryKey: ["pull-request", owner, repo, number, "timeline"],
+      queryFn: async ({ signal }) => {
+        const events: TimelineEvent[] = [];
+        let page = 1;
+        while (true) {
+          const { data } = await getOctokit().request(
+            "GET /repos/{owner}/{repo}/issues/{issue_number}/timeline",
+            {
+              owner,
+              repo,
+              issue_number: number,
+              per_page: 100,
+              page,
+              request: { signal },
+            }
+          );
+          events.push(...(data as TimelineEvent[]));
+          if (data.length < 100) break;
+          page++;
+        }
+        return events;
+      },
+      staleTime: 30_000,
+    }),
+
+  issueReactions: (owner: string, repo: string, issueNumber: number) =>
+    queryOptions({
+      queryKey: ["reactions", "issue", owner, repo, issueNumber],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request(
+          "GET /repos/{owner}/{repo}/issues/{issue_number}/reactions",
+          {
+            owner,
+            repo,
+            issue_number: issueNumber,
+            per_page: 100,
+            request: { signal },
+          }
+        );
+        return res.data as components["schemas"]["reaction"][];
+      },
+      staleTime: 5 * 60_000,
+    }),
+
+  commentReactions: (owner: string, repo: string, commentId: number) =>
+    queryOptions({
+      queryKey: ["reactions", "comment", owner, repo, commentId],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request(
+          "GET /repos/{owner}/{repo}/issues/comments/{comment_id}/reactions",
+          {
+            owner,
+            repo,
+            comment_id: commentId,
+            per_page: 100,
+            request: { signal },
+          }
+        );
+        return res.data as components["schemas"]["reaction"][];
+      },
+      staleTime: 5 * 60_000,
+    }),
+
+  reviewCommentReactions: (owner: string, repo: string, commentId: number) =>
+    queryOptions({
+      queryKey: ["reactions", "review-comment", owner, repo, commentId],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request(
+          "GET /repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions",
+          {
+            owner,
+            repo,
+            comment_id: commentId,
+            per_page: 100,
+            request: { signal },
+          }
+        );
+        return res.data as components["schemas"]["reaction"][];
+      },
+      staleTime: 5 * 60_000,
+    }),
+
+  userByLogin: (login: string) =>
+    queryOptions({
+      queryKey: ["user", login],
+      queryFn: async ({ signal }) => {
+        const res = await getOctokit().request("GET /users/{username}", {
+          username: login,
+          request: { signal },
+        });
+        return res.data as UserProfile;
+      },
+      staleTime: 60 * 60_000,
+      meta: { persist: true },
+    }),
+
+  prList: (queryStrings: string[], page = 1, perPage = 30) =>
+    queryOptions({
+      queryKey: ["pr-list", [...queryStrings].sort(), page, perPage],
+      queryFn: async ({ signal }) => {
+        if (queryStrings.length === 0) {
+          return { items: [] as PRSearchResult[], totalCount: 0 };
+        }
+
+        const results = await Promise.all(
+          queryStrings.map((q) =>
+            getOctokit()
+              .request("GET /search/issues", {
+                q,
+                sort: "updated",
+                order: "desc",
+                per_page: perPage,
+                page,
+                request: { signal },
+              })
+              .then((r) => r.data)
+          )
+        );
+
+        const seen = new Set<number>();
+        const combined: PRSearchResult[] = [];
+        let totalCount = 0;
+
+        for (const data of results) {
+          totalCount += data.total_count ?? 0;
+          for (const pr of (data.items ?? []) as PRSearchResult[]) {
+            if (!seen.has(pr.id)) {
+              seen.add(pr.id);
+              combined.push(pr);
+            }
+          }
+        }
+
+        combined.sort(
+          (a, b) =>
+            new Date(b.updated_at).getTime() - new Date(a.updated_at).getTime()
+        );
+
+        const prIdentifiers = combined
+          .map((item) => {
+            const match = item.repository_url?.match(/repos\/([^/]+)\/([^/]+)/);
+            if (match && item.number) {
+              return { owner: match[1], repo: match[2], number: item.number };
+            }
+            return null;
+          })
+          .filter(
+            (x): x is { owner: string; repo: string; number: number } =>
+              x !== null
+          );
+
+        if (prIdentifiers.length > 0 && !signal?.aborted) {
+          try {
+            const enrichmentMap = await _enrichPRs(prIdentifiers, signal);
+            for (const item of combined) {
+              const match = item.repository_url?.match(
+                /repos\/([^/]+)\/([^/]+)/
+              );
+              if (match && item.number) {
+                const key = `${match[1]}/${match[2]}/${item.number}`;
+                const enrichment = enrichmentMap.get(key);
+                if (enrichment) Object.assign(item, enrichment);
+              }
+            }
+          } catch (e) {
+            console.error("PR enrichment failed:", e);
+          }
+        }
+
+        return { items: combined, totalCount };
+      },
+      staleTime: 30_000,
+      placeholderData: keepPreviousData,
+    }),
+};
+
+type CheckContext =
+  | {
+      __typename: "CheckRun";
+      name: string;
+      conclusion: string | null;
+      status: string;
+    }
+  | { __typename: "StatusContext"; context: string; state: string };
+
+type EnrichmentResult = {
+  changedFiles: number;
+  additions: number;
+  deletions: number;
+  updatedAt: string;
+  isReadByViewer: boolean;
+  lastCommitAt: string | null;
+  viewerLastReviewAt: string | null;
+  hasNewChanges: boolean;
+  ciStatus: "pending" | "success" | "failure" | "none" | "action_required";
+  ciSummary: string;
+  ciChecks: Array<{
+    name: string;
+    state: "pending" | "success" | "failure" | "skipped";
+  }>;
+  reviewDecision: "APPROVED" | "CHANGES_REQUESTED" | "REVIEW_REQUIRED" | null;
+  latestReviews: Array<{
+    login: string;
+    avatarUrl: string;
+    state: "APPROVED" | "CHANGES_REQUESTED";
+  }>;
+  inMergeQueue: boolean;
+};
+
+async function _enrichPRs(
+  prs: Array<{ owner: string; repo: string; number: number }>,
+  signal?: AbortSignal
+): Promise<Map<string, EnrichmentResult>> {
+  const prQueries = prs
+    .map(
+      (pr, idx) => `
+    pr${idx}: repository(owner: "${pr.owner}", name: "${pr.repo}") {
+      pullRequest(number: ${pr.number}) {
+        number
+        updatedAt
+        isReadByViewer
+        changedFiles
+        additions
+        deletions
+        isInMergeQueue
+        reviewDecision
+        latestOpinionatedReviews(first: 10) {
+          nodes {
+            author { login avatarUrl }
+            state
+          }
+        }
+        commits(last: 1) {
+          nodes {
+            commit {
+              committedDate
+              statusCheckRollup {
+                state
+                contexts(first: 50) {
+                  nodes {
+                    __typename
+                    ... on CheckRun { name conclusion status }
+                    ... on StatusContext { context state }
+                  }
+                }
+              }
+            }
+          }
+        }
+        viewerLatestReview { submittedAt }
+      }
+    }`
+    )
+    .join("\n");
+
+  const data = await getOctokit().graphql<
+    Record<
+      string,
+      {
+        pullRequest: {
+          number: number;
+          updatedAt: string;
+          isReadByViewer: boolean;
+          changedFiles: number;
+          additions: number;
+          deletions: number;
+          isInMergeQueue: boolean;
+          reviewDecision:
+            | "APPROVED"
+            | "CHANGES_REQUESTED"
+            | "REVIEW_REQUIRED"
+            | null;
+          latestOpinionatedReviews: {
+            nodes: Array<{
+              author: { login: string; avatarUrl: string } | null;
+              state: "APPROVED" | "CHANGES_REQUESTED";
+            }>;
+          };
+          commits: {
+            nodes: Array<{
+              commit: {
+                committedDate: string;
+                statusCheckRollup: {
+                  state:
+                    | "EXPECTED"
+                    | "ERROR"
+                    | "FAILURE"
+                    | "PENDING"
+                    | "SUCCESS";
+                  contexts: { nodes: CheckContext[] };
+                } | null;
+              };
+            }>;
+          };
+          viewerLatestReview: { submittedAt: string } | null;
+        } | null;
+      }
+    >
+  >(`query { ${prQueries} }`, { request: { signal } });
+
+  const enrichmentMap = new Map<string, EnrichmentResult>();
+
+  prs.forEach((pr, idx) => {
+    const result = data[`pr${idx}`]?.pullRequest;
+    if (!result) return;
+
+    const lastCommit = result.commits.nodes[0]?.commit;
+    const lastCommitAt = lastCommit?.committedDate ?? null;
+    const viewerLastReviewAt = result.viewerLatestReview?.submittedAt ?? null;
+    const hasNewChanges =
+      viewerLastReviewAt != null &&
+      lastCommitAt != null &&
+      new Date(lastCommitAt) > new Date(viewerLastReviewAt);
+
+    const statusState = lastCommit?.statusCheckRollup?.state;
+    let ciStatus: EnrichmentResult["ciStatus"] = "none";
+    if (statusState === "SUCCESS") ciStatus = "success";
+    else if (statusState === "FAILURE" || statusState === "ERROR")
+      ciStatus = "failure";
+    else if (statusState === "PENDING" || statusState === "EXPECTED")
+      ciStatus = "pending";
+
+    const contexts = lastCommit?.statusCheckRollup?.contexts?.nodes ?? [];
+    const ciChecks: EnrichmentResult["ciChecks"] = contexts.map((ctx) => {
+      if (ctx.__typename === "CheckRun") {
+        let state: "pending" | "success" | "failure" | "skipped" = "pending";
+        if (ctx.status === "COMPLETED") {
+          if (ctx.conclusion === "SUCCESS") state = "success";
+          else if (
+            ["SKIPPED", "NEUTRAL", "CANCELLED"].includes(ctx.conclusion ?? "")
+          )
+            state = "skipped";
+          else state = "failure";
+        }
+        return { name: ctx.name, state };
+      }
+      const state =
+        ctx.state === "SUCCESS"
+          ? "success"
+          : ctx.state === "FAILURE" || ctx.state === "ERROR"
+            ? "failure"
+            : "pending";
+      return { name: ctx.context, state };
+    });
+
+    let ciSummary = "";
+    if (ciChecks.length > 0) {
+      const passed = ciChecks.filter((c) => c.state === "success").length;
+      const failed = ciChecks.filter((c) => c.state === "failure").length;
+      const pending = ciChecks.filter((c) => c.state === "pending").length;
+      const skipped = ciChecks.filter((c) => c.state === "skipped").length;
+      if (failed > 0) {
+        ciSummary =
+          ciChecks.find((c) => c.state === "failure")?.name ??
+          `${failed} failed`;
+      } else if (pending > 0) {
+        ciSummary =
+          ciChecks.find((c) => c.state === "pending")?.name ??
+          `${pending} running`;
+      } else {
+        const nonSkipped = ciChecks.length - skipped;
+        ciSummary =
+          nonSkipped > 0 ? `${passed}/${nonSkipped} passed` : "All skipped";
+      }
+    }
+
+    const reviewsByUser = new Map<
+      string,
+      {
+        login: string;
+        avatarUrl: string;
+        state: "APPROVED" | "CHANGES_REQUESTED";
+      }
+    >();
+    for (const review of result.latestOpinionatedReviews?.nodes ?? []) {
+      if (review.author) {
+        reviewsByUser.set(review.author.login, {
+          login: review.author.login,
+          avatarUrl: review.author.avatarUrl,
+          state: review.state,
+        });
+      }
+    }
+
+    enrichmentMap.set(`${pr.owner}/${pr.repo}/${pr.number}`, {
+      changedFiles: result.changedFiles,
+      additions: result.additions,
+      deletions: result.deletions,
+      updatedAt: result.updatedAt,
+      isReadByViewer: result.isReadByViewer,
+      lastCommitAt,
+      viewerLastReviewAt,
+      hasNewChanges,
+      ciStatus,
+      ciSummary,
+      ciChecks,
+      reviewDecision: result.reviewDecision,
+      latestReviews: Array.from(reviewsByUser.values()),
+      inMergeQueue: result.isInMergeQueue,
+    });
+  });
+
+  return enrichmentMap;
+}
diff --git a/src/browser/lib/query-client.ts b/src/browser/lib/query-client.ts
new file mode 100644
index 0000000..e934f1c
--- /dev/null
+++ b/src/browser/lib/query-client.ts
@@ -0,0 +1,75 @@
+import { QueryClient } from "@tanstack/react-query";
+import { createAsyncStoragePersister } from "@tanstack/query-async-storage-persister";
+
+// Separate DB from PersistentCache (pulldash/responses) to avoid collisions
+const DB_NAME = "pulldash-rq";
+const STORE_NAME = "data";
+const DB_VERSION = 1;
+
+let dbPromise: Promise<IDBDatabase> | null = null;
+
+function openDB(): Promise<IDBDatabase> {
+  if (dbPromise) return dbPromise;
+  dbPromise = new Promise((resolve, reject) => {
+    const req = indexedDB.open(DB_NAME, DB_VERSION);
+    req.onupgradeneeded = () => {
+      if (!req.result.objectStoreNames.contains(STORE_NAME)) {
+        req.result.createObjectStore(STORE_NAME);
+      }
+    };
+    req.onsuccess = () => resolve(req.result);
+    req.onerror = () => {
+      dbPromise = null;
+      reject(req.error);
+    };
+  });
+  return dbPromise;
+}
+
+const idbStorage = {
+  getItem: async (key: string): Promise<string | null> => {
+    const db = await openDB();
+    return new Promise((resolve, reject) => {
+      const req = db.transaction(STORE_NAME).objectStore(STORE_NAME).get(key);
+      req.onsuccess = () => resolve((req.result as string | undefined) ?? null);
+      req.onerror = () => reject(req.error);
+    });
+  },
+  setItem: async (key: string, value: string): Promise<void> => {
+    const db = await openDB();
+    return new Promise((resolve, reject) => {
+      const req = db
+        .transaction(STORE_NAME, "readwrite")
+        .objectStore(STORE_NAME)
+        .put(value, key);
+      req.onsuccess = () => resolve();
+      req.onerror = () => reject(req.error);
+    });
+  },
+  removeItem: async (key: string): Promise<void> => {
+    const db = await openDB();
+    return new Promise((resolve, reject) => {
+      const req = db
+        .transaction(STORE_NAME, "readwrite")
+        .objectStore(STORE_NAME)
+        .delete(key);
+      req.onsuccess = () => resolve();
+      req.onerror = () => reject(req.error);
+    });
+  },
+};
+
+export const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      staleTime: 30_000,
+      gcTime: 5 * 60_000,
+      refetchOnWindowFocus: false,
+      retry: 1,
+    },
+  },
+});
+
+export const persister = createAsyncStoragePersister({
+  storage: idbStorage,
+});
diff --git a/src/types/assets.d.ts b/src/types/assets.d.ts
index a01d535..ff751c5 100644
--- a/src/types/assets.d.ts
+++ b/src/types/assets.d.ts
@@ -1,6 +1,7 @@
 // Type declarations for asset imports
 
 declare const __REPO_URL__: string;
+declare const __DEV__: boolean;
 
 declare module "*.svg" {
   const content: string;