ymichael · ymichael · Jun 22, 2026 · Jun 24, 2026 · Jun 24, 2026 · Jun 25, 2026
diff --git a/apps/app/.ladle/story-fixtures.ts b/apps/app/.ladle/story-fixtures.ts
@@ -326,6 +326,10 @@ export function makeThreadListEntry(
     environmentName: null,
     environmentBranchName: null,
     environmentWorkspaceDisplayKind: "other",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 100 },
+      pullRequest: { state: "not_applicable", refreshedAt: 100 },
+    },
     runtime: { displayStatus: "idle", hostReconnectGraceExpiresAt: null },
   };
   return { ...base, ...overrides };

diff --git a/apps/app/src/components/sidebar/ProjectRow.interactions.test.tsx b/apps/app/src/components/sidebar/ProjectRow.interactions.test.tsx
@@ -92,6 +92,10 @@ function makeThread(overrides: Partial<ThreadListEntry> = {}): ThreadListEntry {
     environmentName: null,
     environmentBranchName: null,
     environmentWorkspaceDisplayKind: "other",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 100 },
+      pullRequest: { state: "not_applicable", refreshedAt: 100 },
+    },
     runtime: { displayStatus: "idle", hostReconnectGraceExpiresAt: null },
     ...overrides,
   };

diff --git a/apps/app/src/components/sidebar/SidebarThreadSearchPanel.test.tsx b/apps/app/src/components/sidebar/SidebarThreadSearchPanel.test.tsx
@@ -55,6 +55,10 @@ function createThreadListEntry({
     environmentId: null,
     environmentName: null,
     environmentWorkspaceDisplayKind: "other",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 1000 },
+      pullRequest: { state: "not_applicable", refreshedAt: 1000 },
+    },
     hasPendingInteraction: false,
     id,
     lastReadAt: null,

diff --git a/apps/app/src/components/sidebar/ThreadRow.test.tsx b/apps/app/src/components/sidebar/ThreadRow.test.tsx
@@ -44,6 +44,10 @@ function createThread(
     environmentName: null,
     environmentBranchName: null,
     environmentWorkspaceDisplayKind: "other",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 1 },
+      pullRequest: { state: "not_applicable", refreshedAt: 1 },
+    },
     runtime: {
       displayStatus: "idle",
       hostReconnectGraceExpiresAt: null,

diff --git a/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts b/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts
@@ -34,6 +34,10 @@ function createThread(
     environmentName: null,
     environmentBranchName: null,
     environmentWorkspaceDisplayKind: "other",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 2 },
+      pullRequest: { state: "not_applicable", refreshedAt: 2 },
+    },
     runtime: {
       displayStatus: "idle",
       hostReconnectGraceExpiresAt: null,

diff --git a/apps/app/src/components/sidebar/projectThreadGroups.test.ts b/apps/app/src/components/sidebar/projectThreadGroups.test.ts
@@ -71,6 +71,10 @@ function createThread(
     environmentName: null,
     environmentBranchName: null,
     environmentWorkspaceDisplayKind: "other",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 2 },
+      pullRequest: { state: "not_applicable", refreshedAt: 2 },
+    },
     runtime: {
       displayStatus: "idle",
       hostReconnectGraceExpiresAt: null,

diff --git a/apps/app/src/components/sidebar/sortComparator.test.ts b/apps/app/src/components/sidebar/sortComparator.test.ts
@@ -38,6 +38,10 @@ function thread(overrides: Partial<ThreadListEntry>): ThreadListEntry {
     environmentName: null,
     environmentBranchName: null,
     environmentWorkspaceDisplayKind: "other",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 2 },
+      pullRequest: { state: "not_applicable", refreshedAt: 2 },
+    },
     runtime: {
       displayStatus: "idle",
       hostReconnectGraceExpiresAt: null,

diff --git a/apps/app/src/hooks/cache-owners/query-cache.ts b/apps/app/src/hooks/cache-owners/query-cache.ts
@@ -460,7 +460,7 @@ export function getEnvironmentActionInvalidationQueryKeys({
 export function getCachedThreadListPlaceholder(
   queryClient: QueryClient,
   threadId: string,
-): ThreadWithRuntime | undefined {
+): ThreadListEntry | undefined {
   if (!threadId) {
     return undefined;
   }
@@ -584,6 +584,13 @@ export function optimisticallyInsertThread(
         hasPendingInteraction: false,
         pinSortKey: null,
         environmentWorkspaceDisplayKind: "other",
+        environmentStatusSummary: {
+          git: { state: "not_applicable", refreshedAt: thread.updatedAt },
+          pullRequest: {
+            state: "not_applicable",
+            refreshedAt: thread.updatedAt,
+          },
+        },
       },
       ...data,
     ]);

diff --git a/apps/app/src/hooks/cache-owners/realtime-cache-registry.ts b/apps/app/src/hooks/cache-owners/realtime-cache-registry.ts
@@ -279,6 +279,13 @@ export const REALTIME_THREAD_CHANGE_REGISTRY = {
       dirtyThreadStorageQueriesForThread, // Thread storage is resolved through the attached environment.
     ],
   },
+  "environment-status-summary-changed": {
+    flush: "debounced",
+    dirty: [
+      dirtyThreadListQueries, // Sidebar/list rows render environment git and PR signals.
+      dirtyThreadDetailQueries, // Detail consumers may reuse list-derived environment summary.
+    ],
+  },
   "read-state-changed": {
     flush: "debounced",
     dirty: [

diff --git a/apps/app/src/hooks/cache-owners/thread-state-cache-owner.test.ts b/apps/app/src/hooks/cache-owners/thread-state-cache-owner.test.ts
@@ -56,6 +56,10 @@ function makeThreadListEntry(
     environmentName: "Environment",
     environmentBranchName: "main",
     environmentWorkspaceDisplayKind: "managed-worktree",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 1 },
+      pullRequest: { state: "not_applicable", refreshedAt: 1 },
+    },
     ...thread,
   };
 }

