fix(web): show linked and retained PR status in sidebar rows

The sidebar rows still resolved a thread's PR from live git status alone,
which required the thread's branch to match the current checkout. Three
gaps followed: threads with a linked PR never showed a badge in the sidebar,
switching the local checkout dropped every non-worktree thread's badge, and
merged/closed states were lost as soon as the row remounted. The chat header
and command palette already used resolveDisplayedThreadPr, so the header
could say "merged" while the row showed nothing.

Ports upstream's row wiring (pingdotgg#4755, pingdotgg#8160): rows read the linked PR through
useLinkedThreadPullRequest, resolve the displayed PR and its provider from
link → parent-held snapshot → git status, and publish snapshot updates into
threadChangeRequestSnapshotsAtom, which the parent hands back to each row.
Guard script pins both call sites.

Web typecheck clean; sidebar/status-indicator suites 419 passing.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

Author: sheehanmunim

apps/web/src/components/Sidebar.tsx

@@ -166,11 +166,17 @@ import {
 import { resolveLocalCheckoutBranchMismatch } from "./BranchToolbar.logic";
 import {
   ThreadWorktreeIndicator,
+  nextThreadChangeRequestSnapshot,
   prStatusIndicator,
-  resolveThreadPr,
+  resolveDisplayedThreadPr,
+  resolveDisplayedThreadPrProvider,
+  setThreadChangeRequestSnapshot,
   settledPrHoverColorClass,
   terminalStatusFromRunningIds,
+  threadChangeRequestSnapshotsAtom,
+  useLinkedThreadPullRequest,
   type TerminalStatusIndicator,
+  type ThreadChangeRequestSnapshot,
 } from "./ThreadStatusIndicators";
 import {
   resolveSnoozePresets,
@@ -831,10 +837,19 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
   onUnsnooze: (threadRef: ScopedThreadRef) => void;
   onUnpin: (threadRef: ScopedThreadRef) => void;
   onAcknowledgeWoke: (threadRef: ScopedThreadRef, visitedAt: string) => void;
+  // Parent-held PR snapshot: rows remount when settlement partitions move
+  // them, so a merged/closed badge would vanish if the row kept it itself.
+  changeRequestSnapshot: ThreadChangeRequestSnapshot | null;
+  onChangeRequestSnapshot: (
+    threadKey: string,
+    snapshot: ThreadChangeRequestSnapshot | null,
+  ) => void;
   isOverlay?: boolean | undefined;
 }) {
   const {
     isRenaming,
+    changeRequestSnapshot,
+    onChangeRequestSnapshot,
     onCancelRename,
     onCommitRename,
     onContextMenu,
@@ -872,6 +887,12 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
   const terminalProcessCount = runningTerminalIds.length;
 
   const gitCwd = thread.worktreePath ?? props.projectCwd;
+  // A linked PR is read from the host directly, so the badge follows the
+  // link even when the local checkout has moved to another branch.
+  const linkedPullRequestStatus = useLinkedThreadPullRequest(
+    leaseLiveStatus ? thread.environmentId : null,
+    leaseLiveStatus ? thread.linkedPullRequest : null,
+  );
   const gitStatus = useEnvironmentQuery(
     leaseLiveStatus && (thread.branch != null || thread.worktreePath !== null) && gitCwd !== null
       ? vcsEnvironment.status({
@@ -884,9 +905,14 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
     JSON.stringify([thread.environmentId, gitCwd]),
     gitStatus.data,
   );
-  const pr = resolveThreadPr({
+  const retainTerminalOnBranchMismatch = thread.worktreePath === null;
+  const pr = resolveDisplayedThreadPr({
     threadBranch: thread.branch,
     gitStatus: visibleGitStatus,
+    snapshot: changeRequestSnapshot,
+    retainTerminalOnBranchMismatch,
+    linkedPullRequest: thread.linkedPullRequest,
+    linkedPullRequestStatus,
   });
 
   // Same semantics as the legacy sidebar (never-visited counts as read):
@@ -979,8 +1005,37 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
     activeThreadBranch: thread.branch,
     currentGitBranch: visibleGitStatus?.refName ?? null,
   });
-  const prStatus = prStatusIndicator(pr, visibleGitStatus?.sourceControlProvider);
+  const prProvider = resolveDisplayedThreadPrProvider({
+    threadBranch: thread.branch,
+    gitStatus: visibleGitStatus,
+    snapshot: changeRequestSnapshot,
+    retainTerminalOnBranchMismatch,
+    linkedPullRequest: thread.linkedPullRequest,
+    linkedPullRequestStatus,
+  });
+  const prStatus = prStatusIndicator(pr, prProvider);
   const settledPrHoverClass = pr ? settledPrHoverColorClass(pr.state) : undefined;
+  useEffect(() => {
+    const nextSnapshot = nextThreadChangeRequestSnapshot({
+      threadBranch: thread.branch,
+      gitStatus: visibleGitStatus,
+      snapshot: changeRequestSnapshot,
+      retainTerminalOnBranchMismatch,
+      linkedPullRequest: thread.linkedPullRequest,
+      linkedPullRequestStatus,
+    });
+    if (nextSnapshot === undefined) return;
+    onChangeRequestSnapshot(threadKey, nextSnapshot);
+  }, [
+    changeRequestSnapshot,
+    visibleGitStatus,
+    linkedPullRequestStatus,
+    onChangeRequestSnapshot,
+    retainTerminalOnBranchMismatch,
+    thread.branch,
+    thread.linkedPullRequest,
+    threadKey,
+  ]);
 
   const modelInstanceId = thread.session?.providerInstanceId ?? thread.modelSelection.instanceId;
   const providerEntry = props.providerEntryByInstanceId.get(modelInstanceId) ?? null;
@@ -2014,6 +2069,8 @@ export default function Sidebar() {
   // fresh clock whenever it recomputes.
   const [snoozeWakeTick, bumpSnoozeWakeTick] = useState(0);
 
+  const changeRequestSnapshotByKey = useAtomValue(threadChangeRequestSnapshotsAtom);
+
   // Project scope: one menu above the list. Scoping filters the list without
   // making the header width depend on the number or length of project names.
   const [projectScopeKey, setProjectScopeKey] = useState<string | null>(null);
@@ -4045,6 +4102,8 @@ export default function Sidebar() {
         onUnsnooze={attemptUnsnooze}
         onUnpin={attemptUnpin}
         onAcknowledgeWoke={acknowledgeWoke}
+        changeRequestSnapshot={changeRequestSnapshotByKey.get(threadKey) ?? null}
+        onChangeRequestSnapshot={setThreadChangeRequestSnapshot}
         isOverlay={isOverlay}
       />
     );

scripts/personal-verify-fork-features.sh

@@ -88,6 +88,12 @@ require apps/server/src/provider/Layers/GrokAdapter.ts "resolveDesktopMcp" "desk
 require apps/server/src/ws.ts "computerViewStream" "computer view RPCs registered"
 require apps/web/src/components/chat/ChatHeader.tsx "ComputerViewDialog" "computer view mounted in chat header"
 
+# --- Sidebar linked-PR badge (upstream #4755/#8160 wiring, restored 2026-09-02) ---
+# Rows read the linked PR from the host and hold merged/closed state in the
+# parent atom; a merge dropped this once and left the sidebar blind to links.
+require apps/web/src/components/Sidebar.tsx "useLinkedThreadPullRequest(" "sidebar rows read linked PR status"
+require apps/web/src/components/Sidebar.tsx "onChangeRequestSnapshot={setThreadChangeRequestSnapshot}" "sidebar rows publish PR snapshots to the shared atom"
+
 # --- Artwork + app icon pickers (44cf90dc0, 0efc0e293) ---
 require apps/web/src/components/settings/SettingsPanels.tsx "SidebarArtworkRow" "artwork picker in settings"
 require apps/web/src/components/settings/SettingsPanels.tsx "AppIconRow" "app icon picker in settings"