diff --git a/apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx b/apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx
index 8478b7c755..5b444fd139 100644
--- a/apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx
+++ b/apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx
@@ -327,7 +327,6 @@ const dirtyContextBannerSection =
 
 const contextBannerElement: ReactNode = dirtyContextBannerSection ? (
   <ThreadPromptContextBanner
-    todoSection={null}
     archivedSection={null}
     environmentGoneSection={null}
     gitSection={{
@@ -342,6 +341,7 @@ const contextBannerElement: ReactNode = dirtyContextBannerSection ? (
     gitSectionPending={false}
     parentThreadSection={null}
     childThreadsSection={null}
+    pullRequestSection={null}
     expandedSection={null}
     onToggleSection={noop}
   />
@@ -349,13 +349,13 @@ const contextBannerElement: ReactNode = dirtyContextBannerSection ? (
 
 const archivedContextBannerElement: ReactNode = (
   <ThreadPromptContextBanner
-    todoSection={null}
     archivedSection={{ archivedAt: 1_731_456_000_000 }}
     environmentGoneSection={null}
     gitSection={null}
     gitSectionPending={false}
     parentThreadSection={null}
     childThreadsSection={null}
+    pullRequestSection={null}
     expandedSection={null}
     onToggleSection={noop}
   />
@@ -363,13 +363,13 @@ const archivedContextBannerElement: ReactNode = (
 
 const environmentGoneContextBannerElement: ReactNode = (
   <ThreadPromptContextBanner
-    todoSection={null}
     archivedSection={null}
     environmentGoneSection={{ status: "destroyed" }}
     gitSection={null}
     gitSectionPending={false}
     parentThreadSection={null}
     childThreadsSection={null}
+    pullRequestSection={null}
     expandedSection={null}
     onToggleSection={noop}
   />
diff --git a/apps/app/src/components/promptbox/banner/QueuedMessagesList.stories.tsx b/apps/app/src/components/promptbox/banner/QueuedMessagesList.stories.tsx
index 6621d70f06..02cd3e366f 100644
--- a/apps/app/src/components/promptbox/banner/QueuedMessagesList.stories.tsx
+++ b/apps/app/src/components/promptbox/banner/QueuedMessagesList.stories.tsx
@@ -281,14 +281,6 @@ function ReorderableQueuedMessagesList() {
   );
 }
 
-export function Reorderable() {
-  return (
-    <PromptStage>
-      <ReorderableQueuedMessagesList />
-    </PromptStage>
-  );
-}
-
 export function Overview() {
   return (
     <StoryCard>
diff --git a/apps/app/src/components/promptbox/banner/ThreadGoalCard.stories.tsx b/apps/app/src/components/promptbox/banner/ThreadGoalCard.stories.tsx
new file mode 100644
index 0000000000..1a44285cd7
--- /dev/null
+++ b/apps/app/src/components/promptbox/banner/ThreadGoalCard.stories.tsx
@@ -0,0 +1,96 @@
+import { useState } from "react";
+import type { ThreadTimelineGoal } from "@bb/domain";
+import { StoryCard, StoryRow } from "../../../../.ladle/story-card";
+import { ThreadGoalCard } from "./ThreadGoalCard";
+
+export default {
+  title: "promptbox/banner/Goal Card",
+};
+
+function Stage({ children }: { children: React.ReactNode }) {
+  return <div className="w-full max-w-[760px]">{children}</div>;
+}
+
+const activeGoal: ThreadTimelineGoal = {
+  sourceSeq: 42,
+  updatedAt: Date.now() - 12_000,
+  objective:
+    "Ship the prompt context banner cleanup: keep active state segments first, compact metadata into icon-only controls, and preserve quick actions for single-segment states.",
+  status: "active",
+  tokenBudget: 80_000,
+  tokensUsed: 27_450,
+  timeUsedSeconds: 1_238,
+};
+
+const unboundedGoal: ThreadTimelineGoal = {
+  ...activeGoal,
+  sourceSeq: 43,
+  objective:
+    "Audit the composer stack and identify the smallest set of follow-up UI fixes needed before merging.",
+  tokenBudget: null,
+  tokensUsed: 9_820,
+  timeUsedSeconds: 412,
+};
+
+function ToggleableGoalCard({
+  goal,
+  initiallyExpanded = false,
+}: {
+  goal: ThreadTimelineGoal;
+  initiallyExpanded?: boolean;
+}) {
+  const [expanded, setExpanded] = useState(initiallyExpanded);
+  return (
+    <ThreadGoalCard
+      goal={goal}
+      isExpanded={expanded}
+      onToggle={() => setExpanded((value) => !value)}
+    />
+  );
+}
+
+function FauxComposer() {
+  return (
+    <div className="rounded-lg border border-border bg-popover p-3">
+      <div className="pb-3 text-sm text-subtle-foreground">
+        Reply to the agent...
+      </div>
+      <div className="flex items-center gap-2">
+        <span className="rounded-full border border-border px-2.5 py-1 text-xs text-muted-foreground">
+          gpt-5.5
+        </span>
+      </div>
+    </div>
+  );
+}
+
+export function Overview() {
+  return (
+    <StoryCard>
+      <StoryRow
+        label="prompt stack"
+        hint="goal card above the composer; click to expand"
+      >
+        <Stage>
+          <div className="flex flex-col gap-2">
+            <ToggleableGoalCard goal={activeGoal} />
+            <FauxComposer />
+          </div>
+        </Stage>
+      </StoryRow>
+      <StoryRow
+        label="expanded"
+        hint="full objective with token budget and elapsed time"
+      >
+        <Stage>
+          <ToggleableGoalCard goal={activeGoal} initiallyExpanded />
+        </Stage>
+      </StoryRow>
+      <StoryRow label="no token budget" hint="unbounded goal usage summary">
+        <Stage>
+          <ToggleableGoalCard goal={unboundedGoal} initiallyExpanded />
+        </Stage>
+      </StoryRow>
+    </StoryCard>
+  );
+}
diff --git a/apps/app/src/components/promptbox/banner/ThreadGoalCard.tsx b/apps/app/src/components/promptbox/banner/ThreadGoalCard.tsx
index eec21cd6d6..2903317773 100644
--- a/apps/app/src/components/promptbox/banner/ThreadGoalCard.tsx
+++ b/apps/app/src/components/promptbox/banner/ThreadGoalCard.tsx
@@ -5,15 +5,6 @@ import { cn } from "@/lib/utils";
 
 const GOAL_CARD_ROW_HEIGHT = 32;
 
-function GoalActiveBadge() {
-  return (
-    <span className="inline-flex shrink-0 items-center gap-1.5 text-xs leading-none text-success">
-      <span className="size-1.5 shrink-0 rounded-full bg-success" />
-      Active
-    </span>
-  );
-}
-
 function formatDuration(seconds: number): string {
   if (seconds < 60) {
     return `${Math.round(seconds)}s`;
@@ -48,10 +39,10 @@ const TOGGLE_ID = "thread-goal-card-toggle";
 /**
  * Collapsible goal card for the prompt stack above the composer. Surfaces the
  * provider's current durable objective (Codex `thread/goal/*` events projected
- * onto the timeline). Collapsed: objective + Active badge. Expanded: full
- * objective + token/time usage. Mirrors the ThreadPromptContextBanner section
- * chrome. Only rendered while the goal is active — once the provider marks it
- * complete (or paused / budget-limited) it drops out of the prompt stack.
+ * onto the timeline). Collapsed: objective. Expanded: full objective +
+ * token/time usage. Mirrors the ThreadPromptContextBanner section chrome. Only
+ * rendered while the goal is active — once the provider marks it complete (or
+ * paused / budget-limited) it drops out of the prompt stack.
  */
 export function ThreadGoalCard({
   goal,
@@ -82,7 +73,10 @@ export function ThreadGoalCard({
             className="size-3.5 shrink-0 text-muted-foreground"
             aria-hidden="true"
           />
-          <span className="min-w-0 flex-1 truncate text-left" title={goal.objective}>
+          <span
+            className="min-w-0 flex-1 truncate text-left"
+            title={goal.objective}
+          >
             {goal.objective}
           </span>
           <Icon
@@ -94,7 +88,6 @@ export function ThreadGoalCard({
             aria-hidden="true"
           />
         </button>
-        <GoalActiveBadge />
       </div>
       <section
         id={BODY_ID}
@@ -115,7 +108,11 @@ export function ThreadGoalCard({
             </p>
             <div className="flex flex-wrap items-center gap-x-4 gap-y-1 text-xs text-muted-foreground">
               <span className="inline-flex items-center gap-1.5">
-                <Icon name="Zap" className="size-3.5 shrink-0" aria-hidden="true" />
+                <Icon
+                  name="Zap"
+                  className="size-3.5 shrink-0"
+                  aria-hidden="true"
+                />
                 {formatTokenUsage(goal)}
               </span>
               <span className="inline-flex items-center gap-1.5">
diff --git a/apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.stories.tsx b/apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.stories.tsx
index d92ec0b6fc..0d1c31b82a 100644
--- a/apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.stories.tsx
+++ b/apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.stories.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
 import type {
-  ThreadTimelinePendingTodos,
+  ThreadPullRequest,
   WorkspaceFileStatus,
   WorkspaceStatus,
 } from "@bb/domain";
@@ -90,25 +90,120 @@ const dirtyUncommittedStatus: WorkspaceStatus = {
 };
 
 const dirtyUncommittedManyFiles: WorkspaceFileStatus[] = [
-  { path: "apps/app/src/components/promptbox/FollowUpPromptBox.tsx", status: "M", insertions: 42, deletions: 18 },
-  { path: "apps/app/src/components/promptbox/banner/PromptStackCard.tsx", status: "A", insertions: 96, deletions: 0 },
-  { path: "apps/app/src/components/promptbox/banner/QueuedMessagesList.tsx", status: "A", insertions: 74, deletions: 0 },
-  { path: "apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.tsx", status: "A", insertions: 88, deletions: 0 },
-  { path: "apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.stories.tsx", status: "M", insertions: 21, deletions: 7 },
-  { path: "apps/app/src/components/thread/WorkspaceChangesList.tsx", status: "M", insertions: 16, deletions: 4 },
-  { path: "apps/app/src/components/workspace/workspace-change-summary.ts", status: "M", insertions: 8, deletions: 3 },
-  { path: "apps/app/src/views/ThreadDetailPromptArea.tsx", status: "M", insertions: 12, deletions: 29 },
-  { path: "apps/app/src/views/ThreadDetailSecondaryPanel.tsx", status: "M", insertions: 5, deletions: 5 },
-  { path: "apps/app/src/hooks/useThreadPromptContext.ts", status: "M", insertions: 32, deletions: 14 },
-  { path: "apps/app/src/lib/format-workspace-status.ts", status: "A", insertions: 24, deletions: 0 },
-  { path: "apps/app/src/styles/promptbox.css", status: "M", insertions: 3, deletions: 1 },
-  { path: "apps/app/.ladle/story-card.tsx", status: "M", insertions: 1, deletions: 1 },
-  { path: "packages/domain/src/workspace.ts", status: "M", insertions: 10, deletions: 2 },
-  { path: "packages/domain/src/thread.ts", status: "M", insertions: 6, deletions: 0 },
-  { path: "apps/server/src/routes/threads.ts", status: "M", insertions: 18, deletions: 11 },
-  { path: "apps/server/src/lifecycle/thread-prompt.ts", status: "M", insertions: 9, deletions: 4 },
-  { path: "apps/host/src/workspace/status.ts", status: "M", insertions: 22, deletions: 8 },
-  { path: "apps/app/src/components/promptbox/banner/__snapshots__/ThreadPromptContextBanner.test.tsx.snap", status: "D", insertions: 0, deletions: 187 },
+  {
+    path: "apps/app/src/components/promptbox/FollowUpPromptBox.tsx",
+    status: "M",
+    insertions: 42,
+    deletions: 18,
+  },
+  {
+    path: "apps/app/src/components/promptbox/banner/PromptStackCard.tsx",
+    status: "A",
+    insertions: 96,
+    deletions: 0,
+  },
+  {
+    path: "apps/app/src/components/promptbox/banner/QueuedMessagesList.tsx",
+    status: "A",
+    insertions: 74,
+    deletions: 0,
+  },
+  {
+    path: "apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.tsx",
+    status: "A",
+    insertions: 88,
+    deletions: 0,
+  },
+  {
+    path: "apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.stories.tsx",
+    status: "M",
+    insertions: 21,
+    deletions: 7,
+  },
+  {
+    path: "apps/app/src/components/thread/WorkspaceChangesList.tsx",
+    status: "M",
+    insertions: 16,
+    deletions: 4,
+  },
+  {
+    path: "apps/app/src/components/workspace/workspace-change-summary.ts",
+    status: "M",
+    insertions: 8,
+    deletions: 3,
+  },
+  {
+    path: "apps/app/src/views/ThreadDetailPromptArea.tsx",
+    status: "M",
+    insertions: 12,
+    deletions: 29,
+  },
+  {
+    path: "apps/app/src/views/ThreadDetailSecondaryPanel.tsx",
+    status: "M",
+    insertions: 5,
+    deletions: 5,
+  },
+  {
+    path: "apps/app/src/hooks/useThreadPromptContext.ts",
+    status: "M",
+    insertions: 32,
+    deletions: 14,
+  },
+  {
+    path: "apps/app/src/lib/format-workspace-status.ts",
+    status: "A",
+    insertions: 24,
+    deletions: 0,
+  },
+  {
+    path: "apps/app/src/styles/promptbox.css",
+    status: "M",
+    insertions: 3,
+    deletions: 1,
+  },
+  {
+    path: "apps/app/.ladle/story-card.tsx",
+    status: "M",
+    insertions: 1,
+    deletions: 1,
+  },
+  {
+    path: "packages/domain/src/workspace.ts",
+    status: "M",
+    insertions: 10,
+    deletions: 2,
+  },
+  {
+    path: "packages/domain/src/thread.ts",
+    status: "M",
+    insertions: 6,
+    deletions: 0,
+  },
+  {
+    path: "apps/server/src/routes/threads.ts",
+    status: "M",
+    insertions: 18,
+    deletions: 11,
+  },
+  {
+    path: "apps/server/src/lifecycle/thread-prompt.ts",
+    status: "M",
+    insertions: 9,
+    deletions: 4,
+  },
+  {
+    path: "apps/host/src/workspace/status.ts",
+    status: "M",
+    insertions: 22,
+    deletions: 8,
+  },
+  {
+    path: "apps/app/src/components/promptbox/banner/__snapshots__/ThreadPromptContextBanner.test.tsx.snap",
+    status: "D",
+    insertions: 0,
+    deletions: 187,
+  },
 ];
 
 const dirtyUncommittedManyStatus: WorkspaceStatus = {
@@ -211,38 +306,6 @@ const featureBranchMergeBase: ContextBannerMergeBaseConfig = {
   onChange: noop,
 };
 
-const pendingTodosFixture: ThreadTimelinePendingTodos = {
-  sourceSeq: 0,
-  updatedAt: 0,
-  items: [
-    {
-      id: "todo:1",
-      text: "Read the planning doc",
-      status: "completed",
-    },
-    {
-      id: "todo:2",
-      text: "Build initial banner shell",
-      status: "completed",
-    },
-    {
-      id: "todo:3",
-      text: "Wire pendingTodos from the timeline projection",
-      status: "in_progress",
-    },
-    {
-      id: "todo:4",
-      text: "Surface pendingTodos in `bb thread show` and `bb status`",
-      status: "pending",
-    },
-    {
-      id: "todo:5",
-      text: "Tighten GET /threads/:id with requirePublicProject",
-      status: "pending",
-    },
-  ],
-};
-
 const parentThreadFixture: ThreadPromptParentThreadSection = {
   parentThreadTitle: "Parent thread",
   href: "/projects/proj-1/threads/thr_parent_demo",
@@ -294,34 +357,225 @@ const childThreadsLargeFixture: ThreadPromptChildThreadsSection = {
   })),
 };
 
+function buildPullRequestFixture(
+  overrides: Partial<ThreadPullRequest> = {},
+): ThreadPullRequest {
+  const base: ThreadPullRequest = {
+    number: 128,
+    title: "Show pull request status in the prompt context banner",
+    state: "open",
+    url: "https://github.com/acme/bb/pull/128",
+    baseRefName: "main",
+    headRefName: "bb/pr-context-banner",
+    updatedAt: "2026-06-16T12:30:00Z",
+    checks: {
+      state: "failing",
+      totalCount: 3,
+      passedCount: 1,
+      failedCount: 1,
+      pendingCount: 1,
+    },
+    review: {
+      state: "review_requested",
+      reviewRequestCount: 1,
+    },
+    mergeability: {
+      state: "mergeable",
+      mergeStateStatus: "CLEAN",
+      mergeable: "MERGEABLE",
+    },
+    attention: "checks_failed",
+  };
+
+  return {
+    ...base,
+    ...overrides,
+    checks: overrides.checks
+      ? { ...base.checks, ...overrides.checks }
+      : base.checks,
+    review: overrides.review
+      ? { ...base.review, ...overrides.review }
+      : base.review,
+    mergeability: overrides.mergeability
+      ? { ...base.mergeability, ...overrides.mergeability }
+      : base.mergeability,
+  };
+}
+
+const pullRequestFixture = buildPullRequestFixture();
+
+const pullRequestStateRows: readonly {
+  label: string;
+  hint: string;
+  pullRequest: ThreadPullRequest;
+}[] = [
+  {
+    label: "open · checks passing",
+    hint: "happy path",
+    pullRequest: buildPullRequestFixture({
+      number: 128,
+      checks: {
+        state: "passing",
+        totalCount: 3,
+        passedCount: 3,
+        failedCount: 0,
+        pendingCount: 0,
+      },
+      attention: "ready_to_merge",
+    }),
+  },
+  {
+    label: "open · checks pending",
+    hint: "running checks",
+    pullRequest: buildPullRequestFixture({
+      number: 129,
+      checks: {
+        state: "pending",
+        totalCount: 3,
+        passedCount: 1,
+        failedCount: 0,
+        pendingCount: 2,
+      },
+      attention: "checks_pending",
+    }),
+  },
+  {
+    label: "open · checks failing",
+    hint: "failing checks",
+    pullRequest: buildPullRequestFixture({
+      number: 130,
+      checks: {
+        state: "failing",
+        totalCount: 3,
+        passedCount: 1,
+        failedCount: 1,
+        pendingCount: 1,
+      },
+      attention: "checks_failed",
+    }),
+  },
+  {
+    label: "draft · checks pending",
+    hint: "draft PR",
+    pullRequest: buildPullRequestFixture({
+      number: 131,
+      state: "draft",
+      checks: {
+        state: "pending",
+        totalCount: 2,
+        passedCount: 0,
+        failedCount: 0,
+        pendingCount: 2,
+      },
+      mergeability: {
+        state: "draft",
+        mergeStateStatus: "DRAFT",
+        mergeable: "UNKNOWN",
+      },
+      attention: "draft",
+    }),
+  },
+  {
+    label: "open · review requested",
+    hint: "human attention",
+    pullRequest: buildPullRequestFixture({
+      number: 132,
+      checks: {
+        state: "passing",
+        totalCount: 3,
+        passedCount: 3,
+        failedCount: 0,
+        pendingCount: 0,
+      },
+      review: {
+        state: "review_requested",
+        reviewRequestCount: 2,
+      },
+      attention: "review_requested",
+    }),
+  },
+  {
+    label: "open · blocked",
+    hint: "merge blocked",
+    pullRequest: buildPullRequestFixture({
+      number: 133,
+      checks: {
+        state: "unknown",
+        totalCount: 0,
+        passedCount: 0,
+        failedCount: 0,
+        pendingCount: 0,
+      },
+      mergeability: {
+        state: "blocked",
+        mergeStateStatus: "BLOCKED",
+        mergeable: "UNKNOWN",
+      },
+      attention: "blocked",
+    }),
+  },
+  {
+    label: "merged",
+    hint: "terminal state",
+    pullRequest: buildPullRequestFixture({
+      number: 134,
+      state: "merged",
+      checks: {
+        state: "passing",
+        totalCount: 3,
+        passedCount: 3,
+        failedCount: 0,
+        pendingCount: 0,
+      },
+      attention: "merged",
+    }),
+  },
+  {
+    label: "closed",
+    hint: "terminal state",
+    pullRequest: buildPullRequestFixture({
+      number: 135,
+      state: "closed",
+      checks: {
+        state: "unknown",
+        totalCount: 0,
+        passedCount: 0,
+        failedCount: 0,
+        pendingCount: 0,
+      },
+      attention: "closed",
+    }),
+  },
+];
+
 interface RowConfig {
   section?: WorkspaceChangedFilesSection;
   mergeBase?: ContextBannerMergeBaseConfig | null;
-  pendingTodos?: ThreadTimelinePendingTodos | null;
   archived?: ThreadPromptArchivedSection | null;
   environmentGone?: ThreadPromptEnvironmentGoneSection | null;
   parentThread?: ThreadPromptParentThreadSection | null;
   childThreads?: ThreadPromptChildThreadsSection | null;
+  pullRequest?: ThreadPullRequest | null;
   initiallyExpandedSection?: ThreadPromptContextBannerExpandedSection | null;
 }
 
 function Row({
   section,
   mergeBase = featureBranchMergeBase,
-  pendingTodos = null,
   archived = null,
   environmentGone = null,
   parentThread = null,
   childThreads = null,
+  pullRequest = null,
   initiallyExpandedSection = null,
 }: RowConfig) {
-  const [expandedSection, setExpandedSection] = useState<
-    ThreadPromptContextBannerExpandedSection | null
-  >(initiallyExpandedSection);
+  const [expandedSection, setExpandedSection] =
+    useState<ThreadPromptContextBannerExpandedSection | null>(
+      initiallyExpandedSection,
+    );
   return (
     <PromptStage>
       <ThreadPromptContextBanner
-        todoSection={pendingTodos ? { pendingTodos } : null}
         gitSection={
           section
             ? {
@@ -336,11 +590,10 @@ function Row({
         environmentGoneSection={environmentGone}
         parentThreadSection={parentThread}
         childThreadsSection={childThreads}
+        pullRequestSection={pullRequest ? { pullRequest } : null}
         expandedSection={expandedSection}
         onToggleSection={(next) =>
-          setExpandedSection((previous) =>
-            previous === next ? null : next,
-          )
+          setExpandedSection((previous) => (previous === next ? null : next))
         }
       />
     </PromptStage>
@@ -349,6 +602,7 @@ function Row({
 
 const archivedFixture: ThreadPromptArchivedSection = {
   archivedAt: 1_731_456_000_000,
+  onUnarchive: noop,
 };
 
 const destroyedEnvironmentFixture: ThreadPromptEnvironmentGoneSection = {
@@ -364,7 +618,7 @@ export function Overview() {
     <StoryCard>
       <StoryRow
         label="git — merge-base picker"
-        hint="GitMerge icon + 'Merge base' label + branch picker ('main'). It carries data-promptbox-hide-compact, so it only shows when the prompt shell is ≥ 34rem — this row forces a wide shell to reveal it."
+        hint="git is the only segment, so the merge-base action is pinned to the far right. It still carries data-promptbox-hide-compact."
       >
         <div className="w-[40rem] max-w-full overflow-x-auto">
           <Row section={committedSection} />
@@ -372,13 +626,13 @@ export function Overview() {
       </StoryRow>
       <StoryRow
         label="archived thread"
-        hint="archive icon + 'Thread is archived'; suppresses todos/git/childThreads"
+        hint="archive icon + 'Thread is archived' with an underlined unarchive label pinned to the far right"
       >
         <Row archived={archivedFixture} mergeBase={null} />
       </StoryRow>
       <StoryRow
         label="archived + child thread"
-        hint="archived row plus parent context on a frozen thread"
+        hint="archived row plus parent context; action is hidden because archived is not the only segment"
       >
         <Row
           archived={archivedFixture}
@@ -388,19 +642,18 @@ export function Overview() {
       </StoryRow>
       <StoryRow
         label="archived thread (with other context, all suppressed)"
-        hint="archived takes precedence — todos/git/child work are hidden"
+        hint="archived takes precedence — git/child work are hidden, so the unarchive action remains available"
       >
         <Row
           archived={archivedFixture}
           section={uncommittedSection}
-          pendingTodos={pendingTodosFixture}
           childThreads={childThreadsFixture}
           mergeBase={null}
         />
       </StoryRow>
       <StoryRow
         label="environment destroyed"
-        hint="environment-gone row suppresses todos/git/childThreads"
+        hint="environment-gone row suppresses git/childThreads"
       >
         <Row environmentGone={destroyedEnvironmentFixture} mergeBase={null} />
       </StoryRow>
@@ -416,20 +669,16 @@ export function Overview() {
       </StoryRow>
       <StoryRow
         label="environment gone (with other context, all suppressed)"
-        hint="gone environment takes precedence — todos/git/child work are hidden"
+        hint="gone environment takes precedence — git/child work are hidden"
       >
         <Row
           environmentGone={destroyedEnvironmentFixture}
           section={uncommittedSection}
-          pendingTodos={pendingTodosFixture}
           childThreads={childThreadsFixture}
           mergeBase={null}
         />
       </StoryRow>
-      <StoryRow
-        label="child thread (alone)"
-        hint="inline parent link"
-      >
+      <StoryRow label="child thread (alone)" hint="inline parent link">
         <Row parentThread={parentThreadFixture} mergeBase={null} />
       </StoryRow>
       <StoryRow
@@ -471,50 +720,31 @@ export function Overview() {
         />
       </StoryRow>
       <StoryRow
-        label="child thread + todos + uncommitted"
+        label="child thread + uncommitted"
         hint="with other context, the parent-thread segment collapses to an icon-only toggle"
       >
-        <Row
-          section={uncommittedSection}
-          pendingTodos={pendingTodosFixture}
-          parentThread={parentThreadFixture}
-        />
+        <Row section={uncommittedSection} parentThread={parentThreadFixture} />
       </StoryRow>
       <StoryRow
-        label="todos + uncommitted"
-        hint="both sections share one row; click either summary to expand its body"
-      >
-        <Row section={uncommittedSection} pendingTodos={pendingTodosFixture} />
-      </StoryRow>
-      <StoryRow
-        label="todos only (all 3 states, expanded)"
-        hint="completed / in-progress / pending shown checked, dotted, and outline"
-      >
-        <Row
-          pendingTodos={pendingTodosFixture}
-          mergeBase={null}
-          initiallyExpandedSection="todos"
-        />
-      </StoryRow>
-      <StoryRow
-        label="todos + uncommitted (todos expanded)"
-        hint="only one section can be expanded at a time"
+        label="metadata + pull request + git"
+        hint="relationship metadata renders first, then GitHub PR, then git status"
       >
         <Row
+          parentThread={forkedFromFixture}
+          pullRequest={pullRequestFixture}
           section={uncommittedSection}
-          pendingTodos={pendingTodosFixture}
-          initiallyExpandedSection="todos"
         />
       </StoryRow>
+      {pullRequestStateRows.map(({ label, hint, pullRequest }) => (
+        <StoryRow key={label} label={`pull request — ${label}`} hint={hint}>
+          <Row pullRequest={pullRequest} mergeBase={null} />
+        </StoryRow>
+      ))}
       <StoryRow
-        label="todos + uncommitted (git expanded)"
-        hint="clicking the git summary closes todos and opens the file list"
+        label="pull request + uncommitted"
+        hint="PR segment coexists with existing banner sections"
       >
-        <Row
-          section={uncommittedSection}
-          pendingTodos={pendingTodosFixture}
-          initiallyExpandedSection="git"
-        />
+        <Row pullRequest={pullRequestFixture} section={uncommittedSection} />
       </StoryRow>
       <StoryRow
         label="uncommitted (collapsed)"
diff --git a/apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.test.tsx b/apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.test.tsx
index 3b865f2fb3..6ec35e8ec0 100644
--- a/apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.test.tsx
+++ b/apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.test.tsx
@@ -8,13 +8,13 @@ describe("ThreadPromptContextBanner", () => {
   it("renders the archived read-only status without an action", () => {
     const markup = renderToStaticMarkup(
       <ThreadPromptContextBanner
-        todoSection={null}
         gitSection={null}
         gitSectionPending={false}
         archivedSection={{ archivedAt: 1_731_456_000_000 }}
         environmentGoneSection={null}
         parentThreadSection={null}
         childThreadsSection={null}
+        pullRequestSection={null}
         expandedSection={null}
         onToggleSection={noop}
       />,
@@ -28,13 +28,13 @@ describe("ThreadPromptContextBanner", () => {
   it("renders the environment-gone read-only status without a provision action", () => {
     const markup = renderToStaticMarkup(
       <ThreadPromptContextBanner
-        todoSection={null}
         gitSection={null}
         gitSectionPending={false}
         archivedSection={null}
         environmentGoneSection={{ status: "destroyed" }}
         parentThreadSection={null}
         childThreadsSection={null}
+        pullRequestSection={null}
         expandedSection={null}
         onToggleSection={noop}
       />,
diff --git a/apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.tsx b/apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.tsx
index d3329848eb..b71d138631 100644
--- a/apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.tsx
+++ b/apps/app/src/components/promptbox/banner/ThreadPromptContextBanner.tsx
@@ -3,10 +3,8 @@ import { NavLink } from "react-router-dom";
 import type {
   EnvironmentStatus,
   GitBranchRefClassification,
+  ThreadPullRequest,
   ThreadRuntimeDisplayStatus,
-  ThreadTimelinePendingTodoItem,
-  ThreadTimelinePendingTodoItemStatus,
-  ThreadTimelinePendingTodos,
 } from "@bb/domain";
 import {
   BranchPicker,
@@ -23,6 +21,8 @@ import {
 } from "@/components/workspace/workspace-change-summary";
 import { cn } from "@/lib/utils";
 import { Icon, type IconName } from "@/components/ui/icon.js";
+import { getPullRequestAttentionDisplay } from "@/lib/pull-request-display";
+import { PullRequestStatusPill } from "@/components/pull-request/PullRequestStatusPill";
 
 export interface ContextBannerMergeBaseConfig {
   branch: string;
@@ -35,10 +35,6 @@ export interface ContextBannerMergeBaseConfig {
   onSearchQueryChange?: (query: string) => void;
 }
 
-export interface ThreadPromptTodoSection {
-  pendingTodos: ThreadTimelinePendingTodos;
-}
-
 export interface ThreadPromptGitSection {
   changedFiles: WorkspaceChangedFilesSection;
   mergeBase: ContextBannerMergeBaseConfig | null;
@@ -71,6 +67,10 @@ export interface ThreadPromptChildThreadsSection {
   items: readonly ThreadPromptChildThreadItem[];
 }
 
+export interface ThreadPromptPullRequestSection {
+  pullRequest: ThreadPullRequest;
+}
+
 /**
  * Archived-state segment for the banner. When present, the banner renders
  * only this row — archived threads are read-only, so suppressing the other
@@ -78,6 +78,8 @@ export interface ThreadPromptChildThreadsSection {
  */
 export interface ThreadPromptArchivedSection {
   archivedAt: number;
+  onUnarchive?: () => void;
+  unarchivePending?: boolean;
 }
 
 /**
@@ -111,7 +113,6 @@ export function isThreadDisplayStatusBannerActive(
 }
 
 export type ThreadPromptContextBannerExpandedSection =
-  | "todos"
   | "git"
   | "parentThread"
   | "childThreads";
@@ -127,7 +128,6 @@ export type ThreadPromptContextBannerExpandedSection =
 export const THREAD_PROMPT_CONTEXT_BANNER_ROW_HEIGHT = 32;
 
 export interface ThreadPromptContextBannerProps {
-  todoSection: ThreadPromptTodoSection | null;
   gitSection: ThreadPromptGitSection | null;
   /**
    * True while the workspace status query for this thread is in flight. Holds
@@ -138,19 +138,20 @@ export interface ThreadPromptContextBannerProps {
   gitSectionPending: boolean;
   /**
    * When set, the banner renders the "Thread is archived" row and suppresses
-   * todos, git, and child-threads — those represent live work that no
-   * longer applies. parentThread still renders alongside if provided, since the
-   * parent relationship remains relevant context for a frozen thread.
+   * git and child-threads — those represent live work that no longer applies.
+   * parentThread still renders alongside if provided, since the parent
+   * relationship remains relevant context for a frozen thread.
    */
   archivedSection: ThreadPromptArchivedSection | null;
   /**
    * When set, the banner renders the "environment is no longer available" row
-   * and suppresses todos, git, and child-threads. parentThread still renders
-   * alongside if provided, since the relationship remains useful context.
+   * and suppresses git and child-threads. parentThread still renders alongside
+   * if provided, since the relationship remains useful context.
    */
   environmentGoneSection: ThreadPromptEnvironmentGoneSection | null;
   parentThreadSection: ThreadPromptParentThreadSection | null;
   childThreadsSection: ThreadPromptChildThreadsSection | null;
+  pullRequestSection: ThreadPromptPullRequestSection | null;
   expandedSection: ThreadPromptContextBannerExpandedSection | null;
   onToggleSection: (section: ThreadPromptContextBannerExpandedSection) => void;
 }
@@ -177,42 +178,12 @@ const SECTION_IDS = {
     toggle: "thread-prompt-banner-child-threads-toggle",
     body: "thread-prompt-banner-child-threads-body",
   },
-  todos: {
-    toggle: "thread-prompt-banner-todos-toggle",
-    body: "thread-prompt-banner-todos-body",
-  },
   git: {
     toggle: "thread-prompt-banner-git-toggle",
     body: "thread-prompt-banner-git-body",
   },
 } as const;
 
-const STATUS_SORT_RANK: Record<ThreadTimelinePendingTodoItemStatus, number> = {
-  in_progress: 0,
-  pending: 1,
-  completed: 2,
-};
-
-function hasObservedTodoItems(
-  pendingTodos: ThreadTimelinePendingTodos,
-): boolean {
-  return pendingTodos.items.length > 0;
-}
-
-function renderTodoCounts(
-  items: readonly ThreadTimelinePendingTodoItem[],
-): ReactNode {
-  if (items.length === 0) return null;
-  let completedCount = 0;
-  for (const item of items) {
-    if (item.status === "completed") completedCount += 1;
-  }
-  if (completedCount === 0) {
-    return `${items.length}`;
-  }
-  return `${completedCount}/${items.length}`;
-}
-
 function ChildThreadIcon({ className }: { className?: string }) {
   return (
     <Icon
@@ -266,9 +237,7 @@ function SectionToggleButton({
       {label !== null && label !== undefined ? (
         <span
           className="min-w-0 truncate"
-          data-promptbox-hide-compact={
-            hideLabelInCompact ? "" : undefined
-          }
+          data-promptbox-hide-compact={hideLabelInCompact ? "" : undefined}
         >
           {label}
         </span>
@@ -285,74 +254,6 @@ function SectionToggleButton({
   );
 }
 
-function TodoStatusIcon({
-  status,
-}: {
-  status: ThreadTimelinePendingTodoItemStatus;
-}) {
-  const className = "size-3.5 shrink-0";
-  switch (status) {
-    case "in_progress":
-      return (
-        <Icon
-          name="Square"
-          className={cn(className, "fill-current text-muted-foreground/30")}
-          aria-hidden="true"
-        />
-      );
-    case "completed":
-      return (
-        <Icon
-          name="Check"
-          className={cn(className, "text-muted-foreground/60")}
-          aria-hidden="true"
-        />
-      );
-    case "pending":
-      return (
-        <Icon
-          name="Square"
-          className={cn(className, "text-muted-foreground/45")}
-          aria-hidden="true"
-        />
-      );
-  }
-}
-
-function TodoBody({
-  items,
-}: {
-  items: readonly ThreadTimelinePendingTodoItem[];
-}) {
-  const ordered = [...items].sort(
-    (a, b) => STATUS_SORT_RANK[a.status] - STATUS_SORT_RANK[b.status],
-  );
-  return (
-    <ul className="max-h-40 space-y-0.5 overflow-y-auto px-3 pb-2 pt-1.5">
-      {ordered.map((item) => (
-        <li
-          key={item.id}
-          className="flex min-w-0 items-center gap-2 py-0.5 text-xs"
-        >
-          <TodoStatusIcon status={item.status} />
-          <span
-            className={cn(
-              "min-w-0 flex-1 truncate",
-              item.status === "in_progress" && "font-medium text-foreground",
-              item.status === "pending" && "text-muted-foreground",
-              item.status === "completed" &&
-                "text-subtle-foreground line-through decoration-subtle-foreground",
-            )}
-            title={item.text}
-          >
-            {item.text}
-          </span>
-        </li>
-      ))}
-    </ul>
-  );
-}
-
 // Single source of truth for how the linked source thread is described across
 // the banner's three render surfaces (inline label, expanded body, aria).
 const PARENT_SECTION_COPY: Record<
@@ -376,6 +277,15 @@ const PARENT_SECTION_COPY: Record<
   },
 };
 
+const PARENT_SECTION_ICON: Record<
+  ThreadPromptParentThreadSection["relationship"],
+  IconName
+> = {
+  parent: "UserRound",
+  fork: "Fork",
+  "side-chat": "SideChat",
+};
+
 function parentSectionAriaLabel(
   section: ThreadPromptParentThreadSection,
 ): string {
@@ -396,7 +306,7 @@ function ParentThreadBody({
       {PARENT_SECTION_COPY[relationship].bodyLead}
       <NavLink
         to={href}
-        className="text-foreground/90 underline-offset-2 hover:underline"
+        className="text-foreground/90 underline underline-offset-2"
       >
         {parentThreadTitle}
       </NavLink>
@@ -428,6 +338,65 @@ function ChildThreadsBody({
   );
 }
 
+function BannerActionSlot({ children }: { children: ReactNode }) {
+  return (
+    <div
+      className="ml-auto flex shrink-0 items-center gap-1.5 text-xs text-muted-foreground"
+      data-promptbox-hide-compact=""
+    >
+      {children}
+    </div>
+  );
+}
+
+function ThreadUnarchiveTextAction({
+  isPending,
+  onUnarchive,
+}: {
+  isPending?: boolean;
+  onUnarchive: () => void;
+}) {
+  return (
+    <button
+      type="button"
+      onClick={onUnarchive}
+      disabled={Boolean(isPending)}
+      className="rounded px-1 py-0.5 text-xs text-muted-foreground underline underline-offset-2 transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-60"
+    >
+      {isPending ? "Unarchiving..." : "Unarchive"}
+    </button>
+  );
+}
+
+function PullRequestBannerLink({
+  pullRequest,
+}: {
+  pullRequest: ThreadPullRequest;
+}) {
+  const attentionDisplay = getPullRequestAttentionDisplay(pullRequest);
+  const showAttentionLabel =
+    attentionDisplay.className === "text-destructive" &&
+    pullRequest.attention !== "checks_failed" &&
+    pullRequest.attention !== "closed";
+  return (
+    <a
+      href={pullRequest.url}
+      target="_blank"
+      rel="noopener noreferrer"
+      title={pullRequest.title}
+      aria-label={`Pull request ${pullRequest.number}: ${attentionDisplay.label}`}
+      className="flex min-w-0 items-center gap-1.5 rounded px-1 py-0.5 text-xs text-muted-foreground no-underline transition-colors hover:bg-state-hover hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+    >
+      <PullRequestStatusPill pullRequest={pullRequest} />
+      {showAttentionLabel ? (
+        <span className={cn("min-w-0 truncate", attentionDisplay.className)}>
+          {attentionDisplay.label}
+        </span>
+      ) : null}
+    </a>
+  );
+}
+
 function AnimatedBody({
   id,
   labelledBy,
@@ -462,6 +431,7 @@ interface ReadOnlyContextBannerProps {
   statusAriaLabel: string;
   statusLabel: string;
   parentThreadSection: ThreadPromptParentThreadSection | null;
+  statusAction: ReactNode;
   expandedSection: ThreadPromptContextBannerExpandedSection | null;
   onToggleSection: (section: ThreadPromptContextBannerExpandedSection) => void;
 }
@@ -471,12 +441,14 @@ function ReadOnlyContextBanner({
   statusAriaLabel,
   statusLabel,
   parentThreadSection,
+  statusAction,
   expandedSection,
   onToggleSection,
 }: ReadOnlyContextBannerProps) {
   const isParentThreadExpanded =
     expandedSection === "parentThread" && parentThreadSection !== null;
   const hasMultipleSegments = parentThreadSection !== null;
+  const showStatusAction = statusAction !== null && !hasMultipleSegments;
   return (
     <PromptStackCard
       ariaLabel="Thread context before sending"
@@ -491,7 +463,7 @@ function ReadOnlyContextBanner({
             ariaLabel={parentSectionAriaLabel(parentThreadSection)}
             icon={
               <Icon
-                name="UserRound"
+                name={PARENT_SECTION_ICON[parentThreadSection.relationship]}
                 className="size-3.5 shrink-0"
                 aria-hidden="true"
               />
@@ -514,14 +486,15 @@ function ReadOnlyContextBanner({
           />
           <span
             className="min-w-0 truncate"
-            data-promptbox-hide-compact={
-              hasMultipleSegments ? "" : undefined
-            }
+            data-promptbox-hide-compact={hasMultipleSegments ? "" : undefined}
             aria-hidden="true"
           >
             {statusLabel}
           </span>
         </div>
+        {showStatusAction ? (
+          <BannerActionSlot>{statusAction}</BannerActionSlot>
+        ) : null}
       </div>
       {parentThreadSection ? (
         <AnimatedBody
@@ -542,19 +515,20 @@ function ReadOnlyContextBanner({
 
 /**
  * Single rounded strip rendered above the FollowUp prompt input. Hosts the
- * thread's high-signal context as inline section toggles (TODO, git) plus
- * the merge-base picker pinned to the right. Only one section can be
- * expanded at a time; the caller owns expandedSection state. See
+ * thread's high-signal context as inline section toggles.
+ * Segment actions render in a far-right slot only when their segment is the
+ * only visible segment. Only one section can be expanded at a time; the caller
+ * owns expandedSection state. See
  * plans/thread-prompt-context-banner.md.
  */
 export function ThreadPromptContextBanner({
-  todoSection,
   gitSection,
   gitSectionPending,
   archivedSection,
   environmentGoneSection,
   parentThreadSection,
   childThreadsSection,
+  pullRequestSection,
   expandedSection,
   onToggleSection,
 }: ThreadPromptContextBannerProps) {
@@ -572,6 +546,14 @@ export function ThreadPromptContextBanner({
             ? ARCHIVED_THREAD_STATUS_LABEL
             : ENVIRONMENT_GONE_STATUS_LABEL
         }
+        statusAction={
+          archivedSection?.onUnarchive ? (
+            <ThreadUnarchiveTextAction
+              isPending={archivedSection.unarchivePending}
+              onUnarchive={archivedSection.onUnarchive}
+            />
+          ) : null
+        }
         parentThreadSection={parentThreadSection}
         expandedSection={expandedSection}
         onToggleSection={onToggleSection}
@@ -581,38 +563,35 @@ export function ThreadPromptContextBanner({
   if (gitSectionPending) {
     return null;
   }
-  const showTodo =
-    todoSection !== null && hasObservedTodoItems(todoSection.pendingTodos);
   const showGit = gitSection !== null;
   const showParentThread = parentThreadSection !== null;
   const showChildThreads =
     childThreadsSection !== null && childThreadsSection.items.length > 0;
-  if (!showTodo && !showGit && !showParentThread && !showChildThreads) {
+  const showPullRequest = pullRequestSection !== null;
+  if (!showGit && !showParentThread && !showChildThreads && !showPullRequest) {
     return null;
   }
   const visibleSegmentCount =
     Number(showParentThread) +
     Number(showChildThreads) +
-    Number(showTodo) +
+    Number(showPullRequest) +
     Number(showGit);
   const hasSingleVisibleSegment = visibleSegmentCount === 1;
-  const todoItems =
-    showTodo && todoSection ? todoSection.pendingTodos.items : [];
-  const todoCountLabel = renderTodoCounts(todoItems);
-  const isTodoExpanded = expandedSection === "todos" && showTodo;
   // selectWorkspaceChangedFilesSection only emits a section when files exist,
   // so showGit implies a non-empty file list.
   const isGitExpanded = expandedSection === "git" && showGit;
-  const isParentThreadExpanded = expandedSection === "parentThread" && showParentThread;
+  const isParentThreadExpanded =
+    expandedSection === "parentThread" && showParentThread;
   const isChildThreadsExpanded =
     expandedSection === "childThreads" && showChildThreads;
-
-  const gitTally = showGit ? toChangeTally(gitSection.changedFiles.stats) : null;
+  const gitTally = showGit
+    ? toChangeTally(gitSection.changedFiles.stats)
+    : null;
   const gitSummaryText = gitTally ? formatChangeSummary(gitTally) : "";
   const gitSummary: ReactNode =
     showGit && gitTally ? (
       <>
-        {showTodo ? null : <>{KIND_PREFIX[gitSection.changedFiles.kind]} · </>}
+        {KIND_PREFIX[gitSection.changedFiles.kind]} ·{" "}
         {renderChangeSummary(gitTally)}
       </>
     ) : null;
@@ -626,13 +605,40 @@ export function ThreadPromptContextBanner({
           remoteMergeBaseBranchOptions: gitSection.mergeBase.remoteOptions,
         })
       : { options: [], remoteOptions: [] };
+  const segmentAction =
+    hasSingleVisibleSegment && showGit && gitSection.mergeBase ? (
+      <BannerActionSlot>
+        <Icon
+          name="GitMerge"
+          className="size-3.5 shrink-0"
+          aria-hidden="true"
+        />
+        <span className="shrink-0">Merge base</span>
+        <BranchPicker
+          value={gitSection.mergeBase.branch}
+          options={mergeBaseCandidates.options}
+          remoteOptions={mergeBaseCandidates.remoteOptions}
+          variant="minimal"
+          emphasizeTriggerValue={false}
+          loading={gitSection.mergeBase.optionsLoading}
+          onChange={gitSection.mergeBase.onChange}
+          onOpenChange={gitSection.mergeBase.onPickerOpenChange}
+          onSearchQueryChange={gitSection.mergeBase.onSearchQueryChange}
+          className="max-w-[10rem]"
+          muted
+          popoverAlign="end"
+        />
+      </BannerActionSlot>
+    ) : null;
 
   // When the parent segment is the only item in the banner, render it
   // inline as "Parent <name>" with the name as a link. There's no other
   // context to compete for the row, so the icon-only toggle would be a strict
   // downgrade in legibility.
   const isParentThreadOnly =
-    showParentThread && !showTodo && !showGit && !showChildThreads;
+    showParentThread && !showGit && !showChildThreads && !showPullRequest;
+
+  const pullRequest = pullRequestSection?.pullRequest ?? null;
 
   return (
     <PromptStackCard
@@ -641,13 +647,14 @@ export function ThreadPromptContextBanner({
       style={{ minHeight: THREAD_PROMPT_CONTEXT_BANNER_ROW_HEIGHT }}
     >
       <div className="flex items-center gap-0.5 px-2 py-1 text-xs text-muted-foreground">
+        {/* Segment order: relationship metadata, active child state, GitHub PR, git status. */}
         {showParentThread && parentThreadSection && isParentThreadOnly ? (
           <div
             className="flex min-w-0 items-center gap-1.5 px-1 py-0.5"
             title={parentSectionAriaLabel(parentThreadSection)}
           >
             <Icon
-              name="UserRound"
+              name={PARENT_SECTION_ICON[parentThreadSection.relationship]}
               className="size-3.5 shrink-0"
               aria-hidden="true"
             />
@@ -669,7 +676,7 @@ export function ThreadPromptContextBanner({
             ariaLabel={parentSectionAriaLabel(parentThreadSection)}
             icon={
               <Icon
-                name="UserRound"
+                name={PARENT_SECTION_ICON[parentThreadSection.relationship]}
                 className="size-3.5 shrink-0"
                 aria-hidden="true"
               />
@@ -701,23 +708,8 @@ export function ThreadPromptContextBanner({
             onToggle={() => onToggleSection("childThreads")}
           />
         ) : null}
-        {showTodo ? (
-          <SectionToggleButton
-            id={SECTION_IDS.todos.toggle}
-            controlsId={SECTION_IDS.todos.body}
-            icon={
-              <Icon
-                name="ListTodo"
-                className="size-3.5 shrink-0"
-                aria-hidden="true"
-              />
-            }
-            label={todoCountLabel}
-            hideLabelInCompact={!hasSingleVisibleSegment}
-            ariaLabel={`Todos: ${todoCountLabel ?? todoItems.length}`}
-            isExpanded={isTodoExpanded}
-            onToggle={() => onToggleSection("todos")}
-          />
+        {showPullRequest && pullRequest ? (
+          <PullRequestBannerLink pullRequest={pullRequest} />
         ) : null}
         {showGit && gitSummary ? (
           <SectionToggleButton
@@ -737,33 +729,7 @@ export function ThreadPromptContextBanner({
             onToggle={() => onToggleSection("git")}
           />
         ) : null}
-        {showGit && gitSection.mergeBase ? (
-          <div
-            className="ml-auto flex shrink-0 items-center gap-1.5 text-xs text-muted-foreground"
-            data-promptbox-hide-compact=""
-          >
-            <Icon
-              name="GitMerge"
-              className="size-3.5 shrink-0"
-              aria-hidden="true"
-            />
-            <span className="shrink-0">Merge base</span>
-            <BranchPicker
-              value={gitSection.mergeBase.branch}
-              options={mergeBaseCandidates.options}
-              remoteOptions={mergeBaseCandidates.remoteOptions}
-              variant="minimal"
-              emphasizeTriggerValue={false}
-              loading={gitSection.mergeBase.optionsLoading}
-              onChange={gitSection.mergeBase.onChange}
-              onOpenChange={gitSection.mergeBase.onPickerOpenChange}
-              onSearchQueryChange={gitSection.mergeBase.onSearchQueryChange}
-              className="max-w-[10rem]"
-              muted
-              popoverAlign="end"
-            />
-          </div>
-        ) : null}
+        {segmentAction}
       </div>
       {showParentThread && parentThreadSection && !isParentThreadOnly ? (
         <AnimatedBody
@@ -787,15 +753,6 @@ export function ThreadPromptContextBanner({
           <ChildThreadsBody items={childThreadsSection.items} />
         </AnimatedBody>
       ) : null}
-      {showTodo ? (
-        <AnimatedBody
-          id={SECTION_IDS.todos.body}
-          labelledBy={SECTION_IDS.todos.toggle}
-          isExpanded={isTodoExpanded}
-        >
-          <TodoBody items={todoItems} />
-        </AnimatedBody>
-      ) : null}
       {showGit ? (
         <AnimatedBody
           id={SECTION_IDS.git.body}
diff --git a/apps/app/src/components/promptbox/banner/ThreadTodoCard.stories.tsx b/apps/app/src/components/promptbox/banner/ThreadTodoCard.stories.tsx
new file mode 100644
index 0000000000..7e4a2d9ea7
--- /dev/null
+++ b/apps/app/src/components/promptbox/banner/ThreadTodoCard.stories.tsx
@@ -0,0 +1,127 @@
+import { useState } from "react";
+import type { ThreadTimelinePendingTodos } from "@bb/domain";
+import { StoryCard, StoryRow } from "../../../../.ladle/story-card";
+import { ThreadTodoCard } from "./ThreadTodoCard";
+
+export default {
+  title: "promptbox/banner/Todo Card",
+};
+
+function Stage({ children }: { children: React.ReactNode }) {
+  return <div className="w-full max-w-[760px]">{children}</div>;
+}
+
+const mixedTodos: ThreadTimelinePendingTodos = {
+  sourceSeq: 0,
+  updatedAt: 0,
+  items: [
+    {
+      id: "todo:1",
+      text: "Read the planning doc",
+      status: "completed",
+    },
+    {
+      id: "todo:2",
+      text: "Build initial banner shell",
+      status: "completed",
+    },
+    {
+      id: "todo:3",
+      text: "Wire pendingTodos from the timeline projection",
+      status: "in_progress",
+    },
+    {
+      id: "todo:4",
+      text: "Surface pendingTodos in `bb thread show` and `bb status`",
+      status: "pending",
+    },
+    {
+      id: "todo:5",
+      text: "Tighten GET /threads/:id with requirePublicProject",
+      status: "pending",
+    },
+  ],
+};
+
+const pendingOnlyTodos: ThreadTimelinePendingTodos = {
+  sourceSeq: 1,
+  updatedAt: 0,
+  items: [
+    {
+      id: "todo:pending:1",
+      text: "Create focused Storybook coverage",
+      status: "pending",
+    },
+    {
+      id: "todo:pending:2",
+      text: "Wire the production prompt stack",
+      status: "pending",
+    },
+  ],
+};
+
+function ToggleableTodoCard({
+  pendingTodos,
+  initiallyExpanded = false,
+}: {
+  pendingTodos: ThreadTimelinePendingTodos;
+  initiallyExpanded?: boolean;
+}) {
+  const [expanded, setExpanded] = useState(initiallyExpanded);
+  return (
+    <ThreadTodoCard
+      pendingTodos={pendingTodos}
+      isExpanded={expanded}
+      onToggle={() => setExpanded((value) => !value)}
+    />
+  );
+}
+
+function FauxComposer() {
+  return (
+    <div className="rounded-lg border border-border bg-popover p-3">
+      <div className="pb-3 text-sm text-subtle-foreground">
+        Reply to the agent...
+      </div>
+      <div className="flex items-center gap-2">
+        <span className="rounded-full border border-border px-2.5 py-1 text-xs text-muted-foreground">
+          opus
+        </span>
+      </div>
+    </div>
+  );
+}
+
+export function Overview() {
+  return (
+    <StoryCard>
+      <StoryRow
+        label="prompt stack"
+        hint="collapsed header shows compact N/M progress; click to expand"
+      >
+        <Stage>
+          <div className="flex flex-col gap-2">
+            <ToggleableTodoCard pendingTodos={mixedTodos} />
+            <FauxComposer />
+          </div>
+        </Stage>
+      </StoryRow>
+      <StoryRow
+        label="expanded"
+        hint="in-progress, pending, and completed items sorted by status"
+      >
+        <Stage>
+          <ToggleableTodoCard pendingTodos={mixedTodos} initiallyExpanded />
+        </Stage>
+      </StoryRow>
+      <StoryRow label="pending only" hint="summary starts at 0/N complete">
+        <Stage>
+          <ToggleableTodoCard
+            pendingTodos={pendingOnlyTodos}
+            initiallyExpanded
+          />
+        </Stage>
+      </StoryRow>
+    </StoryCard>
+  );
+}
diff --git a/apps/app/src/components/promptbox/banner/ThreadTodoCard.tsx b/apps/app/src/components/promptbox/banner/ThreadTodoCard.tsx
new file mode 100644
index 0000000000..3e17d925bd
--- /dev/null
+++ b/apps/app/src/components/promptbox/banner/ThreadTodoCard.tsx
@@ -0,0 +1,173 @@
+import type {
+  ThreadTimelinePendingTodoItem,
+  ThreadTimelinePendingTodoItemStatus,
+  ThreadTimelinePendingTodos,
+} from "@bb/domain";
+import { PromptStackCard } from "@/components/promptbox/banner/PromptStackCard";
+import { Icon } from "@/components/ui/icon.js";
+import { cn } from "@/lib/utils";
+
+const TODO_CARD_ROW_HEIGHT = 32;
+
+const STATUS_SORT_RANK: Record<ThreadTimelinePendingTodoItemStatus, number> = {
+  in_progress: 0,
+  pending: 1,
+  completed: 2,
+};
+
+export interface ThreadTodoCardProps {
+  pendingTodos: ThreadTimelinePendingTodos | null;
+  isExpanded: boolean;
+  onToggle: () => void;
+}
+
+const BODY_ID = "thread-todo-card-body";
+const TOGGLE_ID = "thread-todo-card-toggle";
+
+function getTodoSummary(items: readonly ThreadTimelinePendingTodoItem[]): {
+  visible: string;
+  aria: string;
+} {
+  let completedCount = 0;
+  for (const item of items) {
+    if (item.status === "completed") completedCount += 1;
+  }
+  return {
+    visible: `${completedCount}/${items.length} complete`,
+    aria: `${completedCount} of ${items.length} ${
+      items.length === 1 ? "item" : "items"
+    } complete`,
+  };
+}
+
+function TodoStatusIcon({
+  status,
+}: {
+  status: ThreadTimelinePendingTodoItemStatus;
+}) {
+  const className = "size-3.5 shrink-0";
+  switch (status) {
+    case "in_progress":
+      return (
+        <Icon
+          name="Square"
+          className={cn(className, "fill-current text-muted-foreground/30")}
+          aria-hidden="true"
+        />
+      );
+    case "completed":
+      return (
+        <Icon
+          name="Check"
+          className={cn(className, "text-muted-foreground/60")}
+          aria-hidden="true"
+        />
+      );
+    case "pending":
+      return (
+        <Icon
+          name="Square"
+          className={cn(className, "text-muted-foreground/45")}
+          aria-hidden="true"
+        />
+      );
+  }
+}
+
+function TodoBody({
+  items,
+}: {
+  items: readonly ThreadTimelinePendingTodoItem[];
+}) {
+  const ordered = [...items].sort(
+    (a, b) => STATUS_SORT_RANK[a.status] - STATUS_SORT_RANK[b.status],
+  );
+  return (
+    <ul className="max-h-40 space-y-0.5 overflow-y-auto px-3 pb-2 pt-1.5">
+      {ordered.map((item) => (
+        <li
+          key={item.id}
+          className="flex min-w-0 items-center gap-2 py-0.5 text-xs"
+        >
+          <TodoStatusIcon status={item.status} />
+          <span
+            className={cn(
+              "min-w-0 flex-1 truncate",
+              item.status === "in_progress" && "font-medium text-foreground",
+              item.status === "pending" && "text-muted-foreground",
+              item.status === "completed" &&
+                "text-subtle-foreground line-through decoration-subtle-foreground",
+            )}
+            title={item.text}
+          >
+            {item.text}
+          </span>
+        </li>
+      ))}
+    </ul>
+  );
+}
+
+export function ThreadTodoCard({
+  pendingTodos,
+  isExpanded,
+  onToggle,
+}: ThreadTodoCardProps) {
+  const items = pendingTodos?.items ?? [];
+  if (items.length === 0) {
+    return null;
+  }
+  const summary = getTodoSummary(items);
+  return (
+    <PromptStackCard
+      ariaLabel="To-do list"
+      className="overflow-hidden"
+      style={{ minHeight: TODO_CARD_ROW_HEIGHT }}
+    >
+      <div className="flex items-center gap-1.5 px-2 py-1">
+        <button
+          type="button"
+          id={TOGGLE_ID}
+          aria-expanded={isExpanded}
+          aria-controls={BODY_ID}
+          aria-label={`To-do list: ${summary.aria}`}
+          onClick={onToggle}
+          className="flex min-w-0 flex-1 items-center gap-1.5 rounded px-1 py-0.5 text-xs text-foreground transition-colors hover:bg-state-hover"
+        >
+          <Icon
+            name="ListTodo"
+            className="size-3.5 shrink-0 text-muted-foreground"
+            aria-hidden="true"
+          />
+          <span className="min-w-0 flex-1 truncate text-left font-medium text-foreground opacity-70">
+            {summary.visible}
+          </span>
+          <Icon
+            name="ChevronDown"
+            className={cn(
+              "size-3.5 shrink-0 text-subtle-foreground transition-transform duration-200",
+              isExpanded && "rotate-180",
+            )}
+            aria-hidden="true"
+          />
+        </button>
+      </div>
+      <section
+        id={BODY_ID}
+        role="region"
+        aria-labelledby={TOGGLE_ID}
+        aria-hidden={!isExpanded}
+        className={cn(
+          "grid overflow-hidden transition-[grid-template-rows,opacity,border-color] duration-200 ease-out",
+          isExpanded
+            ? "grid-rows-[1fr] border-t border-border opacity-100"
+            : "pointer-events-none grid-rows-[0fr] border-t border-transparent opacity-0",
+        )}
+      >
+        <div className="overflow-hidden bg-popover">
+          <TodoBody items={items} />
+        </div>
+      </section>
+    </PromptStackCard>
+  );
+}
diff --git a/apps/app/src/components/promptbox/banner/ThreadWorkflowCard.stories.tsx b/apps/app/src/components/promptbox/banner/ThreadWorkflowCard.stories.tsx
index e9af5339b4..2eef473664 100644
--- a/apps/app/src/components/promptbox/banner/ThreadWorkflowCard.stories.tsx
+++ b/apps/app/src/components/promptbox/banner/ThreadWorkflowCard.stories.tsx
@@ -5,7 +5,7 @@ import { workflowRow } from "@/test/fixtures/thread-timeline-rows";
 import { StoryCard, StoryRow } from "../../../../.ladle/story-card";
 
 export default {
-  title: "promptbox/banner/ThreadWorkflowCard",
+  title: "promptbox/banner/Workflow Card",
 };
 
 function Stage({ children }: { children: React.ReactNode }) {
@@ -112,7 +112,10 @@ export function Overview() {
           </div>
         </Stage>
       </StoryRow>
-      <StoryRow label="collapsed" hint="single-line glance: name, agent count, live time">
+      <StoryRow
+        label="collapsed"
+        hint="single-line glance: name, agent count, live time"
+      >
         <Stage>
           <ThreadWorkflowCard
             workflow={runningWorkflow}
diff --git a/apps/app/src/components/promptbox/banner/ThreadWorkflowCard.tsx b/apps/app/src/components/promptbox/banner/ThreadWorkflowCard.tsx
index 2afe622949..fa7e8a8bc8 100644
--- a/apps/app/src/components/promptbox/banner/ThreadWorkflowCard.tsx
+++ b/apps/app/src/components/promptbox/banner/ThreadWorkflowCard.tsx
@@ -84,7 +84,7 @@ export function ThreadWorkflowCard({
           className="flex min-w-0 flex-1 items-center gap-1.5 rounded px-1 py-0.5 text-xs text-foreground transition-colors hover:bg-state-hover"
         >
           <Icon
-            name="ListTodo"
+            name="Workflow"
             className="size-3.5 shrink-0 text-muted-foreground"
             aria-hidden="true"
           />
diff --git a/apps/app/src/components/pull-request/PullRequestStatusPill.tsx b/apps/app/src/components/pull-request/PullRequestStatusPill.tsx
new file mode 100644
index 0000000000..6e02e3a194
--- /dev/null
+++ b/apps/app/src/components/pull-request/PullRequestStatusPill.tsx
@@ -0,0 +1,183 @@
+import type {
+  PullRequestState,
+  ThreadPullRequest,
+  ThreadPullRequestChecksState,
+} from "@bb/domain";
+import { Icon, type IconName } from "@/components/ui/icon.js";
+import { cn } from "@/lib/utils";
+
+const checksSuccessIcon =
+  "https://github.githubassets.com/favicons/favicon-success.png";
+const checksSuccessDarkIcon =
+  "https://github.githubassets.com/favicons/favicon-success-dark.png";
+const checksFailureIcon =
+  "https://github.githubassets.com/favicons/favicon-failure.png";
+const checksFailureDarkIcon =
+  "https://github.githubassets.com/favicons/favicon-failure-dark.png";
+const checksPendingIcon =
+  "https://github.githubassets.com/favicons/favicon-pending.png";
+const checksPendingDarkIcon =
+  "https://github.githubassets.com/favicons/favicon-pending-dark.png";
+
+export type GithubCheckStatus = "success" | "failure" | "pending";
+
+const PR_STATUS_COLOR: Record<PullRequestState, { textClassName: string }> = {
+  open: {
+    textClassName: "text-[#238636]",
+  },
+  closed: {
+    textClassName: "text-[#da3633]",
+  },
+  merged: {
+    textClassName: "text-[#8957e5]",
+  },
+  draft: {
+    textClassName: "text-[#656c76]",
+  },
+};
+
+const PR_STATUS_ICON: Record<
+  PullRequestState,
+  { icon: IconName; className: string; title: string }
+> = {
+  open: {
+    icon: "GitPullRequestArrow",
+    className: PR_STATUS_COLOR.open.textClassName,
+    title: "Open Pull Request",
+  },
+  closed: {
+    icon: "GitPullRequestClosed",
+    className: PR_STATUS_COLOR.closed.textClassName,
+    title: "Closed Pull Request",
+  },
+  merged: {
+    icon: "GitMerge",
+    className: PR_STATUS_COLOR.merged.textClassName,
+    title: "Merged Pull Request",
+  },
+  draft: {
+    icon: "GitPullRequestDraft",
+    className: PR_STATUS_COLOR.draft.textClassName,
+    title: "Draft Pull Request",
+  },
+};
+
+function getGithubCheckStatus(
+  state: ThreadPullRequestChecksState,
+): GithubCheckStatus | null {
+  switch (state) {
+    case "passing":
+      return "success";
+    case "failing":
+      return "failure";
+    case "pending":
+      return "pending";
+    case "no_checks":
+    case "unknown":
+      return null;
+  }
+}
+
+function getPullRequestGithubCheckStatus(
+  pullRequest: ThreadPullRequest,
+): GithubCheckStatus | null {
+  if (pullRequest.state !== "open" && pullRequest.state !== "draft") {
+    return null;
+  }
+  return getGithubCheckStatus(pullRequest.checks.state);
+}
+
+export function PullRequestStateIcon({
+  state,
+  className,
+}: {
+  state: PullRequestState;
+  className?: string;
+}) {
+  const statusIcon = PR_STATUS_ICON[state];
+  return (
+    <Icon
+      name={statusIcon.icon}
+      className={cn("size-4 shrink-0", statusIcon.className, className)}
+      aria-hidden="true"
+    />
+  );
+}
+
+export function PullRequestGithubCheckIcon({
+  pullRequest,
+  className,
+}: {
+  pullRequest: ThreadPullRequest;
+  className?: string;
+}) {
+  const status = getPullRequestGithubCheckStatus(pullRequest);
+  const checkStatusClassName = "size-4";
+  switch (status) {
+    case "success":
+      return (
+        <>
+          <img
+            src={checksSuccessIcon}
+            alt="Checks success"
+            className={cn(checkStatusClassName, "dark:hidden", className)}
+          />
+          <img
+            src={checksSuccessDarkIcon}
+            alt="Checks success"
+            className={cn(checkStatusClassName, "hidden dark:block", className)}
+          />
+        </>
+      );
+    case "failure":
+      return (
+        <>
+          <img
+            src={checksFailureIcon}
+            alt="Checks failure"
+            className={cn(checkStatusClassName, "dark:hidden", className)}
+          />
+          <img
+            src={checksFailureDarkIcon}
+            alt="Checks failure"
+            className={cn(checkStatusClassName, "hidden dark:block", className)}
+          />
+        </>
+      );
+    case "pending":
+      return (
+        <>
+          <img
+            src={checksPendingIcon}
+            alt="Checks pending"
+            className={cn(checkStatusClassName, "dark:hidden", className)}
+          />
+          <img
+            src={checksPendingDarkIcon}
+            alt="Checks pending"
+            className={cn(checkStatusClassName, "hidden dark:block", className)}
+          />
+        </>
+      );
+    case null:
+      return null;
+  }
+}
+
+export function PullRequestStatusPill({
+  pullRequest,
+  className,
+}: {
+  pullRequest: ThreadPullRequest;
+  className?: string;
+}) {
+  return (
+    <span
+      title={PR_STATUS_ICON[pullRequest.state].title}
+      className={cn("flex h-5 items-center gap-1 cursor-pointer", className)}
+    >
+      <PullRequestStateIcon state={pullRequest.state} />
+      <PullRequestGithubCheckIcon pullRequest={pullRequest} />
+    </span>
+  );
+}
diff --git a/apps/app/src/components/secondary-panel/ThreadMetadataContent.fixtures.tsx b/apps/app/src/components/secondary-panel/ThreadMetadataContent.fixtures.tsx
index 0d881bf389..54afd2ffb3 100644
--- a/apps/app/src/components/secondary-panel/ThreadMetadataContent.fixtures.tsx
+++ b/apps/app/src/components/secondary-panel/ThreadMetadataContent.fixtures.tsx
@@ -1,5 +1,5 @@
 import type { ReactNode } from "react";
-import type { ThreadListEntry } from "@bb/domain";
+import type { ThreadListEntry, ThreadPullRequest } from "@bb/domain";
 import type { EnvironmentDisplayHostContext } from "@bb/core-ui";
 import {
   makeEnvironment,
@@ -45,6 +45,38 @@ export const parentThreads: ThreadListEntry[] = [
   }),
 ];
 
+export function makePullRequest(
+  overrides: Partial<ThreadPullRequest> = {},
+): ThreadPullRequest {
+  return {
+    number: 128,
+    title: "Show the branch's GitHub pull request in the Info tab",
+    state: "open",
+    url: "https://github.com/acme/bb/pull/128",
+    baseRefName: "main",
+    headRefName: "bb/pr-info-panel",
+    updatedAt: "2026-06-16T12:30:00Z",
+    checks: {
+      state: "passing",
+      totalCount: 3,
+      passedCount: 3,
+      failedCount: 0,
+      pendingCount: 0,
+    },
+    review: {
+      state: "approved",
+      reviewRequestCount: 0,
+    },
+    mergeability: {
+      state: "mergeable",
+      mergeStateStatus: "CLEAN",
+      mergeable: "MERGEABLE",
+    },
+    attention: "ready_to_merge",
+    ...overrides,
+  };
+}
+
 export const baseProps: ThreadMetadataContentProps = {
   thread: makeThread(),
   projectId: "proj_bb",
diff --git a/apps/app/src/components/secondary-panel/ThreadMetadataContent.rows.stories.tsx b/apps/app/src/components/secondary-panel/ThreadMetadataContent.rows.stories.tsx
index 18abd809e8..eace9eab64 100644
--- a/apps/app/src/components/secondary-panel/ThreadMetadataContent.rows.stories.tsx
+++ b/apps/app/src/components/secondary-panel/ThreadMetadataContent.rows.stories.tsx
@@ -19,6 +19,7 @@ import {
   localEnvironmentDisplayHost,
   parentThreads,
   makeEnvironment,
+  makePullRequest,
   makeThread,
   makeWorkspaceStatus,
 } from "./ThreadMetadataContent.fixtures";
@@ -319,40 +320,268 @@ export function MergeBase() {
 }
 
 // ---------------------------------------------------------------------------
-// Pull request — one row per PR state.
+// Pull request — PR state and check status are separate. "Open" does not mean
+// ready to merge; the checks/review/mergeability summary determines that.
 // ---------------------------------------------------------------------------
 
 export function PullRequest() {
-  const url = "https://github.com/acme/bb/pull/128";
-  const title = "Show the branch's GitHub pull request in the Info tab";
+  const readyPullRequest = makePullRequest();
+  const passingPullRequest = makePullRequest({
+    mergeability: {
+      state: "unknown",
+      mergeStateStatus: "UNKNOWN",
+      mergeable: "UNKNOWN",
+    },
+    attention: "none",
+  });
+  const noChecksPullRequest = makePullRequest({
+    checks: {
+      state: "no_checks",
+      totalCount: 0,
+      passedCount: 0,
+      failedCount: 0,
+      pendingCount: 0,
+    },
+    review: {
+      state: "none",
+      reviewRequestCount: 0,
+    },
+    attention: "none",
+  });
+  const unknownChecksPullRequest = makePullRequest({
+    checks: {
+      state: "unknown",
+      totalCount: 1,
+      passedCount: 0,
+      failedCount: 0,
+      pendingCount: 0,
+    },
+    review: {
+      state: "none",
+      reviewRequestCount: 0,
+    },
+    mergeability: {
+      state: "unknown",
+      mergeStateStatus: "UNKNOWN",
+      mergeable: "UNKNOWN",
+    },
+    attention: "none",
+  });
+  const failingPullRequest = makePullRequest({
+    checks: {
+      state: "failing",
+      totalCount: 3,
+      passedCount: 2,
+      failedCount: 1,
+      pendingCount: 0,
+    },
+    attention: "checks_failed",
+  });
+  const pendingPullRequest = makePullRequest({
+    checks: {
+      state: "pending",
+      totalCount: 3,
+      passedCount: 2,
+      failedCount: 0,
+      pendingCount: 1,
+    },
+    attention: "checks_pending",
+  });
+  const changesRequestedPullRequest = makePullRequest({
+    review: {
+      state: "changes_requested",
+      reviewRequestCount: 0,
+    },
+    attention: "changes_requested",
+  });
+  const reviewRequestedPullRequest = makePullRequest({
+    review: {
+      state: "review_requested",
+      reviewRequestCount: 2,
+    },
+    attention: "review_requested",
+  });
+  const conflictsPullRequest = makePullRequest({
+    mergeability: {
+      state: "conflicts",
+      mergeStateStatus: "DIRTY",
+      mergeable: "CONFLICTING",
+    },
+    attention: "conflicts",
+  });
+  const blockedPullRequest = makePullRequest({
+    mergeability: {
+      state: "blocked",
+      mergeStateStatus: "BLOCKED",
+      mergeable: "UNKNOWN",
+    },
+    attention: "blocked",
+  });
+  const draftMergeability = {
+    state: "draft",
+    mergeStateStatus: "DRAFT",
+    mergeable: "UNKNOWN",
+  } as const;
+  const draftPassingPullRequest = makePullRequest({
+    state: "draft",
+    mergeability: draftMergeability,
+    attention: "draft",
+  });
+  const draftFailingPullRequest = makePullRequest({
+    state: "draft",
+    checks: {
+      state: "failing",
+      totalCount: 3,
+      passedCount: 2,
+      failedCount: 1,
+      pendingCount: 0,
+    },
+    mergeability: draftMergeability,
+    attention: "checks_failed",
+  });
+  const draftNoChecksPullRequest = makePullRequest({
+    state: "draft",
+    checks: {
+      state: "no_checks",
+      totalCount: 0,
+      passedCount: 0,
+      failedCount: 0,
+      pendingCount: 0,
+    },
+    mergeability: draftMergeability,
+    attention: "draft",
+  });
+  const draftUnknownChecksPullRequest = makePullRequest({
+    state: "draft",
+    checks: {
+      state: "unknown",
+      totalCount: 1,
+      passedCount: 0,
+      failedCount: 0,
+      pendingCount: 0,
+    },
+    mergeability: draftMergeability,
+    attention: "draft",
+  });
+  const draftPullRequest = makePullRequest({
+    state: "draft",
+    checks: {
+      state: "pending",
+      totalCount: 3,
+      passedCount: 2,
+      failedCount: 0,
+      pendingCount: 1,
+    },
+    mergeability: draftMergeability,
+    attention: "draft",
+  });
+  const draftChangesRequestedPullRequest = makePullRequest({
+    state: "draft",
+    review: {
+      state: "changes_requested",
+      reviewRequestCount: 0,
+    },
+    mergeability: draftMergeability,
+    attention: "changes_requested",
+  });
+  const mergedPullRequest = makePullRequest({
+    state: "merged",
+    attention: "merged",
+  });
+  const closedPullRequest = makePullRequest({
+    state: "closed",
+    attention: "closed",
+  });
   return (
     <StoryCard>
-      <StoryRow label="open">
+      <StoryRow label="open, ready to merge">
         <RowStage>
-          <PullRequestRow
-            pullRequest={{ number: 128, title, state: "open", url }}
-          />
+          <PullRequestRow pullRequest={readyPullRequest} />
         </RowStage>
       </StoryRow>
-      <StoryRow label="draft">
+      <StoryRow label="open, checks passing">
         <RowStage>
-          <PullRequestRow
-            pullRequest={{ number: 128, title, state: "draft", url }}
-          />
+          <PullRequestRow pullRequest={passingPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="open, no checks">
+        <RowStage>
+          <PullRequestRow pullRequest={noChecksPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="open, checks unknown">
+        <RowStage>
+          <PullRequestRow pullRequest={unknownChecksPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="open, checks failing">
+        <RowStage>
+          <PullRequestRow pullRequest={failingPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="open, checks pending">
+        <RowStage>
+          <PullRequestRow pullRequest={pendingPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="open, changes requested">
+        <RowStage>
+          <PullRequestRow pullRequest={changesRequestedPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="open, review requested">
+        <RowStage>
+          <PullRequestRow pullRequest={reviewRequestedPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="open, conflicts">
+        <RowStage>
+          <PullRequestRow pullRequest={conflictsPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="open, blocked">
+        <RowStage>
+          <PullRequestRow pullRequest={blockedPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="draft, checks passing">
+        <RowStage>
+          <PullRequestRow pullRequest={draftPassingPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="draft, checks failing">
+        <RowStage>
+          <PullRequestRow pullRequest={draftFailingPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="draft, no checks">
+        <RowStage>
+          <PullRequestRow pullRequest={draftNoChecksPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="draft, checks unknown">
+        <RowStage>
+          <PullRequestRow pullRequest={draftUnknownChecksPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="draft, checks pending">
+        <RowStage>
+          <PullRequestRow pullRequest={draftPullRequest} />
+        </RowStage>
+      </StoryRow>
+      <StoryRow label="draft, changes requested">
+        <RowStage>
+          <PullRequestRow pullRequest={draftChangesRequestedPullRequest} />
         </RowStage>
       </StoryRow>
       <StoryRow label="merged">
         <RowStage>
-          <PullRequestRow
-            pullRequest={{ number: 128, title, state: "merged", url }}
-          />
+          <PullRequestRow pullRequest={mergedPullRequest} />
         </RowStage>
       </StoryRow>
       <StoryRow label="closed">
         <RowStage>
-          <PullRequestRow
-            pullRequest={{ number: 128, title, state: "closed", url }}
-          />
+          <PullRequestRow pullRequest={closedPullRequest} />
         </RowStage>
       </StoryRow>
     </StoryCard>
diff --git a/apps/app/src/components/secondary-panel/ThreadMetadataContent.stories.tsx b/apps/app/src/components/secondary-panel/ThreadMetadataContent.stories.tsx
index 5b538851ed..6028d87934 100644
--- a/apps/app/src/components/secondary-panel/ThreadMetadataContent.stories.tsx
+++ b/apps/app/src/components/secondary-panel/ThreadMetadataContent.stories.tsx
@@ -5,6 +5,7 @@ import {
 import {
   PanelStage,
   baseProps,
+  makePullRequest,
   makeThread,
 } from "./ThreadMetadataContent.fixtures";
 import { StoryCard, StoryRow } from "../../../.ladle/story-card";
@@ -29,12 +30,7 @@ export function Overview() {
         hint="canonical state — parent + env + worktree path + branch + merge base + pull request + clean git status"
       >
         {render({
-          pullRequest: {
-            number: 128,
-            title: "Show the branch's GitHub pull request in the Info tab",
-            state: "open",
-            url: "https://github.com/acme/bb/pull/128",
-          },
+          pullRequest: makePullRequest(),
         })}
       </StoryRow>
       <StoryRow
@@ -73,32 +69,3 @@ export function Overview() {
     </StoryCard>
   );
 }
-
-// The pull-request row in the full Info panel, so each state is visible in its
-// real position alongside Branch / Merge base / Git status.
-export function PullRequest() {
-  const url = "https://github.com/acme/bb/pull/128";
-  const title = "Show the branch's GitHub pull request in the Info tab";
-  return (
-    <StoryCard>
-      <StoryRow
-        label="open"
-        hint="the PR row sits with the Branch / Merge base / Git status group"
-      >
-        {render({ pullRequest: { number: 128, title, state: "open", url } })}
-      </StoryRow>
-      <StoryRow label="draft">
-        {render({ pullRequest: { number: 128, title, state: "draft", url } })}
-      </StoryRow>
-      <StoryRow label="merged">
-        {render({ pullRequest: { number: 128, title, state: "merged", url } })}
-      </StoryRow>
-      <StoryRow label="closed">
-        {render({ pullRequest: { number: 128, title, state: "closed", url } })}
-      </StoryRow>
-      <StoryRow label="no PR" hint="row omitted entirely when there is no PR">
-        {render({ pullRequest: null })}
-      </StoryRow>
-    </StoryCard>
-  );
-}
diff --git a/apps/app/src/components/secondary-panel/ThreadMetadataContent.tsx b/apps/app/src/components/secondary-panel/ThreadMetadataContent.tsx
index 15f74271be..a5f00712c9 100644
--- a/apps/app/src/components/secondary-panel/ThreadMetadataContent.tsx
+++ b/apps/app/src/components/secondary-panel/ThreadMetadataContent.tsx
@@ -5,7 +5,6 @@ import { Link } from "react-router-dom";
 import type {
   Environment,
   GitBranchRefClassification,
-  PullRequestState,
   Thread,
   ThreadListEntry,
   ThreadPullRequest,
@@ -62,6 +61,17 @@ import { useThreads } from "@/hooks/queries/thread-queries";
 import { buildParentSelectorOptions } from "@/views/thread-detail/threadParentSelectorOptions";
 import { getThreadRoutePath } from "@/lib/route-paths";
 import { getThreadDisplayTitle } from "@/lib/thread-title";
+import {
+  PULL_REQUEST_STATE_DISPLAY,
+  getPullRequestAttentionDisplay,
+  getPullRequestChecksDisplay,
+  getPullRequestMergeabilityDisplay,
+  getPullRequestReviewDisplay,
+} from "@/lib/pull-request-display";
+import {
+  PullRequestGithubCheckIcon,
+  PullRequestStateIcon,
+} from "@/components/pull-request/PullRequestStatusPill";
 
 // ---------------------------------------------------------------------------
 // Each row of the Info tab is a function component that owns its own raw
@@ -70,6 +80,9 @@ import { getThreadDisplayTitle } from "@/lib/thread-title";
 // without bypassing the production rendering path.
 // ---------------------------------------------------------------------------
 
+const GITHUB_FAVICON_URL =
+  "https://github.githubassets.com/favicons/favicon.png";
+
 export interface ParentSelectorRowProps {
   thread: Thread;
   projectId: string;
@@ -389,22 +402,6 @@ export function BranchRow({ thread, workspaceStatus }: BranchRowProps) {
   );
 }
 
-interface PullRequestStateDisplay {
-  label: string;
-  /** Background utility for the leading state dot. */
-  dotClass: string;
-}
-
-const PULL_REQUEST_STATE_DISPLAY: Record<
-  PullRequestState,
-  PullRequestStateDisplay
-> = {
-  open: { label: "Open", dotClass: "bg-success" },
-  draft: { label: "Draft", dotClass: "bg-muted-foreground" },
-  merged: { label: "Merged", dotClass: "bg-pr-merged" },
-  closed: { label: "Closed", dotClass: "bg-destructive" },
-};
-
 export interface PullRequestRowProps {
   pullRequest: ThreadPullRequest | null;
 }
@@ -412,10 +409,45 @@ export interface PullRequestRowProps {
 export function PullRequestRow({ pullRequest }: PullRequestRowProps) {
   if (!pullRequest) return null;
   const stateDisplay = PULL_REQUEST_STATE_DISPLAY[pullRequest.state];
+  const attentionDisplay = getPullRequestAttentionDisplay(pullRequest);
+  const checksDisplay = getPullRequestChecksDisplay(pullRequest);
+  const showGithubCheckIcon =
+    (pullRequest.state === "open" || pullRequest.state === "draft") &&
+    (pullRequest.checks.state === "passing" ||
+      pullRequest.checks.state === "failing" ||
+      pullRequest.checks.state === "pending");
+  const canShowChecksStatus =
+    (pullRequest.state === "open" || pullRequest.state === "draft") &&
+    pullRequest.checks.state !== "no_checks" &&
+    pullRequest.checks.state !== "unknown";
+  const statusDisplay =
+    pullRequest.attention === "changes_requested" ||
+    pullRequest.attention === "review_requested"
+      ? getPullRequestReviewDisplay(pullRequest)
+      : pullRequest.attention === "conflicts" ||
+          pullRequest.attention === "blocked"
+        ? getPullRequestMergeabilityDisplay(pullRequest)
+        : attentionDisplay.label !== stateDisplay.label
+          ? attentionDisplay
+          : canShowChecksStatus
+            ? checksDisplay
+            : null;
+  const useNeutralStatusText =
+    pullRequest.attention === "ready_to_merge" ||
+    pullRequest.attention === "checks_pending" ||
+    ((pullRequest.state === "open" || pullRequest.state === "draft") &&
+      (pullRequest.checks.state === "passing" ||
+        pullRequest.checks.state === "pending") &&
+      (pullRequest.attention === "none" || pullRequest.attention === "draft"));
+  const statusTextClassName = useNeutralStatusText
+    ? "text-foreground"
+    : statusDisplay?.className;
   return (
     <DetailRow
       label={
-        <DetailRowIconLabel icon="GitMerge">Pull request</DetailRowIconLabel>
+        <DetailRowIconLabel icon="GitPullRequestArrow">
+          Pull request
+        </DetailRowIconLabel>
       }
       valueClassName="min-w-0"
     >
@@ -424,23 +456,34 @@ export function PullRequestRow({ pullRequest }: PullRequestRowProps) {
         target="_blank"
         rel="noopener noreferrer"
         title={pullRequest.title}
-        className="inline-flex max-w-full min-w-0 items-center gap-1.5 text-xs text-foreground no-underline transition-[text-decoration-color] duration-150 hover:underline hover:underline-offset-2"
+        aria-label={`Pull request ${pullRequest.number}: ${attentionDisplay.label}`}
+        className="flex h-5 max-w-full min-w-0 items-center gap-2 text-xs text-foreground no-underline transition-opacity hover:opacity-80 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
       >
-        <span className="shrink-0">PR #{pullRequest.number}</span>
-        <span className="shrink-0 text-muted-foreground">·</span>
-        <span
-          aria-hidden
-          className={cn(
-            "size-1.5 shrink-0 rounded-full",
-            stateDisplay.dotClass,
-          )}
-        />
-        <span className="min-w-0 truncate">{stateDisplay.label}</span>
-        <Icon
-          name="ExternalLink"
-          aria-hidden
-          className="size-3 shrink-0 text-muted-foreground"
-        />
+        {showGithubCheckIcon ? (
+          <PullRequestGithubCheckIcon pullRequest={pullRequest} />
+        ) : (
+          <img
+            src={GITHUB_FAVICON_URL}
+            alt=""
+            className="size-4 shrink-0"
+            aria-hidden="true"
+          />
+        )}
+        <span className="shrink-0 text-muted-foreground">
+          #{pullRequest.number}
+        </span>
+        <span className="inline-flex h-5 shrink-0 items-center gap-1.5 rounded-full border border-border bg-background px-1.5 text-muted-foreground">
+          <PullRequestStateIcon
+            state={pullRequest.state}
+            className="size-3.5"
+          />
+          <span>{stateDisplay.label}</span>
+        </span>
+        {statusDisplay ? (
+          <span className={cn("min-w-0 truncate", statusTextClassName)}>
+            {statusDisplay.label}
+          </span>
+        ) : null}
       </a>
     </DetailRow>
   );
diff --git a/apps/app/src/components/ui/icon.stories.tsx b/apps/app/src/components/ui/icon.stories.tsx
index 80795deba9..036a13ca94 100644
--- a/apps/app/src/components/ui/icon.stories.tsx
+++ b/apps/app/src/components/ui/icon.stories.tsx
@@ -51,9 +51,13 @@ const USAGE: Partial<Record<IconName, string>> = {
   GitBranch:
     "Worktree environment icon (resolved via environment-workspace helpers)",
   GitMerge: "Branch name display, branch picker selected/option glyph",
+  GitPullRequest: "Available pull request glyph",
+  GitPullRequestArrow: "Open pull request glyph",
+  GitPullRequestClosed: "Closed pull request glyph",
+  GitPullRequestDraft: "Draft pull request glyph",
   Info: "Right panel “thread info” tab, informational banners",
   Laptop: "Persistent host icon (resolved via getHostIconName)",
-  ListTodo: "Todo section header in prompt context banner",
+  ListTodo: "Todo prompt-stack card header",
   Maximize2: "Enter zen mode (prompt expand), open Mermaid diagram dialog",
   MessageSquarePlus: "“New chat” button in sidebar",
   Mic: "Voice toggle in prompt",
@@ -78,6 +82,7 @@ const USAGE: Partial<Record<IconName, string>> = {
   Trash2: "Delete queued message, remove project source",
   UserRound: "Parent-thread indicator in sidebar and prompt banner",
   UserRoundPlus: "unused legacy parent-action icon",
+  Workflow: "Workflow card indicator in the prompt stack",
   X: "Close dialogs/drawers, clear search input, remove attachment, close metadata panel",
   Zap: "Fast-mode indicator in model picker trigger, Fast-mode toggle row",
   ZoomIn: "Mermaid diagram dialog zoom in",
diff --git a/apps/app/src/components/ui/icon.tsx b/apps/app/src/components/ui/icon.tsx
index 3f77eed3fa..47f4f644db 100644
--- a/apps/app/src/components/ui/icon.tsx
+++ b/apps/app/src/components/ui/icon.tsx
@@ -52,6 +52,10 @@ import {
   FolderRemoveIcon,
   GitBranchIcon,
   GitMergeIcon,
+  GitPullRequestArrow,
+  GitPullRequestClosedIcon,
+  GitPullRequestDraftIcon,
+  GitPullRequestIcon,
   GridViewIcon,
   InformationCircleIcon,
   InternetIcon,
@@ -83,6 +87,7 @@ import {
   Unarchive03Icon,
   UserAdd01Icon,
   UserIcon,
+  WorkflowCircle03Icon,
   ZapIcon,
   ZoomInAreaIcon,
   ZoomOutAreaIcon,
@@ -141,6 +146,10 @@ const ICON_MAP = {
   Fork: TrendingUpDownIcon,
   GitBranch: GitBranchIcon,
   GitMerge: GitMergeIcon,
+  GitPullRequest: GitPullRequestIcon,
+  GitPullRequestArrow: GitPullRequestArrow,
+  GitPullRequestClosed: GitPullRequestClosedIcon,
+  GitPullRequestDraft: GitPullRequestDraftIcon,
   Globe: InternetIcon,
   GridView: GridViewIcon,
   Info: InformationCircleIcon,
@@ -174,6 +183,7 @@ const ICON_MAP = {
   Trash2: Delete02Icon,
   UserRound: UserIcon,
   UserRoundPlus: UserAdd01Icon,
+  Workflow: WorkflowCircle03Icon,
   X: Cancel01Icon,
   Zap: ZapIcon,
   ZoomIn: ZoomInAreaIcon,
diff --git a/apps/app/src/lib/pull-request-display.test.ts b/apps/app/src/lib/pull-request-display.test.ts
new file mode 100644
index 0000000000..51fb791506
--- /dev/null
+++ b/apps/app/src/lib/pull-request-display.test.ts
@@ -0,0 +1,62 @@
+import type { ThreadPullRequest } from "@bb/domain";
+import { describe, expect, it } from "vitest";
+import {
+  PULL_REQUEST_STATE_DISPLAY,
+  getPullRequestAttentionDisplay,
+} from "./pull-request-display";
+
+function pullRequest(
+  overrides: Partial<ThreadPullRequest> = {},
+): ThreadPullRequest {
+  return {
+    number: 1,
+    title: "Add PR indicators",
+    state: "open",
+    url: "https://github.com/acme/bb/pull/1",
+    baseRefName: "main",
+    headRefName: "bb/pr-indicators",
+    updatedAt: "2026-06-17T12:00:00Z",
+    checks: {
+      state: "passing",
+      totalCount: 1,
+      passedCount: 1,
+      failedCount: 0,
+      pendingCount: 0,
+    },
+    review: {
+      state: "none",
+      reviewRequestCount: 0,
+    },
+    mergeability: {
+      state: "mergeable",
+      mergeStateStatus: "CLEAN",
+      mergeable: "MERGEABLE",
+    },
+    attention: "none",
+    ...overrides,
+  };
+}
+
+describe("pull request display icons", () => {
+  it("uses GitHub pull request glyphs for PR state", () => {
+    expect(PULL_REQUEST_STATE_DISPLAY.open.icon).toBe("GitPullRequestArrow");
+    expect(PULL_REQUEST_STATE_DISPLAY.draft.icon).toBe("GitPullRequestDraft");
+    expect(PULL_REQUEST_STATE_DISPLAY.closed.icon).toBe(
+      "GitPullRequestClosed",
+    );
+    expect(PULL_REQUEST_STATE_DISPLAY.merged.icon).toBe("GitMerge");
+  });
+
+  it("keeps attention states PR-shaped in compact surfaces", () => {
+    expect(
+      getPullRequestAttentionDisplay(
+        pullRequest({ attention: "checks_failed" }),
+      ).icon,
+    ).toBe("GitPullRequestArrow");
+    expect(
+      getPullRequestAttentionDisplay(
+        pullRequest({ attention: "ready_to_merge" }),
+      ).icon,
+    ).toBe("GitPullRequestArrow");
+  });
+});
diff --git a/apps/app/src/lib/pull-request-display.ts b/apps/app/src/lib/pull-request-display.ts
new file mode 100644
index 0000000000..ac8dd95818
--- /dev/null
+++ b/apps/app/src/lib/pull-request-display.ts
@@ -0,0 +1,211 @@
+import type {
+  PullRequestState,
+  ThreadPullRequest,
+  ThreadPullRequestAttentionState,
+  ThreadPullRequestChecksState,
+  ThreadPullRequestMergeabilityState,
+  ThreadPullRequestReviewState,
+} from "@bb/domain";
+import type { IconName } from "@/components/ui/icon.js";
+
+interface PullRequestDisplay {
+  label: string;
+  icon: IconName;
+  className: string;
+}
+
+export interface PullRequestStateDisplay extends PullRequestDisplay {
+  dotClass: string;
+}
+
+export const PULL_REQUEST_STATE_DISPLAY: Record<
+  PullRequestState,
+  PullRequestStateDisplay
+> = {
+  open: {
+    label: "Open",
+    icon: "GitPullRequestArrow",
+    className: "text-success",
+    dotClass: "bg-success",
+  },
+  draft: {
+    label: "Draft",
+    icon: "GitPullRequestDraft",
+    className: "text-muted-foreground",
+    dotClass: "bg-muted-foreground",
+  },
+  merged: {
+    label: "Merged",
+    icon: "GitMerge",
+    className: "text-pr-merged",
+    dotClass: "bg-pr-merged",
+  },
+  closed: {
+    label: "Closed",
+    icon: "GitPullRequestClosed",
+    className: "text-destructive",
+    dotClass: "bg-destructive",
+  },
+};
+
+const CHECKS_DISPLAY: Record<ThreadPullRequestChecksState, PullRequestDisplay> =
+  {
+    passing: {
+      label: "Checks passing",
+      icon: "CircleCheck",
+      className: "text-success",
+    },
+    failing: {
+      label: "Checks failing",
+      icon: "CircleX",
+      className: "text-destructive",
+    },
+    pending: {
+      label: "Checks pending",
+      icon: "Clock",
+      className: "text-warning-text",
+    },
+    no_checks: {
+      label: "No checks",
+      icon: "Circle",
+      className: "text-muted-foreground",
+    },
+    unknown: {
+      label: "Checks unknown",
+      icon: "AlertTriangle",
+      className: "text-warning-text",
+    },
+  };
+
+const REVIEW_DISPLAY: Record<ThreadPullRequestReviewState, PullRequestDisplay> =
+  {
+    approved: {
+      label: "Approved",
+      icon: "CircleCheck",
+      className: "text-success",
+    },
+    changes_requested: {
+      label: "Changes requested",
+      icon: "CircleX",
+      className: "text-destructive",
+    },
+    review_required: {
+      label: "Review required",
+      icon: "Clock",
+      className: "text-destructive",
+    },
+    review_requested: {
+      label: "Review requested",
+      icon: "Clock",
+      className: "text-destructive",
+    },
+    none: {
+      label: "No review",
+      icon: "Circle",
+      className: "text-muted-foreground",
+    },
+  };
+
+const MERGEABILITY_DISPLAY: Record<
+  ThreadPullRequestMergeabilityState,
+  PullRequestDisplay
+> = {
+  mergeable: {
+    label: "Mergeable",
+    icon: "CircleCheck",
+    className: "text-success",
+  },
+  conflicts: {
+    label: "Conflicts",
+    icon: "AlertTriangle",
+    className: "text-destructive",
+  },
+  blocked: {
+    label: "Blocked",
+    icon: "AlertTriangle",
+    className: "text-destructive",
+  },
+  draft: {
+    label: "Draft",
+    icon: "Clock",
+    className: "text-muted-foreground",
+  },
+  unknown: {
+    label: "Mergeability unknown",
+    icon: "AlertTriangle",
+    className: "text-warning-text",
+  },
+};
+
+const ATTENTION_DISPLAY: Record<
+  ThreadPullRequestAttentionState,
+  PullRequestDisplay
+> = {
+  checks_failed: {
+    ...CHECKS_DISPLAY.failing,
+    icon: "GitPullRequestArrow",
+  },
+  checks_pending: {
+    ...CHECKS_DISPLAY.pending,
+    icon: "GitPullRequestArrow",
+  },
+  changes_requested: {
+    ...REVIEW_DISPLAY.changes_requested,
+    icon: "GitPullRequestArrow",
+  },
+  review_requested: {
+    ...REVIEW_DISPLAY.review_requested,
+    icon: "GitPullRequestArrow",
+  },
+  conflicts: {
+    ...MERGEABILITY_DISPLAY.conflicts,
+    icon: "GitPullRequestArrow",
+  },
+  blocked: {
+    ...MERGEABILITY_DISPLAY.blocked,
+    icon: "GitPullRequestArrow",
+  },
+  draft: PULL_REQUEST_STATE_DISPLAY.draft,
+  ready_to_merge: {
+    label: "Ready to merge",
+    icon: "GitPullRequestArrow",
+    className: "text-success",
+  },
+  merged: PULL_REQUEST_STATE_DISPLAY.merged,
+  closed: PULL_REQUEST_STATE_DISPLAY.closed,
+  none: PULL_REQUEST_STATE_DISPLAY.open,
+};
+
+export function getPullRequestChecksDisplay(
+  pullRequest: ThreadPullRequest,
+): PullRequestDisplay {
+  return CHECKS_DISPLAY[pullRequest.checks.state];
+}
+
+export function getPullRequestReviewDisplay(
+  pullRequest: ThreadPullRequest,
+): PullRequestDisplay {
+  return REVIEW_DISPLAY[pullRequest.review.state];
+}
+
+export function getPullRequestMergeabilityDisplay(
+  pullRequest: ThreadPullRequest,
+): PullRequestDisplay {
+  return MERGEABILITY_DISPLAY[pullRequest.mergeability.state];
+}
+
+export function getPullRequestAttentionDisplay(
+  pullRequest: ThreadPullRequest,
+): PullRequestDisplay {
+  return ATTENTION_DISPLAY[pullRequest.attention];
+}
+
+export function getPullRequestSignalDisplays(
+  pullRequest: ThreadPullRequest,
+): readonly PullRequestDisplay[] {
+  return [
+    getPullRequestChecksDisplay(pullRequest),
+    getPullRequestReviewDisplay(pullRequest),
+    getPullRequestMergeabilityDisplay(pullRequest),
+  ];
+}
diff --git a/apps/app/src/views/thread-detail/ThreadDetailPromptArea.tsx b/apps/app/src/views/thread-detail/ThreadDetailPromptArea.tsx
index 8a4fefe5f5..acfa5110a0 100644
--- a/apps/app/src/views/thread-detail/ThreadDetailPromptArea.tsx
+++ b/apps/app/src/views/thread-detail/ThreadDetailPromptArea.tsx
@@ -6,6 +6,7 @@ import type {
   EnvironmentStatus,
   PendingInteraction,
   ThreadQueuedMessage,
+  ThreadPullRequest,
   ThreadTimelineGoal,
   ThreadTimelinePendingTodos,
   ThreadWithRuntime,
@@ -21,8 +22,10 @@ import {
   type ThreadPromptContextBannerExpandedSection,
   type ThreadPromptParentThreadSection,
   type ThreadPromptChildThreadsSection,
+  type ThreadPromptPullRequestSection,
 } from "@/components/promptbox/banner/ThreadPromptContextBanner";
 import { ThreadGoalCard } from "@/components/promptbox/banner/ThreadGoalCard";
+import { ThreadTodoCard } from "@/components/promptbox/banner/ThreadTodoCard";
 import { ThreadWorkflowCard } from "@/components/promptbox/banner/ThreadWorkflowCard";
 import type {
   WorkspaceChangedFileSelection,
@@ -48,6 +51,7 @@ import {
   useSendThreadQueuedMessage,
   useStopThread,
 } from "@/hooks/mutations/thread-runtime-mutations";
+import { useUnarchiveThread } from "@/hooks/mutations/thread-state-mutations";
 import {
   getLatestPendingInteraction,
   useThreadQueuedMessages,
@@ -136,6 +140,8 @@ interface ThreadDetailPromptAreaProps {
   parentThreadSection: ThreadPromptParentThreadSection | null;
   /** Active child threads for parent threads. Null otherwise. */
   childThreadsSection: ThreadPromptChildThreadsSection | null;
+  /** Pull request summary for the active thread branch. Null when there is no PR. */
+  pullRequest: ThreadPullRequest | null;
   sendMessage: SendMessageMutationLike;
   /**
    * Bumped by the timeline host each time a quote is appended to the shared
@@ -179,6 +185,7 @@ export function ThreadDetailPromptArea({
   activeWorkflow,
   parentThreadSection,
   childThreadsSection,
+  pullRequest,
   sendMessage,
   composerFocusRequestNonce,
   thread,
@@ -258,6 +265,7 @@ export function ThreadDetailPromptArea({
   const deleteQueuedMessage = useDeleteThreadQueuedMessage();
   const reorderQueuedMessage = useReorderThreadQueuedMessage();
   const stopThread = useStopThread();
+  const unarchiveThread = useUnarchiveThread();
   const uploadPromptAttachment = useUploadPromptAttachment();
   const promptDraft = usePromptDraftStorage({
     kind: "thread",
@@ -282,7 +290,12 @@ export function ThreadDetailPromptArea({
   const [attachmentError, setAttachmentError] = useState<string | null>(null);
   const [expandedBannerSection, setExpandedBannerSection] =
     useState<ThreadPromptContextBannerExpandedSection | null>(null);
+  const pullRequestSection = useMemo<ThreadPromptPullRequestSection | null>(
+    () => (pullRequest ? { pullRequest } : null),
+    [pullRequest],
+  );
   const [isGoalExpanded, setIsGoalExpanded] = useState(false);
+  const [isTodoExpanded, setIsTodoExpanded] = useState(false);
   const [isWorkflowExpanded, setIsWorkflowExpanded] = useState(false);
   const [isFollowUpShortcutSending, setIsFollowUpShortcutSending] =
     useState(false);
@@ -734,6 +747,11 @@ export function ThreadDetailPromptArea({
     },
     [],
   );
+  const isUnarchiveCurrentThreadPending =
+    unarchiveThread.isPending && unarchiveThread.variables?.id === thread.id;
+  const handleUnarchiveCurrentThread = useCallback(() => {
+    unarchiveThread.mutate({ id: thread.id });
+  }, [thread.id, unarchiveThread]);
 
   const attachmentsConfig = useMemo(
     () => ({
@@ -927,11 +945,23 @@ export function ThreadDetailPromptArea({
           isExpanded={isGoalExpanded}
           onToggle={() => setIsGoalExpanded((value) => !value)}
         />
+        <ThreadTodoCard
+          pendingTodos={
+            thread.archivedAt === null && environmentGoneStatus === null
+              ? pendingTodos
+              : null
+          }
+          isExpanded={isTodoExpanded}
+          onToggle={() => setIsTodoExpanded((value) => !value)}
+        />
         <ThreadPromptContextBanner
-          todoSection={!pendingTodos ? null : { pendingTodos }}
           archivedSection={
             thread.archivedAt !== null
-              ? { archivedAt: thread.archivedAt }
+              ? {
+                  archivedAt: thread.archivedAt,
+                  onUnarchive: handleUnarchiveCurrentThread,
+                  unarchivePending: isUnarchiveCurrentThreadPending,
+                }
               : null
           }
           environmentGoneSection={
@@ -941,6 +971,7 @@ export function ThreadDetailPromptArea({
           }
           parentThreadSection={parentThreadSection}
           childThreadsSection={childThreadsSection}
+          pullRequestSection={pullRequestSection}
           gitSection={
             workspaceChangedFilesSection
               ? {
@@ -988,15 +1019,19 @@ export function ThreadDetailPromptArea({
       handleReorderQueuedMessage,
       handleSendQueuedImmediately,
       handleToggleBannerSection,
+      handleUnarchiveCurrentThread,
       environmentGoneStatus,
       isFollowUpSubmitting,
+      isUnarchiveCurrentThreadPending,
       isQueueMutationPending,
       goal,
       isGoalExpanded,
+      isTodoExpanded,
       activeWorkflow,
       isWorkflowExpanded,
       parentThreadSection,
       childThreadsSection,
+      pullRequestSection,
       pendingTodos,
       displayedProcessingQueuedMessage,
       queuedMessages,
diff --git a/apps/app/src/views/thread-detail/ThreadDetailView.tsx b/apps/app/src/views/thread-detail/ThreadDetailView.tsx
index 30c9aa61c9..f0144ec28c 100644
--- a/apps/app/src/views/thread-detail/ThreadDetailView.tsx
+++ b/apps/app/src/views/thread-detail/ThreadDetailView.tsx
@@ -1822,6 +1822,7 @@ export function ThreadDetailView(props: ThreadDetailViewProps) {
       activeWorkflow={activeWorkflow}
       parentThreadSection={parentThreadSection}
       childThreadsSection={childThreadsSection}
+      pullRequest={pullRequest}
       thread={thread}
     />
   );
diff --git a/apps/host-daemon/test/command/workspace-dispatch.test.ts b/apps/host-daemon/test/command/workspace-dispatch.test.ts
index 58f0d2fd28..e713598fdb 100644
--- a/apps/host-daemon/test/command/workspace-dispatch.test.ts
+++ b/apps/host-daemon/test/command/workspace-dispatch.test.ts
@@ -1,5 +1,6 @@
 import fs from "node:fs/promises";
 import path from "node:path";
+import type { GitHostPullRequest } from "@bb/domain";
 import { afterEach, describe, expect, it } from "vitest";
 import {
   dispatchCommand,
@@ -102,13 +103,21 @@ describe("workspace command dispatch", () => {
       workspacePath: "/tmp/env-1",
     });
 
-    const pullRequest = {
+    const pullRequest: GitHostPullRequest = {
       number: 42,
       title: "Add timeline polish",
       state: "OPEN",
       url: "https://github.com/bb/bb/pull/42",
       isDraft: false,
-    } as const;
+      baseRefName: "main",
+      headRefName: "bb/timeline-polish",
+      updatedAt: "2026-06-16T12:30:00Z",
+      checks: [],
+      reviewDecision: null,
+      reviewRequestCount: 0,
+      mergeStateStatus: "CLEAN",
+      mergeable: "MERGEABLE",
+    };
     harness.workspaceState.pullRequest = pullRequest;
 
     const presentResult = await dispatchOnlineRpcCommand(
@@ -148,6 +157,14 @@ describe("workspace command dispatch", () => {
       state: "OPEN",
       url: "https://github.com/bb/bb/pull/7",
       isDraft: false,
+      baseRefName: "main",
+      headRefName: "bb/hidden-pr",
+      updatedAt: "2026-06-16T12:30:00Z",
+      checks: [],
+      reviewDecision: null,
+      reviewRequestCount: 0,
+      mergeStateStatus: "CLEAN",
+      mergeable: "MERGEABLE",
     };
     await harness.manager.ensureEnvironment({
       environmentId: "env-non-git-pr",
@@ -514,7 +531,9 @@ describe("workspace command dispatch", () => {
   });
 
   it("hides host.read_file_relative dotfiles when dotfiles are denied", async () => {
-    const tempDir = await makeTempDir("bb-dispatch-host-read-relative-dotfile-");
+    const tempDir = await makeTempDir(
+      "bb-dispatch-host-read-relative-dotfile-",
+    );
     await fs.writeFile(path.join(tempDir, ".env"), "secret");
     const harness = createHarness();
 
diff --git a/apps/server/src/services/environments/pull-request.test.ts b/apps/server/src/services/environments/pull-request.test.ts
index 17e8216aca..e4cf655f81 100644
--- a/apps/server/src/services/environments/pull-request.test.ts
+++ b/apps/server/src/services/environments/pull-request.test.ts
@@ -11,6 +11,14 @@ function rawPullRequest(
     state: "OPEN",
     url: "https://github.com/acme/bb/pull/42",
     isDraft: false,
+    baseRefName: "main",
+    headRefName: "bb/add-pr-section",
+    updatedAt: "2026-06-16T12:30:00Z",
+    checks: [],
+    reviewDecision: null,
+    reviewRequestCount: 0,
+    mergeStateStatus: "CLEAN",
+    mergeable: "MERGEABLE",
     ...overrides,
   };
 }
@@ -26,6 +34,26 @@ describe("assembleThreadPullRequest", () => {
       title: "Add pull request section",
       url: "https://github.com/acme/bb/pull/42",
       state: "open",
+      baseRefName: "main",
+      headRefName: "bb/add-pr-section",
+      updatedAt: "2026-06-16T12:30:00Z",
+      checks: {
+        state: "no_checks",
+        totalCount: 0,
+        passedCount: 0,
+        failedCount: 0,
+        pendingCount: 0,
+      },
+      review: {
+        state: "none",
+        reviewRequestCount: 0,
+      },
+      mergeability: {
+        state: "mergeable",
+        mergeStateStatus: "CLEAN",
+        mergeable: "MERGEABLE",
+      },
+      attention: "none",
     });
   });
 
@@ -56,4 +84,83 @@ describe("assembleThreadPullRequest", () => {
       )?.state,
     ).toBe("closed");
   });
+
+  it("summarizes failed checks as attention", () => {
+    expect(
+      assembleThreadPullRequest(
+        rawPullRequest({
+          checks: [
+            {
+              name: "test",
+              status: "completed",
+              conclusion: "success",
+              url: null,
+            },
+            {
+              name: "typecheck",
+              status: "completed",
+              conclusion: "failure",
+              url: "https://github.com/acme/bb/actions/runs/1",
+            },
+          ],
+        }),
+      ),
+    ).toMatchObject({
+      checks: {
+        state: "failing",
+        totalCount: 2,
+        passedCount: 1,
+        failedCount: 1,
+        pendingCount: 0,
+      },
+      attention: "checks_failed",
+    });
+  });
+
+  it("summarizes review requests and conflicts", () => {
+    expect(
+      assembleThreadPullRequest(
+        rawPullRequest({
+          reviewDecision: "REVIEW_REQUIRED",
+          reviewRequestCount: 2,
+          mergeStateStatus: "DIRTY",
+          mergeable: "CONFLICTING",
+        }),
+      ),
+    ).toMatchObject({
+      review: {
+        state: "review_requested",
+        reviewRequestCount: 2,
+      },
+      mergeability: {
+        state: "conflicts",
+        mergeStateStatus: "DIRTY",
+        mergeable: "CONFLICTING",
+      },
+      attention: "conflicts",
+    });
+  });
+
+  it("marks passing mergeable PRs as ready to merge", () => {
+    expect(
+      assembleThreadPullRequest(
+        rawPullRequest({
+          checks: [
+            {
+              name: "test",
+              status: "completed",
+              conclusion: "success",
+              url: null,
+            },
+          ],
+          reviewDecision: "APPROVED",
+        }),
+      ),
+    ).toMatchObject({
+      checks: { state: "passing" },
+      review: { state: "approved" },
+      mergeability: { state: "mergeable" },
+      attention: "ready_to_merge",
+    });
+  });
 });
diff --git a/apps/server/src/services/environments/pull-request.ts b/apps/server/src/services/environments/pull-request.ts
index 3427798fe5..b0d8552477 100644
--- a/apps/server/src/services/environments/pull-request.ts
+++ b/apps/server/src/services/environments/pull-request.ts
@@ -1,4 +1,157 @@
-import type { GitHostPullRequest, ThreadPullRequest } from "@bb/domain";
+import type {
+  GitHostPullRequest,
+  GitHostPullRequestCheck,
+  ThreadPullRequest,
+  ThreadPullRequestAttentionState,
+  ThreadPullRequestChecks,
+  ThreadPullRequestChecksState,
+  ThreadPullRequestMergeability,
+  ThreadPullRequestMergeabilityState,
+  ThreadPullRequestReview,
+  ThreadPullRequestReviewState,
+} from "@bb/domain";
+
+function assembleThreadPullRequestChecks(
+  rawChecks: readonly GitHostPullRequestCheck[],
+): ThreadPullRequestChecks {
+  let passedCount = 0;
+  let failedCount = 0;
+  let pendingCount = 0;
+  let unknownCount = 0;
+
+  for (const check of rawChecks) {
+    if (check.status === "queued" || check.status === "in_progress") {
+      pendingCount += 1;
+      continue;
+    }
+    switch (check.conclusion) {
+      case "success":
+      case "skipped":
+      case "neutral":
+        passedCount += 1;
+        break;
+      case "failure":
+      case "cancelled":
+      case "timed_out":
+      case "action_required":
+      case "startup_failure":
+      case "stale":
+        failedCount += 1;
+        break;
+      case "unknown":
+      case null:
+        unknownCount += 1;
+        break;
+    }
+  }
+
+  let state: ThreadPullRequestChecksState;
+  if (rawChecks.length === 0) {
+    state = "no_checks";
+  } else if (failedCount > 0) {
+    state = "failing";
+  } else if (pendingCount > 0) {
+    state = "pending";
+  } else if (unknownCount > 0) {
+    state = "unknown";
+  } else {
+    state = "passing";
+  }
+
+  return {
+    state,
+    totalCount: rawChecks.length,
+    passedCount,
+    failedCount,
+    pendingCount,
+  };
+}
+
+function assembleThreadPullRequestReview(
+  raw: GitHostPullRequest,
+): ThreadPullRequestReview {
+  let state: ThreadPullRequestReviewState;
+  switch (raw.reviewDecision) {
+    case "APPROVED":
+      state = "approved";
+      break;
+    case "CHANGES_REQUESTED":
+      state = "changes_requested";
+      break;
+    case "REVIEW_REQUIRED":
+      state =
+        raw.reviewRequestCount > 0 ? "review_requested" : "review_required";
+      break;
+    case null:
+      state = raw.reviewRequestCount > 0 ? "review_requested" : "none";
+      break;
+  }
+
+  return {
+    state,
+    reviewRequestCount: raw.reviewRequestCount,
+  };
+}
+
+function assembleThreadPullRequestMergeability(
+  raw: GitHostPullRequest,
+): ThreadPullRequestMergeability {
+  let state: ThreadPullRequestMergeabilityState;
+  if (raw.state === "OPEN" && raw.isDraft) {
+    state = "draft";
+  } else if (
+    raw.mergeable === "CONFLICTING" ||
+    raw.mergeStateStatus === "DIRTY"
+  ) {
+    state = "conflicts";
+  } else if (
+    raw.mergeStateStatus === "BLOCKED" ||
+    raw.mergeStateStatus === "BEHIND" ||
+    raw.mergeStateStatus === "HAS_HOOKS" ||
+    raw.mergeStateStatus === "UNSTABLE"
+  ) {
+    state = "blocked";
+  } else if (
+    raw.mergeable === "MERGEABLE" ||
+    raw.mergeStateStatus === "CLEAN"
+  ) {
+    state = "mergeable";
+  } else {
+    state = "unknown";
+  }
+
+  return {
+    state,
+    mergeStateStatus: raw.mergeStateStatus,
+    mergeable: raw.mergeable,
+  };
+}
+
+function assemblePullRequestAttention(
+  state: ThreadPullRequest["state"],
+  checks: ThreadPullRequestChecks,
+  review: ThreadPullRequestReview,
+  mergeability: ThreadPullRequestMergeability,
+): ThreadPullRequestAttentionState {
+  if (state === "merged") return "merged";
+  if (state === "closed") return "closed";
+  if (mergeability.state === "conflicts") return "conflicts";
+  if (checks.state === "failing") return "checks_failed";
+  if (review.state === "changes_requested") return "changes_requested";
+  if (mergeability.state === "blocked") return "blocked";
+  if (state === "draft") return "draft";
+  if (
+    review.state === "review_requested" ||
+    review.state === "review_required"
+  ) {
+    return "review_requested";
+  }
+  if (checks.state === "pending") return "checks_pending";
+  if (mergeability.state === "mergeable" && checks.state === "passing") {
+    return "ready_to_merge";
+  }
+  return "none";
+}
 
 /**
  * Server-owned product policy: fold the raw `gh` state plus `isDraft` from the
@@ -11,17 +164,33 @@ export function assembleThreadPullRequest(
   if (!raw) {
     return null;
   }
+  const state =
+    raw.state === "MERGED"
+      ? "merged"
+      : raw.state === "CLOSED"
+        ? "closed"
+        : raw.isDraft
+          ? "draft"
+          : "open";
+  const checks = assembleThreadPullRequestChecks(raw.checks);
+  const review = assembleThreadPullRequestReview(raw);
+  const mergeability = assembleThreadPullRequestMergeability(raw);
   return {
     number: raw.number,
     title: raw.title,
     url: raw.url,
-    state:
-      raw.state === "MERGED"
-        ? "merged"
-        : raw.state === "CLOSED"
-          ? "closed"
-          : raw.isDraft
-            ? "draft"
-            : "open",
+    state,
+    baseRefName: raw.baseRefName,
+    headRefName: raw.headRefName,
+    updatedAt: raw.updatedAt,
+    checks,
+    review,
+    mergeability,
+    attention: assemblePullRequestAttention(
+      state,
+      checks,
+      review,
+      mergeability,
+    ),
   };
 }
diff --git a/packages/domain/src/thread.ts b/packages/domain/src/thread.ts
index 3210017767..d3f91c9b00 100644
--- a/packages/domain/src/thread.ts
+++ b/packages/domain/src/thread.ts
@@ -142,10 +142,80 @@ export const workspaceStatusSchema = z.object({
 });
 export type WorkspaceStatus = z.infer<typeof workspaceStatusSchema>;
 
+export const gitHostPullRequestCheckStatusSchema = z.enum([
+  "queued",
+  "in_progress",
+  "completed",
+  "unknown",
+]);
+export type GitHostPullRequestCheckStatus = z.infer<
+  typeof gitHostPullRequestCheckStatusSchema
+>;
+
+export const gitHostPullRequestCheckConclusionSchema = z.enum([
+  "success",
+  "failure",
+  "cancelled",
+  "skipped",
+  "neutral",
+  "timed_out",
+  "action_required",
+  "startup_failure",
+  "stale",
+  "unknown",
+]);
+export type GitHostPullRequestCheckConclusion = z.infer<
+  typeof gitHostPullRequestCheckConclusionSchema
+>;
+
+export const gitHostPullRequestCheckSchema = z
+  .object({
+    name: z.string().min(1),
+    status: gitHostPullRequestCheckStatusSchema,
+    conclusion: gitHostPullRequestCheckConclusionSchema.nullable(),
+    url: z.string().url().nullable(),
+  })
+  .strict();
+export type GitHostPullRequestCheck = z.infer<
+  typeof gitHostPullRequestCheckSchema
+>;
+
+export const gitHostPullRequestReviewDecisionSchema = z.enum([
+  "APPROVED",
+  "CHANGES_REQUESTED",
+  "REVIEW_REQUIRED",
+]);
+export type GitHostPullRequestReviewDecision = z.infer<
+  typeof gitHostPullRequestReviewDecisionSchema
+>;
+
+export const gitHostPullRequestMergeStateStatusSchema = z.enum([
+  "BEHIND",
+  "BLOCKED",
+  "CLEAN",
+  "DIRTY",
+  "DRAFT",
+  "HAS_HOOKS",
+  "UNKNOWN",
+  "UNSTABLE",
+]);
+export type GitHostPullRequestMergeStateStatus = z.infer<
+  typeof gitHostPullRequestMergeStateStatusSchema
+>;
+
+export const gitHostPullRequestMergeableSchema = z.enum([
+  "CONFLICTING",
+  "MERGEABLE",
+  "UNKNOWN",
+]);
+export type GitHostPullRequestMergeable = z.infer<
+  typeof gitHostPullRequestMergeableSchema
+>;
+
 /**
- * Raw pull request data as emitted by the host git-host CLI (`gh pr view
- * --json number,title,state,url,isDraft`). The host daemon returns this
- * verbatim; the server maps it onto the product-facing `ThreadPullRequest`.
+ * Pull request data normalized from the host git-host CLI (`gh pr view`).
+ * The host daemon returns this verbatim; the server maps it onto the
+ * product-facing `ThreadPullRequest`.
  */
 export const gitHostPullRequestSchema = z
   .object({
@@ -154,6 +224,14 @@ export const gitHostPullRequestSchema = z
     state: z.enum(["OPEN", "CLOSED", "MERGED"]),
     url: z.string().url(),
     isDraft: z.boolean(),
+    baseRefName: z.string(),
+    headRefName: z.string(),
+    updatedAt: z.string().datetime(),
+    checks: z.array(gitHostPullRequestCheckSchema),
+    reviewDecision: gitHostPullRequestReviewDecisionSchema.nullable(),
+    reviewRequestCount: z.number().int().nonnegative(),
+    mergeStateStatus: gitHostPullRequestMergeStateStatusSchema.nullable(),
+    mergeable: gitHostPullRequestMergeableSchema.nullable(),
   })
   .strict();
 export type GitHostPullRequest = z.infer<typeof gitHostPullRequestSchema>;
@@ -166,6 +244,90 @@ export const pullRequestStateSchema = z.enum([
 ]);
 export type PullRequestState = z.infer<typeof pullRequestStateSchema>;
 
+export const threadPullRequestChecksStateSchema = z.enum([
+  "passing",
+  "failing",
+  "pending",
+  "no_checks",
+  "unknown",
+]);
+export type ThreadPullRequestChecksState = z.infer<
+  typeof threadPullRequestChecksStateSchema
+>;
+
+export const threadPullRequestChecksSchema = z
+  .object({
+    state: threadPullRequestChecksStateSchema,
+    totalCount: z.number().int().nonnegative(),
+    passedCount: z.number().int().nonnegative(),
+    failedCount: z.number().int().nonnegative(),
+    pendingCount: z.number().int().nonnegative(),
+  })
+  .strict();
+export type ThreadPullRequestChecks = z.infer<
+  typeof threadPullRequestChecksSchema
+>;
+
+export const threadPullRequestReviewStateSchema = z.enum([
+  "approved",
+  "changes_requested",
+  "review_required",
+  "review_requested",
+  "none",
+]);
+export type ThreadPullRequestReviewState = z.infer<
+  typeof threadPullRequestReviewStateSchema
+>;
+
+export const threadPullRequestReviewSchema = z
+  .object({
+    state: threadPullRequestReviewStateSchema,
+    reviewRequestCount: z.number().int().nonnegative(),
+  })
+  .strict();
+export type ThreadPullRequestReview = z.infer<
+  typeof threadPullRequestReviewSchema
+>;
+
+export const threadPullRequestMergeabilityStateSchema = z.enum([
+  "mergeable",
+  "conflicts",
+  "blocked",
+  "draft",
+  "unknown",
+]);
+export type ThreadPullRequestMergeabilityState = z.infer<
+  typeof threadPullRequestMergeabilityStateSchema
+>;
+
+export const threadPullRequestMergeabilitySchema = z
+  .object({
+    state: threadPullRequestMergeabilityStateSchema,
+    mergeStateStatus: gitHostPullRequestMergeStateStatusSchema.nullable(),
+    mergeable: gitHostPullRequestMergeableSchema.nullable(),
+  })
+  .strict();
+export type ThreadPullRequestMergeability = z.infer<
+  typeof threadPullRequestMergeabilitySchema
+>;
+
+export const threadPullRequestAttentionStateSchema = z.enum([
+  "checks_failed",
+  "checks_pending",
+  "changes_requested",
+  "review_requested",
+  "conflicts",
+  "blocked",
+  "draft",
+  "ready_to_merge",
+  "merged",
+  "closed",
+  "none",
+]);
+export type ThreadPullRequestAttentionState = z.infer<
+  typeof threadPullRequestAttentionStateSchema
+>;
+
 /**
  * A pull request associated with a thread's branch, assembled by the server
  * from {@link gitHostPullRequestSchema} (the server folds `isDraft` into the
@@ -177,6 +339,13 @@ export const threadPullRequestSchema = z
     title: z.string(),
     state: pullRequestStateSchema,
     url: z.string().url(),
+    baseRefName: z.string(),
+    headRefName: z.string(),
+    updatedAt: z.string().datetime(),
+    checks: threadPullRequestChecksSchema,
+    review: threadPullRequestReviewSchema,
+    mergeability: threadPullRequestMergeabilitySchema,
+    attention: threadPullRequestAttentionStateSchema,
   })
   .strict();
 export type ThreadPullRequest = z.infer<typeof threadPullRequestSchema>;
diff --git a/packages/host-daemon-contract/test/contract.test.ts b/packages/host-daemon-contract/test/contract.test.ts
index 72242a9bc6..e043575b13 100644
--- a/packages/host-daemon-contract/test/contract.test.ts
+++ b/packages/host-daemon-contract/test/contract.test.ts
@@ -237,6 +237,21 @@ const ONLINE_RPC_RESPONSE_RESULT_FIXTURES: OnlineRpcResponseResultFixtures = {
       state: "OPEN",
       url: "https://github.com/acme/bb/pull/42",
       isDraft: false,
+      baseRefName: "main",
+      headRefName: "feature/host-rpc",
+      updatedAt: "2026-06-16T12:30:00Z",
+      checks: [
+        {
+          name: "test",
+          status: "completed",
+          conclusion: "success",
+          url: null,
+        },
+      ],
+      reviewDecision: "APPROVED",
+      reviewRequestCount: 0,
+      mergeStateStatus: "CLEAN",
+      mergeable: "MERGEABLE",
     },
   },
 };
diff --git a/packages/host-workspace/src/git-host.ts b/packages/host-workspace/src/git-host.ts
index 8df420f47d..c75069c01f 100644
--- a/packages/host-workspace/src/git-host.ts
+++ b/packages/host-workspace/src/git-host.ts
@@ -1,6 +1,15 @@
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
-import { type GitHostPullRequest, gitHostPullRequestSchema } from "@bb/domain";
+import {
+  type GitHostPullRequest,
+  type GitHostPullRequestCheck,
+  type GitHostPullRequestCheckConclusion,
+  type GitHostPullRequestCheckStatus,
+  type GitHostPullRequestMergeStateStatus,
+  type GitHostPullRequestMergeable,
+  type GitHostPullRequestReviewDecision,
+  gitHostPullRequestSchema,
+} from "@bb/domain";
 import { sanitizeInheritedChildProcessEnv } from "@bb/process-utils";
 
 const execFileAsync = promisify(execFile);
@@ -16,13 +25,241 @@ const GH_PR_VIEW_TIMEOUT_MS = 10_000;
  */
 const GH_PR_VIEW_MAX_BUFFER_BYTES = 16 * 1024 * 1024;
 
-const GH_PR_VIEW_JSON_FIELDS = "number,title,state,url,isDraft";
+const GH_PR_VIEW_JSON_FIELDS = [
+  "number",
+  "title",
+  "state",
+  "url",
+  "isDraft",
+  "baseRefName",
+  "headRefName",
+  "updatedAt",
+  "statusCheckRollup",
+  "reviewDecision",
+  "reviewRequests",
+  "mergeStateStatus",
+  "mergeable",
+].join(",");
 
 interface GetPullRequestForBranchArgs {
   cwd: string;
   branch: string;
 }
 
+type JsonObject = Record<string, unknown>;
+
+function asObject(value: unknown): JsonObject | null {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return null;
+  }
+  return value as JsonObject;
+}
+
+function getString(object: JsonObject, key: string): string | null {
+  const value = object[key];
+  return typeof value === "string" ? value : null;
+}
+
+function getNumber(object: JsonObject, key: string): number | null {
+  const value = object[key];
+  return typeof value === "number" ? value : null;
+}
+
+function getBoolean(object: JsonObject, key: string): boolean | null {
+  const value = object[key];
+  return typeof value === "boolean" ? value : null;
+}
+
+function normalizeUppercase(value: unknown): string | null {
+  return typeof value === "string" && value.trim()
+    ? value.trim().toUpperCase()
+    : null;
+}
+
+function normalizeReviewDecision(
+  value: unknown,
+): GitHostPullRequestReviewDecision | null {
+  switch (normalizeUppercase(value)) {
+    case "APPROVED":
+      return "APPROVED";
+    case "CHANGES_REQUESTED":
+      return "CHANGES_REQUESTED";
+    case "REVIEW_REQUIRED":
+      return "REVIEW_REQUIRED";
+    default:
+      return null;
+  }
+}
+
+function normalizeMergeStateStatus(
+  value: unknown,
+): GitHostPullRequestMergeStateStatus | null {
+  switch (normalizeUppercase(value)) {
+    case "BEHIND":
+      return "BEHIND";
+    case "BLOCKED":
+      return "BLOCKED";
+    case "CLEAN":
+      return "CLEAN";
+    case "DIRTY":
+      return "DIRTY";
+    case "DRAFT":
+      return "DRAFT";
+    case "HAS_HOOKS":
+      return "HAS_HOOKS";
+    case "UNKNOWN":
+      return "UNKNOWN";
+    case "UNSTABLE":
+      return "UNSTABLE";
+    default:
+      return null;
+  }
+}
+
+function normalizeMergeable(
+  value: unknown,
+): GitHostPullRequestMergeable | null {
+  switch (normalizeUppercase(value)) {
+    case "CONFLICTING":
+      return "CONFLICTING";
+    case "MERGEABLE":
+      return "MERGEABLE";
+    case "UNKNOWN":
+      return "UNKNOWN";
+    default:
+      return null;
+  }
+}
+
+function normalizeCheckStatus(value: unknown): GitHostPullRequestCheckStatus {
+  switch (normalizeUppercase(value)) {
+    case "QUEUED":
+    case "REQUESTED":
+    case "WAITING":
+      return "queued";
+    case "EXPECTED":
+    case "IN_PROGRESS":
+    case "PENDING":
+      return "in_progress";
+    case "COMPLETED":
+    case "SUCCESS":
+    case "FAILURE":
+    case "ERROR":
+    case "CANCELLED":
+    case "SKIPPED":
+    case "NEUTRAL":
+      return "completed";
+    default:
+      return "unknown";
+  }
+}
+
+function normalizeCheckConclusion(
+  value: unknown,
+): GitHostPullRequestCheckConclusion | null {
+  switch (normalizeUppercase(value)) {
+    case "SUCCESS":
+      return "success";
+    case "FAILURE":
+    case "ERROR":
+      return "failure";
+    case "CANCELLED":
+      return "cancelled";
+    case "SKIPPED":
+      return "skipped";
+    case "NEUTRAL":
+      return "neutral";
+    case "TIMED_OUT":
+      return "timed_out";
+    case "ACTION_REQUIRED":
+      return "action_required";
+    case "STARTUP_FAILURE":
+      return "startup_failure";
+    case "STALE":
+      return "stale";
+    case "UNKNOWN":
+      return "unknown";
+    default:
+      return null;
+  }
+}
+
+function getNullableUrl(object: JsonObject, key: string): string | null {
+  const value = object[key];
+  if (typeof value !== "string" || value.length === 0) {
+    return null;
+  }
+  try {
+    return new URL(value).toString();
+  } catch {
+    return null;
+  }
+}
+
+function normalizeCheckName(object: JsonObject): string {
+  const explicitName = getString(object, "name");
+  if (explicitName && explicitName.trim()) return explicitName.trim();
+  const context = getString(object, "context");
+  if (context && context.trim()) return context.trim();
+  const workflowName = getString(object, "workflowName");
+  if (workflowName && workflowName.trim()) return workflowName.trim();
+  return "Unnamed check";
+}
+
+function normalizeChecks(value: unknown): GitHostPullRequestCheck[] {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+  const checks: GitHostPullRequestCheck[] = [];
+  for (const item of value) {
+    const object = asObject(item);
+    if (!object) continue;
+    const status = normalizeCheckStatus(object.status ?? object.state);
+    const conclusion =
+      normalizeCheckConclusion(object.conclusion) ??
+      normalizeCheckConclusion(object.state);
+    checks.push({
+      name: normalizeCheckName(object),
+      status,
+      conclusion,
+      url:
+        getNullableUrl(object, "detailsUrl") ??
+        getNullableUrl(object, "targetUrl"),
+    });
+  }
+  return checks;
+}
+
+function getArrayLength(value: unknown): number {
+  return Array.isArray(value) ? value.length : 0;
+}
+
+function normalizeGitHubPullRequestView(
+  json: unknown,
+): GitHostPullRequest | null {
+  const object = asObject(json);
+  if (!object) {
+    return null;
+  }
+  const candidate = {
+    number: getNumber(object, "number"),
+    title: getString(object, "title"),
+    state: normalizeUppercase(object.state),
+    url: getString(object, "url"),
+    isDraft: getBoolean(object, "isDraft"),
+    baseRefName: getString(object, "baseRefName"),
+    headRefName: getString(object, "headRefName"),
+    updatedAt: getString(object, "updatedAt"),
+    checks: normalizeChecks(object.statusCheckRollup),
+    reviewDecision: normalizeReviewDecision(object.reviewDecision),
+    reviewRequestCount: getArrayLength(object.reviewRequests),
+    mergeStateStatus: normalizeMergeStateStatus(object.mergeStateStatus),
+    mergeable: normalizeMergeable(object.mergeable),
+  };
+  const parsed = gitHostPullRequestSchema.safeParse(candidate);
+  return parsed.success ? parsed.data : null;
+}
+
 /**
  * Parse the stdout of `gh pr view --json <fields>` into a validated
  * {@link GitHostPullRequest}. Returns `null` for any output that is not a
@@ -42,8 +279,7 @@ export function parseGitHostPullRequest(
   } catch {
     return null;
   }
-  const parsed = gitHostPullRequestSchema.safeParse(json);
-  return parsed.success ? parsed.data : null;
+  return normalizeGitHubPullRequestView(json);
 }
 
 /**
diff --git a/packages/host-workspace/test/git-host.test.ts b/packages/host-workspace/test/git-host.test.ts
index 0f30c5bd95..0310120007 100644
--- a/packages/host-workspace/test/git-host.test.ts
+++ b/packages/host-workspace/test/git-host.test.ts
@@ -8,6 +8,14 @@ function ghJson(overrides: Record<string, unknown> = {}): string {
     state: "OPEN",
     url: "https://github.com/acme/bb/pull/42",
     isDraft: false,
+    baseRefName: "main",
+    headRefName: "bb/add-pr-section",
+    updatedAt: "2026-06-16T12:30:00Z",
+    statusCheckRollup: [],
+    reviewDecision: null,
+    reviewRequests: [],
+    mergeStateStatus: "CLEAN",
+    mergeable: "MERGEABLE",
     ...overrides,
   });
 }
@@ -20,6 +28,14 @@ describe("parseGitHostPullRequest", () => {
       state: "OPEN",
       url: "https://github.com/acme/bb/pull/42",
       isDraft: false,
+      baseRefName: "main",
+      headRefName: "bb/add-pr-section",
+      updatedAt: "2026-06-16T12:30:00Z",
+      checks: [],
+      reviewDecision: null,
+      reviewRequestCount: 0,
+      mergeStateStatus: "CLEAN",
+      mergeable: "MERGEABLE",
     });
   });
 
@@ -39,6 +55,68 @@ describe("parseGitHostPullRequest", () => {
     expect(parseGitHostPullRequest(`\n  ${ghJson()}\n`)?.number).toBe(42);
   });
 
+  it("normalizes checks, review requests, and mergeability", () => {
+    expect(
+      parseGitHostPullRequest(
+        ghJson({
+          statusCheckRollup: [
+            {
+              __typename: "CheckRun",
+              name: "typecheck",
+              status: "COMPLETED",
+              conclusion: "SUCCESS",
+              detailsUrl: "https://github.com/acme/bb/actions/runs/1",
+            },
+            {
+              __typename: "StatusContext",
+              context: "ci/build",
+              state: "FAILURE",
+              targetUrl: "https://ci.example.test/build/42",
+            },
+            {
+              __typename: "CheckRun",
+              workflowName: "lint",
+              status: "IN_PROGRESS",
+              conclusion: null,
+            },
+          ],
+          reviewDecision: "REVIEW_REQUIRED",
+          reviewRequests: [
+            { requestedReviewer: { login: "octocat" } },
+            { requestedReviewer: { login: "hubot" } },
+          ],
+          mergeStateStatus: "DIRTY",
+          mergeable: "CONFLICTING",
+        }),
+      ),
+    ).toMatchObject({
+      checks: [
+        {
+          name: "typecheck",
+          status: "completed",
+          conclusion: "success",
+          url: "https://github.com/acme/bb/actions/runs/1",
+        },
+        {
+          name: "ci/build",
+          status: "completed",
+          conclusion: "failure",
+          url: "https://ci.example.test/build/42",
+        },
+        {
+          name: "lint",
+          status: "in_progress",
+          conclusion: null,
+          url: null,
+        },
+      ],
+      reviewDecision: "REVIEW_REQUIRED",
+      reviewRequestCount: 2,
+      mergeStateStatus: "DIRTY",
+      mergeable: "CONFLICTING",
+    });
+  });
+
   it.each([
     ["empty output", ""],
     ["whitespace only", "   \n"],
@@ -50,9 +128,12 @@ describe("parseGitHostPullRequest", () => {
 
   it.each([
     ["an unknown state", ghJson({ state: "QUEUED" })],
-    ["a missing field", JSON.stringify({ number: 1, title: "x", state: "OPEN" })],
+    [
+      "a missing field",
+      JSON.stringify({ number: 1, title: "x", state: "OPEN" }),
+    ],
     ["a non-positive number", ghJson({ number: 0 })],
-    ["an extra field", ghJson({ mergeable: "MERGEABLE" })],
+    ["an invalid updatedAt", ghJson({ updatedAt: "yesterday" })],
     ["a non-url", ghJson({ url: "not-a-url" })],
   ])("returns null for %s", (_label, stdout) => {
     expect(parseGitHostPullRequest(stdout)).toBeNull();