diff --git a/apps/app/src/hooks/mutations/thread-folder-mutations.test.tsx b/apps/app/src/hooks/mutations/thread-folder-mutations.test.tsx
@@ -51,6 +51,10 @@ function makeThreadListEntry(
     environmentHostId: "host-1",
     environmentName: "Environment",
     environmentWorkspaceDisplayKind: "managed-worktree",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 1 },
+      pullRequest: { state: "not_applicable", refreshedAt: 1 },
+    },
     ...thread,
   };
 }

diff --git a/apps/app/src/hooks/mutations/thread-state-mutations.test.tsx b/apps/app/src/hooks/mutations/thread-state-mutations.test.tsx
@@ -61,6 +61,10 @@ function makeThreadResponse(
   return {
     ...makeThreadWithRuntime(thread),
     canSpawnChild: true,
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 1 },
+      pullRequest: { state: "not_applicable", refreshedAt: 1 },
+    },
     ...thread,
   };
 }
@@ -77,6 +81,10 @@ function makeThreadListEntry(
     environmentName: "Environment",
     environmentBranchName: "main",
     environmentWorkspaceDisplayKind: "managed-worktree",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 1 },
+      pullRequest: { state: "not_applicable", refreshedAt: 1 },
+    },
     ...thread,
   };
 }
