fix(app): keep dropped rows in place until their new order arrives

Sheet portals forward new children after the local drop commit. Renew transform hosts with the incoming row order so clearing drag offsets cannot expose the old slots. Reset same-slot drops explicitly because their data order does not change.

.oxlintrc.json

@@ -530,7 +530,7 @@
       }
     },
     // Press feedback is owned by the primitives in components/ui. Raw pressable burn-down:
-    // 94 files. They may only leave this list.
+    // 85 files. They may only leave this list.
     {
       "files": [
         "packages/app/src/components/ui/**/*.{ts,tsx}",
@@ -539,12 +539,9 @@
         "packages/app/src/agent-skills/selection-sheet.tsx",
         "packages/app/src/agent-stream/chat-outline/rail.web.tsx",
         "packages/app/src/agent-stream/view.tsx",
-        "packages/app/src/changelog/internal/changelog-sheet.tsx",
         "packages/app/src/command-center/command-center.tsx",
-        "packages/app/src/components/adaptive-modal-sheet.tsx",
         "packages/app/src/components/add-project-flow.tsx",
         "packages/app/src/components/agent-list.tsx",
-        "packages/app/src/components/app-diagnostic-sheet.tsx",
         "packages/app/src/components/attachment-lightbox.tsx",
         "packages/app/src/components/attachment-pill.tsx",
         "packages/app/src/components/combined-model-selector.tsx",
@@ -583,7 +580,6 @@
         "packages/app/src/components/terminal-emulator-native-grid.native.tsx",
         "packages/app/src/components/terminal-pane.tsx",
         "packages/app/src/components/toast-host.tsx",
-        "packages/app/src/components/tool-call-sheet.tsx",
         "packages/app/src/components/welcome-screen.tsx",
         "packages/app/src/components/workspace-hover-card.tsx",
         "packages/app/src/components/zoomable-viewport/toolbar.tsx",
@@ -619,7 +615,6 @@
         "packages/app/src/screens/workspace/scripts/workspace-scripts-button.tsx",
         "packages/app/src/screens/workspace/workspace-desktop-tabs-row.tsx",
         "packages/app/src/screens/workspace/workspace-tab-presentation.tsx",
-        "packages/app/src/tool-calls/detail-level/overview/sheet.tsx",
         "packages/app/src/usage/sidebar-item.tsx",
         "packages/app/src/usage/window-bar.tsx",
         "packages/app/src/workspace-labels/manager-modal.tsx",

docs/agent-stream-disclosure.md

@@ -186,7 +186,8 @@ Drop a hunk when the installed LegendList ships its fix.
 
 `modules/paseo-scroll` replaces React Native's scroll view on both platforms with a subclass:
 Android's `PaseoScrollView` and iOS's `PaseoScrollViewComponentView`.
-`VisibleContentPositionClampTest` covers Android; iOS has no native test harness.
+`VisibleContentPositionClampTest` and `SelectableTextTouchTest` cover Android; iOS has no native
+test harness.
 
 **Content clamp.** A mount that shrinks the content while `maintainVisibleContentPosition` is set
 applies the shrink twice on both platforms: the scroll view clamps its offset to the new end during
@@ -206,5 +207,16 @@ React Native 0.88 skips the adjustment for a removed anchor
 and skip its correction while the user drags ([user scroll](#user-scroll)). This one has no React
 Native counterpart; it stays while the timeline uses the pin.
 
+**Touched text (Android).** Chat text is selectable, and Android focuses selectable text when it is
+touched. React Native scrolls a newly focused view fully into view, so tapping a link or a word, or
+long-pressing to select, in a message partly off screen moved the timeline by up to a screen.
+`PaseoScrollView` skips that scroll when the focused view is selectable, non-editable text in touch
+mode. The text keeps focus, and a streaming reply's new text collapses its selection to the start,
+which asks to reveal the reply's first line; that request is skipped too while nothing is selected.
+A change in the timeline's height, such as the composer below it growing, also reveals the focused
+view, and is skipped the same way. Inputs, focus moved by a keyboard, and a selection the user drags
+still scroll into view. The inverted timeline guarded this with a rule tied to the inversion, which
+went with it; keep this one while chat text is selectable.
+
 Remove the content clamp and removed-anchor overrides once the installed React Native includes
 their fixes.

docs/android.md

@@ -186,10 +186,10 @@ This is the Android counterpart of the iOS local-simulator flow in [development.
 ## Scroll view corrections
 
 `modules/paseo-scroll` replaces React Native's vertical scroll view with `PaseoScrollView`, which
-keeps React Native's scroll manager interface and corrects `maintainVisibleContentPosition` for the
-chat timeline. [agent-stream-disclosure.md](agent-stream-disclosure.md#scroll-view-corrections)
-lists the corrections and the React Native issues they work around. Its instrumentation test,
-`VisibleContentPositionClampTest`, mounts through React Native's own mounting manager:
+keeps React Native's scroll manager interface and corrects how the chat timeline holds its position.
+[agent-stream-disclosure.md](agent-stream-disclosure.md#scroll-view-corrections) lists the
+corrections and the React Native issues they work around. Its instrumentation tests run the scroll
+view in a real window, mounting through React Native's own mounting manager and injecting touches:
 
 ```bash
 cd packages/app/android

docs/design.md

@@ -20,7 +20,7 @@ A semantic element used in three or more places is a primitive. One of a kind is
 
 Primitives live in `packages/app/src/components/ui/` and `packages/app/src/components/headers/`. Card and row layout live in `packages/app/src/styles/settings.ts`. Section structure lives in `packages/app/src/screens/settings/settings-section.tsx`.
 
-A pressable styled to look like a button is wrong; the button is `<Button>` (`packages/app/src/components/ui/button.tsx`). A pressable wrapping an icon is wrong; the icon action is `<ToolbarButton>` (`packages/app/src/components/ui/pane-content-toolbar.tsx`), which owns the hitbox, the rounded `interactionHighlight` fill on hover and press, the compact size, and the tooltip. Rows on a menu surface are `<MenuItem>`, or `<ComposerTrackRow>` in a track panel; other rows are `<PressHighlight>` (`packages/app/src/components/ui/press-highlight.tsx`), which uses React Native’s press lifecycle on native with a short press delay so scrolling cancels pending feedback. A bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/components/settings/headings/settings-section.tsx`). A docs link in its header is its `link` prop, which renders `Label ↗` on the title's rail; a ghost button with an arrow is wrong. A custom `Modal` for a confirmation is wrong; the confirmation is `confirmDialog` (`packages/app/src/utils/confirm-dialog.ts`). A hand-rolled overflow menu is wrong; the menu is `<DropdownMenu>` (`packages/app/src/components/ui/dropdown-menu.tsx`). A hand-rolled status pill is wrong; the pill is `<StatusBadge>` (`packages/app/src/components/ui/status-badge.tsx`). A circle pinned over a scrolling surface is wrong; the floating action is `<FloatingActionButton>` (`packages/app/src/components/ui/floating-action-button.tsx`), one per surface, and the surface reserves `FLOATING_ACTION_BUTTON_CLEARANCE` below its content so the button never traps the last row.
+A pressable styled to look like a button is wrong; the button is `<Button>` (`packages/app/src/components/ui/button.tsx`). A pressable wrapping an icon is wrong; the icon action is `<ToolbarButton>` (`packages/app/src/components/ui/pane-content-toolbar.tsx`), which owns the hitbox, the rounded `interactionHighlight` fill on hover and press, the compact size, and the tooltip. Rows on a menu surface are `<MenuItem>`, or `<ComposerTrackRow>` in a track panel; other rows are `<PressHighlight>` (`packages/app/src/components/ui/press-highlight.tsx`), which owns the pressed feedback: pass the pressed fill as `highlightStyle` and never paint it in your own style. iOS and web paint that fill; Android draws the platform ripple over the content instead, clipped to the row's corners. On native, feedback waits for a short press delay so a scroll that claims the touch shows none. Content that knocks out of the row's surface, such as a badge ring, follows the fill through `onHighlightChange`. A bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/components/settings/headings/settings-section.tsx`). A docs link in its header is its `link` prop, which renders `Label ↗` on the title's rail; a ghost button with an arrow is wrong. A custom `Modal` for a confirmation is wrong; the confirmation is `confirmDialog` (`packages/app/src/utils/confirm-dialog.ts`). A hand-rolled overflow menu is wrong; the menu is `<DropdownMenu>` (`packages/app/src/components/ui/dropdown-menu.tsx`). A hand-rolled status pill is wrong; the pill is `<StatusBadge>` (`packages/app/src/components/ui/status-badge.tsx`). A circle pinned over a scrolling surface is wrong; the floating action is `<FloatingActionButton>` (`packages/app/src/components/ui/floating-action-button.tsx`), one per surface, and the surface reserves `FLOATING_ACTION_BUTTON_CLEARANCE` below its content so the button never traps the last row.
 
 Before adding a new component, read `components/ui/`. The primitive usually exists.
 
@@ -114,6 +114,8 @@ Five primitives. The pick is determined by option count, the need to search, and
 
 `<AdaptiveModalSheet>` owns the presentation. Its content inset — the gutter that puts sheet content on the same rails as the sheet header — and compact bottom safe-area padding are the sheet's, not the caller's. A caller declares layout intent through `contentStyle` and never branches on form factor to add its own margins. If a sheet's first snap point is shorter than its header, content, and safe-area clearance, raise that snap point rather than moving the sheet container.
 
+The sheet header (`SheetHeaderView`) is the only sheet title row. A sheet that brings its own Gorhom modal still renders it. Back, Close and every action passed through `header.actions` are `SheetHeaderIconButton`, so all of them get the header island's chrome, as `CompactHeader` does: one frame, glyph, colour and hover. The first and last buttons hang into the row's padding, so their glyphs sit on the content rail.
+
 `confirmDialog` is for destructive yes/no and imperative confirmation. Promise-based: `await confirmDialog({ destructive: true, ... })`. Anything where a wrong click loses work.
 
 Three themes is `DropdownMenu`. Thirty hosts is `Combobox`. A label and a value is `AdaptiveModalSheet`. "Are you sure?" is `confirmDialog`.
@@ -134,7 +136,7 @@ Cards inside a section sit closer than sections. Rows inside a card touch — on
 
 Rows have generous vertical padding: roughly 16px of content plus 16px of vertical padding for settings rows, 8–12px for sidebar list items where many rows must fit. Compressing rows below the established density to fit more on the screen is wrong. Too many rows means more cards or more sections, not smaller rows.
 
-Rows revealed under a `<SettingsCollapsibleRow>` are nested rows, one step smaller than card rows: 8px of vertical padding, `fontSize.sm` text, `sm` controls, and one fixed height so rows with and without a trailing button line up. The collapsible row sets this for everything under it (`packages/app/src/components/settings/row-density.tsx`). Never pass a density to a row, and never pad or resize a nested row by hand.
+Rows revealed under a `<SettingsCollapsibleRow>` are nested rows, one step smaller than card rows: 8px of vertical padding, `fontSize.sm` text, `sm` controls, and one fixed height so rows with and without a trailing button line up. The collapsible row sets this for everything under it (`packages/app/src/components/settings/row-density.tsx`). Never pass a density to a row, and never pad or resize a nested row by hand. Settings rows that share a menu surface with menu rows, such as Usage's options, go inside `<MenuSettingsRows>`, which puts their labels on the menu rows' label rail (`menuRowContentInset`).
 
 The whitespace is the design.
 

docs/development.md

@@ -49,7 +49,7 @@ than downloading a published desktop release.
 - The **server itself** (e.g. when launched by the desktop app or `npm run start`) defaults to `~/.paseo` (see `packages/server/src/server/paseo-home.ts`).
 - **Repo dev scripts** default to `$ROOT/.dev/paseo-home`, where `$ROOT` is the current checkout or worktree root. This keeps all dev state scoped to the checkout instead of the packaged desktop app.
 - **`npm run cli -- ...`** runs through the same dev-home wrapper as the dev scripts, so the in-repo CLI automatically targets the current checkout's `.dev/paseo-home` and configured dev daemon endpoint.
-- **Paseo-created worktrees** seed `$PASEO_WORKTREE_PATH/.dev/paseo-home` from `$PASEO_SOURCE_CHECKOUT_PATH/.dev/paseo-home` by copying durable JSON metadata. Runtime files like pid files, sockets, and logs are not copied.
+- **Paseo-created worktrees** seed `$PASEO_WORKTREE_PATH/.dev/paseo-home` from `$PASEO_SOURCE_CHECKOUT_PATH/.dev/paseo-home` by copying agent and project JSON metadata and configuration. Both this setup and `PASEO_DEV_SEED_HOME` use the same seeder, which disables `agents.resumeOnStartup` in the copied config. Startup repairs copied running records without resuming agents or sending recovery prompts. Schedules and heartbeats (stored under `schedules/`), runtime files, identities, sockets, and logs are not copied. Existing nonempty homes are left unchanged unless explicitly reset. Copied agents still reference the original provider sessions and working directories: manually prompting one reaches that real session.
 - **This repo's worktree setup** also best-effort seeds `packages/app/ios` and the newest `.dev/ios-build` entry from the source checkout so iOS simulator services can reuse native project and Xcode cache state when it is safe enough to do so.
 
 Override knobs:

docs/floating-panels.md

@@ -7,12 +7,12 @@ canonical files and are trying to add or change one.
 
 ## Canonical files
 
-| File                                     | Use case                                                          |
-| ---------------------------------------- | ----------------------------------------------------------------- |
-| `components/ui/combobox.tsx`             | Anchored picker with search; mobile falls back to bottom sheet    |
-| `components/ui/tooltip.tsx`              | Non-interactive hover/long-press tooltip                          |
-| `components/ui/hover-card.tsx`           | Desktop-web hover card the pointer can move onto; Portal          |
-| `components/ui/autocomplete-popover.tsx` | Slash-command autocomplete anchored to the focused composer input |
+| File                                  | Use case                                                          |
+| ------------------------------------- | ----------------------------------------------------------------- |
+| `components/ui/combobox.tsx`          | Anchored picker with search; mobile falls back to bottom sheet    |
+| `components/ui/tooltip.tsx`           | Non-interactive hover/long-press tooltip                          |
+| `components/ui/hover-card.tsx`        | Desktop-web hover card the pointer can move onto; Portal          |
+| `components/ui/autocomplete-popover/` | Slash-command autocomplete anchored to the focused composer input |
 
 Each handles a different mix of concerns: combobox owns input focus, tooltip is
 non-interactive, hover-card is web-only desktop, autocomplete keeps the composer
@@ -65,6 +65,10 @@ Two escape hatches in the codebase:
   Android can detach the IME from an underlying TextInput. Fine for combobox
   (it has its own input) and tooltip (no input). **Not** fine for autocomplete
   (the composer's input must stay focused so the user keeps typing).
+  Use `@/components/ui/modal`, not React Native's `Modal`. On Android, React Native lays out a
+  modal's first frames at the screen size minus the status and navigation bars, then grows it to
+  the full edge-to-edge window, so a full-screen backdrop stops short of the bottom and snaps
+  down. The wrapper sizes the content to the window from the first frame.
 - **`<Portal>` from `@gorhom/portal`** (hover-card, autocomplete-popover) —
   hoists the React subtree to a fixed mount point whose bounds cover the
   screen. Same window, same IME, hit-test works because the new parent is
@@ -280,6 +284,22 @@ popover or leaves it behind the keyboard. `measureAtRest` measures through
 Fabric's transform-free `measureLayout` instead. Re-measure when `isMoving`
 settles; the composer's resting position changes as the draft grows.
 
+A measured rect is an asynchronous copy, so it lands after the anchor's new
+layout has painted. The composer resizes while the autocomplete is open: a
+wrapped line, cleared text, a window resize. On web a `ResizeObserver` reads
+the anchor's rect against the layer and commits the placement with `flushSync`,
+which runs after layout and before paint. On native a Reanimated frame callback
+reads only the anchor's height on the UI thread and holds its bottom edge at
+the rest measurement. A height carries no transform. On iOS the absolute
+position does not reliably include one: the keyboard lift runs on the native
+driver and reaches the shadow tree only when the view re-renders. The
+fixed-bottom model is wrong for the centered New workspace composer on tablets,
+which grows around its middle, and for width or x changes. The popover is off
+there by half the growth, or by the old width, until the next rest measurement.
+Keep the portal's `KeyboardTranslateView` host-sized with
+`pointerEvents="box-none"` and position the popover inside it, so the popover
+moves without leaving its parent's bounds (Gotcha 1).
+
 The provider also reconciles iOS from the controller's native `onEnd` event.
 The controller's stock iOS shared values update at move start and during an
 interactive move, but not at the terminal event, so JS contention can otherwise
@@ -422,9 +442,11 @@ gets that 0 and draws over the navigation bar.
 
 - A Gorhom sheet reads the inset inside its children, which render in the app's sheet host. See
   `CompactSheetBody`, `MenuSheetScrollView` and `ComboboxSheetFrame`.
-- An RN `Modal` passes the call site's context straight through, so put a `SafeAreaProvider`
-  inside it and read the inset below that. The modal is its own window, and the provider measures
-  it. See `attachment-lightbox.tsx`.
+- An RN `Modal` passes the call site's context straight through, so wrap its content in
+  `WindowSafeArea` from `@/window-layout` and read the inset below that. It provides the insets of
+  the whole window, published by `WindowLayoutProvider`. Do not put a `SafeAreaProvider` inside the
+  modal: on Android it measures the dialog window, whose bottom inset reads 24, then 0, then 24
+  again over the first frames, and everything padded by it jumps. See `attachment-lightbox.tsx`.
 
 ## Recipe for a new anchored panel
 
@@ -453,6 +475,14 @@ Before you write a new one, ask:
    `top` paints over its anchor until the next placement lands, about 150 ms
    on Android. Web hides this because React commits the resize and the
    re-placement in one task.
+7. **Does the panel hold a list that reads away from its anchor?** Make the
+   anchor edge the list's resting scroll position: an inverted list, as in
+   `components/ui/autocomplete.tsx`. On Android a scroll command issued after
+   the rows commit reaches the screen one or two frames after them, so a list
+   scrolled to its anchor edge paints its far end first. Give each result set
+   its own list with a `key`, so it starts at the anchor edge with the rows
+   that fill the panel. A list that mounts every result holds the panel's
+   first frame until the last row is ready.
 
 Then copy the closest canonical file and trim.
 

docs/keyboard-shortcuts.md

@@ -59,6 +59,8 @@ Register keyboard handling with `useOverlayRegistration` from `@/keyboard`.
 Pass the surface's open state, layer, handled keys and `onKeyDown`. The highest
 layer gets first refusal; the latest registration wins a tie. Native registration
 does not need a DOM ref. Web adds focus trapping and restoration through its adapter.
+Declaring Tab takes it from the web focus trap and hands it to `onKeyDown`; the command
+center rotates its tabs with it. Native sources drop Tab from the declarations.
 
 Capture a global overlay’s layer in state for its opening lifetime. Memo caches can
 be discarded or removed by React Compiler; recomputing against the registry lets an

docs/timeline-sync.md

@@ -95,10 +95,11 @@ Provider message IDs are not guaranteed for every displayed item. Paseo-generate
 Actions that address a point in chat history, such as Fork, use the daemon timeline `epoch` plus the projected item's `seqEnd`. The app carries that position on the rendered assistant item for both live and fetched history. When adjacent projected chunks merge, the merged item retains the newer chunk's position.
 
 The daemon validates the epoch and locates the projected item at the selected position. A fork
-includes projected items through that checkpoint. If an item the fork copies spans the checkpoint
-and changed afterward, the daemon refuses that fork with an actionable error: discarded historical
-payloads cannot be reconstructed from sequence metadata. Plugin cards are not copied, so a card
-updated after the checkpoint does not block it. Forking the current context remains available.
+includes projected items through that checkpoint. A tool call that started before the checkpoint
+and changed after it, such as background work that outlives a reply, is copied as still running:
+the projection keeps only its latest payload, so its state at the checkpoint can't be read back.
+Plugin cards are not copied. A position from another epoch, or one that is gone, is refused;
+forking the current context remains available.
 
 ## Resume behavior
 

packages/app/e2e/browser/agent-relative-time.spec.ts

@@ -5,7 +5,7 @@ import { seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 import { openAgentRoute } from "../support/helpers/mock-agent";
 import { resetSeededPageState, openSessions } from "../support/helpers/archive-tab";
 
-test("agent list age advances and command center says just now for a fresh agent", async ({
+test("agent list age advances and command center says just now for a fresh workspace", async ({
   page,
 }) => {
   const session = await seedMockAgentWorkspace({
@@ -23,10 +23,10 @@ test("agent list age advances and command center says just now for a fresh agent
 
     const commandCenter = await openCommandCenter(page);
     await commandCenter.getByTestId("command-center-input").fill("Relative time agent");
-    const agentResult = commandCenter.getByTestId(
-      `command-center-agent-${getServerId()}:${session.agentId}`,
+    const workspaceResult = commandCenter.getByTestId(
+      `command-center-workspace-${getServerId()}:${session.workspaceId}`,
     );
-    await expect(agentResult.getByTestId("command-center-result-timestamp")).toContainText(
+    await expect(workspaceResult.getByTestId("command-center-result-timestamp")).toContainText(
       "just now",
     );
     await page.keyboard.press("Escape");

packages/app/e2e/browser/command-center-file-search.spec.ts

@@ -1,5 +1,12 @@
 import { expect, test } from "../support/fixtures";
-import { openCommandCenter } from "../support/helpers/command-center";
+import { openSettings } from "../support/helpers/app";
+import {
+  closeCommandCenter,
+  expectCommandCenterTab,
+  expectCommandCenterTabs,
+  openCommandCenter,
+  selectCommandCenterTab,
+} from "../support/helpers/command-center";
 import {
   delayDirectorySuggestionResponses,
   holdDirectorySuggestionResponses,
@@ -17,6 +24,7 @@ import {
 } from "../support/helpers/command-center-scroll";
 import { expectFileTabOpen } from "../support/helpers/file-explorer";
 import { gotoWorkspace } from "../support/helpers/launcher";
+import { getServerId } from "../support/helpers/server-id";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
 
 const FILE_PATH =
@@ -67,7 +75,7 @@ test("workspace file search stays geometrically stable through delayed loading a
 
     const panel = page.getByTestId("command-center-panel");
     await expect(panel).toBeVisible({ timeout: 30_000 });
-    await expect(panel.getByRole("button", { name: "Files" })).toBeVisible();
+    await expectCommandCenterTab(panel, "Files");
     await startCommandCenterLayoutObservation(page);
 
     await panel.getByTestId("command-center-input").fill(FILE_NAME);
@@ -97,26 +105,90 @@ test("workspace file search stays geometrically stable through delayed loading a
   }
 });
 
-test("dropping the files scope leaves the search row the same height", async ({ page }) => {
+test("command center tabs rotate with Tab and never move the header", async ({ page }) => {
   const seeded = await seedWorkspace({
-    repoPrefix: "command-center-file-search-scope-",
-    title: "Scope chip height",
+    repoPrefix: "command-center-tabs-",
+    title: "Tab rotation",
   });
 
   try {
     await gotoWorkspace(page, seeded.workspaceId);
-    await page.keyboard.press("Meta+P");
-
     const panel = page.getByTestId("command-center-panel");
-    await expect(panel).toBeVisible({ timeout: 30_000 });
     const header = panel.getByTestId("command-center-header");
-    const scoped = await header.boundingBox();
+    const input = panel.getByTestId("command-center-input");
 
-    await page.getByTestId("command-center-files-scope").click();
-    await expect(page.getByTestId("command-center-files-scope")).toHaveCount(0);
-    const unscoped = await header.boundingBox();
+    await test.step("⌘P opens on Files and Backspace on an empty field returns to All", async () => {
+      await page.keyboard.press("Meta+P");
+      await expect(panel).toBeVisible({ timeout: 30_000 });
+      await expectCommandCenterTab(panel, "Files");
+      await page.keyboard.press("Backspace");
+      await expectCommandCenterTab(panel, "All");
+    });
 
-    expect(scoped?.height).toBe(unscoped?.height);
+    const results = panel.getByTestId("command-center-results");
+    const headerOnAll = await header.boundingBox();
+    const resultsTopOnAll = (await results.boundingBox())?.y;
+
+    await test.step("Tab walks forward and wraps; Shift+Tab walks back", async () => {
+      await page.keyboard.press("Tab");
+      await expectCommandCenterTab(panel, "Workspaces");
+      await page.keyboard.press("Tab");
+      await expectCommandCenterTab(panel, "Files");
+      await page.keyboard.press("Tab");
+      await expectCommandCenterTab(panel, "Actions");
+      expect(await header.boundingBox()).toEqual(headerOnAll);
+      expect((await results.boundingBox())?.y).toBe(resultsTopOnAll);
+      await page.keyboard.press("Tab");
+      await expectCommandCenterTab(panel, "All");
+      await page.keyboard.press("Shift+Tab");
+      await expectCommandCenterTab(panel, "Actions");
+      await page.keyboard.press("Shift+Tab");
+      await expectCommandCenterTab(panel, "Files");
+    });
+
+    await test.step("rotating keeps the query", async () => {
+      await input.fill("tab rot");
+      await page.keyboard.press("Tab");
+      await expectCommandCenterTab(panel, "Actions");
+      await expect(input).toHaveValue("tab rot");
+    });
+
+    await test.step("clicking a tab keeps typing in the search field", async () => {
+      await selectCommandCenterTab(panel, "Workspaces");
+      await page.keyboard.press("Backspace");
+      await expect(input).toHaveValue("tab ro");
+      await expect(
+        panel.getByTestId(`command-center-workspace-${getServerId()}:${seeded.workspaceId}`),
+      ).toBeVisible();
+    });
+
+    await test.step("⌘K opens on All", async () => {
+      await page.keyboard.press("Escape");
+      await expect(panel).not.toBeVisible();
+      await page.keyboard.press("Meta+K");
+      await expectCommandCenterTab(panel, "All");
+    });
+
+    await test.step("in a workspace every tab is offered", async () => {
+      await expectCommandCenterTabs(panel, ["All", "Workspaces", "Files", "Actions"]);
+    });
+
+    await test.step("outside a workspace there is no Files tab, and Tab skips it", async () => {
+      const outside = { workspaceOpen: false };
+      await closeCommandCenter(page);
+      await openSettings(page);
+      await page.keyboard.press("Meta+K");
+      await expectCommandCenterTab(panel, "All", outside);
+      await expectCommandCenterTabs(panel, ["All", "Workspaces", "Actions"]);
+      await page.keyboard.press("Tab");
+      await expectCommandCenterTab(panel, "Workspaces", outside);
+      await page.keyboard.press("Tab");
+      await expectCommandCenterTab(panel, "Actions", outside);
+      await page.keyboard.press("Tab");
+      await expectCommandCenterTab(panel, "All", outside);
+      await page.keyboard.press("Shift+Tab");
+      await expectCommandCenterTab(panel, "Actions", outside);
+    });
   } finally {
     await seeded.cleanup();
   }

packages/app/e2e/browser/command-center-scroll.spec.ts

@@ -7,8 +7,8 @@ import {
   searchCommandCenter,
   warmCommandCenterRows,
   expectOnlyCommandCenterRowRendered,
-  expectCommandCenterAgentWindow,
-  scrollToOldestCommandCenterAgent,
+  expectCommandCenterWorkspaceWindow,
+  scrollToOldestCommandCenterWorkspace,
 } from "../support/helpers/command-center-performance";
 import { gotoAppShell } from "../support/helpers/app";
 import {
@@ -19,7 +19,7 @@ import {
   expectPrimaryCommandCenterActions,
   expectTightTwoLineResultSpacing,
   expectVisibleKeyboardNavigationNotToScroll,
-  expectWorkspaceResultsToBeLimitedUntilSearch,
+  expectRecentWorkspacesUntilSearch,
   observeCommandCenterScroll,
   openCommandCenterWithKeyboard,
 } from "../support/helpers/command-center-scroll";
@@ -63,9 +63,9 @@ test("Command Center preserves manual scrolling through live updates and resumes
     await expectCommandCenterToRemainAtTheTop(page);
     await expectPrimaryCommandCenterActions(panel);
     await expectVisibleKeyboardNavigationNotToScroll(page, panel);
-    // The empty query lists the most recent workspaces, so the last one seeded leads it.
+    // All leads with the most recent workspaces, so the last one seeded leads it.
     await expectTightTwoLineResultSpacing(panel, "Command Center Scroll 08");
-    await expectWorkspaceResultsToBeLimitedUntilSearch(panel);
+    await expectRecentWorkspacesUntilSearch(panel);
     const offset = await scrollCommandCenterAwayFromSelection(page, panel);
     await seeded.client.setWorkspaceTitle(newestWorkspaceId, "Command Center Scroll renamed");
     await expect(panel.getByText("Command Center Scroll renamed", { exact: true })).toHaveCount(1);
@@ -76,42 +76,50 @@ test("Command Center preserves manual scrolling through live updates and resumes
   }
 });
 
-test("live search updates render only the changed row and keep agents virtualized", async ({
+test("live search updates render only the changed row and keep workspaces virtualized", async ({
   page,
 }) => {
   test.setTimeout(120_000);
   const seeded = await seedSearchableCommandCenter();
+  const agentWorkspaceRowId = `workspace:${getServerId()}:${seeded.workspaceId}`;
   try {
     await observeCommandCenterRowRenders(page);
     await gotoAppShell(page);
     const panel = await openCommandCenterWithKeyboard(page);
-    await searchCommandCenter(panel, "Search agent");
-    await expect(panel.getByText("Search agent 059", { exact: true })).toBeVisible();
-    await warmCommandCenterRows(page);
-    await expectCommandCenterAgentWindow(panel, seeded.agents.length);
 
-    await seeded.client.updateAgent(seeded.agents[59].id, { name: "Search agent 059 revised" });
-    await expect(panel.getByText("Search agent 059 revised", { exact: true })).toBeVisible();
-    await expectOnlyCommandCenterRowRendered(
-      page,
-      `agent:${getServerId()}:${seeded.agents[59].id}`,
-    );
+    await test.step("renaming a matched agent re-renders only its workspace", async () => {
+      await searchCommandCenter(panel, "Search agent 002");
+      const agentLine = panel
+        .getByTestId(`command-center-workspace-${getServerId()}:${seeded.workspaceId}`)
+        .getByTestId("command-center-workspace-agent");
+      await expect(agentLine).toHaveText("Search agent 002");
+      await warmCommandCenterRows(page);
+      await seeded.client.updateAgent(seeded.agents[2].id, { name: "Search agent 002 revised" });
+      await expect(agentLine).toHaveText("Search agent 002 revised");
+      await expectOnlyCommandCenterRowRendered(page, agentWorkspaceRowId);
+    });
 
-    await searchCommandCenter(panel, "Search workspace");
-    await expect(panel.getByText("Search workspace 039", { exact: true })).toBeVisible();
-    await warmCommandCenterRows(page);
-    await seeded.client.setWorkspaceTitle(seeded.workspaces[39].id, "Search workspace 039 revised");
-    await expect(panel.getByText("Search workspace 039 revised", { exact: true })).toBeVisible();
-    await expectOnlyCommandCenterRowRendered(
-      page,
-      `workspace:${getServerId()}:${seeded.workspaces[39].id}`,
-    );
+    await test.step("renaming a workspace re-renders only its row", async () => {
+      await searchCommandCenter(panel, "Search workspace");
+      await expect(panel.getByText("Search workspace 039", { exact: true })).toBeVisible();
+      await warmCommandCenterRows(page);
+      await seeded.client.setWorkspaceTitle(
+        seeded.workspaces[39].id,
+        "Search workspace 039 revised",
+      );
+      await expect(panel.getByText("Search workspace 039 revised", { exact: true })).toBeVisible();
+      await expectOnlyCommandCenterRowRendered(
+        page,
+        `workspace:${getServerId()}:${seeded.workspaces[39].id}`,
+      );
+    });
 
-    await searchCommandCenter(panel, "Search agent");
-    await warmCommandCenterRows(page);
-    await scrollToOldestCommandCenterAgent(panel);
-    await expect(panel.getByText("Search agent 000", { exact: true })).toBeVisible();
-    await expectCommandCenterAgentWindow(panel, seeded.agents.length);
+    await test.step("a long list mounts only a window of rows", async () => {
+      await expectCommandCenterWorkspaceWindow(panel, seeded.workspaces.length + 1);
+      await scrollToOldestCommandCenterWorkspace(panel);
+      await expect(panel.getByText("Search workspace 000", { exact: true })).toBeVisible();
+      await expectCommandCenterWorkspaceWindow(panel, seeded.workspaces.length + 1);
+    });
   } finally {
     await seeded.cleanup();
   }

packages/app/e2e/browser/command-center-workspaces.spec.ts

@@ -4,7 +4,12 @@ import { test } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { createIdleAgent } from "../support/helpers/archive-tab";
 import { expectAgentTabActive } from "../support/helpers/launcher";
-import { openCommandCenter } from "../support/helpers/command-center";
+import {
+  commandCenterSection,
+  expectCommandCenterTab,
+  openCommandCenter,
+  selectCommandCenterTab,
+} from "../support/helpers/command-center";
 import { addOfflineHostAndReload } from "../support/helpers/hosts";
 import { expectAppRoute } from "../support/helpers/route-assertions";
 import { seedWorkspace } from "../support/helpers/seed-client";
@@ -21,9 +26,7 @@ const AGENT_TITLE = "Fix checkout retries";
 test.describe("Command center workspaces", () => {
   test.describe.configure({ timeout: 180_000 });
 
-  test("agent and workspace results retain their icons and overlay live status", async ({
-    page,
-  }) => {
+  test("workspace results overlay live status", async ({ page }) => {
     const workspace = await seedRunningMockAgentWorkspace({
       repoPrefix: "command-center-status-",
       title: "Review checkout retries",
@@ -34,15 +37,13 @@ test.describe("Command center workspaces", () => {
       await openAgentRoute(page, workspace);
       await expectAgentTabActive(page, workspace.agentId);
       const panel = await openCommandCenter(page);
-      const agent = panel.getByTestId(`command-center-agent-${getServerId()}:${workspace.agentId}`);
+      // Recent workspaces leaves out the open one; the Workspaces tab lists every workspace.
+      await selectCommandCenterTab(panel, "Workspaces");
       const row = panel.getByTestId(
         `command-center-workspace-${getServerId()}:${workspace.workspaceId}`,
       );
-      await expect(agent.getByRole("progressbar", { name: "Agent running" })).toBeVisible();
       await expect(row.getByRole("progressbar", { name: "Agent running" })).toBeVisible();
-      await expect(agent.getByRole("img", { name: "Mock agent" })).toBeVisible();
       await workspace.client.cancelAgent(workspace.agentId);
-      await expect(agent.getByRole("progressbar")).toHaveCount(0);
       await expect(row.getByRole("progressbar")).toHaveCount(0);
     } finally {
       await workspace.cleanup();
@@ -80,9 +81,11 @@ test.describe("Command center workspaces", () => {
       });
 
       const panel = await openCommandCenter(page);
+      await selectCommandCenterTab(panel, "Workspaces");
       const row = panel.getByTestId(
         `command-center-workspace-${getServerId()}:${seeded.workspaceId}`,
       );
+      const agentLine = row.getByTestId("command-center-workspace-agent");
       await expect(row).toBeVisible({ timeout: 30_000 });
       await expect(row).toContainText(WORKSPACE_TITLE);
       await expect(row).toContainText(WORKSPACE_BRANCH);
@@ -92,65 +95,151 @@ test.describe("Command center workspaces", () => {
       await expect(subtitle).toContainText(PRIMARY_HOST_LABEL);
       await expect(subtitle).toContainText(seeded.projectDisplayName);
       await expect(subtitle).toContainText(WORKSPACE_BRANCH);
+      await expect(agentLine).toHaveCount(0);
 
-      // The agent subtitle is unchanged by the shared-helper refactor.
-      const agentRow = panel.getByTestId(`command-center-agent-${getServerId()}:${agent.id}`);
-      await expect(agentRow).toContainText(AGENT_TITLE);
-      await expect(agentRow).toContainText(PRIMARY_HOST_LABEL);
-      await expect(agentRow).toContainText(WORKSPACE_TITLE);
-      await expect(agentRow).not.toContainText(seeded.repoPath);
-
-      const workspaceSectionTop = await panel
-        .getByText("Workspaces", { exact: true })
-        .evaluate((element) => element.getBoundingClientRect().top);
-      const agentSectionTop = await panel
-        .getByText("Agents", { exact: true })
-        .evaluate((element) => element.getBoundingClientRect().top);
-      expect(workspaceSectionTop).toBeLessThan(agentSectionTop);
-
-      const input = panel.getByTestId("command-center-input");
-      await input.fill(PRIMARY_HOST_LABEL);
-      await expect(row).toBeVisible();
-      await expect(agentRow).toBeVisible();
-
-      await input.fill(WORKSPACE_BRANCH);
-      await expect(row).toBeVisible();
-      await expect(agentRow).not.toBeVisible();
-
-      await input.fill(WORKSPACE_TITLE);
-      await expect(row).toBeVisible();
-      await expect(agentRow).toBeVisible();
-
-      await input.fill(seeded.repoPath);
-      await expect(agentRow).toBeVisible();
-      await expect(row).not.toBeVisible();
-
-      // The project name is now part of the workspace searchText.
-      await input.fill(seeded.projectDisplayName);
-      await expect(row).toBeVisible();
-
-      await input.fill(AGENT_TITLE);
-      await expect(agentRow).toBeVisible();
-      await expect(row).not.toBeVisible();
-
-      await input.fill(WORKSPACE_TITLE);
-      await page.keyboard.press("Enter");
-
-      await expectAppRoute(page, buildHostWorkspaceRoute(getServerId(), seeded.workspaceId), {
-        timeout: 30_000,
+      await test.step("a workspace matches on its own fields", async () => {
+        const input = panel.getByTestId("command-center-input");
+        for (const query of [
+          PRIMARY_HOST_LABEL,
+          WORKSPACE_BRANCH,
+          WORKSPACE_TITLE,
+          seeded.projectDisplayName,
+        ]) {
+          await input.fill(query);
+          await expect(row).toBeVisible();
+          await expect(agentLine).toHaveCount(0);
+        }
+        // `cwd` is never shown, so it must never match.
+        await input.fill(seeded.repoPath);
+        await expect(row).not.toBeVisible();
       });
 
-      await test.step("find an agent and open its workspace tab", async () => {
-        const agentPanel = await openCommandCenter(page);
-        await agentPanel.getByTestId("command-center-input").fill(AGENT_TITLE);
+      await test.step("an agent title finds its workspace and names the agent", async () => {
+        await panel.getByTestId("command-center-input").fill(AGENT_TITLE);
+        await expect(agentLine).toHaveText(AGENT_TITLE);
+        await expect(panel.getByText("Agents", { exact: true })).toHaveCount(0);
         await page.keyboard.press("Enter");
         await expectAgentTabActive(page, agent.id);
       });
+
+      await test.step("a workspace match opens the workspace", async () => {
+        const searchAgain = await openCommandCenter(page);
+        await expectCommandCenterTab(searchAgain, "All");
+        await searchAgain.getByTestId("command-center-input").fill(WORKSPACE_TITLE);
+        await page.keyboard.press("Enter");
+        await expectAppRoute(page, buildHostWorkspaceRoute(getServerId(), seeded.workspaceId), {
+          timeout: 30_000,
+        });
+      });
     } finally {
       await seeded.cleanup();
     }
   });
 
+  test("All leads with the three most recent workspaces other than the open one", async ({
+    page,
+  }) => {
+    const older = [];
+    for (const title of ["Recent oldest", "Recent third", "Recent second", "Recent newest"]) {
+      older.push(await seedWorkspace({ repoPrefix: "command-center-recent-", title }));
+    }
+    const current = await seedWorkspace({
+      repoPrefix: "command-center-recent-",
+      title: "Open one",
+    });
+    try {
+      await page.goto(buildHostWorkspaceRoute(getServerId(), current.workspaceId));
+      const panel = await openCommandCenter(page);
+      await expectCommandCenterTab(panel, "All");
+      await expect(commandCenterSection(panel, "Recent workspaces")).toBeVisible();
+      const rowOf = (workspaceId: string) =>
+        panel.getByTestId(`command-center-workspace-${getServerId()}:${workspaceId}`);
+
+      await expect(rowOf(older[3].workspaceId)).toBeVisible({ timeout: 30_000 });
+      await expect(rowOf(older[2].workspaceId)).toBeVisible();
+      await expect(rowOf(older[1].workspaceId)).toBeVisible();
+      await expect(rowOf(older[0].workspaceId)).toHaveCount(0);
+      await expect(rowOf(current.workspaceId)).toHaveCount(0);
+      await expect(commandCenterSection(panel, "Workspaces")).toHaveCount(0);
+
+      // The newest recent workspace is selected, so Enter goes straight back to it.
+      await page.keyboard.press("Enter");
+      await expectAppRoute(page, buildHostWorkspaceRoute(getServerId(), older[3].workspaceId), {
+        timeout: 30_000,
+      });
+    } finally {
+      for (const seeded of [current, ...older]) await seeded.cleanup();
+    }
+  });
+
+  test("archived workspaces follow active matches and open where they can be unarchived", async ({
+    page,
+  }) => {
+    const active = await seedWorkspace({
+      repoPrefix: "command-center-archived-active-",
+      title: "Billing dashboard",
+    });
+    const archived = await seedWorkspace({
+      repoPrefix: "command-center-archived-",
+      title: "Billing cleanup",
+    });
+    try {
+      await createIdleAgent(archived.client, {
+        cwd: archived.repoPath,
+        workspaceId: archived.workspaceId,
+        title: "Audit invoice totals",
+      });
+      expect((await archived.client.archiveWorkspace(archived.workspaceId)).error).toBeNull();
+      await gotoAppShell(page);
+      const panel = await openCommandCenter(page);
+      const input = panel.getByTestId("command-center-input");
+      const activeRow = panel.getByTestId(
+        `command-center-workspace-${getServerId()}:${active.workspaceId}`,
+      );
+      const archivedRow = panel.getByTestId(
+        `command-center-workspace-${getServerId()}:${archived.workspaceId}`,
+      );
+
+      await test.step("an empty query never lists archived workspaces", async () => {
+        await selectCommandCenterTab(panel, "Workspaces");
+        await expect(activeRow).toBeVisible({ timeout: 30_000 });
+        await expect(archivedRow).toHaveCount(0);
+      });
+
+      await test.step("a query lists the archived workspace after the active one", async () => {
+        await input.fill("billing");
+        await expect(archivedRow).toBeVisible({ timeout: 30_000 });
+        await expect(archivedRow).toContainText("Archived");
+        await expect(activeRow).not.toContainText("Archived");
+        const activeTop = (await activeRow.boundingBox())?.y ?? Number.NaN;
+        const archivedTop = (await archivedRow.boundingBox())?.y ?? Number.NaN;
+        expect(archivedTop).toBeGreaterThan(activeTop);
+      });
+
+      await test.step("an agent title finds the archived workspace on All", async () => {
+        // Opened from the app shell, outside any workspace.
+        await selectCommandCenterTab(panel, "All", { workspaceOpen: false });
+        await input.fill("invoice totals");
+        await expect(archivedRow.getByTestId("command-center-workspace-agent")).toHaveText(
+          "Audit invoice totals",
+          { timeout: 30_000 },
+        );
+        await expect(activeRow).toHaveCount(0);
+      });
+
+      await test.step("opening it lands where the workspace can be unarchived", async () => {
+        await page.keyboard.press("Enter");
+        await expect(page.getByText("Workspace archived", { exact: true })).toBeVisible({
+          timeout: 30_000,
+        });
+        await expect(page.getByRole("button", { name: "Unarchive", exact: true })).toBeVisible();
+      });
+    } finally {
+      await active.cleanup();
+      await archived.cleanup();
+    }
+  });
+
   test("single-host workspace subtitle omits the host and shows project · branch", async ({
     page,
   }) => {
@@ -229,7 +318,7 @@ test.describe("Compact sidebar inspection", () => {
       title: "Compact destination",
     });
     try {
-      const agent = await createIdleAgent(seeded.client, {
+      await createIdleAgent(seeded.client, {
         cwd: seeded.repoPath,
         workspaceId: seeded.workspaceId,
         title: "Compact root agent",
@@ -246,7 +335,10 @@ test.describe("Compact sidebar inspection", () => {
       await openSidebar(page);
       const agentSearch = await openCommandCenter(page);
       await agentSearch.getByTestId("command-center-input").fill("Compact root agent");
-      await agentSearch.getByTestId(`command-center-agent-${getServerId()}:${agent.id}`).click();
+      await agentSearch
+        .getByTestId(`command-center-workspace-${getServerId()}:${seeded.workspaceId}`)
+        .getByTestId("command-center-workspace-agent")
+        .click();
       await expect(page.getByRole("button", { name: "Open menu", exact: true })).toBeVisible();
       await expect(
         page.getByRole("textbox", { name: "Message agent...", exact: true }),

packages/app/e2e/browser/composer-autocomplete.spec.ts

@@ -787,9 +787,13 @@ test.describe("Composer autocomplete", () => {
       await input.press("ArrowDown");
       await input.press("ArrowDown");
       await input.press("h");
-      await expect(popover.getByText("/help", { exact: true }).first()).toBeVisible();
+      // On web the search reads the cursor after paint, so the input's value runs ahead of
+      // the list. Wait on the list itself: /tdd is hidden only while the search is "h", and
+      // back only once the search is "" again.
+      await expect(popover.getByText("/tdd", { exact: true })).toHaveCount(0);
       await input.press("Backspace");
       await expect(input).toHaveValue("/");
+      await expect(popover.getByText("/tdd", { exact: true }).first()).toBeVisible();
       await input.press("Enter");
 
       await expect(input).toHaveValue("/tdd ");

packages/app/e2e/browser/creation-idempotency.spec.ts

@@ -148,6 +148,23 @@ for (const scenario of [
   });
 }
 
+test("retrying failed agent initialization keeps the plugin metadata set on New workspace", async ({
+  creation,
+  startup,
+  composerMetadata,
+}) => {
+  await creation.openWorkspaceForm("local");
+  await composerMetadata.set({ "composer-metadata.tag": "kept" });
+  await creation.submitPrompt("Start the tagged task.", "Create");
+  await creation.expectAgentStillStarting();
+  await startup.fail();
+  await creation.expectStartupFailure();
+  await creation.expectOneCreatedWorkspace();
+  await creation.submitPrompt("Start the tagged task.");
+  await creation.expectAgentCount(1);
+  await creation.expectAgentMetadata({ "composer-metadata.tag": "kept" });
+});
+
 test("an edited agent draft starts after its first start failed", async ({
   creation,
   startup,

packages/app/e2e/browser/launcher-tab.spec.ts

@@ -125,12 +125,15 @@ test.describe("Tab creation", () => {
   }) => {
     await gotoWorkspace(page, workspace.workspaceId);
     await assertNewTabMenuTriggerVisible(page);
-    await pressNewTabShortcut(page);
     const newTabs = page
       .locator('[data-testid^="workspace-tab-tab_"]')
       .filter({ hasText: "New tab" });
+    // The workspace opens on a New tab of its own; count from the tab the shortcut adds.
     await expect(newTabs.first()).toBeVisible();
-    const countBefore = await newTabs.count();
+    const openedCount = await newTabs.count();
+    await pressNewTabShortcut(page);
+    await expect(newTabs).toHaveCount(openedCount + 1);
+    const countBefore = openedCount + 1;
     const draftCount = await countTabsOfKind(page, "draft");
 
     await test.step("opening the plus menu leaves the current tabs intact", async () => {

packages/app/e2e/browser/new-workspace-entry.spec.ts

@@ -160,6 +160,22 @@ test.describe("New workspace entry points", () => {
     }
   });
 
+  test("Ctrl+N opens the project picker with search focused", async ({ page }) => {
+    const seeded: SeededWorkspace = await seedWorkspace({ repoPrefix: "entry-shortcut-" });
+
+    try {
+      await gotoAppShell(page);
+      await waitForSidebarHydration(page);
+      await openGlobalNewWorkspaceComposer(page);
+
+      await openGlobalNewWorkspaceComposer(page);
+      await page.goBack();
+      await openNewWorkspaceProjectPickerWithShortcut(page, "Control+N");
+    } finally {
+      await seeded.cleanup();
+    }
+  });
+
   test("keeps the in-progress form when the remembered workspace is archived elsewhere", async ({
     page,
   }) => {

packages/app/e2e/browser/usage-modal.spec.ts

@@ -8,6 +8,7 @@ import { gotoAppShell, openSettings } from "../support/helpers/app";
 import { addConnectedHostAndReload } from "../support/helpers/hosts";
 import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
 import { openSettingsSection } from "../support/helpers/settings";
+import { gate } from "../support/helpers/context-window";
 import { getServerId } from "../support/helpers/server-id";
 import { seedSidebarFooterPreferences } from "../support/helpers/sidebar-nav-settings";
 import {
@@ -33,7 +34,12 @@ import {
   pinRow,
   openUsageOptions,
   closeUsageOptions,
+  pickUsageHost,
+  usageModalHost,
+  dragUsageCardAbove,
+  expectUsageCardOrder,
   expectUsageOptionsFitContent,
+  setUsageCardOn,
   showUsageAs,
   refreshAllUsage,
   togglePin,
@@ -93,10 +99,6 @@ async function qaScreenshot(page: Page, name: string, target: "page" | "summary"
   await page.screenshot({ path: file });
 }
 
-function hostFilter(page: Page) {
-  return page.locator('[data-testid="usage-host-filter-trigger"]:visible');
-}
-
 function weeklyReport(sourceId: string, usedPct: number): UsageReportEntry {
   return {
     id: `${sourceId}:a`,
@@ -108,6 +110,14 @@ function weeklyReport(sourceId: string, usedPct: number): UsageReportEntry {
   };
 }
 
+function accountReport(sourceId: string, account: string, usedPct: number): UsageReportEntry {
+  return {
+    ...weeklyReport(sourceId, usedPct),
+    id: `${sourceId}:${account}`,
+    account: { label: account },
+  };
+}
+
 function installReversedUsageRefresh(page: Page) {
   const initial = [weeklyReport("opencode", 31), weeklyReport("openai", 12)];
   const refreshed = [weeklyReport("openai", 22), weeklyReport("opencode", 41)];
@@ -120,15 +130,15 @@ async function openUsageSummaryAtWidth(page: Page, width: number) {
   await page.setViewportSize({ width, height: 900 });
   await gotoAppShell(page);
   if (width === 390) await openCompactSidebar(page);
-  await expectPinnedUsage(page, ["31% Weekly", "12% Weekly"]);
+  await expectPinnedUsage(page, ["12% Weekly", "31% Weekly"]);
   await openUsageFromItem(page);
 }
 
 async function expectUsageProviderOrder(page: Page, summary: string[]) {
   const group = page.getByTestId(`usage-host-${getServerId()}`);
   await expect(group.getByText(/^(opencode|openai) plan$/)).toHaveText([
-    "opencode plan",
     "openai plan",
+    "opencode plan",
   ]);
   await expectPinnedUsage(page, summary);
 }
@@ -143,7 +153,7 @@ async function refreshUsageAndWaitForReports(page: Page, usage: UsageReportsFixt
 }
 
 test.describe("usage modal", () => {
-  test("opens from the sidebar on the host's reports, with no host filter for one host", async ({
+  test("opens from the sidebar on the host's reports, with no host named for one host", async ({
     page,
   }) => {
     test.setTimeout(120_000);
@@ -183,7 +193,7 @@ test.describe("usage modal", () => {
 
     const group = page.getByTestId(`usage-host-${serverId}`);
     await expect(group.getByText("Alpha plan", { exact: true })).toBeVisible({ timeout: 10_000 });
-    await expect(hostFilter(page)).toHaveCount(0);
+    await expect(page.getByTestId("usage-modal-host")).toHaveCount(0);
     await qaScreenshot(page, "usage-modal-one-host");
     await expect(group.getByText("31% used")).toBeVisible();
     await expect(group.getByText("Beta plan", { exact: true })).toBeVisible();
@@ -200,15 +210,61 @@ test.describe("usage modal", () => {
     }) => {
       const usage = await installReversedUsageRefresh(page);
       await openUsageSummaryAtWidth(page, width);
-      await expectUsageProviderOrder(page, ["31% Weekly", "12% Weekly"]);
+      // Reports arrive opencode first; cards and the summary stay alphabetical.
+      await expectUsageProviderOrder(page, ["12% Weekly", "31% Weekly"]);
       await qaScreenshot(page, `usage-order-${width}-before-refresh`);
 
       await refreshUsageAndWaitForReports(page, usage);
-      await expectUsageProviderOrder(page, ["41% Weekly", "22% Weekly"]);
+      await expectUsageProviderOrder(page, ["22% Weekly", "41% Weekly"]);
       await qaScreenshot(page, `usage-order-${width}-after-refresh`);
     });
   }
 
+  test("keeps a card turned off and a dragged order after a reload", async ({ page }) => {
+    test.setTimeout(120_000);
+    await installUsageReportsFixture(page, {
+      lists: [
+        [
+          accountReport("beta", "work", 12),
+          weeklyReport("alpha", 31),
+          accountReport("beta", "home", 20),
+        ],
+      ],
+    });
+    await gotoAppShell(page);
+    // Three windows leave no room for labels in the summary, so it reads percents.
+    await expectPinnedUsage(page, ["31%", "20%", "12%"]);
+    await openUsageFromItem(page);
+    await expectUsageCardOrder(page, ["alpha:a", "beta:home", "beta:work"]);
+
+    // Without the pointer over the card, keyboard focus on its handle shows the handle.
+    await page.mouse.move(0, 0);
+    const alphaHandle = page
+      .getByTestId("usage-report-alpha:a")
+      .getByRole("button", { name: "Reorder alpha plan", exact: true });
+    await expect(alphaHandle).toHaveCSS("opacity", "0");
+    await alphaHandle.focus();
+    await expect(alphaHandle).toHaveCSS("opacity", "1");
+    await alphaHandle.blur();
+
+    // The off card collapses to its header, which still names the account.
+    await setUsageCardOn(page, "beta plan (work)", false);
+    const work = page.getByTestId("usage-report-beta:work");
+    await expect(work.getByText("12% used")).toHaveCount(0);
+    await expect(work.getByText("work", { exact: true })).toBeVisible();
+    await expectPinnedUsage(page, ["31% Weekly", "20% Weekly"]);
+
+    await dragUsageCardAbove(page, "beta:home", "alpha:a");
+    await expectUsageCardOrder(page, ["beta:home", "alpha:a", "beta:work"]);
+    await expectPinnedUsage(page, ["20% Weekly", "31% Weekly"]);
+
+    await page.reload();
+    await expectPinnedUsage(page, ["20% Weekly", "31% Weekly"]);
+    await openUsageFromItem(page);
+    await expectUsageCardOrder(page, ["beta:home", "alpha:a", "beta:work"]);
+    await expect(page.getByTestId("usage-report-beta:work").getByText("12% used")).toHaveCount(0);
+  });
+
   test("refreshes one report from its card", async ({ page }) => {
     test.setTimeout(120_000);
     const serverId = getServerId();
@@ -320,9 +376,11 @@ test.describe("usage modal", () => {
     );
     try {
       await installUsageReportsFixture(page, { lists: [[weeklyReport("alpha", 31)]] });
+      // The second host's reports wait until the test lets them through, like a slow host.
+      const secondaryReports = gate();
       await installUsageReportsFixture(page, {
         port: secondary.port,
-        lists: [[weeklyReport("beta", 12)]],
+        lists: [{ stream: [secondaryReports.promise, weeklyReport("beta", 12)] }],
       });
       await gotoAppShell(page);
       await addConnectedHostAndReload(page, {
@@ -336,12 +394,15 @@ test.describe("usage modal", () => {
       await openUsageFromItem(page);
       await expect(page.getByTestId(`usage-host-${primaryServerId}`)).toBeVisible();
 
-      await hostFilter(page).click();
-      await page.getByTestId(`usage-host-filter-item-${secondary.serverId}`).click();
-      await expect(
-        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12% used"),
-      ).toBeVisible({ timeout: 30_000 });
-      await expect(hostFilter(page)).toContainText("Secondary box");
+      await expect(usageModalHost(page)).toHaveText("localhost");
+      await pickUsageHost(page, secondary.serverId);
+      // Until its reports arrive, the picked host loads; it never shows the first host's cards.
+      const secondaryBody = page.getByTestId(`usage-host-${secondary.serverId}`);
+      await expect(secondaryBody.getByText("Loading usage...")).toBeVisible();
+      await expect(page.getByTestId("usage-modal-body").getByText("31% used")).toHaveCount(0);
+      await expect(usageModalHost(page)).toHaveText("Secondary box");
+      secondaryReports.open();
+      await expect(secondaryBody.getByText("12% used")).toBeVisible({ timeout: 30_000 });
       await qaScreenshot(page, "usage-modal-picked-host");
       await expectPinnedUsage(page, ["12% Weekly"]);
 
@@ -360,6 +421,51 @@ test.describe("usage modal", () => {
       await secondary.close().catch(() => undefined);
     }
   });
+
+  test("on a phone, picking a host in Settings keeps Usage open on that host", async ({ page }) => {
+    test.setTimeout(420_000);
+    const longName = "build-box-eu-west-gpu-runner-02.internal";
+    const secondary = await startIsolatedHostDaemon(
+      `srv_usage_${randomUUID().replaceAll("-", "").slice(0, 12)}`,
+    );
+    try {
+      await installUsageReportsFixture(page, { lists: [[weeklyReport("alpha", 31)]] });
+      await installUsageReportsFixture(page, {
+        port: secondary.port,
+        lists: [[weeklyReport("beta", 12)]],
+      });
+      await page.setViewportSize({ width: 375, height: 812 });
+      await gotoAppShell(page);
+      await addConnectedHostAndReload(page, {
+        serverId: secondary.serverId,
+        label: longName,
+        port: secondary.port,
+      });
+      await openCompactSidebar(page);
+      await openUsageFromItem(page);
+
+      await pickUsageHost(page, secondary.serverId);
+
+      // The sheet stays up once Settings has closed over it, showing the picked host's cards.
+      await expect(
+        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12% used"),
+      ).toBeVisible({ timeout: 30_000 });
+      await expect(usageModalHost(page)).toHaveText(longName);
+      // The long name truncates under the title; the title itself reads in full.
+      const title = page.locator('[data-testid="usage-modal-title"]:visible');
+      await expect(title).toHaveText("Usage");
+      expect(await title.evaluate((element) => element.scrollWidth <= element.clientWidth)).toBe(
+        true,
+      );
+      const host = usageModalHost(page);
+      expect(await host.evaluate((element) => element.scrollWidth > element.clientWidth)).toBe(
+        true,
+      );
+      await qaScreenshot(page, "usage-phone-picked-long-host");
+    } finally {
+      await secondary.close().catch(() => undefined);
+    }
+  });
 });
 
 const loginWindows: UsageReportEntry["report"] = {

packages/app/e2e/browser/usage-sidebar-item.spec.ts

@@ -318,10 +318,11 @@ test.describe("Usage item", () => {
 
     await test.step("pinning Claude 5-hour and Codex weekly shows both in the Usage item", async () => {
       await expect(screen.getByText("Claude", { exact: true })).toBeVisible({ timeout: 10_000 });
-      // One host: no host filter, as on History.
-      await expect(page.locator('[data-testid="usage-host-filter-trigger"]:visible')).toHaveCount(
-        0,
-      );
+      // One host: Settings has no Host row, and the title no host under it.
+      await expect(page.getByTestId("usage-modal-host")).toHaveCount(0);
+      await openUsageOptions(page);
+      await expect(page.getByTestId("usage-options-host")).toHaveCount(0);
+      await closeUsageOptions(page);
       await togglePin(screen, "Claude", "Weekly");
       await expectPinnedUsage(page, ["31% 5h", "7% 5h", "12% wk"]);
       await expect(pinRow(screen, "Claude", "Session")).toBeChecked();

packages/app/e2e/browser/workspace-archive-undo.spec.ts

@@ -14,6 +14,7 @@ import { connectSeedClient } from "../support/helpers/seed-client";
 import { createTempGitRepo } from "../support/helpers/workspace";
 import { getWorkspaceTabTestIds } from "../support/helpers/workspace-tabs";
 import {
+  archivedToast,
   archiveFromRowButton,
   createGatedTeardown,
   expectDirectoryPresence,
@@ -25,6 +26,7 @@ import {
   resizeSidebarToMinimum,
   rowArchiveButton,
   rowKebab,
+  scrollSidebarListToEnd,
   undoButton,
   workspaceRow,
   workspaceTitleWidth,
@@ -119,6 +121,41 @@ test.describe("Workspace archive undo", () => {
     expect(shortcutBox.x - (labelBox.x + labelBox.width)).toBeLessThanOrEqual(8.5);
   });
 
+  test("a long list ends just below its last row, and the toast over it moves no row", async ({
+    page,
+  }) => {
+    await page.clock.install({ time: Date.now() });
+    const fillers: Array<{ path: string; cleanup: () => Promise<void> }> = [];
+    const fillerProjectIds: string[] = [];
+    try {
+      for (let index = 0; index < 10; index += 1) {
+        const repo = await createTempGitRepo(`archive-toast-filler-${index}-`);
+        fillers.push(repo);
+        fillerProjectIds.push((await openProjectViaDaemon(client, repo.path)).projectId);
+      }
+      const worktree = await seedWorktree(page, "archive-toast-long-list");
+
+      const resting = await scrollSidebarListToEnd(page);
+      expect(resting.listBottom - resting.rowBottoms.at(-1)!).toBeLessThan(resting.rowHeight);
+
+      await archiveFromRowButton(page, worktree.workspaceId);
+      await page.mouse.move(0, 0);
+      const withToast = await scrollSidebarListToEnd(page);
+      const toastBox = await archivedToast(page).boundingBox();
+      if (!toastBox) throw new Error("Toast is not laid out");
+      expect(toastBox.y + toastBox.height).toBeLessThanOrEqual(withToast.listBottom);
+
+      await outlastUndoWindow(page);
+      await expect(archivedToast(page)).toHaveCount(0);
+      expect(await scrollSidebarListToEnd(page)).toEqual(withToast);
+    } finally {
+      for (const projectId of fillerProjectIds) {
+        await client.removeProject(projectId).catch(() => undefined);
+      }
+      for (const repo of fillers) await repo.cleanup().catch(() => undefined);
+    }
+  });
+
   test("an archive that fails after the sidebar was replaced still shows its error", async ({
     page,
   }) => {

packages/app/e2e/browser/worktree-archive-risk-warning.spec.ts

@@ -5,27 +5,34 @@ import path from "node:path";
 import type { Dialog, Page } from "@playwright/test";
 import { expect, test } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
+import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
 import {
   archiveWorkspaceFromDaemon,
   connectNewWorkspaceDaemonClient,
   createWorktreeViaDaemon,
   openProjectViaDaemon,
 } from "../support/helpers/new-workspace";
+import { expectAppRoute } from "../support/helpers/route-assertions";
 import { getServerId } from "../support/helpers/server-id";
 import {
   clickArchiveWorkspaceMenuItem,
   expectWorkspaceAbsentFromSidebar,
 } from "../support/helpers/sidebar";
 import { createTempGitRepo } from "../support/helpers/workspace";
+import {
+  rowArchiveButton,
+  undoButton,
+  workspaceRow,
+} from "../support/helpers/workspace-archive-undo";
 import {
   waitForSidebarHydration,
   waitForWorkspaceInSidebar,
 } from "../support/helpers/workspace-ui";
+import { buildHostWorkspaceRoute } from "@/utils/host-routes";
 
-async function seedRiskyWorktree(
-  client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>,
-  worktreeDirectory: string,
-): Promise<void> {
+type DaemonClient = Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
+
+async function seedRiskyWorktree(client: DaemonClient, worktreeDirectory: string): Promise<void> {
   // The daemon only reports unpushed commits when the branch has a configured
   // upstream (aheadOfOrigin is computed against `branch.<name>.merge`). Push the
   // worktree branch at its current head first so it tracks origin with 0 ahead,
@@ -55,35 +62,189 @@ async function seedRiskyWorktree(
   const dirtyFile = path.join(worktreeDirectory, "DIRTY.md");
   await writeFile(dirtyFile, "# dirty\n");
 
-  const refreshed = await client.checkoutRefresh(worktreeDirectory);
+  await refreshCheckout(client, worktreeDirectory);
+}
+
+async function refreshCheckout(client: DaemonClient, directory: string): Promise<void> {
+  const refreshed = await client.checkoutRefresh(directory);
   if (!refreshed.success) {
-    throw new Error(`Failed to refresh checkout for ${worktreeDirectory}`);
+    throw new Error(`Failed to refresh checkout for ${directory}`);
   }
 }
 
-// The archive confirmation is a synchronous web `window.confirm()`. The click that
-// opens it does not resolve until the dialog is answered, so the handler must
-// accept/dismiss inline — awaiting the dialog only *after* the click deadlocks, as
-// the click waits for an answer that is gated behind that same click.
-async function clickArchiveAndAnswerWarning(
+// The archive confirmation is a synchronous web `window.confirm()` that opens once the app has
+// read the worktree's git state from the host. Wait for the dialog itself: on web the click does
+// not resolve until it is answered, so answer it from the event.
+async function answerArchiveWarning(
   page: Page,
-  workspaceId: string,
   answer: "accept" | "dismiss",
+  openArchive: () => Promise<void>,
 ): Promise<Dialog> {
-  let warning: Dialog | undefined;
-  page.once("dialog", (dialog) => {
-    warning = dialog;
-    void (answer === "accept" ? dialog.accept() : dialog.dismiss());
+  const warning = page.waitForEvent("dialog", { timeout: 10_000 }).then(async (dialog) => {
+    await (answer === "accept" ? dialog.accept() : dialog.dismiss());
+    return dialog;
   });
-  await clickArchiveWorkspaceMenuItem(page, workspaceId);
-  if (!warning) {
-    throw new Error("Expected an archive confirmation dialog, but none was shown.");
+  await openArchive();
+  return await warning;
+}
+
+// A clean Paseo worktree's primary git action in the workspace header is Archive.
+function gitActionsArchiveButton(page: Page) {
+  return page.getByTestId("changes-primary-cta").and(page.getByLabel("Archive workspace"));
+}
+
+async function clickRowArchiveButton(page: Page, workspaceId: string): Promise<void> {
+  await workspaceRow(page, workspaceId).hover();
+  await rowArchiveButton(page, workspaceId).click();
+}
+
+interface SessionEnvelope {
+  type?: unknown;
+  message?: {
+    type?: unknown;
+    workspaceId?: unknown;
+    cwd?: unknown;
+    payload?: Record<string, unknown>;
+  };
+}
+
+function parseSessionEnvelope(message: string): SessionEnvelope | null {
+  try {
+    return JSON.parse(message) as SessionEnvelope;
+  } catch {
+    return null;
   }
-  return warning;
+}
+
+function removeGitStatusFromDescriptors(value: unknown, workspaceId: string): number {
+  if (Array.isArray(value)) {
+    return value.reduce<number>(
+      (count, item) => count + removeGitStatusFromDescriptors(item, workspaceId),
+      0,
+    );
+  }
+  if (!value || typeof value !== "object") return 0;
+  const record = value as Record<string, unknown>;
+  let count = 0;
+  if (record.id === workspaceId && "workspaceDirectory" in record) {
+    delete record.gitRuntime;
+    record.diffStat = null;
+    count += 1;
+  }
+  for (const child of Object.values(record)) {
+    count += removeGitStatusFromDescriptors(child, workspaceId);
+  }
+  return count;
+}
+
+/**
+ * Relays the app's connection to the daemon. Every workspace descriptor for `workspaceId` reaches
+ * the app without git status, as the host sends it before its first checkout snapshot of the
+ * worktree, so the sidebar row has nothing cached to warn from. `failCheckoutStatusFor` turns the
+ * host's checkout status answer for that directory into a git error.
+ */
+async function relayDaemon(
+  page: Page,
+  input: { workspaceId: string; failCheckoutStatusFor?: string },
+) {
+  let descriptorRewrites = 0;
+  let archiveRequests = 0;
+  await page.routeWebSocket(daemonWsRoutePattern(), (browser) => {
+    const server = browser.connectToServer();
+    browser.onMessage((message) => {
+      if (typeof message === "string") {
+        const request = parseSessionEnvelope(message)?.message;
+        if (
+          request?.type === "archive_workspace_request" &&
+          request.workspaceId === input.workspaceId
+        ) {
+          archiveRequests += 1;
+        }
+      }
+      server.send(message);
+    });
+    server.onMessage((message) => {
+      if (typeof message !== "string") {
+        browser.send(message);
+        return;
+      }
+      const envelope = parseSessionEnvelope(message);
+      const response = envelope?.message;
+      if (
+        input.failCheckoutStatusFor &&
+        response?.type === "checkout_status_response" &&
+        response.payload?.cwd === input.failCheckoutStatusFor
+      ) {
+        response.payload = {
+          ...response.payload,
+          isGit: false,
+          isPaseoOwnedWorktree: false,
+          repoRoot: null,
+          currentBranch: null,
+          isDirty: null,
+          baseRef: null,
+          aheadBehind: null,
+          aheadOfOrigin: null,
+          behindOfOrigin: null,
+          hasRemote: false,
+          remoteUrl: null,
+          error: { code: "UNKNOWN", message: "git status failed" },
+        };
+        browser.send(JSON.stringify(envelope));
+        return;
+      }
+      if (!envelope || !message.includes(input.workspaceId)) {
+        browser.send(message);
+        return;
+      }
+      descriptorRewrites += removeGitStatusFromDescriptors(envelope, input.workspaceId);
+      browser.send(JSON.stringify(envelope));
+    });
+  });
+  return {
+    descriptorRewrites: () => descriptorRewrites,
+    archiveRequests: () => archiveRequests,
+  };
+}
+
+/**
+ * Holds the app's next checkout status request for `directory` once armed, so a test can act
+ * while the archive waits for the host's answer.
+ */
+async function holdCheckoutStatusRequest(page: Page, directory: string) {
+  let armed = false;
+  let held: (() => void) | null = null;
+  await page.routeWebSocket(daemonWsRoutePattern(), (browser) => {
+    const server = browser.connectToServer();
+    browser.onMessage((message) => {
+      const request = typeof message === "string" ? parseSessionEnvelope(message)?.message : null;
+      if (
+        armed &&
+        !held &&
+        request?.type === "checkout_status_request" &&
+        request.cwd === directory
+      ) {
+        held = () => server.send(message);
+        return;
+      }
+      server.send(message);
+    });
+    server.onMessage((message) => browser.send(message));
+  });
+  return {
+    arm: () => {
+      armed = true;
+    },
+    waitForHeld: () => expect.poll(() => held !== null).toBe(true),
+    release: () => {
+      if (!held) throw new Error("No checkout status request is held");
+      held();
+    },
+  };
 }
 
 test.describe("Workspace archive risk warning for worktree backing", () => {
-  let client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
+  let client: DaemonClient;
   let tempRepo: { path: string; cleanup: () => Promise<void> };
   const createdWorktreeDirectories = new Set<string>();
 
@@ -103,36 +264,53 @@ test.describe("Workspace archive risk warning for worktree backing", () => {
     await tempRepo?.cleanup().catch(() => undefined);
   });
 
-  test("a risky workspace archive is gated by confirmation and removes its worktree after acceptance", async ({
-    page,
-  }) => {
-    const serverId = getServerId();
-    await openProjectViaDaemon(client, tempRepo.path);
+  async function createWorktree(slug: string) {
+    const project = await openProjectViaDaemon(client, tempRepo.path);
     const worktree = await createWorktreeViaDaemon(client, {
       cwd: tempRepo.path,
-      slug: `archive-risk-${Date.now()}`,
+      slug: `${slug}-${Date.now()}`,
     });
     createdWorktreeDirectories.add(worktree.workspaceDirectory);
     expect(existsSync(worktree.workspaceDirectory)).toBe(true);
+    return { ...worktree, project };
+  }
 
-    await seedRiskyWorktree(client, worktree.workspaceDirectory);
-
+  async function openSidebarRow(page: Page, workspaceId: string): Promise<void> {
     await gotoAppShell(page);
     await waitForSidebarHydration(page);
-    await waitForWorkspaceInSidebar(page, { serverId, workspaceId: worktree.workspaceId });
+    await waitForWorkspaceInSidebar(page, { serverId: getServerId(), workspaceId });
+  }
 
-    const firstWarning = await clickArchiveAndAnswerWarning(page, worktree.workspaceId, "dismiss");
+  async function expectWorktreeKept(page: Page, worktree: { workspaceId: string }) {
+    await expect(workspaceRow(page, worktree.workspaceId)).toBeVisible({ timeout: 10_000 });
+  }
+
+  async function hostListsWorkspace(workspaceId: string): Promise<boolean> {
+    const { entries } = await client.fetchWorkspaces();
+    return entries.some((entry) => entry.id === workspaceId);
+  }
+
+  test("a risky workspace archive is gated by confirmation and removes its worktree after acceptance", async ({
+    page,
+  }) => {
+    const worktree = await createWorktree("archive-risk");
+    await seedRiskyWorktree(client, worktree.workspaceDirectory);
+    await openSidebarRow(page, worktree.workspaceId);
+
+    const firstWarning = await answerArchiveWarning(page, "dismiss", () =>
+      clickArchiveWorkspaceMenuItem(page, worktree.workspaceId),
+    );
     expect(firstWarning.type()).toBe("confirm");
     expect(firstWarning.message()).toContain(`Archive "${worktree.workspaceName}"?`);
     expect(firstWarning.message()).toContain("Uncommitted changes");
     expect(firstWarning.message()).toContain("1 unpushed commit");
 
-    await expect(
-      page.getByTestId(`sidebar-workspace-row-${serverId}:${worktree.workspaceId}`),
-    ).toBeVisible({ timeout: 10_000 });
+    await expectWorktreeKept(page, worktree);
     expect(existsSync(worktree.workspaceDirectory)).toBe(true);
 
-    const secondWarning = await clickArchiveAndAnswerWarning(page, worktree.workspaceId, "accept");
+    const secondWarning = await answerArchiveWarning(page, "accept", () =>
+      clickArchiveWorkspaceMenuItem(page, worktree.workspaceId),
+    );
     expect(secondWarning.message()).toContain("Uncommitted changes");
     expect(secondWarning.message()).toContain("1 unpushed commit");
 
@@ -143,4 +321,128 @@ test.describe("Workspace archive risk warning for worktree backing", () => {
 
     createdWorktreeDirectories.delete(worktree.workspaceDirectory);
   });
+
+  test("the row's archive button warns from the host's git state while the row has none, and Cancel keeps the worktree", async ({
+    page,
+  }) => {
+    const worktree = await createWorktree("archive-risk-uncached");
+    await seedRiskyWorktree(client, worktree.workspaceDirectory);
+    const relay = await relayDaemon(page, { workspaceId: worktree.workspaceId });
+    await openSidebarRow(page, worktree.workspaceId);
+    expect(relay.descriptorRewrites()).toBeGreaterThan(0);
+
+    const warning = await answerArchiveWarning(page, "dismiss", () =>
+      clickRowArchiveButton(page, worktree.workspaceId),
+    );
+    expect(warning.message()).toContain(`Archive "${worktree.workspaceName}"?`);
+    expect(warning.message()).toContain("Uncommitted changes");
+    expect(warning.message()).toContain("1 unpushed commit");
+
+    await expectWorktreeKept(page, worktree);
+    expect(relay.archiveRequests()).toBe(0);
+    expect(existsSync(path.join(worktree.workspaceDirectory, "DIRTY.md"))).toBe(true);
+  });
+
+  test("a worktree holding only new files warns when the repository hides untracked files", async ({
+    page,
+  }) => {
+    execSync("git config status.showUntrackedFiles no", { cwd: tempRepo.path, stdio: "ignore" });
+    const worktree = await createWorktree("archive-risk-untracked");
+    await writeFile(path.join(worktree.workspaceDirectory, "NEW.md"), "# not yet added\n");
+    await refreshCheckout(client, worktree.workspaceDirectory);
+    await openSidebarRow(page, worktree.workspaceId);
+
+    const warning = await answerArchiveWarning(page, "dismiss", () =>
+      clickRowArchiveButton(page, worktree.workspaceId),
+    );
+    expect(warning.message()).toContain(`Archive "${worktree.workspaceName}"?`);
+    expect(warning.message()).toContain("Uncommitted changes");
+
+    await expectWorktreeKept(page, worktree);
+    expect(existsSync(path.join(worktree.workspaceDirectory, "NEW.md"))).toBe(true);
+  });
+
+  test("a failed git read shows its error and keeps the worktree", async ({ page }) => {
+    const worktree = await createWorktree("archive-risk-read-failure");
+    await seedRiskyWorktree(client, worktree.workspaceDirectory);
+    const relay = await relayDaemon(page, {
+      workspaceId: worktree.workspaceId,
+      failCheckoutStatusFor: worktree.workspaceDirectory,
+    });
+    await openSidebarRow(page, worktree.workspaceId);
+
+    await clickRowArchiveButton(page, worktree.workspaceId);
+
+    await expect(page.getByTestId("app-toast-message")).toHaveText("git status failed");
+    await expectWorktreeKept(page, worktree);
+    expect(relay.archiveRequests()).toBe(0);
+    expect(existsSync(worktree.workspaceDirectory)).toBe(true);
+  });
+
+  // Archives the open worktree with `startArchive`, opens the project's main workspace while the
+  // host's checkout status answer is held, then lets the answer through.
+  async function archiveWhileOpeningAnotherWorkspace(
+    page: Page,
+    slug: string,
+    startArchive: (worktree: { workspaceId: string }) => Promise<void>,
+  ): Promise<string> {
+    const serverId = getServerId();
+    const worktree = await createWorktree(slug);
+    const statusRequest = await holdCheckoutStatusRequest(page, worktree.workspaceDirectory);
+    await openSidebarRow(page, worktree.workspaceId);
+    await workspaceRow(page, worktree.workspaceId).click();
+    await expectAppRoute(page, buildHostWorkspaceRoute(serverId, worktree.workspaceId));
+
+    statusRequest.arm();
+    await startArchive(worktree);
+    await statusRequest.waitForHeld();
+    await workspaceRow(page, worktree.project.workspaceId).click();
+    const openedRoute = buildHostWorkspaceRoute(serverId, worktree.project.workspaceId);
+    await expectAppRoute(page, openedRoute);
+
+    statusRequest.release();
+    await expect(undoButton(page)).toBeVisible();
+    // The redirect runs before the archive request, so once the host has archived the worktree
+    // any redirect has already happened.
+    await expect
+      .poll(() => hostListsWorkspace(worktree.workspaceId), { timeout: 30_000 })
+      .toBe(false);
+    return openedRoute;
+  }
+
+  test("opening another workspace while the host answers keeps it open after a row archive", async ({
+    page,
+  }) => {
+    const openedRoute = await archiveWhileOpeningAnotherWorkspace(
+      page,
+      "archive-risk-switch-row",
+      (worktree) => clickRowArchiveButton(page, worktree.workspaceId),
+    );
+    await expectAppRoute(page, openedRoute);
+  });
+
+  test("opening another workspace while the host answers keeps it open after a git actions archive", async ({
+    page,
+  }) => {
+    const openedRoute = await archiveWhileOpeningAnotherWorkspace(
+      page,
+      "archive-risk-switch-git",
+      () => gitActionsArchiveButton(page).click(),
+    );
+    await expectAppRoute(page, openedRoute);
+  });
+
+  test("archiving the open worktree from its git actions leaves it for a new workspace", async ({
+    page,
+  }) => {
+    const worktree = await createWorktree("archive-risk-git-redirect");
+    await openSidebarRow(page, worktree.workspaceId);
+    await workspaceRow(page, worktree.workspaceId).click();
+    await expectAppRoute(page, buildHostWorkspaceRoute(getServerId(), worktree.workspaceId));
+
+    await gitActionsArchiveButton(page).click();
+
+    await expect.poll(() => new URL(page.url()).pathname).toBe("/new");
+    await expectWorkspaceAbsentFromSidebar(page, worktree.workspaceId);
+  });
 });

packages/app/e2e/mobile/usage-drag/README.md

@@ -0,0 +1,27 @@
+# Android Usage drop regressions
+
+Use a device you own and fixed reports from an isolated daemon. Keep recordings in `.artifacts/`. Do not upload recordings containing account details.
+
+## Same-slot drop
+
+Open Usage with two cards that fit without scrolling. Run:
+
+```sh
+ANDROID_SERIAL=emulator-5580 node packages/app/e2e/mobile/usage-drag/android.mjs
+```
+
+Set `PASEO_DEVICE_SESSION` to reuse your Agent Device session. The test holds the first handle, moves within its slot, drops it, then swipes the sheet body. It asserts sheet movement while the finger is still down: after release, the sheet can snap back to its starting position.
+
+## Old-order frame
+
+Record a drop with Android `screenrecord`. Include the original order, the held arrangement, the release, and at least five seconds after release. Take a reference screenshot before recording. Use fixed labels that stay visible throughout the drop.
+
+Create a JSON map of label names to screenshot rectangles `[x, y, width, height]`, in physical pixels. Crop each label tightly, without changing text or the pointer. Install `opencv-python-headless` in a local virtual environment under `.artifacts/`, then run:
+
+```sh
+.artifacts/frames-venv/bin/python packages/app/e2e/mobile/usage-drag/frames.py \
+  --reference .artifacts/before.png --labels .artifacts/labels.json \
+  .artifacts/drop-up.mp4 .artifacts/drop-down.mp4
+```
+
+The check requires recognized labels in the first and last frames and a changed final order. After every label first reaches its final slot, it fails on any frame showing all original slots again. It prints the offending frame numbers for each recording. This exercises the Android compositor; a JavaScript render test cannot establish which intermediate commit reached the screen.

packages/app/e2e/mobile/usage-drag/android.mjs

@@ -0,0 +1,71 @@
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { mkdirSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { setTimeout } from "node:timers/promises";
+
+// Open Usage with a fixture whose cards fit without scrolling before running.
+// A same-slot drop must release the list's recognizer so a body swipe moves the sheet.
+const serial = process.env.ANDROID_SERIAL;
+assert.ok(serial, "Set ANDROID_SERIAL to the device owned by this test");
+const session = process.env.PASEO_DEVICE_SESSION ?? "usage-drag-regression";
+const artifacts = resolve(".artifacts/usage-drag-regression");
+mkdirSync(artifacts, { recursive: true });
+function ad(...args) {
+  return execFileSync(
+    "agent-device",
+    [...args, "--platform", "android", "--serial", serial, "--session", session],
+    { encoding: "utf8", timeout: 30_000 },
+  );
+}
+function adb(...args) {
+  return execFileSync("adb", ["-s", serial, ...args], { timeout: 30_000 });
+}
+function snapshot() {
+  return JSON.parse(ad("snapshot", "--json")).data.nodes;
+}
+function touch(kind, x, y) {
+  adb("shell", "input", "motionevent", kind, String(Math.round(x)), String(Math.round(y)));
+}
+try {
+  ad("open", process.env.PASEO_MOBILE_APP_ID ?? "sh.paseo.debug");
+  const nodes = snapshot();
+  writeFileSync(resolve(artifacts, "before.json"), JSON.stringify(nodes));
+  const handle = nodes.find((node) => node.identifier === "usage-card-drag-handle");
+  const list = nodes.find((node) => node.identifier === "usage-list");
+  assert.ok(handle?.rect && list?.rect, "Open Usage with a visible card handle");
+  const x = handle.rect.x + handle.rect.width / 2;
+  const y = handle.rect.y + handle.rect.height / 2;
+  touch("DOWN", x, y);
+  await setTimeout(600);
+  touch("MOVE", x, y + 60);
+  await setTimeout(200);
+  touch("MOVE", x, y + 90);
+  touch("MOVE", x, y + 60);
+  ad("screenshot", resolve(artifacts, "dragging.png"));
+  touch("UP", x, y + 60);
+  await setTimeout(2000);
+  ad("screenshot", resolve(artifacts, "dropped.png"));
+  const swipeX = list.rect.x + list.rect.width / 2;
+  touch("DOWN", swipeX, y + 80);
+  for (let offset = 90; offset <= 500; offset += 10) {
+    touch("MOVE", swipeX, y + offset);
+  }
+  const during = snapshot();
+  writeFileSync(resolve(artifacts, "during.json"), JSON.stringify(during));
+  ad("screenshot", resolve(artifacts, "during.png"));
+  touch("UP", swipeX, y + 500);
+  await setTimeout(1500);
+  const after = snapshot();
+  writeFileSync(resolve(artifacts, "after.json"), JSON.stringify(after));
+  ad("screenshot", resolve(artifacts, "after.png"));
+  const beforeSheet = nodes.find((node) => node.label === "Bottom sheet handle");
+  const afterSheet = during.find((node) => node.label === "Bottom sheet handle");
+  assert.ok(beforeSheet?.rect, "Usage must start as a sheet");
+  assert.ok(
+    !afterSheet || afterSheet.rect.y > beforeSheet.rect.y + 50,
+    "A body swipe after a same-slot drop must move the sheet",
+  );
+} finally {
+  ad("close");
+}

packages/app/e2e/mobile/usage-drag/frames.py

@@ -0,0 +1,59 @@
+"""Check native drop recordings against visible row labels (requires opencv-python-headless).
+
+Supply a before screenshot and a JSON map of label names to [x, y, width, height].
+A recording must start in the original order and end in a different order. Once
+all labels reach their final slots, any frame returning to the original slots fails.
+Keep the pointer clear of the labels and use fixed fixture data.
+"""
+import argparse
+import json
+from pathlib import Path
+
+import cv2
+
+parser = argparse.ArgumentParser(description=__doc__)
+parser.add_argument("--reference", required=True)
+parser.add_argument("--labels", required=True)
+parser.add_argument("--top", type=int, default=0)
+parser.add_argument("--bottom", type=int)
+parser.add_argument("videos", nargs="+")
+args = parser.parse_args()
+reference = cv2.imread(args.reference, cv2.IMREAD_GRAYSCALE)
+assert reference is not None, "Cannot read reference image"
+labels = json.loads(Path(args.labels).read_text())
+results = []
+for video in args.videos:
+    capture = cv2.VideoCapture(video)
+    frames = []
+    while True:
+        ok, image = capture.read()
+        if not ok:
+            break
+        gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
+        positions = {}
+        for label, (x, y, width, height) in labels.items():
+            template = reference[y:y + height, x:x + width]
+            matches = cv2.matchTemplate(gray[args.top:args.bottom, x:x + width], template, cv2.TM_CCOEFF_NORMED)
+            _, confidence, _, point = cv2.minMaxLoc(matches)
+            positions[label] = (point[1] + args.top, confidence)
+        frames.append(positions)
+    capture.release()
+    assert frames, f"No frames in {video}"
+    initial, final = frames[0], frames[-1]
+    assert all(confidence >= 0.95 for _, confidence in initial.values()), f"Unrecognized initial labels: {video}"
+    assert all(confidence >= 0.95 for _, confidence in final.values()), f"Unrecognized final labels: {video}"
+    assert sorted(initial, key=lambda key: initial[key][0]) != sorted(final, key=lambda key: final[key][0]), f"Drop did not reorder: {video}"
+
+    def matches_slots(frame, target):
+        return all(confidence >= 0.95 and abs(y - target[label][0]) <= 2
+                   for label, (y, confidence) in frame.items())
+
+    reached_final = False
+    wrong = []
+    for number, frame in enumerate(frames, start=1):
+        reached_final = reached_final or matches_slots(frame, final)
+        if reached_final and matches_slots(frame, initial):
+            wrong.append(number)
+    results.append({"recording": video, "oldOrderFrames": wrong, "count": len(wrong)})
+print(json.dumps(results, indent=2))
+raise SystemExit(1 if any(result["count"] for result in results) else 0)

packages/app/e2e/support/creation-fixtures.ts

@@ -1,6 +1,8 @@
-import { writeFile, rm, rename } from "node:fs/promises";
+import { mkdtemp, writeFile, rm, rename } from "node:fs/promises";
+import { tmpdir } from "node:os";
 import path from "node:path";
-import { copyPluginExample } from "./helpers/plugin-fixture";
+import type { Page } from "@playwright/test";
+import { copyPluginExample, pluginRequirements } from "./helpers/plugin-fixture";
 import { connectNewWorkspaceDaemonClient } from "./helpers/new-workspace";
 import { test as base } from "./fixtures";
 import {
@@ -14,6 +16,7 @@ import { delayBrowserAgentCreatedStatus } from "./helpers/new-workspace";
 export const test = base.extend<{
   startup: { release(): Promise<void>; fail(): Promise<void> };
   promptRejection: void;
+  composerMetadata: { set(patch: Record<string, string>): Promise<void> };
   creation: Awaited<ReturnType<typeof createCreationScenario>>;
   promptRetry: ReturnType<typeof createPromptRetryScenario>;
   agentRetries: Awaited<ReturnType<typeof retryNextAgentCreation>>;
@@ -98,6 +101,39 @@ export default function contribute(server) {
       await client.close();
     }
   },
+  composerMetadata: async ({ page }, provide) => {
+    const client = await connectNewWorkspaceDaemonClient();
+    const previous = await client.getDaemonConfig();
+    const directory = await mkdtemp(path.join(tmpdir(), "paseo-composer-metadata-"));
+    try {
+      await writeFile(
+        path.join(directory, "paseo-plugin.json"),
+        JSON.stringify({ id: "composer-metadata", requirements: pluginRequirements }),
+      );
+      await writeFile(
+        path.join(directory, "index.client.tsx"),
+        `import { useComposer } from "@getpaseo/plugin/client";
+
+function Holder() {
+  globalThis.metadataComposer = useComposer();
+  return null;
+}
+
+export default function contribute(client) {
+  client.addComposerItem({ id: "holder", Component: Holder });
+  return () => {};
+}`,
+      );
+      await client.patchDaemonConfig({ pluginsEnabled: true });
+      await client.installDirectoryPlugin(directory);
+      await provide({ set: (patch) => setComposerMetadata(page, patch) });
+    } finally {
+      await client.removePlugin("composer-metadata");
+      await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
+      await rm(directory, { recursive: true, force: true });
+      await client.close();
+    }
+  },
   creation: async ({ page }, provide) => {
     const creation = await createCreationScenario(page);
     try {
@@ -126,3 +162,15 @@ export default function contribute(server) {
     }
   },
 });
+
+type MetadataComposerGlobal = typeof globalThis & {
+  metadataComposer?: { setMetadata(patch: Record<string, string>): Promise<void> };
+};
+
+async function setComposerMetadata(page: Page, patch: Record<string, string>) {
+  await page.waitForFunction(() => (globalThis as MetadataComposerGlobal).metadataComposer);
+  await page.evaluate(
+    (value) => (globalThis as MetadataComposerGlobal).metadataComposer!.setMetadata(value),
+    patch,
+  );
+}

packages/app/e2e/support/helpers/agent-timeline-gate.ts

@@ -21,7 +21,6 @@ export interface OlderTimelinePagesGate {
   getRepeatedEntryCount(): number;
   getOwnedEntryCountContaining(text: string): number;
   releasePage(pageNumber: number): void;
-  waitForRequestCount(count: number): Promise<void>;
 }
 
 export interface DaemonHydrationGate {
@@ -371,15 +370,6 @@ export async function holdAgentOlderTimelinePages(
   const ownedEntries = new Map<string, string>();
   const releasedPages = new Set<number>();
   const delayedForwards = new Map<number, Array<() => void>>();
-  const requestWaiters = new Map<number, Array<() => void>>();
-
-  const resolveRequestWaiters = () => {
-    for (const [count, resolvers] of requestWaiters) {
-      if (requestCount < count) continue;
-      requestWaiters.delete(count);
-      for (const resolve of resolvers) resolve();
-    }
-  };
 
   const routePattern =
     daemonPort === undefined ? daemonWsRoutePattern() : wsRoutePatternForPort(String(daemonPort));
@@ -393,7 +383,6 @@ export async function holdAgentOlderTimelinePages(
         sessionMessage.direction === "before"
       ) {
         requestCount += 1;
-        resolveRequestWaiters();
       }
       server.send(message);
     });
@@ -439,14 +428,6 @@ export async function holdAgentOlderTimelinePages(
       for (const forward of delayedForwards.get(pageNumber) ?? []) forward();
       delayedForwards.delete(pageNumber);
     },
-    waitForRequestCount(count) {
-      if (requestCount >= count) return Promise.resolve();
-      return new Promise<void>((resolve) => {
-        const resolvers = requestWaiters.get(count) ?? [];
-        resolvers.push(resolve);
-        requestWaiters.set(count, resolvers);
-      });
-    },
   };
 }
 

packages/app/e2e/support/helpers/command-center-file-search.ts

@@ -26,7 +26,7 @@ const SURFACE_SELECTORS = {
   input: '[data-testid="command-center-input"]',
   fileSearchStatus: '[data-testid="command-center-file-search-status"]',
   results: '[data-testid="command-center-results"]',
-  scope: '[data-testid="command-center-files-scope"]',
+  tabs: '[data-testid="command-center-tabs"]',
   fileRow: '[data-testid^="command-center-file-row-"]',
   fileIcon: '[data-testid="command-center-file-icon"]',
   fileLine: '[data-testid="command-center-file-line"]',

packages/app/e2e/support/helpers/command-center-performance.ts

@@ -11,7 +11,7 @@ export async function seedSearchableCommandCenter() {
   });
   try {
     const agents = [];
-    for (let index = 0; index < 60; index += 1) {
+    for (let index = 0; index < 3; index += 1) {
       agents.push(
         await createMockIdleAgent(seed.client, {
           cwd: seed.repoPath,
@@ -49,11 +49,27 @@ export async function searchCommandCenter(panel: Locator, query: string) {
 }
 
 export async function warmCommandCenterRows(page: Page) {
-  // FlatList fills its overscan window in timed batches after the first visible frame.
-  await page.waitForTimeout(600);
-  await page.evaluate(() => {
-    globalThis.__PASEO_RENDER_PROFILE_REASONS__ = {};
-  });
+  // FlatList fills its overscan window in timed batches after the first visible frame,
+  // and a slow runner can still be mounting rows long after it. Start counting only
+  // once a quiet period passes with no row render.
+  await expect
+    .poll(() => page.evaluate(countRowRendersOverQuietPeriod), {
+      intervals: [0],
+      timeout: 15_000,
+    })
+    .toBe(0);
+}
+
+// Runs in the page: resets the render profile and counts row renders over two frames and 300ms.
+async function countRowRendersOverQuietPeriod() {
+  globalThis.__PASEO_RENDER_PROFILE_REASONS__ = {};
+  await new Promise<void>((resolve) =>
+    requestAnimationFrame(() => requestAnimationFrame(() => resolve())),
+  );
+  await new Promise((resolve) => setTimeout(resolve, 300));
+  return Object.keys(globalThis.__PASEO_RENDER_PROFILE_REASONS__ ?? {}).filter((id) =>
+    id.startsWith("CommandCenterResultRow:"),
+  ).length;
 }
 
 export async function expectOnlyCommandCenterRowRendered(page: Page, resultId: string) {
@@ -73,16 +89,17 @@ export async function expectOnlyCommandCenterRowRendered(page: Page, resultId: s
   expect(renders).toEqual({ [`CommandCenterResultRow:${resultId}`]: { render: 1 } });
 }
 
-export async function expectCommandCenterAgentWindow(panel: Locator, total: number) {
-  const rows = panel.locator(
-    '[data-testid^="command-center-agent-"]:not([data-testid="command-center-agent-subtitle"])',
-  );
-  const count = await rows.count();
+const WORKSPACE_ROWS =
+  '[data-testid^="command-center-workspace-"]:not([data-testid="command-center-workspace-subtitle"]):not([data-testid="command-center-workspace-agent"])';
+
+/** The list mounts a window of rows, not every match. */
+export async function expectCommandCenterWorkspaceWindow(panel: Locator, total: number) {
+  const count = await panel.locator(WORKSPACE_ROWS).count();
   expect(count).toBeGreaterThan(0);
   expect(count).toBeLessThan(total);
 }
 
-export async function scrollToOldestCommandCenterAgent(panel: Locator) {
+export async function scrollToOldestCommandCenterWorkspace(panel: Locator) {
   await panel.getByTestId("command-center-results").evaluate((element) => {
     element.scrollTop = element.scrollHeight;
     element.dispatchEvent(new Event("scroll"));

packages/app/e2e/support/helpers/command-center-scroll.ts

@@ -22,14 +22,9 @@ export async function observeCommandCenterScroll(page: Page): Promise<void> {
 
     const discoverPanel = new MutationObserver(() => {
       const panel = document.querySelector<HTMLElement>('[data-testid="command-center-panel"]');
-      const firstResult = panel?.querySelector<HTMLElement>('[role="button"]');
-      if (!panel || !firstResult) return;
-
-      let viewport = firstResult.parentElement;
-      while (viewport && viewport !== panel && viewport.scrollHeight <= viewport.clientHeight) {
-        viewport = viewport.parentElement;
-      }
-      if (!viewport || viewport === panel) return;
+      const viewport = panel?.querySelector<HTMLElement>('[data-testid="command-center-results"]');
+      const firstResult = viewport?.querySelector<HTMLElement>('[role="button"]');
+      if (!viewport || !firstResult) return;
 
       discoverPanel.disconnect();
       let frame = 0;
@@ -119,15 +114,8 @@ export async function expectVisibleKeyboardNavigationNotToScroll(
   for (let index = 0; index < 4; index += 1) await page.keyboard.press("ArrowDown");
 
   const scrollSamples = await panel
-    .getByRole("button")
-    .first()
-    .evaluate(async (firstResult) => {
-      let viewport = firstResult.parentElement;
-      while (viewport && viewport.scrollHeight <= viewport.clientHeight) {
-        viewport = viewport.parentElement;
-      }
-      if (!viewport) throw new Error("Could not find the command center scroll viewport");
-
+    .getByTestId("command-center-results")
+    .evaluate(async (viewport) => {
       const samples: number[] = [];
       for (let frame = 0; frame < 20; frame += 1) {
         await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
@@ -139,7 +127,8 @@ export async function expectVisibleKeyboardNavigationNotToScroll(
   expect(Math.max(...scrollSamples)).toBe(0);
 }
 
-export async function expectWorkspaceResultsToBeLimitedUntilSearch(panel: Locator): Promise<void> {
+/** All leads with three recent workspaces; a query searches every workspace. */
+export async function expectRecentWorkspacesUntilSearch(panel: Locator): Promise<void> {
   const workspaces = panel.locator(
     '[data-testid^="command-center-workspace-"]:not([data-testid="command-center-workspace-subtitle"])',
   );
@@ -150,9 +139,11 @@ export async function expectWorkspaceResultsToBeLimitedUntilSearch(panel: Locato
       ),
     ).size;
 
-  await expect.poll(distinctWorkspaceCount).toBe(5);
+  await expect(panel.getByText("Recent workspaces", { exact: true })).toBeVisible();
+  await expect.poll(distinctWorkspaceCount).toBe(3);
 
   await panel.getByTestId("command-center-input").fill("Command Center Scroll");
+  await expect(panel.getByText("Recent workspaces", { exact: true })).toHaveCount(0);
   await expect.poll(distinctWorkspaceCount).toBe(9);
 }
 

packages/app/e2e/support/helpers/command-center.ts

@@ -1,5 +1,20 @@
 import { expect, type Locator, type Page } from "@playwright/test";
 
+export type CommandCenterTabName = "All" | "Workspaces" | "Files" | "Actions";
+
+const TAB_PLACEHOLDERS: Record<CommandCenterTabName, string> = {
+  All: "Search workspaces, files, and actions...",
+  Workspaces: "Search workspaces...",
+  Files: "Search files...",
+  Actions: "Search actions...",
+};
+
+/** Outside a workspace there are no files to search, so All does not offer them. */
+const TAB_PLACEHOLDERS_WITHOUT_WORKSPACE: Record<CommandCenterTabName, string> = {
+  ...TAB_PLACEHOLDERS,
+  All: "Search workspaces and actions...",
+};
+
 // Opens the command center / global search palette from the sidebar and returns its panel.
 export async function openCommandCenter(page: Page): Promise<Locator> {
   await page.getByTestId("sidebar-search").click();
@@ -12,3 +27,46 @@ export async function closeCommandCenter(page: Page): Promise<void> {
   await page.keyboard.press("Escape");
   await expect(page.getByTestId("command-center-panel")).not.toBeVisible();
 }
+
+function commandCenterTab(panel: Locator, name: CommandCenterTabName): Locator {
+  return panel.getByTestId("command-center-tabs").getByRole("button", { name, exact: true });
+}
+
+export async function selectCommandCenterTab(
+  panel: Locator,
+  name: CommandCenterTabName,
+  options: { workspaceOpen?: boolean } = {},
+): Promise<void> {
+  await commandCenterTab(panel, name).click();
+  await expectCommandCenterTab(panel, name, options);
+}
+
+/**
+ * The tab is selected and the search field asks for what that tab lists. Pass
+ * `{ workspaceOpen: false }` when the command center was opened outside a workspace.
+ */
+export async function expectCommandCenterTab(
+  panel: Locator,
+  name: CommandCenterTabName,
+  options: { workspaceOpen?: boolean } = {},
+): Promise<void> {
+  const placeholders =
+    options.workspaceOpen === false ? TAB_PLACEHOLDERS_WITHOUT_WORKSPACE : TAB_PLACEHOLDERS;
+  await expect(commandCenterTab(panel, name)).toHaveAttribute("aria-selected", "true");
+  await expect(panel.getByTestId("command-center-input")).toHaveAttribute(
+    "placeholder",
+    placeholders[name],
+  );
+}
+
+/** Exactly these tabs are offered, in this order. */
+export async function expectCommandCenterTabs(
+  panel: Locator,
+  names: readonly CommandCenterTabName[],
+): Promise<void> {
+  await expect(panel.getByTestId("command-center-tabs").getByRole("button")).toHaveText([...names]);
+}
+
+export function commandCenterSection(panel: Locator, title: string): Locator {
+  return panel.getByTestId("command-center-results").getByText(title, { exact: true });
+}

packages/app/e2e/support/helpers/creation.ts

@@ -258,6 +258,16 @@ export async function createCreationScenario(page: Page) {
         .filter(({ agent }) => agent.workspaceId === workspaceId)
         .map(({ agent }) => agent.id);
     },
+    async expectAgentMetadata(metadata: Record<string, unknown>) {
+      await expect
+        .poll(
+          async () =>
+            (await project.client.fetchAgents()).entries.find(
+              ({ agent }) => agent.workspaceId === workspaceId,
+            )?.agent.metadata,
+        )
+        .toEqual(metadata);
+    },
     async expectAgentTitle(title: string) {
       await expect
         .poll(

packages/app/e2e/support/helpers/directory-bootstrap-scenario.ts

@@ -33,8 +33,10 @@ async function createRunningMockAgent(
   return { id: agent.id, title };
 }
 
-async function openCommandCenter(page: Page): Promise<void> {
+// Agents are found through their workspace: the query names the agent, the row shows it.
+async function searchCommandCenter(page: Page, query: string): Promise<void> {
   await page.getByTestId("sidebar-search").click();
+  await page.getByTestId("command-center-input").fill(query);
 }
 
 export class DirectoryBootstrapScenario {
@@ -78,8 +80,10 @@ export class DirectoryBootstrapScenario {
     const workspaceLink = this.page.getByText(workspace.projectDisplayName, { exact: true });
     await expect(workspaceLink).toHaveCount(1);
     await expect(workspaceLink).toBeVisible();
-    await openCommandCenter(this.page);
-    const agentLink = this.page.getByText(agent.title, { exact: true });
+    await searchCommandCenter(this.page, agent.title);
+    const agentLink = this.page
+      .getByTestId("command-center-workspace-agent")
+      .getByText(agent.title, { exact: true });
     await expect(agentLink).toHaveCount(1);
     await expect(agentLink).toBeVisible();
     await this.page.keyboard.press("Escape");
@@ -111,8 +115,10 @@ export class DirectoryBootstrapScenario {
     const workspaceLink = this.page.getByText(workspace.projectDisplayName, { exact: true });
     await expect(workspaceLink).toHaveCount(1);
     await expect(workspaceLink).toBeVisible();
-    await openCommandCenter(this.page);
-    const agentLink = this.page.getByText(agent.title, { exact: true });
+    await searchCommandCenter(this.page, agent.title);
+    const agentLink = this.page
+      .getByTestId("command-center-workspace-agent")
+      .getByText(agent.title, { exact: true });
     await expect(agentLink).toHaveCount(1);
     await expect(agentLink).toBeVisible();
     await agentLink.click();

packages/app/e2e/support/helpers/new-workspace.ts

@@ -232,8 +232,11 @@ export async function expectNewWorkspaceControlsEnabled(page: Page): Promise<voi
   });
 }
 
-export async function openNewWorkspaceProjectPickerWithShortcut(page: Page): Promise<void> {
-  await page.keyboard.press("Control+P");
+export async function openNewWorkspaceProjectPickerWithShortcut(
+  page: Page,
+  shortcut = "Control+P",
+): Promise<void> {
+  await page.keyboard.press(shortcut);
 
   const searchInput = page.getByPlaceholder("Search projects");
   await expect(searchInput).toBeVisible({ timeout: 30_000 });

packages/app/e2e/support/helpers/seed-client.ts

@@ -131,6 +131,7 @@ export interface SeedDaemonClient {
         currentModeId: string | null;
         status: string;
         title?: string | null;
+        metadata?: Record<string, unknown>;
       };
     }>;
   }>;

packages/app/e2e/support/helpers/timeline-pagination.ts

@@ -427,7 +427,11 @@ export async function holdOlderHistoryPages(
   const loader = page.getByTestId("load-older-history-spinner");
   return {
     async expectRequestedPages(count) {
-      await gate.waitForRequestCount(count);
+      await expect
+        .poll(() => gate.getRequestCount(), {
+          message: `older history requests ${count} page(s)`,
+        })
+        .toBeGreaterThanOrEqual(count);
       expect(gate.getRequestCount()).toBe(count);
     },
     async expectSettledWithRequestedPages(count) {

packages/app/e2e/support/helpers/usage-sidebar-item.ts

@@ -147,6 +147,46 @@ export function usageModal(page: Page): Locator {
   return visible(page, "usage-modal-body");
 }
 
+/** The Usage modal's cards, top to bottom, by report id. */
+export async function expectUsageCardOrder(page: Page, reportIds: string[]): Promise<void> {
+  const cards = usageModal(page).locator('[data-testid^="usage-report-"]');
+  await expect(cards).toHaveCount(reportIds.length);
+  await expect
+    .poll(() =>
+      cards.evaluateAll((nodes) =>
+        nodes.map((node) => node.getAttribute("data-testid")?.slice("usage-report-".length)),
+      ),
+    )
+    .toEqual(reportIds);
+}
+
+/** Turns a card on or off from its header switch, named by its source and account. */
+export async function setUsageCardOn(page: Page, name: string, on: boolean): Promise<void> {
+  const cardSwitch = usageModal(page).getByRole("switch", { name: `Show ${name}`, exact: true });
+  await cardSwitch.click();
+  await expect(cardSwitch).toBeChecked({ checked: on });
+}
+
+/** Drags a card by its handle until it sits above another card, with the mouse. */
+export async function dragUsageCardAbove(
+  page: Page,
+  reportId: string,
+  targetReportId: string,
+): Promise<void> {
+  const card = usageModal(page).getByTestId(`usage-report-${reportId}`);
+  const target = usageModal(page).getByTestId(`usage-report-${targetReportId}`);
+  await card.hover();
+  const handle = await card.getByTestId("usage-card-drag-handle").boundingBox();
+  const targetBox = await target.boundingBox();
+  if (!handle || !targetBox) throw new Error("Both cards must be on screen to drag.");
+  const x = handle.x + handle.width / 2;
+  await page.mouse.move(x, handle.y + handle.height / 2);
+  await page.mouse.down();
+  await page.mouse.move(x, handle.y + handle.height / 2 - 10, { steps: 3 });
+  await page.mouse.move(x, targetBox.y + 4, { steps: 12 });
+  await page.mouse.up();
+}
+
 /** Each pinned window as it reads: its percent and short label, "31% 5h". */
 export async function expectPinnedUsage(page: Page, windows: string[]): Promise<void> {
   const pinned = usageItem(page).getByTestId("sidebar-usage-pinned-window");
@@ -167,14 +207,18 @@ export function pinRow(scope: Locator, source: string, window: string): Locator
 
 /**
  * A report card whose window rows do not pin: no pin toggle, no pin glyph, and nothing focusable
- * but buttons, so no row presses or highlights on hover.
+ * but the header's buttons and on/off switch, so no row presses or highlights on hover.
  */
 export async function expectUnpinnableRows(card: Locator): Promise<void> {
   await expect(card.getByRole("checkbox")).toHaveCount(0);
   await expect(card.locator('[data-testid^="usage-pin-"]')).toHaveCount(0);
   const focusable = await card
     .locator("[tabindex]")
-    .evaluateAll((nodes) => nodes.filter((node) => node.getAttribute("role") !== "button").length);
+    .evaluateAll(
+      (nodes) =>
+        nodes.filter((node) => !["button", "switch"].includes(node.getAttribute("role") ?? ""))
+          .length,
+    );
   expect(focusable).toBe(0);
 }
 
@@ -273,6 +317,19 @@ export async function openUsageOptions(page: Page): Promise<void> {
   await expect(visible(page, "usage-display-used")).toBeVisible();
 }
 
+/** Picks the host Usage shows, from the Host row of its Settings. */
+export async function pickUsageHost(page: Page, serverId: string): Promise<void> {
+  await openUsageOptions(page);
+  await visible(page, "usage-options-host").click();
+  await visible(page, `usage-options-host-${serverId}`).click();
+  await expect(page.getByTestId("usage-display-used")).toHaveCount(0);
+}
+
+/** The host Usage shows, under its title; absent with a single host. */
+export function usageModalHost(page: Page): Locator {
+  return visible(page, "usage-modal-host");
+}
+
 export function usageOptionsSurface(page: Page): Locator {
   return page
     .locator(

packages/app/e2e/support/helpers/workspace-archive-undo.ts

@@ -162,3 +162,38 @@ export function createGatedTeardown(): GatedTeardown {
     release: () => writeFileSync(releasePath, "release\n"),
   };
 }
+
+export function archivedToast(page: Page) {
+  return page.getByTestId("workspace-archived-toast");
+}
+
+export interface SidebarListLayout {
+  /** Bottom edge of the list's visible area. */
+  listBottom: number;
+  /** Bottom edges of the visible project and workspace rows, top to bottom. */
+  rowBottoms: number[];
+  rowHeight: number;
+}
+
+/** Scrolls the sidebar's workspace list to its end and reads where its rows sit. */
+export async function scrollSidebarListToEnd(page: Page): Promise<SidebarListLayout> {
+  const list = page.getByTestId("sidebar-project-workspace-list-scroll");
+  await list.evaluate((element) => {
+    element.scrollTop = element.scrollHeight;
+  });
+  return list.evaluate((element) => {
+    const visible = element.getBoundingClientRect();
+    const rows = Array.from(
+      element.querySelectorAll<HTMLElement>(
+        '[data-testid^="sidebar-workspace-row-"],[data-testid^="sidebar-project-row-"]',
+      ),
+    )
+      .map((row) => row.getBoundingClientRect())
+      .filter((row) => row.height > 0 && row.bottom > visible.top && row.top < visible.bottom);
+    return {
+      listBottom: visible.bottom,
+      rowBottoms: rows.map((row) => row.bottom).sort((a, b) => a - b),
+      rowHeight: Math.min(...rows.map((row) => row.height)),
+    };
+  });
+}

packages/app/modules/paseo-scroll/android/src/androidTest/java/sh/paseo/scroll/SelectableTextTouchTest.kt

@@ -0,0 +1,282 @@
+package sh.paseo.scroll
+
+import android.app.Activity
+import android.content.Intent
+import android.os.SystemClock
+import android.text.InputType
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewConfiguration
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputConnection
+import android.widget.EditText
+import android.widget.FrameLayout
+import android.widget.TextView
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
+import com.facebook.react.uimanager.DisplayMetricsHolder
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.views.scroll.ReactScrollView
+import com.facebook.react.views.scroll.ReactScrollViewManager
+import com.facebook.react.views.view.ReactViewGroup
+import com.facebook.soloader.SoLoader
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Touches on chat text in the timeline's scroll view. Chat text is selectable, so a tap or a long
+ * press focuses it, and the focus may not scroll the timeline. The touches are injected into a real
+ * window, so touch mode, focus and the selection controller run as on device.
+ */
+@RunWith(AndroidJUnit4::class)
+class SelectableTextTouchTest {
+  private val instrumentation = InstrumentationRegistry.getInstrumentation()
+  private var activity: Activity? = null
+
+  @After fun finish() {
+    activity?.finish()
+  }
+
+  // A reply whose top is on screen and whose bottom is below the viewport.
+  @Test fun tappingTextThatRunsBelowTheViewportKeepsTheOffset() {
+    val timeline = openTimeline(edge = Edge.TOP)
+
+    timeline.tap(visibleY = EDGE_Y + 100)
+
+    assertTrue("The tap focuses the text", timeline.textHasFocus())
+    assertEquals("Offset after the tap", OFFSET, timeline.settledScrollY())
+  }
+
+  // A reply whose bottom is on screen and whose top is above the viewport, like a link at its end.
+  @Test fun tappingTextThatStartsAboveTheViewportKeepsTheOffset() {
+    val timeline = openTimeline(edge = Edge.BOTTOM)
+
+    timeline.tap(visibleY = EDGE_Y - 100)
+
+    assertTrue("The tap focuses the text", timeline.textHasFocus())
+    assertEquals("Offset after the tap", OFFSET, timeline.settledScrollY())
+  }
+
+  // A reply that is still streaming gets new text while the user's tap holds its focus.
+  @Test fun aStreamingUpdateToTappedTextKeepsTheOffset() {
+    val timeline = openTimeline(edge = Edge.BOTTOM)
+    timeline.tap(visibleY = EDGE_Y - 100)
+    assertTrue("The tap focuses the text", timeline.textHasFocus())
+
+    timeline.updateText("$CHAT_TEXT\nOne more line of the reply.")
+
+    assertEquals("Offset after the update", OFFSET, timeline.settledScrollY())
+  }
+
+  // The timeline changes height while tapped text holds focus, as when the composer above the
+  // keyboard loses its queued message.
+  @Test fun aTimelineResizeAfterATapKeepsTheOffset() {
+    val timeline = openTimeline(edge = Edge.TOP)
+    timeline.tap(visibleY = EDGE_Y + 100)
+    assertTrue("The tap focuses the text", timeline.textHasFocus())
+
+    timeline.resize(height = VIEWPORT + 200)
+
+    assertEquals("Offset after the resize", OFFSET, timeline.settledScrollY())
+  }
+
+  @Test fun longPressSelectsAWordAndKeepsTheOffset() {
+    val timeline = openTimeline(edge = Edge.TOP)
+
+    val word = timeline.wordAt(visibleY = EDGE_Y + 100)
+
+    timeline.longPress(visibleY = EDGE_Y + 100)
+
+    assertEquals("Selected text", word, timeline.selectedText())
+    assertEquals("Offset after the long press", OFFSET, timeline.settledScrollY())
+  }
+
+  // Inputs in the timeline, such as an agent's question form, still scroll into view to be typed in.
+  @Test fun tappingAnInputThatRunsBelowTheViewportRevealsIt() {
+    val timeline = openTimeline(edge = Edge.TOP, editable = true)
+
+    timeline.tap(visibleY = EDGE_Y + 100)
+
+    assertTrue("The tap focuses the input", timeline.textHasFocus())
+    assertNotEquals("Offset after the tap", OFFSET, timeline.settledScrollY())
+  }
+
+  private inner class Timeline(private val scroll: ReactScrollView, private val text: TextView) {
+    fun scrollTo(y: Int) {
+      instrumentation.runOnMainSync { scroll.scrollTo(0, y) }
+      awaitFrames(2)
+    }
+
+    fun tap(visibleY: Int) {
+      val downTime = SystemClock.uptimeMillis()
+      touch(downTime, MotionEvent.ACTION_DOWN, visibleY)
+      touch(downTime, MotionEvent.ACTION_UP, visibleY)
+    }
+
+    fun longPress(visibleY: Int) {
+      val downTime = SystemClock.uptimeMillis()
+      touch(downTime, MotionEvent.ACTION_DOWN, visibleY)
+      SystemClock.sleep(ViewConfiguration.getLongPressTimeout() * 2L)
+      touch(downTime, MotionEvent.ACTION_UP, visibleY)
+    }
+
+    fun resize(height: Int) {
+      instrumentation.runOnMainSync {
+        scroll.layoutParams = scroll.layoutParams.apply { this.height = height }
+      }
+    }
+
+    // Replaces the text and lays it out again at its top, the way a streaming reply mounts.
+    fun updateText(value: String) {
+      instrumentation.runOnMainSync {
+        text.setText(value)
+        text.measure(exact(WIDTH), unspecified())
+        text.layout(0, text.top, WIDTH, text.top + text.measuredHeight)
+      }
+    }
+
+    fun textHasFocus(): Boolean {
+      awaitFrames(2)
+      var focused = false
+      instrumentation.runOnMainSync { focused = text.isFocused }
+      return focused
+    }
+
+    fun selectedText(): String {
+      awaitFrames(2)
+      var selected = ""
+      instrumentation.runOnMainSync {
+        selected = text.text.substring(text.selectionStart, text.selectionEnd)
+      }
+      return selected
+    }
+
+    /** The word under [visibleY] at the current offset. */
+    fun wordAt(visibleY: Int): String {
+      var word = ""
+      instrumentation.runOnMainSync {
+        val chars = text.text
+        val y = scroll.scrollY + visibleY - text.top
+        val offset = text.getOffsetForPosition(TOUCH_X - text.left, y.toFloat())
+        var start = offset
+        var end = offset
+        while (start > 0 && chars[start - 1].isLetterOrDigit()) start--
+        while (end < chars.length && chars[end].isLetterOrDigit()) end++
+        word = chars.substring(start, end)
+      }
+      assertTrue("The touch lands on a word", word.isNotEmpty())
+      return word
+    }
+
+    fun settledScrollY(): Int {
+      var previous = scrollY()
+      repeat(60) {
+        awaitFrames(3)
+        val current = scrollY()
+        if (current == previous) return current
+        previous = current
+      }
+      throw AssertionError("Offset never settled")
+    }
+
+    private fun scrollY(): Int {
+      var y = 0
+      instrumentation.runOnMainSync { y = scroll.scrollY }
+      return y
+    }
+
+    // Injected through the window like a finger, which puts the window in touch mode.
+    private fun touch(downTime: Long, action: Int, visibleY: Int) {
+      val location = IntArray(2)
+      instrumentation.runOnMainSync { scroll.getLocationOnScreen(location) }
+      val x = location[0] + TOUCH_X
+      val y = location[1] + visibleY.toFloat()
+      val event = MotionEvent.obtain(downTime, SystemClock.uptimeMillis(), action, x, y, 0)
+      instrumentation.sendPointerSync(event)
+      event.recycle()
+    }
+
+    fun awaitFrames(count: Int) {
+      repeat(count) {
+        instrumentation.waitForIdleSync()
+        SystemClock.sleep(16)
+      }
+    }
+  }
+
+  /** Which edge of the text is on screen, at [EDGE_Y]; the other is past the viewport. */
+  private enum class Edge { TOP, BOTTOM }
+
+  /** A timeline scrolled to [OFFSET] with one block of chat text taller than the viewport. */
+  private fun openTimeline(edge: Edge, editable: Boolean = false): Timeline {
+    val started =
+      instrumentation.startActivitySync(
+        Intent(instrumentation.targetContext, Activity::class.java).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+      )
+    activity = started
+    lateinit var timeline: Timeline
+    instrumentation.runOnMainSync {
+      DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(started)
+      SoLoader.init(started, OpenSourceMergedSoMapping)
+      val reactContext = MountingReactContext(started.applicationContext)
+      val context = ThemedReactContext(reactContext, started)
+      val manager =
+        PaseoScrollPackage().createViewManager(reactContext, ReactScrollViewManager.REACT_CLASS)
+          as ReactScrollViewManager
+      val scroll = manager.createViewInstance(context)
+      val content = ReactViewGroup(context)
+      val text =
+        if (editable) {
+          // Selectable, as React Native's TextInput makes itself when attached, so only being a text
+          // editor tells it apart from chat text. No input connection: building one runs React
+          // Native's focus search through Fabric, which this context does not run.
+          object : EditText(context) {
+            override fun onCreateInputConnection(outAttrs: EditorInfo): InputConnection? = null
+          }.apply {
+            inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE
+            setTextIsSelectable(true)
+          }
+        } else {
+          // How enriched-markdown and React Native's <Text selectable> set up chat text.
+          TextView(context).apply { setTextIsSelectable(true) }
+        }
+      text.setText(CHAT_TEXT)
+      content.addView(text)
+      scroll.addView(content)
+      started.setContentView(
+        FrameLayout(started).apply { addView(scroll, FrameLayout.LayoutParams(WIDTH, VIEWPORT)) }
+      )
+      // Fabric lays out React content; nothing in a React view group lays out its children itself.
+      content.layout(0, 0, WIDTH, CONTENT_HEIGHT)
+      text.measure(exact(WIDTH), unspecified())
+      assertTrue("The text is taller than the viewport", text.measuredHeight > VIEWPORT)
+      val top = if (edge == Edge.TOP) OFFSET + EDGE_Y else OFFSET + EDGE_Y - text.measuredHeight
+      text.layout(0, top, WIDTH, top + text.measuredHeight)
+      timeline = Timeline(scroll, text)
+    }
+    timeline.awaitFrames(2)
+    timeline.scrollTo(OFFSET)
+    assertEquals("Starts at the offset", OFFSET, timeline.settledScrollY())
+    return timeline
+  }
+
+  private fun exact(size: Int) = View.MeasureSpec.makeMeasureSpec(size, View.MeasureSpec.EXACTLY)
+
+  private fun unspecified() = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)
+
+  private companion object {
+    const val WIDTH = 600
+    const val TOUCH_X = WIDTH / 2f
+    const val VIEWPORT = 800
+    const val CONTENT_HEIGHT = 6000
+    const val OFFSET = 2400
+    // Below the plain activity's action bar, which overlays the top of the window.
+    const val EDGE_Y = 500
+    val CHAT_TEXT = List(30) { "Line $it of a reply in the chat timeline." }.joinToString("\n")
+  }
+}

packages/app/modules/paseo-scroll/android/src/main/java/sh/paseo/scroll/PaseoScrollView.java

@@ -1,10 +1,12 @@
 package sh.paseo.scroll;
 
 import android.content.Context;
+import android.graphics.Rect;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
+import android.widget.TextView;
 import androidx.annotation.Nullable;
 import com.facebook.react.R;
 import com.facebook.react.views.scroll.MaintainVisibleScrollPositionHelper;
@@ -12,7 +14,7 @@ import com.facebook.react.views.scroll.ReactScrollView;
 import com.facebook.react.views.scroll.ReactScrollViewHelper;
 
 /**
- * React Native's vertical scroll view with two corrections. Java, because the content-position
+ * React Native's vertical scroll view with five corrections. Java, because the content-position
  * config type is internal to React Native's Kotlin module.
  */
 final class PaseoScrollView extends ReactScrollView {
@@ -27,6 +29,7 @@ final class PaseoScrollView extends ReactScrollView {
   private @Nullable MaintainVisibleScrollPositionHelper.Config visibleContentPosition = null;
   private boolean isClampPending = false;
   private boolean isUserDragging = false;
+  private boolean isFocusRevealSkipped = false;
 
   PaseoScrollView(Context context) {
     super(context);
@@ -51,6 +54,56 @@ final class PaseoScrollView extends ReactScrollView {
     super.scrollToPreservingMomentum(x, y);
   }
 
+  // Chat text is selectable (enriched-markdown's text views and <Text selectable>), and selectable
+  // text takes focus when touched: a tap on a link, a word, or a long-press to select. React Native
+  // scrolls a newly focused child fully into view, so touching a reply that is partly off screen
+  // scrolled the timeline by up to a screen under the user's finger. Text the user touched is
+  // already where they are looking, so its focus does not scroll. Inputs, and focus moved by a
+  // keyboard, still scroll into view.
+  @Override
+  public void requestChildFocus(View child, View focused) {
+    if (isTouchedReadOnlyText(focused)) {
+      requestChildFocusWithoutScroll(child, focused);
+      return;
+    }
+    super.requestChildFocus(child, focused);
+  }
+
+  // Focused text asks to reveal its selection whenever the selection changes. A streaming reply
+  // replaces its text, which collapses the selection to the start, so a reply that kept focus from
+  // a touch scrolled the timeline back to its first line on the next update. Read-only text has no
+  // caret, so a collapsed selection has nothing to reveal. A selection the user drags still does.
+  @Override
+  public boolean requestChildRectangleOnScreen(View child, Rect rectangle, boolean immediate) {
+    View focused = findFocus();
+    if (isTouchedReadOnlyText(focused) && !((TextView) focused).hasSelection()) return false;
+    return super.requestChildRectangleOnScreen(child, rectangle, immediate);
+  }
+
+  // When the scroll view changes height, Android scrolls the focused view into view again. Touched
+  // chat text keeps focus, so the composer growing or shrinking below the timeline realigned it.
+  @Override
+  protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+    isFocusRevealSkipped = isTouchedReadOnlyText(findFocus());
+    try {
+      super.onSizeChanged(w, h, oldw, oldh);
+    } finally {
+      isFocusRevealSkipped = false;
+    }
+  }
+
+  @Override
+  protected int computeScrollDeltaToGetChildRectOnScreen(Rect rect) {
+    if (isFocusRevealSkipped) return 0;
+    return super.computeScrollDeltaToGetChildRectOnScreen(rect);
+  }
+
+  private static boolean isTouchedReadOnlyText(@Nullable View view) {
+    if (!(view instanceof TextView) || !view.isInTouchMode()) return false;
+    TextView text = (TextView) view;
+    return text.isTextSelectable() && !text.onCheckIsTextEditor();
+  }
+
   // The drag begins where React Native emits onScrollBeginDrag.
   @Override
   protected void handleInterceptedTouchEvent(MotionEvent ev) {

packages/app/playwright.config.ts

@@ -23,6 +23,12 @@ export default defineConfig({
   // spec on one worker avoids repeating its file-level setup across daemons.
   fullyParallel: false,
   workers: Number(process.env.E2E_WORKERS ?? (process.env.CI ? "2" : "1")),
+  // Workspace packages are already compiled. Tests import them at run time, so
+  // on a cold cache every worker transpiles the same files and writes them into
+  // Playwright's shared transform cache without locking. A worker that reads an
+  // entry mid-write loads an empty module and fails with "does not provide an
+  // export named".
+  build: { external: ["**/packages/*/dist/**"] },
   retries: process.env.CI ? 1 : 0,
   reporter: [["list"]],
   use: {

packages/app/src/agent-stream/strategy-web.browser.test.tsx

@@ -49,8 +49,21 @@ afterEach(() => {
   host.remove();
 });
 
-function mountTimeline(historyMounted: StreamItem[]) {
-  const strategy = createWebStreamStrategy({ isMobileBreakpoint: true });
+type OlderHistoryInput = Pick<
+  StreamRenderInput,
+  "onNearHistoryStart" | "hasOlderHistory" | "olderHistoryProgressKey"
+>;
+
+interface MountTimelineOptions {
+  olderHistory?: OlderHistoryInput;
+  isMobileBreakpoint?: boolean;
+}
+
+function mountTimeline(
+  historyMounted: StreamItem[],
+  { olderHistory, isMobileBreakpoint = true }: MountTimelineOptions = {},
+) {
+  const strategy = createWebStreamStrategy({ isMobileBreakpoint });
   const viewportRef = React.createRef<StreamViewportHandle>();
   const input: StreamRenderInput = {
     agentId: "agent",
@@ -76,6 +89,7 @@ function mountTimeline(historyMounted: StreamItem[]) {
     baseListContentContainerStyle: null,
     forwardListContentContainerStyle: null,
     contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
+    ...olderHistory,
   };
   const render = (segments: Partial<StreamRenderInput["segments"]>) =>
     root.render(strategy.render({ ...input, segments: { ...input.segments, ...segments } }));
@@ -100,8 +114,20 @@ function mountTimeline(historyMounted: StreamItem[]) {
     scrollTo: (top: number) => {
       scrollContainer.scrollTop = top;
     },
+    // A wheel listener runs before the browser applies the scroll the wheel causes.
+    wheelUpTo: (top: number) => {
+      scrollContainer.dispatchEvent(new WheelEvent("wheel", { bubbles: true, deltaY: -1000 }));
+      scrollContainer.scrollTop = top;
+    },
     distanceFromEnd: () =>
       scrollContainer.scrollHeight - scrollContainer.clientHeight - scrollContainer.scrollTop,
+    scrollTop: () => scrollContainer.scrollTop,
+    scrollUp: (distance: number) =>
+      act(() => {
+        scrollContainer.dispatchEvent(new WheelEvent("wheel", { deltaY: -distance }));
+        scrollContainer.scrollTop -= distance;
+        scrollContainer.dispatchEvent(new Event("scroll"));
+      }),
     // Resize observers and the hold's settle run on animation frames.
     settle: () =>
       act(async () => {
@@ -113,6 +139,53 @@ function mountTimeline(historyMounted: StreamItem[]) {
 }
 
 describe("web disclosure hold", () => {
+  it.each([{ isMobileBreakpoint: true }, { isMobileBreakpoint: false }])(
+    "keeps the reading position when mounted history becomes virtualized (compact: $isMobileBreakpoint)",
+    async (options) => {
+      const history = Array.from({ length: 80 }, (_, index) => row(index));
+      const timeline = mountTimeline(history, options);
+      await timeline.settle();
+      timeline.scrollUp(600);
+      await timeline.settle();
+      const offset = timeline.scrollTop();
+      const readingTop = timeline.rowTop("message-64");
+      expect(offset).toBeGreaterThan(0);
+
+      timeline.render({
+        historyVirtualized: history.slice(0, 60),
+        historyMounted: history.slice(60),
+      });
+      await timeline.settle();
+
+      expect(timeline.scrollTop()).toBe(offset);
+      expect(timeline.rowTop("message-64")).toBe(readingTop);
+    },
+  );
+
+  it.each([{ isMobileBreakpoint: true }, { isMobileBreakpoint: false }])(
+    "keeps following output when mounted history becomes virtualized at the end (compact: $isMobileBreakpoint)",
+    async (options) => {
+      const history = Array.from({ length: 80 }, (_, index) => row(index));
+      const timeline = mountTimeline(history, options);
+      await timeline.settle();
+
+      timeline.render({
+        historyVirtualized: history.slice(0, 60),
+        historyMounted: history.slice(60),
+      });
+      await timeline.settle();
+      expect(timeline.distanceFromEnd()).toBeLessThanOrEqual(1);
+
+      timeline.render({
+        historyVirtualized: history.slice(0, 60),
+        historyMounted: history.slice(60),
+        liveHead: [row(80)],
+      });
+      await timeline.settle();
+      expect(timeline.distanceFromEnd()).toBeLessThanOrEqual(1);
+    },
+  );
+
   it("keeps the trigger's top when an anchored toggle at the bottom opens rows below it, and stops following", async () => {
     const history = [1, 2, 3, 4, 5, 6].map((index) => row(index));
     const timeline = mountTimeline(history);
@@ -208,3 +281,32 @@ describe("web disclosure hold", () => {
     expect(timeline.distanceFromEnd()).toBeLessThanOrEqual(1);
   });
 });
+
+describe("web history start", () => {
+  it("loads older history when an upward wheel lands at the start after the reader stopped following", async () => {
+    let olderHistoryLoads = 0;
+    const history = [1, 2, 3, 4, 5, 6].map((index) => row(index));
+    const timeline = mountTimeline(history, {
+      olderHistory: {
+        hasOlderHistory: true,
+        olderHistoryProgressKey: "epoch:1",
+        onNearHistoryStart: async () => {
+          olderHistoryLoads += 1;
+          return true;
+        },
+      },
+    });
+    await timeline.settle();
+    // Opening a row at the bottom stops following output without any scroll.
+    timeline.hold("message-5", () =>
+      timeline.render({ historyMounted: [...history.slice(0, 5), row(7, 200), history[5]!] }),
+    );
+    await timeline.settle();
+    expect(olderHistoryLoads).toBe(0);
+
+    timeline.wheelUpTo(0);
+    await timeline.settle();
+
+    expect(olderHistoryLoads).toBe(1);
+  });
+});

packages/app/src/agent-stream/strategy-web.tsx

@@ -457,6 +457,8 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
   const rowVirtualizer = useVirtualizer({
     count: segments.historyVirtualized.length,
     enabled: shouldUseVirtualizer,
+    // History can become virtualized after the reader has already scrolled the mounted rows.
+    initialOffset: () => scrollContainerRef.current?.scrollTop ?? 0,
     initialRect: {
       width: scrollContainerRef.current?.clientWidth ?? 0,
       height: scrollContainerRef.current?.clientHeight ?? 0,
@@ -605,6 +607,15 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
       window.performance.now() + UPWARD_INPUT_EVIDENCE_TIMEOUT_MS;
   }, []);
 
+  const hasUpwardInputEvidence = useCallback(() => {
+    const mouseGesture = mouseScrollGestureRef.current;
+    return (
+      mouseGesture?.kind === "scrollbar" ||
+      (mouseGesture?.kind === "autoscroll" && mouseGesture.hasUpwardEvidence) ||
+      window.performance.now() < upwardInputEvidenceUntilRef.current
+    );
+  }, []);
+
   useLayoutEffect(() => {
     if (isActive) {
       return;
@@ -791,16 +802,16 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     const scrolledUp = currentScrollTop < lastKnownScrollTopRef.current - USER_SCROLL_DELTA_EPSILON;
     const scrolledDown =
       currentScrollTop > lastKnownScrollTopRef.current + USER_SCROLL_DELTA_EPSILON;
-    const mouseGesture = mouseScrollGestureRef.current;
-    const hasUpwardInputEvidence =
-      mouseGesture?.kind === "scrollbar" ||
-      (mouseGesture?.kind === "autoscroll" && mouseGesture.hasUpwardEvidence) ||
-      window.performance.now() < upwardInputEvidenceUntilRef.current;
+    const userScrolledUp = scrolledUp && hasUpwardInputEvidence();
 
     if (!followOutputRef.current && isAtBottom && scrolledDown && !isJumpSettling()) {
       setFollowOutput(true);
-    } else if (followOutputRef.current && scrolledUp && hasUpwardInputEvidence) {
+    } else if (followOutputRef.current && userScrolledUp) {
       stopFollowingOutputFromUserIntent();
+    } else if (userScrolledUp) {
+      // Wheel listeners can run before or after the browser applies the scroll, so the
+      // upward scroll itself re-arms loading when it reaches the start.
+      rearmHistoryStartFromUserIntent();
     }
 
     lastKnownScrollTopRef.current = currentScrollTop;
@@ -811,8 +822,10 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
     evaluateHistoryStart();
   }, [
     evaluateHistoryStart,
+    hasUpwardInputEvidence,
     isJumpSettling,
     readingAnchor,
+    rearmHistoryStartFromUserIntent,
     stopFollowingOutputFromUserIntent,
     updateScrollMetrics,
   ]);

packages/app/src/archived-workspaces/index.ts

@@ -0,0 +1,5 @@
+export type { ArchivedWorkspace, ArchivedWorkspaceAgent } from "./internal/group";
+export {
+  useArchivedWorkspaceSearch,
+  type ArchivedWorkspaceSearch,
+} from "./internal/use-archived-workspace-search";

packages/app/src/archived-workspaces/internal/group.test.ts

@@ -0,0 +1,128 @@
+import { describe, expect, it } from "vitest";
+import type { AggregatedAgent } from "@/hooks/use-aggregated-agents";
+import { groupArchivedWorkspaces } from "./group";
+
+const T0 = Date.parse("2026-11-01T10:00:00.000Z");
+const minutes = (count: number) => new Date(T0 + count * 60_000);
+
+function historyAgent(input: {
+  id: string;
+  serverId?: string;
+  workspaceId?: string | null;
+  title?: string | null;
+  activeAt: number;
+  archivedAt?: number | null;
+  workspaceName?: string | null;
+  branch?: string | null;
+  cwd?: string;
+}): AggregatedAgent {
+  const cwd = input.cwd ?? "/repos/payments";
+  return {
+    id: input.id,
+    serverId: input.serverId ?? "host-a",
+    serverLabel: input.serverId ?? "host-a",
+    title: input.title ?? null,
+    status: "closed",
+    turn: { phase: "open", turnId: null, startedAt: null, cancellationRequestId: null },
+    lastActivityAt: minutes(input.activeAt),
+    cwd,
+    workspaceId: input.workspaceId === undefined ? "ws-1" : input.workspaceId,
+    provider: "claude",
+    requiresAttention: false,
+    attentionReason: null,
+    attentionTimestamp: null,
+    archivedAt: input.archivedAt == null ? null : minutes(input.archivedAt),
+    createdAt: minutes(0),
+    labels: {},
+    projectPlacement: {
+      projectKey: "prj-payments",
+      projectName: "payments",
+      workspaceName: input.workspaceName === undefined ? "Billing cleanup" : input.workspaceName,
+      checkout: {
+        cwd,
+        isGit: true,
+        currentBranch: input.branch === undefined ? "billing-cleanup" : input.branch,
+        remoteUrl: null,
+        worktreeRoot: cwd,
+        isPaseoOwnedWorktree: false,
+        mainRepoRoot: null,
+      },
+    },
+  } as AggregatedAgent;
+}
+
+const NO_ACTIVE = new Map<string, ReadonlySet<string>>();
+
+describe("groupArchivedWorkspaces", () => {
+  it("folds a workspace's agents into one entry led by its most recent agent", () => {
+    const [workspace] = groupArchivedWorkspaces({
+      agents: [
+        historyAgent({ id: "older", title: "Audit invoices", activeAt: 1, archivedAt: 5 }),
+        historyAgent({ id: "newer", title: "Fix totals", activeAt: 3, archivedAt: 4 }),
+      ],
+      activeIds: NO_ACTIVE,
+    });
+
+    expect(workspace).toMatchObject({
+      key: "host-a:ws-1",
+      serverId: "host-a",
+      workspaceId: "ws-1",
+      name: "Billing cleanup",
+      projectName: "payments",
+      projectKey: "prj-payments",
+      branch: "billing-cleanup",
+      archivedAt: minutes(5),
+    });
+    expect(workspace.agents.map((agent) => agent.id)).toEqual(["newer", "older"]);
+  });
+
+  it("leaves out workspaces that are still active on their host", () => {
+    const workspaces = groupArchivedWorkspaces({
+      agents: [historyAgent({ id: "a", activeAt: 1, archivedAt: 2 })],
+      activeIds: new Map([["host-a", new Set(["ws-1"])]]),
+    });
+
+    expect(workspaces).toEqual([]);
+  });
+
+  it("leaves out an inactive workspace none of whose agents were archived", () => {
+    const workspaces = groupArchivedWorkspaces({
+      agents: [historyAgent({ id: "a", activeAt: 1, archivedAt: null })],
+      activeIds: NO_ACTIVE,
+    });
+
+    expect(workspaces).toEqual([]);
+  });
+
+  it("keeps the same workspace ID on two hosts apart and lists the latest archive first", () => {
+    const workspaces = groupArchivedWorkspaces({
+      agents: [
+        historyAgent({ id: "a", serverId: "host-a", activeAt: 1, archivedAt: 2 }),
+        historyAgent({ id: "b", serverId: "host-b", activeAt: 1, archivedAt: 9 }),
+      ],
+      activeIds: NO_ACTIVE,
+    });
+
+    expect(workspaces.map((workspace) => workspace.key)).toEqual(["host-b:ws-1", "host-a:ws-1"]);
+  });
+
+  it("skips agents with no workspace and names an unnamed workspace after its folder", () => {
+    const workspaces = groupArchivedWorkspaces({
+      agents: [
+        historyAgent({ id: "loose", workspaceId: null, activeAt: 1, archivedAt: 2 }),
+        historyAgent({
+          id: "a",
+          workspaceName: null,
+          branch: null,
+          cwd: "/repos/receipts",
+          activeAt: 1,
+          archivedAt: 2,
+        }),
+      ],
+      activeIds: NO_ACTIVE,
+    });
+
+    expect(workspaces).toHaveLength(1);
+    expect(workspaces[0]).toMatchObject({ name: "receipts", branch: null });
+  });
+});

packages/app/src/archived-workspaces/internal/group.ts

@@ -0,0 +1,87 @@
+import type { AggregatedAgent } from "@/hooks/use-aggregated-agents";
+
+export interface ArchivedWorkspaceAgent {
+  id: string;
+  title: string | null;
+  provider: string;
+}
+
+/** A workspace the user archived, as agent history describes it. */
+export interface ArchivedWorkspace {
+  /** `serverId:workspaceId` */
+  key: string;
+  serverId: string;
+  workspaceId: string;
+  name: string;
+  projectName: string | null;
+  /** The host's project ID. */
+  projectKey: string | null;
+  branch: string | null;
+  /** The latest archive time among its agents. */
+  archivedAt: Date;
+  /** Its agents in this history page, most recently active first. Never empty. */
+  agents: ArchivedWorkspaceAgent[];
+}
+
+/** Which workspaces each host still lists as active. */
+export type ActiveWorkspaceIdsByServer = ReadonlyMap<string, ReadonlySet<string>>;
+
+function lastPathSegment(path: string): string {
+  const parts = path.split(/[\\/]/).filter(Boolean);
+  return parts[parts.length - 1] ?? path;
+}
+
+function checkoutBranch(agent: AggregatedAgent): string | null {
+  const checkout = agent.projectPlacement?.checkout;
+  return checkout?.isGit ? checkout.currentBranch : null;
+}
+
+/**
+ * Folds agent history into one entry per archived workspace, newest archive first. A
+ * workspace its host still lists is active, so it is left out. So is an inactive workspace
+ * with no archived agent: the user never put it away (a background workspace, for example).
+ */
+export function groupArchivedWorkspaces(input: {
+  agents: readonly AggregatedAgent[];
+  activeIds: ActiveWorkspaceIdsByServer;
+}): ArchivedWorkspace[] {
+  const byKey = new Map<string, ArchivedWorkspace & { archivedAtOrNull: Date | null }>();
+  const newestFirst = [...input.agents].sort(
+    (left, right) => right.lastActivityAt.getTime() - left.lastActivityAt.getTime(),
+  );
+  for (const agent of newestFirst) {
+    const workspaceId = agent.workspaceId;
+    if (!workspaceId || input.activeIds.get(agent.serverId)?.has(workspaceId)) continue;
+    const key = `${agent.serverId}:${workspaceId}`;
+    const archivedAt = agent.archivedAt ? new Date(agent.archivedAt) : null;
+    const summary = { id: agent.id, title: agent.title ?? null, provider: agent.provider };
+    const existing = byKey.get(key);
+    if (existing) {
+      existing.agents.push(summary);
+      if (archivedAt && (!existing.archivedAtOrNull || archivedAt > existing.archivedAtOrNull)) {
+        existing.archivedAtOrNull = archivedAt;
+      }
+      continue;
+    }
+    // The most recent agent describes the workspace: it saw its latest name and branch.
+    const placement = agent.projectPlacement;
+    byKey.set(key, {
+      key,
+      serverId: agent.serverId,
+      workspaceId,
+      name: placement?.workspaceName || lastPathSegment(agent.cwd),
+      projectName: placement?.projectName ?? null,
+      projectKey: placement?.projectKey ?? null,
+      branch: checkoutBranch(agent),
+      archivedAt: archivedAt ?? new Date(0),
+      archivedAtOrNull: archivedAt,
+      agents: [summary],
+    });
+  }
+
+  const archived: ArchivedWorkspace[] = [];
+  for (const { archivedAtOrNull, ...workspace } of byKey.values()) {
+    if (archivedAtOrNull) archived.push({ ...workspace, archivedAt: archivedAtOrNull });
+  }
+  return archived.sort((left, right) => right.archivedAt.getTime() - left.archivedAt.getTime());
+}

packages/app/src/archived-workspaces/internal/use-archived-workspace-search.ts

@@ -0,0 +1,83 @@
+import { useMemo } from "react";
+import { useShallow } from "zustand/shallow";
+import { useAgentHistory } from "@/hooks/use-agent-history";
+import { useDebouncedValue } from "@/hooks/use-debounced-value";
+import { useSessionStore, type WorkspaceDescriptor } from "@/stores/session-store";
+import {
+  groupArchivedWorkspaces,
+  type ActiveWorkspaceIdsByServer,
+  type ArchivedWorkspace,
+} from "./group";
+
+const SEARCH_DEBOUNCE_MS = 200;
+const NO_WORKSPACES: Record<string, ReadonlyMap<string, WorkspaceDescriptor>> = {};
+const NO_ARCHIVED_WORKSPACES: ArchivedWorkspace[] = [];
+
+export interface ArchivedWorkspaceSearch {
+  /** Newest archive first. Empty without a query. */
+  workspaces: ArchivedWorkspace[];
+  /**
+   * The host matched these for the current query. Its search forgives typos, so its matches
+   * can include rows the caller cannot match itself. False while the previous query's
+   * results stand in for the next one; those rows must still match the query on their own.
+   */
+  matchedByHost: boolean;
+  /** Still searching for the current query, debounce included. */
+  pending: boolean;
+}
+
+function useActiveWorkspaceIds(enabled: boolean): ActiveWorkspaceIdsByServer {
+  // Each host's workspace map is replaced only when its workspaces change, so this does not
+  // re-render on agent activity.
+  const workspacesByServer = useSessionStore(
+    useShallow((state) =>
+      enabled
+        ? Object.fromEntries(
+            Object.entries(state.sessions).map(([serverId, session]) => [
+              serverId,
+              session.workspaces,
+            ]),
+          )
+        : NO_WORKSPACES,
+    ),
+  );
+  return useMemo(
+    () =>
+      new Map(
+        Object.entries(workspacesByServer).map(([serverId, workspaces]) => [
+          serverId,
+          new Set(workspaces.keys()),
+        ]),
+      ),
+    [workspacesByServer],
+  );
+}
+
+/**
+ * Archived workspaces whose name, project, branch, or agent titles match `query`, searched on
+ * every host that supports history search. Hosts that predate it contribute nothing.
+ */
+export function useArchivedWorkspaceSearch(
+  query: string,
+  options: { enabled: boolean },
+): ArchivedWorkspaceSearch {
+  const trimmed = query.trim();
+  const search = useDebouncedValue(trimmed, SEARCH_DEBOUNCE_MS);
+  const enabled = options.enabled && trimmed.length > 0;
+  const activeIds = useActiveWorkspaceIds(enabled);
+  const history = useAgentHistory({
+    search,
+    enabled: enabled && search.length > 0,
+    searchableHostsOnly: true,
+    keepPreviousResults: true,
+  });
+  const workspaces = useMemo(
+    () =>
+      enabled
+        ? groupArchivedWorkspaces({ agents: history.agents, activeIds })
+        : NO_ARCHIVED_WORKSPACES,
+    [activeIds, enabled, history.agents],
+  );
+  const matchedByHost = search === trimmed && !history.isLoading && !history.isPreviousResults;
+  return { workspaces, matchedByHost, pending: enabled && !matchedByHost };
+}

packages/app/src/assistant-file-links/use-file-link.test.tsx

@@ -39,6 +39,21 @@ function createDeferred<T>() {
   return { promise, resolve, reject };
 }
 
+/**
+ * Resolves a pending lookup and waits until React Query has delivered the result. It delivers on a
+ * timer, which would otherwise fire after the test, when jsdom is gone.
+ */
+async function resolveLookupAndDeliver(
+  lookup: ReturnType<typeof createDeferred<DirectorySuggestionResult>>,
+  result: DirectorySuggestionResult,
+): Promise<void> {
+  await act(async () => {
+    lookup.resolve(result);
+    await lookup.promise;
+    await new Promise((resolve) => setTimeout(resolve, 0));
+  });
+}
+
 interface OpenedFile {
   target: InlinePathTarget;
   disposition: OpenFileDisposition;
@@ -322,11 +337,12 @@ describe("useFileLink", () => {
     act(() => {
       result.current.setWorkspaceRoot("/Users/test/other");
     });
-    deferred.resolve(resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]));
+    await resolveLookupAndDeliver(
+      deferred,
+      resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]),
+    );
 
-    await waitFor(() => {
-      expect(getDirectorySuggestions).toHaveBeenCalledTimes(1);
-    });
+    expect(getDirectorySuggestions).toHaveBeenCalledTimes(1);
     expect(openedFiles).toEqual([]);
   });
 });

packages/app/src/attachments/use-attachment-preview-url.browser.test.tsx

@@ -0,0 +1,71 @@
+import React, { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+import { persistAttachmentFromBlob } from "@/attachments/service";
+import type { AttachmentMetadata } from "@/attachments/types";
+import { type AttachmentPreviewUrl, useAttachmentPreviewUrl } from "./use-attachment-preview-url";
+
+let root: Root;
+let container: HTMLDivElement;
+let latest: AttachmentPreviewUrl | null = null;
+
+function PreviewProbe({ attachment }: { attachment: AttachmentMetadata | null }) {
+  latest = useAttachmentPreviewUrl(attachment);
+  return null;
+}
+
+async function render(attachment: AttachmentMetadata | null) {
+  await act(async () => root.render(<PreviewProbe attachment={attachment} />));
+}
+
+async function waitForReady(): Promise<string> {
+  await vi.waitFor(() => expect(latest?.status).toBe("ready"));
+  if (latest?.status !== "ready") throw new Error("preview never resolved");
+  return latest.url;
+}
+
+beforeEach(() => {
+  vi.stubGlobal("React", React);
+  container = document.createElement("div");
+  document.body.appendChild(container);
+  root = createRoot(container);
+  latest = null;
+});
+
+afterEach(() => {
+  act(() => root.unmount());
+  container.remove();
+  vi.unstubAllGlobals();
+});
+
+it("never hands back a URL it already released when the same attachment returns", async () => {
+  const attachment = await persistAttachmentFromBlob({
+    blob: new Blob([new Uint8Array([1, 2, 3])], { type: "image/png" }),
+    mimeType: "image/png",
+    fileName: "shot.png",
+  });
+
+  await render(attachment);
+  const released = await waitForReady();
+  await render(null);
+  await render(attachment);
+
+  expect(latest).not.toEqual({ status: "ready", url: released });
+  expect(await waitForReady()).not.toBe(released);
+});
+
+it("retries a failed attachment from loading when it returns", async () => {
+  const stored = await persistAttachmentFromBlob({
+    blob: new Blob([new Uint8Array([1, 2, 3])], { type: "image/png" }),
+    mimeType: "image/png",
+    fileName: "shot.png",
+  });
+  const missing = { ...stored, id: "missing-attachment", storageKey: "missing-attachment" };
+
+  await render(missing);
+  await vi.waitFor(() => expect(latest?.status).toBe("failed"));
+  await render(null);
+  await render(missing);
+
+  expect(latest).toEqual({ status: "loading" });
+});

packages/app/src/attachments/use-attachment-preview-url.ts

@@ -2,62 +2,75 @@ import { useEffect, useRef, useState } from "react";
 import type { AttachmentMetadata } from "@/attachments/types";
 import { releaseAttachmentPreviewUrl, resolveAttachmentPreviewUrl } from "@/attachments/service";
 
+export type AttachmentPreviewUrl =
+  | { status: "loading" }
+  | { status: "ready"; url: string }
+  | { status: "failed" };
+
+const LOADING: AttachmentPreviewUrl = { status: "loading" };
+const FAILED: AttachmentPreviewUrl = { status: "failed" };
+
+function attachmentKey(attachment: AttachmentMetadata | null | undefined): string | null {
+  if (!attachment) return null;
+  return [attachment.id, attachment.storageType, attachment.storageKey, attachment.mimeType].join(
+    "\u0000",
+  );
+}
+
+/**
+ * Resolves a displayable URL for a stored attachment. Stays `loading` until the URL for the
+ * current attachment resolves, so a caller never shows a failure, or the previous attachment's
+ * URL, while the next one is still resolving. A missing attachment stays `loading`.
+ */
 export function useAttachmentPreviewUrl(
   attachment: AttachmentMetadata | null | undefined,
-): string | null {
-  const [url, setUrl] = useState<string | null>(null);
-  const activeAttachmentRef = useRef<AttachmentMetadata | null>(null);
+): AttachmentPreviewUrl {
+  const [resolved, setResolved] = useState<{
+    key: string;
+    preview: AttachmentPreviewUrl;
+  } | null>(null);
   const attachmentRef = useRef(attachment);
   attachmentRef.current = attachment;
-
-  const id = attachment?.id;
-  const storageType = attachment?.storageType;
-  const storageKey = attachment?.storageKey;
-  const mimeType = attachment?.mimeType;
+  const key = attachmentKey(attachment);
 
   useEffect(() => {
-    let disposed = false;
-    let currentUrl: string | null = null;
     const current = attachmentRef.current;
-
-    activeAttachmentRef.current = current ?? null;
-    if (!current) {
-      setUrl(null);
+    if (!current || key === null) {
       return;
     }
+    let disposed = false;
+    let currentUrl: string | null = null;
 
     void (async () => {
       try {
-        const resolved = await resolveAttachmentPreviewUrl(current);
+        const url = await resolveAttachmentPreviewUrl(current);
         if (disposed) {
-          await releaseAttachmentPreviewUrl({ attachment: current, url: resolved });
+          await releaseAttachmentPreviewUrl({ attachment: current, url });
           return;
         }
-        currentUrl = resolved;
-        setUrl(resolved);
+        currentUrl = url;
+        setResolved({ key, preview: { status: "ready", url } });
       } catch (error) {
         console.error("[attachments] Failed to resolve preview URL", {
           attachmentId: current.id,
           error,
         });
         if (!disposed) {
-          setUrl(null);
+          setResolved({ key, preview: FAILED });
         }
       }
     })();
 
     return () => {
       disposed = true;
-      const activeAttachment = activeAttachmentRef.current;
-      if (!currentUrl || !activeAttachment) {
-        return;
+      if (currentUrl) {
+        void releaseAttachmentPreviewUrl({ attachment: current, url: currentUrl });
       }
-      void releaseAttachmentPreviewUrl({
-        attachment: activeAttachment,
-        url: currentUrl,
-      });
+      // A result lives only as long as its lookup. Kept, the same attachment coming back would
+      // read a released URL, or an old failure, until the next lookup lands.
+      setResolved((previous) => (previous?.key === key ? null : previous));
     };
-  }, [id, storageType, storageKey, mimeType]);
+  }, [key]);
 
-  return url;
+  return resolved !== null && resolved.key === key ? resolved.preview : LOADING;
 }

packages/app/src/changelog/internal/changelog-sheet.tsx

@@ -1,18 +1,18 @@
 import { memo, useCallback, useMemo, useState } from "react";
-import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
+import { Text, View } from "react-native";
 import { ExternalLink, Gift } from "lucide-react-native";
 import { useTranslation } from "react-i18next";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 
-import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
+import {
+  AdaptiveModalSheet,
+  SheetHeaderIconButton,
+  type SheetHeader,
+} from "@/components/adaptive-modal-sheet";
 import { MarkdownRenderer } from "@/components/markdown/renderer";
 import { Alert } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
-import {
-  iconButtonChromeGlyphSize,
-  iconButtonChromeStyle,
-} from "@/components/ui/icon-button-chrome";
 import { StatusBadge } from "@/components/ui/status-badge";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 import { resolveAppVersion } from "@/utils/app-version";
@@ -28,12 +28,9 @@ import {
 const WEBSITE_CHANGELOG_URL = "https://paseo.sh/changelog";
 
 const ThemedGift = withUnistyles(Gift);
-const ThemedExternalLink = withUnistyles(ExternalLink);
 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 const sheetLeadingIcon = <ThemedGift size={ICON_SIZE.md} uniProps={mutedColorMapping} />;
-const websiteButtonStyle = (state: PressableStateCallbackType & { hovered?: boolean }) =>
-  iconButtonChromeStyle({ size: "large", state });
 
 interface ChangelogSheetProps {
   visible: boolean;
@@ -54,19 +51,12 @@ export function ChangelogSheet({ visible, onClose }: ChangelogSheetProps) {
       title: t("changelog.title"),
       leading: sheetLeadingIcon,
       actions: (
-        <Pressable
+        <SheetHeaderIconButton
+          icon={ExternalLink}
+          label={t("changelog.openWebsite")}
           onPress={handleOpenWebsite}
-          hitSlop={8}
-          style={websiteButtonStyle}
-          accessibilityRole="button"
-          accessibilityLabel={t("changelog.openWebsite")}
           testID="changelog-open-website"
-        >
-          <ThemedExternalLink
-            size={iconButtonChromeGlyphSize("large")}
-            uniProps={mutedColorMapping}
-          />
-        </Pressable>
+        />
       ),
     }),
     [handleOpenWebsite, t],

packages/app/src/command-center/command-center.tsx

@@ -24,10 +24,12 @@ import {
   useSyncExternalStore,
 } from "react";
 import { useTranslation } from "react-i18next";
-import { Check, ChevronRight, Folder, X } from "lucide-react-native";
+import { Check, ChevronRight } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { BottomSheetFlatList, type BottomSheetFlatListMethods } from "@gorhom/bottom-sheet";
-import { useAgentDescriptor, resolveAgentLabel } from "@/agent-presentation";
+import { resolveAgentLabel } from "@/agent-presentation";
+import { useArchivedWorkspaceSearch, type ArchivedWorkspace } from "@/archived-workspaces";
+import { ArchivedBadge } from "@/components/archived-badge";
 import { StatusIcon } from "@/components/status-icon";
 import { useWorkspaceStatus } from "@/workspace-status";
 import type { SurfaceBackdrop } from "@/styles/surface-backdrop";
@@ -35,12 +37,14 @@ import type { Theme } from "@/styles/theme";
 import { HighlightedText, type HighlightedTextProps } from "@/components/ui/highlighted-text";
 import { findHighlightRanges } from "@/components/ui/highlighted-text-segments";
 import { MaterialFileIcon } from "@/components/material-file-icon";
+import { useProviderIcon } from "@/components/provider-icons";
 import { ProjectIconView } from "@/components/project-icon-view";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import {
   EditingTextInput as TextInput,
   type EditingTextInputHandle,
 } from "@/components/ui/text-input";
+import { SegmentedControl, type SegmentedControlOption } from "@/components/ui/segmented-control";
 import { Shortcut } from "@/components/ui/shortcut";
 import {
   IsolatedBottomSheetModal,
@@ -48,18 +52,20 @@ import {
 } from "@/components/ui/isolated-bottom-sheet-modal";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { isNative, isWeb } from "@/constants/platform";
-import { useAggregatedAgents } from "@/hooks/use-aggregated-agents";
+import { useAggregatedAgents, type AggregatedAgent } from "@/hooks/use-aggregated-agents";
 import { useProjects } from "@/hooks/use-projects";
 import { useTimeAgo } from "@/hooks/use-time-ago";
 import { createProjectIconTarget } from "@/projects/icon-target";
 import { useProjectIcons } from "@/projects/icons";
 import { OverlayLayerProvider, useGlobalOverlayLayer } from "@/lib/overlay-root";
-import { useHosts } from "@/runtime/host-runtime";
+import { useHostRuntimeConnectionStatuses, useHosts } from "@/runtime/host-runtime";
+import { useHydratedWorkspaceServerIds } from "@/stores/session-store-hooks";
+import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
+import { useSidebarViewStore } from "@/stores/sidebar-view-store";
 import {
-  useKeyboardShortcutsStore,
-  type CommandCenterScope,
-} from "@/stores/keyboard-shortcuts-store";
-import { navigateToWorkspace } from "@/stores/navigation-active-workspace-store";
+  navigateToWorkspace,
+  useActiveWorkspaceSelection,
+} from "@/stores/navigation-active-workspace-store";
 import { useKeyboardActionDispatcher } from "@/keyboard/keyboard-action-dispatcher-context";
 import {
   clearCommandCenterFocusRestoreElement,
@@ -67,8 +73,8 @@ import {
 } from "@/utils/command-center-focus-restore";
 import { focusWithRetries } from "@/utils/web-focus";
 import { navigateToAgent } from "@/utils/navigate-to-agent";
-import { shortenPath } from "@/utils/shorten-path";
 import { projectIconPlaceholderLabelFromDisplayName } from "@/utils/project-display-name";
+import { getProjectSummaryForHostProject } from "@/utils/projects";
 import {
   COMMAND_CENTER_LINE_HEIGHT,
   COMMAND_CENTER_LIST_METRICS,
@@ -76,21 +82,23 @@ import {
   type CommandCenterListMetrics,
 } from "./list-metrics";
 import { useCommandCenterContributions } from "./provider";
-import { filterAndRankWorkspaces } from "./workspace-search";
+import { createWorkspaceRanker } from "./workspace-search";
 import {
-  buildContributionSections,
-  filterAndRankBuiltInResults,
   joinSubtitleParts,
-  PINNED_SECTION_BAND,
   projectCommandCenterRows,
-  type CommandCenterAgentResult,
   type CommandCenterFileResult,
   type CommandCenterListRow,
   type CommandCenterResult,
-  type CommandCenterResultSection,
-  type CommandCenterSearchFields,
+  type CommandCenterWorkspaceAgent,
   type CommandCenterWorkspaceResult,
 } from "./results";
+import { buildCommandCenterSections } from "./sections";
+import {
+  availableCommandCenterTabs,
+  resolveCommandCenterTab,
+  rotateCommandCenterTab,
+  type CommandCenterTab,
+} from "./tabs";
 import { createCommandCenterInteraction, type CommandCenterInteraction } from "./interaction";
 import { useWorkspaceFileSearch } from "./workspace-file-search";
 
@@ -100,23 +108,16 @@ const ThemedBottomSheetTextInput = withUnistyles(TextInput, (theme) => ({
 const ThemedTextInput = withUnistyles(TextInput, (theme) => ({
   placeholderTextColor: theme.colors.foregroundMuted,
 }));
-const ThemedFolder = withUnistyles(Folder, (theme) => ({ color: theme.colors.foregroundMuted }));
 const ThemedCheck = withUnistyles(Check, (theme) => ({ color: theme.colors.foreground }));
 const ThemedChevronRight = withUnistyles(ChevronRight, (theme) => ({
   color: theme.colors.foregroundMuted,
 }));
-const ThemedX = withUnistyles(X, (theme) => ({ color: theme.colors.foregroundMuted }));
 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner, (theme) => ({
   color: theme.colors.foregroundMuted,
 }));
 const COMMAND_CENTER_SNAP_POINTS = ["60%", "90%"];
 const KEYBOARD_SHOULD_PERSIST_TAPS = "always" as const;
 
-/** `cwd` is not rendered, so a path match must never outrank a match on text the user can see. */
-function agentSearchFields(result: CommandCenterAgentResult): CommandCenterSearchFields {
-  return { visible: [result.title, result.subtitle], hidden: [result.agent.cwd] };
-}
-
 function createWorkspaceResultAction(serverId: string, workspaceId: string) {
   return () => {
     clearCommandCenterFocusRestoreElement();
@@ -124,28 +125,73 @@ function createWorkspaceResultAction(serverId: string, workspaceId: string) {
   };
 }
 
-function createAgentResultAction(serverId: string, agentId: string) {
-  return () => {
+function createAgentResultAction(serverId: string) {
+  return (agentId: string) => {
     clearCommandCenterFocusRestoreElement();
     navigateToAgent({ serverId, agentId });
   };
 }
 
-/**
- * Build every pinned row. Deliberately not keyed on `query`: none of this work depends on what
- * was typed. Ordering belongs to `filterAndRankBuiltInResults`, which ranks on every keystroke.
- */
-function useBuiltInRows(open: boolean): {
-  workspaces: CommandCenterWorkspaceResult[];
-  agents: CommandCenterAgentResult[];
-} {
-  const { t } = useTranslation();
-  const previousRows = useRef(
-    new Map<string, CommandCenterAgentResult | CommandCenterWorkspaceResult>(),
+const NO_WORKSPACE_AGENTS: readonly CommandCenterWorkspaceAgent[] = [];
+
+/** Each workspace's titled agents, most recent first, keyed `serverId:workspaceId`. */
+function groupWorkspaceAgents(
+  agents: readonly AggregatedAgent[],
+): Map<string, CommandCenterWorkspaceAgent[]> {
+  const byWorkspace = new Map<string, CommandCenterWorkspaceAgent[]>();
+  const newestFirst = [...agents].sort(
+    (left, right) => right.lastActivityAt.getTime() - left.lastActivityAt.getTime(),
   );
-  const { agents } = useAggregatedAgents({ demand: open });
-  const { projects } = useProjects({ enabled: open });
-  const showHost = useHosts().length > 1;
+  for (const agent of newestFirst) {
+    const title = resolveAgentLabel(agent.title);
+    if (!agent.workspaceId || !title) continue;
+    const key = `${agent.serverId}:${agent.workspaceId}`;
+    const list = byWorkspace.get(key) ?? [];
+    list.push({ id: agent.id, title, provider: agent.provider });
+    byWorkspace.set(key, list);
+  }
+  return byWorkspace;
+}
+
+function createArchivedAgentAction(serverId: string, workspaceId: string) {
+  // Opening on an agent with the tab pinned is what offers Unarchive, as History does.
+  return (agentId: string) => {
+    clearCommandCenterFocusRestoreElement();
+    navigateToAgent({ serverId, agentId, workspaceId, pin: true });
+  };
+}
+
+function titledAgents(
+  agents: readonly { id: string; title: string | null; provider: string }[],
+): CommandCenterWorkspaceAgent[] {
+  return agents.flatMap((agent) => {
+    const title = resolveAgentLabel(agent.title);
+    return title ? [{ id: agent.id, title, provider: agent.provider }] : [];
+  });
+}
+
+interface WorkspaceRows {
+  active: CommandCenterWorkspaceResult[];
+  archived: CommandCenterWorkspaceResult[];
+  /** The workspace list has not loaded yet, so rows are still arriving. */
+  loading: boolean;
+}
+
+/**
+ * Build every workspace row. Deliberately not keyed on `query`: none of this work depends on
+ * what was typed. Ordering belongs to the workspace ranker, which ranks on every keystroke.
+ * Archived rows come from the host's history search, so they change with its results.
+ */
+function useWorkspaceRows(
+  open: boolean,
+  archivedWorkspaces: readonly ArchivedWorkspace[],
+): WorkspaceRows {
+  const previousRows = useRef(new Map<string, CommandCenterWorkspaceResult>());
+  const { agents, isInitialLoad: agentsLoading } = useAggregatedAgents({ demand: open });
+  const { projects, isLoading: projectsLoading } = useProjects({ enabled: open });
+  const hosts = useHosts();
+  const workspacesArriving = useWorkspacesArriving(open, hosts);
+  const showHost = hosts.length > 1;
   const iconTargets = useMemo(
     () =>
       open
@@ -163,24 +209,26 @@ function useBuiltInRows(open: boolean): {
   );
   const iconDataByProjectViewKey = useProjectIcons({ projects: iconTargets });
 
-  return useMemo(() => {
+  const active = useMemo(() => {
     if (!open) {
       previousRows.current.clear();
-      return { workspaces: [], agents: [] };
+      return [];
     }
-    // Built-in IDs identify immutable navigation targets. Reuse their callbacks and unchanged
+    // Workspace IDs identify immutable navigation targets. Reuse their callbacks and unchanged
     // row data so a directory update does not invalidate every mounted ResultRow.
-    const nextRows = new Map<string, CommandCenterAgentResult | CommandCenterWorkspaceResult>();
-    const preserve = <T extends CommandCenterAgentResult | CommandCenterWorkspaceResult>(
-      row: T,
-    ): T => {
+    const nextRows = new Map<string, CommandCenterWorkspaceResult>();
+    const preserve = (row: CommandCenterWorkspaceResult): CommandCenterWorkspaceResult => {
       const previous = previousRows.current.get(row.id);
-      if (previous) row.run = previous.run;
-      const stable = previous && equal(previous, row) ? (previous as T) : row;
+      if (previous) {
+        row.run = previous.run;
+        row.openAgent = previous.openAgent;
+      }
+      const stable = previous && equal(previous, row) ? previous : row;
       nextRows.set(row.id, stable);
       return stable;
     };
-    const allWorkspaces: CommandCenterWorkspaceResult[] = [];
+    const agentsByWorkspace = groupWorkspaceAgents(agents);
+    const rows: CommandCenterWorkspaceResult[] = [];
     for (const project of projects) {
       const workspaceProject = {
         viewKey: project.viewKey,
@@ -190,10 +238,11 @@ function useBuiltInRows(open: boolean): {
       for (const host of project.hosts) {
         for (const workspace of host.workspaces) {
           if (workspace.archivingAt) continue;
-          allWorkspaces.push(
+          const key = `${host.serverId}:${workspace.id}`;
+          rows.push(
             preserve({
               kind: "workspace",
-              id: `workspace:${host.serverId}:${workspace.id}`,
+              id: `workspace:${key}`,
               title: workspace.title ?? workspace.name,
               subtitle: joinSubtitleParts([
                 showHost ? host.serverName : null,
@@ -205,66 +254,93 @@ function useBuiltInRows(open: boolean): {
               project: workspaceProject,
               changeRequestNumber: workspace.changeRequestNumber,
               activityAt: workspace.statusEnteredAt,
+              agents: agentsByWorkspace.get(key) ?? NO_WORKSPACE_AGENTS,
+              matchedAgent: null,
+              archived: false,
+              background: workspace.background,
               run: createWorkspaceResultAction(host.serverId, workspace.id),
+              openAgent: createAgentResultAction(host.serverId),
             }),
           );
         }
       }
     }
-    const workspaceTitleByKey = new Map(
-      allWorkspaces.map((workspace) => [workspace.id.slice("workspace:".length), workspace.title]),
-    );
-    const agentRows = agents.map<CommandCenterAgentResult>((agent) => {
-      const workspaceTitle = agent.workspaceId
-        ? workspaceTitleByKey.get(`${agent.serverId}:${agent.workspaceId}`)
-        : undefined;
-      return preserve({
-        kind: "agent",
-        id: `agent:${agent.serverId}:${agent.id}`,
-        agent,
-        title: resolveAgentLabel(agent.title) ?? t("workspace.tabs.loading"),
-        subtitle: joinSubtitleParts([
-          showHost ? agent.serverLabel : null,
-          workspaceTitle ?? shortenPath(agent.cwd),
-        ]),
-        activityAt: agent.lastActivityAt,
-        run: createAgentResultAction(agent.serverId, agent.id),
-      });
-    });
     previousRows.current = nextRows;
-    return { workspaces: allWorkspaces, agents: agentRows };
-  }, [agents, iconDataByProjectViewKey, open, projects, showHost, t]);
+    return rows;
+  }, [agents, iconDataByProjectViewKey, open, projects, showHost]);
+
+  const archived = useMemo(() => {
+    const activeIds = new Set(active.map((row) => row.id));
+    const hostLabels = new Map(hosts.map((host) => [host.serverId, host.label]));
+    return archivedWorkspaces.flatMap<CommandCenterWorkspaceResult>((workspace) => {
+      const id = `workspace:${workspace.key}`;
+      // The host's history can trail its workspace list; the active row wins.
+      if (activeIds.has(id)) return [];
+      const project = workspace.projectKey
+        ? getProjectSummaryForHostProject(projects, workspace.serverId, workspace.projectKey)
+        : undefined;
+      const projectName = project?.projectName ?? workspace.projectName ?? workspace.name;
+      const openAgent = createArchivedAgentAction(workspace.serverId, workspace.workspaceId);
+      const latestAgentId = workspace.agents[0].id;
+      return [
+        {
+          kind: "workspace",
+          id,
+          title: workspace.name,
+          subtitle: joinSubtitleParts([
+            showHost ? (hostLabels.get(workspace.serverId) ?? workspace.serverId) : null,
+            projectName,
+            workspace.branch,
+          ]),
+          serverId: workspace.serverId,
+          workspaceId: workspace.workspaceId,
+          project: {
+            viewKey: project?.viewKey ?? `archived:${workspace.key}`,
+            name: projectName,
+            iconDataUri: project ? (iconDataByProjectViewKey.get(project.viewKey) ?? null) : null,
+          },
+          changeRequestNumber: null,
+          activityAt: workspace.archivedAt,
+          agents: titledAgents(workspace.agents),
+          matchedAgent: null,
+          archived: true,
+          background: false,
+          run: () => openAgent(latestAgentId),
+          openAgent,
+        },
+      ];
+    });
+  }, [active, archivedWorkspaces, hosts, iconDataByProjectViewKey, projects, showHost]);
+
+  return {
+    active,
+    archived,
+    // Opening a workspace route loads that workspace before the rest of the directory, so rows
+    // are no sign that the list is complete.
+    loading: agentsLoading || projectsLoading || workspacesArriving,
+  };
 }
 
-function useBuiltInSections(open: boolean, query: string): CommandCenterResultSection[] {
-  const { t } = useTranslation();
-  const rows = useBuiltInRows(open);
-
-  return useMemo(() => {
-    if (!open) return [];
-    return [
-      {
-        id: "workspaces",
-        band: PINNED_SECTION_BAND,
-        rank: 2,
-        title: t("shell.commandCenter.workspaces"),
-        results: filterAndRankWorkspaces(rows.workspaces, query),
-      },
-      {
-        id: "agents",
-        band: PINNED_SECTION_BAND,
-        rank: 3,
-        title: t("shell.commandCenter.agents"),
-        results: filterAndRankBuiltInResults(rows.agents, query, agentSearchFields),
-      },
-    ];
-  }, [open, query, rows, t]);
+/**
+ * An online host's workspaces have not arrived yet. Its agent directory reports ready before
+ * the workspace snapshot lands, so until then the workspace rows are incomplete.
+ */
+function useWorkspacesArriving(open: boolean, hosts: readonly { serverId: string }[]): boolean {
+  const serverIds = useMemo(() => (open ? hosts.map((host) => host.serverId) : []), [hosts, open]);
+  const connectionStatuses = useHostRuntimeConnectionStatuses(serverIds);
+  const hydratedServerIds = useHydratedWorkspaceServerIds(serverIds);
+  return serverIds.some(
+    (serverId) =>
+      connectionStatuses.get(serverId) === "online" && !hydratedServerIds.includes(serverId),
+  );
 }
 
 interface CommandCenterState {
   open: boolean;
-  scope: CommandCenterScope;
-  clearScope(): void;
+  /** The tabs on offer, in the order Tab walks them. */
+  tabs: readonly CommandCenterTab[];
+  tab: CommandCenterTab;
+  selectTab(tab: CommandCenterTab): void;
   query: string;
   setQuery(query: string): void;
   activeId: string | null;
@@ -275,7 +351,7 @@ interface CommandCenterState {
   fileSearchError: string | null;
   close(): void;
   select(result: CommandCenterResult): void;
-  key(key: string): boolean;
+  key(event: { key: string; shiftKey?: boolean }): boolean;
 }
 
 function useCommandCenterState(
@@ -285,62 +361,95 @@ function useCommandCenterState(
   const keyboardActionDispatcher = useKeyboardActionDispatcher();
   const { t } = useTranslation();
   const open = useKeyboardShortcutsStore((state) => state.commandCenterOpen);
-  const scope = useKeyboardShortcutsStore((state) => state.commandCenterScope);
+  const requestedTab = useKeyboardShortcutsStore((state) => state.commandCenterTab);
   const setOpen = useKeyboardShortcutsStore((state) => state.setCommandCenterOpen);
-  const setScope = useKeyboardShortcutsStore((state) => state.setCommandCenterScope);
+  const setTab = useKeyboardShortcutsStore((state) => state.setCommandCenterTab);
   const snapshot = useCommandCenterContributions();
   const inputRef = useRef<EditingTextInputHandle>(null);
   const previousOpenRef = useRef(open);
   const { query, activeId } = useSyncExternalStore(interaction.subscribe, interaction.getSnapshot);
-  const builtInSections = useBuiltInSections(open, query);
+  const activeWorkspace = useActiveWorkspaceSelection();
+  const hasWorkspace = activeWorkspace !== null;
+  const tabs = useMemo(() => availableCommandCenterTabs({ hasWorkspace }), [hasWorkspace]);
+  const tab = resolveCommandCenterTab(requestedTab, tabs);
+  const showBackground = useSidebarViewStore((state) => state.showBackground);
+  const listsWorkspaces = tab === "all" || tab === "workspaces";
+  const archivedSearch = useArchivedWorkspaceSearch(query, {
+    enabled: open && listsWorkspaces,
+  });
+  const workspaceRows = useWorkspaceRows(open, archivedSearch.workspaces);
+  const [rankWorkspaces] = useState(createWorkspaceRanker);
+  const currentWorkspaceId = activeWorkspace
+    ? `workspace:${activeWorkspace.serverId}:${activeWorkspace.workspaceId}`
+    : null;
   const {
     entries: fileSearchEntries,
     loading: fileSearchLoading,
     error: fileSearchError,
     openFile,
   } = useWorkspaceFileSearch({
-    enabled: open && (scope === "files" || Boolean(query.trim())),
+    enabled:
+      open &&
+      tabs.includes("files") &&
+      (tab === "files" || (tab === "all" && Boolean(query.trim()))),
     query,
   });
-  const fileSections = useMemo<CommandCenterResultSection[]>(() => {
-    const results = fileSearchEntries.map<CommandCenterFileResult>((entry) => ({
-      kind: "file",
-      id: `file:${entry.path}`,
-      filePath: entry.path,
-      title: entry.name,
-      subtitle: entry.directory,
-      run: () => openFile(entry.path),
-    }));
-    // File rows are matched by the daemon, so they carry no client-side score and cannot be
-    // relevance-compared against the rows that do. Pinning them keeps the section comparator
-    // total: band is decided before any score is read.
-    return [
-      {
-        id: "files",
-        band: PINNED_SECTION_BAND,
-        rank: 4,
-        title: t("shell.commandCenter.files"),
-        results,
-      },
-    ];
-  }, [fileSearchEntries, openFile, t]);
-  const contributionSections = useMemo(
-    () => buildContributionSections(snapshot.contributions, query),
-    [query, snapshot.contributions],
+  const files = useMemo(
+    () =>
+      fileSearchEntries.map<CommandCenterFileResult>((entry) => ({
+        kind: "file",
+        id: `file:${entry.path}`,
+        filePath: entry.path,
+        title: entry.name,
+        subtitle: entry.directory,
+        run: () => openFile(entry.path),
+      })),
+    [fileSearchEntries, openFile],
+  );
+  const sections = useMemo(
+    () =>
+      open
+        ? buildCommandCenterSections({
+            tab,
+            query,
+            rankWorkspaces,
+            workspaces: workspaceRows.active,
+            archivedWorkspaces: workspaceRows.archived,
+            archivedMatchedByHost: archivedSearch.matchedByHost,
+            showBackground,
+            currentWorkspaceId,
+            contributions: snapshot.contributions,
+            files,
+            titles: {
+              recentWorkspaces: t("shell.commandCenter.recentWorkspaces"),
+              workspaces: t("shell.commandCenter.workspaces"),
+              files: t("shell.commandCenter.files"),
+            },
+          })
+        : [],
+    [
+      archivedSearch.matchedByHost,
+      currentWorkspaceId,
+      files,
+      open,
+      query,
+      rankWorkspaces,
+      showBackground,
+      snapshot.contributions,
+      t,
+      tab,
+      workspaceRows,
+    ],
   );
   const projection = useMemo(
-    () =>
-      projectCommandCenterRows(
-        scope === "files"
-          ? fileSections
-          : [...contributionSections, ...fileSections, ...builtInSections],
-        listMetrics,
-      ),
-    [builtInSections, contributionSections, fileSections, listMetrics, scope],
+    () => projectCommandCenterRows(sections, listMetrics),
+    [listMetrics, sections],
   );
+  const loading =
+    fileSearchLoading || (listsWorkspaces && (archivedSearch.pending || workspaceRows.loading));
   useLayoutEffect(() => {
-    interaction.update({ open, scope, query, projection, loading: fileSearchLoading });
-  }, [interaction, open, scope, query, projection, fileSearchLoading]);
+    interaction.update({ open, tab, query, projection, loading });
+  }, [interaction, open, tab, query, projection, loading]);
 
   const close = useCallback(() => setOpen(false), [setOpen]);
   const select = useCallback(
@@ -350,16 +459,29 @@ function useCommandCenterState(
     },
     [setOpen],
   );
+  const selectTab = useCallback(
+    (next: CommandCenterTab) => {
+      setTab(next);
+      // A tab click must not take typing away from the search field.
+      inputRef.current?.focus();
+    },
+    [setTab],
+  );
   const key = useCallback(
-    (pressed: string): boolean => {
+    (event: { key: string; shiftKey?: boolean }): boolean => {
       if (!open) return false;
+      const pressed = event.key;
       const results = projection.selectableResults;
       if (pressed === "Escape") {
         close();
         return true;
       }
-      if (pressed === "Backspace" && !query.trim() && scope) {
-        setScope(null);
+      if (pressed === "Tab") {
+        setTab(rotateCommandCenterTab(tab, event.shiftKey ? "previous" : "next", tabs));
+        return true;
+      }
+      if (pressed === "Backspace" && !query.trim() && tab !== "all") {
+        setTab("all");
         return true;
       }
       if (pressed === "Enter") {
@@ -377,9 +499,10 @@ function useCommandCenterState(
       projection.selectableResults,
       query,
       activeId,
-      scope,
+      tab,
+      tabs,
       select,
-      setScope,
+      setTab,
       interaction,
     ],
   );
@@ -405,8 +528,9 @@ function useCommandCenterState(
 
   return {
     open,
-    scope,
-    clearScope: () => setScope(null),
+    tabs,
+    tab,
+    selectTab,
     query,
     setQuery: interaction.setQuery,
     activeId,
@@ -536,55 +660,38 @@ function SubtitleWithTimestamp({
   );
 }
 
-const providerIconMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-
-function AgentResultContent({
-  result,
+/**
+ * The third line of a workspace that matched only through one of its agents: which agent, so the
+ * user can tell why the row is here. It starts on the title's rail.
+ */
+function MatchedAgentLine({
+  agent,
+  serverId,
   query,
-  backdrop,
 }: {
-  result: CommandCenterAgentResult;
+  agent: CommandCenterWorkspaceAgent;
+  serverId: string;
   query: string;
-  backdrop: SurfaceBackdrop;
 }) {
-  const agent = result.agent;
-  const descriptor = useAgentDescriptor(
-    { kind: "agent", agentId: agent.id },
-    { serverId: agent.serverId },
-  );
-  const Icon = useMemo(
-    () => withUnistyles(descriptor.icon, providerIconMapping),
-    [descriptor.icon],
-  );
+  const ProviderIcon = useProviderIcon(agent.provider, serverId);
+  const Icon = useMemo(() => withUnistyles(ProviderIcon, providerIconMapping), [ProviderIcon]);
   return (
-    <View style={styles.rowContent} testID={`command-center-agent-${agent.serverId}:${agent.id}`}>
-      <View style={styles.rowMain}>
-        <View style={styles.iconSlot}>
-          <StatusIcon statusBucket={descriptor.statusBucket} size={16} backdrop={backdrop}>
-            <View accessibilityRole="image" accessibilityLabel={descriptor.subtitle}>
-              <Icon size={16} />
-            </View>
-          </StatusIcon>
-        </View>
-        <View style={styles.textContent}>
-          <QueryHighlightedText
-            query={query}
-            text={result.title}
-            style={styles.title}
-            numberOfLines={1}
-          />
-          <SubtitleWithTimestamp
-            query={query}
-            subtitle={result.subtitle}
-            activityAt={result.activityAt}
-            testID="command-center-agent-subtitle"
-          />
-        </View>
+    <View style={styles.agentLine} testID="command-center-workspace-agent">
+      <View style={styles.agentLineIcon}>
+        <Icon size={12} />
       </View>
+      <QueryHighlightedText
+        query={query}
+        text={agent.title}
+        style={[styles.subtitle, styles.subtitleText]}
+        numberOfLines={1}
+      />
     </View>
   );
 }
 
+const providerIconMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+
 function WorkspaceResultIcon({
   result,
   backdrop,
@@ -595,24 +702,27 @@ function WorkspaceResultIcon({
   const statusBucket = useWorkspaceStatus(result.serverId, result.workspaceId);
   return (
     <StatusIcon statusBucket={statusBucket} size={16} backdrop={backdrop}>
-      <View accessibilityElementsHidden importantForAccessibility="no-hide-descendants" aria-hidden>
-        <WorkspaceProjectIcon project={result.project} />
-      </View>
+      <DecorativeProjectIcon project={result.project} />
     </StatusIcon>
   );
 }
 
-/** The same project icon the sidebar's workspace rows lead with: its image, or a lettered square. */
-function WorkspaceProjectIcon({ project }: { project: CommandCenterWorkspaceResult["project"] }) {
+/**
+ * The same project icon the sidebar's workspace rows lead with: its image, or a lettered square.
+ * Hidden from assistive tech so the fallback's initial does not prefix the row's name.
+ */
+function DecorativeProjectIcon({ project }: { project: CommandCenterWorkspaceResult["project"] }) {
   const initial = projectIconPlaceholderLabelFromDisplayName(project.name).charAt(0).toUpperCase();
   return (
-    <ProjectIconView
-      iconDataUri={project.iconDataUri}
-      initial={initial}
-      projectViewKey={project.viewKey}
-      size={16}
-      textStyle={styles.projectIconFallbackText}
-    />
+    <View accessibilityElementsHidden importantForAccessibility="no-hide-descendants" aria-hidden>
+      <ProjectIconView
+        iconDataUri={project.iconDataUri}
+        initial={initial}
+        projectViewKey={project.viewKey}
+        size={16}
+        textStyle={styles.projectIconFallbackText}
+      />
+    </View>
   );
 }
 
@@ -650,17 +760,18 @@ function ResultContent({
       </View>
     );
   }
-  if (result.kind === "agent") {
-    return <AgentResultContent result={result} query={query} backdrop={backdrop} />;
-  }
   if (result.kind === "workspace") {
     const key = result.id.slice("workspace:".length);
     return (
       <View style={styles.rowContent} testID={`command-center-workspace-${key}`}>
         <View style={styles.rowMain}>
-          {/* Decorative: the fallback icon's initial must not prefix the row's accessible name. */}
           <View style={styles.iconSlot}>
-            <WorkspaceResultIcon result={result} backdrop={backdrop} />
+            {/* An archived workspace runs nothing, so it has no status to show. */}
+            {result.archived ? (
+              <DecorativeProjectIcon project={result.project} />
+            ) : (
+              <WorkspaceResultIcon result={result} backdrop={backdrop} />
+            )}
           </View>
           <View style={styles.textContent}>
             <QueryHighlightedText
@@ -675,8 +786,16 @@ function ResultContent({
               activityAt={result.activityAt}
               testID="command-center-workspace-subtitle"
             />
+            {result.matchedAgent ? (
+              <MatchedAgentLine
+                agent={result.matchedAgent}
+                serverId={result.serverId}
+                query={query}
+              />
+            ) : null}
           </View>
         </View>
+        {result.archived ? <ArchivedBadge /> : null}
       </View>
     );
   }
@@ -761,9 +880,24 @@ function SectionRow({ row }: { row: Extract<CommandCenterListRow, { kind: "secti
 }
 
 // Escape arrives without asking; it is registered for `agent.interrupt` anyway.
-// Backspace stays off deliberately — the palette pops its scope with it on web,
+// Backspace stays off deliberately — on web it returns a tab to All when the field is empty,
 // but a registered command would stop the search field deleting text.
 
+const TAB_PLACEHOLDER_KEYS = {
+  all: "shell.commandCenter.placeholder",
+  workspaces: "shell.commandCenter.workspacePlaceholder",
+  files: "shell.commandCenter.filePlaceholder",
+  actions: "shell.commandCenter.actionPlaceholder",
+} as const satisfies Record<CommandCenterTab, string>;
+
+/** The search field names what the tab searches; All names only the kinds on offer. */
+function placeholderKey(tab: CommandCenterTab, tabs: readonly CommandCenterTab[]) {
+  if (tab === "all" && !tabs.includes("files")) {
+    return "shell.commandCenter.placeholderWithoutFiles";
+  }
+  return TAB_PLACEHOLDER_KEYS[tab];
+}
+
 export function CommandCenter() {
   const { t } = useTranslation();
   const isCompact = useIsCompactFormFactor();
@@ -875,22 +1009,42 @@ export function CommandCenter() {
       : {}),
     scrollEventThrottle: 16,
   };
-  const submit = useCallback(() => state.key("Enter"), [state]);
+  const submit = useCallback(() => state.key({ key: "Enter" }), [state]);
   const handleOverlayKeyDown = useCallback(
     (event: KeyboardInputEvent) => {
-      if (!state.key(event.key)) return false;
+      if (!state.key(event)) return false;
       event.preventDefault();
       return true;
     },
     [state],
   );
   const setOverlayScope = useOverlayRegistration({
-    keys: ["Escape", "Enter", "ArrowUp", "ArrowDown"],
+    keys: ["Escape", "Enter", "ArrowUp", "ArrowDown", "Tab"],
     active: state.open,
     layer: modalLayer,
     onKeyDown: handleOverlayKeyDown,
   });
 
+  const tabOptions = useMemo<SegmentedControlOption<CommandCenterTab>[]>(
+    () =>
+      state.tabs.map((tab) => ({
+        value: tab,
+        label: t(`shell.commandCenter.tabs.${tab}`),
+        testID: `command-center-tab-${tab}`,
+      })),
+    [state.tabs, t],
+  );
+  const tabs = (
+    <SegmentedControl
+      options={tabOptions}
+      value={state.tab}
+      onValueChange={state.selectTab}
+      size="sm"
+      testID="command-center-tabs"
+    />
+  );
+  const placeholder = t(placeholderKey(state.tab, state.tabs));
+
   if (showBottomSheet) {
     return (
       <IsolatedBottomSheetModal
@@ -910,32 +1064,28 @@ export function CommandCenter() {
         accessible={false}
       >
         <OverlayLayerProvider layer={modalLayer}>
-          <View style={[styles.bottomSheetHeader, styles.searchRow]} testID="command-center-header">
-            {state.scope === "files" ? (
-              <ScopeChip label={t("shell.commandCenter.files")} onRemove={state.clearScope} />
-            ) : null}
-            <ThemedBottomSheetTextInput
-              testID="command-center-input"
-              ref={bottomSheetInputRef}
-              initialValue={state.query}
-              variant="bottom-sheet"
-              onChangeText={state.setQuery}
-              onSubmitEditing={submit}
-              placeholder={
-                state.scope === "files"
-                  ? t("shell.commandCenter.filePlaceholder")
-                  : t("shell.commandCenter.placeholder")
-              }
-              style={[styles.input, styles.growingInput]}
-              autoCapitalize="none"
-              autoCorrect={false}
-              autoFocus
-            />
-            <FileSearchLoadingIndicator
-              loading={state.fileSearchLoading}
-              label={t("shell.commandCenter.searchingFiles")}
-            />
+          <View style={styles.header} testID="command-center-header">
+            <View style={styles.searchRow}>
+              <ThemedBottomSheetTextInput
+                testID="command-center-input"
+                ref={bottomSheetInputRef}
+                initialValue={state.query}
+                variant="bottom-sheet"
+                onChangeText={state.setQuery}
+                onSubmitEditing={submit}
+                placeholder={placeholder}
+                style={[styles.input, styles.growingInput]}
+                autoCapitalize="none"
+                autoCorrect={false}
+                autoFocus
+              />
+              <FileSearchLoadingIndicator
+                loading={state.fileSearchLoading}
+                label={t("shell.commandCenter.searchingFiles")}
+              />
+            </View>
           </View>
+          <View style={styles.tabBar}>{tabs}</View>
           {fileSearchError}
           <BottomSheetFlatList ref={bottomSheetListRef} {...commonListProps} />
         </OverlayLayerProvider>
@@ -949,30 +1099,26 @@ export function CommandCenter() {
         <View style={styles.overlay}>
           <Pressable style={styles.backdrop} onPress={state.close} />
           <View ref={setOverlayScope} testID="command-center-panel" style={styles.panel}>
-            <View style={[styles.header, styles.searchRow]} testID="command-center-header">
-              {state.scope === "files" ? (
-                <ScopeChip label={t("shell.commandCenter.files")} onRemove={state.clearScope} />
-              ) : null}
-              <ThemedTextInput
-                testID="command-center-input"
-                ref={state.inputRef}
-                initialValue={state.query}
-                onChangeText={state.setQuery}
-                placeholder={
-                  state.scope === "files"
-                    ? t("shell.commandCenter.filePlaceholder")
-                    : t("shell.commandCenter.placeholder")
-                }
-                style={[styles.input, styles.growingInput]}
-                autoCapitalize="none"
-                autoCorrect={false}
-                autoFocus
-              />
-              <FileSearchLoadingIndicator
-                loading={state.fileSearchLoading}
-                label={t("shell.commandCenter.searchingFiles")}
-              />
+            <View style={styles.header} testID="command-center-header">
+              <View style={styles.searchRow}>
+                <ThemedTextInput
+                  testID="command-center-input"
+                  ref={state.inputRef}
+                  initialValue={state.query}
+                  onChangeText={state.setQuery}
+                  placeholder={placeholder}
+                  style={[styles.input, styles.growingInput]}
+                  autoCapitalize="none"
+                  autoCorrect={false}
+                  autoFocus
+                />
+                <FileSearchLoadingIndicator
+                  loading={state.fileSearchLoading}
+                  label={t("shell.commandCenter.searchingFiles")}
+                />
+              </View>
             </View>
+            <View style={styles.tabBar}>{tabs}</View>
             {fileSearchError}
             <FlatList ref={listRef} {...commonListProps} />
           </View>
@@ -998,25 +1144,6 @@ function FileSearchLoadingIndicator({ loading, label }: { loading: boolean; labe
   );
 }
 
-// The chip sits at the input's own height and type size so it reads as the scope of the field
-// rather than a badge dropped into the query. Its 28px matches the input's line box, so showing or
-// dropping the scope cannot resize the header.
-function ScopeChip({ label, onRemove }: { label: string; onRemove(): void }) {
-  return (
-    <Pressable
-      accessibilityRole="button"
-      accessibilityLabel={label}
-      onPress={onRemove}
-      style={styles.scopeChip}
-      testID="command-center-files-scope"
-    >
-      <ThemedFolder size={14} strokeWidth={2.2} />
-      <Text style={styles.scopeChipLabel}>{label}</Text>
-      <ThemedX size={12} strokeWidth={2.2} />
-    </Pressable>
-  );
-}
-
 const styles = StyleSheet.create((theme) => ({
   overlay: {
     flex: 1,
@@ -1043,11 +1170,12 @@ const styles = StyleSheet.create((theme) => ({
     borderBottomWidth: 1,
     borderBottomColor: theme.colors.border,
   },
-  bottomSheetHeader: {
+  // Below the divider, above the list. The first section label brings its own top gap, so the
+  // pills sit with equal space above and below. A fixed bar, so switching tabs never moves the
+  // field or the list.
+  tabBar: {
     paddingHorizontal: theme.spacing[4],
-    paddingVertical: theme.spacing[3],
-    borderBottomWidth: 1,
-    borderBottomColor: theme.colors.border,
+    paddingTop: COMMAND_CENTER_SECTION_GAP,
   },
   input: {
     fontSize: theme.fontSize.base,
@@ -1058,25 +1186,6 @@ const styles = StyleSheet.create((theme) => ({
   growingInput: { flex: 1, minWidth: 0 },
   searchRow: { flexDirection: "row", alignItems: "center", gap: theme.spacing[2] },
   fileSearchStatus: { width: 14, height: 14, alignItems: "center", justifyContent: "center" },
-  scopeChip: {
-    // Stretching to the row rather than setting a height keeps the chip exactly as tall as the
-    // input's line box, so showing or dropping the scope can never resize the header.
-    alignSelf: "stretch",
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1.5],
-    marginRight: theme.spacing[1],
-    paddingHorizontal: theme.spacing[2],
-    borderRadius: theme.borderRadius.md,
-    borderWidth: 1,
-    borderColor: theme.colors.borderAccent,
-    backgroundColor: theme.colors.surface2,
-  },
-  scopeChipLabel: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-    fontWeight: "500",
-  },
   results: { flex: 1 },
   // Sections and rows take their height from list-metrics; these styles only place content in it.
   section: { justifyContent: "flex-end" },
@@ -1129,6 +1238,14 @@ const styles = StyleSheet.create((theme) => ({
   },
   subtitleLine: { flexDirection: "row", minWidth: 0 },
   subtitleText: { flexShrink: 1, minWidth: 0 },
+  agentLine: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1.5],
+    minWidth: 0,
+    height: COMMAND_CENTER_LINE_HEIGHT.agent,
+  },
+  agentLineIcon: { width: 12, alignItems: "center", justifyContent: "center" },
   iconSlot: {
     width: 16,
     height: COMMAND_CENTER_LINE_HEIGHT.singleLine,

packages/app/src/command-center/interaction.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 import { createCommandCenterInteraction } from "./interaction";
 import { projectCommandCenterRows, type CommandCenterFileResult } from "./results";
-import type { CommandCenterScope } from "@/stores/keyboard-shortcuts-store";
+import type { CommandCenterTab } from "./tabs";
 
 function results(ids = ["a", "b", "c", "d"]) {
   return projectCommandCenterRows(
@@ -21,17 +21,17 @@ function results(ids = ["a", "b", "c", "d"]) {
         })),
       },
     ],
-    { singleLineRow: 40, twoLineRow: 60, sectionTitle: 20, sectionDivider: 10 },
+    { singleLineRow: 40, twoLineRow: 60, threeLineRow: 80, sectionTitle: 20, sectionDivider: 10 },
   );
 }
 
-function setup(options: { scope?: CommandCenterScope; measured?: boolean } = {}) {
+function setup(options: { tab?: CommandCenterTab; measured?: boolean } = {}) {
   const offsets: number[] = [];
   const model = createCommandCenterInteraction((offset) => offsets.push(offset));
   const publish = (ids = ["a", "b", "c", "d"], loading = false) =>
     model.update({
       open: true,
-      scope: options.scope ?? null,
+      tab: options.tab ?? "all",
       query: model.getSnapshot().query,
       projection: results(ids),
       loading,
@@ -53,6 +53,45 @@ describe("Command Center interaction", () => {
     expect(offsets).toEqual([]);
   });
 
+  it("follows the first result while results load, so Enter does not run what rendered first", () => {
+    const { model, publish } = setup();
+    model.setQuery("");
+    // Recent workspaces lead All and arrive after the actions below them.
+    publish(["new-workspace", "settings"], true);
+    expect(model.getSnapshot().activeId).toBe("new-workspace");
+    publish(["recent", "new-workspace", "settings"]);
+    expect(model.getSnapshot().activeId).toBe("recent");
+  });
+
+  it("keeps the selected row when settled results reorder", () => {
+    const { model, publish } = setup();
+    expect(model.getSnapshot().activeId).toBe("a");
+    // Another workspace's agent changed status, so it moves to the top of Recent workspaces.
+    publish(["b", "a", "c", "d"]);
+    expect(model.getSnapshot().activeId).toBe("a");
+  });
+
+  it("keeps the selected row when results land above it after the query settled", () => {
+    const { model, publish } = setup();
+    model.setQuery("invoice");
+    // Files arrive while archived workspaces are still being searched.
+    publish(["file-1", "file-2"], true);
+    expect(model.getSnapshot().activeId).toBe("file-1");
+    publish(["archived", "file-1", "file-2"]);
+    expect(model.getSnapshot().activeId).toBe("archived");
+    publish(["archived-2", "archived", "file-1", "file-2"]);
+    expect(model.getSnapshot().activeId).toBe("archived");
+  });
+
+  it("keeps the user's pick while results are still loading", () => {
+    const { model, publish } = setup();
+    model.setQuery("q");
+    publish(["a", "b"], true);
+    model.move("next");
+    publish(["z", "a", "b"], true);
+    expect(model.getSnapshot().activeId).toBe("b");
+  });
+
   it("reveals only clipped keyboard selections and wraps around", () => {
     const { model, offsets } = setup();
     expect(model.move("next")).toBe(true);
@@ -120,7 +159,7 @@ describe("Command Center interaction", () => {
   });
 
   it("waits for scoped search results instead of revealing the previous query's rows", () => {
-    const { model, offsets, publish } = setup({ scope: "files" });
+    const { model, offsets, publish } = setup({ tab: "files" });
     model.scrolled(100);
     model.setQuery("new");
     publish(["a", "b"], true);
@@ -132,7 +171,7 @@ describe("Command Center interaction", () => {
   });
 
   it("manual interaction cancels a reveal awaiting search results", () => {
-    const { model, offsets, publish } = setup({ scope: "files" });
+    const { model, offsets, publish } = setup({ tab: "files" });
     model.setQuery("new");
     publish([], true);
     model.beginManualScroll();
@@ -153,13 +192,29 @@ describe("Command Center interaction", () => {
     expect(offsets).toEqual([]);
   });
 
-  it("scope changes reset selection and request a reveal", () => {
+  it("tab changes select the first result and return the list to the top", () => {
     const { model, offsets } = setup();
     model.move("next");
+    model.move("next");
+    model.move("next");
     model.scrolled(100);
-    model.update({ open: true, scope: "files", query: "", projection: results(), loading: false });
+    model.update({ open: true, tab: "files", query: "", projection: results(), loading: false });
     expect(model.getSnapshot().activeId).toBe("a");
-    expect(offsets).toEqual([20, 20]);
+    expect(offsets.at(-1)).toBe(0);
+  });
+
+  it("tab changes keep the query", () => {
+    const { model, publish } = setup();
+    model.setQuery("b");
+    publish(["b"]);
+    model.update({
+      open: true,
+      tab: "workspaces",
+      query: "b",
+      projection: results(["b"]),
+      loading: false,
+    });
+    expect(model.getSnapshot()).toEqual({ query: "b", activeId: "b" });
   });
 
   it("close discards the old query, metrics, and deferred reveal", () => {
@@ -167,7 +222,7 @@ describe("Command Center interaction", () => {
     model.setQuery("old");
     publish();
     model.move("previous");
-    model.update({ open: false, scope: null, query: "old", projection: results(), loading: false });
+    model.update({ open: false, tab: "all", query: "old", projection: results(), loading: false });
     model.layout(80);
     expect(model.getSnapshot()).toEqual({ query: "", activeId: null });
     expect(offsets).toEqual([]);

packages/app/src/command-center/interaction.ts

@@ -1,9 +1,9 @@
-import type { CommandCenterScope } from "@/stores/keyboard-shortcuts-store";
 import {
   moveActiveResultId,
   preserveActiveResultId,
   type CommandCenterListProjection,
 } from "./results";
+import type { CommandCenterTab } from "./tabs";
 
 interface Snapshot {
   query: string;
@@ -12,21 +12,28 @@ interface Snapshot {
 
 interface ResultsInput {
   open: boolean;
-  scope: CommandCenterScope;
+  tab: CommandCenterTab;
   query: string;
   projection: CommandCenterListProjection;
+  /** A source of this query's and tab's results is still loading. */
   loading: boolean;
 }
 
-/** Selection persists; permission to move the viewport lasts for one user command. */
+/**
+ * While a query's or tab's results are still loading, the selection follows the first result,
+ * so Enter right after opening runs what ends up on top rather than whatever rendered first.
+ * Once they have all loaded, or the user moves the selection, it stays on its row by ID through
+ * any later reordering. Permission to move the viewport lasts for one user command.
+ */
 export function createCommandCenterInteraction(scrollToOffset: (offset: number) => void) {
   let snapshot: Snapshot = { query: "", activeId: null };
   const listeners = new Set<() => void>();
   let open = false;
-  let scope: CommandCenterScope = null;
+  let tab: CommandCenterTab = "all";
   let projection: CommandCenterListProjection | null = null;
   let loading = false;
   let revealPending = false;
+  let followingFirst = true;
   let offset = 0;
   let visibleLength = 0;
 
@@ -38,8 +45,8 @@ export function createCommandCenterInteraction(scrollToOffset: (offset: number)
 
   function reveal() {
     if (!open || !revealPending || !projection || visibleLength <= 0) return;
-    // Scoped file search keeps its previous entries while the next query is loading.
-    if (scope === "files" && loading) return;
+    // The Files tab keeps its previous entries while the next query is loading.
+    if (tab === "files" && loading) return;
     if (!snapshot.activeId) {
       if (!loading) revealPending = false;
       return;
@@ -67,9 +74,10 @@ export function createCommandCenterInteraction(scrollToOffset: (offset: number)
       };
     },
     update(input: ResultsInput) {
-      const resetSelection = input.open && (!open || scope !== input.scope);
+      const tabChanged = open && input.open && tab !== input.tab;
+      const resetSelection = input.open && (!open || tabChanged);
       open = input.open;
-      scope = input.scope;
+      tab = input.tab;
       if (!open) {
         projection = null;
         revealPending = false;
@@ -80,33 +88,44 @@ export function createCommandCenterInteraction(scrollToOffset: (offset: number)
       }
       if (resetSelection) {
         revealPending = true;
+        followingFirst = true;
         publish({ ...snapshot, activeId: null });
       }
+      // A tab is a different list: it starts at its top, section label included.
+      if (tabChanged && offset !== 0) {
+        offset = 0;
+        scrollToOffset(0);
+      }
       // A query command invalidates the old projection until React supplies its new results.
       if (input.query !== snapshot.query) return;
       projection = input.projection;
       loading = input.loading;
-      if (scope !== "files" || !loading) {
+      if (tab !== "files" || !loading) {
         publish({
           ...snapshot,
-          activeId: preserveActiveResultId(snapshot.activeId, projection.selectableResults),
+          activeId: followingFirst
+            ? (projection.selectableResults[0]?.id ?? null)
+            : preserveActiveResultId(snapshot.activeId, projection.selectableResults),
         });
+        if (!loading) followingFirst = false;
       }
       reveal();
     },
     setQuery(query: string) {
       projection = null;
       revealPending = true;
+      followingFirst = true;
       publish({ query, activeId: null });
     },
     move(direction: "next" | "previous"): boolean {
       if (
         !open ||
         !projection ||
-        (scope === "files" && loading) ||
+        (tab === "files" && loading) ||
         projection.selectableResults.length === 0
       )
         return false;
+      followingFirst = false;
       publish({
         ...snapshot,
         activeId: moveActiveResultId(snapshot.activeId, projection.selectableResults, direction),

packages/app/src/command-center/list-metrics.ts

@@ -16,6 +16,8 @@ export const COMMAND_CENTER_LINE_HEIGHT = {
   singleLine: 20,
   title: 18,
   subtitle: 16,
+  /** The matched-agent line under a workspace's subtitle. */
+  agent: 16,
   sectionLabel: 16,
 } as const;
 
@@ -26,6 +28,8 @@ const SECTION_DIVIDER_THICKNESS = 1;
 export interface CommandCenterListMetrics {
   singleLineRow: number;
   twoLineRow: number;
+  /** A workspace row that also names the agent the query matched. */
+  threeLineRow: number;
   /** A section label and the gaps around it. */
   sectionTitle: number;
   /** The rule between two sections and the gaps around it. */
@@ -37,6 +41,7 @@ function listMetrics(rowInset: number): CommandCenterListMetrics {
   return {
     singleLineRow: rowInset + line.singleLine + rowInset,
     twoLineRow: rowInset + line.title + line.subtitle + rowInset,
+    threeLineRow: rowInset + line.title + line.subtitle + line.agent + rowInset,
     sectionTitle: COMMAND_CENTER_SECTION_GAP + line.sectionLabel + COMMAND_CENTER_SECTION_GAP,
     sectionDivider:
       COMMAND_CENTER_SECTION_GAP + SECTION_DIVIDER_THICKNESS + COMMAND_CENTER_SECTION_GAP,

packages/app/src/command-center/results.test.ts

@@ -3,7 +3,6 @@ import type { CommandCenterContribution } from "./contributions";
 import { COMMAND_CENTER_LIST_METRICS } from "./list-metrics";
 import {
   buildContributionSections,
-  filterAndRankBuiltInResults,
   joinSubtitleParts,
   moveActiveResultId,
   PINNED_SECTION_BAND,
@@ -11,6 +10,7 @@ import {
   projectCommandCenterRows,
   type CommandCenterWorkspaceResult,
 } from "./results";
+import { createWorkspaceRanker } from "./workspace-search";
 
 function contribution(input: {
   id: string;
@@ -118,7 +118,12 @@ function workspace(
     project: { viewKey: "project", name: "project", iconDataUri: null },
     changeRequestNumber: null,
     activityAt,
+    agents: [],
+    matchedAgent: null,
+    archived: false,
+    background: false,
     run: () => undefined,
+    openAgent: () => undefined,
   };
 }
 
@@ -184,6 +189,40 @@ describe("Command Center result projection", () => {
     expect(sectionResultIds(buildContributionSections(contributions, "home"))).toEqual(["home"]);
   });
 
+  it("lists query-only actions without a query when asked to browse them", () => {
+    const contributions = [
+      contribution({ id: "settings", group: "actions", groupRank: 0 }),
+      contribution({ id: "opus", group: "models", groupRank: 1, visibility: "query" }),
+    ];
+
+    expect(
+      sectionResultIds(buildContributionSections(contributions, "", { includeQueryOnly: true })),
+    ).toEqual(["settings", "opus"]);
+  });
+
+  it("gives a workspace row matched through an agent room for its agent line", () => {
+    const matched = {
+      ...workspace("workspace:matched"),
+      matchedAgent: { id: "agent", title: "Add receipt emails", provider: "mock" },
+    };
+    const projection = projectCommandCenterRows(
+      [
+        {
+          id: "workspaces",
+          band: PINNED_SECTION_BAND,
+          rank: 2,
+          results: [workspace("workspace:plain"), matched],
+        },
+      ],
+      metrics,
+    );
+    expect(projection.rows.map((row) => row.height)).toEqual([
+      metrics.twoLineRow,
+      metrics.threeLineRow,
+    ]);
+    expect(metrics.threeLineRow).toBeGreaterThan(metrics.twoLineRow);
+  });
+
   it("preserves active selection by id and falls back to the first result", () => {
     const first = workspace("workspace:first");
     const second = workspace("workspace:second");
@@ -486,25 +525,9 @@ describe("Command Center query tokenization", () => {
   });
 });
 
-describe("filterAndRankBuiltInResults", () => {
-  const visibleOnly = (row: CommandCenterWorkspaceResult) => ({
-    visible: [row.title, row.subtitle],
-    hidden: [],
-  });
-
-  it("shows the five most recent rows for an empty query", () => {
-    const rows = Array.from({ length: 8 }, (_, index) =>
-      workspace(`w${index}`, `w${index}`, "host", minutesAgo(8 - index)),
-    );
-
-    expect(filterAndRankBuiltInResults(rows, "", visibleOnly).map((row) => row.id)).toEqual([
-      "w7",
-      "w6",
-      "w5",
-      "w4",
-      "w3",
-    ]);
-  });
+describe("workspace ranking", () => {
+  const rank = (rows: readonly CommandCenterWorkspaceResult[], query: string) =>
+    createWorkspaceRanker()(rows, query).map((row) => row.id);
 
   it("puts the best match first even when it sorts last alphabetically", () => {
     const rows = [
@@ -514,22 +537,7 @@ describe("filterAndRankBuiltInResults", () => {
     ];
 
     // Alphabetically this is Alpha, Label, Zebra. "lab des" only matches Label as Design.
-    expect(filterAndRankBuiltInResults(rows, "lab des", visibleOnly).map((row) => row.id)).toEqual([
-      "c",
-    ]);
-  });
-
-  it("ranks a title match above a match that only the hidden field reached", () => {
-    const rows = [workspace("hidden-hit", "Unrelated"), workspace("title-hit", "Deploy")];
-    const fields = (row: CommandCenterWorkspaceResult) =>
-      row.id === "hidden-hit"
-        ? { visible: [row.title], hidden: ["deploy"] }
-        : { visible: [row.title], hidden: [] };
-
-    expect(filterAndRankBuiltInResults(rows, "deploy", fields).map((row) => row.id)).toEqual([
-      "title-hit",
-      "hidden-hit",
-    ]);
+    expect(rank(rows, "lab des")).toEqual(["c"]);
   });
 
   it("orders rows in the same match tier by recency, not by where the word sits", () => {
@@ -539,10 +547,7 @@ describe("filterAndRankBuiltInResults", () => {
       workspace("newer", "design the cli interface to expose usage data", "host", minutesAgo(5)),
     ];
 
-    expect(filterAndRankBuiltInResults(rows, "usage", visibleOnly).map((row) => row.id)).toEqual([
-      "newer",
-      "older",
-    ]);
+    expect(rank(rows, "usage")).toEqual(["newer", "older"]);
   });
 
   it("keeps a better match tier above a more recent weaker match", () => {
@@ -551,16 +556,13 @@ describe("filterAndRankBuiltInResults", () => {
       workspace("whole-word", "Usage hover card", "host", minutesAgo(600)),
     ];
 
-    expect(filterAndRankBuiltInResults(rows, "usage", visibleOnly).map((row) => row.id)).toEqual([
-      "whole-word",
-      "subsequence",
-    ]);
+    expect(rank(rows, "usage")).toEqual(["whole-word", "subsequence"]);
   });
 
   it("drops a row when one token matches nothing", () => {
     const rows = [workspace("a", "Label as Design")];
 
-    expect(filterAndRankBuiltInResults(rows, "lab zzz", visibleOnly)).toEqual([]);
+    expect(rank(rows, "lab zzz")).toEqual([]);
   });
 });
 

packages/app/src/command-center/results.ts

@@ -1,12 +1,15 @@
-import type { AggregatedAgent } from "@/hooks/use-aggregated-agents";
 import {
   compareMatchScores,
+  type MatchClass,
   type MatchScore,
   scoreTextFields,
+  textFieldsMatchClass,
 } from "@getpaseo/protocol/search/text-match";
 import type { CommandCenterContribution } from "./contributions";
 import type { CommandCenterListMetrics } from "./list-metrics";
 
+/** Sections pinned above every contribution section. */
+export const LEADING_SECTION_BAND = -1;
 /** Sections that reorder by how well they match the query. */
 export const CONTRIBUTION_SECTION_BAND = 0;
 /** Sections pinned below every contribution section regardless of match quality. */
@@ -50,6 +53,13 @@ export interface CommandCenterWorkspaceProject {
   iconDataUri: string | null;
 }
 
+/** An agent a workspace can be found by. Agents are never results of their own. */
+export interface CommandCenterWorkspaceAgent {
+  id: string;
+  title: string;
+  provider: string;
+}
+
 export interface CommandCenterWorkspaceResult {
   kind: "workspace";
   id: string;
@@ -60,18 +70,19 @@ export interface CommandCenterWorkspaceResult {
   project: CommandCenterWorkspaceProject;
   /** PR/MR number backing this workspace, so a number query can match it exactly. */
   changeRequestNumber: number | null;
+  /** Last activity, or when it was archived for an archived workspace. */
   activityAt: Date | null;
+  /** The workspace's agents, most recent first. Part of what the workspace matches on. */
+  agents: readonly CommandCenterWorkspaceAgent[];
+  /** The agent the query matched better than the workspace's own text. Drawn as a third line. */
+  matchedAgent: CommandCenterWorkspaceAgent | null;
+  archived: boolean;
+  /** Started by automation rather than the user. Found by a query, never listed as recent. */
+  background: boolean;
+  /** Opens the workspace and lets its default tab selection apply. */
   run(): void;
-}
-
-export interface CommandCenterAgentResult {
-  kind: "agent";
-  id: string;
-  agent: AggregatedAgent;
-  title: string;
-  subtitle: string;
-  activityAt: Date | null;
-  run(): void;
+  /** Opens the workspace on this agent's tab. */
+  openAgent(agentId: string): void;
 }
 
 export interface CommandCenterFileResult {
@@ -94,13 +105,12 @@ export interface CommandCenterContributionResult {
 
 export type CommandCenterResult =
   | CommandCenterWorkspaceResult
-  | CommandCenterAgentResult
   | CommandCenterFileResult
   | CommandCenterContributionResult;
 
 export interface CommandCenterResultSection {
   id: string;
-  /** CONTRIBUTION_SECTION_BAND or PINNED_SECTION_BAND. Compared before anything else. */
+  /** LEADING, CONTRIBUTION or PINNED_SECTION_BAND. Compared before anything else. */
   band: number;
   rank: number;
   title?: string;
@@ -162,6 +172,14 @@ export function scoreSearchFields(
   return match ? { fieldRank: KEYWORD_FIELD_RANK, match } : null;
 }
 
+/** How closely the query matched the fields; see `MatchClass`. Null when it does not match. */
+export function searchFieldsMatchClass(
+  query: string,
+  fields: CommandCenterSearchFields,
+): MatchClass | null {
+  return textFieldsMatchClass(query, [...fields.visible, ...fields.hidden]);
+}
+
 /** Join non-empty subtitle parts with " · ", dropping null/undefined/empty. */
 export function joinSubtitleParts(parts: readonly (string | null | undefined)[]): string {
   return parts.filter((part): part is string => Boolean(part)).join(" · ");
@@ -181,12 +199,18 @@ function contributionSearchFields(
   return { visible, hidden: contribution.keywords };
 }
 
-/** Whether the row draws a second, subtitle line under its title. */
-function hasSubtitleLine(result: CommandCenterResult): boolean {
-  if (result.kind === "workspace" || result.kind === "agent") return true;
-  if (result.kind === "file") return false;
+/** How many lines of text the row draws, which decides its height. */
+function resultLineCount(result: CommandCenterResult): 1 | 2 | 3 {
+  if (result.kind === "workspace") return result.matchedAgent ? 3 : 2;
+  if (result.kind === "file") return 1;
   const presentation = result.contribution.presentation;
-  return presentation.kind === "action" && Boolean(presentation.subtitle);
+  return presentation.kind === "action" && presentation.subtitle ? 2 : 1;
+}
+
+function resultHeight(result: CommandCenterResult, metrics: CommandCenterListMetrics): number {
+  const lines = resultLineCount(result);
+  if (lines === 3) return metrics.threeLineRow;
+  return lines === 2 ? metrics.twoLineRow : metrics.singleLineRow;
 }
 
 /**
@@ -211,10 +235,7 @@ function resultScore(result: CommandCenterResult): CommandCenterScore | undefine
   return result.kind === "contribution" ? result.score : undefined;
 }
 
-/** Rows shown when nothing has been typed, per pinned category. */
-const DEFAULT_CATEGORY_RESULT_LIMIT = 5;
-
-/** A built-in row (workspace or agent) that orders by how recently it saw activity. */
+/** A built-in row that orders by how recently it saw activity. */
 export interface CommandCenterRecentRow {
   activityAt: Date | null;
 }
@@ -235,44 +256,20 @@ export function compareBuiltInScores(left: CommandCenterScore, right: CommandCen
 }
 
 /**
- * Filter and rank already-built rows. Rows in, rows out — building them needs translations,
- * navigation callbacks and the project tree, none of which matching cares about, so that stays
- * with the caller and this stays testable without mounting React.
- *
- * Rows rank by `compareBuiltInScores`; rows that rank equally, including every row of an empty
- * query, go most recent first.
+ * Group contributions into their sections, ranked by the query. `includeQueryOnly` lists the
+ * contributions that otherwise wait for a query, for a list whose whole job is browsing them.
  */
-export function filterAndRankBuiltInResults<Row extends CommandCenterRecentRow>(
-  rows: readonly Row[],
-  query: string,
-  fieldsOf: (row: Row) => CommandCenterSearchFields,
-): Row[] {
-  if (!query.trim()) {
-    return [...rows].sort(compareByRecency).slice(0, DEFAULT_CATEGORY_RESULT_LIMIT);
-  }
-
-  const scored: { row: Row; score: CommandCenterScore }[] = [];
-  for (const row of rows) {
-    const score = scoreSearchFields(query, fieldsOf(row));
-    if (score) scored.push({ row, score });
-  }
-  scored.sort(
-    (left, right) =>
-      compareBuiltInScores(left.score, right.score) || compareByRecency(left.row, right.row),
-  );
-  return scored.map((entry) => entry.row);
-}
-
 export function buildContributionSections(
   contributions: readonly CommandCenterContribution[],
   query: string,
+  options: { includeQueryOnly?: boolean } = {},
 ): CommandCenterResultSection[] {
   const groups = new Map<string, MutableCommandCenterResultSection>();
   const registryIndexById = new Map<string, number>();
   const hasQuery = Boolean(query.trim());
 
   for (const [index, contribution] of contributions.entries()) {
-    if (contribution.visibility === "query" && !hasQuery) continue;
+    if (contribution.visibility === "query" && !hasQuery && !options.includeQueryOnly) continue;
     let score: CommandCenterScore | undefined;
     if (hasQuery) {
       // The score is the filter: null means no token found a home, so the row is out.
@@ -351,7 +348,7 @@ export function projectCommandCenterRows(
       offset += sectionHeight;
     }
     for (const result of section.results) {
-      const height = hasSubtitleLine(result) ? metrics.twoLineRow : metrics.singleLineRow;
+      const height = resultHeight(result, metrics);
       offsets.push(offset);
       rowIndexByResultId.set(result.id, rows.length);
       rows.push({ kind: "result", key: result.id, result, height });

packages/app/src/command-center/sections.test.ts

@@ -0,0 +1,181 @@
+import { describe, expect, it } from "vitest";
+import type { CommandCenterContribution } from "./contributions";
+import type { CommandCenterFileResult, CommandCenterWorkspaceResult } from "./results";
+import { COMMAND_CENTER_LIST_METRICS } from "./list-metrics";
+import { projectCommandCenterRows } from "./results";
+import { buildCommandCenterSections } from "./sections";
+import type { CommandCenterTab } from "./tabs";
+import { createWorkspaceRanker } from "./workspace-search";
+
+function workspace(
+  id: string,
+  options: {
+    daysAgo?: number;
+    title?: string;
+    archived?: boolean;
+    background?: boolean;
+    agentTitle?: string;
+  } = {},
+): CommandCenterWorkspaceResult {
+  return {
+    kind: "workspace",
+    id: `workspace:server:${id}`,
+    serverId: "server",
+    workspaceId: id,
+    title: options.title ?? id,
+    subtitle: "project · main",
+    project: { viewKey: "project", name: "project", iconDataUri: null },
+    changeRequestNumber: null,
+    activityAt: new Date(Date.UTC(2026, 9, 30) - (options.daysAgo ?? 0) * 86_400_000),
+    agents: options.agentTitle
+      ? [{ id: `${id}-agent`, title: options.agentTitle, provider: "mock" }]
+      : [],
+    matchedAgent: null,
+    archived: options.archived ?? false,
+    background: options.background ?? false,
+    run: () => undefined,
+    openAgent: () => undefined,
+  };
+}
+
+function action(id: string, group: string, visibility: "always" | "query" = "always") {
+  return {
+    id,
+    group,
+    groupRank: group === "workspace" ? 0 : 1,
+    rank: 0,
+    keywords: [],
+    visibility,
+    run: () => undefined,
+    presentation: { kind: "action", title: id, sectionTitle: group },
+  } satisfies CommandCenterContribution;
+}
+
+const file: CommandCenterFileResult = {
+  kind: "file",
+  id: "file:src/index.ts",
+  filePath: "src/index.ts",
+  title: "index.ts",
+  subtitle: "src",
+  run: () => undefined,
+};
+
+const workspaces = [
+  workspace("current", { daysAgo: 0 }),
+  workspace("payments", { daysAgo: 1, title: "Payments refactor" }),
+  // Started by automation; more recent than the workspaces below it.
+  workspace("nightly", { daysAgo: 1.5, title: "Nightly triage", background: true }),
+  workspace("onboarding", { daysAgo: 2, title: "Onboarding flow", agentTitle: "Add receipts" }),
+  workspace("docs", { daysAgo: 3, title: "Docs site" }),
+  workspace("search", { daysAgo: 4, title: "Search ranking" }),
+];
+const archived = [workspace("billing", { title: "Billing cleanup", archived: true })];
+const contributions = [
+  action("New agent", "workspace"),
+  action("Settings", "actions"),
+  action("Group by status", "actions", "query"),
+];
+
+function listed(
+  tab: CommandCenterTab,
+  query: string,
+  options: { archivedMatchedByHost?: boolean; showBackground?: boolean } = {},
+) {
+  const sections = buildCommandCenterSections({
+    tab,
+    query,
+    rankWorkspaces: createWorkspaceRanker(),
+    workspaces,
+    archivedWorkspaces: query ? archived : [],
+    archivedMatchedByHost: options.archivedMatchedByHost ?? true,
+    showBackground: options.showBackground ?? false,
+    currentWorkspaceId: "workspace:server:current",
+    contributions,
+    files: [file],
+    titles: { recentWorkspaces: "Recent workspaces", workspaces: "Workspaces", files: "Files" },
+  });
+  return projectCommandCenterRows(sections, COMMAND_CENTER_LIST_METRICS.desktop).rows.map((row) =>
+    row.kind === "section" ? `# ${row.title ?? ""}` : row.key,
+  );
+}
+
+describe("command center tabs", () => {
+  it("All leads with the three most recent workspaces, then actions, before a query", () => {
+    expect(listed("all", "")).toEqual([
+      "# Recent workspaces",
+      "workspace:server:payments",
+      "workspace:server:onboarding",
+      "workspace:server:docs",
+      "# workspace",
+      "New agent",
+      "# actions",
+      "Settings",
+    ]);
+  });
+
+  it("lists background workspaces unqueried only as the sidebar does; a query finds them", () => {
+    expect(listed("all", "")).not.toContain("workspace:server:nightly");
+    expect(listed("all", "", { showBackground: true })).not.toContain("workspace:server:nightly");
+    expect(listed("workspaces", "")).not.toContain("workspace:server:nightly");
+    expect(listed("workspaces", "", { showBackground: true })).toContain(
+      "workspace:server:nightly",
+    );
+    expect(listed("all", "nightly")).toContain("workspace:server:nightly");
+    expect(listed("workspaces", "nightly")).toContain("workspace:server:nightly");
+  });
+
+  it("All ranks every kind of result for a query, archived workspaces after active ones", () => {
+    expect(listed("all", "i")).toEqual(
+      expect.arrayContaining(["Settings", "file:src/index.ts", "workspace:server:billing"]),
+    );
+    const rows = listed("all", "ing");
+    const workspaceRows = rows.filter((row) => row.startsWith("workspace:"));
+    expect(workspaceRows.at(-1)).toBe("workspace:server:billing");
+    expect(rows).not.toContain("# Recent workspaces");
+  });
+
+  it("Workspaces lists every workspace, current included, most recent first", () => {
+    expect(listed("workspaces", "")).toEqual([
+      "# Workspaces",
+      "workspace:server:current",
+      "workspace:server:payments",
+      "workspace:server:onboarding",
+      "workspace:server:docs",
+      "workspace:server:search",
+    ]);
+  });
+
+  it("Workspaces finds a workspace through its agent and appends archived matches", () => {
+    expect(listed("workspaces", "receipts")).toEqual([
+      "# Workspaces",
+      "workspace:server:onboarding",
+      "workspace:server:billing",
+    ]);
+  });
+
+  it("keeps archived rows the host did not match for this query only if they match it", () => {
+    // The previous query's archived results stand in while the next search loads.
+    expect(listed("workspaces", "receipts", { archivedMatchedByHost: false })).toEqual([
+      "# Workspaces",
+      "workspace:server:onboarding",
+    ]);
+    expect(listed("workspaces", "billing", { archivedMatchedByHost: false })).toEqual([
+      "# Workspaces",
+      "workspace:server:billing",
+    ]);
+  });
+
+  it("Files lists only files", () => {
+    expect(listed("files", "")).toEqual(["# Files", "file:src/index.ts"]);
+  });
+
+  it("Actions lists every action, including those that otherwise wait for a query", () => {
+    expect(listed("actions", "")).toEqual([
+      "# workspace",
+      "New agent",
+      "# actions",
+      "Settings",
+      "Group by status",
+    ]);
+  });
+});

packages/app/src/command-center/sections.ts

@@ -0,0 +1,120 @@
+import type { CommandCenterContribution } from "./contributions";
+import {
+  buildContributionSections,
+  LEADING_SECTION_BAND,
+  PINNED_SECTION_BAND,
+  type CommandCenterFileResult,
+  type CommandCenterResultSection,
+  type CommandCenterWorkspaceResult,
+} from "./results";
+import type { CommandCenterTab } from "./tabs";
+import type { WorkspaceRanker } from "./workspace-search";
+
+/**
+ * How many workspaces All leads with before anything is typed. Background workspaces are left
+ * out, as the sidebar leaves them out by default.
+ */
+const RECENT_WORKSPACE_LIMIT = 3;
+
+export interface CommandCenterSectionTitles {
+  recentWorkspaces: string;
+  workspaces: string;
+  files: string;
+}
+
+export interface CommandCenterSectionsInput {
+  tab: CommandCenterTab;
+  query: string;
+  rankWorkspaces: WorkspaceRanker;
+  workspaces: readonly CommandCenterWorkspaceResult[];
+  /** Archived workspaces the host found for the query. Empty without a query. */
+  archivedWorkspaces: readonly CommandCenterWorkspaceResult[];
+  /**
+   * The host matched the archived workspaces for this exact query. Its search forgives typos,
+   * so its matches stay even when the client cannot score them. Results from the previous
+   * query must match on their own.
+   */
+  archivedMatchedByHost: boolean;
+  /**
+   * The sidebar's Show background preference. Without a query, Workspaces lists background
+   * workspaces only when the sidebar does; a query finds them either way.
+   */
+  showBackground: boolean;
+  /** The open workspace's result ID. Recent workspaces leaves it out: the user is already there. */
+  currentWorkspaceId: string | null;
+  contributions: readonly CommandCenterContribution[];
+  files: readonly CommandCenterFileResult[];
+  titles: CommandCenterSectionTitles;
+}
+
+function recentWorkspacesSection(input: CommandCenterSectionsInput): CommandCenterResultSection {
+  const recent = input
+    .rankWorkspaces(input.workspaces, "")
+    .filter((workspace) => workspace.id !== input.currentWorkspaceId && !workspace.background)
+    .slice(0, RECENT_WORKSPACE_LIMIT);
+  return {
+    id: "recent-workspaces",
+    band: LEADING_SECTION_BAND,
+    rank: 0,
+    title: input.titles.recentWorkspaces,
+    results: recent,
+  };
+}
+
+/** Active matches first; archived ones are appended, so active rows never move when they land. */
+function workspacesSection(input: CommandCenterSectionsInput): CommandCenterResultSection {
+  const listed =
+    input.query.trim() || input.showBackground
+      ? input.workspaces
+      : input.workspaces.filter((workspace) => !workspace.background);
+  const active = input.rankWorkspaces(listed, input.query);
+  const archived = input.query.trim()
+    ? input.rankWorkspaces(input.archivedWorkspaces, input.query, {
+        keepUnmatched: input.archivedMatchedByHost,
+      })
+    : [];
+  return {
+    id: "workspaces",
+    band: PINNED_SECTION_BAND,
+    rank: 2,
+    title: input.titles.workspaces,
+    results: [...active, ...archived],
+  };
+}
+
+function filesSection(input: CommandCenterSectionsInput): CommandCenterResultSection {
+  // File rows are matched by the daemon, so they carry no client-side score and cannot be
+  // relevance-compared against the rows that do. Pinning them keeps the section comparator
+  // total: band is decided before any score is read.
+  return {
+    id: "files",
+    band: PINNED_SECTION_BAND,
+    rank: 4,
+    title: input.titles.files,
+    results: input.files,
+  };
+}
+
+/**
+ * The sections a tab shows. All mixes every kind and leads with recent workspaces until
+ * something is typed; every other tab lists everything of its one kind.
+ */
+export function buildCommandCenterSections(
+  input: CommandCenterSectionsInput,
+): CommandCenterResultSection[] {
+  switch (input.tab) {
+    case "all": {
+      const actions = buildContributionSections(input.contributions, input.query);
+      if (!input.query.trim()) return [recentWorkspacesSection(input), ...actions];
+      return [...actions, workspacesSection(input), filesSection(input)];
+    }
+    case "workspaces":
+      return [workspacesSection(input)];
+    case "files":
+      return [filesSection(input)];
+    case "actions":
+      return buildContributionSections(input.contributions, input.query, {
+        includeQueryOnly: true,
+      });
+  }
+}

packages/app/src/command-center/tabs.test.ts

@@ -0,0 +1,43 @@
+import { describe, expect, it } from "vitest";
+import {
+  availableCommandCenterTabs,
+  resolveCommandCenterTab,
+  rotateCommandCenterTab,
+  type CommandCenterTab,
+} from "./tabs";
+
+const IN_WORKSPACE = availableCommandCenterTabs({ hasWorkspace: true });
+const NO_WORKSPACE = availableCommandCenterTabs({ hasWorkspace: false });
+
+function walk(available: readonly CommandCenterTab[], direction: "next" | "previous") {
+  const walked: CommandCenterTab[] = ["all"];
+  for (let step = 0; step < available.length; step += 1) {
+    walked.push(rotateCommandCenterTab(walked[walked.length - 1], direction, available));
+  }
+  return walked;
+}
+
+describe("command center tabs", () => {
+  it("walks All, Workspaces, Files, Actions in a workspace and wraps", () => {
+    expect(walk(IN_WORKSPACE, "next")).toEqual(["all", "workspaces", "files", "actions", "all"]);
+    expect(walk(IN_WORKSPACE, "previous")).toEqual([
+      "all",
+      "actions",
+      "files",
+      "workspaces",
+      "all",
+    ]);
+  });
+
+  it("offers no Files tab outside a workspace, and Tab skips it", () => {
+    expect(NO_WORKSPACE).toEqual(["all", "workspaces", "actions"]);
+    expect(walk(NO_WORKSPACE, "next")).toEqual(["all", "workspaces", "actions", "all"]);
+    expect(walk(NO_WORKSPACE, "previous")).toEqual(["all", "actions", "workspaces", "all"]);
+  });
+
+  it("opens a requested tab only when it is on offer", () => {
+    expect(resolveCommandCenterTab("files", IN_WORKSPACE)).toBe("files");
+    expect(resolveCommandCenterTab("files", NO_WORKSPACE)).toBe("all");
+    expect(resolveCommandCenterTab("actions", NO_WORKSPACE)).toBe("actions");
+  });
+});

packages/app/src/command-center/tabs.ts

@@ -0,0 +1,39 @@
+/**
+ * The command center's tabs, in the order Tab walks them. All shows every kind of result; each
+ * other tab shows one kind.
+ */
+const COMMAND_CENTER_TABS = ["all", "workspaces", "files", "actions"] as const;
+
+export type CommandCenterTab = (typeof COMMAND_CENTER_TABS)[number];
+
+/**
+ * The tabs on offer, in the order Tab walks them. Files searches the open workspace, so it is
+ * offered only when a workspace is open; without one, All lists no files either.
+ */
+export function availableCommandCenterTabs(context: {
+  hasWorkspace: boolean;
+}): readonly CommandCenterTab[] {
+  return context.hasWorkspace
+    ? COMMAND_CENTER_TABS
+    : COMMAND_CENTER_TABS.filter((tab) => tab !== "files");
+}
+
+/** The tab to show for a requested one: itself when on offer, otherwise All. */
+export function resolveCommandCenterTab(
+  requested: CommandCenterTab,
+  available: readonly CommandCenterTab[],
+): CommandCenterTab {
+  return available.includes(requested) ? requested : "all";
+}
+
+/** The available tab after (or before) `tab`, wrapping at either end. */
+export function rotateCommandCenterTab(
+  tab: CommandCenterTab,
+  direction: "next" | "previous",
+  available: readonly CommandCenterTab[],
+): CommandCenterTab {
+  const index = available.indexOf(tab);
+  const delta = direction === "next" ? 1 : -1;
+  const count = available.length;
+  return available[(index + delta + count) % count];
+}

packages/app/src/command-center/workspace-search.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
-import type { CommandCenterWorkspaceResult } from "./results";
-import { filterAndRankWorkspaces } from "./workspace-search";
+import type { CommandCenterWorkspaceAgent, CommandCenterWorkspaceResult } from "./results";
+import { createWorkspaceRanker } from "./workspace-search";
 
 function workspace(input: {
   id: string;
@@ -8,6 +8,8 @@ function workspace(input: {
   subtitle?: string;
   changeRequestNumber?: number | null;
   activityAt?: Date | null;
+  agents?: readonly CommandCenterWorkspaceAgent[];
+  opened?: string[];
 }): CommandCenterWorkspaceResult {
   return {
     kind: "workspace",
@@ -19,15 +21,24 @@ function workspace(input: {
     project: { viewKey: "project", name: "project", iconDataUri: null },
     changeRequestNumber: input.changeRequestNumber ?? null,
     activityAt: input.activityAt ?? null,
-    run: () => undefined,
+    agents: input.agents ?? [],
+    matchedAgent: null,
+    archived: false,
+    background: false,
+    run: () => input.opened?.push("workspace"),
+    openAgent: (agentId) => input.opened?.push(agentId),
   };
 }
 
-function ids(rows: readonly CommandCenterWorkspaceResult[], query: string): string[] {
-  return filterAndRankWorkspaces(rows, query).map((row) => row.id);
+function agent(id: string, title: string): CommandCenterWorkspaceAgent {
+  return { id, title, provider: "mock" };
 }
 
-describe("filterAndRankWorkspaces", () => {
+function ids(rows: readonly CommandCenterWorkspaceResult[], query: string): string[] {
+  return createWorkspaceRanker()(rows, query).map((row) => row.id);
+}
+
+describe("workspace ranking", () => {
   const subject = workspace({
     id: "payments",
     title: "Payments refactor",
@@ -96,4 +107,214 @@ describe("filterAndRankWorkspaces", () => {
     });
     expect(ids([older, newer], "usage")).toEqual(["newer", "older"]);
   });
+
+  it("lists every workspace most recent first when the query is empty", () => {
+    const rows = Array.from({ length: 8 }, (_, index) =>
+      workspace({ id: `w${index}`, activityAt: new Date(2026, 0, index + 1) }),
+    );
+    expect(ids(rows, "")).toEqual(["w7", "w6", "w5", "w4", "w3", "w2", "w1", "w0"]);
+  });
+
+  it("matches a workspace through one of its agents and names that agent", () => {
+    const receipts = agent("agent-receipts", "Add receipt emails");
+    const row = workspace({
+      id: "onboarding",
+      title: "Onboarding flow",
+      agents: [agent("agent-welcome", "Polish welcome screen"), receipts],
+    });
+    const [ranked] = createWorkspaceRanker()([row], "receipt");
+    expect(ranked.id).toBe("onboarding");
+    expect(ranked.matchedAgent).toEqual(receipts);
+  });
+
+  it("names no agent when the workspace's own text matched", () => {
+    const row = workspace({
+      id: "payments",
+      title: "Payments refactor",
+      agents: [agent("agent-payments", "Payments retries")],
+    });
+    const [ranked] = createWorkspaceRanker()([row], "payments");
+    expect(ranked.matchedAgent).toBeNull();
+  });
+
+  it("ranks a workspace's own match above an equally good match through an agent", () => {
+    const viaAgent = workspace({
+      id: "via-agent",
+      title: "Onboarding flow",
+      activityAt: new Date("2026-10-17T00:00:00Z"),
+      agents: [agent("a", "Receipt emails")],
+    });
+    const own = workspace({
+      id: "own",
+      title: "Receipt redesign",
+      activityAt: new Date("2026-10-01T00:00:00Z"),
+    });
+    expect(ids([viaAgent, own], "receipt")).toEqual(["own", "via-agent"]);
+  });
+
+  it("picks the best-matching agent for the line", () => {
+    const row = workspace({
+      id: "w",
+      title: "Onboarding",
+      agents: [agent("loose", "Reconcile cash receipts later"), agent("exact", "receipts")],
+    });
+    const [ranked] = createWorkspaceRanker()([row], "receipts");
+    expect(ranked.matchedAgent?.id).toBe("exact");
+  });
+
+  it("matches a query split between the workspace's text and an agent's title", () => {
+    const login = agent("agent-login", "Fix login retries");
+    const row = workspace({ id: "payments", title: "payments", agents: [login] });
+    const [ranked] = createWorkspaceRanker()([row], "payments login");
+    expect(ranked?.id).toBe("payments");
+    expect(ranked?.matchedAgent).toEqual(login);
+  });
+
+  it("names the agent when it matches better than a loose match on the workspace's text", () => {
+    const opened: string[] = [];
+    const login = agent("agent-login", "Fix login retries");
+    const row = workspace({
+      id: "long-input",
+      title: "Long input",
+      // "login" is a subsequence of "long-input", the weakest kind of match.
+      subtitle: "Local · paseo · feature/long-input",
+      agents: [login],
+      opened,
+    });
+    const [ranked] = createWorkspaceRanker()([row], "login");
+    expect(ranked?.matchedAgent).toEqual(login);
+    ranked?.run();
+    expect(opened).toEqual(["agent-login"]);
+  });
+
+  it("keeps a change-request hit on the workspace even when an agent's title names the number", () => {
+    const opened: string[] = [];
+    const row = workspace({
+      id: "payments",
+      title: "Payments refactor",
+      changeRequestNumber: 42,
+      agents: [agent("agent-review", "Address PR 42 review comments")],
+      opened,
+    });
+    const rank = createWorkspaceRanker();
+    for (const query of ["42", "pr 42", "#42"]) {
+      const [ranked] = rank([row], query);
+      expect(ranked?.matchedAgent).toBeNull();
+      ranked?.run();
+    }
+    expect(opened).toEqual(["workspace", "workspace", "workspace"]);
+  });
+
+  it("names no agent while the workspace's own text matches every keystroke contiguously", () => {
+    const row = workspace({
+      id: "fix-login-bug",
+      title: "fix-login-bug",
+      subtitle: "paseo · fix/login-bug",
+      agents: [agent("agent-login", "Login page fix")],
+    });
+    const rank = createWorkspaceRanker();
+    for (const query of ["l", "lo", "log", "logi", "login"]) {
+      expect(rank([row], query)[0]?.matchedAgent).toBeNull();
+    }
+  });
+
+  it("names no agent whose one-word title matches better than the workspace's whole word", () => {
+    const row = workspace({
+      id: "review-queue",
+      title: "Review queue",
+      agents: [agent("agent-review", "Review")],
+    });
+    expect(createWorkspaceRanker()([row], "review")[0]?.matchedAgent).toBeNull();
+  });
+
+  it("ranks a better match through an agent above a looser match on a workspace's own text", () => {
+    const loose = workspace({
+      id: "loose-own",
+      title: "Long input",
+      subtitle: "Local · paseo · feature/long-input",
+      activityAt: new Date("2026-10-17T00:00:00Z"),
+    });
+    const viaAgent = workspace({
+      id: "via-agent",
+      title: "Auth",
+      activityAt: new Date("2026-10-01T00:00:00Z"),
+      agents: [agent("a", "login page")],
+    });
+    expect(ids([loose, viaAgent], "login")).toEqual(["via-agent", "loose-own"]);
+  });
+
+  it("keeps a workspace that also matches on its own name first while typing an agent's title", () => {
+    const ownAndAgent = workspace({
+      id: "oauth-refactor",
+      activityAt: new Date("2026-10-17T00:00:00Z"),
+      agents: [agent("agent-a", "Auth flow fix")],
+    });
+    const agentOnly = workspace({
+      id: "cleanup",
+      activityAt: new Date("2026-10-01T00:00:00Z"),
+      agents: [agent("agent-b", "Auth flow fix")],
+    });
+    for (const query of ["a", "au", "auth", "auth f", "auth fl", "auth flow"]) {
+      expect(ids([ownAndAgent, agentOnly], query)).toEqual(["oauth-refactor", "cleanup"]);
+    }
+  });
+
+  it("ranks a word match on a workspace's name above a newer one that matches only inside a word", () => {
+    const rank = createWorkspaceRanker();
+    const authService = workspace({
+      id: "auth-service",
+      activityAt: new Date("2026-10-01T00:00:00Z"),
+    });
+    const oauthRefactor = workspace({
+      id: "oauth-refactor",
+      activityAt: new Date("2026-10-17T00:00:00Z"),
+      agents: [agent("agent-auth", "Auth flow fix")],
+    });
+    const authRows = rank([oauthRefactor, authService], "auth");
+    expect(authRows.map((row) => row.id)).toEqual(["auth-service", "oauth-refactor"]);
+    // The row that matched through its agent says so.
+    expect(authRows[1]?.matchedAgent?.title).toBe("Auth flow fix");
+
+    const fixLogin = workspace({ id: "fix-login", activityAt: new Date("2026-10-17T00:00:00Z") });
+    const prefixedThing = workspace({
+      id: "prefixed-thing",
+      activityAt: new Date("2026-10-01T00:00:00Z"),
+      agents: [agent("agent-fix", "Fix")],
+    });
+    const fixRows = rank([prefixedThing, fixLogin], "fix");
+    expect(fixRows.map((row) => row.id)).toEqual(["fix-login", "prefixed-thing"]);
+    expect(fixRows[1]?.matchedAgent?.title).toBe("Fix");
+  });
+
+  it("opens the matched agent's tab, and the workspace otherwise", () => {
+    const opened: string[] = [];
+    const row = workspace({
+      id: "w",
+      title: "Onboarding flow",
+      agents: [agent("agent-receipts", "Add receipt emails")],
+      opened,
+    });
+    const rank = createWorkspaceRanker();
+    rank([row], "receipt")[0].run();
+    rank([row], "onboarding")[0].run();
+    expect(opened).toEqual(["agent-receipts", "workspace"]);
+  });
+
+  it("returns the same row object across keystrokes while the matched agent holds", () => {
+    const row = workspace({
+      id: "w",
+      title: "Onboarding flow",
+      agents: [agent("agent-receipts", "Add receipt emails")],
+    });
+    const rank = createWorkspaceRanker();
+    expect(rank([row], "rece")[0]).toBe(rank([row], "receipt")[0]);
+    expect(rank([row], "onboard")[0]).toBe(row);
+  });
+
+  it("keeps rows the host already matched when asked to, without an agent line", () => {
+    const row = workspace({ id: "archived", title: "Billing cleanup" });
+    const rank = createWorkspaceRanker();
+    expect(rank([row], "billign")).toEqual([]);
+    expect(rank([row], "billign", { keepUnmatched: true })).toEqual([row]);
+  });
 });

packages/app/src/command-center/workspace-search.ts

@@ -1,9 +1,12 @@
+import { compareMatchClasses, type MatchClass } from "@getpaseo/protocol/search/text-match";
 import {
   compareBuiltInScores,
   compareByRecency,
-  filterAndRankBuiltInResults,
   scoreSearchFields,
+  searchFieldsMatchClass,
   type CommandCenterScore,
+  type CommandCenterSearchFields,
+  type CommandCenterWorkspaceAgent,
   type CommandCenterWorkspaceResult,
 } from "./results";
 
@@ -24,41 +27,176 @@ function parseChangeRequestQuery(query: string): number | null {
   return Number.isSafeInteger(number) ? number : null;
 }
 
+/** Within a match class, a match on the workspace's own text ranks ahead of one through an agent. */
+const OWN_MATCH = 0;
+const AGENT_MATCH = 1;
+/** The host matched it (typo-tolerant, server-side) but nothing here does. Archived rows only. */
+const HOST_MATCH = 2;
+
+/** How a row matched: its class decides first, its score within the class. */
+interface Candidate {
+  matchClass: MatchClass;
+  score: CommandCenterScore;
+}
+
 interface ScoredWorkspace {
   workspace: CommandCenterWorkspaceResult;
-  score: CommandCenterScore | null;
+  via: typeof OWN_MATCH | typeof AGENT_MATCH | typeof HOST_MATCH;
+  /** The match the row shows, which is also the one it ranks by. */
+  candidate: Candidate | null;
+  agent: CommandCenterWorkspaceAgent | null;
   changeRequestHit: boolean;
 }
 
-function searchFields(workspace: CommandCenterWorkspaceResult) {
+function ownSearchFields(workspace: CommandCenterWorkspaceResult) {
   return { visible: [workspace.title, workspace.subtitle], hidden: [] };
 }
 
+/** An agent is found through its own title and its workspace's text together. */
+function agentSearchFields(
+  workspace: CommandCenterWorkspaceResult,
+  agent: CommandCenterWorkspaceAgent,
+) {
+  return { visible: [workspace.title, workspace.subtitle, agent.title], hidden: [] };
+}
+
+function scoreCandidate(query: string, fields: CommandCenterSearchFields): Candidate | null {
+  const score = scoreSearchFields(query, fields);
+  const matchClass = searchFieldsMatchClass(query, fields);
+  return score && matchClass ? { matchClass, score } : null;
+}
+
+function compareCandidates(left: Candidate, right: Candidate): number {
+  return (
+    compareMatchClasses(left.matchClass, right.matchClass) ||
+    compareBuiltInScores(left.score, right.score)
+  );
+}
+
+/**
+ * Change-request hits first, host-only matches last; then match class, the workspace's own text
+ * ahead of an agent, match quality, and recency.
+ */
 function compareScoredWorkspaces(left: ScoredWorkspace, right: ScoredWorkspace): number {
   if (left.changeRequestHit !== right.changeRequestHit) {
     return left.changeRequestHit ? -1 : 1;
   }
-  if (left.score && right.score) {
-    const scoreDelta = compareBuiltInScores(left.score, right.score);
+  if ((left.via === HOST_MATCH) !== (right.via === HOST_MATCH)) {
+    return left.via === HOST_MATCH ? 1 : -1;
+  }
+  if (left.candidate && right.candidate) {
+    const classDelta = compareMatchClasses(left.candidate.matchClass, right.candidate.matchClass);
+    if (classDelta !== 0) return classDelta;
+  }
+  if (left.via !== right.via) return left.via - right.via;
+  if (left.candidate && right.candidate) {
+    const scoreDelta = compareBuiltInScores(left.candidate.score, right.candidate.score);
     if (scoreDelta !== 0) return scoreDelta;
   }
   return compareByRecency(left.workspace, right.workspace);
 }
 
-export function filterAndRankWorkspaces(
+interface AgentMatch extends Candidate {
+  agent: CommandCenterWorkspaceAgent;
+}
+
+/**
+ * The workspace's best-matching agent. Each agent is scored together with the workspace's
+ * text, so a query split across the two finds it. Agents arrive most recent first, so a tie
+ * keeps the newer one.
+ */
+function agentMatch(workspace: CommandCenterWorkspaceResult, query: string): AgentMatch | null {
+  let best: AgentMatch | null = null;
+  for (const agent of workspace.agents) {
+    const candidate = scoreCandidate(query, agentSearchFields(workspace, agent));
+    if (candidate && (!best || compareCandidates(candidate, best) < 0)) {
+      best = { agent, ...candidate };
+    }
+  }
+  return best;
+}
+
+export type WorkspaceRanker = (
   workspaces: readonly CommandCenterWorkspaceResult[],
   query: string,
-): CommandCenterWorkspaceResult[] {
-  if (!query.trim()) return filterAndRankBuiltInResults(workspaces, query, searchFields);
+  options?: { keepUnmatched?: boolean },
+) => CommandCenterWorkspaceResult[];
 
-  const changeRequestNumber = parseChangeRequestQuery(query);
-  const matches: ScoredWorkspace[] = [];
-  for (const workspace of workspaces) {
-    const score = scoreSearchFields(query, searchFields(workspace));
-    const changeRequestHit =
-      changeRequestNumber !== null && workspace.changeRequestNumber === changeRequestNumber;
-    if (score || changeRequestHit) matches.push({ workspace, score, changeRequestHit });
+/**
+ * Rank workspaces for a query, best match first. A workspace matches on its own title, project,
+ * branch and change request, or on those together with the title of one of its agents. It is
+ * matched through an agent only when the agent matches in a closer class than its own text
+ * (see `MatchClass`), never on a change-request hit; such a match comes back naming that agent,
+ * and opens it. Each row ranks by the match it shows.
+ *
+ * An empty query lists every workspace, most recent first. `keepUnmatched` keeps rows nothing
+ * here matches, ranked last: archived rows come from the host's own search, which is
+ * typo-tolerant, so the host is the authority on whether they match.
+ *
+ * The ranker remembers the row it made for each workspace and agent, so a row matched through
+ * the same agent is the same object on every keystroke and its list row does not re-render.
+ */
+export function createWorkspaceRanker(): WorkspaceRanker {
+  const viaAgent = new WeakMap<
+    CommandCenterWorkspaceResult,
+    Map<string, CommandCenterWorkspaceResult>
+  >();
+
+  function matchedThrough(
+    workspace: CommandCenterWorkspaceResult,
+    agent: CommandCenterWorkspaceAgent,
+  ): CommandCenterWorkspaceResult {
+    let rows = viaAgent.get(workspace);
+    if (!rows) {
+      rows = new Map();
+      viaAgent.set(workspace, rows);
+    }
+    let row = rows.get(agent.id);
+    if (!row) {
+      row = { ...workspace, matchedAgent: agent, run: () => workspace.openAgent(agent.id) };
+      rows.set(agent.id, row);
+    }
+    return row;
   }
-  matches.sort(compareScoredWorkspaces);
-  return matches.map((match) => match.workspace);
+
+  return (workspaces, query, options = {}) => {
+    if (!query.trim()) return [...workspaces].sort(compareByRecency);
+
+    const changeRequestNumber = parseChangeRequestQuery(query);
+    const matches: ScoredWorkspace[] = [];
+    for (const workspace of workspaces) {
+      const changeRequestHit =
+        changeRequestNumber !== null && workspace.changeRequestNumber === changeRequestNumber;
+      const own = scoreCandidate(query, ownSearchFields(workspace));
+      // A change-request hit is the workspace's own answer to the query.
+      const throughAgent = changeRequestHit ? null : agentMatch(workspace, query);
+      // An agent is named only when it matches in a closer class than the workspace's own text.
+      if (
+        throughAgent &&
+        (!own || compareMatchClasses(throughAgent.matchClass, own.matchClass) < 0)
+      ) {
+        matches.push({
+          workspace,
+          via: AGENT_MATCH,
+          candidate: throughAgent,
+          agent: throughAgent.agent,
+          changeRequestHit,
+        });
+      } else if (own || changeRequestHit) {
+        matches.push({ workspace, via: OWN_MATCH, candidate: own, agent: null, changeRequestHit });
+      } else if (options.keepUnmatched) {
+        matches.push({
+          workspace,
+          via: HOST_MATCH,
+          candidate: null,
+          agent: null,
+          changeRequestHit,
+        });
+      }
+    }
+    matches.sort(compareScoredWorkspaces);
+    return matches.map((match) =>
+      match.agent ? matchedThrough(match.workspace, match.agent) : match.workspace,
+    );
+  };
 }

packages/app/src/components/adaptive-modal-sheet.browser.test.tsx

@@ -0,0 +1,76 @@
+import React, { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { RotateCw, Settings } from "lucide-react-native";
+import { afterEach, describe, expect, it } from "vitest";
+import {
+  InlineHeaderView,
+  SheetHeaderIconButton,
+  SheetHeaderView,
+  type SheetHeader,
+} from "@/components/adaptive-modal-sheet";
+
+let root: Root | null = null;
+let container: HTMLDivElement | null = null;
+
+afterEach(() => {
+  act(() => root?.unmount());
+  container?.remove();
+  root = null;
+  container = null;
+});
+
+function noop() {}
+
+const LONG_TITLE =
+  "A sheet title long enough to fill the whole header row on a phone and then some more";
+
+const header: SheetHeader = {
+  title: LONG_TITLE,
+  actions: (
+    <>
+      <SheetHeaderIconButton icon={RotateCw} label="Refresh" onPress={noop} testID="refresh" />
+      <SheetHeaderIconButton icon={Settings} label="Settings" onPress={noop} testID="settings" />
+    </>
+  ),
+};
+
+function mount(node: React.ReactNode) {
+  container = document.createElement("div");
+  container.style.width = "390px";
+  document.body.appendChild(container);
+  root = createRoot(container);
+  act(() => root?.render(node));
+}
+
+function rectOf(testID: string): DOMRect {
+  const found = document.querySelector(`[data-testid="${testID}"]`);
+  if (!(found instanceof HTMLElement)) throw new Error(`Nothing rendered as ${testID}`);
+  return found.getBoundingClientRect();
+}
+
+/** Each button keeps its own width, follows the previous one and stays inside the row. */
+function expectButtonsInRow(testIDs: string[]) {
+  const row = container?.getBoundingClientRect();
+  if (!row) throw new Error("Nothing mounted");
+  const rects = testIDs.map(rectOf);
+  for (const [index, rect] of rects.entries()) {
+    expect(rect.width).toBeGreaterThan(0);
+    expect(rect.right).toBeLessThanOrEqual(row.right + 1);
+    const previous = rects[index - 1];
+    if (previous) expect(rect.left).toBeGreaterThanOrEqual(previous.right);
+  }
+}
+
+describe("sheet header with a long title", () => {
+  it("truncates the title and keeps the actions and Close in place", () => {
+    mount(<SheetHeaderView header={header} onClose={noop} closeTestID="close" />);
+
+    expectButtonsInRow(["refresh", "settings", "close"]);
+  });
+
+  it("does the same in the inline header", () => {
+    mount(<InlineHeaderView header={header} />);
+
+    expectButtonsInRow(["refresh", "settings"]);
+  });
+});

packages/app/src/components/adaptive-modal-sheet.tsx

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import type { ComponentProps, ReactNode } from "react";
 import { createPortal } from "react-dom";
 import { useTranslation } from "react-i18next";
-import { Keyboard, Pressable, Text, View } from "react-native";
+import { Keyboard, Text, View } from "react-native";
 import type { DimensionValue, StyleProp, ViewProps, ViewStyle } from "react-native";
 import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -29,6 +29,15 @@ import { useKeyboardVisibility } from "@/hooks/use-keyboard-visibility";
 import { SafeAreaInsetsContext, useSafeAreaInsets } from "react-native-safe-area-context";
 import { AdaptiveTextInput } from "@/components/adaptive-text-input";
 import { useDismissibleOverlay } from "@/components/ui/overlay-dismissal";
+import { DismissBackdrop } from "@/components/ui/dismiss-backdrop";
+import {
+  IconButtonChromeProvider,
+  iconButtonChromeGlyphSize,
+  iconButtonChromeHang,
+  mutedIconColorMapping,
+} from "@/components/ui/icon-button-chrome";
+import { LoadingSpinner } from "@/components/ui/loading-spinner";
+import { ToolbarButton } from "@/components/ui/pane-content-toolbar";
 export { AdaptiveTextInput, type AdaptiveTextInputProps } from "@/components/adaptive-text-input";
 
 // Horizontal indent token shared by the sheet header (title, back arrow,
@@ -37,11 +46,6 @@ export { AdaptiveTextInput, type AdaptiveTextInputProps } from "@/components/ada
 // match this padding.
 export const SHEET_HORIZONTAL_PADDING_SCALE = 6;
 
-// The header's close button grows outward from its glyph, so the glyph's
-// trailing rail is the content inset plus this padding. Rows whose trailing
-// glyph should line up with the X must reach the same rail.
-export const SHEET_HEADER_CLOSE_PADDING_SCALE = 2;
-
 /** The one height a sheet takes when it shows a whole pane rather than sizing to its content. */
 export const FULL_SHEET_SNAP_POINTS = ["92%"];
 
@@ -63,6 +67,7 @@ export interface SheetHeaderBack {
 
 export interface SheetHeader {
   title: string;
+  titleTestID?: string;
   subtitle?: ReactNode;
   back?: SheetHeaderBack;
   leading?: ReactNode;
@@ -71,7 +76,9 @@ export interface SheetHeader {
 }
 
 const SCROLL_CONTENT_GROW = { flexGrow: 1 };
-const ABSOLUTE_FILL_STYLE = { ...StyleSheet.absoluteFill };
+// Header buttons hang by how far their frame reaches past the glyph, so the edge glyphs sit on the
+// content rail and a 44pt touch frame does not grow the row.
+const HEADER_BUTTON_HANG = iconButtonChromeHang("large");
 const NATIVE_DIALOG_SNAP_POINTS = ["100%"];
 
 const styles = StyleSheet.create((theme) => ({
@@ -105,20 +112,24 @@ const styles = StyleSheet.create((theme) => ({
     borderBottomWidth: 1,
     borderBottomColor: theme.colors.surface2,
   },
+  // One height for every sheet header whatever its buttons; a hung 44pt touch frame fits inside it.
   headerRow: {
+    minHeight: 64,
     paddingHorizontal: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
     paddingVertical: theme.spacing[4],
     flexDirection: "row",
     alignItems: "center",
     gap: theme.spacing[2],
   },
-  headerBackButton: {
-    borderRadius: theme.borderRadius.lg,
+  headerBack: {
+    marginVertical: HEADER_BUTTON_HANG,
+    marginLeft: HEADER_BUTTON_HANG,
   },
   headerLeadingSlot: {
     alignItems: "center",
     justifyContent: "center",
   },
+  // The title takes the room the buttons leave and truncates; the buttons never shrink.
   headerTitleGroup: {
     flex: 1,
     gap: theme.spacing[1],
@@ -128,14 +139,17 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.base,
     fontWeight: theme.fontWeight.medium,
   },
-  headerActions: {
+  subtitle: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+  },
+  headerTrailing: {
     flexDirection: "row",
     alignItems: "center",
     gap: theme.spacing[2],
-  },
-  closeButton: {
-    padding: theme.spacing[SHEET_HEADER_CLOSE_PADDING_SCALE],
-    borderRadius: theme.borderRadius.lg,
+    flexShrink: 0,
+    marginVertical: HEADER_BUTTON_HANG,
+    marginRight: HEADER_BUTTON_HANG,
   },
   // Without a header the close button floats over the card's top-right corner.
   floatingClose: {
@@ -176,6 +190,7 @@ const styles = StyleSheet.create((theme) => ({
   },
   inlineTitle: {
     flex: 1,
+    minWidth: 0,
     fontSize: theme.fontSize.base,
     fontWeight: theme.fontWeight.medium,
     color: theme.colors.foreground,
@@ -343,47 +358,92 @@ function SheetContent({ style, children }: { style: StyleProp<ViewStyle>; childr
   return <View style={[styles.sheetContent, style]}>{children}</View>;
 }
 
+const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
+const ThemedHeaderGlyph = withUnistyles(function HeaderGlyph({
+  icon: Icon,
+  size,
+  color,
+}: {
+  icon: LucideIcon;
+  size: number;
+  color?: string;
+}) {
+  return <Icon size={size} color={color} />;
+});
+
 /**
- * An icon action in a sheet header's trailing rail, drawn like the Close button so a header's
- * actions line up with it at one size. Pass it through `SheetHeader.actions`.
+ * The one icon button of a sheet header: the back arrow, the close X, and every action passed
+ * through `SheetHeader.actions`. Inside a header it takes the header island's chrome, so all of them
+ * share one frame, glyph, colour and hover. `busy` swaps the glyph for a spinner and holds presses.
  */
 export function SheetHeaderIconButton({
-  icon: Icon,
-  accessibilityLabel,
+  icon,
+  label,
   onPress,
+  busy = false,
+  disabled = false,
   testID,
 }: {
   icon: LucideIcon;
-  accessibilityLabel: string;
+  /** The accessible name, also shown as the desktop tooltip. */
+  label: string;
   onPress: () => void;
+  busy?: boolean;
+  disabled?: boolean;
   testID?: string;
 }) {
-  const { theme } = useUnistyles();
+  const compact = useIsCompactFormFactor();
+  const glyphSize = iconButtonChromeGlyphSize("large", compact);
   return (
-    <Pressable
-      accessibilityRole="button"
-      accessibilityLabel={accessibilityLabel}
-      style={styles.closeButton}
+    <ToolbarButton
+      label={label}
+      compact={compact}
+      disabled={disabled || busy}
       onPress={onPress}
       testID={testID}
     >
-      {({ pressed }) => (
-        <Icon size={16} color={pressed ? theme.colors.foreground : theme.colors.foregroundMuted} />
+      {busy ? (
+        <ThemedLoadingSpinner size={glyphSize} uniProps={mutedIconColorMapping} />
+      ) : (
+        <ThemedHeaderGlyph icon={icon} size={glyphSize} uniProps={mutedIconColorMapping} />
       )}
-    </Pressable>
+    </ToolbarButton>
+  );
+}
+
+function SheetHeaderBackButton({ back }: { back: SheetHeaderBack }) {
+  const { t } = useTranslation();
+  return (
+    <View style={styles.headerBack}>
+      <SheetHeaderIconButton
+        icon={ArrowLeft}
+        label={back.accessibilityLabel ?? back.label ?? t("common.actions.back")}
+        onPress={back.onPress}
+        testID="sheet-header-back"
+      />
+    </View>
+  );
+}
+
+/** A plain-text header subtitle: one muted line under the title that truncates, never the title. */
+export function SheetHeaderSubtitle({ text, testID }: { text: string; testID?: string }) {
+  return (
+    <Text style={styles.subtitle} numberOfLines={1} testID={testID}>
+      {text}
+    </Text>
   );
 }
 
 export function SheetHeaderView({
   header,
   onClose,
-  showCloseButton = true,
   testID,
+  closeTestID,
 }: {
   header: SheetHeader;
   onClose: () => void;
-  showCloseButton?: boolean;
   testID?: string;
+  closeTestID?: string;
 }) {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
@@ -391,8 +451,6 @@ export function SheetHeaderView({
     () => [styles.title, { color: theme.colors.foreground }],
     [theme.colors.foreground],
   );
-  const back = header.back;
-  const handleBackPress = back?.onPress;
   const search = header.search;
   const handleSearchChange = useCallback(
     (value: string) => {
@@ -403,40 +461,27 @@ export function SheetHeaderView({
 
   return (
     <View style={styles.headerContainer} testID={testID}>
-      <View style={styles.headerRow}>
-        {handleBackPress ? (
-          <Pressable
-            onPress={handleBackPress}
-            hitSlop={8}
-            style={styles.headerBackButton}
-            accessibilityRole="button"
-            accessibilityLabel={back?.accessibilityLabel ?? back?.label ?? t("common.actions.back")}
-            testID="sheet-header-back"
-          >
-            {({ pressed }) => (
-              <ArrowLeft
-                size={18}
-                color={pressed ? theme.colors.foreground : theme.colors.foregroundMuted}
-              />
-            )}
-          </Pressable>
-        ) : null}
-        {header.leading ? <View style={styles.headerLeadingSlot}>{header.leading}</View> : null}
-        <View style={styles.headerTitleGroup}>
-          <Text style={titleStyle} numberOfLines={1}>
-            {header.title}
-          </Text>
-          {header.subtitle}
+      <IconButtonChromeProvider value="header-island">
+        <View style={styles.headerRow}>
+          {header.back ? <SheetHeaderBackButton back={header.back} /> : null}
+          {header.leading ? <View style={styles.headerLeadingSlot}>{header.leading}</View> : null}
+          <View style={styles.headerTitleGroup}>
+            <Text style={titleStyle} numberOfLines={1} testID={header.titleTestID}>
+              {header.title}
+            </Text>
+            {header.subtitle}
+          </View>
+          <View style={styles.headerTrailing}>
+            {header.actions}
+            <SheetHeaderIconButton
+              icon={X}
+              label={t("common.actions.close")}
+              onPress={onClose}
+              testID={closeTestID}
+            />
+          </View>
         </View>
-        {header.actions ? <View style={styles.headerActions}>{header.actions}</View> : null}
-        {showCloseButton ? (
-          <SheetHeaderIconButton
-            icon={X}
-            accessibilityLabel={t("common.actions.close")}
-            onPress={onClose}
-          />
-        ) : null}
-      </View>
+      </IconButtonChromeProvider>
       {search ? (
         <View style={styles.searchRow}>
           <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
@@ -462,39 +507,21 @@ export function SheetHeaderView({
 export function InlineHeaderView({ header }: { header: SheetHeader }) {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
-  const back = header.back;
-  const handleBackPress = back?.onPress;
-  const hasInlineRow = Boolean(handleBackPress || header.leading || header.actions);
+  const hasInlineRow = Boolean(header.back || header.leading || header.actions);
   if (!hasInlineRow && !header.search) return null;
   return (
     <View>
       {hasInlineRow ? (
-        <View style={styles.inlineHeaderRow}>
-          {handleBackPress ? (
-            <Pressable
-              onPress={handleBackPress}
-              hitSlop={8}
-              style={styles.headerBackButton}
-              accessibilityRole="button"
-              accessibilityLabel={
-                back?.accessibilityLabel ?? back?.label ?? t("common.actions.back")
-              }
-              testID="sheet-header-back"
-            >
-              {({ pressed }) => (
-                <ArrowLeft
-                  size={16}
-                  color={pressed ? theme.colors.foreground : theme.colors.foregroundMuted}
-                />
-              )}
-            </Pressable>
-          ) : null}
-          {header.leading ? <View style={styles.headerLeadingSlot}>{header.leading}</View> : null}
-          <Text style={styles.inlineTitle} numberOfLines={1}>
-            {header.title}
-          </Text>
-          {header.actions ? <View style={styles.headerActions}>{header.actions}</View> : null}
-        </View>
+        <IconButtonChromeProvider value="header-island">
+          <View style={styles.inlineHeaderRow}>
+            {header.back ? <SheetHeaderBackButton back={header.back} /> : null}
+            {header.leading ? <View style={styles.headerLeadingSlot}>{header.leading}</View> : null}
+            <Text style={styles.inlineTitle} numberOfLines={1} testID={header.titleTestID}>
+              {header.title}
+            </Text>
+            {header.actions ? <View style={styles.headerTrailing}>{header.actions}</View> : null}
+          </View>
+        </IconButtonChromeProvider>
       ) : null}
       {header.search ? (
         <View style={styles.inlineSearchRow}>
@@ -798,24 +825,18 @@ export function AdaptiveModalSheet({
       </View>
       {footerView}
       {header ? null : (
-        <View style={styles.floatingClose}>
-          <SheetHeaderIconButton
-            icon={X}
-            accessibilityLabel={t("common.actions.close")}
-            onPress={onClose}
-          />
-        </View>
+        <IconButtonChromeProvider value="header-island">
+          <View style={styles.floatingClose}>
+            <SheetHeaderIconButton icon={X} label={t("common.actions.close")} onPress={onClose} />
+          </View>
+        </IconButtonChromeProvider>
       )}
     </OverlayLayerProvider>
   );
 
   const desktopContent = (
     <View style={desktopOverlayStyle} testID={testID}>
-      <Pressable
-        accessibilityLabel={t("common.actions.dismiss")}
-        style={ABSOLUTE_FILL_STYLE}
-        onPress={onClose}
-      />
+      <DismissBackdrop label={t("common.actions.dismiss")} onPress={onClose} />
       <View ref={setOverlayScope} style={desktopCardStyle} role="dialog" aria-modal tabIndex={-1}>
         {cardInner}
       </View>

packages/app/src/components/agent-list.tsx

@@ -17,11 +17,12 @@ import { useIsCompactFormFactor } from "@/constants/layout";
 import { useTimeAgo } from "@/hooks/use-time-ago";
 import { type AggregatedAgent } from "@/hooks/use-aggregated-agents";
 import { useSessionStore } from "@/stores/session-store";
-import { Archive, ChevronRight } from "lucide-react-native";
+import { ChevronRight } from "lucide-react-native";
 import { useProviderIcon } from "@/components/provider-icons";
 import { navigateToAgent } from "@/utils/navigate-to-agent";
 import { useArchiveAgent } from "@/hooks/use-archive-agent";
 import { HighlightedText } from "@/components/ui/highlighted-text";
+import { ArchivedBadge } from "@/components/archived-badge";
 import { StatusBadge, type StatusBadgeVariant } from "@/components/ui/status-badge";
 import { findHighlightRanges } from "@/components/ui/highlighted-text-segments";
 
@@ -99,36 +100,30 @@ function formatDateSectionLabel(t: TFunction, section: DateSectionKey): string {
 
 function SessionBadge({
   label,
-  icon,
   tone = "neutral",
 }: {
   label: string;
-  icon?: ReactElement;
   tone?: "neutral" | "warning" | "danger";
 }) {
   let variant: StatusBadgeVariant = "muted";
   if (tone === "warning") variant = "warning";
   else if (tone === "danger") variant = "error";
-  return <StatusBadge label={label} variant={variant} leading={icon} />;
+  return <StatusBadge label={label} variant={variant} />;
 }
 
 function SessionRowBadges({
   agent,
-  archivedIcon,
   pendingPermissionCount,
   showDesktopAttention,
 }: {
   agent: AggregatedAgent;
-  archivedIcon: ReactElement;
   pendingPermissionCount: number;
   showDesktopAttention: boolean;
 }) {
   const { t } = useTranslation();
   return (
     <>
-      {agent.archivedAt ? (
-        <SessionBadge label={t("agentList.badges.archived")} icon={archivedIcon} />
-      ) : null}
+      {agent.archivedAt ? <ArchivedBadge /> : null}
       {pendingPermissionCount > 0 ? (
         <SessionBadge
           label={t("agentList.badges.pending", { count: pendingPermissionCount })}
@@ -214,10 +209,6 @@ function SessionRow({
   const handlePress = useCallback(() => onPress(agent), [onPress, agent]);
   const handleLongPress = useCallback(() => onLongPress(agent), [onLongPress, agent]);
 
-  const archivedIcon = useMemo(
-    () => <Archive size={theme.fontSize.sm} color={theme.colors.foregroundMuted} />,
-    [theme.fontSize.sm, theme.colors.foregroundMuted],
-  );
   const showDesktopAttention =
     !isMobile && showAttentionIndicator && Boolean(agent.requiresAttention);
 
@@ -261,7 +252,6 @@ function SessionRow({
           ) : null}
           <SessionRowBadges
             agent={agent}
-            archivedIcon={archivedIcon}
             pendingPermissionCount={pendingPermissionCount}
             showDesktopAttention={showDesktopAttention}
           />

packages/app/src/components/app-diagnostic-sheet.tsx

@@ -1,11 +1,15 @@
 import * as Clipboard from "expo-clipboard";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Platform, Pressable, Text, View, type PressableStateCallbackType } from "react-native";
+import { Platform, Text, View } from "react-native";
 import { Copy, RotateCw } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
 
-import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
+import {
+  AdaptiveModalSheet,
+  SheetHeaderIconButton,
+  type SheetHeader,
+} from "@/components/adaptive-modal-sheet";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { ScrollableCodeSurface, SurfaceCard } from "@/components/ui/scrollable-code-surface";
 import { useToast } from "@/contexts/toast-context";
@@ -42,8 +46,6 @@ interface DiagnosticCollectionResult {
 }
 
 const SNAP_POINTS = ["55%", "88%"];
-const ThemedCopy = withUnistyles(Copy);
-const ThemedRotateCw = withUnistyles(RotateCw);
 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
 const foregroundMutedColorMapping = (theme: Theme) => ({
   color: theme.colors.foregroundMuted,
@@ -150,68 +152,31 @@ export function AppDiagnosticSheet({
       .catch(() => toast.error(t("settings.diagnostics.app.copyFailed")));
   }, [diagnostic, t, toast]);
 
-  const iconButtonStyle = useCallback(
-    ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
-      styles.iconButton,
-      (Boolean(hovered) || pressed) && styles.iconButtonHovered,
-    ],
-    [],
-  );
-
-  const disabledIconButtonStyle = useCallback(
-    ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
-      styles.iconButton,
-      (Boolean(hovered) || pressed) && Boolean(diagnostic) && styles.iconButtonHovered,
-      diagnostic ? null : styles.disabled,
-    ],
-    [diagnostic],
-  );
-
   const header = useMemo<SheetHeader>(
     () => ({
       title: t("settings.diagnostics.app.title"),
       actions: (
-        <View style={styles.headerActions}>
-          <Pressable
+        <>
+          <SheetHeaderIconButton
+            icon={Copy}
+            label={t("settings.diagnostics.app.copyAccessibility")}
             onPress={handleCopyPress}
             disabled={!diagnostic}
-            hitSlop={8}
-            style={disabledIconButtonStyle}
-            accessibilityRole="button"
-            accessibilityLabel={t("settings.diagnostics.app.copyAccessibility")}
-          >
-            <ThemedCopy size={ICON_SIZE.sm} uniProps={foregroundMutedColorMapping} />
-          </Pressable>
-          <Pressable
-            onPress={handleRefreshPress}
-            disabled={loading}
-            hitSlop={8}
-            style={iconButtonStyle}
-            accessibilityRole="button"
-            accessibilityLabel={
+          />
+          <SheetHeaderIconButton
+            icon={RotateCw}
+            label={
               loading
                 ? t("settings.diagnostics.app.refreshingAccessibility")
                 : t("settings.diagnostics.app.refreshAccessibility")
             }
-          >
-            {loading ? (
-              <ThemedLoadingSpinner size={ICON_SIZE.sm} uniProps={foregroundMutedColorMapping} />
-            ) : (
-              <ThemedRotateCw size={ICON_SIZE.sm} uniProps={foregroundMutedColorMapping} />
-            )}
-          </Pressable>
-        </View>
+            onPress={handleRefreshPress}
+            busy={loading}
+          />
+        </>
       ),
     }),
-    [
-      diagnostic,
-      disabledIconButtonStyle,
-      handleCopyPress,
-      handleRefreshPress,
-      iconButtonStyle,
-      loading,
-      t,
-    ],
+    [diagnostic, handleCopyPress, handleRefreshPress, loading, t],
   );
 
   return (
@@ -342,24 +307,6 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.base,
     color: theme.colors.foregroundMuted,
   },
-  headerActions: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-  },
-  iconButton: {
-    width: 28,
-    height: 28,
-    borderRadius: theme.borderRadius.full,
-    alignItems: "center",
-    justifyContent: "center",
-  },
-  iconButtonHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
-  disabled: {
-    opacity: 0.5,
-  },
   statusDot: {
     width: 8,
     height: 8,

packages/app/src/components/archived-badge.tsx

@@ -0,0 +1,17 @@
+import { Archive } from "lucide-react-native";
+import { useTranslation } from "react-i18next";
+import { withUnistyles } from "react-native-unistyles";
+import { StatusBadge } from "@/components/ui/status-badge";
+
+const ThemedArchive = withUnistyles(Archive, (theme) => ({
+  size: theme.fontSize.sm,
+  color: theme.colors.foregroundMuted,
+}));
+
+const ARCHIVE_ICON = <ThemedArchive />;
+
+/** Marks a session or workspace the user archived, wherever archived items are listed. */
+export function ArchivedBadge() {
+  const { t } = useTranslation();
+  return <StatusBadge label={t("agentList.badges.archived")} leading={ARCHIVE_ICON} />;
+}

packages/app/src/components/attachment-lightbox.browser.test.tsx

@@ -0,0 +1,149 @@
+import React, { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { persistAttachmentFromBlob } from "@/attachments/service";
+import { SafeAreaProvider } from "react-native-safe-area-context";
+import { i18n } from "@/i18n/i18next";
+import { WindowLayoutProvider } from "@/window-layout";
+import { AttachmentLightbox, type ImageLightboxSource } from "./attachment-lightbox";
+
+interface FrameSample {
+  image: { x: number; y: number; width: number; height: number } | null;
+  error: boolean;
+}
+
+function nextFrame(): Promise<number> {
+  return new Promise((resolve) => requestAnimationFrame(resolve));
+}
+
+function createPng(width: number, height: number): Promise<Blob> {
+  const canvas = new OffscreenCanvas(width, height);
+  const context = canvas.getContext("2d");
+  if (!context) throw new Error("Canvas 2D context unavailable");
+  context.fillStyle = "#3a7";
+  context.fillRect(0, 0, width, height);
+  return canvas.convertToBlob({ type: "image/png" });
+}
+
+function noop() {}
+
+function isPainted(element: Element): boolean {
+  for (let node: Element | null = element; node; node = node.parentElement) {
+    if (Number(getComputedStyle(node).opacity) === 0) return false;
+  }
+  return true;
+}
+
+/** What the next paint will show: the visible lightbox image box, and whether the error is up. */
+function sampleFrame(): FrameSample {
+  const image = document.querySelector('[data-testid="attachment-lightbox-image"]');
+  const rect = image?.getBoundingClientRect();
+  const visible = image && rect && rect.width > 0 && rect.height > 0 && isPainted(image);
+  return {
+    image: visible
+      ? {
+          x: Math.round(rect.x),
+          y: Math.round(rect.y),
+          width: Math.round(rect.width),
+          height: Math.round(rect.height),
+        }
+      : null,
+    error: (document.body.textContent ?? "").includes("Couldn't load image"),
+  };
+}
+
+/** Samples every frame from the open until the image has held one box for 20 frames. */
+async function recordOpening(open: () => void): Promise<FrameSample[]> {
+  const samples: FrameSample[] = [];
+  open();
+  let stableFrames = 0;
+  for (let frame = 0; frame < 300 && stableFrames < 20; frame += 1) {
+    await nextFrame();
+    const sample = sampleFrame();
+    const previous = samples.at(-1);
+    stableFrames =
+      sample.image && JSON.stringify(sample.image) === JSON.stringify(previous?.image)
+        ? stableFrames + 1
+        : 0;
+    samples.push(sample);
+  }
+  return samples;
+}
+
+let root: Root;
+let container: HTMLDivElement;
+
+beforeEach(async () => {
+  vi.stubGlobal("React", React);
+  await i18n.changeLanguage("en");
+  container = document.createElement("div");
+  document.body.appendChild(container);
+  root = createRoot(container);
+});
+
+afterEach(() => {
+  act(() => root.unmount());
+  document.body.replaceChildren();
+  vi.unstubAllGlobals();
+});
+
+function renderLightbox(source: ImageLightboxSource | null) {
+  root.render(
+    <SafeAreaProvider>
+      <WindowLayoutProvider>
+        <AttachmentLightbox source={source} onClose={noop} />
+      </WindowLayoutProvider>
+    </SafeAreaProvider>,
+  );
+}
+
+async function expectOpeningPaintsOnlyTheFittedImage(source: ImageLightboxSource) {
+  const samples = await recordOpening(() => renderLightbox(source));
+  const fitted = samples.at(-1)?.image;
+
+  expect(fitted, "the image never settled").toBeTruthy();
+  expect(samples.filter((sample) => sample.error)).toEqual([]);
+  expect(
+    samples.filter(
+      (sample) => sample.image && JSON.stringify(sample.image) !== JSON.stringify(fitted),
+    ),
+  ).toEqual([]);
+}
+
+describe("AttachmentLightbox opening in the browser", () => {
+  it("paints the fitted attachment image as its first image frame", async () => {
+    const metadata = await persistAttachmentFromBlob({
+      blob: await createPng(2400, 1600),
+      mimeType: "image/png",
+      fileName: "screenshot.png",
+    });
+
+    await expectOpeningPaintsOnlyTheFittedImage({ type: "attachment", metadata });
+  });
+
+  it("paints only the fitted image when the same attachment opens again", async () => {
+    const metadata = await persistAttachmentFromBlob({
+      blob: await createPng(2400, 1600),
+      mimeType: "image/png",
+      fileName: "screenshot.png",
+    });
+    const source: ImageLightboxSource = { type: "attachment", metadata };
+
+    await expectOpeningPaintsOnlyTheFittedImage(source);
+    await act(async () => renderLightbox(null));
+    await expectOpeningPaintsOnlyTheFittedImage(source);
+  });
+
+  it("shows an image the browser reports no natural size for", async () => {
+    const svg = '<svg xmlns="http://www.w3.org/2000/svg" width="0" height="0"></svg>';
+    const uri = URL.createObjectURL(new Blob([svg], { type: "image/svg+xml" }));
+
+    await expectOpeningPaintsOnlyTheFittedImage({ type: "uri", uri });
+  });
+
+  it("paints the fitted timeline image as its first image frame", async () => {
+    const uri = URL.createObjectURL(await createPng(2400, 1600));
+
+    await expectOpeningPaintsOnlyTheFittedImage({ type: "uri", uri });
+  });
+});

packages/app/src/components/attachment-lightbox.test.tsx

@@ -4,6 +4,7 @@ import { createRoot, type Root } from "react-dom/client";
 import { JSDOM } from "jsdom";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { AttachmentMetadata } from "@/attachments/types";
+import type { AttachmentPreviewUrl } from "@/attachments/use-attachment-preview-url";
 import { AttachmentLightbox, type ImageLightboxSource } from "./attachment-lightbox";
 
 const { theme, imageMetadata, useAttachmentPreviewUrlMock } = vi.hoisted(() => {
@@ -38,9 +39,9 @@ const { theme, imageMetadata, useAttachmentPreviewUrlMock } = vi.hoisted(() => {
   return {
     theme: hoistedTheme,
     imageMetadata: hoistedImageMetadata,
-    useAttachmentPreviewUrlMock: vi.fn<(metadata: AttachmentMetadata | null) => string | null>(
-      () => "blob:preview",
-    ),
+    useAttachmentPreviewUrlMock: vi.fn<
+      (metadata: AttachmentMetadata | null) => AttachmentPreviewUrl
+    >(() => ({ status: "ready", url: "blob:preview" })),
   };
 });
 const attachmentSource: ImageLightboxSource = { type: "attachment", metadata: imageMetadata };
@@ -73,10 +74,13 @@ vi.mock("react-i18next", () => ({
 }));
 
 vi.mock("react-native-safe-area-context", () => ({
-  SafeAreaProvider: ({ children }: { children?: React.ReactNode }) => children,
   useSafeAreaInsets: () => ({ top: 0, right: 0, bottom: 0, left: 0 }),
 }));
 
+vi.mock("@/window-layout", () => ({
+  WindowSafeArea: ({ children }: { children?: React.ReactNode }) => children,
+}));
+
 vi.mock("react-native-gesture-handler", () => ({
   GestureHandlerRootView: ({ children }: { children?: React.ReactNode }) =>
     React.createElement("div", { "data-testid": "gesture-handler-root" }, children),
@@ -151,7 +155,7 @@ beforeEach(() => {
   container = document.createElement("div");
   document.body.appendChild(container);
   root = createRoot(container);
-  useAttachmentPreviewUrlMock.mockReturnValue("blob:preview");
+  useAttachmentPreviewUrlMock.mockReturnValue({ status: "ready", url: "blob:preview" });
 });
 
 afterEach(() => {
@@ -229,14 +233,22 @@ describe("AttachmentLightbox", () => {
     expect(onClose).toHaveBeenCalledTimes(1);
   });
 
-  it("shows error text when the preview URL resolves to null", () => {
-    useAttachmentPreviewUrlMock.mockReturnValue(null);
+  it("shows error text when the preview URL fails to resolve", () => {
+    useAttachmentPreviewUrlMock.mockReturnValue({ status: "failed" });
     render(<AttachmentLightbox source={attachmentSource} onClose={vi.fn()} />);
 
     expect(queryByTestId("attachment-lightbox-image")).toBeNull();
     expect(document.body.textContent ?? "").toContain("Couldn't load image");
   });
 
+  it("shows neither the image nor an error while the preview URL resolves", () => {
+    useAttachmentPreviewUrlMock.mockReturnValue({ status: "loading" });
+    render(<AttachmentLightbox source={attachmentSource} onClose={vi.fn()} />);
+
+    expect(queryByTestId("attachment-lightbox-image")).toBeNull();
+    expect(document.body.textContent ?? "").not.toContain("Couldn't load image");
+  });
+
   it("closes on Escape key on web", () => {
     const onClose = vi.fn();
     render(<AttachmentLightbox source={attachmentSource} onClose={onClose} />);

packages/app/src/components/attachment-lightbox.tsx

@@ -4,17 +4,21 @@ import { type ReactNode, useCallback, useEffect, useMemo, useState } from "react
 import { Pressable, Text, View } from "react-native";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { StyleSheet } from "react-native-unistyles";
-import { SafeAreaProvider, useSafeAreaInsets } from "react-native-safe-area-context";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { X } from "lucide-react-native";
 import { useTranslation } from "react-i18next";
 import type { AttachmentMetadata } from "@/attachments/types";
-import { useAttachmentPreviewUrl } from "@/attachments/use-attachment-preview-url";
+import {
+  type AttachmentPreviewUrl,
+  useAttachmentPreviewUrl,
+} from "@/attachments/use-attachment-preview-url";
 import { isNative } from "@/constants/platform";
 import { SPACING } from "@/styles/theme";
 import { WindowChromeRootRegion } from "@/utils/desktop-window";
 import { ZoomableImage } from "@/components/zoomable-viewport/image";
 import type { ViewportSize } from "@/components/zoomable-viewport/geometry";
 import { useGlobalOverlayLayer } from "@/lib/overlay-root";
+import { WindowSafeArea } from "@/window-layout";
 
 export type ImageLightboxSource =
   | { type: "attachment"; metadata: AttachmentMetadata }
@@ -31,10 +35,13 @@ const LIGHTBOX_FIT = { padding: SPACING[4], maxWidth: 960, maxHeight: 640 };
 export function AttachmentLightbox({ source, onClose }: AttachmentLightboxProps) {
   const { t } = useTranslation();
   const metadata = source?.type === "attachment" ? source.metadata : null;
-  const attachmentUrl = useAttachmentPreviewUrl(metadata);
-  const url = source?.type === "uri" ? source.uri : attachmentUrl;
+  const attachmentPreview = useAttachmentPreviewUrl(metadata);
+  const image: AttachmentPreviewUrl =
+    source?.type === "uri" ? { status: "ready", url: source.uri } : attachmentPreview;
+  const url = image.status === "ready" ? image.url : null;
   const contentSize = source?.type === "uri" ? source.contentSize : undefined;
   const [errored, setErrored] = useState(false);
+  const failed = errored || image.status === "failed";
   const modalLayer = useGlobalOverlayLayer("modal", source !== null);
 
   useEffect(() => {
@@ -76,14 +83,12 @@ export function AttachmentLightbox({ source, onClose }: AttachmentLightboxProps)
     return null;
   }
 
-  const hasError = errored || !url;
-
   return (
     <Modal transparent animationType="fade" statusBarTranslucent visible onRequestClose={onClose}>
       <ModalRoot style={styles.root}>
-        {/* The modal is its own window: its insets are the window's, not the ones left where the
-            image was opened (inside a sheet tab, the bottom one is already spent). */}
-        <SafeAreaProvider>
+        {/* The modal draws over the whole window: its insets are the window's, not the ones left
+            where the image was opened (inside a sheet tab, the bottom one is already spent). */}
+        <WindowSafeArea>
           <WindowChromeRootRegion corners="both">
             <View ref={setOverlayScope} style={styles.root}>
               <Pressable
@@ -94,9 +99,10 @@ export function AttachmentLightbox({ source, onClose }: AttachmentLightboxProps)
                 style={styles.backdrop}
               />
               <LightboxImageArea>
-                {hasError ? (
+                {failed ? (
                   <Text style={styles.errorText}>{t("message.attachments.imageLoadFailed")}</Text>
-                ) : (
+                ) : null}
+                {!failed && url ? (
                   <ZoomableImage
                     accessibilityLabel={t("composer.attachments.openImage")}
                     actions={actions}
@@ -108,11 +114,11 @@ export function AttachmentLightbox({ source, onClose }: AttachmentLightboxProps)
                     testID="attachment-lightbox"
                     uri={url}
                   />
-                )}
+                ) : null}
               </LightboxImageArea>
             </View>
           </WindowChromeRootRegion>
-        </SafeAreaProvider>
+        </WindowSafeArea>
       </ModalRoot>
     </Modal>
   );

packages/app/src/components/attachment-pill.tsx

@@ -133,9 +133,10 @@ export function AttachmentLabel({ icon, title, subtitle }: AttachmentLabelProps)
 
 /** Square image preview pill body. */
 export function AttachmentThumbnail({ metadata }: { metadata: AttachmentMetadata }) {
-  const uri = useAttachmentPreviewUrl(metadata);
-  const source = useMemo(() => ({ uri: uri ?? "" }), [uri]);
-  if (!uri) {
+  const preview = useAttachmentPreviewUrl(metadata);
+  const uri = preview.status === "ready" ? preview.url : null;
+  const source = useMemo(() => (uri ? { uri } : null), [uri]);
+  if (!source) {
     return <View style={styles.thumbnailPlaceholder} />;
   }
   return <Image source={source} style={styles.thumbnail} />;

packages/app/src/components/drag-reorder/drag-hold.test.ts

@@ -0,0 +1,45 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createDragHold } from "./drag-hold";
+
+beforeEach(() => {
+  vi.useFakeTimers();
+});
+
+afterEach(() => {
+  vi.useRealTimers();
+});
+
+function hold() {
+  const onArm = vi.fn();
+  return { onArm, hold: createDragHold({ delayMs: 180, slopPx: 4, onArm }) };
+}
+
+describe("createDragHold", () => {
+  it("arms once the finger has stayed within the slop for the delay", () => {
+    const { onArm, hold: dragHold } = hold();
+    dragHold.begin({ x: 10, y: 10 });
+    dragHold.move({ x: 12, y: 13 });
+    vi.advanceTimersByTime(180);
+
+    expect(onArm).toHaveBeenCalledTimes(1);
+  });
+
+  it("never arms when the finger moves past the slop first, as when a scroll starts", () => {
+    const { onArm, hold: dragHold } = hold();
+    dragHold.begin({ x: 10, y: 10 });
+    dragHold.move({ x: 10, y: 20 });
+    vi.advanceTimersByTime(500);
+
+    expect(onArm).not.toHaveBeenCalled();
+  });
+
+  it("never arms when the finger lifts before the delay", () => {
+    const { onArm, hold: dragHold } = hold();
+    dragHold.begin({ x: 10, y: 10 });
+    vi.advanceTimersByTime(100);
+    dragHold.cancel();
+    vi.advanceTimersByTime(500);
+
+    expect(onArm).not.toHaveBeenCalled();
+  });
+});

packages/app/src/components/drag-reorder/drag-hold.ts

@@ -0,0 +1,51 @@
+export interface TouchPoint {
+  x: number;
+  y: number;
+}
+
+export interface DragHold {
+  begin: (point: TouchPoint) => void;
+  move: (point: TouchPoint) => void;
+  cancel: () => void;
+}
+
+/**
+ * A hold that arms a drag once the finger has stayed put for `delayMs`. Moving further than
+ * `slopPx` from where the touch began cancels it, so a scroll that starts on a handle stays a
+ * scroll. The sidebar rows arm on the same delay and slop.
+ */
+export function createDragHold({
+  delayMs,
+  slopPx,
+  onArm,
+}: {
+  delayMs: number;
+  slopPx: number;
+  onArm: () => void;
+}): DragHold {
+  let timer: ReturnType<typeof setTimeout> | null = null;
+  let start: TouchPoint | null = null;
+
+  function cancel() {
+    if (timer) clearTimeout(timer);
+    timer = null;
+    start = null;
+  }
+
+  return {
+    begin(point) {
+      cancel();
+      start = point;
+      timer = setTimeout(() => {
+        timer = null;
+        start = null;
+        onArm();
+      }, delayMs);
+    },
+    move(point) {
+      if (!start) return;
+      if (Math.hypot(point.x - start.x, point.y - start.y) > slopPx) cancel();
+    },
+    cancel,
+  };
+}

packages/app/src/components/drag-reorder/native-drop.test.ts

@@ -0,0 +1,14 @@
+import { describe, expect, it } from "vitest";
+import { movedItemKey } from "./native-drop";
+
+const byValue = (item: string): string => item;
+
+describe("movedItemKey", () => {
+  it("names the item at its new slot", () => {
+    expect(movedItemKey({ data: ["b", "c", "a"], from: 0, to: 2 }, byValue)).toBe("a");
+  });
+
+  it("names nothing when the item is released in the slot it started in", () => {
+    expect(movedItemKey({ data: ["a", "b", "c"], from: 1, to: 1 }, byValue)).toBeNull();
+  });
+});

packages/app/src/components/drag-reorder/native-drop.ts

@@ -0,0 +1,17 @@
+export interface NativeDrop<T> {
+  data: T[];
+  from: number;
+  to: number;
+}
+
+/**
+ * The key of the item a native drop moved, or null when the item was released in the slot it
+ * started in. The native list reports every release; web reports only drops that moved an item.
+ */
+export function movedItemKey<T>(
+  { data, from, to }: NativeDrop<T>,
+  keyExtractor: (item: T, index: number) => string,
+): string | null {
+  if (from === to) return null;
+  return keyExtractor(data[to], to);
+}

packages/app/src/components/drag-reorder/use-drag-reorder-state.ts

@@ -24,7 +24,7 @@ export function useDragReorderState<T>({
 }: {
   data: T[];
   keyExtractor: (item: T, index: number) => string;
-  onDragEnd?: (items: T[]) => void;
+  onDragEnd?: (items: T[], movedKey: string) => void;
   onDragBegin?: () => void;
   disabled?: boolean;
 }): DragReorderState<T> {
@@ -50,13 +50,14 @@ export function useDragReorderState<T>({
       dispatch({ type: "clear" });
       if (disabled) return;
 
+      const activeId = String(active.id);
       const reordered = reorderItemsOnDragEnd({
         items,
-        activeId: String(active.id),
+        activeId,
         overId: over ? String(over.id) : null,
         keyExtractor,
       });
-      if (reordered) onDragEnd?.(reordered);
+      if (reordered) onDragEnd?.(reordered, activeId);
     },
     [data, disabled, keyExtractor, onDragEnd, state.dragItems],
   );

packages/app/src/components/draggable-list.native.tsx

@@ -1,16 +1,94 @@
-import { RefreshControl } from "react-native";
-import { useCallback, useMemo, useState } from "react";
+import { RefreshControl, View, type GestureResponderEvent } from "react-native";
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import * as Haptics from "expo-haptics";
 import DraggableFlatList, {
   NestableDraggableFlatList,
   type RenderItemParams,
 } from "react-native-draggable-flatlist";
+import type { GestureType } from "react-native-gesture-handler";
 import { useUnistyles } from "react-native-unistyles";
-import type { DraggableListProps, DraggableRenderItemInfo } from "./draggable-list.types";
+import { useContentDrag } from "@/components/ui/scroll-view";
+import { createDragHold } from "./drag-reorder/drag-hold";
+import { movedItemKey } from "./drag-reorder/native-drop";
+import type {
+  DraggableListHandleProps,
+  DraggableListProps,
+  DraggableRenderItemInfo,
+} from "./draggable-list.types";
 
-export type { DraggableListProps, DraggableRenderItemInfo };
+export type { DraggableListHandleProps, DraggableListProps, DraggableRenderItemInfo };
+
+/** The row's `drag()`, for its handle. */
+const RowDragContext = createContext<(() => void) | null>(null);
+
+// The list only accepts drag() once its pan gesture has begun for this touch, and that begin
+// reaches JS after the touch does. Same hold and slop as the sidebar rows' drag arm.
+const HANDLE_HOLD_MS = 180;
+const HANDLE_HOLD_SLOP_PX = 4;
+
+function touchPoint(event: GestureResponderEvent) {
+  return { x: event.nativeEvent.pageX, y: event.nativeEvent.pageY };
+}
+
+/**
+ * On native the handle has no accessibility role or label: a screen reader cannot hold and drag,
+ * and announcing a control whose activation does nothing misleads. The label is for web, where
+ * the keyboard reorders through it.
+ */
+export function DraggableListHandle({ testID, style, children }: DraggableListHandleProps) {
+  const drag = useContext(RowDragContext);
+  const hold = useMemo(
+    () =>
+      drag
+        ? createDragHold({
+            delayMs: HANDLE_HOLD_MS,
+            slopPx: HANDLE_HOLD_SLOP_PX,
+            onArm: () => {
+              void Haptics.selectionAsync().catch(() => {});
+              drag();
+            },
+          })
+        : null,
+    [drag],
+  );
+  useEffect(() => () => hold?.cancel(), [hold]);
+  const startHold = useCallback(
+    (event: GestureResponderEvent) => hold?.begin(touchPoint(event)),
+    [hold],
+  );
+  const moveHold = useCallback(
+    (event: GestureResponderEvent) => hold?.move(touchPoint(event)),
+    [hold],
+  );
+  const cancelHold = useCallback(() => hold?.cancel(), [hold]);
+  return (
+    <View
+      onTouchStart={startHold}
+      onTouchMove={moveHold}
+      onTouchEnd={cancelHold}
+      onTouchCancel={cancelHold}
+      style={style}
+      testID={testID}
+    >
+      {children}
+    </View>
+  );
+}
 
 const SCROLL_ENABLED_FLEX_STYLE = { flex: 1 };
 
+// A drop remounts every row between the drag's start and end slots (see the draggable-flatlist
+// patch), so state held inside a rendered row resets when a drop moves it. Keep state that must
+// survive a reorder in the list's owner, keyed by row.
+
 export function DraggableList<T>({
   data,
   keyExtractor,
@@ -37,6 +115,12 @@ export function DraggableList<T>({
 }: DraggableListProps<T>) {
   const { theme } = useUnistyles();
   const [isDragging, setIsDragging] = useState(false);
+  // Inside a sheet the sheet would otherwise take the vertical move from an armed row.
+  const contentDrag = useContentDrag();
+  const { attach: attachContentDrag } = contentDrag;
+  const dragGestureRef = useRef<GestureType | undefined>(undefined);
+  // Passive effects run after the list's gesture detector has attached and filled the ref.
+  useEffect(() => attachContentDrag?.(dragGestureRef), [attachContentDrag]);
 
   // Pass the ref directly to DraggableFlatList - it handles gesture
   // coordination internally for nestable lists.
@@ -59,27 +143,31 @@ export function DraggableList<T>({
         drag,
         isActive,
       };
-      return renderItem(info);
+      return <RowDragContext.Provider value={drag}>{renderItem(info)}</RowDragContext.Provider>;
     },
     [renderItem],
   );
 
   const handleDragEnd = useCallback(
-    ({ data: newData }: { data: T[] }) => {
+    (drop: { data: T[]; from: number; to: number }) => {
       setIsDragging(false);
-      onDragEnd(newData);
+      contentDrag.setActive(false);
+      const moved = movedItemKey(drop, keyExtractor);
+      if (moved !== null) onDragEnd(drop.data, moved);
     },
-    [onDragEnd],
+    [contentDrag, keyExtractor, onDragEnd],
   );
 
   const handleDragBegin = useCallback(() => {
     setIsDragging(true);
+    contentDrag.setActive(true);
     onDragBeginProp?.();
-  }, [onDragBeginProp]);
+  }, [contentDrag, onDragBeginProp]);
 
   const handleRelease = useCallback(() => {
     setIsDragging(false);
-  }, []);
+    contentDrag.setActive(false);
+  }, [contentDrag]);
 
   const showRefreshControl = Boolean(onRefresh) && (!isDragging || Boolean(refreshing));
   const resolvedContainerStyle =
@@ -117,9 +205,14 @@ export function DraggableList<T>({
       ListEmptyComponent={ListEmptyComponent}
       showsVerticalScrollIndicator={showsVerticalScrollIndicator}
       scrollEnabled={scrollEnabled}
+      // A list that doesn't scroll shows every row, so it renders them all in its first commit.
+      // FlatList's default first render is 10 rows; a nested list remounted by a drop would paint
+      // 10 rows, then grow on a later commit.
+      initialNumToRender={scrollEnabled ? undefined : data.length}
       extraData={extraData}
       simultaneousHandlers={simultaneousHandlers}
       dragGestureHostPresented={gestureHostPresented}
+      dragGestureRef={attachContentDrag ? dragGestureRef : undefined}
       // Higher activation distance reduces accidental drag capture while nested
       // lists are inside a scroll container.
       activationDistance={20}

packages/app/src/components/draggable-list.types.ts

@@ -1,4 +1,4 @@
-import type { ReactElement, MutableRefObject } from "react";
+import type { ReactElement, ReactNode, MutableRefObject } from "react";
 import type { StyleProp, ViewStyle } from "react-native";
 import type { GestureType } from "react-native-gesture-handler";
 
@@ -12,6 +12,18 @@ export interface DraggableListDragHandleProps {
   setActivatorNodeRef?: (node: unknown) => void;
 }
 
+/**
+ * The grip a row is dragged by, rendered anywhere inside `renderItem`. Pointer drags start from
+ * it on web (with `useDragHandle`); touch drags start after a short hold on native.
+ */
+export interface DraggableListHandleProps {
+  /** Names the keyboard-reorderable handle on web. Native leaves the handle out of accessibility. */
+  accessibilityLabel: string;
+  testID?: string;
+  style?: StyleProp<ViewStyle>;
+  children: ReactNode;
+}
+
 export interface DraggableRenderItemInfo<T> {
   item: T;
   index: number;
@@ -24,7 +36,8 @@ export interface DraggableListProps<T> {
   data: T[];
   keyExtractor: (item: T, index: number) => string;
   renderItem: (info: DraggableRenderItemInfo<T>) => ReactElement;
-  onDragEnd: (data: T[]) => void;
+  /** The new order, and the key of the item the user moved to reach it. */
+  onDragEnd: (data: T[], movedKey: string) => void;
   style?: StyleProp<ViewStyle>;
   /** Outer container style (useful for nested, non-scrolling lists). */
   containerStyle?: StyleProp<ViewStyle>;

packages/app/src/components/draggable-list.web.browser.test.tsx

@@ -0,0 +1,110 @@
+import React, { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  DraggableList,
+  DraggableListHandle,
+  type DraggableRenderItemInfo,
+} from "./draggable-list.web";
+
+Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
+
+interface Item {
+  id: string;
+}
+
+function keyExtractor(item: Item): string {
+  return item.id;
+}
+
+function noop() {}
+
+let root: Root | null = null;
+let container: HTMLDivElement | null = null;
+
+beforeEach(() => {
+  container = document.createElement("div");
+  document.body.appendChild(container);
+  root = createRoot(container);
+});
+
+afterEach(() => {
+  act(() => root?.unmount());
+  container?.remove();
+  root = null;
+  container = null;
+});
+
+function renderRowWithHandle(info: DraggableRenderItemInfo<Item>) {
+  return (
+    <div>
+      <DraggableListHandle accessibilityLabel={`Move ${info.item.id}`} testID="row-handle">
+        <span>grip</span>
+      </DraggableListHandle>
+      <span data-testid="row-body">{info.item.id}</span>
+    </div>
+  );
+}
+
+function renderList(onDragBegin: () => void) {
+  act(() => {
+    root?.render(
+      <DraggableList
+        data={[{ id: "one" }, { id: "two" }]}
+        keyExtractor={keyExtractor}
+        renderItem={renderRowWithHandle}
+        onDragEnd={noop}
+        onDragBegin={onDragBegin}
+        useDragHandle
+      />,
+    );
+  });
+}
+
+function byTestId(testID: string): HTMLElement {
+  const found = container?.querySelector(`[data-testid="${testID}"]`);
+  if (!(found instanceof HTMLElement)) throw new Error(`Nothing rendered as ${testID}`);
+  return found;
+}
+
+/** Press on the element's centre, move the mouse down by `distance`, and release. */
+function pressAndMove(element: HTMLElement, distance: number) {
+  const { left, top, width, height } = element.getBoundingClientRect();
+  const x = left + width / 2;
+  const y = top + height / 2;
+  act(() => {
+    element.dispatchEvent(
+      new MouseEvent("mousedown", { bubbles: true, button: 0, clientX: x, clientY: y }),
+    );
+  });
+  act(() => {
+    document.dispatchEvent(
+      new MouseEvent("mousemove", { bubbles: true, clientX: x, clientY: y + distance }),
+    );
+  });
+  act(() => {
+    document.dispatchEvent(new MouseEvent("mouseup", { bubbles: true }));
+  });
+}
+
+describe("DraggableListHandle on web", () => {
+  it("starts the row's drag from the handle, and only from the handle", () => {
+    const onDragBegin = vi.fn();
+    renderList(onDragBegin);
+
+    pressAndMove(byTestId("row-body"), 20);
+    expect(onDragBegin).not.toHaveBeenCalled();
+
+    pressAndMove(byTestId("row-handle"), 20);
+    expect(onDragBegin).toHaveBeenCalledTimes(1);
+  });
+
+  it("is a labelled button rather than dnd-kit's sortable", () => {
+    renderList(noop);
+    const handle = byTestId("row-handle");
+
+    expect(handle.getAttribute("role")).toBe("button");
+    expect(handle.getAttribute("aria-label")).toBe("Move one");
+    expect(handle.getAttribute("aria-roledescription")).toBeNull();
+  });
+});

packages/app/src/components/draggable-list.web.tsx

@@ -1,4 +1,13 @@
-import { memo, useCallback, useMemo, useRef, type ReactElement } from "react";
+import {
+  createContext,
+  memo,
+  useCallback,
+  useContext,
+  useMemo,
+  useRef,
+  type ReactElement,
+  type Ref,
+} from "react";
 import { ScrollView, View } from "react-native";
 import {
   DndContext,
@@ -17,10 +26,52 @@ import {
   useSortable,
 } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
-import type { DraggableListProps, DraggableRenderItemInfo } from "./draggable-list.types";
+import type {
+  DraggableListDragHandleProps,
+  DraggableListHandleProps,
+  DraggableListProps,
+  DraggableRenderItemInfo,
+} from "./draggable-list.types";
 import { getDragActivationConstraints, useDragReorderState } from "./drag-reorder";
 
-export type { DraggableListProps, DraggableRenderItemInfo };
+export type { DraggableListHandleProps, DraggableListProps, DraggableRenderItemInfo };
+
+/** The row's dnd-kit activator, for its handle. Absent unless the list uses drag handles. */
+const RowHandleContext = createContext<DraggableListDragHandleProps | undefined>(undefined);
+
+// React Native's style types have no `cursor: "grab"`; react-native-web passes it through.
+const GRAB_CURSOR = { cursor: "grab" } as object;
+
+export function DraggableListHandle({
+  accessibilityLabel,
+  testID,
+  style,
+  children,
+}: DraggableListHandleProps) {
+  const handle = useContext(RowHandleContext);
+  // The handle is a labelled button; dnd-kit's own role, focus stop and "sortable" description
+  // would replace that.
+  const {
+    role: _role,
+    tabIndex: _tabIndex,
+    "aria-roledescription": _roleDescription,
+    ...attributes
+  } = handle?.attributes ?? {};
+  const handleStyle = useMemo(() => [GRAB_CURSOR, style], [style]);
+  return (
+    <View
+      {...attributes}
+      {...handle?.listeners}
+      ref={handle?.setActivatorNodeRef as unknown as Ref<View>}
+      accessibilityRole="button"
+      accessibilityLabel={accessibilityLabel}
+      style={handleStyle}
+      testID={testID}
+    >
+      {children}
+    </View>
+  );
+}
 
 const restrictToVerticalAxis: Modifier = ({ transform }) => ({
   ...transform,
@@ -177,7 +228,9 @@ function SortableItemInner<T>({
 
   return (
     <div {...wrapperProps} style={style}>
-      {renderItem(info)}
+      <RowHandleContext.Provider value={dragHandleProps}>
+        {renderItem(info)}
+      </RowHandleContext.Provider>
     </div>
   );
 }

packages/app/src/components/host-status-dot.tsx

@@ -5,6 +5,8 @@ import {
   useHostRuntimeConnectionStatus,
 } from "@/runtime/host-runtime";
 
+export const HOST_STATUS_DOT_SIZE = 8;
+
 export function HostStatusDot({ serverId }: { serverId: string }) {
   const status = useHostRuntimeConnectionStatus(serverId);
 
@@ -19,8 +21,8 @@ function statusStyle(status: HostRuntimeConnectionStatus) {
 
 const styles = StyleSheet.create((theme) => ({
   dot: {
-    width: 8,
-    height: 8,
+    width: HOST_STATUS_DOT_SIZE,
+    height: HOST_STATUS_DOT_SIZE,
     borderRadius: theme.borderRadius.full,
   },
   dotOnline: {

packages/app/src/components/hosts/host-filter.tsx

@@ -1,8 +1,12 @@
 import { useCallback, useMemo, useRef, useState, type ReactElement } from "react";
-import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
-import { ChevronDown, Server } from "lucide-react-native";
+import { Text, View } from "react-native";
+import { Server } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import type { Theme } from "@/styles/theme";
+import { HOST_STATUS_DOT_SIZE } from "@/components/host-status-dot";
+import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
+import { mapLayout } from "@/components/ui/control-sizing";
+import { density } from "@/styles/density";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
 import {
   ALL_HOSTS_OPTION_ID,
   getHostPickerLabel,
@@ -12,7 +16,8 @@ import {
 } from "@/components/hosts/host-picker";
 
 const ThemedServer = withUnistyles(Server);
-const ThemedChevronDown = withUnistyles(ChevronDown);
+// The height a hung trigger keeps: one line of its base-size label.
+const LABEL_LINE = 20;
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 
 export interface HostFilterProps {
@@ -24,20 +29,28 @@ export interface HostFilterProps {
    * manager edits a single host's catalog, so "all" is not an answer it could carry out.
    */
   includeAllHost?: boolean;
+  /**
+   * Hang the trigger into the surrounding padding, for a trigger that leads a column such as a
+   * modal body: its leading glyph's ink sits on the content rail and it adds only a label line to
+   * the column, so the column's own gap sets the rhythm. The frame still grows outward on hover.
+   */
+  hang?: boolean;
   triggerTestID?: string;
   hostOptionTestID?: (serverId: string) => string;
 }
 
 /**
- * The "All hosts / <host>" host pill shared by History, Schedules, Usage, the label manager and
+ * The "All hosts / <host>" host picker shared by History, Schedules, Usage, the label manager and
  * plugin screens: an anchored HostPicker, hidden by the caller when only one host exists. Without
- * `includeAllHost` it picks the one host a surface shows.
+ * `includeAllHost` it picks the one host a surface shows. Its trigger is the Settings host
+ * trigger; a long host name truncates instead of pushing the row.
  */
 export function HostFilter({
   hosts,
   selectedHost,
   onSelectHost,
   includeAllHost = true,
+  hang = false,
   triggerTestID,
   hostOptionTestID,
 }: HostFilterProps): ReactElement {
@@ -50,12 +63,21 @@ export function HostFilter({
   );
 
   const handleFilterOpen = useCallback(() => setIsFilterOpen(true), []);
+  const showsAllHosts = selectedHost === ALL_HOSTS_OPTION_ID;
+  const slotStyle = useMemo(
+    () => [
+      styles.triggerSlot,
+      hang && styles.triggerSlotHang,
+      hang && (showsAllHosts ? styles.glyphHang : styles.dotHang),
+    ],
+    [hang, showsAllHosts],
+  );
 
-  const filterTriggerStyle = useCallback(
-    ({ pressed, hovered = false }: PressableStateCallbackType & { hovered?: boolean }) => [
-      styles.filterTrigger,
-      Boolean(hovered) && styles.filterTriggerHovered,
-      pressed && styles.filterTriggerPressed,
+  const triggerStyle = useCallback(
+    ({ pressed, hovered }: { pressed: boolean; hovered: boolean }) => [
+      styles.trigger,
+      hovered && styles.triggerHovered,
+      pressed && styles.triggerPressed,
     ],
     [],
   );
@@ -74,54 +96,73 @@ export function HostFilter({
       desktopPlacement="bottom-start"
       hostOptionTestID={hostOptionTestID}
     >
-      <View ref={filterAnchorRef} collapsable={false} style={styles.filterTriggerWrap}>
-        <Pressable
+      <View style={slotStyle}>
+        <ComboboxTrigger
+          ref={filterAnchorRef}
           onPress={handleFilterOpen}
-          style={filterTriggerStyle}
+          style={triggerStyle}
           testID={triggerTestID}
           accessibilityRole="button"
           accessibilityLabel={`Filter: ${selectedHostLabel}`}
         >
-          {selectedHost === ALL_HOSTS_OPTION_ID ? (
-            <ThemedServer size={14} uniProps={mutedColorMapping} />
+          {showsAllHosts ? (
+            <ThemedServer size={ICON_SIZE.sm} uniProps={mutedColorMapping} />
           ) : (
             <HostStatusDotSlot serverId={selectedHost} />
           )}
-          <Text style={styles.filterTriggerText} numberOfLines={1}>
+          <Text style={styles.label} numberOfLines={1}>
             {selectedHostLabel}
           </Text>
-          <ThemedChevronDown size={14} uniProps={mutedColorMapping} />
-        </Pressable>
+        </ComboboxTrigger>
       </View>
     </HostPicker>
   );
 }
 
 const styles = StyleSheet.create((theme) => ({
-  filterTriggerWrap: {
-    alignSelf: "flex-start",
+  // A row around the trigger keeps it as wide as its label in a column, and centred like any other
+  // item in a row.
+  triggerSlot: {
+    flexDirection: "row",
+    flexShrink: 1,
+    minWidth: 0,
+    maxWidth: "100%",
   },
-  filterTrigger: {
+  // Hangs the frame's height down to a label line.
+  triggerSlotHang: {
+    marginVertical: mapLayout(density.tightRowHeight, (height) => (LABEL_LINE - height) / 2),
+  },
+  // Hangs the padding, so the server glyph's box sits on the rail.
+  glyphHang: {
+    marginLeft: -theme.spacing[2],
+  },
+  // Hangs the padding and the dot's inset in its icon slot, so the dot's ink sits on the rail.
+  dotHang: {
+    marginLeft: -(theme.spacing[2] + (ICON_SIZE.sm - HOST_STATUS_DOT_SIZE) / 2),
+  },
+  // The Settings host trigger: a borderless row that fills on hover and press.
+  trigger: {
+    flexShrink: 1,
+    minWidth: 0,
+    maxWidth: "100%",
     flexDirection: "row",
     alignItems: "center",
-    gap: theme.spacing[1.5],
-    alignSelf: "flex-start",
-    paddingVertical: theme.spacing[1.5],
-    paddingHorizontal: theme.spacing[3],
-    borderRadius: theme.borderRadius.md,
-    backgroundColor: theme.colors.surface1,
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
+    minHeight: density.tightRowHeight,
+    paddingVertical: theme.spacing[1],
+    paddingHorizontal: theme.spacing[2],
+    borderRadius: theme.borderRadius.lg,
   },
-  filterTriggerHovered: {
+  triggerHovered: {
     backgroundColor: theme.colors.surface2,
   },
-  filterTriggerPressed: {
-    backgroundColor: theme.colors.surface3,
+  triggerPressed: {
+    backgroundColor: theme.colors.surface2,
   },
-  filterTriggerText: {
+  label: {
+    flexShrink: 1,
+    minWidth: 0,
     color: theme.colors.foreground,
     fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.medium,
+    fontWeight: theme.fontWeight.normal,
   },
 }));

packages/app/src/components/hosts/host-menu-item.tsx

@@ -0,0 +1,47 @@
+import { useCallback, useMemo, type ReactElement } from "react";
+import { View } from "react-native";
+import { HostStatusDot } from "@/components/host-status-dot";
+import { MenuItem } from "@/components/ui/menu";
+
+interface HostMenuItemProps {
+  serverId: string;
+  label: string;
+  selected: boolean;
+  onSelect: (serverId: string) => void;
+  /** Off for a multi-select page, where choosing a host is one of several toggles. */
+  closeOnSelect?: boolean;
+  testID?: string;
+  statusTestID?: string;
+}
+
+/** A host as a menu option: its live status dot leads, and the chosen host carries the check. */
+export function HostMenuItem({
+  serverId,
+  label,
+  selected,
+  onSelect,
+  closeOnSelect = true,
+  testID,
+  statusTestID,
+}: HostMenuItemProps): ReactElement {
+  const handleSelect = useCallback(() => onSelect(serverId), [onSelect, serverId]);
+  const leading = useMemo(
+    () => (
+      <View testID={statusTestID}>
+        <HostStatusDot serverId={serverId} />
+      </View>
+    ),
+    [serverId, statusTestID],
+  );
+  return (
+    <MenuItem
+      selected={selected}
+      closeOnSelect={closeOnSelect}
+      leading={leading}
+      onSelect={handleSelect}
+      testID={testID}
+    >
+      {label}
+    </MenuItem>
+  );
+}

packages/app/src/components/import-session-sheet.test.tsx

@@ -164,6 +164,25 @@ vi.mock("@/components/adaptive-modal-sheet", () => ({
         {children}
       </section>
     ) : null,
+  SheetHeaderIconButton: ({
+    label,
+    onPress,
+    busy,
+    testID,
+  }: {
+    label: string;
+    onPress: () => void;
+    busy?: boolean;
+    testID?: string;
+  }) => (
+    <button
+      type="button"
+      aria-label={label}
+      disabled={busy}
+      onClick={onPress}
+      data-testid={testID}
+    />
+  ),
 }));
 
 vi.mock("react-native", async () => {

packages/app/src/components/import-session-sheet.tsx

@@ -9,7 +9,11 @@ import type {
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
 import { ChevronDown, Inbox, Layers, RotateCw } from "lucide-react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
-import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
+import {
+  AdaptiveModalSheet,
+  SheetHeaderIconButton,
+  type SheetHeader,
+} from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import { ImportSessionList } from "@/components/import-session-list";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
@@ -216,36 +220,6 @@ function ProviderErrorBannerRow({
   );
 }
 
-function RefreshAction({ isRefreshing, onPress }: { isRefreshing: boolean; onPress: () => void }) {
-  const { theme } = useUnistyles();
-  const { t } = useTranslation();
-  const pressableStyle = useCallback(
-    ({ pressed }: PressableStateCallbackType) => [
-      styles.refreshButton,
-      pressed && styles.refreshButtonPressed,
-    ],
-    [],
-  );
-  return (
-    <Pressable
-      onPress={onPress}
-      disabled={isRefreshing}
-      accessibilityLabel={t("importSession.actions.refresh")}
-      accessibilityRole="button"
-      testID="import-session-refresh"
-      style={pressableStyle}
-    >
-      <View style={styles.refreshIconSlot}>
-        {isRefreshing ? (
-          <LoadingSpinner color={theme.colors.foregroundMuted} />
-        ) : (
-          <RotateCw size={16} color={theme.colors.foregroundMuted} />
-        )}
-      </View>
-    </Pressable>
-  );
-}
-
 function ScopeSubtitle({
   hostLabel,
   isScoped,
@@ -775,7 +749,15 @@ export function ImportSessionSheet({
             },
           }
         : {}),
-      actions: <RefreshAction isRefreshing={isRefreshing} onPress={handleRefresh} />,
+      actions: (
+        <SheetHeaderIconButton
+          icon={RotateCw}
+          label={t("importSession.actions.refresh")}
+          onPress={handleRefresh}
+          busy={isRefreshing}
+          testID="import-session-refresh"
+        />
+      ),
     }),
     [handleRefresh, handleShowAll, hostLabel, isRefreshing, scopeCwd, supportsSearch, t, visible],
   );
@@ -1099,18 +1081,4 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.base,
     textAlign: "center",
   },
-  refreshButton: {
-    padding: theme.spacing[2],
-    marginRight: theme.spacing[1],
-    borderRadius: theme.borderRadius.lg,
-  },
-  refreshButtonPressed: {
-    backgroundColor: theme.colors.surface2,
-  },
-  refreshIconSlot: {
-    width: 16,
-    height: 16,
-    alignItems: "center",
-    justifyContent: "center",
-  },
 }));

packages/app/src/components/model-browser.tsx

@@ -35,7 +35,7 @@ import {
   type AgentProfilePickerRow as AgentProfilePickerRowModel,
   type AgentProfileSeed,
 } from "@/agent-profiles";
-import type { SheetHeader } from "@/components/adaptive-modal-sheet";
+import { SheetHeaderIconButton, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
@@ -74,14 +74,13 @@ const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
 const ThemedPencil = withUnistyles(Pencil);
 const ThemedPlus = withUnistyles(Plus);
 const ThemedSearch = withUnistyles(Search);
-const ThemedSettings = withUnistyles(Settings);
 
 function ProviderSettingsAction({
-  accessibilityLabel,
+  label,
   provider,
   serverId,
 }: {
-  accessibilityLabel: string;
+  label: string;
   provider: string;
   serverId: string | null;
 }) {
@@ -92,17 +91,13 @@ function ProviderSettingsAction({
   }, [overlayParentLayer, provider, serverId]);
 
   return (
-    <Pressable
+    <SheetHeaderIconButton
+      icon={Settings}
+      label={label}
       onPress={handlePress}
       disabled={!serverId}
-      hitSlop={8}
-      style={iconButtonStyle}
-      accessibilityRole="button"
-      accessibilityLabel={accessibilityLabel}
       testID={`selector-header-settings-${provider}`}
-    >
-      <HeaderSettingsIcon disabled={!serverId} />
-    </Pressable>
+    />
   );
 }
 
@@ -188,10 +183,6 @@ const foregroundExtraMutedMapping = (theme: Theme) => ({
   color: theme.colors.foregroundExtraMuted,
 });
 
-const headerSettingsMapping = (disabled: boolean) => (theme: Theme) => ({
-  color: disabled ? theme.colors.border : theme.colors.foregroundMuted,
-});
-
 interface ModelBrowserInput {
   providers: ProviderSelectorProvider[];
   selectedProvider: string;
@@ -278,11 +269,6 @@ export function ModelProviderGlyph({
   return <Icon size={size} strokeWidth={strokeWidth} color={color} />;
 }
 
-function HeaderSettingsIcon({ disabled }: { disabled: boolean }) {
-  const uniProps = useMemo(() => headerSettingsMapping(disabled), [disabled]);
-  return <ThemedSettings size={ICON_SIZE.sm} uniProps={uniProps} />;
-}
-
 function iconButtonStyle({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) {
   return [
     styles.rowIconButton,
@@ -395,15 +381,11 @@ export function useModelBrowser({
       ),
       back: singleProviderView ? undefined : { onPress: showAll },
       actions: (
-        <View style={styles.headerActionRow}>
-          <ProviderSettingsAction
-            serverId={serverId}
-            provider={view.providerId}
-            accessibilityLabel={t("modelSelector.openProviderSettings", {
-              provider: view.providerLabel,
-            })}
-          />
-        </View>
+        <ProviderSettingsAction
+          serverId={serverId}
+          provider={view.providerId}
+          label={t("modelSelector.openProviderSettings", { provider: view.providerLabel })}
+        />
       ),
       search: {
         onChange: handleSearchQueryChange,
@@ -1586,11 +1568,6 @@ export function ModelBrowser({
 }
 
 const styles = StyleSheet.create((theme) => ({
-  headerActionRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-  },
   profilesContainer: {
     backgroundColor: theme.colors.surface1,
     borderBottomWidth: 1,

packages/app/src/components/provider-diagnostic-sheet.tsx

@@ -8,6 +8,7 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import {
   AdaptiveModalSheet,
   AdaptiveTextInput,
+  SheetHeaderIconButton,
   type SheetHeader,
 } from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
@@ -275,28 +276,10 @@ function DiagnosticSubSheet({
     }
   }, [visible, fetchDiagnostic]);
 
-  const refreshButtonStyle = useCallback(
-    ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
-      sheetStyles.iconButton,
-      (Boolean(hovered) || pressed) && sheetStyles.iconButtonHovered,
-      loading ? sheetStyles.disabled : null,
-    ],
-    [loading],
-  );
-
   const handleRefreshPress = useCallback(() => {
     void fetchDiagnostic();
   }, [fetchDiagnostic]);
 
-  const copyButtonStyle = useCallback(
-    ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
-      sheetStyles.iconButton,
-      (Boolean(hovered) || pressed) && Boolean(diagnostic) && sheetStyles.iconButtonHovered,
-      diagnostic ? null : sheetStyles.disabled,
-    ],
-    [diagnostic],
-  );
-
   const handleCopyPress = useCallback(() => {
     if (!diagnostic) return;
     void Clipboard.setStringAsync(diagnostic)
@@ -308,49 +291,27 @@ function DiagnosticSubSheet({
     () => ({
       title: t("settings.providers.diagnostic.title"),
       actions: (
-        <View style={sheetStyles.headerActions}>
-          <Pressable
+        <>
+          <SheetHeaderIconButton
+            icon={Copy}
+            label={t("settings.providers.diagnostic.copyAccessibility")}
             onPress={handleCopyPress}
             disabled={!diagnostic}
-            hitSlop={8}
-            style={copyButtonStyle}
-            accessibilityRole="button"
-            accessibilityLabel={t("settings.providers.diagnostic.copyAccessibility")}
-          >
-            <Copy size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
-          </Pressable>
-          <Pressable
-            onPress={handleRefreshPress}
-            disabled={loading}
-            hitSlop={8}
-            style={refreshButtonStyle}
-            accessibilityRole="button"
-            accessibilityLabel={
+          />
+          <SheetHeaderIconButton
+            icon={RotateCw}
+            label={
               loading
                 ? t("settings.providers.diagnostic.refreshingAccessibility")
                 : t("settings.providers.diagnostic.refreshAccessibility")
             }
-          >
-            {loading ? (
-              <LoadingSpinner size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
-            ) : (
-              <RotateCw size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
-            )}
-          </Pressable>
-        </View>
+            onPress={handleRefreshPress}
+            busy={loading}
+          />
+        </>
       ),
     }),
-    [
-      copyButtonStyle,
-      diagnostic,
-      handleCopyPress,
-      handleRefreshPress,
-      loading,
-      refreshButtonStyle,
-      t,
-      theme.colors.foregroundMuted,
-      theme.iconSize.sm,
-    ],
+    [diagnostic, handleCopyPress, handleRefreshPress, loading, t],
   );
 
   let body: React.ReactNode;
@@ -762,11 +723,6 @@ const sheetStyles = StyleSheet.create((theme) => ({
   iconButtonHovered: {
     backgroundColor: theme.colors.surface2,
   },
-  headerActions: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-  },
   disabled: {
     opacity: 0.5,
   },

packages/app/src/components/settings/index.tsx

@@ -31,6 +31,7 @@ export { SettingsSection } from "./headings/settings-section";
 export { SettingsCollapsibleRow } from "./collapsible-row";
 export { SettingsDetailRow } from "./detail-row";
 export { SettingsInfoTip } from "./headings/settings-info-tip";
+export { MenuSettingsRows } from "./row-density";
 
 /** What app screens can add to a plugin-facing row: an accessory beside the label, such as an info tip. */
 interface AppRowExtras {

packages/app/src/components/settings/row-density.tsx

@@ -2,16 +2,27 @@ import { createContext, useContext, useMemo, type ReactNode } from "react";
 import type { StyleProp, TextStyle, ViewStyle } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { CONTROL_HEIGHTS, mapLayout, type ControlSize } from "@/components/ui/control-geometry";
+import { menuRowContentInset } from "@/components/ui/menu";
 
 import { settingsStyles } from "@/styles/settings";
 
-// Rows revealed under a collapsible row belong to it, so they sit one step smaller than the rows
-// of the card: tighter padding, smaller text, smaller controls. The container decides; a row
-// never knows on its own that it is nested.
-const NestedRowsContext = createContext(false);
+// The container decides how its rows lay out; a row never knows on its own where it is.
+//
+// - card: the rows of a settings card.
+// - nested: rows revealed under a collapsible row belong to it, so they sit one step smaller than
+//   the rows of the card: tighter padding, smaller text, smaller controls.
+// - menu: rows that share a menu surface with menu rows put their labels on the menu's label rail.
+type RowPlacement = "card" | "nested" | "menu";
+
+const RowPlacementContext = createContext<RowPlacement>("card");
 
 export function NestedSettingsRows({ children }: { children: ReactNode }) {
-  return <NestedRowsContext.Provider value>{children}</NestedRowsContext.Provider>;
+  return <RowPlacementContext.Provider value="nested">{children}</RowPlacementContext.Provider>;
+}
+
+/** Settings rows rendered in a menu surface, alongside menu rows. */
+export function MenuSettingsRows({ children }: { children: ReactNode }) {
+  return <RowPlacementContext.Provider value="menu">{children}</RowPlacementContext.Provider>;
 }
 
 export interface SettingsRowLayout {
@@ -22,26 +33,36 @@ export interface SettingsRowLayout {
   controlSize: ControlSize;
 }
 
-/** How a row lays out where it is rendered: in a card, or nested under a collapsible row. */
+function layoutFor(placement: RowPlacement): SettingsRowLayout {
+  switch (placement) {
+    case "nested":
+      return {
+        row: [settingsStyles.row, styles.nestedRow],
+        title: [settingsStyles.rowTitle, styles.nestedText],
+        hint: [settingsStyles.rowHint, styles.nestedText],
+        controlSize: "sm",
+      };
+    case "menu":
+      return {
+        row: [settingsStyles.row, styles.menuRow],
+        title: settingsStyles.rowTitle,
+        hint: settingsStyles.rowHint,
+        controlSize: "md",
+      };
+    case "card":
+      return {
+        row: settingsStyles.row,
+        title: settingsStyles.rowTitle,
+        hint: settingsStyles.rowHint,
+        controlSize: "md",
+      };
+  }
+}
+
+/** How a row lays out where it is rendered: in a card, nested under a collapsible row, or in a menu. */
 export function useSettingsRowLayout(): SettingsRowLayout {
-  const nested = useContext(NestedRowsContext);
-  return useMemo(
-    () =>
-      nested
-        ? {
-            row: [settingsStyles.row, styles.nestedRow],
-            title: [settingsStyles.rowTitle, styles.nestedText],
-            hint: [settingsStyles.rowHint, styles.nestedText],
-            controlSize: "sm",
-          }
-        : {
-            row: settingsStyles.row,
-            title: settingsStyles.rowTitle,
-            hint: settingsStyles.rowHint,
-            controlSize: "md",
-          },
-    [nested],
-  );
+  const placement = useContext(RowPlacementContext);
+  return useMemo(() => layoutFor(placement), [placement]);
 }
 
 const styles = StyleSheet.create((theme) => ({
@@ -54,4 +75,7 @@ const styles = StyleSheet.create((theme) => ({
   nestedText: {
     fontSize: theme.fontSize.sm,
   },
+  menuRow: {
+    paddingHorizontal: menuRowContentInset(theme),
+  },
 }));

packages/app/src/components/settings/row-header.tsx

@@ -54,11 +54,7 @@ export function SettingsRowHeader({
 }: SettingsRowHeaderProps) {
   const layout = useSettingsRowLayout();
   const rowStyle = useCallback(
-    ({ hovered, pressed }: HoverState) => [
-      layout.row,
-      !disabled && hovered && styles.hovered,
-      !disabled && pressed && styles.pressed,
-    ],
+    ({ hovered }: HoverState) => [layout.row, !disabled && hovered && styles.hovered],
     [disabled, layout],
   );
   const chevronStyle = useMemo(

packages/app/src/components/sidebar-workspace-list.test.tsx

@@ -462,7 +462,9 @@ describe("sidebar group visibility", () => {
 
   it.each([0, 7, 8])("limits %i Done rows to seven", (count) => {
     const items = entries(Array(count).fill("done"));
-    const { result } = renderHook(() => useLimitedSidebarGroup({ items, selection: null, policy }));
+    const { result } = renderHook(() =>
+      useLimitedSidebarGroup({ items, selection: null, expanded: false, policy }),
+    );
     expect(result.current.visibleItems).toEqual(items.slice(0, 7));
     expect(result.current.canToggle).toBe(count > 7);
   });
@@ -472,7 +474,7 @@ describe("sidebar group visibility", () => {
     (status) => {
       const items = entries([...Array(11).fill("done"), status]);
       const { result } = renderHook(() =>
-        useLimitedSidebarGroup({ items, selection: null, policy }),
+        useLimitedSidebarGroup({ items, selection: null, expanded: false, policy }),
       );
       expect(names(result.current.visibleItems)).toEqual([
         "row-1",
@@ -497,6 +499,7 @@ describe("sidebar group visibility", () => {
         useLimitedSidebarGroup({
           items,
           selection: null,
+          expanded: false,
           policy: createWorkspaceVisibilityPolicy(entriesByKey),
         }),
       );
@@ -518,7 +521,9 @@ describe("sidebar group visibility", () => {
       "needs_input",
       "failed",
     ]);
-    const { result } = renderHook(() => useLimitedSidebarGroup({ items, selection: null, policy }));
+    const { result } = renderHook(() =>
+      useLimitedSidebarGroup({ items, selection: null, expanded: false, policy }),
+    );
     expect(result.current.visibleItems).toEqual(items);
     expect(result.current.canToggle).toBe(false);
   });
@@ -532,9 +537,10 @@ describe("sidebar group visibility", () => {
       "done",
       "attention",
     ]);
-    const { result, rerender, unmount } = renderHook(
-      ({ rows }) => useLimitedSidebarGroup({ items: rows, selection: null, policy }),
-      { initialProps: { rows: items } },
+    const { result, rerender } = renderHook(
+      ({ rows, expanded }) =>
+        useLimitedSidebarGroup({ items: rows, selection: null, expanded, policy }),
+      { initialProps: { rows: items, expanded: false } },
     );
     expect(names(result.current.visibleItems)).toEqual([
       "row-1",
@@ -548,16 +554,15 @@ describe("sidebar group visibility", () => {
       "row-10",
       "row-12",
     ]);
-    act(() => result.current.toggleExpanded());
+    rerender({ rows: items, expanded: true });
     expect(result.current.visibleItems).toEqual(items);
-    rerender({ rows: items.map((item) => ({ ...item, statusBucket: "running" })) });
+    rerender({ rows: items.map((item) => ({ ...item, statusBucket: "running" })), expanded: true });
     expect(result.current.canToggle).toBe(false);
-    expect(result.current.expanded).toBe(true);
-    rerender({ rows: items.slice(0, 3) });
+    rerender({ rows: items.slice(0, 3), expanded: true });
     expect(result.current.canToggle).toBe(false);
-    rerender({ rows: items.toReversed() });
+    rerender({ rows: items.toReversed(), expanded: true });
     expect(result.current.visibleItems).toEqual(items.toReversed());
-    act(() => result.current.toggleExpanded());
+    rerender({ rows: items.toReversed(), expanded: false });
     expect(names(result.current.visibleItems)).toEqual([
       "row-12",
       "row-11",
@@ -568,15 +573,25 @@ describe("sidebar group visibility", () => {
       "row-6",
     ]);
     const newest = { ...items[0], workspaceId: "new", workspaceKey: "srv:new" };
-    rerender({ rows: [newest, ...items] });
+    rerender({ rows: [newest, ...items], expanded: false });
     expect(result.current.visibleItems[0]).toBe(newest);
     expect(result.current.visibleItems).toHaveLength(10);
-    expect(result.current.expanded).toBe(false);
-    act(() => result.current.toggleExpanded());
-    unmount();
-    const remounted = renderHook(() => useLimitedSidebarGroup({ items, selection: null, policy }));
-    expect(remounted.result.current.expanded).toBe(false);
-    expect(remounted.result.current.visibleItems).toHaveLength(10);
+  });
+
+  it("shows the reveal its owner passes in on every mount", () => {
+    // A native drop remounts every project block it moves, so the group holds no reveal of its
+    // own. Only the native list remounts rows; the browser list never does, so no test here can
+    // drive that remount.
+    const items = entries([...Array(7).fill("done"), "running", "done", "failed", "done"]);
+    const first = renderHook(() =>
+      useLimitedSidebarGroup({ items, selection: null, expanded: true, policy }),
+    );
+    expect(first.result.current.visibleItems).toEqual(items);
+    first.unmount();
+    const remounted = renderHook(() =>
+      useLimitedSidebarGroup({ items, selection: null, expanded: true, policy }),
+    );
+    expect(remounted.result.current.visibleItems).toEqual(items);
   });
 
   it("follows effective pending creation, recovery and agent activity without changing Created order", () => {
@@ -602,6 +617,7 @@ describe("sidebar group visibility", () => {
         useLimitedSidebarGroup({
           items: [...items.slice(0, 11), last],
           selection: null,
+          expanded: false,
           policy,
         }),
       { initialProps: { last: items[11] } },
@@ -641,12 +657,15 @@ describe("sidebar group visibility", () => {
 
   it("preserves the twenty-row pinned policy regardless of status", () => {
     const items = entries(Array(21).fill("running"));
-    const { result } = renderHook(() => useLimitedSidebarGroup({ items, selection: null }));
+    const { result, rerender } = renderHook(
+      ({ expanded }) => useLimitedSidebarGroup({ items, selection: null, expanded }),
+      { initialProps: { expanded: false } },
+    );
     expect(result.current.visibleItems).toEqual(items.slice(0, 20));
     expect(result.current.canToggle).toBe(true);
-    act(() => result.current.toggleExpanded());
+    rerender({ expanded: true });
     expect(result.current.visibleItems).toEqual(items);
-    act(() => result.current.toggleExpanded());
+    rerender({ expanded: false });
     expect(result.current.visibleItems).toHaveLength(20);
   });
 });

packages/app/src/components/sidebar-workspace-list.tsx

@@ -87,7 +87,6 @@ import {
 import { ProjectLeadingVisual } from "@/components/sidebar/project-leading-visual";
 import { useToast } from "@/contexts/toast-context";
 import { getForgePresentation, normalizeForge } from "@/git/forge";
-import { toWorktreeArchiveRisk } from "@/git/worktree-archive-warning";
 import { hasVisibleOrderChanged, mergeWithRemainder } from "@/utils/sidebar-reorder";
 import { confirmDialog } from "@/utils/confirm-dialog";
 import type { SidebarStateBucket } from "@/utils/sidebar-agent-state";
@@ -368,12 +367,10 @@ function projectKebabStyle({
 
 function getProjectWorkspaceRowStyle({
   isDragging,
-  isPressed,
   selected,
   isHovered,
 }: {
   isDragging: boolean;
-  isPressed: boolean;
   selected: boolean;
   isHovered: boolean;
 }) {
@@ -382,7 +379,6 @@ function getProjectWorkspaceRowStyle({
     isHovered && styles.workspaceRowHovered,
     selected && styles.sidebarRowSelected,
     isDragging && styles.workspaceRowDragging,
-    isPressed && styles.workspaceRowPressed,
   ];
 }
 
@@ -820,7 +816,6 @@ function NewWorkspaceGhostRow({
     ({ hovered = false, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
       styles.newWorkspaceGhostRow,
       hovered && !pressed && styles.newWorkspaceGhostRowHovered,
-      pressed && styles.newWorkspaceGhostRowPressed,
     ],
     [],
   );
@@ -833,6 +828,7 @@ function NewWorkspaceGhostRow({
       })}
       onPress={handlePress}
       style={rowStyle}
+      highlightStyle={styles.newWorkspaceGhostRowPressed}
       testID={`sidebar-project-new-workspace-row-${project.viewKey}`}
     >
       {({ hovered, pressed }) => (
@@ -883,7 +879,7 @@ function ProjectHeaderRow({
   dragHandleProps,
 }: ProjectHeaderRowProps) {
   const [isHovered, setIsHovered] = useState(false);
-  const [isPressed, setIsPressed] = useState(false);
+  const [isHighlighted, setIsHighlighted] = useState(false);
   const [contextMenuOpen, setContextMenuOpen] = useState(false);
   const isMobileBreakpoint = useIsCompactFormFactor();
   const localDaemonServerId = useLocalDaemonServerId();
@@ -930,25 +926,13 @@ function ProjectHeaderRow({
     setContextMenuOpen(open);
     if (open) setIsHovered(false);
   }, []);
-  const handleProjectPressIn = useCallback(
-    (event: GestureResponderEvent) => {
-      setIsPressed(true);
-      interaction.handlePressIn(event);
-    },
-    [interaction],
-  );
-  const handleProjectPressOut = useCallback(() => {
-    setIsPressed(false);
-    interaction.handlePressOut();
-  }, [interaction]);
 
-  const projectRowStyle = useCallback(
-    ({ pressed }: PressableStateCallbackType) => [
+  const projectRowStyle = useMemo(
+    () => [
       styles.projectRow,
       isDragging && styles.projectRowDragging,
       selected && styles.sidebarRowSelected,
       isHovered && styles.projectRowHovered,
-      pressed && styles.projectRowPressed,
     ],
     [isDragging, selected, isHovered],
   );
@@ -961,7 +945,7 @@ function ProjectHeaderRow({
           iconDataUri={iconDataUri}
           statusBucket={statusBucket}
           projectViewKey={project.viewKey}
-          backdrop={getSidebarRowBackdrop({ isDragging, isPressed, selected, isHovered })}
+          backdrop={getSidebarRowBackdrop({ isDragging, isHighlighted, selected, isHovered })}
           chevron={chevron}
           showChevron={isHovered && chevron !== null}
           isArchiving={isArchiving}
@@ -1007,9 +991,10 @@ function ProjectHeaderRow({
           accessibilityRole="button"
           style={projectRowStyle}
           highlightStyle={styles.projectRowPressed}
-          onPressIn={handleProjectPressIn}
+          onHighlightChange={setIsHighlighted}
+          onPressIn={interaction.handlePressIn}
           onTouchMove={interaction.handleTouchMove}
-          onPressOut={handleProjectPressOut}
+          onPressOut={interaction.handlePressOut}
           onPress={handlePress}
           testID={`sidebar-project-row-${project.viewKey}`}
         >
@@ -1033,9 +1018,10 @@ function ProjectHeaderRow({
           accessibilityRole="button"
           style={projectRowStyle}
           highlightStyle={styles.projectRowPressed}
-          onPressIn={handleProjectPressIn}
+          onHighlightChange={setIsHighlighted}
+          onPressIn={interaction.handlePressIn}
           onTouchMove={interaction.handleTouchMove}
-          onPressOut={handleProjectPressOut}
+          onPressOut={interaction.handlePressOut}
           onPress={handlePress}
           testID={`sidebar-project-row-${project.viewKey}`}
         >
@@ -1091,7 +1077,7 @@ function WorkspaceRowInner({
   reserveIdleStatusIndicatorSpace = true,
 }: WorkspaceRowInnerProps) {
   const isCompact = useIsCompactFormFactor();
-  const [isPressed, setIsPressed] = useState(false);
+  const [isHighlighted, setIsHighlighted] = useState(false);
   const isTouchPlatform = platformIsNative || isCompact;
   const interaction = useLongPressDragInteraction({
     drag,
@@ -1111,17 +1097,6 @@ function WorkspaceRowInner({
     }
     onPress();
   }, [interaction.didLongPressRef, onPress]);
-  const handleWorkspacePressIn = useCallback(
-    (event: GestureResponderEvent) => {
-      setIsPressed(true);
-      interaction.handlePressIn(event);
-    },
-    [interaction],
-  );
-  const handleWorkspacePressOut = useCallback(() => {
-    setIsPressed(false);
-    interaction.handlePressOut();
-  }, [interaction]);
 
   const accessibilityState = useMemo(() => ({ selected }), [selected]);
   const isEditingTitle = titleEditor !== null;
@@ -1135,13 +1110,8 @@ function WorkspaceRowInner({
       {({ isHovered, contextMenuOpen, onContextMenuOpenChange, hoverHandlers }) => {
         const isDesktop = !isTouchPlatform;
         const serviceSummary = isDesktop ? selectWorkspaceServiceSummary(workspace.scripts) : null;
-        const workspaceRowStyle = getProjectWorkspaceRowStyle({
-          isDragging,
-          isPressed,
-          selected,
-          isHovered,
-        });
-        const backdrop = getSidebarRowBackdrop({ isDragging, isPressed, selected, isHovered });
+        const workspaceRowStyle = getProjectWorkspaceRowStyle({ isDragging, selected, isHovered });
+        const backdrop = getSidebarRowBackdrop({ isDragging, isHighlighted, selected, isHovered });
         return (
           <View
             {...dragAttributes}
@@ -1176,10 +1146,11 @@ function WorkspaceRowInner({
               accessibilityRole="button"
               accessibilityState={accessibilityState}
               style={workspaceRowStyle}
-              highlightStyle={styles.workspaceRowPressed}
-              onPressIn={isEditingTitle ? undefined : handleWorkspacePressIn}
+              highlightStyle={isEditingTitle ? undefined : styles.workspaceRowPressed}
+              onHighlightChange={setIsHighlighted}
+              onPressIn={isEditingTitle ? undefined : interaction.handlePressIn}
               onTouchMove={isEditingTitle ? undefined : interaction.handleTouchMove}
-              onPressOut={isEditingTitle ? undefined : handleWorkspacePressOut}
+              onPressOut={isEditingTitle ? undefined : interaction.handlePressOut}
               onPress={isEditingTitle ? undefined : handlePress}
               testID={`sidebar-workspace-row-${workspace.workspaceKey}`}
             >
@@ -1280,8 +1251,9 @@ function WorkspaceRowWithMenu({
     serverId: workspace.serverId,
     workspaceId: workspace.workspaceId,
     workspaceKind: workspace.workspaceKind,
+    workspaceDirectory: workspace.workspaceDirectory,
     name: workspace.name,
-    ...toWorktreeArchiveRisk(workspace),
+    diffStat: workspace.diffStat,
     onArchiveStarted: redirectAfterArchive,
     onSetHiding: setIsHidingWorkspace,
   });
@@ -1557,6 +1529,8 @@ function ProjectBlock({
   showShortcutBadges,
   shortcutIndexByWorkspaceKey,
   onToggleCollapsed,
+  workspacesExpanded,
+  onToggleWorkspacesExpanded,
   onWorkspacePress,
   parentGestureRef,
   onWorkspaceReorder,
@@ -1583,6 +1557,9 @@ function ProjectBlock({
   showShortcutBadges: boolean;
   shortcutIndexByWorkspaceKey: Map<string, number>;
   onToggleCollapsed: (projectViewKey: string) => void;
+  /** "Show more" on this project's workspaces, owned by the list so a drop's remount keeps it. */
+  workspacesExpanded: boolean;
+  onToggleWorkspacesExpanded: (projectViewKey: string) => void;
   onWorkspacePress?: () => void;
   parentGestureRef?: MutableRefObject<GestureType | undefined>;
   onWorkspaceReorder: (projectViewKey: string, workspaces: SidebarWorkspacePlacement[]) => void;
@@ -1607,12 +1584,11 @@ function ProjectBlock({
   const {
     leadingItem: leadingWorkspace,
     visibleItems: visibleWorkspaces,
-    expanded: workspacesExpanded,
     canToggle: canToggleWorkspaces,
-    toggleExpanded: toggleWorkspacesExpanded,
   } = useLimitedSidebarGroup({
     items: project.workspaces,
     selection: selectionEnabled ? activeWorkspaceSelection : null,
+    expanded: workspacesExpanded,
     policy: visibilityPolicy,
   });
   const activeServerId = activeWorkspaceSelection?.serverId ?? null;
@@ -1770,6 +1746,10 @@ function ProjectBlock({
     onToggleCollapsed(project.viewKey);
   }, [onToggleCollapsed, project.viewKey]);
 
+  const handleToggleWorkspacesExpanded = useCallback(() => {
+    onToggleWorkspacesExpanded(project.viewKey);
+  }, [onToggleWorkspacesExpanded, project.viewKey]);
+
   let projectChildren = null;
   if (!collapsed) {
     if (project.workspaces.length > 0) {
@@ -1806,7 +1786,7 @@ function ProjectBlock({
           {canToggleWorkspaces ? (
             <SidebarGroupToggleRow
               expanded={workspacesExpanded}
-              onPress={toggleWorkspacesExpanded}
+              onPress={handleToggleWorkspacesExpanded}
               testID={`sidebar-project-show-more-${project.viewKey}`}
             />
           ) : null}
@@ -1876,6 +1856,8 @@ function areProjectBlockPropsEqual(previous: ProjectBlockProps, next: ProjectBlo
     previous.supportsPinningByServerId === next.supportsPinningByServerId &&
     previous.onToggleWorkspacePin === next.onToggleWorkspacePin &&
     previous.onToggleCollapsed === next.onToggleCollapsed &&
+    previous.workspacesExpanded === next.workspacesExpanded &&
+    previous.onToggleWorkspacesExpanded === next.onToggleWorkspacesExpanded &&
     previous.onWorkspacePress === next.onWorkspacePress &&
     previous.parentGestureRef === next.parentGestureRef &&
     previous.onWorkspaceReorder === next.onWorkspaceReorder &&
@@ -2204,15 +2186,29 @@ function ProjectModeList({
   const selectionEnabled = isWorkspaceRoute;
   const activeWorkspaceSelection = useActiveWorkspaceSelection();
   const { pinnedChats, unpinnedProjects } = pinnedGroups;
+  const [pinnedChatsExpanded, setPinnedChatsExpanded] = useState(false);
+  const togglePinnedChatsExpanded = useCallback(
+    () => setPinnedChatsExpanded((current) => !current),
+    [],
+  );
+  const [expandedProjectKeys, setExpandedProjectKeys] = useState<ReadonlySet<string>>(
+    () => new Set(),
+  );
+  const toggleProjectWorkspacesExpanded = useCallback((projectViewKey: string) => {
+    setExpandedProjectKeys((current) => {
+      const next = new Set(current);
+      if (!next.delete(projectViewKey)) next.add(projectViewKey);
+      return next;
+    });
+  }, []);
   const {
     leadingItem: leadingPinnedChat,
     visibleItems: visiblePinnedChats,
-    expanded: pinnedChatsExpanded,
     canToggle: canTogglePinnedChats,
-    toggleExpanded: togglePinnedChatsExpanded,
   } = useLimitedSidebarGroup({
     items: pinnedChats,
     selection: selectionEnabled ? activeWorkspaceSelection : null,
+    expanded: pinnedChatsExpanded,
   });
   const nativeScrollGestureProps = useMemo(
     () =>
@@ -2368,6 +2364,8 @@ function ProjectModeList({
           showShortcutBadges={showShortcutBadges}
           shortcutIndexByWorkspaceKey={shortcutIndexByWorkspaceKey}
           onToggleCollapsed={onToggleProjectCollapsed}
+          workspacesExpanded={expandedProjectKeys.has(item.viewKey)}
+          onToggleWorkspacesExpanded={toggleProjectWorkspacesExpanded}
           onWorkspacePress={onWorkspacePress}
           manualSort={manualSort}
           parentGestureRef={parentGestureRef}
@@ -2389,6 +2387,8 @@ function ProjectModeList({
     },
     [
       collapsedProjectKeys,
+      expandedProjectKeys,
+      toggleProjectWorkspacesExpanded,
       activeWorkspaceSelection,
       handleWorktreeCreated,
       manualSort,
@@ -2592,9 +2592,9 @@ const styles = StyleSheet.create((theme) => ({
     // Optical inset: aligns the visible Pinned/Workspaces glyph edge with the
     // Schedules icon across the divider; their layout boxes have different insets.
     paddingTop: 2,
-    // Keep the last row scrollable above the sidebar toast, including a wrapped Undo row.
-    // This space stays present across toast changes so the scroll range never jumps.
-    paddingBottom: theme.spacing[24],
+    // The sidebar toast floats over the list's end. Keep this padding the same whether or not
+    // a toast shows: changing it moves the rows when the toast leaves.
+    paddingBottom: theme.spacing[4],
   },
   projectListContainer: {
     width: "100%",

packages/app/src/components/sidebar/display-preferences/menu.tsx

@@ -7,7 +7,7 @@ import {
   type ReactNode,
 } from "react";
 import { useTranslation } from "react-i18next";
-import { View, type PressableStateCallbackType } from "react-native";
+import type { PressableStateCallbackType } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import {
   Captions,
@@ -35,7 +35,7 @@ import {
   MenuTrigger,
   type MenuPageDefinition,
 } from "@/components/ui/menu";
-import { HostStatusDot } from "@/components/host-status-dot";
+import { HostMenuItem } from "@/components/hosts/host-menu-item";
 import { isWeb } from "@/constants/platform";
 import { useHosts } from "@/runtime/host-runtime";
 import { useSidebarModel } from "@/components/sidebar/sidebar-model";
@@ -813,53 +813,21 @@ function HostFilterPage({
         {t("sidebar.display.hostFilter.all")}
       </MenuItem>
       {hosts.map((host) => (
-        <HostFilterItem
+        <HostMenuItem
           key={host.serverId}
           serverId={host.serverId}
           label={host.label?.trim() || host.serverId}
           selected={preferences.hostFilters.includes(host.serverId)}
-          onToggle={preferences.toggleHostFilter}
+          onSelect={preferences.toggleHostFilter}
+          closeOnSelect={false}
+          testID={`sidebar-host-filter-${host.serverId}`}
+          statusTestID={`sidebar-host-filter-status-${host.serverId}`}
         />
       ))}
     </>
   );
 }
 
-/** The one option row whose mark is live state rather than an icon. */
-function HostFilterItem({
-  serverId,
-  label,
-  selected,
-  onToggle,
-}: {
-  serverId: string;
-  label: string;
-  selected: boolean;
-  onToggle: (serverId: string) => void;
-}): ReactElement {
-  const handleSelect = useCallback(() => onToggle(serverId), [onToggle, serverId]);
-  const leading = useMemo(
-    () => (
-      <View testID={`sidebar-host-filter-status-${serverId}`}>
-        <HostStatusDot serverId={serverId} />
-      </View>
-    ),
-    [serverId],
-  );
-
-  return (
-    <MenuItem
-      selected={selected}
-      closeOnSelect={false}
-      leading={leading}
-      onSelect={handleSelect}
-      testID={`sidebar-host-filter-${serverId}`}
-    >
-      {label}
-    </MenuItem>
-  );
-}
-
 const styles = StyleSheet.create((theme) => ({
   trigger: {
     width: 28,

packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx

@@ -39,7 +39,6 @@ export function SidebarGroupToggleRow({
       styles.row,
       indented && sidebarWorkspaceRowStyles.rowIndented,
       hovered && !pressed && styles.rowHovered,
-      pressed && styles.rowPressed,
     ],
     [indented],
   );
@@ -50,6 +49,7 @@ export function SidebarGroupToggleRow({
       accessibilityLabel={label}
       onPress={onPress}
       style={rowStyle}
+      highlightStyle={styles.rowPressed}
       testID={testID}
     >
       {({ hovered, pressed }) => (

packages/app/src/components/sidebar/sidebar-row-backdrop.ts

@@ -12,16 +12,17 @@ import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
  */
 export function getSidebarRowBackdrop({
   isDragging = false,
-  isPressed = false,
+  isHighlighted = false,
   selected = false,
   isHovered = false,
 }: {
   isDragging?: boolean;
-  isPressed?: boolean;
+  /** The press highlight is painting the row's pressed fill. */
+  isHighlighted?: boolean;
   selected?: boolean;
   isHovered?: boolean;
 }): SidebarSurfaceBackdrop {
-  if (isDragging || isPressed) return "surface2";
+  if (isDragging || isHighlighted) return "surface2";
   if (selected) return "surfaceSidebarSelected";
   if (isHovered) return "surfaceSidebarHover";
   return "surfaceSidebar";

packages/app/src/components/sidebar/sidebar-status-list.tsx

@@ -9,13 +9,7 @@ import {
   type Ref,
 } from "react";
 import { useTranslation } from "react-i18next";
-import {
-  View,
-  Text,
-  ScrollView,
-  type GestureResponderEvent,
-  type PressableStateCallbackType,
-} from "react-native";
+import { View, Text, ScrollView } from "react-native";
 import { NestableScrollContainer } from "react-native-draggable-flatlist";
 import type { GestureType } from "react-native-gesture-handler";
 import { navigateToWorkspace } from "@/stores/navigation-active-workspace-store";
@@ -44,7 +38,6 @@ import { useSidebarWorkspaceRename } from "@/workspace-rename";
 import { useWorkspaceClipboardActions } from "@/hooks/use-workspace-clipboard-actions";
 import { redirectIfArchivingActiveWorkspace } from "@/utils/sidebar-workspace-archive-redirect";
 import { useWorkspaceArchive } from "@/workspace/use-workspace-archive";
-import { toWorktreeArchiveRisk } from "@/git/worktree-archive-warning";
 import type { ShortcutKey } from "@/utils/format-shortcut";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
 import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
@@ -155,13 +148,20 @@ export function SidebarStatusWorkspaceList({
   const togglePinnedCollapsed = useSidebarCollapsedSectionsStore(
     (state) => state.togglePinnedCollapsed,
   );
+  const [pinnedWorkspacesExpanded, setPinnedWorkspacesExpanded] = useState(false);
+  const togglePinnedWorkspacesExpanded = useCallback(
+    () => setPinnedWorkspacesExpanded((current) => !current),
+    [],
+  );
   const {
     leadingItem: leadingPinnedWorkspace,
     visibleItems: visiblePinnedWorkspaces,
-    expanded: pinnedWorkspacesExpanded,
     canToggle: canTogglePinnedWorkspaces,
-    toggleExpanded: togglePinnedWorkspacesExpanded,
-  } = useLimitedSidebarGroup({ items: pinnedWorkspaces, selection: activeWorkspaceSelection });
+  } = useLimitedSidebarGroup({
+    items: pinnedWorkspaces,
+    selection: activeWorkspaceSelection,
+    expanded: pinnedWorkspacesExpanded,
+  });
 
   const statusShortcutIndex = showShortcutBadges
     ? shortcutIndexByWorkspaceKey
@@ -366,15 +366,19 @@ function StatusGroupRows({
   onToggleWorkspacePin: ToggleSidebarWorkspacePin;
 }) {
   const activeWorkspaceSelection = useActiveWorkspaceSelection();
+  const [workspacesExpanded, setWorkspacesExpanded] = useState(false);
+  const toggleWorkspacesExpanded = useCallback(
+    () => setWorkspacesExpanded((current) => !current),
+    [],
+  );
   const {
     leadingItem: leadingWorkspace,
     visibleItems: visibleWorkspaces,
-    expanded: workspacesExpanded,
     canToggle: canToggleWorkspaces,
-    toggleExpanded: toggleWorkspacesExpanded,
   } = useLimitedSidebarGroup({
     items: group.rows,
     selection: activeWorkspaceSelection,
+    expanded: workspacesExpanded,
     policy: STATUS_GROUP_VISIBILITY,
   });
 
@@ -460,12 +464,8 @@ function StatusGroupHeader({
   }, [group.key, toggleWorkspaceGroupCollapsed]);
   const handleHoverIn = useCallback(() => setIsHovered(true), []);
   const handleHoverOut = useCallback(() => setIsHovered(false), []);
-  const rowStyle = useCallback(
-    ({ pressed }: PressableStateCallbackType) => [
-      styles.statusGroupRow,
-      isHovered && styles.statusGroupRowHovered,
-      pressed && styles.statusGroupRowPressed,
-    ],
+  const rowStyle = useMemo(
+    () => [styles.statusGroupRow, isHovered && styles.statusGroupRowHovered],
     [isHovered],
   );
   const accessibilityState = useMemo(() => ({ expanded: !collapsed }), [collapsed]);
@@ -477,6 +477,7 @@ function StatusGroupHeader({
         accessibilityLabel={t("sidebar.statusGroupAccessibility", { label: group.label })}
         accessibilityState={accessibilityState}
         style={rowStyle}
+        highlightStyle={styles.statusGroupRowPressed}
         onPress={handlePress}
         testID={`sidebar-status-group-${group.key}`}
       >
@@ -654,8 +655,9 @@ function StatusWorkspaceRowWithMenu({
     serverId: workspace.serverId,
     workspaceId: workspace.workspaceId,
     workspaceKind: workspace.workspaceKind,
+    workspaceDirectory: workspace.workspaceDirectory,
     name: workspace.name,
-    ...toWorktreeArchiveRisk(workspace),
+    diffStat: workspace.diffStat,
     onArchiveStarted: redirectAfterArchive,
     onSetHiding: setIsHidingWorkspace,
   });
@@ -826,7 +828,7 @@ function StatusWorkspaceRowInnerContent({
 }) {
   const isCompact = useIsCompactFormFactor();
   const isTouchPlatform = platformIsNative || isCompact;
-  const [isPressed, setIsPressed] = useState(false);
+  const [isHighlighted, setIsHighlighted] = useState(false);
   const trailing = useSidebarWorkspaceTrailing();
   const {
     role: _dragRole,
@@ -851,17 +853,6 @@ function StatusWorkspaceRowInnerContent({
     }
     onPress();
   }, [didLongPressRef, onPress]);
-  const handlePressIn = useCallback(
-    (event: GestureResponderEvent) => {
-      setIsPressed(true);
-      startDragPress?.(event);
-    },
-    [startDragPress],
-  );
-  const handlePressOut = useCallback(() => {
-    setIsPressed(false);
-    endDragPress?.();
-  }, [endDragPress]);
 
   return (
     <SidebarWorkspaceRowFrame
@@ -887,13 +878,12 @@ function StatusWorkspaceRowInnerContent({
           showShortcut,
         });
         const workspaceRowStyle = getStatusWorkspaceRowStyle({
-          isPressed,
           selected,
           isHovered,
           inStatusGroup,
           isDragging,
         });
-        const backdrop = getSidebarRowBackdrop({ isDragging, isPressed, selected, isHovered });
+        const backdrop = getSidebarRowBackdrop({ isDragging, isHighlighted, selected, isHovered });
         return (
           <View
             {...dragAttributes}
@@ -928,10 +918,11 @@ function StatusWorkspaceRowInnerContent({
               accessibilityRole="button"
               accessibilityState={accessibilityState}
               style={workspaceRowStyle}
-              highlightStyle={styles.workspaceRowPressed}
-              onPressIn={isEditingTitle ? undefined : handlePressIn}
+              highlightStyle={isEditingTitle ? undefined : styles.workspaceRowPressed}
+              onHighlightChange={setIsHighlighted}
+              onPressIn={isEditingTitle ? undefined : startDragPress}
               onTouchMove={isEditingTitle ? undefined : moveDragPress}
-              onPressOut={isEditingTitle ? undefined : handlePressOut}
+              onPressOut={isEditingTitle ? undefined : endDragPress}
               onPress={isEditingTitle ? undefined : handlePress}
               testID={`sidebar-workspace-row-${workspace.workspaceKey}`}
             >
@@ -1068,13 +1059,11 @@ function StatusWorkspaceActionSlot({
 }
 
 function getStatusWorkspaceRowStyle({
-  isPressed,
   selected,
   isHovered,
   inStatusGroup,
   isDragging,
 }: {
-  isPressed: boolean;
   selected: boolean;
   isHovered: boolean;
   inStatusGroup: boolean;
@@ -1086,7 +1075,6 @@ function getStatusWorkspaceRowStyle({
     isHovered && styles.workspaceRowHovered,
     selected && styles.sidebarRowSelected,
     isDragging && styles.workspaceRowDragging,
-    isPressed && styles.workspaceRowPressed,
   ];
 }
 
@@ -1101,8 +1089,9 @@ const styles = StyleSheet.create((theme) => ({
     paddingHorizontal: theme.spacing[2],
     // Keep status mode's Pinned/Workspaces boundary identical to project mode.
     paddingTop: 2,
-    // Match project grouping: permanent room to scroll the final row above sidebar toasts.
-    paddingBottom: theme.spacing[24],
+    // The sidebar toast floats over the list's end. Keep this padding the same whether or not
+    // a toast shows: changing it moves the rows when the toast leaves.
+    paddingBottom: theme.spacing[4],
   },
   pinnedSection: {
     marginBottom: theme.spacing[1],

packages/app/src/components/sidebar/use-limited-sidebar-group.ts

@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from "react";
+import { useMemo } from "react";
 import {
   selectSidebarGroupVisibility,
   type SidebarGroupItem,
@@ -12,23 +12,22 @@ const PINNED_POLICY = { kind: "pinned" } as const;
 interface LimitedSidebarGroupInput<T> {
   items: readonly T[];
   selection: ActiveWorkspaceSelection | null;
+  /**
+   * Whether the user revealed the whole group. The caller owns it: a native drop remounts the
+   * rows it moved, and a reveal held inside a row would reset with them.
+   */
+  expanded: boolean;
   policy?: SidebarGroupVisibilityPolicy<T>;
 }
 
 export function useLimitedSidebarGroup<T extends SidebarGroupItem>({
   items,
   selection,
+  expanded,
   policy = PINNED_POLICY,
-}: LimitedSidebarGroupInput<T>): SidebarGroupVisibility<T> & {
-  expanded: boolean;
-  toggleExpanded: () => void;
-} {
-  const [expanded, setExpanded] = useState(false);
-  const visibility = useMemo(
+}: LimitedSidebarGroupInput<T>): SidebarGroupVisibility<T> {
+  return useMemo(
     () => selectSidebarGroupVisibility({ items, expanded, policy, selection }),
     [expanded, items, policy, selection],
   );
-  const toggleExpanded = useCallback(() => setExpanded((current) => !current), []);
-
-  return { ...visibility, expanded, toggleExpanded };
 }

packages/app/src/components/sortable-inline-list.web.tsx

@@ -127,7 +127,7 @@ export function SortableInlineList<T>({
   data: T[];
   keyExtractor: (item: T, index: number) => string;
   renderItem: (info: DraggableRenderItemInfo<T>) => ReactElement;
-  onDragEnd?: (data: T[]) => void;
+  onDragEnd?: (data: T[], movedKey: string) => void;
   useDragHandle?: boolean;
   disabled?: boolean;
   activationDistance?: number;

packages/app/src/components/tool-call-sheet.tsx

@@ -1,16 +1,16 @@
 import React, { createContext, useContext, useCallback, useMemo } from "react";
 import type { ReactNode } from "react";
-import { View, Text, Pressable } from "react-native";
+import { View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { useTranslation } from "react-i18next";
 import { BottomSheetScrollView } from "@gorhom/bottom-sheet";
-import { X } from "lucide-react-native";
 import type { ToolCallDetail } from "@getpaseo/protocol/agent-types";
 import {
   IsolatedBottomSheetModal,
   type ContextBridge,
   useIsolatedBottomSheetVisibility,
 } from "@/components/ui/isolated-bottom-sheet-modal";
+import { SheetHeaderView, type SheetHeader } from "@/components/adaptive-modal-sheet";
+import { ICON_SIZE } from "@/styles/theme";
 import type { ToolCallIconComponent } from "@/utils/tool-call-icon";
 import { ToolCallDetailsContent } from "./tool-call-details";
 
@@ -66,9 +66,6 @@ function ToolCallHeaderIcon({ icon: Icon, size, color }: ToolCallHeaderIconProps
 const ThemedToolCallHeaderIcon = withUnistyles(ToolCallHeaderIcon, (theme) => ({
   color: theme.colors.foreground,
 }));
-const ThemedCloseIcon = withUnistyles(X, (theme) => ({
-  color: theme.colors.foregroundMuted,
-}));
 
 export const ToolCallSheetModal = withUnistyles(IsolatedBottomSheetModal, (theme) => ({
   backgroundStyle: {
@@ -148,7 +145,6 @@ interface ToolCallSheetContentProps {
 }
 
 function ToolCallSheetContent({ data, onClose }: ToolCallSheetContentProps) {
-  const { t } = useTranslation();
   const {
     toolName,
     displayName,
@@ -157,27 +153,17 @@ function ToolCallSheetContent({ data, onClose }: ToolCallSheetContentProps) {
     icon: IconComponent,
     showLoadingSkeleton,
   } = data;
+  const header = useMemo<SheetHeader>(
+    () => ({
+      title: displayName,
+      leading: <ThemedToolCallHeaderIcon icon={IconComponent} size={ICON_SIZE.md} />,
+    }),
+    [IconComponent, displayName],
+  );
 
   return (
     <View style={styles.container}>
-      {/* Header */}
-      <View style={styles.header}>
-        <View style={styles.headerLeft}>
-          <ThemedToolCallHeaderIcon icon={IconComponent} size={20} />
-          <Text style={styles.headerTitle} numberOfLines={1}>
-            {displayName}
-          </Text>
-        </View>
-        <Pressable
-          onPress={onClose}
-          style={styles.closeButton}
-          accessibilityRole="button"
-          accessibilityLabel={t("common.actions.close")}
-          testID="tool-call-sheet-close"
-        >
-          <ThemedCloseIcon size={20} />
-        </Pressable>
-      </View>
+      <SheetHeaderView header={header} onClose={onClose} closeTestID="tool-call-sheet-close" />
 
       {/* Content */}
       <BottomSheetScrollView style={styles.content} contentContainerStyle={styles.contentContainer}>
@@ -200,30 +186,6 @@ const styles = StyleSheet.create((theme) => ({
     flex: 1,
     backgroundColor: theme.colors.surface2,
   },
-  header: {
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "space-between",
-    paddingHorizontal: theme.spacing[4],
-    paddingVertical: theme.spacing[3],
-    borderBottomWidth: theme.borderWidth[1],
-    borderBottomColor: theme.colors.border,
-  },
-  headerLeft: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    flex: 1,
-  },
-  headerTitle: {
-    fontSize: theme.fontSize.base,
-    fontWeight: theme.fontWeight.semibold,
-    color: theme.colors.foreground,
-    flex: 1,
-  },
-  closeButton: {
-    padding: theme.spacing[2],
-  },
   content: {
     flex: 1,
     minHeight: 0,

packages/app/src/components/ui/autocomplete-popover.browser.test.tsx

@@ -0,0 +1,574 @@
+import React, { act, type ReactNode } from "react";
+import { flushSync } from "react-dom";
+import { createRoot, type Root } from "react-dom/client";
+import { PortalProvider } from "@gorhom/portal";
+import { View } from "react-native";
+import { KeyboardProvider } from "react-native-keyboard-controller";
+import { SafeAreaProvider } from "react-native-safe-area-context";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+import { RetainedPanel } from "@/components/retained-panel";
+import { KeyboardShiftProvider } from "@/keyboard/shift";
+import type { AutocompleteOption } from "./autocomplete";
+import { AutocompletePopover } from "./autocomplete-popover";
+import { FloatingPanelPortalHost } from "./floating-panel-portal";
+
+// App sources compile against the classic JSX runtime, which expects React on the global.
+beforeEach(() => vi.stubGlobal("React", React));
+
+/**
+ * The popover must paint its first frame at its place. On native, Reanimated computes a style's
+ * first value when its hook first runs and sends later values after the mounting commit, which
+ * native paints: a bound computed while the popover was closed hung the popover over the composer
+ * for a frame on every open. The frame now mounts only with a measured anchor. This suite runs the
+ * web frame; the native frame was checked frame by frame on Android.
+ */
+
+const SAFE_AREA = {
+  frame: { x: 0, y: 0, width: 390, height: 844 },
+  insets: { top: 0, left: 0, right: 0, bottom: 0 },
+};
+// The composer rests on the dock's bottom edge and grows upward, as in the app.
+const COMPOSER_BOTTOM = 124;
+const OFFSET_FROM_ANCHOR = 12;
+const OPTIONS: AutocompleteOption[] = ["help", "hello", "history"].map((name) => ({
+  id: name,
+  label: `/${name}`,
+  icon: "command",
+}));
+
+let root: Root | null = null;
+let container: HTMLDivElement | null = null;
+
+afterEach(() => {
+  act(() => root?.unmount());
+  container?.remove();
+  root = null;
+  container = null;
+});
+
+const SCREEN_STYLE = { width: 390, height: 844 };
+const styleCache = new Map<string, object>();
+function cachedStyle<T extends object>(key: string, create: () => T): T {
+  const cached = styleCache.get(key);
+  if (cached) return cached as T;
+  const style = create();
+  styleCache.set(key, style);
+  return style;
+}
+function composerStyle(width: number): object {
+  return cachedStyle(`composer:${width}`, () => ({
+    position: "absolute" as const,
+    bottom: COMPOSER_BOTTOM,
+    left: 16,
+    width,
+  }));
+}
+function inputStyle(height: number): object {
+  return cachedStyle(`input:${height}`, () => ({ height }));
+}
+function ignoreSelection(): void {}
+
+function Providers({ children }: { children: ReactNode }): ReactNode {
+  return (
+    <SafeAreaProvider initialMetrics={SAFE_AREA}>
+      <KeyboardProvider>
+        <KeyboardShiftProvider>
+          <PortalProvider>{children}</PortalProvider>
+        </KeyboardShiftProvider>
+      </KeyboardProvider>
+    </SafeAreaProvider>
+  );
+}
+
+interface ScreenProps {
+  visible: boolean;
+  panelActive?: boolean;
+  inputHeight?: number;
+  composerWidth?: number;
+  options?: AutocompleteOption[];
+  /** Counted up from the best match, which is the last option. */
+  selectedFromBest?: number;
+}
+
+function Screen({
+  visible,
+  panelActive = true,
+  inputHeight = 120,
+  composerWidth = 358,
+  options = OPTIONS,
+  selectedFromBest = 0,
+}: ScreenProps): ReactNode {
+  return (
+    <Providers>
+      <RetainedPanel active={panelActive}>
+        <View style={SCREEN_STYLE}>
+          <View style={composerStyle(composerWidth)}>
+            <AutocompletePopover
+              visible={visible}
+              options={options}
+              selectedIndex={options.length - 1 - selectedFromBest}
+              onSelect={ignoreSelection}
+            >
+              <View testID="composer-input" style={inputStyle(inputHeight)} />
+            </AutocompletePopover>
+          </View>
+          <FloatingPanelPortalHost />
+        </View>
+      </RetainedPanel>
+    </Providers>
+  );
+}
+
+function render(node: ReactNode): void {
+  if (!container) {
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  }
+  act(() => root?.render(node));
+}
+
+/** Commits a change to the screen synchronously and lets the browser paint it. */
+async function changeAndPaint(node: ReactNode): Promise<void> {
+  flushSync(() => root?.render(node));
+  await new Promise<void>((resolve) => {
+    requestAnimationFrame(() => {
+      const channel = new MessageChannel();
+      channel.port1.addEventListener("message", () => resolve(), { once: true });
+      channel.port1.start();
+      channel.port2.postMessage(null);
+    });
+  });
+}
+
+function rectOf(testID: string): DOMRect | null {
+  return document.querySelector(`[data-testid="${testID}"]`)?.getBoundingClientRect() ?? null;
+}
+
+/** Where the popover sits against the composer, or null when it is not painted. */
+function placementAgainstComposer(): { gap: number; x: number; width: number } | null {
+  const popover = rectOf("composer-autocomplete-popover");
+  const composer = rectOf("composer-input");
+  if (!popover || !composer) return null;
+  return {
+    gap: Math.round(composer.top - popover.bottom),
+    x: Math.round(popover.x - composer.x),
+    width: Math.round(popover.width - composer.width),
+  };
+}
+
+async function openSettled(props: Omit<ScreenProps, "visible"> = {}): Promise<void> {
+  render(<Screen visible={false} {...props} />);
+  render(<Screen visible {...props} />);
+  await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 200));
+  expect(placementAgainstComposer()).toEqual({ gap: OFFSET_FROM_ANCHOR, x: 0, width: 0 });
+}
+
+/** Every max-height the popover's frame has held, starting with the one it mounted with. */
+function recordPopoverMaxHeights(): { values: string[]; stop: () => void } {
+  const values: string[] = [];
+  const observer = new MutationObserver((records) => {
+    for (const record of records) {
+      if (record.type === "childList") {
+        for (const node of record.addedNodes) {
+          if (!(node instanceof HTMLElement)) continue;
+          const popover = node.matches('[data-testid="composer-autocomplete-popover"]')
+            ? node
+            : node.querySelector<HTMLElement>('[data-testid="composer-autocomplete-popover"]');
+          // The attribute records below carry what the style was before each change; this
+          // carries the style at insertion when nothing changed it afterwards.
+          if (popover && values.length === 0) values.push(popover.style.maxHeight);
+        }
+      }
+      if (
+        record.type === "attributes" &&
+        record.target instanceof HTMLElement &&
+        record.target.dataset.testid === "composer-autocomplete-popover"
+      ) {
+        const before = /max-height:\s*([^;]+)/.exec(record.oldValue ?? "")?.[1]?.trim() ?? "";
+        if (values.length <= 1) values.splice(0, values.length, before);
+        values.push(record.target.style.maxHeight);
+      }
+    }
+  });
+  observer.observe(document.body, {
+    subtree: true,
+    childList: true,
+    attributes: true,
+    attributeFilter: ["style"],
+    attributeOldValue: true,
+  });
+  return { values, stop: () => observer.disconnect() };
+}
+
+async function waitForPopover(): Promise<HTMLElement> {
+  for (let attempt = 0; attempt < 100; attempt += 1) {
+    const popover = document.querySelector<HTMLElement>(
+      '[data-testid="composer-autocomplete-popover"]',
+    );
+    if (popover) return popover;
+    await new Promise((resolve) => setTimeout(resolve, 20));
+  }
+  throw new Error("The popover did not open");
+}
+
+it("opens with its height bound instead of the bound it had while closed", async () => {
+  // The composer mounts first and opens the popover later, as typing `/` does.
+  render(<Screen visible={false} />);
+  const recording = recordPopoverMaxHeights();
+  render(<Screen visible />);
+  const popover = await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 200));
+  recording.stop();
+
+  const settled = popover.style.maxHeight;
+  expect(Number.parseFloat(settled)).toBeGreaterThan(0);
+  expect(recording.values[0]).toBe(settled);
+});
+
+/**
+ * The popover lives in a portal and copies the composer's rect. A copy taken after the composer's
+ * layout paints the composer at its new size against the popover's old place: the popover overlapped
+ * a composer that grew a line, floated above one that shrank, and kept the old width after a resize.
+ */
+it("moves with the composer in the frame the composer grows", async () => {
+  await openSettled();
+  await changeAndPaint(<Screen visible inputHeight={160} />);
+  expect(placementAgainstComposer()).toEqual({ gap: OFFSET_FROM_ANCHOR, x: 0, width: 0 });
+});
+
+it("follows the composer down when its text clears before the popover closes", async () => {
+  // The input relayouts on the cleared text before the autocomplete hides the popover.
+  await openSettled({ inputHeight: 160 });
+  await changeAndPaint(<Screen visible inputHeight={120} />);
+  expect(placementAgainstComposer()).toEqual({ gap: OFFSET_FROM_ANCHOR, x: 0, width: 0 });
+});
+
+it("matches the composer's width in the frame the composer resizes", async () => {
+  await openSettled();
+  await changeAndPaint(<Screen visible composerWidth={240} />);
+  expect(placementAgainstComposer()).toEqual({ gap: OFFSET_FROM_ANCHOR, x: 0, width: 0 });
+});
+
+/**
+ * A retained workspace stays mounted while another route shows. A popover left open there tracked a
+ * composer it could not measure, and on native stopped following the composer after the user came
+ * back.
+ */
+it("closes while its retained panel is hidden and reopens in place when it shows again", async () => {
+  await openSettled();
+  render(<Screen visible panelActive={false} />);
+  expect(rectOf("composer-autocomplete-popover")).toBeNull();
+  render(<Screen visible />);
+  await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 200));
+  expect(placementAgainstComposer()).toEqual({ gap: OFFSET_FROM_ANCHOR, x: 0, width: 0 });
+});
+
+/** As many commands as a workspace with skills installed lists; the best match is last. */
+function commandOptions(prefix: string, count: number): AutocompleteOption[] {
+  return Array.from({ length: count }, (_, index) => ({
+    id: `${prefix}-${count - index}`,
+    label: `/${prefix}-${count - index}`,
+    icon: "skill" as const,
+    description: `Description of ${prefix} ${count - index}`,
+    tag: "Skill",
+  }));
+}
+
+const LIST_PADDING_AND_BORDER = 5;
+const ROW_HEIGHT_AT_LEAST = 36;
+
+/** How far the best match's row sits above the popover's bottom edge, or null when not painted. */
+function bestMatchAgainstPopoverBottom(label: string): number | null {
+  const popover = rectOf("composer-autocomplete-popover");
+  const row = document.querySelector(`[aria-label^="${label},"]`)?.getBoundingClientRect();
+  if (!popover) return null;
+  if (!row) return Number.NaN;
+  return Math.round(popover.bottom - row.bottom);
+}
+
+/** Samples a reading after every paint until stopped. */
+function recordPaintedFrames<T>(read: () => T): { frames: T[]; stop: () => void } {
+  const frames: T[] = [];
+  let running = true;
+  const channel = new MessageChannel();
+  channel.port1.addEventListener("message", () => {
+    if (running) frames.push(read());
+  });
+  channel.port1.start();
+  const tick = (): void => {
+    if (!running) return;
+    channel.port2.postMessage(null);
+    requestAnimationFrame(tick);
+  };
+  requestAnimationFrame(tick);
+  return {
+    frames,
+    stop: () => {
+      running = false;
+    },
+  };
+}
+
+/**
+ * The list is longer than the popover and reads upward from its best match, which sits against the
+ * bottom edge. Scrolling there after the list mounted painted the list at its old offset first: a
+ * few pixels short on open, a different stretch of the list when the results changed.
+ */
+it("paints a long list with its best match against the bottom from the first frame", async () => {
+  const options = commandOptions("skill", 100);
+  render(<Screen visible={false} options={options} />);
+  const recording = recordPaintedFrames(() => bestMatchAgainstPopoverBottom("/skill-1"));
+  render(<Screen visible options={options} />);
+  await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 300));
+  recording.stop();
+
+  const painted = recording.frames.filter((frame) => frame !== null);
+  expect(painted.length).toBeGreaterThan(0);
+  expect([...new Set(painted)]).toEqual([LIST_PADDING_AND_BORDER]);
+});
+
+it("keeps the best match against the bottom in the frame the results change", async () => {
+  const all = commandOptions("skill", 100);
+  const fewer = all.filter((_, index) => index % 3 === 0);
+  render(<Screen visible={false} options={all} />);
+  render(<Screen visible options={all} />);
+  await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 300));
+
+  // Narrowing keeps `/skill-1` the best match; widening brings the rest back above it.
+  const recording = recordPaintedFrames(() => bestMatchAgainstPopoverBottom("/skill-1"));
+  await changeAndPaint(<Screen visible options={fewer} />);
+  await new Promise((resolve) => setTimeout(resolve, 200));
+  await changeAndPaint(<Screen visible options={all} />);
+  await new Promise((resolve) => setTimeout(resolve, 300));
+  recording.stop();
+
+  expect([...new Set(recording.frames)]).toEqual([LIST_PADDING_AND_BORDER]);
+});
+
+function mountedRows(prefix = "skill"): Element[] {
+  return [...document.querySelectorAll(`[aria-label^="/${prefix}-"]`)];
+}
+
+/**
+ * Every result used to mount before the popover's first frame, so a workspace with a hundred
+ * commands waited on a hundred rows to see six.
+ */
+it("mounts the rows nearest the composer first, however many results there are", async () => {
+  const options = commandOptions("skill", 500);
+  render(<Screen visible={false} options={options} />);
+  const recording = recordPaintedFrames(() =>
+    rectOf("composer-autocomplete-popover") ? mountedRows().length : null,
+  );
+  render(<Screen visible options={options} />);
+  await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 100));
+  recording.stop();
+
+  const firstFrame = recording.frames.find((frame) => frame !== null);
+  expect(firstFrame).toBeGreaterThan(0);
+  expect(firstFrame).toBeLessThan(20);
+  expect(bestMatchAgainstPopoverBottom("/skill-1")).toBe(LIST_PADDING_AND_BORDER);
+});
+
+/**
+ * A list that had mounted its whole window kept that window for the next results, so narrowing a
+ * long list to another long one waited on ten times the rows the popover shows.
+ */
+it("mounts the rows nearest the composer first when the results change", async () => {
+  const commands = commandOptions("skill", 500);
+  const matches = commandOptions("plugin", 300);
+  render(<Screen visible={false} options={commands} />);
+  render(<Screen visible options={commands} />);
+  await waitForPopover();
+  await expect.poll(() => mountedRows().length, { timeout: 3000 }).toBeGreaterThan(40);
+
+  const recording = recordPaintedFrames(() => mountedRows("plugin").length);
+  await changeAndPaint(<Screen visible options={matches} />);
+  recording.stop();
+
+  const firstFrame = recording.frames.find((count) => count > 0);
+  expect(firstFrame).toBeLessThan(20);
+  expect(bestMatchAgainstPopoverBottom("/plugin-1")).toBe(LIST_PADDING_AND_BORDER);
+});
+
+function scrollerOf(popover: HTMLElement): HTMLElement {
+  const scroller = [...popover.querySelectorAll<HTMLElement>("*")].find(
+    (element) =>
+      element.scrollHeight > element.clientHeight + 1 &&
+      ["auto", "scroll"].includes(getComputedStyle(element).overflowY),
+  );
+  if (!scroller) throw new Error("The list does not scroll");
+  return scroller;
+}
+
+/**
+ * Native paints a scroll command a frame or two after the rows it was meant for. A list that rests
+ * against the composer only because script scrolled it there shows the rows somewhere else first,
+ * so the composer's edge is where the list's scroll starts.
+ */
+it("rests against the composer where its scroll starts", async () => {
+  const all = commandOptions("skill", 100);
+  const fewer = all.filter((_, index) => index % 3 === 0);
+  render(<Screen visible={false} options={all} />);
+  render(<Screen visible options={all} />);
+  const popover = await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 300));
+  expect(scrollerOf(popover).scrollTop).toBe(0);
+
+  await changeAndPaint(<Screen visible options={fewer} />);
+  await new Promise((resolve) => setTimeout(resolve, 200));
+  expect(scrollerOf(popover).scrollTop).toBe(0);
+
+  await changeAndPaint(<Screen visible options={all} />);
+  await new Promise((resolve) => setTimeout(resolve, 300));
+  expect(scrollerOf(popover).scrollTop).toBe(0);
+  expect(bestMatchAgainstPopoverBottom("/skill-1")).toBe(LIST_PADDING_AND_BORDER);
+});
+
+it("returns to the best match in the frame results arrive while the list is scrolled away", async () => {
+  const all = commandOptions("skill", 100);
+  const fewer = all.filter((_, index) => index % 3 === 0);
+  render(<Screen visible={false} options={all} />);
+  render(<Screen visible options={all} />);
+  const popover = await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 300));
+  scrollerOf(popover).scrollTop = 400;
+  await new Promise((resolve) => setTimeout(resolve, 200));
+  expect(bestMatchAgainstPopoverBottom("/skill-1")).not.toBe(LIST_PADDING_AND_BORDER);
+
+  const recording = recordPaintedFrames(() => bestMatchAgainstPopoverBottom("/skill-1"));
+  await changeAndPaint(<Screen visible options={fewer} />);
+  await new Promise((resolve) => setTimeout(resolve, 200));
+  recording.stop();
+
+  expect([...new Set(recording.frames)]).toEqual([LIST_PADDING_AND_BORDER]);
+});
+
+/**
+ * The composer hands over a new list on every keystroke and every refetch, often holding the results
+ * it already showed. Starting over for those returned a list the user had scrolled to its rest.
+ */
+it("keeps its place when the same results arrive again", async () => {
+  const options = commandOptions("skill", 100);
+  render(<Screen visible={false} options={options} />);
+  render(<Screen visible options={options} />);
+  const popover = await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 300));
+  scrollerOf(popover).scrollTop = 400;
+  await new Promise((resolve) => setTimeout(resolve, 200));
+  const scrolledAway = bestMatchAgainstPopoverBottom("/skill-1");
+  expect(scrolledAway).not.toBe(LIST_PADDING_AND_BORDER);
+
+  const recording = recordPaintedFrames(() => bestMatchAgainstPopoverBottom("/skill-1"));
+  await changeAndPaint(<Screen visible options={commandOptions("skill", 100)} />);
+  await new Promise((resolve) => setTimeout(resolve, 200));
+  recording.stop();
+
+  expect([...new Set(recording.frames)]).toEqual([scrolledAway]);
+});
+
+/** Whether the row is wholly inside the popover's box. */
+function isRowInView(label: string): boolean {
+  const popover = rectOf("composer-autocomplete-popover");
+  const row = document.querySelector(`[aria-label^="${label},"]`)?.getBoundingClientRect();
+  if (!popover || !row) return false;
+  return row.top >= popover.top - 0.5 && row.bottom <= popover.bottom + 0.5;
+}
+
+it("reveals the row the arrow keys select, including across the wrap to the far end", async () => {
+  const options = commandOptions("skill", 100);
+  render(<Screen visible={false} options={options} />);
+  render(<Screen visible options={options} />);
+  await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 300));
+
+  for (const selectedFromBest of [1, 5, 6, 7, 12, 6, 0, 99, 98, 93, 0]) {
+    render(<Screen visible options={options} selectedFromBest={selectedFromBest} />);
+    // Rows beyond the mounted ones come into view as they mount.
+    await expect
+      .poll(() => [selectedFromBest, isRowInView(`/skill-${selectedFromBest + 1}`)], {
+        timeout: 3000,
+      })
+      .toEqual([selectedFromBest, true]);
+  }
+  await expect.poll(() => bestMatchAgainstPopoverBottom("/skill-1")).toBe(LIST_PADDING_AND_BORDER);
+});
+
+/** The composer grew until the space above it holds fewer rows than the popover was showing. */
+it("keeps the selected row in view when the popover gets shorter", async () => {
+  const options = commandOptions("skill", 100);
+  render(<Screen visible={false} options={options} />);
+  render(<Screen visible options={options} />);
+  await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 300));
+  // Beyond the rows the popover opened with, so it came into view at the popover's top edge.
+  render(<Screen visible options={options} selectedFromBest={7} />);
+  await expect.poll(() => isRowInView("/skill-8"), { timeout: 3000 }).toBe(true);
+  const height = rectOf("composer-autocomplete-popover")!.height;
+
+  render(<Screen visible options={options} selectedFromBest={7} inputHeight={560} />);
+  await expect
+    .poll(() => rectOf("composer-autocomplete-popover")!.height, { timeout: 3000 })
+    .toBeLessThan(height - ROW_HEIGHT_AT_LEAST);
+  await expect.poll(() => isRowInView("/skill-8"), { timeout: 3000 }).toBe(true);
+});
+
+/** The label of the row at the top of the popover's box. */
+function topRowInView(): string | null {
+  const popover = rectOf("composer-autocomplete-popover");
+  if (!popover) return null;
+  const rows = mountedRows()
+    .map((row) => ({ rect: row.getBoundingClientRect(), label: row.getAttribute("aria-label") }))
+    .filter(({ rect }) => rect.top >= popover.top - 0.5 && rect.bottom <= popover.bottom + 0.5)
+    .toSorted((a, b) => a.rect.top - b.rect.top);
+  return rows[0]?.label?.split(",")[0] ?? null;
+}
+
+/**
+ * The far end of a long list is not mounted while the list rests against the composer. Scrolling to
+ * it as rows mounted painted the list at several places on the way.
+ */
+it("jumps between the two ends in one frame when the arrow keys wrap", async () => {
+  const options = commandOptions("skill", 100);
+  render(<Screen visible={false} options={options} />);
+  render(<Screen visible options={options} />);
+  await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 300));
+  const restingAtComposer = topRowInView();
+
+  const toFarEnd = recordPaintedFrames(topRowInView);
+  await changeAndPaint(<Screen visible options={options} selectedFromBest={99} />);
+  await new Promise((resolve) => setTimeout(resolve, 400));
+  toFarEnd.stop();
+  expect([...new Set(toFarEnd.frames)]).toEqual(["/skill-100"]);
+  expect(isRowInView("/skill-100")).toBe(true);
+
+  const toComposer = recordPaintedFrames(topRowInView);
+  await changeAndPaint(<Screen visible options={options} selectedFromBest={0} />);
+  await new Promise((resolve) => setTimeout(resolve, 400));
+  toComposer.stop();
+  expect([...new Set(toComposer.frames)]).toEqual([restingAtComposer]);
+  expect(bestMatchAgainstPopoverBottom("/skill-1")).toBe(LIST_PADDING_AND_BORDER);
+});
+
+it("scrolls towards rows further from the composer when the wheel turns up", async () => {
+  const options = commandOptions("skill", 100);
+  render(<Screen visible={false} options={options} />);
+  render(<Screen visible options={options} />);
+  const popover = await waitForPopover();
+  await new Promise((resolve) => setTimeout(resolve, 300));
+
+  const row = document.querySelector('[aria-label^="/skill-1,"]');
+  row?.dispatchEvent(new WheelEvent("wheel", { deltaY: -120, bubbles: true, cancelable: true }));
+  await new Promise((resolve) => setTimeout(resolve, 200));
+
+  // The best match moved down, out of the popover, by the distance the wheel turned.
+  expect(bestMatchAgainstPopoverBottom("/skill-1")).toBe(LIST_PADDING_AND_BORDER - 120);
+  expect(isRowInView("/skill-7")).toBe(true);
+  expect(popover.getBoundingClientRect().bottom).toBe(rectOf("composer-input")!.top - 12);
+});

packages/app/src/components/ui/autocomplete-popover/index.tsx

@@ -1,15 +1,13 @@
+import { useCallback, useEffect, useRef, useState, type ReactElement, type ReactNode } from "react";
 import {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-  type ReactElement,
-  type ReactNode,
-} from "react";
-import { View, useWindowDimensions, type StyleProp, type ViewStyle } from "react-native";
+  StyleSheet,
+  View,
+  useWindowDimensions,
+  type StyleProp,
+  type ViewStyle,
+} from "react-native";
 import { Portal } from "@gorhom/portal";
-import Animated, { useAnimatedReaction, useAnimatedStyle } from "react-native-reanimated";
+import { useAnimatedReaction, useAnimatedRef } from "react-native-reanimated";
 import { scheduleOnRN } from "react-native-worklets";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import {
@@ -21,18 +19,10 @@ import {
   measureFloatingPanelPortalHost,
   useFloatingPanelPortalHostName,
 } from "@/components/ui/floating-panel-portal";
+import { useRetainedPanelActive } from "@/components/retained-panel";
 import { KeyboardTranslateView, useKeyboardAnchor, useKeyboardShift } from "@/keyboard/shift";
-import { SPACING } from "@/styles/theme";
-import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
-
-const OFFSET_FROM_ANCHOR = SPACING[3];
-
-interface RelativeAnchorRect {
-  x: number;
-  y: number;
-  width: number;
-  hostHeight: number;
-}
+import { PopoverFrame } from "./internal/frame";
+import type { AnchorAtRest } from "./internal/placement";
 
 interface AutocompletePopoverProps {
   visible: boolean;
@@ -55,8 +45,16 @@ export function AutocompletePopover({
 }: AutocompletePopoverProps): ReactElement | null {
   "use no memo";
   // React Compiler memoizes effect captures by reading SharedValue.value during render.
-  const anchorRef = useRef<View>(null);
-  const [relativeAnchorRect, setRelativeAnchorRect] = useState<RelativeAnchorRect | null>(null);
+  const anchorRef = useAnimatedRef<View>();
+  // The animated ref returns its native handle, which React 19 would call as a ref cleanup.
+  // The anchor stays a plain View: its style is the caller's Unistyles style.
+  const setAnchorElement = useCallback(
+    (element: View | null) => {
+      anchorRef(element);
+    },
+    [anchorRef],
+  );
+  const [anchorAtRest, setAnchorAtRest] = useState<AnchorAtRest | null>(null);
   const windowDimensions = useWindowDimensions();
   const safeAreaInsets = useSafeAreaInsets();
   const portalHostName = useFloatingPanelPortalHostName();
@@ -64,7 +62,9 @@ export function AutocompletePopover({
   const anchor = useKeyboardAnchor();
   const { measureAtRest } = anchor;
   const measurementGeneration = useRef(0);
-  const canMeasure = visible && (options.length === 0 || selectedIndex >= 0);
+  // A retained panel stays mounted while hidden; its anchor cannot be measured until it shows.
+  const isPanelActive = useRetainedPanelActive();
+  const canMeasure = isPanelActive && visible && (options.length === 0 || selectedIndex >= 0);
 
   const remeasure = useCallback(() => {
     if (!canMeasure) return;
@@ -78,10 +78,11 @@ export function AutocompletePopover({
       if (generation !== measurementGeneration.current || !anchorRect || !hostRect) {
         return undefined;
       }
-      setRelativeAnchorRect({
+      setAnchorAtRest({
         x: anchorRect.x - hostRect.x,
         y: anchorRect.y - hostRect.y,
         width: anchorRect.width,
+        height: anchorRect.height,
         hostHeight: hostRect.height,
       });
       return undefined;
@@ -91,7 +92,7 @@ export function AutocompletePopover({
   useEffect(() => {
     measurementGeneration.current += 1;
     if (!canMeasure) {
-      setRelativeAnchorRect(null);
+      setAnchorAtRest(null);
       return;
     }
 
@@ -114,47 +115,32 @@ export function AutocompletePopover({
     [isMoving, remeasure],
   );
 
-  // Lay out at the anchor's resting position; the KeyboardTranslateView below lifts
-  // it with the anchor. Height changes only at keyboard boundaries.
-  const baseStyle = useMemo(() => {
-    if (!relativeAnchorRect) return null;
-    return inlineUnistylesStyle({
-      position: "absolute" as const,
-      left: relativeAnchorRect.x,
-      width: relativeAnchorRect.width,
-      bottom: relativeAnchorRect.hostHeight - relativeAnchorRect.y + OFFSET_FROM_ANCHOR,
-    });
-  }, [relativeAnchorRect]);
-
-  const anchorY = relativeAnchorRect?.y ?? 0;
-  const reservedLift = anchor.reservedLift;
-  const heightStyle = useAnimatedStyle(
-    () => ({
-      maxHeight: Math.max(
-        0,
-        anchorY - reservedLift.value - safeAreaInsets.top - OFFSET_FROM_ANCHOR * 2,
-      ),
-    }),
-    [anchorY, reservedLift, safeAreaInsets.top],
-  );
-
-  const showPopover = canMeasure && relativeAnchorRect && baseStyle;
-
-  // The translate view is the popover's own frame, so it lifts only the popover.
+  // The layer covers the host and rides the anchor's keyboard translation; the frame inside it
+  // places the popover. A layer that spans the host keeps the popover inside its parent's bounds,
+  // which Android hit-testing requires.
   return (
-    <View ref={anchorRef} onLayout={remeasure} style={anchorStyle} collapsable={false}>
+    <View ref={setAnchorElement} onLayout={remeasure} style={anchorStyle} collapsable={false}>
       {children}
-      {showPopover ? (
+      {canMeasure && anchorAtRest ? (
         <Portal hostName={portalHostName}>
-          <KeyboardTranslateView {...anchor.translation} style={baseStyle}>
-            <Animated.View testID="composer-autocomplete-popover" style={heightStyle}>
+          <KeyboardTranslateView
+            {...anchor.translation}
+            style={StyleSheet.absoluteFill}
+            pointerEvents="box-none"
+          >
+            <PopoverFrame
+              anchorRef={anchorRef}
+              anchorAtRest={anchorAtRest}
+              reservedLift={anchor.reservedLift}
+              topInset={safeAreaInsets.top}
+            >
               <Autocomplete
                 options={options}
                 selectedIndex={selectedIndex}
                 onSelect={onSelect}
                 status={status}
               />
-            </Animated.View>
+            </PopoverFrame>
           </KeyboardTranslateView>
         </Portal>
       ) : null}