From 560a88ad6c5f735eab2491313df5a971e7ccfeb2 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 11:19:53 -0700
Subject: [PATCH 01/37] feat(native-chat): show each interrupted chat's
 workspace as its read-only sidebar card

The resume-on-restart dialog listed workspaces as a bare name and glyph, so users could not
tell their sessions apart. It now renders each workspace with the sidebar's own WorktreeCard
in a new read-only mode, with the offered chats in place of its live agent rows, and nests
child workspaces under a listed parent the way the sidebar does. The dialog is wider and the
chat rows use the sidebar's compact agent row layout.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../NativeChatResumeOnRestartAgentRow.tsx     |  32 ++-
 .../NativeChatResumeOnRestartGroups.tsx       | 233 ++++++++++++------
 .../NativeChatResumeOnRestartModal.tsx        |  55 +++--
 ...ve-chat-resume-on-restart-grouping.test.ts |  30 +++
 .../native-chat-resume-on-restart-grouping.ts |  33 +++
 .../WorktreeCard.affiliate-list-mode.test.tsx |  69 ++++++
 .../src/components/sidebar/WorktreeCard.tsx   |   6 +-
 .../sidebar/use-worktree-card-controller.ts   |   4 +-
 .../use-worktree-card-secondary-details.ts    |   7 +-
 .../sidebar/worktree-card-header.tsx          |   7 +-
 .../components/sidebar/worktree-card-model.ts |   6 +
 .../sidebar/worktree-card-presentation.tsx    |  18 +-
 .../sidebar/worktree-card-secondary-rows.tsx  |  20 +-
 .../sidebar/worktree-card-surface.tsx         |  10 +-
 14 files changed, 393 insertions(+), 137 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
index 3c7e376c00f1..8662bef2d99e 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
@@ -12,8 +12,9 @@ import { ResumeFailureGuidanceLine, ResumeFailureStatus } from './NativeChatResu
 import { resumeActivityLabel } from './native-chat-resume-activity-label'
 
 /**
- * One offered chat, laid out like the sidebar's compact agent row: provider glyph, the chat's name,
- * then the model and an age on the right.
+ * One offered chat, laid out like the sidebar's compact agent row — provider glyph, then "name -
+ * what it was doing" on one line, then the model and an age on the right — with the checkbox in
+ * the state dot's slot. It sits inside the workspace's own read-only sidebar card.
  *
  * The sidebar's own `CompactAgentRow` cannot be reused — it takes a `DashboardAgentRow`, which
  * requires a live pane, tab and status entry, and every chat here is by definition stopped. The
@@ -26,7 +27,7 @@ import { resumeActivityLabel } from './native-chat-resume-activity-label'
  * a fault, `done` a finish, `working` a spinner. A missing dot beats a dot that says these agents
  * are running.
  *
- * Under the name, what the chat was doing when Orca went away — mid-reply, waiting on the user,
+ * After the name, what the chat was doing when Orca went away — mid-reply, waiting on the user,
  * subagents or monitoring — so rows the sidebar showed as working for different reasons differ.
  *
  * A chat an earlier resume could not carry on is the same row — selectable where a retry can run,
@@ -60,7 +61,8 @@ export function ResumeCandidateRow({
   const model = candidate.model?.trim() ?? ''
   const activity = resumeActivityLabel(candidate.activity)
   const row = (
-    <label className="flex min-w-0 flex-1 cursor-pointer items-center gap-2 rounded px-1 py-1 hover:bg-accent/50">
+    // Same box and type scale as the sidebar's `CompactAgentRow`.
+    <label className="flex h-6 min-w-0 flex-1 cursor-pointer items-center gap-1.5 rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover">
       {/* Identifies the agent AND its workspace: the accessible name has to distinguish rows that
             would otherwise all read the same. */}
       <Checkbox
@@ -76,29 +78,25 @@ export function ResumeCandidateRow({
       />
       {/* AgentIcon carries no label of its own, so the provider was invisible to assistive tech. */}
       <span role="img" aria-label={agentLabel} className="inline-flex shrink-0">
-        <AgentIcon agent={agentTypeToIconAgent(candidate.agent)} size={14} />
+        <AgentIcon agent={agentTypeToIconAgent(candidate.agent)} size={13} />
       </span>
-      <span className="flex min-w-0 flex-1 flex-col">
-        <span className="truncate text-xs font-medium">{title}</span>
-        {activity && (
-          <span
-            className="truncate text-[11px] text-muted-foreground"
-            title={activity.detail || undefined}
-          >
-            {activity.summary}
-          </span>
-        )}
+      <span
+        className="min-w-0 flex-1 truncate"
+        title={activity ? `${title} - ${activity.detail || activity.summary}` : title}
+      >
+        <span className="text-foreground/90">{title}</span>
+        {activity && <span className="text-muted-foreground/80"> - {activity.summary}</span>}
       </span>
       {model && (
         <span
-          className="min-w-0 max-w-24 shrink-0 truncate font-mono text-[10px] text-muted-foreground"
+          className="min-w-0 max-w-24 shrink-0 truncate font-mono text-[10px] text-muted-foreground/70"
           title={model}
         >
           {model}
         </span>
       )}
       {/* `formatShortTimeAgo` takes (timestamp, now) and subtracts internally — NOT a delta. */}
-      <span className="shrink-0 text-[11px] tabular-nums text-muted-foreground">
+      <span className="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">
         {formatShortTimeAgo(candidate.recordedAt, listedAt)}
       </span>
     </label>
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index 6f8bb64f4f1e..6cd323dde9e3 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -1,19 +1,32 @@
+import { useMemo } from 'react'
 import { Folder, FolderTree, GitBranch } from 'lucide-react'
 import { RepoIconGlyph } from '@/components/repo/repo-icon'
+import WorktreeCard from '@/components/sidebar/WorktreeCard'
 import { WorktreeHostContextBadge } from '@/components/sidebar/WorktreeHostContextBadge'
+import {
+  getLineageChildrenInlineStyle,
+  getLineageNestedRowGeometry
+} from '@/components/sidebar/worktree-list/rows/indentation'
+import {
+  getHostScopedWorktreeLineageInputs,
+  getWorktreeLineageAncestors
+} from '@/components/sidebar/worktree-lineage-projection'
+import { getAllWorktreesFromState, getWorktreeOnHostFromState } from '@/store/selectors'
 import { getHostContextLabel } from '../../../shared/worktree/host-context-labels'
-import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
+import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host'
 import type { AgentSessionWorkspaceKind } from '../../../shared/agent-session-record'
 import { useAppStore } from '../store'
 import { ResumeCandidateRow } from './NativeChatResumeOnRestartAgentRow'
 import {
   groupResumeCandidates,
   groupResumeWorkspacesByRepo,
+  nestResumeWorkspaces,
   resolveResumeGroupHeader,
   resumeWorkspaceKind,
   type ResumeCandidate,
   type ResumeFailure,
-  type ResumeWorkspaceGroup
+  type ResumeWorkspaceGroup,
+  type ResumeWorkspaceNode
 } from './native-chat-resume-on-restart-grouping'
 import type { ResumeFailureAction } from './native-chat-resume-failure-guidance'
 
@@ -22,36 +35,25 @@ export type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
 /**
  * The offered chats in the sidebar's three tiers: repo/project, then workspace, then agent sessions.
  *
- * Reused from the sidebar rather than rebuilt: `RepoIconGlyph` for a repo's own glyph, `FolderTree`
- * from the sidebar's `PROJECT_GROUP_META` for a project group, and `WorktreeHostContextBadge` —
- * extracted from the sidebar card's meta row so both surfaces render one chip. The label inside it
- * comes from `getHostContextLabel`, which is the sidebar's own source for "Local Mac".
+ * Each workspace IS the sidebar's own `WorktreeCard`, rendered read-only, so the user recognizes it
+ * exactly as they know it — title, status, branch, PR and host as their sidebar settings show them —
+ * with the offered chats in place of its live agent rows. Child workspaces nest under a listed
+ * parent the way the sidebar nests them.
  *
- * The sidebar has NO resolver for git-worktree vs folder-workspace glyphs: both kinds render the
- * same card, and the apparent difference is its status lane picking `GitBranch` when the workspace
- * has a branch identity. That single sidebar precedent is what the workspace glyph follows here.
+ * A workspace the store does not know yet (its host still connecting, or since deleted) falls back
+ * to a plain header: glyph, name, host chip. The sidebar has no git-worktree vs folder glyph
+ * resolver; that header follows its status lane, which picks `GitBranch` for a branch identity.
  */
 
-type StoreState = ReturnType<typeof useAppStore.getState>
-
 /** Lets a row that an earlier resume could not carry on show what went wrong and what to do. */
 type FailureProps = {
   failureFor?: (sessionId: string) => ResumeFailure | undefined
   onFailureAction?: (action: ResumeFailureAction, sessionId: string) => void
 }
 
-function resolveWorkspaceWorktree(store: StoreState, workspaceId: string) {
-  return (
-    store.getKnownWorktreeById(workspaceId) ??
-    store.allWorktrees().find((entry) => entry.id === workspaceId)
-  )
-}
-
-/** Selectors return primitives, so repeated runs cannot churn equality. */
-function useWorkspaceName(workspaceId: string): string {
-  return useAppStore(
-    (store) => resolveWorkspaceWorktree(store, workspaceId)?.displayName ?? workspaceId
-  )
+/** The store's row for a workspace on its own host; folder workspaces included. Stable per row. */
+function useWorkspaceWorktree(workspaceId: string, hostId: ExecutionHostId | undefined) {
+  return useAppStore((store) => store.getKnownWorktreeById(workspaceId, hostId))
 }
 
 /**
@@ -61,23 +63,56 @@ function useWorkspaceName(workspaceId: string): string {
  * or array would fail the equality check on every store change and re-render the whole list.
  */
 function useRepoIdByWorkspace(
-  workspaceIds: readonly string[]
+  workspaces: readonly ResumeWorkspaceGroup[]
 ): (workspaceId: string) => string | null {
-  const key = workspaceIds.join('\0')
+  const ids = workspaces.map((group) => group.workspaceId)
+  const hosts = workspaces.map((group) => group.candidates[0]?.executionHostId)
   const joined = useAppStore((store) =>
-    key
-      .split('\0')
-      .map((id) => resolveWorkspaceWorktree(store, id)?.repoId ?? '')
-      .join('\0')
+    ids.map((id, index) => store.getKnownWorktreeById(id, hosts[index])?.repoId ?? '').join('\0')
   )
   const repoIds = joined.split('\0')
   return (workspaceId: string) => {
-    const index = workspaceIds.indexOf(workspaceId)
+    const index = ids.indexOf(workspaceId)
     const repoId = index === -1 ? '' : (repoIds[index] ?? '')
     return repoId === '' ? null : repoId
   }
 }
 
+/** Each workspace's lineage ancestors, nearest first, scoped to its host as the sidebar scopes them. */
+function useLineageAncestors(
+  workspaces: readonly ResumeWorkspaceGroup[]
+): (workspaceId: string) => readonly string[] {
+  const worktreesByRepo = useAppStore((store) => store.worktreesByRepo)
+  const worktreeLineageById = useAppStore((store) => store.worktreeLineageById)
+  const ancestors = useMemo(() => {
+    const state = { worktreesByRepo }
+    const all = getAllWorktreesFromState(state)
+    return new Map(
+      workspaces.map((group) => {
+        const target = getWorktreeOnHostFromState(
+          state,
+          group.workspaceId,
+          group.candidates[0]?.executionHostId
+        )
+        if (!target) {
+          return [group.workspaceId, []]
+        }
+        // Why: the sidebar nests a child only under a parent on the same host, and never archived.
+        const { worktreeMap, lineageById } = getHostScopedWorktreeLineageInputs(
+          all.filter((worktree) => worktree.hostId === target.hostId && !worktree.isArchived),
+          worktreeLineageById,
+          target.hostId
+        )
+        return [
+          group.workspaceId,
+          getWorktreeLineageAncestors(target, lineageById, worktreeMap).map((parent) => parent.id)
+        ]
+      })
+    )
+  }, [workspaces, worktreesByRepo, worktreeLineageById])
+  return (workspaceId) => ancestors.get(workspaceId) ?? []
+}
+
 /** The glyph for the workspace itself. Kind comes from the host's record, never from a name. */
 function WorkspaceKindGlyph({ kind }: { kind: AgentSessionWorkspaceKind }): React.JSX.Element {
   return kind === 'folder' ? (
@@ -113,50 +148,100 @@ function RepoHeader({ repoId }: { repoId: string | null }): React.JSX.Element {
   )
 }
 
-function WorkspaceGroup({
-  group,
-  listedAt,
-  busy,
-  selected,
-  onToggle,
-  failureFor,
-  onFailureAction
-}: {
-  group: ResumeWorkspaceGroup
+type RowProps = {
   listedAt: number
   busy: boolean
   selected: ReadonlySet<string>
   onToggle: (sessionId: string, checked: boolean) => void
-} & FailureProps): React.JSX.Element {
-  const name = useWorkspaceName(group.workspaceId)
+} & FailureProps
+
+function WorkspaceCard({
+  node,
+  depth,
+  ...rowProps
+}: { node: ResumeWorkspaceNode; depth: number } & RowProps): React.JSX.Element {
+  const { group } = node
   const first = group.candidates[0]
-  const kind = first ? resumeWorkspaceKind(first) : 'git-worktree'
+  const hostId = first?.executionHostId
+  const worktree = useWorkspaceWorktree(group.workspaceId, hostId)
+  const repo = useAppStore((store) =>
+    worktree ? store.repos.find((entry) => entry.id === worktree.repoId) : undefined
+  )
+  const newCardStyle = useAppStore(
+    (store) => store.settings?.experimentalNewWorktreeCardStyle === true
+  )
+  const name = worktree?.displayName ?? group.workspaceId
   // Shown for every workspace, local included. The sidebar hides it on a single-host install; this
   // list is a one-off prompt with no surrounding context, so the machine is always worth naming.
-  const hostLabel = getHostContextLabel(first?.executionHostId ?? LOCAL_EXECUTION_HOST_ID)
+  const hostLabel = getHostContextLabel(hostId ?? LOCAL_EXECUTION_HOST_ID)
+  const { listedAt, busy, selected, onToggle, failureFor, onFailureAction } = rowProps
+  const rows = (
+    <ul className="flex flex-col">
+      {group.candidates.map((candidate) => (
+        <ResumeCandidateRow
+          key={candidate.sessionId}
+          candidate={candidate}
+          workspaceName={name}
+          listedAt={listedAt}
+          checked={selected.has(candidate.sessionId)}
+          disabled={busy}
+          onCheckedChange={(checked) => onToggle(candidate.sessionId, checked)}
+          failure={failureFor?.(candidate.sessionId)}
+          onFailureAction={onFailureAction}
+        />
+      ))}
+    </ul>
+  )
+  const geometry = getLineageNestedRowGeometry({
+    experimentalNewWorktreeCardStyle: newCardStyle,
+    inheritedCardContentIndent: 0,
+    lineageDepth: depth
+  })
+  const children = node.children.map((child) => (
+    <div
+      key={child.group.workspaceId}
+      style={geometry.surfaceInset > 0 ? { paddingLeft: geometry.surfaceInset } : undefined}
+    >
+      <WorkspaceCard node={child} depth={depth + 1} {...rowProps} />
+    </div>
+  ))
+
+  if (!worktree) {
+    const kind = first ? resumeWorkspaceKind(first) : 'git-worktree'
+    return (
+      <section className="flex flex-col gap-0.5">
+        <div className="flex items-center gap-1.5 px-0.5">
+          <WorkspaceKindGlyph kind={kind} />
+          <span className="min-w-0 truncate text-xs font-medium">{name}</span>
+          <WorktreeHostContextBadge label={hostLabel} />
+        </div>
+        <div className="pl-1">{rows}</div>
+        {children.length > 0 && <div className="flex flex-col gap-1 pl-3">{children}</div>}
+      </section>
+    )
+  }
+
   return (
-    <section className="flex flex-col gap-0.5">
-      <div className="flex items-center gap-1.5 px-0.5">
-        <WorkspaceKindGlyph kind={kind} />
-        <span className="min-w-0 truncate text-xs font-medium">{name}</span>
-        <WorktreeHostContextBadge label={hostLabel} />
-      </div>
-      <ul className="flex flex-col pl-1">
-        {group.candidates.map((candidate) => (
-          <ResumeCandidateRow
-            key={candidate.sessionId}
-            candidate={candidate}
-            workspaceName={name}
-            listedAt={listedAt}
-            checked={selected.has(candidate.sessionId)}
-            disabled={busy}
-            onCheckedChange={(checked) => onToggle(candidate.sessionId, checked)}
-            failure={failureFor?.(candidate.sessionId)}
-            onFailureAction={onFailureAction}
-          />
-        ))}
-      </ul>
-    </section>
+    <WorktreeCard
+      worktree={worktree}
+      repo={repo}
+      isActive={false}
+      isActiveSurface={false}
+      readOnly
+      // The repo header above already names it.
+      hideRepoBadge
+      hostContextLabel={hostLabel}
+      nativeDragEnabled={false}
+      flushSurface
+      contentIndent={geometry.cardContentIndent}
+      agentRows={rows}
+      lineageChildren={children.length > 0 ? children : undefined}
+      lineageChildrenStyle={
+        children.length > 0
+          ? getLineageChildrenInlineStyle(geometry.lineageChildrenInlineOffset)
+          : undefined
+      }
+    />
   )
 }
 
@@ -175,19 +260,21 @@ export function ResumeOnRestartGroups({
   selected: ReadonlySet<string>
   onToggle: (sessionId: string, checked: boolean) => void
 } & FailureProps): React.JSX.Element {
-  const workspaces = groupResumeCandidates(candidates)
-  const repoIdFor = useRepoIdByWorkspace(workspaces.map((group) => group.workspaceId))
+  const workspaces = useMemo(() => groupResumeCandidates(candidates), [candidates])
+  const repoIdFor = useRepoIdByWorkspace(workspaces)
+  const ancestorsOf = useLineageAncestors(workspaces)
   const repoGroups = groupResumeWorkspacesByRepo(workspaces, repoIdFor)
   return (
     <div className="flex flex-col gap-2.5">
       {repoGroups.map((repoGroup) => (
         <section key={repoGroup.repoId ?? 'no-repo'} className="flex flex-col gap-1">
           <RepoHeader repoId={repoGroup.repoId} />
-          <div className="flex flex-col gap-1.5 pl-2">
-            {repoGroup.workspaces.map((workspace) => (
-              <WorkspaceGroup
-                key={workspace.workspaceId}
-                group={workspace}
+          <div className="flex flex-col gap-1">
+            {nestResumeWorkspaces(repoGroup.workspaces, ancestorsOf).map((node) => (
+              <WorkspaceCard
+                key={node.group.workspaceId}
+                node={node}
+                depth={0}
                 listedAt={listedAt}
                 busy={busy}
                 selected={selected}
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index 4d7e7c8bfb7f..e3ed2b4d06c3 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -188,7 +188,8 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
     >
       {/* Height is capped, never the data: the list scrolls inside the dialog so the header and
           the primary action stay put however many chats were interrupted. */}
-      <DialogContent className="grid-rows-[auto_minmax(0,1fr)_auto_auto] sm:max-w-xl max-h-[85vh]">
+      {/* Wide enough for a sidebar card's chat row to keep its name, model and age on one line. */}
+      <DialogContent className="grid-rows-[auto_minmax(0,1fr)_auto] sm:max-w-3xl max-h-[85vh]">
         <DialogHeader>
           <DialogTitle>
             {/* Plain wrapper owns the icon spacing; DialogTitle owns its own. */}
@@ -219,7 +220,8 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
             'auto.components.NativeChatResumeOnRestartModal.listLabel',
             'Chats that would be resumed'
           )}
-          className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md border bg-muted/35 p-1.5"
+          // The sidebar's own surface, so its cards read here as they do there.
+          className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md border bg-worktree-sidebar p-1.5"
         >
           <ResumeOnRestartGroups
             candidates={rows}
@@ -232,32 +234,31 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
           />
         </div>
 
-        <label className="flex items-start gap-2.5">
-          <Checkbox
-            checked={dontAskAgain}
-            disabled={busy}
-            onCheckedChange={(next) => setDontAskAgain(next === true)}
-            className="mt-0.5"
-          />
-          <span className="min-w-0 space-y-0.5">
-            <span className="block text-sm">
-              {translate(
-                'auto.components.NativeChatResumeOnRestartModal.dontAskAgain',
-                "Don't ask again (resume automatically)"
-              )}
-            </span>
-            {/* Where to undo it; what it does is the body copy's job. */}
-            <span className="block text-xs text-muted-foreground">
-              {translate(
-                'auto.components.NativeChatResumeOnRestartModal.dontAskAgainHint',
-                'You can turn this off in Settings → Experimental → Chat UI.'
-              )}
-            </span>
-          </span>
-        </label>
-
         {/* Two controls: one deletes the offer, one acts on it. Closing snoozes, so it needs none. */}
-        <DialogFooter className="sm:justify-between">
+        <DialogFooter className="sm:items-center">
+          <label className="flex min-w-0 items-start gap-2.5 sm:mr-auto">
+            <Checkbox
+              checked={dontAskAgain}
+              disabled={busy}
+              onCheckedChange={(next) => setDontAskAgain(next === true)}
+              className="mt-0.5"
+            />
+            <span className="min-w-0 space-y-0.5">
+              <span className="block text-sm">
+                {translate(
+                  'auto.components.NativeChatResumeOnRestartModal.dontAskAgain',
+                  "Don't ask again (resume automatically)"
+                )}
+              </span>
+              {/* Where to undo it; what it does is the body copy's job. */}
+              <span className="block text-xs text-muted-foreground">
+                {translate(
+                  'auto.components.NativeChatResumeOnRestartModal.dontAskAgainHint',
+                  'You can turn this off in Settings → Experimental → Chat UI.'
+                )}
+              </span>
+            </span>
+          </label>
           {/* Quiet, explicit cleanup of the durable records. */}
           <Button variant="ghost" size="sm" disabled={busy} onClick={() => void dismissAll()}>
             {translate('auto.components.NativeChatResumeOnRestartModal.dismissAll', 'Dismiss all')}
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
index 9f8bcb17dcb8..79dc768bc58f 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
@@ -5,6 +5,7 @@ import {
   allResumeSessionIds,
   groupResumeCandidates,
   groupResumeWorkspacesByRepo,
+  nestResumeWorkspaces,
   resolveResumeGroupHeader,
   resumeWorkspaceKind,
   type ResumeCandidate
@@ -129,3 +130,32 @@ describe('naming the group header', () => {
     expect(header.kind).toBe('project')
   })
 })
+
+describe('nesting child workspaces', () => {
+  const group = (workspaceId: string) => ({ workspaceId, candidates: [] })
+  const shape = (nodes: ReturnType<typeof nestResumeWorkspaces>): unknown =>
+    nodes.map((node) => [node.group.workspaceId, shape(node.children)])
+
+  it('puts a child under its nearest listed ancestor, skipping one with nothing to resume', () => {
+    // grandchild -> child (not listed) -> parent
+    const ancestors: Record<string, string[]> = { grandchild: ['child', 'parent'], parent: [] }
+    const nested = nestResumeWorkspaces(
+      [group('grandchild'), group('other'), group('parent')],
+      (id) => ancestors[id] ?? []
+    )
+
+    expect(shape(nested)).toEqual([
+      ['other', []],
+      ['parent', [['grandchild', []]]]
+    ])
+  })
+
+  it('keeps a child whose ancestors are all unlisted at the top, in offer order', () => {
+    const nested = nestResumeWorkspaces([group('a'), group('b')], () => ['elsewhere'])
+
+    expect(shape(nested)).toEqual([
+      ['a', []],
+      ['b', []]
+    ])
+  })
+})
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
index 225ad6621ac6..bdbd52b5fa38 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
@@ -111,6 +111,39 @@ export function groupResumeWorkspacesByRepo(
   return [...groups.values()]
 }
 
+export type ResumeWorkspaceNode = {
+  group: ResumeWorkspaceGroup
+  children: ResumeWorkspaceNode[]
+}
+
+/**
+ * Nests each workspace under its nearest LISTED ancestor, as the sidebar nests child workspaces.
+ *
+ * `ancestorsOf` is nearest-first; an ancestor with nothing to resume is skipped, so its listed
+ * descendants attach to the next listed one up, or stay at the top. Offer order is kept.
+ */
+export function nestResumeWorkspaces(
+  workspaces: readonly ResumeWorkspaceGroup[],
+  ancestorsOf: (workspaceId: string) => readonly string[]
+): ResumeWorkspaceNode[] {
+  const nodes = new Map<string, ResumeWorkspaceNode>(
+    workspaces.map((group) => [group.workspaceId, { group, children: [] }])
+  )
+  const roots: ResumeWorkspaceNode[] = []
+  for (const node of nodes.values()) {
+    const parentId = ancestorsOf(node.group.workspaceId).find(
+      (id) => id !== node.group.workspaceId && nodes.has(id)
+    )
+    const parent = parentId === undefined ? undefined : nodes.get(parentId)
+    if (parent) {
+      parent.children.push(node)
+    } else {
+      roots.push(node)
+    }
+  }
+  return roots
+}
+
 export type ResumeGroupHeader =
   | { kind: 'repo'; name: string; repoIcon: RepoIcon | null }
   | { kind: 'project'; name: string }
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx
index e451ce5681fa..d778dc00b6d9 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx
@@ -324,3 +324,72 @@ describe('WorktreeCard affiliate list mode', () => {
     expect(container.querySelector('[data-worktree-unread-alert=""]')).not.toBeNull()
   })
 })
+
+describe('WorktreeCard read-only mode', () => {
+  let container: HTMLDivElement
+  let root: Root
+
+  beforeEach(() => {
+    container = document.createElement('div')
+    document.body.appendChild(container)
+    root = createRoot(container)
+    vi.clearAllMocks()
+    worktreeCardProperties = ['status', 'comment', 'inline-agents']
+    settings = null
+    sleepMocks.sleeping = false
+  })
+
+  afterEach(() => {
+    act(() => {
+      root.unmount()
+    })
+    container.remove()
+  })
+
+  function renderReadOnly(): HTMLElement | null {
+    act(() => {
+      root.render(
+        <WorktreeCard
+          worktree={makeWorktree()}
+          repo={makeRepo()}
+          isActive={false}
+          readOnly
+          hostContextLabel="Local Mac"
+          agentRows={<div data-testid="caller-rows" />}
+        />
+      )
+    })
+    return container.querySelector<HTMLElement>('[data-worktree-card-surface="true"]')
+  }
+
+  it('responds to nothing: no activation, rename, edit, drag or context menu', () => {
+    const surface = renderReadOnly()
+
+    act(() => {
+      surface?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
+      surface?.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }))
+    })
+
+    expect(testDoubles.activateWorktreeFromSidebar).not.toHaveBeenCalled()
+    expect(openModal).not.toHaveBeenCalled()
+    expect(surface?.getAttribute('draggable')).toBe('false')
+    expect(surface?.className).not.toContain('cursor-pointer')
+    expect(container.querySelector('[data-testid="context-menu-wrapper"]')).toBeNull()
+    expect(
+      container.querySelector('[data-testid="inline-rename"]')?.getAttribute('data-disabled')
+    ).toBe('true')
+  })
+
+  it("shows the caller's rows in place of the live agent list", () => {
+    renderReadOnly()
+
+    expect(container.querySelector('[data-testid="caller-rows"]')).not.toBeNull()
+    expect(container.querySelector('[data-testid="inline-agents"]')).toBeNull()
+  })
+
+  it('names the host even when the sidebar hides the host chip', () => {
+    renderReadOnly()
+
+    expect(container.textContent).toContain('Local Mac')
+  })
+})
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.tsx b/src/renderer/src/components/sidebar/WorktreeCard.tsx
index 38609994e8b4..d6147a780abb 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.tsx
@@ -40,6 +40,8 @@ const WorktreeCard = React.memo(function WorktreeCard({
   onLineageToggle,
   isLineageDropTarget = false,
   affiliateListMode = false,
+  readOnly = false,
+  agentRows,
   statusPrDisplay = null
 }: WorktreeCardProps): React.JSX.Element {
   const card = useWorktreeCardController({
@@ -74,7 +76,9 @@ const WorktreeCard = React.memo(function WorktreeCard({
     lineageChildrenStyle,
     onLineageToggle,
     isLineageDropTarget,
-    affiliateListMode,
+    affiliateListMode: affiliateListMode || readOnly,
+    readOnly,
+    agentRows,
     statusPrDisplay
   })
 
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
index 8a608f371252..95ecc7a18c25 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
@@ -39,7 +39,8 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
   const showAutomation = foundation.cardProps.includes('automation')
   const showCli = foundation.cardProps.includes('cli')
   const showComment = foundation.cardProps.includes('comment')
-  const showPorts = foundation.cardProps.includes('ports')
+  // Why: the ports trigger is a control, and live ports say nothing a read-only picture needs.
+  const showPorts = !props.readOnly && foundation.cardProps.includes('ports')
   const shouldRefreshHostedReview = foundation.newCardStyle ? showStatus : showPR
   const detailsHoverControl = useWorktreeCardDetailsHoverControl()
   const hoverDetailsOpen = detailsHoverControl.hoverOpen
@@ -111,6 +112,7 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
   const secondary = useWorktreeCardSecondaryDetails({
     worktree,
     repo,
+    readOnly: props.readOnly,
     statusPrDisplay: props.statusPrDisplay,
     showStatus,
     showIssue,
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
index 5718ad0f2d66..aa270f9c9346 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
@@ -19,6 +19,7 @@ type ReviewDetails = ReturnType<typeof useWorktreeCardReviewDetails>
 export function useWorktreeCardSecondaryDetails({
   worktree,
   repo,
+  readOnly,
   statusPrDisplay,
   showStatus,
   showIssue,
@@ -46,7 +47,7 @@ export function useWorktreeCardSecondaryDetails({
   openTaskPage,
   updateWorktreeMeta,
   settings
-}: Pick<WorktreeCardProps, 'worktree' | 'repo' | 'statusPrDisplay'> &
+}: Pick<WorktreeCardProps, 'worktree' | 'repo' | 'statusPrDisplay' | 'readOnly'> &
   Pick<
     Foundation,
     | 'cardProps'
@@ -88,7 +89,9 @@ export function useWorktreeCardSecondaryDetails({
   const metaAutomationProvenance = showAutomation ? worktree.automationProvenance : null
   const metaCliProvenance = showCli ? worktree.cliProvenance : null
   const metaComment = showComment ? hoverComment : null
-  const showInlineAgentList = cardProps.includes('inline-agents') && (newCardStyle || !compactCards)
+  // Why: live agent rows activate panes; a read-only card shows its caller's `agentRows` instead.
+  const showInlineAgentList =
+    !readOnly && cardProps.includes('inline-agents') && (newCardStyle || !compactCards)
   const compactInlineAgentRows = useWorktreeAgentRows(
     worktree.id,
     showInlineAgentList && agentActivityDisplayMode === 'compact'
diff --git a/src/renderer/src/components/sidebar/worktree-card-header.tsx b/src/renderer/src/components/sidebar/worktree-card-header.tsx
index 8fb715b01ca5..3693178f02fd 100644
--- a/src/renderer/src/components/sidebar/worktree-card-header.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-header.tsx
@@ -55,6 +55,7 @@ export function WorktreeCardHeader({
     worktree,
     repo,
     affiliateListMode,
+    readOnly,
     renameRowKey,
     compactCards,
     newCardStyle,
@@ -103,7 +104,8 @@ export function WorktreeCardHeader({
           </RepoIdentityChip>
         )}
 
-        {repo?.connectionId && (
+        {/* Why: this pill is a reconnect control; a read-only card names its host with the chip. */}
+        {repo?.connectionId && !readOnly && (
           <WorktreeCardSshHostControl
             targetId={repo.connectionId}
             targetLabel={sshTargetLabel || repo.displayName}
@@ -186,7 +188,8 @@ export function WorktreeCardHeader({
 
         {typeof worktree.firstAgentMessageRenameError === 'string' &&
         worktree.firstAgentMessageRenameError.length > 0 &&
-        !titleRenaming ? (
+        !titleRenaming &&
+        !readOnly ? (
           // Why: the error can be raw agent CLI output, so the badge opens a dialog rather than a tooltip.
           <Tooltip>
             <TooltipTrigger asChild>
diff --git a/src/renderer/src/components/sidebar/worktree-card-model.ts b/src/renderer/src/components/sidebar/worktree-card-model.ts
index 16219c5727dc..e3b53c95a3ce 100644
--- a/src/renderer/src/components/sidebar/worktree-card-model.ts
+++ b/src/renderer/src/components/sidebar/worktree-card-model.ts
@@ -52,6 +52,10 @@ export type WorktreeCardProps = {
   onCardDragEnd?: (event: React.DragEvent<HTMLDivElement>) => void
   nativeDragEnabled?: boolean
   affiliateListMode?: boolean
+  /** A static picture of the card for another surface: nothing on it responds, and `agentRows`
+   *  stands in for the live agent list. Implies everything `affiliateListMode` turns off. */
+  readOnly?: boolean
+  agentRows?: React.ReactNode
   statusPrDisplay?: WorktreeCardPrDisplay | null
 }
 
@@ -69,6 +73,7 @@ type DefaultedWorktreeCardProp =
   | 'lineageCollapsed'
   | 'isLineageDropTarget'
   | 'affiliateListMode'
+  | 'readOnly'
   | 'statusPrDisplay'
 
 export type ResolvedWorktreeCardProps = Omit<WorktreeCardProps, DefaultedWorktreeCardProp> & {
@@ -85,6 +90,7 @@ export type ResolvedWorktreeCardProps = Omit<WorktreeCardProps, DefaultedWorktre
   lineageCollapsed: boolean
   isLineageDropTarget: boolean
   affiliateListMode: boolean
+  readOnly: boolean
   statusPrDisplay: WorktreeCardPrDisplay | null
 }
 
diff --git a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
index 25376e330544..23f449a5c9a2 100644
--- a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
@@ -20,6 +20,8 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     hideRepoBadge,
     hostContextLabel,
     affiliateListMode,
+    readOnly,
+    agentRows,
     flushSurface,
     contentIndent,
     newCardStyle,
@@ -77,7 +79,9 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     showRepoIdentityInTitle && !!repo && !hideRepoBadge && !isFolder && !showPinnedRepoIcon
   const showRepoBadgeInMetaRow =
     !showRepoIdentityInTitle && !!repo && !hideRepoBadge && !showPinnedRepoIcon
-  const showHostContextBadge = !compactCards && !!hostContextLabel && cardProps.includes('host')
+  // Why: a read-only card stands alone on another surface, so the machine is always worth naming.
+  const showHostContextBadge =
+    !compactCards && !!hostContextLabel && (readOnly || cardProps.includes('host'))
   const showDetachedHeadInMetaRow = !compactCards && !isFolder && detachedHeadDisplay !== null
   const showBranch =
     !isFolder &&
@@ -127,7 +131,9 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
       ? trimmedVisibleCardTitle
       : undefined
   const hasHoverIdentity = Boolean(hoverWorkspaceTitle || hoverBranchName)
+  // Why: the details popover carries edit and open actions, so a read-only card never opens it.
   const hasHoverDetails =
+    !readOnly &&
     newCardStyle &&
     (hasWorktreeCardDetails({
       issue: hoverIssue,
@@ -145,7 +151,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     ? hasHoverDetails
       ? (title: React.ReactElement): React.ReactElement => title
       : undefined
-    : compactCards && (showBranchIdentityHover || hasDetails || hasPorts)
+    : !readOnly && compactCards && (showBranchIdentityHover || hasDetails || hasPorts)
       ? (title: React.ReactElement): React.ReactElement => (
           <WorktreeCardDetailsHover
             issue={metaIssue}
@@ -221,7 +227,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
       </div>
     ) : null
   const detailsAndPorts =
-    detailsAndPortsContent && !newCardStyle ? (
+    detailsAndPortsContent && !newCardStyle && !readOnly ? (
       <WorktreeCardDetailsHover
         issue={metaIssue}
         linearIssue={metaLinearIssue}
@@ -258,7 +264,11 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     <div className="ml-auto flex shrink-0 items-center gap-1 pr-1.5">{detailsAndPorts}</div>
   ) : null
   const hasSecondaryCardContent =
-    hasMetaRow || !!remoteBranchConflict || showInlineAgentList || showLineageChildChip
+    hasMetaRow ||
+    !!remoteBranchConflict ||
+    showInlineAgentList ||
+    showLineageChildChip ||
+    agentRows != null
   const titleOnlyCard = !hasSecondaryCardContent
 
   return {
diff --git a/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx b/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
index d661726c67fb..ca52983e896f 100644
--- a/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
@@ -22,6 +22,8 @@ export function WorktreeCardSecondaryRows({
     repo,
     settings,
     isActive,
+    readOnly,
+    agentRows,
     newCardStyle,
     lineageChildren,
     lineageCollapsed,
@@ -76,7 +78,7 @@ export function WorktreeCardSecondaryRows({
         </Tooltip>
       ) : null}
 
-      {isActive && worktree.linkedLinearIssue ? (
+      {isActive && !readOnly && worktree.linkedLinearIssue ? (
         <LinearAgentSkillSetupPrompt
           linked
           remote={Boolean(repo?.connectionId || settings?.activeRuntimeEnvironmentId?.trim())}
@@ -86,12 +88,16 @@ export function WorktreeCardSecondaryRows({
       ) : null}
 
       {/* Why: counterbalance the card stack gap (-mt-1) so agents right after the title read as one header group. */}
-      {showInlineAgentList && (
-        <WorktreeCardAgents
-          worktreeId={worktree.id}
-          agents={agentActivityDisplayMode === 'compact' ? compactInlineAgentRows : undefined}
-          className={hasMetaRow || remoteBranchConflict ? 'mt-0' : '-mt-1'}
-        />
+      {agentRows != null ? (
+        <div className={hasMetaRow || remoteBranchConflict ? 'mt-0' : '-mt-1'}>{agentRows}</div>
+      ) : (
+        showInlineAgentList && (
+          <WorktreeCardAgents
+            worktreeId={worktree.id}
+            agents={agentActivityDisplayMode === 'compact' ? compactInlineAgentRows : undefined}
+            className={hasMetaRow || remoteBranchConflict ? 'mt-0' : '-mt-1'}
+          />
+        )
       )}
 
       {showLineageChildChip && (
diff --git a/src/renderer/src/components/sidebar/worktree-card-surface.tsx b/src/renderer/src/components/sidebar/worktree-card-surface.tsx
index df0cd67b4120..869cf694da81 100644
--- a/src/renderer/src/components/sidebar/worktree-card-surface.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-surface.tsx
@@ -16,6 +16,7 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
     selectedWorktrees,
     onAssignWorkspaceStatus,
     affiliateListMode,
+    readOnly,
     isActiveSurface,
     activeSurfaceVariant,
     isMultiSelected,
@@ -48,7 +49,8 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
   const cardBody = (
     <div
       className={cn(
-        'relative flex cursor-pointer flex-col pr-1.5 transition-[background-color,border-color,opacity,box-shadow] duration-200 outline-none select-none',
+        'relative flex flex-col pr-1.5 transition-[background-color,border-color,opacity,box-shadow] duration-200 outline-none select-none',
+        !readOnly && 'cursor-pointer',
         titleOnlyCard ? 'py-2' : 'pt-1.25 pb-1.5',
         flushSurface ? 'ml-1 w-[calc(100%-0.25rem)]' : 'ml-1',
         'overflow-hidden rounded-lg',
@@ -60,7 +62,9 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
             ? 'border border-transparent'
             : isMultiSelected
               ? 'border border-worktree-sidebar-ring/35 bg-worktree-sidebar-accent/70 ring-1 ring-worktree-sidebar-ring/30'
-              : 'border border-transparent worktree-sidebar-card-hover',
+              : readOnly
+                ? 'border border-transparent'
+                : 'border border-transparent worktree-sidebar-card-hover',
         isActiveSurface && isMultiSelected && 'ring-1 ring-worktree-sidebar-ring/35',
         revealHighlight && [
           'scroll-to-current-workspace-reveal-highlight',
@@ -81,7 +85,7 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
         isActiveSurface && !isLineageDropTarget ? activeSurfaceVariant : undefined
       }
       data-worktree-lineage-drop-target={isLineageDropTarget || undefined}
-      onClick={handleClick}
+      onClick={readOnly ? undefined : handleClick}
       onDoubleClick={affiliateListMode ? undefined : handleDoubleClick}
       draggable={!affiliateListMode && nativeDragEnabled && !isDeleting && !titleRenaming}
       onDragStart={!affiliateListMode && nativeDragEnabled ? handleDragStart : undefined}

From b956288c2d7cbf0a3f8bd192aff28d5e1ef23364 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 11:30:08 -0700
Subject: [PATCH 02/37] test(native-chat): name the nesting helper for what it
 returns

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../native-chat-resume-on-restart-grouping.test.ts        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
index 79dc768bc58f..dd99bbeea63f 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
@@ -133,8 +133,8 @@ describe('naming the group header', () => {
 
 describe('nesting child workspaces', () => {
   const group = (workspaceId: string) => ({ workspaceId, candidates: [] })
-  const shape = (nodes: ReturnType<typeof nestResumeWorkspaces>): unknown =>
-    nodes.map((node) => [node.group.workspaceId, shape(node.children)])
+  const nestedWorkspaceIds = (nodes: ReturnType<typeof nestResumeWorkspaces>): unknown =>
+    nodes.map((node) => [node.group.workspaceId, nestedWorkspaceIds(node.children)])
 
   it('puts a child under its nearest listed ancestor, skipping one with nothing to resume', () => {
     // grandchild -> child (not listed) -> parent
@@ -144,7 +144,7 @@ describe('nesting child workspaces', () => {
       (id) => ancestors[id] ?? []
     )
 
-    expect(shape(nested)).toEqual([
+    expect(nestedWorkspaceIds(nested)).toEqual([
       ['other', []],
       ['parent', [['grandchild', []]]]
     ])
@@ -153,7 +153,7 @@ describe('nesting child workspaces', () => {
   it('keeps a child whose ancestors are all unlisted at the top, in offer order', () => {
     const nested = nestResumeWorkspaces([group('a'), group('b')], () => ['elsewhere'])
 
-    expect(shape(nested)).toEqual([
+    expect(nestedWorkspaceIds(nested)).toEqual([
       ['a', []],
       ['b', []]
     ])

From a27b59e1342a0ef605e472798b4feabf74fbd367 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 12:55:32 -0700
Subject: [PATCH 03/37] fix(native-chat): resume dialog cards show no status

The dialog's cards stand in for the chats before the restart, so the sidebar's live status
(Failed, now Interrupted) read as a verdict on chats the dialog offers to resume. A read-only
card shows no status, and in the new card style its PR joins the badges because the status
lane that normally holds it is gone.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../sidebar/WorktreeCard.affiliate-list-mode.test.tsx  | 10 ++++++++++
 .../components/sidebar/use-worktree-card-controller.ts |  6 ++++--
 .../sidebar/use-worktree-card-secondary-details.ts     |  6 +++++-
 .../components/sidebar/worktree-card-presentation.tsx  |  5 +++--
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx
index d778dc00b6d9..768477a5fe53 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx
@@ -387,6 +387,16 @@ describe('WorktreeCard read-only mode', () => {
     expect(container.querySelector('[data-testid="inline-agents"]')).toBeNull()
   })
 
+  it('shows no status, even with the status property on', () => {
+    for (const newCardStyle of [false, true]) {
+      settings = { experimentalNewWorktreeCardStyle: newCardStyle }
+      renderReadOnly()
+
+      expect(worktreeCardProperties).toContain('status')
+      expect(container.querySelector('[data-worktree-card-status-slot]')).toBeNull()
+    }
+  })
+
   it('names the host even when the sidebar hides the host chip', () => {
     renderReadOnly()
 
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
index 95ecc7a18c25..8ad09d33a766 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
@@ -31,7 +31,9 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     prDisplay: review.prDisplay
   })
 
-  const showStatus = foundation.cardProps.includes('status')
+  // Why: a read-only card stands in for another moment (e.g. before a restart), so the live status
+  // it would show belongs to now and would mislead there.
+  const showStatus = !props.readOnly && foundation.cardProps.includes('status')
   const showIssue = foundation.cardProps.includes('issue')
   const showLinearIssue = foundation.cardProps.includes('linear-issue')
   const showJiraIssue = foundation.cardProps.includes('jira-issue')
@@ -41,7 +43,7 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
   const showComment = foundation.cardProps.includes('comment')
   // Why: the ports trigger is a control, and live ports say nothing a read-only picture needs.
   const showPorts = !props.readOnly && foundation.cardProps.includes('ports')
-  const shouldRefreshHostedReview = foundation.newCardStyle ? showStatus : showPR
+  const shouldRefreshHostedReview = foundation.newCardStyle && !props.readOnly ? showStatus : showPR
   const detailsHoverControl = useWorktreeCardDetailsHoverControl()
   const hoverDetailsOpen = detailsHoverControl.hoverOpen
 
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
index aa270f9c9346..2e306c6eff71 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
@@ -230,11 +230,14 @@ export function useWorktreeCardSecondaryDetails({
     },
     [linearIssue, openTaskPage]
   )
+  // Why: the new card shows its review in the status lane; a read-only card has none, so its review
+  // joins the badges as in the legacy card.
+  const reviewInBadges = !newCardStyle || readOnly
   const hasDetails = hasWorktreeCardDetails({
     issue: metaIssue,
     linearIssue: metaLinearIssue,
     jiraIssue: metaJiraIssue,
-    review: newCardStyle ? null : metaReview,
+    review: reviewInBadges ? metaReview : null,
     comment: metaComment,
     automationProvenance: metaAutomationProvenance,
     cliProvenance: metaCliProvenance
@@ -260,6 +263,7 @@ export function useWorktreeCardSecondaryDetails({
     metaAutomationProvenance,
     metaCliProvenance,
     metaComment,
+    reviewInBadges,
     showInlineAgentList,
     compactInlineAgentRows,
     handleOpenGitHubIssueInOrca,
diff --git a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
index 23f449a5c9a2..2a2f01725bb7 100644
--- a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
@@ -68,7 +68,8 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     canUnlinkReview,
     handleUnlinkReview,
     detailsHoverControl,
-    showDeleteQuickAction
+    showDeleteQuickAction,
+    reviewInBadges
   } = card
 
   // Why: pinned trees mix repos, so the repo icon shows regardless of groupBy's hideRepoBadge.
@@ -217,7 +218,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
             issue={metaIssue}
             linearIssue={metaLinearIssue}
             jiraIssue={metaJiraIssue}
-            review={newCardStyle ? null : metaReview}
+            review={reviewInBadges ? metaReview : null}
             comment={metaComment}
             automationProvenance={metaAutomationProvenance}
             cliProvenance={metaCliProvenance}

From 0163c9c52a69d712166f438a0113d6ce2e174dc2 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 13:44:15 -0700
Subject: [PATCH 04/37] fix(sidebar): a read-only card is inert and shows no
 live state, whatever its caller passes

A read-only card stayed inert only because each control checked `readOnly` on its own and the
caller left out the handlers that would turn the rest on: passing `onLineageToggle` put a live
child-workspaces toggle on it. It also still painted live state over the resume dialog's chat
rows: the sleep dim, the "Queued for deletion" overlay (which blocked unticking a pre-ticked
chat) and the prompt-cache countdown.

WorktreeCard now reduces a read-only card's props to what it pictures (every handler, selection
and active flag dropped), and the controller resolves `readOnly` once into what the views
already read: card properties without status, ports or live agents (and with the host), no
sleep or delete state, no cache countdown, and one `interactive` flag for its own controls.
A contract test renders a read-only card with every feature and handler on in all three card
styles and fails on any control outside the caller's rows or any live state.
---
 .../activity/activity-thread-hover-card.tsx   |   2 +
 .../WorktreeCard.read-only-contract.test.tsx  | 318 ++++++++++++++++++
 .../src/components/sidebar/WorktreeCard.tsx   |  13 +-
 .../sidebar/use-worktree-card-controller.ts   |  55 +--
 ...ndary-details.store-subscriptions.test.tsx |   2 +
 .../use-worktree-card-secondary-details.ts    |  17 +-
 .../sidebar/worktree-card-header.tsx          |   6 +-
 .../components/sidebar/worktree-card-model.ts |  52 ++-
 .../sidebar/worktree-card-presentation.tsx    |  14 +-
 .../sidebar/worktree-card-secondary-rows.tsx  |   3 +-
 .../sidebar/worktree-card-surface.tsx         |  15 +-
 11 files changed, 441 insertions(+), 56 deletions(-)
 create mode 100644 src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx

diff --git a/src/renderer/src/components/activity/activity-thread-hover-card.tsx b/src/renderer/src/components/activity/activity-thread-hover-card.tsx
index 9bb4ed838871..1969ad34ba7a 100644
--- a/src/renderer/src/components/activity/activity-thread-hover-card.tsx
+++ b/src/renderer/src/components/activity/activity-thread-hover-card.tsx
@@ -129,6 +129,8 @@ function ActivityThreadHoverCardContent({
     worktree,
     repo: repo ?? undefined,
     statusPrDisplay: null,
+    reviewInBadges: !foundation.newCardStyle,
+    showCacheTimer: true,
     showStatus: true,
     showIssue: true,
     showLinearIssue: true,
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
new file mode 100644
index 000000000000..98220a688cd5
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
@@ -0,0 +1,318 @@
+// @vitest-environment happy-dom
+
+import { act, type ReactNode } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type { Repo } from '../../../../shared/repo-types'
+import type { WorktreeCardProperty } from '../../../../shared/ui-chrome-types'
+import type { Worktree } from '../../../../shared/worktree/types'
+import { issueCacheKey } from '@/store/github/cache-identity'
+import type WorktreeCardComponent from './WorktreeCard'
+
+const activateWorktreeFromSidebar = vi.hoisted(() => vi.fn())
+const callbacks = {
+  onActivate: vi.fn(),
+  onWorktreeCardClick: vi.fn(),
+  onImmediateActivate: vi.fn(),
+  onSelectionGesture: vi.fn(() => false),
+  onContextMenuSelect: vi.fn(() => []),
+  onAssignWorkspaceStatus: vi.fn(),
+  onCardDragStart: vi.fn(),
+  onCardDragEnd: vi.fn(),
+  onLineageToggle: vi.fn()
+}
+
+const ALL_CARD_PROPERTIES: WorktreeCardProperty[] = [
+  'status',
+  'unread',
+  'ci',
+  'branch',
+  'issue',
+  'linear-issue',
+  'jira-issue',
+  'pr',
+  'automation',
+  'cli',
+  'comment',
+  'ports',
+  'inline-agents',
+  'host'
+]
+
+let WorktreeCard: typeof WorktreeCardComponent
+let settings: Partial<GlobalSettings> = {}
+let deleteStateByWorktreeId: Record<string, unknown> = {}
+
+vi.mock('@/store', () => ({
+  useAppStore: (selector: (state: unknown) => unknown) =>
+    selector({
+      browserTabsByWorktree: {},
+      createBrowserTab: vi.fn(),
+      deleteFolderWorkspace: vi.fn(),
+      deleteStateByWorktreeId,
+      fetchHostedReviewForBranch: vi.fn(),
+      fetchIssue: vi.fn(),
+      fetchLinearIssue: vi.fn(),
+      gitConflictOperationByWorktree: {},
+      hostedReviewCache: {},
+      // Why a url: the details popovers only offer their open/copy actions for a linked item with one.
+      issueCache: {
+        [issueCacheKey(repo.path, repo.id, 7, settings, repo.connectionId, undefined, true)]: {
+          data: { number: 7, title: 'Issue', state: 'open', url: 'https://example.com/7' },
+          fetchedAt: Date.now()
+        }
+      },
+      linearIssueCache: {},
+      openModal: vi.fn(),
+      openTaskPage: vi.fn(),
+      projectGroups: [],
+      ptyIdsByTabId: {},
+      recordFeatureInteraction: vi.fn(),
+      remoteBranchConflictByWorktreeId: {},
+      removedSshTargetLabels: new Map(),
+      renamingWorktreeId: null,
+      runtimeEnvironments: [],
+      runtimeStatusByEnvironmentId: new Map(),
+      setActiveWorktree: vi.fn(),
+      setRenamingWorktreeId: vi.fn(),
+      settings,
+      sshConnectionStates: new Map([['ssh-target-1', { status: 'disconnected' }]]),
+      sshStateByEnvironment: new Map(),
+      sshTargetLabels: new Map([['ssh-target-1', 'Remote target']]),
+      sshTargetsHydrated: true,
+      tabsByWorktree: {},
+      updateWorktreeMeta: vi.fn(),
+      workspacePortScan: {
+        key: 'repo-1',
+        result: {
+          platform: 'darwin',
+          scannedAt: 1,
+          ports: [
+            {
+              id: '127.0.0.1:5173:1234',
+              bindHost: '127.0.0.1',
+              connectHost: '127.0.0.1',
+              port: 5173,
+              pid: 1234,
+              processName: 'node',
+              protocol: 'http',
+              kind: 'workspace',
+              owner: {
+                worktreeId: 'repo-1::/repo/worktrees/full',
+                repoId: 'repo-1',
+                displayName: 'Full',
+                path: '/repo/worktrees/full',
+                confidence: 'cwd'
+              }
+            }
+          ]
+        }
+      },
+      worktreesByRepo: {},
+      worktreeCardProperties: ALL_CARD_PROPERTIES
+    })
+}))
+
+// Why passthrough: popover and tooltip content then renders inline, so a hover that should not
+// exist on a read-only card puts its buttons in the DOM where the sweep sees them.
+vi.mock('@/components/ui/hover-card', () => ({
+  HoverCard: ({ children }: { children: ReactNode }) => <>{children}</>,
+  HoverCardContent: ({ children }: { children: ReactNode }) => <>{children}</>,
+  HoverCardTrigger: ({ children }: { children: ReactNode }) => <>{children}</>
+}))
+
+vi.mock('@/components/ui/tooltip', () => ({
+  Tooltip: ({ children }: { children: ReactNode }) => <>{children}</>,
+  TooltipContent: ({ children }: { children: ReactNode }) => <>{children}</>,
+  TooltipTrigger: ({ children }: { children: ReactNode }) => <>{children}</>
+}))
+
+vi.mock('@/lib/sidebar-worktree-activation', () => ({ activateWorktreeFromSidebar }))
+
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  getActiveRuntimeTarget: () => ({ kind: 'local' })
+}))
+
+vi.mock('./use-worktree-activity-status', () => ({
+  useWorktreeActivityStatus: () => 'working'
+}))
+
+vi.mock('./use-worktree-sleep-state', () => ({
+  useIsSleepingWorktree: () => true
+}))
+
+vi.mock('./CacheTimer', () => ({
+  default: () => <span data-testid="cache-timer" />,
+  usePromptCacheCountdownStartedAt: (_worktreeId: string, active = true) => (active ? 1 : null)
+}))
+
+vi.mock('./useWorktreeAgentRows', () => ({
+  useWorktreeAgentRows: () => []
+}))
+
+vi.mock('./WorktreeCardAgents', () => ({
+  default: () => <button type="button" data-testid="inline-agents" />
+}))
+
+vi.mock('./WorktreeContextMenu', () => ({
+  default: ({ children }: { children: ReactNode }) => (
+    <div data-testid="context-menu-wrapper">{children}</div>
+  ),
+  CLOSE_ALL_CONTEXT_MENUS_EVENT: 'orca:test-close-context-menus',
+  WORKTREE_CONTEXT_MENU_SCOPE_ATTR: 'data-orca-context-menu-scope',
+  WORKTREE_NATIVE_CONTEXT_MENU_ATTR: 'data-worktree-native-context-menu'
+}))
+
+const INTERACTIVE =
+  'button, a[href], input, textarea, select, [tabindex]:not([tabindex="-1"]), [role="button"], [draggable="true"]'
+
+const CARD_STYLES: { name: string; settings: Partial<GlobalSettings> }[] = [
+  { name: 'legacy', settings: { promptCacheTimerEnabled: true } },
+  { name: 'compact', settings: { compactWorktreeCards: true, promptCacheTimerEnabled: true } },
+  {
+    name: 'new',
+    settings: { experimentalNewWorktreeCardStyle: true, promptCacheTimerEnabled: true }
+  }
+]
+
+const repo: Repo = {
+  id: 'repo-1',
+  path: '/repo',
+  displayName: 'orca',
+  badgeColor: '#999999',
+  addedAt: 1,
+  connectionId: 'ssh-target-1'
+}
+
+const worktree: Worktree = {
+  id: 'repo-1::/repo/worktrees/full',
+  repoId: 'repo-1',
+  path: '/repo/worktrees/full',
+  displayName: 'Full',
+  branch: 'refs/heads/full',
+  head: 'abc123',
+  isBare: false,
+  isMainWorktree: false,
+  comment: 'a comment',
+  linkedIssue: 7,
+  linkedPR: 42,
+  linkedLinearIssue: 'ENG-1',
+  linkedGitLabMR: null,
+  linkedGitLabIssue: null,
+  firstAgentMessageRenameError: 'agent CLI said no',
+  isArchived: false,
+  isUnread: true,
+  isPinned: false,
+  sortOrder: 0,
+  lastActivityAt: 1
+}
+
+describe('WorktreeCard read-only contract', () => {
+  let container: HTMLDivElement
+  let root: Root
+
+  beforeAll(async () => {
+    WorktreeCard = (await import('./WorktreeCard')).default
+  }, 20_000)
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    deleteStateByWorktreeId = {}
+    container = document.createElement('div')
+    document.body.appendChild(container)
+    root = createRoot(container)
+  })
+
+  afterEach(() => {
+    act(() => root.unmount())
+    container.remove()
+  })
+
+  /** Every feature on and every handler passed, so only the card itself can keep it inert. */
+  function render(readOnly: boolean): HTMLElement {
+    act(() => {
+      root.render(
+        <WorktreeCard
+          worktree={worktree}
+          repo={repo}
+          isActive
+          isActiveSurface
+          isMultiSelected
+          selectedWorktrees={[worktree]}
+          revealHighlight
+          isLineageDropTarget
+          activationRowKey="row"
+          renameRowKey="row"
+          hostContextLabel="Remote target"
+          flushSurface
+          nativeDragEnabled
+          lineageChildCount={2}
+          lineageChildren={<span>children</span>}
+          readOnly={readOnly}
+          agentRows={
+            <div data-testid="caller-rows">
+              <button type="button">chat</button>
+            </div>
+          }
+          {...callbacks}
+        />
+      )
+    })
+    const surface = container.querySelector<HTMLElement>('[data-worktree-card-surface="true"]')
+    if (!surface) {
+      throw new Error('card did not render')
+    }
+    return surface
+  }
+
+  function controlsOutsideCallerRows(): string[] {
+    return [...container.querySelectorAll(INTERACTIVE)]
+      .filter((element) => !element.closest('[data-testid="caller-rows"]'))
+      .map((element) => element.getAttribute('aria-label') ?? element.outerHTML.slice(0, 80))
+  }
+
+  function liveState(): string[] {
+    return [
+      container.querySelector('[data-worktree-card-status-slot]') && 'status',
+      container.querySelector('[data-worktree-sleeping-dim]') && 'sleep dim',
+      container.querySelector('[data-testid="cache-timer"]') && 'cache countdown',
+      container.textContent?.includes('Queued for deletion') && 'delete overlay'
+    ].filter((entry): entry is string => typeof entry === 'string')
+  }
+
+  for (const style of CARD_STYLES) {
+    it(`${style.name} card: the same fixture is live without readOnly`, () => {
+      settings = style.settings
+      render(false)
+      expect(controlsOutsideCallerRows().length).toBeGreaterThan(0)
+      expect(liveState()).toContain('status')
+      deleteStateByWorktreeId = { [worktree.id]: { isDeleting: true, phase: 'queued' } }
+      render(false)
+      expect(liveState()).toContain('delete overlay')
+    })
+
+    it(`${style.name} card: read-only has no control outside the caller's rows and no live state`, () => {
+      settings = style.settings
+      for (const deleting of [false, true]) {
+        deleteStateByWorktreeId = deleting
+          ? { [worktree.id]: { isDeleting: true, phase: 'queued' } }
+          : {}
+        const surface = render(true)
+        act(() => {
+          surface.dispatchEvent(new MouseEvent('click', { bubbles: true }))
+          surface.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }))
+        })
+
+        expect(controlsOutsideCallerRows()).toEqual([])
+        expect(liveState()).toEqual([])
+        expect(container.querySelector('[data-testid="context-menu-wrapper"]')).toBeNull()
+        expect(surface.getAttribute('data-worktree-card-active')).toBeNull()
+        expect(activateWorktreeFromSidebar).not.toHaveBeenCalled()
+        for (const callback of Object.values(callbacks)) {
+          expect(callback).not.toHaveBeenCalled()
+        }
+      }
+    })
+  }
+})
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.tsx b/src/renderer/src/components/sidebar/WorktreeCard.tsx
index d6147a780abb..396692f7436d 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.tsx
@@ -1,7 +1,11 @@
 import React from 'react'
 
 import { WorktreeCardSurface } from './worktree-card-surface'
-import type { WorktreeCardProps } from './worktree-card-model'
+import {
+  toReadOnlyCardProps,
+  type ResolvedWorktreeCardProps,
+  type WorktreeCardProps
+} from './worktree-card-model'
 import { useWorktreeCardController } from './use-worktree-card-controller'
 
 export { shouldBeginWorktreeRename } from './worktree-card-model'
@@ -44,7 +48,7 @@ const WorktreeCard = React.memo(function WorktreeCard({
   agentRows,
   statusPrDisplay = null
 }: WorktreeCardProps): React.JSX.Element {
-  const card = useWorktreeCardController({
+  const props: ResolvedWorktreeCardProps = {
     worktree,
     repo,
     isActive,
@@ -76,11 +80,12 @@ const WorktreeCard = React.memo(function WorktreeCard({
     lineageChildrenStyle,
     onLineageToggle,
     isLineageDropTarget,
-    affiliateListMode: affiliateListMode || readOnly,
+    affiliateListMode,
     readOnly,
     agentRows,
     statusPrDisplay
-  })
+  }
+  const card = useWorktreeCardController(readOnly ? toReadOnlyCardProps(props) : props)
 
   return <WorktreeCardSurface card={card} />
 })
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
index 8ad09d33a766..33c1de63c6df 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
@@ -1,6 +1,8 @@
+import { useMemo } from 'react'
+
 import { canShowWorkspaceDeleteQuickAction } from './workspace-delete-quick-action'
 import { useWorktreeCardDetailsHoverControl } from './worktree-card-details-hover-state'
-import type { ResolvedWorktreeCardProps } from './worktree-card-model'
+import { getReadOnlyCardProperties, type ResolvedWorktreeCardProps } from './worktree-card-model'
 import { useWorktreeCardActivationActions } from './use-worktree-card-activation-actions'
 import { useWorktreeCardFoundation } from './use-worktree-card-foundation'
 import { useWorktreeCardLifecycleEffects } from './use-worktree-card-lifecycle-effects'
@@ -8,22 +10,34 @@ import { useWorktreeCardLinkedDetails } from './use-worktree-card-linked-details
 import { useWorktreeCardReviewDetails } from './use-worktree-card-review-details'
 import { useWorktreeCardSecondaryDetails } from './use-worktree-card-secondary-details'
 import { useWorktreeCardWorkspaceActions } from './use-worktree-card-workspace-actions'
+import { useIsSleepingWorktree } from './use-worktree-sleep-state'
 
 export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
-  const { worktree, repo } = props
+  const { worktree, repo, readOnly } = props
   const foundation = useWorktreeCardFoundation({ worktree, repo })
+  // Why: the only read of `readOnly` past toReadOnlyCardProps; views see the outcome, never the flag.
+  // A read-only card loses its own controls and the live state that belongs to now, not the picture.
+  const interactive = !readOnly
+  const cardProps = useMemo(
+    () => (readOnly ? getReadOnlyCardProperties(foundation.cardProps) : foundation.cardProps),
+    [readOnly, foundation.cardProps]
+  )
+  const isSleeping = useIsSleepingWorktree(worktree.id) && !readOnly
+  const deleteState = readOnly ? undefined : foundation.deleteState
+  // Why: the new card shows its review in the status lane, which a read-only card lacks.
+  const reviewInBadges = !foundation.newCardStyle || readOnly
   const review = useWorktreeCardReviewDetails({
     worktree,
     repo,
     settings: foundation.settings,
     projectGroups: foundation.projectGroups,
-    cardProps: foundation.cardProps,
+    cardProps,
     newCardStyle: foundation.newCardStyle
   })
   const linked = useWorktreeCardLinkedDetails({
     worktree,
     newCardStyle: foundation.newCardStyle,
-    deleteState: foundation.deleteState,
+    deleteState,
     branch: review.branch,
     issueEntry: review.issueEntry,
     linearIssueEntry: review.linearIssueEntry,
@@ -31,19 +45,16 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     prDisplay: review.prDisplay
   })
 
-  // Why: a read-only card stands in for another moment (e.g. before a restart), so the live status
-  // it would show belongs to now and would mislead there.
-  const showStatus = !props.readOnly && foundation.cardProps.includes('status')
-  const showIssue = foundation.cardProps.includes('issue')
-  const showLinearIssue = foundation.cardProps.includes('linear-issue')
-  const showJiraIssue = foundation.cardProps.includes('jira-issue')
-  const showPR = foundation.cardProps.includes('pr')
-  const showAutomation = foundation.cardProps.includes('automation')
-  const showCli = foundation.cardProps.includes('cli')
-  const showComment = foundation.cardProps.includes('comment')
-  // Why: the ports trigger is a control, and live ports say nothing a read-only picture needs.
-  const showPorts = !props.readOnly && foundation.cardProps.includes('ports')
-  const shouldRefreshHostedReview = foundation.newCardStyle && !props.readOnly ? showStatus : showPR
+  const showStatus = cardProps.includes('status')
+  const showIssue = cardProps.includes('issue')
+  const showLinearIssue = cardProps.includes('linear-issue')
+  const showJiraIssue = cardProps.includes('jira-issue')
+  const showPR = cardProps.includes('pr')
+  const showAutomation = cardProps.includes('automation')
+  const showCli = cardProps.includes('cli')
+  const showComment = cardProps.includes('comment')
+  const showPorts = cardProps.includes('ports')
+  const shouldRefreshHostedReview = reviewInBadges ? showPR : showStatus
   const detailsHoverControl = useWorktreeCardDetailsHoverControl()
   const hoverDetailsOpen = detailsHoverControl.hoverOpen
 
@@ -114,8 +125,9 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
   const secondary = useWorktreeCardSecondaryDetails({
     worktree,
     repo,
-    readOnly: props.readOnly,
     statusPrDisplay: props.statusPrDisplay,
+    reviewInBadges,
+    showCacheTimer: !readOnly,
     showStatus,
     showIssue,
     showLinearIssue,
@@ -134,7 +146,7 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     linkedBitbucketPR: review.linkedBitbucketPR,
     linkedAzureDevOpsPR: review.linkedAzureDevOpsPR,
     linkedGiteaPR: review.linkedGiteaPR,
-    cardProps: foundation.cardProps,
+    cardProps,
     newCardStyle: foundation.newCardStyle,
     compactCards: foundation.compactCards,
     agentActivityDisplayMode: foundation.agentActivityDisplayMode,
@@ -147,6 +159,11 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
   return {
     ...props,
     ...foundation,
+    cardProps,
+    deleteState,
+    interactive,
+    isSleeping,
+    reviewInBadges,
     ...review,
     ...linked,
     detailsHoverControl,
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx
index 7bb7bc05e0e5..f3784ccf7fe4 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx
+++ b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx
@@ -75,6 +75,8 @@ function secondaryDetailsArgs(settings: GlobalSettings) {
     worktree: makeWorktree(),
     repo: undefined,
     statusPrDisplay: null,
+    reviewInBadges: true,
+    showCacheTimer: true,
     showStatus: false,
     showIssue: false,
     showLinearIssue: false,
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
index 2e306c6eff71..6a3f2ca368f1 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
@@ -19,8 +19,9 @@ type ReviewDetails = ReturnType<typeof useWorktreeCardReviewDetails>
 export function useWorktreeCardSecondaryDetails({
   worktree,
   repo,
-  readOnly,
   statusPrDisplay,
+  reviewInBadges,
+  showCacheTimer,
   showStatus,
   showIssue,
   showLinearIssue,
@@ -47,7 +48,7 @@ export function useWorktreeCardSecondaryDetails({
   openTaskPage,
   updateWorktreeMeta,
   settings
-}: Pick<WorktreeCardProps, 'worktree' | 'repo' | 'statusPrDisplay' | 'readOnly'> &
+}: Pick<WorktreeCardProps, 'worktree' | 'repo' | 'statusPrDisplay'> &
   Pick<
     Foundation,
     | 'cardProps'
@@ -64,6 +65,8 @@ export function useWorktreeCardSecondaryDetails({
     ReviewDetails,
     'prDisplay' | 'linkedGitLabMR' | 'linkedBitbucketPR' | 'linkedAzureDevOpsPR' | 'linkedGiteaPR'
   > & {
+    reviewInBadges: boolean
+    showCacheTimer: boolean
     showStatus: boolean
     showIssue: boolean
     showLinearIssue: boolean
@@ -89,9 +92,7 @@ export function useWorktreeCardSecondaryDetails({
   const metaAutomationProvenance = showAutomation ? worktree.automationProvenance : null
   const metaCliProvenance = showCli ? worktree.cliProvenance : null
   const metaComment = showComment ? hoverComment : null
-  // Why: live agent rows activate panes; a read-only card shows its caller's `agentRows` instead.
-  const showInlineAgentList =
-    !readOnly && cardProps.includes('inline-agents') && (newCardStyle || !compactCards)
+  const showInlineAgentList = cardProps.includes('inline-agents') && (newCardStyle || !compactCards)
   const compactInlineAgentRows = useWorktreeAgentRows(
     worktree.id,
     showInlineAgentList && agentActivityDisplayMode === 'compact'
@@ -100,7 +101,7 @@ export function useWorktreeCardSecondaryDetails({
     showInlineAgentList &&
     agentActivityDisplayMode === 'compact' &&
     compactInlineAgentRows.length > 0
-  const showAggregateCacheTimer = !compactCards && !compactInlineAgentRowsVisible
+  const showAggregateCacheTimer = showCacheTimer && !compactCards && !compactInlineAgentRowsVisible
   const handleOpenGitHubIssueInOrca = useCallback(
     (e: React.MouseEvent) => {
       e.stopPropagation()
@@ -230,9 +231,6 @@ export function useWorktreeCardSecondaryDetails({
     },
     [linearIssue, openTaskPage]
   )
-  // Why: the new card shows its review in the status lane; a read-only card has none, so its review
-  // joins the badges as in the legacy card.
-  const reviewInBadges = !newCardStyle || readOnly
   const hasDetails = hasWorktreeCardDetails({
     issue: metaIssue,
     linearIssue: metaLinearIssue,
@@ -263,7 +261,6 @@ export function useWorktreeCardSecondaryDetails({
     metaAutomationProvenance,
     metaCliProvenance,
     metaComment,
-    reviewInBadges,
     showInlineAgentList,
     compactInlineAgentRows,
     handleOpenGitHubIssueInOrca,
diff --git a/src/renderer/src/components/sidebar/worktree-card-header.tsx b/src/renderer/src/components/sidebar/worktree-card-header.tsx
index 3693178f02fd..55bf692732ce 100644
--- a/src/renderer/src/components/sidebar/worktree-card-header.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-header.tsx
@@ -55,7 +55,7 @@ export function WorktreeCardHeader({
     worktree,
     repo,
     affiliateListMode,
-    readOnly,
+    interactive,
     renameRowKey,
     compactCards,
     newCardStyle,
@@ -105,7 +105,7 @@ export function WorktreeCardHeader({
         )}
 
         {/* Why: this pill is a reconnect control; a read-only card names its host with the chip. */}
-        {repo?.connectionId && !readOnly && (
+        {repo?.connectionId && interactive && (
           <WorktreeCardSshHostControl
             targetId={repo.connectionId}
             targetLabel={sshTargetLabel || repo.displayName}
@@ -189,7 +189,7 @@ export function WorktreeCardHeader({
         {typeof worktree.firstAgentMessageRenameError === 'string' &&
         worktree.firstAgentMessageRenameError.length > 0 &&
         !titleRenaming &&
-        !readOnly ? (
+        interactive ? (
           // Why: the error can be raw agent CLI output, so the badge opens a dialog rather than a tooltip.
           <Tooltip>
             <TooltipTrigger asChild>
diff --git a/src/renderer/src/components/sidebar/worktree-card-model.ts b/src/renderer/src/components/sidebar/worktree-card-model.ts
index e3b53c95a3ce..5b62faa1557e 100644
--- a/src/renderer/src/components/sidebar/worktree-card-model.ts
+++ b/src/renderer/src/components/sidebar/worktree-card-model.ts
@@ -1,6 +1,7 @@
 import type React from 'react'
 
 import type { Repo } from '../../../../shared/repo-types'
+import type { WorktreeCardProperty } from '../../../../shared/ui-chrome-types'
 import type { WorkspaceStatus, Worktree } from '../../../../shared/worktree/types'
 import type { WorktreeCardPrDisplay } from './worktree-card-pr-display'
 
@@ -52,8 +53,8 @@ export type WorktreeCardProps = {
   onCardDragEnd?: (event: React.DragEvent<HTMLDivElement>) => void
   nativeDragEnabled?: boolean
   affiliateListMode?: boolean
-  /** A static picture of the card for another surface: nothing on it responds, and `agentRows`
-   *  stands in for the live agent list. Implies everything `affiliateListMode` turns off. */
+  /** A static picture of the card for another surface: nothing on it responds, it shows no live
+   *  state, and `agentRows` stands in for the live agent list. See `toReadOnlyCardProps`. */
   readOnly?: boolean
   agentRows?: React.ReactNode
   statusPrDisplay?: WorktreeCardPrDisplay | null
@@ -94,6 +95,53 @@ export type ResolvedWorktreeCardProps = Omit<WorktreeCardProps, DefaultedWorktre
   statusPrDisplay: WorktreeCardPrDisplay | null
 }
 
+/**
+ * What a read-only card keeps of its props: only what it pictures. Every handler, selection and
+ * active flag is dropped here, so a caller cannot make one live by passing it.
+ */
+export function toReadOnlyCardProps(props: ResolvedWorktreeCardProps): ResolvedWorktreeCardProps {
+  return {
+    worktree: props.worktree,
+    repo: props.repo,
+    hideRepoBadge: props.hideRepoBadge,
+    hostContextLabel: props.hostContextLabel,
+    inPinnedSection: props.inPinnedSection,
+    contentIndent: props.contentIndent,
+    flushSurface: props.flushSurface,
+    lineageChildren: props.lineageChildren,
+    lineageChildrenStyle: props.lineageChildrenStyle,
+    agentRows: props.agentRows,
+    isActive: false,
+    isActiveSurface: false,
+    activeSurfaceVariant: 'primary',
+    isMultiSelected: false,
+    revealHighlight: false,
+    revealHighlightTone: 'default',
+    nativeDragEnabled: false,
+    lineageChildCount: 0,
+    lineageCollapsed: false,
+    isLineageDropTarget: false,
+    affiliateListMode: true,
+    readOnly: true,
+    statusPrDisplay: null
+  }
+}
+
+// Why: these show the workspace as it is now, which misleads on a picture of another moment; and
+// with no sidebar around it, the host is always worth naming.
+const READ_ONLY_HIDDEN_CARD_PROPERTIES = new Set<WorktreeCardProperty>([
+  'status',
+  'ports',
+  'inline-agents'
+])
+
+export function getReadOnlyCardProperties(
+  cardProps: readonly WorktreeCardProperty[]
+): WorktreeCardProperty[] {
+  const kept = cardProps.filter((property) => !READ_ONLY_HIDDEN_CARD_PROPERTIES.has(property))
+  return kept.includes('host') ? kept : [...kept, 'host']
+}
+
 export const EMPTY_WORKSPACE_PORTS = []
 export const HOSTED_REVIEW_CARD_REFRESH_INTERVAL_MS = 60_000
 
diff --git a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
index 2a2f01725bb7..30b61d41b10b 100644
--- a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
@@ -20,7 +20,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     hideRepoBadge,
     hostContextLabel,
     affiliateListMode,
-    readOnly,
+    interactive,
     agentRows,
     flushSurface,
     contentIndent,
@@ -80,9 +80,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     showRepoIdentityInTitle && !!repo && !hideRepoBadge && !isFolder && !showPinnedRepoIcon
   const showRepoBadgeInMetaRow =
     !showRepoIdentityInTitle && !!repo && !hideRepoBadge && !showPinnedRepoIcon
-  // Why: a read-only card stands alone on another surface, so the machine is always worth naming.
-  const showHostContextBadge =
-    !compactCards && !!hostContextLabel && (readOnly || cardProps.includes('host'))
+  const showHostContextBadge = !compactCards && !!hostContextLabel && cardProps.includes('host')
   const showDetachedHeadInMetaRow = !compactCards && !isFolder && detachedHeadDisplay !== null
   const showBranch =
     !isFolder &&
@@ -132,9 +130,9 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
       ? trimmedVisibleCardTitle
       : undefined
   const hasHoverIdentity = Boolean(hoverWorkspaceTitle || hoverBranchName)
-  // Why: the details popover carries edit and open actions, so a read-only card never opens it.
+  // Why: the details popover carries edit and open actions, so only an interactive card opens it.
   const hasHoverDetails =
-    !readOnly &&
+    interactive &&
     newCardStyle &&
     (hasWorktreeCardDetails({
       issue: hoverIssue,
@@ -152,7 +150,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     ? hasHoverDetails
       ? (title: React.ReactElement): React.ReactElement => title
       : undefined
-    : !readOnly && compactCards && (showBranchIdentityHover || hasDetails || hasPorts)
+    : interactive && compactCards && (showBranchIdentityHover || hasDetails || hasPorts)
       ? (title: React.ReactElement): React.ReactElement => (
           <WorktreeCardDetailsHover
             issue={metaIssue}
@@ -228,7 +226,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
       </div>
     ) : null
   const detailsAndPorts =
-    detailsAndPortsContent && !newCardStyle && !readOnly ? (
+    detailsAndPortsContent && !newCardStyle && interactive ? (
       <WorktreeCardDetailsHover
         issue={metaIssue}
         linearIssue={metaLinearIssue}
diff --git a/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx b/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
index ca52983e896f..496a7508423c 100644
--- a/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
@@ -22,7 +22,6 @@ export function WorktreeCardSecondaryRows({
     repo,
     settings,
     isActive,
-    readOnly,
     agentRows,
     newCardStyle,
     lineageChildren,
@@ -78,7 +77,7 @@ export function WorktreeCardSecondaryRows({
         </Tooltip>
       ) : null}
 
-      {isActive && !readOnly && worktree.linkedLinearIssue ? (
+      {isActive && worktree.linkedLinearIssue ? (
         <LinearAgentSkillSetupPrompt
           linked
           remote={Boolean(repo?.connectionId || settings?.activeRuntimeEnvironmentId?.trim())}
diff --git a/src/renderer/src/components/sidebar/worktree-card-surface.tsx b/src/renderer/src/components/sidebar/worktree-card-surface.tsx
index 869cf694da81..816e095eb267 100644
--- a/src/renderer/src/components/sidebar/worktree-card-surface.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-surface.tsx
@@ -4,7 +4,6 @@ import { LoaderCircle } from 'lucide-react'
 import { cn } from '@/lib/utils'
 import { AutoRenameFailedDialog } from './AutoRenameFailedDialog'
 import WorktreeContextMenu from './WorktreeContextMenu'
-import { useIsSleepingWorktree } from './use-worktree-sleep-state'
 import { WorktreeCardParentContent } from './worktree-card-parent-content'
 import { buildWorktreeCardPresentation } from './worktree-card-presentation'
 import type { WorktreeCardController } from './use-worktree-card-controller'
@@ -16,7 +15,7 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
     selectedWorktrees,
     onAssignWorkspaceStatus,
     affiliateListMode,
-    readOnly,
+    interactive,
     isActiveSurface,
     activeSurfaceVariant,
     isMultiSelected,
@@ -30,6 +29,7 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
     newCardStyle,
     titleRenaming,
     isDeleting,
+    isSleeping,
     isRuntimeDisconnected,
     isQueuedForDeletion,
     deleteLabel,
@@ -42,7 +42,6 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
     setShowRenameErrorDialog
   } = card
   const { titleOnlyCard, cardStyle } = presentation
-  const isSleeping = useIsSleepingWorktree(worktree.id)
 
   const parentCardContent = <WorktreeCardParentContent card={card} presentation={presentation} />
 
@@ -50,7 +49,7 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
     <div
       className={cn(
         'relative flex flex-col pr-1.5 transition-[background-color,border-color,opacity,box-shadow] duration-200 outline-none select-none',
-        !readOnly && 'cursor-pointer',
+        interactive && 'cursor-pointer',
         titleOnlyCard ? 'py-2' : 'pt-1.25 pb-1.5',
         flushSurface ? 'ml-1 w-[calc(100%-0.25rem)]' : 'ml-1',
         'overflow-hidden rounded-lg',
@@ -62,9 +61,9 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
             ? 'border border-transparent'
             : isMultiSelected
               ? 'border border-worktree-sidebar-ring/35 bg-worktree-sidebar-accent/70 ring-1 ring-worktree-sidebar-ring/30'
-              : readOnly
-                ? 'border border-transparent'
-                : 'border border-transparent worktree-sidebar-card-hover',
+              : interactive
+                ? 'border border-transparent worktree-sidebar-card-hover'
+                : 'border border-transparent',
         isActiveSurface && isMultiSelected && 'ring-1 ring-worktree-sidebar-ring/35',
         revealHighlight && [
           'scroll-to-current-workspace-reveal-highlight',
@@ -85,7 +84,7 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
         isActiveSurface && !isLineageDropTarget ? activeSurfaceVariant : undefined
       }
       data-worktree-lineage-drop-target={isLineageDropTarget || undefined}
-      onClick={readOnly ? undefined : handleClick}
+      onClick={interactive ? handleClick : undefined}
       onDoubleClick={affiliateListMode ? undefined : handleDoubleClick}
       draggable={!affiliateListMode && nativeDragEnabled && !isDeleting && !titleRenaming}
       onDragStart={!affiliateListMode && nativeDragEnabled ? handleDragStart : undefined}

From fd3cbbe907ee91abb9a7cfded04ff436494a30e7 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 13:44:26 -0700
Subject: [PATCH 05/37] fix(native-chat): nest and indent the resume dialog's
 child workspaces as the sidebar does

A child workspace whose parent has older metadata with no host id stayed at the top of the
dialog, though the sidebar nests it: the dialog copied a strict same-host filter, while the
sidebar treats a hostless row as belonging to the host. The nesting rule now lives in one
sidebar lineage helper, getWorktreeLineageAncestorsOnHost, which scopes by host the way the
sidebar's lineage inputs do.

In the legacy card style a nested child was inset for its parent's depth instead of its own,
so it sat one sidebar step too far left (0px instead of 14px), outdented into the parent's
padding. Each child is now inset for its own depth, as a sidebar row is.

A groups-level test renders real sidebar cards from the store, with the child nested under a
hostless parent, and checks every offered chat's checkbox renders and the legacy inset.
---
 .../NativeChatResumeOnRestartGroups.test.tsx  | 141 ++++++++++++++++++
 .../NativeChatResumeOnRestartGroups.tsx       |  53 +++----
 .../sidebar/worktree-lineage-projection.ts    |  19 +++
 3 files changed, 181 insertions(+), 32 deletions(-)
 create mode 100644 src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
new file mode 100644
index 000000000000..010fa0124630
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -0,0 +1,141 @@
+// @vitest-environment happy-dom
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it } from 'vitest'
+import { useAppStore } from '../store'
+import { getDefaultSettings } from '../../../shared/constants'
+import type { Worktree } from '../../../shared/worktree/types'
+import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
+import { TooltipProvider } from './ui/tooltip'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+let root: Root
+let container: HTMLDivElement
+
+function worktree(name: string, overrides: Partial<Worktree> = {}): Worktree {
+  return {
+    id: `repo-1::/repo/${name}`,
+    instanceId: `instance-${name}`,
+    repoId: 'repo-1',
+    path: `/repo/${name}`,
+    displayName: name,
+    branch: `refs/heads/${name}`,
+    head: 'abc123',
+    isBare: false,
+    isMainWorktree: false,
+    comment: '',
+    linkedIssue: null,
+    linkedPR: null,
+    linkedLinearIssue: null,
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: 0,
+    lastActivityAt: 1,
+    ...overrides
+  }
+}
+
+// An older parent whose metadata carries no host, as the sidebar still nests children under.
+const parent = worktree('parent')
+const child = worktree('child', { hostId: 'local' })
+
+function candidate(sessionId: string, workspace: Worktree): ResumeCandidate {
+  return {
+    sessionId,
+    workspaceId: workspace.id,
+    agent: 'codex',
+    trigger: 'quit',
+    latestPrompt: `Prompt ${sessionId}`,
+    recordedAt: 1_800_000_000_000,
+    executionHostId: 'local',
+    workspaceKind: 'git-worktree'
+  }
+}
+
+const candidates = [
+  candidate('in-child', child),
+  candidate('in-parent', parent),
+  candidate('also-in-child', child)
+]
+
+function render(newCardStyle: boolean): void {
+  useAppStore.setState({
+    settings: { ...getDefaultSettings(''), experimentalNewWorktreeCardStyle: newCardStyle },
+    repos: [
+      { id: 'repo-1', path: '/repo', displayName: 'orca', badgeColor: '#999999', addedAt: 1 }
+    ],
+    worktreesByRepo: { 'repo-1': [parent, child] },
+    worktreeLineageById: {
+      [child.id]: {
+        worktreeId: child.id,
+        worktreeInstanceId: 'instance-child',
+        parentWorktreeId: parent.id,
+        parentWorktreeInstanceId: 'instance-parent',
+        origin: 'cli',
+        capture: { source: 'explicit-cli-flag', confidence: 'explicit' },
+        createdAt: 1
+      }
+    }
+  })
+  act(() =>
+    root.render(
+      <TooltipProvider>
+        <ResumeOnRestartGroups
+          candidates={candidates}
+          listedAt={1_800_000_060_000}
+          busy={false}
+          selected={new Set(candidates.map((entry) => entry.sessionId))}
+          onToggle={() => {}}
+        />
+      </TooltipProvider>
+    )
+  )
+}
+
+function cardTitled(title: string): HTMLElement {
+  const card = [
+    ...container.querySelectorAll<HTMLElement>('[data-worktree-card-surface="true"]')
+  ].find(
+    (surface) => surface.querySelector('[data-worktree-title-inline-rename]')?.textContent === title
+  )
+  if (!card) {
+    throw new Error(`Missing card: ${title}`)
+  }
+  return card
+}
+
+beforeEach(() => {
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+})
+
+for (const newCardStyle of [false, true]) {
+  it(`shows every offered chat inside its sidebar card, the child nested (${newCardStyle ? 'new' : 'legacy'} cards)`, () => {
+    render(newCardStyle)
+
+    const checkboxes = [...container.querySelectorAll('[role="checkbox"]')]
+    expect(checkboxes.map((box) => box.getAttribute('aria-checked'))).toEqual([
+      'true',
+      'true',
+      'true'
+    ])
+    const parentCard = cardTitled('parent')
+    const childCard = cardTitled('child')
+    expect(parentCard.contains(childCard)).toBe(true)
+    expect(childCard.textContent).toContain('Prompt in-child')
+    expect(childCard.textContent).toContain('Prompt also-in-child')
+    // Why: a legacy child sits one sidebar step (14px) in, as its own lineage depth puts it there.
+    expect(childCard.parentElement?.style.paddingLeft ?? '').toBe(newCardStyle ? '' : '14px')
+  })
+}
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index 6cd323dde9e3..38a4062c9751 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -7,11 +7,8 @@ import {
   getLineageChildrenInlineStyle,
   getLineageNestedRowGeometry
 } from '@/components/sidebar/worktree-list/rows/indentation'
-import {
-  getHostScopedWorktreeLineageInputs,
-  getWorktreeLineageAncestors
-} from '@/components/sidebar/worktree-lineage-projection'
-import { getAllWorktreesFromState, getWorktreeOnHostFromState } from '@/store/selectors'
+import { getWorktreeLineageAncestorsOnHost } from '@/components/sidebar/worktree-lineage-projection'
+import { getAllWorktreesFromState } from '@/store/selectors'
 import { getHostContextLabel } from '../../../shared/worktree/host-context-labels'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host'
 import type { AgentSessionWorkspaceKind } from '../../../shared/agent-session-record'
@@ -78,36 +75,24 @@ function useRepoIdByWorkspace(
   }
 }
 
-/** Each workspace's lineage ancestors, nearest first, scoped to its host as the sidebar scopes them. */
+/** Each workspace's lineage ancestors, nearest first, on its own host as the sidebar nests them. */
 function useLineageAncestors(
   workspaces: readonly ResumeWorkspaceGroup[]
 ): (workspaceId: string) => readonly string[] {
   const worktreesByRepo = useAppStore((store) => store.worktreesByRepo)
   const worktreeLineageById = useAppStore((store) => store.worktreeLineageById)
   const ancestors = useMemo(() => {
-    const state = { worktreesByRepo }
-    const all = getAllWorktreesFromState(state)
+    const all = getAllWorktreesFromState({ worktreesByRepo })
     return new Map(
-      workspaces.map((group) => {
-        const target = getWorktreeOnHostFromState(
-          state,
+      workspaces.map((group) => [
+        group.workspaceId,
+        getWorktreeLineageAncestorsOnHost(
           group.workspaceId,
-          group.candidates[0]?.executionHostId
-        )
-        if (!target) {
-          return [group.workspaceId, []]
-        }
-        // Why: the sidebar nests a child only under a parent on the same host, and never archived.
-        const { worktreeMap, lineageById } = getHostScopedWorktreeLineageInputs(
-          all.filter((worktree) => worktree.hostId === target.hostId && !worktree.isArchived),
+          all,
           worktreeLineageById,
-          target.hostId
-        )
-        return [
-          group.workspaceId,
-          getWorktreeLineageAncestors(target, lineageById, worktreeMap).map((parent) => parent.id)
-        ]
-      })
+          group.candidates[0]?.executionHostId
+        ).map((parent) => parent.id)
+      ])
     )
   }, [workspaces, worktreesByRepo, worktreeLineageById])
   return (workspaceId) => ancestors.get(workspaceId) ?? []
@@ -192,15 +177,19 @@ function WorkspaceCard({
       ))}
     </ul>
   )
-  const geometry = getLineageNestedRowGeometry({
-    experimentalNewWorktreeCardStyle: newCardStyle,
-    inheritedCardContentIndent: 0,
-    lineageDepth: depth
-  })
+  const geometryAt = (lineageDepth: number) =>
+    getLineageNestedRowGeometry({
+      experimentalNewWorktreeCardStyle: newCardStyle,
+      inheritedCardContentIndent: 0,
+      lineageDepth
+    })
+  const geometry = geometryAt(depth)
+  // Why: as in the sidebar, a child inside a card's lineage list is inset for its own depth.
+  const childInset = worktree ? geometryAt(depth + 1).surfaceInset : 0
   const children = node.children.map((child) => (
     <div
       key={child.group.workspaceId}
-      style={geometry.surfaceInset > 0 ? { paddingLeft: geometry.surfaceInset } : undefined}
+      style={childInset > 0 ? { paddingLeft: childInset } : undefined}
     >
       <WorkspaceCard node={child} depth={depth + 1} {...rowProps} />
     </div>
diff --git a/src/renderer/src/components/sidebar/worktree-lineage-projection.ts b/src/renderer/src/components/sidebar/worktree-lineage-projection.ts
index 5c14a2fedad5..3655e1fa9721 100644
--- a/src/renderer/src/components/sidebar/worktree-lineage-projection.ts
+++ b/src/renderer/src/components/sidebar/worktree-lineage-projection.ts
@@ -173,3 +173,22 @@ export function getWorktreeLineageAncestors(
   }
   return ancestors
 }
+
+/**
+ * A worktree's ancestors on one execution host, nearest first, as the sidebar nests it: archived
+ * rows never render, and a row with no host id (older metadata) still counts as that host's.
+ */
+export function getWorktreeLineageAncestorsOnHost(
+  worktreeId: string,
+  worktrees: readonly Worktree[],
+  lineageById: Readonly<Record<string, WorktreeLineage>>,
+  executionHostId: ExecutionHostId | undefined
+): Worktree[] {
+  const scoped = getHostScopedWorktreeLineageInputs(
+    worktrees.filter((worktree) => !worktree.isArchived),
+    lineageById,
+    executionHostId
+  )
+  const target = scoped.worktreeMap.get(worktreeId)
+  return target ? getWorktreeLineageAncestors(target, scoped.lineageById, scoped.worktreeMap) : []
+}

From ead9ca8089a16f92ae69020f62a830200aec48c9 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 13:44:34 -0700
Subject: [PATCH 06/37] fix(native-chat): the resume dialog places every
 workspace even if lineage loops

Nesting followed each workspace's parent chain, so two workspaces listed as each other's
ancestors (possible only when two hosts report opposite lineage for the same ids) were placed
under no top-level entry and vanished, while their pre-ticked chats would still be resumed.
The loop is now cut where the walk first comes back, so every workspace renders.
---
 ...ve-chat-resume-on-restart-grouping.test.ts | 20 +++++++++++++++++
 .../native-chat-resume-on-restart-grouping.ts | 22 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
index dd99bbeea63f..62299cbbae38 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
@@ -158,4 +158,24 @@ describe('nesting child workspaces', () => {
       ['b', []]
     ])
   })
+
+  // Lineage from two hosts can disagree; a chat under no root would be resumed without being seen.
+  it('places every workspace when ancestors loop', () => {
+    const ancestors: Record<string, string[]> = { a: ['b'], b: ['a'], c: ['a'] }
+    const nested = nestResumeWorkspaces(
+      [group('a'), group('b'), group('c'), group('d')],
+      (id) => ancestors[id] ?? []
+    )
+
+    expect(nestedWorkspaceIds(nested)).toEqual([
+      [
+        'a',
+        [
+          ['b', []],
+          ['c', []]
+        ]
+      ],
+      ['d', []]
+    ])
+  })
 })
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
index bdbd52b5fa38..50b41961c1ba 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
@@ -129,12 +129,32 @@ export function nestResumeWorkspaces(
   const nodes = new Map<string, ResumeWorkspaceNode>(
     workspaces.map((group) => [group.workspaceId, { group, children: [] }])
   )
-  const roots: ResumeWorkspaceNode[] = []
+  const parentOf = new Map<ResumeWorkspaceNode, ResumeWorkspaceNode>()
   for (const node of nodes.values()) {
     const parentId = ancestorsOf(node.group.workspaceId).find(
       (id) => id !== node.group.workspaceId && nodes.has(id)
     )
     const parent = parentId === undefined ? undefined : nodes.get(parentId)
+    if (parent) {
+      parentOf.set(node, parent)
+    }
+  }
+  // Why: a loop in the parent chain would leave its members under no root, and a ticked chat that
+  // renders nowhere would still be resumed; the loop is cut where the walk first comes back.
+  for (const node of nodes.values()) {
+    const seen = new Set([node])
+    let up = parentOf.get(node)
+    while (up && !seen.has(up)) {
+      seen.add(up)
+      up = parentOf.get(up)
+    }
+    if (up) {
+      parentOf.delete(up)
+    }
+  }
+  const roots: ResumeWorkspaceNode[] = []
+  for (const node of nodes.values()) {
+    const parent = parentOf.get(node)
     if (parent) {
       parent.children.push(node)
     } else {

From 0736622a481264fbecc32a65e7f8f995e184dcc5 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 13:44:36 -0700
Subject: [PATCH 07/37] fix(native-chat): keep "Don't ask again" above the
 resume dialog's buttons when narrow

Below the small breakpoint the footer stacks bottom-up, so the option moved into it rendered
under Resume and Dismiss all. It now reads top to bottom: the option, then the actions; wider
windows keep the single row.
---
 src/renderer/src/components/NativeChatResumeOnRestartModal.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index e3ed2b4d06c3..1f9f639fa3f0 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -236,7 +236,8 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
 
         {/* Two controls: one deletes the offer, one acts on it. Closing snoozes, so it needs none. */}
         <DialogFooter className="sm:items-center">
-          <label className="flex min-w-0 items-start gap-2.5 sm:mr-auto">
+          {/* Why order-last: the narrow footer stacks bottom-up, so this keeps the option above the actions. */}
+          <label className="order-last flex min-w-0 items-start gap-2.5 sm:order-none sm:mr-auto">
             <Checkbox
               checked={dontAskAgain}
               disabled={busy}

From b05eaab67e123f603171209d2402e6a461e8dd24 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 14:01:34 -0700
Subject: [PATCH 08/37] test(sidebar): import the card statically in the
 read-only contract test

Its dynamic import ran in a beforeAll with a 20 s timeout, below the suite's 60 s hook timeout,
and timed out under parallel load, which skipped all six contract tests.
---
 .../sidebar/WorktreeCard.read-only-contract.test.tsx   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
index 98220a688cd5..5fc2206ad309 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
@@ -2,13 +2,12 @@
 
 import { act, type ReactNode } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { Repo } from '../../../../shared/repo-types'
 import type { WorktreeCardProperty } from '../../../../shared/ui-chrome-types'
 import type { Worktree } from '../../../../shared/worktree/types'
 import { issueCacheKey } from '@/store/github/cache-identity'
-import type WorktreeCardComponent from './WorktreeCard'
 
 const activateWorktreeFromSidebar = vi.hoisted(() => vi.fn())
 const callbacks = {
@@ -40,7 +39,6 @@ const ALL_CARD_PROPERTIES: WorktreeCardProperty[] = [
   'host'
 ]
 
-let WorktreeCard: typeof WorktreeCardComponent
 let settings: Partial<GlobalSettings> = {}
 let deleteStateByWorktreeId: Record<string, unknown> = {}
 
@@ -164,6 +162,8 @@ vi.mock('./WorktreeContextMenu', () => ({
   WORKTREE_NATIVE_CONTEXT_MENU_ATTR: 'data-worktree-native-context-menu'
 }))
 
+import WorktreeCard from './WorktreeCard'
+
 const INTERACTIVE =
   'button, a[href], input, textarea, select, [tabindex]:not([tabindex="-1"]), [role="button"], [draggable="true"]'
 
@@ -212,10 +212,6 @@ describe('WorktreeCard read-only contract', () => {
   let container: HTMLDivElement
   let root: Root
 
-  beforeAll(async () => {
-    WorktreeCard = (await import('./WorktreeCard')).default
-  }, 20_000)
-
   beforeEach(() => {
     vi.clearAllMocks()
     deleteStateByWorktreeId = {}

From 756fa066a35ce8e44cb7119740618c651175ca33 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 14:01:54 -0700
Subject: [PATCH 09/37] fix(sidebar): legacy lineage children step in as far
 without a status lane

Legacy cards outdent their nested child list by 1.125rem to pull it back over the 22px status
lane. A card without that lane (a read-only card in the resume dialog, or the sidebar with the
Status property off) kept the outdent, so a child's title sat 3px right of its parent's instead
of 25px. Without a lane the list now sits at ml-1, which gives the same 25px step (39px at depth
2). Cards with a status lane, the default sidebar, render exactly as before.
---
 .../sidebar/WorktreeCard.lineage.test.tsx     | 28 +++++++++++++++++++
 .../sidebar/worktree-card-secondary-rows.tsx  | 13 +++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
index 9147a881c476..7eee13a1edc6 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
@@ -44,6 +44,10 @@ vi.mock('@/components/ui/tooltip', () => ({
   TooltipTrigger: ({ children }: { children: ReactNode }) => <>{children}</>
 }))
 
+vi.mock('./use-worktree-activity-status', () => ({
+  useWorktreeActivityStatus: () => 'idle'
+}))
+
 vi.mock('./use-worktree-sleep-state', () => ({
   useIsSleepingWorktree: () => false
 }))
@@ -143,4 +147,28 @@ describe('WorktreeCard lineage indicators', () => {
     },
     WORKTREE_CARD_IMPORT_TIMEOUT_MS
   )
+
+  // Why: the legacy outdent is sized against the status lane; without one it would undercut the step.
+  it(
+    'outdents legacy lineage children only over a status lane',
+    async () => {
+      const { default: WorktreeCard } = await import('./WorktreeCard')
+      const render = (): string =>
+        renderToStaticMarkup(
+          <WorktreeCard
+            worktree={makeWorktree()}
+            repo={makeRepo()}
+            isActive={false}
+            lineageChildren={<span>child</span>}
+          />
+        )
+
+      worktreeCardProperties = ['status']
+      expect(render()).toContain('-ml-[1.125rem] w-[calc(100%+1.125rem)]')
+      worktreeCardProperties = []
+      expect(render()).not.toContain('-ml-[1.125rem]')
+      expect(render()).toContain('ml-1 w-[calc(100%-0.25rem)]')
+    },
+    WORKTREE_CARD_IMPORT_TIMEOUT_MS
+  )
 })
diff --git a/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx b/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
index 496a7508423c..d131b86b626a 100644
--- a/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
@@ -36,7 +36,7 @@ export function WorktreeCardSecondaryRows({
     childWorkspaceShortLabel,
     isDeleting
   } = card
-  const { hasMetaRow } = presentation
+  const { hasMetaRow, showCombinedStatusSlot } = presentation
 
   return (
     <>
@@ -140,7 +140,16 @@ export function WorktreeCardSecondaryRows({
       )}
 
       {!newCardStyle && lineageChildren && (
-        <div className="-ml-[1.125rem] mt-1.5 w-[calc(100%+1.125rem)] space-y-1">
+        <div
+          className={cn(
+            'mt-1.5 space-y-1',
+            // Why: the outdent pulls children back over the 22px status lane; with no lane, ml-1
+            // keeps the same step between parent and child titles.
+            showCombinedStatusSlot
+              ? '-ml-[1.125rem] w-[calc(100%+1.125rem)]'
+              : 'ml-1 w-[calc(100%-0.25rem)]'
+          )}
+        >
           {lineageChildren}
         </div>
       )}

From 50351c10bb5cd80084846a7483eae1640bcd7b6c Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 14:01:56 -0700
Subject: [PATCH 10/37] fix(native-chat): nest resume dialog children by the
 sidebar's own row rule

Round one nested a child under a parent whenever either had no host id, but the sidebar's row
builder looks a parent up on the child's own host, so a row with no host id nests only under a
parent with none either. The dialog showed a parent/child pair nested that the sidebar shows side
by side.

The row builder's parent lookup is now one function, getSidebarLineageParent, and the dialog
walks ancestors with it (getSidebarLineageAncestors) over the same non-archived rows and cycle
set. The chat's workspace is still found on its host, falling back to a row with no host id.
A test checks the four host pairings against the real row builder, and the dialog test renders
each pairing with every chat's checkbox.
---
 .../NativeChatResumeOnRestartGroups.test.tsx  | 89 +++++++++++++------
 .../NativeChatResumeOnRestartGroups.tsx       | 53 ++++++++---
 .../sidebar/sidebar-lineage-ancestors.test.ts | 67 ++++++++++++++
 .../sidebar/worktree-lineage-projection.ts    | 57 +++++++++---
 .../worktree-list/grouping/row-builders.ts    | 23 ++---
 5 files changed, 216 insertions(+), 73 deletions(-)
 create mode 100644 src/renderer/src/components/sidebar/sidebar-lineage-ancestors.test.ts

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index 010fa0124630..73947bf48f6b 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -5,6 +5,7 @@ import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, expect, it } from 'vitest'
 import { useAppStore } from '../store'
 import { getDefaultSettings } from '../../../shared/constants'
+import type { ExecutionHostId } from '../../../shared/execution-host'
 import type { Worktree } from '../../../shared/worktree/types'
 import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
 import { TooltipProvider } from './ui/tooltip'
@@ -38,10 +39,6 @@ function worktree(name: string, overrides: Partial<Worktree> = {}): Worktree {
   }
 }
 
-// An older parent whose metadata carries no host, as the sidebar still nests children under.
-const parent = worktree('parent')
-const child = worktree('child', { hostId: 'local' })
-
 function candidate(sessionId: string, workspace: Worktree): ResumeCandidate {
   return {
     sessionId,
@@ -55,13 +52,17 @@ function candidate(sessionId: string, workspace: Worktree): ResumeCandidate {
   }
 }
 
-const candidates = [
-  candidate('in-child', child),
-  candidate('in-parent', parent),
-  candidate('also-in-child', child)
-]
-
-function render(newCardStyle: boolean): void {
+function render(
+  newCardStyle: boolean,
+  hosts: { parent?: ExecutionHostId; child?: ExecutionHostId } = { parent: 'local', child: 'local' }
+): void {
+  const parent = worktree('parent', { hostId: hosts.parent })
+  const child = worktree('child', { hostId: hosts.child })
+  const candidates = [
+    candidate('in-child', child),
+    candidate('in-parent', parent),
+    candidate('also-in-child', child)
+  ]
   useAppStore.setState({
     settings: { ...getDefaultSettings(''), experimentalNewWorktreeCardStyle: newCardStyle },
     repos: [
@@ -120,22 +121,52 @@ afterEach(() => {
   useAppStore.setState(useAppStore.getInitialState(), true)
 })
 
-for (const newCardStyle of [false, true]) {
-  it(`shows every offered chat inside its sidebar card, the child nested (${newCardStyle ? 'new' : 'legacy'} cards)`, () => {
-    render(newCardStyle)
-
-    const checkboxes = [...container.querySelectorAll('[role="checkbox"]')]
-    expect(checkboxes.map((box) => box.getAttribute('aria-checked'))).toEqual([
-      'true',
-      'true',
-      'true'
-    ])
-    const parentCard = cardTitled('parent')
-    const childCard = cardTitled('child')
-    expect(parentCard.contains(childCard)).toBe(true)
-    expect(childCard.textContent).toContain('Prompt in-child')
-    expect(childCard.textContent).toContain('Prompt also-in-child')
-    // Why: a legacy child sits one sidebar step (14px) in, as its own lineage depth puts it there.
-    expect(childCard.parentElement?.style.paddingLeft ?? '').toBe(newCardStyle ? '' : '14px')
-  })
+function checkedBoxes(): (string | null)[] {
+  return [...container.querySelectorAll('[role="checkbox"]')].map((box) =>
+    box.getAttribute('aria-checked')
+  )
 }
+
+// Why: the sidebar nests a child only under a parent on its own host; no host id matches only none.
+it.each([
+  ['both local', 'local', 'local', true],
+  ['neither with a host id', undefined, undefined, true],
+  ['parent without a host id, child local', undefined, 'local', false],
+  ['parent local, child without a host id', 'local', undefined, false]
+] as const)(
+  '%s: nests the child exactly as the sidebar does',
+  (_, parentHost, childHost, nests) => {
+    render(false, { parent: parentHost, child: childHost })
+
+    expect(checkedBoxes()).toEqual(['true', 'true', 'true'])
+    expect(cardTitled('parent').contains(cardTitled('child'))).toBe(nests)
+    expect(cardTitled('child').textContent).toContain('Prompt in-child')
+    expect(cardTitled('child').textContent).toContain('Prompt also-in-child')
+  }
+)
+
+// Title step, child minus parent = list margin + wrapper inset + 7px (ml-1, border, padding). The
+// sidebar's legacy cards add their 22px status lane and outdent the list 18px: -18 + 14 + 7 + 22 =
+// 25px. A status-free card keeps 25px with an ml-1 list: 4 + 14 + 7.
+it('steps a legacy child in as far as the sidebar does, with no status lane', () => {
+  render(false)
+
+  const childCard = cardTitled('child')
+  const wrapper = childCard.parentElement
+  expect(container.querySelector('[data-worktree-card-status-slot]')).toBeNull()
+  expect(wrapper?.style.paddingLeft).toBe('14px')
+  expect(wrapper?.parentElement?.className).toContain('ml-1')
+  expect(wrapper?.parentElement?.className).not.toContain('-ml-')
+})
+
+it('keeps the new card style geometry', () => {
+  render(true)
+
+  const childCard = cardTitled('child')
+  expect(checkedBoxes()).toEqual(['true', 'true', 'true'])
+  expect(cardTitled('parent').contains(childCard)).toBe(true)
+  expect(childCard.parentElement?.style.paddingLeft).toBe('')
+  expect(childCard.closest<HTMLElement>('[data-worktree-lineage-children]')?.style.marginLeft).toBe(
+    '14px'
+  )
+})
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index 38a4062c9751..d42ce3ad4398 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -7,8 +7,19 @@ import {
   getLineageChildrenInlineStyle,
   getLineageNestedRowGeometry
 } from '@/components/sidebar/worktree-list/rows/indentation'
-import { getWorktreeLineageAncestorsOnHost } from '@/components/sidebar/worktree-lineage-projection'
-import { getAllWorktreesFromState } from '@/store/selectors'
+import {
+  getCyclicProjectedWorktreeLineageIds,
+  getSidebarLineageAncestors
+} from '@/components/sidebar/worktree-lineage-projection'
+import {
+  getAllWorktreesFromState,
+  getWorktreeMapFromState,
+  getWorktreeOnHostFromState
+} from '@/store/selectors'
+import {
+  composeWorktreeHostIdentity,
+  getWorktreeHostIdentity
+} from '../../../shared/worktree/host-qualified-identity'
 import { getHostContextLabel } from '../../../shared/worktree/host-context-labels'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host'
 import type { AgentSessionWorkspaceKind } from '../../../shared/agent-session-record'
@@ -33,7 +44,7 @@ export type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
  * The offered chats in the sidebar's three tiers: repo/project, then workspace, then agent sessions.
  *
  * Each workspace IS the sidebar's own `WorktreeCard`, rendered read-only, so the user recognizes it
- * exactly as they know it — title, status, branch, PR and host as their sidebar settings show them —
+ * exactly as they know it — title, branch, PR and host as their sidebar settings show them —
  * with the offered chats in place of its live agent rows. Child workspaces nest under a listed
  * parent the way the sidebar nests them.
  *
@@ -75,24 +86,38 @@ function useRepoIdByWorkspace(
   }
 }
 
-/** Each workspace's lineage ancestors, nearest first, on its own host as the sidebar nests them. */
+/** Each workspace's lineage ancestors, nearest first, by the sidebar's own nesting rule. */
 function useLineageAncestors(
   workspaces: readonly ResumeWorkspaceGroup[]
 ): (workspaceId: string) => readonly string[] {
   const worktreesByRepo = useAppStore((store) => store.worktreesByRepo)
   const worktreeLineageById = useAppStore((store) => store.worktreeLineageById)
   const ancestors = useMemo(() => {
-    const all = getAllWorktreesFromState({ worktreesByRepo })
+    const state = { worktreesByRepo }
+    // Why: archived rows never render in the sidebar, so nothing nests under them.
+    const rows = new Map(
+      getAllWorktreesFromState(state)
+        .filter((worktree) => !worktree.isArchived)
+        .map((worktree) => [getWorktreeHostIdentity(worktree), worktree])
+    )
+    const cyclic = getCyclicProjectedWorktreeLineageIds(
+      worktreeLineageById,
+      getWorktreeMapFromState(state)
+    )
     return new Map(
-      workspaces.map((group) => [
-        group.workspaceId,
-        getWorktreeLineageAncestorsOnHost(
-          group.workspaceId,
-          all,
-          worktreeLineageById,
-          group.candidates[0]?.executionHostId
-        ).map((parent) => parent.id)
-      ])
+      workspaces.map((group) => {
+        // Why: a row with no host id (older metadata) is still the chat's workspace.
+        const target =
+          getWorktreeOnHostFromState(
+            state,
+            group.workspaceId,
+            group.candidates[0]?.executionHostId
+          ) ?? rows.get(composeWorktreeHostIdentity(undefined, group.workspaceId))
+        const parents = target
+          ? getSidebarLineageAncestors(target, worktreeLineageById, rows, cyclic)
+          : []
+        return [group.workspaceId, parents.map((parent) => parent.id)]
+      })
     )
   }, [workspaces, worktreesByRepo, worktreeLineageById])
   return (workspaceId) => ancestors.get(workspaceId) ?? []
diff --git a/src/renderer/src/components/sidebar/sidebar-lineage-ancestors.test.ts b/src/renderer/src/components/sidebar/sidebar-lineage-ancestors.test.ts
new file mode 100644
index 000000000000..65ae48b8b13c
--- /dev/null
+++ b/src/renderer/src/components/sidebar/sidebar-lineage-ancestors.test.ts
@@ -0,0 +1,67 @@
+import { describe, expect, it } from 'vitest'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
+import type { WorktreeLineage } from '../../../../shared/worktree/lineage-types'
+import type { Worktree } from '../../../../shared/worktree/types'
+import { buildRows } from './worktree-list/grouping/build-rows'
+import { worktree, repoMap } from './worktree-list-groups-test-fixtures'
+import {
+  getCyclicProjectedWorktreeLineageIds,
+  getSidebarLineageAncestors
+} from './worktree-lineage-projection'
+
+function pair(parentHost: ExecutionHostId | undefined, childHost: ExecutionHostId | undefined) {
+  const parent: Worktree = { ...worktree, id: 'parent', instanceId: 'p', hostId: parentHost }
+  const child: Worktree = { ...worktree, id: 'child', instanceId: 'c', hostId: childHost }
+  const lineageById: Record<string, WorktreeLineage> = {
+    child: {
+      worktreeId: 'child',
+      worktreeInstanceId: 'c',
+      parentWorktreeId: 'parent',
+      parentWorktreeInstanceId: 'p',
+      origin: 'cli',
+      capture: { source: 'explicit-cli-flag', confidence: 'explicit' },
+      createdAt: 1
+    }
+  }
+  return { parent, child, lineageById }
+}
+
+describe('getSidebarLineageAncestors', () => {
+  // Why: only a parent on the child's own host nests it; a missing host id matches only another.
+  it.each([
+    ['both without a host id', undefined, undefined, true],
+    ['both local', 'local', 'local', true],
+    ['parent without a host id, child local', undefined, 'local', false],
+    ['parent local, child without a host id', 'local', undefined, false]
+  ] as const)('%s: nests exactly when the sidebar rows do', (_, parentHost, childHost, nests) => {
+    const { parent, child, lineageById } = pair(parentHost, childHost)
+    const worktreeMap = new Map([
+      [parent.id, parent],
+      [child.id, child]
+    ])
+    const sidebarDepth = buildRows(
+      'none',
+      [parent, child],
+      repoMap,
+      null,
+      new Set(),
+      undefined,
+      undefined,
+      undefined,
+      lineageById,
+      worktreeMap,
+      true
+    ).find((row) => row.type === 'item' && row.worktree.id === 'child')
+    const rows = new Map([parent, child].map((entry) => [getWorktreeHostIdentity(entry), entry]))
+    const ancestors = getSidebarLineageAncestors(
+      child,
+      lineageById,
+      rows,
+      getCyclicProjectedWorktreeLineageIds(lineageById, worktreeMap)
+    )
+
+    expect(sidebarDepth?.type === 'item' && sidebarDepth.depth).toBe(nests ? 1 : 0)
+    expect(ancestors.map((entry) => entry.id)).toEqual(nests ? ['parent'] : [])
+  })
+})
diff --git a/src/renderer/src/components/sidebar/worktree-lineage-projection.ts b/src/renderer/src/components/sidebar/worktree-lineage-projection.ts
index 3655e1fa9721..aec5bec4e085 100644
--- a/src/renderer/src/components/sidebar/worktree-lineage-projection.ts
+++ b/src/renderer/src/components/sidebar/worktree-lineage-projection.ts
@@ -3,6 +3,10 @@ import {
   isValidResolvedWorktreeLineageEdge
 } from '../../../../shared/resolved-worktree-lineage'
 import type { ExecutionHostId } from '../../../../shared/execution-host'
+import {
+  composeWorktreeHostIdentity,
+  getWorktreeHostIdentity
+} from '../../../../shared/worktree/host-qualified-identity'
 import type { WorktreeLineage } from '../../../../shared/worktree/lineage-types'
 import type { Worktree } from '../../../../shared/worktree/types'
 
@@ -175,20 +179,47 @@ export function getWorktreeLineageAncestors(
 }
 
 /**
- * A worktree's ancestors on one execution host, nearest first, as the sidebar nests it: archived
- * rows never render, and a row with no host id (older metadata) still counts as that host's.
+ * The row a worktree nests under in the sidebar: its lineage parent on the worktree's own host,
+ * where a row with no host id (older metadata) nests only under a parent with none either.
  */
-export function getWorktreeLineageAncestorsOnHost(
-  worktreeId: string,
-  worktrees: readonly Worktree[],
+export function getSidebarLineageParent(
+  worktree: Worktree,
   lineageById: Readonly<Record<string, WorktreeLineage>>,
-  executionHostId: ExecutionHostId | undefined
-): Worktree[] {
-  const scoped = getHostScopedWorktreeLineageInputs(
-    worktrees.filter((worktree) => !worktree.isArchived),
-    lineageById,
-    executionHostId
+  rowsByHostIdentity: ReadonlyMap<string, Worktree>
+): Worktree | undefined {
+  const projected = getProjectedWorktreeLineage(worktree, lineageById)
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: resolved rows may carry an inline lineage the Worktree type omits; it is only read, never trusted over a matching projection.
+  const inline = (worktree as WorktreeWithResolvedLineage).lineage
+  const lineage = projected?.worktreeInstanceId === worktree.instanceId ? projected : inline
+  if (!lineage) {
+    return undefined
+  }
+  const parent = rowsByHostIdentity.get(
+    composeWorktreeHostIdentity(worktree.hostId, lineage.parentWorktreeId)
   )
-  const target = scoped.worktreeMap.get(worktreeId)
-  return target ? getWorktreeLineageAncestors(target, scoped.lineageById, scoped.worktreeMap) : []
+  return parent && isValidResolvedWorktreeLineageEdge(worktree, parent, lineage)
+    ? parent
+    : undefined
+}
+
+/** The rows a worktree nests under in the sidebar, nearest first; a lineage cycle nests nothing. */
+export function getSidebarLineageAncestors(
+  worktree: Worktree,
+  lineageById: Readonly<Record<string, WorktreeLineage>>,
+  rowsByHostIdentity: ReadonlyMap<string, Worktree>,
+  cyclicLineageIds: ReadonlySet<string>
+): Worktree[] {
+  const ancestors: Worktree[] = []
+  const seen = new Set([getWorktreeHostIdentity(worktree)])
+  let current = worktree
+  while (!cyclicLineageIds.has(current.id)) {
+    const parent = getSidebarLineageParent(current, lineageById, rowsByHostIdentity)
+    if (!parent || seen.has(getWorktreeHostIdentity(parent))) {
+      break
+    }
+    seen.add(getWorktreeHostIdentity(parent))
+    ancestors.push(parent)
+    current = parent
+  }
+  return ancestors
 }
diff --git a/src/renderer/src/components/sidebar/worktree-list/grouping/row-builders.ts b/src/renderer/src/components/sidebar/worktree-list/grouping/row-builders.ts
index e62d0f9ec705..231419088d9e 100644
--- a/src/renderer/src/components/sidebar/worktree-list/grouping/row-builders.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/grouping/row-builders.ts
@@ -2,8 +2,7 @@ import type { Repo } from '../../../../../../shared/repo-types'
 import type { WorktreeLineage } from '../../../../../../shared/worktree/lineage-types'
 import type { Worktree } from '../../../../../../shared/worktree/types'
 import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
-import { isValidResolvedWorktreeLineageEdge } from '../../../../../../shared/resolved-worktree-lineage'
-import { getProjectedWorktreeLineage } from '../../worktree-lineage-projection'
+import { getSidebarLineageParent } from '../../worktree-lineage-projection'
 import { getWorktreeLineageGroupKey } from './group-keys'
 import type { NoticeHostContext } from './host-labels'
 import type { RenderableFolderWorkspace } from './folder-workspace-lanes'
@@ -149,23 +148,13 @@ export function appendWorktreeRows(
   const childrenByParentIdentity = new Map<string, Worktree[]>()
   const childIdentities = new Set<string>()
   for (const worktree of worktrees) {
-    const projectedLineage = getProjectedWorktreeLineage(worktree, lineageById)
-    const inlineLineage = (worktree as Worktree & { lineage?: WorktreeLineage | null }).lineage
-    const lineage =
-      projectedLineage?.worktreeInstanceId === worktree.instanceId
-        ? projectedLineage
-        : inlineLineage
-    if (!lineage || cyclicLineageIds.has(worktree.id)) {
-      continue
-    }
-    const parentIdentity = getWorktreeHostIdentity({
-      id: lineage.parentWorktreeId,
-      hostId: worktree.hostId
-    })
-    const parent = visibleByIdentity.get(parentIdentity)
-    if (!parent || !isValidResolvedWorktreeLineageEdge(worktree, parent, lineage)) {
+    const parent = cyclicLineageIds.has(worktree.id)
+      ? undefined
+      : getSidebarLineageParent(worktree, lineageById, visibleByIdentity)
+    if (!parent) {
       continue
     }
+    const parentIdentity = getWorktreeHostIdentity(parent)
     const childIdentity = getWorktreeHostIdentity(worktree)
     childIdentities.add(childIdentity)
     const children = childrenByParentIdentity.get(parentIdentity) ?? []

From 186bbf2e04f469a7a73a61903722d136cd64db49 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 14:08:00 -0700
Subject: [PATCH 11/37] test(sidebar): pin child-workspace indent with and
 without a status lane

Covers legacy, compact and new card styles with the Status property on and off. With Status on,
the legacy and compact sidebar keep their outdent unchanged; with it off they now step children
in by the same amount; the new card style is identical either way. The file now imports the
card statically, since its 15 s per-test dynamic import timed out under load.
---
 .../sidebar/WorktreeCard.lineage.test.tsx     | 111 +++++++++---------
 1 file changed, 57 insertions(+), 54 deletions(-)

diff --git a/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
index 7eee13a1edc6..42d0a26567c1 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
@@ -1,6 +1,7 @@
 import { renderToStaticMarkup } from 'react-dom/server'
 import type { ReactNode } from 'react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { Repo } from '../../../../shared/repo-types'
 import type { WorktreeCardProperty } from '../../../../shared/ui-chrome-types'
 import type { Worktree } from '../../../../shared/worktree/types'
@@ -12,7 +13,7 @@ const openModal = vi.fn()
 const updateWorktreeMeta = vi.fn()
 
 let worktreeCardProperties: WorktreeCardProperty[] = []
-const WORKTREE_CARD_IMPORT_TIMEOUT_MS = 15_000
+let settings: Partial<GlobalSettings> | null = null
 
 vi.mock('@/store', () => ({
   useAppStore: (selector: (state: unknown) => unknown) =>
@@ -28,7 +29,7 @@ vi.mock('@/store', () => ({
       openModal,
       projectGroups: [],
       remoteBranchConflictByWorktreeId: {},
-      settings: null,
+      settings,
       sshConnectionStates: new Map(),
       sshTargetLabels: new Map(),
       updateWorktreeMeta,
@@ -68,6 +69,8 @@ vi.mock('./WorktreeContextMenu', () => ({
   WORKTREE_NATIVE_CONTEXT_MENU_ATTR: 'data-worktree-native-context-menu'
 }))
 
+import WorktreeCard from './WorktreeCard'
+
 function makeRepo(): Repo {
   return {
     id: 'repo-1',
@@ -105,70 +108,70 @@ describe('WorktreeCard lineage indicators', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     worktreeCardProperties = []
+    settings = null
   })
 
-  it(
-    'does not render parent lineage badge copy on workspace cards',
-    async () => {
-      const { default: WorktreeCard } = await import('./WorktreeCard')
+  it('does not render parent lineage badge copy on workspace cards', () => {
+    const markup = renderToStaticMarkup(
+      <WorktreeCard worktree={makeWorktree()} repo={makeRepo()} isActive={false} />
+    )
 
-      const markup = renderToStaticMarkup(
-        <WorktreeCard worktree={makeWorktree()} repo={makeRepo()} isActive={false} />
-      )
-
-      expect(markup).not.toContain('Parent workspace')
-      expect(markup).not.toContain('parent:')
-      expect(markup).not.toContain('from master')
-      expect(markup).not.toContain('Missing parent')
-      expect(markup).toContain('overflow-hidden')
-    },
-    WORKTREE_CARD_IMPORT_TIMEOUT_MS
-  )
+    expect(markup).not.toContain('Parent workspace')
+    expect(markup).not.toContain('parent:')
+    expect(markup).not.toContain('from master')
+    expect(markup).not.toContain('Missing parent')
+    expect(markup).toContain('overflow-hidden')
+  })
 
-  it(
-    'keeps the child workspace toggle chip',
-    async () => {
-      const { default: WorktreeCard } = await import('./WorktreeCard')
+  it('keeps the child workspace toggle chip', () => {
+    const markup = renderToStaticMarkup(
+      <WorktreeCard
+        worktree={makeWorktree()}
+        repo={makeRepo()}
+        isActive={false}
+        lineageChildCount={1}
+        lineageCollapsed={false}
+        onLineageToggle={vi.fn()}
+      />
+    )
+
+    expect(markup).toContain('aria-label="Hide 1 child workspace"')
+    expect(markup).toContain('1 child')
+    expect(markup).not.toContain('Parent workspace')
+  })
 
+  // Why: the legacy outdent is sized against the 22px status lane; without one it undercut the
+  // child's step (3px instead of 25px). The new card style nests in the surface and never had it.
+  const OUTDENT = '-ml-[1.125rem] mt-1.5 w-[calc(100%+1.125rem)] space-y-1'
+  const NO_LANE = 'ml-1 mt-1.5 w-[calc(100%-0.25rem)] space-y-1'
+  const STYLES = {
+    legacy: {},
+    compact: { compactWorktreeCards: true },
+    new: { experimentalNewWorktreeCardStyle: true }
+  }
+  it.each([
+    ['legacy', 'on', OUTDENT],
+    ['legacy', 'off', NO_LANE],
+    ['compact', 'on', OUTDENT],
+    ['compact', 'off', NO_LANE],
+    ['new', 'on', 'mt-1.5 space-y-1'],
+    ['new', 'off', 'mt-1.5 space-y-1']
+  ] as const)(
+    '%s card, status %s: lineage children list classes',
+    (style, status, expectedClasses) => {
+      settings = STYLES[style]
+      worktreeCardProperties = status === 'on' ? ['status'] : []
       const markup = renderToStaticMarkup(
         <WorktreeCard
           worktree={makeWorktree()}
           repo={makeRepo()}
           isActive={false}
-          lineageChildCount={1}
-          lineageCollapsed={false}
-          onLineageToggle={vi.fn()}
+          lineageChildren={<span data-testid="child">child</span>}
         />
       )
 
-      expect(markup).toContain('aria-label="Hide 1 child workspace"')
-      expect(markup).toContain('1 child')
-      expect(markup).not.toContain('Parent workspace')
-    },
-    WORKTREE_CARD_IMPORT_TIMEOUT_MS
-  )
-
-  // Why: the legacy outdent is sized against the status lane; without one it would undercut the step.
-  it(
-    'outdents legacy lineage children only over a status lane',
-    async () => {
-      const { default: WorktreeCard } = await import('./WorktreeCard')
-      const render = (): string =>
-        renderToStaticMarkup(
-          <WorktreeCard
-            worktree={makeWorktree()}
-            repo={makeRepo()}
-            isActive={false}
-            lineageChildren={<span>child</span>}
-          />
-        )
-
-      worktreeCardProperties = ['status']
-      expect(render()).toContain('-ml-[1.125rem] w-[calc(100%+1.125rem)]')
-      worktreeCardProperties = []
-      expect(render()).not.toContain('-ml-[1.125rem]')
-      expect(render()).toContain('ml-1 w-[calc(100%-0.25rem)]')
-    },
-    WORKTREE_CARD_IMPORT_TIMEOUT_MS
+      const listClasses = /<div class="([^"]*)"[^>]*><span data-testid="child">/.exec(markup)?.[1]
+      expect(listClasses?.split(' ').toSorted()).toEqual(expectedClasses.split(' ').toSorted())
+    }
   )
 })

From ff1b786fddfab82504e52025c63d7cd987fea942 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 14:17:33 -0700
Subject: [PATCH 12/37] fix(sidebar): a read-only card's child workspaces step
 in as the sidebar's do

The legacy outdent on a card's child list cancels its status lane, which in the sidebar is the
unread button plus the row gap: 1.125rem, exactly the outdent, not the 22px the previous fix
assumed. Its ml-1 for a card with no lane put the resume dialog's children 4px deeper per level
than the sidebar's (25px against 21px). With no lane there is now nothing to cancel and no
margin, which gives the sidebar's 21px (35px at depth 2).

Status is a fixed card property, so every live card has the lane: only a read-only card takes
this branch, and the live sidebar is unchanged. The tests now pin the outdent for live legacy
and compact cards and no margin for a read-only one, instead of an unreachable Status-off state.
---
 .../NativeChatResumeOnRestartGroups.test.tsx  |  9 ++++----
 .../sidebar/WorktreeCard.lineage.test.tsx     | 23 +++++++++----------
 .../sidebar/worktree-card-secondary-rows.tsx  |  8 +++----
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index 73947bf48f6b..c7392a913013 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -145,9 +145,9 @@ it.each([
   }
 )
 
-// Title step, child minus parent = list margin + wrapper inset + 7px (ml-1, border, padding). The
-// sidebar's legacy cards add their 22px status lane and outdent the list 18px: -18 + 14 + 7 + 22 =
-// 25px. A status-free card keeps 25px with an ml-1 list: 4 + 14 + 7.
+// Title step, child minus parent = list margin + wrapper inset + 7px (ml-1, border, padding) + the
+// child's status lane. Sidebar legacy cards: -18 + 14 + 7 + 18 = 21px (35px at depth 2). A
+// read-only card has no lane and no outdent: 0 + 14 + 7 = 21px.
 it('steps a legacy child in as far as the sidebar does, with no status lane', () => {
   render(false)
 
@@ -155,8 +155,7 @@ it('steps a legacy child in as far as the sidebar does, with no status lane', ()
   const wrapper = childCard.parentElement
   expect(container.querySelector('[data-worktree-card-status-slot]')).toBeNull()
   expect(wrapper?.style.paddingLeft).toBe('14px')
-  expect(wrapper?.parentElement?.className).toContain('ml-1')
-  expect(wrapper?.parentElement?.className).not.toContain('-ml-')
+  expect(wrapper?.parentElement?.className.split(' ').toSorted()).toEqual(['mt-1.5', 'space-y-1'])
 })
 
 it('keeps the new card style geometry', () => {
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
index 42d0a26567c1..bb59b673a3ef 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
@@ -140,32 +140,31 @@ describe('WorktreeCard lineage indicators', () => {
     expect(markup).not.toContain('Parent workspace')
   })
 
-  // Why: the legacy outdent is sized against the 22px status lane; without one it undercut the
-  // child's step (3px instead of 25px). The new card style nests in the surface and never had it.
+  // Why: legacy cards outdent their child list over the status lane; a read-only card has no lane
+  // to outdent over. The new card style nests in the surface and never had it.
   const OUTDENT = '-ml-[1.125rem] mt-1.5 w-[calc(100%+1.125rem)] space-y-1'
-  const NO_LANE = 'ml-1 mt-1.5 w-[calc(100%-0.25rem)] space-y-1'
   const STYLES = {
     legacy: {},
     compact: { compactWorktreeCards: true },
     new: { experimentalNewWorktreeCardStyle: true }
   }
   it.each([
-    ['legacy', 'on', OUTDENT],
-    ['legacy', 'off', NO_LANE],
-    ['compact', 'on', OUTDENT],
-    ['compact', 'off', NO_LANE],
-    ['new', 'on', 'mt-1.5 space-y-1'],
-    ['new', 'off', 'mt-1.5 space-y-1']
+    ['legacy', false, OUTDENT],
+    ['compact', false, OUTDENT],
+    ['new', false, 'mt-1.5 space-y-1'],
+    ['legacy', true, 'mt-1.5 space-y-1']
   ] as const)(
-    '%s card, status %s: lineage children list classes',
-    (style, status, expectedClasses) => {
+    '%s card, read-only %s: lineage children list classes',
+    (style, readOnly, expectedClasses) => {
       settings = STYLES[style]
-      worktreeCardProperties = status === 'on' ? ['status'] : []
+      // Why: status is a fixed card property, so every live card has the lane.
+      worktreeCardProperties = ['status']
       const markup = renderToStaticMarkup(
         <WorktreeCard
           worktree={makeWorktree()}
           repo={makeRepo()}
           isActive={false}
+          readOnly={readOnly}
           lineageChildren={<span data-testid="child">child</span>}
         />
       )
diff --git a/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx b/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
index d131b86b626a..d58e276cc8c6 100644
--- a/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
@@ -143,11 +143,9 @@ export function WorktreeCardSecondaryRows({
         <div
           className={cn(
             'mt-1.5 space-y-1',
-            // Why: the outdent pulls children back over the 22px status lane; with no lane, ml-1
-            // keeps the same step between parent and child titles.
-            showCombinedStatusSlot
-              ? '-ml-[1.125rem] w-[calc(100%+1.125rem)]'
-              : 'ml-1 w-[calc(100%-0.25rem)]'
+            // Why: the outdent cancels the status lane (unread button + gap = 1.125rem) so children
+            // step from the title; a read-only card has no lane, so there is nothing to cancel.
+            showCombinedStatusSlot && '-ml-[1.125rem] w-[calc(100%+1.125rem)]'
           )}
         >
           {lineageChildren}

From 5e73d7ea1a0e9a2c7066a51b54d3b7f9d54b598a Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 16:37:36 -0700
Subject: [PATCH 13/37] test(sidebar): a read-only card never carries main's
 multi-selected marker

Main now styles a multi-selected card through data-worktree-card-selected. The contract test
passes isMultiSelected, so it now asserts the marker stays off a read-only card, and drops the
context-menu event constant main removed from that module.
---
 .../components/sidebar/WorktreeCard.read-only-contract.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
index 5fc2206ad309..3a975ee78e67 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
@@ -157,7 +157,6 @@ vi.mock('./WorktreeContextMenu', () => ({
   default: ({ children }: { children: ReactNode }) => (
     <div data-testid="context-menu-wrapper">{children}</div>
   ),
-  CLOSE_ALL_CONTEXT_MENUS_EVENT: 'orca:test-close-context-menus',
   WORKTREE_CONTEXT_MENU_SCOPE_ATTR: 'data-orca-context-menu-scope',
   WORKTREE_NATIVE_CONTEXT_MENU_ATTR: 'data-worktree-native-context-menu'
 }))
@@ -304,6 +303,7 @@ describe('WorktreeCard read-only contract', () => {
         expect(liveState()).toEqual([])
         expect(container.querySelector('[data-testid="context-menu-wrapper"]')).toBeNull()
         expect(surface.getAttribute('data-worktree-card-active')).toBeNull()
+        expect(surface.getAttribute('data-worktree-card-selected')).toBeNull()
         expect(activateWorktreeFromSidebar).not.toHaveBeenCalled()
         for (const callback of Object.values(callbacks)) {
           expect(callback).not.toHaveBeenCalled()

From d92d318907cfcd7db18cb2673ff4c5418705f45e Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 18:22:47 -0700
Subject: [PATCH 14/37] fix(sidebar): preserve quiet read-only card geometry

---
 .../activity/activity-thread-hover-card.tsx   |  3 +-
 .../WorktreeCard.affiliate-list-mode.test.tsx | 34 +++++--
 .../sidebar/WorktreeCard.lineage.test.tsx     |  7 +-
 .../WorktreeCard.read-only-contract.test.tsx  | 74 +++++++++++++--
 .../sidebar/WorktreeCardStatusSlot.tsx        | 17 +++-
 .../sidebar/use-worktree-card-controller.ts   | 17 ++--
 ...ndary-details.store-subscriptions.test.tsx |  3 +-
 .../use-worktree-card-secondary-details.ts    | 12 +--
 .../components/sidebar/worktree-card-model.ts | 22 ++---
 .../sidebar/worktree-card-parent-content.tsx  | 48 +++++++---
 .../sidebar/worktree-card-presentation.tsx    |  5 +-
 .../sidebar/worktree-card-secondary-rows.tsx  | 94 +++++++++++--------
 .../sidebar/worktree-list/rows/item-row.tsx   | 82 +++-------------
 .../rows/worktree-row-geometry.ts             | 70 ++++++++++++++
 14 files changed, 301 insertions(+), 187 deletions(-)
 create mode 100644 src/renderer/src/components/sidebar/worktree-list/rows/worktree-row-geometry.ts

diff --git a/src/renderer/src/components/activity/activity-thread-hover-card.tsx b/src/renderer/src/components/activity/activity-thread-hover-card.tsx
index baad25d51932..50ee614aa89c 100644
--- a/src/renderer/src/components/activity/activity-thread-hover-card.tsx
+++ b/src/renderer/src/components/activity/activity-thread-hover-card.tsx
@@ -133,8 +133,7 @@ function ActivityThreadHoverCardContent({
     worktree,
     repo: repo ?? undefined,
     statusPrDisplay: null,
-    reviewInBadges: !foundation.newCardStyle,
-    showCacheTimer: true,
+    showLiveState: true,
     showStatus: true,
     showIssue: true,
     showLinearIssue: true,
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx
index d8f9e3735597..09ad2ac90547 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx
@@ -345,11 +345,11 @@ describe('WorktreeCard read-only mode', () => {
     container.remove()
   })
 
-  function renderReadOnly(): HTMLElement | null {
+  function renderReadOnly(overrides: Partial<Worktree> = {}): HTMLElement | null {
     act(() => {
       root.render(
         <WorktreeCard
-          worktree={makeWorktree()}
+          worktree={makeWorktree(overrides)}
           repo={makeRepo()}
           isActive={false}
           readOnly
@@ -386,19 +386,33 @@ describe('WorktreeCard read-only mode', () => {
     expect(container.querySelector('[data-testid="inline-agents"]')).toBeNull()
   })
 
-  it('shows no status, even with the status property on', () => {
+  it('keeps the status lane but draws it quiet: no button, sleep or unread', () => {
+    sleepMocks.sleeping = true
     for (const newCardStyle of [false, true]) {
       settings = { experimentalNewWorktreeCardStyle: newCardStyle }
-      renderReadOnly()
+      renderReadOnly({ isUnread: true })
 
-      expect(worktreeCardProperties).toContain('status')
-      expect(container.querySelector('[data-worktree-card-status-slot]')).toBeNull()
+      const lane = container.querySelector('[data-worktree-card-status-slot]')
+      expect(lane).not.toBeNull()
+      expect(lane?.querySelector('button')).toBeNull()
+      expect(lane?.querySelector('.lucide-moon, [data-worktree-unread-alert]')).toBeNull()
     }
   })
 
-  it('names the host even when the sidebar hides the host chip', () => {
-    renderReadOnly()
+  it.each([
+    ['legacy', {}, true],
+    ['compact', { compactWorktreeCards: true }, false],
+    ['new', { experimentalNewWorktreeCardStyle: true }, true]
+  ] as const)(
+    '%s: follows the host card property and sidebar compact rules',
+    (_, style, showsHost) => {
+      settings = style
+      renderReadOnly()
+      expect(container.textContent).not.toContain('Local Mac')
 
-    expect(container.textContent).toContain('Local Mac')
-  })
+      worktreeCardProperties = ['status', 'host']
+      renderReadOnly()
+      expect(container.textContent?.includes('Local Mac')).toBe(showsHost)
+    }
+  )
 })
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
index 4f19ba0fb3fa..0260cb6ed370 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
@@ -139,8 +139,7 @@ describe('WorktreeCard lineage indicators', () => {
     expect(markup).not.toContain('Parent workspace')
   })
 
-  // Why: legacy cards outdent their child list over the status lane; a read-only card has no lane
-  // to outdent over. The new card style nests in the surface and never had it.
+  // Why: read-only cards keep the status lane, so legacy children keep the sidebar's outdent.
   const OUTDENT = '-ml-[1.125rem] mt-1.5 w-[calc(100%+1.125rem)] space-y-1'
   const STYLES = {
     legacy: {},
@@ -151,7 +150,9 @@ describe('WorktreeCard lineage indicators', () => {
     ['legacy', false, OUTDENT],
     ['compact', false, OUTDENT],
     ['new', false, 'mt-1.5 space-y-1'],
-    ['legacy', true, 'mt-1.5 space-y-1']
+    ['legacy', true, OUTDENT],
+    ['compact', true, OUTDENT],
+    ['new', true, 'mt-1.5 space-y-1']
   ] as const)(
     '%s card, read-only %s: lineage children list classes',
     (style, readOnly, expectedClasses) => {
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
index 3a975ee78e67..18176cc6ebd5 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
@@ -7,6 +7,7 @@ import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { Repo } from '../../../../shared/repo-types'
 import type { WorktreeCardProperty } from '../../../../shared/ui-chrome-types'
 import type { Worktree } from '../../../../shared/worktree/types'
+import type { WorktreeStatus } from '@/lib/worktree-status'
 import { issueCacheKey } from '@/store/github/cache-identity'
 
 const activateWorktreeFromSidebar = vi.hoisted(() => vi.fn())
@@ -41,6 +42,9 @@ const ALL_CARD_PROPERTIES: WorktreeCardProperty[] = [
 
 let settings: Partial<GlobalSettings> = {}
 let deleteStateByWorktreeId: Record<string, unknown> = {}
+let activityStatus: WorktreeStatus = 'working'
+let sleeping = true
+const onChatClick = vi.fn()
 
 vi.mock('@/store', () => ({
   useAppStore: (selector: (state: unknown) => unknown) =>
@@ -133,11 +137,11 @@ vi.mock('@/runtime/runtime-rpc-client', () => ({
 }))
 
 vi.mock('./use-worktree-activity-status', () => ({
-  useWorktreeActivityStatus: () => 'working'
+  useWorktreeActivityStatus: () => activityStatus
 }))
 
 vi.mock('./use-worktree-sleep-state', () => ({
-  useIsSleepingWorktree: () => true
+  useIsSleepingWorktree: () => sleeping
 }))
 
 vi.mock('./CacheTimer', () => ({
@@ -164,7 +168,7 @@ vi.mock('./WorktreeContextMenu', () => ({
 import WorktreeCard from './WorktreeCard'
 
 const INTERACTIVE =
-  'button, a[href], input, textarea, select, [tabindex]:not([tabindex="-1"]), [role="button"], [draggable="true"]'
+  'button, a, input, textarea, select, [tabindex], [role="button"], [draggable="true"]'
 
 const CARD_STYLES: { name: string; settings: Partial<GlobalSettings> }[] = [
   { name: 'legacy', settings: { promptCacheTimerEnabled: true } },
@@ -213,6 +217,8 @@ describe('WorktreeCard read-only contract', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
+    activityStatus = 'working'
+    sleeping = true
     deleteStateByWorktreeId = {}
     container = document.createElement('div')
     document.body.appendChild(container)
@@ -225,11 +231,11 @@ describe('WorktreeCard read-only contract', () => {
   })
 
   /** Every feature on and every handler passed, so only the card itself can keep it inert. */
-  function render(readOnly: boolean): HTMLElement {
+  function render(readOnly: boolean, overrides: Partial<Worktree> = {}): HTMLElement {
     act(() => {
       root.render(
         <WorktreeCard
-          worktree={worktree}
+          worktree={{ ...worktree, ...overrides }}
           repo={repo}
           isActive
           isActiveSurface
@@ -243,11 +249,14 @@ describe('WorktreeCard read-only contract', () => {
           flushSurface
           nativeDragEnabled
           lineageChildCount={2}
+          lineageCollapsed
           lineageChildren={<span>children</span>}
           readOnly={readOnly}
           agentRows={
             <div data-testid="caller-rows">
-              <button type="button">chat</button>
+              <button type="button" onClick={onChatClick}>
+                chat
+              </button>
             </div>
           }
           {...callbacks}
@@ -261,15 +270,45 @@ describe('WorktreeCard read-only contract', () => {
     return surface
   }
 
+  it.each([
+    ['branch', null, null],
+    ['GitHub review', 42, null],
+    ['GitLab review', null, 43]
+  ] as const)('%s: read-only uses the quiet sidebar glyph', (_, linkedPR, linkedGitLabMR) => {
+    settings = { experimentalNewWorktreeCardStyle: true }
+    const overrides = { linkedPR, linkedGitLabMR, isUnread: false }
+    render(true, overrides)
+    const readOnlyGlyph = container.querySelector('[data-worktree-card-status-slot] svg')?.outerHTML
+    expect(readOnlyGlyph).toBeDefined()
+    expect(liveState()).toEqual([])
+
+    activityStatus = 'inactive'
+    sleeping = false
+    render(false, overrides)
+    expect(container.querySelector('[data-worktree-card-status-slot] svg')?.outerHTML).toBe(
+      readOnlyGlyph
+    )
+  })
+
   function controlsOutsideCallerRows(): string[] {
     return [...container.querySelectorAll(INTERACTIVE)]
       .filter((element) => !element.closest('[data-testid="caller-rows"]'))
       .map((element) => element.getAttribute('aria-label') ?? element.outerHTML.slice(0, 80))
   }
 
+  // Why: the fixture is working, asleep and unread, so a lane drawn from live state shows it.
   function liveState(): string[] {
+    const lane = container.querySelector('[data-worktree-card-status-slot]')
+    const title = container.querySelector('[data-worktree-title-inline-rename]')
     return [
-      container.querySelector('[data-worktree-card-status-slot]') && 'status',
+      /Working|Failed|Done/.test(lane?.textContent ?? '') && 'live status',
+      lane?.querySelector(
+        '[data-agent-working-spinner], .animate-spin, .bg-red-500, .bg-emerald-500'
+      ) && 'live glyph',
+      lane?.querySelector('.lucide-moon') && 'sleep glyph',
+      lane?.querySelector('.lucide-bell, .text-amber-500, [data-worktree-unread-alert]') &&
+        'unread glyph',
+      title?.className.includes('font-semibold') && 'unread title',
       container.querySelector('[data-worktree-sleeping-dim]') && 'sleep dim',
       container.querySelector('[data-testid="cache-timer"]') && 'cache countdown',
       container.textContent?.includes('Queued for deletion') && 'delete overlay'
@@ -281,7 +320,8 @@ describe('WorktreeCard read-only contract', () => {
       settings = style.settings
       render(false)
       expect(controlsOutsideCallerRows().length).toBeGreaterThan(0)
-      expect(liveState()).toContain('status')
+      expect(liveState()).toContain('live status')
+      expect(liveState()).toContain('unread title')
       deleteStateByWorktreeId = { [worktree.id]: { isDeleting: true, phase: 'queued' } }
       render(false)
       expect(liveState()).toContain('delete overlay')
@@ -301,13 +341,31 @@ describe('WorktreeCard read-only contract', () => {
 
         expect(controlsOutsideCallerRows()).toEqual([])
         expect(liveState()).toEqual([])
+        expect(container.querySelector('[data-worktree-card-status-slot]')).not.toBeNull()
+        expect(container.textContent).toContain('2 children')
+        expect(container.querySelector('.-rotate-90')).toBeNull()
         expect(container.querySelector('[data-testid="context-menu-wrapper"]')).toBeNull()
         expect(surface.getAttribute('data-worktree-card-active')).toBeNull()
         expect(surface.getAttribute('data-worktree-card-selected')).toBeNull()
+        expect(surface.getAttribute('data-worktree-lineage-drop-target')).toBeNull()
+        expect(surface.className).not.toContain('reveal-highlight')
         expect(activateWorktreeFromSidebar).not.toHaveBeenCalled()
         for (const callback of Object.values(callbacks)) {
           expect(callback).not.toHaveBeenCalled()
         }
+        const chat = container.querySelector('[data-testid="caller-rows"] button')
+        act(() => chat?.dispatchEvent(new MouseEvent('click', { bubbles: true })))
+        expect(onChatClick).toHaveBeenCalledTimes(deleting ? 2 : 1)
+      }
+    })
+
+    it(`${style.name} card: activity changes never enter the quiet status lane`, () => {
+      settings = style.settings
+      for (const status of ['working', 'failed', 'done', 'inactive'] as const) {
+        activityStatus = status
+        render(true)
+        expect(liveState()).toEqual([])
+        expect(controlsOutsideCallerRows()).toEqual([])
       }
     })
   }
diff --git a/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx b/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx
index aaceddad4641..0523d3d6e3b1 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx
@@ -95,6 +95,16 @@ function getReviewStatusLabel(review: WorktreeCardPrDisplay): string {
 
 export function WorktreeCardStatusSlot({
   worktreeId,
+  ...props
+}: WorktreeCardStatusSlotProps): React.JSX.Element | null {
+  const status = useWorktreeActivityStatus(worktreeId)
+  const isSleeping = useIsSleepingWorktree(worktreeId)
+  return <WorktreeCardStatusSlotView status={status} isSleeping={isSleeping} {...props} />
+}
+
+export function WorktreeCardStatusSlotView({
+  status,
+  isSleeping,
   showStatus,
   showUnreadAction,
   isUnread,
@@ -106,9 +116,10 @@ export function WorktreeCardStatusSlot({
   hasBranchIdentity = false,
   branchIdentityLabel,
   className
-}: WorktreeCardStatusSlotProps): React.JSX.Element | null {
-  const status = useWorktreeActivityStatus(worktreeId)
-  const isSleeping = useIsSleepingWorktree(worktreeId)
+}: Omit<WorktreeCardStatusSlotProps, 'worktreeId'> & {
+  status: WorktreeStatus
+  isSleeping: boolean
+}): React.JSX.Element | null {
   const statusLabel = getWorktreeStatusLabel(status) || status
   // Why: sleep must stay distinct from awake completion; a sleeping workspace
   // never collapses into branch/PR, even when retained done rows keep its
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
index 33c1de63c6df..7368bd3e5a5d 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
@@ -15,17 +15,15 @@ import { useIsSleepingWorktree } from './use-worktree-sleep-state'
 export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
   const { worktree, repo, readOnly } = props
   const foundation = useWorktreeCardFoundation({ worktree, repo })
-  // Why: the only read of `readOnly` past toReadOnlyCardProps; views see the outcome, never the flag.
-  // A read-only card loses its own controls and the live state that belongs to now, not the picture.
+  // Why: resolve read-only policy here so views share one quiet, passive presentation.
   const interactive = !readOnly
+  const quietStatusLane = readOnly
   const cardProps = useMemo(
     () => (readOnly ? getReadOnlyCardProperties(foundation.cardProps) : foundation.cardProps),
     [readOnly, foundation.cardProps]
   )
   const isSleeping = useIsSleepingWorktree(worktree.id) && !readOnly
   const deleteState = readOnly ? undefined : foundation.deleteState
-  // Why: the new card shows its review in the status lane, which a read-only card lacks.
-  const reviewInBadges = !foundation.newCardStyle || readOnly
   const review = useWorktreeCardReviewDetails({
     worktree,
     repo,
@@ -54,7 +52,7 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
   const showCli = cardProps.includes('cli')
   const showComment = cardProps.includes('comment')
   const showPorts = cardProps.includes('ports')
-  const shouldRefreshHostedReview = reviewInBadges ? showPR : showStatus
+  const shouldRefreshHostedReview = foundation.newCardStyle ? showStatus : showPR
   const detailsHoverControl = useWorktreeCardDetailsHoverControl()
   const hoverDetailsOpen = detailsHoverControl.hoverOpen
 
@@ -126,8 +124,7 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     worktree,
     repo,
     statusPrDisplay: props.statusPrDisplay,
-    reviewInBadges,
-    showCacheTimer: !readOnly,
+    showLiveState: !readOnly,
     showStatus,
     showIssue,
     showLinearIssue,
@@ -162,8 +159,8 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     cardProps,
     deleteState,
     interactive,
+    quietStatusLane,
     isSleeping,
-    reviewInBadges,
     ...review,
     ...linked,
     detailsHoverControl,
@@ -180,6 +177,10 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     ...activation,
     showDeleteQuickAction,
     ...workspaceActions,
+    // Why: a read-only card's children are always listed, so its chip names them without a toggle.
+    showLineageChildChip: readOnly
+      ? props.lineageChildCount > 0
+      : workspaceActions.showLineageChildChip,
     ...secondary
   }
 }
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx
index f3784ccf7fe4..f50bf8277c2b 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx
+++ b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx
@@ -75,8 +75,7 @@ function secondaryDetailsArgs(settings: GlobalSettings) {
     worktree: makeWorktree(),
     repo: undefined,
     statusPrDisplay: null,
-    reviewInBadges: true,
-    showCacheTimer: true,
+    showLiveState: true,
     showStatus: false,
     showIssue: false,
     showLinearIssue: false,
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
index 6a3f2ca368f1..ca095a260935 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
@@ -20,8 +20,7 @@ export function useWorktreeCardSecondaryDetails({
   worktree,
   repo,
   statusPrDisplay,
-  reviewInBadges,
-  showCacheTimer,
+  showLiveState,
   showStatus,
   showIssue,
   showLinearIssue,
@@ -65,8 +64,7 @@ export function useWorktreeCardSecondaryDetails({
     ReviewDetails,
     'prDisplay' | 'linkedGitLabMR' | 'linkedBitbucketPR' | 'linkedAzureDevOpsPR' | 'linkedGiteaPR'
   > & {
-    reviewInBadges: boolean
-    showCacheTimer: boolean
+    showLiveState: boolean
     showStatus: boolean
     showIssue: boolean
     showLinearIssue: boolean
@@ -78,7 +76,7 @@ export function useWorktreeCardSecondaryDetails({
     showPorts: boolean
   }) {
   // Why: unread lives in the left status lane, so the Status toggle owns both the dot/PR slot and unread emphasis.
-  const showUnreadEmphasis = showStatus && worktree.isUnread
+  const showUnreadEmphasis = showLiveState && showStatus && worktree.isUnread
   const hoverIssue = issueDisplay
   const hoverLinearIssue = linearIssueDisplay
   const hoverJiraIssue = jiraIssueDisplay
@@ -101,7 +99,7 @@ export function useWorktreeCardSecondaryDetails({
     showInlineAgentList &&
     agentActivityDisplayMode === 'compact' &&
     compactInlineAgentRows.length > 0
-  const showAggregateCacheTimer = showCacheTimer && !compactCards && !compactInlineAgentRowsVisible
+  const showAggregateCacheTimer = showLiveState && !compactCards && !compactInlineAgentRowsVisible
   const handleOpenGitHubIssueInOrca = useCallback(
     (e: React.MouseEvent) => {
       e.stopPropagation()
@@ -235,7 +233,7 @@ export function useWorktreeCardSecondaryDetails({
     issue: metaIssue,
     linearIssue: metaLinearIssue,
     jiraIssue: metaJiraIssue,
-    review: reviewInBadges ? metaReview : null,
+    review: newCardStyle ? null : metaReview,
     comment: metaComment,
     automationProvenance: metaAutomationProvenance,
     cliProvenance: metaCliProvenance
diff --git a/src/renderer/src/components/sidebar/worktree-card-model.ts b/src/renderer/src/components/sidebar/worktree-card-model.ts
index 5b62faa1557e..29cc75cb0160 100644
--- a/src/renderer/src/components/sidebar/worktree-card-model.ts
+++ b/src/renderer/src/components/sidebar/worktree-card-model.ts
@@ -53,8 +53,7 @@ export type WorktreeCardProps = {
   onCardDragEnd?: (event: React.DragEvent<HTMLDivElement>) => void
   nativeDragEnabled?: boolean
   affiliateListMode?: boolean
-  /** A static picture of the card for another surface: nothing on it responds, it shows no live
-   *  state, and `agentRows` stands in for the live agent list. See `toReadOnlyCardProps`. */
+  /** Passive sidebar layout without live state; caller-owned `agentRows` remain interactive. */
   readOnly?: boolean
   agentRows?: React.ReactNode
   statusPrDisplay?: WorktreeCardPrDisplay | null
@@ -95,10 +94,7 @@ export type ResolvedWorktreeCardProps = Omit<WorktreeCardProps, DefaultedWorktre
   statusPrDisplay: WorktreeCardPrDisplay | null
 }
 
-/**
- * What a read-only card keeps of its props: only what it pictures. Every handler, selection and
- * active flag is dropped here, so a caller cannot make one live by passing it.
- */
+// Why: allowlist presentation props so caller-supplied handlers cannot make a read-only card act.
 export function toReadOnlyCardProps(props: ResolvedWorktreeCardProps): ResolvedWorktreeCardProps {
   return {
     worktree: props.worktree,
@@ -118,7 +114,7 @@ export function toReadOnlyCardProps(props: ResolvedWorktreeCardProps): ResolvedW
     revealHighlight: false,
     revealHighlightTone: 'default',
     nativeDragEnabled: false,
-    lineageChildCount: 0,
+    lineageChildCount: props.lineageChildCount,
     lineageCollapsed: false,
     isLineageDropTarget: false,
     affiliateListMode: true,
@@ -127,19 +123,13 @@ export function toReadOnlyCardProps(props: ResolvedWorktreeCardProps): ResolvedW
   }
 }
 
-// Why: these show the workspace as it is now, which misleads on a picture of another moment; and
-// with no sidebar around it, the host is always worth naming.
-const READ_ONLY_HIDDEN_CARD_PROPERTIES = new Set<WorktreeCardProperty>([
-  'status',
-  'ports',
-  'inline-agents'
-])
+// Why: recovery cards replace live ports and agents while keeping the sidebar's quiet status lane.
+const READ_ONLY_HIDDEN_CARD_PROPERTIES = new Set<WorktreeCardProperty>(['ports', 'inline-agents'])
 
 export function getReadOnlyCardProperties(
   cardProps: readonly WorktreeCardProperty[]
 ): WorktreeCardProperty[] {
-  const kept = cardProps.filter((property) => !READ_ONLY_HIDDEN_CARD_PROPERTIES.has(property))
-  return kept.includes('host') ? kept : [...kept, 'host']
+  return cardProps.filter((property) => !READ_ONLY_HIDDEN_CARD_PROPERTIES.has(property))
 }
 
 export const EMPTY_WORKSPACE_PORTS = []
diff --git a/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx b/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx
index e5aea802b84d..df77fe3c6050 100644
--- a/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx
@@ -7,7 +7,7 @@ import { WorktreeCardDetailsHover } from './WorktreeCardMeta'
 import { WorktreeCardPortsDetails } from './WorktreeCardPorts'
 import type { WorktreeCardPresentation } from './worktree-card-presentation'
 import { WorktreeCardSecondaryRows } from './worktree-card-secondary-rows'
-import { WorktreeCardStatusSlot } from './WorktreeCardStatusSlot'
+import { WorktreeCardStatusSlot, WorktreeCardStatusSlotView } from './WorktreeCardStatusSlot'
 import type { WorktreeCardController } from './use-worktree-card-controller'
 
 export function WorktreeCardParentContent({
@@ -20,6 +20,7 @@ export function WorktreeCardParentContent({
   const {
     worktree,
     affiliateListMode,
+    quietStatusLane,
     newCardStyle,
     lineageChildren,
     showStatus,
@@ -134,22 +135,41 @@ export function WorktreeCardParentContent({
           className={cn(
             'flex shrink-0 justify-center',
             newCardStyle ? 'mr-1 w-5 items-center' : 'items-start pt-[2px]',
-            affiliateListMode && 'px-1'
+            // Why: a quiet lane stands in for the sidebar's own, so it keeps the sidebar's width.
+            affiliateListMode && !quietStatusLane && 'px-1'
           )}
           data-worktree-card-status-slot=""
         >
-          <WorktreeCardStatusSlot
-            worktreeId={worktree.id}
-            showStatus={showStatus}
-            showUnreadAction={showUnreadQuickAction}
-            isUnread={worktree.isUnread}
-            unreadTooltip={unreadTooltip}
-            onPointerDown={stopQuickActionPointerPropagation}
-            onToggleUnread={handleToggleUnreadQuick}
-            prDisplay={statusLaneReview}
-            newCardStyle={newCardStyle}
-            hasBranchIdentity={Boolean(branchIdentityDisplay)}
-          />
+          {quietStatusLane ? (
+            // Why: a quiet legacy lane keeps the 16px footprint of the sidebar's unread button.
+            <WorktreeCardStatusSlotView
+              status="inactive"
+              isSleeping={false}
+              showStatus={showStatus}
+              showUnreadAction={false}
+              isUnread={false}
+              unreadTooltip={unreadTooltip}
+              onPointerDown={stopQuickActionPointerPropagation}
+              onToggleUnread={handleToggleUnreadQuick}
+              prDisplay={statusLaneReview}
+              newCardStyle={newCardStyle}
+              hasBranchIdentity={Boolean(branchIdentityDisplay)}
+              className={newCardStyle ? undefined : 'size-4'}
+            />
+          ) : (
+            <WorktreeCardStatusSlot
+              worktreeId={worktree.id}
+              showStatus={showStatus}
+              showUnreadAction={showUnreadQuickAction}
+              isUnread={worktree.isUnread}
+              unreadTooltip={unreadTooltip}
+              onPointerDown={stopQuickActionPointerPropagation}
+              onToggleUnread={handleToggleUnreadQuick}
+              prDisplay={statusLaneReview}
+              newCardStyle={newCardStyle}
+              hasBranchIdentity={Boolean(branchIdentityDisplay)}
+            />
+          )}
         </div>
       ) : null}
 
diff --git a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
index 30b61d41b10b..2993a72b9360 100644
--- a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
@@ -68,8 +68,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     canUnlinkReview,
     handleUnlinkReview,
     detailsHoverControl,
-    showDeleteQuickAction,
-    reviewInBadges
+    showDeleteQuickAction
   } = card
 
   // Why: pinned trees mix repos, so the repo icon shows regardless of groupBy's hideRepoBadge.
@@ -216,7 +215,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
             issue={metaIssue}
             linearIssue={metaLinearIssue}
             jiraIssue={metaJiraIssue}
-            review={reviewInBadges ? metaReview : null}
+            review={newCardStyle ? null : metaReview}
             comment={metaComment}
             automationProvenance={metaAutomationProvenance}
             cliProvenance={metaCliProvenance}
diff --git a/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx b/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
index d58e276cc8c6..8955dc4ea699 100644
--- a/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
@@ -10,6 +10,9 @@ import WorktreeCardAgents from './WorktreeCardAgents'
 import type { WorktreeCardPresentation } from './worktree-card-presentation'
 import type { WorktreeCardController } from './use-worktree-card-controller'
 
+const LINEAGE_CHIP_LOOK =
+  'relative z-10 h-[18px] max-w-[8rem] gap-1 rounded-md border border-worktree-sidebar-border bg-worktree-sidebar px-1.5 text-[10px] font-medium leading-none text-muted-foreground shadow-none'
+
 export function WorktreeCardSecondaryRows({
   card,
   presentation
@@ -34,9 +37,19 @@ export function WorktreeCardSecondaryRows({
     showLineageChildChip,
     lineageChildAriaLabel,
     childWorkspaceShortLabel,
-    isDeleting
+    isDeleting,
+    interactive
   } = card
-  const { hasMetaRow, showCombinedStatusSlot } = presentation
+  const { hasMetaRow } = presentation
+  const lineageChipContent = (
+    <>
+      <Workflow className="size-2.5" />
+      <span className="truncate">{childWorkspaceShortLabel}</span>
+      <ChevronDown
+        className={cn('size-2.5 transition-transform', lineageCollapsed && '-rotate-90')}
+      />
+    </>
+  )
 
   return (
     <>
@@ -106,48 +119,49 @@ export function WorktreeCardSecondaryRows({
             color: 'color-mix(in srgb, var(--muted-foreground) 42%, var(--worktree-sidebar))'
           }}
         >
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <Button
-                type="button"
-                variant="ghost"
-                size="xs"
-                className="relative z-10 h-[18px] max-w-[8rem] gap-1 rounded-md border border-worktree-sidebar-border bg-worktree-sidebar px-1.5 text-[10px] font-medium leading-none text-muted-foreground shadow-none hover:bg-worktree-sidebar-accent hover:text-foreground focus-visible:ring-1 focus-visible:ring-worktree-sidebar-ring"
-                aria-label={lineageChildAriaLabel}
-                aria-expanded={!lineageCollapsed}
-                onClick={onLineageToggle}
-              >
-                <Workflow className="size-2.5" />
-                <span className="truncate">{childWorkspaceShortLabel}</span>
-                <ChevronDown
-                  className={cn('size-2.5 transition-transform', lineageCollapsed && '-rotate-90')}
-                />
-              </Button>
-            </TooltipTrigger>
-            <TooltipContent side="right" sideOffset={8}>
-              {lineageCollapsed
-                ? translate(
-                    'auto.components.sidebar.WorktreeCard.8cb634cda6',
-                    'Show child workspaces'
-                  )
-                : translate(
-                    'auto.components.sidebar.WorktreeCard.57eaa61b55',
-                    'Hide child workspaces'
-                  )}
-            </TooltipContent>
-          </Tooltip>
+          {interactive ? (
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="xs"
+                  className="relative z-10 h-[18px] max-w-[8rem] gap-1 rounded-md border border-worktree-sidebar-border bg-worktree-sidebar px-1.5 text-[10px] font-medium leading-none text-muted-foreground shadow-none hover:bg-worktree-sidebar-accent hover:text-foreground focus-visible:ring-1 focus-visible:ring-worktree-sidebar-ring"
+                  aria-label={lineageChildAriaLabel}
+                  aria-expanded={!lineageCollapsed}
+                  onClick={onLineageToggle}
+                >
+                  {lineageChipContent}
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent side="right" sideOffset={8}>
+                {lineageCollapsed
+                  ? translate(
+                      'auto.components.sidebar.WorktreeCard.8cb634cda6',
+                      'Show child workspaces'
+                    )
+                  : translate(
+                      'auto.components.sidebar.WorktreeCard.57eaa61b55',
+                      'Hide child workspaces'
+                    )}
+              </TooltipContent>
+            </Tooltip>
+          ) : (
+            // Why: a read-only card always lists its children, so the chip only names them.
+            <span
+              className={cn(
+                'inline-flex shrink-0 items-center justify-center whitespace-nowrap',
+                LINEAGE_CHIP_LOOK
+              )}
+            >
+              {lineageChipContent}
+            </span>
+          )}
         </div>
       )}
 
       {!newCardStyle && lineageChildren && (
-        <div
-          className={cn(
-            'mt-1.5 space-y-1',
-            // Why: the outdent cancels the status lane (unread button + gap = 1.125rem) so children
-            // step from the title; a read-only card has no lane, so there is nothing to cancel.
-            showCombinedStatusSlot && '-ml-[1.125rem] w-[calc(100%+1.125rem)]'
-          )}
-        >
+        <div className="-ml-[1.125rem] mt-1.5 w-[calc(100%+1.125rem)] space-y-1">
           {lineageChildren}
         </div>
       )}
diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/item-row.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/item-row.tsx
index 6b21ffea56e9..382154d21243 100644
--- a/src/renderer/src/components/sidebar/worktree-list/rows/item-row.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/item-row.tsx
@@ -10,15 +10,8 @@ import {
 import WorktreeCard, { type ActiveSurfaceVariant } from '../../WorktreeCard'
 import { PINNED_GROUP_KEY } from '../grouping/group-keys'
 import type { WorktreeGroupBy } from '../grouping/row-types'
-import {
-  getFolderBackedRepoWorktreeCardContentIndent,
-  getFolderBackedRepoWorktreeCardSurfaceInset,
-  getLineageChildrenInlineStyle,
-  getLineageNestedRowGeometry,
-  getWorktreeCardContentIndent,
-  getWorktreeCardSurfaceInset,
-  LINEAGE_CHILDREN_INLINE_OFFSET
-} from './indentation'
+import { getLineageChildrenInlineStyle, LINEAGE_CHILDREN_INLINE_OFFSET } from './indentation'
+import { getWorktreeRowGeometry } from './worktree-row-geometry'
 import type { LineageToggleHandler } from '../../worktree-lineage-toggle-handler-cache'
 import { stopNestedWorktreeCardBubble } from './header-event-guards'
 import type { WorktreeItemRow } from '../listing/renderable-rows'
@@ -63,66 +56,6 @@ export type WorktreeItemRowContext = {
   onCardDragEnd: () => void
 }
 
-// Geometry differs three ways: a plain grouped row, a lineage child inheriting its parent's
-// surface, and a row inside a folder-backed project group.
-function getWorktreeItemRowGeometry(
-  ctx: WorktreeItemRowContext,
-  itemRow: WorktreeItemRow,
-  nested: boolean
-): { surfaceInset: number; cardContentIndent: number; lineageChildrenInlineOffset?: number } {
-  const projectGroupId = itemRow.repo?.projectGroupId
-  const isFolderBackedRepoChild =
-    ctx.groupBy === 'repo' &&
-    Boolean(projectGroupId && ctx.folderBackedProjectGroupIds.has(projectGroupId))
-  // Why: experimental in-card lineage inherits the parent surface; legacy cards keep depth-based nested geometry.
-  const paddingDepth = nested ? Math.max(0, itemRow.depth - 1) : itemRow.depth
-  const getCardContentIndent = (lineageDepth: number): number =>
-    isFolderBackedRepoChild
-      ? getFolderBackedRepoWorktreeCardContentIndent({
-          groupDepth: itemRow.groupDepth,
-          lineageDepth
-        })
-      : getWorktreeCardContentIndent({
-          isGrouped: ctx.groupBy !== 'none',
-          groupDepth: itemRow.groupDepth,
-          lineageDepth
-        })
-  const nestedLineageGeometry = nested
-    ? getLineageNestedRowGeometry({
-        experimentalNewWorktreeCardStyle: ctx.settings?.experimentalNewWorktreeCardStyle === true,
-        inheritedCardContentIndent: getCardContentIndent(0),
-        lineageDepth: itemRow.depth
-      })
-    : null
-  // Why: grouped rows inherit their header depth, but the card surface still spans the full row.
-  const paddingLeft =
-    nested && ctx.groupBy !== 'none'
-      ? getWorktreeCardContentIndent({
-          isGrouped: false,
-          groupDepth: itemRow.groupDepth,
-          lineageDepth: paddingDepth
-        })
-      : getCardContentIndent(paddingDepth)
-  const surfaceInset = nestedLineageGeometry
-    ? nestedLineageGeometry.surfaceInset
-    : isFolderBackedRepoChild
-      ? getFolderBackedRepoWorktreeCardSurfaceInset({
-          groupDepth: itemRow.groupDepth,
-          lineageDepth: paddingDepth
-        })
-      : getWorktreeCardSurfaceInset({
-          isGrouped: ctx.groupBy !== 'none',
-          groupDepth: itemRow.groupDepth
-        })
-  return {
-    surfaceInset,
-    cardContentIndent: nestedLineageGeometry
-      ? nestedLineageGeometry.cardContentIndent
-      : Math.max(0, paddingLeft - surfaceInset),
-    lineageChildrenInlineOffset: nestedLineageGeometry?.lineageChildrenInlineOffset
-  }
-}
-
 export function renderWorktreeItemRow(
   ctx: WorktreeItemRowContext,
   itemRow: WorktreeItemRow,
@@ -130,8 +63,15 @@ export function renderWorktreeItemRow(
   lineageChildren?: React.ReactNode,
   forceActiveSurface = false
 ): React.JSX.Element {
-  const { surfaceInset, cardContentIndent, lineageChildrenInlineOffset } =
-    getWorktreeItemRowGeometry(ctx, itemRow, nested)
+  const { surfaceInset, cardContentIndent, lineageChildrenInlineOffset } = getWorktreeRowGeometry({
+    groupBy: ctx.groupBy,
+    folderBackedProjectGroupIds: ctx.folderBackedProjectGroupIds,
+    newCardStyle: ctx.settings?.experimentalNewWorktreeCardStyle === true,
+    projectGroupId: itemRow.repo?.projectGroupId,
+    depth: itemRow.depth,
+    groupDepth: itemRow.groupDepth,
+    nested
+  })
   const lineageChildrenStyle = lineageChildren
     ? getLineageChildrenInlineStyle(lineageChildrenInlineOffset ?? LINEAGE_CHILDREN_INLINE_OFFSET)
     : undefined
diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/worktree-row-geometry.ts b/src/renderer/src/components/sidebar/worktree-list/rows/worktree-row-geometry.ts
new file mode 100644
index 000000000000..db4286611b77
--- /dev/null
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/worktree-row-geometry.ts
@@ -0,0 +1,70 @@
+import type { WorktreeGroupBy } from '../grouping/row-types'
+import {
+  getFolderBackedRepoWorktreeCardContentIndent,
+  getFolderBackedRepoWorktreeCardSurfaceInset,
+  getLineageNestedRowGeometry,
+  getWorktreeCardContentIndent,
+  getWorktreeCardSurfaceInset
+} from './indentation'
+
+export function getWorktreeRowGeometry(args: {
+  groupBy: WorktreeGroupBy
+  folderBackedProjectGroupIds: ReadonlySet<string>
+  newCardStyle: boolean
+  projectGroupId: string | null | undefined
+  depth: number
+  groupDepth: number
+  nested: boolean
+}): { surfaceInset: number; cardContentIndent: number; lineageChildrenInlineOffset?: number } {
+  const { groupBy, projectGroupId, depth, groupDepth, nested } = args
+  const isFolderBackedRepoChild =
+    groupBy === 'repo' &&
+    Boolean(projectGroupId && args.folderBackedProjectGroupIds.has(projectGroupId))
+  // Why: experimental in-card lineage inherits the parent surface; legacy cards keep depth-based nested geometry.
+  const paddingDepth = nested ? Math.max(0, depth - 1) : depth
+  const getCardContentIndent = (lineageDepth: number): number =>
+    isFolderBackedRepoChild
+      ? getFolderBackedRepoWorktreeCardContentIndent({
+          groupDepth,
+          lineageDepth
+        })
+      : getWorktreeCardContentIndent({
+          isGrouped: groupBy !== 'none',
+          groupDepth,
+          lineageDepth
+        })
+  const nestedLineageGeometry = nested
+    ? getLineageNestedRowGeometry({
+        experimentalNewWorktreeCardStyle: args.newCardStyle,
+        inheritedCardContentIndent: getCardContentIndent(0),
+        lineageDepth: depth
+      })
+    : null
+  // Why: grouped rows inherit their header depth, but the card surface still spans the full row.
+  const paddingLeft =
+    nested && groupBy !== 'none'
+      ? getWorktreeCardContentIndent({
+          isGrouped: false,
+          groupDepth,
+          lineageDepth: paddingDepth
+        })
+      : getCardContentIndent(paddingDepth)
+  const surfaceInset = nestedLineageGeometry
+    ? nestedLineageGeometry.surfaceInset
+    : isFolderBackedRepoChild
+      ? getFolderBackedRepoWorktreeCardSurfaceInset({
+          groupDepth,
+          lineageDepth: paddingDepth
+        })
+      : getWorktreeCardSurfaceInset({
+          isGrouped: groupBy !== 'none',
+          groupDepth
+        })
+  return {
+    surfaceInset,
+    cardContentIndent: nestedLineageGeometry
+      ? nestedLineageGeometry.cardContentIndent
+      : Math.max(0, paddingLeft - surfaceInset),
+    lineageChildrenInlineOffset: nestedLineageGeometry?.lineageChildrenInlineOffset
+  }
+}

From cf86c0bc407186a9056e58e8f8b64ddfe65b2570 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 18:23:14 -0700
Subject: [PATCH 15/37] fix(native-chat): match resume cards to sidebar rows

---
 .../NativeChatResumeOnRestartGroups.test.tsx  | 224 ++++++++++++++++--
 .../NativeChatResumeOnRestartGroups.tsx       |  89 ++++---
 .../NativeChatResumeOnRestartModal.test.tsx   |   7 +
 .../NativeChatResumeOnRestartModal.tsx        |  13 +-
 4 files changed, 270 insertions(+), 63 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index c7392a913013..f56c92bc31e8 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -2,18 +2,25 @@
 
 import { act } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, expect, it } from 'vitest'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '../store'
 import { getDefaultSettings } from '../../../shared/constants'
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import type { Worktree } from '../../../shared/worktree/types'
 import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
 import { TooltipProvider } from './ui/tooltip'
+import {
+  renderWorktreeItemRow,
+  type WorktreeItemRowContext
+} from './sidebar/worktree-list/rows/item-row'
+import { WORKTREE_ROW_DRAG_INITIAL_STATE } from './sidebar/worktree-list/drag/row-state'
+import type { WorktreeItemRow } from './sidebar/worktree-list/listing/renderable-rows'
 import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
 
 globalThis.IS_REACT_ACT_ENVIRONMENT = true
 let root: Root
-let container: HTMLDivElement
+let container: HTMLElement
+const liveRoots: { root: Root; element: HTMLElement }[] = []
 
 function worktree(name: string, overrides: Partial<Worktree> = {}): Worktree {
   return {
@@ -54,7 +61,11 @@ function candidate(sessionId: string, workspace: Worktree): ResumeCandidate {
 
 function render(
   newCardStyle: boolean,
-  hosts: { parent?: ExecutionHostId; child?: ExecutionHostId } = { parent: 'local', child: 'local' }
+  hosts: { parent?: ExecutionHostId; child?: ExecutionHostId } = {
+    parent: 'local',
+    child: 'local'
+  },
+  compactCards = false
 ): void {
   const parent = worktree('parent', { hostId: hosts.parent })
   const child = worktree('child', { hostId: hosts.child })
@@ -64,7 +75,11 @@ function render(
     candidate('also-in-child', child)
   ]
   useAppStore.setState({
-    settings: { ...getDefaultSettings(''), experimentalNewWorktreeCardStyle: newCardStyle },
+    settings: {
+      ...getDefaultSettings(''),
+      experimentalNewWorktreeCardStyle: newCardStyle,
+      compactWorktreeCards: compactCards
+    },
     repos: [
       { id: 'repo-1', path: '/repo', displayName: 'orca', badgeColor: '#999999', addedAt: 1 }
     ],
@@ -118,6 +133,10 @@ beforeEach(() => {
 afterEach(() => {
   act(() => root.unmount())
   container.remove()
+  for (const live of liveRoots.splice(0)) {
+    act(() => live.root.unmount())
+    live.element.remove()
+  }
   useAppStore.setState(useAppStore.getInitialState(), true)
 })
 
@@ -145,27 +164,188 @@ it.each([
   }
 )
 
-// Title step, child minus parent = list margin + wrapper inset + 7px (ml-1, border, padding) + the
-// child's status lane. Sidebar legacy cards: -18 + 14 + 7 + 18 = 21px (35px at depth 2). A
-// read-only card has no lane and no outdent: 0 + 14 + 7 = 21px.
-it('steps a legacy child in as far as the sidebar does, with no status lane', () => {
+// Why: ancestor spacing and earlier flex items determine the title's horizontal offset.
+const X_GEOMETRY = /^-?(m[lrx]?|p[lrx]?|gap|w|size|space-x)-/
+
+function describeX(element: Element | null): string {
+  if (!(element instanceof HTMLElement)) {
+    return ''
+  }
+  const classes = [...element.classList].filter((name) => X_GEOMETRY.test(name)).toSorted()
+  // Why the raw attribute: the DOM shim drops values like max(), which the card's padding uses.
+  const styles = (element.getAttribute('style') ?? '')
+    .split(';')
+    .map((declaration) => declaration.trim())
+    .filter((declaration) => /^(padding-left|margin-left|width):/.test(declaration))
+  return [...classes, ...styles].join(' ')
+}
+
+function isRow(element: Element | null): boolean {
+  const classes = element?.classList
+  return (
+    Boolean(classes && (classes.contains('flex') || classes.contains('inline-flex'))) &&
+    !classes?.contains('flex-col')
+  )
+}
+
+function titleXSignature(title: string, stopAt: Element): string[] {
+  const titleElement = cardTitled(title).querySelector('[data-worktree-title-inline-rename]')
+  const signature: string[] = []
+  for (let node = titleElement; node && node !== stopAt; node = node.parentElement) {
+    signature.push(describeX(node))
+    // Why: only a row's earlier items (the status lane, chips) push the title sideways.
+    if (!isRow(node.parentElement)) {
+      continue
+    }
+    for (let before = node.previousElementSibling; before; before = before.previousElementSibling) {
+      let box: Element | null = before
+      while (box && describeX(box) === '' && box.firstElementChild) {
+        box = box.firstElementChild
+      }
+      signature.push(`before: ${describeX(box)}`)
+    }
+  }
+  // Why: a plain wrapper (context-menu trigger, sleep dim) moves nothing.
+  return signature.filter((entry) => entry !== '' && entry !== 'before: ')
+}
+
+function surfaceClasses(title: string): string[] {
+  // Why: caller-owned chat rows change compact card height; borders and surfaces must still match.
+  return [...cardTitled(title).classList]
+    .filter((name) => /^(border($|-)|rounded-|bg-|ring-|shadow-)/.test(name))
+    .toSorted()
+}
+
+function renderLiveSidebarRows(): HTMLElement {
+  const state = useAppStore.getState()
+  const [parent, child] = state.worktreesByRepo['repo-1'] ?? []
+  const repo = state.repos[0]
+  if (!parent || !child) {
+    throw new Error('Missing sidebar fixture')
+  }
+  const ctx: WorktreeItemRowContext = {
+    settings: state.settings,
+    groupBy: 'repo',
+    folderBackedProjectGroupIds: new Set(),
+    groupKeyByRowKey: new Map(),
+    groupIndexByRowKey: new Map(),
+    agentSendTargetWorktreeId: null,
+    worktreeDragState: WORKTREE_ROW_DRAG_INITIAL_STATE,
+    nativeLineageDropTargetId: null,
+    activeWorktreeId: null,
+    activeWorkspaceExecutionHostId: null,
+    currentWorktreeId: null,
+    highlightedRevealRowKey: null,
+    selectedWorktreeIds: new Set(),
+    selectedWorktrees: [],
+    getActiveSurfaceVariant: () => 'primary',
+    getLineageToggleHandler: () => vi.fn(),
+    onSelectionGesture: () => false,
+    onContextMenuSelect: () => [],
+    onImmediateActivate: vi.fn(),
+    onRowClickCapture: vi.fn(),
+    onRowPointerDown: vi.fn(),
+    onCardDragStart: vi.fn(),
+    onCardDragEnd: vi.fn()
+  }
+  const row = (workspace: Worktree, depth: number): WorktreeItemRow => ({
+    type: 'item',
+    rowKey: workspace.id,
+    sectionKey: 'repo-1',
+    worktree: workspace,
+    repo,
+    depth,
+    groupDepth: 0,
+    lineageTrail: [],
+    isLastLineageChild: true,
+    lineageChildCount: depth === 0 ? 1 : 0,
+    lineageGroupKey: depth === 0 ? 'parent' : undefined,
+    lineageCollapsed: false
+  })
+  const live = document.createElement('div')
+  document.body.append(live)
+  const liveRoot = createRoot(live)
+  act(() =>
+    liveRoot.render(
+      <TooltipProvider>
+        {renderWorktreeItemRow(
+          ctx,
+          row(parent, 0),
+          false,
+          renderWorktreeItemRow(ctx, row(child, 1), true)
+        )}
+      </TooltipProvider>
+    )
+  )
+  liveRoots.push({ root: liveRoot, element: live })
+  return live
+}
+
+it.each([
+  ['legacy', false, false],
+  ['compact', false, true],
+  ['new', true, false]
+] as const)(
+  '%s: places parent and child titles where the live sidebar does',
+  (_style, newCardStyle, compactCards) => {
+    render(newCardStyle, undefined, compactCards)
+    const dialogList = cardTitled('parent').parentElement?.parentElement
+    if (!dialogList) {
+      throw new Error('Missing dialog list')
+    }
+    const dialog = {
+      parent: titleXSignature('parent', dialogList),
+      child: titleXSignature('child', dialogList),
+      parentSurface: surfaceClasses('parent'),
+      childSurface: surfaceClasses('child')
+    }
+    const live = renderLiveSidebarRows()
+    const liveContainer = container
+    container = live
+    const sidebar = {
+      parent: titleXSignature('parent', live),
+      child: titleXSignature('child', live),
+      parentSurface: surfaceClasses('parent'),
+      childSurface: surfaceClasses('child')
+    }
+    container = liveContainer
+
+    expect(dialog.parent.length).toBeGreaterThan(3)
+    expect(dialog).toEqual(sidebar)
+  }
+)
+
+it('lays a read-only parent out with its status lane and passive child chip', () => {
   render(false)
 
-  const childCard = cardTitled('child')
-  const wrapper = childCard.parentElement
-  expect(container.querySelector('[data-worktree-card-status-slot]')).toBeNull()
-  expect(wrapper?.style.paddingLeft).toBe('14px')
-  expect(wrapper?.parentElement?.className.split(' ').toSorted()).toEqual(['mt-1.5', 'space-y-1'])
+  const parentCard = cardTitled('parent')
+  expect(parentCard.querySelector('[data-worktree-card-status-slot]')).not.toBeNull()
+  expect(parentCard.textContent).toContain('1 child')
+  expect(parentCard.querySelector('button[aria-expanded]')).toBeNull()
 })
 
-it('keeps the new card style geometry', () => {
-  render(true)
-
-  const childCard = cardTitled('child')
-  expect(checkedBoxes()).toEqual(['true', 'true', 'true'])
-  expect(cardTitled('parent').contains(childCard)).toBe(true)
-  expect(childCard.parentElement?.style.paddingLeft).toBe('')
-  expect(childCard.closest<HTMLElement>('[data-worktree-lineage-children]')?.style.marginLeft).toBe(
-    '14px'
+it('counts only listed child workspaces in the passive chip', () => {
+  render(false)
+  const state = useAppStore.getState()
+  const parent = state.worktreesByRepo['repo-1']?.[0]
+  const childLineage = Object.values(state.worktreeLineageById)[0]
+  if (!parent || !childLineage) {
+    throw new Error('Missing lineage fixture')
+  }
+  const unlisted = worktree('unlisted', { hostId: 'local' })
+  act(() =>
+    useAppStore.setState({
+      worktreesByRepo: { 'repo-1': [...(state.worktreesByRepo['repo-1'] ?? []), unlisted] },
+      worktreeLineageById: {
+        ...state.worktreeLineageById,
+        [unlisted.id]: {
+          ...childLineage,
+          worktreeId: unlisted.id,
+          worktreeInstanceId: 'instance-unlisted'
+        }
+      }
+    })
   )
+  expect(cardTitled('parent').textContent).toContain('1 child')
+  expect(cardTitled('parent').textContent).not.toContain('2 children')
 })
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index d42ce3ad4398..11afc3a74485 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -5,8 +5,9 @@ import WorktreeCard from '@/components/sidebar/WorktreeCard'
 import { WorktreeHostContextBadge } from '@/components/sidebar/WorktreeHostContextBadge'
 import {
   getLineageChildrenInlineStyle,
-  getLineageNestedRowGeometry
+  LINEAGE_CHILDREN_INLINE_OFFSET
 } from '@/components/sidebar/worktree-list/rows/indentation'
+import { getWorktreeRowGeometry } from '@/components/sidebar/worktree-list/rows/worktree-row-geometry'
 import {
   getCyclicProjectedWorktreeLineageIds,
   getSidebarLineageAncestors
@@ -158,7 +159,11 @@ function RepoHeader({ repoId }: { repoId: string | null }): React.JSX.Element {
   )
 }
 
+const NO_FOLDER_BACKED_GROUPS: ReadonlySet<string> = new Set()
+
 type RowProps = {
+  /** Whether the listed workspaces span machines; the sidebar names hosts only then. */
+  mixedHosts: boolean
   listedAt: number
   busy: boolean
   selected: ReadonlySet<string>
@@ -181,10 +186,8 @@ function WorkspaceCard({
     (store) => store.settings?.experimentalNewWorktreeCardStyle === true
   )
   const name = worktree?.displayName ?? group.workspaceId
-  // Shown for every workspace, local included. The sidebar hides it on a single-host install; this
-  // list is a one-off prompt with no surrounding context, so the machine is always worth naming.
   const hostLabel = getHostContextLabel(hostId ?? LOCAL_EXECUTION_HOST_ID)
-  const { listedAt, busy, selected, onToggle, failureFor, onFailureAction } = rowProps
+  const { mixedHosts, listedAt, busy, selected, onToggle, failureFor, onFailureAction } = rowProps
   const rows = (
     <ul className="flex flex-col">
       {group.candidates.map((candidate) => (
@@ -202,22 +205,18 @@ function WorkspaceCard({
       ))}
     </ul>
   )
-  const geometryAt = (lineageDepth: number) =>
-    getLineageNestedRowGeometry({
-      experimentalNewWorktreeCardStyle: newCardStyle,
-      inheritedCardContentIndent: 0,
-      lineageDepth
-    })
-  const geometry = geometryAt(depth)
-  // Why: as in the sidebar, a child inside a card's lineage list is inset for its own depth.
-  const childInset = worktree ? geometryAt(depth + 1).surfaceInset : 0
+  // Why: the sidebar's own row geometry for a repo-grouped list, so the cards line up as there.
+  const geometry = getWorktreeRowGeometry({
+    groupBy: 'repo',
+    folderBackedProjectGroupIds: NO_FOLDER_BACKED_GROUPS,
+    newCardStyle,
+    projectGroupId: repo?.projectGroupId,
+    depth,
+    groupDepth: 0,
+    nested: depth > 0
+  })
   const children = node.children.map((child) => (
-    <div
-      key={child.group.workspaceId}
-      style={childInset > 0 ? { paddingLeft: childInset } : undefined}
-    >
-      <WorkspaceCard node={child} depth={depth + 1} {...rowProps} />
-    </div>
+    <WorkspaceCard key={child.group.workspaceId} node={child} depth={depth + 1} {...rowProps} />
   ))
 
   if (!worktree) {
@@ -235,27 +234,35 @@ function WorkspaceCard({
     )
   }
 
+  // Why: like a sidebar row, each card is inset for its own depth.
   return (
-    <WorktreeCard
-      worktree={worktree}
-      repo={repo}
-      isActive={false}
-      isActiveSurface={false}
-      readOnly
-      // The repo header above already names it.
-      hideRepoBadge
-      hostContextLabel={hostLabel}
-      nativeDragEnabled={false}
-      flushSurface
-      contentIndent={geometry.cardContentIndent}
-      agentRows={rows}
-      lineageChildren={children.length > 0 ? children : undefined}
-      lineageChildrenStyle={
-        children.length > 0
-          ? getLineageChildrenInlineStyle(geometry.lineageChildrenInlineOffset)
-          : undefined
-      }
-    />
+    <div
+      style={geometry.surfaceInset > 0 ? { paddingLeft: `${geometry.surfaceInset}px` } : undefined}
+    >
+      <WorktreeCard
+        worktree={worktree}
+        repo={repo}
+        isActive={false}
+        isActiveSurface={false}
+        readOnly
+        // The repo header above already names it.
+        hideRepoBadge
+        hostContextLabel={mixedHosts ? hostLabel : undefined}
+        nativeDragEnabled={false}
+        flushSurface
+        contentIndent={geometry.cardContentIndent}
+        agentRows={rows}
+        lineageChildCount={children.length}
+        lineageChildren={children.length > 0 ? children : undefined}
+        lineageChildrenStyle={
+          children.length > 0
+            ? getLineageChildrenInlineStyle(
+                geometry.lineageChildrenInlineOffset ?? LINEAGE_CHILDREN_INLINE_OFFSET
+              )
+            : undefined
+        }
+      />
+    </div>
   )
 }
 
@@ -278,6 +285,9 @@ export function ResumeOnRestartGroups({
   const repoIdFor = useRepoIdByWorkspace(workspaces)
   const ancestorsOf = useLineageAncestors(workspaces)
   const repoGroups = groupResumeWorkspacesByRepo(workspaces, repoIdFor)
+  const mixedHosts =
+    new Set(candidates.map((candidate) => candidate.executionHostId ?? LOCAL_EXECUTION_HOST_ID))
+      .size > 1
   return (
     <div className="flex flex-col gap-2.5">
       {repoGroups.map((repoGroup) => (
@@ -289,6 +299,7 @@ export function ResumeOnRestartGroups({
                 key={node.group.workspaceId}
                 node={node}
                 depth={0}
+                mixedHosts={mixedHosts}
                 listedAt={listedAt}
                 busy={busy}
                 selected={selected}
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
index 1a139b18d26b..eec8c8c52afc 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
@@ -148,6 +148,13 @@ it('keeps next-launch preference out of the current resume action', async () =>
   expect(rpc).toHaveBeenCalledTimes(2)
 })
 
+// Left to the dialog, focus lands on the scrollable list and draws a ring around it.
+it('opens with focus on the resume action', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  expect(document.activeElement?.textContent?.trim()).toBe('Resume 2 chats')
+})
+
 // One primary action and one way out of it; the body copy carries the transparency.
 it('offers exactly Dismiss all and the resume action', async () => {
   rpc.mockResolvedValue({ sessions: offered })
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index 1f9f639fa3f0..413e90807b74 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState, useSyncExternalStore } from 'react'
+import { useCallback, useMemo, useRef, useState, useSyncExternalStore } from 'react'
 import { useNativeChatRestartOfferEnabled } from './native-chat-restart-offer-gate'
 import { RotateCcw } from 'lucide-react'
 import { Button } from './ui/button'
@@ -81,6 +81,7 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
   )
   const updateSettings = useAppStore((store) => store.updateSettings)
   const [dontAskAgain, setDontAskAgain] = useState(false)
+  const resumeButtonRef = useRef<HTMLButtonElement>(null)
   // The store's: the resume outlives this dialog, which can close or reopen mid-run.
   const resuming = useNativeChatRestartResuming()
   const busy = resuming.length > 0
@@ -189,7 +190,14 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
       {/* Height is capped, never the data: the list scrolls inside the dialog so the header and
           the primary action stay put however many chats were interrupted. */}
       {/* Wide enough for a sidebar card's chat row to keep its name, model and age on one line. */}
-      <DialogContent className="grid-rows-[auto_minmax(0,1fr)_auto] sm:max-w-3xl max-h-[85vh]">
+      <DialogContent
+        className="grid-rows-[auto_minmax(0,1fr)_auto] sm:max-w-3xl max-h-[85vh]"
+        // Why: left to Radix, focus lands on the scrollable list (its first tabbable) and rings it.
+        onOpenAutoFocus={(event) => {
+          event.preventDefault()
+          resumeButtonRef.current?.focus()
+        }}
+      >
         <DialogHeader>
           <DialogTitle>
             {/* Plain wrapper owns the icon spacing; DialogTitle owns its own. */}
@@ -265,6 +273,7 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
             {translate('auto.components.NativeChatResumeOnRestartModal.dismissAll', 'Dismiss all')}
           </Button>
           <Button
+            ref={resumeButtonRef}
             variant="default"
             size="sm"
             disabled={busy || chosen.length === 0}

From f0004d00e37a6d3c488c80557b54c5ea73ba8b79 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 19:14:52 -0700
Subject: [PATCH 16/37] fix(sidebar): preserve passive SSH identity on
 read-only cards

---
 .../WorktreeCard.read-only-contract.test.tsx  | 51 ++++++++++++++-
 .../WorktreeCardSshHostControl.test.tsx       | 39 ++++++++++++
 .../sidebar/WorktreeCardSshHostControl.tsx    | 62 ++++++++++++++-----
 .../sidebar/worktree-card-header.tsx          |  4 +-
 ...rktree-card-title-geometry.test-support.ts | 60 ++++++++++++++++++
 5 files changed, 197 insertions(+), 19 deletions(-)
 create mode 100644 src/renderer/src/components/sidebar/worktree-card-title-geometry.test-support.ts

diff --git a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
index 18176cc6ebd5..70f7df312d68 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
@@ -3,6 +3,8 @@
 import { act, type ReactNode } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { SshConnectionStatus } from '../../../../shared/ssh-types'
+import { worktreeCardTitleXSignature } from './worktree-card-title-geometry.test-support'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { Repo } from '../../../../shared/repo-types'
 import type { WorktreeCardProperty } from '../../../../shared/ui-chrome-types'
@@ -44,6 +46,7 @@ let settings: Partial<GlobalSettings> = {}
 let deleteStateByWorktreeId: Record<string, unknown> = {}
 let activityStatus: WorktreeStatus = 'working'
 let sleeping = true
+let sshStatus: SshConnectionStatus = 'disconnected'
 const onChatClick = vi.fn()
 
 vi.mock('@/store', () => ({
@@ -79,7 +82,7 @@ vi.mock('@/store', () => ({
       setActiveWorktree: vi.fn(),
       setRenamingWorktreeId: vi.fn(),
       settings,
-      sshConnectionStates: new Map([['ssh-target-1', { status: 'disconnected' }]]),
+      sshConnectionStates: new Map([['ssh-target-1', { status: sshStatus }]]),
       sshStateByEnvironment: new Map(),
       sshTargetLabels: new Map([['ssh-target-1', 'Remote target']]),
       sshTargetsHydrated: true,
@@ -219,6 +222,7 @@ describe('WorktreeCard read-only contract', () => {
     vi.clearAllMocks()
     activityStatus = 'working'
     sleeping = true
+    sshStatus = 'disconnected'
     deleteStateByWorktreeId = {}
     container = document.createElement('div')
     document.body.appendChild(container)
@@ -316,6 +320,51 @@ describe('WorktreeCard read-only contract', () => {
   }
 
   for (const style of CARD_STYLES) {
+    it.each([
+      'connected',
+      'disconnected',
+      'connecting',
+      'error',
+      'auth-failed',
+      'reconnection-failed'
+    ] as const)(
+      `${style.name} card: %s SSH identity matches the live sidebar without controls`,
+      (status) => {
+        settings = style.settings
+        sshStatus = status
+        activityStatus = 'inactive'
+        sleeping = false
+        const overrides = { isUnread: false, firstAgentMessageRenameError: null }
+        render(false, overrides)
+        const liveIdentity = container.querySelector('[data-ssh-target-label]')
+        expect(liveIdentity).not.toBeNull()
+        const liveClasses = [...(liveIdentity?.classList ?? [])]
+          .filter((name) => name !== 'cursor-pointer')
+          .toSorted()
+        const liveGlyph = liveIdentity?.querySelector('svg')?.outerHTML
+        const liveSignature = worktreeCardTitleXSignature(
+          container.querySelector('[data-worktree-title-inline-rename]'),
+          container
+        )
+        render(true, overrides)
+        const identity = container.querySelector('[data-ssh-target-label]')
+        expect(
+          worktreeCardTitleXSignature(
+            container.querySelector('[data-worktree-title-inline-rename]'),
+            container
+          )
+        ).toEqual(liveSignature)
+        expect(identity?.tagName).toBe('SPAN')
+        expect(
+          [...(identity?.classList ?? [])].filter((name) => name !== 'cursor-default').toSorted()
+        ).toEqual(liveClasses)
+        expect(identity?.querySelector('svg')?.outerHTML).toBe(liveGlyph)
+        expect(identity?.textContent).toContain('Remote target')
+        expect(controlsOutsideCallerRows()).toEqual([])
+        expect(identity?.hasAttribute('aria-describedby')).toBe(false)
+      }
+    )
+
     it(`${style.name} card: the same fixture is live without readOnly`, () => {
       settings = style.settings
       render(false)
diff --git a/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx b/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx
index 1bbc711a49e4..bfe8bb0a3bf1 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx
@@ -82,6 +82,45 @@ describe('WorktreeCardSshHostControl', () => {
     cleanup()
   })
 
+  it.each(
+    (
+      [
+        'connected',
+        'disconnected',
+        'connecting',
+        'deploying-relay',
+        'reconnecting',
+        'error',
+        'auth-failed',
+        'reconnection-failed',
+        null
+      ] as const
+    ).flatMap((status) => [false, true].map((iconOnly) => ({ status, iconOnly })))
+  )(
+    'renders $status (iconOnly=$iconOnly) passively without a tooltip or reconnect action',
+    async ({ status, iconOnly }) => {
+      const connect = vi.fn()
+      const onPointerDown = vi.fn()
+      installSshApi(connect)
+      const { container } = renderControl({ status, iconOnly, interactive: false, onPointerDown })
+      const identity = container.querySelector('[data-ssh-target-label]')
+      expect(identity?.tagName).toBe('SPAN')
+      expect(identity?.textContent).toContain('devbox')
+      expect(
+        container.querySelector('button, [tabindex], [role="button"], [data-tooltip]')
+      ).toBeNull()
+      const user = userEvent.setup()
+      if (!(identity instanceof HTMLElement)) {
+        throw new Error('Missing passive SSH identity')
+      }
+      await user.click(identity)
+      await user.dblClick(identity)
+      expect(connect).not.toHaveBeenCalled()
+      expect(onPointerDown).not.toHaveBeenCalled()
+      expect(environmentSshMocks.connectRuntimeEnvironmentSshTarget).not.toHaveBeenCalled()
+    }
+  )
+
   it('offers a Connect control naming the host for a disconnected target', () => {
     renderControl()
 
diff --git a/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.tsx b/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.tsx
index 890baba32e76..14225a9fb885 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.tsx
@@ -1,7 +1,7 @@
 import { useCallback } from 'react'
 import { Loader2, Server, ServerOff } from 'lucide-react'
 import { toast } from 'sonner'
-import { Button } from '@/components/ui/button'
+import { Button, buttonVariants } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { cn } from '@/lib/utils'
 import { translate } from '@/i18n/i18n'
@@ -31,6 +31,7 @@ type WorktreeCardSshHostControlProps = {
   sshOwnerEnvironmentId: string | null
   /** True when the row cannot afford a visible label: icon-only with an sr-only label. */
   iconOnly: boolean
+  interactive?: boolean
   onPointerDown: React.PointerEventHandler<HTMLButtonElement>
 }
 
@@ -47,21 +48,27 @@ function PassiveGlyph({
   icon,
   tooltip,
   accessibleName,
-  targetLabel
+  targetLabel,
+  interactive
 }: {
   icon: React.ReactNode
   tooltip: string
   accessibleName: string
   targetLabel: string
+  interactive: boolean
 }): React.JSX.Element {
+  const glyph = (
+    <span className="shrink-0 inline-flex items-center" data-ssh-target-label={targetLabel}>
+      {icon}
+      <span className="sr-only">{accessibleName}</span>
+    </span>
+  )
+  if (!interactive) {
+    return glyph
+  }
   return (
     <Tooltip>
-      <TooltipTrigger asChild>
-        <span className="shrink-0 inline-flex items-center" data-ssh-target-label={targetLabel}>
-          {icon}
-          <span className="sr-only">{accessibleName}</span>
-        </span>
-      </TooltipTrigger>
+      <TooltipTrigger asChild>{glyph}</TooltipTrigger>
       <TooltipContent side="right" sideOffset={8}>
         {tooltip}
       </TooltipContent>
@@ -76,6 +83,7 @@ export function WorktreeCardSshHostControl({
   targetRemoved,
   sshOwnerEnvironmentId,
   iconOnly,
+  interactive = true,
   onPointerDown
 }: WorktreeCardSshHostControlProps): React.JSX.Element | null {
   const setSshConnectionState = useAppStore((store) => store.setSshConnectionState)
@@ -140,6 +148,7 @@ export function WorktreeCardSshHostControl({
   if (status === null || status === 'connected') {
     return (
       <PassiveGlyph
+        interactive={interactive}
         targetLabel={targetLabel}
         icon={<Server className="size-3 text-muted-foreground" />}
         tooltip={translate(
@@ -161,6 +170,7 @@ export function WorktreeCardSshHostControl({
   if (targetRemoved) {
     return (
       <PassiveGlyph
+        interactive={interactive}
         targetLabel={targetLabel}
         icon={<ServerOff className="size-3 text-muted-foreground" />}
         tooltip={translate(
@@ -225,6 +235,33 @@ export function WorktreeCardSshHostControl({
           )
         : accessibleName
 
+  const content = (
+    <>
+      {connecting ? (
+        <Loader2 className="size-2.5 animate-spin motion-reduce:animate-none" />
+      ) : (
+        iconOnly && <ServerOff className="size-2.5" />
+      )}
+      {!iconOnly && <span className="text-left">{label}</span>}
+    </>
+  )
+  if (!interactive) {
+    return (
+      <span
+        className={cn(
+          buttonVariants({ variant: 'ghost' }),
+          PILL_BASE,
+          failed ? PILL_FAILED : PILL_QUIET,
+          iconOnly && 'w-4 justify-center !px-0 has-[>svg]:!px-0',
+          'cursor-default'
+        )}
+        data-ssh-target-label={targetLabel}
+      >
+        {content}
+        <span className="sr-only">{accessibleName}</span>
+      </span>
+    )
+  }
   return (
     <Tooltip>
       <TooltipTrigger asChild>
@@ -265,14 +302,7 @@ export function WorktreeCardSshHostControl({
             void handleConnect()
           }}
         >
-          {connecting ? (
-            <Loader2 className="size-2.5 animate-spin motion-reduce:animate-none" />
-          ) : (
-            iconOnly && <ServerOff className="size-2.5" />
-          )}
-          {/* Why: aria-label already names the control, so a second sr-only copy would be
-              dead markup; the label span exists only for sighted users. */}
-          {!iconOnly && <span className="text-left">{label}</span>}
+          {content}
         </Button>
       </TooltipTrigger>
       <TooltipContent side="right" sideOffset={8}>
diff --git a/src/renderer/src/components/sidebar/worktree-card-header.tsx b/src/renderer/src/components/sidebar/worktree-card-header.tsx
index 55bf692732ce..58698b9d0a40 100644
--- a/src/renderer/src/components/sidebar/worktree-card-header.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-header.tsx
@@ -104,8 +104,7 @@ export function WorktreeCardHeader({
           </RepoIdentityChip>
         )}
 
-        {/* Why: this pill is a reconnect control; a read-only card names its host with the chip. */}
-        {repo?.connectionId && interactive && (
+        {repo?.connectionId && (
           <WorktreeCardSshHostControl
             targetId={repo.connectionId}
             targetLabel={sshTargetLabel || repo.displayName}
@@ -113,6 +112,7 @@ export function WorktreeCardHeader({
             targetRemoved={sshTargetRemoved}
             sshOwnerEnvironmentId={sshOwnerEnvironmentId}
             iconOnly={compactCards || newCardStyle}
+            interactive={interactive}
             onPointerDown={stopQuickActionPointerPropagation}
           />
         )}
diff --git a/src/renderer/src/components/sidebar/worktree-card-title-geometry.test-support.ts b/src/renderer/src/components/sidebar/worktree-card-title-geometry.test-support.ts
new file mode 100644
index 000000000000..8ed9a5eaa7f9
--- /dev/null
+++ b/src/renderer/src/components/sidebar/worktree-card-title-geometry.test-support.ts
@@ -0,0 +1,60 @@
+const X_GEOMETRY = /^-?(m[lrx]?|p[lrx]?|gap|w|size|space-x)-/
+
+function describeX(element: Element): string {
+  const classes = [...element.classList].filter((name) => X_GEOMETRY.test(name)).toSorted()
+  // The DOM shim drops max() values, so inspect the card's raw padding declaration.
+  const styles = (element.getAttribute('style') ?? '')
+    .split(';')
+    .map((declaration) => declaration.trim())
+    .filter((declaration) => /^(padding-left|margin-left|width):/.test(declaration))
+  const width = element.getAttribute('width')
+  return [...classes, ...styles, ...(width ? [`width=${width}`] : [])].join(' ')
+}
+
+function isRow(element: Element | null): boolean {
+  const classes = element?.classList
+  return (
+    Boolean(classes && (classes.contains('flex') || classes.contains('inline-flex'))) &&
+    !classes?.contains('flex-col')
+  )
+}
+
+function precedingBoxSignature(element: Element): string[] {
+  if (element.classList.contains('sr-only')) {
+    return []
+  }
+  // Contents cannot widen a fixed-width status lane or icon-only pill.
+  if (
+    [...element.classList].some((name) => /^(w|size)-/.test(name)) ||
+    element.hasAttribute('width') ||
+    /\bwidth:/.test(element.getAttribute('style') ?? '')
+  ) {
+    return [describeX(element)]
+  }
+  return [describeX(element), ...[...element.children].flatMap(precedingBoxSignature)].filter(
+    Boolean
+  )
+}
+
+export function worktreeCardTitleXSignature(title: Element | null, stopAt: Element): string[] {
+  const signature: string[] = []
+  for (let node = title; node && node !== stopAt; node = node.parentElement) {
+    signature.push(describeX(node))
+    if (!isRow(node.parentElement)) {
+      continue
+    }
+    let gaps = 0
+    for (let before = node.previousElementSibling; before; before = before.previousElementSibling) {
+      if (before.classList.contains('sr-only')) {
+        continue
+      }
+      gaps++
+      signature.push(...precedingBoxSignature(before).map((box) => `before: ${box}`))
+    }
+    // Each preceding flex item adds a gap even when its wrapper has no width class.
+    if (gaps > 0) {
+      signature.push(`gaps-before: ${gaps}`)
+    }
+  }
+  return signature.filter(Boolean)
+}

From 404de10b3a6df0da11ec6991ccaf01fdb1b3698a Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 19:14:53 -0700
Subject: [PATCH 17/37] fix(native-chat): keep resume focus and folder host
 identity

---
 .../NativeChatResumeOnRestartGroups.test.tsx  | 184 +++++++++++++-----
 .../NativeChatResumeOnRestartGroups.tsx       |  10 +-
 .../NativeChatResumeOnRestartModal.test.tsx   |  36 ++++
 .../NativeChatResumeOnRestartModal.tsx        |   9 +-
 4 files changed, 183 insertions(+), 56 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index f56c92bc31e8..4f725091fc86 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -5,6 +5,8 @@ import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '../store'
 import { getDefaultSettings } from '../../../shared/constants'
+import type { SshConnectionStatus } from '../../../shared/ssh-types'
+import { worktreeCardTitleXSignature } from './sidebar/worktree-card-title-geometry.test-support'
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import type { Worktree } from '../../../shared/worktree/types'
 import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
@@ -54,7 +56,7 @@ function candidate(sessionId: string, workspace: Worktree): ResumeCandidate {
     trigger: 'quit',
     latestPrompt: `Prompt ${sessionId}`,
     recordedAt: 1_800_000_000_000,
-    executionHostId: 'local',
+    executionHostId: workspace.hostId ?? 'local',
     workspaceKind: 'git-worktree'
   }
 }
@@ -65,7 +67,8 @@ function render(
     parent: 'local',
     child: 'local'
   },
-  compactCards = false
+  compactCards = false,
+  sshStatus?: SshConnectionStatus
 ): void {
   const parent = worktree('parent', { hostId: hosts.parent })
   const child = worktree('child', { hostId: hosts.child })
@@ -81,8 +84,32 @@ function render(
       compactWorktreeCards: compactCards
     },
     repos: [
-      { id: 'repo-1', path: '/repo', displayName: 'orca', badgeColor: '#999999', addedAt: 1 }
+      {
+        id: 'repo-1',
+        path: '/repo',
+        displayName: 'orca',
+        badgeColor: '#999999',
+        addedAt: 1,
+        connectionId: sshStatus ? 'build-server' : undefined
+      }
     ],
+    sshConnectionStates: new Map(
+      sshStatus
+        ? [
+            [
+              'build-server',
+              {
+                targetId: 'build-server',
+                status: sshStatus,
+                error: null,
+                reconnectAttempt: 0,
+                remotePlatform: 'linux'
+              }
+            ]
+          ]
+        : []
+    ),
+    sshTargetLabels: new Map([['build-server', 'build-server']]),
     worktreesByRepo: { 'repo-1': [parent, child] },
     worktreeLineageById: {
       [child.id]: {
@@ -164,49 +191,11 @@ it.each([
   }
 )
 
-// Why: ancestor spacing and earlier flex items determine the title's horizontal offset.
-const X_GEOMETRY = /^-?(m[lrx]?|p[lrx]?|gap|w|size|space-x)-/
-
-function describeX(element: Element | null): string {
-  if (!(element instanceof HTMLElement)) {
-    return ''
-  }
-  const classes = [...element.classList].filter((name) => X_GEOMETRY.test(name)).toSorted()
-  // Why the raw attribute: the DOM shim drops values like max(), which the card's padding uses.
-  const styles = (element.getAttribute('style') ?? '')
-    .split(';')
-    .map((declaration) => declaration.trim())
-    .filter((declaration) => /^(padding-left|margin-left|width):/.test(declaration))
-  return [...classes, ...styles].join(' ')
-}
-
-function isRow(element: Element | null): boolean {
-  const classes = element?.classList
-  return (
-    Boolean(classes && (classes.contains('flex') || classes.contains('inline-flex'))) &&
-    !classes?.contains('flex-col')
-  )
-}
-
 function titleXSignature(title: string, stopAt: Element): string[] {
-  const titleElement = cardTitled(title).querySelector('[data-worktree-title-inline-rename]')
-  const signature: string[] = []
-  for (let node = titleElement; node && node !== stopAt; node = node.parentElement) {
-    signature.push(describeX(node))
-    // Why: only a row's earlier items (the status lane, chips) push the title sideways.
-    if (!isRow(node.parentElement)) {
-      continue
-    }
-    for (let before = node.previousElementSibling; before; before = before.previousElementSibling) {
-      let box: Element | null = before
-      while (box && describeX(box) === '' && box.firstElementChild) {
-        box = box.firstElementChild
-      }
-      signature.push(`before: ${describeX(box)}`)
-    }
-  }
-  // Why: a plain wrapper (context-menu trigger, sleep dim) moves nothing.
-  return signature.filter((entry) => entry !== '' && entry !== 'before: ')
+  return worktreeCardTitleXSignature(
+    cardTitled(title).querySelector('[data-worktree-title-inline-rename]'),
+    stopAt
+  )
 }
 
 function surfaceClasses(title: string): string[] {
@@ -281,14 +270,26 @@ function renderLiveSidebarRows(): HTMLElement {
   return live
 }
 
-it.each([
-  ['legacy', false, false],
-  ['compact', false, true],
-  ['new', true, false]
-] as const)(
-  '%s: places parent and child titles where the live sidebar does',
-  (_style, newCardStyle, compactCards) => {
-    render(newCardStyle, undefined, compactCards)
+it.each(
+  [
+    { style: 'legacy', newCardStyle: false, compactCards: false },
+    { style: 'compact', newCardStyle: false, compactCards: true },
+    { style: 'new', newCardStyle: true, compactCards: false }
+  ].flatMap((style) =>
+    ([undefined, 'connected', 'disconnected'] as const).map((sshStatus) => ({
+      ...style,
+      sshStatus
+    }))
+  )
+)(
+  '$style/$sshStatus: places parent and child titles where the live sidebar does',
+  ({ newCardStyle, compactCards, sshStatus }) => {
+    render(
+      newCardStyle,
+      sshStatus ? { parent: 'ssh:build-server', child: 'ssh:build-server' } : undefined,
+      compactCards,
+      sshStatus
+    )
     const dialogList = cardTitled('parent').parentElement?.parentElement
     if (!dialogList) {
       throw new Error('Missing dialog list')
@@ -312,6 +313,21 @@ it.each([
 
     expect(dialog.parent.length).toBeGreaterThan(3)
     expect(dialog).toEqual(sidebar)
+    if (sshStatus) {
+      const identity = cardTitled('parent').querySelector('[data-ssh-target-label="build-server"]')
+      expect(identity?.tagName).toBe('SPAN')
+      expect(cardTitled('parent').textContent).toContain('build-server')
+      expect(identity?.matches('button, [tabindex], [role="button"]')).toBe(false)
+      expect(dialog.parent).toContain('gaps-before: 1')
+      if (sshStatus === 'connected') {
+        expect(identity?.querySelector('svg')?.classList.contains('size-3')).toBe(true)
+        expect(dialog.parent).toContain('before: size-3 width=24')
+      } else if (newCardStyle || compactCards) {
+        expect(identity?.querySelector('svg')?.classList.contains('size-2.5')).toBe(true)
+      } else {
+        expect(identity?.textContent).toContain('Connect')
+      }
+    }
   }
 )
 
@@ -349,3 +365,65 @@ it('counts only listed child workspaces in the passive chip', () => {
   expect(cardTitled('parent').textContent).toContain('1 child')
   expect(cardTitled('parent').textContent).not.toContain('2 children')
 })
+
+it.each([
+  ['legacy', false, false, true],
+  ['legacy, host disabled', false, false, false],
+  ['compact', false, true, true],
+  ['new', true, false, true],
+  ['new, host disabled', true, false, false]
+] as const)(
+  '%s: keeps a remote folder identifiable when its host chip is enabled',
+  async (_style, newCardStyle, compactCards, showHost) => {
+    useAppStore.setState({
+      settings: {
+        ...getDefaultSettings(''),
+        experimentalNewWorktreeCardStyle: newCardStyle,
+        compactWorktreeCards: compactCards
+      },
+      worktreeCardProperties: showHost ? ['status', 'host'] : ['status'],
+      folderWorkspaces: [
+        {
+          id: 'remote-folder',
+          projectGroupId: 'folder-project',
+          name: 'Remote folder',
+          folderPath: '/remote/folder',
+          connectionId: 'build-server',
+          executionHostId: 'ssh:build-server',
+          linkedTask: null,
+          comment: '',
+          isArchived: false,
+          isUnread: false,
+          isPinned: false,
+          sortOrder: 0,
+          lastActivityAt: 1,
+          createdAt: 1,
+          updatedAt: 1
+        }
+      ]
+    })
+    const entry: ResumeCandidate = {
+      ...candidate('folder-chat', worktree('folder')),
+      workspaceId: 'folder:remote-folder',
+      executionHostId: 'ssh:build-server',
+      workspaceKind: 'folder'
+    }
+    await act(async () =>
+      root.render(
+        <TooltipProvider>
+          <ResumeOnRestartGroups
+            candidates={[entry]}
+            listedAt={entry.recordedAt}
+            busy={false}
+            selected={new Set([entry.sessionId])}
+            onToggle={() => {}}
+          />
+        </TooltipProvider>
+      )
+    )
+    const card = cardTitled('Remote folder')
+    expect(card.textContent?.includes('build-server')).toBe(showHost && !compactCards)
+    expect(card.querySelector('[data-ssh-target-label]')).toBeNull()
+    expect(card.querySelector('button:not([role="checkbox"]), [tabindex]')).toBeNull()
+  }
+)
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index 11afc3a74485..525cf914b9ae 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -188,6 +188,14 @@ function WorkspaceCard({
   const name = worktree?.displayName ?? group.workspaceId
   const hostLabel = getHostContextLabel(hostId ?? LOCAL_EXECUTION_HOST_ID)
   const { mixedHosts, listedAt, busy, selected, onToggle, failureFor, onFailureAction } = rowProps
+  // Remote folders have no repo, so no title-row SSH identity can name their host.
+  const showHostLabel =
+    mixedHosts ||
+    (!repo &&
+      first &&
+      resumeWorkspaceKind(first) === 'folder' &&
+      hostId &&
+      hostId !== LOCAL_EXECUTION_HOST_ID)
   const rows = (
     <ul className="flex flex-col">
       {group.candidates.map((candidate) => (
@@ -247,7 +255,7 @@ function WorkspaceCard({
         readOnly
         // The repo header above already names it.
         hideRepoBadge
-        hostContextLabel={mixedHosts ? hostLabel : undefined}
+        hostContextLabel={showHostLabel ? hostLabel : undefined}
         nativeDragEnabled={false}
         flushSurface
         contentIndent={geometry.cardContentIndent}
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
index eec8c8c52afc..9e6985801d07 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
@@ -155,6 +155,42 @@ it('opens with focus on the resume action', async () => {
   expect(document.activeElement?.textContent?.trim()).toBe('Resume 2 chats')
 })
 
+it('keeps initial focus inside the dialog with no resumable chats', async () => {
+  rpc.mockResolvedValue({ sessions: [], failed: [failure('b')] })
+  await mount(<NativeChatResumeOnRestartModal />)
+  await act(async () => requestNativeChatResumeOnRestartDialog())
+  const dialog = document.querySelector('[role="dialog"]')
+  expect(button('Resume 0 chats').disabled).toBe(true)
+  expect(dialog).not.toBeNull()
+  expect(dialog?.contains(document.activeElement)).toBe(true)
+})
+
+it('keeps initial focus inside the dialog when reopened during resume', async () => {
+  const continued = Promise.withResolvers<unknown>()
+  rpc.mockImplementation((_target, method) =>
+    method === 'agentSession.restartResumable'
+      ? Promise.resolve({ sessions: offered })
+      : continued.promise
+  )
+  await mount(
+    <>
+      <NativeChatResumeOnRestartModal />
+      <NativeChatResumeStatusSegment iconOnly={false} />
+    </>
+  )
+  await act(async () => button('Resume 2 chats').click())
+  const opener = button('Resuming 2 chats')
+  await act(async () => {
+    opener.focus()
+    opener.click()
+  })
+  const dialog = document.querySelector('[role="dialog"]')
+  expect(button('Resuming…').disabled).toBe(true)
+  expect(dialog).not.toBeNull()
+  expect(dialog?.contains(document.activeElement)).toBe(true)
+  await act(async () => continued.resolve({ sessions: [], failed: [], resumed: [], continued: [] }))
+})
+
 // One primary action and one way out of it; the body copy carries the transparency.
 it('offers exactly Dismiss all and the resume action', async () => {
   rpc.mockResolvedValue({ sessions: offered })
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index 413e90807b74..52183fdf7a1a 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -192,10 +192,15 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
       {/* Wide enough for a sidebar card's chat row to keep its name, model and age on one line. */}
       <DialogContent
         className="grid-rows-[auto_minmax(0,1fr)_auto] sm:max-w-3xl max-h-[85vh]"
-        // Why: left to Radix, focus lands on the scrollable list (its first tabbable) and rings it.
+        // Keep the scrollable list out of initial focus, including while Resume is disabled.
         onOpenAutoFocus={(event) => {
           event.preventDefault()
-          resumeButtonRef.current?.focus()
+          const resumeButton = resumeButtonRef.current
+          if (resumeButton && !resumeButton.disabled) {
+            resumeButton.focus()
+          } else if (event.currentTarget instanceof HTMLElement) {
+            event.currentTarget.focus()
+          }
         }}
       >
         <DialogHeader>

From 1140cca58c2e814975d61ac83759a8746a513c98 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 19:36:53 -0700
Subject: [PATCH 18/37] fix(native-chat): remove resume dialog list border

---
 .../components/NativeChatResumeOnRestartModal.test.tsx   | 9 +++++++++
 .../src/components/NativeChatResumeOnRestartModal.tsx    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
index 9e6985801d07..ff7ab5cbe2ab 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
@@ -155,6 +155,15 @@ it('opens with focus on the resume action', async () => {
   expect(document.activeElement?.textContent?.trim()).toBe('Resume 2 chats')
 })
 
+it('uses the sidebar surface without a border around the resume list', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const list = document.querySelector('[aria-label="Chats that would be resumed"]')
+  expect(list).not.toBeNull()
+  expect(list?.classList.contains('bg-worktree-sidebar')).toBe(true)
+  expect(list?.classList.contains('border')).toBe(false)
+})
+
 it('keeps initial focus inside the dialog with no resumable chats', async () => {
   rpc.mockResolvedValue({ sessions: [], failed: [failure('b')] })
   await mount(<NativeChatResumeOnRestartModal />)
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index 52183fdf7a1a..3ae449b504a3 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -234,7 +234,7 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
             'Chats that would be resumed'
           )}
           // The sidebar's own surface, so its cards read here as they do there.
-          className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md border bg-worktree-sidebar p-1.5"
+          className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md bg-worktree-sidebar p-1.5"
         >
           <ResumeOnRestartGroups
             candidates={rows}

From 07ad990dab3b54e6c870e7a9faf0c8fed1d0bd6d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 20:09:19 -0700
Subject: [PATCH 19/37] fix(sidebar): keep passive SSH pills static

---
 .../WorktreeCard.read-only-contract.test.tsx        |  8 +++++++-
 .../sidebar/WorktreeCardSshHostControl.test.tsx     |  7 +++++++
 .../sidebar/WorktreeCardSshHostControl.tsx          | 13 ++++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
index 70f7df312d68..a9018a3785ca 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
@@ -25,6 +25,9 @@ const callbacks = {
   onLineageToggle: vi.fn()
 }
 
+const INTERACTION_VARIANT =
+  /(?:^|:)(?:hover|focus|focus-visible|focus-within|active|disabled|aria-invalid):/
+
 const ALL_CARD_PROPERTIES: WorktreeCardProperty[] = [
   'status',
   'unread',
@@ -339,7 +342,7 @@ describe('WorktreeCard read-only contract', () => {
         const liveIdentity = container.querySelector('[data-ssh-target-label]')
         expect(liveIdentity).not.toBeNull()
         const liveClasses = [...(liveIdentity?.classList ?? [])]
-          .filter((name) => name !== 'cursor-pointer')
+          .filter((name) => name !== 'cursor-pointer' && !INTERACTION_VARIANT.test(name))
           .toSorted()
         const liveGlyph = liveIdentity?.querySelector('svg')?.outerHTML
         const liveSignature = worktreeCardTitleXSignature(
@@ -355,6 +358,9 @@ describe('WorktreeCard read-only contract', () => {
           )
         ).toEqual(liveSignature)
         expect(identity?.tagName).toBe('SPAN')
+        expect(
+          [...(identity?.classList ?? [])].filter((name) => INTERACTION_VARIANT.test(name))
+        ).toEqual([])
         expect(
           [...(identity?.classList ?? [])].filter((name) => name !== 'cursor-default').toSorted()
         ).toEqual(liveClasses)
diff --git a/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx b/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx
index bfe8bb0a3bf1..7ebffa11819c 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx
@@ -105,6 +105,13 @@ describe('WorktreeCardSshHostControl', () => {
       const { container } = renderControl({ status, iconOnly, interactive: false, onPointerDown })
       const identity = container.querySelector('[data-ssh-target-label]')
       expect(identity?.tagName).toBe('SPAN')
+      expect(
+        [...(identity?.classList ?? [])].filter((name) =>
+          /(?:^|:)(?:hover|focus|focus-visible|focus-within|active|disabled|aria-invalid):/.test(
+            name
+          )
+        )
+      ).toEqual([])
       expect(identity?.textContent).toContain('devbox')
       expect(
         container.querySelector('button, [tabindex], [role="button"], [data-tooltip]')
diff --git a/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.tsx b/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.tsx
index 14225a9fb885..fa5b130cde03 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.tsx
@@ -1,7 +1,7 @@
 import { useCallback } from 'react'
 import { Loader2, Server, ServerOff } from 'lucide-react'
 import { toast } from 'sonner'
-import { Button, buttonVariants } from '@/components/ui/button'
+import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { cn } from '@/lib/utils'
 import { translate } from '@/i18n/i18n'
@@ -39,11 +39,18 @@ type WorktreeCardSshHostControlProps = {
 // (WorktreeCard.tsx). States differ only by color token, so the pill never changes height.
 const PILL_BASE =
   'h-4 shrink-0 gap-0.5 rounded !px-0.5 text-[10px] font-medium leading-none has-[>svg]:!px-0.5'
+// Mirror Button's resting layout without its interaction variants.
+const PILL_LAYOUT =
+  "inline-flex items-center justify-center whitespace-nowrap transition-all outline-none px-4 py-2 has-[>svg]:px-3 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
 const PILL_QUIET =
   'text-muted-foreground border border-worktree-sidebar-border bg-worktree-sidebar shadow-none hover:bg-worktree-sidebar-accent hover:text-foreground focus-visible:border-worktree-sidebar-border focus-visible:ring-1 focus-visible:ring-worktree-sidebar-ring'
 const PILL_FAILED =
   'text-destructive border border-destructive/40 bg-destructive/10 hover:bg-destructive/15 hover:text-destructive focus-visible:border-destructive/40 focus-visible:ring-1 focus-visible:ring-worktree-sidebar-ring'
 
+const PILL_QUIET_STATIC =
+  'text-muted-foreground border border-worktree-sidebar-border bg-worktree-sidebar shadow-none'
+const PILL_FAILED_STATIC = 'text-destructive border border-destructive/40 bg-destructive/10'
+
 function PassiveGlyph({
   icon,
   tooltip,
@@ -249,9 +256,9 @@ export function WorktreeCardSshHostControl({
     return (
       <span
         className={cn(
-          buttonVariants({ variant: 'ghost' }),
+          PILL_LAYOUT,
           PILL_BASE,
-          failed ? PILL_FAILED : PILL_QUIET,
+          failed ? PILL_FAILED_STATIC : PILL_QUIET_STATIC,
           iconOnly && 'w-4 justify-center !px-0 has-[>svg]:!px-0',
           'cursor-default'
         )}

From dc8cc8ba8bd4c4b2ca61512a744f0257555f43c7 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 21:26:28 -0700
Subject: [PATCH 20/37] fix(native-chat): align resume card vertical spacing

---
 .../NativeChatResumeOnRestartGroups.test.tsx  | 208 +++++++++++++++---
 .../NativeChatResumeOnRestartGroups.tsx       |   3 +-
 .../sidebar/use-worktree-card-controller.ts   |   8 +
 .../use-worktree-card-secondary-details.ts    |   7 +-
 .../sidebar/worktree-card-presentation.tsx    |  11 +-
 .../sidebar/worktree-card-spacing.ts          |  13 ++
 .../sidebar/worktree-card-surface.tsx         |   4 +-
 ...ree-card-vertical-geometry.test-support.ts | 148 +++++++++++++
 8 files changed, 372 insertions(+), 30 deletions(-)
 create mode 100644 src/renderer/src/components/sidebar/worktree-card-spacing.ts
 create mode 100644 src/renderer/src/components/sidebar/worktree-card-vertical-geometry.test-support.ts

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index 4f725091fc86..ee7939d959fb 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -7,17 +7,27 @@ import { useAppStore } from '../store'
 import { getDefaultSettings } from '../../../shared/constants'
 import type { SshConnectionStatus } from '../../../shared/ssh-types'
 import { worktreeCardTitleXSignature } from './sidebar/worktree-card-title-geometry.test-support'
+import {
+  describeWorktreeVerticalGeometry,
+  worktreeCardRootGap,
+  worktreeCardVerticalOffsets,
+  worktreeCardVerticalSignature
+} from './sidebar/worktree-card-vertical-geometry.test-support'
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import type { Worktree } from '../../../shared/worktree/types'
+import type { WorktreeCardProperty } from '../../../shared/ui-chrome-types'
 import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
 import { TooltipProvider } from './ui/tooltip'
 import {
   renderWorktreeItemRow,
+  renderWorktreeLineageDescendants,
   type WorktreeItemRowContext
 } from './sidebar/worktree-list/rows/item-row'
 import { WORKTREE_ROW_DRAG_INITIAL_STATE } from './sidebar/worktree-list/drag/row-state'
-import type { WorktreeItemRow } from './sidebar/worktree-list/listing/renderable-rows'
 import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import { buildRows } from './sidebar/worktree-list/grouping/build-rows'
+import { buildRenderableRows } from './sidebar/worktree-list/listing/renderable-rows'
+import { WORKTREE_SIDEBAR_VIRTUAL_ROW_GAP } from './sidebar/worktree-list/viewport/virtual-rows'
 
 globalThis.IS_REACT_ACT_ENVIRONMENT = true
 let root: Root
@@ -68,16 +78,24 @@ function render(
     child: 'local'
   },
   compactCards = false,
-  sshStatus?: SshConnectionStatus
+  sshStatus?: SshConnectionStatus,
+  includeSiblings = false,
+  cardProperties?: WorktreeCardProperty[]
 ): void {
   const parent = worktree('parent', { hostId: hosts.parent })
   const child = worktree('child', { hostId: hosts.child })
+  const sibling = worktree('sibling', { hostId: hosts.child })
+  const nextRoot = worktree('next-root', { hostId: hosts.parent })
   const candidates = [
     candidate('in-child', child),
     candidate('in-parent', parent),
-    candidate('also-in-child', child)
+    candidate('also-in-child', child),
+    ...(includeSiblings
+      ? [candidate('in-sibling', sibling), candidate('in-next-root', nextRoot)]
+      : [])
   ]
   useAppStore.setState({
+    worktreeCardProperties: cardProperties ?? useAppStore.getState().worktreeCardProperties,
     settings: {
       ...getDefaultSettings(''),
       experimentalNewWorktreeCardStyle: newCardStyle,
@@ -110,7 +128,7 @@ function render(
         : []
     ),
     sshTargetLabels: new Map([['build-server', 'build-server']]),
-    worktreesByRepo: { 'repo-1': [parent, child] },
+    worktreesByRepo: { 'repo-1': [parent, child, ...(includeSiblings ? [sibling, nextRoot] : [])] },
     worktreeLineageById: {
       [child.id]: {
         worktreeId: child.id,
@@ -120,7 +138,20 @@ function render(
         origin: 'cli',
         capture: { source: 'explicit-cli-flag', confidence: 'explicit' },
         createdAt: 1
-      }
+      },
+      ...(includeSiblings
+        ? {
+            [sibling.id]: {
+              worktreeId: sibling.id,
+              worktreeInstanceId: 'instance-sibling',
+              parentWorktreeId: parent.id,
+              parentWorktreeInstanceId: 'instance-parent',
+              origin: 'cli' as const,
+              capture: { source: 'explicit-cli-flag' as const, confidence: 'explicit' as const },
+              createdAt: 1
+            }
+          }
+        : {})
     }
   })
   act(() =>
@@ -237,32 +268,44 @@ function renderLiveSidebarRows(): HTMLElement {
     onCardDragStart: vi.fn(),
     onCardDragEnd: vi.fn()
   }
-  const row = (workspace: Worktree, depth: number): WorktreeItemRow => ({
-    type: 'item',
-    rowKey: workspace.id,
-    sectionKey: 'repo-1',
-    worktree: workspace,
-    repo,
-    depth,
-    groupDepth: 0,
-    lineageTrail: [],
-    isLastLineageChild: true,
-    lineageChildCount: depth === 0 ? 1 : 0,
-    lineageGroupKey: depth === 0 ? 'parent' : undefined,
-    lineageCollapsed: false
-  })
+  const rows = buildRenderableRows(
+    buildRows(
+      'repo',
+      state.worktreesByRepo['repo-1'] ?? [],
+      new Map(repo ? [[repo.id, repo]] : []),
+      null,
+      new Set(),
+      undefined,
+      undefined,
+      undefined,
+      state.worktreeLineageById,
+      undefined,
+      true
+    )
+  ).filter((row) => row.type === 'item' || row.type === 'lineage-group')
   const live = document.createElement('div')
+  live.style.display = 'flex'
+  live.style.flexDirection = 'column'
+  live.style.rowGap = `${WORKTREE_SIDEBAR_VIRTUAL_ROW_GAP}px`
   document.body.append(live)
   const liveRoot = createRoot(live)
   act(() =>
     liveRoot.render(
       <TooltipProvider>
-        {renderWorktreeItemRow(
-          ctx,
-          row(parent, 0),
-          false,
-          renderWorktreeItemRow(ctx, row(child, 1), true)
-        )}
+        {rows.map((row) => {
+          if (row.type === 'item') {
+            return renderWorktreeItemRow(ctx, row, false)
+          }
+          const [lineageParent, ...descendants] = row.rows
+          return lineageParent
+            ? renderWorktreeItemRow(
+                ctx,
+                lineageParent,
+                false,
+                renderWorktreeLineageDescendants(ctx, lineageParent, descendants)
+              )
+            : null
+        })}
       </TooltipProvider>
     )
   )
@@ -340,6 +383,121 @@ it('lays a read-only parent out with its status lane and passive child chip', ()
   expect(parentCard.querySelector('button[aria-expanded]')).toBeNull()
 })
 
+it.each([
+  { style: 'legacy', newCardStyle: false, compactCards: false },
+  { style: 'compact', newCardStyle: false, compactCards: true },
+  { style: 'new', newCardStyle: true, compactCards: false }
+])(
+  '$style: matches the live sidebar vertical card and lineage geometry',
+  ({ newCardStyle, compactCards }) => {
+    render(newCardStyle, undefined, compactCards, undefined, true)
+    const dialog = {
+      parent: worktreeCardVerticalSignature(cardTitled('parent')),
+      child: worktreeCardVerticalSignature(cardTitled('child')),
+      sibling: worktreeCardVerticalSignature(cardTitled('sibling')),
+      nextRoot: worktreeCardVerticalSignature(cardTitled('next-root'))
+    }
+    const live = renderLiveSidebarRows()
+    const dialogContainer = container
+    container = live
+    const sidebar = {
+      parent: worktreeCardVerticalSignature(cardTitled('parent')),
+      child: worktreeCardVerticalSignature(cardTitled('child')),
+      sibling: worktreeCardVerticalSignature(cardTitled('sibling')),
+      nextRoot: worktreeCardVerticalSignature(cardTitled('next-root'))
+    }
+    container = dialogContainer
+    expect(sidebar.parent.surface).toEqual(['border', 'pb-1.5', 'pt-1.25'])
+    expect(sidebar.child.surface).toEqual(
+      compactCards ? ['border', 'py-2'] : ['border', 'pb-1.5', 'pt-1.25']
+    )
+    expect(sidebar.parent.children).toHaveLength(2)
+    for (const childPath of sidebar.parent.children) {
+      expect(childPath).toContainEqual(['mt-1.5', 'space-y-1'])
+    }
+    expect(dialog).toEqual(sidebar)
+  }
+)
+
+it.each([
+  { style: 'legacy', newCardStyle: false, compactCards: false },
+  { style: 'compact', newCardStyle: false, compactCards: true },
+  { style: 'new', newCardStyle: true, compactCards: false }
+])('$style: leaves the sidebar gap before the next root card', ({ newCardStyle, compactCards }) => {
+  render(newCardStyle, undefined, compactCards, undefined, true)
+  const list = cardTitled('parent').parentElement?.parentElement
+  if (!list) {
+    throw new Error('Missing dialog list')
+  }
+  const live = renderLiveSidebarRows()
+  expect(WORKTREE_SIDEBAR_VIRTUAL_ROW_GAP).toBe(6)
+  expect(describeWorktreeVerticalGeometry(list)).toEqual(describeWorktreeVerticalGeometry(live))
+})
+
+it.each(
+  [
+    { style: 'legacy', newCardStyle: false, compactCards: false },
+    { style: 'compact', newCardStyle: false, compactCards: true },
+    { style: 'new', newCardStyle: true, compactCards: false }
+  ].flatMap((style) => [true, false].map((inlineAgents) => ({ ...style, inlineAgents })))
+)(
+  '$style/inline=$inlineAgents: follows sidebar padding when branch metadata is hidden',
+  ({ newCardStyle, compactCards, inlineAgents }) => {
+    render(newCardStyle, undefined, compactCards, undefined, true, [
+      'status',
+      ...(inlineAgents ? ['inline-agents' as const] : [])
+    ])
+    const titles = ['parent', 'child', 'sibling', 'next-root']
+    const dialog = titles.map((title) => worktreeCardVerticalSignature(cardTitled(title)))
+    const live = renderLiveSidebarRows()
+    const dialogContainer = container
+    container = live
+    const sidebar = titles.map((title) => worktreeCardVerticalSignature(cardTitled(title)))
+    container = dialogContainer
+    expect(sidebar[1]?.surface).toEqual(
+      (newCardStyle && !inlineAgents) || compactCards
+        ? ['border', 'py-2']
+        : ['border', 'pb-1.5', 'pt-1.25']
+    )
+    expect(dialog).toEqual(sidebar)
+  }
+)
+
+it.each([
+  { style: 'legacy', newCardStyle: false, compactCards: false, chip: 18, sibling: 10, root: 19 },
+  { style: 'compact', newCardStyle: false, compactCards: true, chip: 21, sibling: 13, root: 22 },
+  { style: 'new', newCardStyle: true, compactCards: false, chip: 12, sibling: 10, root: 19 }
+])(
+  '$style: matches computed chip, sibling and next-root title offsets',
+  ({ newCardStyle, compactCards, chip, sibling, root: nextRootOffset }) => {
+    render(newCardStyle, undefined, compactCards, undefined, true)
+    const list = cardTitled('parent').parentElement?.parentElement
+    if (!list) {
+      throw new Error('Missing dialog list')
+    }
+    const dialog = worktreeCardVerticalOffsets(
+      cardTitled('parent'),
+      cardTitled('next-root'),
+      worktreeCardRootGap(list)
+    )
+    const live = renderLiveSidebarRows()
+    const dialogContainer = container
+    container = live
+    const sidebar = worktreeCardVerticalOffsets(
+      cardTitled('parent'),
+      cardTitled('next-root'),
+      worktreeCardRootGap(live)
+    )
+    container = dialogContainer
+    expect(sidebar).toEqual({
+      chipToChildTitle: chip,
+      childToSiblingTitle: sibling,
+      lastChildToNextRootTitle: nextRootOffset
+    })
+    expect(dialog).toEqual(sidebar)
+  }
+)
+
 it('counts only listed child workspaces in the passive chip', () => {
   render(false)
   const state = useAppStore.getState()
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index 525cf914b9ae..f6e062f68079 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -8,6 +8,7 @@ import {
   LINEAGE_CHILDREN_INLINE_OFFSET
 } from '@/components/sidebar/worktree-list/rows/indentation'
 import { getWorktreeRowGeometry } from '@/components/sidebar/worktree-list/rows/worktree-row-geometry'
+import { WORKTREE_SIDEBAR_VIRTUAL_ROW_GAP } from '@/components/sidebar/worktree-list/viewport/virtual-rows'
 import {
   getCyclicProjectedWorktreeLineageIds,
   getSidebarLineageAncestors
@@ -301,7 +302,7 @@ export function ResumeOnRestartGroups({
       {repoGroups.map((repoGroup) => (
         <section key={repoGroup.repoId ?? 'no-repo'} className="flex flex-col gap-1">
           <RepoHeader repoId={repoGroup.repoId} />
-          <div className="flex flex-col gap-1">
+          <div className="flex flex-col" style={{ rowGap: WORKTREE_SIDEBAR_VIRTUAL_ROW_GAP }}>
             {nestResumeWorkspaces(repoGroup.workspaces, ancestorsOf).map((node) => (
               <WorkspaceCard
                 key={node.group.workspaceId}
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
index 7368bd3e5a5d..854d14c43530 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
@@ -11,6 +11,7 @@ import { useWorktreeCardReviewDetails } from './use-worktree-card-review-details
 import { useWorktreeCardSecondaryDetails } from './use-worktree-card-secondary-details'
 import { useWorktreeCardWorkspaceActions } from './use-worktree-card-workspace-actions'
 import { useIsSleepingWorktree } from './use-worktree-sleep-state'
+import { hasInlineWorktreeAgentRows } from './worktree-card-spacing'
 
 export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
   const { worktree, repo, readOnly } = props
@@ -160,6 +161,13 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     deleteState,
     interactive,
     quietStatusLane,
+    // Caller-owned recovery rows keep the sidebar header's padding even when compact cards hide live agents.
+    callerRowsAffectSurfacePadding: !readOnly,
+    inlineAgentRowsAffectSurfacePadding: hasInlineWorktreeAgentRows({
+      cardProperties: foundation.cardProps,
+      newCardStyle: foundation.newCardStyle,
+      compactCards: foundation.compactCards
+    }),
     isSleeping,
     ...review,
     ...linked,
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
index ca095a260935..186edc43bfdd 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
@@ -11,6 +11,7 @@ import type { WorktreeCardProps } from './worktree-card-model'
 import type { useWorktreeCardFoundation } from './use-worktree-card-foundation'
 import type { useWorktreeCardLinkedDetails } from './use-worktree-card-linked-details'
 import type { useWorktreeCardReviewDetails } from './use-worktree-card-review-details'
+import { hasInlineWorktreeAgentRows } from './worktree-card-spacing'
 
 type Foundation = ReturnType<typeof useWorktreeCardFoundation>
 type LinkedDetails = ReturnType<typeof useWorktreeCardLinkedDetails>
@@ -90,7 +91,11 @@ export function useWorktreeCardSecondaryDetails({
   const metaAutomationProvenance = showAutomation ? worktree.automationProvenance : null
   const metaCliProvenance = showCli ? worktree.cliProvenance : null
   const metaComment = showComment ? hoverComment : null
-  const showInlineAgentList = cardProps.includes('inline-agents') && (newCardStyle || !compactCards)
+  const showInlineAgentList = hasInlineWorktreeAgentRows({
+    cardProperties: cardProps,
+    newCardStyle,
+    compactCards
+  })
   const compactInlineAgentRows = useWorktreeAgentRows(
     worktree.id,
     showInlineAgentList && agentActivityDisplayMode === 'compact'
diff --git a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
index 2993a72b9360..c7213e58ca6a 100644
--- a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
@@ -10,6 +10,7 @@ import {
   WorktreeCardMetaBadges
 } from './WorktreeCardMeta'
 import { WorktreeCardPortsDetails, WorktreeCardPortsTrigger } from './WorktreeCardPorts'
+import { getWorktreeCardSurfacePadding } from './worktree-card-spacing'
 import type { WorktreeCardController } from './use-worktree-card-controller'
 
 export function buildWorktreeCardPresentation(card: WorktreeCardController) {
@@ -268,6 +269,13 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     showLineageChildChip ||
     agentRows != null
   const titleOnlyCard = !hasSecondaryCardContent
+  const surfacePaddingClassName = getWorktreeCardSurfacePadding(
+    hasMetaRow ||
+      !!remoteBranchConflict ||
+      card.inlineAgentRowsAffectSurfacePadding ||
+      showLineageChildChip ||
+      (card.callerRowsAffectSurfacePadding && agentRows != null)
+  )
 
   return {
     showPinnedRepoIcon,
@@ -294,7 +302,8 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     cardStyle,
     detailsAndPorts,
     titleRowIndicators,
-    titleOnlyCard
+    titleOnlyCard,
+    surfacePaddingClassName
   }
 }
 
diff --git a/src/renderer/src/components/sidebar/worktree-card-spacing.ts b/src/renderer/src/components/sidebar/worktree-card-spacing.ts
new file mode 100644
index 000000000000..834a190d644b
--- /dev/null
+++ b/src/renderer/src/components/sidebar/worktree-card-spacing.ts
@@ -0,0 +1,13 @@
+import type { WorktreeCardProperty } from '../../../../shared/ui-chrome-types'
+
+export function hasInlineWorktreeAgentRows(args: {
+  cardProperties: readonly WorktreeCardProperty[]
+  newCardStyle: boolean
+  compactCards: boolean
+}): boolean {
+  return args.cardProperties.includes('inline-agents') && (args.newCardStyle || !args.compactCards)
+}
+
+export function getWorktreeCardSurfacePadding(hasSecondaryContent: boolean): string {
+  return hasSecondaryContent ? 'pt-1.25 pb-1.5' : 'py-2'
+}
diff --git a/src/renderer/src/components/sidebar/worktree-card-surface.tsx b/src/renderer/src/components/sidebar/worktree-card-surface.tsx
index c2a8e2edd114..b6f7bc273d53 100644
--- a/src/renderer/src/components/sidebar/worktree-card-surface.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-surface.tsx
@@ -41,7 +41,7 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
     showRenameErrorDialog,
     setShowRenameErrorDialog
   } = card
-  const { titleOnlyCard, cardStyle } = presentation
+  const { surfacePaddingClassName, cardStyle } = presentation
 
   const parentCardContent = <WorktreeCardParentContent card={card} presentation={presentation} />
 
@@ -50,7 +50,7 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
       className={cn(
         'relative flex flex-col pr-1.5 transition-[background-color,border-color,opacity,box-shadow] duration-200 outline-none select-none',
         interactive && 'cursor-pointer',
-        titleOnlyCard ? 'py-2' : 'pt-1.25 pb-1.5',
+        surfacePaddingClassName,
         flushSurface ? 'ml-1 w-[calc(100%-0.25rem)]' : 'ml-1',
         'overflow-hidden rounded-lg',
         // Why: the live data attribute updates before React state during navigation,
diff --git a/src/renderer/src/components/sidebar/worktree-card-vertical-geometry.test-support.ts b/src/renderer/src/components/sidebar/worktree-card-vertical-geometry.test-support.ts
new file mode 100644
index 000000000000..be8a8301a37f
--- /dev/null
+++ b/src/renderer/src/components/sidebar/worktree-card-vertical-geometry.test-support.ts
@@ -0,0 +1,148 @@
+const VERTICAL_GEOMETRY =
+  /^(-?(m[tyb]?|p[tyb]?|gap(-y)?|h|min-h|max-h|size|space-y|leading)-|border$)/
+
+export function describeWorktreeVerticalGeometry(element: Element): string[] {
+  return [
+    ...[...element.classList].filter((name) => VERTICAL_GEOMETRY.test(name)).toSorted(),
+    ...(element.getAttribute('style') ?? '')
+      .split(';')
+      .map((declaration) => declaration.trim())
+      .filter((declaration) =>
+        /^(margin(-(top|bottom|block))?|padding(-(top|bottom|block))?|height|gap|row-gap):/.test(
+          declaration
+        )
+      )
+  ]
+}
+
+function rowHeightBoxes(element: Element): string[][] {
+  if (['sr-only', 'absolute', 'hidden'].some((name) => element.classList.contains(name))) {
+    return []
+  }
+  const geometry = describeWorktreeVerticalGeometry(element)
+  if ([...element.classList].some((name) => /^(h|size)-/.test(name))) {
+    return [geometry]
+  }
+  return [geometry, ...[...element.children].flatMap(rowHeightBoxes)].filter(
+    (box) => box.length > 0
+  )
+}
+
+function pathTo(element: Element, stopAt: Element): string[][] {
+  const path: string[][] = []
+  for (let node: Element | null = element; node && node !== stopAt; node = node.parentElement) {
+    const geometry = describeWorktreeVerticalGeometry(node)
+    if (geometry.length > 0) {
+      path.push(geometry)
+    }
+    const parent = node.parentElement
+    if (
+      parent &&
+      (parent.classList.contains('flex') || parent.classList.contains('inline-flex')) &&
+      !parent.classList.contains('flex-col')
+    ) {
+      for (const sibling of parent.children) {
+        if (sibling !== node) {
+          path.push(
+            ...rowHeightBoxes(sibling).map((box) => box.map((entry) => `row-neighbour: ${entry}`))
+          )
+        }
+      }
+    }
+  }
+  return path
+}
+
+function spacing(element: Element, prefix: string): number {
+  const value = [...element.classList]
+    .find((name) => name.startsWith(`${prefix}-`))
+    ?.slice(prefix.length + 1)
+  if (!value) {
+    return 0
+  }
+  if (/^\d+(\.\d+)?$/.test(value)) {
+    return Number(value) * 4
+  }
+  if (/^\[\d+(\.\d+)?px\]$/.test(value)) {
+    return Number(value.slice(1, -3))
+  }
+  throw new Error(`Unhandled vertical length: ${value}`)
+}
+
+function topPadding(element: Element): number {
+  return spacing(element, 'pt') || spacing(element, 'py') || spacing(element, 'p')
+}
+
+function bottomPadding(element: Element): number {
+  return spacing(element, 'pb') || spacing(element, 'py') || spacing(element, 'p')
+}
+
+export function worktreeCardRootGap(list: HTMLElement): number {
+  return list.style.rowGap
+    ? Number.parseFloat(list.style.rowGap)
+    : spacing(list, 'gap-y') || spacing(list, 'gap')
+}
+
+export function worktreeCardVerticalOffsets(
+  surface: Element,
+  nextRoot: Element,
+  rootGap: number
+): {
+  chipToChildTitle: number
+  childToSiblingTitle: number
+  lastChildToNextRootTitle: number
+} {
+  const children = [...surface.querySelectorAll('[data-worktree-card-surface]')].filter(
+    (child) => child.parentElement?.closest('[data-worktree-card-surface]') === surface
+  )
+  const [firstChild, sibling] = children
+  if (!firstChild || !sibling) {
+    throw new Error('Missing sibling cards')
+  }
+  let lineage: Element | null = firstChild.parentElement
+  while (
+    lineage &&
+    lineage !== surface &&
+    ![...lineage.classList].some((name) => name.startsWith('space-y-'))
+  ) {
+    lineage = lineage.parentElement
+  }
+  if (!lineage) {
+    throw new Error('Missing lineage container')
+  }
+  const legacyStack = lineage.parentElement?.classList.contains('flex-col')
+    ? spacing(lineage.parentElement, 'gap')
+    : 0
+  const border = (card: Element): number => (card.classList.contains('border') ? 1 : 0)
+  return {
+    chipToChildTitle:
+      legacyStack + spacing(lineage, 'mt') + border(firstChild) + topPadding(firstChild),
+    childToSiblingTitle: spacing(lineage, 'space-y') + border(sibling) + topPadding(sibling),
+    lastChildToNextRootTitle:
+      bottomPadding(surface) + border(surface) + rootGap + border(nextRoot) + topPadding(nextRoot)
+  }
+}
+
+export function worktreeCardVerticalSignature(surface: Element): {
+  surface: string[]
+  title: string[][]
+  chip: string[][] | undefined
+  children: string[][][]
+} {
+  const title = surface.querySelector('[data-worktree-title-inline-rename]')
+  if (!title) {
+    throw new Error('Missing card title')
+  }
+  const chip = [...surface.querySelectorAll('button, span')].find((element) =>
+    /^\d+ child(ren)?$/.test(element.textContent ?? '')
+  )
+  const children = [...surface.querySelectorAll('[data-worktree-card-surface]')].filter(
+    (child) => child.parentElement?.closest('[data-worktree-card-surface]') === surface
+  )
+  return {
+    surface: describeWorktreeVerticalGeometry(surface),
+    title: pathTo(title, surface),
+    chip: chip ? pathTo(chip, surface) : undefined,
+    children: children.map((child) => pathTo(child, surface))
+  }
+}

From 4b21e08e167157c29cad90af7264b635dfb5fe3e Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 5 Oct 2026 22:13:33 -0700
Subject: [PATCH 21/37] fix(native-chat): preserve cache-only card header
 spacing

---
 .../NativeChatResumeOnRestartGroups.test.tsx  | 66 +++++++++++++++++++
 .../use-worktree-card-secondary-details.ts    |  8 ++-
 .../sidebar/worktree-card-presentation.tsx    |  1 +
 3 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index ee7939d959fb..de452050a237 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -498,6 +498,72 @@ it.each([
   }
 )
 
+it.each([true, false])(
+  'cache-only metadata/enabled=%s: preserves sidebar header geometry without showing live state',
+  (enabled) => {
+    useAppStore.setState({ fetchHostedReviewForBranch: vi.fn().mockResolvedValue(undefined) })
+    render(true, undefined, false, undefined, true, ['status'])
+    const child = worktree('child', { hostId: 'local' })
+    const state = useAppStore.getState()
+    act(() =>
+      useAppStore.setState({
+        settings: {
+          ...(state.settings ?? getDefaultSettings('')),
+          promptCacheTimerEnabled: enabled,
+          promptCacheTtlMs: 300_000
+        },
+        tabsByWorktree: {
+          [child.id]: [
+            {
+              id: 'child-claude',
+              worktreeId: child.id,
+              ptyId: null,
+              title: 'Claude',
+              customTitle: null,
+              color: null,
+              launchAgent: 'claude',
+              sortOrder: 0,
+              createdAt: 1
+            }
+          ]
+        },
+        cacheTimerByKey: { 'child-claude:seed': Date.now() }
+      })
+    )
+    const dialogChild = cardTitled('child')
+    const dialog = worktreeCardVerticalSignature(dialogChild)
+    const list = cardTitled('parent').parentElement?.parentElement
+    if (!list) {
+      throw new Error('Missing dialog list')
+    }
+    const dialogOffsets = worktreeCardVerticalOffsets(
+      cardTitled('parent'),
+      cardTitled('next-root'),
+      worktreeCardRootGap(list)
+    )
+    expect(dialogChild.querySelector('[data-worktree-card-meta-row]')).toBeNull()
+    expect(dialogChild.textContent).toContain('Prompt in-child')
+    expect(dialogChild.textContent).toContain('Prompt also-in-child')
+
+    const live = renderLiveSidebarRows()
+    const dialogContainer = container
+    container = live
+    const sidebarChild = cardTitled('child')
+    const sidebar = worktreeCardVerticalSignature(sidebarChild)
+    const sidebarOffsets = worktreeCardVerticalOffsets(
+      cardTitled('parent'),
+      cardTitled('next-root'),
+      worktreeCardRootGap(live)
+    )
+    container = dialogContainer
+    expect(sidebarChild.querySelector('[data-worktree-card-meta-row]') !== null).toBe(enabled)
+    expect(sidebar.surface).toEqual(enabled ? ['border', 'pb-1.5', 'pt-1.25'] : ['border', 'py-2'])
+    expect(dialog).toEqual(sidebar)
+    expect(sidebarOffsets.chipToChildTitle).toBe(enabled ? 12 : 15)
+    expect(dialogOffsets).toEqual(sidebarOffsets)
+  }
+)
+
 it('counts only listed child workspaces in the passive chip', () => {
   render(false)
   const state = useAppStore.getState()
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
index 186edc43bfdd..a3fcbd88ba23 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
@@ -244,7 +244,12 @@ export function useWorktreeCardSecondaryDetails({
     cliProvenance: metaCliProvenance
   })
   const hasPorts = showPorts && workspacePorts.length > 0
-  const cacheStartedAt = usePromptCacheCountdownStartedAt(worktree.id, showAggregateCacheTimer)
+  // Hidden live metadata still determines the sidebar's header padding.
+  const cacheStartedAtForSurfacePadding = usePromptCacheCountdownStartedAt(
+    worktree.id,
+    !compactCards && !compactInlineAgentRowsVisible
+  )
+  const cacheStartedAt = showAggregateCacheTimer ? cacheStartedAtForSurfacePadding : null
   // Why: derived from the settings the card already subscribes to — a third store
   // subscription for this one field costs a listener per card on every store write.
   const cacheTtlMs = showAggregateCacheTimer ? (settings?.promptCacheTtlMs ?? 0) : 0
@@ -276,6 +281,7 @@ export function useWorktreeCardSecondaryDetails({
     handleOpenLinearIssueInOrca,
     hasDetails,
     hasPorts,
+    cacheTimerAffectsSurfacePadding: cacheStartedAtForSurfacePadding != null,
     cacheStartedAt,
     cacheTtlMs
   }
diff --git a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
index c7213e58ca6a..12fcb6829b09 100644
--- a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
@@ -271,6 +271,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
   const titleOnlyCard = !hasSecondaryCardContent
   const surfacePaddingClassName = getWorktreeCardSurfacePadding(
     hasMetaRow ||
+      card.cacheTimerAffectsSurfacePadding ||
       !!remoteBranchConflict ||
       card.inlineAgentRowsAffectSurfacePadding ||
       showLineageChildChip ||

From c2e4d93fc975b59d4cf0cc820007a6e7e0a0dcc0 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 00:06:35 -0700
Subject: [PATCH 22/37] fix(native-chat): lay the resume dialog out as a
 checkbox-column list

Every row of the resume list (Select all, workspace, chat) now keeps its
checkbox in one left column; nesting indents only the content after it,
and a divider separates every row. A workspace checkbox is tri-state over
its own chats and those of the workspaces nested under it; Select all
heads the list with an "N of M selected" count. Failures a retry cannot
fix stay out of both. Up/Down move between the list's checkboxes.

The dialog no longer renders the sidebar's WorktreeCard, so the read-only
card mode and the sidebar changes that only served it are reverted to
main. The sidebar lineage helpers stay: the dialog still nests child
workspaces by the sidebar's own rule.
---
 .../NativeChatResumeFailureDetails.tsx        |   2 +-
 .../NativeChatResumeOnRestartAgentRow.tsx     |  85 +-
 .../NativeChatResumeOnRestartGroups.test.tsx  | 859 +++++++-----------
 .../NativeChatResumeOnRestartGroups.tsx       | 267 +++---
 ...tiveChatResumeOnRestartModal.list.test.tsx | 205 +++++
 .../NativeChatResumeOnRestartModal.test.tsx   | 142 +--
 .../NativeChatResumeOnRestartModal.tsx        |  83 +-
 .../activity/activity-thread-hover-card.tsx   |   1 -
 ...ve-chat-resume-on-restart-grouping.test.ts |  48 +
 .../native-chat-resume-on-restart-grouping.ts |  38 +
 ...at-resume-on-restart-modal.test-support.ts |  63 ++
 .../WorktreeCard.affiliate-list-mode.test.tsx |  93 --
 .../sidebar/WorktreeCard.lineage.test.tsx     |  91 +-
 .../WorktreeCard.read-only-contract.test.tsx  | 427 ---------
 .../src/components/sidebar/WorktreeCard.tsx   |  15 +-
 .../WorktreeCardSshHostControl.test.tsx       |  46 -
 .../sidebar/WorktreeCardSshHostControl.tsx    |  67 +-
 .../sidebar/WorktreeCardStatusSlot.tsx        |  17 +-
 .../sidebar/use-worktree-card-controller.ts   |  58 +-
 ...ndary-details.store-subscriptions.test.tsx |   1 -
 .../use-worktree-card-secondary-details.ts    |  21 +-
 .../sidebar/worktree-card-header.tsx          |   5 +-
 .../components/sidebar/worktree-card-model.ts |  44 -
 .../sidebar/worktree-card-parent-content.tsx  |  48 +-
 .../sidebar/worktree-card-presentation.tsx    |  26 +-
 .../sidebar/worktree-card-secondary-rows.tsx  | 100 +-
 .../sidebar/worktree-card-spacing.ts          |  13 -
 .../sidebar/worktree-card-surface.tsx         |  17 +-
 ...rktree-card-title-geometry.test-support.ts |  60 --
 ...ree-card-vertical-geometry.test-support.ts | 148 ---
 .../sidebar/worktree-list/rows/item-row.tsx   |  82 +-
 .../rows/worktree-row-geometry.ts             |  70 --
 src/renderer/src/i18n/locales/en.json         |   7 +-
 33 files changed, 1156 insertions(+), 2093 deletions(-)
 create mode 100644 src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
 create mode 100644 src/renderer/src/components/native-chat-resume-on-restart-modal.test-support.ts
 delete mode 100644 src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
 delete mode 100644 src/renderer/src/components/sidebar/worktree-card-spacing.ts
 delete mode 100644 src/renderer/src/components/sidebar/worktree-card-title-geometry.test-support.ts
 delete mode 100644 src/renderer/src/components/sidebar/worktree-card-vertical-geometry.test-support.ts
 delete mode 100644 src/renderer/src/components/sidebar/worktree-list/rows/worktree-row-geometry.ts

diff --git a/src/renderer/src/components/NativeChatResumeFailureDetails.tsx b/src/renderer/src/components/NativeChatResumeFailureDetails.tsx
index f0bd41a1792f..968c0fc0769b 100644
--- a/src/renderer/src/components/NativeChatResumeFailureDetails.tsx
+++ b/src/renderer/src/components/NativeChatResumeFailureDetails.tsx
@@ -99,7 +99,7 @@ export function ResumeFailureGuidanceLine({
 }): React.JSX.Element {
   const guidance = resumeFailureGuidance(failure)
   return (
-    <div className="ml-6 mb-1 flex items-center gap-2 rounded-md border border-status-warning-border bg-status-warning-background px-2 py-1.5 text-[11px]">
+    <div className="mb-1 flex items-center gap-2 rounded-md border border-status-warning-border bg-status-warning-background px-2 py-1.5 text-[11px]">
       <span className="min-w-0 flex-1">
         <span className="font-semibold">
           {translate('auto.components.NativeChatResumeOutcomeRow.toResume', 'To resume:')}
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
index 8662bef2d99e..411dde7b9a3b 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
@@ -12,9 +12,9 @@ import { ResumeFailureGuidanceLine, ResumeFailureStatus } from './NativeChatResu
 import { resumeActivityLabel } from './native-chat-resume-activity-label'
 
 /**
- * One offered chat, laid out like the sidebar's compact agent row — provider glyph, then "name -
- * what it was doing" on one line, then the model and an age on the right — with the checkbox in
- * the state dot's slot. It sits inside the workspace's own read-only sidebar card.
+ * One offered chat as a row of the resume list: its checkbox in the list's shared left column, then,
+ * indented for its depth, the provider glyph, "name - what it was doing", the model and an age —
+ * the pieces of the sidebar's compact agent row.
  *
  * The sidebar's own `CompactAgentRow` cannot be reused — it takes a `DashboardAgentRow`, which
  * requires a live pane, tab and status entry, and every chat here is by definition stopped. The
@@ -32,6 +32,8 @@ import { resumeActivityLabel } from './native-chat-resume-activity-label'
  *
  * A chat an earlier resume could not carry on is the same row — selectable where a retry can run,
  * so Resume retries it — plus a status icon, a dismiss control, and a line saying what to do.
+ *
+ * The enclosing list sets `--resume-chat-indent` for the row's depth.
  */
 export function ResumeCandidateRow({
   candidate,
@@ -61,54 +63,56 @@ export function ResumeCandidateRow({
   const model = candidate.model?.trim() ?? ''
   const activity = resumeActivityLabel(candidate.activity)
   const row = (
-    // Same box and type scale as the sidebar's `CompactAgentRow`.
-    <label className="flex h-6 min-w-0 flex-1 cursor-pointer items-center gap-1.5 rounded-sm px-1 text-[11px] leading-none text-muted-foreground worktree-agent-row-hover">
-      {/* Identifies the agent AND its workspace: the accessible name has to distinguish rows that
+    <label className="grid h-7.5 min-w-0 flex-1 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center hover:bg-worktree-sidebar-accent has-[:disabled]:cursor-default">
+      <span className="flex justify-center">
+        {/* Identifies the agent AND its workspace: the accessible name has to distinguish rows that
             would otherwise all read the same. */}
-      <Checkbox
-        checked={checked}
-        disabled={disabled || (failure !== undefined && !resumeFailureSelectable(failure))}
-        onCheckedChange={(next) => onCheckedChange(next === true)}
-        className="shrink-0"
-        aria-label={translate(
-          'auto.components.NativeChatResumeOnRestartModal.selectAgent',
-          'Resume {{value0}} chat "{{value1}}" in {{value2}}',
-          { value0: agentLabel, value1: title, value2: workspaceName }
-        )}
-      />
-      {/* AgentIcon carries no label of its own, so the provider was invisible to assistive tech. */}
-      <span role="img" aria-label={agentLabel} className="inline-flex shrink-0">
-        <AgentIcon agent={agentTypeToIconAgent(candidate.agent)} size={13} />
-      </span>
-      <span
-        className="min-w-0 flex-1 truncate"
-        title={activity ? `${title} - ${activity.detail || activity.summary}` : title}
-      >
-        <span className="text-foreground/90">{title}</span>
-        {activity && <span className="text-muted-foreground/80"> - {activity.summary}</span>}
+        <Checkbox
+          checked={checked}
+          disabled={disabled || (failure !== undefined && !resumeFailureSelectable(failure))}
+          onCheckedChange={(next) => onCheckedChange(next === true)}
+          aria-label={translate(
+            'auto.components.NativeChatResumeOnRestartModal.selectAgent',
+            'Resume {{value0}} chat "{{value1}}" in {{value2}}',
+            { value0: agentLabel, value1: title, value2: workspaceName }
+          )}
+        />
       </span>
-      {model && (
+      <span className="flex min-w-0 items-center gap-1.5 pr-2.5 pl-(--resume-chat-indent) text-[11px] leading-none text-muted-foreground">
+        {/* AgentIcon carries no label of its own, so the provider was invisible to assistive tech. */}
+        <span role="img" aria-label={agentLabel} className="inline-flex shrink-0">
+          <AgentIcon agent={agentTypeToIconAgent(candidate.agent)} size={13} />
+        </span>
         <span
-          className="min-w-0 max-w-24 shrink-0 truncate font-mono text-[10px] text-muted-foreground/70"
-          title={model}
+          className="min-w-0 flex-1 truncate"
+          title={activity ? `${title} - ${activity.detail || activity.summary}` : title}
         >
-          {model}
+          <span className="text-foreground/90">{title}</span>
+          {activity && <span className="text-muted-foreground/80"> - {activity.summary}</span>}
+        </span>
+        {model && (
+          <span
+            className="min-w-0 max-w-24 shrink-0 truncate font-mono text-[10px] text-muted-foreground/70"
+            title={model}
+          >
+            {model}
+          </span>
+        )}
+        {/* `formatShortTimeAgo` takes (timestamp, now) and subtracts internally — NOT a delta. */}
+        <span className="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">
+          {formatShortTimeAgo(candidate.recordedAt, listedAt)}
         </span>
-      )}
-      {/* `formatShortTimeAgo` takes (timestamp, now) and subtracts internally — NOT a delta. */}
-      <span className="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">
-        {formatShortTimeAgo(candidate.recordedAt, listedAt)}
       </span>
     </label>
   )
   if (!failure) {
-    return <li>{row}</li>
+    return <li className="border-t border-worktree-sidebar-border">{row}</li>
   }
   const act = (action: ResumeFailureAction) => onFailureAction?.(action, candidate.sessionId)
   return (
-    <li className="flex flex-col">
+    <li className="flex flex-col border-t border-worktree-sidebar-border">
       {/* Outside the label, so pressing them never toggles the checkbox. */}
-      <div className="flex items-center gap-1">
+      <div className="flex items-center gap-1 pr-1">
         {row}
         <ResumeFailureStatus
           failure={failure}
@@ -118,7 +122,10 @@ export function ResumeCandidateRow({
           onAction={act}
         />
       </div>
-      <ResumeFailureGuidanceLine failure={failure} disabled={disabled} onAction={act} />
+      {/* Lined up with the row's content, past the checkbox column. */}
+      <div className="pr-2.5 pl-[calc(1.75rem+var(--resume-chat-indent,0px))]">
+        <ResumeFailureGuidanceLine failure={failure} disabled={disabled} onAction={act} />
+      </div>
     </li>
   )
 }
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index de452050a237..d027d23e76ee 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -1,38 +1,21 @@
 // @vitest-environment happy-dom
 
-import { act } from 'react'
+import { act, useState } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '../store'
 import { getDefaultSettings } from '../../../shared/constants'
-import type { SshConnectionStatus } from '../../../shared/ssh-types'
-import { worktreeCardTitleXSignature } from './sidebar/worktree-card-title-geometry.test-support'
-import {
-  describeWorktreeVerticalGeometry,
-  worktreeCardRootGap,
-  worktreeCardVerticalOffsets,
-  worktreeCardVerticalSignature
-} from './sidebar/worktree-card-vertical-geometry.test-support'
+import { getHostContextLabel } from '../../../shared/worktree/host-context-labels'
 import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { WorktreeLineage } from '../../../shared/worktree/lineage-types'
 import type { Worktree } from '../../../shared/worktree/types'
-import type { WorktreeCardProperty } from '../../../shared/ui-chrome-types'
 import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
 import { TooltipProvider } from './ui/tooltip'
-import {
-  renderWorktreeItemRow,
-  renderWorktreeLineageDescendants,
-  type WorktreeItemRowContext
-} from './sidebar/worktree-list/rows/item-row'
-import { WORKTREE_ROW_DRAG_INITIAL_STATE } from './sidebar/worktree-list/drag/row-state'
-import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
-import { buildRows } from './sidebar/worktree-list/grouping/build-rows'
-import { buildRenderableRows } from './sidebar/worktree-list/listing/renderable-rows'
-import { WORKTREE_SIDEBAR_VIRTUAL_ROW_GAP } from './sidebar/worktree-list/viewport/virtual-rows'
+import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
 
 globalThis.IS_REACT_ACT_ENVIRONMENT = true
 let root: Root
 let container: HTMLElement
-const liveRoots: { root: Root; element: HTMLElement }[] = []
 
 function worktree(name: string, overrides: Partial<Worktree> = {}): Worktree {
   return {
@@ -41,7 +24,7 @@ function worktree(name: string, overrides: Partial<Worktree> = {}): Worktree {
     repoId: 'repo-1',
     path: `/repo/${name}`,
     displayName: name,
-    branch: `refs/heads/${name}`,
+    branch: `refs/heads/${name}-branch`,
     head: 'abc123',
     isBare: false,
     isMainWorktree: false,
@@ -71,117 +54,137 @@ function candidate(sessionId: string, workspace: Worktree): ResumeCandidate {
   }
 }
 
-function render(
-  newCardStyle: boolean,
-  hosts: { parent?: ExecutionHostId; child?: ExecutionHostId } = {
-    parent: 'local',
-    child: 'local'
-  },
-  compactCards = false,
-  sshStatus?: SshConnectionStatus,
-  includeSiblings = false,
-  cardProperties?: WorktreeCardProperty[]
-): void {
-  const parent = worktree('parent', { hostId: hosts.parent })
-  const child = worktree('child', { hostId: hosts.child })
-  const sibling = worktree('sibling', { hostId: hosts.child })
-  const nextRoot = worktree('next-root', { hostId: hosts.parent })
-  const candidates = [
+function lineage(child: Worktree, parent: Worktree): WorktreeLineage {
+  return {
+    worktreeId: child.id,
+    worktreeInstanceId: child.instanceId!,
+    parentWorktreeId: parent.id,
+    parentWorktreeInstanceId: parent.instanceId!,
+    origin: 'cli',
+    capture: { source: 'explicit-cli-flag', confidence: 'explicit' },
+    createdAt: 1
+  }
+}
+
+/** parent (1 chat) > child (2 chats), plus an unrelated root workspace. */
+function seedTree(hosts: { parent?: ExecutionHostId; child?: ExecutionHostId } = {}) {
+  // An explicit undefined is a row with no host id (older metadata).
+  const parentHost = 'parent' in hosts ? hosts.parent : 'local'
+  const parent = worktree('parent', { hostId: parentHost })
+  const child = worktree('child', { hostId: 'child' in hosts ? hosts.child : 'local' })
+  const other = worktree('other', { hostId: parentHost })
+  useAppStore.setState({
+    settings: getDefaultSettings(''),
+    repos: [
+      { id: 'repo-1', path: '/repo', displayName: 'orca', badgeColor: '#999999', addedAt: 1 }
+    ],
+    worktreesByRepo: { 'repo-1': [parent, child, other] },
+    worktreeLineageById: { [child.id]: lineage(child, parent) }
+  })
+  return [
     candidate('in-child', child),
     candidate('in-parent', parent),
     candidate('also-in-child', child),
-    ...(includeSiblings
-      ? [candidate('in-sibling', sibling), candidate('in-next-root', nextRoot)]
-      : [])
+    candidate('in-other', other)
   ]
-  useAppStore.setState({
-    worktreeCardProperties: cardProperties ?? useAppStore.getState().worktreeCardProperties,
-    settings: {
-      ...getDefaultSettings(''),
-      experimentalNewWorktreeCardStyle: newCardStyle,
-      compactWorktreeCards: compactCards
-    },
-    repos: [
-      {
-        id: 'repo-1',
-        path: '/repo',
-        displayName: 'orca',
-        badgeColor: '#999999',
-        addedAt: 1,
-        connectionId: sshStatus ? 'build-server' : undefined
-      }
-    ],
-    sshConnectionStates: new Map(
-      sshStatus
-        ? [
-            [
-              'build-server',
-              {
-                targetId: 'build-server',
-                status: sshStatus,
-                error: null,
-                reconnectAttempt: 0,
-                remotePlatform: 'linux'
-              }
-            ]
-          ]
-        : []
-    ),
-    sshTargetLabels: new Map([['build-server', 'build-server']]),
-    worktreesByRepo: { 'repo-1': [parent, child, ...(includeSiblings ? [sibling, nextRoot] : [])] },
-    worktreeLineageById: {
-      [child.id]: {
-        worktreeId: child.id,
-        worktreeInstanceId: 'instance-child',
-        parentWorktreeId: parent.id,
-        parentWorktreeInstanceId: 'instance-parent',
-        origin: 'cli',
-        capture: { source: 'explicit-cli-flag', confidence: 'explicit' },
-        createdAt: 1
-      },
-      ...(includeSiblings
-        ? {
-            [sibling.id]: {
-              worktreeId: sibling.id,
-              worktreeInstanceId: 'instance-sibling',
-              parentWorktreeId: parent.id,
-              parentWorktreeInstanceId: 'instance-parent',
-              origin: 'cli' as const,
-              capture: { source: 'explicit-cli-flag' as const, confidence: 'explicit' as const },
-              createdAt: 1
+}
+
+const onToggleSpy = vi.fn()
+
+/** Owns the selection the way the dialog does, so group toggles show their effect. */
+function Harness({
+  candidates,
+  initiallySelected,
+  busy = false,
+  failureFor
+}: {
+  candidates: ResumeCandidate[]
+  initiallySelected?: string[]
+  busy?: boolean
+  failureFor?: (sessionId: string) => ResumeFailure | undefined
+}): React.JSX.Element {
+  const [selected, setSelected] = useState<ReadonlySet<string>>(
+    () => new Set(initiallySelected ?? candidates.map((entry) => entry.sessionId))
+  )
+  return (
+    <TooltipProvider>
+      <ResumeOnRestartGroups
+        candidates={candidates}
+        listedAt={1_800_000_060_000}
+        busy={busy}
+        selected={selected}
+        onToggle={(sessionId, checked) => {
+          onToggleSpy(sessionId, checked)
+          setSelected((current) => {
+            const next = new Set(current)
+            if (checked) {
+              next.add(sessionId)
+            } else {
+              next.delete(sessionId)
             }
-          }
-        : {})
-    }
-  })
-  act(() =>
-    root.render(
-      <TooltipProvider>
-        <ResumeOnRestartGroups
-          candidates={candidates}
-          listedAt={1_800_000_060_000}
-          busy={false}
-          selected={new Set(candidates.map((entry) => entry.sessionId))}
-          onToggle={() => {}}
-        />
-      </TooltipProvider>
-    )
+            return next
+          })
+        }}
+        failureFor={failureFor}
+      />
+    </TooltipProvider>
+  )
+}
+
+function render(props: React.ComponentProps<typeof Harness>): void {
+  act(() => root.render(<Harness {...props} />))
+}
+
+function workspaceBox(name: string): HTMLElement {
+  const box = container.querySelector<HTMLElement>(
+    `[role="checkbox"][aria-label="Select all chats in ${name}"]`
   )
+  if (!box) {
+    throw new Error(`Missing workspace checkbox: ${name}`)
+  }
+  return box
 }
 
-function cardTitled(title: string): HTMLElement {
-  const card = [
-    ...container.querySelectorAll<HTMLElement>('[data-worktree-card-surface="true"]')
-  ].find(
-    (surface) => surface.querySelector('[data-worktree-title-inline-rename]')?.textContent === title
+function chatBox(sessionId: string): HTMLElement {
+  const box = container.querySelector<HTMLElement>(
+    `[role="checkbox"][aria-label*="Prompt ${sessionId}"]`
   )
-  if (!card) {
-    throw new Error(`Missing card: ${title}`)
+  if (!box) {
+    throw new Error(`Missing chat checkbox: ${sessionId}`)
   }
-  return card
+  return box
+}
+
+function rowOf(box: HTMLElement): HTMLElement {
+  return box.closest('label')!
+}
+
+/** A row's grid cell: 1 is the checkbox column, 2 the indented content. */
+function cell(row: HTMLElement, column: 1 | 2): HTMLElement {
+  return row.querySelector<HTMLElement>(`:scope > :nth-child(${column})`)!
+}
+
+/** The workspace row's "x of y". */
+function workspaceCount(name: string): string | undefined {
+  return rowOf(workspaceBox(name)).querySelector('.tabular-nums')?.textContent ?? undefined
+}
+
+/** Each row in list order, as kind:label@indent-of-its-content. */
+function rowOutline(): string[] {
+  return [...container.querySelectorAll<HTMLElement>('[role="checkbox"]')].map((box) => {
+    const label = box.getAttribute('aria-label') ?? ''
+    const workspace = /^Select all chats in (.+)$/.exec(label)?.[1]
+    if (workspace) {
+      const content = cell(rowOf(box), 2)
+      return `ws:${workspace}@${content.style.paddingLeft || '0px'}`
+    }
+    const indent = box.closest('ul')?.style.getPropertyValue('--resume-chat-indent')
+    return `chat:${/Prompt ([\w-]+)/.exec(label)?.[1]}@${indent}`
+  })
 }
 
 beforeEach(() => {
+  onToggleSpy.mockReset()
   useAppStore.setState(useAppStore.getInitialState(), true)
   container = document.createElement('div')
   document.body.append(container)
@@ -191,463 +194,223 @@ beforeEach(() => {
 afterEach(() => {
   act(() => root.unmount())
   container.remove()
-  for (const live of liveRoots.splice(0)) {
-    act(() => live.root.unmount())
-    live.element.remove()
-  }
   useAppStore.setState(useAppStore.getInitialState(), true)
 })
 
-function checkedBoxes(): (string | null)[] {
-  return [...container.querySelectorAll('[role="checkbox"]')].map((box) =>
-    box.getAttribute('aria-checked')
-  )
-}
-
-// Why: the sidebar nests a child only under a parent on its own host; no host id matches only none.
-it.each([
-  ['both local', 'local', 'local', true],
-  ['neither with a host id', undefined, undefined, true],
-  ['parent without a host id, child local', undefined, 'local', false],
-  ['parent local, child without a host id', 'local', undefined, false]
-] as const)(
-  '%s: nests the child exactly as the sidebar does',
-  (_, parentHost, childHost, nests) => {
-    render(false, { parent: parentHost, child: childHost })
+it('lists every chat with its checkbox in the shared left column, indenting only the content', () => {
+  const candidates = seedTree()
+  render({ candidates })
 
-    expect(checkedBoxes()).toEqual(['true', 'true', 'true'])
-    expect(cardTitled('parent').contains(cardTitled('child'))).toBe(nests)
-    expect(cardTitled('child').textContent).toContain('Prompt in-child')
-    expect(cardTitled('child').textContent).toContain('Prompt also-in-child')
+  expect(rowOutline()).toEqual([
+    'ws:parent@0px',
+    'chat:in-parent@20px',
+    'ws:child@20px',
+    'chat:in-child@40px',
+    'chat:also-in-child@40px',
+    'ws:other@0px',
+    'chat:in-other@20px'
+  ])
+  for (const box of container.querySelectorAll<HTMLElement>('[role="checkbox"]')) {
+    const row = rowOf(box)
+    // The checkbox cell is the row's first grid column and is never indented.
+    expect(row.classList.contains('grid-cols-[1.75rem_minmax(0,1fr)]')).toBe(true)
+    expect(row.firstElementChild?.contains(box)).toBe(true)
+    expect(cell(row, 1).style.paddingLeft).toBe('')
   }
-)
+})
 
-function titleXSignature(title: string, stopAt: Element): string[] {
-  return worktreeCardTitleXSignature(
-    cardTitled(title).querySelector('[data-worktree-title-inline-rename]'),
-    stopAt
-  )
-}
+it('names the repo in a header row with no checkbox, aligned to the content column', () => {
+  render({ candidates: seedTree() })
 
-function surfaceClasses(title: string): string[] {
-  // Why: caller-owned chat rows change compact card height; borders and surfaces must still match.
-  return [...cardTitled(title).classList]
-    .filter((name) => /^(border($|-)|rounded-|bg-|ring-|shadow-)/.test(name))
-    .toSorted()
-}
+  const header = container.querySelector('section')!.firstElementChild!
+  expect(header.textContent).toBe('orca')
+  expect(header.querySelector('[role="checkbox"]')).toBeNull()
+  expect(header.classList.contains('grid-cols-[1.75rem_minmax(0,1fr)]')).toBe(true)
+  expect(header.firstElementChild?.textContent).toBe('')
+})
 
-function renderLiveSidebarRows(): HTMLElement {
-  const state = useAppStore.getState()
-  const [parent, child] = state.worktreesByRepo['repo-1'] ?? []
-  const repo = state.repos[0]
-  if (!parent || !child) {
-    throw new Error('Missing sidebar fixture')
-  }
-  const ctx: WorktreeItemRowContext = {
-    settings: state.settings,
-    groupBy: 'repo',
-    folderBackedProjectGroupIds: new Set(),
-    groupKeyByRowKey: new Map(),
-    groupIndexByRowKey: new Map(),
-    agentSendTargetWorktreeId: null,
-    worktreeDragState: WORKTREE_ROW_DRAG_INITIAL_STATE,
-    nativeLineageDropTargetId: null,
-    activeWorktreeId: null,
-    activeWorkspaceExecutionHostId: null,
-    currentWorktreeId: null,
-    highlightedRevealRowKey: null,
-    selectedWorktreeIds: new Set(),
-    selectedWorktrees: [],
-    getActiveSurfaceVariant: () => 'primary',
-    getLineageToggleHandler: () => vi.fn(),
-    onSelectionGesture: () => false,
-    onContextMenuSelect: () => [],
-    onImmediateActivate: vi.fn(),
-    onRowClickCapture: vi.fn(),
-    onRowPointerDown: vi.fn(),
-    onCardDragStart: vi.fn(),
-    onCardDragEnd: vi.fn()
-  }
-  const rows = buildRenderableRows(
-    buildRows(
-      'repo',
-      state.worktreesByRepo['repo-1'] ?? [],
-      new Map(repo ? [[repo.id, repo]] : []),
-      null,
-      new Set(),
-      undefined,
-      undefined,
-      undefined,
-      state.worktreeLineageById,
-      undefined,
-      true
-    )
-  ).filter((row) => row.type === 'item' || row.type === 'lineage-group')
-  const live = document.createElement('div')
-  live.style.display = 'flex'
-  live.style.flexDirection = 'column'
-  live.style.rowGap = `${WORKTREE_SIDEBAR_VIRTUAL_ROW_GAP}px`
-  document.body.append(live)
-  const liveRoot = createRoot(live)
-  act(() =>
-    liveRoot.render(
-      <TooltipProvider>
-        {rows.map((row) => {
-          if (row.type === 'item') {
-            return renderWorktreeItemRow(ctx, row, false)
-          }
-          const [lineageParent, ...descendants] = row.rows
-          return lineageParent
-            ? renderWorktreeItemRow(
-                ctx,
-                lineageParent,
-                false,
-                renderWorktreeLineageDescendants(ctx, lineageParent, descendants)
-              )
-            : null
-        })}
-      </TooltipProvider>
-    )
-  )
-  liveRoots.push({ root: liveRoot, element: live })
-  return live
-}
+it('separates every row with the sidebar divider', () => {
+  render({ candidates: seedTree() })
 
-it.each(
-  [
-    { style: 'legacy', newCardStyle: false, compactCards: false },
-    { style: 'compact', newCardStyle: false, compactCards: true },
-    { style: 'new', newCardStyle: true, compactCards: false }
-  ].flatMap((style) =>
-    ([undefined, 'connected', 'disconnected'] as const).map((sshStatus) => ({
-      ...style,
-      sshStatus
-    }))
-  )
-)(
-  '$style/$sshStatus: places parent and child titles where the live sidebar does',
-  ({ newCardStyle, compactCards, sshStatus }) => {
-    render(
-      newCardStyle,
-      sshStatus ? { parent: 'ssh:build-server', child: 'ssh:build-server' } : undefined,
-      compactCards,
-      sshStatus
+  const rows = [
+    container.querySelector('section')!.firstElementChild!,
+    ...[...container.querySelectorAll<HTMLElement>('[role="checkbox"]')].map(
+      (box) => box.closest('li') ?? rowOf(box)
     )
-    const dialogList = cardTitled('parent').parentElement?.parentElement
-    if (!dialogList) {
-      throw new Error('Missing dialog list')
-    }
-    const dialog = {
-      parent: titleXSignature('parent', dialogList),
-      child: titleXSignature('child', dialogList),
-      parentSurface: surfaceClasses('parent'),
-      childSurface: surfaceClasses('child')
-    }
-    const live = renderLiveSidebarRows()
-    const liveContainer = container
-    container = live
-    const sidebar = {
-      parent: titleXSignature('parent', live),
-      child: titleXSignature('child', live),
-      parentSurface: surfaceClasses('parent'),
-      childSurface: surfaceClasses('child')
-    }
-    container = liveContainer
-
-    expect(dialog.parent.length).toBeGreaterThan(3)
-    expect(dialog).toEqual(sidebar)
-    if (sshStatus) {
-      const identity = cardTitled('parent').querySelector('[data-ssh-target-label="build-server"]')
-      expect(identity?.tagName).toBe('SPAN')
-      expect(cardTitled('parent').textContent).toContain('build-server')
-      expect(identity?.matches('button, [tabindex], [role="button"]')).toBe(false)
-      expect(dialog.parent).toContain('gaps-before: 1')
-      if (sshStatus === 'connected') {
-        expect(identity?.querySelector('svg')?.classList.contains('size-3')).toBe(true)
-        expect(dialog.parent).toContain('before: size-3 width=24')
-      } else if (newCardStyle || compactCards) {
-        expect(identity?.querySelector('svg')?.classList.contains('size-2.5')).toBe(true)
-      } else {
-        expect(identity?.textContent).toContain('Connect')
-      }
-    }
+  ]
+  for (const row of rows) {
+    expect(row.classList.contains('border-t')).toBe(true)
+    expect(row.classList.contains('border-worktree-sidebar-border')).toBe(true)
   }
-)
+})
 
-it('lays a read-only parent out with its status lane and passive child chip', () => {
-  render(false)
+it('shows the branch for a git worktree, muted after its name', () => {
+  render({ candidates: seedTree() })
 
-  const parentCard = cardTitled('parent')
-  expect(parentCard.querySelector('[data-worktree-card-status-slot]')).not.toBeNull()
-  expect(parentCard.textContent).toContain('1 child')
-  expect(parentCard.querySelector('button[aria-expanded]')).toBeNull()
+  const content = rowOf(workspaceBox('parent')).children[1]!
+  expect(content.textContent).toContain('parentparent-branch')
+  const branch = [...content.querySelectorAll('span')].find(
+    (span) => span.textContent === 'parent-branch'
+  )
+  expect(branch?.classList.contains('text-muted-foreground')).toBe(true)
 })
 
-it.each([
-  { style: 'legacy', newCardStyle: false, compactCards: false },
-  { style: 'compact', newCardStyle: false, compactCards: true },
-  { style: 'new', newCardStyle: true, compactCards: false }
-])(
-  '$style: matches the live sidebar vertical card and lineage geometry',
-  ({ newCardStyle, compactCards }) => {
-    render(newCardStyle, undefined, compactCards, undefined, true)
-    const dialog = {
-      parent: worktreeCardVerticalSignature(cardTitled('parent')),
-      child: worktreeCardVerticalSignature(cardTitled('child')),
-      sibling: worktreeCardVerticalSignature(cardTitled('sibling')),
-      nextRoot: worktreeCardVerticalSignature(cardTitled('next-root'))
-    }
-    const live = renderLiveSidebarRows()
-    const dialogContainer = container
-    container = live
-    const sidebar = {
-      parent: worktreeCardVerticalSignature(cardTitled('parent')),
-      child: worktreeCardVerticalSignature(cardTitled('child')),
-      sibling: worktreeCardVerticalSignature(cardTitled('sibling')),
-      nextRoot: worktreeCardVerticalSignature(cardTitled('next-root'))
-    }
-    container = dialogContainer
-    expect(sidebar.parent.surface).toEqual(['border', 'pb-1.5', 'pt-1.25'])
-    expect(sidebar.child.surface).toEqual(
-      compactCards ? ['border', 'py-2'] : ['border', 'pb-1.5', 'pt-1.25']
-    )
-    expect(sidebar.parent.children).toHaveLength(2)
-    for (const childPath of sidebar.parent.children) {
-      expect(childPath).toContainEqual(['mt-1.5', 'space-y-1'])
-    }
-    expect(dialog).toEqual(sidebar)
-  }
-)
+it('covers nested child workspaces with a tri-state workspace checkbox', () => {
+  render({ candidates: seedTree() })
+  expect(workspaceBox('parent').getAttribute('aria-checked')).toBe('true')
+  expect(workspaceCount('parent')).toBe('3 of 3')
 
-it.each([
-  { style: 'legacy', newCardStyle: false, compactCards: false },
-  { style: 'compact', newCardStyle: false, compactCards: true },
-  { style: 'new', newCardStyle: true, compactCards: false }
-])('$style: leaves the sidebar gap before the next root card', ({ newCardStyle, compactCards }) => {
-  render(newCardStyle, undefined, compactCards, undefined, true)
-  const list = cardTitled('parent').parentElement?.parentElement
-  if (!list) {
-    throw new Error('Missing dialog list')
+  act(() => chatBox('in-child').click())
+  expect(workspaceBox('parent').getAttribute('aria-checked')).toBe('mixed')
+  expect(workspaceCount('parent')).toBe('2 of 3')
+  expect(workspaceBox('child').getAttribute('aria-checked')).toBe('mixed')
+  expect(workspaceCount('child')).toBe('1 of 2')
+  expect(workspaceBox('other').getAttribute('aria-checked')).toBe('true')
+
+  // Partly selected: ticking selects everything it covers, child workspace included.
+  act(() => workspaceBox('parent').click())
+  expect(chatBox('in-child').getAttribute('aria-checked')).toBe('true')
+  expect(workspaceCount('parent')).toBe('3 of 3')
+
+  act(() => workspaceBox('parent').click())
+  expect(workspaceBox('parent').getAttribute('aria-checked')).toBe('false')
+  expect(workspaceCount('parent')).toBe('0 of 3')
+  for (const id of ['in-parent', 'in-child', 'also-in-child']) {
+    expect(chatBox(id).getAttribute('aria-checked')).toBe('false')
   }
-  const live = renderLiveSidebarRows()
-  expect(WORKTREE_SIDEBAR_VIRTUAL_ROW_GAP).toBe(6)
-  expect(describeWorktreeVerticalGeometry(list)).toEqual(describeWorktreeVerticalGeometry(live))
+  expect(chatBox('in-other').getAttribute('aria-checked')).toBe('true')
 })
 
-it.each(
-  [
-    { style: 'legacy', newCardStyle: false, compactCards: false },
-    { style: 'compact', newCardStyle: false, compactCards: true },
-    { style: 'new', newCardStyle: true, compactCards: false }
-  ].flatMap((style) => [true, false].map((inlineAgents) => ({ ...style, inlineAgents })))
-)(
-  '$style/inline=$inlineAgents: follows sidebar padding when branch metadata is hidden',
-  ({ newCardStyle, compactCards, inlineAgents }) => {
-    render(newCardStyle, undefined, compactCards, undefined, true, [
-      'status',
-      ...(inlineAgents ? ['inline-agents' as const] : [])
-    ])
-    const titles = ['parent', 'child', 'sibling', 'next-root']
-    const dialog = titles.map((title) => worktreeCardVerticalSignature(cardTitled(title)))
-    const live = renderLiveSidebarRows()
-    const dialogContainer = container
-    container = live
-    const sidebar = titles.map((title) => worktreeCardVerticalSignature(cardTitled(title)))
-    container = dialogContainer
-    expect(sidebar[1]?.surface).toEqual(
-      (newCardStyle && !inlineAgents) || compactCards
-        ? ['border', 'py-2']
-        : ['border', 'pb-1.5', 'pt-1.25']
-    )
-    expect(dialog).toEqual(sidebar)
+it('selects a whole row by clicking anywhere on it', () => {
+  render({ candidates: seedTree(), initiallySelected: [] })
+
+  act(() => cell(rowOf(workspaceBox('child')), 2).click())
+  expect(chatBox('in-child').getAttribute('aria-checked')).toBe('true')
+  expect(chatBox('also-in-child').getAttribute('aria-checked')).toBe('true')
+
+  act(() => cell(rowOf(chatBox('in-other')), 2).click())
+  expect(chatBox('in-other').getAttribute('aria-checked')).toBe('true')
+})
+
+it('leaves a failure a retry cannot fix out of its workspace checkbox', () => {
+  const candidates = seedTree()
+  const stuck: ResumeFailure = {
+    ...candidates[0]!,
+    failedAt: 1_800_000_030_000,
+    outcome: 'refused',
+    reason: 'agent_session_restart_work_superseded',
+    retryable: false
   }
-)
+  render({
+    candidates,
+    initiallySelected: ['in-parent'],
+    failureFor: (sessionId) => (sessionId === 'in-child' ? stuck : undefined)
+  })
 
-it.each([
-  { style: 'legacy', newCardStyle: false, compactCards: false, chip: 18, sibling: 10, root: 19 },
-  { style: 'compact', newCardStyle: false, compactCards: true, chip: 21, sibling: 13, root: 22 },
-  { style: 'new', newCardStyle: true, compactCards: false, chip: 12, sibling: 10, root: 19 }
-])(
-  '$style: matches computed chip, sibling and next-root title offsets',
-  ({ newCardStyle, compactCards, chip, sibling, root: nextRootOffset }) => {
-    render(newCardStyle, undefined, compactCards, undefined, true)
-    const list = cardTitled('parent').parentElement?.parentElement
-    if (!list) {
-      throw new Error('Missing dialog list')
-    }
-    const dialog = worktreeCardVerticalOffsets(
-      cardTitled('parent'),
-      cardTitled('next-root'),
-      worktreeCardRootGap(list)
-    )
-    const live = renderLiveSidebarRows()
-    const dialogContainer = container
-    container = live
-    const sidebar = worktreeCardVerticalOffsets(
-      cardTitled('parent'),
-      cardTitled('next-root'),
-      worktreeCardRootGap(live)
-    )
-    container = dialogContainer
-    expect(sidebar).toEqual({
-      chipToChildTitle: chip,
-      childToSiblingTitle: sibling,
-      lastChildToNextRootTitle: nextRootOffset
-    })
-    expect(dialog).toEqual(sidebar)
+  expect(chatBox('in-child').hasAttribute('disabled')).toBe(true)
+  expect(workspaceCount('child')).toBe('0 of 1')
+  expect(workspaceCount('parent')).toBe('1 of 2')
+
+  act(() => workspaceBox('parent').click())
+  expect(onToggleSpy.mock.calls.map(([sessionId]) => sessionId)).not.toContain('in-child')
+  expect(chatBox('in-child').getAttribute('aria-checked')).toBe('false')
+  expect(workspaceBox('parent').getAttribute('aria-checked')).toBe('true')
+})
+
+it('disables a workspace checkbox with nothing it could select', () => {
+  const candidates = seedTree()
+  const stuck = (sessionId: string): ResumeFailure => ({
+    ...candidates.find((entry) => entry.sessionId === sessionId)!,
+    failedAt: 1_800_000_030_000,
+    outcome: 'refused',
+    reason: 'agent_session_restart_work_superseded',
+    retryable: false
+  })
+  render({
+    candidates,
+    initiallySelected: [],
+    failureFor: (sessionId) => (sessionId === 'in-other' ? stuck(sessionId) : undefined)
+  })
+
+  expect(workspaceBox('other').hasAttribute('disabled')).toBe(true)
+  expect(workspaceCount('other')).toBeUndefined()
+})
+
+it('disables every checkbox while a resume runs', () => {
+  render({ candidates: seedTree(), busy: true })
+
+  const boxes = [...container.querySelectorAll('[role="checkbox"]')]
+  expect(boxes).toHaveLength(7)
+  for (const box of boxes) {
+    expect(box.hasAttribute('disabled')).toBe(true)
   }
-)
+})
 
-it.each([true, false])(
-  'cache-only metadata/enabled=%s: preserves sidebar header geometry without showing live state',
-  (enabled) => {
-    useAppStore.setState({ fetchHostedReviewForBranch: vi.fn().mockResolvedValue(undefined) })
-    render(true, undefined, false, undefined, true, ['status'])
-    const child = worktree('child', { hostId: 'local' })
-    const state = useAppStore.getState()
-    act(() =>
-      useAppStore.setState({
-        settings: {
-          ...(state.settings ?? getDefaultSettings('')),
-          promptCacheTimerEnabled: enabled,
-          promptCacheTtlMs: 300_000
-        },
-        tabsByWorktree: {
-          [child.id]: [
-            {
-              id: 'child-claude',
-              worktreeId: child.id,
-              ptyId: null,
-              title: 'Claude',
-              customTitle: null,
-              color: null,
-              launchAgent: 'claude',
-              sortOrder: 0,
-              createdAt: 1
-            }
-          ]
-        },
-        cacheTimerByKey: { 'child-claude:seed': Date.now() }
-      })
-    )
-    const dialogChild = cardTitled('child')
-    const dialog = worktreeCardVerticalSignature(dialogChild)
-    const list = cardTitled('parent').parentElement?.parentElement
-    if (!list) {
-      throw new Error('Missing dialog list')
-    }
-    const dialogOffsets = worktreeCardVerticalOffsets(
-      cardTitled('parent'),
-      cardTitled('next-root'),
-      worktreeCardRootGap(list)
-    )
-    expect(dialogChild.querySelector('[data-worktree-card-meta-row]')).toBeNull()
-    expect(dialogChild.textContent).toContain('Prompt in-child')
-    expect(dialogChild.textContent).toContain('Prompt also-in-child')
-
-    const live = renderLiveSidebarRows()
-    const dialogContainer = container
-    container = live
-    const sidebarChild = cardTitled('child')
-    const sidebar = worktreeCardVerticalSignature(sidebarChild)
-    const sidebarOffsets = worktreeCardVerticalOffsets(
-      cardTitled('parent'),
-      cardTitled('next-root'),
-      worktreeCardRootGap(live)
-    )
-    container = dialogContainer
-    expect(sidebarChild.querySelector('[data-worktree-card-meta-row]') !== null).toBe(enabled)
-    expect(sidebar.surface).toEqual(enabled ? ['border', 'pb-1.5', 'pt-1.25'] : ['border', 'py-2'])
-    expect(dialog).toEqual(sidebar)
-    expect(sidebarOffsets.chipToChildTitle).toBe(enabled ? 12 : 15)
-    expect(dialogOffsets).toEqual(sidebarOffsets)
+it('names the machine of a single-host SSH offer', () => {
+  const remote: ExecutionHostId = 'ssh:build-server'
+  render({ candidates: seedTree({ parent: remote, child: remote }) })
+
+  const label = getHostContextLabel(remote)
+  for (const name of ['parent', 'child', 'other']) {
+    expect(rowOf(workspaceBox(name)).textContent).toContain(label)
   }
-)
+})
+
+it('names hosts only when the machine is not obvious', () => {
+  render({ candidates: seedTree() })
+  const local = getHostContextLabel('local')
+  expect(container.textContent).not.toContain(local)
+
+  act(() => root.unmount())
+  root = createRoot(container)
+  const remote: ExecutionHostId = 'ssh:build-server'
+  render({ candidates: seedTree({ parent: 'local', child: remote }) })
+  expect(rowOf(workspaceBox('parent')).textContent).toContain(local)
+  expect(rowOf(workspaceBox('child')).textContent).toContain(getHostContextLabel(remote))
+})
 
-it('counts only listed child workspaces in the passive chip', () => {
-  render(false)
-  const state = useAppStore.getState()
-  const parent = state.worktreesByRepo['repo-1']?.[0]
-  const childLineage = Object.values(state.worktreeLineageById)[0]
-  if (!parent || !childLineage) {
-    throw new Error('Missing lineage fixture')
+it('names a workspace the store does not know by its id, with the kind the host recorded', () => {
+  const unknown: ResumeCandidate = {
+    ...candidate('lost', worktree('gone')),
+    workspaceId: 'folder:missing-folder',
+    workspaceKind: 'folder'
   }
-  const unlisted = worktree('unlisted', { hostId: 'local' })
-  act(() =>
-    useAppStore.setState({
-      worktreesByRepo: { 'repo-1': [...(state.worktreesByRepo['repo-1'] ?? []), unlisted] },
-      worktreeLineageById: {
-        ...state.worktreeLineageById,
-        [unlisted.id]: {
-          ...childLineage,
-          worktreeId: unlisted.id,
-          worktreeInstanceId: 'instance-unlisted'
-        }
-      }
-    })
-  )
-  expect(cardTitled('parent').textContent).toContain('1 child')
-  expect(cardTitled('parent').textContent).not.toContain('2 children')
+  render({ candidates: [unknown] })
+
+  const row = rowOf(workspaceBox('folder:missing-folder'))
+  expect(row.textContent).toContain('folder:missing-folder')
+  expect(row.querySelector('svg.lucide-folder')).not.toBeNull()
+  expect(chatBox('lost').getAttribute('aria-label')).toContain('in folder:missing-folder')
 })
 
+// Why: the sidebar nests a child only under a parent on its own host; no host id matches only none.
 it.each([
-  ['legacy', false, false, true],
-  ['legacy, host disabled', false, false, false],
-  ['compact', false, true, true],
-  ['new', true, false, true],
-  ['new, host disabled', true, false, false]
+  ['both local', 'local', 'local', true],
+  ['neither with a host id', undefined, undefined, true],
+  ['parent without a host id, child local', undefined, 'local', false],
+  ['parent local, child without a host id', 'local', undefined, false]
 ] as const)(
-  '%s: keeps a remote folder identifiable when its host chip is enabled',
-  async (_style, newCardStyle, compactCards, showHost) => {
-    useAppStore.setState({
-      settings: {
-        ...getDefaultSettings(''),
-        experimentalNewWorktreeCardStyle: newCardStyle,
-        compactWorktreeCards: compactCards
-      },
-      worktreeCardProperties: showHost ? ['status', 'host'] : ['status'],
-      folderWorkspaces: [
-        {
-          id: 'remote-folder',
-          projectGroupId: 'folder-project',
-          name: 'Remote folder',
-          folderPath: '/remote/folder',
-          connectionId: 'build-server',
-          executionHostId: 'ssh:build-server',
-          linkedTask: null,
-          comment: '',
-          isArchived: false,
-          isUnread: false,
-          isPinned: false,
-          sortOrder: 0,
-          lastActivityAt: 1,
-          createdAt: 1,
-          updatedAt: 1
-        }
-      ]
-    })
-    const entry: ResumeCandidate = {
-      ...candidate('folder-chat', worktree('folder')),
-      workspaceId: 'folder:remote-folder',
-      executionHostId: 'ssh:build-server',
-      workspaceKind: 'folder'
-    }
-    await act(async () =>
-      root.render(
-        <TooltipProvider>
-          <ResumeOnRestartGroups
-            candidates={[entry]}
-            listedAt={entry.recordedAt}
-            busy={false}
-            selected={new Set([entry.sessionId])}
-            onToggle={() => {}}
-          />
-        </TooltipProvider>
-      )
-    )
-    const card = cardTitled('Remote folder')
-    expect(card.textContent?.includes('build-server')).toBe(showHost && !compactCards)
-    expect(card.querySelector('[data-ssh-target-label]')).toBeNull()
-    expect(card.querySelector('button:not([role="checkbox"]), [tabindex]')).toBeNull()
+  '%s: nests the child exactly as the sidebar does',
+  (_, parentHost, childHost, nests) => {
+    const candidates = seedTree({ parent: parentHost, child: childHost })
+    render({ candidates })
+
+    expect(rowOutline()).toContain(nests ? 'ws:child@20px' : 'ws:child@0px')
+    expect(workspaceCount('parent')).toBe(nests ? '3 of 3' : '1 of 1')
+    expect(container.querySelectorAll('[role="checkbox"][aria-label^="Resume"]')).toHaveLength(4)
   }
 )
+
+it('lists every chat when workspace lineage loops', () => {
+  const a = worktree('a')
+  const b = worktree('b')
+  useAppStore.setState({
+    settings: getDefaultSettings(''),
+    worktreesByRepo: { 'repo-1': [a, b] },
+    worktreeLineageById: { [a.id]: lineage(a, b), [b.id]: lineage(b, a) }
+  })
+  render({ candidates: [candidate('in-a', a), candidate('in-b', b)] })
+
+  expect(chatBox('in-a')).toBeTruthy()
+  expect(chatBox('in-b')).toBeTruthy()
+})
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index f6e062f68079..c384c4b06a07 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -1,18 +1,16 @@
 import { useMemo } from 'react'
 import { Folder, FolderTree, GitBranch } from 'lucide-react'
 import { RepoIconGlyph } from '@/components/repo/repo-icon'
-import WorktreeCard from '@/components/sidebar/WorktreeCard'
 import { WorktreeHostContextBadge } from '@/components/sidebar/WorktreeHostContextBadge'
-import {
-  getLineageChildrenInlineStyle,
-  LINEAGE_CHILDREN_INLINE_OFFSET
-} from '@/components/sidebar/worktree-list/rows/indentation'
-import { getWorktreeRowGeometry } from '@/components/sidebar/worktree-list/rows/worktree-row-geometry'
-import { WORKTREE_SIDEBAR_VIRTUAL_ROW_GAP } from '@/components/sidebar/worktree-list/viewport/virtual-rows'
 import {
   getCyclicProjectedWorktreeLineageIds,
   getSidebarLineageAncestors
 } from '@/components/sidebar/worktree-lineage-projection'
+import { translate } from '@/i18n/i18n'
+import {
+  resolveWorktreeBranchLabel,
+  resolveWorktreeDisplayName
+} from '@/lib/worktree-default-display-name'
 import {
   getAllWorktreesFromState,
   getWorktreeMapFromState,
@@ -26,35 +24,44 @@ import { getHostContextLabel } from '../../../shared/worktree/host-context-label
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host'
 import type { AgentSessionWorkspaceKind } from '../../../shared/agent-session-record'
 import { useAppStore } from '../store'
+import { Checkbox } from './ui/checkbox'
 import { ResumeCandidateRow } from './NativeChatResumeOnRestartAgentRow'
 import {
   groupResumeCandidates,
   groupResumeWorkspacesByRepo,
   nestResumeWorkspaces,
   resolveResumeGroupHeader,
+  resumeSelectionState,
   resumeWorkspaceKind,
+  resumeWorkspaceSessionIds,
+  toggleResumeSelection,
   type ResumeCandidate,
   type ResumeFailure,
   type ResumeWorkspaceGroup,
   type ResumeWorkspaceNode
 } from './native-chat-resume-on-restart-grouping'
-import type { ResumeFailureAction } from './native-chat-resume-failure-guidance'
+import {
+  resumeFailureSelectable,
+  type ResumeFailureAction
+} from './native-chat-resume-failure-guidance'
 
 export type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
 
 /**
- * The offered chats in the sidebar's three tiers: repo/project, then workspace, then agent sessions.
+ * The offered chats as a checkbox list in the sidebar's three tiers: repo/project, then workspace,
+ * then agent sessions.
  *
- * Each workspace IS the sidebar's own `WorktreeCard`, rendered read-only, so the user recognizes it
- * exactly as they know it — title, branch, PR and host as their sidebar settings show them —
- * with the offered chats in place of its live agent rows. Child workspaces nest under a listed
- * parent the way the sidebar nests them.
+ * Every row's checkbox sits in one column at the left edge; nesting indents only what follows it.
+ * A workspace row's checkbox covers its own chats and those of the workspaces nested under it,
+ * which follow the sidebar's own lineage rule. A repo row is a label with no checkbox.
  *
- * A workspace the store does not know yet (its host still connecting, or since deleted) falls back
- * to a plain header: glyph, name, host chip. The sidebar has no git-worktree vs folder glyph
- * resolver; that header follows its status lane, which picks `GitBranch` for a branch identity.
+ * A workspace the store does not know yet (its host still connecting, or since deleted) is named
+ * by its id. The kind glyph comes from the host's record of the chat, never from a name.
  */
 
+/** Indent per nesting level, applied right of the checkbox column. */
+const RESUME_INDENT_PX = 20
+
 /** Lets a row that an earlier resume could not carry on show what went wrong and what to do. */
 type FailureProps = {
   failureFor?: (sessionId: string) => ResumeFailure | undefined
@@ -147,31 +154,35 @@ function RepoHeader({ repoId }: { repoId: string | null }): React.JSX.Element {
   const projectGroups = useAppStore((store) => store.projectGroups)
   const header = resolveResumeGroupHeader(repoId, repos, projectGroups)
   return (
-    <div className="flex items-center gap-1.5 px-0.5">
-      {/* A repo shows its own configured glyph; a project group uses the FolderTree the sidebar's
-          own PROJECT_GROUP_META uses. */}
-      {header.kind === 'project' ? (
-        <FolderTree className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
-      ) : (
-        <RepoIconGlyph repoIcon={header.repoIcon} className="size-3.5" iconClassName="size-3.5" />
-      )}
-      <span className="min-w-0 flex-1 truncate text-xs font-semibold">{header.name}</span>
+    // The empty first cell keeps the title in the content column.
+    <div className="grid h-7 grid-cols-[1.75rem_minmax(0,1fr)] items-center border-t border-worktree-sidebar-border">
+      <span />
+      <span className="flex min-w-0 items-center gap-1.5 pr-2.5">
+        {/* A repo shows its own configured glyph; a project group uses the FolderTree the sidebar's
+            own PROJECT_GROUP_META uses. */}
+        {header.kind === 'project' ? (
+          <FolderTree className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
+        ) : (
+          <RepoIconGlyph repoIcon={header.repoIcon} className="size-3.5" iconClassName="size-3.5" />
+        )}
+        <span className="min-w-0 flex-1 truncate text-[13px] font-semibold">{header.name}</span>
+      </span>
     </div>
   )
 }
 
-const NO_FOLDER_BACKED_GROUPS: ReadonlySet<string> = new Set()
-
 type RowProps = {
-  /** Whether the listed workspaces span machines; the sidebar names hosts only then. */
+  /** Whether the listed chats span machines; every workspace then names its host. */
   mixedHosts: boolean
   listedAt: number
   busy: boolean
   selected: ReadonlySet<string>
   onToggle: (sessionId: string, checked: boolean) => void
+  /** Whether a group checkbox may tick this chat; a failure a retry cannot fix is left out. */
+  selectable: (sessionId: string) => boolean
 } & FailureProps
 
-function WorkspaceCard({
+function WorkspaceRows({
   node,
   depth,
   ...rowProps
@@ -180,98 +191,79 @@ function WorkspaceCard({
   const first = group.candidates[0]
   const hostId = first?.executionHostId
   const worktree = useWorkspaceWorktree(group.workspaceId, hostId)
-  const repo = useAppStore((store) =>
-    worktree ? store.repos.find((entry) => entry.id === worktree.repoId) : undefined
-  )
-  const newCardStyle = useAppStore(
-    (store) => store.settings?.experimentalNewWorktreeCardStyle === true
-  )
-  const name = worktree?.displayName ?? group.workspaceId
-  const hostLabel = getHostContextLabel(hostId ?? LOCAL_EXECUTION_HOST_ID)
-  const { mixedHosts, listedAt, busy, selected, onToggle, failureFor, onFailureAction } = rowProps
-  // Remote folders have no repo, so no title-row SSH identity can name their host.
+  const kind = first ? resumeWorkspaceKind(first) : 'git-worktree'
+  const name = (worktree && resolveWorktreeDisplayName(worktree)) || group.workspaceId
+  const branch = worktree && kind === 'git-worktree' ? resolveWorktreeBranchLabel(worktree) : ''
+  const { mixedHosts, listedAt, busy, selected, onToggle, selectable } = rowProps
+  // Why: a remote workspace is named by its machine even when it is the only one listed.
   const showHostLabel =
-    mixedHosts ||
-    (!repo &&
-      first &&
-      resumeWorkspaceKind(first) === 'folder' &&
-      hostId &&
-      hostId !== LOCAL_EXECUTION_HOST_ID)
-  const rows = (
-    <ul className="flex flex-col">
-      {group.candidates.map((candidate) => (
-        <ResumeCandidateRow
-          key={candidate.sessionId}
-          candidate={candidate}
-          workspaceName={name}
-          listedAt={listedAt}
-          checked={selected.has(candidate.sessionId)}
-          disabled={busy}
-          onCheckedChange={(checked) => onToggle(candidate.sessionId, checked)}
-          failure={failureFor?.(candidate.sessionId)}
-          onFailureAction={onFailureAction}
-        />
-      ))}
-    </ul>
-  )
-  // Why: the sidebar's own row geometry for a repo-grouped list, so the cards line up as there.
-  const geometry = getWorktreeRowGeometry({
-    groupBy: 'repo',
-    folderBackedProjectGroupIds: NO_FOLDER_BACKED_GROUPS,
-    newCardStyle,
-    projectGroupId: repo?.projectGroupId,
-    depth,
-    groupDepth: 0,
-    nested: depth > 0
-  })
-  const children = node.children.map((child) => (
-    <WorkspaceCard key={child.group.workspaceId} node={child} depth={depth + 1} {...rowProps} />
-  ))
-
-  if (!worktree) {
-    const kind = first ? resumeWorkspaceKind(first) : 'git-worktree'
-    return (
-      <section className="flex flex-col gap-0.5">
-        <div className="flex items-center gap-1.5 px-0.5">
-          <WorkspaceKindGlyph kind={kind} />
-          <span className="min-w-0 truncate text-xs font-medium">{name}</span>
-          <WorktreeHostContextBadge label={hostLabel} />
-        </div>
-        <div className="pl-1">{rows}</div>
-        {children.length > 0 && <div className="flex flex-col gap-1 pl-3">{children}</div>}
-      </section>
-    )
+    mixedHosts || (hostId ?? LOCAL_EXECUTION_HOST_ID) !== LOCAL_EXECUTION_HOST_ID
+  const covered = resumeWorkspaceSessionIds(node).filter(selectable)
+  const selection = resumeSelectionState(covered, selected)
+  const chatIndent: React.CSSProperties & Record<'--resume-chat-indent', string> = {
+    '--resume-chat-indent': `${(depth + 1) * RESUME_INDENT_PX}px`
   }
-
-  // Why: like a sidebar row, each card is inset for its own depth.
   return (
-    <div
-      style={geometry.surfaceInset > 0 ? { paddingLeft: `${geometry.surfaceInset}px` } : undefined}
-    >
-      <WorktreeCard
-        worktree={worktree}
-        repo={repo}
-        isActive={false}
-        isActiveSurface={false}
-        readOnly
-        // The repo header above already names it.
-        hideRepoBadge
-        hostContextLabel={showHostLabel ? hostLabel : undefined}
-        nativeDragEnabled={false}
-        flushSurface
-        contentIndent={geometry.cardContentIndent}
-        agentRows={rows}
-        lineageChildCount={children.length}
-        lineageChildren={children.length > 0 ? children : undefined}
-        lineageChildrenStyle={
-          children.length > 0
-            ? getLineageChildrenInlineStyle(
-                geometry.lineageChildrenInlineOffset ?? LINEAGE_CHILDREN_INLINE_OFFSET
-              )
-            : undefined
-        }
-      />
-    </div>
+    <>
+      <label className="grid h-7.5 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center border-t border-worktree-sidebar-border hover:bg-worktree-sidebar-accent has-[:disabled]:cursor-default">
+        <span className="flex justify-center">
+          <Checkbox
+            checked={selection.checked}
+            disabled={busy || selection.total === 0}
+            onCheckedChange={() => toggleResumeSelection(covered, selection, onToggle)}
+            aria-label={translate(
+              'auto.components.NativeChatResumeOnRestartModal.selectWorkspace',
+              'Select all chats in {{value0}}',
+              { value0: name }
+            )}
+          />
+        </span>
+        <span
+          className="flex min-w-0 items-center gap-1.5 pr-2.5"
+          style={depth > 0 ? { paddingLeft: depth * RESUME_INDENT_PX } : undefined}
+        >
+          <WorkspaceKindGlyph kind={kind} />
+          <span className="min-w-0 truncate text-[13px] font-medium text-foreground">{name}</span>
+          {branch && (
+            <span className="min-w-0 shrink-2 truncate text-[11px] text-muted-foreground">
+              {branch}
+            </span>
+          )}
+          {showHostLabel && (
+            <WorktreeHostContextBadge
+              label={getHostContextLabel(hostId ?? LOCAL_EXECUTION_HOST_ID)}
+            />
+          )}
+          {selection.total > 0 && (
+            <span className="ml-auto shrink-0 pl-2 text-[11px] tabular-nums text-muted-foreground">
+              {translate(
+                'auto.components.NativeChatResumeOnRestartModal.workspaceSelectedCount',
+                '{{value0}} of {{value1}}',
+                { value0: selection.selectedCount, value1: selection.total }
+              )}
+            </span>
+          )}
+        </span>
+      </label>
+      <ul style={chatIndent}>
+        {group.candidates.map((candidate) => (
+          <ResumeCandidateRow
+            key={candidate.sessionId}
+            candidate={candidate}
+            workspaceName={name}
+            listedAt={listedAt}
+            checked={selected.has(candidate.sessionId)}
+            disabled={busy}
+            onCheckedChange={(checked) => onToggle(candidate.sessionId, checked)}
+            failure={rowProps.failureFor?.(candidate.sessionId)}
+            onFailureAction={rowProps.onFailureAction}
+          />
+        ))}
+      </ul>
+      {node.children.map((child) => (
+        <WorkspaceRows key={child.group.workspaceId} node={child} depth={depth + 1} {...rowProps} />
+      ))}
+    </>
   )
 }
 
@@ -297,27 +289,30 @@ export function ResumeOnRestartGroups({
   const mixedHosts =
     new Set(candidates.map((candidate) => candidate.executionHostId ?? LOCAL_EXECUTION_HOST_ID))
       .size > 1
+  const selectable = (sessionId: string): boolean => {
+    const failure = failureFor?.(sessionId)
+    return !failure || resumeFailureSelectable(failure)
+  }
   return (
-    <div className="flex flex-col gap-2.5">
+    <div className="flex flex-col">
       {repoGroups.map((repoGroup) => (
-        <section key={repoGroup.repoId ?? 'no-repo'} className="flex flex-col gap-1">
+        <section key={repoGroup.repoId ?? 'no-repo'} className="flex flex-col">
           <RepoHeader repoId={repoGroup.repoId} />
-          <div className="flex flex-col" style={{ rowGap: WORKTREE_SIDEBAR_VIRTUAL_ROW_GAP }}>
-            {nestResumeWorkspaces(repoGroup.workspaces, ancestorsOf).map((node) => (
-              <WorkspaceCard
-                key={node.group.workspaceId}
-                node={node}
-                depth={0}
-                mixedHosts={mixedHosts}
-                listedAt={listedAt}
-                busy={busy}
-                selected={selected}
-                onToggle={onToggle}
-                failureFor={failureFor}
-                onFailureAction={onFailureAction}
-              />
-            ))}
-          </div>
+          {nestResumeWorkspaces(repoGroup.workspaces, ancestorsOf).map((node) => (
+            <WorkspaceRows
+              key={node.group.workspaceId}
+              node={node}
+              depth={0}
+              mixedHosts={mixedHosts}
+              listedAt={listedAt}
+              busy={busy}
+              selected={selected}
+              onToggle={onToggle}
+              selectable={selectable}
+              failureFor={failureFor}
+              onFailureAction={onFailureAction}
+            />
+          ))}
         </section>
       ))}
     </div>
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
new file mode 100644
index 000000000000..aa6f36236141
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
@@ -0,0 +1,205 @@
+// @vitest-environment happy-dom
+
+// The dialog's list as a control: initial focus, Select all, and keyboard movement.
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '../store'
+import { getDefaultSettings } from '../../../shared/constants'
+import { NativeChatResumeOnRestartModal } from './NativeChatResumeOnRestartModal'
+import { NativeChatResumeStatusSegment } from './status-bar/NativeChatResumeStatusSegment'
+import { TooltipProvider } from './ui/tooltip'
+import {
+  button,
+  chatBox,
+  failure,
+  namedBox,
+  offered
+} from './native-chat-resume-on-restart-modal.test-support'
+import {
+  consumeNativeChatResumeOnRestartDialogRequest,
+  requestNativeChatResumeOnRestartDialog
+} from './native-chat-resume-on-restart-dialog'
+import { _resetNativeChatRestartOffer } from './native-chat-resume-on-restart-store'
+
+const rpc = vi.hoisted(() => vi.fn())
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: rpc,
+  subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
+}))
+vi.mock('@/lib/activate-ai-vault-structured-session', () => ({
+  activateAiVaultStructuredSession: vi.fn(async () => true)
+}))
+vi.mock('sonner', () => ({ toast: vi.fn() }))
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+let root: Root
+let container: HTMLDivElement
+
+/** Rows carry tooltips, so every mount needs the provider the app shell supplies. */
+async function mount(node: React.ReactNode): Promise<void> {
+  await act(async () => root.render(<TooltipProvider>{node}</TooltipProvider>))
+}
+
+beforeEach(() => {
+  rpc.mockReset()
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({
+    settings: { ...getDefaultSettings(''), experimentalStructuredNativeChat: true }
+  })
+  container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+})
+
+// Left to the dialog, focus lands on the scrollable list and draws a ring around it.
+it('opens with focus on the resume action', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  expect(document.activeElement?.textContent?.trim()).toBe('Resume 2 chats')
+})
+
+it('uses the sidebar surface without a border around the resume list', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const list = document.querySelector('[aria-label="Chats that would be resumed"]')
+  expect(list).not.toBeNull()
+  expect(list?.classList.contains('bg-worktree-sidebar')).toBe(true)
+  expect(list?.classList.contains('border')).toBe(false)
+})
+
+it('keeps initial focus inside the dialog with no resumable chats', async () => {
+  rpc.mockResolvedValue({ sessions: [], failed: [failure('b')] })
+  await mount(<NativeChatResumeOnRestartModal />)
+  await act(async () => requestNativeChatResumeOnRestartDialog())
+  const dialog = document.querySelector('[role="dialog"]')
+  expect(button('Resume 0 chats').disabled).toBe(true)
+  expect(dialog).not.toBeNull()
+  expect(dialog?.contains(document.activeElement)).toBe(true)
+})
+
+it('keeps initial focus inside the dialog when reopened during resume', async () => {
+  const continued = Promise.withResolvers<unknown>()
+  rpc.mockImplementation((_target, method) =>
+    method === 'agentSession.restartResumable'
+      ? Promise.resolve({ sessions: offered })
+      : continued.promise
+  )
+  await mount(
+    <>
+      <NativeChatResumeOnRestartModal />
+      <NativeChatResumeStatusSegment iconOnly={false} />
+    </>
+  )
+  await act(async () => button('Resume 2 chats').click())
+  const opener = button('Resuming 2 chats')
+  await act(async () => {
+    opener.focus()
+    opener.click()
+  })
+  const dialog = document.querySelector('[role="dialog"]')
+  expect(button('Resuming…').disabled).toBe(true)
+  expect(dialog).not.toBeNull()
+  expect(dialog?.contains(document.activeElement)).toBe(true)
+  await act(async () => continued.resolve({ sessions: [], failed: [], resumed: [], continued: [] }))
+})
+
+it('starts the list with a tri-state Select all that counts the selection', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const list = document.querySelector('[aria-label="Chats that would be resumed"]')!
+  const selectAll = namedBox('Select all chats')
+  // First row of the list, in the same left column as every other checkbox.
+  expect(list.querySelector('[role="checkbox"]')).toBe(selectAll)
+  expect(selectAll.closest('label')?.firstElementChild?.contains(selectAll)).toBe(true)
+  const count = () => selectAll.closest('label')?.querySelector('.tabular-nums')?.textContent
+  expect(selectAll.getAttribute('aria-checked')).toBe('true')
+  expect(count()).toBe('2 of 2 selected')
+
+  await act(async () => chatBox('a').click())
+  expect(selectAll.getAttribute('aria-checked')).toBe('mixed')
+  expect(count()).toBe('1 of 2 selected')
+
+  await act(async () => selectAll.click())
+  expect(chatBox('a').getAttribute('aria-checked')).toBe('true')
+  expect(button('Resume 2 chats').disabled).toBe(false)
+
+  await act(async () => selectAll.click())
+  expect(selectAll.getAttribute('aria-checked')).toBe('false')
+  expect(count()).toBe('0 of 2 selected')
+  expect(button('Resume 0 chats').disabled).toBe(true)
+})
+
+it('leaves a failure a retry cannot fix out of Select all', async () => {
+  rpc.mockResolvedValue({ sessions: [offered[0]], failed: [{ ...failure('b'), retryable: false }] })
+  await mount(<NativeChatResumeOnRestartModal />)
+  await act(async () => requestNativeChatResumeOnRestartDialog())
+  const selectAll = namedBox('Select all chats')
+  expect(selectAll.closest('label')?.textContent).toContain('1 of 1 selected')
+
+  await act(async () => selectAll.click())
+  await act(async () => selectAll.click())
+  expect(chatBox('a').getAttribute('aria-checked')).toBe('true')
+  expect(chatBox('b').getAttribute('aria-checked')).toBe('false')
+  expect(button('Resume 1 chat').disabled).toBe(false)
+})
+
+it('disables Select all and the workspace checkbox while a resume runs', async () => {
+  const continued = Promise.withResolvers<unknown>()
+  rpc.mockImplementation((_target, method) =>
+    method === 'agentSession.restartResumable'
+      ? Promise.resolve({ sessions: offered })
+      : continued.promise
+  )
+  await mount(
+    <>
+      <NativeChatResumeOnRestartModal />
+      <NativeChatResumeStatusSegment iconOnly={false} />
+    </>
+  )
+  await act(async () => button('Resume 2 chats').click())
+  await act(async () => button('Resuming 2 chats').click())
+  const list = document.querySelector('[aria-label="Chats that would be resumed"]')!
+  const boxes = [...list.querySelectorAll('[role="checkbox"]')]
+  expect(boxes).toHaveLength(4)
+  for (const box of boxes) {
+    expect(box.hasAttribute('disabled')).toBe(true)
+  }
+  await act(async () => continued.resolve({ sessions: [], failed: [], resumed: [], continued: [] }))
+})
+
+it('moves between the list’s checkboxes with the arrow keys', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const order = [
+    namedBox('Select all chats'),
+    namedBox('Select all chats in workspace'),
+    chatBox('a'),
+    chatBox('b')
+  ]
+  const press = async (key: string) =>
+    act(async () => {
+      document.activeElement?.dispatchEvent(new KeyboardEvent('keydown', { key, bubbles: true }))
+    })
+  order[0]!.focus()
+  for (const next of order.slice(1)) {
+    await press('ArrowDown')
+    expect(document.activeElement).toBe(next)
+  }
+  // The last checkbox is the end of the list: focus never leaves it for the footer.
+  await press('ArrowDown')
+  expect(document.activeElement).toBe(order[3])
+  await press('ArrowUp')
+  expect(document.activeElement).toBe(order[2])
+})
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
index 42e8671e1ac4..c61958e6a2fc 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
@@ -11,6 +11,14 @@ import { NativeChatResumeStatusSegment } from './status-bar/NativeChatResumeStat
 import { TooltipProvider } from './ui/tooltip'
 import { lastToastShow } from './native-chat-resume-toast.test-support'
 import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import {
+  button,
+  chatBox,
+  chatBoxes,
+  dontAskAgain,
+  failure,
+  offered
+} from './native-chat-resume-on-restart-modal.test-support'
 import {
   consumeNativeChatResumeOnRestartDialogRequest,
   getNativeChatResumeOnRestartDialogRequest,
@@ -37,46 +45,12 @@ vi.mock('sonner', () => ({ toast: vi.fn() }))
 globalThis.IS_REACT_ACT_ENVIRONMENT = true
 let root: Root
 let container: HTMLDivElement
-const offered: ResumeCandidate[] = ['a', 'b'].map((sessionId) => ({
-  sessionId,
-  workspaceId: 'workspace',
-  agent: 'codex',
-  trigger: 'quit',
-  latestPrompt: `Prompt ${sessionId}`,
-  recordedAt: 1_800_000_000_000,
-  executionHostId: 'local',
-  workspaceKind: 'git-worktree'
-}))
-
-/** A chat the host acted on and could not carry on, as it reports it. */
-function failure(sessionId: string, reason = 'agent_session_restart_work_superseded') {
-  const candidate = offered.find((entry) => entry.sessionId === sessionId)!
-  return { ...candidate, failedAt: candidate.recordedAt + 60_000, outcome: 'refused', reason }
-}
 
 /** Outcome rows carry tooltips, so every mount needs the provider the app shell supplies. */
 async function mount(node: React.ReactNode): Promise<void> {
   await act(async () => root.render(<TooltipProvider>{node}</TooltipProvider>))
 }
 
-function button(text: string): HTMLButtonElement {
-  const found = [...document.querySelectorAll('button')].find(
-    (entry) => entry.textContent?.trim() === text || entry.getAttribute('aria-label') === text
-  )
-  if (!found) {
-    throw new Error(`Missing button: ${text}`)
-  }
-  return found
-}
-
-function checkbox(index: number): HTMLElement {
-  const found = document.querySelectorAll<HTMLElement>('[role="checkbox"]')[index]
-  if (!found) {
-    throw new Error(`Missing checkbox: ${index}`)
-  }
-  return found
-}
-
 function offerIds(): string[] {
   return getNativeChatRestartOffer().candidates.map((candidate) => candidate.sessionId)
 }
@@ -126,8 +100,8 @@ it('keeps next-launch preference out of the current resume action', async () =>
     return action.promise
   })
   await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => checkbox(1).click())
-  await act(async () => checkbox(2).click())
+  await act(async () => chatBox('b').click())
+  await act(async () => dontAskAgain().click())
   await act(async () => button('Resume 1 chat').click())
   expect(useAppStore.getState().settings?.nativeChatResumeWorkOnRestart).toBe(true)
   expect(rpc.mock.calls.map((call) => [call[1], call[2]])).toEqual([
@@ -144,58 +118,6 @@ it('keeps next-launch preference out of the current resume action', async () =>
   expect(rpc).toHaveBeenCalledTimes(2)
 })
 
-// Left to the dialog, focus lands on the scrollable list and draws a ring around it.
-it('opens with focus on the resume action', async () => {
-  rpc.mockResolvedValue({ sessions: offered })
-  await mount(<NativeChatResumeOnRestartModal />)
-  expect(document.activeElement?.textContent?.trim()).toBe('Resume 2 chats')
-})
-
-it('uses the sidebar surface without a border around the resume list', async () => {
-  rpc.mockResolvedValue({ sessions: offered })
-  await mount(<NativeChatResumeOnRestartModal />)
-  const list = document.querySelector('[aria-label="Chats that would be resumed"]')
-  expect(list).not.toBeNull()
-  expect(list?.classList.contains('bg-worktree-sidebar')).toBe(true)
-  expect(list?.classList.contains('border')).toBe(false)
-})
-
-it('keeps initial focus inside the dialog with no resumable chats', async () => {
-  rpc.mockResolvedValue({ sessions: [], failed: [failure('b')] })
-  await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => requestNativeChatResumeOnRestartDialog())
-  const dialog = document.querySelector('[role="dialog"]')
-  expect(button('Resume 0 chats').disabled).toBe(true)
-  expect(dialog).not.toBeNull()
-  expect(dialog?.contains(document.activeElement)).toBe(true)
-})
-
-it('keeps initial focus inside the dialog when reopened during resume', async () => {
-  const continued = Promise.withResolvers<unknown>()
-  rpc.mockImplementation((_target, method) =>
-    method === 'agentSession.restartResumable'
-      ? Promise.resolve({ sessions: offered })
-      : continued.promise
-  )
-  await mount(
-    <>
-      <NativeChatResumeOnRestartModal />
-      <NativeChatResumeStatusSegment iconOnly={false} />
-    </>
-  )
-  await act(async () => button('Resume 2 chats').click())
-  const opener = button('Resuming 2 chats')
-  await act(async () => {
-    opener.focus()
-    opener.click()
-  })
-  const dialog = document.querySelector('[role="dialog"]')
-  expect(button('Resuming…').disabled).toBe(true)
-  expect(dialog).not.toBeNull()
-  expect(dialog?.contains(document.activeElement)).toBe(true)
-  await act(async () => continued.resolve({ sessions: [], failed: [], resumed: [], continued: [] }))
-})
-
 // One primary action and one way out of it; the body copy carries the transparency.
 it('offers exactly Dismiss all and the resume action', async () => {
   rpc.mockResolvedValue({ sessions: offered })
@@ -235,7 +157,7 @@ it('says under each chat what it was doing when Orca went away', async () => {
 it('snoozes to the status-bar offer when the dialog is closed', async () => {
   rpc.mockResolvedValue({ sessions: offered })
   await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => checkbox(2).click())
+  await act(async () => dontAskAgain().click())
   await act(async () => button('Close').click())
   expect(useAppStore.getState().settings?.nativeChatResumeWorkOnRestart).toBe(true)
   expect(rpc.mock.calls.map((call) => call[1])).toEqual(['agentSession.restartResumable'])
@@ -280,7 +202,7 @@ it('saves Don’t ask again when the offer is dismissed outright', async () => {
     method === 'agentSession.restartResumable' ? { sessions: offered } : { dismissed: 2 }
   )
   await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => checkbox(2).click())
+  await act(async () => dontAskAgain().click())
   await act(async () => button('Dismiss all').click())
   expect(useAppStore.getState().settings?.nativeChatResumeWorkOnRestart).toBe(true)
 })
@@ -307,7 +229,7 @@ it('never re-offers a resumed chat when the status entry reopens the dialog', as
       <NativeChatResumeStatusSegment iconOnly={false} />
     </>
   )
-  await act(async () => checkbox(1).click())
+  await act(async () => chatBox('b').click())
   await act(async () => button('Resume 1 chat').click())
   expect(offerIds()).toEqual(['b'])
   // The action closes the dialog itself; the status entry is the way back to what is left.
@@ -316,8 +238,8 @@ it('never re-offers a resumed chat when the status entry reopens the dialog', as
   await act(async () => button('1 chat to resume').click())
   expect(document.querySelector('[role="dialog"]')).not.toBeNull()
   expect(offerIds()).toEqual(['b'])
-  // One offered row plus the preference box — never the resumed chat again.
-  expect(document.querySelectorAll('[role="checkbox"]')).toHaveLength(2)
+  // One offered row — never the resumed chat again.
+  expect(chatBoxes()).toHaveLength(1)
 })
 
 // The resume outlives the dialog, as a skill update does: the status bar carries it while in flight.
@@ -378,15 +300,15 @@ it('keeps a dialog reopened mid-resume open over the chats still offered', async
       <NativeChatResumeStatusSegment iconOnly={false} />
     </>
   )
-  await act(async () => checkbox(2).click())
+  await act(async () => chatBox('c').click())
   await act(async () => button('Resume 2 chats').click())
   expect(document.querySelector('[role="dialog"]')).toBeNull()
   await act(async () => button('1 chat to resume').click())
   expect(document.querySelector('[role="dialog"]')).not.toBeNull()
   // Mid-run the ticks say what is running, so the chat left out reads as left out.
   const rowC = () => document.querySelector('[role="checkbox"][aria-label*="Prompt c"]')
-  expect(checkbox(0).getAttribute('data-state')).toBe('checked')
-  expect(checkbox(1).getAttribute('data-state')).toBe('checked')
+  expect(chatBox('a').getAttribute('data-state')).toBe('checked')
+  expect(chatBox('b').getAttribute('data-state')).toBe('checked')
   expect(rowC()?.getAttribute('data-state')).toBe('unchecked')
 
   await act(async () =>
@@ -402,20 +324,20 @@ it('keeps a dialog reopened mid-resume open over the chats still offered', async
   expect(dialog?.textContent).not.toContain('Prompt a')
   // The run is over, so the chat left out is actionable again, and this opening ticks it afresh.
   expect(button('Dismiss all').disabled).toBe(false)
-  expect(checkbox(0).getAttribute('data-state')).toBe('checked')
+  expect(chatBox('c').getAttribute('data-state')).toBe('checked')
   expect(button('Resume 1 chat').disabled).toBe(false)
 })
 
 it('starts each opening from the default ticks, not the ones left at the last close', async () => {
   rpc.mockResolvedValue({ sessions: offered })
   await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => checkbox(1).click())
+  await act(async () => chatBox('b').click())
   expect(button('Resume 1 chat')).toBeTruthy()
   await act(async () => button('Close').click())
   expect(document.querySelector('[role="dialog"]')).toBeNull()
 
   await act(async () => requestNativeChatResumeOnRestartDialog())
-  expect(checkbox(1).getAttribute('data-state')).toBe('checked')
+  expect(chatBox('b').getAttribute('data-state')).toBe('checked')
   expect(button('Resume 2 chats').disabled).toBe(false)
 })
 
@@ -433,7 +355,7 @@ it('settles the offer for the chats a resume reattached', async () => {
         }
   )
   await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => checkbox(1).click())
+  await act(async () => chatBox('b').click())
   await act(async () => button('Resume 1 chat').click())
   expect(offerIds()).toEqual(['b'])
 })
@@ -558,8 +480,8 @@ it('dispatches the selected action while a future preference save is still pendi
         }
   )
   await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => checkbox(1).click())
-  await act(async () => checkbox(2).click())
+  await act(async () => chatBox('b').click())
+  await act(async () => dontAskAgain().click())
   await act(async () => button('Resume 1 chat').click())
   expect(rpc.mock.calls.at(-1)?.slice(1)).toEqual([
     'agentSession.restartContinue',
@@ -781,7 +703,7 @@ it('lists a chat the resume could not carry on when the dialog reopens, with wha
   expect(dialog?.textContent).not.toContain('Dismiss failed')
   // The resumed chat left the list as it always did; the failed one is a row with a checkbox.
   expect(dialog?.textContent).not.toContain('Prompt a')
-  expect(document.querySelectorAll('[role="checkbox"]')).toHaveLength(2)
+  expect(chatBoxes()).toHaveLength(1)
   expect(document.querySelector('[aria-label="Prompt b: Couldn’t resume"]')).not.toBeNull()
   expect(dialog?.textContent).toContain('To resume:')
   expect(dialog?.textContent).toContain('Open the chat and reply.')
@@ -793,7 +715,7 @@ it('lists a chat the resume could not carry on when the dialog reopens, with wha
     'Close'
   ])
   // A retry cannot fix newer work in the chat, so it is not pre-selected for one.
-  expect(checkbox(0).getAttribute('data-state')).toBe('unchecked')
+  expect(chatBox('b').getAttribute('data-state')).toBe('unchecked')
 
   await act(async () => button('Open chat').click())
   expect(activate).toHaveBeenCalledWith({
@@ -830,7 +752,7 @@ it.each(['footer', 'row'] as const)(
       'Close it there, then retry.'
     )
     // A retry can fix an ownership clash, so the row starts selected.
-    expect(checkbox(0).getAttribute('data-state')).toBe('checked')
+    expect(chatBox('b').getAttribute('data-state')).toBe('checked')
 
     await act(async () => button(from === 'footer' ? 'Resume 1 chat' : 'Retry').click())
     expect(rpc.mock.calls.at(-1)?.slice(1)).toEqual([
@@ -912,13 +834,13 @@ it('keeps a failure the host marks unretryable out of Resume, even after a tick'
   await mount(<NativeChatResumeOnRestartModal />)
   await act(async () => requestNativeChatResumeOnRestartDialog())
   // An older host sends no flag, and the row stays selectable as it always was.
-  expect(checkbox(0).hasAttribute('disabled')).toBe(false)
-  await act(async () => checkbox(0).click())
+  expect(chatBox('b').hasAttribute('disabled')).toBe(false)
+  await act(async () => chatBox('b').click())
   expect(button('Resume 1 chat').disabled).toBe(false)
 
   failed = [{ ...failure('b'), retryable: false }]
   await act(async () => void (await refreshNativeChatRestartOffer()))
-  expect(checkbox(0).hasAttribute('disabled')).toBe(true)
+  expect(chatBox('b').hasAttribute('disabled')).toBe(true)
   expect(button('Resume 0 chats').disabled).toBe(true)
   expect(button('Open chat').disabled).toBe(false)
 })
@@ -939,14 +861,14 @@ it('dismisses one failed chat by name, and every record through Dismiss all', as
   )
   await mount(<NativeChatResumeOnRestartModal />)
   await act(async () => requestNativeChatResumeOnRestartDialog())
-  expect(document.querySelectorAll('[role="checkbox"]')).toHaveLength(3)
+  expect(chatBoxes()).toHaveLength(2)
   await act(async () => button('Dismiss "Prompt a" in workspace').click())
   expect(rpc.mock.calls.at(-1)?.slice(1)).toEqual([
     'agentSession.restartResumableDismiss',
     { sessionIds: ['a'] }
   ])
   expect(document.querySelector('[role="dialog"]')?.textContent).not.toContain('Prompt a')
-  expect(document.querySelectorAll('[role="checkbox"]')).toHaveLength(2)
+  expect(chatBoxes()).toHaveLength(1)
   await act(async () => button('Dismiss all').click())
   expect(rpc.mock.calls.at(-1)?.slice(1)).toEqual(['agentSession.restartResumableDismiss', {}])
   expect(document.querySelector('[role="dialog"]')).toBeNull()
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index 3ae449b504a3..9c24a1c97df2 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -20,7 +20,12 @@ import {
   resumeFailureSelectable,
   type ResumeFailureAction
 } from './native-chat-resume-failure-guidance'
-import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
+import {
+  resumeSelectionState,
+  toggleResumeSelection,
+  type ResumeCandidate,
+  type ResumeFailure
+} from './native-chat-resume-on-restart-grouping'
 import {
   consumeNativeChatResumeOnRestartDialogRequest,
   getNativeChatResumeOnRestartDialogRequest,
@@ -64,6 +69,23 @@ function selectedByDefault(failure: ResumeFailure | undefined): boolean {
   return guidance.primary === 'retry' || guidance.secondary === 'retry'
 }
 
+/** Up/Down step between the list's checkboxes; Space toggles the focused one natively. */
+function moveCheckboxFocus(event: React.KeyboardEvent<HTMLElement>): void {
+  if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') {
+    return
+  }
+  const target = event.target
+  if (!(target instanceof HTMLElement) || target.getAttribute('role') !== 'checkbox') {
+    return
+  }
+  const boxes = [
+    ...event.currentTarget.querySelectorAll<HTMLElement>('[role="checkbox"]:not(:disabled)')
+  ]
+  const next = boxes[boxes.indexOf(target) + (event.key === 'ArrowDown' ? 1 : -1)]
+  event.preventDefault()
+  next?.focus()
+}
+
 export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
   const offerEnabled = useNativeChatRestartOfferEnabled()
   const { candidates, failed, listedAt } = useNativeChatRestartOffer(offerEnabled)
@@ -98,24 +120,31 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
       setOverrides(new Map())
     }
   }
-  /** Derived from the host's own list, so an action can never name a chat it did not list. */
-  const chosen = useMemo(
+  /** Every chat a tick can name; a failure the host marks unretryable is left out. */
+  const selectable = useMemo(
     () =>
       rows
         .filter((row) => {
           const failure = failureBySession.get(row.sessionId)
-          // A tick made before the host marked it unretryable must not carry into the action.
-          return (
-            (!failure || resumeFailureSelectable(failure)) &&
-            (overrides.get(row.sessionId) ?? selectedByDefault(failure))
-          )
+          return !failure || resumeFailureSelectable(failure)
         })
         .map((row) => row.sessionId),
-    [rows, overrides, failureBySession]
+    [rows, failureBySession]
+  )
+  /** Derived from the host's own list, so an action can never name a chat it did not list. */
+  const chosen = useMemo(
+    () =>
+      // A tick made before the host marked it unretryable must not carry into the action.
+      selectable.filter(
+        (sessionId) =>
+          overrides.get(sessionId) ?? selectedByDefault(failureBySession.get(sessionId))
+      ),
+    [selectable, overrides, failureBySession]
   )
   const selected = useMemo(() => new Set(chosen), [chosen])
   // Mid-run the ticks show what is running; this opening's own ticks may name chats left out of it.
   const ticked = useMemo(() => (busy ? new Set(resuming) : selected), [busy, resuming, selected])
+  const allSelection = resumeSelectionState(selectable, ticked)
 
   const toggleSelected = useCallback((sessionId: string, checked: boolean) => {
     setOverrides((current) => new Map(current).set(sessionId, checked))
@@ -189,7 +218,7 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
     >
       {/* Height is capped, never the data: the list scrolls inside the dialog so the header and
           the primary action stay put however many chats were interrupted. */}
-      {/* Wide enough for a sidebar card's chat row to keep its name, model and age on one line. */}
+      {/* Wide enough for a nested chat row to keep its name, model and age on one line. */}
       <DialogContent
         className="grid-rows-[auto_minmax(0,1fr)_auto] sm:max-w-3xl max-h-[85vh]"
         // Keep the scrollable list out of initial focus, including while Resume is disabled.
@@ -233,9 +262,41 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
             'auto.components.NativeChatResumeOnRestartModal.listLabel',
             'Chats that would be resumed'
           )}
-          // The sidebar's own surface, so its cards read here as they do there.
+          // The sidebar's own surface, so its workspaces read here as they do there.
           className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md bg-worktree-sidebar p-1.5"
+          onKeyDown={moveCheckboxFocus}
         >
+          {/* Here, not in the groups: a list may hold one set of groups per machine. */}
+          <label className="grid h-7.5 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center hover:bg-worktree-sidebar-accent has-[:disabled]:cursor-default">
+            <span className="flex justify-center">
+              <Checkbox
+                checked={allSelection.checked}
+                disabled={busy || allSelection.total === 0}
+                onCheckedChange={() =>
+                  toggleResumeSelection(selectable, allSelection, toggleSelected)
+                }
+                aria-label={translate(
+                  'auto.components.NativeChatResumeOnRestartModal.selectAll',
+                  'Select all chats'
+                )}
+              />
+            </span>
+            <span className="flex min-w-0 items-center gap-1.5 pr-2.5">
+              <span className="min-w-0 truncate text-xs font-semibold text-muted-foreground">
+                {translate(
+                  'auto.components.NativeChatResumeOnRestartModal.selectAllLabel',
+                  'Select all'
+                )}
+              </span>
+              <span className="ml-auto shrink-0 pl-2 text-[11px] tabular-nums text-muted-foreground">
+                {translate(
+                  'auto.components.NativeChatResumeOnRestartModal.selectedCount',
+                  '{{value0}} of {{value1}} selected',
+                  { value0: allSelection.selectedCount, value1: allSelection.total }
+                )}
+              </span>
+            </span>
+          </label>
           <ResumeOnRestartGroups
             candidates={rows}
             listedAt={listedAt}
diff --git a/src/renderer/src/components/activity/activity-thread-hover-card.tsx b/src/renderer/src/components/activity/activity-thread-hover-card.tsx
index 50ee614aa89c..064235f175ec 100644
--- a/src/renderer/src/components/activity/activity-thread-hover-card.tsx
+++ b/src/renderer/src/components/activity/activity-thread-hover-card.tsx
@@ -133,7 +133,6 @@ function ActivityThreadHoverCardContent({
     worktree,
     repo: repo ?? undefined,
     statusPrDisplay: null,
-    showLiveState: true,
     showStatus: true,
     showIssue: true,
     showLinearIssue: true,
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
index 62299cbbae38..2d3bd0306e54 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
@@ -7,7 +7,10 @@ import {
   groupResumeWorkspacesByRepo,
   nestResumeWorkspaces,
   resolveResumeGroupHeader,
+  resumeSelectionState,
   resumeWorkspaceKind,
+  resumeWorkspaceSessionIds,
+  toggleResumeSelection,
   type ResumeCandidate
 } from './native-chat-resume-on-restart-grouping'
 
@@ -179,3 +182,48 @@ describe('nesting child workspaces', () => {
     ])
   })
 })
+
+describe('group checkboxes', () => {
+  it('covers a workspace and every workspace nested under it', () => {
+    const chats = (workspaceId: string, ...sessionIds: string[]) => ({
+      workspaceId,
+      candidates: sessionIds.map((sessionId) => candidate({ sessionId, workspaceId }))
+    })
+    const [root] = nestResumeWorkspaces(
+      [chats('parent', 'p1'), chats('child', 'c1', 'c2'), chats('grandchild', 'g1')],
+      (id) => ({ child: ['parent'], grandchild: ['child', 'parent'] })[id] ?? []
+    )
+
+    expect(resumeWorkspaceSessionIds(root!)).toEqual(['p1', 'c1', 'c2', 'g1'])
+  })
+
+  it.each([
+    [['a', 'b'], true, 2],
+    [['a'], 'indeterminate', 1],
+    [[], false, 0]
+  ] as const)('with %j ticked reads %s', (ticked, checked, selectedCount) => {
+    expect(resumeSelectionState(['a', 'b'], new Set(ticked))).toEqual({
+      checked,
+      selectedCount,
+      total: 2
+    })
+  })
+
+  it('reads unchecked when it covers nothing', () => {
+    expect(resumeSelectionState([], new Set(['a'])).checked).toBe(false)
+  })
+
+  it('ticks everything unless everything is ticked, then unticks it', () => {
+    const calls: [string, boolean][] = []
+    const record = (sessionId: string, checked: boolean) => calls.push([sessionId, checked])
+    toggleResumeSelection(['a', 'b'], resumeSelectionState(['a', 'b'], new Set(['a'])), record)
+    toggleResumeSelection(['a', 'b'], resumeSelectionState(['a', 'b'], new Set(['a', 'b'])), record)
+
+    expect(calls).toEqual([
+      ['a', true],
+      ['b', true],
+      ['a', false],
+      ['b', false]
+    ])
+  })
+})
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
index 0a59a6927406..9526926841e9 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
@@ -168,6 +168,44 @@ export function nestResumeWorkspaces(
   return roots
 }
 
+/** A workspace's chats followed by those of every workspace nested under it, in list order. */
+export function resumeWorkspaceSessionIds(node: ResumeWorkspaceNode): string[] {
+  return [
+    ...node.group.candidates.map((candidate) => candidate.sessionId),
+    ...node.children.flatMap(resumeWorkspaceSessionIds)
+  ]
+}
+
+export type ResumeSelectionState = {
+  checked: boolean | 'indeterminate'
+  selectedCount: number
+  total: number
+}
+
+/** A group checkbox's state over the selectable chats it covers. */
+export function resumeSelectionState(
+  sessionIds: readonly string[],
+  selected: ReadonlySet<string>
+): ResumeSelectionState {
+  const selectedCount = sessionIds.filter((sessionId) => selected.has(sessionId)).length
+  const total = sessionIds.length
+  const checked =
+    total > 0 && selectedCount === total ? true : selectedCount > 0 ? 'indeterminate' : false
+  return { checked, selectedCount, total }
+}
+
+/** Ticks every chat a group covers unless all already are, then unticks them. */
+export function toggleResumeSelection(
+  sessionIds: readonly string[],
+  state: ResumeSelectionState,
+  onToggle: (sessionId: string, checked: boolean) => void
+): void {
+  const next = state.selectedCount < state.total
+  for (const sessionId of sessionIds) {
+    onToggle(sessionId, next)
+  }
+}
+
 export type ResumeGroupHeader =
   | { kind: 'repo'; name: string; repoIcon: RepoIcon | null }
   | { kind: 'project'; name: string }
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-modal.test-support.ts b/src/renderer/src/components/native-chat-resume-on-restart-modal.test-support.ts
new file mode 100644
index 000000000000..993a170ba0f1
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-on-restart-modal.test-support.ts
@@ -0,0 +1,63 @@
+// Fixtures and DOM lookups shared by the resume dialog's test files.
+
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+
+export const offered: ResumeCandidate[] = ['a', 'b'].map((sessionId) => ({
+  sessionId,
+  workspaceId: 'workspace',
+  agent: 'codex',
+  trigger: 'quit',
+  latestPrompt: `Prompt ${sessionId}`,
+  recordedAt: 1_800_000_000_000,
+  executionHostId: 'local',
+  workspaceKind: 'git-worktree'
+}))
+
+/** A chat the host acted on and could not carry on, as it reports it. */
+export function failure(sessionId: string, reason = 'agent_session_restart_work_superseded') {
+  const candidate = offered.find((entry) => entry.sessionId === sessionId)!
+  return { ...candidate, failedAt: candidate.recordedAt + 60_000, outcome: 'refused', reason }
+}
+
+export function button(text: string): HTMLButtonElement {
+  const found = [...document.querySelectorAll('button')].find(
+    (entry) => entry.textContent?.trim() === text || entry.getAttribute('aria-label') === text
+  )
+  if (!found) {
+    throw new Error(`Missing button: ${text}`)
+  }
+  return found
+}
+
+/** A chat's own checkbox; its accessible name carries the prompt. */
+export function chatBox(sessionId: string): HTMLElement {
+  const found = document.querySelector<HTMLElement>(
+    `[role="checkbox"][aria-label*="Prompt ${sessionId}"]`
+  )
+  if (!found) {
+    throw new Error(`Missing chat checkbox: ${sessionId}`)
+  }
+  return found
+}
+
+export function chatBoxes(): HTMLElement[] {
+  return [...document.querySelectorAll<HTMLElement>('[role="checkbox"][aria-label^="Resume "]')]
+}
+
+export function namedBox(name: string): HTMLElement {
+  const found = document.querySelector<HTMLElement>(`[role="checkbox"][aria-label="${name}"]`)
+  if (!found) {
+    throw new Error(`Missing checkbox: ${name}`)
+  }
+  return found
+}
+
+export function dontAskAgain(): HTMLElement {
+  const found = [...document.querySelectorAll('label')]
+    .find((label) => label.textContent?.includes("Don't ask again"))
+    ?.querySelector<HTMLElement>('[role="checkbox"]')
+  if (!found) {
+    throw new Error('Missing Don’t ask again checkbox')
+  }
+  return found
+}
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx
index 09ad2ac90547..1cdaa5a039be 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.affiliate-list-mode.test.tsx
@@ -323,96 +323,3 @@ describe('WorktreeCard affiliate list mode', () => {
     expect(container.querySelector('[data-worktree-unread-alert=""]')).not.toBeNull()
   })
 })
-
-describe('WorktreeCard read-only mode', () => {
-  let container: HTMLDivElement
-  let root: Root
-
-  beforeEach(() => {
-    container = document.createElement('div')
-    document.body.appendChild(container)
-    root = createRoot(container)
-    vi.clearAllMocks()
-    worktreeCardProperties = ['status', 'comment', 'inline-agents']
-    settings = null
-    sleepMocks.sleeping = false
-  })
-
-  afterEach(() => {
-    act(() => {
-      root.unmount()
-    })
-    container.remove()
-  })
-
-  function renderReadOnly(overrides: Partial<Worktree> = {}): HTMLElement | null {
-    act(() => {
-      root.render(
-        <WorktreeCard
-          worktree={makeWorktree(overrides)}
-          repo={makeRepo()}
-          isActive={false}
-          readOnly
-          hostContextLabel="Local Mac"
-          agentRows={<div data-testid="caller-rows" />}
-        />
-      )
-    })
-    return container.querySelector<HTMLElement>('[data-worktree-card-surface="true"]')
-  }
-
-  it('responds to nothing: no activation, rename, edit, drag or context menu', () => {
-    const surface = renderReadOnly()
-
-    act(() => {
-      surface?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
-      surface?.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }))
-    })
-
-    expect(testDoubles.activateWorktreeFromSidebar).not.toHaveBeenCalled()
-    expect(openModal).not.toHaveBeenCalled()
-    expect(surface?.getAttribute('draggable')).toBe('false')
-    expect(surface?.className).not.toContain('cursor-pointer')
-    expect(container.querySelector('[data-testid="context-menu-wrapper"]')).toBeNull()
-    expect(
-      container.querySelector('[data-testid="inline-rename"]')?.getAttribute('data-disabled')
-    ).toBe('true')
-  })
-
-  it("shows the caller's rows in place of the live agent list", () => {
-    renderReadOnly()
-
-    expect(container.querySelector('[data-testid="caller-rows"]')).not.toBeNull()
-    expect(container.querySelector('[data-testid="inline-agents"]')).toBeNull()
-  })
-
-  it('keeps the status lane but draws it quiet: no button, sleep or unread', () => {
-    sleepMocks.sleeping = true
-    for (const newCardStyle of [false, true]) {
-      settings = { experimentalNewWorktreeCardStyle: newCardStyle }
-      renderReadOnly({ isUnread: true })
-
-      const lane = container.querySelector('[data-worktree-card-status-slot]')
-      expect(lane).not.toBeNull()
-      expect(lane?.querySelector('button')).toBeNull()
-      expect(lane?.querySelector('.lucide-moon, [data-worktree-unread-alert]')).toBeNull()
-    }
-  })
-
-  it.each([
-    ['legacy', {}, true],
-    ['compact', { compactWorktreeCards: true }, false],
-    ['new', { experimentalNewWorktreeCardStyle: true }, true]
-  ] as const)(
-    '%s: follows the host card property and sidebar compact rules',
-    (_, style, showsHost) => {
-      settings = style
-      renderReadOnly()
-      expect(container.textContent).not.toContain('Local Mac')
-
-      worktreeCardProperties = ['status', 'host']
-      renderReadOnly()
-      expect(container.textContent?.includes('Local Mac')).toBe(showsHost)
-    }
-  )
-})
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
index 0260cb6ed370..d7ccd755c681 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.lineage.test.tsx
@@ -1,7 +1,6 @@
 import { renderToStaticMarkup } from 'react-dom/server'
 import type { ReactNode } from 'react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { Repo } from '../../../../shared/repo-types'
 import type { WorktreeCardProperty } from '../../../../shared/ui-chrome-types'
 import type { Worktree } from '../../../../shared/worktree/types'
@@ -13,7 +12,7 @@ const openModal = vi.fn()
 const updateWorktreeMeta = vi.fn()
 
 let worktreeCardProperties: WorktreeCardProperty[] = []
-let settings: Partial<GlobalSettings> | null = null
+const WORKTREE_CARD_IMPORT_TIMEOUT_MS = 15_000
 
 vi.mock('@/store', () => ({
   useAppStore: (selector: (state: unknown) => unknown) =>
@@ -29,7 +28,7 @@ vi.mock('@/store', () => ({
       openModal,
       projectGroups: [],
       remoteBranchConflictByWorktreeId: {},
-      settings,
+      settings: null,
       sshConnectionStates: new Map(),
       sshTargetLabels: new Map(),
       updateWorktreeMeta,
@@ -45,10 +44,6 @@ vi.mock('@/components/ui/tooltip', () => ({
   TooltipTrigger: ({ children }: { children: ReactNode }) => <>{children}</>
 }))
 
-vi.mock('./use-worktree-activity-status', () => ({
-  useWorktreeActivityStatus: () => 'idle'
-}))
-
 vi.mock('./use-worktree-sleep-state', () => ({
   useIsSleepingWorktree: () => false
 }))
@@ -68,8 +63,6 @@ vi.mock('./WorktreeContextMenu', () => ({
   WORKTREE_NATIVE_CONTEXT_MENU_ATTR: 'data-worktree-native-context-menu'
 }))
 
-import WorktreeCard from './WorktreeCard'
-
 function makeRepo(): Repo {
   return {
     id: 'repo-1',
@@ -107,70 +100,46 @@ describe('WorktreeCard lineage indicators', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     worktreeCardProperties = []
-    settings = null
   })
 
-  it('does not render parent lineage badge copy on workspace cards', () => {
-    const markup = renderToStaticMarkup(
-      <WorktreeCard worktree={makeWorktree()} repo={makeRepo()} isActive={false} />
-    )
+  it(
+    'does not render parent lineage badge copy on workspace cards',
+    async () => {
+      const { default: WorktreeCard } = await import('./WorktreeCard')
 
-    expect(markup).not.toContain('Parent workspace')
-    expect(markup).not.toContain('parent:')
-    expect(markup).not.toContain('from master')
-    expect(markup).not.toContain('Missing parent')
-    expect(markup).toContain('overflow-hidden')
-  })
+      const markup = renderToStaticMarkup(
+        <WorktreeCard worktree={makeWorktree()} repo={makeRepo()} isActive={false} />
+      )
 
-  it('keeps the child workspace toggle chip', () => {
-    const markup = renderToStaticMarkup(
-      <WorktreeCard
-        worktree={makeWorktree()}
-        repo={makeRepo()}
-        isActive={false}
-        lineageChildCount={1}
-        lineageCollapsed={false}
-        onLineageToggle={vi.fn()}
-      />
-    )
-
-    expect(markup).toContain('aria-label="Hide 1 child workspace"')
-    expect(markup).toContain('1 child')
-    expect(markup).not.toContain('Parent workspace')
-  })
+      expect(markup).not.toContain('Parent workspace')
+      expect(markup).not.toContain('parent:')
+      expect(markup).not.toContain('from master')
+      expect(markup).not.toContain('Missing parent')
+      expect(markup).toContain('overflow-hidden')
+    },
+    WORKTREE_CARD_IMPORT_TIMEOUT_MS
+  )
+
+  it(
+    'keeps the child workspace toggle chip',
+    async () => {
+      const { default: WorktreeCard } = await import('./WorktreeCard')
 
-  // Why: read-only cards keep the status lane, so legacy children keep the sidebar's outdent.
-  const OUTDENT = '-ml-[1.125rem] mt-1.5 w-[calc(100%+1.125rem)] space-y-1'
-  const STYLES = {
-    legacy: {},
-    compact: { compactWorktreeCards: true },
-    new: { experimentalNewWorktreeCardStyle: true }
-  }
-  it.each([
-    ['legacy', false, OUTDENT],
-    ['compact', false, OUTDENT],
-    ['new', false, 'mt-1.5 space-y-1'],
-    ['legacy', true, OUTDENT],
-    ['compact', true, OUTDENT],
-    ['new', true, 'mt-1.5 space-y-1']
-  ] as const)(
-    '%s card, read-only %s: lineage children list classes',
-    (style, readOnly, expectedClasses) => {
-      settings = STYLES[style]
-      // Why: status is a fixed card property, so every live card has the lane.
-      worktreeCardProperties = ['status']
       const markup = renderToStaticMarkup(
         <WorktreeCard
           worktree={makeWorktree()}
           repo={makeRepo()}
           isActive={false}
-          readOnly={readOnly}
-          lineageChildren={<span data-testid="child">child</span>}
+          lineageChildCount={1}
+          lineageCollapsed={false}
+          onLineageToggle={vi.fn()}
         />
       )
 
-      const listClasses = /<div class="([^"]*)"[^>]*><span data-testid="child">/.exec(markup)?.[1]
-      expect(listClasses?.split(' ').toSorted()).toEqual(expectedClasses.split(' ').toSorted())
-    }
+      expect(markup).toContain('aria-label="Hide 1 child workspace"')
+      expect(markup).toContain('1 child')
+      expect(markup).not.toContain('Parent workspace')
+    },
+    WORKTREE_CARD_IMPORT_TIMEOUT_MS
   )
 })
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
deleted file mode 100644
index a9018a3785ca..000000000000
--- a/src/renderer/src/components/sidebar/WorktreeCard.read-only-contract.test.tsx
+++ /dev/null
@@ -1,427 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, type ReactNode } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { SshConnectionStatus } from '../../../../shared/ssh-types'
-import { worktreeCardTitleXSignature } from './worktree-card-title-geometry.test-support'
-import type { GlobalSettings } from '../../../../shared/global-settings-types'
-import type { Repo } from '../../../../shared/repo-types'
-import type { WorktreeCardProperty } from '../../../../shared/ui-chrome-types'
-import type { Worktree } from '../../../../shared/worktree/types'
-import type { WorktreeStatus } from '@/lib/worktree-status'
-import { issueCacheKey } from '@/store/github/cache-identity'
-
-const activateWorktreeFromSidebar = vi.hoisted(() => vi.fn())
-const callbacks = {
-  onActivate: vi.fn(),
-  onWorktreeCardClick: vi.fn(),
-  onImmediateActivate: vi.fn(),
-  onSelectionGesture: vi.fn(() => false),
-  onContextMenuSelect: vi.fn(() => []),
-  onAssignWorkspaceStatus: vi.fn(),
-  onCardDragStart: vi.fn(),
-  onCardDragEnd: vi.fn(),
-  onLineageToggle: vi.fn()
-}
-
-const INTERACTION_VARIANT =
-  /(?:^|:)(?:hover|focus|focus-visible|focus-within|active|disabled|aria-invalid):/
-
-const ALL_CARD_PROPERTIES: WorktreeCardProperty[] = [
-  'status',
-  'unread',
-  'ci',
-  'branch',
-  'issue',
-  'linear-issue',
-  'jira-issue',
-  'pr',
-  'automation',
-  'cli',
-  'comment',
-  'ports',
-  'inline-agents',
-  'host'
-]
-
-let settings: Partial<GlobalSettings> = {}
-let deleteStateByWorktreeId: Record<string, unknown> = {}
-let activityStatus: WorktreeStatus = 'working'
-let sleeping = true
-let sshStatus: SshConnectionStatus = 'disconnected'
-const onChatClick = vi.fn()
-
-vi.mock('@/store', () => ({
-  useAppStore: (selector: (state: unknown) => unknown) =>
-    selector({
-      browserTabsByWorktree: {},
-      createBrowserTab: vi.fn(),
-      deleteFolderWorkspace: vi.fn(),
-      deleteStateByWorktreeId,
-      fetchHostedReviewForBranch: vi.fn(),
-      fetchIssue: vi.fn(),
-      fetchLinearIssue: vi.fn(),
-      gitConflictOperationByWorktree: {},
-      hostedReviewCache: {},
-      // Why a url: the details popovers only offer their open/copy actions for a linked item with one.
-      issueCache: {
-        [issueCacheKey(repo.path, repo.id, 7, settings, repo.connectionId, undefined, true)]: {
-          data: { number: 7, title: 'Issue', state: 'open', url: 'https://example.com/7' },
-          fetchedAt: Date.now()
-        }
-      },
-      linearIssueCache: {},
-      openModal: vi.fn(),
-      openTaskPage: vi.fn(),
-      projectGroups: [],
-      ptyIdsByTabId: {},
-      recordFeatureInteraction: vi.fn(),
-      remoteBranchConflictByWorktreeId: {},
-      removedSshTargetLabels: new Map(),
-      renamingWorktreeId: null,
-      runtimeEnvironments: [],
-      runtimeStatusByEnvironmentId: new Map(),
-      setActiveWorktree: vi.fn(),
-      setRenamingWorktreeId: vi.fn(),
-      settings,
-      sshConnectionStates: new Map([['ssh-target-1', { status: sshStatus }]]),
-      sshStateByEnvironment: new Map(),
-      sshTargetLabels: new Map([['ssh-target-1', 'Remote target']]),
-      sshTargetsHydrated: true,
-      tabsByWorktree: {},
-      updateWorktreeMeta: vi.fn(),
-      workspacePortScan: {
-        key: 'repo-1',
-        result: {
-          platform: 'darwin',
-          scannedAt: 1,
-          ports: [
-            {
-              id: '127.0.0.1:5173:1234',
-              bindHost: '127.0.0.1',
-              connectHost: '127.0.0.1',
-              port: 5173,
-              pid: 1234,
-              processName: 'node',
-              protocol: 'http',
-              kind: 'workspace',
-              owner: {
-                worktreeId: 'repo-1::/repo/worktrees/full',
-                repoId: 'repo-1',
-                displayName: 'Full',
-                path: '/repo/worktrees/full',
-                confidence: 'cwd'
-              }
-            }
-          ]
-        }
-      },
-      worktreesByRepo: {},
-      worktreeCardProperties: ALL_CARD_PROPERTIES
-    })
-}))
-
-// Why passthrough: popover and tooltip content then renders inline, so a hover that should not
-// exist on a read-only card puts its buttons in the DOM where the sweep sees them.
-vi.mock('@/components/ui/hover-card', () => ({
-  HoverCard: ({ children }: { children: ReactNode }) => <>{children}</>,
-  HoverCardContent: ({ children }: { children: ReactNode }) => <>{children}</>,
-  HoverCardTrigger: ({ children }: { children: ReactNode }) => <>{children}</>
-}))
-
-vi.mock('@/components/ui/tooltip', () => ({
-  Tooltip: ({ children }: { children: ReactNode }) => <>{children}</>,
-  TooltipContent: ({ children }: { children: ReactNode }) => <>{children}</>,
-  TooltipTrigger: ({ children }: { children: ReactNode }) => <>{children}</>
-}))
-
-vi.mock('@/lib/sidebar-worktree-activation', () => ({ activateWorktreeFromSidebar }))
-
-vi.mock('@/runtime/runtime-rpc-client', () => ({
-  getActiveRuntimeTarget: () => ({ kind: 'local' })
-}))
-
-vi.mock('./use-worktree-activity-status', () => ({
-  useWorktreeActivityStatus: () => activityStatus
-}))
-
-vi.mock('./use-worktree-sleep-state', () => ({
-  useIsSleepingWorktree: () => sleeping
-}))
-
-vi.mock('./CacheTimer', () => ({
-  default: () => <span data-testid="cache-timer" />,
-  usePromptCacheCountdownStartedAt: (_worktreeId: string, active = true) => (active ? 1 : null)
-}))
-
-vi.mock('./useWorktreeAgentRows', () => ({
-  useWorktreeAgentRows: () => []
-}))
-
-vi.mock('./WorktreeCardAgents', () => ({
-  default: () => <button type="button" data-testid="inline-agents" />
-}))
-
-vi.mock('./WorktreeContextMenu', () => ({
-  default: ({ children }: { children: ReactNode }) => (
-    <div data-testid="context-menu-wrapper">{children}</div>
-  ),
-  WORKTREE_CONTEXT_MENU_SCOPE_ATTR: 'data-orca-context-menu-scope',
-  WORKTREE_NATIVE_CONTEXT_MENU_ATTR: 'data-worktree-native-context-menu'
-}))
-
-import WorktreeCard from './WorktreeCard'
-
-const INTERACTIVE =
-  'button, a, input, textarea, select, [tabindex], [role="button"], [draggable="true"]'
-
-const CARD_STYLES: { name: string; settings: Partial<GlobalSettings> }[] = [
-  { name: 'legacy', settings: { promptCacheTimerEnabled: true } },
-  { name: 'compact', settings: { compactWorktreeCards: true, promptCacheTimerEnabled: true } },
-  {
-    name: 'new',
-    settings: { experimentalNewWorktreeCardStyle: true, promptCacheTimerEnabled: true }
-  }
-]
-
-const repo: Repo = {
-  id: 'repo-1',
-  path: '/repo',
-  displayName: 'orca',
-  badgeColor: '#999999',
-  addedAt: 1,
-  connectionId: 'ssh-target-1'
-}
-
-const worktree: Worktree = {
-  id: 'repo-1::/repo/worktrees/full',
-  repoId: 'repo-1',
-  path: '/repo/worktrees/full',
-  displayName: 'Full',
-  branch: 'refs/heads/full',
-  head: 'abc123',
-  isBare: false,
-  isMainWorktree: false,
-  comment: 'a comment',
-  linkedIssue: 7,
-  linkedPR: 42,
-  linkedLinearIssue: 'ENG-1',
-  linkedGitLabMR: null,
-  linkedGitLabIssue: null,
-  firstAgentMessageRenameError: 'agent CLI said no',
-  isArchived: false,
-  isUnread: true,
-  isPinned: false,
-  sortOrder: 0,
-  lastActivityAt: 1
-}
-
-describe('WorktreeCard read-only contract', () => {
-  let container: HTMLDivElement
-  let root: Root
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    activityStatus = 'working'
-    sleeping = true
-    sshStatus = 'disconnected'
-    deleteStateByWorktreeId = {}
-    container = document.createElement('div')
-    document.body.appendChild(container)
-    root = createRoot(container)
-  })
-
-  afterEach(() => {
-    act(() => root.unmount())
-    container.remove()
-  })
-
-  /** Every feature on and every handler passed, so only the card itself can keep it inert. */
-  function render(readOnly: boolean, overrides: Partial<Worktree> = {}): HTMLElement {
-    act(() => {
-      root.render(
-        <WorktreeCard
-          worktree={{ ...worktree, ...overrides }}
-          repo={repo}
-          isActive
-          isActiveSurface
-          isMultiSelected
-          selectedWorktrees={[worktree]}
-          revealHighlight
-          isLineageDropTarget
-          activationRowKey="row"
-          renameRowKey="row"
-          hostContextLabel="Remote target"
-          flushSurface
-          nativeDragEnabled
-          lineageChildCount={2}
-          lineageCollapsed
-          lineageChildren={<span>children</span>}
-          readOnly={readOnly}
-          agentRows={
-            <div data-testid="caller-rows">
-              <button type="button" onClick={onChatClick}>
-                chat
-              </button>
-            </div>
-          }
-          {...callbacks}
-        />
-      )
-    })
-    const surface = container.querySelector<HTMLElement>('[data-worktree-card-surface="true"]')
-    if (!surface) {
-      throw new Error('card did not render')
-    }
-    return surface
-  }
-
-  it.each([
-    ['branch', null, null],
-    ['GitHub review', 42, null],
-    ['GitLab review', null, 43]
-  ] as const)('%s: read-only uses the quiet sidebar glyph', (_, linkedPR, linkedGitLabMR) => {
-    settings = { experimentalNewWorktreeCardStyle: true }
-    const overrides = { linkedPR, linkedGitLabMR, isUnread: false }
-    render(true, overrides)
-    const readOnlyGlyph = container.querySelector('[data-worktree-card-status-slot] svg')?.outerHTML
-    expect(readOnlyGlyph).toBeDefined()
-    expect(liveState()).toEqual([])
-
-    activityStatus = 'inactive'
-    sleeping = false
-    render(false, overrides)
-    expect(container.querySelector('[data-worktree-card-status-slot] svg')?.outerHTML).toBe(
-      readOnlyGlyph
-    )
-  })
-
-  function controlsOutsideCallerRows(): string[] {
-    return [...container.querySelectorAll(INTERACTIVE)]
-      .filter((element) => !element.closest('[data-testid="caller-rows"]'))
-      .map((element) => element.getAttribute('aria-label') ?? element.outerHTML.slice(0, 80))
-  }
-
-  // Why: the fixture is working, asleep and unread, so a lane drawn from live state shows it.
-  function liveState(): string[] {
-    const lane = container.querySelector('[data-worktree-card-status-slot]')
-    const title = container.querySelector('[data-worktree-title-inline-rename]')
-    return [
-      /Working|Failed|Done/.test(lane?.textContent ?? '') && 'live status',
-      lane?.querySelector(
-        '[data-agent-working-spinner], .animate-spin, .bg-red-500, .bg-emerald-500'
-      ) && 'live glyph',
-      lane?.querySelector('.lucide-moon') && 'sleep glyph',
-      lane?.querySelector('.lucide-bell, .text-amber-500, [data-worktree-unread-alert]') &&
-        'unread glyph',
-      title?.className.includes('font-semibold') && 'unread title',
-      container.querySelector('[data-worktree-sleeping-dim]') && 'sleep dim',
-      container.querySelector('[data-testid="cache-timer"]') && 'cache countdown',
-      container.textContent?.includes('Queued for deletion') && 'delete overlay'
-    ].filter((entry): entry is string => typeof entry === 'string')
-  }
-
-  for (const style of CARD_STYLES) {
-    it.each([
-      'connected',
-      'disconnected',
-      'connecting',
-      'error',
-      'auth-failed',
-      'reconnection-failed'
-    ] as const)(
-      `${style.name} card: %s SSH identity matches the live sidebar without controls`,
-      (status) => {
-        settings = style.settings
-        sshStatus = status
-        activityStatus = 'inactive'
-        sleeping = false
-        const overrides = { isUnread: false, firstAgentMessageRenameError: null }
-        render(false, overrides)
-        const liveIdentity = container.querySelector('[data-ssh-target-label]')
-        expect(liveIdentity).not.toBeNull()
-        const liveClasses = [...(liveIdentity?.classList ?? [])]
-          .filter((name) => name !== 'cursor-pointer' && !INTERACTION_VARIANT.test(name))
-          .toSorted()
-        const liveGlyph = liveIdentity?.querySelector('svg')?.outerHTML
-        const liveSignature = worktreeCardTitleXSignature(
-          container.querySelector('[data-worktree-title-inline-rename]'),
-          container
-        )
-        render(true, overrides)
-        const identity = container.querySelector('[data-ssh-target-label]')
-        expect(
-          worktreeCardTitleXSignature(
-            container.querySelector('[data-worktree-title-inline-rename]'),
-            container
-          )
-        ).toEqual(liveSignature)
-        expect(identity?.tagName).toBe('SPAN')
-        expect(
-          [...(identity?.classList ?? [])].filter((name) => INTERACTION_VARIANT.test(name))
-        ).toEqual([])
-        expect(
-          [...(identity?.classList ?? [])].filter((name) => name !== 'cursor-default').toSorted()
-        ).toEqual(liveClasses)
-        expect(identity?.querySelector('svg')?.outerHTML).toBe(liveGlyph)
-        expect(identity?.textContent).toContain('Remote target')
-        expect(controlsOutsideCallerRows()).toEqual([])
-        expect(identity?.hasAttribute('aria-describedby')).toBe(false)
-      }
-    )
-
-    it(`${style.name} card: the same fixture is live without readOnly`, () => {
-      settings = style.settings
-      render(false)
-      expect(controlsOutsideCallerRows().length).toBeGreaterThan(0)
-      expect(liveState()).toContain('live status')
-      expect(liveState()).toContain('unread title')
-      deleteStateByWorktreeId = { [worktree.id]: { isDeleting: true, phase: 'queued' } }
-      render(false)
-      expect(liveState()).toContain('delete overlay')
-    })
-
-    it(`${style.name} card: read-only has no control outside the caller's rows and no live state`, () => {
-      settings = style.settings
-      for (const deleting of [false, true]) {
-        deleteStateByWorktreeId = deleting
-          ? { [worktree.id]: { isDeleting: true, phase: 'queued' } }
-          : {}
-        const surface = render(true)
-        act(() => {
-          surface.dispatchEvent(new MouseEvent('click', { bubbles: true }))
-          surface.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }))
-        })
-
-        expect(controlsOutsideCallerRows()).toEqual([])
-        expect(liveState()).toEqual([])
-        expect(container.querySelector('[data-worktree-card-status-slot]')).not.toBeNull()
-        expect(container.textContent).toContain('2 children')
-        expect(container.querySelector('.-rotate-90')).toBeNull()
-        expect(container.querySelector('[data-testid="context-menu-wrapper"]')).toBeNull()
-        expect(surface.getAttribute('data-worktree-card-active')).toBeNull()
-        expect(surface.getAttribute('data-worktree-card-selected')).toBeNull()
-        expect(surface.getAttribute('data-worktree-lineage-drop-target')).toBeNull()
-        expect(surface.className).not.toContain('reveal-highlight')
-        expect(activateWorktreeFromSidebar).not.toHaveBeenCalled()
-        for (const callback of Object.values(callbacks)) {
-          expect(callback).not.toHaveBeenCalled()
-        }
-        const chat = container.querySelector('[data-testid="caller-rows"] button')
-        act(() => chat?.dispatchEvent(new MouseEvent('click', { bubbles: true })))
-        expect(onChatClick).toHaveBeenCalledTimes(deleting ? 2 : 1)
-      }
-    })
-
-    it(`${style.name} card: activity changes never enter the quiet status lane`, () => {
-      settings = style.settings
-      for (const status of ['working', 'failed', 'done', 'inactive'] as const) {
-        activityStatus = status
-        render(true)
-        expect(liveState()).toEqual([])
-        expect(controlsOutsideCallerRows()).toEqual([])
-      }
-    })
-  }
-})
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.tsx b/src/renderer/src/components/sidebar/WorktreeCard.tsx
index 396692f7436d..38609994e8b4 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.tsx
@@ -1,11 +1,7 @@
 import React from 'react'
 
 import { WorktreeCardSurface } from './worktree-card-surface'
-import {
-  toReadOnlyCardProps,
-  type ResolvedWorktreeCardProps,
-  type WorktreeCardProps
-} from './worktree-card-model'
+import type { WorktreeCardProps } from './worktree-card-model'
 import { useWorktreeCardController } from './use-worktree-card-controller'
 
 export { shouldBeginWorktreeRename } from './worktree-card-model'
@@ -44,11 +40,9 @@ const WorktreeCard = React.memo(function WorktreeCard({
   onLineageToggle,
   isLineageDropTarget = false,
   affiliateListMode = false,
-  readOnly = false,
-  agentRows,
   statusPrDisplay = null
 }: WorktreeCardProps): React.JSX.Element {
-  const props: ResolvedWorktreeCardProps = {
+  const card = useWorktreeCardController({
     worktree,
     repo,
     isActive,
@@ -81,11 +75,8 @@ const WorktreeCard = React.memo(function WorktreeCard({
     onLineageToggle,
     isLineageDropTarget,
     affiliateListMode,
-    readOnly,
-    agentRows,
     statusPrDisplay
-  }
-  const card = useWorktreeCardController(readOnly ? toReadOnlyCardProps(props) : props)
+  })
 
   return <WorktreeCardSurface card={card} />
 })
diff --git a/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx b/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx
index 7ebffa11819c..1bbc711a49e4 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.test.tsx
@@ -82,52 +82,6 @@ describe('WorktreeCardSshHostControl', () => {
     cleanup()
   })
 
-  it.each(
-    (
-      [
-        'connected',
-        'disconnected',
-        'connecting',
-        'deploying-relay',
-        'reconnecting',
-        'error',
-        'auth-failed',
-        'reconnection-failed',
-        null
-      ] as const
-    ).flatMap((status) => [false, true].map((iconOnly) => ({ status, iconOnly })))
-  )(
-    'renders $status (iconOnly=$iconOnly) passively without a tooltip or reconnect action',
-    async ({ status, iconOnly }) => {
-      const connect = vi.fn()
-      const onPointerDown = vi.fn()
-      installSshApi(connect)
-      const { container } = renderControl({ status, iconOnly, interactive: false, onPointerDown })
-      const identity = container.querySelector('[data-ssh-target-label]')
-      expect(identity?.tagName).toBe('SPAN')
-      expect(
-        [...(identity?.classList ?? [])].filter((name) =>
-          /(?:^|:)(?:hover|focus|focus-visible|focus-within|active|disabled|aria-invalid):/.test(
-            name
-          )
-        )
-      ).toEqual([])
-      expect(identity?.textContent).toContain('devbox')
-      expect(
-        container.querySelector('button, [tabindex], [role="button"], [data-tooltip]')
-      ).toBeNull()
-      const user = userEvent.setup()
-      if (!(identity instanceof HTMLElement)) {
-        throw new Error('Missing passive SSH identity')
-      }
-      await user.click(identity)
-      await user.dblClick(identity)
-      expect(connect).not.toHaveBeenCalled()
-      expect(onPointerDown).not.toHaveBeenCalled()
-      expect(environmentSshMocks.connectRuntimeEnvironmentSshTarget).not.toHaveBeenCalled()
-    }
-  )
-
   it('offers a Connect control naming the host for a disconnected target', () => {
     renderControl()
 
diff --git a/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.tsx b/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.tsx
index fa5b130cde03..890baba32e76 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardSshHostControl.tsx
@@ -31,7 +31,6 @@ type WorktreeCardSshHostControlProps = {
   sshOwnerEnvironmentId: string | null
   /** True when the row cannot afford a visible label: icon-only with an sr-only label. */
   iconOnly: boolean
-  interactive?: boolean
   onPointerDown: React.PointerEventHandler<HTMLButtonElement>
 }
 
@@ -39,43 +38,30 @@ type WorktreeCardSshHostControlProps = {
 // (WorktreeCard.tsx). States differ only by color token, so the pill never changes height.
 const PILL_BASE =
   'h-4 shrink-0 gap-0.5 rounded !px-0.5 text-[10px] font-medium leading-none has-[>svg]:!px-0.5'
-// Mirror Button's resting layout without its interaction variants.
-const PILL_LAYOUT =
-  "inline-flex items-center justify-center whitespace-nowrap transition-all outline-none px-4 py-2 has-[>svg]:px-3 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
 const PILL_QUIET =
   'text-muted-foreground border border-worktree-sidebar-border bg-worktree-sidebar shadow-none hover:bg-worktree-sidebar-accent hover:text-foreground focus-visible:border-worktree-sidebar-border focus-visible:ring-1 focus-visible:ring-worktree-sidebar-ring'
 const PILL_FAILED =
   'text-destructive border border-destructive/40 bg-destructive/10 hover:bg-destructive/15 hover:text-destructive focus-visible:border-destructive/40 focus-visible:ring-1 focus-visible:ring-worktree-sidebar-ring'
 
-const PILL_QUIET_STATIC =
-  'text-muted-foreground border border-worktree-sidebar-border bg-worktree-sidebar shadow-none'
-const PILL_FAILED_STATIC = 'text-destructive border border-destructive/40 bg-destructive/10'
-
 function PassiveGlyph({
   icon,
   tooltip,
   accessibleName,
-  targetLabel,
-  interactive
+  targetLabel
 }: {
   icon: React.ReactNode
   tooltip: string
   accessibleName: string
   targetLabel: string
-  interactive: boolean
 }): React.JSX.Element {
-  const glyph = (
-    <span className="shrink-0 inline-flex items-center" data-ssh-target-label={targetLabel}>
-      {icon}
-      <span className="sr-only">{accessibleName}</span>
-    </span>
-  )
-  if (!interactive) {
-    return glyph
-  }
   return (
     <Tooltip>
-      <TooltipTrigger asChild>{glyph}</TooltipTrigger>
+      <TooltipTrigger asChild>
+        <span className="shrink-0 inline-flex items-center" data-ssh-target-label={targetLabel}>
+          {icon}
+          <span className="sr-only">{accessibleName}</span>
+        </span>
+      </TooltipTrigger>
       <TooltipContent side="right" sideOffset={8}>
         {tooltip}
       </TooltipContent>
@@ -90,7 +76,6 @@ export function WorktreeCardSshHostControl({
   targetRemoved,
   sshOwnerEnvironmentId,
   iconOnly,
-  interactive = true,
   onPointerDown
 }: WorktreeCardSshHostControlProps): React.JSX.Element | null {
   const setSshConnectionState = useAppStore((store) => store.setSshConnectionState)
@@ -155,7 +140,6 @@ export function WorktreeCardSshHostControl({
   if (status === null || status === 'connected') {
     return (
       <PassiveGlyph
-        interactive={interactive}
         targetLabel={targetLabel}
         icon={<Server className="size-3 text-muted-foreground" />}
         tooltip={translate(
@@ -177,7 +161,6 @@ export function WorktreeCardSshHostControl({
   if (targetRemoved) {
     return (
       <PassiveGlyph
-        interactive={interactive}
         targetLabel={targetLabel}
         icon={<ServerOff className="size-3 text-muted-foreground" />}
         tooltip={translate(
@@ -242,33 +225,6 @@ export function WorktreeCardSshHostControl({
           )
         : accessibleName
 
-  const content = (
-    <>
-      {connecting ? (
-        <Loader2 className="size-2.5 animate-spin motion-reduce:animate-none" />
-      ) : (
-        iconOnly && <ServerOff className="size-2.5" />
-      )}
-      {!iconOnly && <span className="text-left">{label}</span>}
-    </>
-  )
-  if (!interactive) {
-    return (
-      <span
-        className={cn(
-          PILL_LAYOUT,
-          PILL_BASE,
-          failed ? PILL_FAILED_STATIC : PILL_QUIET_STATIC,
-          iconOnly && 'w-4 justify-center !px-0 has-[>svg]:!px-0',
-          'cursor-default'
-        )}
-        data-ssh-target-label={targetLabel}
-      >
-        {content}
-        <span className="sr-only">{accessibleName}</span>
-      </span>
-    )
-  }
   return (
     <Tooltip>
       <TooltipTrigger asChild>
@@ -309,7 +265,14 @@ export function WorktreeCardSshHostControl({
             void handleConnect()
           }}
         >
-          {content}
+          {connecting ? (
+            <Loader2 className="size-2.5 animate-spin motion-reduce:animate-none" />
+          ) : (
+            iconOnly && <ServerOff className="size-2.5" />
+          )}
+          {/* Why: aria-label already names the control, so a second sr-only copy would be
+              dead markup; the label span exists only for sighted users. */}
+          {!iconOnly && <span className="text-left">{label}</span>}
         </Button>
       </TooltipTrigger>
       <TooltipContent side="right" sideOffset={8}>
diff --git a/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx b/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx
index 0523d3d6e3b1..aaceddad4641 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx
@@ -95,16 +95,6 @@ function getReviewStatusLabel(review: WorktreeCardPrDisplay): string {
 
 export function WorktreeCardStatusSlot({
   worktreeId,
-  ...props
-}: WorktreeCardStatusSlotProps): React.JSX.Element | null {
-  const status = useWorktreeActivityStatus(worktreeId)
-  const isSleeping = useIsSleepingWorktree(worktreeId)
-  return <WorktreeCardStatusSlotView status={status} isSleeping={isSleeping} {...props} />
-}
-
-export function WorktreeCardStatusSlotView({
-  status,
-  isSleeping,
   showStatus,
   showUnreadAction,
   isUnread,
@@ -116,10 +106,9 @@ export function WorktreeCardStatusSlotView({
   hasBranchIdentity = false,
   branchIdentityLabel,
   className
-}: Omit<WorktreeCardStatusSlotProps, 'worktreeId'> & {
-  status: WorktreeStatus
-  isSleeping: boolean
-}): React.JSX.Element | null {
+}: WorktreeCardStatusSlotProps): React.JSX.Element | null {
+  const status = useWorktreeActivityStatus(worktreeId)
+  const isSleeping = useIsSleepingWorktree(worktreeId)
   const statusLabel = getWorktreeStatusLabel(status) || status
   // Why: sleep must stay distinct from awake completion; a sleeping workspace
   // never collapses into branch/PR, even when retained done rows keep its
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
index 854d14c43530..8a608f371252 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
@@ -1,8 +1,6 @@
-import { useMemo } from 'react'
-
 import { canShowWorkspaceDeleteQuickAction } from './workspace-delete-quick-action'
 import { useWorktreeCardDetailsHoverControl } from './worktree-card-details-hover-state'
-import { getReadOnlyCardProperties, type ResolvedWorktreeCardProps } from './worktree-card-model'
+import type { ResolvedWorktreeCardProps } from './worktree-card-model'
 import { useWorktreeCardActivationActions } from './use-worktree-card-activation-actions'
 import { useWorktreeCardFoundation } from './use-worktree-card-foundation'
 import { useWorktreeCardLifecycleEffects } from './use-worktree-card-lifecycle-effects'
@@ -10,33 +8,22 @@ import { useWorktreeCardLinkedDetails } from './use-worktree-card-linked-details
 import { useWorktreeCardReviewDetails } from './use-worktree-card-review-details'
 import { useWorktreeCardSecondaryDetails } from './use-worktree-card-secondary-details'
 import { useWorktreeCardWorkspaceActions } from './use-worktree-card-workspace-actions'
-import { useIsSleepingWorktree } from './use-worktree-sleep-state'
-import { hasInlineWorktreeAgentRows } from './worktree-card-spacing'
 
 export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
-  const { worktree, repo, readOnly } = props
+  const { worktree, repo } = props
   const foundation = useWorktreeCardFoundation({ worktree, repo })
-  // Why: resolve read-only policy here so views share one quiet, passive presentation.
-  const interactive = !readOnly
-  const quietStatusLane = readOnly
-  const cardProps = useMemo(
-    () => (readOnly ? getReadOnlyCardProperties(foundation.cardProps) : foundation.cardProps),
-    [readOnly, foundation.cardProps]
-  )
-  const isSleeping = useIsSleepingWorktree(worktree.id) && !readOnly
-  const deleteState = readOnly ? undefined : foundation.deleteState
   const review = useWorktreeCardReviewDetails({
     worktree,
     repo,
     settings: foundation.settings,
     projectGroups: foundation.projectGroups,
-    cardProps,
+    cardProps: foundation.cardProps,
     newCardStyle: foundation.newCardStyle
   })
   const linked = useWorktreeCardLinkedDetails({
     worktree,
     newCardStyle: foundation.newCardStyle,
-    deleteState,
+    deleteState: foundation.deleteState,
     branch: review.branch,
     issueEntry: review.issueEntry,
     linearIssueEntry: review.linearIssueEntry,
@@ -44,15 +31,15 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     prDisplay: review.prDisplay
   })
 
-  const showStatus = cardProps.includes('status')
-  const showIssue = cardProps.includes('issue')
-  const showLinearIssue = cardProps.includes('linear-issue')
-  const showJiraIssue = cardProps.includes('jira-issue')
-  const showPR = cardProps.includes('pr')
-  const showAutomation = cardProps.includes('automation')
-  const showCli = cardProps.includes('cli')
-  const showComment = cardProps.includes('comment')
-  const showPorts = cardProps.includes('ports')
+  const showStatus = foundation.cardProps.includes('status')
+  const showIssue = foundation.cardProps.includes('issue')
+  const showLinearIssue = foundation.cardProps.includes('linear-issue')
+  const showJiraIssue = foundation.cardProps.includes('jira-issue')
+  const showPR = foundation.cardProps.includes('pr')
+  const showAutomation = foundation.cardProps.includes('automation')
+  const showCli = foundation.cardProps.includes('cli')
+  const showComment = foundation.cardProps.includes('comment')
+  const showPorts = foundation.cardProps.includes('ports')
   const shouldRefreshHostedReview = foundation.newCardStyle ? showStatus : showPR
   const detailsHoverControl = useWorktreeCardDetailsHoverControl()
   const hoverDetailsOpen = detailsHoverControl.hoverOpen
@@ -125,7 +112,6 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     worktree,
     repo,
     statusPrDisplay: props.statusPrDisplay,
-    showLiveState: !readOnly,
     showStatus,
     showIssue,
     showLinearIssue,
@@ -144,7 +130,7 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     linkedBitbucketPR: review.linkedBitbucketPR,
     linkedAzureDevOpsPR: review.linkedAzureDevOpsPR,
     linkedGiteaPR: review.linkedGiteaPR,
-    cardProps,
+    cardProps: foundation.cardProps,
     newCardStyle: foundation.newCardStyle,
     compactCards: foundation.compactCards,
     agentActivityDisplayMode: foundation.agentActivityDisplayMode,
@@ -157,18 +143,6 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
   return {
     ...props,
     ...foundation,
-    cardProps,
-    deleteState,
-    interactive,
-    quietStatusLane,
-    // Caller-owned recovery rows keep the sidebar header's padding even when compact cards hide live agents.
-    callerRowsAffectSurfacePadding: !readOnly,
-    inlineAgentRowsAffectSurfacePadding: hasInlineWorktreeAgentRows({
-      cardProperties: foundation.cardProps,
-      newCardStyle: foundation.newCardStyle,
-      compactCards: foundation.compactCards
-    }),
-    isSleeping,
     ...review,
     ...linked,
     detailsHoverControl,
@@ -185,10 +159,6 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     ...activation,
     showDeleteQuickAction,
     ...workspaceActions,
-    // Why: a read-only card's children are always listed, so its chip names them without a toggle.
-    showLineageChildChip: readOnly
-      ? props.lineageChildCount > 0
-      : workspaceActions.showLineageChildChip,
     ...secondary
   }
 }
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx
index f50bf8277c2b..7bb7bc05e0e5 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx
+++ b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.store-subscriptions.test.tsx
@@ -75,7 +75,6 @@ function secondaryDetailsArgs(settings: GlobalSettings) {
     worktree: makeWorktree(),
     repo: undefined,
     statusPrDisplay: null,
-    showLiveState: true,
     showStatus: false,
     showIssue: false,
     showLinearIssue: false,
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
index a3fcbd88ba23..5718ad0f2d66 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
@@ -11,7 +11,6 @@ import type { WorktreeCardProps } from './worktree-card-model'
 import type { useWorktreeCardFoundation } from './use-worktree-card-foundation'
 import type { useWorktreeCardLinkedDetails } from './use-worktree-card-linked-details'
 import type { useWorktreeCardReviewDetails } from './use-worktree-card-review-details'
-import { hasInlineWorktreeAgentRows } from './worktree-card-spacing'
 
 type Foundation = ReturnType<typeof useWorktreeCardFoundation>
 type LinkedDetails = ReturnType<typeof useWorktreeCardLinkedDetails>
@@ -21,7 +20,6 @@ export function useWorktreeCardSecondaryDetails({
   worktree,
   repo,
   statusPrDisplay,
-  showLiveState,
   showStatus,
   showIssue,
   showLinearIssue,
@@ -65,7 +63,6 @@ export function useWorktreeCardSecondaryDetails({
     ReviewDetails,
     'prDisplay' | 'linkedGitLabMR' | 'linkedBitbucketPR' | 'linkedAzureDevOpsPR' | 'linkedGiteaPR'
   > & {
-    showLiveState: boolean
     showStatus: boolean
     showIssue: boolean
     showLinearIssue: boolean
@@ -77,7 +74,7 @@ export function useWorktreeCardSecondaryDetails({
     showPorts: boolean
   }) {
   // Why: unread lives in the left status lane, so the Status toggle owns both the dot/PR slot and unread emphasis.
-  const showUnreadEmphasis = showLiveState && showStatus && worktree.isUnread
+  const showUnreadEmphasis = showStatus && worktree.isUnread
   const hoverIssue = issueDisplay
   const hoverLinearIssue = linearIssueDisplay
   const hoverJiraIssue = jiraIssueDisplay
@@ -91,11 +88,7 @@ export function useWorktreeCardSecondaryDetails({
   const metaAutomationProvenance = showAutomation ? worktree.automationProvenance : null
   const metaCliProvenance = showCli ? worktree.cliProvenance : null
   const metaComment = showComment ? hoverComment : null
-  const showInlineAgentList = hasInlineWorktreeAgentRows({
-    cardProperties: cardProps,
-    newCardStyle,
-    compactCards
-  })
+  const showInlineAgentList = cardProps.includes('inline-agents') && (newCardStyle || !compactCards)
   const compactInlineAgentRows = useWorktreeAgentRows(
     worktree.id,
     showInlineAgentList && agentActivityDisplayMode === 'compact'
@@ -104,7 +97,7 @@ export function useWorktreeCardSecondaryDetails({
     showInlineAgentList &&
     agentActivityDisplayMode === 'compact' &&
     compactInlineAgentRows.length > 0
-  const showAggregateCacheTimer = showLiveState && !compactCards && !compactInlineAgentRowsVisible
+  const showAggregateCacheTimer = !compactCards && !compactInlineAgentRowsVisible
   const handleOpenGitHubIssueInOrca = useCallback(
     (e: React.MouseEvent) => {
       e.stopPropagation()
@@ -244,12 +237,7 @@ export function useWorktreeCardSecondaryDetails({
     cliProvenance: metaCliProvenance
   })
   const hasPorts = showPorts && workspacePorts.length > 0
-  // Hidden live metadata still determines the sidebar's header padding.
-  const cacheStartedAtForSurfacePadding = usePromptCacheCountdownStartedAt(
-    worktree.id,
-    !compactCards && !compactInlineAgentRowsVisible
-  )
-  const cacheStartedAt = showAggregateCacheTimer ? cacheStartedAtForSurfacePadding : null
+  const cacheStartedAt = usePromptCacheCountdownStartedAt(worktree.id, showAggregateCacheTimer)
   // Why: derived from the settings the card already subscribes to — a third store
   // subscription for this one field costs a listener per card on every store write.
   const cacheTtlMs = showAggregateCacheTimer ? (settings?.promptCacheTtlMs ?? 0) : 0
@@ -281,7 +269,6 @@ export function useWorktreeCardSecondaryDetails({
     handleOpenLinearIssueInOrca,
     hasDetails,
     hasPorts,
-    cacheTimerAffectsSurfacePadding: cacheStartedAtForSurfacePadding != null,
     cacheStartedAt,
     cacheTtlMs
   }
diff --git a/src/renderer/src/components/sidebar/worktree-card-header.tsx b/src/renderer/src/components/sidebar/worktree-card-header.tsx
index 58698b9d0a40..8fb715b01ca5 100644
--- a/src/renderer/src/components/sidebar/worktree-card-header.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-header.tsx
@@ -55,7 +55,6 @@ export function WorktreeCardHeader({
     worktree,
     repo,
     affiliateListMode,
-    interactive,
     renameRowKey,
     compactCards,
     newCardStyle,
@@ -112,7 +111,6 @@ export function WorktreeCardHeader({
             targetRemoved={sshTargetRemoved}
             sshOwnerEnvironmentId={sshOwnerEnvironmentId}
             iconOnly={compactCards || newCardStyle}
-            interactive={interactive}
             onPointerDown={stopQuickActionPointerPropagation}
           />
         )}
@@ -188,8 +186,7 @@ export function WorktreeCardHeader({
 
         {typeof worktree.firstAgentMessageRenameError === 'string' &&
         worktree.firstAgentMessageRenameError.length > 0 &&
-        !titleRenaming &&
-        interactive ? (
+        !titleRenaming ? (
           // Why: the error can be raw agent CLI output, so the badge opens a dialog rather than a tooltip.
           <Tooltip>
             <TooltipTrigger asChild>
diff --git a/src/renderer/src/components/sidebar/worktree-card-model.ts b/src/renderer/src/components/sidebar/worktree-card-model.ts
index 29cc75cb0160..16219c5727dc 100644
--- a/src/renderer/src/components/sidebar/worktree-card-model.ts
+++ b/src/renderer/src/components/sidebar/worktree-card-model.ts
@@ -1,7 +1,6 @@
 import type React from 'react'
 
 import type { Repo } from '../../../../shared/repo-types'
-import type { WorktreeCardProperty } from '../../../../shared/ui-chrome-types'
 import type { WorkspaceStatus, Worktree } from '../../../../shared/worktree/types'
 import type { WorktreeCardPrDisplay } from './worktree-card-pr-display'
 
@@ -53,9 +52,6 @@ export type WorktreeCardProps = {
   onCardDragEnd?: (event: React.DragEvent<HTMLDivElement>) => void
   nativeDragEnabled?: boolean
   affiliateListMode?: boolean
-  /** Passive sidebar layout without live state; caller-owned `agentRows` remain interactive. */
-  readOnly?: boolean
-  agentRows?: React.ReactNode
   statusPrDisplay?: WorktreeCardPrDisplay | null
 }
 
@@ -73,7 +69,6 @@ type DefaultedWorktreeCardProp =
   | 'lineageCollapsed'
   | 'isLineageDropTarget'
   | 'affiliateListMode'
-  | 'readOnly'
   | 'statusPrDisplay'
 
 export type ResolvedWorktreeCardProps = Omit<WorktreeCardProps, DefaultedWorktreeCardProp> & {
@@ -90,48 +85,9 @@ export type ResolvedWorktreeCardProps = Omit<WorktreeCardProps, DefaultedWorktre
   lineageCollapsed: boolean
   isLineageDropTarget: boolean
   affiliateListMode: boolean
-  readOnly: boolean
   statusPrDisplay: WorktreeCardPrDisplay | null
 }
 
-// Why: allowlist presentation props so caller-supplied handlers cannot make a read-only card act.
-export function toReadOnlyCardProps(props: ResolvedWorktreeCardProps): ResolvedWorktreeCardProps {
-  return {
-    worktree: props.worktree,
-    repo: props.repo,
-    hideRepoBadge: props.hideRepoBadge,
-    hostContextLabel: props.hostContextLabel,
-    inPinnedSection: props.inPinnedSection,
-    contentIndent: props.contentIndent,
-    flushSurface: props.flushSurface,
-    lineageChildren: props.lineageChildren,
-    lineageChildrenStyle: props.lineageChildrenStyle,
-    agentRows: props.agentRows,
-    isActive: false,
-    isActiveSurface: false,
-    activeSurfaceVariant: 'primary',
-    isMultiSelected: false,
-    revealHighlight: false,
-    revealHighlightTone: 'default',
-    nativeDragEnabled: false,
-    lineageChildCount: props.lineageChildCount,
-    lineageCollapsed: false,
-    isLineageDropTarget: false,
-    affiliateListMode: true,
-    readOnly: true,
-    statusPrDisplay: null
-  }
-}
-
-// Why: recovery cards replace live ports and agents while keeping the sidebar's quiet status lane.
-const READ_ONLY_HIDDEN_CARD_PROPERTIES = new Set<WorktreeCardProperty>(['ports', 'inline-agents'])
-
-export function getReadOnlyCardProperties(
-  cardProps: readonly WorktreeCardProperty[]
-): WorktreeCardProperty[] {
-  return cardProps.filter((property) => !READ_ONLY_HIDDEN_CARD_PROPERTIES.has(property))
-}
-
 export const EMPTY_WORKSPACE_PORTS = []
 export const HOSTED_REVIEW_CARD_REFRESH_INTERVAL_MS = 60_000
 
diff --git a/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx b/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx
index df77fe3c6050..e5aea802b84d 100644
--- a/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx
@@ -7,7 +7,7 @@ import { WorktreeCardDetailsHover } from './WorktreeCardMeta'
 import { WorktreeCardPortsDetails } from './WorktreeCardPorts'
 import type { WorktreeCardPresentation } from './worktree-card-presentation'
 import { WorktreeCardSecondaryRows } from './worktree-card-secondary-rows'
-import { WorktreeCardStatusSlot, WorktreeCardStatusSlotView } from './WorktreeCardStatusSlot'
+import { WorktreeCardStatusSlot } from './WorktreeCardStatusSlot'
 import type { WorktreeCardController } from './use-worktree-card-controller'
 
 export function WorktreeCardParentContent({
@@ -20,7 +20,6 @@ export function WorktreeCardParentContent({
   const {
     worktree,
     affiliateListMode,
-    quietStatusLane,
     newCardStyle,
     lineageChildren,
     showStatus,
@@ -135,41 +134,22 @@ export function WorktreeCardParentContent({
           className={cn(
             'flex shrink-0 justify-center',
             newCardStyle ? 'mr-1 w-5 items-center' : 'items-start pt-[2px]',
-            // Why: a quiet lane stands in for the sidebar's own, so it keeps the sidebar's width.
-            affiliateListMode && !quietStatusLane && 'px-1'
+            affiliateListMode && 'px-1'
           )}
           data-worktree-card-status-slot=""
         >
-          {quietStatusLane ? (
-            // Why: a quiet legacy lane keeps the 16px footprint of the sidebar's unread button.
-            <WorktreeCardStatusSlotView
-              status="inactive"
-              isSleeping={false}
-              showStatus={showStatus}
-              showUnreadAction={false}
-              isUnread={false}
-              unreadTooltip={unreadTooltip}
-              onPointerDown={stopQuickActionPointerPropagation}
-              onToggleUnread={handleToggleUnreadQuick}
-              prDisplay={statusLaneReview}
-              newCardStyle={newCardStyle}
-              hasBranchIdentity={Boolean(branchIdentityDisplay)}
-              className={newCardStyle ? undefined : 'size-4'}
-            />
-          ) : (
-            <WorktreeCardStatusSlot
-              worktreeId={worktree.id}
-              showStatus={showStatus}
-              showUnreadAction={showUnreadQuickAction}
-              isUnread={worktree.isUnread}
-              unreadTooltip={unreadTooltip}
-              onPointerDown={stopQuickActionPointerPropagation}
-              onToggleUnread={handleToggleUnreadQuick}
-              prDisplay={statusLaneReview}
-              newCardStyle={newCardStyle}
-              hasBranchIdentity={Boolean(branchIdentityDisplay)}
-            />
-          )}
+          <WorktreeCardStatusSlot
+            worktreeId={worktree.id}
+            showStatus={showStatus}
+            showUnreadAction={showUnreadQuickAction}
+            isUnread={worktree.isUnread}
+            unreadTooltip={unreadTooltip}
+            onPointerDown={stopQuickActionPointerPropagation}
+            onToggleUnread={handleToggleUnreadQuick}
+            prDisplay={statusLaneReview}
+            newCardStyle={newCardStyle}
+            hasBranchIdentity={Boolean(branchIdentityDisplay)}
+          />
         </div>
       ) : null}
 
diff --git a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
index 12fcb6829b09..25376e330544 100644
--- a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
@@ -10,7 +10,6 @@ import {
   WorktreeCardMetaBadges
 } from './WorktreeCardMeta'
 import { WorktreeCardPortsDetails, WorktreeCardPortsTrigger } from './WorktreeCardPorts'
-import { getWorktreeCardSurfacePadding } from './worktree-card-spacing'
 import type { WorktreeCardController } from './use-worktree-card-controller'
 
 export function buildWorktreeCardPresentation(card: WorktreeCardController) {
@@ -21,8 +20,6 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     hideRepoBadge,
     hostContextLabel,
     affiliateListMode,
-    interactive,
-    agentRows,
     flushSurface,
     contentIndent,
     newCardStyle,
@@ -130,9 +127,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
       ? trimmedVisibleCardTitle
       : undefined
   const hasHoverIdentity = Boolean(hoverWorkspaceTitle || hoverBranchName)
-  // Why: the details popover carries edit and open actions, so only an interactive card opens it.
   const hasHoverDetails =
-    interactive &&
     newCardStyle &&
     (hasWorktreeCardDetails({
       issue: hoverIssue,
@@ -150,7 +145,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     ? hasHoverDetails
       ? (title: React.ReactElement): React.ReactElement => title
       : undefined
-    : interactive && compactCards && (showBranchIdentityHover || hasDetails || hasPorts)
+    : compactCards && (showBranchIdentityHover || hasDetails || hasPorts)
       ? (title: React.ReactElement): React.ReactElement => (
           <WorktreeCardDetailsHover
             issue={metaIssue}
@@ -226,7 +221,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
       </div>
     ) : null
   const detailsAndPorts =
-    detailsAndPortsContent && !newCardStyle && interactive ? (
+    detailsAndPortsContent && !newCardStyle ? (
       <WorktreeCardDetailsHover
         issue={metaIssue}
         linearIssue={metaLinearIssue}
@@ -263,20 +258,8 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     <div className="ml-auto flex shrink-0 items-center gap-1 pr-1.5">{detailsAndPorts}</div>
   ) : null
   const hasSecondaryCardContent =
-    hasMetaRow ||
-    !!remoteBranchConflict ||
-    showInlineAgentList ||
-    showLineageChildChip ||
-    agentRows != null
+    hasMetaRow || !!remoteBranchConflict || showInlineAgentList || showLineageChildChip
   const titleOnlyCard = !hasSecondaryCardContent
-  const surfacePaddingClassName = getWorktreeCardSurfacePadding(
-    hasMetaRow ||
-      card.cacheTimerAffectsSurfacePadding ||
-      !!remoteBranchConflict ||
-      card.inlineAgentRowsAffectSurfacePadding ||
-      showLineageChildChip ||
-      (card.callerRowsAffectSurfacePadding && agentRows != null)
-  )
 
   return {
     showPinnedRepoIcon,
@@ -303,8 +286,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     cardStyle,
     detailsAndPorts,
     titleRowIndicators,
-    titleOnlyCard,
-    surfacePaddingClassName
+    titleOnlyCard
   }
 }
 
diff --git a/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx b/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
index 8955dc4ea699..d661726c67fb 100644
--- a/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
@@ -10,9 +10,6 @@ import WorktreeCardAgents from './WorktreeCardAgents'
 import type { WorktreeCardPresentation } from './worktree-card-presentation'
 import type { WorktreeCardController } from './use-worktree-card-controller'
 
-const LINEAGE_CHIP_LOOK =
-  'relative z-10 h-[18px] max-w-[8rem] gap-1 rounded-md border border-worktree-sidebar-border bg-worktree-sidebar px-1.5 text-[10px] font-medium leading-none text-muted-foreground shadow-none'
-
 export function WorktreeCardSecondaryRows({
   card,
   presentation
@@ -25,7 +22,6 @@ export function WorktreeCardSecondaryRows({
     repo,
     settings,
     isActive,
-    agentRows,
     newCardStyle,
     lineageChildren,
     lineageCollapsed,
@@ -37,19 +33,9 @@ export function WorktreeCardSecondaryRows({
     showLineageChildChip,
     lineageChildAriaLabel,
     childWorkspaceShortLabel,
-    isDeleting,
-    interactive
+    isDeleting
   } = card
   const { hasMetaRow } = presentation
-  const lineageChipContent = (
-    <>
-      <Workflow className="size-2.5" />
-      <span className="truncate">{childWorkspaceShortLabel}</span>
-      <ChevronDown
-        className={cn('size-2.5 transition-transform', lineageCollapsed && '-rotate-90')}
-      />
-    </>
-  )
 
   return (
     <>
@@ -100,16 +86,12 @@ export function WorktreeCardSecondaryRows({
       ) : null}
 
       {/* Why: counterbalance the card stack gap (-mt-1) so agents right after the title read as one header group. */}
-      {agentRows != null ? (
-        <div className={hasMetaRow || remoteBranchConflict ? 'mt-0' : '-mt-1'}>{agentRows}</div>
-      ) : (
-        showInlineAgentList && (
-          <WorktreeCardAgents
-            worktreeId={worktree.id}
-            agents={agentActivityDisplayMode === 'compact' ? compactInlineAgentRows : undefined}
-            className={hasMetaRow || remoteBranchConflict ? 'mt-0' : '-mt-1'}
-          />
-        )
+      {showInlineAgentList && (
+        <WorktreeCardAgents
+          worktreeId={worktree.id}
+          agents={agentActivityDisplayMode === 'compact' ? compactInlineAgentRows : undefined}
+          className={hasMetaRow || remoteBranchConflict ? 'mt-0' : '-mt-1'}
+        />
       )}
 
       {showLineageChildChip && (
@@ -119,44 +101,36 @@ export function WorktreeCardSecondaryRows({
             color: 'color-mix(in srgb, var(--muted-foreground) 42%, var(--worktree-sidebar))'
           }}
         >
-          {interactive ? (
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="xs"
-                  className="relative z-10 h-[18px] max-w-[8rem] gap-1 rounded-md border border-worktree-sidebar-border bg-worktree-sidebar px-1.5 text-[10px] font-medium leading-none text-muted-foreground shadow-none hover:bg-worktree-sidebar-accent hover:text-foreground focus-visible:ring-1 focus-visible:ring-worktree-sidebar-ring"
-                  aria-label={lineageChildAriaLabel}
-                  aria-expanded={!lineageCollapsed}
-                  onClick={onLineageToggle}
-                >
-                  {lineageChipContent}
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent side="right" sideOffset={8}>
-                {lineageCollapsed
-                  ? translate(
-                      'auto.components.sidebar.WorktreeCard.8cb634cda6',
-                      'Show child workspaces'
-                    )
-                  : translate(
-                      'auto.components.sidebar.WorktreeCard.57eaa61b55',
-                      'Hide child workspaces'
-                    )}
-              </TooltipContent>
-            </Tooltip>
-          ) : (
-            // Why: a read-only card always lists its children, so the chip only names them.
-            <span
-              className={cn(
-                'inline-flex shrink-0 items-center justify-center whitespace-nowrap',
-                LINEAGE_CHIP_LOOK
-              )}
-            >
-              {lineageChipContent}
-            </span>
-          )}
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <Button
+                type="button"
+                variant="ghost"
+                size="xs"
+                className="relative z-10 h-[18px] max-w-[8rem] gap-1 rounded-md border border-worktree-sidebar-border bg-worktree-sidebar px-1.5 text-[10px] font-medium leading-none text-muted-foreground shadow-none hover:bg-worktree-sidebar-accent hover:text-foreground focus-visible:ring-1 focus-visible:ring-worktree-sidebar-ring"
+                aria-label={lineageChildAriaLabel}
+                aria-expanded={!lineageCollapsed}
+                onClick={onLineageToggle}
+              >
+                <Workflow className="size-2.5" />
+                <span className="truncate">{childWorkspaceShortLabel}</span>
+                <ChevronDown
+                  className={cn('size-2.5 transition-transform', lineageCollapsed && '-rotate-90')}
+                />
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent side="right" sideOffset={8}>
+              {lineageCollapsed
+                ? translate(
+                    'auto.components.sidebar.WorktreeCard.8cb634cda6',
+                    'Show child workspaces'
+                  )
+                : translate(
+                    'auto.components.sidebar.WorktreeCard.57eaa61b55',
+                    'Hide child workspaces'
+                  )}
+            </TooltipContent>
+          </Tooltip>
         </div>
       )}
 
diff --git a/src/renderer/src/components/sidebar/worktree-card-spacing.ts b/src/renderer/src/components/sidebar/worktree-card-spacing.ts
deleted file mode 100644
index 834a190d644b..000000000000
--- a/src/renderer/src/components/sidebar/worktree-card-spacing.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { WorktreeCardProperty } from '../../../../shared/ui-chrome-types'
-
-export function hasInlineWorktreeAgentRows(args: {
-  cardProperties: readonly WorktreeCardProperty[]
-  newCardStyle: boolean
-  compactCards: boolean
-}): boolean {
-  return args.cardProperties.includes('inline-agents') && (args.newCardStyle || !args.compactCards)
-}
-
-export function getWorktreeCardSurfacePadding(hasSecondaryContent: boolean): string {
-  return hasSecondaryContent ? 'pt-1.25 pb-1.5' : 'py-2'
-}
diff --git a/src/renderer/src/components/sidebar/worktree-card-surface.tsx b/src/renderer/src/components/sidebar/worktree-card-surface.tsx
index b6f7bc273d53..37bafb3db25f 100644
--- a/src/renderer/src/components/sidebar/worktree-card-surface.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-surface.tsx
@@ -4,6 +4,7 @@ import { LoaderCircle } from 'lucide-react'
 import { cn } from '@/lib/utils'
 import { AutoRenameFailedDialog } from './AutoRenameFailedDialog'
 import WorktreeContextMenu from './WorktreeContextMenu'
+import { useIsSleepingWorktree } from './use-worktree-sleep-state'
 import { WorktreeCardParentContent } from './worktree-card-parent-content'
 import { buildWorktreeCardPresentation } from './worktree-card-presentation'
 import type { WorktreeCardController } from './use-worktree-card-controller'
@@ -15,7 +16,6 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
     selectedWorktrees,
     onAssignWorkspaceStatus,
     affiliateListMode,
-    interactive,
     isActiveSurface,
     activeSurfaceVariant,
     isMultiSelected,
@@ -29,7 +29,6 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
     newCardStyle,
     titleRenaming,
     isDeleting,
-    isSleeping,
     isRuntimeDisconnected,
     isQueuedForDeletion,
     deleteLabel,
@@ -41,16 +40,16 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
     showRenameErrorDialog,
     setShowRenameErrorDialog
   } = card
-  const { surfacePaddingClassName, cardStyle } = presentation
+  const { titleOnlyCard, cardStyle } = presentation
+  const isSleeping = useIsSleepingWorktree(worktree.id)
 
   const parentCardContent = <WorktreeCardParentContent card={card} presentation={presentation} />
 
   const cardBody = (
     <div
       className={cn(
-        'relative flex flex-col pr-1.5 transition-[background-color,border-color,opacity,box-shadow] duration-200 outline-none select-none',
-        interactive && 'cursor-pointer',
-        surfacePaddingClassName,
+        'relative flex cursor-pointer flex-col pr-1.5 transition-[background-color,border-color,opacity,box-shadow] duration-200 outline-none select-none',
+        titleOnlyCard ? 'py-2' : 'pt-1.25 pb-1.5',
         flushSurface ? 'ml-1 w-[calc(100%-0.25rem)]' : 'ml-1',
         'overflow-hidden rounded-lg',
         // Why: the live data attribute updates before React state during navigation,
@@ -59,9 +58,7 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
           ? 'border border-worktree-sidebar-foreground/40 bg-worktree-sidebar-accent text-worktree-sidebar-accent-foreground ring-1 ring-inset ring-worktree-sidebar-ring/60'
           : isActiveSurface
             ? 'border border-transparent'
-            : interactive
-              ? 'border border-transparent worktree-sidebar-card-hover'
-              : 'border border-transparent',
+            : 'border border-transparent worktree-sidebar-card-hover',
         isActiveSurface && isMultiSelected && 'ring-1 ring-worktree-sidebar-ring/35',
         revealHighlight && [
           'scroll-to-current-workspace-reveal-highlight',
@@ -85,7 +82,7 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
         (isMultiSelected && !isActiveSurface && !isLineageDropTarget) || undefined
       }
       data-worktree-lineage-drop-target={isLineageDropTarget || undefined}
-      onClick={interactive ? handleClick : undefined}
+      onClick={handleClick}
       onDoubleClick={affiliateListMode ? undefined : handleDoubleClick}
       draggable={!affiliateListMode && nativeDragEnabled && !isDeleting && !titleRenaming}
       onDragStart={!affiliateListMode && nativeDragEnabled ? handleDragStart : undefined}
diff --git a/src/renderer/src/components/sidebar/worktree-card-title-geometry.test-support.ts b/src/renderer/src/components/sidebar/worktree-card-title-geometry.test-support.ts
deleted file mode 100644
index 8ed9a5eaa7f9..000000000000
--- a/src/renderer/src/components/sidebar/worktree-card-title-geometry.test-support.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-const X_GEOMETRY = /^-?(m[lrx]?|p[lrx]?|gap|w|size|space-x)-/
-
-function describeX(element: Element): string {
-  const classes = [...element.classList].filter((name) => X_GEOMETRY.test(name)).toSorted()
-  // The DOM shim drops max() values, so inspect the card's raw padding declaration.
-  const styles = (element.getAttribute('style') ?? '')
-    .split(';')
-    .map((declaration) => declaration.trim())
-    .filter((declaration) => /^(padding-left|margin-left|width):/.test(declaration))
-  const width = element.getAttribute('width')
-  return [...classes, ...styles, ...(width ? [`width=${width}`] : [])].join(' ')
-}
-
-function isRow(element: Element | null): boolean {
-  const classes = element?.classList
-  return (
-    Boolean(classes && (classes.contains('flex') || classes.contains('inline-flex'))) &&
-    !classes?.contains('flex-col')
-  )
-}
-
-function precedingBoxSignature(element: Element): string[] {
-  if (element.classList.contains('sr-only')) {
-    return []
-  }
-  // Contents cannot widen a fixed-width status lane or icon-only pill.
-  if (
-    [...element.classList].some((name) => /^(w|size)-/.test(name)) ||
-    element.hasAttribute('width') ||
-    /\bwidth:/.test(element.getAttribute('style') ?? '')
-  ) {
-    return [describeX(element)]
-  }
-  return [describeX(element), ...[...element.children].flatMap(precedingBoxSignature)].filter(
-    Boolean
-  )
-}
-
-export function worktreeCardTitleXSignature(title: Element | null, stopAt: Element): string[] {
-  const signature: string[] = []
-  for (let node = title; node && node !== stopAt; node = node.parentElement) {
-    signature.push(describeX(node))
-    if (!isRow(node.parentElement)) {
-      continue
-    }
-    let gaps = 0
-    for (let before = node.previousElementSibling; before; before = before.previousElementSibling) {
-      if (before.classList.contains('sr-only')) {
-        continue
-      }
-      gaps++
-      signature.push(...precedingBoxSignature(before).map((box) => `before: ${box}`))
-    }
-    // Each preceding flex item adds a gap even when its wrapper has no width class.
-    if (gaps > 0) {
-      signature.push(`gaps-before: ${gaps}`)
-    }
-  }
-  return signature.filter(Boolean)
-}
diff --git a/src/renderer/src/components/sidebar/worktree-card-vertical-geometry.test-support.ts b/src/renderer/src/components/sidebar/worktree-card-vertical-geometry.test-support.ts
deleted file mode 100644
index be8a8301a37f..000000000000
--- a/src/renderer/src/components/sidebar/worktree-card-vertical-geometry.test-support.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-const VERTICAL_GEOMETRY =
-  /^(-?(m[tyb]?|p[tyb]?|gap(-y)?|h|min-h|max-h|size|space-y|leading)-|border$)/
-
-export function describeWorktreeVerticalGeometry(element: Element): string[] {
-  return [
-    ...[...element.classList].filter((name) => VERTICAL_GEOMETRY.test(name)).toSorted(),
-    ...(element.getAttribute('style') ?? '')
-      .split(';')
-      .map((declaration) => declaration.trim())
-      .filter((declaration) =>
-        /^(margin(-(top|bottom|block))?|padding(-(top|bottom|block))?|height|gap|row-gap):/.test(
-          declaration
-        )
-      )
-  ]
-}
-
-function rowHeightBoxes(element: Element): string[][] {
-  if (['sr-only', 'absolute', 'hidden'].some((name) => element.classList.contains(name))) {
-    return []
-  }
-  const geometry = describeWorktreeVerticalGeometry(element)
-  if ([...element.classList].some((name) => /^(h|size)-/.test(name))) {
-    return [geometry]
-  }
-  return [geometry, ...[...element.children].flatMap(rowHeightBoxes)].filter(
-    (box) => box.length > 0
-  )
-}
-
-function pathTo(element: Element, stopAt: Element): string[][] {
-  const path: string[][] = []
-  for (let node: Element | null = element; node && node !== stopAt; node = node.parentElement) {
-    const geometry = describeWorktreeVerticalGeometry(node)
-    if (geometry.length > 0) {
-      path.push(geometry)
-    }
-    const parent = node.parentElement
-    if (
-      parent &&
-      (parent.classList.contains('flex') || parent.classList.contains('inline-flex')) &&
-      !parent.classList.contains('flex-col')
-    ) {
-      for (const sibling of parent.children) {
-        if (sibling !== node) {
-          path.push(
-            ...rowHeightBoxes(sibling).map((box) => box.map((entry) => `row-neighbour: ${entry}`))
-          )
-        }
-      }
-    }
-  }
-  return path
-}
-
-function spacing(element: Element, prefix: string): number {
-  const value = [...element.classList]
-    .find((name) => name.startsWith(`${prefix}-`))
-    ?.slice(prefix.length + 1)
-  if (!value) {
-    return 0
-  }
-  if (/^\d+(\.\d+)?$/.test(value)) {
-    return Number(value) * 4
-  }
-  if (/^\[\d+(\.\d+)?px\]$/.test(value)) {
-    return Number(value.slice(1, -3))
-  }
-  throw new Error(`Unhandled vertical length: ${value}`)
-}
-
-function topPadding(element: Element): number {
-  return spacing(element, 'pt') || spacing(element, 'py') || spacing(element, 'p')
-}
-
-function bottomPadding(element: Element): number {
-  return spacing(element, 'pb') || spacing(element, 'py') || spacing(element, 'p')
-}
-
-export function worktreeCardRootGap(list: HTMLElement): number {
-  return list.style.rowGap
-    ? Number.parseFloat(list.style.rowGap)
-    : spacing(list, 'gap-y') || spacing(list, 'gap')
-}
-
-export function worktreeCardVerticalOffsets(
-  surface: Element,
-  nextRoot: Element,
-  rootGap: number
-): {
-  chipToChildTitle: number
-  childToSiblingTitle: number
-  lastChildToNextRootTitle: number
-} {
-  const children = [...surface.querySelectorAll('[data-worktree-card-surface]')].filter(
-    (child) => child.parentElement?.closest('[data-worktree-card-surface]') === surface
-  )
-  const [firstChild, sibling] = children
-  if (!firstChild || !sibling) {
-    throw new Error('Missing sibling cards')
-  }
-  let lineage: Element | null = firstChild.parentElement
-  while (
-    lineage &&
-    lineage !== surface &&
-    ![...lineage.classList].some((name) => name.startsWith('space-y-'))
-  ) {
-    lineage = lineage.parentElement
-  }
-  if (!lineage) {
-    throw new Error('Missing lineage container')
-  }
-  const legacyStack = lineage.parentElement?.classList.contains('flex-col')
-    ? spacing(lineage.parentElement, 'gap')
-    : 0
-  const border = (card: Element): number => (card.classList.contains('border') ? 1 : 0)
-  return {
-    chipToChildTitle:
-      legacyStack + spacing(lineage, 'mt') + border(firstChild) + topPadding(firstChild),
-    childToSiblingTitle: spacing(lineage, 'space-y') + border(sibling) + topPadding(sibling),
-    lastChildToNextRootTitle:
-      bottomPadding(surface) + border(surface) + rootGap + border(nextRoot) + topPadding(nextRoot)
-  }
-}
-
-export function worktreeCardVerticalSignature(surface: Element): {
-  surface: string[]
-  title: string[][]
-  chip: string[][] | undefined
-  children: string[][][]
-} {
-  const title = surface.querySelector('[data-worktree-title-inline-rename]')
-  if (!title) {
-    throw new Error('Missing card title')
-  }
-  const chip = [...surface.querySelectorAll('button, span')].find((element) =>
-    /^\d+ child(ren)?$/.test(element.textContent ?? '')
-  )
-  const children = [...surface.querySelectorAll('[data-worktree-card-surface]')].filter(
-    (child) => child.parentElement?.closest('[data-worktree-card-surface]') === surface
-  )
-  return {
-    surface: describeWorktreeVerticalGeometry(surface),
-    title: pathTo(title, surface),
-    chip: chip ? pathTo(chip, surface) : undefined,
-    children: children.map((child) => pathTo(child, surface))
-  }
-}
diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/item-row.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/item-row.tsx
index 382154d21243..6b21ffea56e9 100644
--- a/src/renderer/src/components/sidebar/worktree-list/rows/item-row.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/item-row.tsx
@@ -10,8 +10,15 @@ import {
 import WorktreeCard, { type ActiveSurfaceVariant } from '../../WorktreeCard'
 import { PINNED_GROUP_KEY } from '../grouping/group-keys'
 import type { WorktreeGroupBy } from '../grouping/row-types'
-import { getLineageChildrenInlineStyle, LINEAGE_CHILDREN_INLINE_OFFSET } from './indentation'
-import { getWorktreeRowGeometry } from './worktree-row-geometry'
+import {
+  getFolderBackedRepoWorktreeCardContentIndent,
+  getFolderBackedRepoWorktreeCardSurfaceInset,
+  getLineageChildrenInlineStyle,
+  getLineageNestedRowGeometry,
+  getWorktreeCardContentIndent,
+  getWorktreeCardSurfaceInset,
+  LINEAGE_CHILDREN_INLINE_OFFSET
+} from './indentation'
 import type { LineageToggleHandler } from '../../worktree-lineage-toggle-handler-cache'
 import { stopNestedWorktreeCardBubble } from './header-event-guards'
 import type { WorktreeItemRow } from '../listing/renderable-rows'
@@ -56,6 +63,66 @@ export type WorktreeItemRowContext = {
   onCardDragEnd: () => void
 }
 
+// Geometry differs three ways: a plain grouped row, a lineage child inheriting its parent's
+// surface, and a row inside a folder-backed project group.
+function getWorktreeItemRowGeometry(
+  ctx: WorktreeItemRowContext,
+  itemRow: WorktreeItemRow,
+  nested: boolean
+): { surfaceInset: number; cardContentIndent: number; lineageChildrenInlineOffset?: number } {
+  const projectGroupId = itemRow.repo?.projectGroupId
+  const isFolderBackedRepoChild =
+    ctx.groupBy === 'repo' &&
+    Boolean(projectGroupId && ctx.folderBackedProjectGroupIds.has(projectGroupId))
+  // Why: experimental in-card lineage inherits the parent surface; legacy cards keep depth-based nested geometry.
+  const paddingDepth = nested ? Math.max(0, itemRow.depth - 1) : itemRow.depth
+  const getCardContentIndent = (lineageDepth: number): number =>
+    isFolderBackedRepoChild
+      ? getFolderBackedRepoWorktreeCardContentIndent({
+          groupDepth: itemRow.groupDepth,
+          lineageDepth
+        })
+      : getWorktreeCardContentIndent({
+          isGrouped: ctx.groupBy !== 'none',
+          groupDepth: itemRow.groupDepth,
+          lineageDepth
+        })
+  const nestedLineageGeometry = nested
+    ? getLineageNestedRowGeometry({
+        experimentalNewWorktreeCardStyle: ctx.settings?.experimentalNewWorktreeCardStyle === true,
+        inheritedCardContentIndent: getCardContentIndent(0),
+        lineageDepth: itemRow.depth
+      })
+    : null
+  // Why: grouped rows inherit their header depth, but the card surface still spans the full row.
+  const paddingLeft =
+    nested && ctx.groupBy !== 'none'
+      ? getWorktreeCardContentIndent({
+          isGrouped: false,
+          groupDepth: itemRow.groupDepth,
+          lineageDepth: paddingDepth
+        })
+      : getCardContentIndent(paddingDepth)
+  const surfaceInset = nestedLineageGeometry
+    ? nestedLineageGeometry.surfaceInset
+    : isFolderBackedRepoChild
+      ? getFolderBackedRepoWorktreeCardSurfaceInset({
+          groupDepth: itemRow.groupDepth,
+          lineageDepth: paddingDepth
+        })
+      : getWorktreeCardSurfaceInset({
+          isGrouped: ctx.groupBy !== 'none',
+          groupDepth: itemRow.groupDepth
+        })
+  return {
+    surfaceInset,
+    cardContentIndent: nestedLineageGeometry
+      ? nestedLineageGeometry.cardContentIndent
+      : Math.max(0, paddingLeft - surfaceInset),
+    lineageChildrenInlineOffset: nestedLineageGeometry?.lineageChildrenInlineOffset
+  }
+}
+
 export function renderWorktreeItemRow(
   ctx: WorktreeItemRowContext,
   itemRow: WorktreeItemRow,
@@ -63,15 +130,8 @@ export function renderWorktreeItemRow(
   lineageChildren?: React.ReactNode,
   forceActiveSurface = false
 ): React.JSX.Element {
-  const { surfaceInset, cardContentIndent, lineageChildrenInlineOffset } = getWorktreeRowGeometry({
-    groupBy: ctx.groupBy,
-    folderBackedProjectGroupIds: ctx.folderBackedProjectGroupIds,
-    newCardStyle: ctx.settings?.experimentalNewWorktreeCardStyle === true,
-    projectGroupId: itemRow.repo?.projectGroupId,
-    depth: itemRow.depth,
-    groupDepth: itemRow.groupDepth,
-    nested
-  })
+  const { surfaceInset, cardContentIndent, lineageChildrenInlineOffset } =
+    getWorktreeItemRowGeometry(ctx, itemRow, nested)
   const lineageChildrenStyle = lineageChildren
     ? getLineageChildrenInlineStyle(lineageChildrenInlineOffset ?? LINEAGE_CHILDREN_INLINE_OFFSET)
     : undefined
diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/worktree-row-geometry.ts b/src/renderer/src/components/sidebar/worktree-list/rows/worktree-row-geometry.ts
deleted file mode 100644
index db4286611b77..000000000000
--- a/src/renderer/src/components/sidebar/worktree-list/rows/worktree-row-geometry.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import type { WorktreeGroupBy } from '../grouping/row-types'
-import {
-  getFolderBackedRepoWorktreeCardContentIndent,
-  getFolderBackedRepoWorktreeCardSurfaceInset,
-  getLineageNestedRowGeometry,
-  getWorktreeCardContentIndent,
-  getWorktreeCardSurfaceInset
-} from './indentation'
-
-export function getWorktreeRowGeometry(args: {
-  groupBy: WorktreeGroupBy
-  folderBackedProjectGroupIds: ReadonlySet<string>
-  newCardStyle: boolean
-  projectGroupId: string | null | undefined
-  depth: number
-  groupDepth: number
-  nested: boolean
-}): { surfaceInset: number; cardContentIndent: number; lineageChildrenInlineOffset?: number } {
-  const { groupBy, projectGroupId, depth, groupDepth, nested } = args
-  const isFolderBackedRepoChild =
-    groupBy === 'repo' &&
-    Boolean(projectGroupId && args.folderBackedProjectGroupIds.has(projectGroupId))
-  // Why: experimental in-card lineage inherits the parent surface; legacy cards keep depth-based nested geometry.
-  const paddingDepth = nested ? Math.max(0, depth - 1) : depth
-  const getCardContentIndent = (lineageDepth: number): number =>
-    isFolderBackedRepoChild
-      ? getFolderBackedRepoWorktreeCardContentIndent({
-          groupDepth,
-          lineageDepth
-        })
-      : getWorktreeCardContentIndent({
-          isGrouped: groupBy !== 'none',
-          groupDepth,
-          lineageDepth
-        })
-  const nestedLineageGeometry = nested
-    ? getLineageNestedRowGeometry({
-        experimentalNewWorktreeCardStyle: args.newCardStyle,
-        inheritedCardContentIndent: getCardContentIndent(0),
-        lineageDepth: depth
-      })
-    : null
-  // Why: grouped rows inherit their header depth, but the card surface still spans the full row.
-  const paddingLeft =
-    nested && groupBy !== 'none'
-      ? getWorktreeCardContentIndent({
-          isGrouped: false,
-          groupDepth,
-          lineageDepth: paddingDepth
-        })
-      : getCardContentIndent(paddingDepth)
-  const surfaceInset = nestedLineageGeometry
-    ? nestedLineageGeometry.surfaceInset
-    : isFolderBackedRepoChild
-      ? getFolderBackedRepoWorktreeCardSurfaceInset({
-          groupDepth,
-          lineageDepth: paddingDepth
-        })
-      : getWorktreeCardSurfaceInset({
-          isGrouped: groupBy !== 'none',
-          groupDepth
-        })
-  return {
-    surfaceInset,
-    cardContentIndent: nestedLineageGeometry
-      ? nestedLineageGeometry.cardContentIndent
-      : Math.max(0, paddingLeft - surfaceInset),
-    lineageChildrenInlineOffset: nestedLineageGeometry?.lineageChildrenInlineOffset
-  }
-}
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index d988e3b00197..748c3e88d347 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -2123,7 +2123,12 @@
         "activitySubagentOne": "Subagent running: {{value0}}",
         "activitySubagentMany": "{{value0}} subagents running",
         "activityMonitorOne": "Monitoring: {{value0}}",
-        "activityMonitorMany": "Monitoring {{value0}} background tasks"
+        "activityMonitorMany": "Monitoring {{value0}} background tasks",
+        "selectWorkspace": "Select all chats in {{value0}}",
+        "workspaceSelectedCount": "{{value0}} of {{value1}}",
+        "selectAll": "Select all chats",
+        "selectAllLabel": "Select all",
+        "selectedCount": "{{value0}} of {{value1}} selected"
       },
       "StarNagCard": {
         "92b0f9d921": "is authenticated and try again.",

From 24052574dc0b1c330101a1a276c95e27cde668a4 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 00:20:43 -0700
Subject: [PATCH 23/37] fix(native-chat): name SSH hosts by their saved label
 in the resume dialog

The workspace row's host chip spelled an SSH host with its raw target id
(e.g. ssh-1728291234567-abc12d) because it never got the sidebar's host
labels. It now takes them from useSidebarHostScopeOptions, as the delete
dialog does, so the chip reads "devbox" like the sidebar.

Also translates the dialog's five new strings in es, fr, ja, ko and zh.
---
 .../NativeChatResumeOnRestartGroups.test.tsx      | 13 +++++++++++++
 .../NativeChatResumeOnRestartGroups.tsx           | 15 +++++++++++++--
 src/renderer/src/i18n/locales/es.json             |  7 ++++++-
 src/renderer/src/i18n/locales/fr.json             |  7 ++++++-
 src/renderer/src/i18n/locales/ja.json             |  7 ++++++-
 src/renderer/src/i18n/locales/ko.json             |  7 ++++++-
 src/renderer/src/i18n/locales/zh.json             |  7 ++++++-
 7 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index d027d23e76ee..3013757ab777 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -356,6 +356,19 @@ it('names the machine of a single-host SSH offer', () => {
   }
 })
 
+// A target saved through Add SSH target gets a generated id; the sidebar names it by its label.
+it('names an SSH machine by its saved name, not its target id', () => {
+  const targetId = 'ssh-1728291234567-abc12d'
+  const remote: ExecutionHostId = `ssh:${targetId}`
+  const candidates = seedTree({ parent: remote, child: remote })
+  useAppStore.setState({ sshTargetLabels: new Map([[targetId, 'devbox']]) })
+  render({ candidates })
+
+  const row = rowOf(workspaceBox('parent')).textContent
+  expect(row).toContain('devbox')
+  expect(row).not.toContain(targetId)
+})
+
 it('names hosts only when the machine is not obvious', () => {
   render({ candidates: seedTree() })
   const local = getHostContextLabel('local')
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index c384c4b06a07..7f7b9314ba2c 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -2,6 +2,7 @@ import { useMemo } from 'react'
 import { Folder, FolderTree, GitBranch } from 'lucide-react'
 import { RepoIconGlyph } from '@/components/repo/repo-icon'
 import { WorktreeHostContextBadge } from '@/components/sidebar/WorktreeHostContextBadge'
+import { useSidebarHostScopeOptions } from '@/components/sidebar/use-sidebar-host-scope-options'
 import {
   getCyclicProjectedWorktreeLineageIds,
   getSidebarLineageAncestors
@@ -180,6 +181,8 @@ type RowProps = {
   onToggle: (sessionId: string, checked: boolean) => void
   /** Whether a group checkbox may tick this chat; a failure a retry cannot fix is left out. */
   selectable: (sessionId: string) => boolean
+  /** The sidebar's host names (SSH target labels, display overrides), so a chip never shows a raw id. */
+  hostLabelById: ReadonlyMap<ExecutionHostId, string>
 } & FailureProps
 
 function WorkspaceRows({
@@ -194,7 +197,7 @@ function WorkspaceRows({
   const kind = first ? resumeWorkspaceKind(first) : 'git-worktree'
   const name = (worktree && resolveWorktreeDisplayName(worktree)) || group.workspaceId
   const branch = worktree && kind === 'git-worktree' ? resolveWorktreeBranchLabel(worktree) : ''
-  const { mixedHosts, listedAt, busy, selected, onToggle, selectable } = rowProps
+  const { mixedHosts, listedAt, busy, selected, onToggle, selectable, hostLabelById } = rowProps
   // Why: a remote workspace is named by its machine even when it is the only one listed.
   const showHostLabel =
     mixedHosts || (hostId ?? LOCAL_EXECUTION_HOST_ID) !== LOCAL_EXECUTION_HOST_ID
@@ -231,7 +234,9 @@ function WorkspaceRows({
           )}
           {showHostLabel && (
             <WorktreeHostContextBadge
-              label={getHostContextLabel(hostId ?? LOCAL_EXECUTION_HOST_ID)}
+              label={getHostContextLabel(hostId ?? LOCAL_EXECUTION_HOST_ID, {
+                hostLabelById
+              })}
             />
           )}
           {selection.total > 0 && (
@@ -285,6 +290,11 @@ export function ResumeOnRestartGroups({
   const workspaces = useMemo(() => groupResumeCandidates(candidates), [candidates])
   const repoIdFor = useRepoIdByWorkspace(workspaces)
   const ancestorsOf = useLineageAncestors(workspaces)
+  const { hostOptions } = useSidebarHostScopeOptions()
+  const hostLabelById = useMemo(
+    () => new Map(hostOptions.map((host) => [host.id, host.label])),
+    [hostOptions]
+  )
   const repoGroups = groupResumeWorkspacesByRepo(workspaces, repoIdFor)
   const mixedHosts =
     new Set(candidates.map((candidate) => candidate.executionHostId ?? LOCAL_EXECUTION_HOST_ID))
@@ -309,6 +319,7 @@ export function ResumeOnRestartGroups({
               selected={selected}
               onToggle={onToggle}
               selectable={selectable}
+              hostLabelById={hostLabelById}
               failureFor={failureFor}
               onFailureAction={onFailureAction}
             />
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index e1dbb80d724f..114b853ce282 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -17375,7 +17375,12 @@
         "selectAgent": "Reanudar {{value0}} chat \"{{value1}}\" en {{value2}}",
         "resumeSelected": "Reanudar {{value0}} chats",
         "resumeSelectedOne": "Reanudar 1 chat",
-        "dismissAll": "Descartar todo"
+        "dismissAll": "Descartar todo",
+        "selectWorkspace": "Seleccionar todos los chats en {{value0}}",
+        "workspaceSelectedCount": "{{value0}} de {{value1}}",
+        "selectAll": "Seleccionar todos los chats",
+        "selectAllLabel": "Seleccionar todo",
+        "selectedCount": "{{value0}} de {{value1}} seleccionados"
       },
       "NativeChatResumeOutcomeRow": {
         "openChat": "Abrir chat",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index dbdc7c9b11f4..8241099299e4 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -17495,7 +17495,12 @@
         "activitySubagentOne": "Sous-agent en cours : {{value0}}",
         "activitySubagentMany": "{{value0}} sous-agents en cours",
         "activityMonitorOne": "Surveillance : {{value0}}",
-        "activityMonitorMany": "Surveillance de {{value0}} tâches en arrière-plan"
+        "activityMonitorMany": "Surveillance de {{value0}} tâches en arrière-plan",
+        "selectWorkspace": "Sélectionner toutes les discussions dans {{value0}}",
+        "workspaceSelectedCount": "{{value0}} sur {{value1}}",
+        "selectAll": "Sélectionner toutes les discussions",
+        "selectAllLabel": "Tout sélectionner",
+        "selectedCount": "{{value0}} sur {{value1}} sélectionnées"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "Filtrage des statuts des équipes {{value0}} sur {{value1}} : les problèmes des équipes restantes ne sont pas inclus.",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index 32b68602e37f..295066dae355 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -17379,7 +17379,12 @@
         "activitySubagentOne": "サブ Agent 実行中: {{value0}}",
         "activitySubagentMany": "{{value0}} 個のサブ Agent が実行中",
         "activityMonitorOne": "監視中: {{value0}}",
-        "activityMonitorMany": "{{value0}} 個のバックグラウンドタスクを監視中"
+        "activityMonitorMany": "{{value0}} 個のバックグラウンドタスクを監視中",
+        "selectWorkspace": "{{value0}} のチャットをすべて選択",
+        "workspaceSelectedCount": "{{value0}}/{{value1}}",
+        "selectAll": "すべてのチャットを選択",
+        "selectAllLabel": "すべて選択",
+        "selectedCount": "{{value1}} 件中 {{value0}} 件を選択"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "{{value0}}/{{value1}} チームステータスをフィルタリングしています。残りのチームからの問題は含まれません。",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index c8576f0cc5d6..63d891de12d9 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -17379,7 +17379,12 @@
         "activitySubagentOne": "하위 에이전트 실행 중: {{value0}}",
         "activitySubagentMany": "하위 에이전트 {{value0}}개 실행 중",
         "activityMonitorOne": "모니터링 중: {{value0}}",
-        "activityMonitorMany": "백그라운드 작업 {{value0}}개 모니터링 중"
+        "activityMonitorMany": "백그라운드 작업 {{value0}}개 모니터링 중",
+        "selectWorkspace": "{{value0}}의 채팅 모두 선택",
+        "workspaceSelectedCount": "{{value0}}/{{value1}}",
+        "selectAll": "모든 채팅 선택",
+        "selectAllLabel": "모두 선택",
+        "selectedCount": "{{value1}}개 중 {{value0}}개 선택됨"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "{{value1}} 팀 상태 중 {{value0}} 필터링 중 - 나머지 팀의 문제는 포함되지 않습니다.",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index f9f16bd79b00..a656b121333d 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -17379,7 +17379,12 @@
         "activitySubagentOne": "子智能体运行中：{{value0}}",
         "activitySubagentMany": "{{value0}} 个子智能体运行中",
         "activityMonitorOne": "正在监控：{{value0}}",
-        "activityMonitorMany": "正在监控 {{value0}} 个后台任务"
+        "activityMonitorMany": "正在监控 {{value0}} 个后台任务",
+        "selectWorkspace": "选择 {{value0}} 中的全部聊天",
+        "workspaceSelectedCount": "{{value0}}/{{value1}}",
+        "selectAll": "选择全部聊天",
+        "selectAllLabel": "选择全部",
+        "selectedCount": "已选择 {{value0}}/{{value1}}"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "过滤 {{value1}} 团队状态中的 {{value0}} — 不包括其余团队的问题。",

From b108fbbe3f054d849ac69c9e84d90db2b0612281 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 01:50:39 -0700
Subject: [PATCH 24/37] fix(native-chat): group the resume list in bands and
 let a project select its chats

The resume list now follows the common grouped-list pattern: each
workspace heads its chats with a full-width tinted band (lighter for a
nested child, at its own indent), chats are split by plain hairlines, and
groups meet without gaps or rounded row corners.

The project row gets a checkbox in the same left column, tri-state over
every eligible chat in the project (nested workspaces included, failures
a retry cannot fix left out) with an "x of y" count, on a band a step
stronger than a workspace's.

The list takes arrow keys, so it is now a named group (role="group").
---
 .../NativeChatResumeOnRestartAgentRow.tsx     |   6 +-
 .../NativeChatResumeOnRestartGroups.test.tsx  | 127 +++++++++++++++---
 .../NativeChatResumeOnRestartGroups.tsx       |  69 ++++++++--
 ...tiveChatResumeOnRestartModal.list.test.tsx |  21 ++-
 .../NativeChatResumeOnRestartModal.tsx        |   5 +-
 src/renderer/src/i18n/locales/en.json         |   3 +-
 src/renderer/src/i18n/locales/es.json         |   3 +-
 src/renderer/src/i18n/locales/fr.json         |   3 +-
 src/renderer/src/i18n/locales/ja.json         |   3 +-
 src/renderer/src/i18n/locales/ko.json         |   3 +-
 src/renderer/src/i18n/locales/zh.json         |   3 +-
 11 files changed, 205 insertions(+), 41 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
index 411dde7b9a3b..0bc4265cfbf4 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
@@ -63,7 +63,7 @@ export function ResumeCandidateRow({
   const model = candidate.model?.trim() ?? ''
   const activity = resumeActivityLabel(candidate.activity)
   const row = (
-    <label className="grid h-7.5 min-w-0 flex-1 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center hover:bg-worktree-sidebar-accent has-[:disabled]:cursor-default">
+    <label className="grid h-7 min-w-0 flex-1 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center hover:bg-worktree-sidebar-accent has-[:disabled]:cursor-default">
       <span className="flex justify-center">
         {/* Identifies the agent AND its workspace: the accessible name has to distinguish rows that
             would otherwise all read the same. */}
@@ -106,11 +106,11 @@ export function ResumeCandidateRow({
     </label>
   )
   if (!failure) {
-    return <li className="border-t border-worktree-sidebar-border">{row}</li>
+    return <li className="border-worktree-sidebar-border not-first:border-t">{row}</li>
   }
   const act = (action: ResumeFailureAction) => onFailureAction?.(action, candidate.sessionId)
   return (
-    <li className="flex flex-col border-t border-worktree-sidebar-border">
+    <li className="flex flex-col border-worktree-sidebar-border not-first:border-t">
       {/* Outside the label, so pressing them never toggles the checkbox. */}
       <div className="flex items-center gap-1 pr-1">
         {row}
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index 3013757ab777..c82414bf120b 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -169,10 +169,33 @@ function workspaceCount(name: string): string | undefined {
   return rowOf(workspaceBox(name)).querySelector('.tabular-nums')?.textContent ?? undefined
 }
 
+/** A project's header row, by the name it shows. */
+function projectRow(name: string): HTMLElement {
+  const row = [...container.querySelectorAll('section')]
+    .map((section) => section.firstElementChild)
+    .find((header) => header?.querySelector('.font-semibold')?.textContent === name)
+  if (!(row instanceof HTMLElement)) {
+    throw new Error(`Missing project row: ${name}`)
+  }
+  return row
+}
+
+function projectBox(name: string): HTMLElement {
+  return projectRow(name).querySelector<HTMLElement>('[role="checkbox"]')!
+}
+
+function projectCount(name: string): string | undefined {
+  return projectRow(name).querySelector('.tabular-nums')?.textContent ?? undefined
+}
+
 /** Each row in list order, as kind:label@indent-of-its-content. */
 function rowOutline(): string[] {
   return [...container.querySelectorAll<HTMLElement>('[role="checkbox"]')].map((box) => {
     const label = box.getAttribute('aria-label') ?? ''
+    const row = rowOf(box)
+    if (row.parentElement?.tagName === 'SECTION' && row.parentElement.firstElementChild === row) {
+      return `project:${/^Select all chats in (.+)$/.exec(label)?.[1]}`
+    }
     const workspace = /^Select all chats in (.+)$/.exec(label)?.[1]
     if (workspace) {
       const content = cell(rowOf(box), 2)
@@ -202,6 +225,7 @@ it('lists every chat with its checkbox in the shared left column, indenting only
   render({ candidates })
 
   expect(rowOutline()).toEqual([
+    'project:orca',
     'ws:parent@0px',
     'chat:in-parent@20px',
     'ws:child@20px',
@@ -219,29 +243,100 @@ it('lists every chat with its checkbox in the shared left column, indenting only
   }
 })
 
-it('names the repo in a header row with no checkbox, aligned to the content column', () => {
+it('heads each project with a checkbox row in the same left column', () => {
   render({ candidates: seedTree() })
 
-  const header = container.querySelector('section')!.firstElementChild!
-  expect(header.textContent).toBe('orca')
-  expect(header.querySelector('[role="checkbox"]')).toBeNull()
+  const header = projectRow('orca')
+  expect(header.textContent).toBe('orca4 of 4')
   expect(header.classList.contains('grid-cols-[1.75rem_minmax(0,1fr)]')).toBe(true)
-  expect(header.firstElementChild?.textContent).toBe('')
+  expect(cell(header, 1).contains(projectBox('orca'))).toBe(true)
+  expect(projectBox('orca').getAttribute('aria-label')).toBe('Select all chats in orca')
 })
 
-it('separates every row with the sidebar divider', () => {
+// The grouped-list pattern: tinted header bands with a line above and below, hairlines between chats.
+it('draws project and workspace bands, and hairlines only between chats', () => {
   render({ candidates: seedTree() })
 
-  const rows = [
-    container.querySelector('section')!.firstElementChild!,
-    ...[...container.querySelectorAll<HTMLElement>('[role="checkbox"]')].map(
-      (box) => box.closest('li') ?? rowOf(box)
-    )
-  ]
-  for (const row of rows) {
-    expect(row.classList.contains('border-t')).toBe(true)
-    expect(row.classList.contains('border-worktree-sidebar-border')).toBe(true)
+  const project = projectRow('orca')
+  expect(project.classList.contains('border-t')).toBe(true)
+  expect(project.classList.contains('border-border')).toBe(true)
+  expect(project.className).toContain(
+    'bg-[color-mix(in_srgb,var(--foreground)_5%,var(--worktree-sidebar-accent))]'
+  )
+  for (const [name, nested] of [
+    ['parent', 'false'],
+    ['child', 'true'],
+    ['other', 'false']
+  ] as const) {
+    const band = rowOf(workspaceBox(name))
+    expect(band.classList.contains('border-y')).toBe(true)
+    expect(band.classList.contains('border-border')).toBe(true)
+    expect(band.classList.contains('bg-worktree-sidebar-accent')).toBe(true)
+    expect(band.getAttribute('data-nested')).toBe(nested)
+    expect(band.querySelector('.font-semibold')?.textContent).toBe(name)
+  }
+  for (const box of container.querySelectorAll<HTMLElement>(
+    '[role="checkbox"][aria-label^="Resume"]'
+  )) {
+    const item = box.closest('li')!
+    // The band above the first chat is its separator; later chats get a hairline.
+    expect(item.classList.contains('not-first:border-t')).toBe(true)
+    expect(item.classList.contains('border-worktree-sidebar-border')).toBe(true)
+  }
+  expect(container.querySelector('.rounded-md, .rounded-sm, .rounded-lg')).toBeNull()
+})
+
+it('selects every eligible chat in a project, nested workspaces included', () => {
+  const candidates = seedTree()
+  const mobile = worktree('mobile', { repoId: 'repo-2', id: 'repo-2::/mobile/mobile' })
+  useAppStore.setState((state) => ({
+    repos: [
+      ...state.repos,
+      {
+        id: 'repo-2',
+        path: '/mobile',
+        displayName: 'orca-mobile',
+        badgeColor: '#999999',
+        addedAt: 1
+      }
+    ],
+    worktreesByRepo: { ...state.worktreesByRepo, 'repo-2': [mobile] }
+  }))
+  const stuck: ResumeFailure = {
+    ...candidates[3]!,
+    failedAt: 1_800_000_030_000,
+    outcome: 'refused',
+    reason: 'agent_session_restart_work_superseded',
+    retryable: false
+  }
+  render({
+    candidates: [...candidates, candidate('in-mobile', mobile)],
+    initiallySelected: ['in-parent', 'in-child', 'also-in-child', 'in-mobile'],
+    failureFor: (sessionId) => (sessionId === 'in-other' ? stuck : undefined)
+  })
+  expect(projectBox('orca').getAttribute('aria-checked')).toBe('true')
+  expect(projectCount('orca')).toBe('3 of 3')
+
+  act(() => chatBox('also-in-child').click())
+  expect(projectBox('orca').getAttribute('aria-checked')).toBe('mixed')
+  expect(projectCount('orca')).toBe('2 of 3')
+
+  onToggleSpy.mockClear()
+  act(() => projectBox('orca').click())
+  expect(chatBox('also-in-child').getAttribute('aria-checked')).toBe('true')
+  expect(projectCount('orca')).toBe('3 of 3')
+
+  act(() => projectBox('orca').click())
+  expect(projectBox('orca').getAttribute('aria-checked')).toBe('false')
+  for (const id of ['in-parent', 'in-child', 'also-in-child']) {
+    expect(chatBox(id).getAttribute('aria-checked')).toBe('false')
   }
+  // Never the unretryable chat, never another project's.
+  const touched = onToggleSpy.mock.calls.map(([sessionId]) => sessionId)
+  expect(touched).not.toContain('in-other')
+  expect(touched).not.toContain('in-mobile')
+  expect(chatBox('in-mobile').getAttribute('aria-checked')).toBe('true')
+  expect(projectCount('orca-mobile')).toBe('1 of 1')
 })
 
 it('shows the branch for a git worktree, muted after its name', () => {
@@ -340,7 +435,7 @@ it('disables every checkbox while a resume runs', () => {
   render({ candidates: seedTree(), busy: true })
 
   const boxes = [...container.querySelectorAll('[role="checkbox"]')]
-  expect(boxes).toHaveLength(7)
+  expect(boxes).toHaveLength(8)
   for (const box of boxes) {
     expect(box.hasAttribute('disabled')).toBe(true)
   }
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index 7f7b9314ba2c..5f2fd099287b 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -52,9 +52,10 @@ export type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
  * The offered chats as a checkbox list in the sidebar's three tiers: repo/project, then workspace,
  * then agent sessions.
  *
- * Every row's checkbox sits in one column at the left edge; nesting indents only what follows it.
- * A workspace row's checkbox covers its own chats and those of the workspaces nested under it,
- * which follow the sidebar's own lineage rule. A repo row is a label with no checkbox.
+ * A grouped list: each project and workspace heads its group with a tinted band, chats are split by
+ * hairlines. Every row's checkbox sits in one column at the left edge; nesting indents only what
+ * follows it. A workspace checkbox covers its own chats and those of the workspaces nested under it,
+ * which follow the sidebar's own lineage rule; a project checkbox covers every chat in the project.
  *
  * A workspace the store does not know yet (its host still connecting, or since deleted) is named
  * by its id. The kind glyph comes from the host's record of the chat, never from a name.
@@ -150,14 +151,39 @@ function WorkspaceKindGlyph({ kind }: { kind: AgentSessionWorkspaceKind }): Reac
  * is the only thing that separates the two, and the sidebar likewise titles these with the project
  * group's name.
  */
-function RepoHeader({ repoId }: { repoId: string | null }): React.JSX.Element {
+function RepoHeader({
+  repoId,
+  covered,
+  busy,
+  selected,
+  onToggle
+}: {
+  repoId: string | null
+  /** Every selectable chat in the project, nested workspaces included. */
+  covered: readonly string[]
+  busy: boolean
+  selected: ReadonlySet<string>
+  onToggle: (sessionId: string, checked: boolean) => void
+}): React.JSX.Element {
   const repos = useAppStore((store) => store.repos)
   const projectGroups = useAppStore((store) => store.projectGroups)
   const header = resolveResumeGroupHeader(repoId, repos, projectGroups)
+  const selection = resumeSelectionState(covered, selected)
   return (
-    // The empty first cell keeps the title in the content column.
-    <div className="grid h-7 grid-cols-[1.75rem_minmax(0,1fr)] items-center border-t border-worktree-sidebar-border">
-      <span />
+    // A band a step stronger than a workspace's, so the project reads as the outer group.
+    <label className="grid h-8.5 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center border-t border-border bg-[color-mix(in_srgb,var(--foreground)_5%,var(--worktree-sidebar-accent))] hover:bg-[color-mix(in_srgb,var(--foreground)_9%,var(--worktree-sidebar-accent))] has-[:disabled]:cursor-default">
+      <span className="flex justify-center">
+        <Checkbox
+          checked={selection.checked}
+          disabled={busy || selection.total === 0}
+          onCheckedChange={() => toggleResumeSelection(covered, selection, onToggle)}
+          aria-label={translate(
+            'auto.components.NativeChatResumeOnRestartModal.selectProject',
+            'Select all chats in {{value0}}',
+            { value0: header.name }
+          )}
+        />
+      </span>
       <span className="flex min-w-0 items-center gap-1.5 pr-2.5">
         {/* A repo shows its own configured glyph; a project group uses the FolderTree the sidebar's
             own PROJECT_GROUP_META uses. */}
@@ -167,8 +193,17 @@ function RepoHeader({ repoId }: { repoId: string | null }): React.JSX.Element {
           <RepoIconGlyph repoIcon={header.repoIcon} className="size-3.5" iconClassName="size-3.5" />
         )}
         <span className="min-w-0 flex-1 truncate text-[13px] font-semibold">{header.name}</span>
+        {selection.total > 0 && (
+          <span className="shrink-0 pl-2 text-[11px] tabular-nums text-muted-foreground">
+            {translate(
+              'auto.components.NativeChatResumeOnRestartModal.workspaceSelectedCount',
+              '{{value0}} of {{value1}}',
+              { value0: selection.selectedCount, value1: selection.total }
+            )}
+          </span>
+        )}
       </span>
-    </div>
+    </label>
   )
 }
 
@@ -208,7 +243,11 @@ function WorkspaceRows({
   }
   return (
     <>
-      <label className="grid h-7.5 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center border-t border-worktree-sidebar-border hover:bg-worktree-sidebar-accent has-[:disabled]:cursor-default">
+      {/* The workspace's band heads its group; a nested one is lighter, at its own indent. */}
+      <label
+        data-nested={depth > 0}
+        className="grid h-8 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center border-y border-border bg-worktree-sidebar-accent hover:bg-[color-mix(in_srgb,var(--foreground)_6%,var(--worktree-sidebar-accent))] has-[:disabled]:cursor-default data-[nested=true]:bg-worktree-sidebar-accent/50"
+      >
         <span className="flex justify-center">
           <Checkbox
             checked={selection.checked}
@@ -226,7 +265,7 @@ function WorkspaceRows({
           style={depth > 0 ? { paddingLeft: depth * RESUME_INDENT_PX } : undefined}
         >
           <WorkspaceKindGlyph kind={kind} />
-          <span className="min-w-0 truncate text-[13px] font-medium text-foreground">{name}</span>
+          <span className="min-w-0 truncate text-[13px] font-semibold text-foreground">{name}</span>
           {branch && (
             <span className="min-w-0 shrink-2 truncate text-[11px] text-muted-foreground">
               {branch}
@@ -307,7 +346,15 @@ export function ResumeOnRestartGroups({
     <div className="flex flex-col">
       {repoGroups.map((repoGroup) => (
         <section key={repoGroup.repoId ?? 'no-repo'} className="flex flex-col">
-          <RepoHeader repoId={repoGroup.repoId} />
+          <RepoHeader
+            repoId={repoGroup.repoId}
+            covered={repoGroup.workspaces
+              .flatMap((group) => group.candidates.map((candidate) => candidate.sessionId))
+              .filter(selectable)}
+            busy={busy}
+            selected={selected}
+            onToggle={onToggle}
+          />
           {nestResumeWorkspaces(repoGroup.workspaces, ancestorsOf).map((node) => (
             <WorkspaceRows
               key={node.group.workspaceId}
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
index aa6f36236141..4e316960ee96 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
@@ -79,6 +79,18 @@ it('uses the sidebar surface without a border around the resume list', async ()
   expect(list?.classList.contains('border')).toBe(false)
 })
 
+// It takes arrow keys, so it needs a role; a group also lets its aria-label name it.
+it('exposes the list as a named group', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const list = document.querySelector('[role="group"][aria-label="Chats that would be resumed"]')
+  expect(list).not.toBeNull()
+  // The bands run edge to edge; the rounded, clipped container keeps the corners.
+  expect(list?.classList.contains('rounded-md')).toBe(true)
+  expect(list?.classList.contains('overflow-y-auto')).toBe(true)
+  expect(list?.className).not.toMatch(/\bp-/)
+})
+
 it('keeps initial focus inside the dialog with no resumable chats', async () => {
   rpc.mockResolvedValue({ sessions: [], failed: [failure('b')] })
   await mount(<NativeChatResumeOnRestartModal />)
@@ -172,7 +184,7 @@ it('disables Select all and the workspace checkbox while a resume runs', async (
   await act(async () => button('Resuming 2 chats').click())
   const list = document.querySelector('[aria-label="Chats that would be resumed"]')!
   const boxes = [...list.querySelectorAll('[role="checkbox"]')]
-  expect(boxes).toHaveLength(4)
+  expect(boxes).toHaveLength(5)
   for (const box of boxes) {
     expect(box.hasAttribute('disabled')).toBe(true)
   }
@@ -182,8 +194,11 @@ it('disables Select all and the workspace checkbox while a resume runs', async (
 it('moves between the list’s checkboxes with the arrow keys', async () => {
   rpc.mockResolvedValue({ sessions: offered })
   await mount(<NativeChatResumeOnRestartModal />)
+  const list = document.querySelector('[aria-label="Chats that would be resumed"]')!
   const order = [
     namedBox('Select all chats'),
+    // The project row's checkbox; this workspace has no repo the store knows.
+    list.querySelector<HTMLElement>('section [role="checkbox"]')!,
     namedBox('Select all chats in workspace'),
     chatBox('a'),
     chatBox('b')
@@ -199,7 +214,7 @@ it('moves between the list’s checkboxes with the arrow keys', async () => {
   }
   // The last checkbox is the end of the list: focus never leaves it for the footer.
   await press('ArrowDown')
-  expect(document.activeElement).toBe(order[3])
+  expect(document.activeElement).toBe(order[4])
   await press('ArrowUp')
-  expect(document.activeElement).toBe(order[2])
+  expect(document.activeElement).toBe(order[3])
 })
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index 9c24a1c97df2..1bf965fa4b4f 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -257,17 +257,18 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
         </DialogHeader>
 
         <div
+          role="group"
           tabIndex={0}
           aria-label={translate(
             'auto.components.NativeChatResumeOnRestartModal.listLabel',
             'Chats that would be resumed'
           )}
           // The sidebar's own surface, so its workspaces read here as they do there.
-          className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md bg-worktree-sidebar p-1.5"
+          className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md bg-worktree-sidebar"
           onKeyDown={moveCheckboxFocus}
         >
           {/* Here, not in the groups: a list may hold one set of groups per machine. */}
-          <label className="grid h-7.5 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center hover:bg-worktree-sidebar-accent has-[:disabled]:cursor-default">
+          <label className="grid h-7 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center hover:bg-worktree-sidebar-accent has-[:disabled]:cursor-default">
             <span className="flex justify-center">
               <Checkbox
                 checked={allSelection.checked}
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 748c3e88d347..f4b7d767e254 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -2128,7 +2128,8 @@
         "workspaceSelectedCount": "{{value0}} of {{value1}}",
         "selectAll": "Select all chats",
         "selectAllLabel": "Select all",
-        "selectedCount": "{{value0}} of {{value1}} selected"
+        "selectedCount": "{{value0}} of {{value1}} selected",
+        "selectProject": "Select all chats in {{value0}}"
       },
       "StarNagCard": {
         "92b0f9d921": "is authenticated and try again.",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 114b853ce282..3c6575469a57 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -17380,7 +17380,8 @@
         "workspaceSelectedCount": "{{value0}} de {{value1}}",
         "selectAll": "Seleccionar todos los chats",
         "selectAllLabel": "Seleccionar todo",
-        "selectedCount": "{{value0}} de {{value1}} seleccionados"
+        "selectedCount": "{{value0}} de {{value1}} seleccionados",
+        "selectProject": "Seleccionar todos los chats en {{value0}}"
       },
       "NativeChatResumeOutcomeRow": {
         "openChat": "Abrir chat",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 8241099299e4..46282414ffd9 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -17500,7 +17500,8 @@
         "workspaceSelectedCount": "{{value0}} sur {{value1}}",
         "selectAll": "Sélectionner toutes les discussions",
         "selectAllLabel": "Tout sélectionner",
-        "selectedCount": "{{value0}} sur {{value1}} sélectionnées"
+        "selectedCount": "{{value0}} sur {{value1}} sélectionnées",
+        "selectProject": "Sélectionner toutes les discussions dans {{value0}}"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "Filtrage des statuts des équipes {{value0}} sur {{value1}} : les problèmes des équipes restantes ne sont pas inclus.",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index 295066dae355..e8c187f369b6 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -17384,7 +17384,8 @@
         "workspaceSelectedCount": "{{value0}}/{{value1}}",
         "selectAll": "すべてのチャットを選択",
         "selectAllLabel": "すべて選択",
-        "selectedCount": "{{value1}} 件中 {{value0}} 件を選択"
+        "selectedCount": "{{value1}} 件中 {{value0}} 件を選択",
+        "selectProject": "{{value0}} のチャットをすべて選択"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "{{value0}}/{{value1}} チームステータスをフィルタリングしています。残りのチームからの問題は含まれません。",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 63d891de12d9..dd88bbbeca56 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -17384,7 +17384,8 @@
         "workspaceSelectedCount": "{{value0}}/{{value1}}",
         "selectAll": "모든 채팅 선택",
         "selectAllLabel": "모두 선택",
-        "selectedCount": "{{value1}}개 중 {{value0}}개 선택됨"
+        "selectedCount": "{{value1}}개 중 {{value0}}개 선택됨",
+        "selectProject": "{{value0}}의 채팅 모두 선택"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "{{value1}} 팀 상태 중 {{value0}} 필터링 중 - 나머지 팀의 문제는 포함되지 않습니다.",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index a656b121333d..c0709a7303fa 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -17384,7 +17384,8 @@
         "workspaceSelectedCount": "{{value0}}/{{value1}}",
         "selectAll": "选择全部聊天",
         "selectAllLabel": "选择全部",
-        "selectedCount": "已选择 {{value0}}/{{value1}}"
+        "selectedCount": "已选择 {{value0}}/{{value1}}",
+        "selectProject": "选择 {{value0}} 中的全部聊天"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "过滤 {{value1}} 团队状态中的 {{value0}} — 不包括其余团队的问题。",

From 73d18749154ca5424d44ad4e1083a8e7fe0da5ca Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 02:01:21 -0700
Subject: [PATCH 25/37] fix(native-chat): no project row for workspaces the
 resume list cannot place

Workspaces the store cannot place in a repo were grouped under a header
with an empty name, so the new project checkbox was announced as "Select
all chats in ". Main and the earlier heads showed that header as a bare
folder glyph with no name, and there is no id to fall back to. Those
workspaces now get no project row; their own rows and Select all still
cover their chats.
---
 .../NativeChatResumeOnRestartGroups.test.tsx  | 31 ++++++++++++++++++-
 .../NativeChatResumeOnRestartGroups.tsx       | 24 ++++++++------
 ...tiveChatResumeOnRestartModal.list.test.tsx | 10 +++---
 3 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index c82414bf120b..f984890cd927 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -193,7 +193,8 @@ function rowOutline(): string[] {
   return [...container.querySelectorAll<HTMLElement>('[role="checkbox"]')].map((box) => {
     const label = box.getAttribute('aria-label') ?? ''
     const row = rowOf(box)
-    if (row.parentElement?.tagName === 'SECTION' && row.parentElement.firstElementChild === row) {
+    // Only a workspace band carries data-nested; a project header is the other band.
+    if (row.parentElement?.tagName === 'SECTION' && !row.hasAttribute('data-nested')) {
       return `project:${/^Select all chats in (.+)$/.exec(label)?.[1]}`
     }
     const workspace = /^Select all chats in (.+)$/.exec(label)?.[1]
@@ -491,6 +492,34 @@ it('names a workspace the store does not know by its id, with the kind the host
   expect(chatBox('lost').getAttribute('aria-label')).toContain('in folder:missing-folder')
 })
 
+// Its project is unknown too: a nameless "Select all chats in " checkbox would help no one.
+it('gives workspaces the store cannot place no project row, leaving them to Select all', () => {
+  const candidates = seedTree()
+  const unknown: ResumeCandidate = {
+    ...candidate('lost', worktree('gone')),
+    workspaceId: 'folder:missing-folder',
+    workspaceKind: 'folder'
+  }
+  render({ candidates: [...candidates, unknown] })
+
+  expect(rowOutline()).toEqual([
+    'project:orca',
+    'ws:parent@0px',
+    'chat:in-parent@20px',
+    'ws:child@20px',
+    'chat:in-child@40px',
+    'chat:also-in-child@40px',
+    'ws:other@0px',
+    'chat:in-other@20px',
+    'ws:folder:missing-folder@0px',
+    'chat:lost@20px'
+  ])
+  expect(container.querySelector('[aria-label="Select all chats in "]')).toBeNull()
+  const [, unplaced] = container.querySelectorAll('section')
+  expect(unplaced?.firstElementChild).toBe(rowOf(workspaceBox('folder:missing-folder')))
+  expect(projectCount('orca')).toBe('4 of 4')
+})
+
 // Why: the sidebar nests a child only under a parent on its own host; no host id matches only none.
 it.each([
   ['both local', 'local', 'local', true],
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index 5f2fd099287b..c9f79ac7dcda 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -158,7 +158,7 @@ function RepoHeader({
   selected,
   onToggle
 }: {
-  repoId: string | null
+  repoId: string
   /** Every selectable chat in the project, nested workspaces included. */
   covered: readonly string[]
   busy: boolean
@@ -346,15 +346,19 @@ export function ResumeOnRestartGroups({
     <div className="flex flex-col">
       {repoGroups.map((repoGroup) => (
         <section key={repoGroup.repoId ?? 'no-repo'} className="flex flex-col">
-          <RepoHeader
-            repoId={repoGroup.repoId}
-            covered={repoGroup.workspaces
-              .flatMap((group) => group.candidates.map((candidate) => candidate.sessionId))
-              .filter(selectable)}
-            busy={busy}
-            selected={selected}
-            onToggle={onToggle}
-          />
+          {/* Workspaces the store cannot place have no project to name or select; Select all
+              still covers them. */}
+          {repoGroup.repoId !== null && (
+            <RepoHeader
+              repoId={repoGroup.repoId}
+              covered={repoGroup.workspaces
+                .flatMap((group) => group.candidates.map((candidate) => candidate.sessionId))
+                .filter(selectable)}
+              busy={busy}
+              selected={selected}
+              onToggle={onToggle}
+            />
+          )}
           {nestResumeWorkspaces(repoGroup.workspaces, ancestorsOf).map((node) => (
             <WorkspaceRows
               key={node.group.workspaceId}
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
index 4e316960ee96..8fa5bb9e66a3 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
@@ -184,7 +184,7 @@ it('disables Select all and the workspace checkbox while a resume runs', async (
   await act(async () => button('Resuming 2 chats').click())
   const list = document.querySelector('[aria-label="Chats that would be resumed"]')!
   const boxes = [...list.querySelectorAll('[role="checkbox"]')]
-  expect(boxes).toHaveLength(5)
+  expect(boxes).toHaveLength(4)
   for (const box of boxes) {
     expect(box.hasAttribute('disabled')).toBe(true)
   }
@@ -194,11 +194,9 @@ it('disables Select all and the workspace checkbox while a resume runs', async (
 it('moves between the list’s checkboxes with the arrow keys', async () => {
   rpc.mockResolvedValue({ sessions: offered })
   await mount(<NativeChatResumeOnRestartModal />)
-  const list = document.querySelector('[aria-label="Chats that would be resumed"]')!
+  // This workspace has no repo the store knows, so no project row sits between.
   const order = [
     namedBox('Select all chats'),
-    // The project row's checkbox; this workspace has no repo the store knows.
-    list.querySelector<HTMLElement>('section [role="checkbox"]')!,
     namedBox('Select all chats in workspace'),
     chatBox('a'),
     chatBox('b')
@@ -214,7 +212,7 @@ it('moves between the list’s checkboxes with the arrow keys', async () => {
   }
   // The last checkbox is the end of the list: focus never leaves it for the footer.
   await press('ArrowDown')
-  expect(document.activeElement).toBe(order[4])
-  await press('ArrowUp')
   expect(document.activeElement).toBe(order[3])
+  await press('ArrowUp')
+  expect(document.activeElement).toBe(order[2])
 })

From 8deb3a9c66bab976dc1ed48a4026f69635b7cb99 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 15:53:22 -0700
Subject: [PATCH 26/37] fix(native-chat): lay the resume list out as nested
 workspace boxes

Brennan chose the nested-box layout without row dividers. A project is a
tinted band; each workspace is a bordered, rounded box one step in from
its project, holding its header band and its chats, and a child
workspace's box sits inside its parent's, after the parent's chats, at
the parent's chat indent. The boxes are drawn in the content area only,
so every checkbox stays in the one left column outside them. Rows carry
no dividers; the box border is the only line.
---
 .../NativeChatResumeOnRestartAgentRow.tsx     | 10 +-
 .../NativeChatResumeOnRestartGroups.test.tsx  | 97 ++++++++++++-------
 .../NativeChatResumeOnRestartGroups.tsx       | 41 +++++---
 .../NativeChatResumeOnRestartModal.tsx        |  6 +-
 4 files changed, 93 insertions(+), 61 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
index 0bc4265cfbf4..204da73e7704 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
@@ -63,7 +63,7 @@ export function ResumeCandidateRow({
   const model = candidate.model?.trim() ?? ''
   const activity = resumeActivityLabel(candidate.activity)
   const row = (
-    <label className="grid h-7 min-w-0 flex-1 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center hover:bg-worktree-sidebar-accent has-[:disabled]:cursor-default">
+    <label className="group/row grid h-7 min-w-0 flex-1 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center has-[:disabled]:cursor-default">
       <span className="flex justify-center">
         {/* Identifies the agent AND its workspace: the accessible name has to distinguish rows that
             would otherwise all read the same. */}
@@ -78,7 +78,7 @@ export function ResumeCandidateRow({
           )}
         />
       </span>
-      <span className="flex min-w-0 items-center gap-1.5 pr-2.5 pl-(--resume-chat-indent) text-[11px] leading-none text-muted-foreground">
+      <span className="ml-(--resume-chat-indent) flex h-full min-w-0 items-center gap-1.5 pr-2.5 pl-2 text-[11px] leading-none text-muted-foreground group-hover/row:bg-worktree-sidebar-accent">
         {/* AgentIcon carries no label of its own, so the provider was invisible to assistive tech. */}
         <span role="img" aria-label={agentLabel} className="inline-flex shrink-0">
           <AgentIcon agent={agentTypeToIconAgent(candidate.agent)} size={13} />
@@ -106,11 +106,11 @@ export function ResumeCandidateRow({
     </label>
   )
   if (!failure) {
-    return <li className="border-worktree-sidebar-border not-first:border-t">{row}</li>
+    return <li>{row}</li>
   }
   const act = (action: ResumeFailureAction) => onFailureAction?.(action, candidate.sessionId)
   return (
-    <li className="flex flex-col border-worktree-sidebar-border not-first:border-t">
+    <li className="flex flex-col">
       {/* Outside the label, so pressing them never toggles the checkbox. */}
       <div className="flex items-center gap-1 pr-1">
         {row}
@@ -123,7 +123,7 @@ export function ResumeCandidateRow({
         />
       </div>
       {/* Lined up with the row's content, past the checkbox column. */}
-      <div className="pr-2.5 pl-[calc(1.75rem+var(--resume-chat-indent,0px))]">
+      <div className="pr-2.5 pl-[calc(1.75rem+var(--resume-chat-indent,0px)+0.5rem)]">
         <ResumeFailureGuidanceLine failure={failure} disabled={disabled} onAction={act} />
       </div>
     </li>
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index f984890cd927..465e5b8323a7 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -193,14 +193,14 @@ function rowOutline(): string[] {
   return [...container.querySelectorAll<HTMLElement>('[role="checkbox"]')].map((box) => {
     const label = box.getAttribute('aria-label') ?? ''
     const row = rowOf(box)
-    // Only a workspace band carries data-nested; a project header is the other band.
-    if (row.parentElement?.tagName === 'SECTION' && !row.hasAttribute('data-nested')) {
+    // A workspace row sits in its box; only a project header is the section's own row.
+    if (row.parentElement?.tagName === 'SECTION') {
       return `project:${/^Select all chats in (.+)$/.exec(label)?.[1]}`
     }
     const workspace = /^Select all chats in (.+)$/.exec(label)?.[1]
     if (workspace) {
       const content = cell(rowOf(box), 2)
-      return `ws:${workspace}@${content.style.paddingLeft || '0px'}`
+      return `ws:${workspace}@${content.style.marginLeft || '0px'}`
     }
     const indent = box.closest('ul')?.style.getPropertyValue('--resume-chat-indent')
     return `chat:${/Prompt ([\w-]+)/.exec(label)?.[1]}@${indent}`
@@ -227,13 +227,13 @@ it('lists every chat with its checkbox in the shared left column, indenting only
 
   expect(rowOutline()).toEqual([
     'project:orca',
-    'ws:parent@0px',
-    'chat:in-parent@20px',
-    'ws:child@20px',
-    'chat:in-child@40px',
-    'chat:also-in-child@40px',
-    'ws:other@0px',
-    'chat:in-other@20px'
+    'ws:parent@20px',
+    'chat:in-parent@40px',
+    'ws:child@40px',
+    'chat:in-child@60px',
+    'chat:also-in-child@60px',
+    'ws:other@20px',
+    'chat:in-other@40px'
   ])
   for (const box of container.querySelectorAll<HTMLElement>('[role="checkbox"]')) {
     const row = rowOf(box)
@@ -254,13 +254,44 @@ it('heads each project with a checkbox row in the same left column', () => {
   expect(projectBox('orca').getAttribute('aria-label')).toBe('Select all chats in orca')
 })
 
-// The grouped-list pattern: tinted header bands with a line above and below, hairlines between chats.
-it('draws project and workspace bands, and hairlines only between chats', () => {
+/** The bordered box a workspace's rows sit in. */
+function boxOf(name: string): HTMLElement {
+  return rowOf(workspaceBox(name)).parentElement!
+}
+
+// Nested boxes: the box border is the only line; a child's box sits inside its parent's.
+it("puts each workspace in a bordered box, a child's box inside its parent's after its chats", () => {
+  render({ candidates: seedTree() })
+
+  const parent = boxOf('parent')
+  const child = boxOf('child')
+  expect(child.parentElement).toBe(parent)
+  expect(parent.lastElementChild).toBe(child)
+  for (const id of ['in-parent', 'in-child', 'also-in-child']) {
+    expect(parent.contains(chatBox(id))).toBe(true)
+  }
+  expect(child.contains(chatBox('in-parent'))).toBe(false)
+  expect(boxOf('other').contains(rowOf(workspaceBox('child')))).toBe(false)
+  for (const [name, left] of [
+    ['parent', '20px'],
+    ['child', '40px'],
+    ['other', '20px']
+  ] as const) {
+    const outline = boxOf(name).querySelector<HTMLElement>(':scope > [aria-hidden="true"]')!
+    expect(outline.getAttribute('aria-hidden')).toBe('true')
+    expect([...outline.classList]).toEqual(
+      expect.arrayContaining(['border', 'border-border', 'rounded-md'])
+    )
+    // Drawn past the checkbox column, at the workspace's own indent.
+    expect(outline.style.left).toBe(`calc(1.75rem + ${left})`)
+  }
+})
+
+it('draws project and workspace bands with no dividers between rows', () => {
   render({ candidates: seedTree() })
 
-  const project = projectRow('orca')
-  expect(project.classList.contains('border-t')).toBe(true)
-  expect(project.classList.contains('border-border')).toBe(true)
+  const project = cell(projectRow('orca'), 2)
+  expect(project.classList.contains('rounded-t-md')).toBe(true)
   expect(project.className).toContain(
     'bg-[color-mix(in_srgb,var(--foreground)_5%,var(--worktree-sidebar-accent))]'
   )
@@ -269,22 +300,14 @@ it('draws project and workspace bands, and hairlines only between chats', () =>
     ['child', 'true'],
     ['other', 'false']
   ] as const) {
-    const band = rowOf(workspaceBox(name))
-    expect(band.classList.contains('border-y')).toBe(true)
-    expect(band.classList.contains('border-border')).toBe(true)
+    const band = cell(rowOf(workspaceBox(name)), 2)
     expect(band.classList.contains('bg-worktree-sidebar-accent')).toBe(true)
     expect(band.getAttribute('data-nested')).toBe(nested)
     expect(band.querySelector('.font-semibold')?.textContent).toBe(name)
   }
-  for (const box of container.querySelectorAll<HTMLElement>(
-    '[role="checkbox"][aria-label^="Resume"]'
-  )) {
-    const item = box.closest('li')!
-    // The band above the first chat is its separator; later chats get a hairline.
-    expect(item.classList.contains('not-first:border-t')).toBe(true)
-    expect(item.classList.contains('border-worktree-sidebar-border')).toBe(true)
+  for (const row of container.querySelectorAll('label, li, ul')) {
+    expect([...row.classList].filter((name) => /(^|:)border/.test(name))).toEqual([])
   }
-  expect(container.querySelector('.rounded-md, .rounded-sm, .rounded-lg')).toBeNull()
 })
 
 it('selects every eligible chat in a project, nested workspaces included', () => {
@@ -504,19 +527,19 @@ it('gives workspaces the store cannot place no project row, leaving them to Sele
 
   expect(rowOutline()).toEqual([
     'project:orca',
-    'ws:parent@0px',
-    'chat:in-parent@20px',
-    'ws:child@20px',
-    'chat:in-child@40px',
-    'chat:also-in-child@40px',
-    'ws:other@0px',
-    'chat:in-other@20px',
-    'ws:folder:missing-folder@0px',
-    'chat:lost@20px'
+    'ws:parent@20px',
+    'chat:in-parent@40px',
+    'ws:child@40px',
+    'chat:in-child@60px',
+    'chat:also-in-child@60px',
+    'ws:other@20px',
+    'chat:in-other@40px',
+    'ws:folder:missing-folder@20px',
+    'chat:lost@40px'
   ])
   expect(container.querySelector('[aria-label="Select all chats in "]')).toBeNull()
   const [, unplaced] = container.querySelectorAll('section')
-  expect(unplaced?.firstElementChild).toBe(rowOf(workspaceBox('folder:missing-folder')))
+  expect(unplaced?.querySelector('label')).toBe(rowOf(workspaceBox('folder:missing-folder')))
   expect(projectCount('orca')).toBe('4 of 4')
 })
 
@@ -532,7 +555,7 @@ it.each([
     const candidates = seedTree({ parent: parentHost, child: childHost })
     render({ candidates })
 
-    expect(rowOutline()).toContain(nests ? 'ws:child@20px' : 'ws:child@0px')
+    expect(rowOutline()).toContain(nests ? 'ws:child@40px' : 'ws:child@20px')
     expect(workspaceCount('parent')).toBe(nests ? '3 of 3' : '1 of 1')
     expect(container.querySelectorAll('[role="checkbox"][aria-label^="Resume"]')).toHaveLength(4)
   }
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index c9f79ac7dcda..94e96af302dc 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -52,10 +52,12 @@ export type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
  * The offered chats as a checkbox list in the sidebar's three tiers: repo/project, then workspace,
  * then agent sessions.
  *
- * A grouped list: each project and workspace heads its group with a tinted band, chats are split by
- * hairlines. Every row's checkbox sits in one column at the left edge; nesting indents only what
- * follows it. A workspace checkbox covers its own chats and those of the workspaces nested under it,
- * which follow the sidebar's own lineage rule; a project checkbox covers every chat in the project.
+ * Nested boxes: a project is a tinted band; each workspace is a bordered box, one step in, holding
+ * its header band and its chats, and a child workspace's box sits inside its parent's, after the
+ * parent's chats. Every row's checkbox stays in one column at the left edge, outside the boxes;
+ * nesting indents only what follows it. No row dividers: the boxes and bands carry the structure.
+ * A workspace checkbox covers its own chats and those of the workspaces nested under it, which
+ * follow the sidebar's own lineage rule; a project checkbox covers every chat in the project.
  *
  * A workspace the store does not know yet (its host still connecting, or since deleted) is named
  * by its id. The kind glyph comes from the host's record of the chat, never from a name.
@@ -171,7 +173,7 @@ function RepoHeader({
   const selection = resumeSelectionState(covered, selected)
   return (
     // A band a step stronger than a workspace's, so the project reads as the outer group.
-    <label className="grid h-8.5 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center border-t border-border bg-[color-mix(in_srgb,var(--foreground)_5%,var(--worktree-sidebar-accent))] hover:bg-[color-mix(in_srgb,var(--foreground)_9%,var(--worktree-sidebar-accent))] has-[:disabled]:cursor-default">
+    <label className="group/row mt-1.5 grid h-8.5 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center has-[:disabled]:cursor-default">
       <span className="flex justify-center">
         <Checkbox
           checked={selection.checked}
@@ -184,7 +186,7 @@ function RepoHeader({
           )}
         />
       </span>
-      <span className="flex min-w-0 items-center gap-1.5 pr-2.5">
+      <span className="mr-1.5 flex h-full min-w-0 items-center gap-1.5 rounded-t-md bg-[color-mix(in_srgb,var(--foreground)_5%,var(--worktree-sidebar-accent))] pr-2.5 pl-2 group-hover/row:bg-[color-mix(in_srgb,var(--foreground)_9%,var(--worktree-sidebar-accent))]">
         {/* A repo shows its own configured glyph; a project group uses the FolderTree the sidebar's
             own PROJECT_GROUP_META uses. */}
         {header.kind === 'project' ? (
@@ -238,16 +240,21 @@ function WorkspaceRows({
     mixedHosts || (hostId ?? LOCAL_EXECUTION_HOST_ID) !== LOCAL_EXECUTION_HOST_ID
   const covered = resumeWorkspaceSessionIds(node).filter(selectable)
   const selection = resumeSelectionState(covered, selected)
+  // Why: a top-level workspace sits one step in from its project, so its box does too.
+  const indent = (depth + 1) * RESUME_INDENT_PX
   const chatIndent: React.CSSProperties & Record<'--resume-chat-indent', string> = {
-    '--resume-chat-indent': `${(depth + 1) * RESUME_INDENT_PX}px`
+    '--resume-chat-indent': `${indent + RESUME_INDENT_PX}px`
   }
   return (
-    <>
-      {/* The workspace's band heads its group; a nested one is lighter, at its own indent. */}
-      <label
-        data-nested={depth > 0}
-        className="grid h-8 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center border-y border-border bg-worktree-sidebar-accent hover:bg-[color-mix(in_srgb,var(--foreground)_6%,var(--worktree-sidebar-accent))] has-[:disabled]:cursor-default data-[nested=true]:bg-worktree-sidebar-accent/50"
-      >
+    <div className="relative my-1.5 mr-1.5">
+      {/* The box, drawn in the content area only so the checkbox column stays outside it. A
+          child's box lands at its parent's chat indent, inside the parent's. */}
+      <span
+        aria-hidden="true"
+        className="pointer-events-none absolute inset-y-0 right-0 rounded-md border border-border"
+        style={{ left: `calc(1.75rem + ${indent}px)` }}
+      />
+      <label className="group/row grid h-8 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center has-[:disabled]:cursor-default">
         <span className="flex justify-center">
           <Checkbox
             checked={selection.checked}
@@ -260,9 +267,11 @@ function WorkspaceRows({
             )}
           />
         </span>
+        {/* The header band inside the box; a nested one is lighter. */}
         <span
-          className="flex min-w-0 items-center gap-1.5 pr-2.5"
-          style={depth > 0 ? { paddingLeft: depth * RESUME_INDENT_PX } : undefined}
+          data-nested={depth > 0}
+          className="flex h-full min-w-0 items-center gap-1.5 rounded-t-md bg-worktree-sidebar-accent pr-2.5 pl-2 group-hover/row:bg-[color-mix(in_srgb,var(--foreground)_6%,var(--worktree-sidebar-accent))] data-[nested=true]:bg-worktree-sidebar-accent/55"
+          style={{ marginLeft: indent }}
         >
           <WorkspaceKindGlyph kind={kind} />
           <span className="min-w-0 truncate text-[13px] font-semibold text-foreground">{name}</span>
@@ -307,7 +316,7 @@ function WorkspaceRows({
       {node.children.map((child) => (
         <WorkspaceRows key={child.group.workspaceId} node={child} depth={depth + 1} {...rowProps} />
       ))}
-    </>
+    </div>
   )
 }
 
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index 1bf965fa4b4f..ae165496dc43 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -264,11 +264,11 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
             'Chats that would be resumed'
           )}
           // The sidebar's own surface, so its workspaces read here as they do there.
-          className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md bg-worktree-sidebar"
+          className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md bg-worktree-sidebar pt-1 pb-1.5"
           onKeyDown={moveCheckboxFocus}
         >
           {/* Here, not in the groups: a list may hold one set of groups per machine. */}
-          <label className="grid h-7 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center hover:bg-worktree-sidebar-accent has-[:disabled]:cursor-default">
+          <label className="group/row grid h-7 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center has-[:disabled]:cursor-default">
             <span className="flex justify-center">
               <Checkbox
                 checked={allSelection.checked}
@@ -282,7 +282,7 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
                 )}
               />
             </span>
-            <span className="flex min-w-0 items-center gap-1.5 pr-2.5">
+            <span className="mr-1.5 flex h-full min-w-0 items-center gap-1.5 pr-2.5 pl-2 group-hover/row:bg-worktree-sidebar-accent">
               <span className="min-w-0 truncate text-xs font-semibold text-muted-foreground">
                 {translate(
                   'auto.components.NativeChatResumeOnRestartModal.selectAllLabel',

From ad09bffa8725ac1e7d173ffefd5dbdb75cb508d8 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 17:03:22 -0700
Subject: [PATCH 27/37] feat(native-chat): resume interrupted chats on every
 machine: reconnect toast, one status entry, one dialog grouped by machine

When a paired Orca server restarts while chats on it are mid-reply, this
desktop now finds out: each verified connection to a server reads its
restart offers, a toast names the server and offers Resume or Show
chats, the status-bar entry counts the user's own interrupted chats on
every machine, and the resume dialog lists every machine with its own
row, tri-state box and workspaces. A server that predates the offer
capability shows nothing.

Rebuilt on #25652 alone: this branch no longer depends on #25674. The
dialog opens through main's request/consume/subscribe API; a request
carries only the machine it was opened for, and a request while one is
open keeps the open dialog (its focus and the user's ticks). The
offer-store, actions, toast, status entry, machine rows, Select all,
own-only Dismiss, outcome toast, listed dismissal, origin, per-machine
fence and the 195 s continue budget are this branch's own work, carried
over unchanged.
---
 .../structured-agent-session-host-teardown.ts |   2 +-
 ...gent-session-host-test-recovery-capsule.ts |   4 +
 .../structured-agent-session-host.ts          |   6 +-
 ...red-agent-session-restart-audience.test.ts |  11 +
 ...ed-agent-session-restart-failure-ledger.ts |  28 +-
 ...ed-agent-session-restart-ownership.test.ts |  19 +
 ...d-agent-session-restart-resume-contract.ts |   7 +
 ...tured-agent-session-restart-resume-host.ts |   1 +
 .../agent-session-recovery-capsule-entries.ts |  80 ++-
 .../agent-session-recovery-capsule-read.ts    |  20 +
 .../agent-session-recovery-capsule.test.ts    |  62 +-
 .../runtime/agent-session-recovery-capsule.ts |  85 +--
 ...structured-agent-session-create-support.ts |   7 +
 ...restart-offer-workspace-provenance.test.ts |  38 ++
 .../restart-offer-workspace-provenance.ts     |  34 +
 ...agent-session-restart-offer-origin.test.ts | 169 +++++
 ...ured-agent-session-restart-offer-origin.ts |  52 ++
 ...d-agent-session-restart-offer-read.test.ts |  32 +
 ...ctured-agent-session-restart-offer-read.ts |  35 +
 ...nt-session-restart-resumable-empty.test.ts |  50 ++
 ...tured-agent-session-restart-resume.test.ts |  24 +
 ...structured-agent-session-restart-resume.ts |  39 +-
 ...ructured-agent-session-rpc.test-fixture.ts |  11 +-
 .../structured-agent-session-schemas.ts       |   7 +-
 .../NativeChatResumeFailureDetails.tsx        |  46 +-
 .../NativeChatResumeOnRestartAgentRow.tsx     |  31 +-
 .../NativeChatResumeOnRestartGroups.test.tsx  |  33 +-
 .../NativeChatResumeOnRestartGroups.tsx       |  53 +-
 ...ativeChatResumeOnRestartMachineSection.tsx | 113 +++
 ...veChatResumeOnRestartModal.layout.test.tsx | 154 +++++
 ...tiveChatResumeOnRestartModal.list.test.tsx |   9 +-
 ...sumeOnRestartModal.machine-column.test.tsx | 292 ++++++++
 ...ChatResumeOnRestartModal.machines.test.tsx | 411 +++++++++++
 .../NativeChatResumeOnRestartModal.test.tsx   |  75 +-
 .../NativeChatResumeOnRestartModal.tsx        | 407 ++++++-----
 ...ative-chat-launch-resume-decision.test.tsx |  16 +-
 ...-chat-restart-action-notifications.test.ts | 226 +++++-
 ...ative-chat-restart-action-notifications.ts | 211 ++++--
 .../components/native-chat-restart-decided.ts | 113 +++
 .../native-chat-restart-machine-fence.ts      |  35 +
 .../native-chat-restart-machine-name.ts       |  81 +++
 .../native-chat-restart-machines.ts           |  54 ++
 .../native-chat-restart-offer-actions.ts      | 289 ++++++++
 ...ative-chat-restart-offer-activity-watch.ts | 136 ++++
 .../native-chat-restart-offer-payload.ts      |  21 +
 .../native-chat-restart-offer-reopen.ts       |  66 ++
 .../native-chat-restart-offer-test-support.ts |  51 ++
 ...native-chat-restart-offer-triggers.test.ts | 643 ++++++++++++++++++
 .../native-chat-restart-offer-triggers.ts     | 319 +++++++++
 .../native-chat-restart-reconnect-toast.ts    |  84 +++
 .../native-chat-resume-dialog-opening.ts      |  52 ++
 ...tive-chat-resume-failed-chat-watch.test.ts |  25 +-
 .../native-chat-resume-failure-action.ts      |  45 ++
 .../native-chat-resume-machine-views.ts       |  70 ++
 ...ative-chat-resume-machines.test-support.ts |  38 ++
 .../native-chat-resume-on-restart-dialog.ts   |  38 +-
 .../native-chat-resume-on-restart-grouping.ts |   3 +
 ...ve-chat-resume-on-restart-launch-prompt.ts |  10 +
 ...at-resume-on-restart-modal.test-support.ts |   3 +-
 ...at-resume-on-restart-outcome-toast.test.ts | 312 +++++++--
 .../native-chat-resume-on-restart-store.ts    | 598 +++++++---------
 .../native-chat-resume-ownership.test.ts      |  18 +
 .../native-chat-resume-ownership.ts           |  52 ++
 .../native-chat-resume-selection.ts           |  86 +++
 .../native-chat-resume-unsent-requests.ts     |  62 +-
 .../NativeChatInterruptedContinue.test.tsx    |  18 +-
 .../NativeChatInterruptedContinue.tsx         |   8 +-
 .../sidebar/workspace-creator-visibility.ts   |  10 +-
 .../NativeChatResumeStatusSegment.test.tsx    | 175 ++++-
 .../NativeChatResumeStatusSegment.tsx         | 220 ++----
 .../native-chat-resume-status-text.ts         | 165 +++++
 src/renderer/src/i18n/locales/en.json         |  26 +-
 src/renderer/src/i18n/locales/es.json         |  26 +-
 src/renderer/src/i18n/locales/fr.json         |  26 +-
 src/renderer/src/i18n/locales/ja.json         |  26 +-
 src/renderer/src/i18n/locales/ko.json         |  26 +-
 src/renderer/src/i18n/locales/zh.json         |  26 +-
 ...ai-vault-structured-session-reveal.test.ts |  16 +
 ...tivate-ai-vault-structured-session.test.ts |  63 ++
 .../activate-ai-vault-structured-session.ts   |  99 ++-
 ...tured-agent-session-tab-activation.test.ts |  54 ++
 ...structured-agent-session-tab-activation.ts |  82 ++-
 .../structured-agent-session-client.test.ts   |  14 +
 .../structured-agent-session-client.ts        |  39 +-
 src/shared/protocol-version.ts                |   9 +
 src/shared/restart-offer-origin.test.ts       |  51 ++
 src/shared/restart-offer-origin.ts            |  38 ++
 .../rpc-params-catalog.generated.ts           |   9 +-
 .../structured-agent-session-params.ts        |  17 -
 ...structured-agent-session-restart-params.ts |  34 +
 src/shared/workspace-creator-provenance.ts    |  19 +
 .../cross-version-restart-offers.unit.test.ts |  94 +++
 .../structured-agent-session-host-fixture.ts  |   2 +
 93 files changed, 6530 insertions(+), 1066 deletions(-)
 create mode 100644 src/main/runtime/agent-session-recovery-capsule-read.ts
 create mode 100644 src/main/runtime/restart-offer-workspace-provenance.test.ts
 create mode 100644 src/main/runtime/restart-offer-workspace-provenance.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-restart-offer-origin.test.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-restart-offer-origin.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-restart-offer-read.test.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-restart-offer-read.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-restart-resumable-empty.test.ts
 create mode 100644 src/renderer/src/components/NativeChatResumeOnRestartMachineSection.tsx
 create mode 100644 src/renderer/src/components/NativeChatResumeOnRestartModal.layout.test.tsx
 create mode 100644 src/renderer/src/components/NativeChatResumeOnRestartModal.machine-column.test.tsx
 create mode 100644 src/renderer/src/components/NativeChatResumeOnRestartModal.machines.test.tsx
 create mode 100644 src/renderer/src/components/native-chat-restart-decided.ts
 create mode 100644 src/renderer/src/components/native-chat-restart-machine-fence.ts
 create mode 100644 src/renderer/src/components/native-chat-restart-machine-name.ts
 create mode 100644 src/renderer/src/components/native-chat-restart-machines.ts
 create mode 100644 src/renderer/src/components/native-chat-restart-offer-actions.ts
 create mode 100644 src/renderer/src/components/native-chat-restart-offer-activity-watch.ts
 create mode 100644 src/renderer/src/components/native-chat-restart-offer-payload.ts
 create mode 100644 src/renderer/src/components/native-chat-restart-offer-reopen.ts
 create mode 100644 src/renderer/src/components/native-chat-restart-offer-test-support.ts
 create mode 100644 src/renderer/src/components/native-chat-restart-offer-triggers.test.ts
 create mode 100644 src/renderer/src/components/native-chat-restart-offer-triggers.ts
 create mode 100644 src/renderer/src/components/native-chat-restart-reconnect-toast.ts
 create mode 100644 src/renderer/src/components/native-chat-resume-dialog-opening.ts
 create mode 100644 src/renderer/src/components/native-chat-resume-failure-action.ts
 create mode 100644 src/renderer/src/components/native-chat-resume-machine-views.ts
 create mode 100644 src/renderer/src/components/native-chat-resume-machines.test-support.ts
 create mode 100644 src/renderer/src/components/native-chat-resume-on-restart-launch-prompt.ts
 create mode 100644 src/renderer/src/components/native-chat-resume-ownership.test.ts
 create mode 100644 src/renderer/src/components/native-chat-resume-ownership.ts
 create mode 100644 src/renderer/src/components/native-chat-resume-selection.ts
 create mode 100644 src/renderer/src/components/status-bar/native-chat-resume-status-text.ts
 create mode 100644 src/shared/restart-offer-origin.test.ts
 create mode 100644 src/shared/restart-offer-origin.ts
 create mode 100644 src/shared/rpc-contract/structured-agent-session-restart-params.ts
 create mode 100644 tests/e2e/cross-version-wire/cross-version-restart-offers.unit.test.ts

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.ts
index 759075639593..cd429e91fcbb 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-teardown.ts
@@ -9,7 +9,7 @@ import type { AgentSessionResumeTrigger } from '../../../shared/agent-session-re
 import { SUPERVISED_GRACEFUL_EXIT_MS } from '../../claude/claude-child-exit-proof-ladder'
 import { PROVIDER_SUPERVISOR_MAX_STOP_MS } from '../../provider-process/provider-process-supervisor'
 import { SNAPSHOT_DRAIN_TIMEOUT_MS } from './structured-agent-session-eviction'
-import type { StructuredAgentSessionRestartResume } from './structured-agent-session-restart-resume-host'
+import type { StructuredAgentSessionRestartResume } from './structured-agent-session-restart-resume-contract'
 import {
   evictOwnedStructuredAgentSessions,
   type StructuredAgentSessionLifetimeContext
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-recovery-capsule.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-recovery-capsule.ts
index 0319346a9ab1..a79b27f650d8 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-recovery-capsule.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-recovery-capsule.ts
@@ -45,6 +45,10 @@ export class TrackedTestRecoveryCapsule extends AgentSessionRecoveryCapsule {
     return this.track(super.dismiss(...args))
   }
 
+  override dismissListed(...args: Parameters<Capsule['dismissListed']>) {
+    return this.track(super.dismissListed(...args))
+  }
+
   override forgetSuperseded(...args: Parameters<Capsule['forgetSuperseded']>) {
     return this.track(super.forgetSuperseded(...args))
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index e0f193ba0b49..d646b8118b8e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -42,10 +42,8 @@ import { StructuredAgentSessionEventRecovery } from './structured-agent-session-
 import { StructuredAgentSessionBackgroundTaskChannel } from './structured-agent-session-background-task-channel'
 import { StructuredAgentSessionClientDelivery } from './structured-agent-session-client-delivery'
 import { StructuredAgentSessionConversations } from './structured-agent-session-conversations'
-import {
-  createStructuredAgentSessionRestartResume,
-  type StructuredAgentSessionRestartResume
-} from './structured-agent-session-restart-resume-host'
+import { createStructuredAgentSessionRestartResume } from './structured-agent-session-restart-resume-host'
+import type { StructuredAgentSessionRestartResume } from './structured-agent-session-restart-resume-contract'
 import { structuredAgentSessionRestartResumeSurfaces } from './structured-agent-session-restart-resume-wiring'
 import * as conversation from './structured-agent-session-host-delivery'
 import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-audience.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-audience.test.ts
index f468d0bd12ee..7fa599ffa4e8 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-audience.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-audience.test.ts
@@ -34,6 +34,17 @@ it('neither lists nor dismisses an offer the caller cannot show', async () => {
   expect(await offersIn(root)).toEqual([])
 })
 
+it('does not dismiss an offer the caller cannot show, even listed with its interruption', async () => {
+  const { host, root } = await interruptedRestart()
+  const [offer] = await host.restartResume.list()
+  const listed = [{ sessionId: SESSION, recordedAt: offer!.recordedAt }]
+
+  expect(await host.restartResume.dismissListed(listed, cannotShowCodex)).toBe(0)
+  expect(await offersIn(root)).toHaveLength(1)
+  expect(await host.restartResume.dismissListed(listed, showsCodex)).toBe(1)
+  expect(await offersIn(root)).toEqual([])
+})
+
 it('neither continues nor reserves an offer the caller cannot show, named or not', async () => {
   const { host, root, acquire, dispatch } = await interruptedRestart()
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-ledger.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-ledger.ts
index 1b3269b7add8..584776d29721 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-ledger.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-failure-ledger.ts
@@ -10,7 +10,8 @@
 import type {
   AgentSessionRecoveryCapsule,
   AgentSessionResumeFailureInput,
-  AgentSessionResumeFailureRecord
+  AgentSessionResumeFailureRecord,
+  ListedRestartOffer
 } from '../../runtime/agent-session-recovery-capsule'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import type {
@@ -34,7 +35,13 @@ import type { StructuredAgentSessionLogger } from './structured-agent-session-lo
 
 type FailureCapsule = Pick<
   AgentSessionRecoveryCapsule,
-  'listFailed' | 'completeResume' | 'failResume' | 'rollbackResume' | 'dismiss' | 'clearAll'
+  | 'listFailed'
+  | 'completeResume'
+  | 'failResume'
+  | 'rollbackResume'
+  | 'dismiss'
+  | 'dismissListed'
+  | 'clearAll'
 >
 
 export type StructuredAgentSessionRestartFailureLedger = {
@@ -65,6 +72,12 @@ export type StructuredAgentSessionRestartFailureLedger = {
     beforeClearAll: (audience?: StructuredAgentSessionRestartAudience) => void | Promise<void>,
     audience?: StructuredAgentSessionRestartAudience
   ) => Promise<number>
+  /** Forgets offers exactly as a client listed them; see the capsule's `dismissListed`. With an
+   *  audience, only records of agents it sees go. */
+  dismissListed: (
+    listed: readonly ListedRestartOffer[],
+    audience?: StructuredAgentSessionRestartAudience
+  ) => Promise<number>
 }
 
 /** Which continuation outcomes count as the agent not carrying on, and how each is filed. */
@@ -252,6 +265,17 @@ export function createStructuredAgentSessionRestartFailureLedger(deps: {
         // A newer Orca's offers and failures were never shown here, so "dismiss all" keeps them.
         const keep = (marker: AgentSessionResumeMarker) => deps.savedByNewerOrca(marker.sessionId)
         return (await deps.capsule?.clearAll(deps.now(), keep)) ?? 0
+      }),
+    dismissListed: (listed, audience) =>
+      deps.enqueue(async () => {
+        // Decided under the capsule lock, as `dismiss` does.
+        const hidden = audience
+          ? (marker: AgentSessionResumeMarker) => {
+              const record = deps.getRecord(marker.sessionId)
+              return record === null || !audience(record.provider)
+            }
+          : undefined
+        return (await deps.capsule?.dismissListed(listed, deps.now(), hidden)) ?? 0
       })
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts
index 0d73656b3477..6da3942082b6 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts
@@ -495,3 +495,22 @@ it('files a restart refused by a conflicted claim under its code, with its detai
     ])
   )
 })
+
+it('continues a chat once when two desktops both resume it, and the second hears nothing failed', async () => {
+  const { host } = await interruptedRestart()
+  await host.restartResume.list()
+
+  const [first, second] = await Promise.all([
+    host.restartResume.continueAfterRestart([SESSION], 'desktop-a'),
+    host.restartResume.continueAfterRestart([SESSION], 'desktop-b')
+  ])
+  const later = await host.restartResume.continueAfterRestart([SESSION], 'desktop-b')
+
+  expect([...first.continued, ...second.continued]).toMatchObject([{ outcome: 'continued' }])
+  // The loser reserved nothing, so it sent nothing and has no failure to file or report.
+  expect(later.continued).toEqual([])
+  expect([...first.failed!, ...second.failed!, ...later.failed!]).toEqual([])
+  expect(
+    (await statusNotes(host)).filter((note) => note.text === AGENT_SESSION_RESTART_CONTINUATION_NOTE)
+  ).toHaveLength(1)
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-contract.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-contract.ts
index 1cbbd8236ad0..9317ac2a5908 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-contract.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-contract.ts
@@ -1,6 +1,7 @@
 // What a host's restart-resume surface offers: teardown's offer recording, the offer list and its
 // actions, and Continue on a cut reply.
 
+import type { ListedRestartOffer } from '../../runtime/agent-session-recovery-capsule'
 import type { AgentSessionResumeTrigger } from '../../../shared/agent-session-resume-marker'
 import type { createInterruptedContinuation } from './structured-agent-session-interrupted-continuation'
 import type { StructuredAgentSessionContinuationOutcome } from './structured-agent-session-restart-continuation'
@@ -42,6 +43,12 @@ export type StructuredAgentSessionRestartResume = {
     sessionIds?: readonly string[],
     audience?: StructuredAgentSessionRestartAudience
   ) => Promise<number>
+  /** Forgets offers exactly as a client listed them: a chat interrupted again since, or being
+   *  resumed by another action right now, keeps its record. An audience limits it as `dismiss`. */
+  dismissListed: (
+    listed: readonly ListedRestartOffer[],
+    audience?: StructuredAgentSessionRestartAudience
+  ) => Promise<number>
   /** The chat's agent proved a start: its offer ends unless the start is a resume's own. */
   onAgentStarted: (sessionId: string) => void
   /** Continue on a reply an Orca stop cut off, offer or not; the send itself retires any offer. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-host.ts
index 120aefb6f205..b6cb25719e83 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-host.ts
@@ -290,6 +290,7 @@ export function createStructuredAgentSessionRestartResume(
         },
         audience
       ),
+    dismissListed: failures.dismissListed,
     continueAfterRestart,
     onAgentStarted: withdrawal.onAgentStarted,
     continueInterrupted: createInterruptedContinuation(continuationHost, readMarkers)
diff --git a/src/main/runtime/agent-session-recovery-capsule-entries.ts b/src/main/runtime/agent-session-recovery-capsule-entries.ts
index 9deb2e20fe67..09ef40bc5bfc 100644
--- a/src/main/runtime/agent-session-recovery-capsule-entries.ts
+++ b/src/main/runtime/agent-session-recovery-capsule-entries.ts
@@ -215,16 +215,90 @@ export function shouldReplaceMarker(
 /** Records "dismiss all" leaves as they were: this host does not list them (a newer Orca's chats). */
 export type KeepRecord = (marker: AgentSessionResumeMarker) => boolean
 
-/** What a "dismiss all" keeps, and how many pending offers it ends. */
+/** What a "dismiss all" keeps, and how many pending offers it ends. A chat another action is
+ *  resuming right now (another device's, on a shared host) stays with its earlier failure for that
+ *  action to settle; the action lease ends a reservation whose action died. */
 export function splitDismissedAll(
   state: Pick<RecoveryCapsuleState, 'entries' | 'failed'>,
   keep: KeepRecord
 ): { kept: Pick<RecoveryCapsuleState, 'entries' | 'failed'>; dismissedPending: number } {
-  const entries = state.entries.filter((entry) => keep(entry.marker))
+  const resuming = new Set(
+    state.entries
+      .filter((entry) => entry.state === 'in-progress')
+      .map((entry) => entry.marker.sessionId)
+  )
+  const kept = (marker: AgentSessionResumeMarker): boolean =>
+    resuming.has(marker.sessionId) || keep(marker)
   return {
-    kept: { entries, failed: state.failed.filter((failure) => keep(failure.marker)) },
+    kept: {
+      entries: state.entries.filter((entry) => kept(entry.marker)),
+      failed: state.failed.filter((failure) => kept(failure.marker))
+    },
     dismissedPending: state.entries.filter(
       (entry) => entry.state === 'pending' && !keep(entry.marker)
     ).length
   }
 }
+
+/** One offer as a client listed it: the chat and the interruption it was shown. */
+export type ListedRestartOffer = { sessionId: string; recordedAt: number }
+
+/** What dismissing listed offers keeps: a record no longer the one listed (a newer interruption),
+ *  and every record of a chat another action is resuming right now. */
+export function splitDismissedListed(
+  state: Pick<RecoveryCapsuleState, 'entries' | 'failed'>,
+  listed: readonly ListedRestartOffer[],
+  keepRecord: KeepRecord = () => false
+): { kept: Pick<RecoveryCapsuleState, 'entries' | 'failed'>; dismissed: Set<string> } {
+  const shown = new Map(listed.map((offer) => [offer.sessionId, offer.recordedAt]))
+  const resuming = new Set(
+    state.entries
+      .filter((entry) => entry.state === 'in-progress')
+      .map((entry) => entry.marker.sessionId)
+  )
+  const dismissed = new Set<string>()
+  const keep = (marker: AgentSessionResumeMarker): boolean => {
+    if (
+      resuming.has(marker.sessionId) ||
+      shown.get(marker.sessionId) !== marker.recordedAt ||
+      keepRecord(marker)
+    ) {
+      return true
+    }
+    dismissed.add(marker.sessionId)
+    return false
+  }
+  return {
+    kept: {
+      entries: state.entries.filter((entry) => keep(entry.marker)),
+      failed: state.failed.filter((failure) => keep(failure.marker))
+    },
+    dismissed
+  }
+}
+
+/** Records the chat itself has since superseded go; witness-keyed, so a newer record stays. */
+export function withoutSuperseded(
+  state: Pick<RecoveryCapsuleState, 'entries' | 'failed'>,
+  superseded: readonly { sessionId: string; recordedAt: number; failedAt?: number }[]
+): Pick<RecoveryCapsuleState, 'entries' | 'failed'> {
+  return {
+    entries: state.entries.filter(
+      (entry) =>
+        entry.state !== 'pending' ||
+        !superseded.some(
+          (gone) =>
+            gone.failedAt === undefined &&
+            gone.sessionId === entry.marker.sessionId &&
+            gone.recordedAt === entry.marker.recordedAt
+        )
+    ),
+    failed: state.failed.filter(
+      (failure) =>
+        !superseded.some(
+          (gone) =>
+            gone.sessionId === failure.marker.sessionId && gone.failedAt === failure.failedAt
+        )
+    )
+  }
+}
diff --git a/src/main/runtime/agent-session-recovery-capsule-read.ts b/src/main/runtime/agent-session-recovery-capsule-read.ts
new file mode 100644
index 000000000000..cb65a72cbcfa
--- /dev/null
+++ b/src/main/runtime/agent-session-recovery-capsule-read.ts
@@ -0,0 +1,20 @@
+import { readNodeFileWithinLimit } from '../../shared/node-bounded-file-reader'
+import { parseState, type RecoveryCapsuleState } from './agent-session-recovery-capsule-entries'
+
+export const MAX_RECOVERY_CAPSULE_BYTES = 4 * 1024 * 1024
+
+/** The capsule as stored; a missing file is an empty one. Callers hold the file's lock. */
+export async function readRecoveryCapsuleState(filePath: string): Promise<RecoveryCapsuleState> {
+  let raw: string
+  try {
+    raw = (await readNodeFileWithinLimit(filePath, MAX_RECOVERY_CAPSULE_BYTES)).buffer.toString(
+      'utf8'
+    )
+  } catch (error) {
+    if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+      return { entries: [], failed: [] }
+    }
+    throw error
+  }
+  return parseState(raw)
+}
diff --git a/src/main/runtime/agent-session-recovery-capsule.test.ts b/src/main/runtime/agent-session-recovery-capsule.test.ts
index bb3c93a6a989..b4f2e17ca219 100644
--- a/src/main/runtime/agent-session-recovery-capsule.test.ts
+++ b/src/main/runtime/agent-session-recovery-capsule.test.ts
@@ -270,6 +270,33 @@ describe('durable restart offers', () => {
     expect(await capsule.list(NOW)).toEqual([marker({ sessionId: 'third' }), marker()])
   })
 
+  it('forgets listed records only while they are still the interruption the client listed', async () => {
+    await capsule.record(
+      [marker(), marker({ sessionId: 'second' }), marker({ sessionId: 'third' })],
+      NOW
+    )
+    // Interrupted again after the listing: the newer offer was never shown, so it stays.
+    await capsule.record([marker({ sessionId: 'second', recordedAt: NOW + 5 })], NOW + 5)
+
+    const listed = [SESSION, 'second', 'third'].map((sessionId) => ({ sessionId, recordedAt: NOW }))
+    expect(await capsule.dismissListed(listed, NOW + 6)).toBe(2)
+    expect(await capsule.list(NOW + 6)).toEqual([
+      marker({ sessionId: 'second', recordedAt: NOW + 5 })
+    ])
+  })
+
+  it('leaves a listed chat another action is resuming, and its earlier failure, to that action', async () => {
+    await capsule.record([marker()], NOW)
+    await fileFailure()
+    // A retry on another desktop reserves the failed chat; this desktop listed it before that.
+    await capsule.beginResume([SESSION], 'operation-b', NOW)
+
+    expect(await capsule.dismissListed([{ sessionId: SESSION, recordedAt: NOW }], NOW)).toBe(0)
+    expect(await capsule.listFailed(NOW)).toHaveLength(1)
+    await capsule.failResume('operation-b', [failure({ reason: 'retry_failed' })], NOW)
+    expect(await capsule.listFailed(NOW)).toMatchObject([{ reason: 'retry_failed' }])
+  })
+
   it('forgets every record of any state except the ones kept, without a fence', async () => {
     await capsule.record(
       [marker(), marker({ sessionId: 'second' }), marker({ sessionId: 'kept' })],
@@ -487,16 +514,17 @@ describe('durable restart offers', () => {
     expect(await capsule.list(later)).toEqual([])
   })
 
-  it('dismisses pending and active recovery records', async () => {
+  // On a shared host the action may be another device's resume: dismissing what this listing showed
+  // must not take its reservation, or a refusal it meets would never be filed.
+  it('dismisses pending records and leaves a chat another action is resuming to that action', async () => {
     await capsule.record([marker(), marker({ sessionId: 'second' })], NOW)
     await capsule.beginResume([SESSION], 'operation-a', NOW)
 
     expect(await capsule.clearAll(NOW)).toBe(1)
     expect(await capsule.list(NOW)).toEqual([])
 
-    // A later failed action cannot resurrect a record the user explicitly dismissed.
-    await capsule.rollbackResume('operation-a', NOW)
-    expect(await capsule.list(NOW)).toEqual([])
+    await capsule.failResume('operation-a', [failure()], NOW)
+    expect(await capsule.listFailed(NOW)).toMatchObject([{ marker: marker() }])
   })
 
   it('fences a late teardown write until a genuinely newer interruption', async () => {
@@ -647,3 +675,29 @@ it('does not retain lock timers after reads, writes, or failed publications', as
     vi.useRealTimers()
   }
 })
+
+describe('whether the capsule holds anything', () => {
+  it('is no for a missing file and for one every record left', async () => {
+    expect(await capsule.holdsAnyRecord()).toBe(false)
+    await capsule.record([marker()], NOW)
+    await capsule.dismiss([SESSION], NOW)
+    expect(await capsule.holdsAnyRecord()).toBe(false)
+  })
+
+  it('counts a pending offer, a reservation, and a filed failure alike', async () => {
+    await capsule.record([marker()], NOW)
+    expect(await capsule.holdsAnyRecord()).toBe(true)
+    await capsule.beginResume([SESSION], 'operation-a', NOW)
+    // Reserved, so the listing no longer shows it — the file still holds it.
+    expect(await capsule.list(NOW)).toEqual([])
+    expect(await capsule.holdsAnyRecord()).toBe(true)
+    await capsule.failResume('operation-a', [failure()], NOW)
+    expect(await capsule.list(NOW)).toEqual([])
+    expect(await capsule.holdsAnyRecord()).toBe(true)
+  })
+
+  it('counts unreadable bytes as holding something', async () => {
+    await writeFile(filePath, '{not json')
+    expect(await capsule.holdsAnyRecord()).toBe(true)
+  })
+})
diff --git a/src/main/runtime/agent-session-recovery-capsule.ts b/src/main/runtime/agent-session-recovery-capsule.ts
index ba34c82fc57c..923266549523 100644
--- a/src/main/runtime/agent-session-recovery-capsule.ts
+++ b/src/main/runtime/agent-session-recovery-capsule.ts
@@ -1,7 +1,6 @@
 import { rm } from 'node:fs/promises'
 import { join } from 'node:path'
 import type { AgentSessionResumeMarker } from '../../shared/agent-session-resume-marker'
-import { readNodeFileWithinLimit } from '../../shared/node-bounded-file-reader'
 import { stringifyJsonWithinByteLimit } from '../../shared/node-bounded-json-stringify'
 import {
   durableWriteTempPath,
@@ -13,23 +12,29 @@ import { withFileTransactionLock } from '../file-transaction-lock'
 import {
   MAX_FAILURE_FIELD_LENGTH,
   normalizeState,
-  parseState,
   shouldReplaceMarker,
   splitDismissedAll,
+  splitDismissedListed,
+  withoutSuperseded,
   type AgentSessionResumeFailureInput,
   type AgentSessionResumeFailureRecord,
   type KeepRecord,
+  type ListedRestartOffer,
   type RecoveryCapsuleState,
   type RecoveryEntry
 } from './agent-session-recovery-capsule-entries'
+import {
+  MAX_RECOVERY_CAPSULE_BYTES,
+  readRecoveryCapsuleState
+} from './agent-session-recovery-capsule-read'
 
 export type {
   AgentSessionResumeFailureInput,
-  AgentSessionResumeFailureRecord
+  AgentSessionResumeFailureRecord,
+  ListedRestartOffer
 } from './agent-session-recovery-capsule-entries'
 
 export const AGENT_SESSION_RECOVERY_CAPSULE_FILE = 'agent-session-recovery.json'
-const MAX_CAPSULE_BYTES = 4 * 1024 * 1024
 
 /** Crash-leftover temp files only; offers themselves have no expiry. */
 const STALE_WRITE_TEMP_FILE_AGE_MS = 24 * 60 * 60 * 1000
@@ -51,6 +56,19 @@ export class AgentSessionRecoveryCapsule {
     })
   }
 
+  /** Whether the file holds anything at all — any entry in any state, any failure — read raw so a
+   *  reservation or replacement counts too. Unreadable bytes count: only provable emptiness is no. */
+  holdsAnyRecord(): Promise<boolean> {
+    return withFileTransactionLock(this.filePath, async () => {
+      try {
+        const { entries, failed } = await this.readState()
+        return entries.length > 0 || failed.length > 0
+      } catch {
+        return true
+      }
+    })
+  }
+
   /** Offers that were acted on and did not end with the agent carrying on. Read-only, like `list`. */
   listFailed(now: number): Promise<AgentSessionResumeFailureRecord[]> {
     return withFileTransactionLock(
@@ -232,6 +250,20 @@ export class AgentSessionRecoveryCapsule {
     })
   }
 
+  /** Forgets offers exactly as a client listed them. A chat interrupted again since, or being
+   *  resumed by another action right now, keeps its record: the listing never named those. A
+   *  record `keep` answers true for stays too, read against the stored marker under the lock. */
+  dismissListed(listed: readonly ListedRestartOffer[], now: number, keep?: KeepRecord) {
+    return withFileTransactionLock(this.filePath, async () => {
+      const state = await this.readState()
+      const { kept, dismissed } = splitDismissedListed(normalizeState(state, now), listed, keep)
+      if (dismissed.size > 0) {
+        await this.publish(kept, now, state.dismissedAt)
+      }
+      return dismissed.size
+    })
+  }
+
   /** Drops records the chat itself has since superseded — the user's own newer message ends both a
    *  pending offer and a recorded failure. Witness-keyed (`recordedAt`, and `failedAt` for a
    *  failure) so a fresh record written after the caller read the stale one is kept. */
@@ -242,25 +274,9 @@ export class AgentSessionRecoveryCapsule {
     return withFileTransactionLock(this.filePath, async () => {
       const state = await this.readState()
       const { entries, failed } = normalizeState(state, now)
-      const keptEntries = entries.filter(
-        (entry) =>
-          entry.state !== 'pending' ||
-          !superseded.some(
-            (gone) =>
-              gone.failedAt === undefined &&
-              gone.sessionId === entry.marker.sessionId &&
-              gone.recordedAt === entry.marker.recordedAt
-          )
-      )
-      const keptFailures = failed.filter(
-        (failure) =>
-          !superseded.some(
-            (gone) =>
-              gone.sessionId === failure.marker.sessionId && gone.failedAt === failure.failedAt
-          )
-      )
-      if (keptEntries.length !== entries.length || keptFailures.length !== failed.length) {
-        await this.publish({ entries: keptEntries, failed: keptFailures }, now, state.dismissedAt)
+      const kept = withoutSuperseded({ entries, failed }, superseded)
+      if (kept.entries.length !== entries.length || kept.failed.length !== failed.length) {
+        await this.publish(kept, now, state.dismissedAt)
       }
     })
   }
@@ -292,9 +308,9 @@ export class AgentSessionRecoveryCapsule {
         return 0
       }
       const { kept, dismissedPending } = splitDismissedAll(state, keep)
-      // Dismiss is the explicit user request to forget every recovery record it was shown. An
-      // in-flight action may still finish, but its later complete/rollback becomes a no-op and
-      // cannot resurrect a row the user dismissed.
+      // Dismiss is the explicit user request to forget every recovery record it was shown. A chat
+      // in-flight on another action was never shown (listing returns pending only); that action
+      // settles it, and the fence still stops a stale teardown writer.
       await this.publish(kept, now, now)
       return dismissedPending
     })
@@ -304,19 +320,8 @@ export class AgentSessionRecoveryCapsule {
     return entry.state === 'in-progress' && entry.operationId === operationId
   }
 
-  private async readState(): Promise<RecoveryCapsuleState> {
-    let raw: string
-    try {
-      raw = (await readNodeFileWithinLimit(this.filePath, MAX_CAPSULE_BYTES)).buffer.toString(
-        'utf8'
-      )
-    } catch (error) {
-      if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
-        return { entries: [], failed: [] }
-      }
-      throw error
-    }
-    return parseState(raw)
+  private readState(): Promise<RecoveryCapsuleState> {
+    return readRecoveryCapsuleState(this.filePath)
   }
 
   private async publish(
@@ -332,7 +337,7 @@ export class AgentSessionRecoveryCapsule {
         ...(dismissedAt === undefined ? {} : { dismissedAt }),
         ...(failed.length === 0 ? {} : { failed })
       },
-      MAX_CAPSULE_BYTES
+      MAX_RECOVERY_CAPSULE_BYTES
     )
     await removeStaleDurableWriteTempFiles(this.filePath, {
       minimumAgeMs: STALE_WRITE_TEMP_FILE_AGE_MS
diff --git a/src/main/runtime/orca-runtime-get-structured-agent-session-create-support.ts b/src/main/runtime/orca-runtime-get-structured-agent-session-create-support.ts
index 0fcdaae95323..dce5bd618e9e 100644
--- a/src/main/runtime/orca-runtime-get-structured-agent-session-create-support.ts
+++ b/src/main/runtime/orca-runtime-get-structured-agent-session-create-support.ts
@@ -22,6 +22,8 @@ import {
   isFloatingWorkspaceSelector
 } from '../../shared/floating-workspace-worktree'
 import { parseWorkspaceKey } from '../../shared/workspace-scope'
+import { readRestartOfferWorkspaceProvenance } from './restart-offer-workspace-provenance'
+import type { RestartOfferWorkspaceProvenance } from '../../shared/restart-offer-origin'
 import {
   agentSessionAccountHome,
   type AgentSessionAccountHome
@@ -33,6 +35,11 @@ import {
 import { agentSessionWireProviderHandle } from '../../shared/agent-session-provider-handle-encoding'
 
 export class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport extends OrcaRuntimeWithGetWorktreePs {
+  /** Who made the workspace an offered restart chat ran in; see `restartOfferOrigin`. */
+  restartOfferWorkspaceProvenance(workspaceId: string): RestartOfferWorkspaceProvenance | undefined {
+    return readRestartOfferWorkspaceProvenance(this.store, workspaceId)
+  }
+
   async getStructuredAgentSessionCreateSupport(
     worktreeSelector: string,
     agent: StructuredAgentId
diff --git a/src/main/runtime/restart-offer-workspace-provenance.test.ts b/src/main/runtime/restart-offer-workspace-provenance.test.ts
new file mode 100644
index 000000000000..b324806c5b0b
--- /dev/null
+++ b/src/main/runtime/restart-offer-workspace-provenance.test.ts
@@ -0,0 +1,38 @@
+import { expect, it } from 'vitest'
+import type { FolderWorkspace } from '../../shared/folder-workspace-types'
+import type { WorktreeMeta } from '../../shared/worktree/meta-types'
+
+type Records = Pick<WorktreeMeta, 'creatorProvenance' | 'automationProvenance'>
+import { readRestartOfferWorkspaceProvenance } from './restart-offer-workspace-provenance'
+
+const MINE = { kind: 'paired-device' as const, deviceId: 'device-mine' }
+
+function store(
+  meta: Record<string, Records>,
+  folders: Pick<FolderWorkspace, 'id' | 'creatorProvenance'>[]
+) {
+  return {
+    getWorktreeMeta: (id: string): Records | undefined => meta[id],
+    getFolderWorkspaces: () => folders
+  }
+}
+
+it('reads a git worktree’s records by its id, and a folder workspace’s by its key', () => {
+  const host = store({ 'repo::/work/a': { creatorProvenance: MINE } }, [
+    { id: 'folder-1', creatorProvenance: { kind: 'host' } }
+  ])
+  expect(readRestartOfferWorkspaceProvenance(host, 'repo::/work/a')).toEqual({
+    creatorProvenance: MINE,
+    automationProvenance: undefined
+  })
+  expect(readRestartOfferWorkspaceProvenance(host, 'folder:folder-1')).toEqual({
+    creatorProvenance: { kind: 'host' }
+  })
+})
+
+it('has no record for a workspace the host does not know', () => {
+  const host = store({}, [])
+  expect(readRestartOfferWorkspaceProvenance(host, 'repo::/main')).toBeUndefined()
+  expect(readRestartOfferWorkspaceProvenance(host, 'folder:gone')).toBeUndefined()
+  expect(readRestartOfferWorkspaceProvenance(null, 'repo::/main')).toBeUndefined()
+})
diff --git a/src/main/runtime/restart-offer-workspace-provenance.ts b/src/main/runtime/restart-offer-workspace-provenance.ts
new file mode 100644
index 000000000000..67554b2eff0c
--- /dev/null
+++ b/src/main/runtime/restart-offer-workspace-provenance.ts
@@ -0,0 +1,34 @@
+import type { RestartOfferWorkspaceProvenance } from '../../shared/restart-offer-origin'
+import { parseWorkspaceKey } from '../../shared/workspace-scope'
+import type { FolderWorkspace } from '../../shared/folder-workspace-types'
+import type { WorktreeMeta } from '../../shared/worktree/meta-types'
+
+/** The store reads this needs; the runtime's store provides them. */
+type ProvenanceStore = {
+  getWorktreeMeta: (
+    worktreeId: string
+  ) => Pick<WorktreeMeta, 'creatorProvenance' | 'automationProvenance'> | undefined
+  getFolderWorkspaces?: () => readonly Pick<FolderWorkspace, 'id' | 'creatorProvenance'>[]
+}
+
+/** The creator and automation records of the workspace an offered chat ran in, as this host keeps
+ *  them; undefined for one it has no record of (a repo's main checkout, a removed workspace). */
+export function readRestartOfferWorkspaceProvenance(
+  store: ProvenanceStore | null,
+  workspaceId: string
+): RestartOfferWorkspaceProvenance | undefined {
+  if (!store) {
+    return undefined
+  }
+  const scope = parseWorkspaceKey(workspaceId)
+  if (scope?.type === 'folder') {
+    const workspace = store
+      .getFolderWorkspaces?.()
+      .find((entry) => entry.id === scope.folderWorkspaceId)
+    return workspace ? { creatorProvenance: workspace.creatorProvenance } : undefined
+  }
+  const meta = store.getWorktreeMeta(scope?.type === 'worktree' ? scope.worktreeId : workspaceId)
+  return meta
+    ? { creatorProvenance: meta.creatorProvenance, automationProvenance: meta.automationProvenance }
+    : undefined
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-restart-offer-origin.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-restart-offer-origin.test.ts
new file mode 100644
index 000000000000..c98257613c1b
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-restart-offer-origin.test.ts
@@ -0,0 +1,169 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type { RestartOfferWorkspaceProvenance } from '../../../../shared/restart-offer-origin'
+import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import type { RpcResponse } from '../core'
+import { DESKTOP_RPC_CALLER } from '../rpc-caller-identity'
+import {
+  call,
+  hostStub,
+  SESSION,
+  STRUCTURED_CLIENT
+} from './structured-agent-session-rpc.test-fixture'
+
+const shortcut = vi.hoisted(() => ({ empty: vi.fn(async () => false) }))
+vi.mock('./structured-agent-session-restart-offer-read', () => ({
+  restartOffersProvablyEmpty: shortcut.empty
+}))
+
+const WORKSPACES: Record<string, RestartOfferWorkspaceProvenance> = {
+  mine: { creatorProvenance: { kind: 'paired-device', deviceId: 'device-mine' } },
+  theirs: { creatorProvenance: { kind: 'paired-device', deviceId: 'device-theirs' } },
+  'host-made': { creatorProvenance: { kind: 'host' } },
+  automated: {
+    automationProvenance: {
+      kind: 'created-by-automation',
+      automationId: 'automation-1',
+      automationNameSnapshot: 'Nightly',
+      automationRunId: 'run-1',
+      automationRunTitleSnapshot: 'Nightly',
+      createdAt: 1,
+      executionTargetType: 'local',
+      executionTargetId: 'local',
+      projectId: 'project-1'
+    }
+  }
+}
+const row = (sessionId: string, workspaceId: string) => ({ sessionId, workspaceId, recordedAt: 1 })
+const restartResume = {
+  list: vi.fn(async () => [
+    row('a', 'mine'),
+    row('b', 'theirs'),
+    row('c', 'host-made'),
+    row('d', 'main-checkout'),
+    row('e', 'automated')
+  ]),
+  listFailures: vi.fn(async () => [row('f', 'theirs')]),
+  dismiss: vi.fn(async () => 1),
+  dismissListed: vi.fn(async (_listed: unknown, _audience?: unknown) => 1),
+  continueAfterRestart: vi.fn(async () => ({
+    resumed: [],
+    continued: [],
+    sessions: [row('a', 'mine'), row('b', 'theirs')],
+    failed: [row('f', 'host-made')]
+  }))
+}
+const RUNTIME = {
+  restartOfferWorkspaceProvenance: (workspaceId: string) => WORKSPACES[workspaceId]
+}
+
+beforeEach(() => {
+  setStructuredAgentSessionHost(
+    Object.assign(hostStub(), { restartResume, knownAgentIds: () => ['claude', 'codex'] })
+  )
+})
+
+afterEach(() => {
+  setStructuredAgentSessionHost(null)
+  vi.clearAllMocks()
+})
+
+function rowsOf(result: unknown, key: 'sessions' | 'failed'): unknown[] {
+  const value = typeof result === 'object' && result !== null && key in result ? result[key] : []
+  return Array.isArray(value) ? value : []
+}
+
+/** Each listed row's origin by session, from a reply. */
+function origins(response: RpcResponse): Record<string, unknown> {
+  const result = response.ok ? response.result : null
+  return Object.fromEntries(
+    [...rowsOf(result, 'sessions'), ...rowsOf(result, 'failed')].map((entry) =>
+      typeof entry === 'object' && entry !== null && 'sessionId' in entry
+        ? [entry.sessionId, 'origin' in entry ? entry.origin : undefined]
+        : []
+    )
+  )
+}
+
+it('says whose each offer is for the paired desktop asking, by the sidebar rule', async () => {
+  const response = await call(
+    'agentSession.restartResumable',
+    {},
+    { ...STRUCTURED_CLIENT, pairedDeviceId: 'device-mine' },
+    RUNTIME
+  )
+  expect(response).toMatchObject({ ok: true })
+  expect(origins(response)).toEqual({
+    a: 'own',
+    b: 'other-device',
+    c: 'server-made',
+    // No creator record: the sidebar shows it as the asker's, so the offer is theirs too.
+    d: 'own',
+    e: 'automation',
+    f: 'other-device'
+  })
+})
+
+it.each([
+  ['an in-process caller', undefined],
+  [
+    'its own desktop window',
+    { ...STRUCTURED_CLIENT, clientId: 'desktop-renderer', caller: DESKTOP_RPC_CALLER }
+  ],
+  // The transport's caller identity decides, never the client id it declares.
+  ['its desktop window under any client id', { ...STRUCTURED_CLIENT, caller: DESKTOP_RPC_CALLER }]
+])("counts the host's own user, as %s, as the owner of what the host made", async (_, client) => {
+  const response = await call('agentSession.restartResumable', {}, client, RUNTIME)
+  expect(origins(response)).toMatchObject({
+    a: 'other-device',
+    c: 'own',
+    d: 'own',
+    e: 'automation'
+  })
+})
+
+it.each([
+  ['a remote caller with no device identity', 'token-1'],
+  ['a caller that only declares the desktop window’s client id', 'desktop-renderer']
+])('leaves the origin out for %s', async (_, clientId) => {
+  const response = await call(
+    'agentSession.restartResumable',
+    {},
+    { ...STRUCTURED_CLIENT, clientId },
+    RUNTIME
+  )
+  expect(origins(response)).toEqual({
+    a: undefined,
+    b: undefined,
+    c: undefined,
+    d: undefined,
+    e: undefined,
+    f: undefined
+  })
+})
+
+it('forgets listed offers by the interruption the client saw, with sessionIds riding along', async () => {
+  const offers = [{ sessionId: SESSION, recordedAt: 1 }]
+  const response = await call(
+    'agentSession.restartResumableDismiss',
+    { sessionIds: [SESSION], offers },
+    { ...STRUCTURED_CLIENT, pairedDeviceId: 'device-mine' },
+    RUNTIME
+  )
+  expect(response).toMatchObject({ ok: true, result: { dismissed: 1 } })
+  expect(restartResume.dismissListed.mock.lastCall?.[0]).toEqual(offers)
+  expect(restartResume.dismiss).not.toHaveBeenCalled()
+  expect(origins(response)).toMatchObject({ a: 'own' })
+})
+
+// The desktop publishes what a continue leaves; without an origin every remaining row would read as
+// not the user's.
+it('says whose each remaining offer is in a continue reply', async () => {
+  const response = await call(
+    'agentSession.restartContinue',
+    { sessionIds: [SESSION] },
+    { ...STRUCTURED_CLIENT, pairedDeviceId: 'device-mine' },
+    RUNTIME
+  )
+  expect(response).toMatchObject({ ok: true })
+  expect(origins(response)).toEqual({ a: 'own', b: 'other-device', f: 'server-made' })
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-restart-offer-origin.ts b/src/main/runtime/rpc/methods/structured-agent-session-restart-offer-origin.ts
new file mode 100644
index 000000000000..76dae1141455
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-restart-offer-origin.ts
@@ -0,0 +1,52 @@
+// Each listed offer says whose it is, for the device asking. The host holds both facts — the
+// workspace's creator record and the caller's paired device — so no client judges it from a
+// workspace list it may not have loaded yet.
+
+import { restartOfferOrigin } from '../../../../shared/restart-offer-origin'
+import type { RpcContext } from '../core'
+import { resolveRpcWorkspaceCreatorProvenance } from '../workspace-creator-context'
+
+/** The asking device as workspace creator records name it: null is the host's own user (its desktop
+ *  window, or an in-process caller), undefined an authenticated remote caller without a device
+ *  identity (its rows go out without an origin). */
+function viewerDeviceId(ctx: RpcContext): string | null | undefined {
+  if (ctx.pairedDeviceId) {
+    return ctx.pairedDeviceId
+  }
+  if (ctx.caller?.kind === 'desktop') {
+    return null
+  }
+  try {
+    return resolveRpcWorkspaceCreatorProvenance(ctx).kind === 'host' ? null : undefined
+  } catch {
+    return undefined
+  }
+}
+
+export function withRestartOfferOrigins<Row extends { workspaceId: string }>(
+  ctx: RpcContext,
+  rows: readonly Row[]
+): Row[] {
+  const viewer = viewerDeviceId(ctx)
+  if (viewer === undefined) {
+    return [...rows]
+  }
+  return rows.map((row) => ({
+    ...row,
+    origin: restartOfferOrigin(ctx.runtime.restartOfferWorkspaceProvenance(row.workspaceId), viewer)
+  }))
+}
+
+/** A listing payload with every row's origin added; fields it does not carry stay absent. */
+export function withRestartOfferPayloadOrigins<
+  Payload extends {
+    sessions?: readonly { workspaceId: string }[]
+    failed?: readonly { workspaceId: string }[]
+  }
+>(ctx: RpcContext, payload: Payload): Payload {
+  return {
+    ...payload,
+    ...(payload.sessions ? { sessions: withRestartOfferOrigins(ctx, payload.sessions) } : {}),
+    ...(payload.failed ? { failed: withRestartOfferOrigins(ctx, payload.failed) } : {})
+  }
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-restart-offer-read.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-restart-offer-read.test.ts
new file mode 100644
index 000000000000..daa62db0982c
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-restart-offer-read.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, it, vi } from 'vitest'
+import { restartOffersProvablyEmpty } from './structured-agent-session-restart-offer-read'
+
+describe('reading restart offers without building a host', () => {
+  it('answers empty only when no host exists and the capsule holds nothing', async () => {
+    const recordsHeld = vi.fn(async () => false)
+    expect(await restartOffersProvablyEmpty({ hostInstalled: () => false, recordsHeld })).toBe(true)
+  })
+
+  it('asks the installed host rather than the file', async () => {
+    const recordsHeld = vi.fn(async () => false)
+    expect(await restartOffersProvablyEmpty({ hostInstalled: () => true, recordsHeld })).toBe(false)
+    expect(recordsHeld).not.toHaveBeenCalled()
+  })
+
+  it('builds the host when the capsule holds anything or cannot be read', async () => {
+    expect(
+      await restartOffersProvablyEmpty({
+        hostInstalled: () => false,
+        recordsHeld: async () => true
+      })
+    ).toBe(false)
+    expect(
+      await restartOffersProvablyEmpty({
+        hostInstalled: () => false,
+        recordsHeld: async () => {
+          throw new Error('locked')
+        }
+      })
+    ).toBe(false)
+  })
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-restart-offer-read.ts b/src/main/runtime/rpc/methods/structured-agent-session-restart-offer-read.ts
new file mode 100644
index 000000000000..b0c0e0fd5d2b
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-restart-offer-read.ts
@@ -0,0 +1,35 @@
+// Listing restart offers on a process that never built its structured host.
+//
+// Building the host opens the record store and journal, so a paired desktop asking every server it
+// connects to would open them on servers that never ran a chat. The offers live only in the
+// recovery capsule, so a capsule holding nothing at all answers "nothing to resume" by itself.
+
+import { AgentSessionRecoveryCapsule } from '../../agent-session-recovery-capsule'
+import { getProfileUserDataPath } from '../../../orca-profiles/profile-storage-paths'
+import { getStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+
+export type RestartOfferReadShortcutDeps = {
+  hostInstalled: () => boolean
+  recordsHeld: () => Promise<boolean>
+}
+
+const defaultDeps: RestartOfferReadShortcutDeps = {
+  hostInstalled: () => getStructuredAgentSessionHost() !== null,
+  // The host's own state directory (orca-runtime-get-worktree-ps.ts `stateDirectory`).
+  recordsHeld: () => new AgentSessionRecoveryCapsule(getProfileUserDataPath()).holdsAnyRecord()
+}
+
+/** True only when no host exists and the capsule provably holds nothing; otherwise the caller
+ *  builds the host and lists as it always has. */
+export async function restartOffersProvablyEmpty(
+  deps: RestartOfferReadShortcutDeps = defaultDeps
+): Promise<boolean> {
+  if (deps.hostInstalled()) {
+    return false
+  }
+  try {
+    return !(await deps.recordsHeld())
+  } catch {
+    return false
+  }
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-restart-resumable-empty.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-restart-resumable-empty.test.ts
new file mode 100644
index 000000000000..7536a8068e1b
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-restart-resumable-empty.test.ts
@@ -0,0 +1,50 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+import { call } from './structured-agent-session-rpc.test-fixture'
+
+const shortcut = vi.hoisted(() => ({ empty: vi.fn(async () => true) }))
+vi.mock('./structured-agent-session-restart-offer-read', () => ({
+  restartOffersProvablyEmpty: shortcut.empty
+}))
+
+const ensureHost = vi.fn(async () => undefined)
+const HOST_BUILDER = { ensureStructuredAgentSessionHost: ensureHost }
+
+// A paired desktop is a remote client; in-process callers carry no client kind at all.
+function listRestartOffers(clientCapabilities?: string[]) {
+  return call(
+    'agentSession.restartResumable',
+    {},
+    clientCapabilities ? { clientKind: 'runtime', clientCapabilities } : undefined,
+    HOST_BUILDER
+  )
+}
+
+beforeEach(() => {
+  ensureHost.mockClear()
+  shortcut.empty.mockClear()
+  shortcut.empty.mockResolvedValue(true)
+})
+
+it('answers an empty capsule without building the chat host', async () => {
+  await expect(listRestartOffers()).resolves.toMatchObject({
+    ok: true,
+    result: { sessions: [], failed: [] }
+  })
+  expect(ensureHost).not.toHaveBeenCalled()
+})
+
+it('still refuses a client that cannot read structured sessions, before looking at the file', async () => {
+  await expect(listRestartOffers(['terminal.v1'])).resolves.toMatchObject({
+    ok: false,
+    error: { message: expect.stringContaining('structured_agent_session_unsupported') }
+  })
+  expect(shortcut.empty).not.toHaveBeenCalled()
+  expect(ensureHost).not.toHaveBeenCalled()
+})
+
+it('builds the host when the capsule may hold an offer', async () => {
+  shortcut.empty.mockResolvedValue(false)
+  // No host comes up in this test, so the build is followed by the usual refusal.
+  await expect(listRestartOffers()).resolves.toMatchObject({ ok: false })
+  expect(ensureHost).toHaveBeenCalledTimes(1)
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-restart-resume.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-restart-resume.test.ts
index 5662731c9a1d..fce99f48c435 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-restart-resume.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-restart-resume.test.ts
@@ -58,6 +58,17 @@ function installRestartHost() {
         return gone.length
       }
     ),
+    dismissListed: vi.fn(
+      async (
+        listed: readonly { sessionId: string }[],
+        audience?: StructuredAgentSessionRestartAudience
+      ) => {
+        const named = new Set(listed.map((offer) => offer.sessionId))
+        const gone = restartRowsFor(offers, audience).filter((offer) => named.has(offer.sessionId))
+        offers = offers.filter((offer) => !gone.includes(offer))
+        return gone.length
+      }
+    ),
     continueAfterRestart: vi.fn(
       async (
         _sessionIds: readonly string[] | undefined,
@@ -110,6 +121,19 @@ describe("a paired client too old to show the host's other agents", () => {
     expect(host.offers()).toEqual([CLAUDE_OFFER, GROK_OFFER])
   })
 
+  it('cannot dismiss an offer it was not shown by listing it', async () => {
+    const host = installRestartHost()
+    const listed = [CLAUDE_OFFER, GROK_OFFER].map(({ sessionId }) => ({ sessionId, recordedAt: 1 }))
+    expect(
+      await call(
+        'agentSession.restartResumableDismiss',
+        { sessionIds: listed.map((offer) => offer.sessionId), offers: listed },
+        OLD_CLIENT
+      )
+    ).toMatchObject({ ok: true, result: { dismissed: 1, sessions: [], failed: [] } })
+    expect(host.offers()).toEqual([GROK_OFFER])
+  })
+
   it('hands the host its audience when it continues all, so hidden offers are not run', async () => {
     const host = installRestartHost()
     await call('agentSession.restartContinue', {}, OLD_CLIENT)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-restart-resume.ts b/src/main/runtime/rpc/methods/structured-agent-session-restart-resume.ts
index c28fe9856f69..b2e02038b498 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-restart-resume.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-restart-resume.ts
@@ -8,11 +8,15 @@
 import { defineMethod } from '../core'
 import {
   ensureStructuredHostInstalled,
+  requireStructuredCapability,
   requireStructuredHost,
   structuredCallerFor
 } from './structured-agent-session-gate'
+import { restartOffersProvablyEmpty } from './structured-agent-session-restart-offer-read'
+import { withRestartOfferPayloadOrigins } from './structured-agent-session-restart-offer-origin'
 import {
   ContinueInterruptedParams,
+  RestartDismissParams,
   RestartResumableParams,
   RestartResumeParams
 } from './structured-agent-session-schemas'
@@ -23,37 +27,47 @@ export const STRUCTURED_AGENT_SESSION_RESTART_RESUME_METHODS = [
     name: 'agentSession.restartResumable',
     params: RestartResumableParams,
     handler: async (_params, ctx) => {
+      requireStructuredCapability(ctx)
+      // A paired desktop asks on every connect; a server that never ran a chat must not build a
+      // host to say it has nothing.
+      if (await restartOffersProvablyEmpty()) {
+        return { sessions: [], failed: [] }
+      }
       await ensureStructuredHostInstalled(ctx)
       const host = requireStructuredHost(ctx)
       const audience = structuredAgentsReadBy(ctx, host.knownAgentIds())
-      return {
+      return withRestartOfferPayloadOrigins(ctx, {
         sessions: await host.restartResume.list(audience),
         // Acted-on offers whose agent did not carry on. Optional on the wire; older clients ignore it.
         failed: await host.restartResume.listFailures(audience)
-      }
+      })
     }
   }),
   defineMethod({
     // Explicitly abandons the markers without resuming. Closing the dialog is a snooze and does
     // not call this method, so the status-bar entry can reopen the offer later.
     name: 'agentSession.restartResumableDismiss',
-    params: RestartResumableParams,
+    params: RestartDismissParams,
     handler: async (params, ctx) => {
       await ensureStructuredHostInstalled(ctx)
       const host = requireStructuredHost(ctx)
       // Offers this client was never shown stay for a client that can show them.
       const audience = structuredAgentsReadBy(ctx, host.knownAgentIds())
-      const dismissed = await host.restartResume.dismiss(params.sessionIds, audience)
-      if (params.sessionIds === undefined) {
+      // `offers` names each chat with the interruption the client listed; read before `sessionIds`,
+      // which rides along for a host that predates it.
+      const dismissed = params.offers
+        ? await host.restartResume.dismissListed(params.offers, audience)
+        : await host.restartResume.dismiss(params.sessionIds, audience)
+      if (!params.offers && params.sessionIds === undefined) {
         // The dismissal removed every pending and in-flight record this client sees, so a second
         // read would only add a new failure point after the user's explicit dismissal.
         return { dismissed, sessions: [], failed: [] }
       }
-      return {
+      return withRestartOfferPayloadOrigins(ctx, {
         dismissed,
         sessions: await host.restartResume.list(audience),
         failed: await host.restartResume.listFailures(audience)
-      }
+      })
     }
   }),
   defineMethod({
@@ -65,10 +79,13 @@ export const STRUCTURED_AGENT_SESSION_RESTART_RESUME_METHODS = [
     handler: async (params, ctx) => {
       await ensureStructuredHostInstalled(ctx)
       const host = requireStructuredHost(ctx)
-      return host.restartResume.continueAfterRestart(
-        params.sessionIds,
-        structuredCallerFor(ctx).callerKey,
-        structuredAgentsReadBy(ctx, host.knownAgentIds())
+      return withRestartOfferPayloadOrigins(
+        ctx,
+        await host.restartResume.continueAfterRestart(
+          params.sessionIds,
+          structuredCallerFor(ctx).callerKey,
+          structuredAgentsReadBy(ctx, host.knownAgentIds())
+        )
       )
     }
   }),
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-rpc.test-fixture.ts b/src/main/runtime/rpc/methods/structured-agent-session-rpc.test-fixture.ts
index c4b3f62700b6..364e843b391e 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-rpc.test-fixture.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-rpc.test-fixture.ts
@@ -17,6 +17,7 @@ import {
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
 } from '../../../../shared/protocol-version'
 import type { RpcAnyMethodDeclaration, RpcRequest, RpcResponse } from '../core'
+import type { RpcDispatchStreamingOptions } from '../dispatcher-stream-options'
 import { RpcDispatcher } from '../dispatcher'
 import { STRUCTURED_AGENT_SESSION_METHODS } from './structured-agent-session'
 import { createStructuredAgentSessionLogger } from '../../../native-chat/agent-session-wire/structured-agent-session-logger'
@@ -252,6 +253,8 @@ export function dispatcher(
     registerSubscriptionCleanup: vi.fn(),
     cleanupSubscription: vi.fn(),
     cleanupSubscriptionsByPrefix: vi.fn(),
+    // No creator record: every listed restart offer reads as the host user's own.
+    restartOfferWorkspaceProvenance: () => undefined,
     ...runtimeCalls,
     ...runtimeOverrides
   }
@@ -266,12 +269,8 @@ export function dispatcher(
 export async function call(
   method: string,
   params: unknown,
-  client?: {
-    clientId?: string
-    clientKind?: 'mobile' | 'runtime'
-    clientCapabilities?: string[]
-    signal?: AbortSignal
-  },
+  // What a transport tells the dispatcher about its caller.
+  client?: RpcDispatchStreamingOptions,
   runtimeOverrides: Record<string, unknown> = {},
   methods?: readonly RpcAnyMethodDeclaration[]
 ): Promise<RpcResponse> {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-schemas.ts b/src/main/runtime/rpc/methods/structured-agent-session-schemas.ts
index 1f749d50490d..359ed31572d9 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-schemas.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-schemas.ts
@@ -22,8 +22,6 @@ export {
   QueuedMessagesResumeParams,
   RespondParams,
   RespondToQuestionParams,
-  RestartResumableParams,
-  RestartResumeParams,
   RewindParams,
   SendParams,
   SessionId,
@@ -33,4 +31,9 @@ export {
   ThreadGoalParams,
   UnsubscribeParams
 } from '../../../../shared/rpc-contract/structured-agent-session-params'
+export {
+  RestartDismissParams,
+  RestartResumableParams,
+  RestartResumeParams
+} from '../../../../shared/rpc-contract/structured-agent-session-restart-params'
 export { ContinueInterruptedParams } from '../../../../shared/rpc-contract/structured-agent-session-continue-params'
diff --git a/src/renderer/src/components/NativeChatResumeFailureDetails.tsx b/src/renderer/src/components/NativeChatResumeFailureDetails.tsx
index 968c0fc0769b..6769e1962bec 100644
--- a/src/renderer/src/components/NativeChatResumeFailureDetails.tsx
+++ b/src/renderer/src/components/NativeChatResumeFailureDetails.tsx
@@ -71,23 +71,45 @@ export function ResumeFailureStatus({
           <span className="mt-0.5 block font-mono text-[10px] opacity-75">{failure.reason}</span>
         </TooltipContent>
       </Tooltip>
-      <Button
-        variant="ghost"
-        size="icon-xs"
+      <ResumeRowDismiss
+        title={title}
+        workspaceName={workspaceName}
         disabled={disabled}
-        aria-label={translate(
-          'auto.components.NativeChatResumeOutcomeRow.dismissChat',
-          'Dismiss "{{value0}}" in {{value1}}',
-          { value0: title, value1: workspaceName }
-        )}
-        onClick={() => onAction('dismiss')}
-      >
-        <X className="size-3" />
-      </Button>
+        onDismiss={() => onAction('dismiss')}
+      />
     </>
   )
 }
 
+/** Forgets one listed chat's offer: a failed resume's, or one Dismiss all leaves for its owner. */
+export function ResumeRowDismiss({
+  title,
+  workspaceName,
+  disabled,
+  onDismiss
+}: {
+  title: string
+  workspaceName: string
+  disabled: boolean
+  onDismiss: () => void
+}): React.JSX.Element {
+  return (
+    <Button
+      variant="ghost"
+      size="icon-xs"
+      disabled={disabled}
+      aria-label={translate(
+        'auto.components.NativeChatResumeOutcomeRow.dismissChat',
+        'Dismiss "{{value0}}" in {{value1}}',
+        { value0: title, value1: workspaceName }
+      )}
+      onClick={onDismiss}
+    >
+      <X className="size-3" />
+    </Button>
+  )
+}
+
 export function ResumeFailureGuidanceLine({
   failure,
   disabled,
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
index 204da73e7704..2873cd7c1ef1 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
@@ -1,3 +1,4 @@
+import { Badge } from './ui/badge'
 import { Checkbox } from './ui/checkbox'
 import { AgentIcon } from '@/lib/agent-catalog'
 import { agentTypeToIconAgent, formatAgentTypeLabel } from '@/lib/agent-status'
@@ -8,7 +9,11 @@ import {
   resumeFailureSelectable,
   type ResumeFailureAction
 } from './native-chat-resume-failure-guidance'
-import { ResumeFailureGuidanceLine, ResumeFailureStatus } from './NativeChatResumeFailureDetails'
+import {
+  ResumeFailureGuidanceLine,
+  ResumeFailureStatus,
+  ResumeRowDismiss
+} from './NativeChatResumeFailureDetails'
 import { resumeActivityLabel } from './native-chat-resume-activity-label'
 
 /**
@@ -43,7 +48,8 @@ export function ResumeCandidateRow({
   disabled,
   onCheckedChange,
   failure,
-  onFailureAction
+  onFailureAction,
+  originLabel
 }: {
   candidate: ResumeCandidate
   /** Named in the checkbox's accessible name: several rows otherwise read identically. */
@@ -55,6 +61,8 @@ export function ResumeCandidateRow({
   /** Present when an earlier resume of this chat did not carry on. */
   failure?: ResumeFailure
   onFailureAction?: (action: ResumeFailureAction, sessionId: string) => void
+  /** Where the chat came from, for one that does not start ticked; absent for the user's own. */
+  originLabel?: string
 }): React.JSX.Element {
   const agentLabel = formatAgentTypeLabel(candidate.agent)
   const title =
@@ -90,6 +98,8 @@ export function ResumeCandidateRow({
           <span className="text-foreground/90">{title}</span>
           {activity && <span className="text-muted-foreground/80"> - {activity.summary}</span>}
         </span>
+        {/* The same quiet context chip that names a workspace's machine. */}
+        {originLabel && <Badge variant="hostContext">{originLabel}</Badge>}
         {model && (
           <span
             className="min-w-0 max-w-24 shrink-0 truncate font-mono text-[10px] text-muted-foreground/70"
@@ -105,10 +115,23 @@ export function ResumeCandidateRow({
       </span>
     </label>
   )
+  const act = (action: ResumeFailureAction) => onFailureAction?.(action, candidate.sessionId)
   if (!failure) {
-    return <li>{row}</li>
+    // A chat that is not the user's is never cleared by Dismiss; its own control ends it here.
+    return originLabel && onFailureAction ? (
+      <li className="flex items-center gap-1 pr-1">
+        {row}
+        <ResumeRowDismiss
+          title={title}
+          workspaceName={workspaceName}
+          disabled={disabled}
+          onDismiss={() => act('dismiss')}
+        />
+      </li>
+    ) : (
+      <li>{row}</li>
+    )
   }
-  const act = (action: ResumeFailureAction) => onFailureAction?.(action, candidate.sessionId)
   return (
     <li className="flex flex-col">
       {/* Outside the label, so pressing them never toggles the checkbox. */}
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index 465e5b8323a7..d0f9729c3aa4 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -96,12 +96,14 @@ function Harness({
   candidates,
   initiallySelected,
   busy = false,
-  failureFor
+  failureFor,
+  machineHostId
 }: {
   candidates: ResumeCandidate[]
   initiallySelected?: string[]
   busy?: boolean
   failureFor?: (sessionId: string) => ResumeFailure | undefined
+  machineHostId?: ExecutionHostId
 }): React.JSX.Element {
   const [selected, setSelected] = useState<ReadonlySet<string>>(
     () => new Set(initiallySelected ?? candidates.map((entry) => entry.sessionId))
@@ -126,6 +128,7 @@ function Harness({
           })
         }}
         failureFor={failureFor}
+        machineHostId={machineHostId}
       />
     </TooltipProvider>
   )
@@ -501,6 +504,34 @@ it('names hosts only when the machine is not obvious', () => {
   expect(rowOf(workspaceBox('child')).textContent).toContain(getHostContextLabel(remote))
 })
 
+// Under a machine row the row already names the machine; only a workspace elsewhere says where.
+it('under a machine row, indents one level and names only a workspace on another host', () => {
+  const remote: ExecutionHostId = 'ssh:build-server'
+  render({ candidates: seedTree({ parent: 'local', child: remote }), machineHostId: 'local' })
+
+  expect(rowOf(workspaceBox('parent')).textContent).not.toContain(getHostContextLabel('local'))
+  expect(rowOf(workspaceBox('other')).textContent).not.toContain(getHostContextLabel('local'))
+  expect(rowOf(workspaceBox('child')).textContent).toContain(getHostContextLabel(remote))
+  // The child is on another host, so it is not nested under its parent, as in the sidebar. Every
+  // box and title sits one level further in than without a machine row; checkboxes do not move.
+  expect(rowOutline()).toEqual([
+    'project:orca',
+    'ws:child@40px',
+    'chat:in-child@60px',
+    'chat:also-in-child@60px',
+    'ws:parent@40px',
+    'chat:in-parent@60px',
+    'ws:other@40px',
+    'chat:in-other@60px'
+  ])
+  const header = container.querySelector<HTMLElement>('section > label')!
+  expect(cell(header, 2).style.marginLeft).toBe('20px')
+  const box = rowOf(workspaceBox('parent')).parentElement?.querySelector<HTMLElement>(
+    ':scope > [aria-hidden="true"]'
+  )
+  expect(box?.style.left).toBe('calc(1.75rem + 40px)')
+})
+
 it('names a workspace the store does not know by its id, with the kind the host recorded', () => {
   const unknown: ResumeCandidate = {
     ...candidate('lost', worktree('gone')),
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index 94e96af302dc..36c1360684ad 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -158,7 +158,8 @@ function RepoHeader({
   covered,
   busy,
   selected,
-  onToggle
+  onToggle,
+  depth
 }: {
   repoId: string
   /** Every selectable chat in the project, nested workspaces included. */
@@ -166,6 +167,7 @@ function RepoHeader({
   busy: boolean
   selected: ReadonlySet<string>
   onToggle: (sessionId: string, checked: boolean) => void
+  depth: number
 }): React.JSX.Element {
   const repos = useAppStore((store) => store.repos)
   const projectGroups = useAppStore((store) => store.projectGroups)
@@ -186,7 +188,10 @@ function RepoHeader({
           )}
         />
       </span>
-      <span className="mr-1.5 flex h-full min-w-0 items-center gap-1.5 rounded-t-md bg-[color-mix(in_srgb,var(--foreground)_5%,var(--worktree-sidebar-accent))] pr-2.5 pl-2 group-hover/row:bg-[color-mix(in_srgb,var(--foreground)_9%,var(--worktree-sidebar-accent))]">
+      <span
+        className="mr-1.5 flex h-full min-w-0 items-center gap-1.5 rounded-t-md bg-[color-mix(in_srgb,var(--foreground)_5%,var(--worktree-sidebar-accent))] pr-2.5 pl-2 group-hover/row:bg-[color-mix(in_srgb,var(--foreground)_9%,var(--worktree-sidebar-accent))]"
+        style={depth > 0 ? { marginLeft: depth * RESUME_INDENT_PX } : undefined}
+      >
         {/* A repo shows its own configured glyph; a project group uses the FolderTree the sidebar's
             own PROJECT_GROUP_META uses. */}
         {header.kind === 'project' ? (
@@ -220,6 +225,10 @@ type RowProps = {
   selectable: (sessionId: string) => boolean
   /** The sidebar's host names (SSH target labels, display overrides), so a chip never shows a raw id. */
   hostLabelById: ReadonlyMap<ExecutionHostId, string>
+  /** Where a chat that does not start ticked came from ("Automation", "Another device"). */
+  originLabelFor?: (sessionId: string) => string | undefined
+  /** The host a machine row above the list already names. */
+  machineHostId?: ExecutionHostId
 } & FailureProps
 
 function WorkspaceRows({
@@ -234,10 +243,22 @@ function WorkspaceRows({
   const kind = first ? resumeWorkspaceKind(first) : 'git-worktree'
   const name = (worktree && resolveWorktreeDisplayName(worktree)) || group.workspaceId
   const branch = worktree && kind === 'git-worktree' ? resolveWorktreeBranchLabel(worktree) : ''
-  const { mixedHosts, listedAt, busy, selected, onToggle, selectable, hostLabelById } = rowProps
-  // Why: a remote workspace is named by its machine even when it is the only one listed.
+  const {
+    mixedHosts,
+    listedAt,
+    busy,
+    selected,
+    onToggle,
+    selectable,
+    hostLabelById,
+    machineHostId
+  } = rowProps
+  const workspaceHostId = hostId ?? LOCAL_EXECUTION_HOST_ID
+  // Why: a remote workspace is named by its machine even when it is the only one listed — unless
+  // the machine row above it already does.
   const showHostLabel =
-    mixedHosts || (hostId ?? LOCAL_EXECUTION_HOST_ID) !== LOCAL_EXECUTION_HOST_ID
+    workspaceHostId !== machineHostId &&
+    (mixedHosts || workspaceHostId !== LOCAL_EXECUTION_HOST_ID)
   const covered = resumeWorkspaceSessionIds(node).filter(selectable)
   const selection = resumeSelectionState(covered, selected)
   // Why: a top-level workspace sits one step in from its project, so its box does too.
@@ -282,9 +303,7 @@ function WorkspaceRows({
           )}
           {showHostLabel && (
             <WorktreeHostContextBadge
-              label={getHostContextLabel(hostId ?? LOCAL_EXECUTION_HOST_ID, {
-                hostLabelById
-              })}
+              label={getHostContextLabel(workspaceHostId, { hostLabelById })}
             />
           )}
           {selection.total > 0 && (
@@ -310,6 +329,7 @@ function WorkspaceRows({
             onCheckedChange={(checked) => onToggle(candidate.sessionId, checked)}
             failure={rowProps.failureFor?.(candidate.sessionId)}
             onFailureAction={rowProps.onFailureAction}
+            originLabel={rowProps.originLabelFor?.(candidate.sessionId)}
           />
         ))}
       </ul>
@@ -327,14 +347,12 @@ export function ResumeOnRestartGroups({
   selected,
   onToggle,
   failureFor,
-  onFailureAction
+  onFailureAction,
+  originLabelFor,
+  machineHostId
 }: {
   candidates: readonly ResumeCandidate[]
-  listedAt: number
-  busy: boolean
-  selected: ReadonlySet<string>
-  onToggle: (sessionId: string, checked: boolean) => void
-} & FailureProps): React.JSX.Element {
+} & Omit<RowProps, 'mixedHosts' | 'selectable' | 'hostLabelById'>): React.JSX.Element {
   const workspaces = useMemo(() => groupResumeCandidates(candidates), [candidates])
   const repoIdFor = useRepoIdByWorkspace(workspaces)
   const ancestorsOf = useLineageAncestors(workspaces)
@@ -347,6 +365,8 @@ export function ResumeOnRestartGroups({
   const mixedHosts =
     new Set(candidates.map((candidate) => candidate.executionHostId ?? LOCAL_EXECUTION_HOST_ID))
       .size > 1
+  // Under a machine row, the whole list is nested one level below it.
+  const depth = machineHostId === undefined ? 0 : 1
   const selectable = (sessionId: string): boolean => {
     const failure = failureFor?.(sessionId)
     return !failure || resumeFailureSelectable(failure)
@@ -366,13 +386,14 @@ export function ResumeOnRestartGroups({
               busy={busy}
               selected={selected}
               onToggle={onToggle}
+              depth={depth}
             />
           )}
           {nestResumeWorkspaces(repoGroup.workspaces, ancestorsOf).map((node) => (
             <WorkspaceRows
               key={node.group.workspaceId}
               node={node}
-              depth={0}
+              depth={depth}
               mixedHosts={mixedHosts}
               listedAt={listedAt}
               busy={busy}
@@ -382,6 +403,8 @@ export function ResumeOnRestartGroups({
               hostLabelById={hostLabelById}
               failureFor={failureFor}
               onFailureAction={onFailureAction}
+              originLabelFor={originLabelFor}
+              machineHostId={machineHostId}
             />
           ))}
         </section>
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartMachineSection.tsx b/src/renderer/src/components/NativeChatResumeOnRestartMachineSection.tsx
new file mode 100644
index 000000000000..ab794cee7e26
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeOnRestartMachineSection.tsx
@@ -0,0 +1,113 @@
+import { ChevronDown, ChevronRight, Laptop, Server } from 'lucide-react'
+import { Checkbox } from './ui/checkbox'
+import { translate } from '@/i18n/i18n'
+import { formatShortTimeAgo } from '@/lib/short-time-ago'
+import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
+import { resumeSelectionState, type ResumeFailure } from './native-chat-resume-on-restart-grouping'
+import type { ResumeFailureAction } from './native-chat-resume-failure-guidance'
+import type { NativeChatRestartMachineOffer } from './native-chat-resume-on-restart-store'
+import { restartMachineExecutionHostId } from './native-chat-restart-machines'
+
+/**
+ * One machine in the resume dialog: a row naming it, why it stopped and how many of its chats are
+ * picked, with its select-all box in the list's shared checkbox column and a chevron; open, the
+ * machine's workspaces and chats below, their content indented one level.
+ */
+export function ResumeMachineSection({
+  offer,
+  name,
+  expanded,
+  onExpandedChange,
+  selected,
+  selectable,
+  busy,
+  onToggle,
+  onToggleAll,
+  failureFor,
+  onFailureAction,
+  originLabelFor
+}: {
+  offer: NativeChatRestartMachineOffer
+  name: string
+  expanded: boolean
+  onExpandedChange: (expanded: boolean) => void
+  /** The ticked chats on this machine. */
+  selected: ReadonlySet<string>
+  /** The chats a tick can include; a failure no retry can fix is left out. */
+  selectable: readonly string[]
+  busy: boolean
+  onToggle: (sessionId: string, checked: boolean) => void
+  onToggleAll: (checked: boolean) => void
+  failureFor: (sessionId: string) => ResumeFailure | undefined
+  onFailureAction: (action: ResumeFailureAction, sessionId: string) => void
+  originLabelFor: (sessionId: string) => string | undefined
+}): React.JSX.Element {
+  const rows = [...offer.candidates, ...offer.failed]
+  const selection = resumeSelectionState(selectable, selected)
+  const latest = Math.max(...rows.map((row) => row.recordedAt))
+  const cause = rows.some((row) => row.trigger === 'update')
+    ? translate(
+        'auto.components.NativeChatResumeOnRestartModal.machineCauseUpdate',
+        'Installed an update'
+      )
+    : translate('auto.components.NativeChatResumeOnRestartModal.machineCauseQuit', 'Was quit')
+  const MachineIcon = offer.target.kind === 'local' ? Laptop : Server
+  const Chevron = expanded ? ChevronDown : ChevronRight
+  return (
+    <>
+      {/* The header over this machine's boxes, never boxed itself: the project's band, in the
+          content area, with its checkbox in the column outside. Twice the list's gap sets it off
+          from the previous machine's boxes. */}
+      <div className="group/row mt-3 grid h-8.5 grid-cols-[1.75rem_minmax(0,1fr)] items-center first:mt-1.5">
+        <span className="flex justify-center">
+          {/* Ticks everything unless all already are, as a workspace's box does. */}
+          <Checkbox
+            checked={selection.checked}
+            disabled={busy || selection.total === 0}
+            onCheckedChange={() => onToggleAll(selection.selectedCount < selection.total)}
+            aria-label={translate(
+              'auto.components.NativeChatResumeOnRestartModal.selectMachine',
+              'Resume every chat on {{value0}}',
+              { value0: name }
+            )}
+          />
+        </span>
+        <button
+          type="button"
+          className="mr-1.5 flex h-full min-w-0 cursor-pointer items-center gap-1.5 rounded-md bg-[color-mix(in_srgb,var(--foreground)_5%,var(--worktree-sidebar-accent))] pr-2.5 pl-2 text-left group-hover/row:bg-[color-mix(in_srgb,var(--foreground)_9%,var(--worktree-sidebar-accent))]"
+          aria-expanded={expanded}
+          onClick={() => onExpandedChange(!expanded)}
+        >
+          <MachineIcon className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
+          <span className="shrink-0 text-[13px] font-semibold">{name}</span>
+          <span className="min-w-0 flex-1 truncate text-[11px] text-muted-foreground">
+            {cause} · {formatShortTimeAgo(latest, offer.listedAt)}
+          </span>
+          {selection.total > 0 && (
+            <span className="shrink-0 pl-2 text-[11px] tabular-nums text-muted-foreground">
+              {translate(
+                'auto.components.NativeChatResumeOnRestartModal.workspaceSelectedCount',
+                '{{value0}} of {{value1}}',
+                { value0: selection.selectedCount, value1: selection.total }
+              )}
+            </span>
+          )}
+          <Chevron className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
+        </button>
+      </div>
+      {expanded && (
+        <ResumeOnRestartGroups
+          candidates={rows}
+          listedAt={offer.listedAt}
+          busy={busy}
+          selected={selected}
+          onToggle={onToggle}
+          failureFor={failureFor}
+          onFailureAction={onFailureAction}
+          originLabelFor={originLabelFor}
+          machineHostId={restartMachineExecutionHostId(offer.target)}
+        />
+      )}
+    </>
+  )
+}
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.layout.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.layout.test.tsx
new file mode 100644
index 000000000000..0472317d826b
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.layout.test.tsx
@@ -0,0 +1,154 @@
+// @vitest-environment happy-dom
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '../store'
+import { getDefaultSettings } from '../../../shared/constants'
+import { NativeChatResumeOnRestartModal } from './NativeChatResumeOnRestartModal'
+import { NativeChatResumeStatusSegment } from './status-bar/NativeChatResumeStatusSegment'
+import { TooltipProvider } from './ui/tooltip'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import {
+  consumeNativeChatResumeOnRestartDialogRequest,
+  requestNativeChatResumeOnRestartDialog
+} from './native-chat-resume-on-restart-dialog'
+import { _resetNativeChatRestartOffer } from './native-chat-restart-offer-triggers'
+
+// The dialog's own layout and focus, apart from what its actions do.
+
+const rpc = vi.hoisted(() => vi.fn())
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: rpc,
+  pairedRestartOffersSupport: async () => 'supported',
+  // A failed row opens the status feed; these cases never drive it.
+  subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
+}))
+vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { dismiss: vi.fn() }) }))
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+let root: Root
+let container: HTMLDivElement
+const offered: ResumeCandidate[] = ['a', 'b'].map((sessionId) => ({
+  sessionId,
+  workspaceId: 'workspace',
+  agent: 'codex',
+  trigger: 'quit',
+  latestPrompt: `Prompt ${sessionId}`,
+  recordedAt: 1_800_000_000_000,
+  executionHostId: 'local',
+  workspaceKind: 'git-worktree',
+  origin: 'own'
+}))
+
+/** A chat the host acted on and could not carry on, as it reports it. */
+function failure(sessionId: string) {
+  const candidate = offered.find((entry) => entry.sessionId === sessionId)!
+  return {
+    ...candidate,
+    failedAt: candidate.recordedAt + 60_000,
+    outcome: 'refused',
+    reason: 'agent_session_restart_work_superseded'
+  }
+}
+
+/** Outcome rows carry tooltips, so every mount needs the provider the app shell supplies. */
+async function mount(node: React.ReactNode): Promise<void> {
+  await act(async () => root.render(<TooltipProvider>{node}</TooltipProvider>))
+}
+
+function button(text: string): HTMLButtonElement {
+  const found = [...document.querySelectorAll('button')].find(
+    (entry) => entry.textContent?.trim() === text || entry.getAttribute('aria-label') === text
+  )
+  if (!found) {
+    throw new Error(`Missing button: ${text}`)
+  }
+  return found
+}
+
+beforeEach(() => {
+  rpc.mockReset()
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({
+    settings: { ...getDefaultSettings(''), experimentalStructuredNativeChat: true }
+  })
+  container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+})
+
+// Left to the dialog, focus lands on the scrollable list and draws a ring around it.
+it('opens with focus on the resume action', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  expect(document.activeElement?.textContent?.trim()).toBe('Resume 2 chats')
+})
+
+it('uses the sidebar surface without a border around the resume list', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const list = document.querySelector('[aria-label="Chats that would be resumed"]')
+  expect(list).not.toBeNull()
+  expect(list?.classList.contains('bg-worktree-sidebar')).toBe(true)
+  expect(list?.classList.contains('border')).toBe(false)
+})
+
+it('keeps initial focus inside the dialog with no resumable chats', async () => {
+  rpc.mockResolvedValue({ sessions: [], failed: [failure('b')] })
+  await mount(<NativeChatResumeOnRestartModal />)
+  await act(async () => requestNativeChatResumeOnRestartDialog())
+  const dialog = document.querySelector('[role="dialog"]')
+  expect(button('Resume 0 chats').disabled).toBe(true)
+  expect(dialog).not.toBeNull()
+  expect(dialog?.contains(document.activeElement)).toBe(true)
+})
+
+it('keeps initial focus inside the dialog when reopened during resume', async () => {
+  const continued = Promise.withResolvers<unknown>()
+  rpc.mockImplementation((_target, method) =>
+    method === 'agentSession.restartResumable'
+      ? Promise.resolve({ sessions: offered })
+      : continued.promise
+  )
+  await mount(
+    <>
+      <NativeChatResumeOnRestartModal />
+      <NativeChatResumeStatusSegment iconOnly={false} />
+    </>
+  )
+  await act(async () => button('Resume 2 chats').click())
+  const opener = button('Resuming 2 chats')
+  await act(async () => {
+    opener.focus()
+    opener.click()
+  })
+  const dialog = document.querySelector('[role="dialog"]')
+  expect(button('Resuming…').disabled).toBe(true)
+  expect(dialog).not.toBeNull()
+  expect(dialog?.contains(document.activeElement)).toBe(true)
+  await act(async () => continued.resolve({ sessions: [], failed: [], resumed: [], continued: [] }))
+})
+
+// One primary action and one way out of it; the body copy carries the transparency.
+it('offers exactly Dismiss all and the resume action', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  // Row and preference checkboxes are buttons too; the controls are what is left after them.
+  const controls = document.querySelectorAll('[role="dialog"] button:not([role="checkbox"])')
+  expect([...controls].map((entry) => entry.textContent?.trim())).toEqual([
+    'Dismiss all',
+    'Resume 2 chats',
+    'Close'
+  ])
+})
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
index 8fa5bb9e66a3..5652cb3d8932 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
@@ -21,17 +21,18 @@ import {
   consumeNativeChatResumeOnRestartDialogRequest,
   requestNativeChatResumeOnRestartDialog
 } from './native-chat-resume-on-restart-dialog'
-import { _resetNativeChatRestartOffer } from './native-chat-resume-on-restart-store'
+import { _resetNativeChatRestartOffer } from './native-chat-restart-offer-triggers'
 
 const rpc = vi.hoisted(() => vi.fn())
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   callStructuredAgentSession: rpc,
+  pairedRestartOffersSupport: async () => 'supported',
   subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
 }))
 vi.mock('@/lib/activate-ai-vault-structured-session', () => ({
   activateAiVaultStructuredSession: vi.fn(async () => true)
 }))
-vi.mock('sonner', () => ({ toast: vi.fn() }))
+vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { dismiss: vi.fn() }) }))
 
 globalThis.IS_REACT_ACT_ENVIRONMENT = true
 let root: Root
@@ -188,6 +189,10 @@ it('disables Select all and the workspace checkbox while a resume runs', async (
   for (const box of boxes) {
     expect(box.hasAttribute('disabled')).toBe(true)
   }
+  // Select all shows the run, as the rows under it do.
+  const selectAll = namedBox('Select all chats')
+  expect(selectAll.getAttribute('aria-checked')).toBe('true')
+  expect(selectAll.closest('label')?.textContent).toContain('2 of 2 selected')
   await act(async () => continued.resolve({ sessions: [], failed: [], resumed: [], continued: [] }))
 })
 
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.machine-column.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.machine-column.test.tsx
new file mode 100644
index 000000000000..97147472f3bf
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.machine-column.test.tsx
@@ -0,0 +1,292 @@
+// @vitest-environment happy-dom
+
+// Machine rows inside the dialog's checkbox-column list: one column of boxes, one Select all.
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '../store'
+import { getDefaultSettings } from '../../../shared/constants'
+import { getHostContextLabel } from '../../../shared/worktree/host-context-labels'
+import { getHostDisplayLabelOverrides } from '../../../shared/host-setting-overrides'
+import { buildSidebarHostOptions } from './sidebar/sidebar-host-options'
+import { NativeChatResumeOnRestartModal } from './NativeChatResumeOnRestartModal'
+import { TooltipProvider } from './ui/tooltip'
+import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
+import {
+  consumeNativeChatResumeOnRestartDialogRequest,
+  requestNativeChatResumeOnRestartDialog
+} from './native-chat-resume-on-restart-dialog'
+import { readNativeChatRestartMachine } from './native-chat-resume-on-restart-store'
+import { _resetNativeChatRestartOffer } from './native-chat-restart-offer-triggers'
+import { pairedEnvironment } from './native-chat-restart-offer-test-support'
+import { button, chatBox, namedBox } from './native-chat-resume-on-restart-modal.test-support'
+import {
+  machineRow,
+  machineRowFixture as row,
+  machineToggle
+} from './native-chat-resume-machines.test-support'
+
+const rpc = vi.hoisted(() => vi.fn())
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: rpc,
+  pairedRestartOffersSupport: async () => 'supported',
+  subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
+}))
+vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { dismiss: vi.fn() }) }))
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+let root: Root
+let container: HTMLDivElement
+
+type Listing = { sessions: ResumeCandidate[]; failed?: ResumeFailure[] }
+
+const LOCAL = getHostContextLabel('local')
+const SERVER_ROWS = [row('s1', 'own'), row('s2', 'other-device'), row('s3', 'automation')]
+
+/** Reads this computer and each named server with the listing given for it. A server's resume
+ *  never answers; this computer's does at once. */
+async function stage(local: Listing, servers: Record<string, Listing>): Promise<void> {
+  rpc.mockImplementation(async (target, method) => {
+    if (method === 'agentSession.restartContinue') {
+      return target.kind === 'local' ? { continued: [], ...local } : new Promise(() => {})
+    }
+    return target.kind === 'local' ? local : (servers[target.environmentId] ?? { sessions: [] })
+  })
+  await act(async () => {
+    await readNativeChatRestartMachine({ kind: 'local' })
+    for (const environmentId of Object.keys(servers)) {
+      await readNativeChatRestartMachine({ kind: 'environment', environmentId })
+    }
+  })
+}
+
+async function open(focus: string | null): Promise<void> {
+  await act(async () =>
+    root.render(
+      <TooltipProvider>
+        <NativeChatResumeOnRestartModal />
+      </TooltipProvider>
+    )
+  )
+  await act(async () => requestNativeChatResumeOnRestartDialog(focus))
+}
+
+/** The grid row a checkbox heads: its first cell is the checkbox column. */
+function rowOf(box: HTMLElement): HTMLElement {
+  return box.parentElement!.parentElement!
+}
+
+function selectAllCount(): string | undefined {
+  return namedBox('Select all chats').closest('label')?.querySelector('.tabular-nums')?.textContent
+}
+
+beforeEach(() => {
+  rpc.mockReset()
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({
+    settings: { ...getDefaultSettings(''), experimentalStructuredNativeChat: false },
+    runtimeEnvironments: [
+      pairedEnvironment('studio', 'studio-mac'),
+      pairedEnvironment('build', 'build-box')
+    ]
+  })
+  container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+})
+
+it('puts each machine’s box in the list’s one checkbox column, indenting only what is under it', async () => {
+  await stage({ sessions: [row('l1', 'own')] }, { studio: { sessions: SERVER_ROWS } })
+  await open('environment:studio')
+
+  expect(document.querySelectorAll('[aria-label="Select all chats"]')).toHaveLength(1)
+  const machine = rowOf(machineToggle('studio-mac'))
+  const workspace = rowOf(namedBox('Select all chats in workspace-s1'))
+  const columns = 'grid-cols-[1.75rem_minmax(0,1fr)]'
+  expect(machine.classList.contains(columns)).toBe(true)
+  expect(workspace.classList.contains(columns)).toBe(true)
+  expect(machine.firstElementChild?.contains(machineToggle('studio-mac'))).toBe(true)
+  // Nested one level under the machine: the workspace's box, title and chats move right.
+  expect(workspace.querySelector<HTMLElement>(':scope > :nth-child(2)')?.style.marginLeft).toBe(
+    '40px'
+  )
+  expect(chatBox('s1').closest('ul')?.style.getPropertyValue('--resume-chat-indent')).toBe('60px')
+
+  const order = [
+    namedBox('Select all chats'),
+    machineToggle(LOCAL),
+    machineToggle('studio-mac'),
+    namedBox('Select all chats in workspace-s1'),
+    chatBox('s1'),
+    namedBox('Select all chats in workspace-s2'),
+    chatBox('s2'),
+    namedBox('Select all chats in workspace-s3'),
+    chatBox('s3')
+  ]
+  order[0]!.focus()
+  for (const next of order.slice(1)) {
+    await act(async () => {
+      document.activeElement?.dispatchEvent(
+        new KeyboardEvent('keydown', { key: 'ArrowDown', bubbles: true })
+      )
+    })
+    expect(document.activeElement).toBe(next)
+  }
+})
+
+// A machine row heads its workspaces' boxes from outside them, and sits a step further from the
+// previous machine's boxes than one box from the next.
+it('heads each machine’s boxes from outside them, set apart from the machine before', async () => {
+  await stage({ sessions: [row('l1', 'own')] }, { studio: { sessions: SERVER_ROWS } })
+  await open('environment:studio')
+  await act(async () => machineRow(LOCAL).click())
+  const localBox = rowOf(namedBox('Select all chats in workspace-l1')).parentElement!
+  const studio = rowOf(machineToggle('studio-mac'))
+  // Each workspace box draws its border in the content area; the machine row is in none of them.
+  expect(localBox.querySelector(':scope > [aria-hidden="true"]')).not.toBeNull()
+  expect(studio.closest('.relative')).toBeNull()
+  expect(localBox.compareDocumentPosition(studio) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
+  expect(studio.classList.contains('mt-3')).toBe(true)
+  expect(localBox.classList.contains('my-1.5')).toBe(true)
+})
+
+it('ticks and clears only its own machine’s chats from a machine’s tri-state box', async () => {
+  await stage(
+    { sessions: [row('l1', 'own'), row('l2', 'other-device')] },
+    { studio: { sessions: SERVER_ROWS } }
+  )
+  await open(null)
+  expect(machineToggle(LOCAL).getAttribute('aria-checked')).toBe('mixed')
+  expect(machineToggle('studio-mac').getAttribute('aria-checked')).toBe('mixed')
+
+  await act(async () => machineToggle('studio-mac').click())
+  expect(machineToggle('studio-mac').getAttribute('aria-checked')).toBe('true')
+  expect(machineToggle(LOCAL).getAttribute('aria-checked')).toBe('mixed')
+  expect(button('Resume 4 chats')).toBeTruthy()
+
+  await act(async () => machineToggle('studio-mac').click())
+  expect(machineToggle('studio-mac').getAttribute('aria-checked')).toBe('false')
+  expect(machineToggle(LOCAL).getAttribute('aria-checked')).toBe('mixed')
+  expect(button('Resume 1 chat')).toBeTruthy()
+})
+
+// Another device's chat starts unticked but can be picked, so Select all counts and ticks it; a
+// failure no retry can fix cannot be picked at all, so it counts nowhere.
+it('counts one Select all across machines, others’ chats included, unfixable failures not', async () => {
+  const unfixable = {
+    ...row('s4', 'own'),
+    failedAt: 1_800_000_060_000,
+    outcome: 'refused' as const,
+    reason: 'agent_session_restart_work_superseded',
+    retryable: false
+  }
+  await stage(
+    { sessions: [row('l1', 'own')] },
+    { studio: { sessions: [row('s1', 'own'), row('s2', 'other-device')], failed: [unfixable] } }
+  )
+  await open('environment:studio')
+  const selectAll = namedBox('Select all chats')
+  expect(selectAll.getAttribute('aria-checked')).toBe('mixed')
+  expect(selectAllCount()).toBe('2 of 3 selected')
+
+  await act(async () => selectAll.click())
+  expect(selectAll.getAttribute('aria-checked')).toBe('true')
+  expect(selectAllCount()).toBe('3 of 3 selected')
+  expect(chatBox('s2').getAttribute('aria-checked')).toBe('true')
+  expect(chatBox('s4').getAttribute('aria-checked')).toBe('false')
+  expect(button('Resume 3 chats')).toBeTruthy()
+
+  await act(async () => selectAll.click())
+  expect(selectAllCount()).toBe('0 of 3 selected')
+  expect(button('Resume 0 chats').disabled).toBe(true)
+})
+
+// A machine mid-resume is locked; its ticks show the run, not a choice Select all can change.
+it('leaves a machine whose resume is running out of Select all', async () => {
+  await stage({ sessions: [row('l1', 'own')] }, { studio: { sessions: SERVER_ROWS } })
+  await open('environment:studio')
+  await act(async () => button('Resume 2 chats').click())
+  await open('environment:studio')
+  expect(machineToggle('studio-mac').hasAttribute('disabled')).toBe(true)
+  expect(selectAllCount()).toBe('1 of 1 selected')
+  await act(async () => namedBox('Select all chats').click())
+  expect(selectAllCount()).toBe('0 of 1 selected')
+  expect(chatBox('s1').getAttribute('aria-checked')).toBe('true')
+  expect(button('Resuming…').disabled).toBe(true)
+})
+
+// With every machine mid-resume there is nothing to choose; Select all shows the run instead.
+it('shows the run in Select all while every machine is resuming', async () => {
+  await stage(
+    { sessions: [] },
+    { studio: { sessions: SERVER_ROWS }, build: { sessions: [row('b1', 'own')] } }
+  )
+  await open(null)
+  await act(async () => button('Resume 2 chats').click())
+  await open(null)
+  const selectAll = namedBox('Select all chats')
+  expect(selectAll.hasAttribute('disabled')).toBe(true)
+  expect(selectAll.getAttribute('aria-checked')).toBe('mixed')
+  expect(selectAllCount()).toBe('2 of 4 selected')
+})
+
+// The machine row names the server; a chip saying the same on every workspace under it would only
+// repeat it, so a paired server's workspaces carry none.
+it('names a paired server once, on its machine row, not again on each workspace', async () => {
+  await stage({ sessions: [row('l1', 'own')] }, { studio: { sessions: SERVER_ROWS } })
+  await open('environment:studio')
+  for (const sessionId of ['s1', 's2', 's3']) {
+    const workspace = rowOf(namedBox(`Select all chats in workspace-${sessionId}`))
+    expect(workspace.textContent).not.toContain('studio')
+  }
+})
+
+// The machine row and a workspace's host chip read one source, the sidebar's host names; a host
+// renamed in its settings reads the new name on both, and no name shows twice for one host.
+it('names each machine as the sidebar does, a rename included, and an SSH host only on its chip', async () => {
+  useAppStore.setState({
+    settings: {
+      ...getDefaultSettings(''),
+      experimentalStructuredNativeChat: false,
+      hostSettingOverrides: {
+        local: { displayLabel: 'Desk' },
+        'runtime:studio': { displayLabel: 'Studio' }
+      }
+    },
+    sshTargetLabels: new Map([['devbox-1', 'devbox']])
+  })
+  const onSsh = { ...row('l2', 'own'), executionHostId: 'ssh:devbox-1' as const }
+  await stage({ sessions: [row('l1', 'own'), onSsh] }, { studio: { sessions: SERVER_ROWS } })
+  await open('environment:studio')
+  // The labels the sidebar's own host sections are built from.
+  const state = useAppStore.getState()
+  const sidebar = new Map(
+    buildSidebarHostOptions({
+      repos: state.repos,
+      sshTargetLabels: state.sshTargetLabels,
+      sshConnectionStates: state.sshConnectionStates,
+      settings: state.settings,
+      runtimeEnvironments: state.runtimeEnvironments,
+      runtimeStatusByEnvironmentId: state.runtimeStatusByEnvironmentId,
+      hostLabelOverrides: getHostDisplayLabelOverrides(state.settings)
+    }).map((host) => [host.id, host.label])
+  )
+  expect([sidebar.get('local'), sidebar.get('runtime:studio')]).toEqual(['Desk', 'Studio'])
+  expect(machineToggle('Desk')).toBeTruthy()
+  expect(machineToggle('Studio')).toBeTruthy()
+  await act(async () => machineRow('Desk').click())
+  expect(rowOf(namedBox('Select all chats in workspace-l2')).textContent).toContain('devbox')
+  expect(rowOf(namedBox('Select all chats in workspace-l1')).textContent).not.toContain('Desk')
+  expect(rowOf(namedBox('Select all chats in workspace-s1')).textContent).not.toContain('Studio')
+})
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.machines.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.machines.test.tsx
new file mode 100644
index 000000000000..aab37cc444b0
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.machines.test.tsx
@@ -0,0 +1,411 @@
+// @vitest-environment happy-dom
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { toast } from 'sonner'
+import { useAppStore } from '../store'
+import { getDefaultSettings } from '../../../shared/constants'
+import { NativeChatResumeOnRestartModal } from './NativeChatResumeOnRestartModal'
+import { TooltipProvider } from './ui/tooltip'
+import { Dialog, DialogContent, DialogTitle } from './ui/dialog'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import {
+  consumeNativeChatResumeOnRestartDialogRequest,
+  getNativeChatResumeOnRestartDialogRequest,
+  requestNativeChatResumeOnRestartDialog
+} from './native-chat-resume-on-restart-dialog'
+import { requestLaunchResumePrompt } from './native-chat-resume-on-restart-launch-prompt'
+import { readNativeChatRestartMachine } from './native-chat-resume-on-restart-store'
+import { _resetNativeChatRestartOffer } from './native-chat-restart-offer-triggers'
+import { pairedEnvironment } from './native-chat-restart-offer-test-support'
+import { lastToastShow } from './native-chat-resume-toast.test-support'
+import {
+  machineRow,
+  machineRowFixture,
+  machineToggle
+} from './native-chat-resume-machines.test-support'
+
+const rpc = vi.hoisted(() => vi.fn())
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: rpc,
+  pairedRestartOffersSupport: async () => 'supported',
+  subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
+}))
+vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { dismiss: vi.fn() }) }))
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+let root: Root
+let container: HTMLDivElement
+
+const row = machineRowFixture
+
+let localRows = [row('l1', 'own')]
+const SERVER_ROWS = [row('s1', 'own'), row('s2', 'other-device'), row('s3', 'automation')]
+const OTHERS_ONLY = [row('o1', 'other-device')]
+
+async function stage(servers: Record<string, ResumeCandidate[]>): Promise<void> {
+  rpc.mockImplementation(async (target, method) => {
+    if (method !== 'agentSession.restartResumable') {
+      return { continued: [], sessions: [] }
+    }
+    return {
+      sessions: target.kind === 'local' ? localRows : (servers[target.environmentId] ?? [])
+    }
+  })
+  await act(async () => {
+    await readNativeChatRestartMachine({ kind: 'local' })
+    for (const environmentId of Object.keys(servers)) {
+      await readNativeChatRestartMachine({ kind: 'environment', environmentId })
+    }
+  })
+}
+
+/** Reads this computer and the studio server with whatever `rpc` answers now. */
+async function stageReads(): Promise<void> {
+  await act(async () => {
+    await readNativeChatRestartMachine({ kind: 'local' })
+    await readNativeChatRestartMachine({ kind: 'environment', environmentId: 'studio' })
+  })
+}
+
+async function open(focus: string | null): Promise<void> {
+  await act(async () =>
+    root.render(
+      <TooltipProvider>
+        <NativeChatResumeOnRestartModal />
+      </TooltipProvider>
+    )
+  )
+  await act(async () => requestNativeChatResumeOnRestartDialog(focus))
+}
+
+function button(text: string): HTMLButtonElement {
+  const found = [...document.querySelectorAll('button')].find(
+    (entry) => entry.textContent?.trim() === text
+  )
+  if (!found) {
+    throw new Error(`Missing button: ${text}`)
+  }
+  return found
+}
+
+function actionCalls(method: string): unknown[] {
+  return rpc.mock.calls.filter((call) => call[1] === method).map((call) => [call[0], call[2]])
+}
+
+beforeEach(() => {
+  rpc.mockReset()
+  vi.mocked(toast).mockClear()
+  localRows = [row('l1', 'own')]
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({
+    settings: { ...getDefaultSettings(''), experimentalStructuredNativeChat: false },
+    runtimeEnvironments: [
+      pairedEnvironment('studio', 'studio-mac'),
+      pairedEnvironment('build', 'build-box')
+    ]
+  })
+  container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+})
+
+it('lists each machine with only the user’s own chats ticked, opening the one it was asked for', async () => {
+  await stage({ studio: SERVER_ROWS })
+  await open('environment:studio')
+  expect(machineRow('studio-mac').getAttribute('aria-expanded')).toBe('true')
+  expect(machineRow('studio-mac').textContent).toContain('1 of 3')
+  // This computer's own chats all start ticked, and it stays closed but listed.
+  expect(machineRow('Local').getAttribute('aria-expanded')).toBe('false')
+  expect(machineToggle('studio-mac').getAttribute('data-state')).toBe('indeterminate')
+  expect(document.body.textContent).toContain('Another device')
+  expect(document.body.textContent).toContain('Automation')
+  expect(button('Resume 2 chats')).toBeTruthy()
+})
+
+it('opens a machine with nothing ticked so its empty box is explained', async () => {
+  await stage({ studio: SERVER_ROWS, build: OTHERS_ONLY })
+  await open(null)
+  expect(machineRow('build-box').getAttribute('aria-expanded')).toBe('true')
+  expect(machineRow('studio-mac').getAttribute('aria-expanded')).toBe('false')
+  expect(machineToggle('build-box').getAttribute('data-state')).toBe('unchecked')
+})
+
+it('resumes each machine’s picked chats on that machine, and the machine box picks them all', async () => {
+  await stage({ studio: SERVER_ROWS })
+  await open('environment:studio')
+  await act(async () => machineToggle('studio-mac').click())
+  expect(machineToggle('studio-mac').getAttribute('data-state')).toBe('checked')
+  await act(async () => button('Resume 4 chats').click())
+  expect(actionCalls('agentSession.restartContinue')).toEqual([
+    [{ kind: 'local' }, { sessionIds: ['l1'] }],
+    [{ kind: 'environment', environmentId: 'studio' }, { sessionIds: ['s1', 's2', 's3'] }]
+  ])
+})
+
+// Dismiss all clears only the user's own chats, on this computer as on a server; another
+// device's, an automation's and the server's own stay for their owner, and the button says so.
+it('dismisses only the user’s own chats, on every machine', async () => {
+  localRows = [row('l1', 'own'), row('l2', 'other-device'), row('l3', 'automation')]
+  await stage({ studio: [...SERVER_ROWS, row('s4', 'server-made')] })
+  await open(null)
+  await act(async () => button('Dismiss').click())
+  const listed = (sessionId: string) => ({ sessionId, recordedAt: 1_800_000_000_000 })
+  expect(actionCalls('agentSession.restartResumableDismiss')).toEqual([
+    [{ kind: 'local' }, { sessionIds: ['l1'], offers: [listed('l1')] }],
+    [
+      { kind: 'environment', environmentId: 'studio' },
+      { sessionIds: ['s1'], offers: [listed('s1')] }
+    ]
+  ])
+})
+
+// What Dismiss all leaves has its own way out: its row's dismiss forgets exactly that offer.
+it('dismisses a chat that is not the user’s from its own row, and offers no such control on theirs', async () => {
+  await stage({ studio: [row('s1', 'own'), row('s2', 'automation')] })
+  await open('environment:studio')
+  const rowDismiss = (prompt: string) =>
+    [...document.querySelectorAll('button')].find(
+      (entry) =>
+        entry.getAttribute('aria-label') === `Dismiss "${prompt}" in workspace-s${prompt.at(-1)}`
+    )
+  expect(rowDismiss('Prompt s1')).toBeUndefined()
+  await act(async () => rowDismiss('Prompt s2')?.click())
+  expect(actionCalls('agentSession.restartResumableDismiss')).toEqual([
+    [
+      { kind: 'environment', environmentId: 'studio' },
+      {
+        sessionIds: ['s2'],
+        offers: [{ sessionId: 's2', recordedAt: 1_800_000_000_000 }]
+      }
+    ]
+  ])
+})
+
+it('says "Dismiss all" only when every listed chat is the user’s own', async () => {
+  await stage({ studio: [row('s1', 'own')] })
+  await open(null)
+  expect(button('Dismiss all')).toBeTruthy()
+  await stage({ studio: [row('s1', 'own'), row('s2', 'automation')] })
+  expect(button('Dismiss')).toBeTruthy()
+})
+
+it('reports one resume across machines in one toast', async () => {
+  await stage({ studio: SERVER_ROWS })
+  rpc.mockImplementation(async (target, method) =>
+    method === 'agentSession.restartContinue'
+      ? {
+          continued: [{ sessionId: target.kind === 'local' ? 'l1' : 's1', outcome: 'continued' }],
+          sessions: [],
+          failed: []
+        }
+      : { sessions: [] }
+  )
+  await open(null)
+  await act(async () => button('Resume 2 chats').click())
+  await vi.waitFor(() => expect(toast).toHaveBeenCalled())
+  expect(vi.mocked(toast).mock.calls.map(([title]) => title)).toEqual(['Resumed 2 chats'])
+})
+
+// One slow server must not hold this computer's chats hostage.
+it('locks only the machine whose resume is still running', async () => {
+  await stage({ studio: SERVER_ROWS })
+  rpc.mockImplementation(async (target, method) =>
+    method === 'agentSession.restartContinue' && target.kind === 'environment'
+      ? new Promise(() => {})
+      : { continued: [], sessions: localRows }
+  )
+  await open('environment:studio')
+  await act(async () => machineToggle('studio-mac').click())
+  await act(async () => button('Resume 4 chats').click())
+  await open(null)
+  expect(machineToggle('studio-mac').hasAttribute('disabled')).toBe(true)
+  expect(button('Resume 1 chat').disabled).toBe(false)
+})
+
+// The launch read joining a dialog the user opened must not move its focus.
+it("keeps the user's ticks and open machine when this computer's launch read lands", async () => {
+  await stage({ studio: [row('s1', 'own'), row('s2', 'own')] })
+  await open('environment:studio')
+  expect(button('Resume 3 chats')).toBeTruthy()
+  await act(async () => machineToggle('studio-mac').click())
+  expect(button('Resume 1 chat')).toBeTruthy()
+  await act(async () => requestLaunchResumePrompt())
+  expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: 'environment:studio' })
+  expect(button('Resume 1 chat')).toBeTruthy()
+  expect(machineRow('studio-mac').getAttribute('aria-expanded')).toBe('true')
+})
+
+it('keeps the flat list when only this computer has chats', async () => {
+  await stage({})
+  await open('local')
+  expect(document.querySelector('button[aria-expanded]')).toBeNull()
+  expect(button('Resume 1 chat')).toBeTruthy()
+})
+
+// A dialog the user opened is never the app's own prompt: another dialog does not hide it.
+it('keeps a user-opened dialog on screen when another dialog opens over it', async () => {
+  await stage({ studio: SERVER_ROWS })
+  await act(async () =>
+    root.render(
+      <TooltipProvider>
+        <NativeChatResumeOnRestartModal />
+        <Dialog open>
+          <DialogContent>
+            <DialogTitle>Another dialog</DialogTitle>
+          </DialogContent>
+        </Dialog>
+      </TooltipProvider>
+    )
+  )
+  await act(async () => requestNativeChatResumeOnRestartDialog('environment:studio'))
+  const resume = [...document.querySelectorAll('[role="dialog"]')].find((entry) =>
+    entry.textContent?.includes('Resume interrupted chats?')
+  )
+  expect(resume).toBeTruthy()
+})
+
+// Once open, a launch-raised dialog stays until the user closes it, whatever this computer's list
+// does under it.
+it('keeps an open launch dialog when this computer’s chats run out while a server’s remain', async () => {
+  await stage({ studio: [row('s1', 'own')] })
+  await act(async () =>
+    root.render(
+      <TooltipProvider>
+        <NativeChatResumeOnRestartModal />
+      </TooltipProvider>
+    )
+  )
+  await act(async () => requestLaunchResumePrompt())
+  expect(document.querySelector('[role="dialog"]')).not.toBeNull()
+  localRows = []
+  await act(async () => {
+    await readNativeChatRestartMachine({ kind: 'local' })
+  })
+  expect(document.querySelector('[role="dialog"]')).not.toBeNull()
+  expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: 'local' })
+})
+
+// The workspace rows inside name no host their machine row already names, so the machine row is
+// what says where the chats are, this computer's and a server's alike, even alone.
+it('names the machine on its row whenever chats are grouped by machine, even a single server', async () => {
+  localRows = []
+  await stage({ studio: SERVER_ROWS })
+  await open(null)
+  expect(machineRow('studio-mac').textContent).toContain('studio-mac')
+  localRows = [row('l1', 'own')]
+  await stage({ studio: SERVER_ROWS })
+  expect(machineRow('Local').textContent).toContain('Local')
+  expect(machineRow('studio-mac')).toBeTruthy()
+})
+
+// With nothing of the user's listed, Dismiss would clear nothing and only close the dialog; it stays
+// in place, disabled, and each row's own dismiss is the way out.
+it('disables Dismiss when no listed chat is the user’s own', async () => {
+  localRows = []
+  await stage({ studio: [row('s2', 'other-device'), row('s3', 'automation')] })
+  await open(null)
+  expect(button('Dismiss').disabled).toBe(true)
+  await act(async () => button('Dismiss').click())
+  expect(actionCalls('agentSession.restartResumableDismiss')).toEqual([])
+  expect(document.querySelector('[role="dialog"]')).not.toBeNull()
+})
+
+// A restart toast still on screen sits above the dialog's backdrop but cannot be clicked through
+// it; the open dialog lists the same chats, so the toast goes.
+it('dismisses a server’s restart toast once the dialog listing it opens', async () => {
+  await stage({ studio: [row('s1', 'own')] })
+  await open('environment:studio')
+  expect(toast.dismiss).toHaveBeenCalledWith('native-chat-restart-reconnect:environment:studio')
+})
+
+// A server's chats opened from its toast before this computer's launch read answers show nothing of
+// this computer; once that dialog is closed, this computer's own offer still opens when its read
+// lands, with no status bar to fall back on.
+it('opens this computer’s offer after a server-only dialog the user closed', async () => {
+  useAppStore.setState({ statusBarVisible: false })
+  localRows = []
+  await stage({ studio: [row('s1', 'own')] })
+  await open('environment:studio')
+  expect(document.querySelector('[role="dialog"]')?.textContent).not.toContain('Prompt l1')
+  await act(async () => button('Close').click())
+  expect(document.querySelector('[role="dialog"]')).toBeNull()
+
+  localRows = [row('l1', 'own')]
+  await act(async () => void (await readNativeChatRestartMachine({ kind: 'local' })))
+  await act(async () => requestLaunchResumePrompt())
+  expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: 'local' })
+  expect(document.querySelector('[role="dialog"]')?.textContent).toContain('Prompt l1')
+})
+
+// The server's provider refused to carry the chat on: the host files the failure and lists it. One
+// toast says so and opens that server's list, where the row's Retry ends in one toast of its own.
+it('reports a chat a server could not carry on once, opens it on that server, and retries it', async () => {
+  localRows = []
+  const failed = {
+    ...row('s1', 'own'),
+    failedAt: 1_800_000_060_000,
+    outcome: 'refused',
+    reason: 'provider_refused_continuation'
+  }
+  const others = [row('s2', 'other-device')]
+  let phase: 'offered' | 'failed' | 'retried' = 'offered'
+  rpc.mockImplementation(async (target, method) => {
+    if (target.kind === 'local') {
+      return { sessions: [] }
+    }
+    if (method === 'agentSession.restartResumable') {
+      return phase === 'offered'
+        ? { sessions: [row('s1', 'own'), ...others], failed: [] }
+        : { sessions: others, failed: phase === 'failed' ? [failed] : [] }
+    }
+    if (phase === 'offered') {
+      phase = 'failed'
+      return {
+        continued: [{ sessionId: 's1', outcome: 'refused' }],
+        sessions: others,
+        failed: [failed]
+      }
+    }
+    phase = 'retried'
+    return { continued: [{ sessionId: 's1', outcome: 'continued' }], sessions: others, failed: [] }
+  })
+  await stageReads()
+  await open('environment:studio')
+  await act(async () => button('Resume 1 chat').click())
+  await vi.waitFor(() => expect(toast).toHaveBeenCalled())
+  expect(vi.mocked(toast).mock.calls).toEqual([
+    [
+      '1 chat on studio-mac couldn’t be resumed',
+      { action: { label: 'Show', onClick: expect.any(Function) } }
+    ]
+  ])
+  expect(document.querySelector('[role="dialog"]')).toBeNull()
+
+  await act(async () => lastToastShow()?.())
+  await vi.waitFor(() =>
+    expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: 'environment:studio' })
+  )
+  const dialog = document.querySelector('[role="dialog"]')
+  expect(dialog?.textContent).toContain('studio-mac')
+  expect(dialog?.textContent).toContain('Prompt s1')
+
+  await act(async () => button('Retry').click())
+  await vi.waitFor(() => expect(toast).toHaveBeenCalledTimes(2))
+  expect(actionCalls('agentSession.restartContinue').at(-1)).toEqual([
+    { kind: 'environment', environmentId: 'studio' },
+    { sessionIds: ['s1'] }
+  ])
+  expect(vi.mocked(toast).mock.calls[1]).toEqual(['Resumed 1 chat on studio-mac'])
+})
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
index c61958e6a2fc..5442a7b63994 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
@@ -20,27 +20,27 @@ import {
   offered
 } from './native-chat-resume-on-restart-modal.test-support'
 import {
-  consumeNativeChatResumeOnRestartDialogRequest,
   getNativeChatResumeOnRestartDialogRequest,
   requestNativeChatResumeOnRestartDialog
 } from './native-chat-resume-on-restart-dialog'
 import {
-  _resetNativeChatRestartOffer,
-  getNativeChatRestartOffer,
-  refreshNativeChatRestartOffer
+  getNativeChatRestartOffers,
+  readNativeChatRestartMachine
 } from './native-chat-resume-on-restart-store'
+import { _resetNativeChatRestartOffer } from './native-chat-restart-offer-triggers'
 
 const rpc = vi.hoisted(() => vi.fn())
 const activate = vi.hoisted(() => vi.fn(async () => true))
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   callStructuredAgentSession: rpc,
+  pairedRestartOffersSupport: async () => 'supported',
   // A failed row opens the status feed; these cases never drive it.
   subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
 }))
 vi.mock('@/lib/activate-ai-vault-structured-session', () => ({
   activateAiVaultStructuredSession: activate
 }))
-vi.mock('sonner', () => ({ toast: vi.fn() }))
+vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { dismiss: vi.fn() }) }))
 
 globalThis.IS_REACT_ACT_ENVIRONMENT = true
 let root: Root
@@ -52,7 +52,13 @@ async function mount(node: React.ReactNode): Promise<void> {
 }
 
 function offerIds(): string[] {
-  return getNativeChatRestartOffer().candidates.map((candidate) => candidate.sessionId)
+  return (getNativeChatRestartOffers().get('local')?.candidates ?? []).map(
+    (candidate) => candidate.sessionId
+  )
+}
+
+function failedIds(): string[] {
+  return (getNativeChatRestartOffers().get('local')?.failed ?? []).map((entry) => entry.sessionId)
 }
 
 /** What each toast said: its title, and its description when it has one. */
@@ -67,7 +73,6 @@ function toasts(): unknown[][] {
 beforeEach(() => {
   rpc.mockReset()
   _resetNativeChatRestartOffer()
-  consumeNativeChatResumeOnRestartDialogRequest()
   vi.mocked(toast).mockClear()
   useAppStore.setState(useAppStore.getInitialState(), true)
   useAppStore.setState({
@@ -88,7 +93,6 @@ afterEach(() => {
   container.remove()
   useAppStore.setState(useAppStore.getInitialState(), true)
   _resetNativeChatRestartOffer()
-  consumeNativeChatResumeOnRestartDialogRequest()
 })
 
 it('keeps next-launch preference out of the current resume action', async () => {
@@ -118,19 +122,6 @@ it('keeps next-launch preference out of the current resume action', async () =>
   expect(rpc).toHaveBeenCalledTimes(2)
 })
 
-// One primary action and one way out of it; the body copy carries the transparency.
-it('offers exactly Dismiss all and the resume action', async () => {
-  rpc.mockResolvedValue({ sessions: offered })
-  await mount(<NativeChatResumeOnRestartModal />)
-  // Row and preference checkboxes are buttons too; the controls are what is left after them.
-  const controls = document.querySelectorAll('[role="dialog"] button:not([role="checkbox"])')
-  expect([...controls].map((entry) => entry.textContent?.trim())).toEqual([
-    'Dismiss all',
-    'Resume 2 chats',
-    'Close'
-  ])
-})
-
 // Rows the sidebar showed as working for different reasons must read differently.
 it('says under each chat what it was doing when Orca went away', async () => {
   rpc.mockResolvedValue({
@@ -175,7 +166,16 @@ it('fully dismisses the offer only through Dismiss all', async () => {
   await act(async () => button('Dismiss all').click())
   expect(rpc.mock.calls.map((call) => [call[1], call[2]])).toEqual([
     ['agentSession.restartResumable', undefined],
-    ['agentSession.restartResumableDismiss', {}]
+    [
+      'agentSession.restartResumableDismiss',
+      {
+        sessionIds: ['a', 'b'],
+        offers: [
+          { sessionId: 'a', recordedAt: 1_800_000_000_000 },
+          { sessionId: 'b', recordedAt: 1_800_000_000_000 }
+        ]
+      }
+    ]
   ])
   expect(offerIds()).toEqual([])
 })
@@ -279,7 +279,7 @@ it('closes on Resume and shows the resume in the status bar until the host answe
   expect(document.body.textContent).not.toContain('Resuming')
   expect(document.querySelector('[role="dialog"]')).toBeNull()
   // Nothing is left to show, so the reopen request is retired rather than left to latch.
-  expect(getNativeChatResumeOnRestartDialogRequest()).toBe(false)
+  expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
   // The click is answered once, when the run settles, across chats that are off-screen.
   expect(toasts()).toEqual([['Resumed 2 chats']])
 })
@@ -398,7 +398,8 @@ it('resumes and continues once when the launch begins opted in', async () => {
   )
   expect(rpc.mock.calls.map((call) => [call[1], call[2]])).toEqual([
     ['agentSession.restartResumable', undefined],
-    ['agentSession.restartContinue', {}]
+    // Named, never "everything": only the user's own chats are continued without asking.
+    ['agentSession.restartContinue', { sessionIds: ['a', 'b'] }]
   ])
   // Answered once, as a click is, however often the settings above re-render the surfaces.
   expect(toasts()).toEqual([['Resumed 2 chats']])
@@ -582,16 +583,16 @@ it('reports the chats a lost resume request named once, as failed, until it is r
   expect(warn).toHaveBeenCalledWith(expect.any(String), lost)
   warn.mockRestore()
   expect(offerIds()).toEqual([])
-  expect(getNativeChatRestartOffer().failed.map((entry) => entry.sessionId)).toEqual(['a', 'b'])
+  expect(failedIds()).toEqual(['a', 'b'])
   expect(button('2 chats failed to resume. Click for details.')).toBeTruthy()
   expect(document.body.textContent).not.toContain('chats to resume')
 
   // A host answer that no longer offers a chat ends its mark.
   sessions = [offered[1]!]
   await act(async () => {
-    await refreshNativeChatRestartOffer()
+    await readNativeChatRestartMachine({ kind: 'local' })
   })
-  expect(getNativeChatRestartOffer().failed.map((entry) => entry.sessionId)).toEqual(['b'])
+  expect(failedIds()).toEqual(['b'])
 
   continueFails = false
   await act(async () => show?.())
@@ -603,7 +604,7 @@ it('reports the chats a lost resume request named once, as failed, until it is r
     'agentSession.restartContinue',
     { sessionIds: ['b'] }
   ])
-  expect(getNativeChatRestartOffer()).toMatchObject({ candidates: [], failed: [] })
+  expect(getNativeChatRestartOffers().get('local')).toBeUndefined()
   expect(toasts().at(-1)).toEqual(['Resumed 1 chat'])
 })
 
@@ -649,17 +650,17 @@ it('keeps a lost resume request marked failed when its Dismiss fails', async ()
   })
   await mount(<NativeChatResumeOnRestartModal />)
   await act(async () => button('Resume 1 chat').click())
-  expect(getNativeChatRestartOffer().failed.map((entry) => entry.sessionId)).toEqual(['a'])
+  expect(failedIds()).toEqual(['a'])
   expect(toasts()).toEqual([['1 chat couldn’t be resumed']])
 
   await act(async () => requestNativeChatResumeOnRestartDialog())
   await act(async () => button('Dismiss "Prompt a" in workspace').click())
   expect(rpc.mock.calls.at(-2)?.slice(1)).toEqual([
     'agentSession.restartResumableDismiss',
-    { sessionIds: ['a'] }
+    { sessionIds: ['a'], offers: [{ sessionId: 'a', recordedAt: 1_800_000_000_000 }] }
   ])
   expect(offerIds()).toEqual([])
-  expect(getNativeChatRestartOffer().failed.map((entry) => entry.sessionId)).toEqual(['a'])
+  expect(failedIds()).toEqual(['a'])
   // A Dismiss is bookkeeping: whether the host took it raises no toast of its own.
   expect(toast).toHaveBeenCalledTimes(1)
   vi.mocked(console.warn).mockRestore()
@@ -719,7 +720,8 @@ it('lists a chat the resume could not carry on when the dialog reopens, with wha
 
   await act(async () => button('Open chat').click())
   expect(activate).toHaveBeenCalledWith({
-    structuredSession: { workspaceId: 'workspace', sessionId: 'b' }
+    // The machine that listed it rides along, so the reveal asks that machine and no other.
+    structuredSession: { workspaceId: 'workspace', sessionId: 'b', executionHostId: 'local' }
   })
   // Opening is read-only: the record stays with the host, the dialog just gets out of the way.
   expect(rpc.mock.calls.map((call) => call[1])).not.toContain(
@@ -839,7 +841,7 @@ it('keeps a failure the host marks unretryable out of Resume, even after a tick'
   expect(button('Resume 1 chat').disabled).toBe(false)
 
   failed = [{ ...failure('b'), retryable: false }]
-  await act(async () => void (await refreshNativeChatRestartOffer()))
+  await act(async () => void (await readNativeChatRestartMachine({ kind: 'local' })))
   expect(chatBox('b').hasAttribute('disabled')).toBe(true)
   expect(button('Resume 0 chats').disabled).toBe(true)
   expect(button('Open chat').disabled).toBe(false)
@@ -865,12 +867,15 @@ it('dismisses one failed chat by name, and every record through Dismiss all', as
   await act(async () => button('Dismiss "Prompt a" in workspace').click())
   expect(rpc.mock.calls.at(-1)?.slice(1)).toEqual([
     'agentSession.restartResumableDismiss',
-    { sessionIds: ['a'] }
+    { sessionIds: ['a'], offers: [{ sessionId: 'a', recordedAt: 1_800_000_000_000 }] }
   ])
   expect(document.querySelector('[role="dialog"]')?.textContent).not.toContain('Prompt a')
   expect(chatBoxes()).toHaveLength(1)
   await act(async () => button('Dismiss all').click())
-  expect(rpc.mock.calls.at(-1)?.slice(1)).toEqual(['agentSession.restartResumableDismiss', {}])
+  expect(rpc.mock.calls.at(-1)?.slice(1)).toEqual([
+    'agentSession.restartResumableDismiss',
+    { sessionIds: ['b'], offers: [{ sessionId: 'b', recordedAt: 1_800_000_000_000 }] }
+  ])
   expect(document.querySelector('[role="dialog"]')).toBeNull()
   // Dismissing is bookkeeping, not a resume: neither form raises a toast.
   expect(toast).not.toHaveBeenCalled()
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index ae165496dc43..3c37e3e56ba7 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -1,5 +1,4 @@
-import { useCallback, useMemo, useRef, useState, useSyncExternalStore } from 'react'
-import { useNativeChatRestartOfferEnabled } from './native-chat-restart-offer-gate'
+import { useCallback, useMemo, useRef, useState } from 'react'
 import { RotateCcw } from 'lucide-react'
 import { Button } from './ui/button'
 import { Checkbox } from './ui/checkbox'
@@ -13,60 +12,87 @@ import {
 } from './ui/dialog'
 import { useAppStore } from '../store'
 import { translate } from '@/i18n/i18n'
-import { activateAiVaultStructuredSession } from '@/lib/activate-ai-vault-structured-session'
 import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
+import { ResumeMachineSection } from './NativeChatResumeOnRestartMachineSection'
+import type { ResumeFailureAction } from './native-chat-resume-failure-guidance'
+import { consumeNativeChatResumeOnRestartDialogRequest } from './native-chat-resume-on-restart-dialog'
 import {
-  resumeFailureGuidance,
-  resumeFailureSelectable,
-  type ResumeFailureAction
-} from './native-chat-resume-failure-guidance'
+  continueNativeChatRestartOffers,
+  dismissNativeChatRestartOffer
+} from './native-chat-restart-offer-actions'
+import { useNativeChatRestartResuming } from './native-chat-resume-on-restart-store'
+import type { MachineView } from './native-chat-resume-machine-views'
+import { useNativeChatResumeDialogOpening } from './native-chat-resume-dialog-opening'
+import { actOnResumeRow } from './native-chat-resume-failure-action'
+import { resumeOwnershipLabel } from './native-chat-resume-ownership'
+import { resumeSelectionState } from './native-chat-resume-on-restart-grouping'
 import {
-  resumeSelectionState,
-  toggleResumeSelection,
-  type ResumeCandidate,
-  type ResumeFailure
-} from './native-chat-resume-on-restart-grouping'
-import {
-  consumeNativeChatResumeOnRestartDialogRequest,
-  getNativeChatResumeOnRestartDialogRequest,
-  subscribeNativeChatResumeOnRestartDialog
-} from './native-chat-resume-on-restart-dialog'
-import {
-  continueNativeChatRestartOffer,
-  dismissNativeChatRestartOffer,
-  useNativeChatRestartOffer,
-  useNativeChatRestartResuming
-} from './native-chat-resume-on-restart-store'
+  chosenResumeRows,
+  dismissedRows,
+  resumeRowKey,
+  resumeRowSelectedByDefault,
+  selectableResumeRows
+} from './native-chat-resume-selection'
 
 /**
- * What would be resumed, shown before anything runs.
+ * What would be resumed, shown before anything runs — on every machine with chats to resume.
  *
  * Resuming reattaches a chat AND asks the agent to carry on, so the list is the point: the user
- * sees which chats the last teardown recorded as mid-turn before a message goes anywhere. Every
- * string here has to say that a message is sent and that the user's own prompt is not re-sent.
+ * sees which chats each machine's last teardown recorded as mid-turn before a message goes
+ * anywhere. Every string here has to say that a message is sent and that the user's own prompt is
+ * not re-sent.
  *
- * The "don't ask again" box removes the PROMPT, never a safety check — an opted-in launch calls
- * the same RPC, which re-derives the same predicate and staggers the same way.
+ * Each machine is a row with a select-all box, opening onto its workspaces and chats; every box,
+ * from Select all down to each chat, sits in one left column. The user's own chats start ticked;
+ * chats another device, an automation or the server itself started are listed unticked with where
+ * they came from, and Select all counts and ticks them like any other. Only this computer, alone,
+ * keeps the flat list.
  *
- * Resume closes the dialog at once and the status-bar entry carries the run, then any chat it could
- * not carry on. The run lives in the store, as a skill update's does, so the dialog is one view of it.
+ * The "don't ask again" box removes the PROMPT, never a safety check — an opted-in launch or
+ * reconnect calls the same RPC, which re-derives the same predicate and staggers the same way.
  *
- * A chat an earlier resume could not carry on is listed too, as the same row plus what went wrong
- * and what to do; selecting it and resuming is a retry, unless the host says a retry cannot run.
- * Row actions (Retry, Dismiss) act on their row and leave the dialog open. It closes only on the
- * user's own way out, or once the host confirms nothing is left; a resume settling never closes it.
+ * Resume closes the dialog at once and the status-bar entry carries the run, then any chat it could
+ * not carry on. A chat an earlier resume could not carry on is listed too, as the same row plus
+ * what went wrong and what to do; selecting it and resuming is a retry. Row actions act on their
+ * row and leave the dialog open. It closes only on the user's own way out, or once no machine has
+ * anything left.
  *
- * Closing is a SNOOZE, so looking around before deciding cannot remove the recovery. Dismiss all is
- * the explicit path that deletes the durable records.
+ * Closing is a SNOOZE, so looking around before deciding cannot remove the recovery. Dismiss is the
+ * explicit path that deletes the durable records, and only the user's own; any other chat ends when
+ * it moves on, when its tab is closed, or by its own row's dismiss.
  */
 
-/** Pre-selected unless it is a failure a retry cannot fix; resuming that would only fail again. */
-function selectedByDefault(failure: ResumeFailure | undefined): boolean {
-  if (!failure) {
-    return true
+/** Says where the chats were cut off: on several machines, by this computer's update, or its close. */
+function resumeDialogBody(flat: boolean, interruptedByUpdate: boolean): string {
+  if (!flat) {
+    return translate(
+      'auto.components.NativeChatResumeOnRestartModal.machinesBody',
+      'These chats were working when Orca on their machine closed or installed an update. Resuming restores each one where it stopped, with its full context, and asks the agent to check what it was doing before carrying on. Your own prompt is not re-sent.'
+    )
+  }
+  return interruptedByUpdate
+    ? translate(
+        'auto.components.NativeChatResumeOnRestartModal.updateBody',
+        'These chats were working when Orca installed an update. Resuming restores each one where it stopped, with its full context, and asks the agent to check what it was doing before carrying on. Your own prompt is not re-sent.'
+      )
+    : translate(
+        'auto.components.NativeChatResumeOnRestartModal.body',
+        'These chats were working when Orca closed. Resuming restores each one where it stopped, with its full context, and asks the agent to check what it was doing before carrying on. Your own prompt is not re-sent.'
+      )
+}
+
+/** Mid-run with nothing left to choose, the button says the run is going rather than "Resume 0". */
+function resumeButtonLabel(chosenCount: number, running: boolean): string {
+  if (chosenCount === 0 && running) {
+    return translate('auto.components.NativeChatResumeOnRestartModal.resuming', 'Resuming…')
   }
-  const guidance = resumeFailureGuidance(failure)
-  return guidance.primary === 'retry' || guidance.secondary === 'retry'
+  return chosenCount === 1
+    ? translate('auto.components.NativeChatResumeOnRestartModal.resumeSelectedOne', 'Resume 1 chat')
+    : translate(
+        'auto.components.NativeChatResumeOnRestartModal.resumeSelected',
+        'Resume {{value0}} chats',
+        { value0: chosenCount }
+      )
 }
 
 /** Up/Down step between the list's checkboxes; Space toggles the focused one natively. */
@@ -87,67 +113,79 @@ function moveCheckboxFocus(event: React.KeyboardEvent<HTMLElement>): void {
 }
 
 export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
-  const offerEnabled = useNativeChatRestartOfferEnabled()
-  const { candidates, failed, listedAt } = useNativeChatRestartOffer(offerEnabled)
-  const rows = useMemo<ResumeCandidate[]>(() => [...candidates, ...failed], [candidates, failed])
-  const failureBySession = useMemo(
-    () => new Map(failed.map((failure) => [failure.sessionId, failure])),
-    [failed]
-  )
-  // Open is an external one-shot request, never mirrored into local state: the launch load and the
-  // status-bar entry both raise it, and a copy here would go stale against whichever raised it last.
-  const open = useSyncExternalStore(
-    subscribeNativeChatResumeOnRestartDialog,
-    getNativeChatResumeOnRestartDialogRequest,
-    getNativeChatResumeOnRestartDialogRequest
-  )
+  const { machines, request, showing } = useNativeChatResumeDialogOpening()
   const updateSettings = useAppStore((store) => store.updateSettings)
   const [dontAskAgain, setDontAskAgain] = useState(false)
   const resumeButtonRef = useRef<HTMLButtonElement>(null)
-  // The store's: the resume outlives this dialog, which can close or reopen mid-run.
+  // The store's: the resume outlives this dialog, which can close or reopen mid-run. Busy is per
+  // machine, so one slow server never locks this computer's chats.
   const resuming = useNativeChatRestartResuming()
-  const busy = resuming.length > 0
-  /** The user's own ticks and unticks, over each row's default. Tracked as OVERRIDES rather than a
-   *  selection because the list is the host's and arrives — and shrinks — under an open dialog; a
-   *  stored selection would need seeding from an effect every time it changed. */
+  const allBusy = machines.length > 0 && machines.every((machine) => resuming.has(machine.machine))
   const [overrides, setOverrides] = useState<ReadonlyMap<string, boolean>>(() => new Map())
+  const [expandedOverrides, setExpandedOverrides] = useState<ReadonlyMap<string, boolean>>(
+    () => new Map()
+  )
   // Each opening starts from the rows' defaults. This component never unmounts, so an untick made
   // before a close would otherwise greet a reopen, e.g. as "Resume 0 chats" over what a run left.
-  const [openedWith, setOpenedWith] = useState(open)
-  if (openedWith !== open) {
-    setOpenedWith(open)
-    if (open) {
+  // Keyed on the request and the machine it was opened for.
+  const opening = request ? `open\u0000${request.focus ?? ''}` : null
+  const [openedWith, setOpenedWith] = useState(opening)
+  if (openedWith !== opening) {
+    setOpenedWith(opening)
+    if (opening) {
       setOverrides(new Map())
+      setExpandedOverrides(new Map())
     }
   }
-  /** Every chat a tick can name; a failure the host marks unretryable is left out. */
-  const selectable = useMemo(
+  const chosen = useMemo(
     () =>
-      rows
-        .filter((row) => {
-          const failure = failureBySession.get(row.sessionId)
-          return !failure || resumeFailureSelectable(failure)
-        })
-        .map((row) => row.sessionId),
-    [rows, failureBySession]
+      machines
+        .filter((machine) => !resuming.has(machine.machine))
+        .map((machine) => ({ machine, ids: chosenResumeRows(machine, overrides) })),
+    [machines, overrides, resuming]
   )
-  /** Derived from the host's own list, so an action can never name a chat it did not list. */
-  const chosen = useMemo(
+  const dismissals = useMemo(
     () =>
-      // A tick made before the host marked it unretryable must not carry into the action.
-      selectable.filter(
-        (sessionId) =>
-          overrides.get(sessionId) ?? selectedByDefault(failureBySession.get(sessionId))
-      ),
-    [selectable, overrides, failureBySession]
+      machines
+        .filter((machine) => !resuming.has(machine.machine))
+        .map((machine) => ({ machine, ids: dismissedRows(machine) })),
+    [machines, resuming]
+  )
+  // "Dismiss all" only when it clears every chat listed; any chat not the user's own (another
+  // device's, an automation's, the server's, or one whose owner the host could not say) stays, and
+  // the button must not claim otherwise. With nothing of the user's listed it clears nothing, so it
+  // stays put but disabled; each such row's own dismiss is the way out.
+  const dismissesEverything = dismissals.every(
+    (entry) => entry.ids.length === entry.machine.rows.length
   )
-  const selected = useMemo(() => new Set(chosen), [chosen])
-  // Mid-run the ticks show what is running; this opening's own ticks may name chats left out of it.
-  const ticked = useMemo(() => (busy ? new Set(resuming) : selected), [busy, resuming, selected])
-  const allSelection = resumeSelectionState(selectable, ticked)
+  const dismissesNothing = dismissals.every((entry) => entry.ids.length === 0)
+  const chosenCount = chosen.reduce((total, entry) => total + entry.ids.length, 0)
+  // One Select all across machines, over every chat a tick can name on a machine not mid-resume;
+  // with every machine mid-resume it shows the run, as the rows below do, and stays disabled.
+  const allSelection = useMemo(() => {
+    const counted = allBusy
+      ? machines.map((machine) => ({ machine, ids: resuming.get(machine.machine) ?? [] }))
+      : chosen
+    const keys = counted.flatMap(({ machine }) =>
+      selectableResumeRows(machine).map((sessionId) => resumeRowKey(machine.identity, sessionId))
+    )
+    const ticked = new Set(
+      counted.flatMap(({ machine, ids }) => ids.map((id) => resumeRowKey(machine.identity, id)))
+    )
+    return { keys, state: resumeSelectionState(keys, ticked) }
+  }, [allBusy, chosen, machines, resuming])
 
-  const toggleSelected = useCallback((sessionId: string, checked: boolean) => {
-    setOverrides((current) => new Map(current).set(sessionId, checked))
+  const toggle = useCallback((identity: string, sessionId: string, checked: boolean) => {
+    setOverrides((current) => new Map(current).set(resumeRowKey(identity, sessionId), checked))
+  }, [])
+  const setTicks = useCallback((keys: readonly string[], checked: boolean) => {
+    setOverrides((current) => {
+      const next = new Map(current)
+      for (const key of keys) {
+        next.set(key, checked)
+      }
+      return next
+    })
   }, [])
 
   /** Applied on whichever action the user takes, so the box means the same thing every way out. */
@@ -157,55 +195,41 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
     }
   }, [dontAskAgain, updateSettings])
 
-  // Never closes the dialog: only the user's own ways out do, and the store once nothing is left.
-  const resume = useCallback(
-    async (sessionIds: string[]): Promise<void> => {
-      void persistPreference()
-      await continueNativeChatRestartOffer(sessionIds)
-    },
-    [persistPreference]
-  )
-
-  /** Closing is a snooze: the host keeps the offer and the status bar keeps the way back to it. */
+  /** Closing is a snooze: each host keeps its offer and the status bar keeps the way back. */
   const snooze = useCallback((): void => {
     consumeNativeChatResumeOnRestartDialogRequest()
     void persistPreference()
   }, [persistPreference])
 
-  const dismissAll = useCallback(async (): Promise<void> => {
+  const dismissAll = async (): Promise<void> => {
     void persistPreference()
-    // Bookkeeping never gates the user's own action: the dialog closes here whatever the host
+    // Bookkeeping never gates the user's own action: the dialog closes here whatever each host
     // answers, rather than being trapped open behind a rejected promise.
     consumeNativeChatResumeOnRestartDialogRequest()
-    await dismissNativeChatRestartOffer()
-  }, [persistPreference])
-
-  const actOnFailure = async (action: ResumeFailureAction, sessionId: string): Promise<void> => {
-    if (action === 'dismiss') {
-      await dismissNativeChatRestartOffer([sessionId])
-      return
-    }
-    if (action === 'retry') {
-      await resume([sessionId])
-      return
-    }
-    const failure = failureBySession.get(sessionId)
-    if (!failure) {
-      return
-    }
-    // Opening is read-only and keeps the record: the user's own send in that chat settles it. The
-    // dialog gets out of the way of the chat it just opened.
-    consumeNativeChatResumeOnRestartDialogRequest()
-    await activateAiVaultStructuredSession({
-      structuredSession: { workspaceId: failure.workspaceId, sessionId }
-    })
+    await Promise.all(
+      dismissals
+        .filter((entry) => entry.ids.length > 0)
+        .map((entry) => dismissNativeChatRestartOffer(entry.machine.machine, entry.ids))
+    )
   }
 
-  if (!offerEnabled || !open || rows.length === 0) {
+  const actOnFailure = (machine: MachineView, action: ResumeFailureAction, sessionId: string) =>
+    actOnResumeRow(machine, action, sessionId, persistPreference)
+
+  if (!request || !showing) {
     return null
   }
 
-  const interruptedByUpdate = rows.some((row) => row.trigger === 'update')
+  const flat = machines.length === 1 && machines[0]!.offer.target.kind === 'local'
+  const rowsAcrossMachines = machines.flatMap((machine) => machine.rows)
+  const interruptedByUpdate = rowsAcrossMachines.some((row) => row.trigger === 'update')
+  const tickedFor = (machine: MachineView): ReadonlySet<string> =>
+    new Set(
+      // Mid-run the ticks show what is running; this opening's own ticks may name chats left out.
+      resuming.get(machine.machine) ?? chosen.find((entry) => entry.machine === machine)?.ids ?? []
+    )
+  const originLabelFor = (machine: MachineView) => (sessionId: string) =>
+    resumeOwnershipLabel(machine.ownershipFor(sessionId), machine.name)
 
   return (
     <Dialog
@@ -243,17 +267,7 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
               )}
             </span>
           </DialogTitle>
-          <DialogDescription>
-            {interruptedByUpdate
-              ? translate(
-                  'auto.components.NativeChatResumeOnRestartModal.updateBody',
-                  'These chats were working when Orca installed an update. Resuming restores each one where it stopped, with its full context, and asks the agent to check what it was doing before carrying on. Your own prompt is not re-sent.'
-                )
-              : translate(
-                  'auto.components.NativeChatResumeOnRestartModal.body',
-                  'These chats were working when Orca closed. Resuming restores each one where it stopped, with its full context, and asks the agent to check what it was doing before carrying on. Your own prompt is not re-sent.'
-                )}
-          </DialogDescription>
+          <DialogDescription>{resumeDialogBody(flat, interruptedByUpdate)}</DialogDescription>
         </DialogHeader>
 
         <div
@@ -267,14 +281,18 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
           className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md bg-worktree-sidebar pt-1 pb-1.5"
           onKeyDown={moveCheckboxFocus}
         >
-          {/* Here, not in the groups: a list may hold one set of groups per machine. */}
+          {/* Here, not in the groups or machine rows: one Select all for every machine listed. */}
           <label className="group/row grid h-7 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center has-[:disabled]:cursor-default">
             <span className="flex justify-center">
               <Checkbox
-                checked={allSelection.checked}
-                disabled={busy || allSelection.total === 0}
+                checked={allSelection.state.checked}
+                disabled={allBusy || allSelection.state.total === 0}
+                // Ticks everything unless all already are, as a workspace's box does.
                 onCheckedChange={() =>
-                  toggleResumeSelection(selectable, allSelection, toggleSelected)
+                  setTicks(
+                    allSelection.keys,
+                    allSelection.state.selectedCount < allSelection.state.total
+                  )
                 }
                 aria-label={translate(
                   'auto.components.NativeChatResumeOnRestartModal.selectAll',
@@ -293,29 +311,80 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
                 {translate(
                   'auto.components.NativeChatResumeOnRestartModal.selectedCount',
                   '{{value0}} of {{value1}} selected',
-                  { value0: allSelection.selectedCount, value1: allSelection.total }
+                  { value0: allSelection.state.selectedCount, value1: allSelection.state.total }
                 )}
               </span>
             </span>
           </label>
-          <ResumeOnRestartGroups
-            candidates={rows}
-            listedAt={listedAt}
-            busy={busy}
-            selected={ticked}
-            onToggle={toggleSelected}
-            failureFor={(sessionId) => failureBySession.get(sessionId)}
-            onFailureAction={(action, sessionId) => void actOnFailure(action, sessionId)}
-          />
+          {flat ? (
+            <ResumeOnRestartGroups
+              candidates={machines[0]!.rows}
+              listedAt={machines[0]!.offer.listedAt}
+              busy={resuming.has(machines[0]!.machine)}
+              selected={tickedFor(machines[0]!)}
+              onToggle={(sessionId, checked) => toggle(machines[0]!.identity, sessionId, checked)}
+              failureFor={machines[0]!.failureFor}
+              onFailureAction={(action, sessionId) =>
+                void actOnFailure(machines[0]!, action, sessionId)
+              }
+              originLabelFor={originLabelFor(machines[0]!)}
+            />
+          ) : (
+            <div className="flex flex-col">
+              {machines.map((machine) => {
+                const ticked = tickedFor(machine)
+                const selectable = selectableResumeRows(machine)
+                // Opened for this machine, or nothing on it starts ticked (so its empty box is
+                // explained), or it is the only machine listed.
+                const expandedByDefault =
+                  request.focus === machine.machine ||
+                  machines.length === 1 ||
+                  !machine.rows.some((row) =>
+                    resumeRowSelectedByDefault(
+                      machine.ownershipFor(row.sessionId),
+                      machine.failureFor(row.sessionId)
+                    )
+                  )
+                return (
+                  <ResumeMachineSection
+                    key={machine.identity}
+                    offer={machine.offer}
+                    name={machine.name}
+                    expanded={expandedOverrides.get(machine.identity) ?? expandedByDefault}
+                    onExpandedChange={(expanded) =>
+                      setExpandedOverrides((current) =>
+                        new Map(current).set(machine.identity, expanded)
+                      )
+                    }
+                    selected={ticked}
+                    selectable={selectable}
+                    busy={resuming.has(machine.machine)}
+                    onToggle={(sessionId, checked) => toggle(machine.identity, sessionId, checked)}
+                    onToggleAll={(checked) =>
+                      setTicks(
+                        selectable.map((sessionId) => resumeRowKey(machine.identity, sessionId)),
+                        checked
+                      )
+                    }
+                    failureFor={machine.failureFor}
+                    onFailureAction={(action, sessionId) =>
+                      void actOnFailure(machine, action, sessionId)
+                    }
+                    originLabelFor={originLabelFor(machine)}
+                  />
+                )
+              })}
+            </div>
+          )}
         </div>
 
-        {/* Two controls: one deletes the offer, one acts on it. Closing snoozes, so it needs none. */}
+        {/* Two controls: one deletes the offers, one acts on them. Closing snoozes, so it needs none. */}
         <DialogFooter className="sm:items-center">
           {/* Why order-last: the narrow footer stacks bottom-up, so this keeps the option above the actions. */}
           <label className="order-last flex min-w-0 items-start gap-2.5 sm:order-none sm:mr-auto">
             <Checkbox
               checked={dontAskAgain}
-              disabled={busy}
+              disabled={allBusy}
               onCheckedChange={(next) => setDontAskAgain(next === true)}
               className="mt-0.5"
             />
@@ -336,32 +405,34 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
             </span>
           </label>
           {/* Quiet, explicit cleanup of the durable records. */}
-          <Button variant="ghost" size="sm" disabled={busy} onClick={() => void dismissAll()}>
-            {translate('auto.components.NativeChatResumeOnRestartModal.dismissAll', 'Dismiss all')}
+          <Button
+            variant="ghost"
+            size="sm"
+            disabled={allBusy || dismissesNothing}
+            onClick={() => void dismissAll()}
+          >
+            {dismissesEverything
+              ? translate(
+                  'auto.components.NativeChatResumeOnRestartModal.dismissAll',
+                  'Dismiss all'
+                )
+              : translate('auto.components.NativeChatResumeOnRestartModal.dismiss', 'Dismiss')}
           </Button>
           <Button
             ref={resumeButtonRef}
             variant="default"
             size="sm"
-            disabled={busy || chosen.length === 0}
+            disabled={chosenCount === 0}
             onClick={() => {
-              // Resume hands the run to the status bar.
+              // Resume hands the run to the status bar, and its result to one notice.
               consumeNativeChatResumeOnRestartDialogRequest()
-              void resume(chosen)
+              void persistPreference()
+              void continueNativeChatRestartOffers(
+                chosen.map((entry) => ({ machine: entry.machine.machine, sessionIds: entry.ids }))
+              )
             }}
           >
-            {busy
-              ? translate('auto.components.NativeChatResumeOnRestartModal.resuming', 'Resuming…')
-              : chosen.length === 1
-                ? translate(
-                    'auto.components.NativeChatResumeOnRestartModal.resumeSelectedOne',
-                    'Resume 1 chat'
-                  )
-                : translate(
-                    'auto.components.NativeChatResumeOnRestartModal.resumeSelected',
-                    'Resume {{value0}} chats',
-                    { value0: chosen.length }
-                  )}
+            {resumeButtonLabel(chosenCount, resuming.size > 0)}
           </Button>
         </DialogFooter>
       </DialogContent>
diff --git a/src/renderer/src/components/native-chat-launch-resume-decision.test.tsx b/src/renderer/src/components/native-chat-launch-resume-decision.test.tsx
index 51ef0de7a6da..9e3febd62eef 100644
--- a/src/renderer/src/components/native-chat-launch-resume-decision.test.tsx
+++ b/src/renderer/src/components/native-chat-launch-resume-decision.test.tsx
@@ -8,11 +8,11 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '../store'
 import { getDefaultSettings } from '../../../shared/constants'
 import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import { useNativeChatRestartResuming } from './native-chat-resume-on-restart-store'
 import {
   _resetNativeChatRestartOffer,
-  useNativeChatRestartOffer,
-  useNativeChatRestartResuming
-} from './native-chat-resume-on-restart-store'
+  useNativeChatRestartOfferSources
+} from './native-chat-restart-offer-triggers'
 import {
   _resetNativeChatLaunchResumeDecision,
   useNativeChatLaunchResumePending
@@ -21,9 +21,10 @@ import {
 const rpc = vi.hoisted(() => vi.fn())
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   callStructuredAgentSession: rpc,
+  pairedRestartOffersSupport: async () => 'supported',
   subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
 }))
-vi.mock('sonner', () => ({ toast: vi.fn() }))
+vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { dismiss: vi.fn() }) }))
 
 globalThis.IS_REACT_ACT_ENVIRONMENT = true
 let root: Root
@@ -36,16 +37,17 @@ const offered: ResumeCandidate[] = ['a', 'b'].map((sessionId) => ({
   latestPrompt: `Prompt ${sessionId}`,
   recordedAt: 1_800_000_000_000,
   executionHostId: 'local',
-  workspaceKind: 'git-worktree'
+  workspaceKind: 'git-worktree',
+  origin: 'own'
 }))
 
 /** What Continue reads, rendered each time it changes. */
 const seen: { pending: boolean; resuming: readonly string[] }[] = []
 function Probe({ launch }: { launch: boolean }): null {
-  useNativeChatRestartOffer(launch)
+  useNativeChatRestartOfferSources(launch)
   seen.push({
     pending: useNativeChatLaunchResumePending(),
-    resuming: useNativeChatRestartResuming()
+    resuming: useNativeChatRestartResuming().get('local') ?? []
   })
   return null
 }
diff --git a/src/renderer/src/components/native-chat-restart-action-notifications.test.ts b/src/renderer/src/components/native-chat-restart-action-notifications.test.ts
index a9b4ccb562de..cd6d046928e7 100644
--- a/src/renderer/src/components/native-chat-restart-action-notifications.test.ts
+++ b/src/renderer/src/components/native-chat-restart-action-notifications.test.ts
@@ -2,7 +2,11 @@ import { isValidElement } from 'react'
 import { renderToStaticMarkup } from 'react-dom/server'
 import { toast } from 'sonner'
 import { beforeEach, expect, it, vi } from 'vitest'
-import { announceRestartResults } from './native-chat-restart-action-notifications'
+import {
+  announceRestartResults,
+  type RestartContinuationOutcome,
+  type RestartContinueResult
+} from './native-chat-restart-action-notifications'
 import { lastToastShow } from './native-chat-resume-toast.test-support'
 
 vi.mock('sonner', () => ({ toast: vi.fn() }))
@@ -13,45 +17,74 @@ const refusedBoth = [
   { sessionId: 'b', outcome: 'refused' as const }
 ]
 
-beforeEach(() => vi.mocked(toast).mockClear())
+function answered(
+  requested: string[],
+  results: RestartContinuationOutcome[] | undefined,
+  hostFailed: { sessionId: string; outcome: 'refused' | 'unconfirmed' }[] | undefined,
+  machine = 'local',
+  machineName?: string
+): RestartContinueResult {
+  return {
+    machine,
+    requested,
+    kind: 'answered',
+    results,
+    hostFailed,
+    ...(machineName ? { machineName } : {})
+  }
+}
 
 function titles(): unknown[] {
   return vi.mocked(toast).mock.calls.map(([text]) => text)
 }
 
+beforeEach(() => {
+  vi.mocked(toast).mockClear()
+  show.mockClear()
+})
+
 it('says how many chats were resumed', () => {
   announceRestartResults(
-    ['a', 'b'],
     [
-      { sessionId: 'a', outcome: 'continued' },
-      { sessionId: 'b', outcome: 'continued' }
+      answered(
+        ['a', 'b'],
+        [
+          { sessionId: 'a', outcome: 'continued' },
+          { sessionId: 'b', outcome: 'continued' }
+        ],
+        []
+      )
     ],
-    [],
     show
   )
   expect(vi.mocked(toast).mock.calls).toEqual([['Resumed 2 chats']])
 })
 
 it('offers Show for chats a resume could not carry on', () => {
-  announceRestartResults(['a', 'b'], refusedBoth, refusedBoth, show)
+  announceRestartResults([answered(['a', 'b'], refusedBoth, refusedBoth)], show)
   expect(titles()).toEqual(['2 chats couldn’t be resumed'])
   const options = vi.mocked(toast).mock.calls[0]?.[1]
   expect(options).not.toHaveProperty('description')
+  expect(options).not.toHaveProperty('cancel')
   expect(options?.action).toEqual({ label: 'Show', onClick: expect.any(Function) })
   lastToastShow()?.()
-  expect(show).toHaveBeenCalledTimes(1)
+  expect(show).toHaveBeenCalledWith('local')
 })
 
 // One resume, one toast: the chats it resumed ride along under the ones it could not.
 it('reports a mixed resume in one toast', () => {
   announceRestartResults(
-    ['a', 'b', 'c'],
     [
-      { sessionId: 'a', outcome: 'continued' },
-      { sessionId: 'b', outcome: 'continued' },
-      { sessionId: 'c', outcome: 'refused' }
+      answered(
+        ['a', 'b', 'c'],
+        [
+          { sessionId: 'a', outcome: 'continued' },
+          { sessionId: 'b', outcome: 'continued' },
+          { sessionId: 'c', outcome: 'refused' }
+        ],
+        [{ sessionId: 'c', outcome: 'refused' }]
+      )
     ],
-    [{ sessionId: 'c', outcome: 'refused' }],
     show
   )
   expect(vi.mocked(toast).mock.calls).toEqual([
@@ -61,15 +94,19 @@ it('reports a mixed resume in one toast', () => {
 
 it('puts each extra count on its own line when a resume had all three outcomes', () => {
   announceRestartResults(
-    ['a', 'b', 'c'],
     [
-      { sessionId: 'a', outcome: 'continued' },
-      { sessionId: 'b', outcome: 'refused' },
-      { sessionId: 'c', outcome: 'unknown' }
-    ],
-    [
-      { sessionId: 'b', outcome: 'refused' },
-      { sessionId: 'c', outcome: 'unconfirmed' }
+      answered(
+        ['a', 'b', 'c'],
+        [
+          { sessionId: 'a', outcome: 'continued' },
+          { sessionId: 'b', outcome: 'refused' },
+          { sessionId: 'c', outcome: 'unknown' }
+        ],
+        [
+          { sessionId: 'b', outcome: 'refused' },
+          { sessionId: 'c', outcome: 'unconfirmed' }
+        ]
+      )
     ],
     show
   )
@@ -89,32 +126,35 @@ it('puts each extra count on its own line when a resume had all three outcomes',
 // `b` finished on its own, or the user already answered it: the host no longer lists it, so the
 // notice must not count a failure the list it opens cannot show.
 it('counts only the requested chats the host still lists as failed', () => {
-  announceRestartResults(['a', 'b'], refusedBoth, [{ sessionId: 'a', outcome: 'refused' }], show)
+  announceRestartResults(
+    [answered(['a', 'b'], refusedBoth, [{ sessionId: 'a', outcome: 'refused' }])],
+    show
+  )
   expect(titles()).toEqual(['1 chat couldn’t be resumed'])
 })
 
 it('says nothing when the host lists none of them as failed', () => {
-  announceRestartResults(['a', 'b'], refusedBoth, [], show)
+  announceRestartResults([answered(['a', 'b'], refusedBoth, [])], show)
   expect(toast).not.toHaveBeenCalled()
 })
 
 // A request that never reached the host leaves no read to narrow by, so every chat it named failed.
 it('counts every chat not carried on when no failure list was read, with nothing to Show', () => {
-  announceRestartResults(['a', 'b'], [], undefined, show)
+  announceRestartResults([answered(['a', 'b'], [], undefined)], show)
   expect(titles()).toEqual(['2 chats couldn’t be resumed'])
   expect(vi.mocked(toast).mock.calls[0]?.[1]).not.toHaveProperty('action')
 })
 
 // An answer without outcomes may still have sent the message.
 it('counts every chat as unconfirmed when the answer carried no outcomes', () => {
-  announceRestartResults(['a', 'b'], undefined, undefined, show)
+  announceRestartResults([answered(['a', 'b'], undefined, undefined)], show)
   expect(titles()).toEqual(['Couldn’t confirm 2 chats were resumed'])
 })
 
 // The host retires an unconfirmed send once the agent is seen carrying on it; the resume must still
 // report the chat, and as resumed, not as a failure the list can no longer show.
 it('counts an unconfirmed chat the host no longer lists as resumed', () => {
-  announceRestartResults(['a'], [{ sessionId: 'a', outcome: 'unknown' }], [], show)
+  announceRestartResults([answered(['a'], [{ sessionId: 'a', outcome: 'unknown' }], [])], show)
   expect(titles()).toEqual(['Resumed 1 chat'])
 })
 
@@ -122,11 +162,15 @@ it('counts an unconfirmed chat the host no longer lists as resumed', () => {
 // `b` reattached with no continuation row: only the host's filed outcome says it is unconfirmed.
 it('counts a chat the host filed as unconfirmed on its own line, as the list does', () => {
   announceRestartResults(
-    ['a', 'b'],
-    [{ sessionId: 'a', outcome: 'refused' }],
     [
-      { sessionId: 'a', outcome: 'refused' },
-      { sessionId: 'b', outcome: 'unconfirmed' }
+      answered(
+        ['a', 'b'],
+        [{ sessionId: 'a', outcome: 'refused' }],
+        [
+          { sessionId: 'a', outcome: 'refused' },
+          { sessionId: 'b', outcome: 'unconfirmed' }
+        ]
+      )
     ],
     show
   )
@@ -140,12 +184,16 @@ it('counts a chat the host filed as unconfirmed on its own line, as the list doe
 
 it('leads with the unconfirmed count when nothing was refused', () => {
   announceRestartResults(
-    ['a', 'b'],
     [
-      { sessionId: 'a', outcome: 'unknown' },
-      { sessionId: 'b', outcome: 'pending' }
+      answered(
+        ['a', 'b'],
+        [
+          { sessionId: 'a', outcome: 'unknown' },
+          { sessionId: 'b', outcome: 'pending' }
+        ],
+        undefined
+      )
     ],
-    undefined,
     show
   )
   expect(vi.mocked(toast).mock.calls).toEqual([
@@ -155,3 +203,113 @@ it('leads with the unconfirmed count when nothing was refused', () => {
     ]
   ])
 })
+
+// One resume, one toast, however many machines it reached.
+it('reports one resume across machines in a single toast', () => {
+  announceRestartResults(
+    [
+      answered(['l1', 'l2'], [{ sessionId: 'l1', outcome: 'continued' }], []),
+      answered(
+        ['s1', 's2'],
+        [{ sessionId: 's1', outcome: 'continued' }],
+        [{ sessionId: 's2', outcome: 'refused' }],
+        'environment:studio',
+        'studio-mac'
+      ),
+      answered(
+        ['b1'],
+        [{ sessionId: 'b1', outcome: 'unknown' }],
+        [{ sessionId: 'b1', outcome: 'unconfirmed' }],
+        'environment:build',
+        'build-box'
+      )
+    ],
+    show
+  )
+  expect(toast).toHaveBeenCalledTimes(1)
+  const [title, options] = vi.mocked(toast).mock.calls[0]!
+  expect(title).toBe('1 chat couldn’t be resumed')
+  const description = options?.description
+  if (!isValidElement(description)) {
+    throw new Error('Expected one line per count')
+  }
+  expect(renderToStaticMarkup(description)).toBe(
+    '<span class="block">Couldn’t confirm 1 other chat was resumed</span>' +
+      '<span class="block">Resumed 2 chats</span>'
+  )
+})
+
+it('names the server when its chats alone are counted', () => {
+  announceRestartResults(
+    [
+      answered(
+        ['s1'],
+        [{ sessionId: 's1', outcome: 'continued' }],
+        [],
+        'environment:studio',
+        'studio-mac'
+      )
+    ],
+    show
+  )
+  expect(titles()).toEqual(['Resumed 1 chat on studio-mac'])
+})
+
+it('opens the dialog on the one failing server', () => {
+  announceRestartResults(
+    [
+      answered(
+        ['s1', 's2'],
+        [{ sessionId: 's1', outcome: 'unknown' }],
+        [
+          { sessionId: 's1', outcome: 'unconfirmed' },
+          { sessionId: 's2', outcome: 'unconfirmed' }
+        ],
+        'environment:studio',
+        'studio-mac'
+      )
+    ],
+    show
+  )
+  expect(titles()).toEqual(['Couldn’t confirm 2 chats on studio-mac were resumed'])
+  lastToastShow()?.()
+  expect(show).toHaveBeenCalledWith('environment:studio')
+})
+
+it('counts failures on several machines together and opens the dialog on none in particular', () => {
+  announceRestartResults(
+    [
+      answered(['a'], [], [{ sessionId: 'a', outcome: 'refused' }]),
+      answered(
+        ['s1'],
+        [],
+        [{ sessionId: 's1', outcome: 'refused' }],
+        'environment:studio',
+        'studio-mac'
+      )
+    ],
+    show
+  )
+  expect(titles()).toEqual(['2 chats couldn’t be resumed'])
+  expect(vi.mocked(toast).mock.calls[0]?.[1]).not.toHaveProperty('cancel')
+  lastToastShow()?.()
+  expect(show).toHaveBeenCalledWith(null)
+})
+
+// The server was re-paired under the listing: nothing was sent, and nothing it lists is this
+// pairing's to show.
+it('counts a resume refused before it left as not resumed, with nothing to Show', () => {
+  announceRestartResults(
+    [
+      {
+        machine: 'environment:studio',
+        machineName: 'studio-mac',
+        requested: ['s1'],
+        kind: 'not-sent'
+      }
+    ],
+    show
+  )
+  expect(titles()).toEqual(['1 chat on studio-mac couldn’t be resumed'])
+  expect(vi.mocked(toast).mock.calls[0]?.[1]).not.toHaveProperty('action')
+})
diff --git a/src/renderer/src/components/native-chat-restart-action-notifications.ts b/src/renderer/src/components/native-chat-restart-action-notifications.ts
index f2d41b29abd3..51e0386c7796 100644
--- a/src/renderer/src/components/native-chat-restart-action-notifications.ts
+++ b/src/renderer/src/components/native-chat-restart-action-notifications.ts
@@ -2,10 +2,12 @@ import { createElement, Fragment, type ReactNode } from 'react'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import type { ResumeFailure } from './native-chat-resume-on-restart-grouping'
+import type { RestartMachineKey } from './native-chat-restart-machines'
 
 /**
- * The one toast a resume raises, clicked or automatic at launch: what it did across chats that are
- * mostly off-screen. Each chat's own note stays the record of what happened to it.
+ * The one toast a resume raises, clicked or automatic: what it did across chats that are mostly
+ * off-screen, on every machine it reached. Each chat's own note stays the record of what happened
+ * to it.
  */
 
 /** One `continued` row as the host reports it. */
@@ -14,7 +16,45 @@ export type RestartContinuationOutcome = {
   outcome: 'continued' | 'pending' | 'unknown' | 'refused'
 }
 
-function continuedCountText(count: number): string {
+/** How one machine's part of a resume ended: the host's answer (or, when the request was lost, the
+ *  list re-read after it), a paired request whose answer and re-read were both lost, or a request
+ *  refused before it was sent (the server was re-paired). */
+export type RestartContinueResult = {
+  machine: RestartMachineKey
+  /** Names a paired server; this computer's own chats need no "where". */
+  machineName?: string
+  requested: readonly string[]
+} & (
+  | {
+      kind: 'answered'
+      /** Undefined for an answer without outcomes, which may still have sent the message. */
+      results: readonly RestartContinuationOutcome[] | undefined
+      /** The failure list after the action, as the dialog shows it; undefined when none was read. */
+      hostFailed: readonly Pick<ResumeFailure, 'sessionId' | 'outcome'>[] | undefined
+    }
+  | {
+      kind: 'unconfirmed'
+      /** Whether the machine still has a listing for Show to open. */
+      listed: boolean
+    }
+  | { kind: 'not-sent' }
+)
+
+/** `machineName` names a paired server; this computer's own chats need no "where". */
+function continuedText(count: number, machineName: string | undefined): string {
+  if (machineName !== undefined) {
+    return count === 1
+      ? translate(
+          'auto.components.NativeChatResumeOnRestartModal.continuedOneOnMachine',
+          'Resumed 1 chat on {{value0}}',
+          { value0: machineName }
+        )
+      : translate(
+          'auto.components.NativeChatResumeOnRestartModal.continuedManyOnMachine',
+          'Resumed {{value0}} chats on {{value1}}',
+          { value0: count, value1: machineName }
+        )
+  }
   return count === 1
     ? translate('auto.components.NativeChatResumeOnRestartModal.continuedOne', 'Resumed 1 chat')
     : translate(
@@ -24,7 +64,20 @@ function continuedCountText(count: number): string {
       )
 }
 
-function refusedCountText(count: number): string {
+function refusedCountText(count: number, machineName: string | undefined): string {
+  if (machineName !== undefined) {
+    return count === 1
+      ? translate(
+          'auto.components.NativeChatResumeOnRestartModal.notContinuedOneOnMachine',
+          '1 chat on {{value0}} couldn’t be resumed',
+          { value0: machineName }
+        )
+      : translate(
+          'auto.components.NativeChatResumeOnRestartModal.notContinuedManyOnMachine',
+          '{{value0}} chats on {{value1}} couldn’t be resumed',
+          { value0: count, value1: machineName }
+        )
+  }
   return count === 1
     ? translate(
         'auto.components.NativeChatResumeOnRestartModal.notContinuedOne',
@@ -37,7 +90,20 @@ function refusedCountText(count: number): string {
       )
 }
 
-function unconfirmedCountText(count: number): string {
+function unconfirmedCountText(count: number, machineName: string | undefined): string {
+  if (machineName !== undefined) {
+    return count === 1
+      ? translate(
+          'auto.components.NativeChatResumeOnRestartModal.notConfirmedOneOnMachine',
+          'Couldn’t confirm 1 chat on {{value0}} was resumed',
+          { value0: machineName }
+        )
+      : translate(
+          'auto.components.NativeChatResumeOnRestartModal.notConfirmedManyOnMachine',
+          'Couldn’t confirm {{value0}} chats on {{value1}} were resumed',
+          { value0: count, value1: machineName }
+        )
+  }
   return count === 1
     ? translate(
         'auto.components.NativeChatResumeOnRestartModal.notConfirmedOne',
@@ -75,39 +141,6 @@ function descriptionFrom(lines: readonly string[]): ReactNode {
       )
 }
 
-/** One toast per resume. No names: the dialog behind Show has the list. Unconfirmed chats get their
- *  own count because the agent may well be working; "couldn't be resumed" would invite a second
- *  send. Without a failure list there is nothing for Show to open. */
-function announceResume(
-  continued: number,
-  refused: number,
-  unconfirmed: number,
-  show: (() => Promise<void>) | undefined
-): void {
-  if (refused === 0 && unconfirmed === 0) {
-    if (continued > 0) {
-      toast(continuedCountText(continued))
-    }
-    return
-  }
-  const title = refused > 0 ? refusedCountText(refused) : unconfirmedCountText(unconfirmed)
-  const lines = [
-    ...(refused > 0 && unconfirmed > 0 ? [otherUnconfirmedCountText(unconfirmed)] : []),
-    ...(continued > 0 ? [continuedCountText(continued)] : [])
-  ]
-  toast(title, {
-    ...(lines.length === 0 ? {} : { description: descriptionFrom(lines) }),
-    ...(show === undefined
-      ? {}
-      : {
-          action: {
-            label: translate('auto.components.NativeChatResumeOnRestartModal.show', 'Show'),
-            onClick: () => void show()
-          }
-        })
-  })
-}
-
 /** Which of the requested chats the host did not carry on: refused, unconfirmed, or — since
  *  eligibility can change after listing — omitted from the answer altogether. */
 export function restartChatsNotContinued(
@@ -118,15 +151,21 @@ export function restartChatsNotContinued(
   return [...new Set(requested)].filter((sessionId) => bySession.get(sessionId) !== 'continued')
 }
 
-export function announceRestartResults(
+type MachineTally = {
+  machine: RestartMachineKey
+  machineName: string | undefined
+  continued: number
+  refused: number
+  unconfirmed: number
+  /** Whether a failure list was read, so Show has rows to open. */
+  listed: boolean
+}
+
+function tallyAnswer(
   requested: readonly string[],
-  /** Undefined for an answer without outcomes, which may still have sent the message. */
   reportedResults: readonly RestartContinuationOutcome[] | undefined,
-  /** The failure list after the action, as the dialog shows it; undefined when none was read. */
-  hostFailed: readonly Pick<ResumeFailure, 'sessionId' | 'outcome'>[] | undefined,
-  /** Opens the dialog over a fresh read; never rejects. */
-  show: () => Promise<void>
-): void {
+  hostFailed: readonly Pick<ResumeFailure, 'sessionId' | 'outcome'>[] | undefined
+): Omit<MachineTally, 'machine' | 'machineName'> {
   const results = Array.isArray(reportedResults)
     ? reportedResults
     : requested.map((sessionId) => ({ sessionId, outcome: 'unknown' as const }))
@@ -151,10 +190,80 @@ export function announceRestartResults(
     (failed.get(sessionId) ?? (sentUnconfirmed(sessionId) ? 'unconfirmed' : 'refused')) ===
     'unconfirmed'
   const unconfirmedCount = reported.filter(unconfirmed).length
-  announceResume(
-    new Set(requested).size - notContinued.length + seenCarryingOn.length,
-    reported.length - unconfirmedCount,
-    unconfirmedCount,
-    hostFailed === undefined ? undefined : show
-  )
+  return {
+    continued: new Set(requested).size - notContinued.length + seenCarryingOn.length,
+    refused: reported.length - unconfirmedCount,
+    unconfirmed: unconfirmedCount,
+    listed: hostFailed !== undefined
+  }
+}
+
+function tally(result: RestartContinueResult): MachineTally {
+  const base = { machine: result.machine, machineName: result.machineName }
+  if (result.kind === 'unconfirmed') {
+    const unconfirmed = new Set(result.requested).size
+    return { ...base, continued: 0, refused: 0, unconfirmed, listed: result.listed }
+  }
+  if (result.kind === 'not-sent') {
+    // Nothing reached the host and the pairing it was listed under is gone: no list to show.
+    const refused = new Set(result.requested).size
+    return { ...base, continued: 0, refused, unconfirmed: 0, listed: false }
+  }
+  return { ...base, ...tallyAnswer(result.requested, result.results, result.hostFailed) }
+}
+
+/** One machine's name when it alone holds the counted chats; otherwise the count needs no "where"
+ *  and the dialog it opens lists each machine. */
+function soleMachineName(tallies: readonly MachineTally[]): string | undefined {
+  return tallies.length === 1 ? tallies[0]!.machineName : undefined
+}
+
+function sum(tallies: readonly MachineTally[], count: (entry: MachineTally) => number): number {
+  return tallies.reduce((total, entry) => total + count(entry), 0)
+}
+
+/**
+ * One toast per resume, however many machines it reached: what went wrong leads, and the rest of
+ * the outcome rides beneath it. No chat names: the dialog behind Show has the list. Unconfirmed
+ * chats get their own count because the agent may well be working; "couldn't be resumed" would
+ * invite a second send. Without a failure list there is nothing for Show to open.
+ *
+ * `show` opens the dialog over a fresh read, on the one failing machine or on none in particular.
+ */
+export function announceRestartResults(
+  results: readonly RestartContinueResult[],
+  show: (machine: RestartMachineKey | null) => void
+): void {
+  const tallies = results.map(tally)
+  const failing = tallies.filter((entry) => entry.refused + entry.unconfirmed > 0)
+  const continuing = tallies.filter((entry) => entry.continued > 0)
+  const refused = sum(failing, (entry) => entry.refused)
+  const unconfirmed = sum(failing, (entry) => entry.unconfirmed)
+  const continued = sum(continuing, (entry) => entry.continued)
+  if (failing.length === 0) {
+    if (continued > 0) {
+      toast(continuedText(continued, soleMachineName(continuing)))
+    }
+    return
+  }
+  const title =
+    refused > 0
+      ? refusedCountText(refused, soleMachineName(failing))
+      : unconfirmedCountText(unconfirmed, soleMachineName(failing))
+  const lines = [
+    ...(refused > 0 && unconfirmed > 0 ? [otherUnconfirmedCountText(unconfirmed)] : []),
+    ...(continued > 0 ? [continuedText(continued, soleMachineName(continuing))] : [])
+  ]
+  const showable = failing.filter((entry) => entry.listed)
+  toast(title, {
+    ...(lines.length === 0 ? {} : { description: descriptionFrom(lines) }),
+    ...(showable.length === 0
+      ? {}
+      : {
+          action: {
+            label: translate('auto.components.NativeChatResumeOnRestartModal.show', 'Show'),
+            onClick: () => show(showable.length === 1 ? showable[0]!.machine : null)
+          }
+        })
+  })
 }
diff --git a/src/renderer/src/components/native-chat-restart-decided.ts b/src/renderer/src/components/native-chat-restart-decided.ts
new file mode 100644
index 000000000000..ab86279193f7
--- /dev/null
+++ b/src/renderer/src/components/native-chat-restart-decided.ts
@@ -0,0 +1,113 @@
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+
+/**
+ * The interruptions on each paired server this desktop has already decided about: announced in a
+ * toast, resumed without asking, or shown in the dialog. Offers are born only at a server teardown,
+ * so a chat and the moment it was cut off name one interruption exactly, and a reconnect, a reload
+ * or a reopened window decides nothing twice.
+ *
+ * This run's record in memory is the authority; the window's storage only seeds it at startup and
+ * carries it to the next launch. It is presentation only — the server holds the offers — so a
+ * storage that refuses writes costs at most one repeated notice per launch, never a second
+ * decision within a run. Every successful read prunes it to what the server still offers, and a
+ * removed or re-paired server's entry goes, so it can never grow.
+ */
+
+const STORAGE_KEY = 'orca.nativeChatRestartDecided.v1'
+
+type DecidedByEnvironment = Record<string, string[]>
+
+export function restartInterruptionKey(
+  candidate: Pick<ResumeCandidate, 'sessionId' | 'recordedAt'>
+): string {
+  return `${candidate.sessionId}\u0000${candidate.recordedAt}`
+}
+
+function read(): DecidedByEnvironment {
+  try {
+    const parsed: unknown = JSON.parse(window.localStorage.getItem(STORAGE_KEY) ?? '{}')
+    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+      return {}
+    }
+    return Object.fromEntries(
+      Object.entries(parsed).flatMap(([environmentId, keys]) =>
+        Array.isArray(keys)
+          ? [[environmentId, keys.filter((key): key is string => typeof key === 'string')]]
+          : []
+      )
+    )
+  } catch {
+    return {}
+  }
+}
+
+function write(next: DecidedByEnvironment): void {
+  try {
+    if (Object.keys(next).length === 0) {
+      window.localStorage.removeItem(STORAGE_KEY)
+    } else {
+      window.localStorage.setItem(STORAGE_KEY, JSON.stringify(next))
+    }
+  } catch {
+    // Storage refused: the next read may announce again, which is all this costs.
+  }
+}
+
+/** This run's record per server, seeded from storage on first use. */
+const memory = new Map<string, Set<string>>()
+
+function keysFor(environmentId: string): Set<string> {
+  let keys = memory.get(environmentId)
+  if (!keys) {
+    keys = new Set(read()[environmentId] ?? [])
+    memory.set(environmentId, keys)
+  }
+  return keys
+}
+
+function persist(environmentId: string, keys: ReadonlySet<string>): void {
+  const all = read()
+  if (keys.size === 0) {
+    delete all[environmentId]
+  } else {
+    all[environmentId] = [...keys]
+  }
+  write(all)
+}
+
+export function decidedRestartInterruptions(environmentId: string): ReadonlySet<string> {
+  return new Set(keysFor(environmentId))
+}
+
+/** Marks these decided, and drops every key the server no longer offers. */
+export function settleRestartInterruptions(
+  environmentId: string,
+  offered: readonly string[],
+  decided: readonly string[]
+): void {
+  const stillOffered = new Set(offered)
+  const keys = new Set(
+    [...keysFor(environmentId), ...decided].filter((key) => stillOffered.has(key))
+  )
+  memory.set(environmentId, keys)
+  persist(environmentId, keys)
+}
+
+/** Every server with a record, so a removed one's can be forgotten. */
+export function restartDecidedEnvironments(): string[] {
+  const remembered = [...memory].flatMap(([environmentId, keys]) =>
+    keys.size > 0 ? [environmentId] : []
+  )
+  return [...new Set([...Object.keys(read()), ...remembered])]
+}
+
+export function forgetRestartInterruptions(environmentId: string): void {
+  // Empty rather than absent, so storage that refused the delete cannot seed the old keys back.
+  memory.set(environmentId, new Set())
+  persist(environmentId, new Set())
+}
+
+/** @internal - a new window starts with only what storage carried over. */
+export function _resetRestartDecidedMemory(): void {
+  memory.clear()
+}
diff --git a/src/renderer/src/components/native-chat-restart-machine-fence.ts b/src/renderer/src/components/native-chat-restart-machine-fence.ts
new file mode 100644
index 000000000000..0d1ef91612cf
--- /dev/null
+++ b/src/renderer/src/components/native-chat-restart-machine-fence.ts
@@ -0,0 +1,35 @@
+import { getRuntimeEnvironmentRevision } from '@/runtime/runtime-environment-revision'
+import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { StructuredAgentSessionCallFence } from '@/runtime/structured-agent-session-client'
+
+/**
+ * The pairing a paired server's offer was read under. A server re-paired under the same id may be a
+ * different machine, so every request on that offer is sent with it and refused before it leaves
+ * if the pairing moved. A restart of the same server needs no fence: the host re-derives which
+ * named chats it still offers. This computer has none.
+ */
+export type RestartMachineFence = Readonly<{ pairingRevision?: number }>
+
+export function currentRestartMachineFence(target: RuntimeClientTarget): RestartMachineFence {
+  const pairingRevision =
+    target.kind === 'local' ? undefined : getRuntimeEnvironmentRevision(target.environmentId)
+  return pairingRevision === undefined ? {} : { pairingRevision }
+}
+
+export function sameRestartMachineFence(
+  left: RestartMachineFence | undefined,
+  right: RestartMachineFence | undefined
+): boolean {
+  return left?.pairingRevision === right?.pairingRevision
+}
+
+/** The call options a fenced request carries; none for this computer, which cannot be re-paired. */
+export function restartMachineCallFence(
+  target: RuntimeClientTarget,
+  fence: RestartMachineFence
+): StructuredAgentSessionCallFence | undefined {
+  if (target.kind === 'local' || fence.pairingRevision === undefined) {
+    return undefined
+  }
+  return { expectedEnvironmentPairingRevision: fence.pairingRevision }
+}
diff --git a/src/renderer/src/components/native-chat-restart-machine-name.ts b/src/renderer/src/components/native-chat-restart-machine-name.ts
new file mode 100644
index 000000000000..7b53dd6bf7bd
--- /dev/null
+++ b/src/renderer/src/components/native-chat-restart-machine-name.ts
@@ -0,0 +1,81 @@
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import { getHostDisplayLabelOverrides } from '../../../shared/host-setting-overrides'
+import { buildSidebarHostOptions } from './sidebar/sidebar-host-options'
+import { useAppStore } from '../store'
+import type { AppState } from '../store/types'
+import {
+  restartMachineExecutionHostId,
+  restartMachineTarget,
+  type RestartMachineKey
+} from './native-chat-restart-machines'
+
+type HostLabelSources = Pick<
+  AppState,
+  | 'repos'
+  | 'sshTargetLabels'
+  | 'sshConnectionStates'
+  | 'settings'
+  | 'runtimeEnvironments'
+  | 'runtimeStatusByEnvironmentId'
+>
+
+let cached: { sources: HostLabelSources; labels: ReadonlyMap<ExecutionHostId, string> } | null =
+  null
+
+/** The sidebar's host names, built as `useSidebarHostScopeOptions` builds them; rebuilt only when an
+ *  input changes, since store selectors call this on every store update. */
+function sidebarHostLabels(state: HostLabelSources): ReadonlyMap<ExecutionHostId, string> {
+  const previous = cached?.sources
+  if (
+    cached &&
+    previous?.repos === state.repos &&
+    previous.sshTargetLabels === state.sshTargetLabels &&
+    previous.sshConnectionStates === state.sshConnectionStates &&
+    previous.settings === state.settings &&
+    previous.runtimeEnvironments === state.runtimeEnvironments &&
+    previous.runtimeStatusByEnvironmentId === state.runtimeStatusByEnvironmentId
+  ) {
+    return cached.labels
+  }
+  const hosts = buildSidebarHostOptions({
+    repos: state.repos,
+    sshTargetLabels: state.sshTargetLabels,
+    sshConnectionStates: state.sshConnectionStates,
+    settings: state.settings,
+    runtimeEnvironments: state.runtimeEnvironments,
+    runtimeStatusByEnvironmentId: state.runtimeStatusByEnvironmentId,
+    hostLabelOverrides: getHostDisplayLabelOverrides(state.settings)
+  })
+  const labels = new Map(hosts.map((host) => [host.id, host.label]))
+  cached = {
+    sources: {
+      repos: state.repos,
+      sshTargetLabels: state.sshTargetLabels,
+      sshConnectionStates: state.sshConnectionStates,
+      settings: state.settings,
+      runtimeEnvironments: state.runtimeEnvironments,
+      runtimeStatusByEnvironmentId: state.runtimeStatusByEnvironmentId
+    },
+    labels
+  }
+  return labels
+}
+
+/** What the user calls a machine: the sidebar's own name for its host (a paired server's name, this
+ *  computer's label, either renamed in host settings), so a machine row and a workspace's host chip
+ *  never spell one host two ways. */
+export function restartMachineNameFromState(
+  state: HostLabelSources,
+  machine: RestartMachineKey
+): string {
+  const target = restartMachineTarget(machine)
+  const hostId = restartMachineExecutionHostId(target)
+  return (
+    sidebarHostLabels(state).get(hostId) ??
+    (target.kind === 'environment' ? target.environmentId : hostId)
+  )
+}
+
+export function restartMachineName(machine: RestartMachineKey): string {
+  return restartMachineNameFromState(useAppStore.getState(), machine)
+}
diff --git a/src/renderer/src/components/native-chat-restart-machines.ts b/src/renderer/src/components/native-chat-restart-machines.ts
new file mode 100644
index 000000000000..3a5177c52ebd
--- /dev/null
+++ b/src/renderer/src/components/native-chat-restart-machines.ts
@@ -0,0 +1,54 @@
+import {
+  LOCAL_EXECUTION_HOST_ID,
+  toRuntimeExecutionHostId,
+  type ExecutionHostId
+} from '../../../shared/execution-host'
+import { structuredAgentSessionStatusFeedKey } from '@/runtime/structured-agent-session-status-feed'
+import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+
+/**
+ * Which machine a restart offer belongs to: this computer, or one paired server.
+ *
+ * Keyed like the structured status feed (`local` | `environment:<id>`), so an offer and the feed
+ * that watches its chats name the same machine the same way.
+ */
+export type RestartMachineKey = string
+
+export const LOCAL_RESTART_MACHINE: RestartMachineKey = 'local'
+
+export function restartMachineKey(target: RuntimeClientTarget): RestartMachineKey {
+  return structuredAgentSessionStatusFeedKey(target)
+}
+
+const ENVIRONMENT_PREFIX = 'environment:'
+
+export function restartMachineTarget(machine: RestartMachineKey): RuntimeClientTarget {
+  return machine.startsWith(ENVIRONMENT_PREFIX)
+    ? { kind: 'environment', environmentId: machine.slice(ENVIRONMENT_PREFIX.length) }
+    : { kind: 'local' }
+}
+
+/**
+ * A paired server's rows in this desktop's terms.
+ *
+ * The server builds its host as `local`, so every row it lists names ITS machine as `local`. Here
+ * that is the server's runtime host, which is the id this desktop files its workspaces under.
+ */
+export function projectRestartMachineRows<Row extends ResumeCandidate>(
+  target: RuntimeClientTarget,
+  rows: readonly Row[]
+): Row[] {
+  if (target.kind === 'local') {
+    return [...rows]
+  }
+  const executionHostId = restartMachineExecutionHostId(target)
+  return rows.map((row) => ({ ...row, executionHostId }))
+}
+
+/** The host this desktop files a machine's workspaces under. */
+export function restartMachineExecutionHostId(target: RuntimeClientTarget): ExecutionHostId {
+  return target.kind === 'local'
+    ? LOCAL_EXECUTION_HOST_ID
+    : toRuntimeExecutionHostId(target.environmentId)
+}
diff --git a/src/renderer/src/components/native-chat-restart-offer-actions.ts b/src/renderer/src/components/native-chat-restart-offer-actions.ts
new file mode 100644
index 000000000000..c02f1895153e
--- /dev/null
+++ b/src/renderer/src/components/native-chat-restart-offer-actions.ts
@@ -0,0 +1,289 @@
+import {
+  callStructuredAgentSession,
+  pairedRestartOffersSupport
+} from '@/runtime/structured-agent-session-client'
+import { hasRuntimeRpcErrorCode } from '@/runtime/runtime-rpc-client'
+import {
+  announceRestartResults,
+  type RestartContinuationOutcome,
+  type RestartContinueResult
+} from './native-chat-restart-action-notifications'
+import {
+  projectRestartMachineRows,
+  restartMachineTarget,
+  type RestartMachineKey
+} from './native-chat-restart-machines'
+import { restartMachineName } from './native-chat-restart-machine-name'
+import { markNativeChatLaunchResumeDecided } from './native-chat-launch-resume-decision'
+import {
+  currentRestartMachineFence,
+  restartMachineCallFence,
+  sameRestartMachineFence,
+  type RestartMachineFence
+} from './native-chat-restart-machine-fence'
+import { failedFrom, type HostOfferPayload } from './native-chat-restart-offer-payload'
+import type { ResumeFailure } from './native-chat-resume-on-restart-grouping'
+import {
+  beginNativeChatRestartAction,
+  getNativeChatRestartOffers,
+  publishNativeChatRestartAnswer,
+  readNativeChatRestartMachine,
+  restartTicketPairingCurrent,
+  type NativeChatRestartMachineOffer,
+  type RestartMachineRead,
+  type RestartMachineTicket
+} from './native-chat-resume-on-restart-store'
+import { forgetUnsentResumes, markUnsentResumes } from './native-chat-resume-unsent-requests'
+import { reopenNativeChatRestartOffer } from './native-chat-restart-offer-reopen'
+
+/**
+ * Acting on one machine's offer: continue the chats, or turn them down for good.
+ *
+ * Every action names the chats it means and is sent under the pairing the offer was listed from:
+ * a server re-paired since is refused before anything leaves. A restart of the same server needs no
+ * fence — its host re-derives which named chats it still offers, and a dismissal names each chat
+ * with the interruption it listed, so a newer one is never deleted by an older listing.
+ */
+
+/** The machine's listed offer, if it is still the one the caller saw. */
+function currentOffer(
+  machine: RestartMachineKey,
+  expected: RestartMachineFence | undefined
+): NativeChatRestartMachineOffer | 'gone' | 'moved' {
+  // A caller holding an older listing (a toast) acts only while the machine is paired the same way.
+  if (
+    expected !== undefined &&
+    !sameRestartMachineFence(expected, currentRestartMachineFence(restartMachineTarget(machine)))
+  ) {
+    return 'moved'
+  }
+  const offer = getNativeChatRestartOffers().get(machine)
+  if (!offer) {
+    return 'gone'
+  }
+  return expected !== undefined && !sameRestartMachineFence(expected, offer.fence) ? 'moved' : offer
+}
+
+/** The server was re-paired under the listing, so the call was refused before anything was sent. */
+function refusedAsStale(error: unknown): boolean {
+  return hasRuntimeRpcErrorCode(error, 'runtime_environment_changed')
+}
+
+/** A later request published first: this answer is not the newest, so ask the host again. */
+async function publishOrReread(
+  ticket: RestartMachineTicket,
+  payload: HostOfferPayload
+): Promise<void> {
+  const published =
+    Array.isArray(payload.sessions) &&
+    publishNativeChatRestartAnswer(ticket, payload.sessions, failedFrom(payload))
+  if (!published && restartTicketPairingCurrent(ticket)) {
+    await readNativeChatRestartMachine(ticket.target)
+  }
+}
+
+/** The toast's Show: the dialog over a fresh read of the failing machine, or of every machine. */
+function showResult(machine: RestartMachineKey | null): void {
+  void reopenNativeChatRestartOffer(machine ? [machine] : undefined)
+}
+
+type ContinueReply = HostOfferPayload & { continued?: RestartContinuationOutcome[] }
+type RestartFailureRow = Pick<ResumeFailure, 'sessionId' | 'outcome'>
+
+export type RestartContinueRequest = {
+  machine: RestartMachineKey
+  sessionIds: readonly string[]
+  /** What the notices count; by default the named chats. */
+  reported?: readonly string[]
+}
+
+/** A lost request's chats as the re-read shows them: each one still offered was marked failed.
+ *  A paired server may have taken the request and be continuing chats it no longer lists, so those
+ *  are unconfirmed rather than dropped; a local request that failed reached nothing. */
+function lostRequestFailures(
+  read: RestartMachineRead,
+  lost: { machine: RestartMachineKey; requested: readonly string[] }
+): RestartFailureRow[] | undefined {
+  if (read.kind !== 'answered') {
+    return undefined
+  }
+  const offer = getNativeChatRestartOffers().get(lost.machine)
+  const failed = offer?.failed ?? []
+  if (restartMachineTarget(lost.machine).kind === 'local') {
+    return [...failed]
+  }
+  const listed = new Set([...(offer?.candidates ?? []), ...failed].map((row) => row.sessionId))
+  return [
+    ...failed,
+    ...lost.requested
+      .filter((sessionId) => !listed.has(sessionId))
+      .map((sessionId) => ({ sessionId, outcome: 'unconfirmed' as const }))
+  ]
+}
+
+async function continueOnMachine(
+  request: RestartContinueRequest,
+  expected: RestartMachineFence | undefined
+): Promise<RestartContinueResult> {
+  const { machine, sessionIds } = request
+  const reported = request.reported ?? sessionIds
+  const target = restartMachineTarget(machine)
+  const base = {
+    machine,
+    requested: reported,
+    ...(target.kind === 'local' ? {} : { machineName: restartMachineName(machine) })
+  }
+  const offer = currentOffer(machine, expected)
+  if (offer === 'gone') {
+    return { ...base, kind: 'answered', results: [], hostFailed: [] }
+  }
+  if (offer === 'moved') {
+    return { ...base, kind: 'not-sent' }
+  }
+  forgetUnsentResumes(machine, sessionIds)
+  const { ticket, settle } = beginNativeChatRestartAction(target, reported)
+  if (target.kind === 'local') {
+    // `resuming` now names this computer's chats, so the launch's one resume decision is made.
+    markNativeChatLaunchResumeDecided()
+  }
+  try {
+    if (!sameRestartMachineFence(ticket.fence, offer.fence)) {
+      return { ...base, kind: 'not-sent' }
+    }
+    const params = { sessionIds: [...sessionIds] }
+    const callFence = restartMachineCallFence(target, offer.fence)
+    const result = await (callFence
+      ? callStructuredAgentSession<ContinueReply>(
+          target,
+          'agentSession.restartContinue',
+          params,
+          callFence
+        )
+      : callStructuredAgentSession<ContinueReply>(target, 'agentSession.restartContinue', params))
+    await publishOrReread(ticket, result)
+    return {
+      ...base,
+      kind: 'answered',
+      // A shape this side did not expect counts as unconfirmed: the message may well have gone out.
+      results: Array.isArray(result.continued) ? result.continued : undefined,
+      hostFailed: Array.isArray(result.failed)
+        ? projectRestartMachineRows(target, failedFrom(result))
+        : undefined
+    }
+  } catch (error) {
+    if (refusedAsStale(error)) {
+      await readNativeChatRestartMachine(target)
+      return { ...base, kind: 'not-sent' }
+    }
+    // The row's reason is this side's own code, so the real error is kept in the log.
+    console.warn('[native-chat-resume] resume request failed or its answer was lost', error)
+    markUnsentResumes(machine, sessionIds, Date.now())
+    const read = await readNativeChatRestartMachine(target)
+    if (read.kind !== 'answered' && target.kind === 'environment') {
+      // Neither the answer nor a re-read came back: the server may be continuing every chat.
+      return { ...base, kind: 'unconfirmed', listed: getNativeChatRestartOffers().has(machine) }
+    }
+    return { ...base, kind: 'answered', results: [], hostFailed: lostRequestFailures(read, base) }
+  } finally {
+    settle()
+  }
+}
+
+/**
+ * Reattach the named chats on each machine, ask each agent to carry on, then replace each machine's
+ * offer with its host's authoritative remaining list.
+ *
+ * Ends in one toast saying what it did across every machine it reached, whether a click, a toast or
+ * an opted-in automatic resume started it; each chat's note stays the record. `sessionIds` always
+ * names the chats: an action never continues one this side did not choose, which on a shared server
+ * could be another device's. `expected` is the listing a caller saw (a toast), which acts only
+ * while the machine is still paired that way.
+ *
+ * Never rejects; a lost answer is followed by a re-read, never a retry. The chats a lost request
+ * named that the host still offers show as failed, with Retry. A request refused because the
+ * server was re-paired counts as not resumed.
+ */
+export async function continueNativeChatRestartOffers(
+  requests: readonly RestartContinueRequest[],
+  options: { expected?: RestartMachineFence } = {}
+): Promise<void> {
+  const results = await Promise.all(
+    requests
+      .filter((request) => request.sessionIds.length > 0)
+      .map((request) => continueOnMachine(request, options.expected))
+  )
+  announceRestartResults(results, showResult)
+}
+
+/** The offers a named dismissal lists back to the host, each with the interruption it showed. */
+function listedOffers(offer: NativeChatRestartMachineOffer, sessionIds: readonly string[]) {
+  const named = new Set(sessionIds)
+  return [...offer.candidates, ...offer.failed]
+    .filter((row) => named.has(row.sessionId))
+    .map((row) => ({ sessionId: row.sessionId, recordedAt: row.recordedAt }))
+}
+
+/**
+ * Turning offers down for good, which explicitly deletes the durable records.
+ *
+ * This computer may dismiss everything it listed by naming nothing. A paired server is always told
+ * which chats: unnamed, its dismissal would delete every device's offers. A server is only ever
+ * listed when it advertises named dismissal, so one that does not is never sent one.
+ *
+ * Says nothing either way: the dialog row going away is the answer. A refused or lost dismissal
+ * leaves the durable record untouched and re-reads the list, which puts it back.
+ */
+export async function dismissNativeChatRestartOffer(
+  machine: RestartMachineKey,
+  sessionIds?: readonly string[],
+  expected?: RestartMachineFence
+): Promise<void> {
+  const offer = currentOffer(machine, expected)
+  if (offer === 'gone') {
+    return
+  }
+  const target = restartMachineTarget(machine)
+  if (offer === 'moved') {
+    void readNativeChatRestartMachine(target)
+    return
+  }
+  const named =
+    target.kind === 'environment'
+      ? (sessionIds ?? [...offer.candidates, ...offer.failed].map((row) => row.sessionId))
+      : sessionIds
+  if (named?.length === 0) {
+    return
+  }
+  if (target.kind === 'environment') {
+    // Checked again rather than assumed from the listing: never an unnamed or unknown dismissal.
+    const support = await pairedRestartOffersSupport(target.environmentId)
+    if (support !== 'supported') {
+      void readNativeChatRestartMachine(target)
+      return
+    }
+  }
+  const { ticket, settle } = beginNativeChatRestartAction(target)
+  try {
+    const params = named ? { sessionIds: [...named], offers: listedOffers(offer, named) } : {}
+    const callFence = restartMachineCallFence(target, offer.fence)
+    const result = await (callFence
+      ? callStructuredAgentSession<HostOfferPayload>(
+          target,
+          'agentSession.restartResumableDismiss',
+          params,
+          callFence
+        )
+      : callStructuredAgentSession<HostOfferPayload>(
+          target,
+          'agentSession.restartResumableDismiss',
+          params
+        ))
+    // Only a dismissal the host took ends the marks; a failed one leaves the chats shown as failed.
+    forgetUnsentResumes(machine, named)
+    await publishOrReread(ticket, result)
+  } catch {
+    await readNativeChatRestartMachine(target)
+  } finally {
+    settle()
+  }
+}
diff --git a/src/renderer/src/components/native-chat-restart-offer-activity-watch.ts b/src/renderer/src/components/native-chat-restart-offer-activity-watch.ts
new file mode 100644
index 000000000000..07e490774eb1
--- /dev/null
+++ b/src/renderer/src/components/native-chat-restart-offer-activity-watch.ts
@@ -0,0 +1,136 @@
+import {
+  getStructuredAgentSessionStatusFeed,
+  type StructuredAgentSessionStatusFeedOwner
+} from '@/runtime/structured-agent-session-status-feed'
+import type { AgentSessionStatusSummary } from '../../../shared/agent-session-wire'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import { restartMachineTarget, type RestartMachineKey } from './native-chat-restart-machines'
+
+/**
+ * Re-reads a machine's offer once an offered or failed chat there shows new activity, so a message
+ * the user sent there, or its agent starting, retires its entry here too. The host stays the judge;
+ * this only asks again.
+ *
+ * One watch per machine, on that machine's own status feed, held only while it has something
+ * offered or failed. Keyed on status and prompt rather than every summary, so an agent streaming in
+ * such a chat costs one re-read, not one per tool call.
+ */
+const OFFERED_CHAT_REFRESH_DELAY_MS = 500
+
+type WatchedOffer = {
+  candidates: readonly ResumeCandidate[]
+  failed: readonly ResumeCandidate[]
+  listedAt: number
+}
+
+type Watch = {
+  feed: StructuredAgentSessionStatusFeedOwner
+  seen: Map<string, string>
+  offer: WatchedOffer
+  refresh: ReturnType<typeof setTimeout> | null
+  release: () => void
+}
+
+const watches = new Map<RestartMachineKey, Watch>()
+
+function offeredChatIds(offer: WatchedOffer): Set<string> {
+  return new Set([...offer.candidates, ...offer.failed].map((entry) => entry.sessionId))
+}
+
+function activityKey(summary: AgentSessionStatusSummary): string {
+  return `${summary.status ?? ''}\u0000${summary.latestPrompt}`
+}
+
+export function syncOfferedChatWatch(
+  machine: RestartMachineKey,
+  offer: WatchedOffer | undefined,
+  onActivity: (machine: RestartMachineKey) => void
+): void {
+  const offeredIds = offer ? offeredChatIds(offer) : new Set<string>()
+  if (!offer || offeredIds.size === 0) {
+    releaseWatch(machine)
+    return
+  }
+  let watch = watches.get(machine)
+  if (!watch) {
+    const feed = getStructuredAgentSessionStatusFeed(restartMachineTarget(machine))
+    const created: Watch = {
+      feed,
+      seen: new Map(),
+      offer,
+      refresh: null,
+      release: () => undefined
+    }
+    const unsubscribe = feed.subscribe(() => noticeActivity(machine, onActivity))
+    const deactivate = feed.activate()
+    created.release = () => {
+      unsubscribe()
+      deactivate()
+    }
+    watches.set(machine, created)
+    watch = created
+  }
+  watch.offer = offer
+  for (const sessionId of watch.seen.keys()) {
+    if (!offeredIds.has(sessionId)) {
+      watch.seen.delete(sessionId)
+    }
+  }
+  // What the feed already holds is what this listing answered.
+  for (const sessionId of offeredIds) {
+    const summary = watch.feed.getSnapshot().get(sessionId)
+    if (summary && !watch.seen.has(sessionId)) {
+      watch.seen.set(sessionId, activityKey(summary))
+    }
+  }
+}
+
+function noticeActivity(
+  machine: RestartMachineKey,
+  onActivity: (machine: RestartMachineKey) => void
+): void {
+  const watch = watches.get(machine)
+  if (!watch) {
+    return
+  }
+  const snapshot = watch.feed.getSnapshot()
+  let changed = false
+  for (const sessionId of offeredChatIds(watch.offer)) {
+    const summary = snapshot.get(sessionId)
+    if (!summary) {
+      continue
+    }
+    const key = activityKey(summary)
+    const previous = watch.seen.get(sessionId)
+    if (previous !== key) {
+      watch.seen.set(sessionId, key)
+      // A first sighting is news only if newer than the list; a change to a known chat always is,
+      // since the host may have answered the list just before the change was delivered here.
+      changed ||= previous !== undefined || summary.updatedAt > watch.offer.listedAt
+    }
+  }
+  if (changed && watch.refresh === null) {
+    watch.refresh = setTimeout(() => {
+      watch.refresh = null
+      onActivity(machine)
+    }, OFFERED_CHAT_REFRESH_DELAY_MS)
+  }
+}
+
+function releaseWatch(machine: RestartMachineKey): void {
+  const watch = watches.get(machine)
+  if (!watch) {
+    return
+  }
+  if (watch.refresh !== null) {
+    clearTimeout(watch.refresh)
+  }
+  watch.release()
+  watches.delete(machine)
+}
+
+export function releaseOfferedChatWatches(): void {
+  for (const machine of watches.keys()) {
+    releaseWatch(machine)
+  }
+}
diff --git a/src/renderer/src/components/native-chat-restart-offer-payload.ts b/src/renderer/src/components/native-chat-restart-offer-payload.ts
new file mode 100644
index 000000000000..717df109a9df
--- /dev/null
+++ b/src/renderer/src/components/native-chat-restart-offer-payload.ts
@@ -0,0 +1,21 @@
+import { hasRuntimeRpcErrorCode } from '@/runtime/runtime-rpc-client'
+import type { ResumeFailure } from './native-chat-resume-on-restart-grouping'
+
+/** The host's answer as this side understands it. `failed` is optional on the wire: an older host
+ *  never sends it, and its absence means nothing to show, not an invalid answer. */
+export type HostOfferPayload = { sessions?: unknown; failed?: unknown }
+
+export function failedFrom(payload: HostOfferPayload): ResumeFailure[] {
+  // SAFETY: the host is the single writer of this shape; a malformed row is a host bug, not input.
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: see above.
+  return Array.isArray(payload.failed) ? (payload.failed as ResumeFailure[]) : []
+}
+
+/** A host that cannot hold restart offers at all: it predates the method, or has no structured
+ *  chat surface for this client. Distinct from a read that failed, which proves nothing. */
+export function hostCannotOffer(error: unknown): boolean {
+  return (
+    hasRuntimeRpcErrorCode(error, 'method_not_found') ||
+    (error instanceof Error && error.message.includes('structured_agent_session_unsupported'))
+  )
+}
diff --git a/src/renderer/src/components/native-chat-restart-offer-reopen.ts b/src/renderer/src/components/native-chat-restart-offer-reopen.ts
new file mode 100644
index 000000000000..b797542788b3
--- /dev/null
+++ b/src/renderer/src/components/native-chat-restart-offer-reopen.ts
@@ -0,0 +1,66 @@
+import { useAppStore } from '../store'
+import { runtimeHostConnectionStateForEntry } from '@/runtime/runtime-host-connection-state'
+import { requestNativeChatResumeOnRestartDialog } from './native-chat-resume-on-restart-dialog'
+import { restartMachineTarget, type RestartMachineKey } from './native-chat-restart-machines'
+import {
+  getNativeChatRestartOffers,
+  getNativeChatRestartResuming,
+  readNativeChatRestartMachine
+} from './native-chat-resume-on-restart-store'
+
+/** The machine to open the dialog on: the only one named, or none in particular. */
+function focusOf(machines: readonly RestartMachineKey[]): RestartMachineKey | null {
+  return machines.length === 1 ? machines[0]! : null
+}
+
+/** How long a click waits on a server's re-read before the dialog opens on its last listing. A
+ *  connected server lists its offers in well under this (one capability probe at most, then a
+ *  capsule read); past it the click must still feel answered, and the late answer lands in the
+ *  open dialog like any other read. */
+const PAIRED_READ_WAIT_MS = 1_500
+
+/** Only a server whose runtime answers right now is worth a wait; any other state (its runtime not
+ *  answering, contact lost or still being checked) opens on its last listing at once. */
+function readableNow(machine: RestartMachineKey): boolean {
+  const target = restartMachineTarget(machine)
+  if (target.kind === 'local') {
+    return true
+  }
+  const entry = useAppStore.getState().runtimeStatusByEnvironmentId.get(target.environmentId)
+  return runtimeHostConnectionStateForEntry(entry) === 'connected'
+}
+
+/** This computer's read is awaited as main's opener does; a server's only for its budget. */
+async function readForClick(machine: RestartMachineKey): Promise<void> {
+  const target = restartMachineTarget(machine)
+  const read = readNativeChatRestartMachine(target)
+  if (target.kind === 'local') {
+    await read
+    return
+  }
+  let timer: ReturnType<typeof setTimeout> | undefined
+  const budget = new Promise<void>((resolve) => {
+    timer = setTimeout(resolve, PAIRED_READ_WAIT_MS)
+  })
+  await Promise.race([read, budget])
+  clearTimeout(timer)
+}
+
+/**
+ * Every way back to the dialog — the status bar entry, a resume toast's Show, a reconnect toast's
+ * Show chats — re-reads the named machines (by default every listed one), then opens only over
+ * rows, since the dialog draws nothing without them. A failed read keeps that machine's last
+ * listing, so a user's click is never lost to bookkeeping. Opening a chat from it is read-only and
+ * keeps the offer.
+ */
+export async function reopenNativeChatRestartOffer(
+  machines: readonly RestartMachineKey[] = [...getNativeChatRestartOffers().keys()]
+): Promise<void> {
+  // Mid-resume the host's answer is already on its way; a re-read racing it could undo it.
+  if (getNativeChatRestartResuming().size === 0) {
+    await Promise.all(machines.filter(readableNow).map(readForClick))
+  }
+  if (getNativeChatRestartResuming().size > 0 || getNativeChatRestartOffers().size > 0) {
+    requestNativeChatResumeOnRestartDialog(focusOf(machines))
+  }
+}
diff --git a/src/renderer/src/components/native-chat-restart-offer-test-support.ts b/src/renderer/src/components/native-chat-restart-offer-test-support.ts
new file mode 100644
index 000000000000..11faf74e90d3
--- /dev/null
+++ b/src/renderer/src/components/native-chat-restart-offer-test-support.ts
@@ -0,0 +1,51 @@
+import type { PublicKnownRuntimeEnvironment } from '../../../shared/runtime-environments'
+import type { RuntimeEnvironmentStatus } from '../../../shared/runtime-host-status'
+import type { RuntimeStatus } from '../../../shared/runtime-types'
+
+/** A paired server as the desktop's saved list holds it. */
+export function pairedEnvironment(
+  id: string,
+  name: string,
+  pairedDeviceId?: string
+): PublicKnownRuntimeEnvironment {
+  return {
+    id,
+    name,
+    createdAt: 1,
+    updatedAt: 1,
+    lastUsedAt: null,
+    runtimeId: null,
+    endpoints: [],
+    preferredEndpointId: 'endpoint',
+    ...(pairedDeviceId ? { pairedDeviceId } : {})
+  }
+}
+
+/** A verified connection to a server's runtime under one pairing. */
+export function verifiedConnection(args: {
+  environmentId: string
+  runtimeId: string
+  pairedDeviceId?: string
+  hostContactEpoch?: number
+  pairingRevision?: number
+}): RuntimeEnvironmentStatus {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the offer triggers read only runtimeId and pairedDeviceId from a status; the rest of RuntimeStatus is irrelevant here.
+  const status = {
+    runtimeId: args.runtimeId,
+    pairedDeviceId: args.pairedDeviceId
+  } as RuntimeStatus
+  return {
+    status,
+    checkedAt: 1,
+    hostContactEpoch: args.hostContactEpoch ?? 0,
+    snapshot: {
+      environmentId: args.environmentId,
+      pairingRevision: args.pairingRevision ?? 1,
+      sequence: 1,
+      checkedAt: 1,
+      status,
+      verification: 'verified',
+      transport: 'ready'
+    }
+  }
+}
diff --git a/src/renderer/src/components/native-chat-restart-offer-triggers.test.ts b/src/renderer/src/components/native-chat-restart-offer-triggers.test.ts
new file mode 100644
index 000000000000..76dbb461341e
--- /dev/null
+++ b/src/renderer/src/components/native-chat-restart-offer-triggers.test.ts
@@ -0,0 +1,643 @@
+// @vitest-environment happy-dom
+
+import { toast } from 'sonner'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { getDefaultSettings } from '../../../shared/constants'
+import type { RestartOfferOrigin } from '../../../shared/restart-offer-origin'
+import { useAppStore } from '../store'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import {
+  consumeNativeChatResumeOnRestartDialogRequest,
+  getNativeChatResumeOnRestartDialogRequest,
+  requestNativeChatResumeOnRestartDialog
+} from './native-chat-resume-on-restart-dialog'
+import {
+  getNativeChatRestartOffers,
+  readNativeChatRestartMachine
+} from './native-chat-resume-on-restart-store'
+import {
+  continueNativeChatRestartOffers,
+  dismissNativeChatRestartOffer
+} from './native-chat-restart-offer-actions'
+import {
+  _resetNativeChatRestartOffer,
+  useNativeChatRestartOfferSources
+} from './native-chat-restart-offer-triggers'
+import { cleanup, renderHook } from '@testing-library/react'
+import { replaceRuntimeEnvironmentRevisions } from '@/runtime/runtime-environment-revision'
+import { pairedEnvironment, verifiedConnection } from './native-chat-restart-offer-test-support'
+
+const mocks = vi.hoisted(() => ({
+  rpc: vi.fn(),
+  support: vi.fn(async (): Promise<'supported' | 'unsupported' | 'unknown'> => 'supported')
+}))
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: mocks.rpc,
+  pairedRestartOffersSupport: mocks.support,
+  subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
+}))
+vi.mock('sonner', () => ({ toast: vi.fn() }))
+
+const SERVER = 'studio'
+const MACHINE = `environment:${SERVER}`
+const TARGET = { kind: 'environment', environmentId: SERVER } as const
+const RECORDED_AT = 1_800_000_000_000
+
+function row(
+  sessionId: string,
+  origin: RestartOfferOrigin | undefined,
+  trigger: 'quit' | 'update' = 'update',
+  recordedAt = RECORDED_AT
+) {
+  return {
+    sessionId,
+    workspaceId: `workspace-${sessionId}`,
+    agent: 'codex',
+    trigger,
+    latestPrompt: `Prompt ${sessionId}`,
+    recordedAt,
+    // The server's own terms: its host is `local` there.
+    executionHostId: 'local',
+    workspaceKind: 'git-worktree',
+    ...(origin ? { origin } : {})
+  } satisfies ResumeCandidate
+}
+
+function stageServer(status: { runtimeId: string; epoch?: number; pairingRevision?: number }) {
+  const pairingRevision = status.pairingRevision ?? 1
+  replaceRuntimeEnvironmentRevisions([{ id: SERVER, createdAt: 1, pairingRevision }])
+  useAppStore.setState({
+    runtimeEnvironments: [pairedEnvironment(SERVER, 'studio-mac')],
+    runtimeEnvironmentCatalogHydrated: true,
+    runtimeStatusByEnvironmentId: new Map([
+      [
+        SERVER,
+        verifiedConnection({
+          environmentId: SERVER,
+          runtimeId: status.runtimeId,
+          hostContactEpoch: status.epoch,
+          pairingRevision
+        })
+      ]
+    ])
+  })
+}
+
+function callsTo(method: string): unknown[][] {
+  return mocks.rpc.mock.calls.filter(([, called]) => called === method)
+}
+
+function continueCalls(): unknown[] {
+  return callsTo('agentSession.restartContinue').map(([target, , params]) => [target, params])
+}
+
+function offerReads(): number {
+  return callsTo('agentSession.restartResumable').length
+}
+
+function toastTitles(): string[] {
+  return vi.mocked(toast).mock.calls.map(([title]) => String(title))
+}
+
+/** Sonner types a toast button as a labelled action or arbitrary content; only the former can be
+ *  pressed. */
+function press(entry: unknown): void {
+  if (
+    typeof entry !== 'object' ||
+    entry === null ||
+    !('onClick' in entry) ||
+    typeof entry.onClick !== 'function'
+  ) {
+    throw new Error('toast button is not clickable')
+  }
+  entry.onClick()
+}
+
+function label(entry: unknown): unknown {
+  return typeof entry === 'object' && entry !== null && 'label' in entry ? entry.label : undefined
+}
+
+async function settle(): Promise<void> {
+  for (let i = 0; i < 20; i += 1) {
+    await Promise.resolve()
+  }
+}
+
+/** A connected desktop: the watcher reads the server on its verified connection. */
+async function connect(status: { runtimeId: string; epoch?: number; pairingRevision?: number }) {
+  stageServer(status)
+  renderHook(() => useNativeChatRestartOfferSources(false))
+  await vi.waitFor(() => expect(offerReads()).toBeGreaterThan(0))
+  await settle()
+}
+
+function serveOffers(sessions: ReturnType<typeof row>[]): void {
+  mocks.rpc.mockImplementation(async (_target, method) =>
+    method === 'agentSession.restartResumable'
+      ? { sessions, failed: [] }
+      : { continued: [], sessions: [], failed: [] }
+  )
+}
+
+beforeEach(() => {
+  vi.mocked(toast).mockClear()
+  mocks.rpc.mockReset()
+  mocks.support.mockReset()
+  mocks.support.mockResolvedValue('supported')
+  window.localStorage.clear()
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({
+    settings: { ...getDefaultSettings(''), experimentalStructuredNativeChat: false }
+  })
+  serveOffers([row('a', 'own'), row('b', 'other-device')])
+})
+
+afterEach(() => {
+  vi.useRealTimers()
+  cleanup()
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+})
+
+it("rewrites a server's rows to its runtime host, so its workspaces are found under it", async () => {
+  await connect({ runtimeId: 'r2' })
+  expect(
+    getNativeChatRestartOffers()
+      .get(MACHINE)
+      ?.candidates.map((candidate) => candidate.executionHostId)
+  ).toEqual(['runtime:studio', 'runtime:studio'])
+})
+
+it("toasts the user's own interruptions once, and a reconnect without a restart adds nothing", async () => {
+  await connect({ runtimeId: 'r2' })
+  expect(vi.mocked(toast).mock.calls).toEqual([
+    [
+      'studio-mac restarted for an update',
+      expect.objectContaining({
+        description:
+          '1 of your chats there was stopped mid-reply. It shows where it stopped, and nothing was lost.'
+      })
+    ]
+  ])
+  stageServer({ runtimeId: 'r2', epoch: 1 })
+  await vi.waitFor(() => expect(offerReads()).toBe(2))
+  await settle()
+  expect(toast).toHaveBeenCalledTimes(1)
+})
+
+it('names a plain quit by the server being restarted', async () => {
+  serveOffers([row('a', 'own', 'quit')])
+  await connect({ runtimeId: 'r2' })
+  expect(toastTitles()[0]).toBe('Orca on studio-mac was restarted')
+})
+
+it('raises no toast for chats that are not the user’s, nor for a row with no answer', async () => {
+  serveOffers([
+    row('a', 'other-device'),
+    row('b', 'automation'),
+    row('c', 'server-made'),
+    row('d', undefined)
+  ])
+  await connect({ runtimeId: 'r2' })
+  expect(toast).not.toHaveBeenCalled()
+  expect(getNativeChatRestartOffers().get(MACHINE)?.candidates).toHaveLength(4)
+})
+
+it("the toast's buttons resume exactly the own chats there, or open the dialog on that server", async () => {
+  await connect({ runtimeId: 'r2' })
+  const options = vi.mocked(toast).mock.calls[0]?.[1]
+  expect([label(options?.action), label(options?.cancel)]).toEqual(['Resume 1 chat', 'Show chats'])
+  press(options?.cancel)
+  // It re-reads the server first, then opens over what it still lists.
+  await settle()
+  expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: MACHINE })
+  press(options?.action)
+  await settle()
+  expect(continueCalls()).toEqual([[TARGET, { sessionIds: ['a'] }]])
+})
+
+it('resumes only own chats without asking, once per interruption, when the preference is on', async () => {
+  useAppStore.setState({
+    settings: { ...getDefaultSettings(''), nativeChatResumeWorkOnRestart: true }
+  })
+  const rows = [row('a', 'own'), row('b', 'automation'), row('c', 'other-device')]
+  mocks.rpc.mockImplementation(async (_target, method) =>
+    method === 'agentSession.restartResumable'
+      ? { sessions: rows, failed: [] }
+      : { continued: [{ sessionId: 'a', outcome: 'continued' }], sessions: [], failed: [] }
+  )
+  await connect({ runtimeId: 'r2' })
+  stageServer({ runtimeId: 'r2', epoch: 1 })
+  await vi.waitFor(() => expect(offerReads()).toBeGreaterThanOrEqual(2))
+  await settle()
+  expect(continueCalls()).toEqual([[TARGET, { sessionIds: ['a'] }]])
+  // No reconnect offer: the resume's own one toast says what it did, as a launch's does.
+  expect(toastTitles()).toEqual(['Resumed 1 chat on studio-mac'])
+})
+
+// A fresh window (a reload, or a reopened window on macOS) reads the same offer again.
+it('decides nothing twice across a new window, and forgets interruptions the server no longer offers', async () => {
+  await connect({ runtimeId: 'r2' })
+  expect(toast).toHaveBeenCalledTimes(1)
+  _resetNativeChatRestartOffer()
+  await connect({ runtimeId: 'r2' })
+  expect(toast).toHaveBeenCalledTimes(1)
+  // Resumed elsewhere, then interrupted again: a new interruption of the same chat is announced.
+  serveOffers([])
+  await readNativeChatRestartMachine(TARGET)
+  serveOffers([row('a', 'own', 'update', RECORDED_AT + 1)])
+  await readNativeChatRestartMachine(TARGET)
+  expect(toast).toHaveBeenCalledTimes(2)
+})
+
+// The watcher mounts before the saved server list loads; a server not listed yet is not removed.
+it('keeps an earlier run’s decisions through boot, before the server list has loaded', async () => {
+  const stored = JSON.stringify({ [SERVER]: [`a\u0000${RECORDED_AT}`] })
+  window.localStorage.setItem('orca.nativeChatRestartDecided.v1', stored)
+  renderHook(() => useNativeChatRestartOfferSources(false))
+  expect(window.localStorage.getItem('orca.nativeChatRestartDecided.v1')).toBe(stored)
+  stageServer({ runtimeId: 'r2' })
+  await vi.waitFor(() => expect(offerReads()).toBeGreaterThan(0))
+  await settle()
+  expect(toast).not.toHaveBeenCalled()
+})
+
+// Storage that refuses writes must not turn one interruption into repeated decisions this run.
+it('decides each interruption once per run even when storage refuses writes', async () => {
+  const refuse = vi.spyOn(Storage.prototype, 'setItem').mockImplementation(() => {
+    throw new Error('QuotaExceededError')
+  })
+  try {
+    await connect({ runtimeId: 'r2' })
+    for (const epoch of [1, 2]) {
+      stageServer({ runtimeId: 'r2', epoch })
+      await vi.waitFor(() => expect(offerReads()).toBe(epoch + 1))
+      await settle()
+    }
+    expect(toast).toHaveBeenCalledTimes(1)
+  } finally {
+    refuse.mockRestore()
+  }
+})
+
+it('continues an interruption at most once per run when storage refuses writes and the continue fails', async () => {
+  useAppStore.setState({
+    settings: { ...getDefaultSettings(''), nativeChatResumeWorkOnRestart: true }
+  })
+  // Bounded so a regression ends: after five continues the server stops listing the chat.
+  mocks.rpc.mockImplementation(async (_target, method) => {
+    if (method === 'agentSession.restartResumable') {
+      return { sessions: continueCalls().length >= 5 ? [] : [row('a', 'own')], failed: [] }
+    }
+    throw new Error('timeout')
+  })
+  const refuse = vi.spyOn(Storage.prototype, 'setItem').mockImplementation(() => {
+    throw new Error('QuotaExceededError')
+  })
+  try {
+    await connect({ runtimeId: 'r2' })
+    await vi.waitFor(() => expect(offerReads()).toBeGreaterThanOrEqual(2))
+    await settle()
+    expect(continueCalls()).toHaveLength(1)
+  } finally {
+    refuse.mockRestore()
+  }
+})
+
+// The dialog opens as soon as it is asked for, and lists every machine: no toast repeats it.
+it('raises no toast while a resume dialog is open, which lists the server too', async () => {
+  requestNativeChatResumeOnRestartDialog('local')
+  await connect({ runtimeId: 'r2' })
+  expect(toast).not.toHaveBeenCalled()
+})
+
+it('announces a paired interruption once no resume dialog is open', async () => {
+  await connect({ runtimeId: 'r2' })
+  expect(toastTitles()).toEqual(['studio-mac restarted for an update'])
+})
+
+it('opens nothing from a toast whose chats are already gone', async () => {
+  await connect({ runtimeId: 'r2' })
+  const options = vi.mocked(toast).mock.calls[0]?.[1]
+  serveOffers([])
+  await readNativeChatRestartMachine(TARGET)
+  press(options?.cancel)
+  await settle()
+  expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
+})
+
+// Re-pairing to a server that cannot be reached yet must not leave the old pairing's rows behind.
+it('forgets the old pairing’s rows as soon as the saved record is re-paired', async () => {
+  await connect({ runtimeId: 'r2' })
+  replaceRuntimeEnvironmentRevisions([{ id: SERVER, createdAt: 1, pairingRevision: 2 }])
+  useAppStore.setState({ runtimeStatusByEnvironmentId: new Map() })
+  expect(getNativeChatRestartOffers().has(MACHINE)).toBe(false)
+})
+
+it('decides what an open dialog already shows without a toast', async () => {
+  requestNativeChatResumeOnRestartDialog(null)
+  await connect({ runtimeId: 'r2' })
+  expect(toast).not.toHaveBeenCalled()
+  consumeNativeChatResumeOnRestartDialogRequest()
+  await readNativeChatRestartMachine(TARGET)
+  expect(toast).not.toHaveBeenCalled()
+})
+
+it('never asks a server that does not advertise paired restart offers', async () => {
+  mocks.support.mockResolvedValue('unsupported')
+  stageServer({ runtimeId: 'r2' })
+  renderHook(() => useNativeChatRestartOfferSources(false))
+  await vi.waitFor(() => expect(mocks.support).toHaveBeenCalled())
+  await settle()
+  expect(offerReads()).toBe(0)
+  expect(getNativeChatRestartOffers().size).toBe(0)
+})
+
+// A server rolled back to a build without the capability must not keep a listing no click clears.
+it('clears a listing once the server definitively no longer supports it', async () => {
+  await connect({ runtimeId: 'r2' })
+  mocks.support.mockResolvedValue('unsupported')
+  expect((await readNativeChatRestartMachine(TARGET)).kind).toBe('unsupported')
+  expect(getNativeChatRestartOffers().has(MACHINE)).toBe(false)
+})
+
+// A failed probe proves nothing: it neither hides the offer nor spends the toast.
+it('treats a failed capability probe like a failed read, and announces on the next good one', async () => {
+  mocks.support.mockResolvedValue('unknown')
+  stageServer({ runtimeId: 'r2' })
+  renderHook(() => useNativeChatRestartOfferSources(false))
+  await vi.waitFor(() => expect(mocks.support).toHaveBeenCalled())
+  await settle()
+  expect(offerReads()).toBe(0)
+  expect(toast).not.toHaveBeenCalled()
+  mocks.support.mockResolvedValue('supported')
+  await readNativeChatRestartMachine(TARGET)
+  expect(toast).toHaveBeenCalledTimes(1)
+  mocks.support.mockResolvedValue('unknown')
+  expect((await readNativeChatRestartMachine(TARGET)).kind).toBe('unavailable')
+  expect(getNativeChatRestartOffers().get(MACHINE)?.candidates).toHaveLength(2)
+})
+
+it('retries a failed read while the connection holds, then stops', async () => {
+  vi.useFakeTimers()
+  mocks.rpc.mockRejectedValue(new Error('server still starting'))
+  stageServer({ runtimeId: 'r2' })
+  renderHook(() => useNativeChatRestartOfferSources(false))
+  await vi.advanceTimersByTimeAsync(0)
+  expect(offerReads()).toBe(1)
+  serveOffers([row('a', 'own')])
+  await vi.advanceTimersByTimeAsync(2_000)
+  expect(offerReads()).toBe(2)
+  expect(toast).toHaveBeenCalledTimes(1)
+  await vi.advanceTimersByTimeAsync(60_000)
+  expect(offerReads()).toBe(2)
+})
+
+it('gives up retrying after a few attempts', async () => {
+  vi.useFakeTimers()
+  mocks.rpc.mockRejectedValue(new Error('unreachable'))
+  stageServer({ runtimeId: 'r2' })
+  renderHook(() => useNativeChatRestartOfferSources(false))
+  await vi.advanceTimersByTimeAsync(120_000)
+  expect(offerReads()).toBe(4)
+})
+
+it("keeps a server's offer through a failed read, and drops it only for an unsupported host", async () => {
+  await connect({ runtimeId: 'r2' })
+  mocks.rpc.mockRejectedValueOnce(new Error('connection lost'))
+  expect((await readNativeChatRestartMachine(TARGET)).kind).toBe('unavailable')
+  expect(getNativeChatRestartOffers().get(MACHINE)?.candidates).toHaveLength(2)
+  mocks.rpc.mockRejectedValueOnce(
+    Object.assign(new Error('Unknown method'), { code: 'method_not_found' })
+  )
+  expect((await readNativeChatRestartMachine(TARGET)).kind).toBe('unsupported')
+  expect(getNativeChatRestartOffers().has(MACHINE)).toBe(false)
+})
+
+// An older read answering after a newer one must not replace it, nor decide anything.
+it('publishes and decides only the newest answer for a machine', async () => {
+  await connect({ runtimeId: 'r2' })
+  let answerOld: (value: unknown) => void = () => {}
+  mocks.rpc.mockImplementationOnce(
+    () =>
+      new Promise((resolve) => {
+        answerOld = resolve
+      })
+  )
+  const older = readNativeChatRestartMachine(TARGET)
+  await settle()
+  serveOffers([])
+  await readNativeChatRestartMachine(TARGET)
+  answerOld({ sessions: [row('a', 'own', 'update', RECORDED_AT + 9)], failed: [] })
+  expect(await older).toMatchObject({ kind: 'answered', published: false })
+  expect(getNativeChatRestartOffers().has(MACHINE)).toBe(false)
+  expect(toast).toHaveBeenCalledTimes(1)
+})
+
+// A read issued before a dismiss must not restore what the dismiss removed.
+it('lets a dismiss issued after a read outrank that read’s late answer', async () => {
+  await connect({ runtimeId: 'r2' })
+  let answerRead: (value: unknown) => void = () => {}
+  mocks.rpc.mockImplementationOnce(
+    () =>
+      new Promise((resolve) => {
+        answerRead = resolve
+      })
+  )
+  const reading = readNativeChatRestartMachine(TARGET)
+  await settle()
+  mocks.rpc.mockResolvedValue({ dismissed: 2, sessions: [], failed: [] })
+  await dismissNativeChatRestartOffer(MACHINE)
+  expect(getNativeChatRestartOffers().has(MACHINE)).toBe(false)
+  answerRead({ sessions: [row('a', 'own'), row('b', 'other-device')], failed: [] })
+  expect(await reading).toMatchObject({ kind: 'answered', published: false })
+  expect(getNativeChatRestartOffers().has(MACHINE)).toBe(false)
+})
+
+it('names every chat with the interruption it listed when dismissing on a server', async () => {
+  await connect({ runtimeId: 'r2' })
+  mocks.rpc.mockResolvedValue({ dismissed: 2, sessions: [], failed: [] })
+  await dismissNativeChatRestartOffer(MACHINE)
+  expect(callsTo('agentSession.restartResumableDismiss').at(-1)?.slice(1)).toEqual([
+    'agentSession.restartResumableDismiss',
+    {
+      sessionIds: ['a', 'b'],
+      offers: [
+        { sessionId: 'a', recordedAt: RECORDED_AT },
+        { sessionId: 'b', recordedAt: RECORDED_AT }
+      ]
+    },
+    { expectedEnvironmentPairingRevision: 1 }
+  ])
+})
+
+// Dismissing is bookkeeping: a refusal re-reads the list, which keeps the offer, and says nothing.
+it('sends nothing and raises no toast for a dismiss when the server cannot be probed', async () => {
+  await connect({ runtimeId: 'r2' })
+  const toasts = toastTitles().length
+  const listed = getNativeChatRestartOffers().get(MACHINE)
+  mocks.support.mockResolvedValue('unknown')
+  await dismissNativeChatRestartOffer(MACHINE)
+  await settle()
+  expect(callsTo('agentSession.restartResumableDismiss')).toEqual([])
+  expect(toastTitles()).toHaveLength(toasts)
+  // The re-read could not reach the server either, so the last answer stands.
+  expect(getNativeChatRestartOffers().get(MACHINE)).toBe(listed)
+})
+
+// The host re-derives which named chats it still offers, so a restart since the listing is fine.
+it('acts under the pairing the offer was listed from, whatever runtime answers now', async () => {
+  await connect({ runtimeId: 'r2' })
+  const options = vi.mocked(toast).mock.calls[0]?.[1]
+  stageServer({ runtimeId: 'r3' })
+  press(options?.action)
+  await settle()
+  expect(callsTo('agentSession.restartContinue')[0]?.[3]).toEqual({
+    expectedEnvironmentPairingRevision: 1
+  })
+})
+
+it('says which chats could not be resumed when the server was re-paired before the call left', async () => {
+  await connect({ runtimeId: 'r2' })
+  mocks.rpc.mockImplementation(async (_target, method) => {
+    if (method === 'agentSession.restartContinue') {
+      throw Object.assign(new Error('runtime_environment_changed'), {
+        code: 'runtime_environment_changed'
+      })
+    }
+    return { sessions: [row('a', 'own')] }
+  })
+  await continueNativeChatRestartOffers([{ machine: MACHINE, sessionIds: ['a'] }])
+  expect(toastTitles()).toContain('1 chat on studio-mac couldn’t be resumed')
+  expect(toastTitles().some((title) => title.includes('unconfirmed'))).toBe(false)
+})
+
+it('retires the old pairing’s offers, decisions and toast on a re-pair', async () => {
+  await connect({ runtimeId: 'r2' })
+  const options = vi.mocked(toast).mock.calls[0]?.[1]
+  // The new pairing cannot be read yet: nothing from the old one may stand in for its answer.
+  mocks.rpc.mockRejectedValue(new Error('connection lost'))
+  stageServer({ runtimeId: 'r2', pairingRevision: 2 })
+  await vi.waitFor(() => expect(getNativeChatRestartOffers().has(MACHINE)).toBe(false))
+  press(options?.action)
+  await settle()
+  expect(continueCalls()).toEqual([])
+  expect(toastTitles()).toContain('1 chat on studio-mac couldn’t be resumed')
+  // Once readable, the new pairing's own chats are its own decision.
+  serveOffers([row('a', 'own')])
+  await readNativeChatRestartMachine(TARGET)
+  expect(
+    toastTitles().filter((title) => title === 'studio-mac restarted for an update')
+  ).toHaveLength(2)
+})
+
+it('drops an action answer that lands after a re-pair', async () => {
+  await connect({ runtimeId: 'r2' })
+  let answer: (value: unknown) => void = () => {}
+  mocks.rpc.mockImplementation((_target, method) =>
+    method === 'agentSession.restartContinue'
+      ? new Promise((resolve) => {
+          answer = resolve
+        })
+      : Promise.reject(new Error('new pairing not readable yet'))
+  )
+  const resuming = continueNativeChatRestartOffers([{ machine: MACHINE, sessionIds: ['a'] }])
+  await settle()
+  stageServer({ runtimeId: 'r9', pairingRevision: 2 })
+  await vi.waitFor(() => expect(getNativeChatRestartOffers().has(MACHINE)).toBe(false))
+  answer({ continued: [], sessions: [row('b', 'other-device')], failed: [] })
+  await resuming
+  expect(getNativeChatRestartOffers().has(MACHINE)).toBe(false)
+})
+
+it('does not read the old pairing’s answer into a re-paired server while probing', async () => {
+  stageServer({ runtimeId: 'r2' })
+  let probed: (value: 'supported') => void = () => {}
+  mocks.support.mockImplementationOnce(
+    () =>
+      new Promise((resolve) => {
+        probed = resolve
+      })
+  )
+  const reading = readNativeChatRestartMachine(TARGET)
+  replaceRuntimeEnvironmentRevisions([{ id: SERVER, createdAt: 1, pairingRevision: 2 }])
+  probed('supported')
+  expect((await reading).kind).toBe('unavailable')
+  expect(offerReads()).toBe(0)
+})
+
+it('reads the machine again when a later read overtook an action’s answer', async () => {
+  await connect({ runtimeId: 'r2' })
+  let answer: (value: unknown) => void = () => {}
+  mocks.rpc.mockImplementationOnce(
+    () =>
+      new Promise((resolve) => {
+        answer = resolve
+      })
+  )
+  const resuming = continueNativeChatRestartOffers([{ machine: MACHINE, sessionIds: ['a'] }])
+  await settle()
+  await readNativeChatRestartMachine(TARGET)
+  const before = offerReads()
+  serveOffers([row('b', 'other-device')])
+  answer({ continued: [{ sessionId: 'a', outcome: 'continued' }], sessions: [], failed: [] })
+  await resuming
+  expect(offerReads()).toBe(before + 1)
+  expect(
+    getNativeChatRestartOffers()
+      .get(MACHINE)
+      ?.candidates.map((entry) => entry.sessionId)
+  ).toEqual(['b'])
+})
+
+it('forgets a server this desktop no longer pairs with', async () => {
+  // Decided about in an earlier run, and unpaired since.
+  window.localStorage.setItem(
+    'orca.nativeChatRestartDecided.v1',
+    JSON.stringify({ 'unpaired-earlier': ['a\u00001'] })
+  )
+  await connect({ runtimeId: 'r2' })
+  expect(window.localStorage.length).toBe(1)
+  useAppStore.setState({ runtimeEnvironments: [] })
+  expect(getNativeChatRestartOffers().has(MACHINE)).toBe(false)
+  expect(window.localStorage.length).toBe(0)
+})
+
+// Only this computer's launch read raises the dialog by itself, and only over the user's own chats.
+it("asks for the dialog on this computer when its launch read finds the user's own chats", async () => {
+  mocks.rpc.mockImplementation(async (target) =>
+    target.kind === 'local' ? { sessions: [row('l1', 'own')] } : { sessions: [] }
+  )
+  renderHook(() => useNativeChatRestartOfferSources(true))
+  await vi.waitFor(() =>
+    expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: 'local' })
+  )
+})
+
+// The launch asks about the user's own chats here; an automation's or another device's alone never
+// open the dialog, launch after launch.
+it.each(['automation', 'other-device', 'server-made'] as const)(
+  'never raises the launch dialog for chats here that are only %s',
+  async (origin) => {
+    mocks.rpc.mockImplementation(async (target) =>
+      target.kind === 'local' ? { sessions: [row('l1', origin)] } : { sessions: [] }
+    )
+    for (let launch = 0; launch < 2; launch += 1) {
+      _resetNativeChatRestartOffer()
+      const { unmount } = renderHook(() => useNativeChatRestartOfferSources(true))
+      await vi.waitFor(() => expect(getNativeChatRestartOffers().get('local')).toBeDefined())
+      unmount()
+      expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
+      expect(getNativeChatRestartOffers().get('local')?.candidates).toHaveLength(1)
+    }
+  }
+)
+
+it('never opens the dialog by itself for a paired server', async () => {
+  await connect({ runtimeId: 'r2' })
+  expect(toast).toHaveBeenCalledTimes(1)
+  expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
+})
diff --git a/src/renderer/src/components/native-chat-restart-offer-triggers.ts b/src/renderer/src/components/native-chat-restart-offer-triggers.ts
new file mode 100644
index 000000000000..6305d44b3080
--- /dev/null
+++ b/src/renderer/src/components/native-chat-restart-offer-triggers.ts
@@ -0,0 +1,319 @@
+import { useEffect } from 'react'
+import { isRuntimeHostContactRevoked } from '../../../shared/runtime-host-status'
+import { parseRestartOfferOrigin } from '../../../shared/restart-offer-origin'
+import { isWebClientLocation } from '@/lib/web-client-location'
+import { getRuntimeEnvironmentRevision } from '@/runtime/runtime-environment-revision'
+import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import { useAppStore } from '../store'
+import type { AppState } from '../store/types'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import {
+  LOCAL_RESTART_MACHINE,
+  restartMachineKey,
+  restartMachineTarget,
+  type RestartMachineKey
+} from './native-chat-restart-machines'
+import { restartMachineName } from './native-chat-restart-machine-name'
+import { continueNativeChatRestartOffers } from './native-chat-restart-offer-actions'
+import {
+  _resetNativeChatRestartOfferState,
+  forgetNativeChatRestartMachine,
+  getNativeChatRestartOffers,
+  readNativeChatRestartMachine,
+  setNativeChatRestartReadListener,
+  type RestartMachineRead
+} from './native-chat-resume-on-restart-store'
+import { requestLaunchResumePrompt } from './native-chat-resume-on-restart-launch-prompt'
+import { markNativeChatLaunchResumeDecided } from './native-chat-launch-resume-decision'
+import {
+  _resetNativeChatResumeOnRestartDialog,
+  getNativeChatResumeOnRestartDialogRequest
+} from './native-chat-resume-on-restart-dialog'
+import {
+  _resetRestartDecidedMemory,
+  decidedRestartInterruptions,
+  forgetRestartInterruptions,
+  restartDecidedEnvironments,
+  restartInterruptionKey,
+  settleRestartInterruptions
+} from './native-chat-restart-decided'
+import { announceReconnectRestartOffer } from './native-chat-restart-reconnect-toast'
+import { reopenNativeChatRestartOffer } from './native-chat-restart-offer-reopen'
+
+/**
+ * When each machine is asked for its offer, and the one decision a fresh offer makes: ask, resume
+ * the user's own chats without asking, or (for a paired server) say so in a toast.
+ *
+ * This computer is asked once, at launch. Each paired server is asked on every verified connection
+ * — the first, a new runtime, and a return after lost contact — never from its chat status feed,
+ * which needs a host that may not exist yet. A failed paired read is retried a few times while the
+ * connection holds.
+ *
+ * The toast is decided from the answer, not from a remembered edge: any published read of a paired
+ * server announces (or, opted in, resumes) the user's own interruptions this desktop has not yet
+ * decided about, then records them as decided.
+ */
+
+const LAUNCH_READ_RETRY_DELAYS_MS = [100, 250, 500] as const
+const PAIRED_READ_RETRY_DELAYS_MS = [2_000, 5_000, 15_000] as const
+
+let launch: Promise<void> | undefined
+
+function autoResumeEnabled(): boolean {
+  return useAppStore.getState().settings?.nativeChatResumeWorkOnRestart === true
+}
+
+/** The user's own chats among those the machine still offers right now. */
+function ownCandidates(
+  target: RuntimeClientTarget,
+  read: readonly ResumeCandidate[]
+): ResumeCandidate[] {
+  const stillOffered = new Set(
+    getNativeChatRestartOffers()
+      .get(restartMachineKey(target))
+      ?.candidates.map((candidate) => candidate.sessionId) ?? []
+  )
+  return read.filter(
+    (candidate) =>
+      stillOffered.has(candidate.sessionId) && parseRestartOfferOrigin(candidate.origin) === 'own'
+  )
+}
+
+/** "Resume automatically": ends in the same one toast a clicked resume does. */
+function resumeOwn(machine: RestartMachineKey, own: readonly ResumeCandidate[]): Promise<void> {
+  return continueNativeChatRestartOffers([
+    { machine, sessionIds: own.map((candidate) => candidate.sessionId) }
+  ])
+}
+
+/**
+ * This launch's single read of this computer's offer.
+ *
+ * Runs once however many surfaces mount, so the count and the dialog describe the same answer and
+ * an opted-in launch cannot dispatch twice.
+ */
+async function loadLaunchOffer(): Promise<void> {
+  // The preference belongs to this launch's request; later saves cannot dispatch another.
+  const resumeWithoutAsking = autoResumeEnabled()
+  const target: RuntimeClientTarget = { kind: 'local' }
+  let read: RestartMachineRead = await readNativeChatRestartMachine(target)
+  // Host startup can race the renderer. Retry only failed reads, never a confirmed empty result,
+  // so a transient startup gap does not strand a durable offer or add steady-state polling.
+  for (const delay of LAUNCH_READ_RETRY_DELAYS_MS) {
+    if (read.kind !== 'unavailable') {
+      break
+    }
+    await new Promise<void>((resolve) => setTimeout(resolve, delay))
+    read = await readNativeChatRestartMachine(target)
+  }
+  // Failures left from an earlier launch are the status bar's to show; only a fresh offer of the
+  // user's own chats asks. Another device's or an automation's alone never open the dialog.
+  const own = read.kind === 'answered' ? ownCandidates(target, read.candidates) : []
+  if (own.length === 0) {
+    return
+  }
+  if (!resumeWithoutAsking) {
+    requestLaunchResumePrompt()
+    return
+  }
+  // Not awaited: nothing will ask, so other launch prompts need not wait for the resume to settle.
+  void resumeOwn(LOCAL_RESTART_MACHINE, own)
+}
+
+/**
+ * A paired server's published answer: its own interruptions this desktop has not decided about
+ * are resumed (opted in) or announced, and every key the server no longer offers is forgotten.
+ * Shown in an open dialog, they are decided without a toast.
+ */
+function decidePairedAnswer(target: RuntimeClientTarget, candidates: readonly ResumeCandidate[]) {
+  if (target.kind !== 'environment') {
+    return
+  }
+  const machine = restartMachineKey(target)
+  const decided = decidedRestartInterruptions(target.environmentId)
+  const fresh = ownCandidates(target, candidates).filter(
+    (candidate) => !decided.has(restartInterruptionKey(candidate))
+  )
+  settleRestartInterruptions(
+    target.environmentId,
+    candidates.map(restartInterruptionKey),
+    fresh.map(restartInterruptionKey)
+  )
+  // A resume dialog on screen lists every machine: what it shows needs no toast.
+  if (fresh.length === 0 || getNativeChatResumeOnRestartDialogRequest() !== null) {
+    return
+  }
+  if (autoResumeEnabled()) {
+    void resumeOwn(machine, fresh)
+    return
+  }
+  const fence = getNativeChatRestartOffers().get(machine)?.fence
+  announceReconnectRestartOffer({
+    machine,
+    machineName: restartMachineName(machine),
+    own: fresh,
+    resume: (sessionIds) =>
+      void continueNativeChatRestartOffers([{ machine, sessionIds }], { expected: fence }),
+    show: () => void reopenNativeChatRestartOffer([machine])
+  })
+}
+
+/** Marks what an open dialog shows as decided, so a later read does not announce it again. */
+export function markNativeChatRestartOffersShown(
+  shown: readonly { machine: RestartMachineKey; candidates: readonly ResumeCandidate[] }[]
+): void {
+  for (const { machine, candidates } of shown) {
+    const target = restartMachineTarget(machine)
+    if (target.kind === 'environment') {
+      const keys = candidates.map(restartInterruptionKey)
+      settleRestartInterruptions(target.environmentId, keys, keys)
+    }
+  }
+}
+
+type SeenConnection = { key: string; pairingRevision: number | undefined; generation: number }
+const seenConnections = new Map<string, SeenConnection>()
+/** Each paired server's pairing revision as the saved list last named it. */
+const knownPairingRevisions = new Map<string, number>()
+let stopWatchingConnections: (() => void) | null = null
+let connectionGenerations = 0
+
+function connectionStillCurrent(environmentId: string, generation: number): boolean {
+  return seenConnections.get(environmentId)?.generation === generation
+}
+
+/** One verified connection: read, and retry a failed read a few times while it holds. */
+async function readPairedMachineOnConnection(environmentId: string, generation: number) {
+  const target: RuntimeClientTarget = { kind: 'environment', environmentId }
+  for (const delay of [...PAIRED_READ_RETRY_DELAYS_MS, null]) {
+    const read = await readNativeChatRestartMachine(target)
+    if (read.kind !== 'unavailable' || delay === null) {
+      return
+    }
+    await new Promise<void>((resolve) => setTimeout(resolve, delay))
+    if (!connectionStillCurrent(environmentId, generation)) {
+      return
+    }
+  }
+}
+
+function forgetPairedMachine(environmentId: string): void {
+  forgetNativeChatRestartMachine(restartMachineKey({ kind: 'environment', environmentId }))
+  forgetRestartInterruptions(environmentId)
+}
+
+/**
+ * Reads a paired server's offer on each verified connection transition. Loss of contact reads
+ * nothing and keeps the offer; only a revoked pairing, a re-pair or a removed server forgets it.
+ */
+function noticeConnections(state: AppState): void {
+  const paired = new Set(state.runtimeEnvironments.map((environment) => environment.id))
+  for (const environmentId of paired) {
+    // A re-pair is known from the saved record before the new pairing ever connects: the old
+    // pairing's rows go now, not once the new one answers.
+    const revision = getRuntimeEnvironmentRevision(environmentId)
+    const known = knownPairingRevisions.get(environmentId)
+    if (revision !== undefined) {
+      if (known !== undefined && known !== revision) {
+        forgetPairedMachine(environmentId)
+      }
+      knownPairingRevisions.set(environmentId, revision)
+    }
+  }
+  for (const [environmentId, entry] of state.runtimeStatusByEnvironmentId) {
+    if (!paired.has(environmentId)) {
+      continue
+    }
+    const pairingRevision = entry.snapshot?.pairingRevision
+    if (isRuntimeHostContactRevoked(entry)) {
+      seenConnections.set(environmentId, { key: '', pairingRevision, generation: 0 })
+      forgetPairedMachine(environmentId)
+      continue
+    }
+    const runtimeId = entry.status?.runtimeId
+    if (!runtimeId) {
+      continue
+    }
+    const key = `${pairingRevision ?? ''}\u0000${runtimeId}\u0000${entry.hostContactEpoch ?? 0}`
+    const seen = seenConnections.get(environmentId)
+    if (seen?.key === key) {
+      continue
+    }
+    if (seen && seen.pairingRevision !== pairingRevision) {
+      // Re-paired under the same id: the old pairing's offers, ticks and decisions are not this one's.
+      forgetPairedMachine(environmentId)
+    }
+    const generation = ++connectionGenerations
+    seenConnections.set(environmentId, { key, pairingRevision, generation })
+    void readPairedMachineOnConnection(environmentId, generation)
+  }
+  // Until the saved server list has loaded, a missing server is not a removed one.
+  if (!state.runtimeEnvironmentCatalogHydrated) {
+    return
+  }
+  const removed = new Set(
+    [
+      ...[...getNativeChatRestartOffers().keys()].flatMap((machine) => {
+        const target = restartMachineTarget(machine)
+        return target.kind === 'environment' ? [target.environmentId] : []
+      }),
+      ...seenConnections.keys(),
+      ...restartDecidedEnvironments()
+    ].filter((environmentId) => !paired.has(environmentId))
+  )
+  for (const environmentId of removed) {
+    seenConnections.delete(environmentId)
+    knownPairingRevisions.delete(environmentId)
+    forgetPairedMachine(environmentId)
+  }
+}
+
+function watchPairedConnections(): void {
+  // A browser client has no paired servers of its own to ask.
+  if (stopWatchingConnections || isWebClientLocation()) {
+    return
+  }
+  setNativeChatRestartReadListener(decidePairedAnswer)
+  let last: AppState | null = null
+  const check = (state: AppState): void => {
+    if (
+      last &&
+      last.runtimeStatusByEnvironmentId === state.runtimeStatusByEnvironmentId &&
+      last.runtimeEnvironments === state.runtimeEnvironments
+    ) {
+      return
+    }
+    last = state
+    noticeConnections(state)
+  }
+  stopWatchingConnections = useAppStore.subscribe(check)
+  check(useAppStore.getState())
+}
+
+/**
+ * Starts every source of restart offers. `localEnabled` gates only this computer's launch read:
+ * settings arrive after the first render, so the read waits for the flag rather than being lost.
+ */
+export function useNativeChatRestartOfferSources(localEnabled: boolean): void {
+  useEffect(watchPairedConnections, [])
+  useEffect(() => {
+    if (localEnabled) {
+      // Fetched after mount, never awaited by startup: the workspace is usable first. Decided
+      // either way, so in-chat Continue stops waiting on this computer's chats.
+      launch ??= loadLaunchOffer().finally(markNativeChatLaunchResumeDecided)
+    }
+  }, [localEnabled])
+}
+
+/** @internal - tests need a clean module between cases: every offer, action and trigger. */
+export function _resetNativeChatRestartOffer(): void {
+  _resetNativeChatRestartOfferState()
+  _resetNativeChatResumeOnRestartDialog()
+  _resetRestartDecidedMemory()
+  launch = undefined
+  seenConnections.clear()
+  knownPairingRevisions.clear()
+  connectionGenerations = 0
+  stopWatchingConnections?.()
+  stopWatchingConnections = null
+}
diff --git a/src/renderer/src/components/native-chat-restart-reconnect-toast.ts b/src/renderer/src/components/native-chat-restart-reconnect-toast.ts
new file mode 100644
index 000000000000..ae3a27c5cc02
--- /dev/null
+++ b/src/renderer/src/components/native-chat-restart-reconnect-toast.ts
@@ -0,0 +1,84 @@
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import type { RestartMachineKey } from './native-chat-restart-machines'
+
+/**
+ * The notice a paired server's restart raises once this desktop reconnects: how many of the user's
+ * own chats there were cut off, with a way to resume exactly those or to pick in the dialog.
+ *
+ * Never shown for this computer, whose own launch opens the dialog instead.
+ */
+function reconnectToastId(machine: RestartMachineKey): string {
+  return `native-chat-restart-reconnect:${machine}`
+}
+
+/** An open resume dialog lists these machines' chats and blocks the page under it, so a toast still
+ *  on screen above it would only look clickable. */
+export function dismissReconnectRestartOffers(machines: readonly RestartMachineKey[]): void {
+  for (const machine of machines) {
+    toast.dismiss(reconnectToastId(machine))
+  }
+}
+
+export function announceReconnectRestartOffer(args: {
+  machine: RestartMachineKey
+  machineName: string
+  own: readonly ResumeCandidate[]
+  resume: (sessionIds: readonly string[]) => void
+  show: () => void
+}): void {
+  const { machineName, own } = args
+  if (own.length === 0) {
+    return
+  }
+  const title = own.some((candidate) => candidate.trigger === 'update')
+    ? translate(
+        'auto.components.NativeChatResumeOnRestartModal.reconnectUpdateTitle',
+        '{{value0}} restarted for an update',
+        { value0: machineName }
+      )
+    : translate(
+        'auto.components.NativeChatResumeOnRestartModal.reconnectQuitTitle',
+        'Orca on {{value0}} was restarted',
+        { value0: machineName }
+      )
+  const description =
+    own.length === 1
+      ? translate(
+          'auto.components.NativeChatResumeOnRestartModal.reconnectBodyOne',
+          '1 of your chats there was stopped mid-reply. It shows where it stopped, and nothing was lost.'
+        )
+      : translate(
+          'auto.components.NativeChatResumeOnRestartModal.reconnectBodyMany',
+          '{{value0}} of your chats there were stopped mid-reply. Each one shows where it stopped, and nothing was lost.',
+          { value0: own.length }
+        )
+  const sessionIds = own.map((candidate) => candidate.sessionId)
+  toast(title, {
+    // One per machine: a newer restart of the same server replaces the older notice.
+    id: reconnectToastId(args.machine),
+    description,
+    action: {
+      label:
+        own.length === 1
+          ? translate(
+              'auto.components.NativeChatResumeOnRestartModal.resumeSelectedOne',
+              'Resume 1 chat'
+            )
+          : translate(
+              'auto.components.NativeChatResumeOnRestartModal.resumeSelected',
+              'Resume {{value0}} chats',
+              { value0: own.length }
+            ),
+      onClick: () => args.resume(sessionIds)
+    },
+    cancel: {
+      label: translate(
+        'auto.components.NativeChatResumeOnRestartModal.reconnectShow',
+        'Show chats'
+      ),
+      onClick: args.show
+    }
+  })
+}
diff --git a/src/renderer/src/components/native-chat-resume-dialog-opening.ts b/src/renderer/src/components/native-chat-resume-dialog-opening.ts
new file mode 100644
index 000000000000..7a78137d7990
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-dialog-opening.ts
@@ -0,0 +1,52 @@
+import { useEffect, useSyncExternalStore } from 'react'
+import { useNativeChatRestartOfferEnabled } from './native-chat-restart-offer-gate'
+import {
+  getNativeChatResumeOnRestartDialogRequest,
+  subscribeNativeChatResumeOnRestartDialog,
+  type NativeChatResumeOnRestartDialogRequest
+} from './native-chat-resume-on-restart-dialog'
+import { dismissReconnectRestartOffers } from './native-chat-restart-reconnect-toast'
+import { useNativeChatRestartOffers } from './native-chat-resume-on-restart-store'
+import { useMachineViews, type MachineView } from './native-chat-resume-machine-views'
+import {
+  markNativeChatRestartOffersShown,
+  useNativeChatRestartOfferSources
+} from './native-chat-restart-offer-triggers'
+
+/**
+ * Whether the resume dialog is on screen, and over which machines. Starts every source of offers
+ * and records what the dialog shows as decided.
+ */
+export function useNativeChatResumeDialogOpening(): {
+  machines: MachineView[]
+  request: NativeChatResumeOnRestartDialogRequest | null
+  showing: boolean
+} {
+  const localEnabled = useNativeChatRestartOfferEnabled()
+  useNativeChatRestartOfferSources(localEnabled)
+  const offers = useNativeChatRestartOffers()
+  const machines = useMachineViews(offers)
+  // Open is an external request, never mirrored into local state: the launch load, the status-bar
+  // entry and a reconnect toast all raise it, and a copy here would go stale against the last one.
+  const request = useSyncExternalStore(
+    subscribeNativeChatResumeOnRestartDialog,
+    getNativeChatResumeOnRestartDialogRequest,
+    getNativeChatResumeOnRestartDialogRequest
+  )
+  // What the open dialog shows is decided: a later read of a paired server does not announce it,
+  // and a restart toast still up goes, since the dialog lists its chats and blocks clicks on it.
+  const showing = request !== null && machines.length > 0
+  useEffect(() => {
+    if (!showing) {
+      return
+    }
+    markNativeChatRestartOffersShown(
+      machines.map((machine) => ({
+        machine: machine.machine,
+        candidates: machine.offer.candidates
+      }))
+    )
+    dismissReconnectRestartOffers(machines.map((machine) => machine.machine))
+  }, [showing, machines])
+  return { machines, request, showing }
+}
diff --git a/src/renderer/src/components/native-chat-resume-failed-chat-watch.test.ts b/src/renderer/src/components/native-chat-resume-failed-chat-watch.test.ts
index 4e0697f228b8..f18be22c9bf3 100644
--- a/src/renderer/src/components/native-chat-resume-failed-chat-watch.test.ts
+++ b/src/renderer/src/components/native-chat-resume-failed-chat-watch.test.ts
@@ -7,12 +7,14 @@ import type {
 } from '../../../shared/agent-session-wire'
 import { resetStructuredAgentSessionStatusFeedsForTests } from '@/runtime/structured-agent-session-status-feed'
 import {
-  _resetNativeChatRestartOffer,
-  continueNativeChatRestartOffer,
-  dismissNativeChatRestartOffer,
-  getNativeChatRestartOffer,
-  refreshNativeChatRestartOffer
+  getNativeChatRestartOffers,
+  readNativeChatRestartMachine
 } from './native-chat-resume-on-restart-store'
+import {
+  continueNativeChatRestartOffers,
+  dismissNativeChatRestartOffer
+} from './native-chat-restart-offer-actions'
+import { _resetNativeChatRestartOffer } from './native-chat-restart-offer-triggers'
 
 const mocks = vi.hoisted(() => ({
   rpc: vi.fn(),
@@ -24,6 +26,14 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
   subscribeStructuredAgentSessionStatus: mocks.subscribeStatus
 }))
 
+function getNativeChatRestartOffer() {
+  return getNativeChatRestartOffers().get('local') ?? { candidates: [], failed: [] }
+}
+
+function refreshNativeChatRestartOffer() {
+  return readNativeChatRestartMachine({ kind: 'local' })
+}
+
 // When the user sends in an offered or failed chat, its status bar entry must retire without the
 // user reopening anything, and nothing may run while nothing is offered or failed.
 
@@ -34,6 +44,7 @@ const failure = {
   trigger: 'update',
   latestPrompt: 'Fix it',
   recordedAt: 1,
+  origin: 'own',
   failedAt: 2,
   outcome: 'refused',
   reason: 'agent_session_restart_work_superseded'
@@ -170,7 +181,7 @@ it('never lets a re-read that was already in flight bring back a dismissed failu
   await vi.advanceTimersByTimeAsync(500)
   expect(offerReads()).toBe(2)
 
-  await dismissNativeChatRestartOffer(['a'])
+  await dismissNativeChatRestartOffer('local', ['a'])
   expect(getNativeChatRestartOffer().failed).toEqual([])
   stale.resolve({ sessions: [], failed: [failure] })
   await vi.advanceTimersByTimeAsync(0)
@@ -188,7 +199,7 @@ it('waits for a resume in flight instead of re-reading under it', async () => {
       ? acting.promise
       : Promise.resolve({ sessions: [], failed: [failure] })
   )
-  const retry = continueNativeChatRestartOffer(['a'])
+  const retry = continueNativeChatRestartOffers([{ machine: 'local', sessionIds: ['a'] }])
   hostEmit()({ type: 'status', session: summary('working', 'Carry on please', Date.now() + 1) })
   await vi.advanceTimersByTimeAsync(500)
   expect(offerReads()).toBe(1)
diff --git a/src/renderer/src/components/native-chat-resume-failure-action.ts b/src/renderer/src/components/native-chat-resume-failure-action.ts
new file mode 100644
index 000000000000..8c351a96911c
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-failure-action.ts
@@ -0,0 +1,45 @@
+import { activateAiVaultStructuredSession } from '@/lib/activate-ai-vault-structured-session'
+import type { ResumeFailureAction } from './native-chat-resume-failure-guidance'
+import { consumeNativeChatResumeOnRestartDialogRequest } from './native-chat-resume-on-restart-dialog'
+import {
+  continueNativeChatRestartOffers,
+  dismissNativeChatRestartOffer
+} from './native-chat-restart-offer-actions'
+import type { MachineView } from './native-chat-resume-machine-views'
+
+/** A dialog row's own action on one chat. Row actions act on their row and leave the dialog open,
+ *  except Open, which gets out of the way of the chat it opens. */
+export async function actOnResumeRow(
+  machine: MachineView,
+  action: ResumeFailureAction,
+  sessionId: string,
+  persistPreference: () => Promise<void>
+): Promise<void> {
+  if (action === 'dismiss') {
+    await dismissNativeChatRestartOffer(machine.machine, [sessionId])
+    return
+  }
+  if (action === 'retry') {
+    void persistPreference()
+    await continueNativeChatRestartOffers([{ machine: machine.machine, sessionIds: [sessionId] }])
+    return
+  }
+  const failure = machine.failureFor(sessionId)
+  if (!failure) {
+    return
+  }
+  // Opening is read-only and keeps the record: the user's own send in that chat settles it.
+  consumeNativeChatResumeOnRestartDialogRequest()
+  await activateAiVaultStructuredSession({
+    structuredSession: {
+      workspaceId: failure.workspaceId,
+      sessionId,
+      // The machine that listed it and the pairing it listed under, never re-derived from
+      // whichever workspace shares its id.
+      executionHostId: failure.executionHostId,
+      ...(machine.offer.fence.pairingRevision === undefined
+        ? {}
+        : { pairingRevision: machine.offer.fence.pairingRevision })
+    }
+  })
+}
diff --git a/src/renderer/src/components/native-chat-resume-machine-views.ts b/src/renderer/src/components/native-chat-resume-machine-views.ts
new file mode 100644
index 000000000000..04172fe94fa8
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-machine-views.ts
@@ -0,0 +1,70 @@
+import { useMemo } from 'react'
+import { useAppStore } from '../store'
+import type { ResumeFailure } from './native-chat-resume-on-restart-grouping'
+import type { NativeChatRestartMachineOffer } from './native-chat-resume-on-restart-store'
+import { LOCAL_RESTART_MACHINE, type RestartMachineKey } from './native-chat-restart-machines'
+import { restartMachineNameFromState } from './native-chat-restart-machine-name'
+import { resumeCandidateOwnership } from './native-chat-resume-ownership'
+import { restartListingIdentity, type ResumeSelectionMachine } from './native-chat-resume-selection'
+
+export type MachineView = ResumeSelectionMachine & {
+  offer: NativeChatRestartMachineOffer
+  name: string
+}
+
+/** This computer first, then each paired server by name. */
+function orderedOffers(
+  offers: ReadonlyMap<RestartMachineKey, NativeChatRestartMachineOffer>,
+  nameOf: (machine: RestartMachineKey) => string
+): NativeChatRestartMachineOffer[] {
+  return [...offers.values()].sort((left, right) =>
+    left.machine === LOCAL_RESTART_MACHINE
+      ? -1
+      : right.machine === LOCAL_RESTART_MACHINE
+        ? 1
+        : nameOf(left.machine).localeCompare(nameOf(right.machine))
+  )
+}
+
+/** Each listed machine, ordered, with its name and each chat's ownership as its host judged it.
+ *  Names are selected as one joined string so the selector returns a PRIMITIVE and the dialog
+ *  re-renders only when a name actually changes. */
+export function useMachineViews(
+  offers: ReadonlyMap<RestartMachineKey, NativeChatRestartMachineOffer>
+): MachineView[] {
+  const joined = useAppStore((state) =>
+    [...offers.keys()]
+      .map((machine) => `${machine}\u0001${restartMachineNameFromState(state, machine)}`)
+      .join('\u0002')
+  )
+  return useMemo(() => {
+    const names = new Map(
+      joined
+        .split('\u0002')
+        .filter(Boolean)
+        .map((entry) => {
+          const [machine = '', name = ''] = entry.split('\u0001')
+          return [machine, name] as const
+        })
+    )
+    return orderedOffers(offers, (machine) => names.get(machine) ?? machine).map((offer) => {
+      const rows = [...offer.candidates, ...offer.failed]
+      const rowById = new Map(rows.map((row) => [row.sessionId, row]))
+      const failureById = new Map<string, ResumeFailure>(
+        offer.failed.map((failure) => [failure.sessionId, failure])
+      )
+      return {
+        machine: offer.machine,
+        identity: restartListingIdentity(offer.machine, offer.fence.pairingRevision),
+        offer,
+        name: names.get(offer.machine) ?? offer.machine,
+        rows,
+        failureFor: (sessionId: string) => failureById.get(sessionId),
+        ownershipFor: (sessionId: string) => {
+          const row = rowById.get(sessionId)
+          return row ? resumeCandidateOwnership(row) : 'unknown'
+        }
+      }
+    })
+  }, [joined, offers])
+}
diff --git a/src/renderer/src/components/native-chat-resume-machines.test-support.ts b/src/renderer/src/components/native-chat-resume-machines.test-support.ts
new file mode 100644
index 000000000000..dd703acba131
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-machines.test-support.ts
@@ -0,0 +1,38 @@
+// Fixtures and DOM lookups shared by the resume dialog's per-machine test files.
+
+import type { RestartOfferOrigin } from '../../../shared/restart-offer-origin'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+
+/** One chat per workspace; each host says whose a chat is for this desktop. */
+export function machineRowFixture(sessionId: string, origin: RestartOfferOrigin): ResumeCandidate {
+  return {
+    sessionId,
+    workspaceId: `workspace-${sessionId}`,
+    agent: 'codex',
+    trigger: 'update',
+    latestPrompt: `Prompt ${sessionId}`,
+    recordedAt: 1_800_000_000_000,
+    executionHostId: 'local',
+    workspaceKind: 'git-worktree',
+    origin
+  }
+}
+
+export function machineToggle(name: string): HTMLElement {
+  const found = document.querySelector<HTMLElement>(`[aria-label="Resume every chat on ${name}"]`)
+  if (!found) {
+    throw new Error(`Missing machine checkbox: ${name}`)
+  }
+  return found
+}
+
+/** The machine row's expand control, which carries its name, cause, age and count. */
+export function machineRow(name: string): HTMLButtonElement {
+  const found = [...document.querySelectorAll<HTMLButtonElement>('button[aria-expanded]')].find(
+    (entry) => entry.textContent?.startsWith(name)
+  )
+  if (!found) {
+    throw new Error(`Missing machine row: ${name}`)
+  }
+  return found
+}
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-dialog.ts b/src/renderer/src/components/native-chat-resume-on-restart-dialog.ts
index 4b139d1c2a34..5390c80b7c1d 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-dialog.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-dialog.ts
@@ -1,4 +1,11 @@
-let pendingOpen = false
+import type { RestartMachineKey } from './native-chat-restart-machines'
+
+/** An open request, and the machine it was opened for (that machine's row starts expanded). */
+export type NativeChatResumeOnRestartDialogRequest = Readonly<{
+  focus: RestartMachineKey | null
+}>
+
+let pending: NativeChatResumeOnRestartDialogRequest | null = null
 const listeners = new Set<() => void>()
 
 function notify(): void {
@@ -7,23 +14,31 @@ function notify(): void {
   }
 }
 
-// Why: the launch load and the status-bar entry both open this dialog, and either can fire before
-// it subscribes. Keeping the request as an external snapshot prevents mount ordering from losing it.
-export function requestNativeChatResumeOnRestartDialog(): void {
-  pendingOpen = true
+// Why: the launch load, the status-bar entry and a reconnect toast all open this dialog, and any
+// can fire before it subscribes. Keeping the request as an external snapshot prevents mount
+// ordering from losing it.
+export function requestNativeChatResumeOnRestartDialog(
+  focus: RestartMachineKey | null = null
+): void {
+  // An open dialog stays as it is: a later request (this computer's launch read landing under it)
+  // would move its focus and reset the user's ticks, and the dialog lists every machine anyway.
+  if (pending) {
+    return
+  }
+  pending = { focus }
   notify()
 }
 
 export function consumeNativeChatResumeOnRestartDialogRequest(): void {
-  if (!pendingOpen) {
+  if (!pending) {
     return
   }
-  pendingOpen = false
+  pending = null
   notify()
 }
 
-export function getNativeChatResumeOnRestartDialogRequest(): boolean {
-  return pendingOpen
+export function getNativeChatResumeOnRestartDialogRequest(): NativeChatResumeOnRestartDialogRequest | null {
+  return pending
 }
 
 export function subscribeNativeChatResumeOnRestartDialog(listener: () => void): () => void {
@@ -32,3 +47,8 @@ export function subscribeNativeChatResumeOnRestartDialog(listener: () => void):
     listeners.delete(listener)
   }
 }
+
+/** @internal - tests need a clean module between cases. */
+export function _resetNativeChatResumeOnRestartDialog(): void {
+  pending = null
+}
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
index 9526926841e9..b9af43063a1e 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
@@ -5,6 +5,7 @@ import { projectGroupIdFromRepoId } from '../../../shared/folder-workspace-workt
 import type { RepoIcon } from '../../../shared/repo-icon'
 import type { AgentSessionRestartActivity } from '../../../shared/agent-session-restart-activity'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
+import type { RestartOfferOrigin } from '../../../shared/restart-offer-origin'
 
 /**
  * The offered chats, arranged the way the sidebar arranges workspaces: project/repo, then workspace,
@@ -29,6 +30,8 @@ export type ResumeCandidate = {
   model?: string
   /** What the chat was doing, snapshotted by the host as it stopped; an older host omits it. */
   activity?: AgentSessionRestartActivity
+  /** Whose chat it is for this desktop, judged by the host; absent from a host that predates it. */
+  origin?: RestartOfferOrigin
 }
 
 /** An offer that was acted on and did not end with the agent carrying on. The host keeps it until
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-launch-prompt.ts b/src/renderer/src/components/native-chat-resume-on-restart-launch-prompt.ts
new file mode 100644
index 000000000000..12fe419bec62
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-on-restart-launch-prompt.ts
@@ -0,0 +1,10 @@
+import { LOCAL_RESTART_MACHINE } from './native-chat-restart-machines'
+import { requestNativeChatResumeOnRestartDialog } from './native-chat-resume-on-restart-dialog'
+
+/**
+ * The one way the resume dialog opens BY ITSELF: this computer's own launch found the user's chats
+ * to resume. Every other opening follows a click (status bar, toast).
+ */
+export function requestLaunchResumePrompt(): void {
+  requestNativeChatResumeOnRestartDialog(LOCAL_RESTART_MACHINE)
+}
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-modal.test-support.ts b/src/renderer/src/components/native-chat-resume-on-restart-modal.test-support.ts
index 993a170ba0f1..ae5516f8a1ab 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-modal.test-support.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-modal.test-support.ts
@@ -10,7 +10,8 @@ export const offered: ResumeCandidate[] = ['a', 'b'].map((sessionId) => ({
   latestPrompt: `Prompt ${sessionId}`,
   recordedAt: 1_800_000_000_000,
   executionHostId: 'local',
-  workspaceKind: 'git-worktree'
+  workspaceKind: 'git-worktree',
+  origin: 'own'
 }))
 
 /** A chat the host acted on and could not carry on, as it reports it. */
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-outcome-toast.test.ts b/src/renderer/src/components/native-chat-resume-on-restart-outcome-toast.test.ts
index 9b8c90eb4333..e8a2f687c55b 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-outcome-toast.test.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-outcome-toast.test.ts
@@ -1,25 +1,36 @@
 import { toast } from 'sonner'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '../store'
 import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
 import { lastToastShow } from './native-chat-resume-toast.test-support'
 import {
   consumeNativeChatResumeOnRestartDialogRequest,
-  getNativeChatResumeOnRestartDialogRequest
+  getNativeChatResumeOnRestartDialogRequest,
+  subscribeNativeChatResumeOnRestartDialog
 } from './native-chat-resume-on-restart-dialog'
 import {
-  _resetNativeChatRestartOffer,
-  continueNativeChatRestartOffer,
-  getNativeChatRestartOffer,
-  refreshNativeChatRestartOffer
+  forgetNativeChatRestartMachine,
+  getNativeChatRestartOffers,
+  readNativeChatRestartMachine
 } from './native-chat-resume-on-restart-store'
+import { continueNativeChatRestartOffers } from './native-chat-restart-offer-actions'
+import { _resetNativeChatRestartOffer } from './native-chat-restart-offer-triggers'
+import { reopenNativeChatRestartOffer } from './native-chat-restart-offer-reopen'
+import { replaceRuntimeEnvironmentRevisions } from '@/runtime/runtime-environment-revision'
+import { pairedEnvironment, verifiedConnection } from './native-chat-restart-offer-test-support'
 
 const rpc = vi.hoisted(() => vi.fn())
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   callStructuredAgentSession: rpc,
+  pairedRestartOffersSupport: async () => 'supported',
   // A failed row opens the status feed; these cases never drive it.
   subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
 }))
-vi.mock('sonner', () => ({ toast: vi.fn() }))
+vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { dismiss: vi.fn() }) }))
+
+const LOCAL = { kind: 'local' } as const
+const SERVER = 'studio'
+const STUDIO = { kind: 'environment', environmentId: SERVER } as const
 
 const offered: ResumeCandidate[] = ['a', 'b'].map((sessionId) => ({
   sessionId,
@@ -27,9 +38,45 @@ const offered: ResumeCandidate[] = ['a', 'b'].map((sessionId) => ({
   agent: 'codex',
   trigger: 'quit',
   latestPrompt: `Prompt ${sessionId}`,
-  recordedAt: 1_800_000_000_000
+  recordedAt: 1_800_000_000_000,
+  origin: 'own'
 }))
 
+function failedIds(machine = 'local'): string[] {
+  return (getNativeChatRestartOffers().get(machine)?.failed ?? []).map((entry) => entry.sessionId)
+}
+
+function offerIds(machine = 'local'): string[] {
+  return (getNativeChatRestartOffers().get(machine)?.candidates ?? []).map(
+    (entry) => entry.sessionId
+  )
+}
+
+function pairStudio(pairingRevision = 1): void {
+  replaceRuntimeEnvironmentRevisions([{ id: SERVER, createdAt: 1, pairingRevision }])
+  useAppStore.setState({
+    runtimeEnvironments: [pairedEnvironment(SERVER, 'studio-mac')],
+    runtimeEnvironmentCatalogHydrated: true,
+    runtimeStatusByEnvironmentId: new Map([
+      [
+        SERVER,
+        verifiedConnection({ environmentId: SERVER, runtimeId: 'runtime-1', pairingRevision })
+      ]
+    ])
+  })
+}
+
+/** Every change to the dialog request from here on, so an open that closes again is seen. */
+function recordDialogRequests(): unknown[] {
+  const seen: unknown[] = []
+  unsubscribe = subscribeNativeChatResumeOnRestartDialog(() => {
+    seen.push(getNativeChatResumeOnRestartDialogRequest())
+  })
+  return seen
+}
+
+let unsubscribe = () => {}
+
 beforeEach(() => {
   rpc.mockReset()
   _resetNativeChatRestartOffer()
@@ -39,6 +86,8 @@ beforeEach(() => {
 })
 
 afterEach(() => {
+  unsubscribe()
+  unsubscribe = () => {}
   vi.mocked(console.warn).mockRestore()
   _resetNativeChatRestartOffer()
 })
@@ -55,44 +104,38 @@ function hostLostAfterListing(): void {
   })
 }
 
-/** How each caller starts a resume: a click names its chats; an opted-in launch names none and
- *  reports the ones it offered. */
-const resumes = {
-  click: () => continueNativeChatRestartOffer(['a', 'b']),
-  launch: () => continueNativeChatRestartOffer(undefined, ['a', 'b'])
-}
+// A click and an opted-in automatic resume both name the user's own chats, so they share one path.
+const resumeBoth = () =>
+  continueNativeChatRestartOffers([{ machine: 'local', sessionIds: ['a', 'b'] }])
 
 // With the host unreachable there is no list to narrow by: every chat the resume reported failed,
 // and nothing is listed for Show to open.
-it.each(['click', 'launch'] as const)(
-  'counts every chat of a lost %s resume when the host cannot be read either',
-  async (caller) => {
-    hostLostAfterListing()
-    await refreshNativeChatRestartOffer()
-    await resumes[caller]()
-    expect(vi.mocked(toast).mock.calls).toEqual([['2 chats couldn’t be resumed', {}]])
-  }
-)
+it('counts every chat of a lost resume when the host cannot be read either', async () => {
+  hostLostAfterListing()
+  await readNativeChatRestartMachine(LOCAL)
+  await resumeBoth()
+  expect(vi.mocked(toast).mock.calls).toEqual([['2 chats couldn’t be resumed', {}]])
+})
 
 // The re-read lists the chats the lost request reported as failed, so the one toast keeps Show.
-it('answers an opted-in launch that loses its resume request with one toast and Show', async () => {
+it('answers a resume that loses its request with one toast and Show', async () => {
   rpc.mockImplementation(async (_target, method) => {
     if (method === 'agentSession.restartResumable') {
       return { sessions: offered, failed: [] }
     }
     throw new Error('response lost')
   })
-  await refreshNativeChatRestartOffer()
-  await resumes.launch()
-  expect(getNativeChatRestartOffer().failed.map((entry) => entry.sessionId)).toEqual(['a', 'b'])
+  await readNativeChatRestartMachine(LOCAL)
+  await resumeBoth()
+  expect(failedIds()).toEqual(['a', 'b'])
   expect(vi.mocked(toast).mock.calls.map(([title]) => title)).toEqual([
     '2 chats couldn’t be resumed'
   ])
   expect(lastToastShow()).toBeDefined()
 })
 
-// The same toast and copy as a click: the chats it resumed ride along under the one it could not.
-it('answers a mixed opted-in launch with one toast', async () => {
+// The chats it resumed ride along under the one it could not.
+it('answers a mixed resume with one toast', async () => {
   const failed = [{ ...offered[1]!, failedAt: 1, outcome: 'refused', reason: 'unknown' }]
   rpc.mockImplementation(async (_target, method) =>
     method === 'agentSession.restartResumable'
@@ -106,8 +149,8 @@ it('answers a mixed opted-in launch with one toast', async () => {
           failed
         }
   )
-  await refreshNativeChatRestartOffer()
-  await resumes.launch()
+  await readNativeChatRestartMachine(LOCAL)
+  await resumeBoth()
   expect(vi.mocked(toast).mock.calls).toEqual([
     ['1 chat couldn’t be resumed', expect.objectContaining({ description: 'Resumed 1 chat' })]
   ])
@@ -115,19 +158,19 @@ it('answers a mixed opted-in launch with one toast', async () => {
 })
 
 // Between the listing and the request every chat moved on by itself: nothing happened to report.
-it('raises no toast when the host had nothing left for an opted-in launch to resume', async () => {
+it('raises no toast when the host had nothing left to resume', async () => {
   rpc.mockImplementation(async (_target, method) =>
     method === 'agentSession.restartResumable'
       ? { sessions: offered, failed: [] }
       : { continued: [], sessions: [], failed: [] }
   )
-  await refreshNativeChatRestartOffer()
-  await resumes.launch()
+  await readNativeChatRestartMachine(LOCAL)
+  await resumeBoth()
   expect(toast).not.toHaveBeenCalled()
 })
 
 // The agent was seen carrying on while the toast was up, so the host retired the failure: Show
-// re-reads and opens nothing, rather than latching a request for a dialog with no rows to draw.
+// re-reads and opens nothing, rather than flashing a dialog with no rows to draw.
 it('opens nothing from Show once the host no longer lists the chat', async () => {
   let failed = [{ ...offered[0]!, failedAt: 1, outcome: 'unconfirmed', reason: 'unknown' }]
   rpc.mockImplementation(async (_target, method) =>
@@ -135,15 +178,208 @@ it('opens nothing from Show once the host no longer lists the chat', async () =>
       ? { sessions: [], failed }
       : { continued: [{ sessionId: 'a', outcome: 'unknown' }], sessions: [], failed }
   )
-  await refreshNativeChatRestartOffer()
-  await continueNativeChatRestartOffer(['a'])
+  await readNativeChatRestartMachine(LOCAL)
+  await continueNativeChatRestartOffers([{ machine: 'local', sessionIds: ['a'] }])
   expect(vi.mocked(toast).mock.calls.map(([title]) => title)).toEqual([
     'Couldn’t confirm 1 chat was resumed'
   ])
   failed = []
+  const requests = recordDialogRequests()
   lastToastShow()?.()
   await new Promise((resolve) => setTimeout(resolve, 0))
   expect(rpc.mock.calls.at(-1)?.[1]).toBe('agentSession.restartResumable')
-  expect(getNativeChatRestartOffer().failed).toEqual([])
-  expect(getNativeChatResumeOnRestartDialogRequest()).toBe(false)
+  expect(getNativeChatRestartOffers().get('local')).toBeUndefined()
+  expect(requests).toEqual([])
+  expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
+})
+
+// Session ids are each host's own: a lost request to one machine marks only that machine's rows.
+it('marks a lost paired resume on that server only, never a same-id chat here', async () => {
+  pairStudio()
+  rpc.mockImplementation(async (target, method) => {
+    if (method === 'agentSession.restartResumable') {
+      return { sessions: offered, failed: [] }
+    }
+    if (target.kind === 'environment') {
+      throw new Error('response lost')
+    }
+    return { continued: [], sessions: offered, failed: [] }
+  })
+  await readNativeChatRestartMachine(LOCAL)
+  await readNativeChatRestartMachine(STUDIO)
+  await continueNativeChatRestartOffers([{ machine: `environment:${SERVER}`, sessionIds: ['a'] }])
+  expect(failedIds(`environment:${SERVER}`)).toEqual(['a'])
+  expect(vi.mocked(toast).mock.calls.map(([title]) => title)).toEqual([
+    '1 chat on studio-mac couldn’t be resumed'
+  ])
+  await readNativeChatRestartMachine(LOCAL)
+  expect(offerIds()).toEqual(['a', 'b'])
+  expect(failedIds()).toEqual([])
+})
+
+// Re-paired or forgotten, the server's marks go with its offers: a later pairing starts clean.
+it('ends a server’s marks when the desktop forgets it', async () => {
+  pairStudio()
+  rpc.mockImplementation(async (_target, method) => {
+    if (method === 'agentSession.restartResumable') {
+      return { sessions: offered, failed: [] }
+    }
+    throw new Error('response lost')
+  })
+  await readNativeChatRestartMachine(STUDIO)
+  await continueNativeChatRestartOffers([{ machine: `environment:${SERVER}`, sessionIds: ['a'] }])
+  expect(failedIds(`environment:${SERVER}`)).toEqual(['a'])
+  forgetNativeChatRestartMachine(`environment:${SERVER}`)
+  await readNativeChatRestartMachine(STUDIO)
+  expect(offerIds(`environment:${SERVER}`)).toEqual(['a', 'b'])
+  expect(failedIds(`environment:${SERVER}`)).toEqual([])
+})
+
+// The host reserved the chats and carries on with them, but the answer never came back: the reserved
+// chats leave its list, so nothing may count them as failed or drop them. One toast still says so.
+it('counts a paired resume whose answer was lost as unconfirmed once the server stops listing it', async () => {
+  pairStudio()
+  let reserved = false
+  rpc.mockImplementation(async (_target, method) => {
+    if (method === 'agentSession.restartResumable') {
+      return { sessions: reserved ? [] : offered, failed: [] }
+    }
+    reserved = true
+    throw Object.assign(new Error('Timed out waiting for runtime response'), {
+      code: 'runtime_timeout'
+    })
+  })
+  await readNativeChatRestartMachine(STUDIO)
+  await continueNativeChatRestartOffers([
+    { machine: `environment:${SERVER}`, sessionIds: ['a', 'b'] }
+  ])
+  expect(vi.mocked(toast).mock.calls.map(([title]) => title)).toEqual([
+    'Couldn’t confirm 2 chats on studio-mac were resumed'
+  ])
+  expect(lastToastShow()).toBeDefined()
+})
+
+// The user's click is never lost to bookkeeping: a server out of contact opens on its last listing,
+// without a read that would hold the dialog back until it timed out.
+it('opens a disconnected server’s last listing from Show without reading it', async () => {
+  pairStudio()
+  rpc.mockResolvedValue({ sessions: offered, failed: [] })
+  await readNativeChatRestartMachine(STUDIO)
+  useAppStore.setState({ runtimeStatusByEnvironmentId: new Map() })
+  const reads = rpc.mock.calls.length
+  await reopenNativeChatRestartOffer([`environment:${SERVER}`])
+  expect(rpc.mock.calls).toHaveLength(reads)
+  expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: `environment:${SERVER}` })
+})
+
+it('opens a connected server’s last listing when its re-read fails', async () => {
+  pairStudio()
+  rpc.mockResolvedValueOnce({ sessions: offered, failed: [] })
+  await readNativeChatRestartMachine(STUDIO)
+  rpc.mockRejectedValue(new Error('host unreachable'))
+  const requests = recordDialogRequests()
+  await reopenNativeChatRestartOffer([`environment:${SERVER}`])
+  expect(rpc.mock.calls.at(-1)?.[1]).toBe('agentSession.restartResumable')
+  expect(requests).toEqual([{ focus: `environment:${SERVER}` }])
+})
+
+it('opens nothing for a connected server whose re-read lists nothing', async () => {
+  pairStudio()
+  rpc.mockResolvedValueOnce({ sessions: offered, failed: [] })
+  await readNativeChatRestartMachine(STUDIO)
+  rpc.mockResolvedValue({ sessions: [], failed: [] })
+  const requests = recordDialogRequests()
+  await reopenNativeChatRestartOffer([`environment:${SERVER}`])
+  expect(requests).toEqual([])
+})
+
+// The server took the request, then the link dropped: neither the answer nor a re-read came back.
+// It may be continuing every chat, so none is reported as failed, which would invite a second send.
+it('counts a paired resume as unconfirmed when its answer and the re-read are both lost', async () => {
+  pairStudio()
+  let down = false
+  rpc.mockImplementation(async (_target, method) => {
+    if (method === 'agentSession.restartResumable' && !down) {
+      return { sessions: offered, failed: [] }
+    }
+    down = true
+    throw new Error('Remote runtime connection closed')
+  })
+  await readNativeChatRestartMachine(STUDIO)
+  await continueNativeChatRestartOffers([
+    { machine: `environment:${SERVER}`, sessionIds: ['a', 'b'] }
+  ])
+  expect(vi.mocked(toast).mock.calls.map(([title]) => title)).toEqual([
+    'Couldn’t confirm 2 chats on studio-mac were resumed'
+  ])
+  // The last listing still names them, so Show has something to open.
+  expect(lastToastShow()).toBeDefined()
+})
+
+it('offers no Show for a lost paired resume once nothing of that server is listed', async () => {
+  pairStudio()
+  rpc.mockResolvedValueOnce({ sessions: offered, failed: [] })
+  await readNativeChatRestartMachine(STUDIO)
+  rpc.mockImplementation(async () => {
+    // Re-paired while the call was out: the old pairing's listing is gone with it.
+    forgetNativeChatRestartMachine(`environment:${SERVER}`)
+    throw new Error('Remote runtime connection closed')
+  })
+  await continueNativeChatRestartOffers([{ machine: `environment:${SERVER}`, sessionIds: ['a'] }])
+  expect(vi.mocked(toast).mock.calls.map(([title]) => title)).toEqual([
+    'Couldn’t confirm 1 chat on studio-mac was resumed'
+  ])
+  expect(lastToastShow()).toBeUndefined()
+})
+
+/** Transport up, but the server's runtime did not answer its status probe. */
+function studioRuntimeUnavailable(): void {
+  const entry = useAppStore.getState().runtimeStatusByEnvironmentId.get(SERVER)!
+  useAppStore.setState({
+    runtimeStatusByEnvironmentId: new Map([
+      [SERVER, { ...entry, snapshot: { ...entry.snapshot!, verification: 'unavailable' } }]
+    ])
+  })
+}
+
+it('opens at once on the last listing of a server whose runtime is not answering', async () => {
+  pairStudio()
+  rpc.mockResolvedValueOnce({ sessions: offered, failed: [] })
+  await readNativeChatRestartMachine(STUDIO)
+  studioRuntimeUnavailable()
+  const reads = rpc.mock.calls.length
+  await reopenNativeChatRestartOffer([`environment:${SERVER}`])
+  expect(rpc.mock.calls).toHaveLength(reads)
+  expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: `environment:${SERVER}` })
+})
+
+// A click is never held for long by a slow server: past the budget the dialog opens on the last
+// listing, and the late answer lands in it like any other read, keeping the same opening.
+it('opens on the last listing once a connected server’s read outlasts its budget', async () => {
+  vi.useFakeTimers()
+  try {
+    pairStudio()
+    rpc.mockResolvedValueOnce({ sessions: offered, failed: [] })
+    await readNativeChatRestartMachine(STUDIO)
+    let answer: (value: unknown) => void = () => {}
+    rpc.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          answer = resolve
+        })
+    )
+    const opening = reopenNativeChatRestartOffer([`environment:${SERVER}`])
+    await vi.advanceTimersByTimeAsync(1_000)
+    expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
+    await vi.advanceTimersByTimeAsync(500)
+    await opening
+    const opened = getNativeChatResumeOnRestartDialogRequest()
+    expect(opened).toEqual({ focus: `environment:${SERVER}` })
+    answer({ sessions: [offered[1]!], failed: [] })
+    await vi.advanceTimersByTimeAsync(0)
+    expect(offerIds(`environment:${SERVER}`)).toEqual(['b'])
+    expect(getNativeChatResumeOnRestartDialogRequest()).toBe(opened)
+  } finally {
+    vi.useRealTimers()
+  }
 })
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-store.ts b/src/renderer/src/components/native-chat-resume-on-restart-store.ts
index 9111eae70dbe..391c6604b7a7 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-store.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-store.ts
@@ -1,69 +1,103 @@
-import { useEffect, useSyncExternalStore } from 'react'
-import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
+import { useSyncExternalStore } from 'react'
 import {
-  getStructuredAgentSessionStatusFeed,
-  type StructuredAgentSessionStatusFeedOwner
-} from '@/runtime/structured-agent-session-status-feed'
-import type { AgentSessionStatusSummary } from '../../../shared/agent-session-wire'
-import { useAppStore } from '../store'
-import { markNativeChatLaunchResumeDecided } from './native-chat-launch-resume-decision'
+  callStructuredAgentSession,
+  pairedRestartOffersSupport
+} from '@/runtime/structured-agent-session-client'
+import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
 import {
-  announceRestartResults,
-  type RestartContinuationOutcome
-} from './native-chat-restart-action-notifications'
+  failedFrom,
+  hostCannotOffer,
+  type HostOfferPayload
+} from './native-chat-restart-offer-payload'
+import { consumeNativeChatResumeOnRestartDialogRequest } from './native-chat-resume-on-restart-dialog'
 import {
-  allResumeSessionIds,
-  type ResumeCandidate,
-  type ResumeFailure
-} from './native-chat-resume-on-restart-grouping'
+  projectRestartMachineRows,
+  restartMachineKey,
+  restartMachineTarget,
+  type RestartMachineKey
+} from './native-chat-restart-machines'
 import {
+  currentRestartMachineFence,
+  restartMachineCallFence,
+  sameRestartMachineFence,
+  type RestartMachineFence
+} from './native-chat-restart-machine-fence'
+import {
+  releaseOfferedChatWatches,
+  syncOfferedChatWatch
+} from './native-chat-restart-offer-activity-watch'
+import {
+  _resetUnsentResumes,
   forgetUnsentResumes,
-  markUnsentResumes,
   withUnsentResumes
 } from './native-chat-resume-unsent-requests'
-import {
-  consumeNativeChatResumeOnRestartDialogRequest,
-  requestNativeChatResumeOnRestartDialog
-} from './native-chat-resume-on-restart-dialog'
 
 /**
- * Which interrupted chats the host is still offering to resume, and every action that moves that.
+ * Which interrupted chats each machine is still offering to resume, and every action that moves
+ * that. A machine is this computer or one paired server; each answers for its own chats.
  *
- * The offer is the HOST's answer, shared by the dialog and the status bar rather than held by
- * whichever rendered first. Opening a chat is intentionally read-only; only an explicit action
- * changes the durable offer.
+ * The offer is each HOST's answer, shared by the dialog, the status bar and the reconnect toast
+ * rather than held by whichever rendered first. Opening a chat is intentionally read-only; only an
+ * explicit action changes the durable offer.
  *
- * What stays on this side is the user's own facts: the snooze, and the preference that decides
- * whether the launch asks at all.
+ * One publication rule per machine: every request (read, continue, dismiss) takes a ticket and the
+ * machine's pairing when it is issued, and its answer is published only if no later-issued request
+ * has published since and the machine is still paired the same way.
  */
 
-// Structured sessions run on the machine hosting the runtime; both launch resolvers refuse anything
-// else, so there is no remote target to aim this at.
-const LOCAL = { kind: 'local' } as const
-
-export type NativeChatRestartOffer = Readonly<{
+export type NativeChatRestartMachineOffer = Readonly<{
+  machine: RestartMachineKey
+  target: RuntimeClientTarget
+  /** Host ids already in this desktop's terms (a paired server's `local` is its runtime host). */
   candidates: readonly ResumeCandidate[]
   /** Acted-on offers whose agent did not carry on, as the host still records them. */
   failed: readonly ResumeFailure[]
+  /** The pairing this answer came from; every action on it is sent with it. */
+  fence: RestartMachineFence
   /** Stamped when the list arrived. Row ages read against this rather than a render-time
    *  `Date.now()`, so they stay stable across re-renders and the render stays pure. */
   listedAt: number
 }>
 
-const EMPTY: NativeChatRestartOffer = { candidates: [], failed: [], listedAt: 0 }
-let offer: NativeChatRestartOffer = EMPTY
-let launch: Promise<void> | undefined
-/** Continue and dismiss calls, begun and settled. Each ends by publishing the host's answer, which
- *  a re-read that raced it must neither pre-empt nor undo. */
-let actionsBegun = 0
-let actionsSettled = 0
-/** The chats each in-flight continue call names, so the status bar can report the resume after
- *  the dialog that started it has closed. Held only for the call's lifetime; never persisted. */
-const resumeBatches = new Set<readonly string[]>()
-const NOTHING_RESUMING: readonly string[] = []
-let resuming: readonly string[] = NOTHING_RESUMING
+export type NativeChatRestartOffers = ReadonlyMap<RestartMachineKey, NativeChatRestartMachineOffer>
+
+/** `unavailable` is not an answer: the machine keeps the last one it gave. `unsupported` is an
+ *  older or chat-less host that has no offers to give. `published` says whether this answer is the
+ *  one the machine now shows; only that one may decide anything. */
+export type RestartMachineRead =
+  | {
+      kind: 'answered'
+      candidates: readonly ResumeCandidate[]
+      failed: readonly ResumeFailure[]
+      published: boolean
+    }
+  | { kind: 'unsupported' }
+  | { kind: 'unavailable' }
+
+/** A request's claim on publishing its answer: issue order, and the pairing it was sent under. */
+export type RestartMachineTicket = Readonly<{
+  machine: RestartMachineKey
+  target: RuntimeClientTarget
+  ticket: number
+  fence: RestartMachineFence
+}>
+
+const NO_OFFERS: NativeChatRestartOffers = new Map()
+let offers: NativeChatRestartOffers = NO_OFFERS
+const ticketsIssued = new Map<RestartMachineKey, number>()
+const ticketsPublished = new Map<RestartMachineKey, number>()
+/** Continue and dismiss calls in flight per machine; a chat-activity re-read waits for them. */
+const actionsInFlight = new Map<RestartMachineKey, number>()
+/** The chats each in-flight continue call names, per machine, so the status bar can report the
+ *  resume after the dialog that started it has closed. Held only for the call's lifetime. */
+const resumeBatches = new Set<{ machine: RestartMachineKey; sessionIds: readonly string[] }>()
+const NOTHING_RESUMING: ReadonlyMap<RestartMachineKey, readonly string[]> = new Map()
+let resuming = NOTHING_RESUMING
 const listeners = new Set<() => void>()
-const LAUNCH_READ_RETRY_DELAYS_MS = [100, 250, 500] as const
+let readListener:
+  | ((target: RuntimeClientTarget, candidates: readonly ResumeCandidate[]) => void)
+  | null = null
 
 function emit(): void {
   for (const listener of listeners) {
@@ -71,359 +105,253 @@ function emit(): void {
   }
 }
 
+function hasRows(offer: NativeChatRestartMachineOffer | undefined): boolean {
+  return Boolean(offer && (offer.candidates.length > 0 || offer.failed.length > 0))
+}
+
 /** The snapshot object is replaced HERE and nowhere else — never during a render — so every
  *  `useSyncExternalStore` reader sees the same reference until a host answer or a user action
- *  actually moves the offer. */
-function publish(next: NativeChatRestartOffer): void {
-  offer = next
-  syncOfferedChatWatch()
+ *  actually moves an offer. */
+function publish(machine: RestartMachineKey, next: NativeChatRestartMachineOffer | null): void {
+  const updated = new Map(offers)
+  if (next && hasRows(next)) {
+    updated.set(machine, next)
+  } else {
+    updated.delete(machine)
+  }
+  offers = updated.size === 0 ? NO_OFFERS : updated
+  syncOfferedChatWatch(machine, offers.get(machine), refreshAfterOfferedChatActivity)
   emit()
-}
-
-/** A confirmed host answer. One with nothing left also retires any open request for the dialog,
- *  which has nothing to show; a failed read only hides rows, so it keeps the request. */
-function publishAnswer(answer: NativeChatRestartOffer): void {
-  const next = withUnsentResumes(answer)
-  publish(next)
-  if (next.candidates.length === 0 && next.failed.length === 0) {
+  if (offers.size === 0) {
+    // With nothing left on any machine, an open request for the dialog has nothing to show.
     consumeNativeChatResumeOnRestartDialogRequest()
   }
 }
 
-function syncResuming(): void {
-  resuming = resumeBatches.size === 0 ? NOTHING_RESUMING : [...new Set([...resumeBatches].flat())]
-  emit()
-}
-
-/**
- * Re-reads the host once an offered or failed chat shows new activity, so a message the user sent
- * there, or its agent starting, retires its entry here too. The host stays the judge; this only
- * asks again.
- *
- * Held only while something is offered or failed. Keyed on status and prompt rather than every
- * summary, so an agent streaming in such a chat costs one re-read, not one per tool call.
- */
-const OFFERED_CHAT_REFRESH_DELAY_MS = 500
-let offeredChatWatch: {
-  feed: StructuredAgentSessionStatusFeedOwner
-  seen: Map<string, string>
-  release: () => void
-} | null = null
-let offeredChatRefresh: ReturnType<typeof setTimeout> | null = null
-
-function offeredChatIds(): Set<string> {
-  return new Set([...offer.candidates, ...offer.failed].map((entry) => entry.sessionId))
+export function issueNativeChatRestartTicket(target: RuntimeClientTarget): RestartMachineTicket {
+  const machine = restartMachineKey(target)
+  const ticket = (ticketsIssued.get(machine) ?? 0) + 1
+  ticketsIssued.set(machine, ticket)
+  return { machine, target, ticket, fence: currentRestartMachineFence(target) }
 }
 
-function offeredChatActivityKey(summary: AgentSessionStatusSummary): string {
-  return `${summary.status ?? ''}\u0000${summary.latestPrompt}`
+/** Whether the machine is still paired the way the request was sent. */
+export function restartTicketPairingCurrent(ticket: RestartMachineTicket): boolean {
+  return sameRestartMachineFence(ticket.fence, currentRestartMachineFence(ticket.target))
 }
 
-function syncOfferedChatWatch(): void {
-  const offeredIds = offeredChatIds()
-  if (offeredIds.size === 0) {
-    releaseOfferedChatWatch()
-    return
-  }
-  if (!offeredChatWatch) {
-    const feed = getStructuredAgentSessionStatusFeed(LOCAL)
-    const unsubscribe = feed.subscribe(noticeOfferedChatActivity)
-    const deactivate = feed.activate()
-    offeredChatWatch = {
-      feed,
-      seen: new Map(),
-      release: () => {
-        unsubscribe()
-        deactivate()
-      }
-    }
+/** Publishes under the one rule; false when a later request already published or the pairing moved. */
+function publishUnder(
+  ticket: RestartMachineTicket,
+  rows: { candidates: readonly ResumeCandidate[]; failed: readonly ResumeFailure[] } | null
+): boolean {
+  if (
+    ticket.ticket <= (ticketsPublished.get(ticket.machine) ?? 0) ||
+    !restartTicketPairingCurrent(ticket)
+  ) {
+    return false
   }
-  const { feed, seen } = offeredChatWatch
-  for (const sessionId of seen.keys()) {
-    if (!offeredIds.has(sessionId)) {
-      seen.delete(sessionId)
-    }
+  ticketsPublished.set(ticket.machine, ticket.ticket)
+  if (!rows) {
+    forgetUnsentResumes(ticket.machine, undefined)
   }
-  // What the feed already holds is what this listing answered.
-  for (const sessionId of offeredIds) {
-    const summary = feed.getSnapshot().get(sessionId)
-    if (summary && !seen.has(sessionId)) {
-      seen.set(sessionId, offeredChatActivityKey(summary))
+  const shown = rows && withUnsentResumes(ticket.machine, rows)
+  publish(
+    ticket.machine,
+    shown && {
+      machine: ticket.machine,
+      target: ticket.target,
+      fence: ticket.fence,
+      candidates: projectRestartMachineRows(ticket.target, shown.candidates),
+      failed: projectRestartMachineRows(ticket.target, shown.failed),
+      listedAt: Date.now()
     }
-  }
+  )
+  return true
 }
 
-function noticeOfferedChatActivity(): void {
-  if (!offeredChatWatch) {
-    return
-  }
-  const { feed, seen } = offeredChatWatch
-  const snapshot = feed.getSnapshot()
-  let changed = false
-  for (const sessionId of offeredChatIds()) {
-    const summary = snapshot.get(sessionId)
-    if (!summary) {
-      continue
-    }
-    const key = offeredChatActivityKey(summary)
-    const previous = seen.get(sessionId)
-    if (previous !== key) {
-      seen.set(sessionId, key)
-      // A first sighting is news only if newer than the list; a change to a known chat always is,
-      // since the host may have answered the list just before the change was delivered here.
-      changed ||= previous !== undefined || summary.updatedAt > offer.listedAt
-    }
-  }
-  if (changed && offeredChatRefresh === null) {
-    offeredChatRefresh = setTimeout(() => {
-      offeredChatRefresh = null
-      if (actionsBegun === actionsSettled) {
-        const issued = actionsBegun
-        void readNativeChatRestartOffer(() => actionsBegun === issued)
-      }
-    }, OFFERED_CHAT_REFRESH_DELAY_MS)
+/** A host answer to an action; false when it was superseded and the caller should read again. */
+export function publishNativeChatRestartAnswer(
+  ticket: RestartMachineTicket,
+  candidates: readonly ResumeCandidate[],
+  failed: readonly ResumeFailure[]
+): boolean {
+  return publishUnder(ticket, { candidates, failed })
+}
+
+function syncResuming(): void {
+  const byMachine = new Map<RestartMachineKey, string[]>()
+  for (const batch of resumeBatches) {
+    const ids = byMachine.get(batch.machine) ?? []
+    byMachine.set(batch.machine, [...new Set([...ids, ...batch.sessionIds])])
   }
+  resuming = byMachine.size === 0 ? NOTHING_RESUMING : byMachine
+  emit()
 }
 
-function releaseOfferedChatWatch(): void {
-  if (offeredChatRefresh !== null) {
-    clearTimeout(offeredChatRefresh)
-    offeredChatRefresh = null
+function refreshAfterOfferedChatActivity(machine: RestartMachineKey): void {
+  // An action in flight ends with the host's answer, or a read of its own if a later one won.
+  if ((actionsInFlight.get(machine) ?? 0) === 0) {
+    void readNativeChatRestartMachine(restartMachineTarget(machine))
   }
-  offeredChatWatch?.release()
-  offeredChatWatch = null
 }
 
-export function getNativeChatRestartOffer(): NativeChatRestartOffer {
-  return offer
+export function getNativeChatRestartOffers(): NativeChatRestartOffers {
+  return offers
 }
 
-export function getNativeChatRestartResuming(): readonly string[] {
+export function getNativeChatRestartResuming(): ReadonlyMap<RestartMachineKey, readonly string[]> {
   return resuming
 }
 
-function subscribe(listener: () => void): () => void {
+export function subscribeNativeChatRestartOffers(listener: () => void): () => void {
   listeners.add(listener)
   return () => {
     listeners.delete(listener)
   }
 }
 
-/**
- * Re-reads the host's answer.
- *
- * Called before the dialog is reopened, so a count can never name a chat the host would now refuse.
- */
-type HostOfferRead = {
-  candidates: readonly ResumeCandidate[]
-  failed: readonly ResumeFailure[]
-  available: boolean
+/** Told of every read whose answer was published, so decisions follow the answer itself. */
+export function setNativeChatRestartReadListener(
+  listener: ((target: RuntimeClientTarget, candidates: readonly ResumeCandidate[]) => void) | null
+): void {
+  readListener = listener
 }
 
-/** The host's answer as this side understands it. `failed` is optional on the wire: an older host
- *  never sends it, and its absence means nothing to show, not an invalid answer. */
-type HostOfferPayload = { sessions?: unknown; failed?: unknown }
-
-function failedFrom(payload: HostOfferPayload): ResumeFailure[] {
-  // SAFETY: the host is the single writer of this shape; a malformed row is a host bug, not input.
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: see above.
-  return Array.isArray(payload.failed) ? (payload.failed as ResumeFailure[]) : []
+async function readPairedSupport(
+  ticket: RestartMachineTicket,
+  environmentId: string
+): Promise<RestartMachineRead | null> {
+  // Asking a paired host that cannot answer without building its chat host would open its journal
+  // on a server that may never have run a chat; such a host is never asked.
+  const support = await pairedRestartOffersSupport(environmentId)
+  if (!restartTicketPairingCurrent(ticket) || support === 'unknown') {
+    // Re-paired while probing, or the probe failed: nothing is known about this server.
+    return { kind: 'unavailable' }
+  }
+  if (support === 'unsupported') {
+    // A server rolled back to a build without it keeps nothing listed that it can no longer act on.
+    publishUnder(ticket, null)
+    return { kind: 'unsupported' }
+  }
+  return null
 }
 
-async function readNativeChatRestartOffer(current = () => true): Promise<HostOfferRead> {
+/**
+ * Re-reads one machine's answer.
+ *
+ * A failed read is not an answer and leaves that machine's last answer in place: loss of contact
+ * is never evidence the offer is gone, and an action re-derives eligibility on the host anyway.
+ */
+export async function readNativeChatRestartMachine(
+  target: RuntimeClientTarget
+): Promise<RestartMachineRead> {
+  // Taken before any await, so the probe and the read both answer for the pairing they asked.
+  const ticket = issueNativeChatRestartTicket(target)
+  if (target.kind === 'environment') {
+    const refused = await readPairedSupport(ticket, target.environmentId)
+    if (refused) {
+      return refused
+    }
+  }
+  const callFence = restartMachineCallFence(target, ticket.fence)
   try {
-    const offered = await callStructuredAgentSession<HostOfferPayload>(
-      LOCAL,
-      'agentSession.restartResumable'
-    )
+    const offered = await (callFence
+      ? callStructuredAgentSession<HostOfferPayload>(
+          target,
+          'agentSession.restartResumable',
+          undefined,
+          callFence
+        )
+      : callStructuredAgentSession<HostOfferPayload>(target, 'agentSession.restartResumable'))
     if (!Array.isArray(offered.sessions)) {
       throw new Error('agent_session_restart_offer_invalid')
     }
+    const candidates: ResumeCandidate[] = offered.sessions
     const failed = failedFrom(offered)
-    if (current()) {
-      publishAnswer({ candidates: offered.sessions, failed, listedAt: Date.now() })
+    const published = publishUnder(ticket, { candidates, failed })
+    const projected = projectRestartMachineRows(target, candidates)
+    if (published) {
+      readListener?.(target, projected)
     }
-    return { candidates: offered.sessions, failed, available: true }
-  } catch {
-    // A failed read is not an answer. Hide the last snapshot so a modal can never present a
-    // candidate the host has not confirmed; the durable record remains and a later refresh can
-    // restore it.
-    if (current()) {
-      publish({ ...EMPTY, listedAt: Date.now() })
+    return {
+      kind: 'answered',
+      candidates: projected,
+      failed: projectRestartMachineRows(target, failed),
+      published
     }
-    return { candidates: [], failed: [], available: false }
+  } catch (error) {
+    if (hostCannotOffer(error)) {
+      publishUnder(ticket, null)
+      return { kind: 'unsupported' }
+    }
+    return { kind: 'unavailable' }
   }
 }
 
-export async function refreshNativeChatRestartOffer(): Promise<void> {
-  await readNativeChatRestartOffer()
-}
-
-/** The status bar entry and a toast's Show: re-read, then open only over rows, since the dialog
- *  draws nothing without them. Opening a chat from it is read-only and keeps the offer. */
-export async function reopenNativeChatRestartOffer(): Promise<void> {
-  // Mid-resume the host's answer is already on its way; a re-read racing it could undo it.
-  if (resuming.length === 0) {
-    await readNativeChatRestartOffer()
-  }
-  if (resuming.length > 0 || offer.candidates.length > 0 || offer.failed.length > 0) {
-    requestNativeChatResumeOnRestartDialog()
+/** A machine this desktop no longer pairs with: its offers are not this desktop's to show, and no
+ *  answer to a request already in flight may bring them back. */
+export function forgetNativeChatRestartMachine(machine: RestartMachineKey): void {
+  const ticket = issueNativeChatRestartTicket(restartMachineTarget(machine))
+  ticketsPublished.set(machine, ticket.ticket)
+  forgetUnsentResumes(machine, undefined)
+  if (offers.has(machine)) {
+    publish(machine, null)
   }
 }
 
-/**
- * Reattach the offered chats, ask each agent to carry on, then replace the offer with the host's
- * authoritative remaining list. This keeps the modal and status bar synchronized after every
- * action, even when the dialog's snapshot became stale while it was open.
- *
- * `sessionIds` is the dialog's selection. An opted-in launch names nothing, so the host acts on
- * whatever it still offers rather than on a list this side captured a moment earlier, and passes
- * `reported` instead: the chats the status bar shows as resuming.
- *
- * Ends in one toast saying what it did across those chats, whether a click or an opted-in launch
- * started it; each chat's note stays the record. Never rejects; a lost answer is followed by a
- * re-read, never a retry. The chats a rejected request named and the host still offers show as
- * failed, with Retry.
- */
-export async function continueNativeChatRestartOffer(
-  sessionIds: readonly string[] | undefined,
-  reported: readonly string[] = sessionIds ?? []
-): Promise<void> {
-  actionsBegun += 1
-  forgetUnsentResumes(sessionIds)
-  const batch = [...reported]
-  let outcome: Parameters<typeof announceRestartResults>
-  resumeBatches.add(batch)
-  syncResuming()
-  // `resuming` now names the chats, so the launch's one resume decision is made.
-  markNativeChatLaunchResumeDecided()
-  try {
-    const result = await callStructuredAgentSession<
-      HostOfferPayload & { continued?: RestartContinuationOutcome[] }
-    >(LOCAL, 'agentSession.restartContinue', sessionIds ? { sessionIds } : {})
-    const listed = Array.isArray(result.failed) ? failedFrom(result) : undefined
-    if (Array.isArray(result.sessions)) {
-      publishAnswer({ candidates: result.sessions, failed: listed ?? [], listedAt: Date.now() })
-    } else {
-      await refreshNativeChatRestartOffer()
-    }
-    outcome = [batch, result.continued, listed, reopenNativeChatRestartOffer]
-  } catch (error) {
-    // The row's reason is this side's own code, so the real error is kept in the log.
-    console.warn('[native-chat-resume] resume request failed before reaching the chats', error)
-    markUnsentResumes(batch, Date.now())
-    const read = await readNativeChatRestartOffer()
-    // Nothing reached the chats, so each is a failure of this resume as the list now shows it.
-    const listed = read.available ? offer.failed : undefined
-    outcome = [batch, [], listed, reopenNativeChatRestartOffer]
-  } finally {
-    actionsSettled += 1
-    resumeBatches.delete(batch)
+/** Bookkeeping for an action (continue or dismiss) on one machine: its ticket, and a resume's chats
+ *  shown as in flight until the host answers. Used by the action module. */
+export function beginNativeChatRestartAction(
+  target: RuntimeClientTarget,
+  resumingIds?: readonly string[]
+): { ticket: RestartMachineTicket; settle: () => void } {
+  const ticket = issueNativeChatRestartTicket(target)
+  actionsInFlight.set(ticket.machine, (actionsInFlight.get(ticket.machine) ?? 0) + 1)
+  const batch = resumingIds ? { machine: ticket.machine, sessionIds: [...resumingIds] } : null
+  if (batch) {
+    resumeBatches.add(batch)
     syncResuming()
   }
-  announceRestartResults(...outcome)
-}
-
-/**
- * Turning the offer down for good, which explicitly deletes the pending durable records.
- *
- * A failed write or unreachable host leaves the durable record untouched. The re-read puts it back
- * in the status bar; if that read fails too, the entry stays hidden until the next launch reads it.
- */
-export async function dismissNativeChatRestartOffer(sessionIds?: readonly string[]): Promise<void> {
-  actionsBegun += 1
-  try {
-    const result = await callStructuredAgentSession<HostOfferPayload>(
-      LOCAL,
-      'agentSession.restartResumableDismiss',
-      // Named only for rows the dialog lists as failed: the host's own failures, or chats this side
-      // marked after a lost resume request, which the host still lists as offers. The host is this
-      // build, and it forgets named records of any state.
-      sessionIds ? { sessionIds: [...sessionIds] } : {}
-    )
-    // Only a dismissal the host took ends the mark; a failed one leaves the chat shown as failed.
-    forgetUnsentResumes(sessionIds)
-    if (Array.isArray(result.sessions)) {
-      publishAnswer({
-        candidates: result.sessions,
-        failed: failedFrom(result),
-        listedAt: Date.now()
-      })
-    } else {
-      await refreshNativeChatRestartOffer()
-    }
-  } catch {
-    await refreshNativeChatRestartOffer()
-  } finally {
-    actionsSettled += 1
-  }
-}
-
-/**
- * This launch's single read of the offer, and the one decision the preference makes: ask, or
- * resume without asking.
- *
- * "Resume automatically" runs the identical call the button runs — reattach AND ask each agent to
- * carry on. Opening a chat remains a separate, read-only inspection action.
- *
- * Runs once however many surfaces mount, so the count and the dialog describe the same answer and
- * an opted-in launch cannot dispatch twice.
- */
-async function loadLaunchOffer(): Promise<void> {
-  // The preference belongs to this launch's request; later saves cannot dispatch another.
-  const autoResume = useAppStore.getState().settings?.nativeChatResumeWorkOnRestart === true
-  let read = await readNativeChatRestartOffer()
-  // Host startup can race the renderer. Retry only failed reads, never a confirmed empty result,
-  // so a transient startup gap does not strand a durable offer or add steady-state polling.
-  for (const delay of LAUNCH_READ_RETRY_DELAYS_MS) {
-    if (read.available) {
-      break
+  return {
+    ticket,
+    settle: () => {
+      actionsInFlight.set(ticket.machine, (actionsInFlight.get(ticket.machine) ?? 1) - 1)
+      if (batch) {
+        resumeBatches.delete(batch)
+        syncResuming()
+      }
     }
-    await new Promise<void>((resolve) => setTimeout(resolve, delay))
-    read = await readNativeChatRestartOffer()
-  }
-  const offered = read.candidates
-  // Failures left from an earlier launch are the status bar's to show; only a fresh offer asks.
-  if (offered.length === 0) {
-    return
   }
-  if (!autoResume) {
-    requestNativeChatResumeOnRestartDialog()
-    return
-  }
-  await continueNativeChatRestartOffer(undefined, allResumeSessionIds(offered))
 }
 
-/**
- * The offer, fetching it on first use.
- *
- * `enabled` is a gate, not a trigger: settings arrive after the first render, so the fetch waits
- * for the flag rather than being lost when it was still undefined.
- */
-export function useNativeChatRestartOffer(enabled: boolean): NativeChatRestartOffer {
-  useEffect(() => {
-    if (enabled) {
-      // Fetched after mount, never awaited by startup: the workspace is usable first.
-      launch ??= loadLaunchOffer().finally(markNativeChatLaunchResumeDecided)
-    }
-  }, [enabled])
-  return useSyncExternalStore(subscribe, getNativeChatRestartOffer, getNativeChatRestartOffer)
+export function useNativeChatRestartOffers(): NativeChatRestartOffers {
+  return useSyncExternalStore(
+    subscribeNativeChatRestartOffers,
+    getNativeChatRestartOffers,
+    getNativeChatRestartOffers
+  )
 }
 
-/** The chats a resume is carrying on right now, whichever surface started it. */
-export function useNativeChatRestartResuming(): readonly string[] {
-  return useSyncExternalStore(subscribe, getNativeChatRestartResuming, getNativeChatRestartResuming)
+/** The chats a resume is carrying on right now, per machine, whichever surface started it. */
+export function useNativeChatRestartResuming(): ReadonlyMap<RestartMachineKey, readonly string[]> {
+  return useSyncExternalStore(
+    subscribeNativeChatRestartOffers,
+    getNativeChatRestartResuming,
+    getNativeChatRestartResuming
+  )
 }
 
 /** @internal - tests need a clean module between cases. */
-export function _resetNativeChatRestartOffer(): void {
-  releaseOfferedChatWatch()
-  offer = EMPTY
-  forgetUnsentResumes(undefined)
+export function _resetNativeChatRestartOfferState(): void {
+  releaseOfferedChatWatches()
+  offers = NO_OFFERS
+  _resetUnsentResumes()
   resumeBatches.clear()
   resuming = NOTHING_RESUMING
-  actionsBegun = 0
-  actionsSettled = 0
-  launch = undefined
+  actionsInFlight.clear()
+  ticketsIssued.clear()
+  ticketsPublished.clear()
   listeners.clear()
+  readListener = null
 }
diff --git a/src/renderer/src/components/native-chat-resume-ownership.test.ts b/src/renderer/src/components/native-chat-resume-ownership.test.ts
new file mode 100644
index 000000000000..52fb996256fe
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-ownership.test.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest'
+import { resumeCandidateOwnership, resumeOwnershipLabel } from './native-chat-resume-ownership'
+
+describe('whose interrupted chat this is', () => {
+  it('takes the host’s answer, and never reads a missing or unknown one as the user’s', () => {
+    expect(resumeCandidateOwnership({ origin: 'own' })).toBe('own')
+    expect(resumeCandidateOwnership({ origin: 'server-made' })).toBe('server-made')
+    expect(resumeCandidateOwnership({})).toBe('unknown')
+  })
+
+  it('labels every chat that does not start ticked, and none that does', () => {
+    expect(resumeOwnershipLabel('own', 'studio-mac')).toBeUndefined()
+    expect(resumeOwnershipLabel('automation', 'studio-mac')).toBe('Automation')
+    expect(resumeOwnershipLabel('other-device', 'studio-mac')).toBe('Another device')
+    expect(resumeOwnershipLabel('server-made', 'studio-mac')).toBe('Made on studio-mac')
+    expect(resumeOwnershipLabel('unknown', 'studio-mac')).toBe('Unknown origin')
+  })
+})
diff --git a/src/renderer/src/components/native-chat-resume-ownership.ts b/src/renderer/src/components/native-chat-resume-ownership.ts
new file mode 100644
index 000000000000..03c437fba152
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-ownership.ts
@@ -0,0 +1,52 @@
+import { translate } from '@/i18n/i18n'
+import {
+  parseRestartOfferOrigin,
+  type RestartOfferOrigin
+} from '../../../shared/restart-offer-origin'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+
+/**
+ * Whose interrupted chat this is, as its host judged it for this desktop (see `restartOfferOrigin`):
+ * by workspace, with the sidebar's rule. Only `own` is ticked by default, announced by a reconnect
+ * toast, or continued without asking; every other answer is still listed, unticked, with where it
+ * came from. `unknown` is a host that sent no answer, which is never treated as the user's.
+ */
+export type ResumeWorkspaceOwnership = RestartOfferOrigin | 'unknown'
+
+export function resumeCandidateOwnership(
+  candidate: Pick<ResumeCandidate, 'origin'>
+): ResumeWorkspaceOwnership {
+  return parseRestartOfferOrigin(candidate.origin) ?? 'unknown'
+}
+
+/** The label beside a chat that does not start ticked; none for the user's own. */
+export function resumeOwnershipLabel(
+  ownership: ResumeWorkspaceOwnership,
+  machineName: string
+): string | undefined {
+  switch (ownership) {
+    case 'own':
+      return undefined
+    case 'automation':
+      return translate(
+        'auto.components.NativeChatResumeOnRestartModal.originAutomation',
+        'Automation'
+      )
+    case 'other-device':
+      return translate(
+        'auto.components.NativeChatResumeOnRestartModal.originOtherDevice',
+        'Another device'
+      )
+    case 'server-made':
+      return translate(
+        'auto.components.NativeChatResumeOnRestartModal.originServer',
+        'Made on {{value0}}',
+        { value0: machineName }
+      )
+    case 'unknown':
+      return translate(
+        'auto.components.NativeChatResumeOnRestartModal.originUnknown',
+        'Unknown origin'
+      )
+  }
+}
diff --git a/src/renderer/src/components/native-chat-resume-selection.ts b/src/renderer/src/components/native-chat-resume-selection.ts
new file mode 100644
index 000000000000..8dac4dbfb636
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-selection.ts
@@ -0,0 +1,86 @@
+import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
+import {
+  resumeFailureGuidance,
+  resumeFailureSelectable
+} from './native-chat-resume-failure-guidance'
+import type { ResumeWorkspaceOwnership } from './native-chat-resume-ownership'
+import type { RestartMachineKey } from './native-chat-restart-machines'
+
+/**
+ * Which offered chats the dialog has ticked, across machines.
+ *
+ * Tracked as the user's OVERRIDES over each row's default rather than as a selection, because each
+ * machine's list is its host's and arrives — and shrinks — under an open dialog; a stored selection
+ * would need re-seeding every time one changed. Keyed by machine and chat: two servers may hold
+ * chats under the same id.
+ */
+export type ResumeSelectionOverrides = ReadonlyMap<string, boolean>
+
+/** Ticks are keyed by the listing's identity, so a re-paired machine never inherits the old
+ *  pairing's ticks for a chat that happens to share an id. */
+export function resumeRowKey(identity: string, sessionId: string): string {
+  return `${identity}\u0000${sessionId}`
+}
+
+/** One machine's listing: the machine and the pairing it was read under. */
+export function restartListingIdentity(
+  machine: RestartMachineKey,
+  pairingRevision: number | undefined
+): string {
+  return `${machine}\u0000${pairingRevision ?? ''}`
+}
+
+/** Ticked by default: the user's own chat, unless it is a failure a retry cannot fix. */
+export function resumeRowSelectedByDefault(
+  ownership: ResumeWorkspaceOwnership,
+  failure: ResumeFailure | undefined
+): boolean {
+  if (ownership !== 'own') {
+    return false
+  }
+  if (!failure) {
+    return true
+  }
+  const guidance = resumeFailureGuidance(failure)
+  return guidance.primary === 'retry' || guidance.secondary === 'retry'
+}
+
+export type ResumeSelectionMachine = {
+  machine: RestartMachineKey
+  /** See `restartListingIdentity`. */
+  identity: string
+  rows: readonly ResumeCandidate[]
+  failureFor: (sessionId: string) => ResumeFailure | undefined
+  ownershipFor: (sessionId: string) => ResumeWorkspaceOwnership
+}
+
+/** The chats a tick can include on one machine; a failure the host marks unretryable never is. */
+export function selectableResumeRows(machine: ResumeSelectionMachine): string[] {
+  return machine.rows
+    .filter((row) => {
+      const failure = machine.failureFor(row.sessionId)
+      return !failure || resumeFailureSelectable(failure)
+    })
+    .map((row) => row.sessionId)
+}
+
+/** Derived from each host's own list, so an action can never name a chat its host did not list. */
+export function chosenResumeRows(
+  machine: ResumeSelectionMachine,
+  overrides: ResumeSelectionOverrides
+): string[] {
+  return selectableResumeRows(machine).filter(
+    (sessionId) =>
+      overrides.get(resumeRowKey(machine.identity, sessionId)) ??
+      resumeRowSelectedByDefault(machine.ownershipFor(sessionId), machine.failureFor(sessionId))
+  )
+}
+
+/** What Dismiss forgets on one machine, each chat named with the interruption it listed: only the
+ *  user's own. Any other chat ends when it moves on, when its tab is closed, or by its own row's
+ *  dismiss. */
+export function dismissedRows(machine: ResumeSelectionMachine): string[] {
+  return machine.rows
+    .filter((row) => machine.ownershipFor(row.sessionId) === 'own')
+    .map((row) => row.sessionId)
+}
diff --git a/src/renderer/src/components/native-chat-resume-unsent-requests.ts b/src/renderer/src/components/native-chat-resume-unsent-requests.ts
index 49eb0d5c816a..e60a6aec9e6d 100644
--- a/src/renderer/src/components/native-chat-resume-unsent-requests.ts
+++ b/src/renderer/src/components/native-chat-resume-unsent-requests.ts
@@ -1,40 +1,70 @@
 import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
+import type { RestartMachineKey } from './native-chat-restart-machines'
 
 // A resume request that failed before the host reserved anything leaves it nothing to record, so
-// its chats are shown failed from here: by id, when it failed. Each host answer re-derives it.
+// its chats are shown failed from here: by machine and id, when it failed. Session ids are each
+// host's own, so a mark only ever applies to the machine it was made for. Each host answer from
+// that machine re-derives it.
 
-const unsentResumes = new Map<string, number>()
+const unsentResumes = new Map<RestartMachineKey, Map<string, number>>()
 const UNSENT_RESUME_REASON = 'agent_session_restart_request_failed'
 
 type HostAnswer = { candidates: readonly ResumeCandidate[]; failed: readonly ResumeFailure[] }
 
-export function markUnsentResumes(sessionIds: readonly string[], failedAt: number): void {
-  sessionIds.forEach((sessionId) => unsentResumes.set(sessionId, failedAt))
+export function markUnsentResumes(
+  machine: RestartMachineKey,
+  sessionIds: readonly string[],
+  failedAt: number
+): void {
+  const marks = unsentResumes.get(machine) ?? new Map<string, number>()
+  sessionIds.forEach((sessionId) => marks.set(sessionId, failedAt))
+  unsentResumes.set(machine, marks)
 }
 
-/** Retry, Dismiss and a launch's own resume each settle the chats they name afresh. */
-export function forgetUnsentResumes(sessionIds: readonly string[] | undefined): void {
+/** Retry, Dismiss and a launch's own resume each settle the chats they name afresh; unnamed, the
+ *  machine's every mark ends (its offer was dismissed whole, or it was re-paired or forgotten). */
+export function forgetUnsentResumes(
+  machine: RestartMachineKey,
+  sessionIds: readonly string[] | undefined
+): void {
+  const marks = unsentResumes.get(machine)
+  if (!marks) {
+    return
+  }
   if (sessionIds === undefined) {
-    unsentResumes.clear()
+    unsentResumes.delete(machine)
     return
   }
-  sessionIds.forEach((sessionId) => unsentResumes.delete(sessionId))
+  sessionIds.forEach((sessionId) => marks.delete(sessionId))
+  if (marks.size === 0) {
+    unsentResumes.delete(machine)
+  }
 }
 
-/** The host's answer with each unsent resume's chat moved from its offers to its failures. A chat
- *  the host no longer offers drops its mark, so a host failure row is never shown beside it. */
-export function withUnsentResumes<T extends HostAnswer>(answer: T): T {
+/** @internal - tests need a clean module between cases. */
+export function _resetUnsentResumes(): void {
+  unsentResumes.clear()
+}
+
+/** The machine's answer with each unsent resume's chat moved from its offers to its failures. A
+ *  chat the host no longer offers drops its mark, so a host failure row is never shown beside it. */
+export function withUnsentResumes<T extends HostAnswer>(machine: RestartMachineKey, answer: T): T {
+  const marks = unsentResumes.get(machine)
+  if (!marks) {
+    return answer
+  }
   const offered = new Set(answer.candidates.map((candidate) => candidate.sessionId))
-  for (const sessionId of unsentResumes.keys()) {
+  for (const sessionId of marks.keys()) {
     if (!offered.has(sessionId)) {
-      unsentResumes.delete(sessionId)
+      marks.delete(sessionId)
     }
   }
-  if (unsentResumes.size === 0) {
+  if (marks.size === 0) {
+    unsentResumes.delete(machine)
     return answer
   }
   const unsent = answer.candidates.flatMap((candidate): ResumeFailure[] => {
-    const failedAt = unsentResumes.get(candidate.sessionId)
+    const failedAt = marks.get(candidate.sessionId)
     return failedAt === undefined
       ? []
       : [
@@ -49,7 +79,7 @@ export function withUnsentResumes<T extends HostAnswer>(answer: T): T {
   })
   return {
     ...answer,
-    candidates: answer.candidates.filter((candidate) => !unsentResumes.has(candidate.sessionId)),
+    candidates: answer.candidates.filter((candidate) => !marks.has(candidate.sessionId)),
     failed: [...answer.failed, ...unsent]
   }
 }
diff --git a/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.test.tsx b/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.test.tsx
index de80b08e4c0b..564b90be3462 100644
--- a/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.test.tsx
@@ -7,7 +7,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 const mocks = vi.hoisted(() => {
   const hostLabel = (): string | null => 'studio-mac'
   const capability = (): 'unknown' | 'supported' | 'unsupported' => 'supported'
-  const resuming: readonly string[] = []
+  const resuming: ReadonlyMap<string, readonly string[]> = new Map()
   return {
     call: vi.fn(),
     capability: capability(),
@@ -41,6 +41,7 @@ import type {
   AgentJournalSubmission
 } from '../../../../shared/agent-session-journal-types'
 import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import { restartMachineKey } from '../native-chat-restart-machines'
 import {
   NativeChatInterruptedContinue,
   useNativeChatInterruptedContinuation
@@ -89,9 +90,7 @@ function Harness(props: Props): React.JSX.Element {
     <TooltipProvider delayDuration={0}>
       <span data-testid="offered">{continuation.offeredTurnItemId ?? 'none'}</span>
       <span data-testid="available">{String(continuation.view.continueAvailable)}</span>
-      <span data-testid="error">
-        {composerError ?? continuation.continueError?.text ?? 'none'}
-      </span>
+      <span data-testid="error">{composerError ?? continuation.continueError?.text ?? 'none'}</span>
       <button type="button" onClick={() => setComposerError(ATTACHMENTS)}>
         compose
       </button>
@@ -106,7 +105,7 @@ const ATTACHMENTS = 'Remove attachments before using a chat-session command.'
 
 beforeEach(() => {
   mocks.capability = 'supported'
-  mocks.resuming = []
+  mocks.resuming = new Map()
   mocks.launchPending = false
   mocks.hostLabel = 'studio-mac'
   mocks.call.mockReset()
@@ -161,11 +160,18 @@ describe('Continue on a reply an Orca stop cut off', () => {
   })
 
   it('is not offered while the restart prompt or the launch is resuming this chat', () => {
-    mocks.resuming = ['session-1']
+    mocks.resuming = new Map([[restartMachineKey(PAIRED), ['session-1']]])
     render(<Harness />)
     expect(continueButton()).toBeNull()
   })
 
+  // Resumes are per machine: a chat of the same id resuming elsewhere is another chat.
+  it('is still offered while a chat of the same id resumes on another machine', () => {
+    mocks.resuming = new Map([['local', ['session-1']]])
+    render(<Harness />)
+    expect(continueButton()).toBeInTheDocument()
+  })
+
   it("is not offered on this machine's chats while the launch may still resume them", () => {
     mocks.launchPending = true
     render(<Harness target={{ kind: 'local' }} />)
diff --git a/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.tsx b/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.tsx
index 2e3e0be96de3..09206030faa1 100644
--- a/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.tsx
@@ -15,6 +15,7 @@ import { AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY } from '../../../
 import type { NativeChatOrcaStopView } from './native-chat-orca-stop-context'
 import { useStructuredAgentSessionHostLabel } from './use-structured-agent-session-host-label'
 import { useNativeChatRestartResuming } from '../native-chat-resume-on-restart-store'
+import { restartMachineKey } from '../native-chat-restart-machines'
 import { useNativeChatLaunchResumePending } from '../native-chat-launch-resume-decision'
 import type { NativeChatComposerNoticeContent } from './native-chat-composer-notice'
 
@@ -51,10 +52,11 @@ export function useNativeChatInterruptedContinuation(input: {
     target,
     AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY
   )
-  // The restart prompt or the launch's own resume is carrying this chat on, or the launch may still
-  // decide to; it resumes only this machine's chats.
+  // The restart prompt or a resume is carrying this chat on, on its own machine, or the launch may
+  // still decide to; the launch resumes only this computer's chats.
   const launchPending = useNativeChatLaunchResumePending() && target.kind === 'local'
-  const resuming = useNativeChatRestartResuming().includes(sessionId) || launchPending
+  const resumingHere = useNativeChatRestartResuming().get(restartMachineKey(target))
+  const resuming = resumingHere?.includes(sessionId) === true || launchPending
   const cut = useMemo(
     () => latestNativeChatOrcaStopCut(input.journalItems, input.submissions),
     [input.journalItems, input.submissions]
diff --git a/src/renderer/src/components/sidebar/workspace-creator-visibility.ts b/src/renderer/src/components/sidebar/workspace-creator-visibility.ts
index ca0b929a40cd..e7831dac3fdb 100644
--- a/src/renderer/src/components/sidebar/workspace-creator-visibility.ts
+++ b/src/renderer/src/components/sidebar/workspace-creator-visibility.ts
@@ -3,7 +3,7 @@ import type { PublicKnownRuntimeEnvironment } from '../../../../shared/runtime-e
 import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
 import type { Worktree } from '../../../../shared/worktree/types'
 import { folderWorkspaceToWorktree } from '../../../../shared/folder-workspace-worktree'
-import { normalizeWorkspaceCreatorProvenance } from '../../../../shared/workspace-creator-provenance'
+import { workspaceCreatorRelation } from '../../../../shared/workspace-creator-provenance'
 
 type RuntimeStatusEntry = { status: RuntimeStatus | null }
 
@@ -28,19 +28,15 @@ export function isWorkspaceFromOtherDevice(
   worktree: Worktree,
   pairedDeviceIdsByEnvironment: ReadonlyMap<string, string>
 ): boolean {
-  const creator = normalizeWorkspaceCreatorProvenance(worktree.creatorProvenance)
-  if (!creator) {
-    return false
-  }
   const environmentId = worktree.runtimeOwnerEnvironmentId
   if (!environmentId) {
-    return creator.kind !== 'host'
+    return workspaceCreatorRelation(worktree.creatorProvenance, null) !== 'viewer'
   }
   const pairedDeviceId = pairedDeviceIdsByEnvironment.get(environmentId)
   if (!pairedDeviceId) {
     return false
   }
-  return creator.kind !== 'paired-device' || creator.deviceId !== pairedDeviceId
+  return workspaceCreatorRelation(worktree.creatorProvenance, pairedDeviceId) !== 'viewer'
 }
 
 export function isFolderWorkspaceFromOtherDevice(
diff --git a/src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.test.tsx b/src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.test.tsx
index fc5fefce1505..eceff0a7dae5 100644
--- a/src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.test.tsx
+++ b/src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.test.tsx
@@ -11,15 +11,20 @@ import {
   consumeNativeChatResumeOnRestartDialogRequest,
   getNativeChatResumeOnRestartDialogRequest
 } from '../native-chat-resume-on-restart-dialog'
-import { _resetNativeChatRestartOffer } from '../native-chat-resume-on-restart-store'
+import { _resetNativeChatRestartOffer } from '../native-chat-restart-offer-triggers'
 import { NativeChatResumeStatusSegment } from './NativeChatResumeStatusSegment'
+import { nativeChatResumePendingText } from './native-chat-resume-status-text'
+import { readNativeChatRestartMachine } from '../native-chat-resume-on-restart-store'
+import { pairedEnvironment } from '../native-chat-restart-offer-test-support'
 
 const rpc = vi.hoisted(() => vi.fn())
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   callStructuredAgentSession: rpc,
+  pairedRestartOffersSupport: async () => 'supported',
   // A failed row opens the status feed; these cases never drive it.
   subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
 }))
+vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { dismiss: vi.fn() }) }))
 
 const candidates: ResumeCandidate[] = [
   {
@@ -28,7 +33,8 @@ const candidates: ResumeCandidate[] = [
     agent: 'codex',
     trigger: 'quit',
     latestPrompt: 'Fix it',
-    recordedAt: 1
+    recordedAt: 1,
+    origin: 'own'
   },
   {
     sessionId: 'b',
@@ -36,7 +42,8 @@ const candidates: ResumeCandidate[] = [
     agent: 'claude',
     trigger: 'update',
     latestPrompt: 'Review it',
-    recordedAt: 2
+    recordedAt: 2,
+    origin: 'own'
   }
 ]
 
@@ -92,14 +99,14 @@ describe('NativeChatResumeStatusSegment', () => {
     expect(screen.getByRole('button', { name: '2 chats available to resume' })).toBeTruthy()
     expect(screen.getByText('2 chats to resume')).toBeTruthy()
 
-    expect(getNativeChatResumeOnRestartDialogRequest()).toBe(false)
+    expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
     await act(async () => screen.getByRole('button').click())
     // The launch read, then a second one taken before the dialog is allowed to reopen.
     expect(rpc.mock.calls.map((call) => call[1])).toEqual([
       'agentSession.restartResumable',
       'agentSession.restartResumable'
     ])
-    expect(getNativeChatResumeOnRestartDialogRequest()).toBe(true)
+    expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: 'local' })
   })
 
   // The offer is spent once acted on, so this entry is the one summary a failed resume leaves.
@@ -122,7 +129,7 @@ describe('NativeChatResumeStatusSegment', () => {
 
     rpc.mockResolvedValue({ sessions: [], failed: [failed] })
     await act(async () => entry.click())
-    expect(getNativeChatResumeOnRestartDialogRequest()).toBe(true)
+    expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: 'local' })
     // With the offer gone, only the failure entry is left — and it stays.
     expect(screen.queryByText('1 chat to resume')).toBeNull()
     expect(screen.getByText('1 chat failed to resume')).toBeTruthy()
@@ -163,9 +170,9 @@ describe('NativeChatResumeStatusSegment', () => {
     rpc.mockResolvedValueOnce({ sessions: candidates }).mockResolvedValue({ sessions: [] })
     await mount()
 
-    expect(getNativeChatResumeOnRestartDialogRequest()).toBe(false)
+    expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
     await act(async () => screen.getByRole('button').click())
-    expect(getNativeChatResumeOnRestartDialogRequest()).toBe(false)
+    expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
     expect(screen.queryByRole('button')).toBeNull()
   })
 
@@ -253,4 +260,156 @@ describe('NativeChatResumeStatusSegment', () => {
     expect(screen.getByRole('button').textContent).toContain('2')
     expect(screen.queryByText('2 chats to resume')).toBeNull()
   })
+
+  // One entry across machines: it names the machine only when there is just one.
+  it('names a paired server when it is the only machine with chats, and opens on it', async () => {
+    rpc.mockImplementation(async (target) =>
+      target.kind === 'environment' ? { sessions: candidates } : { sessions: [] }
+    )
+    useAppStore.setState({
+      runtimeEnvironments: [pairedEnvironment('studio', 'studio-mac')]
+    })
+    await mount()
+    await act(async () => {
+      await readNativeChatRestartMachine({ kind: 'environment', environmentId: 'studio' })
+    })
+    expect(screen.getByText('2 chats to resume on studio-mac')).toBeTruthy()
+    await act(async () => screen.getByRole('button').click())
+    expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: 'environment:studio' })
+  })
+
+  // Another device's or an automation's chats are theirs to resume; the entry counts the user's.
+  it("counts only the user's own chats, and adds nothing for a server holding only others'", async () => {
+    const others = (['other-device', 'automation', 'server-made'] as const).map(
+      (origin, index) => ({
+        ...candidates[0]!,
+        sessionId: `o${index}`,
+        origin
+      })
+    )
+    let studio = [...candidates, ...others]
+    rpc.mockImplementation(async (target) =>
+      target.kind === 'environment' ? { sessions: studio } : { sessions: [] }
+    )
+    useAppStore.setState({
+      runtimeEnvironments: [pairedEnvironment('studio', 'studio-mac')]
+    })
+    await mount()
+    await act(async () => {
+      await readNativeChatRestartMachine({ kind: 'environment', environmentId: 'studio' })
+    })
+    expect(screen.getByText('2 chats to resume on studio-mac')).toBeTruthy()
+    studio = others
+    await act(async () => {
+      await readNativeChatRestartMachine({ kind: 'environment', environmentId: 'studio' })
+    })
+    expect(screen.queryByRole('button')).toBeNull()
+  })
+
+  // A server's provider refused to carry the user's chat on: the entry says so, counting only the
+  // user's own failures, and opens on that server. The failed label names no machine; the dialog does.
+  it('counts only the user’s own failures on a paired server, and opens on it', async () => {
+    const failure = (sessionId: string, origin: 'own' | 'other-device') => ({
+      ...candidates[0]!,
+      sessionId,
+      origin,
+      failedAt: 60_000,
+      outcome: 'refused',
+      reason: 'provider_refused_continuation'
+    })
+    rpc.mockImplementation(async (target) =>
+      target.kind === 'environment'
+        ? { sessions: [], failed: [failure('a', 'own'), failure('o', 'other-device')] }
+        : { sessions: [] }
+    )
+    useAppStore.setState({
+      runtimeEnvironments: [pairedEnvironment('studio', 'studio-mac')]
+    })
+    await mount()
+    await act(async () => {
+      await readNativeChatRestartMachine({ kind: 'environment', environmentId: 'studio' })
+    })
+    const entry = screen.getByRole('button', {
+      name: '1 chat failed to resume. Click for details.'
+    })
+    expect(entry.textContent).toBe('1 chat failed to resume')
+    await act(async () => entry.click())
+    expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: 'environment:studio' })
+  })
+
+  it('counts every machine in one entry and opens on none in particular', async () => {
+    rpc.mockImplementation(async (target) =>
+      target.kind === 'environment' ? { sessions: candidates } : { sessions: [candidates[0]] }
+    )
+    useAppStore.setState({
+      runtimeEnvironments: [pairedEnvironment('studio', 'studio-mac')]
+    })
+    await mount()
+    await act(async () => {
+      await readNativeChatRestartMachine({ kind: 'environment', environmentId: 'studio' })
+    })
+    expect(screen.getAllByRole('button')).toHaveLength(1)
+    expect(screen.getByText('3 chats to resume')).toBeTruthy()
+    await act(async () => screen.getByRole('button').click())
+    expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: null })
+  })
+
+  it('breaks the tooltip down by machine only when there is more than one', () => {
+    expect(
+      nativeChatResumePendingText(4, null, [
+        { count: 1, name: 'Local Mac' },
+        { count: 2, name: 'studio-mac' },
+        { count: 1, name: 'build-box' }
+      ]).tooltip
+    ).toBe('4 chats to resume: 1 on Local Mac, 2 on studio-mac, 1 on build-box. Click to choose.')
+    expect(
+      nativeChatResumePendingText(2, 'studio-mac', [{ count: 2, name: 'studio-mac' }])
+    ).toEqual({
+      label: '2 chats to resume on studio-mac',
+      ariaLabel: '2 chats available to resume',
+      tooltip: 'Open interrupted chats available to resume'
+    })
+    expect(nativeChatResumePendingText(1, null, [{ count: 1, name: 'Local Mac' }]).label).toBe(
+      '1 chat to resume'
+    )
+  })
+
+  // Read first, as this computer's entry always has; a server out of contact is not waited on.
+  it('re-reads this computer and opens over a disconnected server’s last listing', async () => {
+    let hang = false
+    rpc.mockImplementation((target) => {
+      if (hang && target.kind === 'environment') {
+        // An unreachable server: a re-read would never answer.
+        return new Promise(() => {})
+      }
+      return Promise.resolve({ sessions: candidates })
+    })
+    useAppStore.setState({
+      runtimeEnvironments: [pairedEnvironment('studio', 'studio-mac')]
+    })
+    await mount()
+    await act(async () => {
+      await readNativeChatRestartMachine({ kind: 'environment', environmentId: 'studio' })
+    })
+    hang = true
+    await act(async () => screen.getByRole('button').click())
+    expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: null })
+    // This computer was asked again; the server, with no connection, was not.
+    expect(
+      rpc.mock.calls
+        .filter((call) => call[1] === 'agentSession.restartResumable')
+        .map((call) => call[0].kind)
+    ).toEqual(['local', 'environment', 'local'])
+  })
+
+  // A failed re-read is loss of contact, never evidence the offers are gone: keep the last answer.
+  it('keeps the last answer when a refresh of this computer fails', async () => {
+    rpc.mockResolvedValueOnce({ sessions: candidates }).mockRejectedValue(new Error('host busy'))
+    await mount()
+    expect(screen.getByText('2 chats to resume')).toBeTruthy()
+    await act(async () => {
+      await readNativeChatRestartMachine({ kind: 'local' })
+    })
+    expect(screen.getByText('2 chats to resume')).toBeTruthy()
+  })
 })
diff --git a/src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.tsx b/src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.tsx
index be3b743b4244..4473db02d5a7 100644
--- a/src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.tsx
+++ b/src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.tsx
@@ -1,18 +1,33 @@
 import { AlertCircle, Loader2, RotateCcw } from 'lucide-react'
 import { useNativeChatRestartOfferEnabled } from '../native-chat-restart-offer-gate'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { translate } from '@/i18n/i18n'
 import {
-  reopenNativeChatRestartOffer,
-  useNativeChatRestartOffer,
+  checkText,
+  failedText,
+  nativeChatResumePendingText,
+  resumingText
+} from './native-chat-resume-status-text'
+import {
+  useNativeChatRestartOffers,
   useNativeChatRestartResuming
 } from '../native-chat-resume-on-restart-store'
+import { reopenNativeChatRestartOffer } from '../native-chat-restart-offer-reopen'
+import { useNativeChatRestartOfferSources } from '../native-chat-restart-offer-triggers'
+import { LOCAL_RESTART_MACHINE, type RestartMachineKey } from '../native-chat-restart-machines'
+import { restartMachineNameFromState } from '../native-chat-restart-machine-name'
+import { useAppStore } from '../../store'
+import type { ResumeCandidate } from '../native-chat-resume-on-restart-grouping'
+import { resumeCandidateOwnership } from '../native-chat-resume-ownership'
 
-// Why: closing the resume dialog is a snooze, not a decline — the host keeps the offer. This is
+// Why: closing the resume dialog is a snooze, not a decline — each host keeps its offer. This is
 // then the only surface left carrying it, so it is always rendered rather than gated by
 // `statusBarItems`. Pressing Resume closes the dialog too, so this entry carries the run while it
-// is in flight. It is also the lasting summary of chats the resume could not carry on: its
-// toast says so once, and each chat it reached carries its own note.
+// is in flight. It is also the lasting summary of the user's own chats a resume could not carry
+// on: its toast says so once, and each chat it reached carries its own note.
+//
+// ONE entry across every machine: the dialog covers them all. It counts only the user's own chats
+// (another device's or an automation's are listed in the dialog, not counted here), names the
+// machine only when there is just one, and its tooltip breaks the count down by machine.
 
 function Segment({
   icon,
@@ -20,7 +35,8 @@ function Segment({
   ariaLabel,
   tooltip,
   iconOnly,
-  count
+  count,
+  machines
 }: {
   icon: React.ReactNode
   label: string
@@ -28,13 +44,14 @@ function Segment({
   tooltip: string
   iconOnly: boolean
   count: number
+  machines: readonly RestartMachineKey[]
 }): React.JSX.Element {
   return (
     <Tooltip>
       <TooltipTrigger asChild>
         <button
           type="button"
-          onClick={() => void reopenNativeChatRestartOffer()}
+          onClick={() => void reopenNativeChatRestartOffer(machines)}
           className="inline-flex cursor-pointer items-center gap-1.5 rounded px-1 py-0.5 hover:bg-accent/70"
           aria-label={ariaLabel}
         >
@@ -49,128 +66,64 @@ function Segment({
   )
 }
 
-type SegmentText = { label: string; ariaLabel: string; tooltip: string }
-
-function resumingText(count: number): SegmentText {
-  return {
-    label:
-      count === 1
-        ? translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.resumingLabelOne',
-            'Resuming 1 chat'
-          )
-        : translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.resumingLabel',
-            'Resuming {{value0}} chats',
-            { value0: count }
-          ),
-    ariaLabel:
-      count === 1
-        ? translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.resumingAriaOne',
-            'Resuming 1 chat. Click to open details.'
-          )
-        : translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.resumingAria',
-            'Resuming {{value0}} chats. Click to open details.',
-            { value0: count }
-          ),
-    tooltip: translate(
-      'auto.components.status.bar.NativeChatResumeStatusSegment.resumingTooltip',
-      'Restoring interrupted chats and asking them to carry on…'
-    )
-  }
-}
-
-function failedText(count: number): SegmentText {
-  return {
-    label:
-      count === 1
-        ? translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.failedLabelOne',
-            '1 chat failed to resume'
-          )
-        : translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.failedLabel',
-            '{{value0}} chats failed to resume',
-            { value0: count }
-          ),
-    ariaLabel:
-      count === 1
-        ? translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.failedAriaOne',
-            '1 chat failed to resume. Click for details.'
-          )
-        : translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.failedAria',
-            '{{value0}} chats failed to resume. Click for details.',
-            { value0: count }
-          ),
-    tooltip: translate(
-      'auto.components.status.bar.NativeChatResumeStatusSegment.failedTooltip',
-      'Chats Orca could not resume after the restart. Click for details.'
-    )
-  }
-}
-
-/** True of a refused chat and an unconfirmed one alike, for a list holding either. */
-function checkText(count: number): SegmentText {
-  return {
-    label:
-      count === 1
-        ? translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.checkLabelOne',
-            '1 chat to check'
-          )
-        : translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.checkLabel',
-            '{{value0}} chats to check',
-            { value0: count }
-          ),
-    ariaLabel:
-      count === 1
-        ? translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.checkAriaOne',
-            '1 chat to check after resuming. Click for details.'
-          )
-        : translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.checkAria',
-            '{{value0}} chats to check after resuming. Click for details.',
-            { value0: count }
-          ),
-    tooltip: translate(
-      'auto.components.status.bar.NativeChatResumeStatusSegment.checkTooltip',
-      'Chats Orca couldn’t resume, or couldn’t confirm it resumed, after the restart. Click for details.'
-    )
-  }
-}
-
 export function NativeChatResumeStatusSegment({
   iconOnly
 }: {
   iconOnly: boolean
 }): React.JSX.Element | null {
-  const offerEnabled = useNativeChatRestartOfferEnabled()
-  const { candidates, failed } = useNativeChatRestartOffer(offerEnabled)
-  const resumingIds = useNativeChatRestartResuming()
-  if (!offerEnabled) {
-    return null
+  const localEnabled = useNativeChatRestartOfferEnabled()
+  useNativeChatRestartOfferSources(localEnabled)
+  const offers = useNativeChatRestartOffers()
+  const resumingByMachine = useNativeChatRestartResuming()
+  const machines = [...offers.keys()]
+  // Joined so the selector returns a primitive and re-renders only when a name changes.
+  const names = useAppStore((state) =>
+    machines.map((machine) => restartMachineNameFromState(state, machine)).join('\u0000')
+  ).split('\u0000')
+  const nameByMachine = new Map(machines.map((machine, index) => [machine, names[index]]))
+  let resuming = 0
+  let pending = 0
+  let failures = 0
+  let unconfirmed = false
+  const breakdown: { machine: RestartMachineKey; count: number; name: string }[] = []
+  const failingMachines: RestartMachineKey[] = []
+  for (const [machine, offer] of offers) {
+    // A chat being resumed is counted once, as in flight, until the host answers for it. Only the
+    // user's own chats count: another device's or an automation's are theirs to resume.
+    const inFlight = new Set(resumingByMachine.get(machine) ?? [])
+    const counted = (row: ResumeCandidate): boolean =>
+      !inFlight.has(row.sessionId) && resumeCandidateOwnership(row) === 'own'
+    const waiting = offer.failed.filter(counted)
+    const machinePending = offer.candidates.filter(counted).length
+    pending += machinePending
+    failures += waiting.length
+    if (waiting.length > 0) {
+      failingMachines.push(machine)
+    }
+    // An unconfirmed chat may be working, so "failed" would invite a duplicate "continue".
+    unconfirmed ||= waiting.some((failure) => failure.outcome === 'unconfirmed')
+    if (machinePending > 0) {
+      breakdown.push({
+        machine,
+        count: machinePending,
+        name: nameByMachine.get(machine) ?? machine
+      })
+    }
   }
-
-  // A chat being resumed is counted once, as in flight, until the host answers for it.
-  const inFlight = new Set(resumingIds)
-  const waiting = failed.filter((failure) => !inFlight.has(failure.sessionId))
-  const resuming = inFlight.size
-  const pending = candidates.filter((candidate) => !inFlight.has(candidate.sessionId)).length
-  const failures = waiting.length
-  // An unconfirmed chat may be working, so "failed" would invite a duplicate "continue".
-  const unconfirmed = waiting.some((failure) => failure.outcome === 'unconfirmed')
+  for (const ids of resumingByMachine.values()) {
+    resuming += ids.length
+  }
+  const onlyPairedName =
+    breakdown.length === 1 && breakdown[0]!.machine !== LOCAL_RESTART_MACHINE
+      ? breakdown[0]!.name
+      : null
   return (
     <>
       {resuming > 0 && (
         <Segment
           iconOnly={iconOnly}
           count={resuming}
+          machines={[...resumingByMachine.keys()]}
           icon={<Loader2 className="size-3 animate-spin text-muted-foreground" />}
           {...resumingText(resuming)}
         />
@@ -179,35 +132,9 @@ export function NativeChatResumeStatusSegment({
         <Segment
           iconOnly={iconOnly}
           count={pending}
+          machines={breakdown.map((entry) => entry.machine)}
           icon={<RotateCcw className="size-3 text-muted-foreground" />}
-          label={
-            pending === 1
-              ? translate(
-                  'auto.components.status.bar.NativeChatResumeStatusSegment.labelOne',
-                  '1 chat to resume'
-                )
-              : translate(
-                  'auto.components.status.bar.NativeChatResumeStatusSegment.label',
-                  '{{value0}} chats to resume',
-                  { value0: pending }
-                )
-          }
-          ariaLabel={
-            pending === 1
-              ? translate(
-                  'auto.components.status.bar.NativeChatResumeStatusSegment.ariaLabelOne',
-                  '1 chat available to resume'
-                )
-              : translate(
-                  'auto.components.status.bar.NativeChatResumeStatusSegment.ariaLabel',
-                  '{{value0}} chats available to resume',
-                  { value0: pending }
-                )
-          }
-          tooltip={translate(
-            'auto.components.status.bar.NativeChatResumeStatusSegment.tooltip',
-            'Open interrupted chats available to resume'
-          )}
+          {...nativeChatResumePendingText(pending, onlyPairedName, breakdown)}
         />
       )}
       {failures > 0 && (
@@ -216,6 +143,7 @@ export function NativeChatResumeStatusSegment({
         <Segment
           iconOnly={iconOnly}
           count={failures}
+          machines={failingMachines}
           icon={<AlertCircle className="size-3 text-status-warning" />}
           {...(unconfirmed ? checkText(failures) : failedText(failures))}
         />
diff --git a/src/renderer/src/components/status-bar/native-chat-resume-status-text.ts b/src/renderer/src/components/status-bar/native-chat-resume-status-text.ts
new file mode 100644
index 000000000000..c8b8fa9b2560
--- /dev/null
+++ b/src/renderer/src/components/status-bar/native-chat-resume-status-text.ts
@@ -0,0 +1,165 @@
+import { translate } from '@/i18n/i18n'
+
+// What each part of the restart status-bar entry says: its label, its screen-reader name, and its
+// tooltip.
+
+export type SegmentText = { label: string; ariaLabel: string; tooltip: string }
+
+export function resumingText(count: number): SegmentText {
+  return {
+    label:
+      count === 1
+        ? translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.resumingLabelOne',
+            'Resuming 1 chat'
+          )
+        : translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.resumingLabel',
+            'Resuming {{value0}} chats',
+            { value0: count }
+          ),
+    ariaLabel:
+      count === 1
+        ? translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.resumingAriaOne',
+            'Resuming 1 chat. Click to open details.'
+          )
+        : translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.resumingAria',
+            'Resuming {{value0}} chats. Click to open details.',
+            { value0: count }
+          ),
+    tooltip: translate(
+      'auto.components.status.bar.NativeChatResumeStatusSegment.resumingTooltip',
+      'Restoring interrupted chats and asking them to carry on…'
+    )
+  }
+}
+
+export function failedText(count: number): SegmentText {
+  return {
+    label:
+      count === 1
+        ? translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.failedLabelOne',
+            '1 chat failed to resume'
+          )
+        : translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.failedLabel',
+            '{{value0}} chats failed to resume',
+            { value0: count }
+          ),
+    ariaLabel:
+      count === 1
+        ? translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.failedAriaOne',
+            '1 chat failed to resume. Click for details.'
+          )
+        : translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.failedAria',
+            '{{value0}} chats failed to resume. Click for details.',
+            { value0: count }
+          ),
+    tooltip: translate(
+      'auto.components.status.bar.NativeChatResumeStatusSegment.failedTooltip',
+      'Chats Orca could not resume after the restart. Click for details.'
+    )
+  }
+}
+
+/** True of a refused chat and an unconfirmed one alike, for a list holding either. */
+export function checkText(count: number): SegmentText {
+  return {
+    label:
+      count === 1
+        ? translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.checkLabelOne',
+            '1 chat to check'
+          )
+        : translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.checkLabel',
+            '{{value0}} chats to check',
+            { value0: count }
+          ),
+    ariaLabel:
+      count === 1
+        ? translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.checkAriaOne',
+            '1 chat to check after resuming. Click for details.'
+          )
+        : translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.checkAria',
+            '{{value0}} chats to check after resuming. Click for details.',
+            { value0: count }
+          ),
+    tooltip: translate(
+      'auto.components.status.bar.NativeChatResumeStatusSegment.checkTooltip',
+      'Chats Orca couldn’t resume, or couldn’t confirm it resumed, after the restart. Click for details.'
+    )
+  }
+}
+
+/** "on studio-mac" after the count, when a paired server is the only machine with chats. */
+export function nativeChatResumePendingText(
+  pending: number,
+  onlyMachineName: string | null,
+  breakdown: readonly { count: number; name: string }[]
+): SegmentText {
+  const label =
+    onlyMachineName === null
+      ? pending === 1
+        ? translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.labelOne',
+            '1 chat to resume'
+          )
+        : translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.label',
+            '{{value0}} chats to resume',
+            { value0: pending }
+          )
+      : pending === 1
+        ? translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.labelOneOnMachine',
+            '1 chat to resume on {{value0}}',
+            { value0: onlyMachineName }
+          )
+        : translate(
+            'auto.components.status.bar.NativeChatResumeStatusSegment.labelOnMachine',
+            '{{value0}} chats to resume on {{value1}}',
+            { value0: pending, value1: onlyMachineName }
+          )
+  const ariaLabel =
+    pending === 1
+      ? translate(
+          'auto.components.status.bar.NativeChatResumeStatusSegment.ariaLabelOne',
+          '1 chat available to resume'
+        )
+      : translate(
+          'auto.components.status.bar.NativeChatResumeStatusSegment.ariaLabel',
+          '{{value0}} chats available to resume',
+          { value0: pending }
+        )
+  const tooltip =
+    breakdown.length > 1
+      ? translate(
+          'auto.components.status.bar.NativeChatResumeStatusSegment.tooltipByMachine',
+          '{{value0}} chats to resume: {{value1}}. Click to choose.',
+          {
+            value0: pending,
+            value1: breakdown
+              .map(({ count, name }) =>
+                translate(
+                  'auto.components.status.bar.NativeChatResumeStatusSegment.tooltipMachinePart',
+                  '{{value0}} on {{value1}}',
+                  { value0: count, value1: name }
+                )
+              )
+              .join(', ')
+          }
+        )
+      : translate(
+          'auto.components.status.bar.NativeChatResumeStatusSegment.tooltip',
+          'Open interrupted chats available to resume'
+        )
+  return { label, ariaLabel, tooltip }
+}
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 9c3e98807873..9510d6e2c7fc 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -2113,6 +2113,7 @@
         "resumeSelected": "Resume {{value0}} chats",
         "resumeSelectedOne": "Resume 1 chat",
         "dismissAll": "Dismiss all",
+        "dismiss": "Dismiss",
         "notContinuedOne": "1 chat couldn’t be resumed",
         "notContinuedMany": "{{value0}} chats couldn’t be resumed",
         "notConfirmedOne": "Couldn’t confirm 1 chat was resumed",
@@ -2128,6 +2129,25 @@
         "activitySubagentMany": "{{value0}} subagents running",
         "activityMonitorOne": "Monitoring: {{value0}}",
         "activityMonitorMany": "Monitoring {{value0}} background tasks",
+        "machineCauseUpdate": "Installed an update",
+        "machineCauseQuit": "Was quit",
+        "selectMachine": "Resume every chat on {{value0}}",
+        "machinesBody": "These chats were working when Orca on their machine closed or installed an update. Resuming restores each one where it stopped, with its full context, and asks the agent to check what it was doing before carrying on. Your own prompt is not re-sent.",
+        "continuedOneOnMachine": "Resumed 1 chat on {{value0}}",
+        "continuedManyOnMachine": "Resumed {{value0}} chats on {{value1}}",
+        "notContinuedOneOnMachine": "1 chat on {{value0}} couldn’t be resumed",
+        "notContinuedManyOnMachine": "{{value0}} chats on {{value1}} couldn’t be resumed",
+        "notConfirmedOneOnMachine": "Couldn’t confirm 1 chat on {{value0}} was resumed",
+        "notConfirmedManyOnMachine": "Couldn’t confirm {{value0}} chats on {{value1}} were resumed",
+        "reconnectUpdateTitle": "{{value0}} restarted for an update",
+        "reconnectQuitTitle": "Orca on {{value0}} was restarted",
+        "reconnectBodyOne": "1 of your chats there was stopped mid-reply. It shows where it stopped, and nothing was lost.",
+        "reconnectBodyMany": "{{value0}} of your chats there were stopped mid-reply. Each one shows where it stopped, and nothing was lost.",
+        "reconnectShow": "Show chats",
+        "originAutomation": "Automation",
+        "originOtherDevice": "Another device",
+        "originServer": "Made on {{value0}}",
+        "originUnknown": "Unknown origin",
         "selectWorkspace": "Select all chats in {{value0}}",
         "workspaceSelectedCount": "{{value0}} of {{value1}}",
         "selectAll": "Select all chats",
@@ -4303,7 +4323,11 @@
             "resumingLabel": "Resuming {{value0}} chats",
             "resumingAriaOne": "Resuming 1 chat. Click to open details.",
             "resumingAria": "Resuming {{value0}} chats. Click to open details.",
-            "resumingTooltip": "Restoring interrupted chats and asking them to carry on…"
+            "resumingTooltip": "Restoring interrupted chats and asking them to carry on…",
+            "labelOneOnMachine": "1 chat to resume on {{value0}}",
+            "labelOnMachine": "{{value0}} chats to resume on {{value1}}",
+            "tooltipByMachine": "{{value0}} chats to resume: {{value1}}. Click to choose.",
+            "tooltipMachinePart": "{{value0}} on {{value1}}"
           }
         }
       },
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 1d208cff5b6c..70a2482d6691 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -4050,7 +4050,11 @@
             "label": "{{value0}} chats para reanudar",
             "ariaLabelOne": "1 chat disponible para reanudar",
             "ariaLabel": "{{value0}} chats disponibles para reanudar",
-            "tooltip": "Abrir chats interrumpidos disponibles para reanudar"
+            "tooltip": "Abrir chats interrumpidos disponibles para reanudar",
+            "labelOneOnMachine": "1 chat por reanudar en {{value0}}",
+            "labelOnMachine": "{{value0}} chats por reanudar en {{value1}}",
+            "tooltipByMachine": "{{value0}} chats por reanudar: {{value1}}. Haz clic para elegir.",
+            "tooltipMachinePart": "{{value0}} en {{value1}}"
           },
           "RuntimeHostStatusRow": {
             "previous_connection_closed": "La conexión anterior cerrada.",
@@ -17374,6 +17378,26 @@
         "resumeSelected": "Reanudar {{value0}} chats",
         "resumeSelectedOne": "Reanudar 1 chat",
         "dismissAll": "Descartar todo",
+        "dismiss": "Descartar",
+        "machineCauseUpdate": "Instaló una actualización",
+        "machineCauseQuit": "Se cerró",
+        "selectMachine": "Reanudar todos los chats en {{value0}}",
+        "machinesBody": "Estos chats estaban trabajando cuando Orca se cerró o instaló una actualización en su máquina. Al reanudarlos, cada uno se restaura donde se detuvo, con todo su contexto, y se pide al agente que revise lo que estaba haciendo antes de continuar. Tu propio prompt no se vuelve a enviar.",
+        "continuedOneOnMachine": "Se reanudó 1 chat en {{value0}}",
+        "continuedManyOnMachine": "Se reanudaron {{value0}} chats en {{value1}}",
+        "notContinuedOneOnMachine": "1 chat en {{value0}} no pudo reanudarse",
+        "notContinuedManyOnMachine": "{{value0}} chats en {{value1}} no pudieron reanudarse",
+        "notConfirmedOneOnMachine": "No se pudo confirmar que 1 chat en {{value0}} se reanudó",
+        "notConfirmedManyOnMachine": "No se pudo confirmar que {{value0}} chats en {{value1}} se reanudaron",
+        "reconnectUpdateTitle": "{{value0}} se reinició por una actualización",
+        "reconnectQuitTitle": "Orca en {{value0}} se reinició",
+        "reconnectBodyOne": "1 de tus chats allí se detuvo a mitad de una respuesta. Muestra dónde se detuvo y no se perdió nada.",
+        "reconnectBodyMany": "{{value0}} de tus chats allí se detuvieron a mitad de una respuesta. Cada uno muestra dónde se detuvo y no se perdió nada.",
+        "reconnectShow": "Mostrar chats",
+        "originAutomation": "Automatización",
+        "originOtherDevice": "Otro dispositivo",
+        "originServer": "Creado en {{value0}}",
+        "originUnknown": "Origen desconocido",
         "selectWorkspace": "Seleccionar todos los chats en {{value0}}",
         "workspaceSelectedCount": "{{value0}} de {{value1}}",
         "selectAll": "Seleccionar todos los chats",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 51fb65ab69bd..49a26c3d74d8 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -4168,7 +4168,11 @@
             "resumingLabel": "Reprise de {{value0}} conversations",
             "resumingAriaOne": "Reprise d’1 conversation. Cliquez pour voir les détails.",
             "resumingAria": "Reprise de {{value0}} conversations. Cliquez pour voir les détails.",
-            "resumingTooltip": "Restauration des conversations interrompues et demande de poursuite…"
+            "resumingTooltip": "Restauration des conversations interrompues et demande de poursuite…",
+            "labelOneOnMachine": "1 discussion à reprendre sur {{value0}}",
+            "labelOnMachine": "{{value0}} discussions à reprendre sur {{value1}}",
+            "tooltipByMachine": "{{value0}} discussions à reprendre : {{value1}}. Cliquez pour choisir.",
+            "tooltipMachinePart": "{{value0}} sur {{value1}}"
           },
           "provider": {
             "extra": {
@@ -17480,6 +17484,7 @@
         "resumeSelected": "Reprendre les discussions {{value0}}",
         "resumeSelectedOne": "Reprendre 1 discussion",
         "dismissAll": "Tout rejeter",
+        "dismiss": "Ignorer",
         "notContinuedOne": "1 chat n'a pas pu reprendre",
         "notContinuedMany": "{{value0}} chats n'ont pas pu reprendre",
         "notConfirmedOne": "Impossible de confirmer qu'1 chat a repris",
@@ -17495,6 +17500,25 @@
         "activitySubagentMany": "{{value0}} sous-agents en cours",
         "activityMonitorOne": "Surveillance : {{value0}}",
         "activityMonitorMany": "Surveillance de {{value0}} tâches en arrière-plan",
+        "machineCauseUpdate": "A installé une mise à jour",
+        "machineCauseQuit": "A été quitté",
+        "selectMachine": "Reprendre toutes les discussions sur {{value0}}",
+        "machinesBody": "Ces discussions étaient en cours quand Orca s'est fermé ou a installé une mise à jour sur leur machine. Les reprendre restaure chacune là où elle s'est arrêtée, avec tout son contexte, et demande à l'agent de vérifier ce qu'il faisait avant de continuer. Votre propre prompt n'est pas renvoyé.",
+        "continuedOneOnMachine": "1 chat a été repris sur {{value0}}",
+        "continuedManyOnMachine": "{{value0}} chats ont été repris sur {{value1}}",
+        "notContinuedOneOnMachine": "1 chat sur {{value0}} n'a pas pu reprendre",
+        "notContinuedManyOnMachine": "{{value0}} chats sur {{value1}} n'ont pas pu reprendre",
+        "notConfirmedOneOnMachine": "Impossible de confirmer qu'1 chat sur {{value0}} a repris",
+        "notConfirmedManyOnMachine": "Impossible de confirmer que {{value0}} chats sur {{value1}} ont repris",
+        "reconnectUpdateTitle": "{{value0}} a redémarré pour une mise à jour",
+        "reconnectQuitTitle": "Orca sur {{value0}} a été redémarré",
+        "reconnectBodyOne": "1 de vos discussions là-bas a été interrompue en pleine réponse. Elle indique où elle s'est arrêtée, et rien n'a été perdu.",
+        "reconnectBodyMany": "{{value0}} de vos discussions là-bas ont été interrompues en pleine réponse. Chacune indique où elle s'est arrêtée, et rien n'a été perdu.",
+        "reconnectShow": "Afficher les discussions",
+        "originAutomation": "Automatisation",
+        "originOtherDevice": "Un autre appareil",
+        "originServer": "Créé sur {{value0}}",
+        "originUnknown": "Origine inconnue",
         "selectWorkspace": "Sélectionner toutes les discussions dans {{value0}}",
         "workspaceSelectedCount": "{{value0}} sur {{value1}}",
         "selectAll": "Sélectionner toutes les discussions",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index f89e561d8093..0d9816d8fd60 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -4063,7 +4063,11 @@
             "resumingLabel": "{{value0}} 件のチャットを再開中",
             "resumingAriaOne": "1 件のチャットを再開中。詳細はクリックしてください。",
             "resumingAria": "{{value0}} 件のチャットを再開中。詳細はクリックしてください。",
-            "resumingTooltip": "中断されたチャットを復元し、続行を依頼しています…"
+            "resumingTooltip": "中断されたチャットを復元し、続行を依頼しています…",
+            "labelOneOnMachine": "{{value0}} で再開する 1 チャット",
+            "labelOnMachine": "{{value1}} で再開する {{value0}} チャット",
+            "tooltipByMachine": "再開する {{value0}} チャット: {{value1}}。クリックして選択。",
+            "tooltipMachinePart": "{{value1}} に {{value0}}"
           },
           "provider": {
             "extra": {
@@ -17364,6 +17368,7 @@
         "resumeSelected": "{{value0}} チャットを再開",
         "resumeSelectedOne": "1 チャットを再開",
         "dismissAll": "すべて閉じる",
+        "dismiss": "閉じる",
         "notContinuedOne": "1 件のチャットを再開できませんでした",
         "notContinuedMany": "{{value0}} 件のチャットを再開できませんでした",
         "notConfirmedOne": "1 件のチャットが再開されたことを確認できませんでした",
@@ -17379,6 +17384,25 @@
         "activitySubagentMany": "{{value0}} 個のサブ Agent が実行中",
         "activityMonitorOne": "監視中: {{value0}}",
         "activityMonitorMany": "{{value0}} 個のバックグラウンドタスクを監視中",
+        "machineCauseUpdate": "アップデートをインストールしました",
+        "machineCauseQuit": "終了しました",
+        "selectMachine": "{{value0}} のすべてのチャットを再開",
+        "machinesBody": "これらのチャットは、各マシンの Orca が終了したかアップデートをインストールしたときに作業中でした。再開すると、各チャットが完全なコンテキストとともに停止した場所から復元され、続行する前に何をしていたかを確認するよう Agent に要求されます。自分自身のプロンプトは再送信されません。",
+        "continuedOneOnMachine": "{{value0}} の 1 件のチャットを再開しました",
+        "continuedManyOnMachine": "{{value1}} の {{value0}} 件のチャットを再開しました",
+        "notContinuedOneOnMachine": "{{value0}} の 1 件のチャットを再開できませんでした",
+        "notContinuedManyOnMachine": "{{value1}} の {{value0}} 件のチャットを再開できませんでした",
+        "notConfirmedOneOnMachine": "{{value0}} の 1 件のチャットが再開されたことを確認できませんでした",
+        "notConfirmedManyOnMachine": "{{value1}} の {{value0}} 件のチャットが再開されたことを確認できませんでした",
+        "reconnectUpdateTitle": "{{value0}} がアップデートのために再起動しました",
+        "reconnectQuitTitle": "{{value0}} の Orca が再起動されました",
+        "reconnectBodyOne": "そこでのあなたのチャット 1 件が返信の途中で停止しました。停止した場所が表示され、何も失われていません。",
+        "reconnectBodyMany": "そこでのあなたのチャット {{value0}} 件が返信の途中で停止しました。それぞれ停止した場所が表示され、何も失われていません。",
+        "reconnectShow": "チャットを表示",
+        "originAutomation": "オートメーション",
+        "originOtherDevice": "別のデバイス",
+        "originServer": "{{value0}} で作成",
+        "originUnknown": "作成元不明",
         "selectWorkspace": "{{value0}} のチャットをすべて選択",
         "workspaceSelectedCount": "{{value0}}/{{value1}}",
         "selectAll": "すべてのチャットを選択",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index d4f98f162590..86509e4ad53f 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -4063,7 +4063,11 @@
             "resumingLabel": "채팅 {{value0}}개 재개 중",
             "resumingAriaOne": "채팅 1개 재개 중. 자세히 보려면 클릭하세요.",
             "resumingAria": "채팅 {{value0}}개 재개 중. 자세히 보려면 클릭하세요.",
-            "resumingTooltip": "중단된 채팅을 복원하고 계속하도록 요청하는 중…"
+            "resumingTooltip": "중단된 채팅을 복원하고 계속하도록 요청하는 중…",
+            "labelOneOnMachine": "{{value0}}에서 재개할 채팅 1개",
+            "labelOnMachine": "{{value1}}에서 재개할 채팅 {{value0}}개",
+            "tooltipByMachine": "재개할 채팅 {{value0}}개: {{value1}}. 클릭하여 선택하세요.",
+            "tooltipMachinePart": "{{value1}}에 {{value0}}개"
           },
           "provider": {
             "extra": {
@@ -17364,6 +17368,7 @@
         "resumeSelected": "{{value0}} 채팅 재개",
         "resumeSelectedOne": "채팅 1개 재개",
         "dismissAll": "모두 닫기",
+        "dismiss": "닫기",
         "notContinuedOne": "채팅 1개를 재개하지 못했습니다",
         "notContinuedMany": "{{value0}}개의 채팅을 재개하지 못했습니다",
         "notConfirmedOne": "채팅 1개가 재개되었는지 확인하지 못했습니다",
@@ -17379,6 +17384,25 @@
         "activitySubagentMany": "하위 에이전트 {{value0}}개 실행 중",
         "activityMonitorOne": "모니터링 중: {{value0}}",
         "activityMonitorMany": "백그라운드 작업 {{value0}}개 모니터링 중",
+        "machineCauseUpdate": "업데이트를 설치함",
+        "machineCauseQuit": "종료됨",
+        "selectMachine": "{{value0}}의 모든 채팅 재개",
+        "machinesBody": "이 채팅들은 해당 머신의 Orca가 종료되거나 업데이트를 설치할 때 작업 중이었습니다. 재개하면 각 채팅이 멈춘 지점에서 전체 컨텍스트와 함께 복원되고, 에이전트가 계속하기 전에 하던 일을 확인하도록 요청합니다. 내 프롬프트는 다시 보내지 않습니다.",
+        "continuedOneOnMachine": "{{value0}}에서 채팅 1개를 재개했습니다",
+        "continuedManyOnMachine": "{{value1}}에서 채팅 {{value0}}개를 재개했습니다",
+        "notContinuedOneOnMachine": "{{value0}}에서 채팅 1개를 재개하지 못했습니다",
+        "notContinuedManyOnMachine": "{{value1}}에서 채팅 {{value0}}개를 재개하지 못했습니다",
+        "notConfirmedOneOnMachine": "{{value0}}에서 채팅 1개가 재개되었는지 확인하지 못했습니다",
+        "notConfirmedManyOnMachine": "{{value1}}에서 채팅 {{value0}}개가 재개되었는지 확인하지 못했습니다",
+        "reconnectUpdateTitle": "{{value0}}이(가) 업데이트로 다시 시작됨",
+        "reconnectQuitTitle": "{{value0}}의 Orca가 다시 시작됨",
+        "reconnectBodyOne": "그곳의 내 채팅 1개가 응답 도중 멈췄습니다. 멈춘 위치가 표시되며 잃은 것은 없습니다.",
+        "reconnectBodyMany": "그곳의 내 채팅 {{value0}}개가 응답 도중 멈췄습니다. 각각 멈춘 위치가 표시되며 잃은 것은 없습니다.",
+        "reconnectShow": "채팅 보기",
+        "originAutomation": "자동화",
+        "originOtherDevice": "다른 기기",
+        "originServer": "{{value0}}에서 만듦",
+        "originUnknown": "출처 알 수 없음",
         "selectWorkspace": "{{value0}}의 채팅 모두 선택",
         "workspaceSelectedCount": "{{value0}}/{{value1}}",
         "selectAll": "모든 채팅 선택",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 15fb22510456..02fc1e371aa7 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -4063,7 +4063,11 @@
             "resumingLabel": "正在恢复 {{value0}} 个聊天",
             "resumingAriaOne": "正在恢复 1 个聊天。点击查看详情。",
             "resumingAria": "正在恢复 {{value0}} 个聊天。点击查看详情。",
-            "resumingTooltip": "正在恢复中断的聊天并请它们继续…"
+            "resumingTooltip": "正在恢复中断的聊天并请它们继续…",
+            "labelOneOnMachine": "{{value0}} 上有 1 个聊天待恢复",
+            "labelOnMachine": "{{value1}} 上有 {{value0}} 个聊天待恢复",
+            "tooltipByMachine": "{{value0}} 个聊天待恢复：{{value1}}。点击选择。",
+            "tooltipMachinePart": "{{value1}} 上 {{value0}} 个"
           },
           "provider": {
             "extra": {
@@ -17364,6 +17368,7 @@
         "resumeSelected": "恢复 {{value0}} 聊天",
         "resumeSelectedOne": "恢复 1 次聊天",
         "dismissAll": "全部关闭",
+        "dismiss": "关闭",
         "notContinuedOne": "1 个聊天无法恢复",
         "notContinuedMany": "{{value0}} 个聊天无法恢复",
         "notConfirmedOne": "无法确认 1 个聊天已恢复",
@@ -17379,6 +17384,25 @@
         "activitySubagentMany": "{{value0}} 个子智能体运行中",
         "activityMonitorOne": "正在监控：{{value0}}",
         "activityMonitorMany": "正在监控 {{value0}} 个后台任务",
+        "machineCauseUpdate": "安装了更新",
+        "machineCauseQuit": "已退出",
+        "selectMachine": "恢复 {{value0}} 上的所有聊天",
+        "machinesBody": "这些聊天在其所在机器上的 Orca 关闭或安装更新时正在工作。恢复会让每个聊天从停止处恢复，保留完整上下文，并让代理在继续之前先检查它刚才在做什么。你自己的提示不会被重新发送。",
+        "continuedOneOnMachine": "已在 {{value0}} 上恢复 1 个聊天",
+        "continuedManyOnMachine": "已在 {{value1}} 上恢复 {{value0}} 个聊天",
+        "notContinuedOneOnMachine": "{{value0}} 上的 1 个聊天无法恢复",
+        "notContinuedManyOnMachine": "{{value1}} 上的 {{value0}} 个聊天无法恢复",
+        "notConfirmedOneOnMachine": "无法确认 {{value0}} 上的 1 个聊天已恢复",
+        "notConfirmedManyOnMachine": "无法确认 {{value1}} 上的 {{value0}} 个聊天已恢复",
+        "reconnectUpdateTitle": "{{value0}} 因更新而重启",
+        "reconnectQuitTitle": "{{value0}} 上的 Orca 已重启",
+        "reconnectBodyOne": "你在那里的 1 个聊天在回复中途停止。它会显示停止的位置，没有丢失任何内容。",
+        "reconnectBodyMany": "你在那里的 {{value0}} 个聊天在回复中途停止。每个都会显示停止的位置，没有丢失任何内容。",
+        "reconnectShow": "显示聊天",
+        "originAutomation": "自动化",
+        "originOtherDevice": "其他设备",
+        "originServer": "在 {{value0}} 上创建",
+        "originUnknown": "来源未知",
         "selectWorkspace": "选择 {{value0}} 中的全部聊天",
         "workspaceSelectedCount": "{{value0}}/{{value1}}",
         "selectAll": "选择全部聊天",
diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session-reveal.test.ts b/src/renderer/src/lib/activate-ai-vault-structured-session-reveal.test.ts
index 0de7f0edb3a4..1bbf2a0bd8b8 100644
--- a/src/renderer/src/lib/activate-ai-vault-structured-session-reveal.test.ts
+++ b/src/renderer/src/lib/activate-ai-vault-structured-session-reveal.test.ts
@@ -42,6 +42,22 @@ beforeEach(() => {
 })
 
 describe('revealStructuredSession', () => {
+  it('asks the machine the caller names, under its pairing, never the workspace owner', async () => {
+    mocks.environmentIdFor.mockReturnValue('env-other')
+
+    await expect(
+      revealStructuredSession({ ...target, executionHostId: 'runtime:studio', pairingRevision: 7 })
+    ).resolves.toBe('revealed')
+
+    expect(mocks.environmentIdFor).not.toHaveBeenCalled()
+    expect(mocks.call).toHaveBeenCalledWith(
+      { kind: 'environment', environmentId: 'studio' },
+      'agentSession.reveal',
+      { sessionId: 'session-1' },
+      expect.objectContaining({ expectedEnvironmentPairingRevision: 7 })
+    )
+  })
+
   it('asks a local host without a capability round trip', async () => {
     // The renderer and its local host are one build, so probing would only cost a round trip on a
     // user's click to prove something already known.
diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session.test.ts b/src/renderer/src/lib/activate-ai-vault-structured-session.test.ts
index 1cf5ce751ae6..c01bc3915723 100644
--- a/src/renderer/src/lib/activate-ai-vault-structured-session.test.ts
+++ b/src/renderer/src/lib/activate-ai-vault-structured-session.test.ts
@@ -19,6 +19,69 @@ function deps(overrides: Partial<Parameters<typeof activateAiVaultStructuredSess
 }
 
 describe('activateAiVaultStructuredSession', () => {
+  // The resume dialog knows which machine listed the chat; it is asked, not whichever machine
+  // owns a workspace that happens to share the id.
+  it('asks the machine the caller names for both the refresh and the reveal', async () => {
+    const parts = deps({
+      activate: vi.fn().mockReturnValueOnce(false).mockReturnValueOnce(false).mockReturnValue(true)
+    })
+    const onServer = {
+      structuredSession: {
+        sessionId: 'session-1',
+        workspaceId: 'workspace-1',
+        executionHostId: 'runtime:studio' as const,
+        pairingRevision: 3
+      }
+    }
+
+    await expect(activateAiVaultStructuredSession(onServer, parts)).resolves.toBe(true)
+
+    expect(parts.refresh).toHaveBeenCalledWith('workspace-1', {
+      executionHostId: 'runtime:studio',
+      pairingRevision: 3
+    })
+    expect(parts.reveal).toHaveBeenCalledWith({
+      worktreeId: 'workspace-1',
+      sessionId: 'session-1',
+      executionHostId: 'runtime:studio',
+      pairingRevision: 3
+    })
+    // The tab is looked up, and focused, on that machine too.
+    expect(parts.activate).toHaveBeenLastCalledWith({
+      worktreeId: 'workspace-1',
+      sessionId: 'session-1',
+      executionHostId: 'runtime:studio',
+      pairingRevision: 3
+    })
+  })
+
+  it('treats the same session id on two machines as two activations, not one in flight', async () => {
+    const pending = Promise.withResolvers<void>()
+    const parts = deps({
+      activate: vi.fn(() => false),
+      refresh: vi.fn(() => pending.promise),
+      reveal: vi.fn(async () => 'gone' as const)
+    })
+    const here = activateAiVaultStructuredSession(
+      { structuredSession: { sessionId: 'session-1', workspaceId: 'workspace-1' } },
+      parts
+    )
+    const there = activateAiVaultStructuredSession(
+      {
+        structuredSession: {
+          sessionId: 'session-1',
+          workspaceId: 'workspace-1',
+          executionHostId: 'runtime:studio'
+        }
+      },
+      parts
+    )
+    // Settled before asserting, so a failure here never strands an activation for later cases.
+    pending.resolve()
+    await Promise.all([here, there])
+    expect(parts.refresh).toHaveBeenCalledTimes(2)
+  })
+
   it('refreshes an unpublished structured tab before activating it', async () => {
     const parts = deps({
       activate: vi.fn().mockReturnValueOnce(false).mockReturnValueOnce(true)
diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session.ts b/src/renderer/src/lib/activate-ai-vault-structured-session.ts
index becd74facb61..af3dd36f44f7 100644
--- a/src/renderer/src/lib/activate-ai-vault-structured-session.ts
+++ b/src/renderer/src/lib/activate-ai-vault-structured-session.ts
@@ -2,9 +2,12 @@ import { toast } from 'sonner'
 import type { AiVaultSession } from '../../../shared/ai-vault-types'
 import { translate } from '@/i18n/i18n'
 import { activateAndRevealWorktree } from './worktree-activation'
-import { activateStructuredAgentSessionById } from './structured-agent-session-tab-activation'
+import {
+  activateStructuredAgentSessionById,
+  structuredSessionMachineEnvironmentId,
+  type StructuredSessionMachine
+} from './structured-agent-session-tab-activation'
 import { useAppStore } from '@/store'
-import { getRuntimeEnvironmentIdForWorktree } from './worktree-runtime-owner'
 import {
   callRuntimeRpc,
   getActiveRuntimeTarget,
@@ -32,13 +35,19 @@ export type StructuredSessionRevealOutcome =
   | 'host-cannot-open'
   | 'unreachable'
 
+/** The machine holding the chat and the pairing it was listed under, when the caller knows them;
+ *  otherwise inferred from the workspace. Carried through every step, so no step re-derives it. */
+type StructuredSessionHost = StructuredSessionMachine
+
 type StructuredSessionActivationDeps = {
   activate: typeof activateStructuredAgentSessionById
-  refresh: (worktreeId: string) => Promise<void>
-  reveal: (target: {
-    worktreeId: string
-    sessionId: string
-  }) => Promise<StructuredSessionRevealOutcome>
+  refresh: (worktreeId: string, host?: StructuredSessionHost) => Promise<void>
+  reveal: (
+    target: {
+      worktreeId: string
+      sessionId: string
+    } & StructuredSessionHost
+  ) => Promise<StructuredSessionRevealOutcome>
   unavailable: () => void
   gone: () => void
   hostCannotOpen: () => void
@@ -96,7 +105,9 @@ const defaultDeps: StructuredSessionActivationDeps = {
  * the same reveal, or the same row answers a click and a drop differently.
  */
 export async function activateAiVaultStructuredSession(
-  session: Pick<AiVaultSession, 'structuredSession'>,
+  session: {
+    structuredSession?: AiVaultSession['structuredSession'] & StructuredSessionHost
+  },
   deps: StructuredSessionActivationDeps = defaultDeps
 ): Promise<boolean> {
   const structured = session.structuredSession
@@ -106,31 +117,41 @@ export async function activateAiVaultStructuredSession(
   // Why: the click can chain a refresh, a capability probe, a reveal and a second refresh, each
   // with its own timeout, and nothing on the row says it is working. Without this, an impatient
   // second click runs the whole sequence again and lands its own toast.
-  const inFlight = activationsInFlight.get(structured.sessionId)
+  // Keyed by machine too: the same session id on two machines is two different chats.
+  const key = `${structured.executionHostId ?? ''}\u0000${structured.sessionId}`
+  const inFlight = activationsInFlight.get(key)
   if (inFlight) {
     return inFlight
   }
   const activation = activateStructuredSession(structured, deps)
-  activationsInFlight.set(structured.sessionId, activation)
+  activationsInFlight.set(key, activation)
   try {
     return await activation
   } finally {
-    activationsInFlight.delete(structured.sessionId)
+    activationsInFlight.delete(key)
   }
 }
 
 const activationsInFlight = new Map<string, Promise<boolean>>()
 
 async function activateStructuredSession(
-  structured: NonNullable<AiVaultSession['structuredSession']>,
+  structured: NonNullable<AiVaultSession['structuredSession']> & StructuredSessionHost,
   deps: StructuredSessionActivationDeps
 ): Promise<boolean> {
-  const target = { worktreeId: structured.workspaceId, sessionId: structured.sessionId }
+  const host: StructuredSessionHost | undefined = structured.executionHostId
+    ? {
+        executionHostId: structured.executionHostId,
+        ...(structured.pairingRevision === undefined
+          ? {}
+          : { pairingRevision: structured.pairingRevision })
+      }
+    : undefined
+  const target = { worktreeId: structured.workspaceId, sessionId: structured.sessionId, ...host }
   if (!deps.activate(target)) {
     // A refresh alone can answer, and costs one call instead of two. It is only ever an
     // optimization, so a refresh that fails must fall through to the reveal rather than end the
     // click: the host republishing the tab is the repair, and it does not need this to have worked.
-    const refreshed = await refreshedWithoutThrowing(deps, structured.workspaceId)
+    const refreshed = await refreshedWithoutThrowing(deps, structured.workspaceId, host)
     if (!refreshed || !deps.activate(target)) {
       // The inventory genuinely does not carry this chat: it was closed, or this process never
       // published it. Ask the host to republish the tab from the record it still holds on disk.
@@ -146,7 +167,7 @@ async function activateStructuredSession(
         }
         return true
       }
-      await refreshedWithoutThrowing(deps, structured.workspaceId)
+      await refreshedWithoutThrowing(deps, structured.workspaceId, host)
       if (!deps.activate(target)) {
         deps.unavailable()
         return true
@@ -154,7 +175,11 @@ async function activateStructuredSession(
     }
   }
   if (useAppStore.getState().activeWorktreeId !== structured.workspaceId) {
-    activateAndRevealWorktree(structured.workspaceId)
+    if (host?.executionHostId) {
+      activateAndRevealWorktree(structured.workspaceId, { executionHostId: host.executionHostId })
+    } else {
+      activateAndRevealWorktree(structured.workspaceId)
+    }
   }
   return true
 }
@@ -163,10 +188,11 @@ async function activateStructuredSession(
  *  thrown end to the click. */
 async function refreshedWithoutThrowing(
   deps: StructuredSessionActivationDeps,
-  worktreeId: string
+  worktreeId: string,
+  host: StructuredSessionHost | undefined
 ): Promise<boolean> {
   try {
-    await deps.refresh(worktreeId)
+    await (host ? deps.refresh(worktreeId, host) : deps.refresh(worktreeId))
     return true
   } catch {
     return false
@@ -179,14 +205,17 @@ async function refreshedWithoutThrowing(
  * Only `revealed` means the tab is on its way. The other three are all terminal for this click, and
  * they are kept apart because the remedy differs: retry, give up, or update the host.
  */
-export async function revealStructuredSession(target: {
-  worktreeId: string
-  sessionId: string
-}): Promise<StructuredSessionRevealOutcome> {
-  const environmentId = getRuntimeEnvironmentIdForWorktree(
-    useAppStore.getState(),
-    target.worktreeId
-  )
+export async function revealStructuredSession(
+  target: {
+    worktreeId: string
+    sessionId: string
+  } & StructuredSessionHost
+): Promise<StructuredSessionRevealOutcome> {
+  const environmentId = structuredSessionMachineEnvironmentId(target, target.worktreeId)
+  const fence =
+    target.pairingRevision === undefined
+      ? {}
+      : { expectedEnvironmentPairingRevision: target.pairingRevision }
   const host = getActiveRuntimeTarget({ activeRuntimeEnvironmentId: environmentId })
   // Negotiated against the host that will answer this call, not the local one: a paired host runs
   // its own build, and its method-not-found is indistinguishable from a refusal we should surface.
@@ -222,7 +251,8 @@ export async function revealStructuredSession(target: {
         'agentSession.reveal',
         { sessionId: target.sessionId },
         {
-          timeoutMs: STRUCTURED_SESSION_RESTORE_TIMEOUT_MS
+          timeoutMs: STRUCTURED_SESSION_RESTORE_TIMEOUT_MS,
+          ...fence
         }
       )
     )
@@ -239,9 +269,11 @@ export async function revealStructuredSession(target: {
 
 type AgentSessionRevealReply = { ok?: boolean; refusal?: { code?: string } }
 
-async function refreshStructuredSessionTabs(worktreeId: string): Promise<void> {
-  const state = useAppStore.getState()
-  const environmentId = getRuntimeEnvironmentIdForWorktree(state, worktreeId)
+async function refreshStructuredSessionTabs(
+  worktreeId: string,
+  host?: StructuredSessionHost
+): Promise<void> {
+  const environmentId = structuredSessionMachineEnvironmentId(host, worktreeId)
   // Every other caller that applies an inventory fences it on the sync generation. Structured chat
   // can be switched off while this call is in flight, which wipes the mirror; without this the
   // answer would land afterwards and re-seed a chat row into a renderer that just discarded them.
@@ -251,7 +283,12 @@ async function refreshStructuredSessionTabs(worktreeId: string): Promise<void> {
       getActiveRuntimeTarget({ activeRuntimeEnvironmentId: environmentId }),
       'session.tabs.list',
       { worktree: toRuntimeWorktreeSelector(worktreeId) },
-      { timeoutMs: STRUCTURED_SESSION_RESTORE_TIMEOUT_MS }
+      {
+        timeoutMs: STRUCTURED_SESSION_RESTORE_TIMEOUT_MS,
+        ...(host?.pairingRevision === undefined
+          ? {}
+          : { expectedEnvironmentPairingRevision: host.pairingRevision })
+      }
     )
   )
   if (!isCurrentLocalStructuredSessionGeneration(generation)) {
diff --git a/src/renderer/src/lib/structured-agent-session-tab-activation.test.ts b/src/renderer/src/lib/structured-agent-session-tab-activation.test.ts
index 04b9ab5f2ca7..512b92c2d9bf 100644
--- a/src/renderer/src/lib/structured-agent-session-tab-activation.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-tab-activation.test.ts
@@ -132,4 +132,58 @@ describe('activateStructuredAgentSessionTab', () => {
       { worktree: 'id:wt-1', tabId: 'agent-session:session-1' }
     )
   })
+
+  // The resume dialog names the machine: a same-named workspace on another machine never answers,
+  // and the focus goes to that machine under the pairing the chat was listed with.
+  it('activates only the named machine’s tab, under the listed pairing', () => {
+    const elsewhere = {
+      id: 'structured-tab-1',
+      worktreeId: 'wt-1',
+      groupId: 'group-1',
+      contentType: 'agent-session',
+      entityId: 'session-1',
+      label: 'Codex Chat',
+      customLabel: null,
+      color: null,
+      sortOrder: 0,
+      createdAt: 0
+    } satisfies Tab
+    mocks.state = {
+      ...mocks.state,
+      unifiedTabsByWorktree: {
+        'wt-1': [{ ...elsewhere, id: 'local-tab', executionHostId: 'local' }]
+      }
+    }
+    expect(
+      activateStructuredAgentSessionById({
+        worktreeId: 'wt-1',
+        sessionId: 'session-1',
+        executionHostId: 'runtime:studio'
+      })
+    ).toBe(false)
+    mocks.state = {
+      ...mocks.state,
+      unifiedTabsByWorktree: {
+        'wt-1': [
+          { ...elsewhere, id: 'local-tab', executionHostId: 'local' },
+          { ...elsewhere, id: 'studio-tab', executionHostId: 'runtime:studio' }
+        ]
+      }
+    }
+    expect(
+      activateStructuredAgentSessionById({
+        worktreeId: 'wt-1',
+        sessionId: 'session-1',
+        executionHostId: 'runtime:studio',
+        pairingRevision: 4
+      })
+    ).toBe(true)
+    expect(mocks.activateTab).toHaveBeenCalledWith('studio-tab', { worktreeId: 'wt-1' })
+    expect(mocks.callRuntimeRpc).toHaveBeenLastCalledWith(
+      { kind: 'environment', environmentId: 'studio' },
+      'session.tabs.activate',
+      { worktree: 'id:wt-1', tabId: 'agent-session:session-1' },
+      { expectedEnvironmentPairingRevision: 4 }
+    )
+  })
 })
diff --git a/src/renderer/src/lib/structured-agent-session-tab-activation.ts b/src/renderer/src/lib/structured-agent-session-tab-activation.ts
index 1bec1d1e8437..90fcb81248b5 100644
--- a/src/renderer/src/lib/structured-agent-session-tab-activation.ts
+++ b/src/renderer/src/lib/structured-agent-session-tab-activation.ts
@@ -3,25 +3,54 @@ import { useAppStore } from '@/store'
 import { callRuntimeRpc, getActiveRuntimeTarget } from '@/runtime/runtime-rpc-client'
 import { toRuntimeWorktreeSelector } from '@/runtime/runtime-worktree-selector'
 import type { Tab } from '../../../shared/tab-types'
+import {
+  LOCAL_EXECUTION_HOST_ID,
+  parseExecutionHostId,
+  type ExecutionHostId
+} from '../../../shared/execution-host'
+
+/** The machine that holds the chat, when the caller knows it, and the pairing it was read under.
+ *  Absent, the machine is inferred from the workspace as before. */
+export type StructuredSessionMachine = {
+  executionHostId?: ExecutionHostId
+  pairingRevision?: number
+}
+
+/** The paired environment a named machine is, or null for this computer. */
+export function structuredSessionMachineEnvironmentId(
+  machine: StructuredSessionMachine | undefined,
+  worktreeId: string
+): string | null {
+  if (machine?.executionHostId) {
+    const parsed = parseExecutionHostId(machine.executionHostId)
+    return parsed?.kind === 'runtime' ? parsed.environmentId : null
+  }
+  return getRuntimeEnvironmentIdForWorktree(useAppStore.getState(), worktreeId)
+}
 
 export function findStructuredAgentSessionTab(
   unifiedTabsByWorktree: Readonly<Record<string, readonly Tab[]>>,
-  args: { workspaceId: string; sessionId: string }
+  args: { workspaceId: string; sessionId: string } & StructuredSessionMachine
 ): Tab | null {
   return (
     unifiedTabsByWorktree[args.workspaceId]?.find(
       (candidate) =>
         candidate.worktreeId === args.workspaceId &&
         candidate.contentType === 'agent-session' &&
-        candidate.entityId === args.sessionId
+        candidate.entityId === args.sessionId &&
+        // A named machine never matches another machine's tab under a shared workspace id.
+        (!args.executionHostId ||
+          (candidate.executionHostId ?? LOCAL_EXECUTION_HOST_ID) === args.executionHostId)
     ) ?? null
   )
 }
 
-export function activateStructuredAgentSessionTab(args: {
-  worktreeId: string
-  tabId: string
-}): boolean {
+export function activateStructuredAgentSessionTab(
+  args: {
+    worktreeId: string
+    tabId: string
+  } & StructuredSessionMachine
+): boolean {
   const state = useAppStore.getState()
   const tab = (state.unifiedTabsByWorktree[args.worktreeId] ?? []).find(
     (candidate) => candidate.id === args.tabId && candidate.contentType === 'agent-session'
@@ -32,27 +61,32 @@ export function activateStructuredAgentSessionTab(args: {
   state.focusGroup(args.worktreeId, tab.groupId)
   state.activateTab(tab.id, { worktreeId: args.worktreeId })
   state.setActiveTabType('agent-session', args.worktreeId)
-  const environmentId = getRuntimeEnvironmentIdForWorktree(state, args.worktreeId)
-  void callRuntimeRpc(
-    getActiveRuntimeTarget({ activeRuntimeEnvironmentId: environmentId }),
-    'session.tabs.activate',
-    {
-      worktree: toRuntimeWorktreeSelector(args.worktreeId),
-      tabId: `agent-session:${tab.entityId}`
-    }
-  )
+  const environmentId = structuredSessionMachineEnvironmentId(args, args.worktreeId)
+  const target = getActiveRuntimeTarget({ activeRuntimeEnvironmentId: environmentId })
+  const params = {
+    worktree: toRuntimeWorktreeSelector(args.worktreeId),
+    tabId: `agent-session:${tab.entityId}`
+  }
+  void (args.pairingRevision === undefined
+    ? callRuntimeRpc(target, 'session.tabs.activate', params)
+    : callRuntimeRpc(target, 'session.tabs.activate', params, {
+        // The pairing the chat was listed under; a re-paired machine is not asked.
+        expectedEnvironmentPairingRevision: args.pairingRevision
+      }))
   return true
 }
 
-export function activateStructuredAgentSessionById(args: {
-  worktreeId: string
-  sessionId: string
-}): boolean {
+export function activateStructuredAgentSessionById(
+  args: {
+    worktreeId: string
+    sessionId: string
+  } & StructuredSessionMachine
+): boolean {
+  const { worktreeId, sessionId, ...machine } = args
   const tab = findStructuredAgentSessionTab(useAppStore.getState().unifiedTabsByWorktree, {
-    workspaceId: args.worktreeId,
-    sessionId: args.sessionId
+    workspaceId: worktreeId,
+    sessionId,
+    ...machine
   })
-  return tab
-    ? activateStructuredAgentSessionTab({ worktreeId: args.worktreeId, tabId: tab.id })
-    : false
+  return tab ? activateStructuredAgentSessionTab({ worktreeId, tabId: tab.id, ...machine }) : false
 }
diff --git a/src/renderer/src/runtime/structured-agent-session-client.test.ts b/src/renderer/src/runtime/structured-agent-session-client.test.ts
index 2ecb463d1adf..437e269ea0db 100644
--- a/src/renderer/src/runtime/structured-agent-session-client.test.ts
+++ b/src/renderer/src/runtime/structured-agent-session-client.test.ts
@@ -107,6 +107,20 @@ describe('callStructuredAgentSession rewind capability', () => {
     })
   })
 
+  // The host answers once each continued chat's agent has started; the default 15 s would lose
+  // that answer on a paired server while the chats carry on.
+  it('gives a restart continue as long as a command, under its pairing fence', async () => {
+    await callStructuredAgentSession(target, 'agentSession.restartContinue', params, {
+      expectedEnvironmentPairingRevision: 3
+    })
+    expect(mocks.call).toHaveBeenCalledExactlyOnceWith(
+      target,
+      'agentSession.restartContinue',
+      params,
+      { timeoutMs: 195_000, expectedEnvironmentPairingRevision: 3 }
+    )
+  })
+
   it('does not dispatch rewind when host capability cannot be verified', async () => {
     mocks.supportsCapability.mockRejectedValue(new Error('Host unreachable'))
 
diff --git a/src/renderer/src/runtime/structured-agent-session-client.ts b/src/renderer/src/runtime/structured-agent-session-client.ts
index 1b7fb4db53e2..54e557315966 100644
--- a/src/renderer/src/runtime/structured-agent-session-client.ts
+++ b/src/renderer/src/runtime/structured-agent-session-client.ts
@@ -15,6 +15,7 @@ import {
   AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY,
   AGENT_SESSION_REWIND_RUNTIME_CAPABILITY,
   AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY,
+  AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY,
   type RuntimeCapability
 } from '../../../shared/protocol-version'
 import {
@@ -59,6 +60,23 @@ export function supportsStructuredAgentSessionQuietRepeatedStop(
   return structuredAgentSessionHostSupports(target, AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY)
 }
 
+/** Whether a paired server takes the restart-offer read on connect and named dismissal. A probe
+ *  that failed proves nothing either way, so it is `unknown`, never `unsupported`. */
+export async function pairedRestartOffersSupport(
+  environmentId: string
+): Promise<'supported' | 'unsupported' | 'unknown'> {
+  try {
+    return (await runtimeEnvironmentSupportsCapability(
+      environmentId,
+      AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY
+    ))
+      ? 'supported'
+      : 'unsupported'
+  } catch {
+    return 'unknown'
+  }
+}
+
 export function supportsStructuredAgentSessionQuestionAnswers(
   target: RuntimeClientTarget
 ): Promise<boolean> {
@@ -93,17 +111,26 @@ const STRUCTURED_AGENT_SESSION_METHOD_TIMEOUT_MS: ReadonlyMap<string, number> =
   ['agentSession.conversationCommand', AGENT_SESSION_CONVERSATION_COMMAND_TIMEOUT_MS],
   // The host may start an agent at rest before rewinding it, as it does for a command.
   ['agentSession.rewind', 195_000],
+  // The host answers once each continued chat's agent has started and taken the message.
+  ['agentSession.restartContinue', 195_000],
   // A waiting catalog read lasts as long as the host's listing: Claude's is 60 s, after up to 15 s
   // for an account switch to settle and 5 s of login-shell environment.
   ['agentSession.modelCatalog', 90_000]
 ])
 
+/** The pairing a caller's state was read under; a server re-paired since is refused before the
+ *  call is sent (`runtime_environment_changed`) instead of acting on another server's state. */
+export type StructuredAgentSessionCallFence = {
+  expectedEnvironmentPairingRevision?: number
+}
+
 export async function callStructuredAgentSession<TResult>(
   target: RuntimeClientTarget,
   method: string,
   params?: unknown,
-  /** For a caller that checked the remote host's compatibility itself, just before. */
-  options: { skipCompatibilityCheck?: true } = {}
+  /** A fence refuses the call once the server is re-paired; a caller that checked the remote host's
+   *  compatibility itself, just before, may skip that check. */
+  options: StructuredAgentSessionCallFence & { skipCompatibilityCheck?: true } = {}
 ): Promise<TResult> {
   if (
     method === 'agentSession.rewind' &&
@@ -116,12 +143,10 @@ export async function callStructuredAgentSession<TResult>(
     throw new Error('Rewinding requires a newer Orca server. Update the server and try again.')
   }
   const timeoutMs = STRUCTURED_AGENT_SESSION_METHOD_TIMEOUT_MS.get(method)
-  return timeoutMs === undefined && !options.skipCompatibilityCheck
+  const callOptions = { ...(timeoutMs === undefined ? {} : { timeoutMs }), ...options }
+  return Object.keys(callOptions).length === 0
     ? callRuntimeRpc<TResult>(target, method, params)
-    : callRuntimeRpc<TResult>(target, method, params, {
-        ...(timeoutMs === undefined ? {} : { timeoutMs }),
-        ...options
-      })
+    : callRuntimeRpc<TResult>(target, method, params, callOptions)
 }
 
 async function subscribeStructuredAgentSessionMethod<TEvent>(
diff --git a/src/shared/protocol-version.ts b/src/shared/protocol-version.ts
index 225b9d23364e..a7485f717b47 100644
--- a/src/shared/protocol-version.ts
+++ b/src/shared/protocol-version.ts
@@ -255,6 +255,14 @@ export const CLAUDE_STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY =
 // older host leaves the message rail on loaded messages instead of answering method_not_found.
 export const AGENT_SESSION_CONVERSATION_OUTLINE_RUNTIME_CAPABILITY =
   'agent-session.conversation-outline.v1' as const
+// Why: a paired desktop may ask a host for its restart offers on every connection only when the
+// host answers that read without building its chat host (a server that never ran a chat stays
+// untouched), and may dismiss there only when the host takes named chats: an older host's dismiss
+// params were strict and empty, and its only dismissal deleted every device's offers. It also
+// promises `offers` witnesses on dismiss and a per-row `origin` for the asking device. A host
+// without this is never asked by a paired desktop.
+export const AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY =
+  'agent-session.paired-restart-offers.v1' as const
 // The RPC is registered unconditionally; per-session rewind support is a separate check.
 export const AGENT_SESSION_REWIND_RUNTIME_CAPABILITY = 'agent-session.rewind.v1' as const
 // Why: the rewind UI relies on the next send settling an in-doubt rewind, even with the agent up.
@@ -401,6 +409,7 @@ export const RUNTIME_CAPABILITIES = [
   AGENT_SESSION_REWIND_RUNTIME_CAPABILITY,
   AGENT_SESSION_REWIND_RECOVERY_CAPABILITY,
   AGENT_SESSION_CONVERSATION_OUTLINE_RUNTIME_CAPABILITY,
+  AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY,
   AGENT_SESSION_BACKGROUND_TASK_STOP_CAPABILITY,
   AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY,
   AGENT_SESSION_ATTACHMENTS_RUNTIME_CAPABILITY,
diff --git a/src/shared/restart-offer-origin.test.ts b/src/shared/restart-offer-origin.test.ts
new file mode 100644
index 000000000000..cd7316764046
--- /dev/null
+++ b/src/shared/restart-offer-origin.test.ts
@@ -0,0 +1,51 @@
+import { describe, expect, it } from 'vitest'
+import { restartOfferOrigin } from './restart-offer-origin'
+import type { AutomationWorkspaceProvenance } from './worktree/types'
+
+const ME = 'device-me'
+const AUTOMATION: AutomationWorkspaceProvenance = {
+  kind: 'created-by-automation',
+  automationId: 'automation-1',
+  automationNameSnapshot: 'Nightly dependency bump',
+  automationRunId: 'run-1',
+  automationRunTitleSnapshot: 'Nightly',
+  createdAt: 1,
+  executionTargetType: 'local',
+  executionTargetId: 'local',
+  projectId: 'project-1'
+}
+
+describe('whose interrupted chat this is', () => {
+  it('for a paired desktop, follows the sidebar: its own device, the server, or another device', () => {
+    const mine = { creatorProvenance: { kind: 'paired-device' as const, deviceId: ME } }
+    expect(restartOfferOrigin(mine, ME)).toBe('own')
+    expect(
+      restartOfferOrigin({ creatorProvenance: { kind: 'paired-device', deviceId: 'other' } }, ME)
+    ).toBe('other-device')
+    expect(restartOfferOrigin({ creatorProvenance: { kind: 'host' } }, ME)).toBe('server-made')
+  })
+
+  // The sidebar shows a workspace with no creator record (a repo's main checkout, one made before
+  // Orca recorded creators) as the user's; its interrupted chats are theirs the same way.
+  it('for a paired desktop, counts a workspace with no creator record as its own', () => {
+    expect(restartOfferOrigin(undefined, ME)).toBe('own')
+    expect(restartOfferOrigin({}, ME)).toBe('own')
+  })
+
+  it('calls an automation’s workspace an automation’s, for any viewer', () => {
+    const robot = {
+      creatorProvenance: { kind: 'paired-device' as const, deviceId: ME },
+      automationProvenance: AUTOMATION
+    }
+    expect(restartOfferOrigin(robot, ME)).toBe('automation')
+    expect(restartOfferOrigin(robot, null)).toBe('automation')
+  })
+
+  it('for the host’s own user, is theirs unless a paired device made the workspace', () => {
+    expect(restartOfferOrigin(undefined, null)).toBe('own')
+    expect(restartOfferOrigin({ creatorProvenance: { kind: 'host' } }, null)).toBe('own')
+    expect(
+      restartOfferOrigin({ creatorProvenance: { kind: 'paired-device', deviceId: 'phone' } }, null)
+    ).toBe('other-device')
+  })
+})
diff --git a/src/shared/restart-offer-origin.ts b/src/shared/restart-offer-origin.ts
new file mode 100644
index 000000000000..9024d7cb7999
--- /dev/null
+++ b/src/shared/restart-offer-origin.ts
@@ -0,0 +1,38 @@
+import type { Worktree } from './worktree/types'
+import { workspaceCreatorRelation } from './workspace-creator-provenance'
+
+/**
+ * Whose interrupted chat a restart offer is, from the asking device's side, decided per WORKSPACE
+ * by the same rule the sidebar uses for "workspaces from other devices". Only `own` is ticked by
+ * default, announced, or continued without asking.
+ */
+export const RESTART_OFFER_ORIGINS = ['own', 'other-device', 'automation', 'server-made'] as const
+
+export type RestartOfferOrigin = (typeof RESTART_OFFER_ORIGINS)[number]
+
+export type RestartOfferWorkspaceProvenance = Pick<
+  Worktree,
+  'creatorProvenance' | 'automationProvenance'
+>
+
+/** `viewerDeviceId` null is the host's own user; an unknown workspace has no record, so it is theirs. */
+export function restartOfferOrigin(
+  workspace: RestartOfferWorkspaceProvenance | undefined,
+  viewerDeviceId: string | null
+): RestartOfferOrigin {
+  if (workspace?.automationProvenance?.kind === 'created-by-automation') {
+    return 'automation'
+  }
+  switch (workspaceCreatorRelation(workspace?.creatorProvenance, viewerDeviceId)) {
+    case 'viewer':
+      return 'own'
+    case 'host':
+      return 'server-made'
+    case 'other-device':
+      return 'other-device'
+  }
+}
+
+export function parseRestartOfferOrigin(value: unknown): RestartOfferOrigin | undefined {
+  return RESTART_OFFER_ORIGINS.find((origin) => origin === value)
+}
diff --git a/src/shared/rpc-contract/rpc-params-catalog.generated.ts b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
index ce0481c1f171..c1c6c18f53ec 100644
--- a/src/shared/rpc-contract/rpc-params-catalog.generated.ts
+++ b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
@@ -505,8 +505,6 @@ import {
   QueuedMessagesResumeParams,
   RespondParams,
   RespondToQuestionParams,
-  RestartResumableParams,
-  RestartResumeParams,
   RewindParams,
   SendParams,
   SetOptionParams,
@@ -515,6 +513,11 @@ import {
   ThreadGoalParams,
   UnsubscribeParams
 } from './structured-agent-session-params'
+import {
+  RestartDismissParams,
+  RestartResumableParams,
+  RestartResumeParams
+} from './structured-agent-session-restart-params'
 import { TerminalAdoptOrphans } from './terminal-orphan-params'
 import { TerminalQuickCommandsUpdate } from './terminal-quick-command-params'
 import {
@@ -630,7 +633,7 @@ export const RPC_PARAMS_BY_METHOD = {
   'agentSession.respondToQuestion': RespondToQuestionParams,
   'agentSession.restartContinue': RestartResumeParams,
   'agentSession.restartResumable': RestartResumableParams,
-  'agentSession.restartResumableDismiss': RestartResumableParams,
+  'agentSession.restartResumableDismiss': RestartDismissParams,
   'agentSession.restartResume': RestartResumeParams,
   'agentSession.reveal': OptionsParams,
   'agentSession.rewind': RewindParams,
diff --git a/src/shared/rpc-contract/structured-agent-session-params.ts b/src/shared/rpc-contract/structured-agent-session-params.ts
index d3ed6283c48a..67235090a631 100644
--- a/src/shared/rpc-contract/structured-agent-session-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session-params.ts
@@ -37,9 +37,6 @@ export const MAX_BLOCKS = 64
 
 export const MAX_OPTION_LABEL = 512
 
-/** One relaunch cannot offer more chats than a profile plausibly holds. */
-export const MAX_RESTART_RESUME_SESSIONS = 512
-
 export const MutationEnvelope = z
   .object({
     sessionId: SessionId,
@@ -336,20 +333,6 @@ export const HoldParams = z
   .object({ sessionId: SessionId, holderId: Identifier('Invalid holder id') })
   .strict()
 
-/** A launch's offer to resume what the last teardown recorded as working; the set is the host's to
- *  derive, never a client's to assert. Listing takes nothing. Dismissing takes the sessions to
- *  forget, or nothing to forget them all; a client only ever names sessions the host itself listed,
- *  so an older host that rejects the key is never asked to. */
-export const RestartResumableParams = z
-  .object({ sessionIds: z.array(SessionId).max(MAX_RESTART_RESUME_SESSIONS).optional() })
-  .strict()
-
-/** Omitting `sessionIds` takes the whole offered set; naming them takes that subset. Either way the
- *  host re-derives eligibility, so an id a client invents is simply not in the set. */
-export const RestartResumeParams = z
-  .object({ sessionIds: z.array(SessionId).max(MAX_RESTART_RESUME_SESSIONS).optional() })
-  .strict()
-
 export const HistoryParams = z
   .object({
     sessionId: SessionId,
diff --git a/src/shared/rpc-contract/structured-agent-session-restart-params.ts b/src/shared/rpc-contract/structured-agent-session-restart-params.ts
new file mode 100644
index 000000000000..3ee3b100543d
--- /dev/null
+++ b/src/shared/rpc-contract/structured-agent-session-restart-params.ts
@@ -0,0 +1,34 @@
+import { z } from 'zod'
+import { SessionId } from './structured-agent-session-params'
+
+// Wire validation for the restart-resume offer: listing, dismissing and acting on it.
+
+/** One relaunch cannot offer more chats than a profile plausibly holds. */
+export const MAX_RESTART_RESUME_SESSIONS = 512
+
+/** A launch's offer to resume what the last teardown recorded as working; the set is the host's to
+ *  derive, never a client's to assert. Listing takes nothing. Dismissing takes the sessions to
+ *  forget, or nothing to forget them all; a client only ever names sessions the host itself listed,
+ *  so an older host that rejects the key is never asked to. */
+export const RestartResumableParams = z.strictObject({
+  sessionIds: z.array(SessionId).max(MAX_RESTART_RESUME_SESSIONS).optional()
+})
+
+/** Dismissing: `sessionIds` as before, or `offers` naming each chat with the interruption the
+ *  client listed. A host that reads `offers` forgets only records still matching them and leaves a
+ *  chat another action is resuming; it is sent only to a host advertising paired restart offers,
+ *  and `sessionIds` rides along for one that predates `offers`. */
+export const RestartDismissParams = z.strictObject({
+  sessionIds: z.array(SessionId).max(MAX_RESTART_RESUME_SESSIONS).optional(),
+  // A Zod 4 number is finite already.
+  offers: z
+    .array(z.strictObject({ sessionId: SessionId, recordedAt: z.number() }))
+    .max(MAX_RESTART_RESUME_SESSIONS)
+    .optional()
+})
+
+/** Omitting `sessionIds` takes the whole offered set; naming them takes that subset. Either way the
+ *  host re-derives eligibility, so an id a client invents is simply not in the set. */
+export const RestartResumeParams = z.strictObject({
+  sessionIds: z.array(SessionId).max(MAX_RESTART_RESUME_SESSIONS).optional()
+})
diff --git a/src/shared/workspace-creator-provenance.ts b/src/shared/workspace-creator-provenance.ts
index 7fe2802f6074..e12f98732196 100644
--- a/src/shared/workspace-creator-provenance.ts
+++ b/src/shared/workspace-creator-provenance.ts
@@ -19,3 +19,22 @@ export function normalizeWorkspaceCreatorProvenance(
   }
   return undefined
 }
+
+/** Who made a workspace, from one viewer's side: the viewer themselves, the host machine's own user,
+ *  or another paired device. `viewerDeviceId` null is the host's own user. A workspace with no
+ *  creator record is the viewer's: the sidebar shows it as theirs. */
+export type WorkspaceCreatorRelation = 'viewer' | 'host' | 'other-device'
+
+export function workspaceCreatorRelation(
+  value: unknown,
+  viewerDeviceId: string | null
+): WorkspaceCreatorRelation {
+  const creator = normalizeWorkspaceCreatorProvenance(value)
+  if (!creator) {
+    return 'viewer'
+  }
+  if (creator.kind === 'host') {
+    return viewerDeviceId === null ? 'viewer' : 'host'
+  }
+  return creator.deviceId === viewerDeviceId ? 'viewer' : 'other-device'
+}
diff --git a/tests/e2e/cross-version-wire/cross-version-restart-offers.unit.test.ts b/tests/e2e/cross-version-wire/cross-version-restart-offers.unit.test.ts
new file mode 100644
index 000000000000..b6664283b984
--- /dev/null
+++ b/tests/e2e/cross-version-wire/cross-version-restart-offers.unit.test.ts
@@ -0,0 +1,94 @@
+// A paired desktop asks a server for its restart offers on every connection and dismisses them
+// there by name and listed interruption, but only where the server advertises it can: an older server builds its chat host
+// to answer the read, and its strict, empty dismiss params refuse names — its only dismissal
+// deletes every device's offers.
+
+import { beforeAll, describe, expect, it } from 'vitest'
+import { RuntimeSubscriptionRegistry } from '../../../src/main/runtime/runtime-subscription-registry'
+import { AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY } from '../../../src/shared/protocol-version'
+import { resolveBaselineReleaseRef } from './release-checkout'
+import { installableHost, structuredHostStub } from './structured-agent-session-host-fixture'
+import { SESSION, WORKSPACE } from './structured-agent-session-surface-manifest'
+import {
+  loadAgentSessionWireBuild,
+  WORKING_TREE,
+  type AgentSessionWireBuild,
+  type RpcReply
+} from './versioned-agent-session-wire'
+
+// Why: a cold CI run extracts the baseline checkout before the first pairing.
+const SUITE_TIMEOUT_MS = 180_000
+
+let current: AgentSessionWireBuild
+let baseline: AgentSessionWireBuild
+
+beforeAll(async () => {
+  current = await loadAgentSessionWireBuild(WORKING_TREE)
+  baseline = await loadAgentSessionWireBuild(resolveBaselineReleaseRef())
+}, SUITE_TIMEOUT_MS)
+
+function runtimeStub(): unknown {
+  const subscriptions = new RuntimeSubscriptionRegistry()
+  return {
+    getRuntimeId: () => 'runtime-1',
+    getClientSettings: () => ({ experimentalStructuredNativeChat: true }),
+    ensureStructuredAgentSessionHost: async () => undefined,
+    registerSubscriptionCleanup: subscriptions.register.bind(subscriptions),
+    registerOwnedSubscriptionCleanup: subscriptions.registerOwned.bind(subscriptions),
+    cleanupSubscription: subscriptions.cleanup.bind(subscriptions),
+    cleanupSubscriptionsByPrefix: subscriptions.cleanupByPrefix.bind(subscriptions)
+  }
+}
+
+async function dismissNamed(
+  build: AgentSessionWireBuild,
+  params: Record<string, unknown> = { sessionIds: [SESSION] }
+): Promise<RpcReply[]> {
+  const replies: RpcReply[] = []
+  await build.createDispatcher(runtimeStub()).dispatchStreaming(
+    {
+      id: 'request-dismiss',
+      authToken: 'cross-version-token',
+      method: 'agentSession.restartResumableDismiss',
+      params
+    },
+    (raw) => replies.push(JSON.parse(raw)),
+    { clientKind: 'runtime', clientCapabilities: current.capabilities }
+  )
+  return replies
+}
+
+describe('paired restart offers across versions', () => {
+  // A build may accept names without advertising; it must never advertise without.
+  it(
+    'is advertised only where a dismiss naming chats is accepted and reaches only those',
+    async () => {
+      for (const build of [current, baseline]) {
+        if (!build.capabilities.includes(AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY)) {
+          continue
+        }
+        const hostCalls = structuredHostStub(SESSION, WORKSPACE)
+        await build.installStructuredHost(installableHost(hostCalls))
+        try {
+          const replies = await dismissNamed(build)
+          expect(replies, `${build.label}: a dismiss naming a chat`).toHaveLength(1)
+          expect(replies[0], `${build.label}: a dismiss naming a chat`).toMatchObject({ ok: true })
+          // Only the names are compared: a newer host also passes the caller's audience.
+          expect(hostCalls.restartResumableDismiss.mock.calls[0]?.[0]).toEqual([SESSION])
+          // A desktop names each chat with the interruption it listed; `sessionIds` rides along.
+          const listed = [{ sessionId: SESSION, recordedAt: 1 }]
+          const witnessed = await dismissNamed(build, { sessionIds: [SESSION], offers: listed })
+          expect(witnessed[0], `${build.label}: a dismiss naming listed offers`).toMatchObject({
+            ok: true
+          })
+          expect(hostCalls.restartResumableDismissListed.mock.calls[0]?.[0]).toEqual(listed)
+          expect(hostCalls.restartResumableDismiss).toHaveBeenCalledTimes(1)
+        } finally {
+          await build.installStructuredHost(null)
+        }
+      }
+      expect(current.capabilities).toContain(AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY)
+    },
+    SUITE_TIMEOUT_MS
+  )
+})
diff --git a/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts b/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
index 949457d4f63a..84c5b3ec87ce 100644
--- a/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
+++ b/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
@@ -22,6 +22,7 @@ export function structuredHostStub(
     restartResumableList: vi.fn(async () => []),
     restartResumableFailures: vi.fn(async () => []),
     restartResumableDismiss: vi.fn(async () => 0),
+    restartResumableDismissListed: vi.fn(async () => 0),
     restartResumeAll: vi.fn(async () => []),
     restartContinueAll: vi.fn(async () => ({ resumed: [], continued: [] })),
     continueInterrupted: vi.fn(async () => ({ sessionId, outcome: 'superseded' })),
@@ -116,6 +117,7 @@ export function installableHost(
       list: hostCalls.restartResumableList,
       listFailures: hostCalls.restartResumableFailures,
       dismiss: hostCalls.restartResumableDismiss,
+      dismissListed: hostCalls.restartResumableDismissListed,
       resume: hostCalls.restartResumeAll,
       continueAfterRestart: hostCalls.restartContinueAll,
       continueInterrupted: hostCalls.continueInterrupted

From 3445654565a14a2f1e45fa5433cd4440e7873ca1 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 17:58:46 -0700
Subject: [PATCH 28/37] fix(native-chat): a resume dialog request always has
 something to draw; toasts follow what is drawn

Clicking the "Resuming" status entry while a read racing that resume had
listed nothing created a dialog request with nothing to draw. Nothing
ended it, a later server's restart toast was held back for it, and the
stale request then opened the dialog by itself over the new rows.

The opener now asks only when some machine has rows to list (a running
resume keeps its machine's rows listed until it answers), and an emptied
listing still ends any request. The dialog reports when it is actually
drawn, and the reconnect toast is held back only then.
---
 ...ChatResumeOnRestartModal.machines.test.tsx | 88 ++++++++++++++++++-
 .../native-chat-restart-offer-reopen.ts       |  4 +-
 ...native-chat-restart-offer-triggers.test.ts | 15 +++-
 .../native-chat-restart-offer-triggers.ts     |  4 +-
 .../native-chat-resume-dialog-opening.ts      |  5 ++
 .../native-chat-resume-on-restart-dialog.ts   | 13 +++
 6 files changed, 122 insertions(+), 7 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.machines.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.machines.test.tsx
index aab37cc444b0..4abe4320c596 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.machines.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.machines.test.tsx
@@ -17,6 +17,8 @@ import {
 } from './native-chat-resume-on-restart-dialog'
 import { requestLaunchResumePrompt } from './native-chat-resume-on-restart-launch-prompt'
 import { readNativeChatRestartMachine } from './native-chat-resume-on-restart-store'
+import { continueNativeChatRestartOffers } from './native-chat-restart-offer-actions'
+import { reopenNativeChatRestartOffer } from './native-chat-restart-offer-reopen'
 import { _resetNativeChatRestartOffer } from './native-chat-restart-offer-triggers'
 import { pairedEnvironment } from './native-chat-restart-offer-test-support'
 import { lastToastShow } from './native-chat-resume-toast.test-support'
@@ -236,14 +238,22 @@ it('locks only the machine whose resume is still running', async () => {
 
 // The launch read joining a dialog the user opened must not move its focus.
 it("keeps the user's ticks and open machine when this computer's launch read lands", async () => {
+  // Only the server is listed when the user opens it; this computer's read answers afterwards.
+  localRows = []
   await stage({ studio: [row('s1', 'own'), row('s2', 'own')] })
   await open('environment:studio')
-  expect(button('Resume 3 chats')).toBeTruthy()
+  expect(button('Resume 2 chats')).toBeTruthy()
   await act(async () => machineToggle('studio-mac').click())
-  expect(button('Resume 1 chat')).toBeTruthy()
+  expect(button('Resume 0 chats')).toBeTruthy()
+
+  localRows = [row('l1', 'own')]
+  await act(async () => void (await readNativeChatRestartMachine({ kind: 'local' })))
   await act(async () => requestLaunchResumePrompt())
   expect(getNativeChatResumeOnRestartDialogRequest()).toEqual({ focus: 'environment:studio' })
+  // This computer joins the open dialog with its chat ticked; the server's unticks stay.
+  expect(machineRow('Local')).toBeTruthy()
   expect(button('Resume 1 chat')).toBeTruthy()
+  expect(machineToggle('studio-mac').getAttribute('data-state')).toBe('unchecked')
   expect(machineRow('studio-mac').getAttribute('aria-expanded')).toBe('true')
 })
 
@@ -349,6 +359,80 @@ it('opens this computer’s offer after a server-only dialog the user closed', a
   expect(document.querySelector('[role="dialog"]')?.textContent).toContain('Prompt l1')
 })
 
+// The open dialog lists a server's restart as it lands, so no toast repeats it.
+it('raises no restart toast for a server whose chats land in the open dialog', async () => {
+  window.localStorage.clear()
+  await stage({})
+  await open('local')
+  vi.mocked(toast).mockClear()
+  await stage({ studio: [row('s1', 'own')] })
+  expect(toast).not.toHaveBeenCalled()
+  expect(document.querySelector('[role="dialog"]')?.textContent).toContain('studio-mac')
+})
+
+// A "Resuming" click while a concurrent read lists nothing opens nothing and leaves nothing behind:
+// once that resume's answer is lost, a later server's restart still gets its toast and does not
+// open the dialog by itself.
+it('leaves no unseen request behind a Resuming click with nothing listed', async () => {
+  window.localStorage.clear()
+  localRows = []
+  await stage({ studio: [row('s1', 'own')] })
+  await act(async () =>
+    root.render(
+      <TooltipProvider>
+        <NativeChatResumeOnRestartModal />
+      </TooltipProvider>
+    )
+  )
+  const continued = Promise.withResolvers<unknown>()
+  let serverRows: Record<string, ResumeCandidate[]> = { studio: [] }
+  let studioReadsFail = false
+  rpc.mockImplementation(async (target, method) => {
+    if (method === 'agentSession.restartContinue') {
+      return continued.promise
+    }
+    if (target.kind === 'local') {
+      return { sessions: localRows }
+    }
+    if (studioReadsFail && target.environmentId === 'studio') {
+      throw new Error('offline')
+    }
+    return { sessions: serverRows[target.environmentId] ?? [] }
+  })
+  const studio = { kind: 'environment' as const, environmentId: 'studio' }
+  // 1-2. The server's only chat starts resuming; a read racing it lists nothing.
+  let resume = Promise.resolve()
+  await act(async () => {
+    resume = continueNativeChatRestartOffers([
+      { machine: 'environment:studio', sessionIds: ['s1'] }
+    ])
+  })
+  await act(async () => void (await readNativeChatRestartMachine(studio)))
+  // 3. The status entry's "Resuming" click: nothing to list, so nothing opens.
+  await act(async () => reopenNativeChatRestartOffer())
+  expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
+  expect(document.querySelector('[role="dialog"]')).toBeNull()
+  // 4. The answer is lost and its re-read fails.
+  studioReadsFail = true
+  await act(async () => {
+    continued.reject(new Error('lost'))
+    await resume
+  })
+  // 5. Another server restarts with the user's chat.
+  studioReadsFail = false
+  serverRows = { studio: [], build: [row('b1', 'own')] }
+  vi.mocked(toast).mockClear()
+  await act(
+    async () =>
+      void (await readNativeChatRestartMachine({ kind: 'environment', environmentId: 'build' }))
+  )
+  expect(vi.mocked(toast).mock.calls.map(([title]) => title)).toEqual([
+    'build-box restarted for an update'
+  ])
+  expect(document.querySelector('[role="dialog"]')).toBeNull()
+  expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
+})
+
 // The server's provider refused to carry the chat on: the host files the failure and lists it. One
 // toast says so and opens that server's list, where the row's Retry ends in one toast of its own.
 it('reports a chat a server could not carry on once, opens it on that server, and retries it', async () => {
diff --git a/src/renderer/src/components/native-chat-restart-offer-reopen.ts b/src/renderer/src/components/native-chat-restart-offer-reopen.ts
index b797542788b3..cc151bd4452c 100644
--- a/src/renderer/src/components/native-chat-restart-offer-reopen.ts
+++ b/src/renderer/src/components/native-chat-restart-offer-reopen.ts
@@ -60,7 +60,9 @@ export async function reopenNativeChatRestartOffer(
   if (getNativeChatRestartResuming().size === 0) {
     await Promise.all(machines.filter(readableNow).map(readForClick))
   }
-  if (getNativeChatRestartResuming().size > 0 || getNativeChatRestartOffers().size > 0) {
+  // Only over rows: a dialog with nothing to list draws nothing, and a request nothing draws would
+  // stay open unseen. A resume still running keeps its machine's rows listed until it answers.
+  if (getNativeChatRestartOffers().size > 0) {
     requestNativeChatResumeOnRestartDialog(focusOf(machines))
   }
 }
diff --git a/src/renderer/src/components/native-chat-restart-offer-triggers.test.ts b/src/renderer/src/components/native-chat-restart-offer-triggers.test.ts
index 76dbb461341e..8758d8046801 100644
--- a/src/renderer/src/components/native-chat-restart-offer-triggers.test.ts
+++ b/src/renderer/src/components/native-chat-restart-offer-triggers.test.ts
@@ -9,6 +9,7 @@ import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
 import {
   consumeNativeChatResumeOnRestartDialogRequest,
   getNativeChatResumeOnRestartDialogRequest,
+  setNativeChatResumeDialogShowing,
   requestNativeChatResumeOnRestartDialog
 } from './native-chat-resume-on-restart-dialog'
 import {
@@ -307,13 +308,21 @@ it('continues an interruption at most once per run when storage refuses writes a
   }
 })
 
-// The dialog opens as soon as it is asked for, and lists every machine: no toast repeats it.
-it('raises no toast while a resume dialog is open, which lists the server too', async () => {
+// A dialog on screen lists every machine: no toast repeats it. The dialog reports itself drawn.
+it('raises no toast while a resume dialog is on screen, which lists the server too', async () => {
   requestNativeChatResumeOnRestartDialog('local')
+  setNativeChatResumeDialogShowing(true)
   await connect({ runtimeId: 'r2' })
   expect(toast).not.toHaveBeenCalled()
 })
 
+// A request alone is not a dialog the user sees: one nothing draws must not swallow the toast.
+it('still announces a paired interruption while a request is pending but no dialog is drawn', async () => {
+  requestNativeChatResumeOnRestartDialog('local')
+  await connect({ runtimeId: 'r2' })
+  expect(toastTitles()).toEqual(['studio-mac restarted for an update'])
+})
+
 it('announces a paired interruption once no resume dialog is open', async () => {
   await connect({ runtimeId: 'r2' })
   expect(toastTitles()).toEqual(['studio-mac restarted for an update'])
@@ -339,8 +348,10 @@ it('forgets the old pairing’s rows as soon as the saved record is re-paired',
 
 it('decides what an open dialog already shows without a toast', async () => {
   requestNativeChatResumeOnRestartDialog(null)
+  setNativeChatResumeDialogShowing(true)
   await connect({ runtimeId: 'r2' })
   expect(toast).not.toHaveBeenCalled()
+  setNativeChatResumeDialogShowing(false)
   consumeNativeChatResumeOnRestartDialogRequest()
   await readNativeChatRestartMachine(TARGET)
   expect(toast).not.toHaveBeenCalled()
diff --git a/src/renderer/src/components/native-chat-restart-offer-triggers.ts b/src/renderer/src/components/native-chat-restart-offer-triggers.ts
index 6305d44b3080..bf9c7941db99 100644
--- a/src/renderer/src/components/native-chat-restart-offer-triggers.ts
+++ b/src/renderer/src/components/native-chat-restart-offer-triggers.ts
@@ -27,7 +27,7 @@ import { requestLaunchResumePrompt } from './native-chat-resume-on-restart-launc
 import { markNativeChatLaunchResumeDecided } from './native-chat-launch-resume-decision'
 import {
   _resetNativeChatResumeOnRestartDialog,
-  getNativeChatResumeOnRestartDialogRequest
+  isNativeChatResumeDialogShowing
 } from './native-chat-resume-on-restart-dialog'
 import {
   _resetRestartDecidedMemory,
@@ -140,7 +140,7 @@ function decidePairedAnswer(target: RuntimeClientTarget, candidates: readonly Re
     fresh.map(restartInterruptionKey)
   )
   // A resume dialog on screen lists every machine: what it shows needs no toast.
-  if (fresh.length === 0 || getNativeChatResumeOnRestartDialogRequest() !== null) {
+  if (fresh.length === 0 || isNativeChatResumeDialogShowing()) {
     return
   }
   if (autoResumeEnabled()) {
diff --git a/src/renderer/src/components/native-chat-resume-dialog-opening.ts b/src/renderer/src/components/native-chat-resume-dialog-opening.ts
index 7a78137d7990..00814c670822 100644
--- a/src/renderer/src/components/native-chat-resume-dialog-opening.ts
+++ b/src/renderer/src/components/native-chat-resume-dialog-opening.ts
@@ -2,6 +2,7 @@ import { useEffect, useSyncExternalStore } from 'react'
 import { useNativeChatRestartOfferEnabled } from './native-chat-restart-offer-gate'
 import {
   getNativeChatResumeOnRestartDialogRequest,
+  setNativeChatResumeDialogShowing,
   subscribeNativeChatResumeOnRestartDialog,
   type NativeChatResumeOnRestartDialogRequest
 } from './native-chat-resume-on-restart-dialog'
@@ -36,6 +37,10 @@ export function useNativeChatResumeDialogOpening(): {
   // What the open dialog shows is decided: a later read of a paired server does not announce it,
   // and a restart toast still up goes, since the dialog lists its chats and blocks clicks on it.
   const showing = request !== null && machines.length > 0
+  useEffect(() => {
+    setNativeChatResumeDialogShowing(showing)
+    return () => setNativeChatResumeDialogShowing(false)
+  }, [showing])
   useEffect(() => {
     if (!showing) {
       return
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-dialog.ts b/src/renderer/src/components/native-chat-resume-on-restart-dialog.ts
index 5390c80b7c1d..c23ccd54cd17 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-dialog.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-dialog.ts
@@ -6,6 +6,8 @@ export type NativeChatResumeOnRestartDialogRequest = Readonly<{
 }>
 
 let pending: NativeChatResumeOnRestartDialogRequest | null = null
+/** Whether the dialog is drawn right now, as the dialog itself reports it. */
+let showing = false
 const listeners = new Set<() => void>()
 
 function notify(): void {
@@ -41,6 +43,16 @@ export function getNativeChatResumeOnRestartDialogRequest(): NativeChatResumeOnR
   return pending
 }
 
+/** Set by the dialog: an open request with something to list. */
+export function setNativeChatResumeDialogShowing(next: boolean): void {
+  showing = next
+}
+
+/** Whether the user is looking at the dialog now; a pending request alone does not say so. */
+export function isNativeChatResumeDialogShowing(): boolean {
+  return showing
+}
+
 export function subscribeNativeChatResumeOnRestartDialog(listener: () => void): () => void {
   listeners.add(listener)
   return () => {
@@ -51,4 +63,5 @@ export function subscribeNativeChatResumeOnRestartDialog(listener: () => void):
 /** @internal - tests need a clean module between cases. */
 export function _resetNativeChatResumeOnRestartDialog(): void {
   pending = null
+  showing = false
 }

From 2aebf5326564a0afb36f7633843cbe1be0279c3c Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 18:33:16 -0700
Subject: [PATCH 29/37] fix(native-chat): show the resume list as a tree

Brennan chose the Resume Tree. The list is now a tree: machine, then
project, then workspace (a child workspace is a node inside its parent,
after the parent's chats), then the chats. Every row keeps its checkbox
in one left column, then an 18px indent per level, a disclosure arrow
(an empty slot on a leaf), the icon and label, and its count. Levels read
apart by icon and weight; there are no boxes, bands or row dividers, only
the divider under Select all.

The machine level shows only when the machine is not obvious (a remote
host, or chats on more than one), named with the sidebar's host labels
and an SSH chip; it replaces the per-workspace host chip. Chats are
grouped per machine first, so one workspace id on two hosts stays two
nodes.

Every node is tri-state over the eligible chats under it, through the
existing per-chat onToggle. Nodes start expanded; collapsing is local to
this opening and keeps the selection. The list is a role="tree" of
leveled treeitems: Up/Down move between checkboxes, Left collapses and
Right expands the focused node.
---
 .../NativeChatResumeOnRestartAgentRow.tsx     | 121 ++--
 ...atResumeOnRestartGroups.selection.test.tsx | 187 ++++++
 .../NativeChatResumeOnRestartGroups.test.tsx  | 565 ++++------------
 .../NativeChatResumeOnRestartGroups.tsx       | 607 ++++++++++--------
 ...tiveChatResumeOnRestartModal.list.test.tsx |  49 +-
 .../NativeChatResumeOnRestartModal.test.tsx   |  14 +-
 .../NativeChatResumeOnRestartModal.tsx        |  87 +--
 ...tiveChatResumeTreeHarness.test-support.tsx |  47 ++
 .../components/NativeChatResumeTreeRow.tsx    | 132 ++++
 ...ve-chat-resume-on-restart-grouping.test.ts |  19 +
 .../native-chat-resume-on-restart-grouping.ts |  24 +-
 .../native-chat-resume-tree-state.ts          |  30 +
 .../native-chat-resume-tree.test-support.ts   | 151 +++++
 .../native-chat-resume-workspace-lookups.ts   |  84 +++
 src/renderer/src/i18n/locales/en.json         |   6 +-
 src/renderer/src/i18n/locales/es.json         |   6 +-
 src/renderer/src/i18n/locales/fr.json         |   6 +-
 src/renderer/src/i18n/locales/ja.json         |   6 +-
 src/renderer/src/i18n/locales/ko.json         |   6 +-
 src/renderer/src/i18n/locales/zh.json         |   6 +-
 20 files changed, 1299 insertions(+), 854 deletions(-)
 create mode 100644 src/renderer/src/components/NativeChatResumeOnRestartGroups.selection.test.tsx
 create mode 100644 src/renderer/src/components/NativeChatResumeTreeHarness.test-support.tsx
 create mode 100644 src/renderer/src/components/NativeChatResumeTreeRow.tsx
 create mode 100644 src/renderer/src/components/native-chat-resume-tree-state.ts
 create mode 100644 src/renderer/src/components/native-chat-resume-tree.test-support.ts
 create mode 100644 src/renderer/src/components/native-chat-resume-workspace-lookups.ts

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
index 204da73e7704..0483b0df5a73 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
@@ -1,4 +1,4 @@
-import { Checkbox } from './ui/checkbox'
+import { useContext } from 'react'
 import { AgentIcon } from '@/lib/agent-catalog'
 import { agentTypeToIconAgent, formatAgentTypeLabel } from '@/lib/agent-status'
 import { formatShortTimeAgo } from '@/lib/short-time-ago'
@@ -10,9 +10,11 @@ import {
 } from './native-chat-resume-failure-guidance'
 import { ResumeFailureGuidanceLine, ResumeFailureStatus } from './NativeChatResumeFailureDetails'
 import { resumeActivityLabel } from './native-chat-resume-activity-label'
+import { ResumeTreeRow } from './NativeChatResumeTreeRow'
+import { ResumeTreeDepthContext } from './native-chat-resume-tree-state'
 
 /**
- * One offered chat as a row of the resume list: its checkbox in the list's shared left column, then,
+ * One offered chat as a leaf of the resume tree: its checkbox in the list's shared left column, then,
  * indented for its depth, the provider glyph, "name - what it was doing", the model and an age —
  * the pieces of the sidebar's compact agent row.
  *
@@ -33,7 +35,7 @@ import { resumeActivityLabel } from './native-chat-resume-activity-label'
  * A chat an earlier resume could not carry on is the same row — selectable where a retry can run,
  * so Resume retries it — plus a status icon, a dismiss control, and a line saying what to do.
  *
- * The enclosing list sets `--resume-chat-indent` for the row's depth.
+ * A leaf of the resume tree; the enclosing workspace node supplies its depth.
  */
 export function ResumeCandidateRow({
   candidate,
@@ -62,70 +64,63 @@ export function ResumeCandidateRow({
     translate('auto.components.NativeChatResumeOnRestartModal.untitled', 'Untitled chat')
   const model = candidate.model?.trim() ?? ''
   const activity = resumeActivityLabel(candidate.activity)
-  const row = (
-    <label className="group/row grid h-7 min-w-0 flex-1 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center has-[:disabled]:cursor-default">
-      <span className="flex justify-center">
-        {/* Identifies the agent AND its workspace: the accessible name has to distinguish rows that
-            would otherwise all read the same. */}
-        <Checkbox
-          checked={checked}
-          disabled={disabled || (failure !== undefined && !resumeFailureSelectable(failure))}
-          onCheckedChange={(next) => onCheckedChange(next === true)}
-          aria-label={translate(
-            'auto.components.NativeChatResumeOnRestartModal.selectAgent',
-            'Resume {{value0}} chat "{{value1}}" in {{value2}}',
-            { value0: agentLabel, value1: title, value2: workspaceName }
-          )}
-        />
+  const depth = useContext(ResumeTreeDepthContext)
+  const act = (action: ResumeFailureAction) => onFailureAction?.(action, candidate.sessionId)
+  return (
+    <ResumeTreeRow
+      depth={depth}
+      name={title}
+      checked={checked}
+      disabled={disabled || (failure !== undefined && !resumeFailureSelectable(failure))}
+      onCheckedChange={onCheckedChange}
+      // Identifies the agent AND its workspace: rows would otherwise all read the same.
+      checkboxLabel={translate(
+        'auto.components.NativeChatResumeOnRestartModal.selectAgent',
+        'Resume {{value0}} chat "{{value1}}" in {{value2}}',
+        { value0: agentLabel, value1: title, value2: workspaceName }
+      )}
+      compact
+      // Outside the label, so pressing them never toggles the checkbox.
+      trailing={
+        failure && (
+          <ResumeFailureStatus
+            failure={failure}
+            title={title}
+            workspaceName={workspaceName}
+            disabled={disabled}
+            onAction={act}
+          />
+        )
+      }
+      below={
+        failure && (
+          <ResumeFailureGuidanceLine failure={failure} disabled={disabled} onAction={act} />
+        )
+      }
+    >
+      {/* AgentIcon carries no label of its own, so the provider was invisible to assistive tech. */}
+      <span role="img" aria-label={agentLabel} className="inline-flex shrink-0">
+        <AgentIcon agent={agentTypeToIconAgent(candidate.agent)} size={13} />
       </span>
-      <span className="ml-(--resume-chat-indent) flex h-full min-w-0 items-center gap-1.5 pr-2.5 pl-2 text-[11px] leading-none text-muted-foreground group-hover/row:bg-worktree-sidebar-accent">
-        {/* AgentIcon carries no label of its own, so the provider was invisible to assistive tech. */}
-        <span role="img" aria-label={agentLabel} className="inline-flex shrink-0">
-          <AgentIcon agent={agentTypeToIconAgent(candidate.agent)} size={13} />
-        </span>
+      <span
+        className="min-w-0 flex-1 truncate text-xs"
+        title={activity ? `${title} - ${activity.detail || activity.summary}` : title}
+      >
+        <span className="text-foreground/90">{title}</span>
+        {activity && <span className="text-muted-foreground"> - {activity.summary}</span>}
+      </span>
+      {model && (
         <span
-          className="min-w-0 flex-1 truncate"
-          title={activity ? `${title} - ${activity.detail || activity.summary}` : title}
+          className="min-w-0 max-w-24 shrink-0 truncate font-mono text-[10px] text-muted-foreground"
+          title={model}
         >
-          <span className="text-foreground/90">{title}</span>
-          {activity && <span className="text-muted-foreground/80"> - {activity.summary}</span>}
-        </span>
-        {model && (
-          <span
-            className="min-w-0 max-w-24 shrink-0 truncate font-mono text-[10px] text-muted-foreground/70"
-            title={model}
-          >
-            {model}
-          </span>
-        )}
-        {/* `formatShortTimeAgo` takes (timestamp, now) and subtracts internally — NOT a delta. */}
-        <span className="shrink-0 text-[10px] tabular-nums text-muted-foreground/60">
-          {formatShortTimeAgo(candidate.recordedAt, listedAt)}
+          {model}
         </span>
+      )}
+      {/* `formatShortTimeAgo` takes (timestamp, now) and subtracts internally — NOT a delta. */}
+      <span className="shrink-0 text-[11px] tabular-nums text-muted-foreground">
+        {formatShortTimeAgo(candidate.recordedAt, listedAt)}
       </span>
-    </label>
-  )
-  if (!failure) {
-    return <li>{row}</li>
-  }
-  const act = (action: ResumeFailureAction) => onFailureAction?.(action, candidate.sessionId)
-  return (
-    <li className="flex flex-col">
-      {/* Outside the label, so pressing them never toggles the checkbox. */}
-      <div className="flex items-center gap-1 pr-1">
-        {row}
-        <ResumeFailureStatus
-          failure={failure}
-          title={title}
-          workspaceName={workspaceName}
-          disabled={disabled}
-          onAction={act}
-        />
-      </div>
-      {/* Lined up with the row's content, past the checkbox column. */}
-      <div className="pr-2.5 pl-[calc(1.75rem+var(--resume-chat-indent,0px)+0.5rem)]">
-        <ResumeFailureGuidanceLine failure={failure} disabled={disabled} onAction={act} />
-      </div>
-    </li>
+    </ResumeTreeRow>
   )
 }
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.selection.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.selection.test.tsx
new file mode 100644
index 000000000000..0e24e13d8bf4
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.selection.test.tsx
@@ -0,0 +1,187 @@
+// @vitest-environment happy-dom
+
+// The resume tree as a control: tri-state at every level, exclusions, busy, and collapsing.
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it } from 'vitest'
+import { useAppStore } from '../store'
+import { getHostContextLabel } from '../../../shared/worktree/host-context-labels'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import {
+  candidate,
+  chatBox,
+  countOf,
+  disclosureOf,
+  nodeBox,
+  onToggleSpy,
+  queryChatBox,
+  seedTree,
+  treeOutline,
+  unretryable,
+  worktree
+} from './native-chat-resume-tree.test-support'
+import { ResumeTreeHarness as Harness } from './NativeChatResumeTreeHarness.test-support'
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+let root: Root
+let container: HTMLElement
+
+function render(props: React.ComponentProps<typeof Harness>): void {
+  act(() => root.render(<Harness {...props} />))
+}
+
+function state(box: HTMLElement): string | null {
+  return box.getAttribute('aria-checked')
+}
+
+beforeEach(() => {
+  onToggleSpy.mockReset()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+})
+
+it('is tri-state at every level, each node over every chat under it', () => {
+  const remote: ExecutionHostId = 'ssh:build-server'
+  render({ candidates: seedTree({ parent: remote, child: remote }) })
+  const machine = getHostContextLabel(remote)
+  expect([machine, 'orca', 'parent', 'child', 'other'].map((name) => countOf(name))).toEqual([
+    '4 of 4',
+    '4 of 4',
+    '3 of 3',
+    '2 of 2',
+    '1 of 1'
+  ])
+
+  act(() => chatBox('in-child').click())
+  expect([machine, 'orca', 'parent', 'child', 'other'].map((name) => state(nodeBox(name)))).toEqual(
+    ['mixed', 'mixed', 'mixed', 'mixed', 'true']
+  )
+  expect(countOf(machine)).toBe('3 of 4')
+  expect(countOf('child')).toBe('1 of 2')
+
+  // Partly selected: ticking selects everything under the node, nested workspaces included.
+  act(() => nodeBox('parent').click())
+  expect(state(chatBox('in-child'))).toBe('true')
+  expect(state(nodeBox(machine))).toBe('true')
+
+  act(() => nodeBox(machine).click())
+  for (const id of ['in-parent', 'in-child', 'also-in-child', 'in-other']) {
+    expect(state(chatBox(id))).toBe('false')
+  }
+  expect(countOf('orca')).toBe('0 of 4')
+})
+
+it('selects every eligible chat in a project, never an unretryable one or another project’s', () => {
+  const candidates = seedTree()
+  const mobile = worktree('mobile', { repoId: 'repo-2', id: 'repo-2::/mobile/mobile' })
+  useAppStore.setState((current) => ({
+    repos: [
+      ...current.repos,
+      { id: 'repo-2', path: '/mobile', displayName: 'orca-mobile', badgeColor: '#999', addedAt: 1 }
+    ],
+    worktreesByRepo: { ...current.worktreesByRepo, 'repo-2': [mobile] }
+  }))
+  const stuck = unretryable(candidates[3]!)
+  render({
+    candidates: [...candidates, candidate('in-mobile', mobile)],
+    initiallySelected: ['in-mobile'],
+    failureFor: (sessionId) => (sessionId === 'in-other' ? stuck : undefined)
+  })
+  expect(countOf('orca')).toBe('0 of 3')
+  expect(chatBox('in-other').hasAttribute('disabled')).toBe(true)
+
+  act(() => nodeBox('orca').click())
+  expect(countOf('orca')).toBe('3 of 3')
+  expect(state(nodeBox('orca'))).toBe('true')
+  const touched = onToggleSpy.mock.calls.map(([sessionId]) => sessionId)
+  expect(touched).not.toContain('in-other')
+  expect(touched).not.toContain('in-mobile')
+  expect(countOf('orca-mobile')).toBe('1 of 1')
+})
+
+it('disables a node with nothing it could select', () => {
+  const candidates = seedTree()
+  render({
+    candidates,
+    initiallySelected: [],
+    failureFor: (sessionId) => (sessionId === 'in-other' ? unretryable(candidates[3]!) : undefined)
+  })
+
+  expect(nodeBox('other').hasAttribute('disabled')).toBe(true)
+  expect(countOf('other')).toBeUndefined()
+})
+
+it('disables every checkbox while a resume runs', () => {
+  render({ candidates: seedTree(), busy: true })
+
+  const boxes = [...container.querySelectorAll('[role="checkbox"]')]
+  expect(boxes).toHaveLength(8)
+  for (const box of boxes) {
+    expect(box.hasAttribute('disabled')).toBe(true)
+  }
+})
+
+it('selects a whole row by clicking anywhere on it, but its arrow only folds', () => {
+  render({ candidates: seedTree(), initiallySelected: [] })
+
+  act(() => itemLabelBody('child').click())
+  expect(state(chatBox('in-child'))).toBe('true')
+
+  act(() => disclosureOf('other').click())
+  expect(state(nodeBox('other'))).toBe('false')
+  expect(queryChatBox('in-other')).toBeNull()
+})
+
+function itemLabelBody(name: string): HTMLElement {
+  return nodeBox(name).closest('label')!.querySelector<HTMLElement>(':scope > :last-child')!
+}
+
+it('starts expanded; collapsing hides a node’s rows and keeps their selection', () => {
+  render({ candidates: seedTree() })
+  const parent = disclosureOf('parent')
+  expect(parent.getAttribute('aria-expanded')).toBe('true')
+  expect(parent.getAttribute('aria-label')).toBe('Collapse parent')
+  expect(parent.tabIndex).toBe(-1)
+  act(() => chatBox('in-child').click())
+
+  act(() => parent.click())
+  expect(treeOutline()).toEqual([
+    '1:project:orca',
+    '2:workspace:parent',
+    '2:workspace:other',
+    '3:chat:in-other'
+  ])
+  expect(disclosureOf('parent').getAttribute('aria-label')).toBe('Expand parent')
+  expect(nodeBox('parent').closest('[role="treeitem"]')?.getAttribute('aria-expanded')).toBe(
+    'false'
+  )
+  // Hidden, not forgotten: the node still counts the pick made inside it.
+  expect(state(nodeBox('parent'))).toBe('mixed')
+  expect(countOf('parent')).toBe('2 of 3')
+
+  act(() => disclosureOf('parent').click())
+  expect(state(chatBox('in-child'))).toBe('false')
+  expect(state(chatBox('also-in-child'))).toBe('true')
+})
+
+it('toggles the chats of a collapsed node', () => {
+  render({ candidates: seedTree(), initiallySelected: [] })
+
+  act(() => disclosureOf('parent').click())
+  act(() => nodeBox('parent').click())
+  expect(countOf('parent')).toBe('3 of 3')
+  expect(onToggleSpy.mock.calls.map(([sessionId]) => sessionId).toSorted()).toEqual([
+    'also-in-child',
+    'in-child',
+    'in-parent'
+  ])
+})
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index 465e5b8323a7..b54a1f412f82 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -1,212 +1,36 @@
 // @vitest-environment happy-dom
 
-import { act, useState } from 'react'
+// The resume tree's shape: levels, depth, where child workspaces go, and when machines show.
+
+import { act } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, expect, it } from 'vitest'
 import { useAppStore } from '../store'
 import { getDefaultSettings } from '../../../shared/constants'
 import { getHostContextLabel } from '../../../shared/worktree/host-context-labels'
 import type { ExecutionHostId } from '../../../shared/execution-host'
-import type { WorktreeLineage } from '../../../shared/worktree/lineage-types'
-import type { Worktree } from '../../../shared/worktree/types'
-import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
-import { TooltipProvider } from './ui/tooltip'
-import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import {
+  candidate,
+  chatBox,
+  itemOf,
+  lineage,
+  nodeBox,
+  onToggleSpy,
+  seedTree,
+  treeOutline,
+  worktree
+} from './native-chat-resume-tree.test-support'
+import { ResumeTreeHarness as Harness } from './NativeChatResumeTreeHarness.test-support'
 
 globalThis.IS_REACT_ACT_ENVIRONMENT = true
 let root: Root
 let container: HTMLElement
 
-function worktree(name: string, overrides: Partial<Worktree> = {}): Worktree {
-  return {
-    id: `repo-1::/repo/${name}`,
-    instanceId: `instance-${name}`,
-    repoId: 'repo-1',
-    path: `/repo/${name}`,
-    displayName: name,
-    branch: `refs/heads/${name}-branch`,
-    head: 'abc123',
-    isBare: false,
-    isMainWorktree: false,
-    comment: '',
-    linkedIssue: null,
-    linkedPR: null,
-    linkedLinearIssue: null,
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: 0,
-    lastActivityAt: 1,
-    ...overrides
-  }
-}
-
-function candidate(sessionId: string, workspace: Worktree): ResumeCandidate {
-  return {
-    sessionId,
-    workspaceId: workspace.id,
-    agent: 'codex',
-    trigger: 'quit',
-    latestPrompt: `Prompt ${sessionId}`,
-    recordedAt: 1_800_000_000_000,
-    executionHostId: workspace.hostId ?? 'local',
-    workspaceKind: 'git-worktree'
-  }
-}
-
-function lineage(child: Worktree, parent: Worktree): WorktreeLineage {
-  return {
-    worktreeId: child.id,
-    worktreeInstanceId: child.instanceId!,
-    parentWorktreeId: parent.id,
-    parentWorktreeInstanceId: parent.instanceId!,
-    origin: 'cli',
-    capture: { source: 'explicit-cli-flag', confidence: 'explicit' },
-    createdAt: 1
-  }
-}
-
-/** parent (1 chat) > child (2 chats), plus an unrelated root workspace. */
-function seedTree(hosts: { parent?: ExecutionHostId; child?: ExecutionHostId } = {}) {
-  // An explicit undefined is a row with no host id (older metadata).
-  const parentHost = 'parent' in hosts ? hosts.parent : 'local'
-  const parent = worktree('parent', { hostId: parentHost })
-  const child = worktree('child', { hostId: 'child' in hosts ? hosts.child : 'local' })
-  const other = worktree('other', { hostId: parentHost })
-  useAppStore.setState({
-    settings: getDefaultSettings(''),
-    repos: [
-      { id: 'repo-1', path: '/repo', displayName: 'orca', badgeColor: '#999999', addedAt: 1 }
-    ],
-    worktreesByRepo: { 'repo-1': [parent, child, other] },
-    worktreeLineageById: { [child.id]: lineage(child, parent) }
-  })
-  return [
-    candidate('in-child', child),
-    candidate('in-parent', parent),
-    candidate('also-in-child', child),
-    candidate('in-other', other)
-  ]
-}
-
-const onToggleSpy = vi.fn()
-
-/** Owns the selection the way the dialog does, so group toggles show their effect. */
-function Harness({
-  candidates,
-  initiallySelected,
-  busy = false,
-  failureFor
-}: {
-  candidates: ResumeCandidate[]
-  initiallySelected?: string[]
-  busy?: boolean
-  failureFor?: (sessionId: string) => ResumeFailure | undefined
-}): React.JSX.Element {
-  const [selected, setSelected] = useState<ReadonlySet<string>>(
-    () => new Set(initiallySelected ?? candidates.map((entry) => entry.sessionId))
-  )
-  return (
-    <TooltipProvider>
-      <ResumeOnRestartGroups
-        candidates={candidates}
-        listedAt={1_800_000_060_000}
-        busy={busy}
-        selected={selected}
-        onToggle={(sessionId, checked) => {
-          onToggleSpy(sessionId, checked)
-          setSelected((current) => {
-            const next = new Set(current)
-            if (checked) {
-              next.add(sessionId)
-            } else {
-              next.delete(sessionId)
-            }
-            return next
-          })
-        }}
-        failureFor={failureFor}
-      />
-    </TooltipProvider>
-  )
-}
-
 function render(props: React.ComponentProps<typeof Harness>): void {
   act(() => root.render(<Harness {...props} />))
 }
 
-function workspaceBox(name: string): HTMLElement {
-  const box = container.querySelector<HTMLElement>(
-    `[role="checkbox"][aria-label="Select all chats in ${name}"]`
-  )
-  if (!box) {
-    throw new Error(`Missing workspace checkbox: ${name}`)
-  }
-  return box
-}
-
-function chatBox(sessionId: string): HTMLElement {
-  const box = container.querySelector<HTMLElement>(
-    `[role="checkbox"][aria-label*="Prompt ${sessionId}"]`
-  )
-  if (!box) {
-    throw new Error(`Missing chat checkbox: ${sessionId}`)
-  }
-  return box
-}
-
-function rowOf(box: HTMLElement): HTMLElement {
-  return box.closest('label')!
-}
-
-/** A row's grid cell: 1 is the checkbox column, 2 the indented content. */
-function cell(row: HTMLElement, column: 1 | 2): HTMLElement {
-  return row.querySelector<HTMLElement>(`:scope > :nth-child(${column})`)!
-}
-
-/** The workspace row's "x of y". */
-function workspaceCount(name: string): string | undefined {
-  return rowOf(workspaceBox(name)).querySelector('.tabular-nums')?.textContent ?? undefined
-}
-
-/** A project's header row, by the name it shows. */
-function projectRow(name: string): HTMLElement {
-  const row = [...container.querySelectorAll('section')]
-    .map((section) => section.firstElementChild)
-    .find((header) => header?.querySelector('.font-semibold')?.textContent === name)
-  if (!(row instanceof HTMLElement)) {
-    throw new Error(`Missing project row: ${name}`)
-  }
-  return row
-}
-
-function projectBox(name: string): HTMLElement {
-  return projectRow(name).querySelector<HTMLElement>('[role="checkbox"]')!
-}
-
-function projectCount(name: string): string | undefined {
-  return projectRow(name).querySelector('.tabular-nums')?.textContent ?? undefined
-}
-
-/** Each row in list order, as kind:label@indent-of-its-content. */
-function rowOutline(): string[] {
-  return [...container.querySelectorAll<HTMLElement>('[role="checkbox"]')].map((box) => {
-    const label = box.getAttribute('aria-label') ?? ''
-    const row = rowOf(box)
-    // A workspace row sits in its box; only a project header is the section's own row.
-    if (row.parentElement?.tagName === 'SECTION') {
-      return `project:${/^Select all chats in (.+)$/.exec(label)?.[1]}`
-    }
-    const workspace = /^Select all chats in (.+)$/.exec(label)?.[1]
-    if (workspace) {
-      const content = cell(rowOf(box), 2)
-      return `ws:${workspace}@${content.style.marginLeft || '0px'}`
-    }
-    const indent = box.closest('ul')?.style.getPropertyValue('--resume-chat-indent')
-    return `chat:${/Prompt ([\w-]+)/.exec(label)?.[1]}@${indent}`
-  })
-}
-
 beforeEach(() => {
   onToggleSpy.mockReset()
   useAppStore.setState(useAppStore.getInitialState(), true)
@@ -221,258 +45,88 @@ afterEach(() => {
   useAppStore.setState(useAppStore.getInitialState(), true)
 })
 
-it('lists every chat with its checkbox in the shared left column, indenting only the content', () => {
-  const candidates = seedTree()
-  render({ candidates })
-
-  expect(rowOutline()).toEqual([
-    'project:orca',
-    'ws:parent@20px',
-    'chat:in-parent@40px',
-    'ws:child@40px',
-    'chat:in-child@60px',
-    'chat:also-in-child@60px',
-    'ws:other@20px',
-    'chat:in-other@40px'
-  ])
-  for (const box of container.querySelectorAll<HTMLElement>('[role="checkbox"]')) {
-    const row = rowOf(box)
-    // The checkbox cell is the row's first grid column and is never indented.
-    expect(row.classList.contains('grid-cols-[1.75rem_minmax(0,1fr)]')).toBe(true)
-    expect(row.firstElementChild?.contains(box)).toBe(true)
-    expect(cell(row, 1).style.paddingLeft).toBe('')
-  }
-})
+const LOCAL_TREE = [
+  '1:project:orca',
+  '2:workspace:parent',
+  '3:chat:in-parent',
+  '3:workspace:child',
+  '4:chat:in-child',
+  '4:chat:also-in-child',
+  '2:workspace:other',
+  '3:chat:in-other'
+]
 
-it('heads each project with a checkbox row in the same left column', () => {
+it('lists project, workspace and chat levels, a child workspace after its parent’s chats', () => {
   render({ candidates: seedTree() })
 
-  const header = projectRow('orca')
-  expect(header.textContent).toBe('orca4 of 4')
-  expect(header.classList.contains('grid-cols-[1.75rem_minmax(0,1fr)]')).toBe(true)
-  expect(cell(header, 1).contains(projectBox('orca'))).toBe(true)
-  expect(projectBox('orca').getAttribute('aria-label')).toBe('Select all chats in orca')
+  expect(treeOutline()).toEqual(LOCAL_TREE)
 })
 
-/** The bordered box a workspace's rows sit in. */
-function boxOf(name: string): HTMLElement {
-  return rowOf(workspaceBox(name)).parentElement!
-}
-
-// Nested boxes: the box border is the only line; a child's box sits inside its parent's.
-it("puts each workspace in a bordered box, a child's box inside its parent's after its chats", () => {
+it('keeps every checkbox in the left column and indents what follows it 18px a level', () => {
   render({ candidates: seedTree() })
 
-  const parent = boxOf('parent')
-  const child = boxOf('child')
-  expect(child.parentElement).toBe(parent)
-  expect(parent.lastElementChild).toBe(child)
-  for (const id of ['in-parent', 'in-child', 'also-in-child']) {
-    expect(parent.contains(chatBox(id))).toBe(true)
-  }
-  expect(child.contains(chatBox('in-parent'))).toBe(false)
-  expect(boxOf('other').contains(rowOf(workspaceBox('child')))).toBe(false)
-  for (const [name, left] of [
-    ['parent', '20px'],
-    ['child', '40px'],
-    ['other', '20px']
-  ] as const) {
-    const outline = boxOf(name).querySelector<HTMLElement>(':scope > [aria-hidden="true"]')!
-    expect(outline.getAttribute('aria-hidden')).toBe('true')
-    expect([...outline.classList]).toEqual(
-      expect.arrayContaining(['border', 'border-border', 'rounded-md'])
-    )
-    // Drawn past the checkbox column, at the workspace's own indent.
-    expect(outline.style.left).toBe(`calc(1.75rem + ${left})`)
+  for (const item of container.querySelectorAll<HTMLElement>('[role="treeitem"]')) {
+    const row = item.querySelector('label')!
+    const cell = (n: number) => row.querySelector<HTMLElement>(`:scope > :nth-child(${n})`)
+    const disclosure = cell(3)
+    // The checkbox cell comes first, before any indent.
+    expect(cell(1)?.querySelector('[role="checkbox"]')).not.toBeNull()
+    const level = Number(item.getAttribute('aria-level'))
+    expect(cell(2)?.style.width).toBe(`${(level - 1) * 18}px`)
+    // Every row keeps the arrow's slot, so icons line up; only a node with children has an arrow.
+    expect(disclosure?.getAttribute('aria-hidden')).toBe('true')
+    const arrow = item.querySelector<HTMLElement>('button[aria-expanded]')
+    expect(arrow !== null).toBe(item.hasAttribute('aria-expanded'))
+    // Laid over its slot, outside the label, so it never toggles the checkbox.
+    expect(arrow?.closest('label') ?? null).toBeNull()
+    if (arrow) {
+      expect(arrow.style.left).toBe(`${28 + (level - 1) * 18}px`)
+    }
   }
 })
 
-it('draws project and workspace bands with no dividers between rows', () => {
+it('reads levels apart by weight, with no row dividers or bands', () => {
   render({ candidates: seedTree() })
 
-  const project = cell(projectRow('orca'), 2)
-  expect(project.classList.contains('rounded-t-md')).toBe(true)
-  expect(project.className).toContain(
-    'bg-[color-mix(in_srgb,var(--foreground)_5%,var(--worktree-sidebar-accent))]'
+  expect(itemOf(nodeBox('orca')).querySelector('.font-semibold')?.textContent).toBe('orca')
+  expect(itemOf(nodeBox('parent')).querySelector('.font-medium')?.textContent).toBe('parent')
+  // Every row element but the checkboxes, which keep their own outline.
+  const rows = container.querySelectorAll(
+    '[role="treeitem"], [role="treeitem"] *:not([role="checkbox"])'
   )
-  for (const [name, nested] of [
-    ['parent', 'false'],
-    ['child', 'true'],
-    ['other', 'false']
-  ] as const) {
-    const band = cell(rowOf(workspaceBox(name)), 2)
-    expect(band.classList.contains('bg-worktree-sidebar-accent')).toBe(true)
-    expect(band.getAttribute('data-nested')).toBe(nested)
-    expect(band.querySelector('.font-semibold')?.textContent).toBe(name)
-  }
-  for (const row of container.querySelectorAll('label, li, ul')) {
-    expect([...row.classList].filter((name) => /(^|:)border/.test(name))).toEqual([])
+  for (const element of rows) {
+    expect([...element.classList].filter((name) => /^(border|bg-)/.test(name))).toEqual([])
   }
 })
 
-it('selects every eligible chat in a project, nested workspaces included', () => {
-  const candidates = seedTree()
-  const mobile = worktree('mobile', { repoId: 'repo-2', id: 'repo-2::/mobile/mobile' })
-  useAppStore.setState((state) => ({
-    repos: [
-      ...state.repos,
-      {
-        id: 'repo-2',
-        path: '/mobile',
-        displayName: 'orca-mobile',
-        badgeColor: '#999999',
-        addedAt: 1
-      }
-    ],
-    worktreesByRepo: { ...state.worktreesByRepo, 'repo-2': [mobile] }
-  }))
-  const stuck: ResumeFailure = {
-    ...candidates[3]!,
-    failedAt: 1_800_000_030_000,
-    outcome: 'refused',
-    reason: 'agent_session_restart_work_superseded',
-    retryable: false
-  }
-  render({
-    candidates: [...candidates, candidate('in-mobile', mobile)],
-    initiallySelected: ['in-parent', 'in-child', 'also-in-child', 'in-mobile'],
-    failureFor: (sessionId) => (sessionId === 'in-other' ? stuck : undefined)
-  })
-  expect(projectBox('orca').getAttribute('aria-checked')).toBe('true')
-  expect(projectCount('orca')).toBe('3 of 3')
-
-  act(() => chatBox('also-in-child').click())
-  expect(projectBox('orca').getAttribute('aria-checked')).toBe('mixed')
-  expect(projectCount('orca')).toBe('2 of 3')
-
-  onToggleSpy.mockClear()
-  act(() => projectBox('orca').click())
-  expect(chatBox('also-in-child').getAttribute('aria-checked')).toBe('true')
-  expect(projectCount('orca')).toBe('3 of 3')
-
-  act(() => projectBox('orca').click())
-  expect(projectBox('orca').getAttribute('aria-checked')).toBe('false')
-  for (const id of ['in-parent', 'in-child', 'also-in-child']) {
-    expect(chatBox(id).getAttribute('aria-checked')).toBe('false')
-  }
-  // Never the unretryable chat, never another project's.
-  const touched = onToggleSpy.mock.calls.map(([sessionId]) => sessionId)
-  expect(touched).not.toContain('in-other')
-  expect(touched).not.toContain('in-mobile')
-  expect(chatBox('in-mobile').getAttribute('aria-checked')).toBe('true')
-  expect(projectCount('orca-mobile')).toBe('1 of 1')
-})
-
 it('shows the branch for a git worktree, muted after its name', () => {
   render({ candidates: seedTree() })
 
-  const content = rowOf(workspaceBox('parent')).children[1]!
-  expect(content.textContent).toContain('parentparent-branch')
-  const branch = [...content.querySelectorAll('span')].find(
+  const branch = [...itemOf(nodeBox('parent')).querySelectorAll('span')].find(
     (span) => span.textContent === 'parent-branch'
   )
   expect(branch?.classList.contains('text-muted-foreground')).toBe(true)
 })
 
-it('covers nested child workspaces with a tri-state workspace checkbox', () => {
+it('starts at projects when every chat is on this machine', () => {
   render({ candidates: seedTree() })
-  expect(workspaceBox('parent').getAttribute('aria-checked')).toBe('true')
-  expect(workspaceCount('parent')).toBe('3 of 3')
-
-  act(() => chatBox('in-child').click())
-  expect(workspaceBox('parent').getAttribute('aria-checked')).toBe('mixed')
-  expect(workspaceCount('parent')).toBe('2 of 3')
-  expect(workspaceBox('child').getAttribute('aria-checked')).toBe('mixed')
-  expect(workspaceCount('child')).toBe('1 of 2')
-  expect(workspaceBox('other').getAttribute('aria-checked')).toBe('true')
-
-  // Partly selected: ticking selects everything it covers, child workspace included.
-  act(() => workspaceBox('parent').click())
-  expect(chatBox('in-child').getAttribute('aria-checked')).toBe('true')
-  expect(workspaceCount('parent')).toBe('3 of 3')
-
-  act(() => workspaceBox('parent').click())
-  expect(workspaceBox('parent').getAttribute('aria-checked')).toBe('false')
-  expect(workspaceCount('parent')).toBe('0 of 3')
-  for (const id of ['in-parent', 'in-child', 'also-in-child']) {
-    expect(chatBox(id).getAttribute('aria-checked')).toBe('false')
-  }
-  expect(chatBox('in-other').getAttribute('aria-checked')).toBe('true')
-})
-
-it('selects a whole row by clicking anywhere on it', () => {
-  render({ candidates: seedTree(), initiallySelected: [] })
 
-  act(() => cell(rowOf(workspaceBox('child')), 2).click())
-  expect(chatBox('in-child').getAttribute('aria-checked')).toBe('true')
-  expect(chatBox('also-in-child').getAttribute('aria-checked')).toBe('true')
-
-  act(() => cell(rowOf(chatBox('in-other')), 2).click())
-  expect(chatBox('in-other').getAttribute('aria-checked')).toBe('true')
+  expect(container.textContent).not.toContain(getHostContextLabel('local'))
+  expect(container.querySelector('[aria-label^="Select all chats on"]')).toBeNull()
 })
 
-it('leaves a failure a retry cannot fix out of its workspace checkbox', () => {
-  const candidates = seedTree()
-  const stuck: ResumeFailure = {
-    ...candidates[0]!,
-    failedAt: 1_800_000_030_000,
-    outcome: 'refused',
-    reason: 'agent_session_restart_work_superseded',
-    retryable: false
-  }
-  render({
-    candidates,
-    initiallySelected: ['in-parent'],
-    failureFor: (sessionId) => (sessionId === 'in-child' ? stuck : undefined)
-  })
-
-  expect(chatBox('in-child').hasAttribute('disabled')).toBe(true)
-  expect(workspaceCount('child')).toBe('0 of 1')
-  expect(workspaceCount('parent')).toBe('1 of 2')
-
-  act(() => workspaceBox('parent').click())
-  expect(onToggleSpy.mock.calls.map(([sessionId]) => sessionId)).not.toContain('in-child')
-  expect(chatBox('in-child').getAttribute('aria-checked')).toBe('false')
-  expect(workspaceBox('parent').getAttribute('aria-checked')).toBe('true')
-})
-
-it('disables a workspace checkbox with nothing it could select', () => {
-  const candidates = seedTree()
-  const stuck = (sessionId: string): ResumeFailure => ({
-    ...candidates.find((entry) => entry.sessionId === sessionId)!,
-    failedAt: 1_800_000_030_000,
-    outcome: 'refused',
-    reason: 'agent_session_restart_work_superseded',
-    retryable: false
-  })
-  render({
-    candidates,
-    initiallySelected: [],
-    failureFor: (sessionId) => (sessionId === 'in-other' ? stuck(sessionId) : undefined)
-  })
-
-  expect(workspaceBox('other').hasAttribute('disabled')).toBe(true)
-  expect(workspaceCount('other')).toBeUndefined()
-})
-
-it('disables every checkbox while a resume runs', () => {
-  render({ candidates: seedTree(), busy: true })
-
-  const boxes = [...container.querySelectorAll('[role="checkbox"]')]
-  expect(boxes).toHaveLength(8)
-  for (const box of boxes) {
-    expect(box.hasAttribute('disabled')).toBe(true)
-  }
-})
-
-it('names the machine of a single-host SSH offer', () => {
+it('heads a single SSH host with its machine node, named and marked SSH', () => {
   const remote: ExecutionHostId = 'ssh:build-server'
   render({ candidates: seedTree({ parent: remote, child: remote }) })
 
-  const label = getHostContextLabel(remote)
-  for (const name of ['parent', 'child', 'other']) {
-    expect(rowOf(workspaceBox(name)).textContent).toContain(label)
-  }
+  const machine = getHostContextLabel(remote)
+  expect(treeOutline()).toEqual([
+    `1:machine:${machine}`,
+    ...LOCAL_TREE.map((row) => row.replace(/^(\d)/, (level) => String(Number(level) + 1)))
+  ])
+  expect(itemOf(nodeBox(machine)).textContent).toContain('SSH')
+  // The machine node names the host, so no workspace repeats it.
+  expect(itemOf(nodeBox('parent')).textContent).not.toContain(machine)
 })
 
 // A target saved through Add SSH target gets a generated id; the sidebar names it by its label.
@@ -483,22 +137,51 @@ it('names an SSH machine by its saved name, not its target id', () => {
   useAppStore.setState({ sshTargetLabels: new Map([[targetId, 'devbox']]) })
   render({ candidates })
 
-  const row = rowOf(workspaceBox('parent')).textContent
-  expect(row).toContain('devbox')
-  expect(row).not.toContain(targetId)
+  expect(itemOf(nodeBox('devbox')).getAttribute('aria-level')).toBe('1')
+  expect(container.textContent).not.toContain(targetId)
 })
 
-it('names hosts only when the machine is not obvious', () => {
-  render({ candidates: seedTree() })
+it('gives each machine its own branch when chats span hosts', () => {
+  const remote: ExecutionHostId = 'ssh:build-server'
+  const candidates = seedTree({ parent: 'local', child: remote })
+  render({ candidates })
+
   const local = getHostContextLabel('local')
-  expect(container.textContent).not.toContain(local)
+  const machine = getHostContextLabel(remote)
+  // The child is on another host, so it does not nest under the local parent.
+  expect(treeOutline()).toEqual([
+    `1:machine:${machine}`,
+    '2:project:orca',
+    '3:workspace:child',
+    '4:chat:in-child',
+    '4:chat:also-in-child',
+    `1:machine:${local}`,
+    '2:project:orca',
+    '3:workspace:parent',
+    '4:chat:in-parent',
+    '3:workspace:other',
+    '4:chat:in-other'
+  ])
+  expect(itemOf(nodeBox(local)).textContent).not.toContain('SSH')
+})
 
-  act(() => root.unmount())
-  root = createRoot(container)
+it('lists every offered chat exactly once, even with one workspace id on two hosts', () => {
   const remote: ExecutionHostId = 'ssh:build-server'
-  render({ candidates: seedTree({ parent: 'local', child: remote }) })
-  expect(rowOf(workspaceBox('parent')).textContent).toContain(local)
-  expect(rowOf(workspaceBox('child')).textContent).toContain(getHostContextLabel(remote))
+  const candidates = seedTree()
+  const remoteParent = worktree('parent', { hostId: remote, instanceId: 'instance-remote' })
+  useAppStore.setState((state) => ({
+    worktreesByRepo: { 'repo-1': [...state.worktreesByRepo['repo-1']!, remoteParent] }
+  }))
+  const twin = candidate('on-remote', remoteParent)
+  render({ candidates: [...candidates, twin] })
+
+  for (const entry of [...candidates, twin]) {
+    expect(
+      container.querySelectorAll(`[role="checkbox"][aria-label*="Prompt ${entry.sessionId}"]`)
+    ).toHaveLength(1)
+  }
+  // Same id, different machine: two separate workspace nodes.
+  expect(container.querySelectorAll('[aria-label="Select all chats in parent"]')).toHaveLength(2)
 })
 
 it('names a workspace the store does not know by its id, with the kind the host recorded', () => {
@@ -509,38 +192,22 @@ it('names a workspace the store does not know by its id, with the kind the host
   }
   render({ candidates: [unknown] })
 
-  const row = rowOf(workspaceBox('folder:missing-folder'))
-  expect(row.textContent).toContain('folder:missing-folder')
+  const row = itemOf(nodeBox('folder:missing-folder'))
   expect(row.querySelector('svg.lucide-folder')).not.toBeNull()
   expect(chatBox('lost').getAttribute('aria-label')).toContain('in folder:missing-folder')
 })
 
 // Its project is unknown too: a nameless "Select all chats in " checkbox would help no one.
-it('gives workspaces the store cannot place no project row, leaving them to Select all', () => {
-  const candidates = seedTree()
+it('gives workspaces the store cannot place no project node', () => {
   const unknown: ResumeCandidate = {
     ...candidate('lost', worktree('gone')),
     workspaceId: 'folder:missing-folder',
     workspaceKind: 'folder'
   }
-  render({ candidates: [...candidates, unknown] })
-
-  expect(rowOutline()).toEqual([
-    'project:orca',
-    'ws:parent@20px',
-    'chat:in-parent@40px',
-    'ws:child@40px',
-    'chat:in-child@60px',
-    'chat:also-in-child@60px',
-    'ws:other@20px',
-    'chat:in-other@40px',
-    'ws:folder:missing-folder@20px',
-    'chat:lost@40px'
-  ])
+  render({ candidates: [...seedTree(), unknown] })
+
+  expect(treeOutline()).toEqual([...LOCAL_TREE, '1:workspace:folder:missing-folder', '2:chat:lost'])
   expect(container.querySelector('[aria-label="Select all chats in "]')).toBeNull()
-  const [, unplaced] = container.querySelectorAll('section')
-  expect(unplaced?.querySelector('label')).toBe(rowOf(workspaceBox('folder:missing-folder')))
-  expect(projectCount('orca')).toBe('4 of 4')
 })
 
 // Why: the sidebar nests a child only under a parent on its own host; no host id matches only none.
@@ -552,11 +219,9 @@ it.each([
 ] as const)(
   '%s: nests the child exactly as the sidebar does',
   (_, parentHost, childHost, nests) => {
-    const candidates = seedTree({ parent: parentHost, child: childHost })
-    render({ candidates })
+    render({ candidates: seedTree({ parent: parentHost, child: childHost }) })
 
-    expect(rowOutline()).toContain(nests ? 'ws:child@40px' : 'ws:child@20px')
-    expect(workspaceCount('parent')).toBe(nests ? '3 of 3' : '1 of 1')
+    expect(treeOutline()).toContain(nests ? '3:workspace:child' : '2:workspace:child')
     expect(container.querySelectorAll('[role="checkbox"][aria-label^="Resume"]')).toHaveLength(4)
   }
 )
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index 94e96af302dc..5f4d14036168 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -1,34 +1,31 @@
 import { useMemo } from 'react'
-import { Folder, FolderTree, GitBranch } from 'lucide-react'
+import { Folder, FolderTree, GitBranch, Monitor } from 'lucide-react'
 import { RepoIconGlyph } from '@/components/repo/repo-icon'
 import { WorktreeHostContextBadge } from '@/components/sidebar/WorktreeHostContextBadge'
 import { useSidebarHostScopeOptions } from '@/components/sidebar/use-sidebar-host-scope-options'
-import {
-  getCyclicProjectedWorktreeLineageIds,
-  getSidebarLineageAncestors
-} from '@/components/sidebar/worktree-lineage-projection'
 import { translate } from '@/i18n/i18n'
 import {
   resolveWorktreeBranchLabel,
   resolveWorktreeDisplayName
 } from '@/lib/worktree-default-display-name'
-import {
-  getAllWorktreesFromState,
-  getWorktreeMapFromState,
-  getWorktreeOnHostFromState
-} from '@/store/selectors'
-import {
-  composeWorktreeHostIdentity,
-  getWorktreeHostIdentity
-} from '../../../shared/worktree/host-qualified-identity'
 import { getHostContextLabel } from '../../../shared/worktree/host-context-labels'
-import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host'
-import type { AgentSessionWorkspaceKind } from '../../../shared/agent-session-record'
+import {
+  LOCAL_EXECUTION_HOST_ID,
+  parseExecutionHostId,
+  type ExecutionHostId
+} from '../../../shared/execution-host'
 import { useAppStore } from '../store'
-import { Checkbox } from './ui/checkbox'
+import {
+  useLineageAncestors,
+  useRepoIdByWorkspace,
+  useWorkspaceWorktree
+} from './native-chat-resume-workspace-lookups'
 import { ResumeCandidateRow } from './NativeChatResumeOnRestartAgentRow'
+import { ResumeTreeCount, ResumeTreeRow } from './NativeChatResumeTreeRow'
+import { ResumeTreeDepthContext, useResumeTreeExpansion } from './native-chat-resume-tree-state'
 import {
   groupResumeCandidates,
+  groupResumeCandidatesByHost,
   groupResumeWorkspacesByRepo,
   nestResumeWorkspaces,
   resolveResumeGroupHeader,
@@ -49,274 +46,308 @@ import {
 export type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
 
 /**
- * The offered chats as a checkbox list in the sidebar's three tiers: repo/project, then workspace,
- * then agent sessions.
+ * The offered chats as a tree: machine, then project, then workspace (a child workspace is a node
+ * inside its parent, after the parent's chats), then the chats.
  *
- * Nested boxes: a project is a tinted band; each workspace is a bordered box, one step in, holding
- * its header band and its chats, and a child workspace's box sits inside its parent's, after the
- * parent's chats. Every row's checkbox stays in one column at the left edge, outside the boxes;
- * nesting indents only what follows it. No row dividers: the boxes and bands carry the structure.
- * A workspace checkbox covers its own chats and those of the workspaces nested under it, which
- * follow the sidebar's own lineage rule; a project checkbox covers every chat in the project.
+ * Every node's checkbox sits in one column at the left edge and covers every selectable chat under
+ * it; levels read apart by icon and weight, nesting by indent and the disclosure arrows. The machine
+ * level shows only when the machine is not obvious (a remote host, or chats on more than one), and
+ * then it is what names the host, so no workspace repeats it.
  *
- * A workspace the store does not know yet (its host still connecting, or since deleted) is named
- * by its id. The kind glyph comes from the host's record of the chat, never from a name.
+ * A workspace the store does not know yet (host connecting, or deleted) is named by its id.
  */
 
-/** Indent per nesting level, applied right of the checkbox column. */
-const RESUME_INDENT_PX = 20
-
 /** Lets a row that an earlier resume could not carry on show what went wrong and what to do. */
 type FailureProps = {
   failureFor?: (sessionId: string) => ResumeFailure | undefined
   onFailureAction?: (action: ResumeFailureAction, sessionId: string) => void
 }
 
-/** The store's row for a workspace on its own host; folder workspaces included. Stable per row. */
-function useWorkspaceWorktree(workspaceId: string, hostId: ExecutionHostId | undefined) {
-  return useAppStore((store) => store.getKnownWorktreeById(workspaceId, hostId))
-}
+/** What every node needs from the tree as a whole. */
+type TreeProps = {
+  listedAt: number
+  busy: boolean
+  selected: ReadonlySet<string>
+  onToggle: (sessionId: string, checked: boolean) => void
+  /** Whether a group checkbox may tick this chat; a failure a retry cannot fix is left out. */
+  selectable: (sessionId: string) => boolean
+  isExpanded: (key: string) => boolean
+  setExpanded: (key: string, expanded: boolean) => void
+  repoIdOf: (group: ResumeWorkspaceGroup) => string | null
+  ancestorsOf: (group: ResumeWorkspaceGroup) => readonly string[]
+} & FailureProps
 
-/**
- * The repo owning each workspace, as one narrow subscription.
- *
- * Selected as a joined string rather than a map so the selector returns a PRIMITIVE: a fresh object
- * or array would fail the equality check on every store change and re-render the whole list.
- */
-function useRepoIdByWorkspace(
-  workspaces: readonly ResumeWorkspaceGroup[]
-): (workspaceId: string) => string | null {
-  const ids = workspaces.map((group) => group.workspaceId)
-  const hosts = workspaces.map((group) => group.candidates[0]?.executionHostId)
-  const joined = useAppStore((store) =>
-    ids.map((id, index) => store.getKnownWorktreeById(id, hosts[index])?.repoId ?? '').join('\0')
+/** A group node: its row, then (while open) what is under it. */
+function GroupNode({
+  nodeKey,
+  depth,
+  name,
+  checkboxLabel,
+  covered,
+  tree,
+  label,
+  children
+}: {
+  nodeKey: string
+  depth: number
+  name: string
+  checkboxLabel: string
+  /** Every selectable chat under this node. */
+  covered: readonly string[]
+  tree: TreeProps
+  label: React.ReactNode
+  children: React.ReactNode
+}): React.JSX.Element {
+  const selection = resumeSelectionState(covered, tree.selected)
+  const expanded = tree.isExpanded(nodeKey)
+  return (
+    <>
+      <ResumeTreeRow
+        depth={depth}
+        expanded={expanded}
+        onExpandedChange={(next) => tree.setExpanded(nodeKey, next)}
+        name={name}
+        checked={selection.checked}
+        disabled={tree.busy || selection.total === 0}
+        onCheckedChange={() => toggleResumeSelection(covered, selection, tree.onToggle)}
+        checkboxLabel={checkboxLabel}
+      >
+        {label}
+        <ResumeTreeCount selectedCount={selection.selectedCount} total={selection.total} />
+      </ResumeTreeRow>
+      {/* Collapsing unmounts the rows only; their selection lives with the dialog. */}
+      {expanded && children}
+    </>
   )
-  const repoIds = joined.split('\0')
-  return (workspaceId: string) => {
-    const index = ids.indexOf(workspaceId)
-    const repoId = index === -1 ? '' : (repoIds[index] ?? '')
-    return repoId === '' ? null : repoId
-  }
-}
-
-/** Each workspace's lineage ancestors, nearest first, by the sidebar's own nesting rule. */
-function useLineageAncestors(
-  workspaces: readonly ResumeWorkspaceGroup[]
-): (workspaceId: string) => readonly string[] {
-  const worktreesByRepo = useAppStore((store) => store.worktreesByRepo)
-  const worktreeLineageById = useAppStore((store) => store.worktreeLineageById)
-  const ancestors = useMemo(() => {
-    const state = { worktreesByRepo }
-    // Why: archived rows never render in the sidebar, so nothing nests under them.
-    const rows = new Map(
-      getAllWorktreesFromState(state)
-        .filter((worktree) => !worktree.isArchived)
-        .map((worktree) => [getWorktreeHostIdentity(worktree), worktree])
-    )
-    const cyclic = getCyclicProjectedWorktreeLineageIds(
-      worktreeLineageById,
-      getWorktreeMapFromState(state)
-    )
-    return new Map(
-      workspaces.map((group) => {
-        // Why: a row with no host id (older metadata) is still the chat's workspace.
-        const target =
-          getWorktreeOnHostFromState(
-            state,
-            group.workspaceId,
-            group.candidates[0]?.executionHostId
-          ) ?? rows.get(composeWorktreeHostIdentity(undefined, group.workspaceId))
-        const parents = target
-          ? getSidebarLineageAncestors(target, worktreeLineageById, rows, cyclic)
-          : []
-        return [group.workspaceId, parents.map((parent) => parent.id)]
-      })
-    )
-  }, [workspaces, worktreesByRepo, worktreeLineageById])
-  return (workspaceId) => ancestors.get(workspaceId) ?? []
 }
 
-/** The glyph for the workspace itself. Kind comes from the host's record, never from a name. */
-function WorkspaceKindGlyph({ kind }: { kind: AgentSessionWorkspaceKind }): React.JSX.Element {
-  return kind === 'folder' ? (
-    <Folder className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
-  ) : (
-    <GitBranch className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
+function WorkspaceNode({
+  node,
+  hostId,
+  depth,
+  tree
+}: {
+  node: ResumeWorkspaceNode
+  hostId: ExecutionHostId
+  depth: number
+  tree: TreeProps
+}): React.JSX.Element {
+  const { group } = node
+  const first = group.candidates[0]
+  const worktree = useWorkspaceWorktree(group.workspaceId, first?.executionHostId)
+  const kind = first ? resumeWorkspaceKind(first) : 'git-worktree'
+  // Kind comes from the host's record, never from a name.
+  const KindGlyph = kind === 'folder' ? Folder : GitBranch
+  const name = (worktree && resolveWorktreeDisplayName(worktree)) || group.workspaceId
+  const branch = worktree && kind === 'git-worktree' ? resolveWorktreeBranchLabel(worktree) : ''
+  return (
+    <GroupNode
+      nodeKey={`workspace:${hostId}:${group.workspaceId}`}
+      depth={depth}
+      name={name}
+      checkboxLabel={translate(
+        'auto.components.NativeChatResumeOnRestartModal.selectWorkspace',
+        'Select all chats in {{value0}}',
+        { value0: name }
+      )}
+      covered={resumeWorkspaceSessionIds(node).filter(tree.selectable)}
+      tree={tree}
+      label={
+        <>
+          <KindGlyph className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
+          <span className="min-w-0 truncate text-[13px] font-medium text-foreground">{name}</span>
+          {branch && (
+            <span className="min-w-0 shrink-2 truncate text-[11px] text-muted-foreground">
+              {branch}
+            </span>
+          )}
+        </>
+      }
+    >
+      <ResumeTreeDepthContext.Provider value={depth + 1}>
+        {group.candidates.map((candidate) => (
+          <ResumeCandidateRow
+            key={candidate.sessionId}
+            candidate={candidate}
+            workspaceName={name}
+            listedAt={tree.listedAt}
+            checked={tree.selected.has(candidate.sessionId)}
+            disabled={tree.busy}
+            onCheckedChange={(checked) => tree.onToggle(candidate.sessionId, checked)}
+            failure={tree.failureFor?.(candidate.sessionId)}
+            onFailureAction={tree.onFailureAction}
+          />
+        ))}
+      </ResumeTreeDepthContext.Provider>
+      {node.children.map((child) => (
+        <WorkspaceNode
+          key={child.group.workspaceId}
+          node={child}
+          hostId={hostId}
+          depth={depth + 1}
+          tree={tree}
+        />
+      ))}
+    </GroupNode>
   )
 }
 
 /**
- * The top tier: a git repo, or the project group a folder workspace belongs to.
+ * A git repo, or the project group a folder workspace belongs to.
  *
  * A folder workspace's synthetic worktree carries `repoId` of `folder-workspace:<projectGroupId>` —
  * never null — so "no repo" cannot be detected by testing for absence. `projectGroupIdFromRepoId`
  * is the only thing that separates the two, and the sidebar likewise titles these with the project
  * group's name.
  */
-function RepoHeader({
+function ProjectNode({
   repoId,
-  covered,
-  busy,
-  selected,
-  onToggle
+  hostId,
+  workspaces,
+  depth,
+  tree
 }: {
   repoId: string
-  /** Every selectable chat in the project, nested workspaces included. */
-  covered: readonly string[]
-  busy: boolean
-  selected: ReadonlySet<string>
-  onToggle: (sessionId: string, checked: boolean) => void
+  hostId: ExecutionHostId
+  workspaces: readonly ResumeWorkspaceNode[]
+  depth: number
+  tree: TreeProps
 }): React.JSX.Element {
   const repos = useAppStore((store) => store.repos)
   const projectGroups = useAppStore((store) => store.projectGroups)
   const header = resolveResumeGroupHeader(repoId, repos, projectGroups)
-  const selection = resumeSelectionState(covered, selected)
   return (
-    // A band a step stronger than a workspace's, so the project reads as the outer group.
-    <label className="group/row mt-1.5 grid h-8.5 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center has-[:disabled]:cursor-default">
-      <span className="flex justify-center">
-        <Checkbox
-          checked={selection.checked}
-          disabled={busy || selection.total === 0}
-          onCheckedChange={() => toggleResumeSelection(covered, selection, onToggle)}
-          aria-label={translate(
-            'auto.components.NativeChatResumeOnRestartModal.selectProject',
-            'Select all chats in {{value0}}',
-            { value0: header.name }
+    <GroupNode
+      nodeKey={`project:${hostId}:${repoId}`}
+      depth={depth}
+      name={header.name}
+      checkboxLabel={translate(
+        'auto.components.NativeChatResumeOnRestartModal.selectProject',
+        'Select all chats in {{value0}}',
+        { value0: header.name }
+      )}
+      covered={workspaces.flatMap(resumeWorkspaceSessionIds).filter(tree.selectable)}
+      tree={tree}
+      label={
+        <>
+          {/* A repo shows its own configured glyph; a project group uses the FolderTree the
+              sidebar's own PROJECT_GROUP_META uses. */}
+          {header.kind === 'project' ? (
+            <FolderTree className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
+          ) : (
+            <RepoIconGlyph
+              repoIcon={header.repoIcon}
+              className="size-3.5 text-muted-foreground"
+              iconClassName="size-3.5"
+            />
           )}
+          <span className="min-w-0 truncate text-[13px] font-semibold">{header.name}</span>
+        </>
+      }
+    >
+      {workspaces.map((node) => (
+        <WorkspaceNode
+          key={node.group.workspaceId}
+          node={node}
+          hostId={hostId}
+          depth={depth + 1}
+          tree={tree}
         />
-      </span>
-      <span className="mr-1.5 flex h-full min-w-0 items-center gap-1.5 rounded-t-md bg-[color-mix(in_srgb,var(--foreground)_5%,var(--worktree-sidebar-accent))] pr-2.5 pl-2 group-hover/row:bg-[color-mix(in_srgb,var(--foreground)_9%,var(--worktree-sidebar-accent))]">
-        {/* A repo shows its own configured glyph; a project group uses the FolderTree the sidebar's
-            own PROJECT_GROUP_META uses. */}
-        {header.kind === 'project' ? (
-          <FolderTree className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
-        ) : (
-          <RepoIconGlyph repoIcon={header.repoIcon} className="size-3.5" iconClassName="size-3.5" />
-        )}
-        <span className="min-w-0 flex-1 truncate text-[13px] font-semibold">{header.name}</span>
-        {selection.total > 0 && (
-          <span className="shrink-0 pl-2 text-[11px] tabular-nums text-muted-foreground">
-            {translate(
-              'auto.components.NativeChatResumeOnRestartModal.workspaceSelectedCount',
-              '{{value0}} of {{value1}}',
-              { value0: selection.selectedCount, value1: selection.total }
-            )}
-          </span>
-        )}
-      </span>
-    </label>
+      ))}
+    </GroupNode>
   )
 }
 
-type RowProps = {
-  /** Whether the listed chats span machines; every workspace then names its host. */
-  mixedHosts: boolean
-  listedAt: number
-  busy: boolean
-  selected: ReadonlySet<string>
-  onToggle: (sessionId: string, checked: boolean) => void
-  /** Whether a group checkbox may tick this chat; a failure a retry cannot fix is left out. */
-  selectable: (sessionId: string) => boolean
-  /** The sidebar's host names (SSH target labels, display overrides), so a chip never shows a raw id. */
-  hostLabelById: ReadonlyMap<ExecutionHostId, string>
-} & FailureProps
-
-function WorkspaceRows({
-  node,
+/** A machine's projects, each a node; workspaces the store cannot place sit at project depth. */
+function MachineContents({
+  hostId,
+  workspaces,
   depth,
-  ...rowProps
-}: { node: ResumeWorkspaceNode; depth: number } & RowProps): React.JSX.Element {
-  const { group } = node
-  const first = group.candidates[0]
-  const hostId = first?.executionHostId
-  const worktree = useWorkspaceWorktree(group.workspaceId, hostId)
-  const kind = first ? resumeWorkspaceKind(first) : 'git-worktree'
-  const name = (worktree && resolveWorktreeDisplayName(worktree)) || group.workspaceId
-  const branch = worktree && kind === 'git-worktree' ? resolveWorktreeBranchLabel(worktree) : ''
-  const { mixedHosts, listedAt, busy, selected, onToggle, selectable, hostLabelById } = rowProps
-  // Why: a remote workspace is named by its machine even when it is the only one listed.
-  const showHostLabel =
-    mixedHosts || (hostId ?? LOCAL_EXECUTION_HOST_ID) !== LOCAL_EXECUTION_HOST_ID
-  const covered = resumeWorkspaceSessionIds(node).filter(selectable)
-  const selection = resumeSelectionState(covered, selected)
-  // Why: a top-level workspace sits one step in from its project, so its box does too.
-  const indent = (depth + 1) * RESUME_INDENT_PX
-  const chatIndent: React.CSSProperties & Record<'--resume-chat-indent', string> = {
-    '--resume-chat-indent': `${indent + RESUME_INDENT_PX}px`
-  }
+  tree
+}: {
+  hostId: ExecutionHostId
+  workspaces: readonly ResumeWorkspaceGroup[]
+  depth: number
+  tree: TreeProps
+}): React.JSX.Element {
+  const byId = new Map(workspaces.map((group) => [group.workspaceId, group]))
+  const lookup =
+    <T,>(read: (group: ResumeWorkspaceGroup) => T, fallback: T) =>
+    (id: string) => {
+      const group = byId.get(id)
+      return group ? read(group) : fallback
+    }
+  const ancestorsOf = lookup(tree.ancestorsOf, [])
   return (
-    <div className="relative my-1.5 mr-1.5">
-      {/* The box, drawn in the content area only so the checkbox column stays outside it. A
-          child's box lands at its parent's chat indent, inside the parent's. */}
-      <span
-        aria-hidden="true"
-        className="pointer-events-none absolute inset-y-0 right-0 rounded-md border border-border"
-        style={{ left: `calc(1.75rem + ${indent}px)` }}
-      />
-      <label className="group/row grid h-8 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center has-[:disabled]:cursor-default">
-        <span className="flex justify-center">
-          <Checkbox
-            checked={selection.checked}
-            disabled={busy || selection.total === 0}
-            onCheckedChange={() => toggleResumeSelection(covered, selection, onToggle)}
-            aria-label={translate(
-              'auto.components.NativeChatResumeOnRestartModal.selectWorkspace',
-              'Select all chats in {{value0}}',
-              { value0: name }
-            )}
+    <>
+      {groupResumeWorkspacesByRepo(workspaces, lookup(tree.repoIdOf, null)).map((repoGroup) => {
+        const nodes = nestResumeWorkspaces(repoGroup.workspaces, ancestorsOf)
+        // A group the store cannot place has no project to name or select; Select all covers it.
+        return repoGroup.repoId === null ? (
+          nodes.map((node) => (
+            <WorkspaceNode
+              key={node.group.workspaceId}
+              node={node}
+              hostId={hostId}
+              depth={depth}
+              tree={tree}
+            />
+          ))
+        ) : (
+          <ProjectNode
+            key={repoGroup.repoId}
+            repoId={repoGroup.repoId}
+            hostId={hostId}
+            workspaces={nodes}
+            depth={depth}
+            tree={tree}
           />
-        </span>
-        {/* The header band inside the box; a nested one is lighter. */}
-        <span
-          data-nested={depth > 0}
-          className="flex h-full min-w-0 items-center gap-1.5 rounded-t-md bg-worktree-sidebar-accent pr-2.5 pl-2 group-hover/row:bg-[color-mix(in_srgb,var(--foreground)_6%,var(--worktree-sidebar-accent))] data-[nested=true]:bg-worktree-sidebar-accent/55"
-          style={{ marginLeft: indent }}
-        >
-          <WorkspaceKindGlyph kind={kind} />
-          <span className="min-w-0 truncate text-[13px] font-semibold text-foreground">{name}</span>
-          {branch && (
-            <span className="min-w-0 shrink-2 truncate text-[11px] text-muted-foreground">
-              {branch}
-            </span>
-          )}
-          {showHostLabel && (
+        )
+      })}
+    </>
+  )
+}
+
+function MachineNode({
+  hostId,
+  candidates,
+  workspaces,
+  hostLabelById,
+  tree
+}: {
+  hostId: ExecutionHostId
+  candidates: readonly ResumeCandidate[]
+  workspaces: readonly ResumeWorkspaceGroup[]
+  hostLabelById: ReadonlyMap<ExecutionHostId, string>
+  tree: TreeProps
+}): React.JSX.Element {
+  const name = getHostContextLabel(hostId, { hostLabelById })
+  return (
+    <GroupNode
+      nodeKey={`machine:${hostId}`}
+      depth={0}
+      name={name}
+      checkboxLabel={translate(
+        'auto.components.NativeChatResumeOnRestartModal.selectMachine',
+        'Select all chats on {{value0}}',
+        { value0: name }
+      )}
+      covered={candidates.map((candidate) => candidate.sessionId).filter(tree.selectable)}
+      tree={tree}
+      label={
+        <>
+          <Monitor className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
+          <span className="min-w-0 truncate text-[13px] font-bold">{name}</span>
+          {parseExecutionHostId(hostId)?.kind === 'ssh' && (
             <WorktreeHostContextBadge
-              label={getHostContextLabel(hostId ?? LOCAL_EXECUTION_HOST_ID, {
-                hostLabelById
-              })}
+              label={translate('auto.components.NativeChatResumeOnRestartModal.sshHost', 'SSH')}
             />
           )}
-          {selection.total > 0 && (
-            <span className="ml-auto shrink-0 pl-2 text-[11px] tabular-nums text-muted-foreground">
-              {translate(
-                'auto.components.NativeChatResumeOnRestartModal.workspaceSelectedCount',
-                '{{value0}} of {{value1}}',
-                { value0: selection.selectedCount, value1: selection.total }
-              )}
-            </span>
-          )}
-        </span>
-      </label>
-      <ul style={chatIndent}>
-        {group.candidates.map((candidate) => (
-          <ResumeCandidateRow
-            key={candidate.sessionId}
-            candidate={candidate}
-            workspaceName={name}
-            listedAt={listedAt}
-            checked={selected.has(candidate.sessionId)}
-            disabled={busy}
-            onCheckedChange={(checked) => onToggle(candidate.sessionId, checked)}
-            failure={rowProps.failureFor?.(candidate.sessionId)}
-            onFailureAction={rowProps.onFailureAction}
-          />
-        ))}
-      </ul>
-      {node.children.map((child) => (
-        <WorkspaceRows key={child.group.workspaceId} node={child} depth={depth + 1} {...rowProps} />
-      ))}
-    </div>
+        </>
+      }
+    >
+      <MachineContents hostId={hostId} workspaces={workspaces} depth={1} tree={tree} />
+    </GroupNode>
   )
 }
 
@@ -335,57 +366,63 @@ export function ResumeOnRestartGroups({
   selected: ReadonlySet<string>
   onToggle: (sessionId: string, checked: boolean) => void
 } & FailureProps): React.JSX.Element {
-  const workspaces = useMemo(() => groupResumeCandidates(candidates), [candidates])
-  const repoIdFor = useRepoIdByWorkspace(workspaces)
-  const ancestorsOf = useLineageAncestors(workspaces)
+  const machines = useMemo(
+    () =>
+      groupResumeCandidatesByHost(candidates).map((machine) => ({
+        ...machine,
+        workspaces: groupResumeCandidates(machine.candidates)
+      })),
+    [candidates]
+  )
+  const allWorkspaces = useMemo(() => machines.flatMap((machine) => machine.workspaces), [machines])
+  const repoIdOf = useRepoIdByWorkspace(allWorkspaces)
+  const ancestorsOf = useLineageAncestors(allWorkspaces)
   const { hostOptions } = useSidebarHostScopeOptions()
   const hostLabelById = useMemo(
     () => new Map(hostOptions.map((host) => [host.id, host.label])),
     [hostOptions]
   )
-  const repoGroups = groupResumeWorkspacesByRepo(workspaces, repoIdFor)
-  const mixedHosts =
-    new Set(candidates.map((candidate) => candidate.executionHostId ?? LOCAL_EXECUTION_HOST_ID))
-      .size > 1
-  const selectable = (sessionId: string): boolean => {
-    const failure = failureFor?.(sessionId)
-    return !failure || resumeFailureSelectable(failure)
+  const expansion = useResumeTreeExpansion()
+  const tree: TreeProps = {
+    listedAt,
+    busy,
+    selected,
+    onToggle,
+    selectable: (sessionId) => {
+      const failure = failureFor?.(sessionId)
+      return !failure || resumeFailureSelectable(failure)
+    },
+    ...expansion,
+    repoIdOf,
+    ancestorsOf,
+    failureFor,
+    onFailureAction
   }
+  // Why: the machine is worth a level only when it is not obvious.
+  const showMachines =
+    machines.length > 1 || machines.some((machine) => machine.hostId !== LOCAL_EXECUTION_HOST_ID)
   return (
     <div className="flex flex-col">
-      {repoGroups.map((repoGroup) => (
-        <section key={repoGroup.repoId ?? 'no-repo'} className="flex flex-col">
-          {/* Workspaces the store cannot place have no project to name or select; Select all
-              still covers them. */}
-          {repoGroup.repoId !== null && (
-            <RepoHeader
-              repoId={repoGroup.repoId}
-              covered={repoGroup.workspaces
-                .flatMap((group) => group.candidates.map((candidate) => candidate.sessionId))
-                .filter(selectable)}
-              busy={busy}
-              selected={selected}
-              onToggle={onToggle}
-            />
-          )}
-          {nestResumeWorkspaces(repoGroup.workspaces, ancestorsOf).map((node) => (
-            <WorkspaceRows
-              key={node.group.workspaceId}
-              node={node}
-              depth={0}
-              mixedHosts={mixedHosts}
-              listedAt={listedAt}
-              busy={busy}
-              selected={selected}
-              onToggle={onToggle}
-              selectable={selectable}
-              hostLabelById={hostLabelById}
-              failureFor={failureFor}
-              onFailureAction={onFailureAction}
-            />
-          ))}
-        </section>
-      ))}
+      {machines.map((machine) =>
+        showMachines ? (
+          <MachineNode
+            key={machine.hostId}
+            hostId={machine.hostId}
+            candidates={machine.candidates}
+            workspaces={machine.workspaces}
+            hostLabelById={hostLabelById}
+            tree={tree}
+          />
+        ) : (
+          <MachineContents
+            key={machine.hostId}
+            hostId={machine.hostId}
+            workspaces={machine.workspaces}
+            depth={0}
+            tree={tree}
+          />
+        )
+      )}
     </div>
   )
 }
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
index 8fa5bb9e66a3..58141aab44f5 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
@@ -79,16 +79,49 @@ it('uses the sidebar surface without a border around the resume list', async ()
   expect(list?.classList.contains('border')).toBe(false)
 })
 
-// It takes arrow keys, so it needs a role; a group also lets its aria-label name it.
-it('exposes the list as a named group', async () => {
+// The resume list is a tree; it keeps the list's accessible name.
+it('exposes the list as a named tree of leveled items', async () => {
   rpc.mockResolvedValue({ sessions: offered })
   await mount(<NativeChatResumeOnRestartModal />)
-  const list = document.querySelector('[role="group"][aria-label="Chats that would be resumed"]')
-  expect(list).not.toBeNull()
-  // The bands run edge to edge; the rounded, clipped container keeps the corners.
-  expect(list?.classList.contains('rounded-md')).toBe(true)
-  expect(list?.classList.contains('overflow-y-auto')).toBe(true)
-  expect(list?.className).not.toMatch(/\bp-/)
+  const tree = document.querySelector('[role="tree"][aria-label="Chats that would be resumed"]')
+  expect(tree).not.toBeNull()
+  expect(
+    document.querySelector('[role="group"][aria-label="Chats that would be resumed"]')
+  ).toBeNull()
+  const levels = [...tree!.querySelectorAll('[role="treeitem"]')].map((item) =>
+    item.getAttribute('aria-level')
+  )
+  // Select all, then this workspace (no project the store knows) and its two chats.
+  expect(levels).toEqual(['1', '1', '2', '2'])
+  // The one divider sits under Select all.
+  const selectAllItem = namedBox('Select all chats').closest('[role="treeitem"]')
+  expect(selectAllItem?.parentElement?.classList.contains('border-b')).toBe(true)
+})
+
+it('folds the focused node with Left and opens it with Right, keeping focus and ticks', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const workspace = namedBox('Select all chats in workspace')
+  const press = async (key: string) =>
+    act(async () => {
+      document.activeElement?.dispatchEvent(new KeyboardEvent('keydown', { key, bubbles: true }))
+    })
+  await act(async () => chatBox('a').click())
+  workspace.focus()
+
+  await press('ArrowLeft')
+  expect(workspace.closest('[role="treeitem"]')?.getAttribute('aria-expanded')).toBe('false')
+  expect(document.querySelector('[aria-label*="Prompt a"]')).toBeNull()
+  expect(document.activeElement).toBe(workspace)
+  // Left again on a closed node does nothing.
+  await press('ArrowLeft')
+  expect(workspace.closest('[role="treeitem"]')?.getAttribute('aria-expanded')).toBe('false')
+
+  await press('ArrowRight')
+  expect(workspace.closest('[role="treeitem"]')?.getAttribute('aria-expanded')).toBe('true')
+  expect(chatBox('a').getAttribute('aria-checked')).toBe('false')
+  expect(chatBox('b').getAttribute('aria-checked')).toBe('true')
+  expect(button('Resume 1 chat')).toBeTruthy()
 })
 
 it('keeps initial focus inside the dialog with no resumable chats', async () => {
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
index c61958e6a2fc..2ed87aa5f310 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
@@ -122,8 +122,10 @@ it('keeps next-launch preference out of the current resume action', async () =>
 it('offers exactly Dismiss all and the resume action', async () => {
   rpc.mockResolvedValue({ sessions: offered })
   await mount(<NativeChatResumeOnRestartModal />)
-  // Row and preference checkboxes are buttons too; the controls are what is left after them.
-  const controls = document.querySelectorAll('[role="dialog"] button:not([role="checkbox"])')
+  // Checkboxes and tree arrows are buttons too; the controls are what is left after them.
+  const controls = document.querySelectorAll(
+    '[role="dialog"] button:not([role="checkbox"]):not([aria-expanded])'
+  )
   expect([...controls].map((entry) => entry.textContent?.trim())).toEqual([
     'Dismiss all',
     'Resume 2 chats',
@@ -667,9 +669,11 @@ it('keeps a lost resume request marked failed when its Dismiss fails', async ()
 
 /** Every button in the dialog, in order; row checkboxes are buttons too, so they are left out. */
 function dialogControls(): (string | null)[] {
-  return [...document.querySelectorAll('[role="dialog"] button:not([role="checkbox"])')].map(
-    (entry) => entry.textContent?.trim() || entry.getAttribute('aria-label')
-  )
+  return [
+    ...document.querySelectorAll(
+      '[role="dialog"] button:not([role="checkbox"]):not([aria-expanded])'
+    )
+  ].map((entry) => entry.textContent?.trim() || entry.getAttribute('aria-label'))
 }
 
 // A chat the resume could not carry on stays in the same dialog — same title, checkboxes and
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index ae165496dc43..85c5d0293a02 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -15,6 +15,7 @@ import { useAppStore } from '../store'
 import { translate } from '@/i18n/i18n'
 import { activateAiVaultStructuredSession } from '@/lib/activate-ai-vault-structured-session'
 import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
+import { ResumeTreeRow } from './NativeChatResumeTreeRow'
 import {
   resumeFailureGuidance,
   resumeFailureSelectable,
@@ -69,21 +70,34 @@ function selectedByDefault(failure: ResumeFailure | undefined): boolean {
   return guidance.primary === 'retry' || guidance.secondary === 'retry'
 }
 
-/** Up/Down step between the list's checkboxes; Space toggles the focused one natively. */
-function moveCheckboxFocus(event: React.KeyboardEvent<HTMLElement>): void {
-  if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') {
-    return
-  }
+/**
+ * Tree keys on a row's checkbox: Up/Down step between the enabled checkboxes, Left collapses and
+ * Right expands the focused node through its own disclosure. Space toggles the checkbox natively.
+ */
+function moveInTree(event: React.KeyboardEvent<HTMLElement>): void {
   const target = event.target
   if (!(target instanceof HTMLElement) || target.getAttribute('role') !== 'checkbox') {
     return
   }
-  const boxes = [
-    ...event.currentTarget.querySelectorAll<HTMLElement>('[role="checkbox"]:not(:disabled)')
-  ]
-  const next = boxes[boxes.indexOf(target) + (event.key === 'ArrowDown' ? 1 : -1)]
-  event.preventDefault()
-  next?.focus()
+  if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
+    const boxes = [
+      ...event.currentTarget.querySelectorAll<HTMLElement>('[role="checkbox"]:not(:disabled)')
+    ]
+    event.preventDefault()
+    boxes[boxes.indexOf(target) + (event.key === 'ArrowDown' ? 1 : -1)]?.focus()
+    return
+  }
+  if (event.key === 'ArrowLeft' || event.key === 'ArrowRight') {
+    event.preventDefault()
+    // Rows are flat treeitems, so the nearest one is this checkbox's own node.
+    const disclosure = target
+      .closest('[role="treeitem"]')
+      ?.querySelector<HTMLButtonElement>('button[aria-expanded]')
+    const open = disclosure?.getAttribute('aria-expanded') === 'true'
+    if (disclosure && open === (event.key === 'ArrowLeft')) {
+      disclosure.click()
+    }
+  }
 }
 
 export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
@@ -206,6 +220,10 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
   }
 
   const interruptedByUpdate = rows.some((row) => row.trigger === 'update')
+  const selectAllLabel = translate(
+    'auto.components.NativeChatResumeOnRestartModal.selectAllLabel',
+    'Select all'
+  )
 
   return (
     <Dialog
@@ -257,37 +275,34 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
         </DialogHeader>
 
         <div
-          role="group"
+          role="tree"
           tabIndex={0}
           aria-label={translate(
             'auto.components.NativeChatResumeOnRestartModal.listLabel',
             'Chats that would be resumed'
           )}
           // The sidebar's own surface, so its workspaces read here as they do there.
-          className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md bg-worktree-sidebar pt-1 pb-1.5"
-          onKeyDown={moveCheckboxFocus}
+          className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md bg-worktree-sidebar p-1.5 pb-2"
+          onKeyDown={moveInTree}
         >
-          {/* Here, not in the groups: a list may hold one set of groups per machine. */}
-          <label className="group/row grid h-7 cursor-pointer grid-cols-[1.75rem_minmax(0,1fr)] items-center has-[:disabled]:cursor-default">
-            <span className="flex justify-center">
-              <Checkbox
-                checked={allSelection.checked}
-                disabled={busy || allSelection.total === 0}
-                onCheckedChange={() =>
-                  toggleResumeSelection(selectable, allSelection, toggleSelected)
-                }
-                aria-label={translate(
-                  'auto.components.NativeChatResumeOnRestartModal.selectAll',
-                  'Select all chats'
-                )}
-              />
-            </span>
-            <span className="mr-1.5 flex h-full min-w-0 items-center gap-1.5 pr-2.5 pl-2 group-hover/row:bg-worktree-sidebar-accent">
+          {/* Here, not in the groups: a list may hold one set of groups per machine. The tree's one
+              divider sets it apart from the nodes. */}
+          <div className="mb-1 border-b border-worktree-sidebar-border pb-0.5">
+            <ResumeTreeRow
+              depth={0}
+              name={selectAllLabel}
+              checked={allSelection.checked}
+              disabled={busy || allSelection.total === 0}
+              onCheckedChange={() =>
+                toggleResumeSelection(selectable, allSelection, toggleSelected)
+              }
+              checkboxLabel={translate(
+                'auto.components.NativeChatResumeOnRestartModal.selectAll',
+                'Select all chats'
+              )}
+            >
               <span className="min-w-0 truncate text-xs font-semibold text-muted-foreground">
-                {translate(
-                  'auto.components.NativeChatResumeOnRestartModal.selectAllLabel',
-                  'Select all'
-                )}
+                {selectAllLabel}
               </span>
               <span className="ml-auto shrink-0 pl-2 text-[11px] tabular-nums text-muted-foreground">
                 {translate(
@@ -296,8 +311,8 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
                   { value0: allSelection.selectedCount, value1: allSelection.total }
                 )}
               </span>
-            </span>
-          </label>
+            </ResumeTreeRow>
+          </div>
           <ResumeOnRestartGroups
             candidates={rows}
             listedAt={listedAt}
diff --git a/src/renderer/src/components/NativeChatResumeTreeHarness.test-support.tsx b/src/renderer/src/components/NativeChatResumeTreeHarness.test-support.tsx
new file mode 100644
index 000000000000..449a92887612
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeTreeHarness.test-support.tsx
@@ -0,0 +1,47 @@
+// The resume tree mounted with selection state, as the dialog owns it, for the tree's tests.
+
+import { useState } from 'react'
+import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
+import { TooltipProvider } from './ui/tooltip'
+import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
+import { onToggleSpy } from './native-chat-resume-tree.test-support'
+
+/** Owns the selection the way the dialog does, so group toggles show their effect. */
+export function ResumeTreeHarness({
+  candidates,
+  initiallySelected,
+  busy = false,
+  failureFor
+}: {
+  candidates: ResumeCandidate[]
+  initiallySelected?: string[]
+  busy?: boolean
+  failureFor?: (sessionId: string) => ResumeFailure | undefined
+}): React.JSX.Element {
+  const [selected, setSelected] = useState<ReadonlySet<string>>(
+    () => new Set(initiallySelected ?? candidates.map((entry) => entry.sessionId))
+  )
+  return (
+    <TooltipProvider>
+      <ResumeOnRestartGroups
+        candidates={candidates}
+        listedAt={1_800_000_060_000}
+        busy={busy}
+        selected={selected}
+        onToggle={(sessionId, checked) => {
+          onToggleSpy(sessionId, checked)
+          setSelected((current) => {
+            const next = new Set(current)
+            if (checked) {
+              next.add(sessionId)
+            } else {
+              next.delete(sessionId)
+            }
+            return next
+          })
+        }}
+        failureFor={failureFor}
+      />
+    </TooltipProvider>
+  )
+}
diff --git a/src/renderer/src/components/NativeChatResumeTreeRow.tsx b/src/renderer/src/components/NativeChatResumeTreeRow.tsx
new file mode 100644
index 000000000000..cb4ad003f353
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeTreeRow.tsx
@@ -0,0 +1,132 @@
+import { ChevronRight } from 'lucide-react'
+import { translate } from '@/i18n/i18n'
+import { Checkbox } from './ui/checkbox'
+
+/** Indent per tree level, right of the shared checkbox column. */
+const RESUME_TREE_INDENT_PX = 18
+
+/** Width of the checkbox column (w-7). */
+const RESUME_TREE_CHECKBOX_COLUMN_PX = 28
+
+/** Where a row's body starts: the checkbox column, the arrow slot (size-4.5) and the body's pl-1. */
+const RESUME_TREE_BODY_OFFSET_PX = RESUME_TREE_CHECKBOX_COLUMN_PX + 18 + 4
+
+/**
+ * One row of the resume tree: the checkbox in the list's single left column, the indent for its
+ * depth, a disclosure arrow (an empty slot on a leaf, so icons line up), then the caller's body.
+ *
+ * The row is a flat `treeitem` carrying its own `aria-level`, so the tree's keyboard handling can
+ * find a row's disclosure without walking nested groups.
+ */
+export function ResumeTreeRow({
+  depth,
+  expanded,
+  onExpandedChange,
+  name,
+  checked,
+  disabled,
+  onCheckedChange,
+  checkboxLabel,
+  compact = false,
+  trailing,
+  below,
+  children
+}: {
+  depth: number
+  /** Absent on a leaf; a node with children is open or closed. */
+  expanded?: boolean
+  onExpandedChange?: (expanded: boolean) => void
+  /** Names the node in its disclosure's label. */
+  name: string
+  checked: boolean | 'indeterminate'
+  disabled: boolean
+  onCheckedChange: (checked: boolean) => void
+  checkboxLabel: string
+  /** A chat row sits a little tighter than a group row. */
+  compact?: boolean
+  /** Controls beside the row that must not toggle its checkbox. */
+  trailing?: React.ReactNode
+  /** A line under the row, aligned with its body. */
+  below?: React.ReactNode
+  children: React.ReactNode
+}): React.JSX.Element {
+  const indent = depth * RESUME_TREE_INDENT_PX
+  return (
+    <div role="treeitem" aria-level={depth + 1} aria-expanded={expanded} className="flex flex-col">
+      <div className="group/row relative flex min-w-0 items-center gap-1">
+        <label
+          data-compact={compact}
+          className="flex h-7 min-w-0 flex-1 cursor-pointer items-center rounded-md pr-2.5 group-hover/row:bg-worktree-sidebar-accent has-[:disabled]:cursor-default data-[compact=true]:h-6.5"
+        >
+          <span className="flex w-7 shrink-0 justify-center">
+            <Checkbox
+              checked={checked}
+              disabled={disabled}
+              onCheckedChange={(next) => onCheckedChange(next === true)}
+              aria-label={checkboxLabel}
+            />
+          </span>
+          <span aria-hidden="true" className="shrink-0" style={{ width: indent }} />
+          {/* The arrow's slot, kept on a leaf too so icons line up. */}
+          <span aria-hidden="true" className="size-4.5 shrink-0" />
+          <span className="flex min-w-0 flex-1 items-center gap-1.5 pl-1">{children}</span>
+        </label>
+        {expanded !== undefined && (
+          // Laid over its slot rather than inside the label, so pressing it never toggles the
+          // checkbox. Off the tab order: Left/Right on the row's checkbox do the same.
+          <button
+            type="button"
+            tabIndex={-1}
+            aria-expanded={expanded}
+            aria-label={
+              expanded
+                ? translate(
+                    'auto.components.NativeChatResumeOnRestartModal.collapseNode',
+                    'Collapse {{value0}}',
+                    { value0: name }
+                  )
+                : translate(
+                    'auto.components.NativeChatResumeOnRestartModal.expandNode',
+                    'Expand {{value0}}',
+                    { value0: name }
+                  )
+            }
+            onClick={() => onExpandedChange?.(!expanded)}
+            className="group/disclosure absolute top-1/2 flex size-4.5 -translate-y-1/2 items-center justify-center rounded-sm text-muted-foreground hover:bg-foreground/8"
+            style={{ left: RESUME_TREE_CHECKBOX_COLUMN_PX + indent }}
+          >
+            <ChevronRight className="size-3 transition-transform group-aria-expanded/disclosure:rotate-90 motion-reduce:transition-none" />
+          </button>
+        )}
+        {trailing}
+      </div>
+      {below && (
+        <div className="pr-2.5" style={{ paddingLeft: RESUME_TREE_BODY_OFFSET_PX + indent }}>
+          {below}
+        </div>
+      )}
+    </div>
+  )
+}
+
+/** A group node's "x of y" on the right of its row. */
+export function ResumeTreeCount({
+  selectedCount,
+  total
+}: {
+  selectedCount: number
+  total: number
+}): React.JSX.Element | null {
+  if (total === 0) {
+    return null
+  }
+  return (
+    <span className="ml-auto shrink-0 pl-2 text-[11px] tabular-nums text-muted-foreground">
+      {translate(
+        'auto.components.NativeChatResumeOnRestartModal.workspaceSelectedCount',
+        '{{value0}} of {{value1}}',
+        { value0: selectedCount, value1: total }
+      )}
+    </span>
+  )
+}
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
index 2d3bd0306e54..7245befbf0e8 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
@@ -4,6 +4,7 @@ import { describe, expect, it } from 'vitest'
 import {
   allResumeSessionIds,
   groupResumeCandidates,
+  groupResumeCandidatesByHost,
   groupResumeWorkspacesByRepo,
   nestResumeWorkspaces,
   resolveResumeGroupHeader,
@@ -227,3 +228,21 @@ describe('group checkboxes', () => {
     ])
   })
 })
+
+describe('grouping by machine', () => {
+  it('groups by host in first-seen order, a missing host id counting as this machine', () => {
+    const groups = groupResumeCandidatesByHost([
+      candidate({ sessionId: 'a', executionHostId: 'ssh:box' }),
+      candidate({ sessionId: 'b', executionHostId: undefined }),
+      candidate({ sessionId: 'c', executionHostId: 'ssh:box' }),
+      candidate({ sessionId: 'd', executionHostId: 'local' })
+    ])
+
+    expect(
+      groups.map((group) => [group.hostId, group.candidates.map((entry) => entry.sessionId)])
+    ).toEqual([
+      ['ssh:box', ['a', 'c']],
+      ['local', ['b', 'd']]
+    ])
+  })
+})
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
index 9526926841e9..e5c32f33b57f 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
@@ -1,6 +1,6 @@
 import { parseWorkspaceKey } from '../../../shared/workspace-scope'
 import type { AgentSessionWorkspaceKind } from '../../../shared/agent-session-record'
-import type { ExecutionHostId } from '../../../shared/execution-host'
+import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host'
 import { projectGroupIdFromRepoId } from '../../../shared/folder-workspace-worktree'
 import type { RepoIcon } from '../../../shared/repo-icon'
 import type { AgentSessionRestartActivity } from '../../../shared/agent-session-restart-activity'
@@ -75,6 +75,28 @@ export function resumeWorkspaceKind(candidate: ResumeCandidate): AgentSessionWor
   )
 }
 
+export type ResumeMachineGroup = {
+  hostId: ExecutionHostId
+  candidates: ResumeCandidate[]
+}
+
+/** Groups by the machine each chat runs on, in first-seen order; no host id means this machine. */
+export function groupResumeCandidatesByHost(
+  candidates: readonly ResumeCandidate[]
+): ResumeMachineGroup[] {
+  const groups = new Map<ExecutionHostId, ResumeCandidate[]>()
+  for (const candidate of candidates) {
+    const hostId = candidate.executionHostId ?? LOCAL_EXECUTION_HOST_ID
+    const existing = groups.get(hostId)
+    if (existing) {
+      existing.push(candidate)
+    } else {
+      groups.set(hostId, [candidate])
+    }
+  }
+  return [...groups].map(([hostId, entries]) => ({ hostId, candidates: entries }))
+}
+
 /** Groups by workspace, preserving the order the host offered them so the list is stable. */
 export function groupResumeCandidates(
   candidates: readonly ResumeCandidate[]
diff --git a/src/renderer/src/components/native-chat-resume-tree-state.ts b/src/renderer/src/components/native-chat-resume-tree-state.ts
new file mode 100644
index 000000000000..f795afe2c817
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-tree-state.ts
@@ -0,0 +1,30 @@
+import { createContext, useState } from 'react'
+
+// The resume tree's shared state: which nodes are open, and how deep a chat row sits.
+
+/**
+ * Which nodes are open. Everything starts expanded; the state is this mount's own, so a dialog that
+ * unmounts its tree on close reopens it fully expanded. Never persisted.
+ */
+export function useResumeTreeExpansion(): {
+  isExpanded: (key: string) => boolean
+  setExpanded: (key: string, expanded: boolean) => void
+} {
+  const [collapsed, setCollapsed] = useState<ReadonlySet<string>>(() => new Set())
+  return {
+    isExpanded: (key) => !collapsed.has(key),
+    setExpanded: (key, expanded) =>
+      setCollapsed((current) => {
+        const next = new Set(current)
+        if (expanded) {
+          next.delete(key)
+        } else {
+          next.add(key)
+        }
+        return next
+      })
+  }
+}
+
+/** The tree depth a chat row renders at; the enclosing workspace node provides it. */
+export const ResumeTreeDepthContext = createContext(0)
diff --git a/src/renderer/src/components/native-chat-resume-tree.test-support.ts b/src/renderer/src/components/native-chat-resume-tree.test-support.ts
new file mode 100644
index 000000000000..733063fcf240
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-tree.test-support.ts
@@ -0,0 +1,151 @@
+// Fixtures and DOM lookups shared by the resume tree's test files.
+
+import { vi, type Mock } from 'vitest'
+import { useAppStore } from '../store'
+import { getDefaultSettings } from '../../../shared/constants'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { WorktreeLineage } from '../../../shared/worktree/lineage-types'
+import type { Worktree } from '../../../shared/worktree/types'
+import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
+
+export function worktree(name: string, overrides: Partial<Worktree> = {}): Worktree {
+  return {
+    id: `repo-1::/repo/${name}`,
+    instanceId: `instance-${name}`,
+    repoId: 'repo-1',
+    path: `/repo/${name}`,
+    displayName: name,
+    branch: `refs/heads/${name}-branch`,
+    head: 'abc123',
+    isBare: false,
+    isMainWorktree: false,
+    comment: '',
+    linkedIssue: null,
+    linkedPR: null,
+    linkedLinearIssue: null,
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: 0,
+    lastActivityAt: 1,
+    ...overrides
+  }
+}
+
+export function candidate(sessionId: string, workspace: Worktree): ResumeCandidate {
+  return {
+    sessionId,
+    workspaceId: workspace.id,
+    agent: 'codex',
+    trigger: 'quit',
+    latestPrompt: `Prompt ${sessionId}`,
+    recordedAt: 1_800_000_000_000,
+    executionHostId: workspace.hostId ?? 'local',
+    workspaceKind: 'git-worktree'
+  }
+}
+
+export function lineage(child: Worktree, parent: Worktree): WorktreeLineage {
+  return {
+    worktreeId: child.id,
+    worktreeInstanceId: child.instanceId!,
+    parentWorktreeId: parent.id,
+    parentWorktreeInstanceId: parent.instanceId!,
+    origin: 'cli',
+    capture: { source: 'explicit-cli-flag', confidence: 'explicit' },
+    createdAt: 1
+  }
+}
+
+/** A failure the host says a retry cannot fix. */
+export function unretryable(entry: ResumeCandidate): ResumeFailure {
+  return {
+    ...entry,
+    failedAt: 1_800_000_030_000,
+    outcome: 'refused',
+    reason: 'agent_session_restart_work_superseded',
+    retryable: false
+  }
+}
+
+/** Repo "orca": parent (1 chat) > child (2 chats), plus an unrelated root workspace "other". */
+export function seedTree(hosts: { parent?: ExecutionHostId; child?: ExecutionHostId } = {}) {
+  // An explicit undefined is a row with no host id (older metadata).
+  const parentHost = 'parent' in hosts ? hosts.parent : 'local'
+  const parent = worktree('parent', { hostId: parentHost })
+  const child = worktree('child', { hostId: 'child' in hosts ? hosts.child : 'local' })
+  const other = worktree('other', { hostId: parentHost })
+  useAppStore.setState({
+    settings: getDefaultSettings(''),
+    repos: [
+      { id: 'repo-1', path: '/repo', displayName: 'orca', badgeColor: '#999999', addedAt: 1 }
+    ],
+    worktreesByRepo: { 'repo-1': [parent, child, other] },
+    worktreeLineageById: { [child.id]: lineage(child, parent) }
+  })
+  return [
+    candidate('in-child', child),
+    candidate('in-parent', parent),
+    candidate('also-in-child', child),
+    candidate('in-other', other)
+  ]
+}
+
+export const onToggleSpy: Mock<(sessionId: string, checked: boolean) => void> = vi.fn()
+
+/** A group node's checkbox: workspace or project ("in"), machine ("on"). */
+export function nodeBox(name: string): HTMLElement {
+  const box = document.querySelector<HTMLElement>(
+    `[role="checkbox"][aria-label="Select all chats in ${name}"], [role="checkbox"][aria-label="Select all chats on ${name}"]`
+  )
+  if (!box) {
+    throw new Error(`Missing node checkbox: ${name}`)
+  }
+  return box
+}
+
+export function chatBox(sessionId: string): HTMLElement {
+  const box = document.querySelector<HTMLElement>(
+    `[role="checkbox"][aria-label*="Prompt ${sessionId}"]`
+  )
+  if (!box) {
+    throw new Error(`Missing chat checkbox: ${sessionId}`)
+  }
+  return box
+}
+
+export function queryChatBox(sessionId: string): HTMLElement | null {
+  return document.querySelector<HTMLElement>(`[role="checkbox"][aria-label*="Prompt ${sessionId}"]`)
+}
+
+export function itemOf(box: HTMLElement): HTMLElement {
+  return box.closest<HTMLElement>('[role="treeitem"]')!
+}
+
+/** The group node's "x of y". */
+export function countOf(name: string): string | undefined {
+  return itemOf(nodeBox(name)).querySelector('.tabular-nums')?.textContent ?? undefined
+}
+
+export function disclosureOf(name: string): HTMLButtonElement {
+  return itemOf(nodeBox(name)).querySelector<HTMLButtonElement>('button[aria-expanded]')!
+}
+
+/** Each tree row in order, as level:kind:name, kind read off the name's weight. */
+export function treeOutline(): string[] {
+  return [...document.querySelectorAll<HTMLElement>('[role="treeitem"]')].map((item) => {
+    const level = item.getAttribute('aria-level')
+    const label = item.querySelector('[role="checkbox"]')?.getAttribute('aria-label') ?? ''
+    const chat = /Prompt ([\w-]+)/.exec(label)?.[1]
+    if (chat) {
+      return `${level}:chat:${chat}`
+    }
+    const name = /^Select all chats (?:in|on) (.+)$/.exec(label)?.[1]
+    const kind = item.querySelector('.font-bold')
+      ? 'machine'
+      : item.querySelector('.font-semibold')
+        ? 'project'
+        : 'workspace'
+    return `${level}:${kind}:${name}`
+  })
+}
diff --git a/src/renderer/src/components/native-chat-resume-workspace-lookups.ts b/src/renderer/src/components/native-chat-resume-workspace-lookups.ts
new file mode 100644
index 000000000000..52d4ffd8d5a1
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-workspace-lookups.ts
@@ -0,0 +1,84 @@
+import { useMemo } from 'react'
+import {
+  getCyclicProjectedWorktreeLineageIds,
+  getSidebarLineageAncestors
+} from '@/components/sidebar/worktree-lineage-projection'
+import {
+  getAllWorktreesFromState,
+  getWorktreeMapFromState,
+  getWorktreeOnHostFromState
+} from '@/store/selectors'
+import {
+  composeWorktreeHostIdentity,
+  getWorktreeHostIdentity
+} from '../../../shared/worktree/host-qualified-identity'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import { useAppStore } from '../store'
+import type { ResumeWorkspaceGroup } from './native-chat-resume-on-restart-grouping'
+
+// Store lookups the resume tree makes for its workspaces, each on the workspace's own host.
+
+/** The store's row for a workspace on its own host; folder workspaces included. Stable per row. */
+export function useWorkspaceWorktree(workspaceId: string, hostId: ExecutionHostId | undefined) {
+  return useAppStore((store) => store.getKnownWorktreeById(workspaceId, hostId))
+}
+
+/**
+ * The repo owning each workspace, as one narrow subscription.
+ *
+ * Selected as a joined string rather than a map so the selector returns a PRIMITIVE: a fresh object
+ * or array would fail the equality check on every store change and re-render the whole list.
+ * Keyed by the group itself: the same workspace id can be listed on two machines.
+ */
+export function useRepoIdByWorkspace(
+  workspaces: readonly ResumeWorkspaceGroup[]
+): (group: ResumeWorkspaceGroup) => string | null {
+  const ids = workspaces.map((group) => group.workspaceId)
+  const hosts = workspaces.map((group) => group.candidates[0]?.executionHostId)
+  const joined = useAppStore((store) =>
+    ids.map((id, index) => store.getKnownWorktreeById(id, hosts[index])?.repoId ?? '').join('\0')
+  )
+  const repoIds = joined.split('\0')
+  return (group) => {
+    const index = workspaces.indexOf(group)
+    const repoId = index === -1 ? '' : (repoIds[index] ?? '')
+    return repoId === '' ? null : repoId
+  }
+}
+
+/** Each workspace's lineage ancestors, nearest first, by the sidebar's own nesting rule. */
+export function useLineageAncestors(
+  workspaces: readonly ResumeWorkspaceGroup[]
+): (group: ResumeWorkspaceGroup) => readonly string[] {
+  const worktreesByRepo = useAppStore((store) => store.worktreesByRepo)
+  const worktreeLineageById = useAppStore((store) => store.worktreeLineageById)
+  const ancestors = useMemo(() => {
+    const state = { worktreesByRepo }
+    // Why: archived rows never render in the sidebar, so nothing nests under them.
+    const rows = new Map(
+      getAllWorktreesFromState(state)
+        .filter((worktree) => !worktree.isArchived)
+        .map((worktree) => [getWorktreeHostIdentity(worktree), worktree])
+    )
+    const cyclic = getCyclicProjectedWorktreeLineageIds(
+      worktreeLineageById,
+      getWorktreeMapFromState(state)
+    )
+    return new Map(
+      workspaces.map((group) => {
+        // Why: a row with no host id (older metadata) is still the chat's workspace.
+        const target =
+          getWorktreeOnHostFromState(
+            state,
+            group.workspaceId,
+            group.candidates[0]?.executionHostId
+          ) ?? rows.get(composeWorktreeHostIdentity(undefined, group.workspaceId))
+        const parents = target
+          ? getSidebarLineageAncestors(target, worktreeLineageById, rows, cyclic)
+          : []
+        return [group, parents.map((parent) => parent.id)]
+      })
+    )
+  }, [workspaces, worktreesByRepo, worktreeLineageById])
+  return (group) => ancestors.get(group) ?? []
+}
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 9c3e98807873..09178330f749 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -2133,7 +2133,11 @@
         "selectAll": "Select all chats",
         "selectAllLabel": "Select all",
         "selectedCount": "{{value0}} of {{value1}} selected",
-        "selectProject": "Select all chats in {{value0}}"
+        "selectProject": "Select all chats in {{value0}}",
+        "collapseNode": "Collapse {{value0}}",
+        "expandNode": "Expand {{value0}}",
+        "selectMachine": "Select all chats on {{value0}}",
+        "sshHost": "SSH"
       },
       "StarNagCard": {
         "92b0f9d921": "is authenticated and try again.",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 1d208cff5b6c..c5d98c2cad97 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -17379,7 +17379,11 @@
         "selectAll": "Seleccionar todos los chats",
         "selectAllLabel": "Seleccionar todo",
         "selectedCount": "{{value0}} de {{value1}} seleccionados",
-        "selectProject": "Seleccionar todos los chats en {{value0}}"
+        "selectProject": "Seleccionar todos los chats en {{value0}}",
+        "collapseNode": "Contraer {{value0}}",
+        "expandNode": "Expandir {{value0}}",
+        "selectMachine": "Seleccionar todos los chats en {{value0}}",
+        "sshHost": "SSH"
       },
       "NativeChatResumeOutcomeRow": {
         "openChat": "Abrir chat",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 51fb65ab69bd..663cae6c421e 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -17500,7 +17500,11 @@
         "selectAll": "Sélectionner toutes les discussions",
         "selectAllLabel": "Tout sélectionner",
         "selectedCount": "{{value0}} sur {{value1}} sélectionnées",
-        "selectProject": "Sélectionner toutes les discussions dans {{value0}}"
+        "selectProject": "Sélectionner toutes les discussions dans {{value0}}",
+        "collapseNode": "Réduire {{value0}}",
+        "expandNode": "Développer {{value0}}",
+        "selectMachine": "Sélectionner toutes les discussions sur {{value0}}",
+        "sshHost": "SSH"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "Filtrage des statuts des équipes {{value0}} sur {{value1}} : les problèmes des équipes restantes ne sont pas inclus.",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index f89e561d8093..a3c06d48c681 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -17384,7 +17384,11 @@
         "selectAll": "すべてのチャットを選択",
         "selectAllLabel": "すべて選択",
         "selectedCount": "{{value1}} 件中 {{value0}} 件を選択",
-        "selectProject": "{{value0}} のチャットをすべて選択"
+        "selectProject": "{{value0}} のチャットをすべて選択",
+        "collapseNode": "{{value0}} を折りたたむ",
+        "expandNode": "{{value0}} を展開します",
+        "selectMachine": "{{value0}} のチャットをすべて選択",
+        "sshHost": "SSH"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "{{value0}}/{{value1}} チームステータスをフィルタリングしています。残りのチームからの問題は含まれません。",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index d4f98f162590..dbdb18ada90e 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -17384,7 +17384,11 @@
         "selectAll": "모든 채팅 선택",
         "selectAllLabel": "모두 선택",
         "selectedCount": "{{value1}}개 중 {{value0}}개 선택됨",
-        "selectProject": "{{value0}}의 채팅 모두 선택"
+        "selectProject": "{{value0}}의 채팅 모두 선택",
+        "collapseNode": "{{value0}} 접기",
+        "expandNode": "{{value0}} 확장",
+        "selectMachine": "{{value0}}의 채팅 모두 선택",
+        "sshHost": "SSH"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "{{value1}} 팀 상태 중 {{value0}} 필터링 중 - 나머지 팀의 문제는 포함되지 않습니다.",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 15fb22510456..8502f4443c20 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -17384,7 +17384,11 @@
         "selectAll": "选择全部聊天",
         "selectAllLabel": "选择全部",
         "selectedCount": "已选择 {{value0}}/{{value1}}",
-        "selectProject": "选择 {{value0}} 中的全部聊天"
+        "selectProject": "选择 {{value0}} 中的全部聊天",
+        "collapseNode": "折叠 {{value0}}",
+        "expandNode": "展开 {{value0}}",
+        "selectMachine": "选择 {{value0}} 上的全部聊天",
+        "sshHost": "SSH"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "过滤 {{value1}} 团队状态中的 {{value0}} — 不包括其余团队的问题。",

From 2bdcd7cc9b76dfba0e7de22f748987142de99174 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 18:36:43 -0700
Subject: [PATCH 30/37] fix(native-chat): judge "the resume dialog is on
 screen" when asked, not from an effect's copy

The reconnect toast was held back by a flag the dialog set in an effect.
When this computer's last rows went and a server's restart landed in the
same tick, the request was already gone but the flag still said "on
screen": the server's interruption was recorded as shown, its toast was
skipped, and no dialog ever showed it.

The toast guard now reads, at the moment it asks, the state the dialog
draws from: a pending request, rows listed in the offer store, and a
mounted dialog (a mount count, set once per mount).
---
 ...ChatResumeOnRestartModal.machines.test.tsx | 38 +++++++++++++++++++
 ...native-chat-restart-offer-triggers.test.ts | 20 ++++++----
 .../native-chat-restart-offer-triggers.ts     |  4 +-
 .../native-chat-resume-dialog-opening.ts      |  7 +---
 .../native-chat-resume-on-restart-dialog.ts   | 21 +++++-----
 5 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.machines.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.machines.test.tsx
index 4abe4320c596..fe8c518cd679 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.machines.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.machines.test.tsx
@@ -370,6 +370,44 @@ it('raises no restart toast for a server whose chats land in the open dialog', a
   expect(document.querySelector('[role="dialog"]')?.textContent).toContain('studio-mac')
 })
 
+// The dialog's last rows go and a server's restart lands in the same tick, before React renders:
+// the dialog is already gone for the user, so the server's restart gets its toast.
+it('announces a server restart that lands in the same tick the dialog loses its last rows', async () => {
+  window.localStorage.clear()
+  await stage({})
+  await open('local')
+  const localRead = Promise.withResolvers<unknown>()
+  const studioRead = Promise.withResolvers<unknown>()
+  rpc.mockImplementation((target, method) =>
+    method !== 'agentSession.restartResumable'
+      ? Promise.resolve({ continued: [], sessions: [] })
+      : target.kind === 'local'
+        ? localRead.promise
+        : studioRead.promise
+  )
+  vi.mocked(toast).mockClear()
+  // Outside act on purpose: React's passive effects must not run between the two answers.
+  const reads = Promise.all([
+    readNativeChatRestartMachine({ kind: 'local' }),
+    readNativeChatRestartMachine({ kind: 'environment', environmentId: 'studio' })
+  ])
+  // Both requests are out (the server's after its capability check) before either answers.
+  await vi.waitFor(() =>
+    expect(
+      rpc.mock.calls.filter((call) => call[1] === 'agentSession.restartResumable')
+    ).toHaveLength(2)
+  )
+  localRead.resolve({ sessions: [] })
+  studioRead.resolve({ sessions: [row('s1', 'own')] })
+  await reads
+  await act(async () => {})
+  expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
+  expect(document.querySelector('[role="dialog"]')).toBeNull()
+  expect(vi.mocked(toast).mock.calls.map(([title]) => title)).toEqual([
+    'studio-mac restarted for an update'
+  ])
+})
+
 // A "Resuming" click while a concurrent read lists nothing opens nothing and leaves nothing behind:
 // once that resume's answer is lost, a later server's restart still gets its toast and does not
 // open the dialog by itself.
diff --git a/src/renderer/src/components/native-chat-restart-offer-triggers.test.ts b/src/renderer/src/components/native-chat-restart-offer-triggers.test.ts
index 8758d8046801..75b183975304 100644
--- a/src/renderer/src/components/native-chat-restart-offer-triggers.test.ts
+++ b/src/renderer/src/components/native-chat-restart-offer-triggers.test.ts
@@ -9,7 +9,7 @@ import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
 import {
   consumeNativeChatResumeOnRestartDialogRequest,
   getNativeChatResumeOnRestartDialogRequest,
-  setNativeChatResumeDialogShowing,
+  mountNativeChatResumeDialog,
   requestNativeChatResumeOnRestartDialog
 } from './native-chat-resume-on-restart-dialog'
 import {
@@ -308,12 +308,16 @@ it('continues an interruption at most once per run when storage refuses writes a
   }
 })
 
-// A dialog on screen lists every machine: no toast repeats it. The dialog reports itself drawn.
+// A dialog on screen lists every machine: no toast repeats it.
 it('raises no toast while a resume dialog is on screen, which lists the server too', async () => {
-  requestNativeChatResumeOnRestartDialog('local')
-  setNativeChatResumeDialogShowing(true)
-  await connect({ runtimeId: 'r2' })
-  expect(toast).not.toHaveBeenCalled()
+  const unmount = mountNativeChatResumeDialog()
+  try {
+    requestNativeChatResumeOnRestartDialog('local')
+    await connect({ runtimeId: 'r2' })
+    expect(toast).not.toHaveBeenCalled()
+  } finally {
+    unmount()
+  }
 })
 
 // A request alone is not a dialog the user sees: one nothing draws must not swallow the toast.
@@ -347,11 +351,11 @@ it('forgets the old pairing’s rows as soon as the saved record is re-paired',
 })
 
 it('decides what an open dialog already shows without a toast', async () => {
+  const unmount = mountNativeChatResumeDialog()
   requestNativeChatResumeOnRestartDialog(null)
-  setNativeChatResumeDialogShowing(true)
   await connect({ runtimeId: 'r2' })
   expect(toast).not.toHaveBeenCalled()
-  setNativeChatResumeDialogShowing(false)
+  unmount()
   consumeNativeChatResumeOnRestartDialogRequest()
   await readNativeChatRestartMachine(TARGET)
   expect(toast).not.toHaveBeenCalled()
diff --git a/src/renderer/src/components/native-chat-restart-offer-triggers.ts b/src/renderer/src/components/native-chat-restart-offer-triggers.ts
index bf9c7941db99..f1126496c7af 100644
--- a/src/renderer/src/components/native-chat-restart-offer-triggers.ts
+++ b/src/renderer/src/components/native-chat-restart-offer-triggers.ts
@@ -27,7 +27,7 @@ import { requestLaunchResumePrompt } from './native-chat-resume-on-restart-launc
 import { markNativeChatLaunchResumeDecided } from './native-chat-launch-resume-decision'
 import {
   _resetNativeChatResumeOnRestartDialog,
-  isNativeChatResumeDialogShowing
+  nativeChatResumeDialogOnScreen
 } from './native-chat-resume-on-restart-dialog'
 import {
   _resetRestartDecidedMemory,
@@ -140,7 +140,7 @@ function decidePairedAnswer(target: RuntimeClientTarget, candidates: readonly Re
     fresh.map(restartInterruptionKey)
   )
   // A resume dialog on screen lists every machine: what it shows needs no toast.
-  if (fresh.length === 0 || isNativeChatResumeDialogShowing()) {
+  if (fresh.length === 0 || nativeChatResumeDialogOnScreen(getNativeChatRestartOffers().size > 0)) {
     return
   }
   if (autoResumeEnabled()) {
diff --git a/src/renderer/src/components/native-chat-resume-dialog-opening.ts b/src/renderer/src/components/native-chat-resume-dialog-opening.ts
index 00814c670822..a64f41ab9d03 100644
--- a/src/renderer/src/components/native-chat-resume-dialog-opening.ts
+++ b/src/renderer/src/components/native-chat-resume-dialog-opening.ts
@@ -2,7 +2,7 @@ import { useEffect, useSyncExternalStore } from 'react'
 import { useNativeChatRestartOfferEnabled } from './native-chat-restart-offer-gate'
 import {
   getNativeChatResumeOnRestartDialogRequest,
-  setNativeChatResumeDialogShowing,
+  mountNativeChatResumeDialog,
   subscribeNativeChatResumeOnRestartDialog,
   type NativeChatResumeOnRestartDialogRequest
 } from './native-chat-resume-on-restart-dialog'
@@ -37,10 +37,7 @@ export function useNativeChatResumeDialogOpening(): {
   // What the open dialog shows is decided: a later read of a paired server does not announce it,
   // and a restart toast still up goes, since the dialog lists its chats and blocks clicks on it.
   const showing = request !== null && machines.length > 0
-  useEffect(() => {
-    setNativeChatResumeDialogShowing(showing)
-    return () => setNativeChatResumeDialogShowing(false)
-  }, [showing])
+  useEffect(mountNativeChatResumeDialog, [])
   useEffect(() => {
     if (!showing) {
       return
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-dialog.ts b/src/renderer/src/components/native-chat-resume-on-restart-dialog.ts
index c23ccd54cd17..d1766dd928c5 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-dialog.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-dialog.ts
@@ -6,8 +6,8 @@ export type NativeChatResumeOnRestartDialogRequest = Readonly<{
 }>
 
 let pending: NativeChatResumeOnRestartDialogRequest | null = null
-/** Whether the dialog is drawn right now, as the dialog itself reports it. */
-let showing = false
+/** How many resume dialogs are mounted to draw a request (the app mounts one). */
+let mountedDialogs = 0
 const listeners = new Set<() => void>()
 
 function notify(): void {
@@ -43,14 +43,18 @@ export function getNativeChatResumeOnRestartDialogRequest(): NativeChatResumeOnR
   return pending
 }
 
-/** Set by the dialog: an open request with something to list. */
-export function setNativeChatResumeDialogShowing(next: boolean): void {
-  showing = next
+/** The dialog's own mount; returns its unmount. */
+export function mountNativeChatResumeDialog(): () => void {
+  mountedDialogs += 1
+  return () => {
+    mountedDialogs -= 1
+  }
 }
 
-/** Whether the user is looking at the dialog now; a pending request alone does not say so. */
-export function isNativeChatResumeDialogShowing(): boolean {
-  return showing
+/** Whether a mounted dialog would draw a request right now, given whether any machine lists rows.
+ *  Read at the moment of asking, from the state the dialog renders from: never a copy of it. */
+export function nativeChatResumeDialogOnScreen(rowsListed: boolean): boolean {
+  return pending !== null && rowsListed && mountedDialogs > 0
 }
 
 export function subscribeNativeChatResumeOnRestartDialog(listener: () => void): () => void {
@@ -63,5 +67,4 @@ export function subscribeNativeChatResumeOnRestartDialog(listener: () => void):
 /** @internal - tests need a clean module between cases. */
 export function _resetNativeChatResumeOnRestartDialog(): void {
   pending = null
-  showing = false
 }

From 0175ddfc3859710901e9602a058f48f280ffd564 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 19:01:04 -0700
Subject: [PATCH 31/37] refactor(native-chat): read each resume chat through
 one key helper

Every per-chat read in the resume tree (its tick, its toggle, its
failure, and each group's coverage) now goes through chatState, so a
later change of chat key stays in one function. Tests pin the machine
level's host rules: a runtime host gets a machine node but no SSH chip.
---
 .../NativeChatResumeOnRestartGroups.test.tsx  | 10 +++
 .../NativeChatResumeOnRestartGroups.tsx       | 75 +++++++------------
 ...ve-chat-resume-on-restart-grouping.test.ts |  9 ++-
 .../native-chat-resume-on-restart-grouping.ts |  7 +-
 .../native-chat-resume-tree-state.ts          | 55 +++++++++++++-
 5 files changed, 101 insertions(+), 55 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
index b54a1f412f82..70c7dfdbf24e 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -129,6 +129,16 @@ it('heads a single SSH host with its machine node, named and marked SSH', () =>
   expect(itemOf(nodeBox('parent')).textContent).not.toContain(machine)
 })
 
+// A paired Orca server's runtime host is not this machine, but it is not SSH either.
+it('heads a runtime host with its machine node and no SSH chip', () => {
+  const runtime: ExecutionHostId = 'runtime:env-1'
+  render({ candidates: seedTree({ parent: runtime, child: runtime }) })
+
+  const machine = getHostContextLabel(runtime)
+  expect(treeOutline()[0]).toBe(`1:machine:${machine}`)
+  expect(itemOf(nodeBox(machine)).textContent).not.toContain('SSH')
+})
+
 // A target saved through Add SSH target gets a generated id; the sidebar names it by its label.
 it('names an SSH machine by its saved name, not its target id', () => {
   const targetId = 'ssh-1728291234567-abc12d'
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index 5f4d14036168..0444159c26b8 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -22,7 +22,14 @@ import {
 } from './native-chat-resume-workspace-lookups'
 import { ResumeCandidateRow } from './NativeChatResumeOnRestartAgentRow'
 import { ResumeTreeCount, ResumeTreeRow } from './NativeChatResumeTreeRow'
-import { ResumeTreeDepthContext, useResumeTreeExpansion } from './native-chat-resume-tree-state'
+import {
+  chatState,
+  coveredKeys,
+  ResumeTreeDepthContext,
+  useResumeTreeExpansion,
+  type FailureProps,
+  type TreeProps
+} from './native-chat-resume-tree-state'
 import {
   groupResumeCandidates,
   groupResumeCandidatesByHost,
@@ -31,17 +38,12 @@ import {
   resolveResumeGroupHeader,
   resumeSelectionState,
   resumeWorkspaceKind,
-  resumeWorkspaceSessionIds,
+  resumeWorkspaceCandidates,
   toggleResumeSelection,
   type ResumeCandidate,
-  type ResumeFailure,
   type ResumeWorkspaceGroup,
   type ResumeWorkspaceNode
 } from './native-chat-resume-on-restart-grouping'
-import {
-  resumeFailureSelectable,
-  type ResumeFailureAction
-} from './native-chat-resume-failure-guidance'
 
 export type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
 
@@ -57,26 +59,6 @@ export type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
  * A workspace the store does not know yet (host connecting, or deleted) is named by its id.
  */
 
-/** Lets a row that an earlier resume could not carry on show what went wrong and what to do. */
-type FailureProps = {
-  failureFor?: (sessionId: string) => ResumeFailure | undefined
-  onFailureAction?: (action: ResumeFailureAction, sessionId: string) => void
-}
-
-/** What every node needs from the tree as a whole. */
-type TreeProps = {
-  listedAt: number
-  busy: boolean
-  selected: ReadonlySet<string>
-  onToggle: (sessionId: string, checked: boolean) => void
-  /** Whether a group checkbox may tick this chat; a failure a retry cannot fix is left out. */
-  selectable: (sessionId: string) => boolean
-  isExpanded: (key: string) => boolean
-  setExpanded: (key: string, expanded: boolean) => void
-  repoIdOf: (group: ResumeWorkspaceGroup) => string | null
-  ancestorsOf: (group: ResumeWorkspaceGroup) => readonly string[]
-} & FailureProps
-
 /** A group node: its row, then (while open) what is under it. */
 function GroupNode({
   nodeKey,
@@ -150,7 +132,7 @@ function WorkspaceNode({
         'Select all chats in {{value0}}',
         { value0: name }
       )}
-      covered={resumeWorkspaceSessionIds(node).filter(tree.selectable)}
+      covered={coveredKeys(resumeWorkspaceCandidates(node), tree)}
       tree={tree}
       label={
         <>
@@ -165,19 +147,22 @@ function WorkspaceNode({
       }
     >
       <ResumeTreeDepthContext.Provider value={depth + 1}>
-        {group.candidates.map((candidate) => (
-          <ResumeCandidateRow
-            key={candidate.sessionId}
-            candidate={candidate}
-            workspaceName={name}
-            listedAt={tree.listedAt}
-            checked={tree.selected.has(candidate.sessionId)}
-            disabled={tree.busy}
-            onCheckedChange={(checked) => tree.onToggle(candidate.sessionId, checked)}
-            failure={tree.failureFor?.(candidate.sessionId)}
-            onFailureAction={tree.onFailureAction}
-          />
-        ))}
+        {group.candidates.map((candidate) => {
+          const chat = chatState(candidate, tree)
+          return (
+            <ResumeCandidateRow
+              key={chat.key}
+              candidate={candidate}
+              workspaceName={name}
+              listedAt={tree.listedAt}
+              checked={chat.checked}
+              disabled={tree.busy}
+              onCheckedChange={chat.onCheckedChange}
+              failure={chat.failure}
+              onFailureAction={tree.onFailureAction}
+            />
+          )
+        })}
       </ResumeTreeDepthContext.Provider>
       {node.children.map((child) => (
         <WorkspaceNode
@@ -226,7 +211,7 @@ function ProjectNode({
         'Select all chats in {{value0}}',
         { value0: header.name }
       )}
-      covered={workspaces.flatMap(resumeWorkspaceSessionIds).filter(tree.selectable)}
+      covered={coveredKeys(workspaces.flatMap(resumeWorkspaceCandidates), tree)}
       tree={tree}
       label={
         <>
@@ -332,7 +317,7 @@ function MachineNode({
         'Select all chats on {{value0}}',
         { value0: name }
       )}
-      covered={candidates.map((candidate) => candidate.sessionId).filter(tree.selectable)}
+      covered={coveredKeys(candidates, tree)}
       tree={tree}
       label={
         <>
@@ -388,10 +373,6 @@ export function ResumeOnRestartGroups({
     busy,
     selected,
     onToggle,
-    selectable: (sessionId) => {
-      const failure = failureFor?.(sessionId)
-      return !failure || resumeFailureSelectable(failure)
-    },
     ...expansion,
     repoIdOf,
     ancestorsOf,
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
index 7245befbf0e8..1becb5fd78d6 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
@@ -10,7 +10,7 @@ import {
   resolveResumeGroupHeader,
   resumeSelectionState,
   resumeWorkspaceKind,
-  resumeWorkspaceSessionIds,
+  resumeWorkspaceCandidates,
   toggleResumeSelection,
   type ResumeCandidate
 } from './native-chat-resume-on-restart-grouping'
@@ -195,7 +195,12 @@ describe('group checkboxes', () => {
       (id) => ({ child: ['parent'], grandchild: ['child', 'parent'] })[id] ?? []
     )
 
-    expect(resumeWorkspaceSessionIds(root!)).toEqual(['p1', 'c1', 'c2', 'g1'])
+    expect(resumeWorkspaceCandidates(root!).map((entry) => entry.sessionId)).toEqual([
+      'p1',
+      'c1',
+      'c2',
+      'g1'
+    ])
   })
 
   it.each([
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
index e5c32f33b57f..76c90706ba80 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
@@ -191,11 +191,8 @@ export function nestResumeWorkspaces(
 }
 
 /** A workspace's chats followed by those of every workspace nested under it, in list order. */
-export function resumeWorkspaceSessionIds(node: ResumeWorkspaceNode): string[] {
-  return [
-    ...node.group.candidates.map((candidate) => candidate.sessionId),
-    ...node.children.flatMap(resumeWorkspaceSessionIds)
-  ]
+export function resumeWorkspaceCandidates(node: ResumeWorkspaceNode): ResumeCandidate[] {
+  return [...node.group.candidates, ...node.children.flatMap(resumeWorkspaceCandidates)]
 }
 
 export type ResumeSelectionState = {
diff --git a/src/renderer/src/components/native-chat-resume-tree-state.ts b/src/renderer/src/components/native-chat-resume-tree-state.ts
index f795afe2c817..cd99733cad28 100644
--- a/src/renderer/src/components/native-chat-resume-tree-state.ts
+++ b/src/renderer/src/components/native-chat-resume-tree-state.ts
@@ -1,6 +1,16 @@
 import { createContext, useState } from 'react'
+import type {
+  ResumeCandidate,
+  ResumeFailure,
+  ResumeWorkspaceGroup
+} from './native-chat-resume-on-restart-grouping'
+import {
+  resumeFailureSelectable,
+  type ResumeFailureAction
+} from './native-chat-resume-failure-guidance'
 
-// The resume tree's shared state: which nodes are open, and how deep a chat row sits.
+// The resume tree's shared state: which nodes are open, how deep a chat row sits, and how a chat
+// is read by its key.
 
 /**
  * Which nodes are open. Everything starts expanded; the state is this mount's own, so a dialog that
@@ -28,3 +38,46 @@ export function useResumeTreeExpansion(): {
 
 /** The tree depth a chat row renders at; the enclosing workspace node provides it. */
 export const ResumeTreeDepthContext = createContext(0)
+
+/** Lets a row that an earlier resume could not carry on show what went wrong and what to do. */
+export type FailureProps = {
+  failureFor?: (sessionId: string) => ResumeFailure | undefined
+  onFailureAction?: (action: ResumeFailureAction, sessionId: string) => void
+}
+
+/** What every node needs from the tree as a whole. */
+export type TreeProps = {
+  listedAt: number
+  busy: boolean
+  selected: ReadonlySet<string>
+  onToggle: (sessionId: string, checked: boolean) => void
+  isExpanded: (key: string) => boolean
+  setExpanded: (key: string, expanded: boolean) => void
+  repoIdOf: (group: ResumeWorkspaceGroup) => string | null
+  ancestorsOf: (group: ResumeWorkspaceGroup) => readonly string[]
+} & FailureProps
+
+/**
+ * The one place a chat's key is read: its row's tick, toggle and failure, and every group's
+ * coverage all go through here, so a change of key stays in this function.
+ */
+export function chatState(candidate: ResumeCandidate, tree: TreeProps) {
+  const key = candidate.sessionId
+  const failure = tree.failureFor?.(key)
+  return {
+    key,
+    checked: tree.selected.has(key),
+    onCheckedChange: (checked: boolean) => tree.onToggle(key, checked),
+    failure,
+    // A group checkbox never ticks a failure a retry cannot fix.
+    selectable: !failure || resumeFailureSelectable(failure)
+  }
+}
+
+/** The keys a group checkbox covers: every selectable chat under it. */
+export function coveredKeys(candidates: readonly ResumeCandidate[], tree: TreeProps): string[] {
+  return candidates
+    .map((candidate) => chatState(candidate, tree))
+    .filter((chat) => chat.selectable)
+    .map((chat) => chat.key)
+}

From 25cefbc5db12fe9ff176f9d4ad8ce4d4cd357c19 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 19:11:59 -0700
Subject: [PATCH 32/37] fix(native-chat): make the resume tree's keys work from
 its Tab stop and after a click

Tab lands on the tree itself, where the arrow keys did nothing. Down and
Home now enter at the first checkbox, Up and End at the last; Home and End
also jump to the ends from a row.

Clicking an arrow with the mouse left focus on the arrow, where no tree
key works. After a collapse or expand click, focus now moves to that
row's checkbox, or to the tree when the checkbox is disabled.
---
 ...tiveChatResumeOnRestartModal.list.test.tsx | 50 +++++++++++++++++++
 .../NativeChatResumeOnRestartModal.tsx        | 32 +++++++++---
 .../components/NativeChatResumeTreeRow.tsx    | 10 +++-
 3 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
index 58141aab44f5..bac1011793ed 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
@@ -249,3 +249,53 @@ it('moves between the list’s checkboxes with the arrow keys', async () => {
   await press('ArrowUp')
   expect(document.activeElement).toBe(order[2])
 })
+
+async function pressOn(element: Element, key: string): Promise<void> {
+  await act(async () => {
+    element.dispatchEvent(new KeyboardEvent('keydown', { key, bubbles: true }))
+  })
+}
+
+// Tab lands on the tree itself; its arrows must lead into the rows from there.
+it('enters the tree from its own Tab stop with the arrow, Home and End keys', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const tree = document.querySelector<HTMLElement>('[role="tree"]')!
+  const first = namedBox('Select all chats')
+  const last = chatBox('b')
+
+  for (const [key, expected] of [
+    ['ArrowDown', first],
+    ['Home', first],
+    ['ArrowUp', last],
+    ['End', last]
+  ] as const) {
+    tree.focus()
+    await pressOn(tree, key)
+    expect(document.activeElement).toBe(expected)
+  }
+  // From a row, Home and End jump to the ends too.
+  await pressOn(last, 'Home')
+  expect(document.activeElement).toBe(first)
+  await pressOn(first, 'End')
+  expect(document.activeElement).toBe(last)
+})
+
+// Chromium focuses a pressed button; the keyboard must not be stranded on the arrow.
+it('hands focus from a pressed arrow to its row’s checkbox', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const workspace = namedBox('Select all chats in workspace')
+  const arrow = workspace
+    .closest('[role="treeitem"]')!
+    .querySelector<HTMLButtonElement>('button[aria-expanded]')!
+
+  arrow.focus()
+  await act(async () => arrow.click())
+  expect(arrow.getAttribute('aria-expanded')).toBe('false')
+  expect(document.activeElement).toBe(workspace)
+  await pressOn(workspace, 'ArrowRight')
+  expect(arrow.getAttribute('aria-expanded')).toBe('true')
+  await pressOn(workspace, 'ArrowDown')
+  expect(document.activeElement).toBe(chatBox('a'))
+})
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index 85c5d0293a02..640c62c9f3e4 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -71,18 +71,38 @@ function selectedByDefault(failure: ResumeFailure | undefined): boolean {
 }
 
 /**
- * Tree keys on a row's checkbox: Up/Down step between the enabled checkboxes, Left collapses and
- * Right expands the focused node through its own disclosure. Space toggles the checkbox natively.
+ * Tree keys. On a row's checkbox: Up/Down step between the enabled checkboxes, Home/End jump to the
+ * first/last, Left collapses and Right expands the node through its own disclosure; Space toggles
+ * natively. On the tree itself (its Tab stop): Down/Home enter at the first checkbox, Up/End at
+ * the last.
  */
 function moveInTree(event: React.KeyboardEvent<HTMLElement>): void {
   const target = event.target
-  if (!(target instanceof HTMLElement) || target.getAttribute('role') !== 'checkbox') {
+  if (!(target instanceof HTMLElement)) {
+    return
+  }
+  const boxes = [
+    ...event.currentTarget.querySelectorAll<HTMLElement>('[role="checkbox"]:not(:disabled)')
+  ]
+  const onTree = target === event.currentTarget
+  if (!onTree && target.getAttribute('role') !== 'checkbox') {
+    return
+  }
+  const jump =
+    event.key === 'Home' || (onTree && event.key === 'ArrowDown')
+      ? boxes[0]
+      : event.key === 'End' || (onTree && event.key === 'ArrowUp')
+        ? boxes.at(-1)
+        : undefined
+  if (jump) {
+    event.preventDefault()
+    jump.focus()
+    return
+  }
+  if (onTree) {
     return
   }
   if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
-    const boxes = [
-      ...event.currentTarget.querySelectorAll<HTMLElement>('[role="checkbox"]:not(:disabled)')
-    ]
     event.preventDefault()
     boxes[boxes.indexOf(target) + (event.key === 'ArrowDown' ? 1 : -1)]?.focus()
     return
diff --git a/src/renderer/src/components/NativeChatResumeTreeRow.tsx b/src/renderer/src/components/NativeChatResumeTreeRow.tsx
index cb4ad003f353..fe5df6e9d9c2 100644
--- a/src/renderer/src/components/NativeChatResumeTreeRow.tsx
+++ b/src/renderer/src/components/NativeChatResumeTreeRow.tsx
@@ -91,7 +91,15 @@ export function ResumeTreeRow({
                     { value0: name }
                   )
             }
-            onClick={() => onExpandedChange?.(!expanded)}
+            onClick={(event) => {
+              onExpandedChange?.(!expanded)
+              // A pointer press focuses the arrow, where no tree key works; hand focus to the
+              // row's checkbox, or to the tree when that is disabled.
+              const row = event.currentTarget.closest('[role="treeitem"]')
+              const box = row?.querySelector<HTMLElement>('[role="checkbox"]:not(:disabled)')
+              const next = box ?? row?.closest<HTMLElement>('[role="tree"]')
+              next?.focus()
+            }}
             className="group/disclosure absolute top-1/2 flex size-4.5 -translate-y-1/2 items-center justify-center rounded-sm text-muted-foreground hover:bg-foreground/8"
             style={{ left: RESUME_TREE_CHECKBOX_COLUMN_PX + indent }}
           >

From 6bcab2722e749aa58baf003ab0ece3e547aedcca Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 19:27:26 -0700
Subject: [PATCH 33/37] fix(native-chat): look up a machine node's host by the
 plain string its node key carries

---
 .../src/components/native-chat-resume-tree-machines.ts         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/components/native-chat-resume-tree-machines.ts b/src/renderer/src/components/native-chat-resume-tree-machines.ts
index 6cbc5d00021b..455128082108 100644
--- a/src/renderer/src/components/native-chat-resume-tree-machines.ts
+++ b/src/renderer/src/components/native-chat-resume-tree-machines.ts
@@ -45,7 +45,8 @@ export function resumeTreeMachines(
   focus: RestartMachineKey | null
 ): ResumeTreeMachines {
   const machineOfRow = new Map<ResumeCandidate, MachineView>()
-  const machineByHost = new Map<ExecutionHostId, MachineView>()
+  // Keyed by plain string: the tree names a machine node by its host id inside a string key.
+  const machineByHost = new Map<string, MachineView>()
   const rowByKey = new Map<string, { machine: MachineView; sessionId: string }>()
   for (const machine of machines) {
     for (const row of machine.rows) {

From 996e88466dd3185aebb53539d97aaf79cfabb108 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 7 Oct 2026 20:11:31 -0700
Subject: [PATCH 34/37] fix(native-chat): a machine's opened/closed choice
 belongs to the listing it was made in

The resume tree kept what the user opened or closed for the whole
dialog, keyed by host only. A server the user had closed, that then
left the list and came back (re-paired, or listed again), stayed closed
over its chats although its own default was open.

A choice is now stored under its host's listing identity (machine and
pairing revision) and goes when that listing is no longer shown; later
answers under the same listing keep it. The tree's one expansion state
takes the listing as an optional second argument, and its callers that
pass none keep host-only keys exactly as before.
---
 .../NativeChatResumeOnRestartGroups.tsx       | 22 +++++-----
 ...sumeOnRestartModal.machine-column.test.tsx | 29 +++++++++++++
 .../NativeChatResumeOnRestartModal.tsx        |  1 +
 .../native-chat-resume-tree-machines.ts       |  3 ++
 .../native-chat-resume-tree-state.ts          | 43 ++++++++++++++++---
 5 files changed, 79 insertions(+), 19 deletions(-)

diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index 006913874e0c..7035c62fde69 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -85,13 +85,13 @@ function GroupNode({
   children: React.ReactNode
 }): React.JSX.Element {
   const selection = resumeSelectionState(covered, tree.selected)
-  const expanded = tree.isExpanded(nodeKey)
+  const expanded = tree.isExpanded(nodeKey, hostId)
   return (
     <>
       <ResumeTreeRow
         depth={depth}
         expanded={expanded}
-        onExpandedChange={(next) => tree.setExpanded(nodeKey, next)}
+        onExpandedChange={(next) => tree.setExpanded(nodeKey, next, hostId)}
         name={name}
         checked={selection.checked}
         disabled={treeBusy(tree, hostId) || selection.total === 0}
@@ -357,11 +357,7 @@ export function ResumeOnRestartGroups({
   onToggle,
   failureFor,
   onFailureAction,
-  rowKey,
-  busyFor,
-  originLabelFor,
-  defaultExpanded,
-  machineSubtitle
+  ...machineProps
 }: {
   candidates: readonly ResumeCandidate[]
   listedAt: number
@@ -386,7 +382,11 @@ export function ResumeOnRestartGroups({
     () => new Map(hostOptions.map((host) => [host.id, host.label])),
     [hostOptions]
   )
-  const expansion = useResumeTreeExpansion(defaultExpanded)
+  const { defaultExpanded, listingOf } = machineProps
+  const expansion = useResumeTreeExpansion(
+    defaultExpanded,
+    listingOf && { listingOf, shown: machines.map((machine) => listingOf(machine.hostId)) }
+  )
   const tree: TreeProps = {
     listedAt,
     busy,
@@ -397,9 +397,7 @@ export function ResumeOnRestartGroups({
     ancestorsOf,
     failureFor,
     onFailureAction,
-    rowKey,
-    busyFor,
-    originLabelFor
+    ...machineProps
   }
   // Why: the machine is worth a level only when it is not obvious.
   const showMachines =
@@ -414,7 +412,7 @@ export function ResumeOnRestartGroups({
             candidates={machine.candidates}
             workspaces={machine.workspaces}
             hostLabelById={hostLabelById}
-            subtitle={machineSubtitle?.(machine.hostId)}
+            subtitle={machineProps.machineSubtitle?.(machine.hostId)}
             tree={tree}
           />
         ) : (
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.machine-column.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.machine-column.test.tsx
index b60734c2da9f..3b89bd10eef4 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.machine-column.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.machine-column.test.tsx
@@ -20,6 +20,7 @@ import {
 import { readNativeChatRestartMachine } from './native-chat-resume-on-restart-store'
 import { _resetNativeChatRestartOffer } from './native-chat-restart-offer-triggers'
 import { pairedEnvironment } from './native-chat-restart-offer-test-support'
+import { replaceRuntimeEnvironmentRevisions } from '@/runtime/runtime-environment-revision'
 import { button, chatBox, namedBox } from './native-chat-resume-on-restart-modal.test-support'
 import {
   machineDisclosure,
@@ -100,6 +101,7 @@ beforeEach(() => {
 })
 
 afterEach(() => {
+  replaceRuntimeEnvironmentRevisions([])
   act(() => root.unmount())
   container.remove()
   _resetNativeChatRestartOffer()
@@ -252,6 +254,33 @@ it('keeps a machine the user closed closed when its answer arrives again', async
   expect(machineRow('studio-mac').textContent).toContain('2 of 4')
 })
 
+// What the user opened or closed holds for the listing it was done in: a server re-paired, or gone
+// and listed again, starts from its own defaults.
+it.each([
+  ['re-paired', 2],
+  ['listed again under the same pairing', undefined]
+] as const)(
+  'opens a machine the user had closed by its default once it is %s',
+  async (_, pairingRevision) => {
+    replaceRuntimeEnvironmentRevisions([])
+    await stage({ sessions: [row('l1', 'own')] }, { studio: { sessions: SERVER_ROWS } })
+    await open('environment:studio')
+    await act(async () => machineDisclosure('studio-mac').click())
+    expect(machineRow('studio-mac').getAttribute('aria-expanded')).toBe('false')
+    // The server's listing goes; this computer's keeps the dialog open.
+    await stage({ sessions: [row('l1', 'own')] }, { studio: { sessions: [] } })
+    expect(document.querySelectorAll('[aria-label="Select all chats on studio-mac"]')).toHaveLength(
+      0
+    )
+    if (pairingRevision !== undefined) {
+      replaceRuntimeEnvironmentRevisions([{ id: 'studio', createdAt: 1, pairingRevision }])
+    }
+    await stage({ sessions: [row('l1', 'own')] }, { studio: { sessions: SERVER_ROWS } })
+    expect(machineRow('studio-mac').getAttribute('aria-expanded')).toBe('true')
+    expect(chatBox('s1')).toBeTruthy()
+  }
+)
+
 it('ticks and clears only its own machine’s chats from a machine’s tri-state box', async () => {
   await stage(
     { sessions: [row('l1', 'own'), row('l2', 'other-device')] },
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index 07bea015732c..8beae03195b0 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -373,6 +373,7 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
             originLabelFor={tree.originLabelFor}
             defaultExpanded={tree.defaultExpanded}
             machineSubtitle={tree.machineSubtitle}
+            listingOf={tree.listingOf}
           />
         </div>
 
diff --git a/src/renderer/src/components/native-chat-resume-tree-machines.ts b/src/renderer/src/components/native-chat-resume-tree-machines.ts
index 455128082108..bdfa2b8da592 100644
--- a/src/renderer/src/components/native-chat-resume-tree-machines.ts
+++ b/src/renderer/src/components/native-chat-resume-tree-machines.ts
@@ -23,6 +23,8 @@ export type ResumeTreeMachines = {
   originLabelFor: (key: string) => string | undefined
   defaultExpanded: (nodeKey: string) => boolean
   machineSubtitle: (hostId: ExecutionHostId) => string | undefined
+  /** The listing a host's chats came from: its machine and the pairing it was read under. */
+  listingOf: (hostId: ExecutionHostId) => string
   /** The machine and session a key names, for the row's own actions. */
   rowOf: (key: string) => { machine: MachineView; sessionId: string } | undefined
 }
@@ -99,6 +101,7 @@ export function resumeTreeMachines(
       const machine = machineByHost.get(hostId)
       return machine ? machineSubtitleFor(machine) : undefined
     },
+    listingOf: (hostId) => machineByHost.get(hostId)?.identity ?? hostId,
     rowOf: (key) => rowByKey.get(key)
   }
 }
diff --git a/src/renderer/src/components/native-chat-resume-tree-state.ts b/src/renderer/src/components/native-chat-resume-tree-state.ts
index 01fd5230204a..ef8eed4caf8f 100644
--- a/src/renderer/src/components/native-chat-resume-tree-state.ts
+++ b/src/renderer/src/components/native-chat-resume-tree-state.ts
@@ -13,20 +13,46 @@ import {
 // The resume tree's shared state: which nodes are open, how deep a chat row sits, and how a chat
 // is read by its key.
 
+/** Separates a choice's listing from its node key; neither contains it. */
+const LISTING_SEPARATOR = '\u0001'
+
 /**
  * Which nodes are open. Everything starts expanded unless `defaultExpanded` says otherwise; what the
  * user opens or closes then wins, also over a default that changes as answers arrive. The state is
  * this mount's own, so a dialog that unmounts its tree on close reopens it from the defaults. Never
  * persisted.
+ *
+ * With `listings`, a choice belongs to the listing its node's host was shown under (a paired server
+ * re-paired is a new listing) and goes when that listing is no longer shown, so a machine that
+ * leaves and comes back starts from its defaults again.
  */
-export function useResumeTreeExpansion(defaultExpanded?: (key: string) => boolean): {
-  isExpanded: (key: string) => boolean
-  setExpanded: (key: string, expanded: boolean) => void
+export function useResumeTreeExpansion(
+  defaultExpanded?: (key: string) => boolean,
+  listings?: { listingOf: (hostId: ExecutionHostId) => string; shown: readonly string[] }
+): {
+  isExpanded: (key: string, hostId?: ExecutionHostId) => boolean
+  setExpanded: (key: string, expanded: boolean, hostId?: ExecutionHostId) => void
 } {
   const [chosen, setChosen] = useState<ReadonlyMap<string, boolean>>(() => new Map())
+  const entry = (key: string, hostId: ExecutionHostId | undefined) =>
+    listings && hostId !== undefined
+      ? `${listings.listingOf(hostId)}${LISTING_SEPARATOR}${key}`
+      : key
+  if (listings) {
+    const shown = new Set(listings.shown)
+    const kept = [...chosen].filter(([stored]) => {
+      const at = stored.indexOf(LISTING_SEPARATOR)
+      return at === -1 || shown.has(stored.slice(0, at))
+    })
+    // Render-time adjustment of this hook's own state: a listing gone takes its choices with it.
+    if (kept.length !== chosen.size) {
+      setChosen(new Map(kept))
+    }
+  }
   return {
-    isExpanded: (key) => chosen.get(key) ?? defaultExpanded?.(key) ?? true,
-    setExpanded: (key, expanded) => setChosen((current) => new Map(current).set(key, expanded))
+    isExpanded: (key, hostId) => chosen.get(entry(key, hostId)) ?? defaultExpanded?.(key) ?? true,
+    setExpanded: (key, expanded, hostId) =>
+      setChosen((current) => new Map(current).set(entry(key, hostId), expanded))
   }
 }
 
@@ -54,6 +80,9 @@ export type MachineProps = {
   defaultExpanded?: (nodeKey: string) => boolean
   /** A line beside a machine's name, e.g. why it stopped and when. */
   machineSubtitle?: (hostId: ExecutionHostId) => string | undefined
+  /** The listing a host's chats were shown under (a re-paired server is a new one): what the user
+   *  opened or closed under it holds only for it. */
+  listingOf?: (hostId: ExecutionHostId) => string
 }
 
 /** What every node needs from the tree as a whole. */
@@ -62,8 +91,8 @@ export type TreeProps = {
   busy: boolean
   selected: ReadonlySet<string>
   onToggle: (sessionId: string, checked: boolean) => void
-  isExpanded: (key: string) => boolean
-  setExpanded: (key: string, expanded: boolean) => void
+  isExpanded: (key: string, hostId?: ExecutionHostId) => boolean
+  setExpanded: (key: string, expanded: boolean, hostId?: ExecutionHostId) => void
   repoIdOf: (group: ResumeWorkspaceGroup) => string | null
   ancestorsOf: (group: ResumeWorkspaceGroup) => readonly string[]
 } & FailureProps &

From 863e1384012203004557e244f2a521f5f017eb83 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 8 Oct 2026 00:13:52 -0700
Subject: [PATCH 35/37] refactor(native-chat): keep the paired restart-offer
 capability beside Continue, outside protocol-version

Main grew protocol-version.ts to its 300-line limit; this branch's
capability put it at 303. Like main's Continue capability, it now lives
in its own module, and the two restart capabilities are spread into
RUNTIME_CAPABILITIES together, so protocol-version.ts is exactly main's
length. No capability is added or removed.
---
 .../runtime/structured-agent-session-client.ts |  2 +-
 .../agent-session-restart-capabilities.ts      | 18 ++++++++++++++++++
 src/shared/protocol-version.ts                 | 13 ++-----------
 .../cross-version-restart-offers.unit.test.ts  |  2 +-
 4 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 src/shared/agent-session-restart-capabilities.ts

diff --git a/src/renderer/src/runtime/structured-agent-session-client.ts b/src/renderer/src/runtime/structured-agent-session-client.ts
index 54e557315966..b149b8da452d 100644
--- a/src/renderer/src/runtime/structured-agent-session-client.ts
+++ b/src/renderer/src/runtime/structured-agent-session-client.ts
@@ -15,9 +15,9 @@ import {
   AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY,
   AGENT_SESSION_REWIND_RUNTIME_CAPABILITY,
   AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY,
-  AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY,
   type RuntimeCapability
 } from '../../../shared/protocol-version'
+import { AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY } from '../../../shared/agent-session-restart-capabilities'
 import {
   callRuntimeRpc,
   runtimeEnvironmentSupportsCapability,
diff --git a/src/shared/agent-session-restart-capabilities.ts b/src/shared/agent-session-restart-capabilities.ts
new file mode 100644
index 000000000000..d088fae6df2b
--- /dev/null
+++ b/src/shared/agent-session-restart-capabilities.ts
@@ -0,0 +1,18 @@
+// The host's restart-and-resume capabilities, spread together into RUNTIME_CAPABILITIES by
+// protocol-version.ts. Import each one from here or its own module.
+
+import { AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY } from './agent-session-continue-interrupted-capability'
+
+// Why: a paired desktop may ask a host for its restart offers on every connection only when the
+// host answers that read without building its chat host (a server that never ran a chat stays
+// untouched), and may dismiss there only when the host takes named chats: an older host's dismiss
+// params were strict and empty, and its only dismissal deleted every device's offers. It also
+// promises `offers` witnesses on dismiss and a per-row `origin` for the asking device. A host
+// without this is never asked by a paired desktop.
+export const AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY =
+  'agent-session.paired-restart-offers.v1' as const
+
+export const AGENT_SESSION_RESTART_RUNTIME_CAPABILITIES = [
+  AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY,
+  AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY
+] as const
diff --git a/src/shared/protocol-version.ts b/src/shared/protocol-version.ts
index e40284691a3d..c5b3595e544b 100644
--- a/src/shared/protocol-version.ts
+++ b/src/shared/protocol-version.ts
@@ -30,7 +30,7 @@ export {
 } from './orchestration-runtime-capabilities'
 import { AGENT_SESSION_RESUME_RUNTIME_CAPABILITIES } from './agent-session-resume-runtime-capabilities'
 import { QODER_OWNED_TERMINAL_CREATE_CAPABILITY } from './qoder-terminal-create-capability'
-import { AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY } from './agent-session-continue-interrupted-capability'
+import { AGENT_SESSION_RESTART_RUNTIME_CAPABILITIES } from './agent-session-restart-capabilities'
 import { ORCAD_RUNTIME_CAPABILITIES } from './orcad-runtime-capabilities'
 export {
   AGENT_SESSION_CURSOR_RESUME_RUNTIME_CAPABILITY,
@@ -258,14 +258,6 @@ export const CLAUDE_STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY =
 // older host leaves the message rail on loaded messages instead of answering method_not_found.
 export const AGENT_SESSION_CONVERSATION_OUTLINE_RUNTIME_CAPABILITY =
   'agent-session.conversation-outline.v1' as const
-// Why: a paired desktop may ask a host for its restart offers on every connection only when the
-// host answers that read without building its chat host (a server that never ran a chat stays
-// untouched), and may dismiss there only when the host takes named chats: an older host's dismiss
-// params were strict and empty, and its only dismissal deleted every device's offers. It also
-// promises `offers` witnesses on dismiss and a per-row `origin` for the asking device. A host
-// without this is never asked by a paired desktop.
-export const AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY =
-  'agent-session.paired-restart-offers.v1' as const
 // The RPC is registered unconditionally; per-session rewind support is a separate check.
 export const AGENT_SESSION_REWIND_RUNTIME_CAPABILITY = 'agent-session.rewind.v1' as const
 // Why: the rewind UI relies on the next send settling an in-doubt rewind, even with the agent up.
@@ -407,13 +399,12 @@ export const RUNTIME_CAPABILITIES = [
   // turn starts, so a client may gate on either.
   AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
   AGENT_SESSION_SEND_ANSWERS_PROOF_RUNTIME_CAPABILITY,
-  AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY,
+  ...AGENT_SESSION_RESTART_RUNTIME_CAPABILITIES,
   ...STRUCTURED_AGENT_SESSION_SURFACE_RUNTIME_CAPABILITIES,
   ...AGENT_SESSION_ATTENTION_RUNTIME_CAPABILITIES,
   AGENT_SESSION_REWIND_RUNTIME_CAPABILITY,
   AGENT_SESSION_REWIND_RECOVERY_CAPABILITY,
   AGENT_SESSION_CONVERSATION_OUTLINE_RUNTIME_CAPABILITY,
-  AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY,
   AGENT_SESSION_BACKGROUND_TASK_STOP_CAPABILITY,
   AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY,
   AGENT_SESSION_ATTACHMENTS_RUNTIME_CAPABILITY,
diff --git a/tests/e2e/cross-version-wire/cross-version-restart-offers.unit.test.ts b/tests/e2e/cross-version-wire/cross-version-restart-offers.unit.test.ts
index b6664283b984..75466de6f9ce 100644
--- a/tests/e2e/cross-version-wire/cross-version-restart-offers.unit.test.ts
+++ b/tests/e2e/cross-version-wire/cross-version-restart-offers.unit.test.ts
@@ -5,7 +5,7 @@
 
 import { beforeAll, describe, expect, it } from 'vitest'
 import { RuntimeSubscriptionRegistry } from '../../../src/main/runtime/runtime-subscription-registry'
-import { AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY } from '../../../src/shared/protocol-version'
+import { AGENT_SESSION_PAIRED_RESTART_OFFERS_RUNTIME_CAPABILITY } from '../../../src/shared/agent-session-restart-capabilities'
 import { resolveBaselineReleaseRef } from './release-checkout'
 import { installableHost, structuredHostStub } from './structured-agent-session-host-fixture'
 import { SESSION, WORKSPACE } from './structured-agent-session-surface-manifest'

From d86e4ca35f46533ccc9aea99990adfd287317348 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 10 Oct 2026 00:31:06 -0700
Subject: [PATCH 36/37] fix(native-chat): keep per-machine resume runs
 consistent with the dialog

- Unpairing a server whose finished resume is all the open dialog shows
  now retires the dialog request, so a later read never opens it unasked.
- A new resume retires an earlier resume's finished runs on other
  machines, and the status bar counts the whole resume, so the dialog and
  the status bar agree.
- Reopening skips only the re-read of a machine that is mid-resume.
---
 .../native-chat-restart-offer-reopen.ts       |   9 +-
 .../components/native-chat-restart-runs.ts    |  16 +-
 .../native-chat-resume-machine-runs.test.tsx  | 184 ++++++++++++++++++
 .../native-chat-resume-on-restart-store.ts    |   9 +-
 .../NativeChatResumeStatusSegment.tsx         |  13 +-
 5 files changed, 214 insertions(+), 17 deletions(-)
 create mode 100644 src/renderer/src/components/native-chat-resume-machine-runs.test.tsx

diff --git a/src/renderer/src/components/native-chat-restart-offer-reopen.ts b/src/renderer/src/components/native-chat-restart-offer-reopen.ts
index ec830988bbe2..3ffd42b553aa 100644
--- a/src/renderer/src/components/native-chat-restart-offer-reopen.ts
+++ b/src/renderer/src/components/native-chat-restart-offer-reopen.ts
@@ -56,10 +56,11 @@ async function readForClick(machine: RestartMachineKey): Promise<void> {
 export async function reopenNativeChatRestartOffer(
   machines: readonly RestartMachineKey[] = [...getNativeChatRestartOffers().keys()]
 ): Promise<void> {
-  // Mid-resume the host's answer is already on its way; a re-read racing it could undo it.
-  if (getNativeChatRestartResuming().size === 0) {
-    await Promise.all(machines.filter(readableNow).map(readForClick))
-  }
+  // Mid-resume that machine's answer is already on its way; a re-read racing it could undo it.
+  const resuming = getNativeChatRestartResuming()
+  await Promise.all(
+    machines.filter((machine) => !resuming.has(machine) && readableNow(machine)).map(readForClick)
+  )
   // Only over rows or a run to follow: a dialog with neither draws nothing, and a request nothing
   // draws would stay open unseen.
   if (getNativeChatRestartOffers().size > 0 || getNativeChatRestartRuns().size > 0) {
diff --git a/src/renderer/src/components/native-chat-restart-runs.ts b/src/renderer/src/components/native-chat-restart-runs.ts
index f293cb7fc25f..ad465d28e74b 100644
--- a/src/renderer/src/components/native-chat-restart-runs.ts
+++ b/src/renderer/src/components/native-chat-restart-runs.ts
@@ -14,8 +14,9 @@ import { watchResumeRunStatus } from './native-chat-resume-run-status-watch'
  * Each machine's latest resume, which the dialog and the status bar follow: the chats it named, each
  * one's live progress from that machine's host, then what became of each.
  *
- * Memory-only history. It retires after its finished summary was shown and then closed, or when the
- * same machine's next resume replaces it, or when the machine is unpaired.
+ * Memory-only history. It retires after its finished summary was shown and then closed, when the
+ * next resume starts (one resume's runs are followed together, as one run was before machines), or
+ * when the machine is unpaired.
  */
 export type NativeChatRestartRun = Readonly<{
   /** The listing the resume started from; it still names the machine once nothing is left there. */
@@ -78,9 +79,9 @@ export type RestartRunAnswer = {
 }
 
 /**
- * Starts following one resume on the listing's machine, replacing that machine's last run. The
- * returned `finish` is called once the host's answer is published, so reopening never shows the old
- * selection as actionable.
+ * Starts following one resume on the listing's machine, replacing that machine's last run and any
+ * finished run of an earlier resume. The returned `finish` is called once the host's answer is
+ * published, so reopening never shows the old selection as actionable.
  */
 export function beginNativeChatRestartRun(
   listing: NativeChatRestartMachineOffer,
@@ -98,6 +99,11 @@ export function beginNativeChatRestartRun(
     )
   }
   releaseStatusWatch(machine)
+  for (const [other, entry] of runs) {
+    if (other !== machine && !resumeRunInFlight(entry.run)) {
+      setRun(other, null)
+    }
+  }
   setRun(machine, current)
   const release = watchResumeRunStatus(
     restartMachineTarget(machine),
diff --git a/src/renderer/src/components/native-chat-resume-machine-runs.test.tsx b/src/renderer/src/components/native-chat-resume-machine-runs.test.tsx
new file mode 100644
index 000000000000..a915df0b4f71
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-machine-runs.test.tsx
@@ -0,0 +1,184 @@
+// @vitest-environment happy-dom
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '../store'
+import { getDefaultSettings } from '../../../shared/constants'
+import { NativeChatResumeOnRestartModal } from './NativeChatResumeOnRestartModal'
+import { NativeChatResumeStatusSegment } from './status-bar/NativeChatResumeStatusSegment'
+import { TooltipProvider } from './ui/tooltip'
+import {
+  consumeNativeChatResumeOnRestartDialogRequest,
+  getNativeChatResumeOnRestartDialogRequest,
+  requestNativeChatResumeOnRestartDialog
+} from './native-chat-resume-on-restart-dialog'
+import {
+  forgetNativeChatRestartMachine,
+  getNativeChatRestartOffers,
+  readNativeChatRestartMachine
+} from './native-chat-resume-on-restart-store'
+import { getNativeChatRestartRuns } from './native-chat-restart-runs'
+import { continueNativeChatRestartOffers } from './native-chat-restart-offer-actions'
+import { reopenNativeChatRestartOffer } from './native-chat-restart-offer-reopen'
+import { _resetNativeChatRestartOffer } from './native-chat-restart-offer-triggers'
+import { pairedEnvironment } from './native-chat-restart-offer-test-support'
+import { machineRowFixture as row } from './native-chat-resume-machines.test-support'
+
+const rpc = vi.hoisted(() => vi.fn())
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: rpc,
+  pairedRestartOffersSupport: async () => 'supported',
+  subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
+}))
+vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { dismiss: vi.fn() }) }))
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+let root: Root
+let container: HTMLDivElement
+
+const STUDIO = { kind: 'environment', environmentId: 'studio' } as const
+const LOCAL = { kind: 'local' } as const
+
+beforeEach(() => {
+  rpc.mockReset()
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({
+    settings: { ...getDefaultSettings(''), experimentalNativeChat: false },
+    runtimeEnvironments: [pairedEnvironment('studio', 'studio-mac')]
+  })
+  container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+})
+
+// Unpairing a server whose finished run is all the open dialog shows leaves nothing to draw, so
+// the request goes too: a later read must never pop the dialog up by itself.
+it('retires the dialog request when the only run it shows belongs to a server that is unpaired', async () => {
+  let localRows: unknown[] = []
+  rpc.mockImplementation(async (target, method, params) => {
+    if (method === 'agentSession.restartResumable') {
+      return { sessions: target.kind === 'local' ? localRows : [row('s1', 'own')], failed: [] }
+    }
+    if (method === 'agentSession.restartContinue') {
+      return {
+        sessions: [],
+        failed: [],
+        continued: params.sessionIds.map((sessionId: string) => ({
+          sessionId,
+          outcome: 'continued'
+        }))
+      }
+    }
+    return {}
+  })
+  await act(async () =>
+    root.render(
+      <TooltipProvider>
+        <NativeChatResumeOnRestartModal />
+      </TooltipProvider>
+    )
+  )
+  await act(async () => {
+    await readNativeChatRestartMachine(STUDIO)
+    await continueNativeChatRestartOffers([{ machine: 'environment:studio', sessionIds: ['s1'] }])
+  })
+  expect(getNativeChatRestartOffers().size).toBe(0)
+  expect(getNativeChatRestartRuns().size).toBe(1)
+  // The success toast's Show (or the user reopening) opens the finished run.
+  await act(async () => requestNativeChatResumeOnRestartDialog('environment:studio'))
+  expect(document.body.textContent).toContain('Resumed 1 of 1 chat')
+  // Server unpaired / re-paired / contact revoked while the dialog is up.
+  await act(async () => forgetNativeChatRestartMachine('environment:studio'))
+  expect(getNativeChatRestartRuns().size).toBe(0)
+  expect(document.body.textContent).not.toContain('Resumed 1 of 1 chat')
+  expect(getNativeChatResumeOnRestartDialogRequest()).toBeNull()
+  localRows = [row('l1', 'own')]
+  await act(async () => {
+    await readNativeChatRestartMachine(LOCAL)
+  })
+  expect(document.querySelector('[role="dialog"]')).toBeNull()
+})
+
+// A new resume retires an earlier resume's finished run, so the dialog and the status bar count the
+// same chats.
+it('counts one resume in the dialog and the status bar alike, not an earlier finished one', async () => {
+  rpc.mockImplementation(async (target, method, params) => {
+    if (method === 'agentSession.restartResumable') {
+      return {
+        sessions:
+          target.kind === 'local' ? [row('l1', 'own'), row('l2', 'own')] : [row('s1', 'own')],
+        failed: []
+      }
+    }
+    if (method === 'agentSession.restartContinue') {
+      if (target.kind === 'environment') {
+        return new Promise(() => {})
+      }
+      return {
+        sessions: [],
+        failed: [],
+        continued: params.sessionIds.map((sessionId: string) => ({
+          sessionId,
+          outcome: 'continued'
+        }))
+      }
+    }
+    return {}
+  })
+  await act(async () =>
+    root.render(
+      <TooltipProvider>
+        <NativeChatResumeStatusSegment iconOnly={false} />
+        <NativeChatResumeOnRestartModal />
+      </TooltipProvider>
+    )
+  )
+  await act(async () => {
+    await readNativeChatRestartMachine(LOCAL)
+    await readNativeChatRestartMachine(STUDIO)
+    await continueNativeChatRestartOffers([{ machine: 'local', sessionIds: ['l1', 'l2'] }])
+    void continueNativeChatRestartOffers([{ machine: 'environment:studio', sessionIds: ['s1'] }])
+  })
+  await act(async () => requestNativeChatResumeOnRestartDialog(null))
+  const text = document.body.textContent ?? ''
+  expect(document.querySelector('[role="dialog"] h2')?.textContent).toContain('Resuming 1 chat')
+  expect(text).toContain('0 of 1 done')
+  expect(text).toContain('Resuming chats 0/1')
+})
+
+// Only the resuming machine's re-read is skipped; another machine is read before the dialog opens.
+it('re-reads a machine on reopen while another machine is mid-resume', async () => {
+  let localRows = [row('l1', 'own')]
+  rpc.mockImplementation(async (target, method) => {
+    if (method === 'agentSession.restartResumable') {
+      return { sessions: target.kind === 'local' ? localRows : [row('s1', 'own')], failed: [] }
+    }
+    if (method === 'agentSession.restartContinue') {
+      return new Promise(() => {})
+    }
+    return {}
+  })
+  await act(async () => {
+    await readNativeChatRestartMachine(LOCAL)
+    await readNativeChatRestartMachine(STUDIO)
+    void continueNativeChatRestartOffers([{ machine: 'environment:studio', sessionIds: ['s1'] }])
+  })
+  localRows = []
+  const before = rpc.mock.calls.filter((call) => call[1] === 'agentSession.restartResumable').length
+  await act(async () => {
+    await reopenNativeChatRestartOffer(['local'])
+  })
+  const after = rpc.mock.calls.filter((call) => call[1] === 'agentSession.restartResumable').length
+  expect(after - before).toBe(1)
+  expect(getNativeChatRestartOffers().has('local')).toBe(false)
+})
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-store.ts b/src/renderer/src/components/native-chat-resume-on-restart-store.ts
index c86dae267c4a..58e57969eedb 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-store.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-store.ts
@@ -129,8 +129,12 @@ function publish(machine: RestartMachineKey, next: NativeChatRestartMachineOffer
   offers = updated.size === 0 ? NO_OFFERS : updated
   syncOfferedChatWatch(machine, offers.get(machine), refreshAfterOfferedChatActivity)
   emit()
+  retireRequestWithNothingToDraw()
+}
+
+/** With nothing left on any machine and no run to follow, an open request has nothing to show. */
+function retireRequestWithNothingToDraw(): void {
   if (offers.size === 0 && getNativeChatRestartRuns().size === 0) {
-    // With nothing left on any machine and no run to follow, an open request has nothing to show.
     consumeNativeChatResumeOnRestartDialogRequest()
   }
 }
@@ -291,6 +295,9 @@ export function forgetNativeChatRestartMachine(machine: RestartMachineKey): void
   forgetNativeChatRestartRun(machine)
   if (offers.has(machine)) {
     publish(machine, null)
+  } else {
+    // Its run may have been all an open dialog showed.
+    retireRequestWithNothingToDraw()
   }
 }
 
diff --git a/src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.tsx b/src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.tsx
index afa99fcc462d..7437b41cd7cd 100644
--- a/src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.tsx
+++ b/src/renderer/src/components/status-bar/NativeChatResumeStatusSegment.tsx
@@ -81,14 +81,14 @@ export function NativeChatResumeStatusSegment({
     machines.map((machine) => restartMachineNameFromState(state, machine)).join('\u0000')
   ).split('\u0000')
   const nameByMachine = new Map(machines.map((machine, index) => [machine, names[index]]))
-  // Chats answered out of the chats asked, across every machine resuming right now.
+  // Chats answered out of the chats asked while a resume runs, counted over every machine it
+  // reached (a machine already done included), as the dialog counts it.
   let resumingDone = 0
   let resumingTotal = 0
-  const resumingMachines: RestartMachineKey[] = []
-  for (const [machine, { run }] of runs) {
-    if (!resumeRunInFlight(run)) {
-      continue
-    }
+  const resumingMachines = [...runs]
+    .filter(([, entry]) => resumeRunInFlight(entry.run))
+    .map(([machine]) => machine)
+  for (const [machine, { run }] of resumingMachines.length > 0 ? runs : []) {
     const offer = offers.get(machine)
     const failureById = new Map(offer?.failed.map((failure) => [failure.sessionId, failure]))
     const { counts } = resumeRunView(
@@ -99,7 +99,6 @@ export function NativeChatResumeStatusSegment({
     )
     resumingDone += counts.done
     resumingTotal += counts.total
-    resumingMachines.push(machine)
   }
   let pending = 0
   let failures = 0

From 60aa16fb679e113c25cf3566c3c9668ab92345c6 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 10 Oct 2026 01:13:05 -0700
Subject: [PATCH 37/37] fix(native-chat): name a resumed chat's origin from the
 row the dialog shows

A finished resume keeps showing chats their host has dropped from its
list, so their origin must come from the run's own row, not the current
listing (which labelled the user's own resumed chat "Unknown origin").
---
 .../native-chat-resume-machine-runs.test.tsx  |  2 ++
 .../native-chat-resume-tree-machines.ts       | 21 ++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/renderer/src/components/native-chat-resume-machine-runs.test.tsx b/src/renderer/src/components/native-chat-resume-machine-runs.test.tsx
index a915df0b4f71..0440a62744c7 100644
--- a/src/renderer/src/components/native-chat-resume-machine-runs.test.tsx
+++ b/src/renderer/src/components/native-chat-resume-machine-runs.test.tsx
@@ -97,6 +97,8 @@ it('retires the dialog request when the only run it shows belongs to a server th
   // The success toast's Show (or the user reopening) opens the finished run.
   await act(async () => requestNativeChatResumeOnRestartDialog('environment:studio'))
   expect(document.body.textContent).toContain('Resumed 1 of 1 chat')
+  // The resumed chat has left the listing; its origin comes from the run's own row.
+  expect(document.body.textContent).not.toContain('Unknown origin')
   // Server unpaired / re-paired / contact revoked while the dialog is up.
   await act(async () => forgetNativeChatRestartMachine('environment:studio'))
   expect(getNativeChatRestartRuns().size).toBe(0)
diff --git a/src/renderer/src/components/native-chat-resume-tree-machines.ts b/src/renderer/src/components/native-chat-resume-tree-machines.ts
index 53f73877f7e1..6c8cf568b6bd 100644
--- a/src/renderer/src/components/native-chat-resume-tree-machines.ts
+++ b/src/renderer/src/components/native-chat-resume-tree-machines.ts
@@ -5,7 +5,7 @@ import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-res
 import type { ResumeFailureAction } from './native-chat-resume-failure-guidance'
 import type { MachineView } from './native-chat-resume-machine-views'
 import type { RestartMachineKey } from './native-chat-restart-machines'
-import { resumeOwnershipLabel } from './native-chat-resume-ownership'
+import { resumeCandidateOwnership, resumeOwnershipLabel } from './native-chat-resume-ownership'
 import { resumeRowKey, resumeRowSelectedByDefault } from './native-chat-resume-selection'
 
 /**
@@ -52,7 +52,10 @@ export function resumeTreeMachines(
   const machineOfRow = new Map<ResumeCandidate, MachineView>()
   // Keyed by plain string: the tree names a machine node by its host id inside a string key.
   const machineByHost = new Map<string, MachineView>()
-  const rowByKey = new Map<string, { machine: MachineView; sessionId: string }>()
+  const rowByKey = new Map<
+    string,
+    { machine: MachineView; sessionId: string; candidate: ResumeCandidate }
+  >()
   const shown = new Map(machines.map((machine) => [machine, rowsOf(machine)]))
   for (const [machine, rows] of shown) {
     for (const row of rows) {
@@ -60,7 +63,8 @@ export function resumeTreeMachines(
       machineByHost.set(row.executionHostId ?? LOCAL_EXECUTION_HOST_ID, machine)
       rowByKey.set(resumeRowKey(machine.identity, row.sessionId), {
         machine,
-        sessionId: row.sessionId
+        sessionId: row.sessionId,
+        candidate: row
       })
     }
   }
@@ -80,10 +84,13 @@ export function resumeTreeMachines(
       return machine !== undefined && resuming.has(machine.machine)
     },
     failureFor: (key) => lookup(key, (machine, sessionId) => machine.failureFor(sessionId)),
-    originLabelFor: (key) =>
-      lookup(key, (machine, sessionId) =>
-        resumeOwnershipLabel(machine.ownershipFor(sessionId), machine.name)
-      ),
+    // Read from the row shown, which may be a run's copy of a chat its host no longer lists.
+    originLabelFor: (key) => {
+      const row = rowByKey.get(key)
+      return row
+        ? resumeOwnershipLabel(resumeCandidateOwnership(row.candidate), row.machine.name)
+        : undefined
+    },
     // A machine starts open when the dialog was opened for it, when it is the only one listed, or
     // when nothing on it starts ticked (so its empty box is explained); every other node is open.
     defaultExpanded: (nodeKey) => {