@@ -224,9 +232,9 @@ describe("thread state mutations", () => {
 
     await waitFor(() => {
       expect(
-      queryClient.getQueryData<ThreadWithRuntime>(threadQueryKey(threadId))
-        ?.folderId,
-    ).toBe("fld_personal");
+        queryClient.getQueryData<ThreadWithRuntime>(threadQueryKey(threadId))
+          ?.folderId,
+      ).toBe("fld_personal");
     });
     expect(
       queryClient.getQueryData<ThreadListEntry[]>(threadListKey)?.[0]?.folderId,

diff --git a/apps/app/src/hooks/queries/environment-queries.test.tsx b/apps/app/src/hooks/queries/environment-queries.test.tsx
@@ -8,7 +8,6 @@ import { createQueryClientTestHarness } from "@/test/queryClientTestHarness";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { environmentPullRequestQueryKey } from "./query-keys";
 import {
-  getEnvironmentPullRequestRefetchInterval,
   getEnvironmentPullRequestStaleTime,
   useEnvironmentPullRequest,
 } from "./environment-queries";
@@ -28,7 +27,6 @@ vi.mock("@/hooks/useRealtimeSubscription", () => ({
 const ENVIRONMENT_ID = "env-1";
 const ACTIVE_PULL_REQUEST_STALE_MS = 30_000;
 const SETTLED_PULL_REQUEST_STALE_MS = 60 * 60_000;
-const ACTIVE_PULL_REQUEST_REFETCH_MS = 5_000;
 
 const pullRequestFixture: ThreadPullRequest = {
   number: 128,
@@ -106,66 +104,7 @@ describe("useEnvironmentPullRequest", () => {
     ).toBe(SETTLED_PULL_REQUEST_STALE_MS);
   });
 
-  it("polls open pull requests while checks or mergeability are still settling", () => {
-    expect(getEnvironmentPullRequestRefetchInterval(null)).toBe(false);
-    expect(getEnvironmentPullRequestRefetchInterval(undefined)).toBe(false);
-    expect(getEnvironmentPullRequestRefetchInterval(pullRequestFixture)).toBe(
-      false,
-    );
-    expect(
-      getEnvironmentPullRequestRefetchInterval({
-        ...pullRequestFixture,
-        checks: {
-          ...pullRequestFixture.checks,
-          state: "pending",
-          pendingCount: 1,
-        },
-        attention: "checks_pending",
-      }),
-    ).toBe(ACTIVE_PULL_REQUEST_REFETCH_MS);
-    expect(
-      getEnvironmentPullRequestRefetchInterval({
-        ...pullRequestFixture,
-        mergeability: {
-          state: "unknown",
-          mergeStateStatus: "UNKNOWN",
-          mergeable: "UNKNOWN",
-        },
-        attention: "none",
-      }),
-    ).toBe(ACTIVE_PULL_REQUEST_REFETCH_MS);
-  });
-
-  it("does not poll draft or settled pull requests", () => {
-    expect(
-      getEnvironmentPullRequestRefetchInterval({
-        ...pullRequestFixture,
-        state: "draft",
-        mergeability: {
-          state: "draft",
-          mergeStateStatus: "DRAFT",
-          mergeable: "UNKNOWN",
-        },
-        attention: "draft",
-      }),
-    ).toBe(false);
-    expect(
-      getEnvironmentPullRequestRefetchInterval({
-        ...pullRequestFixture,
-        state: "closed",
-        attention: "closed",
-      }),
-    ).toBe(false);
-    expect(
-      getEnvironmentPullRequestRefetchInterval({
-        ...pullRequestFixture,
-        state: "merged",
-        attention: "merged",
-      }),
-    ).toBe(false);
-  });
-
-  it("refetches stale pull request data on mount and always refetches on window focus", async () => {
+  it("refetches stale pull request data on mount and window focus without polling", async () => {
     const { wrapper, queryClient } = createQueryClientTestHarness();
     vi.mocked(api.getEnvironmentPullRequest).mockResolvedValue(
       pullRequestResponse(pullRequestFixture),
@@ -185,9 +124,9 @@ describe("useEnvironmentPullRequest", () => {
       expect.objectContaining({
         refetchOnMount: true,
         refetchOnWindowFocus: "always",
-        refetchInterval: expect.any(Function),
         staleTime: expect.any(Function),
       }),
     );
+    expect(query?.options).not.toHaveProperty("refetchInterval");
   });
 });
diff --git a/apps/app/src/hooks/queries/environment-queries.ts b/apps/app/src/hooks/queries/environment-queries.ts
@@ -52,7 +52,6 @@ interface UseEnvironmentDiffFilesOptions extends QueryOptions {
 
 const ENVIRONMENT_PULL_REQUEST_STALE_MS = 30_000;
 const ENVIRONMENT_SETTLED_PULL_REQUEST_STALE_MS = 60 * 60_000;
-const ENVIRONMENT_ACTIVE_PULL_REQUEST_REFETCH_MS = 5_000;
 const MERGE_BASE_BRANCHES_STALE_MS = 30_000;
 const MERGE_BASE_BRANCHES_LIMIT = 50;
 /** Staleness window for the environment diff TOC query. */
@@ -133,21 +132,6 @@ export function getEnvironmentPullRequestStaleTime(
     : ENVIRONMENT_PULL_REQUEST_STALE_MS;
 }
 
-export function getEnvironmentPullRequestRefetchInterval(
-  pullRequest: ThreadPullRequest | null | undefined,
-): number | false {
-  if (!pullRequest || pullRequest.state !== "open") {
-    return false;
-  }
-  if (
-    pullRequest.checks.state === "pending" ||
-    pullRequest.mergeability.state === "unknown"
-  ) {
-    return ENVIRONMENT_ACTIVE_PULL_REQUEST_REFETCH_MS;
-  }
-  return false;
-}
-
 export function useEnvironmentPullRequest(
   environmentId: string | null | undefined,
   options?: QueryOptions,
@@ -165,8 +149,6 @@ export function useEnvironmentPullRequest(
     enabled,
     refetchOnMount: true,
     refetchOnWindowFocus: "always",
-    refetchInterval: (query) =>
-      getEnvironmentPullRequestRefetchInterval(query.state.data?.pullRequest),
     staleTime: (query) =>
       getEnvironmentPullRequestStaleTime(query.state.data?.pullRequest),
   });

diff --git a/apps/app/src/hooks/queries/query-helpers.test.ts b/apps/app/src/hooks/queries/query-helpers.test.ts
@@ -216,6 +216,10 @@ describe("resolveThreadPlaceholder", () => {
     const previousThread: ThreadResponse = {
       ...makeThreadWithRuntime({ id: "thread-1" }),
       canSpawnChild: false,
+      environmentStatusSummary: {
+        git: { state: "not_applicable", refreshedAt: 1 },
+        pullRequest: { state: "not_applicable", refreshedAt: 1 },
+      },
     };
 
     expect(

diff --git a/apps/app/src/hooks/queries/thread-queries.ts b/apps/app/src/hooks/queries/thread-queries.ts
@@ -9,7 +9,7 @@ import { useDebounceValue } from "usehooks-ts";
 import type {
   PendingInteraction,
   ResolvedThreadExecutionOptions,
-  ThreadWithRuntime,
+  ThreadListEntry,
 } from "@bb/domain";
 import type {
   PromptHistoryResponse,
@@ -518,7 +518,7 @@ export function useThread(id: string, options?: QueryOptions) {
 // placeholder; the real single-thread response, which carries the server-
 // computed value, resolves moments later.
 function liftThreadListPlaceholder(
-  thread: ThreadWithRuntime | undefined,
+  thread: ThreadListEntry | undefined,
 ): ThreadResponse | undefined {
   if (thread === undefined) {
     return undefined;

diff --git a/apps/app/src/views/RootComposeMobileRecents.test.tsx b/apps/app/src/views/RootComposeMobileRecents.test.tsx
@@ -38,6 +38,10 @@ function makeThread(args: MakeThreadArgs): ThreadListEntry {
     environmentName: null,
     environmentBranchName: null,
     environmentWorkspaceDisplayKind: "other",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 100 },
+      pullRequest: { state: "not_applicable", refreshedAt: 100 },
+    },
     runtime: {
       displayStatus: "idle",
       hostReconnectGraceExpiresAt: null,

diff --git a/apps/app/src/views/RootComposeView.test.ts b/apps/app/src/views/RootComposeView.test.ts
@@ -86,6 +86,10 @@ function makeThread(args: MakeThreadArgs): ThreadListEntry {
     environmentName: null,
     environmentBranchName: null,
     environmentWorkspaceDisplayKind: "other",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 100 },
+      pullRequest: { state: "not_applicable", refreshedAt: 100 },
+    },
     runtime: {
       displayStatus: "idle",
       hostReconnectGraceExpiresAt: null,

diff --git a/apps/app/src/views/thread-detail/ThreadDetailView.tsx b/apps/app/src/views/thread-detail/ThreadDetailView.tsx
@@ -16,6 +16,7 @@ import {
 import {
   isActiveTerminalSessionStatus,
   resolveEnvironmentMergeBaseBranch,
+  type ThreadPullRequest,
   type ThreadListEntry,
   type ThreadWithRuntime,
 } from "@bb/domain";
@@ -36,7 +37,6 @@ import { useSendThreadMessage } from "../../hooks/mutations/thread-runtime-mutat
 import { useUpdateEnvironment } from "../../hooks/mutations/environment-mutations";
 import {
   useEnvironment,
-  useEnvironmentPullRequest,
   useEnvironmentWorkStatus,
 } from "../../hooks/queries/environment-queries";
 import {
@@ -1282,10 +1282,10 @@ export function ThreadDetailView(props: ThreadDetailViewProps) {
     workStatusResponse?.outcome === "unavailable"
       ? workStatusResponse.failure
       : undefined;
-  const pullRequestQuery = useEnvironmentPullRequest(thread?.environmentId, {
-    enabled: canUseGitUi && environment !== undefined,
-  });
-  const pullRequest = pullRequestQuery.data?.pullRequest ?? null;
+  const pullRequest = useMemo<ThreadPullRequest | null>(() => {
+    const summary = thread?.environmentStatusSummary.pullRequest;
+    return summary?.state === "available" ? summary.pullRequest : null;
+  }, [thread?.environmentStatusSummary.pullRequest]);
   const handlePullRequestReady = useCallback(async () => {
     const environmentId = thread?.environmentId;
     if (!environmentId) {

diff --git a/apps/app/src/views/thread-detail/threadParentSelectorOptions.test.ts b/apps/app/src/views/thread-detail/threadParentSelectorOptions.test.ts
@@ -19,6 +19,10 @@ function makeThread(overrides: ThreadListEntryOverrides = {}): ThreadListEntry {
     environmentId: null,
     environmentName: null,
     environmentWorkspaceDisplayKind: "other",
+    environmentStatusSummary: {
+      git: { state: "not_applicable", refreshedAt: 1 },
+      pullRequest: { state: "not_applicable", refreshedAt: 1 },
+    },
     hasPendingInteraction: false,
     id: "thr_1",
     lastReadAt: null,