fix(app): settle archived search when no history host is reachable

With no searchable host online, the history query is disabled under a new
key, and keepPreviousData kept serving the old key's rows as placeholder
data. Archived search read that as still waiting for results, so the
command center selection never settled and followed every re-rank.
Previous results now stand in only while the query can run.

docs/agent-stream-disclosure.md

@@ -186,8 +186,7 @@ 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` and `SelectableTextTouchTest` cover Android; iOS has no native
-test harness.
+`VisibleContentPositionClampTest` covers 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
@@ -207,16 +206,5 @@ 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 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:
+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:
 
 ```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 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.
+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.
 
 Before adding a new component, read `components/ui/`. The primitive usually exists.
 

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 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.
+- **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.
 - **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/hub.md

@@ -61,10 +61,6 @@ The daemon journals the assigned agent ID before creation. Concurrent retries sh
 and a retry after a lost acknowledgement or restart returns the durable agent without creating a
 workspace or starting a turn. Deleting that agent does not make its old creation key reusable.
 Confirmed message delivery is also journaled, so retrying its message ID does not submit it again.
-A direct send (one without `sourceAgentId`) rejected before its prompt is handed to a run, for
-example because the agent could not be loaded or the requested mode could not be set, leaves no
-receipt, so retrying its message ID submits it. A failure during or after run startup is treated
-as an unfinished delivery.
 An unfinished delivery after restart reports `agent_request_outcome_unknown`: a provider can have
 accepted a prompt before the daemon recorded success, so automatic resubmission could duplicate
 work. Inspect the agent before choosing a new message ID. Receipts contain identity and request

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,11 +95,10 @@ 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. 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.
+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.
 
 ## 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,13 +787,9 @@ test.describe("Composer autocomplete", () => {
       await input.press("ArrowDown");
       await input.press("ArrowDown");
       await input.press("h");
-      // 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 expect(popover.getByText("/help", { exact: true }).first()).toBeVisible();
       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/workspace-archive-undo.spec.ts

@@ -14,7 +14,6 @@ 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,
@@ -26,7 +25,6 @@ import {
   resizeSidebarToMinimum,
   rowArchiveButton,
   rowKebab,
-  scrollSidebarListToEnd,
   undoButton,
   workspaceRow,
   workspaceTitleWidth,
@@ -121,41 +119,6 @@ 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,34 +5,27 @@ 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";
 
-type DaemonClient = Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
-
-async function seedRiskyWorktree(client: DaemonClient, worktreeDirectory: string): Promise<void> {
+async function seedRiskyWorktree(
+  client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>,
+  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,
@@ -62,189 +55,35 @@ async function seedRiskyWorktree(client: DaemonClient, worktreeDirectory: string
   const dirtyFile = path.join(worktreeDirectory, "DIRTY.md");
   await writeFile(dirtyFile, "# dirty\n");
 
-  await refreshCheckout(client, worktreeDirectory);
-}
-
-async function refreshCheckout(client: DaemonClient, directory: string): Promise<void> {
-  const refreshed = await client.checkoutRefresh(directory);
+  const refreshed = await client.checkoutRefresh(worktreeDirectory);
   if (!refreshed.success) {
-    throw new Error(`Failed to refresh checkout for ${directory}`);
+    throw new Error(`Failed to refresh checkout for ${worktreeDirectory}`);
   }
 }
 
-// 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(
+// 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(
   page: Page,
+  workspaceId: string,
   answer: "accept" | "dismiss",
-  openArchive: () => Promise<void>,
 ): Promise<Dialog> {
-  const warning = page.waitForEvent("dialog", { timeout: 10_000 }).then(async (dialog) => {
-    await (answer === "accept" ? dialog.accept() : dialog.dismiss());
-    return dialog;
+  let warning: Dialog | undefined;
+  page.once("dialog", (dialog) => {
+    warning = dialog;
+    void (answer === "accept" ? dialog.accept() : dialog.dismiss());
   });
-  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;
+  await clickArchiveWorkspaceMenuItem(page, workspaceId);
+  if (!warning) {
+    throw new Error("Expected an archive confirmation dialog, but none was shown.");
   }
-}
-
-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();
-    },
-  };
+  return warning;
 }
 
 test.describe("Workspace archive risk warning for worktree backing", () => {
-  let client: DaemonClient;
+  let client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
   let tempRepo: { path: string; cleanup: () => Promise<void> };
   const createdWorktreeDirectories = new Set<string>();
 
@@ -264,53 +103,36 @@ test.describe("Workspace archive risk warning for worktree backing", () => {
     await tempRepo?.cleanup().catch(() => undefined);
   });
 
-  async function createWorktree(slug: string) {
-    const project = await openProjectViaDaemon(client, tempRepo.path);
-    const worktree = await createWorktreeViaDaemon(client, {
-      cwd: tempRepo.path,
-      slug: `${slug}-${Date.now()}`,
-    });
-    createdWorktreeDirectories.add(worktree.workspaceDirectory);
-    expect(existsSync(worktree.workspaceDirectory)).toBe(true);
-    return { ...worktree, project };
-  }
-
-  async function openSidebarRow(page: Page, workspaceId: string): Promise<void> {
-    await gotoAppShell(page);
-    await waitForSidebarHydration(page);
-    await waitForWorkspaceInSidebar(page, { serverId: getServerId(), workspaceId });
-  }
-
-  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 serverId = getServerId();
+    await openProjectViaDaemon(client, tempRepo.path);
+    const worktree = await createWorktreeViaDaemon(client, {
+      cwd: tempRepo.path,
+      slug: `archive-risk-${Date.now()}`,
+    });
+    createdWorktreeDirectories.add(worktree.workspaceDirectory);
+    expect(existsSync(worktree.workspaceDirectory)).toBe(true);
 
-    const firstWarning = await answerArchiveWarning(page, "dismiss", () =>
-      clickArchiveWorkspaceMenuItem(page, worktree.workspaceId),
-    );
+    await seedRiskyWorktree(client, worktree.workspaceDirectory);
+
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+    await waitForWorkspaceInSidebar(page, { serverId, workspaceId: worktree.workspaceId });
+
+    const firstWarning = await clickArchiveAndAnswerWarning(page, worktree.workspaceId, "dismiss");
     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 expectWorktreeKept(page, worktree);
+    await expect(
+      page.getByTestId(`sidebar-workspace-row-${serverId}:${worktree.workspaceId}`),
+    ).toBeVisible({ timeout: 10_000 });
     expect(existsSync(worktree.workspaceDirectory)).toBe(true);
 
-    const secondWarning = await answerArchiveWarning(page, "accept", () =>
-      clickArchiveWorkspaceMenuItem(page, worktree.workspaceId),
-    );
+    const secondWarning = await clickArchiveAndAnswerWarning(page, worktree.workspaceId, "accept");
     expect(secondWarning.message()).toContain("Uncommitted changes");
     expect(secondWarning.message()).toContain("1 unpushed commit");
 
@@ -321,128 +143,4 @@ 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/support/helpers/agent-timeline-gate.ts

@@ -21,6 +21,7 @@ export interface OlderTimelinePagesGate {
   getRepeatedEntryCount(): number;
   getOwnedEntryCountContaining(text: string): number;
   releasePage(pageNumber: number): void;
+  waitForRequestCount(count: number): Promise<void>;
 }
 
 export interface DaemonHydrationGate {
@@ -370,6 +371,15 @@ 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));
@@ -383,6 +393,7 @@ export async function holdAgentOlderTimelinePages(
         sessionMessage.direction === "before"
       ) {
         requestCount += 1;
+        resolveRequestWaiters();
       }
       server.send(message);
     });
@@ -428,6 +439,14 @@ 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,
@@ -73,16 +73,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/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/timeline-pagination.ts

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

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

@@ -162,38 +162,3 @@ 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

@@ -1,282 +0,0 @@
-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,12 +1,10 @@
 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;
@@ -14,7 +12,7 @@ import com.facebook.react.views.scroll.ReactScrollView;
 import com.facebook.react.views.scroll.ReactScrollViewHelper;
 
 /**
- * React Native's vertical scroll view with five corrections. Java, because the content-position
+ * React Native's vertical scroll view with two corrections. Java, because the content-position
  * config type is internal to React Native's Kotlin module.
  */
 final class PaseoScrollView extends ReactScrollView {
@@ -29,7 +27,6 @@ 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);
@@ -54,56 +51,6 @@ 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/src/agent-stream/strategy-web.browser.test.tsx

@@ -49,21 +49,8 @@ afterEach(() => {
   host.remove();
 });
 
-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 });
+function mountTimeline(historyMounted: StreamItem[]) {
+  const strategy = createWebStreamStrategy({ isMobileBreakpoint: true });
   const viewportRef = React.createRef<StreamViewportHandle>();
   const input: StreamRenderInput = {
     agentId: "agent",
@@ -89,7 +76,6 @@ function mountTimeline(
     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 } }));
@@ -114,20 +100,8 @@ function mountTimeline(
     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 () => {
@@ -139,53 +113,6 @@ function mountTimeline(
 }
 
 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);
@@ -281,32 +208,3 @@ 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,8 +457,6 @@ 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,
@@ -607,15 +605,6 @@ 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;
@@ -802,16 +791,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 userScrolledUp = scrolledUp && hasUpwardInputEvidence();
+    const mouseGesture = mouseScrollGestureRef.current;
+    const hasUpwardInputEvidence =
+      mouseGesture?.kind === "scrollbar" ||
+      (mouseGesture?.kind === "autoscroll" && mouseGesture.hasUpwardEvidence) ||
+      window.performance.now() < upwardInputEvidenceUntilRef.current;
 
     if (!followOutputRef.current && isAtBottom && scrolledDown && !isJumpSettling()) {
       setFollowOutput(true);
-    } else if (followOutputRef.current && userScrolledUp) {
+    } else if (followOutputRef.current && scrolledUp && hasUpwardInputEvidence) {
       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;
@@ -822,10 +811,8 @@ 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/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/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/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/draggable-list.native.tsx

@@ -11,10 +11,6 @@ export type { DraggableListProps, DraggableRenderItemInfo };
 
 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,
@@ -121,10 +117,6 @@ 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}

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

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

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

@@ -462,9 +462,7 @@ 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, expanded: false, policy }),
-    );
+    const { result } = renderHook(() => useLimitedSidebarGroup({ items, selection: null, policy }));
     expect(result.current.visibleItems).toEqual(items.slice(0, 7));
     expect(result.current.canToggle).toBe(count > 7);
   });
@@ -474,7 +472,7 @@ describe("sidebar group visibility", () => {
     (status) => {
       const items = entries([...Array(11).fill("done"), status]);
       const { result } = renderHook(() =>
-        useLimitedSidebarGroup({ items, selection: null, expanded: false, policy }),
+        useLimitedSidebarGroup({ items, selection: null, policy }),
       );
       expect(names(result.current.visibleItems)).toEqual([
         "row-1",
@@ -499,7 +497,6 @@ describe("sidebar group visibility", () => {
         useLimitedSidebarGroup({
           items,
           selection: null,
-          expanded: false,
           policy: createWorkspaceVisibilityPolicy(entriesByKey),
         }),
       );
@@ -521,9 +518,7 @@ describe("sidebar group visibility", () => {
       "needs_input",
       "failed",
     ]);
-    const { result } = renderHook(() =>
-      useLimitedSidebarGroup({ items, selection: null, expanded: false, policy }),
-    );
+    const { result } = renderHook(() => useLimitedSidebarGroup({ items, selection: null, policy }));
     expect(result.current.visibleItems).toEqual(items);
     expect(result.current.canToggle).toBe(false);
   });
@@ -537,10 +532,9 @@ describe("sidebar group visibility", () => {
       "done",
       "attention",
     ]);
-    const { result, rerender } = renderHook(
-      ({ rows, expanded }) =>
-        useLimitedSidebarGroup({ items: rows, selection: null, expanded, policy }),
-      { initialProps: { rows: items, expanded: false } },
+    const { result, rerender, unmount } = renderHook(
+      ({ rows }) => useLimitedSidebarGroup({ items: rows, selection: null, policy }),
+      { initialProps: { rows: items } },
     );
     expect(names(result.current.visibleItems)).toEqual([
       "row-1",
@@ -554,15 +548,16 @@ describe("sidebar group visibility", () => {
       "row-10",
       "row-12",
     ]);
-    rerender({ rows: items, expanded: true });
+    act(() => result.current.toggleExpanded());
     expect(result.current.visibleItems).toEqual(items);
-    rerender({ rows: items.map((item) => ({ ...item, statusBucket: "running" })), expanded: true });
+    rerender({ rows: items.map((item) => ({ ...item, statusBucket: "running" })) });
     expect(result.current.canToggle).toBe(false);
-    rerender({ rows: items.slice(0, 3), expanded: true });
+    expect(result.current.expanded).toBe(true);
+    rerender({ rows: items.slice(0, 3) });
     expect(result.current.canToggle).toBe(false);
-    rerender({ rows: items.toReversed(), expanded: true });
+    rerender({ rows: items.toReversed() });
     expect(result.current.visibleItems).toEqual(items.toReversed());
-    rerender({ rows: items.toReversed(), expanded: false });
+    act(() => result.current.toggleExpanded());
     expect(names(result.current.visibleItems)).toEqual([
       "row-12",
       "row-11",
@@ -573,25 +568,15 @@ describe("sidebar group visibility", () => {
       "row-6",
     ]);
     const newest = { ...items[0], workspaceId: "new", workspaceKey: "srv:new" };
-    rerender({ rows: [newest, ...items], expanded: false });
+    rerender({ rows: [newest, ...items] });
     expect(result.current.visibleItems[0]).toBe(newest);
     expect(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);
+    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("follows effective pending creation, recovery and agent activity without changing Created order", () => {
@@ -617,7 +602,6 @@ describe("sidebar group visibility", () => {
         useLimitedSidebarGroup({
           items: [...items.slice(0, 11), last],
           selection: null,
-          expanded: false,
           policy,
         }),
       { initialProps: { last: items[11] } },
@@ -657,15 +641,12 @@ describe("sidebar group visibility", () => {
 
   it("preserves the twenty-row pinned policy regardless of status", () => {
     const items = entries(Array(21).fill("running"));
-    const { result, rerender } = renderHook(
-      ({ expanded }) => useLimitedSidebarGroup({ items, selection: null, expanded }),
-      { initialProps: { expanded: false } },
-    );
+    const { result } = renderHook(() => useLimitedSidebarGroup({ items, selection: null }));
     expect(result.current.visibleItems).toEqual(items.slice(0, 20));
     expect(result.current.canToggle).toBe(true);
-    rerender({ expanded: true });
+    act(() => result.current.toggleExpanded());
     expect(result.current.visibleItems).toEqual(items);
-    rerender({ expanded: false });
+    act(() => result.current.toggleExpanded());
     expect(result.current.visibleItems).toHaveLength(20);
   });
 });

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

@@ -87,6 +87,7 @@ 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";
@@ -367,10 +368,12 @@ function projectKebabStyle({
 
 function getProjectWorkspaceRowStyle({
   isDragging,
+  isPressed,
   selected,
   isHovered,
 }: {
   isDragging: boolean;
+  isPressed: boolean;
   selected: boolean;
   isHovered: boolean;
 }) {
@@ -379,6 +382,7 @@ function getProjectWorkspaceRowStyle({
     isHovered && styles.workspaceRowHovered,
     selected && styles.sidebarRowSelected,
     isDragging && styles.workspaceRowDragging,
+    isPressed && styles.workspaceRowPressed,
   ];
 }
 
@@ -816,6 +820,7 @@ function NewWorkspaceGhostRow({
     ({ hovered = false, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
       styles.newWorkspaceGhostRow,
       hovered && !pressed && styles.newWorkspaceGhostRowHovered,
+      pressed && styles.newWorkspaceGhostRowPressed,
     ],
     [],
   );
@@ -828,7 +833,6 @@ function NewWorkspaceGhostRow({
       })}
       onPress={handlePress}
       style={rowStyle}
-      highlightStyle={styles.newWorkspaceGhostRowPressed}
       testID={`sidebar-project-new-workspace-row-${project.viewKey}`}
     >
       {({ hovered, pressed }) => (
@@ -879,7 +883,7 @@ function ProjectHeaderRow({
   dragHandleProps,
 }: ProjectHeaderRowProps) {
   const [isHovered, setIsHovered] = useState(false);
-  const [isHighlighted, setIsHighlighted] = useState(false);
+  const [isPressed, setIsPressed] = useState(false);
   const [contextMenuOpen, setContextMenuOpen] = useState(false);
   const isMobileBreakpoint = useIsCompactFormFactor();
   const localDaemonServerId = useLocalDaemonServerId();
@@ -926,13 +930,25 @@ 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 = useMemo(
-    () => [
+  const projectRowStyle = useCallback(
+    ({ pressed }: PressableStateCallbackType) => [
       styles.projectRow,
       isDragging && styles.projectRowDragging,
       selected && styles.sidebarRowSelected,
       isHovered && styles.projectRowHovered,
+      pressed && styles.projectRowPressed,
     ],
     [isDragging, selected, isHovered],
   );
@@ -945,7 +961,7 @@ function ProjectHeaderRow({
           iconDataUri={iconDataUri}
           statusBucket={statusBucket}
           projectViewKey={project.viewKey}
-          backdrop={getSidebarRowBackdrop({ isDragging, isHighlighted, selected, isHovered })}
+          backdrop={getSidebarRowBackdrop({ isDragging, isPressed, selected, isHovered })}
           chevron={chevron}
           showChevron={isHovered && chevron !== null}
           isArchiving={isArchiving}
@@ -991,10 +1007,9 @@ function ProjectHeaderRow({
           accessibilityRole="button"
           style={projectRowStyle}
           highlightStyle={styles.projectRowPressed}
-          onHighlightChange={setIsHighlighted}
-          onPressIn={interaction.handlePressIn}
+          onPressIn={handleProjectPressIn}
           onTouchMove={interaction.handleTouchMove}
-          onPressOut={interaction.handlePressOut}
+          onPressOut={handleProjectPressOut}
           onPress={handlePress}
           testID={`sidebar-project-row-${project.viewKey}`}
         >
@@ -1018,10 +1033,9 @@ function ProjectHeaderRow({
           accessibilityRole="button"
           style={projectRowStyle}
           highlightStyle={styles.projectRowPressed}
-          onHighlightChange={setIsHighlighted}
-          onPressIn={interaction.handlePressIn}
+          onPressIn={handleProjectPressIn}
           onTouchMove={interaction.handleTouchMove}
-          onPressOut={interaction.handlePressOut}
+          onPressOut={handleProjectPressOut}
           onPress={handlePress}
           testID={`sidebar-project-row-${project.viewKey}`}
         >
@@ -1077,7 +1091,7 @@ function WorkspaceRowInner({
   reserveIdleStatusIndicatorSpace = true,
 }: WorkspaceRowInnerProps) {
   const isCompact = useIsCompactFormFactor();
-  const [isHighlighted, setIsHighlighted] = useState(false);
+  const [isPressed, setIsPressed] = useState(false);
   const isTouchPlatform = platformIsNative || isCompact;
   const interaction = useLongPressDragInteraction({
     drag,
@@ -1097,6 +1111,17 @@ 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;
@@ -1110,8 +1135,13 @@ function WorkspaceRowInner({
       {({ isHovered, contextMenuOpen, onContextMenuOpenChange, hoverHandlers }) => {
         const isDesktop = !isTouchPlatform;
         const serviceSummary = isDesktop ? selectWorkspaceServiceSummary(workspace.scripts) : null;
-        const workspaceRowStyle = getProjectWorkspaceRowStyle({ isDragging, selected, isHovered });
-        const backdrop = getSidebarRowBackdrop({ isDragging, isHighlighted, selected, isHovered });
+        const workspaceRowStyle = getProjectWorkspaceRowStyle({
+          isDragging,
+          isPressed,
+          selected,
+          isHovered,
+        });
+        const backdrop = getSidebarRowBackdrop({ isDragging, isPressed, selected, isHovered });
         return (
           <View
             {...dragAttributes}
@@ -1146,11 +1176,10 @@ function WorkspaceRowInner({
               accessibilityRole="button"
               accessibilityState={accessibilityState}
               style={workspaceRowStyle}
-              highlightStyle={isEditingTitle ? undefined : styles.workspaceRowPressed}
-              onHighlightChange={setIsHighlighted}
-              onPressIn={isEditingTitle ? undefined : interaction.handlePressIn}
+              highlightStyle={styles.workspaceRowPressed}
+              onPressIn={isEditingTitle ? undefined : handleWorkspacePressIn}
               onTouchMove={isEditingTitle ? undefined : interaction.handleTouchMove}
-              onPressOut={isEditingTitle ? undefined : interaction.handlePressOut}
+              onPressOut={isEditingTitle ? undefined : handleWorkspacePressOut}
               onPress={isEditingTitle ? undefined : handlePress}
               testID={`sidebar-workspace-row-${workspace.workspaceKey}`}
             >
@@ -1251,9 +1280,8 @@ function WorkspaceRowWithMenu({
     serverId: workspace.serverId,
     workspaceId: workspace.workspaceId,
     workspaceKind: workspace.workspaceKind,
-    workspaceDirectory: workspace.workspaceDirectory,
     name: workspace.name,
-    diffStat: workspace.diffStat,
+    ...toWorktreeArchiveRisk(workspace),
     onArchiveStarted: redirectAfterArchive,
     onSetHiding: setIsHidingWorkspace,
   });
@@ -1529,8 +1557,6 @@ function ProjectBlock({
   showShortcutBadges,
   shortcutIndexByWorkspaceKey,
   onToggleCollapsed,
-  workspacesExpanded,
-  onToggleWorkspacesExpanded,
   onWorkspacePress,
   parentGestureRef,
   onWorkspaceReorder,
@@ -1557,9 +1583,6 @@ 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;
@@ -1584,11 +1607,12 @@ 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;
@@ -1746,10 +1770,6 @@ 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) {
@@ -1786,7 +1806,7 @@ function ProjectBlock({
           {canToggleWorkspaces ? (
             <SidebarGroupToggleRow
               expanded={workspacesExpanded}
-              onPress={handleToggleWorkspacesExpanded}
+              onPress={toggleWorkspacesExpanded}
               testID={`sidebar-project-show-more-${project.viewKey}`}
             />
           ) : null}
@@ -1856,8 +1876,6 @@ 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 &&
@@ -2186,29 +2204,15 @@ 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(
     () =>
@@ -2364,8 +2368,6 @@ function ProjectModeList({
           showShortcutBadges={showShortcutBadges}
           shortcutIndexByWorkspaceKey={shortcutIndexByWorkspaceKey}
           onToggleCollapsed={onToggleProjectCollapsed}
-          workspacesExpanded={expandedProjectKeys.has(item.viewKey)}
-          onToggleWorkspacesExpanded={toggleProjectWorkspacesExpanded}
           onWorkspacePress={onWorkspacePress}
           manualSort={manualSort}
           parentGestureRef={parentGestureRef}
@@ -2387,8 +2389,6 @@ 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,
-    // 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],
+    // 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],
   },
   projectListContainer: {
     width: "100%",

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

@@ -39,6 +39,7 @@ export function SidebarGroupToggleRow({
       styles.row,
       indented && sidebarWorkspaceRowStyles.rowIndented,
       hovered && !pressed && styles.rowHovered,
+      pressed && styles.rowPressed,
     ],
     [indented],
   );
@@ -49,7 +50,6 @@ 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,17 +12,16 @@ import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
  */
 export function getSidebarRowBackdrop({
   isDragging = false,
-  isHighlighted = false,
+  isPressed = false,
   selected = false,
   isHovered = false,
 }: {
   isDragging?: boolean;
-  /** The press highlight is painting the row's pressed fill. */
-  isHighlighted?: boolean;
+  isPressed?: boolean;
   selected?: boolean;
   isHovered?: boolean;
 }): SidebarSurfaceBackdrop {
-  if (isDragging || isHighlighted) return "surface2";
+  if (isDragging || isPressed) return "surface2";
   if (selected) return "surfaceSidebarSelected";
   if (isHovered) return "surfaceSidebarHover";
   return "surfaceSidebar";

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

@@ -9,7 +9,13 @@ import {
   type Ref,
 } from "react";
 import { useTranslation } from "react-i18next";
-import { View, Text, ScrollView } from "react-native";
+import {
+  View,
+  Text,
+  ScrollView,
+  type GestureResponderEvent,
+  type PressableStateCallbackType,
+} 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";
@@ -38,6 +44,7 @@ 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";
@@ -148,20 +155,13 @@ 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,
-    canToggle: canTogglePinnedWorkspaces,
-  } = useLimitedSidebarGroup({
-    items: pinnedWorkspaces,
-    selection: activeWorkspaceSelection,
     expanded: pinnedWorkspacesExpanded,
-  });
+    canToggle: canTogglePinnedWorkspaces,
+    toggleExpanded: togglePinnedWorkspacesExpanded,
+  } = useLimitedSidebarGroup({ items: pinnedWorkspaces, selection: activeWorkspaceSelection });
 
   const statusShortcutIndex = showShortcutBadges
     ? shortcutIndexByWorkspaceKey
@@ -366,19 +366,15 @@ 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,
   });
 
@@ -464,8 +460,12 @@ function StatusGroupHeader({
   }, [group.key, toggleWorkspaceGroupCollapsed]);
   const handleHoverIn = useCallback(() => setIsHovered(true), []);
   const handleHoverOut = useCallback(() => setIsHovered(false), []);
-  const rowStyle = useMemo(
-    () => [styles.statusGroupRow, isHovered && styles.statusGroupRowHovered],
+  const rowStyle = useCallback(
+    ({ pressed }: PressableStateCallbackType) => [
+      styles.statusGroupRow,
+      isHovered && styles.statusGroupRowHovered,
+      pressed && styles.statusGroupRowPressed,
+    ],
     [isHovered],
   );
   const accessibilityState = useMemo(() => ({ expanded: !collapsed }), [collapsed]);
@@ -477,7 +477,6 @@ function StatusGroupHeader({
         accessibilityLabel={t("sidebar.statusGroupAccessibility", { label: group.label })}
         accessibilityState={accessibilityState}
         style={rowStyle}
-        highlightStyle={styles.statusGroupRowPressed}
         onPress={handlePress}
         testID={`sidebar-status-group-${group.key}`}
       >
@@ -655,9 +654,8 @@ function StatusWorkspaceRowWithMenu({
     serverId: workspace.serverId,
     workspaceId: workspace.workspaceId,
     workspaceKind: workspace.workspaceKind,
-    workspaceDirectory: workspace.workspaceDirectory,
     name: workspace.name,
-    diffStat: workspace.diffStat,
+    ...toWorktreeArchiveRisk(workspace),
     onArchiveStarted: redirectAfterArchive,
     onSetHiding: setIsHidingWorkspace,
   });
@@ -828,7 +826,7 @@ function StatusWorkspaceRowInnerContent({
 }) {
   const isCompact = useIsCompactFormFactor();
   const isTouchPlatform = platformIsNative || isCompact;
-  const [isHighlighted, setIsHighlighted] = useState(false);
+  const [isPressed, setIsPressed] = useState(false);
   const trailing = useSidebarWorkspaceTrailing();
   const {
     role: _dragRole,
@@ -853,6 +851,17 @@ function StatusWorkspaceRowInnerContent({
     }
     onPress();
   }, [didLongPressRef, onPress]);
+  const handlePressIn = useCallback(
+    (event: GestureResponderEvent) => {
+      setIsPressed(true);
+      startDragPress?.(event);
+    },
+    [startDragPress],
+  );
+  const handlePressOut = useCallback(() => {
+    setIsPressed(false);
+    endDragPress?.();
+  }, [endDragPress]);
 
   return (
     <SidebarWorkspaceRowFrame
@@ -878,12 +887,13 @@ function StatusWorkspaceRowInnerContent({
           showShortcut,
         });
         const workspaceRowStyle = getStatusWorkspaceRowStyle({
+          isPressed,
           selected,
           isHovered,
           inStatusGroup,
           isDragging,
         });
-        const backdrop = getSidebarRowBackdrop({ isDragging, isHighlighted, selected, isHovered });
+        const backdrop = getSidebarRowBackdrop({ isDragging, isPressed, selected, isHovered });
         return (
           <View
             {...dragAttributes}
@@ -918,11 +928,10 @@ function StatusWorkspaceRowInnerContent({
               accessibilityRole="button"
               accessibilityState={accessibilityState}
               style={workspaceRowStyle}
-              highlightStyle={isEditingTitle ? undefined : styles.workspaceRowPressed}
-              onHighlightChange={setIsHighlighted}
-              onPressIn={isEditingTitle ? undefined : startDragPress}
+              highlightStyle={styles.workspaceRowPressed}
+              onPressIn={isEditingTitle ? undefined : handlePressIn}
               onTouchMove={isEditingTitle ? undefined : moveDragPress}
-              onPressOut={isEditingTitle ? undefined : endDragPress}
+              onPressOut={isEditingTitle ? undefined : handlePressOut}
               onPress={isEditingTitle ? undefined : handlePress}
               testID={`sidebar-workspace-row-${workspace.workspaceKey}`}
             >
@@ -1059,11 +1068,13 @@ function StatusWorkspaceActionSlot({
 }
 
 function getStatusWorkspaceRowStyle({
+  isPressed,
   selected,
   isHovered,
   inStatusGroup,
   isDragging,
 }: {
+  isPressed: boolean;
   selected: boolean;
   isHovered: boolean;
   inStatusGroup: boolean;
@@ -1075,6 +1086,7 @@ function getStatusWorkspaceRowStyle({
     isHovered && styles.workspaceRowHovered,
     selected && styles.sidebarRowSelected,
     isDragging && styles.workspaceRowDragging,
+    isPressed && styles.workspaceRowPressed,
   ];
 }
 
@@ -1089,9 +1101,8 @@ const styles = StyleSheet.create((theme) => ({
     paddingHorizontal: theme.spacing[2],
     // Keep status mode's Pinned/Workspaces boundary identical to project mode.
     paddingTop: 2,
-    // 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],
+    // Match project grouping: permanent room to scroll the final row above sidebar toasts.
+    paddingBottom: theme.spacing[24],
   },
   pinnedSection: {
     marginBottom: theme.spacing[1],

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

@@ -1,4 +1,4 @@
-import { useMemo } from "react";
+import { useCallback, useMemo, useState } from "react";
 import {
   selectSidebarGroupVisibility,
   type SidebarGroupItem,
@@ -12,22 +12,23 @@ 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> {
-  return useMemo(
+}: LimitedSidebarGroupInput<T>): SidebarGroupVisibility<T> & {
+  expanded: boolean;
+  toggleExpanded: () => void;
+} {
+  const [expanded, setExpanded] = useState(false);
+  const visibility = useMemo(
     () => selectSidebarGroupVisibility({ items, expanded, policy, selection }),
     [expanded, items, policy, selection],
   );
+  const toggleExpanded = useCallback(() => setExpanded((current) => !current), []);
+
+  return { ...visibility, expanded, toggleExpanded };
 }

packages/app/src/components/ui/context-menu.tsx

@@ -8,6 +8,7 @@ import {
 import {
   View,
   type GestureResponderEvent,
+  type PressableProps,
   type PressableStateCallbackType,
   type StyleProp,
   type ViewProps,
@@ -26,7 +27,6 @@ import {
   type MenuTriggerState,
 } from "@/components/ui/menu";
 import { PressHighlight } from "@/components/ui/press-highlight";
-import type { PressHighlightProps } from "@/components/ui/press-highlight.types";
 
 /**
  * A menu opened by a long press or a right click, anchored to the point of the gesture rather
@@ -109,7 +109,8 @@ export function ContextMenuTrigger({
   triggerRef,
   ...props
 }: PropsWithChildren<
-  Omit<PressHighlightProps, "style"> & {
+  Omit<PressableProps, "style"> & {
+    highlightStyle?: StyleProp<ViewStyle>;
     style?: TriggerStyleProp;
     enabled?: boolean;
     enabledOnMobile?: boolean;

packages/app/src/components/ui/press-highlight.android.tsx

@@ -1,87 +0,0 @@
-import { forwardRef, useCallback, useMemo } from "react";
-import {
-  Pressable,
-  type PressableProps,
-  type PressableStateCallbackType,
-  type View,
-} from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import type { Theme } from "@/styles/theme";
-import type { PressHighlightProps } from "./press-highlight.types";
-
-interface RipplePressableProps extends Omit<PressableProps, "style"> {
-  rippleColor?: string;
-  // `withUnistyles` flattens a `style` prop, which would drop the caller's state callback.
-  pressableStyle: PressableProps["style"];
-}
-
-// A foreground ripple tints the content with the surface, so nothing inside needs to know the
-// row is pressed.
-const RipplePressable = withUnistyles(
-  forwardRef<View, RipplePressableProps>(function RipplePressable(
-    { rippleColor, pressableStyle, ...props },
-    ref,
-  ) {
-    const ripple = useMemo(
-      () => (rippleColor ? { color: rippleColor, foreground: true } : undefined),
-      [rippleColor],
-    );
-    return <Pressable {...props} ref={ref} style={pressableStyle} android_ripple={ripple} />;
-  }),
-);
-
-// Android's own `ViewConfiguration.getTapTimeout()`: a native list in a scroll view waits this long
-// before showing pressed, so a scroll that claims the touch first cancels it.
-const TAP_TIMEOUT_MS = 100;
-
-const rippleColorMapping = (theme: Theme) => ({ rippleColor: theme.colors.interactionHighlight });
-
-/**
- * The platform ripple replaces `highlightStyle`. Pressable starts it from JS after the press
- * delay, then the animation runs on the UI thread without a React commit.
- */
-export const PressHighlight = forwardRef<View, PressHighlightProps>(function PressHighlight(
-  {
-    highlightStyle,
-    onHighlightChange: _onHighlightChange,
-    style,
-    unstable_pressDelay = TAP_TIMEOUT_MS,
-    ...props
-  },
-  ref,
-) {
-  const hasRipple = highlightStyle != null;
-  const rippleStyle = useCallback(
-    (state: PressableStateCallbackType) => [
-      hasRipple && styles.rippleBorderReset,
-      typeof style === "function" ? style(state) : style,
-      hasRipple && styles.rippleClip,
-    ],
-    [style, hasRipple],
-  );
-  return (
-    <RipplePressable
-      {...props}
-      ref={ref}
-      pressableStyle={rippleStyle}
-      uniProps={hasRipple ? rippleColorMapping : undefined}
-      unstable_pressDelay={unstable_pressDelay}
-    />
-  );
-});
-
-const styles = StyleSheet.create({
-  // React Native 0.86 sends NaN when a style drops `borderWidth`, and an overflow-hidden view then
-  // clips to a NaN padding box and stops painting. A sidebar row loses its drag border on drop.
-  // An explicit 0 under the caller's style sends 0 instead. Fixed upstream in
-  // facebook/react-native#57789; remove once the app ships a React Native release with it.
-  rippleBorderReset: {
-    borderWidth: 0,
-  },
-  // React Native draws ripples in the view's rectangle. With overflow hidden, the view clips its
-  // children to its rounded padding box, and that clip is still on the canvas when Android draws
-  // the foreground, so the ripple follows the corners.
-  rippleClip: {
-    overflow: "hidden",
-  },
-});

packages/app/src/components/ui/press-highlight.browser.test.tsx

@@ -4,8 +4,6 @@ import { ArrowUp } from "lucide-react-native";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { afterEach, expect, it } from "vitest";
 import { PressHighlight } from "./press-highlight.native";
-import { PressHighlight as AndroidPressHighlight } from "./press-highlight.android";
-import { PressHighlight as WebPressHighlight } from "./press-highlight";
 import { FloatingActionButton } from "./floating-action-button";
 
 const rowStyle = { backgroundColor: "rgb(255, 255, 255)", borderRadius: 8 };
@@ -15,22 +13,6 @@ afterEach(cleanup);
 
 function onPress() {}
 
-function recordPresses() {
-  const calls: string[] = [];
-  return {
-    calls,
-    onPressIn: () => calls.push("in"),
-    onPressOut: () => calls.push("out"),
-  };
-}
-
-const borderedRowStyle = { ...rowStyle, borderWidth: 1, borderColor: "rgb(0, 0, 0)" };
-
-function recordHighlights() {
-  const calls: boolean[] = [];
-  return { calls, record: (highlighted: boolean) => calls.push(highlighted) };
-}
-
 it("keeps a floating action opaque while showing its held-press feedback", async () => {
   const { getByRole } = render(
     <FloatingActionButton icon={ArrowUp} accessibilityLabel="Jump to file" onPress={onPress} />,
@@ -49,147 +31,30 @@ it("keeps a floating action opaque while showing its held-press feedback", async
   await waitFor(() => expect(getComputedStyle(button).backgroundColor).toBe(restingFill));
 });
 
-it("paints the native row fill while pressed and keeps its existing corners", async () => {
-  const { getByTestId } = render(
+it("uses the pressable's pressed state for the native row fill and its existing corners", () => {
+  const { getByTestId, rerender } = render(
     <GestureHandlerRootView>
-      <PressHighlight testID="row" style={rowStyle} highlightStyle={highlightStyle} />
+      <PressHighlight
+        testID="row"
+        testOnly_pressed
+        style={rowStyle}
+        highlightStyle={highlightStyle}
+      />
     </GestureHandlerRootView>,
   );
-  const row = getByTestId("row");
 
-  fireEvent.mouseDown(row, { button: 0 });
-  await waitFor(() => expect(getComputedStyle(row).backgroundColor).toBe("rgb(20, 30, 40)"));
-  expect(getComputedStyle(row).borderRadius).toBe("8px");
+  expect(getComputedStyle(getByTestId("row")).backgroundColor).toBe("rgb(20, 30, 40)");
+  expect(getComputedStyle(getByTestId("row")).borderRadius).toBe("8px");
 
-  fireEvent.mouseUp(row, { button: 0 });
-  await waitFor(() => expect(getComputedStyle(row).backgroundColor).toBe("rgb(255, 255, 255)"));
-});
-
-it("paints the pressed fill on web and reports it, so a caller does not paint its own", async () => {
-  const highlights = recordHighlights();
-  const { getByTestId } = render(
-    <WebPressHighlight
-      testID="row"
-      style={rowStyle}
-      highlightStyle={highlightStyle}
-      onHighlightChange={highlights.record}
-      onPress={onPress}
-    />,
+  rerender(
+    <GestureHandlerRootView>
+      <PressHighlight
+        testID="row"
+        testOnly_pressed={false}
+        style={rowStyle}
+        highlightStyle={highlightStyle}
+      />
+    </GestureHandlerRootView>,
   );
-  const row = getByTestId("row");
-
-  fireEvent.mouseDown(row, { button: 0 });
-  await waitFor(() => expect(getComputedStyle(row).backgroundColor).toBe("rgb(20, 30, 40)"));
-  expect(highlights.calls).toEqual([true]);
-
-  fireEvent.mouseUp(row, { button: 0 });
-  await waitFor(() => expect(getComputedStyle(row).backgroundColor).toBe("rgb(255, 255, 255)"));
-  expect(highlights.calls).toEqual([true, false]);
-});
-
-it("leaves the Android row surface alone while pressed and clips the ripple to its corners", () => {
-  const highlights = recordHighlights();
-  const { getByTestId } = render(
-    <AndroidPressHighlight
-      testID="row"
-      testOnly_pressed
-      style={rowStyle}
-      highlightStyle={highlightStyle}
-      onHighlightChange={highlights.record}
-    />,
-  );
-  const row = getComputedStyle(getByTestId("row"));
-
-  expect(row.backgroundColor).toBe("rgb(255, 255, 255)");
-  expect(row.borderRadius).toBe("8px");
-  expect(row.overflow).toBe("hidden");
-  expect(highlights.calls).toEqual([]);
-});
-
-it("keeps the caller's border and press handlers on the Android ripple row", async () => {
-  const presses = recordPresses();
-  const { getByTestId } = render(
-    <AndroidPressHighlight
-      testID="row"
-      style={borderedRowStyle}
-      highlightStyle={highlightStyle}
-      onPressIn={presses.onPressIn}
-      onPressOut={presses.onPressOut}
-      onPress={onPress}
-    />,
-  );
-  const row = getByTestId("row");
-
-  expect(getComputedStyle(row).borderTopWidth).toBe("1px");
-  fireEvent.mouseDown(row, { button: 0 });
-  fireEvent.mouseUp(row, { button: 0 });
-  await waitFor(() => expect(presses.calls).toEqual(["in", "out"]));
-});
-
-it("paints and reports nothing on web without a pressed fill, such as a row being renamed", () => {
-  const highlights = recordHighlights();
-  const { getByTestId } = render(
-    <WebPressHighlight
-      testID="row"
-      style={rowStyle}
-      onHighlightChange={highlights.record}
-      onPress={onPress}
-    />,
-  );
-  const row = getByTestId("row");
-
-  fireEvent.mouseDown(row, { button: 0 });
-  expect(getComputedStyle(row).backgroundColor).toBe("rgb(255, 255, 255)");
-  fireEvent.mouseUp(row, { button: 0 });
-  expect(highlights.calls).toEqual([]);
-});
-
-const midPress = { ...recordPresses(), highlights: recordHighlights() };
-
-function PressedRow({ filled }: { filled: boolean }) {
-  return (
-    <WebPressHighlight
-      testID="row"
-      style={rowStyle}
-      highlightStyle={filled ? highlightStyle : undefined}
-      onHighlightChange={midPress.highlights.record}
-      onPressIn={midPress.onPressIn}
-      onPressOut={midPress.onPressOut}
-      onPress={onPress}
-    />
-  );
-}
-
-function resetMidPress() {
-  midPress.calls.length = 0;
-  midPress.highlights.calls.length = 0;
-}
-
-it("keeps a press's fill and report together when the fill appears mid-press", async () => {
-  resetMidPress();
-  const { getByTestId, rerender } = render(<PressedRow filled={false} />);
-  const row = getByTestId("row");
-
-  fireEvent.mouseDown(row, { button: 0 });
-  await waitFor(() => expect(midPress.calls).toEqual(["in"]));
-  rerender(<PressedRow filled />);
-  expect(getComputedStyle(row).backgroundColor).toBe("rgb(255, 255, 255)");
-  fireEvent.mouseUp(row, { button: 0 });
-  await waitFor(() => expect(midPress.calls).toEqual(["in", "out"]));
-  expect(midPress.highlights.calls).toEqual([]);
-});
-
-it("keeps a press's fill and report together when the fill goes away mid-press", async () => {
-  resetMidPress();
-  const { getByTestId, rerender } = render(<PressedRow filled />);
-  const row = getByTestId("row");
-
-  fireEvent.mouseDown(row, { button: 0 });
-  await waitFor(() => expect(midPress.calls).toEqual(["in"]));
-  rerender(<PressedRow filled={false} />);
-  expect(getComputedStyle(row).backgroundColor).toBe("rgb(20, 30, 40)");
-  fireEvent.mouseUp(row, { button: 0 });
-  await waitFor(() => expect(midPress.calls).toEqual(["in", "out"]));
-  expect(getComputedStyle(row).backgroundColor).toBe("rgb(255, 255, 255)");
-  expect(midPress.highlights.calls).toEqual([true, false]);
+  expect(getComputedStyle(getByTestId("row")).backgroundColor).toBe("rgb(255, 255, 255)");
 });

packages/app/src/components/ui/press-highlight.fill.ts

@@ -1,60 +0,0 @@
-import { useCallback, useRef, useState } from "react";
-import type {
-  GestureResponderEvent,
-  PressableStateCallbackType,
-  StyleProp,
-  ViewStyle,
-} from "react-native";
-import type { PressHighlightProps } from "./press-highlight.types";
-
-type PressFillProps = Pick<
-  PressHighlightProps,
-  "style" | "highlightStyle" | "onPressIn" | "onPressOut" | "onHighlightChange"
->;
-
-/**
- * Paints `highlightStyle` while pressed and reports it, for the platforms that show a fill. A press
- * keeps the fill it started with until it ends, so the paint and the report always agree, even when
- * the caller adds or removes `highlightStyle` mid-press.
- */
-export function usePressFill({
-  style,
-  highlightStyle,
-  onPressIn,
-  onPressOut,
-  onHighlightChange,
-}: PressFillProps) {
-  const [pressFill, setPressFill] = useState<StyleProp<ViewStyle> | null>(null);
-  // Pressable can call the press-out handler from the render that started the press.
-  const reportedRef = useRef(false);
-  const fillStyle = useCallback(
-    (state: PressableStateCallbackType) => [
-      typeof style === "function" ? style(state) : style,
-      pressFill,
-    ],
-    [style, pressFill],
-  );
-  const handlePressIn = useCallback(
-    (event: GestureResponderEvent) => {
-      if (highlightStyle != null) {
-        setPressFill(highlightStyle);
-        reportedRef.current = true;
-        onHighlightChange?.(true);
-      }
-      onPressIn?.(event);
-    },
-    [highlightStyle, onHighlightChange, onPressIn],
-  );
-  const handlePressOut = useCallback(
-    (event: GestureResponderEvent) => {
-      setPressFill(null);
-      if (reportedRef.current) {
-        reportedRef.current = false;
-        onHighlightChange?.(false);
-      }
-      onPressOut?.(event);
-    },
-    [onHighlightChange, onPressOut],
-  );
-  return { style: fillStyle, onPressIn: handlePressIn, onPressOut: handlePressOut };
-}

packages/app/src/components/ui/press-highlight.native.tsx

@@ -1,25 +1,21 @@
-import { forwardRef } from "react";
-import { Pressable, type View } from "react-native";
-import { usePressFill } from "./press-highlight.fill";
+import { forwardRef, useCallback } from "react";
+import { Pressable, type PressableStateCallbackType, type View } from "react-native";
 import type { PressHighlightProps } from "./press-highlight.types";
 
-// iOS. Android resolves `press-highlight.android.tsx`.
-
-// Feedback waits this long so a scroll that claims the touch first cancels it.
-const PRESS_DELAY_MS = 130;
-
 export const PressHighlight = forwardRef<View, PressHighlightProps>(function PressHighlight(
-  {
-    highlightStyle,
-    onHighlightChange,
-    style,
-    onPressIn,
-    onPressOut,
-    unstable_pressDelay = PRESS_DELAY_MS,
-    ...props
-  },
+  { highlightStyle, style, unstable_pressDelay = 130, ...props },
   ref,
 ) {
-  const fill = usePressFill({ style, highlightStyle, onPressIn, onPressOut, onHighlightChange });
-  return <Pressable {...props} {...fill} ref={ref} unstable_pressDelay={unstable_pressDelay} />;
+  // Give the scroll view time to claim a pan before Pressable activates its feedback.
+  const pressStyle = useCallback(
+    (state: PressableStateCallbackType) => [
+      typeof style === "function" ? style(state) : style,
+      state.pressed && highlightStyle,
+    ],
+    [style, highlightStyle],
+  );
+
+  return (
+    <Pressable {...props} ref={ref} unstable_pressDelay={unstable_pressDelay} style={pressStyle} />
+  );
 });

packages/app/src/components/ui/press-highlight.tsx

@@ -1,13 +1,11 @@
 import { forwardRef } from "react";
 import { Pressable } from "react-native";
 import type { View } from "react-native";
-import { usePressFill } from "./press-highlight.fill";
 import type { PressHighlightProps } from "./press-highlight.types";
 
 export const PressHighlight = forwardRef<View, PressHighlightProps>(function PressHighlight(
-  { highlightStyle, onHighlightChange, style, onPressIn, onPressOut, ...props },
+  { highlightStyle: _highlightStyle, ...props },
   ref,
 ) {
-  const fill = usePressFill({ style, highlightStyle, onPressIn, onPressOut, onHighlightChange });
-  return <Pressable ref={ref} {...props} {...fill} />;
+  return <Pressable ref={ref} {...props} />;
 });

packages/app/src/components/ui/press-highlight.types.ts

@@ -1,15 +1,6 @@
 import type { PressableProps, StyleProp, ViewStyle } from "react-native";
 
 export interface PressHighlightProps extends PressableProps {
-  /**
-   * The pressed fill. iOS and web paint it while the pressable is pressed; Android draws the
-   * platform ripple over the content instead. Callers do not paint their own pressed fill.
-   */
+  /** Native pressed style. Feedback and cancellation follow Pressable's press lifecycle. */
   highlightStyle?: StyleProp<ViewStyle>;
-  /**
-   * Reports when `highlightStyle` starts and stops painting, so content that knocks out of the
-   * surface (a badge ring, a text scrim) can match it. The Android ripple tints over the content,
-   * so it never reports a highlight.
-   */
-  onHighlightChange?: (highlighted: boolean) => void;
 }

packages/app/src/git/file-header.tsx

@@ -1,5 +1,10 @@
 import { memo, type ReactElement, useCallback, useMemo, useState } from "react";
-import { Text, View, type GestureResponderEvent } from "react-native";
+import {
+  Text,
+  View,
+  type GestureResponderEvent,
+  type PressableStateCallbackType,
+} from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { useWorkspaceFileDragSource } from "@/attachments/use-workspace-file-drag-source";
 import { DiffStat } from "@/components/diff-stat";
@@ -87,17 +92,18 @@ function useFileHeaderHover(enabled: boolean, onActiveChange?: (active: boolean)
   return { isHovered, handlePointerEnter, handlePointerLeave };
 }
 
-// Press feedback is the pressable's `highlightStyle`, so it is not part of the active fill.
 function fileHeaderIsActive(input: {
   isHovered: boolean;
+  pressed: boolean;
   showsBodyState: boolean;
   isSelected: boolean;
 }): boolean {
-  return input.isHovered || (!input.showsBodyState && input.isSelected);
+  return input.isHovered || input.pressed || (!input.showsBodyState && input.isSelected);
 }
 
 function fileHeaderInteractionStyle(input: {
   isHovered: boolean;
+  pressed: boolean;
   showsBodyState: boolean;
   isSelected: boolean;
 }) {
@@ -211,8 +217,8 @@ export const FileHeader = memo(function FileHeader({
       [file.path, onHeaderHeightChange],
     ),
   });
-  const pressableStyle = useMemo(
-    () => [
+  const pressableStyle = useCallback(
+    ({ pressed }: PressableStateCallbackType) => [
       styles.header,
       !showsBodyState && workspaceTreeRowStyles.row,
       showsBodyState && styles.documentHeader,
@@ -223,14 +229,18 @@ export const FileHeader = memo(function FileHeader({
         : null,
       fileHeaderInteractionStyle({
         isHovered: hover.isHovered,
+        pressed,
         showsBodyState,
         isSelected,
       }),
     ],
     [depth, hover.isHovered, isSelected, showsBodyState],
   );
-  const canvasPressableStyle = useMemo(
-    () => [pressableStyle, canvasRendered && styles.canvasInteraction],
+  const canvasPressableStyle = useCallback(
+    (state: PressableStateCallbackType) => [
+      pressableStyle(state),
+      canvasRendered && styles.canvasInteraction,
+    ],
     [canvasRendered, pressableStyle],
   );
   const accessibilityState = useMemo(
@@ -314,7 +324,7 @@ export const FileHeader = memo(function FileHeader({
   } else {
     trigger = (
       <View
-        style={[pressableStyle, canvasRendered && styles.canvasInteraction]}
+        style={[pressableStyle({ pressed: false }), canvasRendered && styles.canvasInteraction]}
         accessibilityLabel={accessibilityLabel}
       >
         {renderedContent}

packages/app/src/git/pull-request-panel/checks-section.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useMemo } from "react";
-import { Pressable, Text, View, type GestureResponderEvent } from "react-native";
+import { Pressable, ScrollView, Text, View, type GestureResponderEvent } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
 import { ChevronDown, ChevronRight, MessageSquarePlus } from "lucide-react-native";
@@ -18,6 +18,12 @@ import { useCheckGroupState } from "./check-group-state";
 const ThemedChevronDown = withUnistyles(ChevronDown);
 const ThemedChevronRight = withUnistyles(ChevronRight);
 
+/**
+ * Roughly eight rows. A repo with thirty checks would otherwise push the activity
+ * timeline off the pane entirely, so past this height the list scrolls in place.
+ */
+const LIST_MAX_HEIGHT = 268;
+
 /**
  * The three statuses the pane has always labelled for tests. Skipped has no id because
  * nothing asserts on it.
@@ -106,7 +112,11 @@ export function ChecksSection({
       </Pressable>
 
       {open && summary.groups.length > 0 ? (
-        <View style={styles.list}>
+        <ScrollView
+          style={styles.list}
+          contentContainerStyle={styles.listContent}
+          nestedScrollEnabled
+        >
           {summary.groups.map((group) => (
             <CheckGroup
               key={group.status}
@@ -118,7 +128,7 @@ export function ChecksSection({
               onAddLogsToChat={onAddLogsToChat}
             />
           ))}
-        </View>
+        </ScrollView>
       ) : null}
     </View>
   );
@@ -253,6 +263,9 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.foregroundMuted,
   },
   list: {
+    maxHeight: LIST_MAX_HEIGHT,
+  },
+  listContent: {
     paddingBottom: theme.spacing[2],
   },
   groupHeader: {

packages/app/src/git/pull-request-panel/pane.browser.test.tsx

@@ -1,231 +0,0 @@
-import React, { act } from "react";
-import { createRoot, type Root } from "react-dom/client";
-import { within } from "@testing-library/dom";
-import { SafeAreaInsetsContext } from "react-native-safe-area-context";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { i18n } from "@/i18n/i18next";
-import { ToastApiProvider } from "@/contexts/toast-context";
-import type { ToastApi } from "@/components/toast-host";
-import type { PrPaneCheck, PrPaneData } from "./data";
-import { PullRequestPane } from "./pane";
-
-Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
-
-// App sources compile against the classic JSX runtime, which expects React on the global.
-beforeEach(() => vi.stubGlobal("React", React));
-
-const PANE_HEIGHT = 600;
-
-const silentToasts: ToastApi = {
-  show: () => () => {},
-  copied: () => {},
-  error: () => {},
-};
-
-let root: Root | null = null;
-let container: HTMLDivElement | null = null;
-
-afterEach(() => {
-  act(() => root?.unmount());
-  container?.remove();
-  root = null;
-  container = null;
-});
-
-function successfulChecks(count: number): PrPaneCheck[] {
-  return Array.from({ length: count }, (_, index) => ({
-    provider: "github",
-    name: `check-${index + 1}`,
-    status: "success",
-    url: `https://example.test/checks/${index + 1}`,
-  }));
-}
-
-function pullRequest(checks: PrPaneCheck[]): PrPaneData {
-  return {
-    provider: { id: "github", label: "GitHub" },
-    forge: "github",
-    number: 42,
-    repoOwner: "acme",
-    repoName: "widgets",
-    title: "Ship the widget",
-    state: "open",
-    url: "https://example.test/pull/42",
-    reviewDecision: "pending",
-    awaitingReviewers: [],
-    checks,
-    activity: [],
-  };
-}
-
-/** A phone's home indicator: the pane clears it with bottom padding. */
-const HOME_INDICATOR_INSETS = { top: 0, right: 0, bottom: 34, left: 0 };
-
-const NO_INSETS = { top: 0, right: 0, bottom: 0, left: 0 };
-
-function renderPane(data: PrPaneData, insets = NO_INSETS) {
-  act(() =>
-    root?.render(
-      <SafeAreaInsetsContext.Provider value={insets}>
-        <ToastApiProvider api={silentToasts}>
-          <PullRequestPane serverId="server-1" cwd="/repo" data={data} activityLoading={false} />
-        </ToastApiProvider>
-      </SafeAreaInsetsContext.Provider>,
-    ),
-  );
-}
-
-function mountPane(data: PrPaneData, insets = NO_INSETS) {
-  container = document.createElement("div");
-  container.style.height = `${PANE_HEIGHT}px`;
-  container.style.width = "600px";
-  container.style.display = "flex";
-  container.style.flexDirection = "column";
-  document.body.appendChild(container);
-  root = createRoot(container);
-  renderPane(data, insets);
-  const pane = container.querySelector<HTMLElement>('[data-testid="pr-pane"]');
-  if (!pane) throw new Error("The pull request pane did not render");
-  return pane;
-}
-
-/** The pressable row holding the Activity title. */
-function activityHeader(pane: HTMLElement): HTMLElement {
-  const title = within(pane).getByText(i18n.t("workspace.git.pr.sections.activity"));
-  const header = title.closest<HTMLElement>("[tabindex]");
-  if (!header) throw new Error("The Activity title is not inside a pressable header");
-  return header;
-}
-
-function checksRegionBottom(pane: HTMLElement): number {
-  return within(pane).getByRole("separator").getBoundingClientRect().top;
-}
-
-/** Whether a user sees the element: no scroll container clips it out of view. */
-function isOnScreen(element: HTMLElement): boolean {
-  const rect = element.getBoundingClientRect();
-  const hit = document.elementFromPoint(rect.left + 8, rect.top + rect.height / 2);
-  return hit !== null && element.contains(hit);
-}
-
-/** React Native Web reports layout from a ResizeObserver, a frame or two after mounting. */
-async function settleLayout() {
-  for (let frame = 0; frame < 2; frame++) {
-    await act(() => new Promise<void>((resolve) => requestAnimationFrame(() => resolve())));
-  }
-}
-
-/** Drags the separator through each offset from where it starts, releasing at the last one. */
-function dragSeparator(pane: HTMLElement, ...deltasY: number[]) {
-  const separator = within(pane).getByRole("separator");
-  const rect = separator.getBoundingClientRect();
-  const x = rect.left + rect.width / 2;
-  const startY = rect.top + rect.height / 2;
-  const pointer = { pointerId: 1, bubbles: true, cancelable: true, clientX: x, button: 0 };
-  act(() => {
-    separator.dispatchEvent(new PointerEvent("pointerdown", { ...pointer, clientY: startY }));
-  });
-  for (const deltaY of deltasY) {
-    act(() => {
-      window.dispatchEvent(
-        new PointerEvent("pointermove", { ...pointer, clientY: startY + deltaY }),
-      );
-    });
-  }
-  const endY = startY + (deltasY.at(-1) ?? 0);
-  act(() => {
-    window.dispatchEvent(new PointerEvent("pointerup", { ...pointer, clientY: endY }));
-  });
-}
-
-describe("pull request pane layout", () => {
-  it("docks a collapsed Activity section to the bottom and gives the checks the pane", async () => {
-    const pane = mountPane(pullRequest(successfulChecks(10)));
-
-    act(() => activityHeader(pane).click());
-
-    await expect
-      .poll(() => Math.round(activityHeader(pane).getBoundingClientRect().bottom))
-      .toBe(Math.round(pane.getBoundingClientRect().bottom));
-    const rows = within(pane).getAllByTestId("pr-pane-check-row");
-    expect(rows).toHaveLength(10);
-    expect(rows.every(isOnScreen)).toBe(true);
-  });
-
-  it("keeps keyboard focus on the Activity header while it collapses and expands", () => {
-    const pane = mountPane(pullRequest(successfulChecks(3)));
-    const header = activityHeader(pane);
-    act(() => header.focus());
-
-    act(() => header.click());
-    expect(document.activeElement).toBe(header);
-    act(() => header.click());
-    expect(document.activeElement).toBe(header);
-  });
-
-  it("exposes whether Activity is expanded to assistive technology", () => {
-    const pane = mountPane(pullRequest(successfulChecks(3)));
-    expect(activityHeader(pane).getAttribute("aria-expanded")).toBe("true");
-
-    act(() => activityHeader(pane).click());
-
-    expect(activityHeader(pane).getAttribute("aria-expanded")).toBe("false");
-  });
-
-  it("keeps the Activity header inside the pane when a dragged pane gets short", async () => {
-    const pane = mountPane(pullRequest(successfulChecks(30)));
-    await settleLayout();
-    dragSeparator(pane, PANE_HEIGHT);
-    await settleLayout();
-
-    act(() => {
-      if (container) container.style.height = "160px";
-    });
-    await settleLayout();
-
-    await expect
-      .poll(() => activityHeader(pane).getBoundingClientRect().bottom)
-      .toBeLessThanOrEqual(pane.getBoundingClientRect().bottom);
-    expect(isOnScreen(activityHeader(pane))).toBe(true);
-  });
-
-  it.each([
-    ["5px down", [5]],
-    ["400px down", [400]],
-    ["up past their end and back down", [-20, 100]],
-  ])("gives the checks their earlier share when they grow after a drag %s", async (_name, path) => {
-    const pane = mountPane(pullRequest(successfulChecks(2)));
-    await settleLayout();
-    const drawn = checksRegionBottom(pane);
-
-    dragSeparator(pane, ...path);
-    await settleLayout();
-    expect(checksRegionBottom(pane)).toBeCloseTo(drawn, 0);
-
-    renderPane(pullRequest(successfulChecks(30)));
-    await settleLayout();
-    const overview = within(pane).getByTestId("pr-pane-overview");
-    expect(overview.getBoundingClientRect().height).toBeCloseTo(PANE_HEIGHT / 2, 0);
-  });
-
-  it("resizes the checks against Activity by dragging the separator between them", async () => {
-    const pane = mountPane(pullRequest(successfulChecks(30)));
-    await settleLayout();
-    const before = checksRegionBottom(pane);
-
-    dragSeparator(pane, 120);
-
-    await expect.poll(() => Math.round(checksRegionBottom(pane) - before)).toBe(120);
-    expect(activityHeader(pane).getBoundingClientRect().top).toBeGreaterThan(before + 100);
-  });
-
-  it("keeps the separator under the pointer when the pane clears a bottom inset", async () => {
-    const pane = mountPane(pullRequest(successfulChecks(30)), HOME_INDICATOR_INSETS);
-    await settleLayout();
-    const before = checksRegionBottom(pane);
-
-    dragSeparator(pane, 120);
-
-    await expect.poll(() => Math.round(checksRegionBottom(pane) - before)).toBe(120);
-  });
-});

packages/app/src/git/pull-request-panel/pane.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useMemo, useState } from "react";
-import { Image, Pressable, Text, View, type ViewStyle } from "react-native";
+import { Image, Pressable, ScrollView, Text, View, type ViewStyle } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import {
   CircleCheck,
@@ -74,14 +74,13 @@ import {
   type PrTimelineEntry,
 } from "./timeline";
 import {
-  SectionHeader,
+  Section,
   SummaryPill,
   dangerColorMapping,
   foregroundMutedColorMapping,
   sectionKitStyles,
   successColorMapping,
 } from "./section-kit";
-import { PullRequestPaneSplit } from "./split";
 
 const ThemedCircleCheck = withUnistyles(CircleCheck);
 const ThemedCircleX = withUnistyles(CircleX);
@@ -479,8 +478,8 @@ export function PullRequestPane({
     : null;
 
   return (
-    <PullRequestPaneSplit activityOpen={activityOpen}>
-      <>
+    <View style={styles.root} testID="pr-pane">
+      <ScrollView style={styles.scroll} showsVerticalScrollIndicator={false}>
         <PaneContentToolbar style={styles.toolbar} testID="pr-pane-toolbar">
           <View style={styles.toolbarActions}>
             <Button
@@ -500,9 +499,7 @@ export function PullRequestPane({
               accessibilityLabel={
                 isRefreshing
                   ? t("workspace.git.diff.refreshing")
-                  : t("workspace.git.diff.refreshState", {
-                      brand: forgePresentation.brandLabel,
-                    })
+                  : t("workspace.git.diff.refreshState", { brand: forgePresentation.brandLabel })
               }
               testID="pr-pane-refresh"
               style={toolbarRefreshButtonStyle}
@@ -567,58 +564,60 @@ export function PullRequestPane({
             onAddLogsToChat={handleAddCheckLogsToChat}
           />
         )}
-      </>
-      <SectionHeader
-        title={t("workspace.git.pr.sections.activity")}
-        open={activityOpen}
-        onToggle={handleToggleActivity}
-        summary={
-          <>
-            <SummaryPill count={approvals} icon={SUMMARY_APPROVAL_ICON} variant="success" />
-            <SummaryPill
-              count={changesRequested}
-              icon={SUMMARY_CHANGES_REQUESTED_ICON}
-              variant="danger"
-            />
-            <SummaryPill count={commentCount} icon={SUMMARY_COMMENT_ICON} variant="muted" />
-          </>
-        }
-      />
-      <View style={sectionKitStyles.sectionBody}>
-        {timelineEntries.length > 0 && attachEnabled && visibleEntries.length > 0 ? (
-          <View style={styles.activityToolbar}>
-            <Button
-              variant="ghost"
-              size="sm"
-              leftIcon={MessageSquarePlus}
-              onPress={handleAddAllToChat}
-              disabled={activityLoading}
-            >
-              {t("workspace.git.pr.actions.addAllToChat")}
-            </Button>
-          </View>
-        ) : null}
-        {activityLoading ? <PrActivitySkeleton /> : null}
-        {!activityLoading && visibleEntries.length === 0 ? (
-          <Text style={sectionKitStyles.emptyText}>{t("workspace.git.pr.empty.noActivity")}</Text>
-        ) : null}
-        {!activityLoading
-          ? visibleEntries.map(({ entry, collapsed }) => (
-              <TimelineEntryCard
-                key={entry.id}
-                entry={entry}
-                collapsed={collapsed}
-                collapsedEntryIds={collapsedEntryIds}
-                attachEnabled={attachEnabled}
-                brandLabel={forgePresentation.brandLabel}
-                onAddToChat={handleAddActivityToChat}
-                onAddThreadToChat={handleAddThreadToChat}
-                onToggleCollapsed={handleToggleEntryCollapsed}
+
+        <View style={styles.divider} />
+
+        <Section
+          title={t("workspace.git.pr.sections.activity")}
+          open={activityOpen}
+          onToggle={handleToggleActivity}
+          summary={
+            <>
+              <SummaryPill count={approvals} icon={SUMMARY_APPROVAL_ICON} variant="success" />
+              <SummaryPill
+                count={changesRequested}
+                icon={SUMMARY_CHANGES_REQUESTED_ICON}
+                variant="danger"
               />
-            ))
-          : null}
-      </View>
-    </PullRequestPaneSplit>
+              <SummaryPill count={commentCount} icon={SUMMARY_COMMENT_ICON} variant="muted" />
+            </>
+          }
+        >
+          {timelineEntries.length > 0 && attachEnabled && visibleEntries.length > 0 ? (
+            <View style={styles.activityToolbar}>
+              <Button
+                variant="ghost"
+                size="sm"
+                leftIcon={MessageSquarePlus}
+                onPress={handleAddAllToChat}
+                disabled={activityLoading}
+              >
+                {t("workspace.git.pr.actions.addAllToChat")}
+              </Button>
+            </View>
+          ) : null}
+          {activityLoading ? <PrActivitySkeleton /> : null}
+          {!activityLoading && visibleEntries.length === 0 ? (
+            <Text style={sectionKitStyles.emptyText}>{t("workspace.git.pr.empty.noActivity")}</Text>
+          ) : null}
+          {!activityLoading
+            ? visibleEntries.map(({ entry, collapsed }) => (
+                <TimelineEntryCard
+                  key={entry.id}
+                  entry={entry}
+                  collapsed={collapsed}
+                  collapsedEntryIds={collapsedEntryIds}
+                  attachEnabled={attachEnabled}
+                  brandLabel={forgePresentation.brandLabel}
+                  onAddToChat={handleAddActivityToChat}
+                  onAddThreadToChat={handleAddThreadToChat}
+                  onToggleCollapsed={handleToggleEntryCollapsed}
+                />
+              ))
+            : null}
+        </Section>
+      </ScrollView>
+    </View>
   );
 }
 
@@ -1193,6 +1192,15 @@ function ThreadComment({
 }
 
 const styles = StyleSheet.create((theme) => ({
+  root: {
+    flex: 1,
+    minHeight: 0,
+    backgroundColor: theme.colors.surfaceSidebar,
+  },
+  scroll: {
+    flex: 1,
+    minHeight: 0,
+  },
   invisible: {
     opacity: 0,
   },
@@ -1253,6 +1261,10 @@ const styles = StyleSheet.create((theme) => ({
     marginLeft: theme.spacing[1],
     opacity: 0,
   },
+  divider: {
+    height: 1,
+    backgroundColor: theme.colors.border,
+  },
   toolbar: {
     flexDirection: "row",
     alignItems: "center",

packages/app/src/git/pull-request-panel/section-kit.tsx

@@ -1,9 +1,8 @@
-import React, { useMemo, type ReactNode } from "react";
+import React, { type ReactNode } from "react";
 import { Pressable, Text, View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import type { CountedCheckPresentation } from "@/git/check-presentation";
 import { CONTROL_HEIGHTS, mapLayout } from "@/components/ui/control-geometry";
-import { isWeb } from "@/constants/platform";
 import {
   CheckPresentationIcon,
   getCheckPresentationTone,
@@ -22,57 +21,39 @@ export const successColorMapping = (theme: Theme) => ({ color: theme.colors.stat
 export const dangerColorMapping = (theme: Theme) => ({ color: theme.colors.statusDanger });
 export const warningColorMapping = (theme: Theme) => ({ color: theme.colors.statusWarning });
 
-interface SectionHeaderProps {
+interface SectionProps {
   title: string;
   open: boolean;
   onToggle: () => void;
   summary: ReactNode;
+  children: ReactNode;
   accessibilityLabel?: string;
 }
 
-interface SectionProps extends SectionHeaderProps {
-  children: ReactNode;
-}
-
-/** The disclosure row of a section, for layouts that place the section's body themselves. */
-export function SectionHeader({
+export function Section({
   title,
   open,
   onToggle,
   summary,
+  children,
   accessibilityLabel,
-}: SectionHeaderProps) {
-  const accessibilityState = useMemo(() => ({ expanded: open }), [open]);
-  // React Native Web does not map `accessibilityState.expanded` to `aria-expanded`.
-  const webExpandedProps = useMemo(
-    () => (isWeb ? ({ "aria-expanded": open } as const) : null),
-    [open],
-  );
-  return (
-    <Pressable
-      accessibilityRole="button"
-      accessibilityLabel={accessibilityLabel ?? title}
-      accessibilityState={accessibilityState}
-      {...webExpandedProps}
-      style={sectionKitStyles.sectionHeader}
-      onPress={onToggle}
-    >
-      {open ? (
-        <ThemedChevronDown size={14} uniProps={foregroundMutedColorMapping} />
-      ) : (
-        <ThemedChevronRight size={14} uniProps={foregroundMutedColorMapping} />
-      )}
-      <Text style={sectionKitStyles.sectionTitle}>{title}</Text>
-      <View style={sectionKitStyles.summaryWrap}>{summary}</View>
-    </Pressable>
-  );
-}
-
-export function Section({ children, ...header }: SectionProps) {
+}: SectionProps) {
   return (
     <View>
-      <SectionHeader {...header} />
-      {header.open ? <View style={sectionKitStyles.sectionBody}>{children}</View> : null}
+      <Pressable
+        accessibilityLabel={accessibilityLabel}
+        style={sectionKitStyles.sectionHeader}
+        onPress={onToggle}
+      >
+        {open ? (
+          <ThemedChevronDown size={14} uniProps={foregroundMutedColorMapping} />
+        ) : (
+          <ThemedChevronRight size={14} uniProps={foregroundMutedColorMapping} />
+        )}
+        <Text style={sectionKitStyles.sectionTitle}>{title}</Text>
+        <View style={sectionKitStyles.summaryWrap}>{summary}</View>
+      </Pressable>
+      {open ? <View style={sectionKitStyles.sectionBody}>{children}</View> : null}
     </View>
   );
 }

packages/app/src/git/pull-request-panel/split.tsx

@@ -1,162 +0,0 @@
-import { Children, useCallback, useMemo, useState, type ReactNode } from "react";
-import { ScrollView, View, type LayoutChangeEvent } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { ResizeHandle } from "@/components/resize-handle";
-
-/** Most of the pane the overview may take before it scrolls, until the user drags the separator. */
-const DEFAULT_OVERVIEW_SHARE = 0.5;
-const SPLIT_GROUP_ID = "pr-pane";
-
-interface PullRequestPaneSplitProps {
-  /**
-   * Exactly three children, in order:
-   * 1. the overview (the PR's header and checks), which scrolls in its own region;
-   * 2. the Activity disclosure row, docked to the bottom of the pane while collapsed;
-   * 3. the Activity timeline, filling the space below the separator while open.
-   *
-   * Slots are children because `react-perf/jsx-no-jsx-as-prop` rejects JSX in a prop. Pass all
-   * three unconditionally, the way `TreeRail` takes its slots.
-   */
-  children: ReactNode;
-  activityOpen: boolean;
-}
-
-/**
- * Lays the pane out the way stacked sidebar sections behave: the overview and Activity share the
- * height, a separator between them resizes the share, and a collapsed Activity gives its space
- * back by docking its header to the bottom.
- */
-export function PullRequestPaneSplit({ children, activityOpen }: PullRequestPaneSplitProps) {
-  const [overview, activityHeader, activityTimeline] = Children.toArray(children);
-  const insets = useSafeAreaInsets();
-  const [overviewShare, setOverviewShare] = useState(DEFAULT_OVERVIEW_SHARE);
-  // The pointer's share while a drag is in progress. The saved share is decided once, when the
-  // drag ends, so moves along the way cannot overwrite the share the overview had before it.
-  const [dragShare, setDragShare] = useState<number | null>(null);
-  const [splitHeight, setSplitHeight] = useState(0);
-  const [overviewHeight, setOverviewHeight] = useState(0);
-  const [overviewContentHeight, setOverviewContentHeight] = useState(0);
-
-  const handleSplitLayout = useCallback((event: LayoutChangeEvent) => {
-    setSplitHeight(event.nativeEvent.layout.height);
-  }, []);
-  const handleOverviewLayout = useCallback((event: LayoutChangeEvent) => {
-    setOverviewHeight(event.nativeEvent.layout.height);
-  }, []);
-  const handleOverviewContentSizeChange = useCallback((_width: number, height: number) => {
-    setOverviewContentHeight(height);
-  }, []);
-  const handlePreviewResize = useCallback((_groupId: string, sizes: number[]) => {
-    const [share] = sizes;
-    if (share !== undefined) setDragShare(share);
-  }, []);
-  const handleResize = useCallback(
-    (_groupId: string, sizes: number[]) => {
-      setDragShare(null);
-      const [share] = sizes;
-      if (share === undefined || splitHeight <= 0) return;
-      const contentShare = overviewContentHeight / splitHeight;
-      setOverviewShare((current) => resolveDraggedShare(share, current, contentShare));
-    },
-    [overviewContentHeight, splitHeight],
-  );
-
-  // The overview stops at its content height, so a drag starts from where the separator is
-  // drawn rather than from the share the overview may grow to.
-  const separatorSizes = useMemo(() => {
-    const share = splitHeight > 0 ? overviewHeight / splitHeight : DEFAULT_OVERVIEW_SHARE;
-    return [share, 1 - share];
-  }, [overviewHeight, splitHeight]);
-  // The Activity header docks to the bottom edge, so it clears the home indicator the way the
-  // Changes pane's docked Commits section does. The split is measured inside that padding: the
-  // overview's percentage height resolves against this box, so the drag must use the same one.
-  const rootStyle = useMemo(() => [styles.root, { paddingBottom: insets.bottom }], [insets.bottom]);
-  const drawnShare = dragShare ?? overviewShare;
-  const overviewStyle = useMemo(
-    () =>
-      activityOpen
-        ? [styles.overviewShared, { maxHeight: `${drawnShare * 100}%` as const }]
-        : styles.overviewFill,
-    [activityOpen, drawnShare],
-  );
-
-  return (
-    <View style={rootStyle} testID="pr-pane">
-      <View style={styles.split} onLayout={handleSplitLayout}>
-        <ScrollView
-          style={overviewStyle}
-          onLayout={handleOverviewLayout}
-          onContentSizeChange={handleOverviewContentSizeChange}
-          showsVerticalScrollIndicator={false}
-          testID="pr-pane-overview"
-        >
-          {overview}
-        </ScrollView>
-        {activityOpen ? (
-          <ResizeHandle
-            testID="pr-pane-split-handle"
-            direction="vertical"
-            groupId={SPLIT_GROUP_ID}
-            index={0}
-            sizes={separatorSizes}
-            containerSize={splitHeight}
-            onPreviewResizeSplit={handlePreviewResize}
-            onResizeSplit={handleResize}
-          />
-        ) : (
-          <View style={styles.divider} />
-        )}
-        {/* The header keeps one slot in both states, so toggling it does not remount the row
-            and drop keyboard focus. Only the timeline mounts and unmounts. */}
-        {activityHeader}
-        {activityOpen ? (
-          <ScrollView style={styles.activityScroll} showsVerticalScrollIndicator={false}>
-            {activityTimeline}
-          </ScrollView>
-        ) : null}
-      </View>
-    </View>
-  );
-}
-
-/**
- * The share a drag leaves the overview. Short content stops the separator at the content's
- * bottom, so a drag that ends there or below saves what was drawn and keeps any larger share
- * the overview already had. The separator then neither jumps to the pointer nor stays pinned
- * at the old content height when the content grows.
- */
-function resolveDraggedShare(pointerShare: number, currentShare: number, contentShare: number) {
-  if (pointerShare < contentShare) return pointerShare;
-  return Math.max(currentShare, contentShare);
-}
-
-const styles = StyleSheet.create((theme) => ({
-  root: {
-    flex: 1,
-    minHeight: 0,
-    backgroundColor: theme.colors.surfaceSidebar,
-  },
-  split: {
-    flex: 1,
-    minHeight: 0,
-  },
-  overviewShared: {
-    flexGrow: 0,
-    flexShrink: 1,
-    minHeight: 0,
-  },
-  overviewFill: {
-    flex: 1,
-    minHeight: 0,
-  },
-  // Same 1px line the separator draws, so collapsing Activity does not move the boundary's look.
-  divider: {
-    height: 1,
-    backgroundColor: theme.colors.border,
-  },
-  activityScroll: {
-    flex: 1,
-    minHeight: 0,
-  },
-}));

packages/app/src/git/use-actions.tsx

@@ -291,13 +291,21 @@ function useWorkspaceScreenArchiveController({
     serverId,
     workspaceId: workspaceDescriptor?.id ?? "",
     workspaceKind: workspaceDescriptor?.workspaceKind ?? "directory",
-    workspaceDirectory: workspaceDescriptor?.workspaceDirectory ?? "",
     name: workspaceDescriptor?.name ?? branchLabel,
+    isDirty: archiveRisk.isDirty,
+    aheadOfOrigin: archiveRisk.aheadOfOrigin,
     diffStat: workspaceDescriptor?.diffStat ?? null,
     warningLabels: getWorktreeArchiveWarningLabels(t),
     onSetHiding: setIsHidingWorkspace,
-    onArchiveStarted: (archived) => {
-      redirectIfArchivingActiveWorkspace({ ...archived, activeWorkspaceSelection });
+    onArchiveStarted: () => {
+      if (!activeWorkspaceSelection) {
+        return;
+      }
+      redirectIfArchivingActiveWorkspace({
+        serverId,
+        workspaceId: activeWorkspaceSelection.workspaceId,
+        activeWorkspaceSelection,
+      });
     },
   });
 

packages/app/src/git/worktree-archive-warning.test.ts

@@ -1,87 +1,11 @@
 import { describe, expect, it } from "vitest";
 
-import type { CheckoutStatusClient, CheckoutStatusPayload } from "@/git/checkout-status-cache";
 import {
   buildWorktreeArchiveConfirmationMessage,
   buildWorktreeArchiveRiskReasons,
-  readWorktreeArchiveRisk,
   toWorktreeArchiveRisk,
 } from "@/git/worktree-archive-warning";
 
-const WORKTREE = "/home/me/.paseo/worktrees/repo/feature";
-
-function hostAnswering(status: CheckoutStatusPayload): CheckoutStatusClient & { asked: string[] } {
-  const asked: string[] = [];
-  return {
-    asked,
-    getCheckoutStatus: async (cwd) => {
-      asked.push(cwd);
-      return status;
-    },
-  };
-}
-
-const NOT_GIT = {
-  cwd: WORKTREE,
-  requestId: "status",
-  isGit: false,
-  isPaseoOwnedWorktree: false,
-  repoRoot: null,
-  currentBranch: null,
-  isDirty: null,
-  baseRef: null,
-  aheadBehind: null,
-  aheadOfOrigin: null,
-  behindOfOrigin: null,
-  hasRemote: false,
-  remoteUrl: null,
-  error: null,
-} satisfies CheckoutStatusPayload;
-
-describe("reading a worktree's archive risk from its host", () => {
-  it("reads uncommitted changes and unpushed commits from the worktree's checkout status", async () => {
-    const host = hostAnswering({
-      cwd: WORKTREE,
-      requestId: "status",
-      isGit: true,
-      isPaseoOwnedWorktree: true,
-      repoRoot: WORKTREE,
-      mainRepoRoot: "/home/me/repo",
-      currentBranch: "feature",
-      isDirty: true,
-      baseRef: "main",
-      aheadBehind: { ahead: 2, behind: 0 },
-      aheadOfOrigin: 2,
-      behindOfOrigin: 0,
-      hasRemote: true,
-      remoteUrl: "git@example.com:me/repo.git",
-      error: null,
-    });
-
-    expect(await readWorktreeArchiveRisk(host, WORKTREE)).toEqual({
-      isDirty: true,
-      aheadOfOrigin: 2,
-    });
-    expect(host.asked).toEqual([WORKTREE]);
-  });
-
-  it("finds nothing to lose in a directory that is no longer a git checkout", async () => {
-    expect(await readWorktreeArchiveRisk(hostAnswering(NOT_GIT), WORKTREE)).toEqual({
-      isDirty: false,
-      aheadOfOrigin: null,
-    });
-  });
-
-  it("rejects with the host's error when it can't read the worktree", async () => {
-    const host = hostAnswering({
-      ...NOT_GIT,
-      error: { code: "UNKNOWN", message: "git status failed" },
-    });
-
-    await expect(readWorktreeArchiveRisk(host, WORKTREE)).rejects.toThrow("git status failed");
-  });
-});
-
 describe("workspace archive warning for worktree backing", () => {
   it("does not require a confirmation for clean and pushed worktrees", () => {
     expect(

packages/app/src/git/worktree-archive-warning.ts

@@ -1,4 +1,3 @@
-import type { CheckoutStatusClient } from "@/git/checkout-status-cache";
 import { confirmDialog } from "@/utils/confirm-dialog";
 import { i18n } from "@/i18n/i18next";
 
@@ -50,21 +49,6 @@ export const DEFAULT_WORKTREE_ARCHIVE_WARNING_LABELS: WorktreeArchiveWarningLabe
       : i18n.t("workspace.git.actions.archiveWarning.unpushedCommits", { count }),
 };
 
-/**
- * Reads the worktree's uncommitted changes and unpushed commits from its host. A directory the
- * host no longer reads as a git checkout has neither. Rejects when the host can't read it.
- */
-export async function readWorktreeArchiveRisk(
-  client: CheckoutStatusClient,
-  workspaceDirectory: string,
-): Promise<Pick<WorktreeArchiveRisk, "isDirty" | "aheadOfOrigin">> {
-  const status = await client.getCheckoutStatus(workspaceDirectory);
-  if (status.error) {
-    throw new Error(status.error.message);
-  }
-  return { isDirty: status.isDirty ?? false, aheadOfOrigin: status.aheadOfOrigin };
-}
-
 export function toWorktreeArchiveRisk(input: WorktreeArchiveRiskInput): WorktreeArchiveRisk {
   return {
     isDirty: input.archiveHasUncommittedChanges,

packages/app/src/hooks/use-agent-history.ts

@@ -3,9 +3,10 @@ import type {
   FetchAgentHistoryOptions,
   FetchAgentHistoryPageInfo,
 } from "@getpaseo/client/internal/daemon-client";
-import { useInfiniteQuery } from "@tanstack/react-query";
+import { keepPreviousData, useInfiniteQuery } from "@tanstack/react-query";
 import { useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
+import { useShallow } from "zustand/shallow";
 import type { AggregatedAgent } from "@/hooks/use-aggregated-agents";
 import {
   getHostRuntimeStore,
@@ -34,6 +35,8 @@ export interface AgentHistoryResult {
   isSearchSupported: boolean;
   /** More sessions matched than the ranked page holds. Narrow the query. */
   isSearchTruncated: boolean;
+  /** The agents answer the previous query; the current one is loading (`keepPreviousResults`). */
+  isPreviousResults: boolean;
   /** Hosts that failed while others succeeded. The list still renders. */
   hostErrors: AgentHistoryHostError[];
   refreshAll: () => Promise<void>;
@@ -222,6 +225,13 @@ export function useAgentHistory(options: {
   serverId?: string | null;
   enabled?: boolean;
   search?: string;
+  /**
+   * Leave out hosts that predate search, instead of searching no host. For a surface that adds
+   * history matches to other results, where a missing host is not a claim of "no matches".
+   */
+  searchableHostsOnly?: boolean;
+  /** Keep the previous query's results until the next query's arrive. */
+  keepPreviousResults?: boolean;
 }): AgentHistoryResult {
   const { t } = useTranslation();
   const daemons = useHosts();
@@ -231,10 +241,18 @@ export function useAgentHistory(options: {
     return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
   }, [options.serverId]);
   const enabled = options.enabled ?? true;
-  const serverIds = useMemo(
+  const requestedServerIds = useMemo(
     () => (serverId ? [serverId] : daemons.map((daemon) => daemon.serverId)),
     [daemons, serverId],
   );
+  const searchableServerIds = useSessionStore(
+    useShallow((state) =>
+      requestedServerIds.filter(
+        (id) => state.sessions[id]?.serverInfo?.features?.agentHistorySearch === true,
+      ),
+    ),
+  );
+  const serverIds = options.searchableHostsOnly ? searchableServerIds : requestedServerIds;
   const connectionStatuses = useHostRuntimeConnectionStatuses(serverIds);
   // A host the user asked about splits two ways: one this fetch can reach, and
   // one whose sessions will be missing from the answer. Both come out of here,
@@ -287,6 +305,7 @@ export function useAgentHistory(options: {
     [daemons],
   );
 
+  const queryEnabled = Boolean(enabled && targetHosts.length > 0);
   const historyQuery = useInfiniteQuery<
     AgentHistoryBatchPage,
     Error,
@@ -295,8 +314,11 @@ export function useAgentHistory(options: {
     AgentHistoryCursorByServerId | null
   >({
     queryKey,
-    enabled: Boolean(enabled && targetHosts.length > 0),
+    enabled: queryEnabled,
     staleTime: 30_000,
+    // Previous results stand in only until the next query's arrive. With no host to search,
+    // nothing will arrive, so they would stand in, and read as still loading, indefinitely.
+    ...(options.keepPreviousResults && queryEnabled ? { placeholderData: keepPreviousData } : {}),
     initialPageParam: null,
     getNextPageParam: getNextAgentHistoryPageParam,
     queryFn: async ({ pageParam }) => {
@@ -318,6 +340,7 @@ export function useAgentHistory(options: {
     isFetching,
     isFetchingNextPage,
     isLoading,
+    isPlaceholderData,
     refetch,
   } = historyQuery;
 
@@ -363,6 +386,7 @@ export function useAgentHistory(options: {
     isLoadingMore: isFetchingNextPage,
     isSearchSupported,
     isSearchTruncated,
+    isPreviousResults: isPlaceholderData,
     hostErrors,
     refreshAll,
     loadMore,

packages/app/src/i18n/resources.test.ts

@@ -319,15 +319,15 @@ describe("translation resources", () => {
     expect(en.shell.menu.toggleSidebar).toBe("Toggle sidebar");
     expect(en.shell.menu.open).toBe("Open menu");
     expect(en.shell.menu.close).toBe("Close menu");
-    expect(en.shell.commandCenter.placeholder).toBe(
-      "Search commands, files, workspaces, and agents...",
-    );
+    expect(en.shell.commandCenter.placeholder).toBe("Search workspaces, files, and actions...");
+    expect(en.shell.commandCenter.placeholderWithoutFiles).toBe("Search workspaces and actions...");
     expect(en.shell.commandCenter.filePlaceholder).toBe("Search files...");
     expect(en.shell.commandCenter.files).toBe("Files");
     expect(en.shell.commandCenter.noMatches).toBe("No matches");
     expect(en.shell.commandCenter.actions).toBe("Actions");
     expect(en.shell.commandCenter.workspaces).toBe("Workspaces");
-    expect(en.shell.commandCenter.agents).toBe("Agents");
+    expect(en.shell.commandCenter.recentWorkspaces).toBe("Recent workspaces");
+    expect(en.shell.commandCenter.tabs.all).toBe("All");
     expect(en.shell.commandCenter.newAgent).toBe("New agent");
     expect(en.shell.commandCenter.addProject).toBe("Add project");
     expect(en.shell.commandCenter.home).toBe("Home");

packages/app/src/i18n/resources/ar.ts

@@ -90,14 +90,23 @@ export const ar: TranslationResources = {
       close: "إغلاق القائمة",
     },
     commandCenter: {
-      placeholder: "ابحث في الأوامر والملفات ومساحات العمل والوكلاء...",
+      placeholder: "البحث في مساحات العمل والملفات والإجراءات...",
+      placeholderWithoutFiles: "البحث في مساحات العمل والإجراءات...",
       filePlaceholder: "البحث في الملفات...",
+      workspacePlaceholder: "البحث في مساحات العمل...",
+      actionPlaceholder: "البحث في الإجراءات...",
       searchingFiles: "جارٍ البحث في الملفات...",
       noMatches: "لا توجد مباريات",
       actions: "الإجراءات",
       files: "الملفات",
       workspaces: "مساحات العمل",
-      agents: "الوكلاء",
+      recentWorkspaces: "مساحات العمل الأخيرة",
+      tabs: {
+        all: "الكل",
+        workspaces: "مساحات العمل",
+        files: "الملفات",
+        actions: "الإجراءات",
+      },
       newAgent: "وكيل جديد",
       open: "فتح {{name}}",
       openInSidePane: "فتح {{name}} في اللوحة الجانبية",

packages/app/src/i18n/resources/en.ts

@@ -86,14 +86,23 @@ export const en = {
       close: "Close menu",
     },
     commandCenter: {
-      placeholder: "Search commands, files, workspaces, and agents...",
+      placeholder: "Search workspaces, files, and actions...",
+      placeholderWithoutFiles: "Search workspaces and actions...",
       filePlaceholder: "Search files...",
+      workspacePlaceholder: "Search workspaces...",
+      actionPlaceholder: "Search actions...",
       searchingFiles: "Searching files...",
       noMatches: "No matches",
       actions: "Actions",
       files: "Files",
       workspaces: "Workspaces",
-      agents: "Agents",
+      recentWorkspaces: "Recent workspaces",
+      tabs: {
+        all: "All",
+        workspaces: "Workspaces",
+        files: "Files",
+        actions: "Actions",
+      },
       newAgent: "New agent",
       open: "Open {{name}}",
       openInSidePane: "Open {{name}} in side pane",

packages/app/src/i18n/resources/es.ts

@@ -91,14 +91,23 @@ export const es: TranslationResources = {
       close: "Cerrar menú",
     },
     commandCenter: {
-      placeholder: "Buscar comandos, archivos, espacios de trabajo y agentes...",
+      placeholder: "Buscar espacios de trabajo, archivos y acciones...",
+      placeholderWithoutFiles: "Buscar espacios de trabajo y acciones...",
       filePlaceholder: "Buscar archivos...",
+      workspacePlaceholder: "Buscar espacios de trabajo...",
+      actionPlaceholder: "Buscar acciones...",
       searchingFiles: "Buscando archivos...",
       noMatches: "No hay coincidencias",
       actions: "Comportamiento",
       files: "Archivos",
       workspaces: "Espacios de trabajo",
-      agents: "Agentes",
+      recentWorkspaces: "Espacios de trabajo recientes",
+      tabs: {
+        all: "Todo",
+        workspaces: "Espacios de trabajo",
+        files: "Archivos",
+        actions: "Acciones",
+      },
       newAgent: "Nuevo agente",
       open: "Abrir {{name}}",
       openInSidePane: "Abrir {{name}} en el panel lateral",

packages/app/src/i18n/resources/fr.ts

@@ -91,14 +91,23 @@ export const fr: TranslationResources = {
       close: "Fermer le menu",
     },
     commandCenter: {
-      placeholder: "Rechercher des commandes, fichiers, espaces de travail et agents…",
+      placeholder: "Rechercher des espaces de travail, fichiers et actions…",
+      placeholderWithoutFiles: "Rechercher des espaces de travail et des actions…",
       filePlaceholder: "Rechercher des fichiers…",
+      workspacePlaceholder: "Rechercher des espaces de travail…",
+      actionPlaceholder: "Rechercher des actions…",
       searchingFiles: "Recherche de fichiers…",
       noMatches: "Aucun résultat",
       actions: "Actions",
       files: "Fichiers",
       workspaces: "Espaces de travail",
-      agents: "Agents",
+      recentWorkspaces: "Espaces de travail récents",
+      tabs: {
+        all: "Tout",
+        workspaces: "Espaces de travail",
+        files: "Fichiers",
+        actions: "Actions",
+      },
       newAgent: "Nouvel agent",
       open: "Ouvrir {{name}}",
       openInSidePane: "Ouvrir {{name}} dans le panneau latéral",

packages/app/src/i18n/resources/ja.ts

@@ -91,14 +91,23 @@ export const ja: TranslationResources = {
       close: "メニューを閉じる",
     },
     commandCenter: {
-      placeholder: "コマンド、ファイル、ワークスペース、エージェントを検索...",
+      placeholder: "ワークスペース、ファイル、アクションを検索...",
+      placeholderWithoutFiles: "ワークスペースとアクションを検索...",
       filePlaceholder: "ファイルを検索...",
+      workspacePlaceholder: "ワークスペースを検索...",
+      actionPlaceholder: "アクションを検索...",
       searchingFiles: "ファイルを検索中...",
       noMatches: "一致なし",
       actions: "アクション",
       files: "ファイル",
       workspaces: "ワークスペース",
-      agents: "エージェント",
+      recentWorkspaces: "最近のワークスペース",
+      tabs: {
+        all: "すべて",
+        workspaces: "ワークスペース",
+        files: "ファイル",
+        actions: "アクション",
+      },
       newAgent: "新しいエージェント",
       open: "{{name}}を開く",
       openInSidePane: "{{name}}をサイドパネルで開く",

packages/app/src/i18n/resources/ko.ts

@@ -90,14 +90,23 @@ export const ko: TranslationResources = {
       close: "메뉴 닫기",
     },
     commandCenter: {
-      placeholder: "명령, 파일, 워크스페이스 및 에이전트 검색...",
+      placeholder: "워크스페이스, 파일 및 작업 검색...",
+      placeholderWithoutFiles: "워크스페이스 및 작업 검색...",
       filePlaceholder: "파일 검색...",
+      workspacePlaceholder: "워크스페이스 검색...",
+      actionPlaceholder: "작업 검색...",
       searchingFiles: "파일 검색 중...",
       noMatches: "일치 항목 없음",
       actions: "작업",
       files: "파일",
       workspaces: "워크스페이스",
-      agents: "에이전트",
+      recentWorkspaces: "최근 워크스페이스",
+      tabs: {
+        all: "전체",
+        workspaces: "워크스페이스",
+        files: "파일",
+        actions: "작업",
+      },
       newAgent: "새 에이전트",
       open: "{{name}} 열기",
       openInSidePane: "사이드 패널에서 {{name}} 열기",

packages/app/src/i18n/resources/pt-BR.ts

@@ -91,14 +91,23 @@ export const ptBR: TranslationResources = {
       close: "Fechar menu",
     },
     commandCenter: {
-      placeholder: "Buscar comandos, arquivos, espaços de trabalho e agentes...",
+      placeholder: "Pesquisar espaços de trabalho, arquivos e ações...",
+      placeholderWithoutFiles: "Pesquisar espaços de trabalho e ações...",
       filePlaceholder: "Pesquisar arquivos...",
+      workspacePlaceholder: "Pesquisar espaços de trabalho...",
+      actionPlaceholder: "Pesquisar ações...",
       searchingFiles: "Pesquisando arquivos...",
       noMatches: "Nenhuma correspondência",
       actions: "Ações",
       files: "Arquivos",
       workspaces: "Espaços de trabalho",
-      agents: "Agentes",
+      recentWorkspaces: "Espaços de trabalho recentes",
+      tabs: {
+        all: "Tudo",
+        workspaces: "Espaços de trabalho",
+        files: "Arquivos",
+        actions: "Ações",
+      },
       newAgent: "Novo agente",
       open: "Abrir {{name}}",
       openInSidePane: "Abrir {{name}} no painel lateral",

packages/app/src/i18n/resources/ru.ts

@@ -91,14 +91,23 @@ export const ru: TranslationResources = {
       close: "Закрыть меню",
     },
     commandCenter: {
-      placeholder: "Поиск команд, файлов, рабочих пространств и агентов...",
+      placeholder: "Поиск рабочих пространств, файлов и действий...",
+      placeholderWithoutFiles: "Поиск рабочих пространств и действий...",
       filePlaceholder: "Поиск файлов...",
+      workspacePlaceholder: "Поиск рабочих пространств...",
+      actionPlaceholder: "Поиск действий...",
       searchingFiles: "Поиск файлов...",
       noMatches: "Нет совпадений",
       actions: "Действия",
       files: "Файлы",
       workspaces: "Рабочие пространства",
-      agents: "Агенты",
+      recentWorkspaces: "Недавние рабочие пространства",
+      tabs: {
+        all: "Все",
+        workspaces: "Рабочие пространства",
+        files: "Файлы",
+        actions: "Действия",
+      },
       newAgent: "Новый агент",
       open: "Открыть {{name}}",
       openInSidePane: "Открыть {{name}} в боковой панели",

packages/app/src/i18n/resources/zh-CN.ts

@@ -90,14 +90,23 @@ export const zhCN: TranslationResources = {
       close: "关闭菜单",
     },
     commandCenter: {
-      placeholder: "搜索命令、文件、工作区和 Agent...",
+      placeholder: "搜索工作区、文件和操作...",
+      placeholderWithoutFiles: "搜索工作区和操作...",
       filePlaceholder: "搜索文件...",
+      workspacePlaceholder: "搜索工作区...",
+      actionPlaceholder: "搜索操作...",
       searchingFiles: "正在搜索文件...",
       noMatches: "没有匹配项",
       actions: "操作",
       files: "文件",
       workspaces: "工作区",
-      agents: "Agents",
+      recentWorkspaces: "最近的工作区",
+      tabs: {
+        all: "全部",
+        workspaces: "工作区",
+        files: "文件",
+        actions: "操作",
+      },
       newAgent: "新建 Agent",
       open: "打开{{name}}",
       openInSidePane: "在侧边面板中打开{{name}}",

packages/app/src/keyboard/internal/overlay-contract.ts

@@ -3,6 +3,10 @@ import type { KeyboardInputEvent } from "./overlays";
 export interface OverlayRegistration {
   active: boolean;
   layer: number;
+  /**
+   * Keys the overlay handles. Native forwards only these. On web, declaring "Tab" hands Tab to
+   * `onKeyDown` instead of the focus trap.
+   */
   keys: readonly string[];
   onKeyDown(event: KeyboardInputEvent): boolean;
   restoreFocusRef?: RefObject<unknown>;

packages/app/src/keyboard/internal/overlay-registration.web.ts

@@ -85,7 +85,9 @@ function dispatchOverlayEntry(entry: WebOverlayEntry, event: KeyboardInputEvent)
   const scope = entry.getScope();
   if (!scope) return top.getKeyHandler()(event);
 
-  if (top.manageFocus && event.key === "Tab") {
+  // An overlay that declares Tab owns it (the command center rotates its tabs); the focus trap
+  // only moves focus for overlays that leave Tab alone.
+  if (top.manageFocus && event.key === "Tab" && !top.getKeys().includes("Tab")) {
     const focusable = getFocusableElements(scope);
     const first = focusable[0];
     const last = focusable[focusable.length - 1];

packages/app/src/keyboard/route-shortcut.test.ts

@@ -376,10 +376,10 @@ describe("routeKeyboardShortcut — callbacks and pickers", () => {
 });
 
 describe("routeKeyboardShortcut — toggle dialogs", () => {
-  it("opens the command center scoped to files from a workspace", () => {
+  it("opens the command center on the Files tab from a workspace", () => {
     expect(
       routeKeyboardShortcut({ action: "command-center.files", payload: null }, makeCtx()),
-    ).toEqual<ShortcutAction>({ kind: "command-center-toggle", nextOpen: true, scope: "files" });
+    ).toEqual<ShortcutAction>({ kind: "command-center-toggle", nextOpen: true, tab: "files" });
   });
 
   it("leaves the file-search shortcut to the project-picker host outside a workspace", () => {

packages/app/src/keyboard/route-shortcut.ts

@@ -32,7 +32,7 @@ export type ShortcutAction =
   | { kind: "router-push"; route: string }
   | { kind: "open-project-picker" }
   | { kind: "callback"; name: ShortcutCallbackName }
-  | { kind: "command-center-toggle"; nextOpen: boolean; scope?: "files" }
+  | { kind: "command-center-toggle"; nextOpen: boolean; tab?: "files" }
   | { kind: "shortcuts-dialog-toggle"; nextOpen: boolean };
 
 const NONE: ShortcutAction = { kind: "none" };
@@ -212,7 +212,7 @@ export function routeKeyboardShortcut(
       return { kind: "command-center-toggle", nextOpen: !ctx.commandCenterOpen };
     case "command-center.files":
       if (parseHostWorkspaceRouteFromPathname(ctx.pathname)) {
-        return { kind: "command-center-toggle", nextOpen: true, scope: "files" };
+        return { kind: "command-center-toggle", nextOpen: true, tab: "files" };
       }
       return dispatch({ id: "workspace.project.pick", scope: "workspace" });
     case "shortcuts.dialog.toggle":

packages/app/src/keyboard/use-shortcuts.ts

@@ -152,9 +152,7 @@ export function useKeyboardShortcuts({
         if (action.nextOpen) {
           captureFocusRestore();
         }
-        useKeyboardShortcutsStore
-          .getState()
-          .setCommandCenterOpen(action.nextOpen, action.scope ?? null);
+        useKeyboardShortcutsStore.getState().setCommandCenterOpen(action.nextOpen, action.tab);
         return true;
       }
       case "shortcuts-dialog-toggle":

packages/app/src/screens/projects-screen.test.tsx

@@ -182,6 +182,7 @@ function workspaceSummary(overrides: Partial<WorkspaceSummary> = {}): WorkspaceS
     status: "done",
     currentBranch: "main",
     changeRequestNumber: null,
+    background: false,
     statusEnteredAt: null,
     ...overrides,
   };

packages/app/src/screens/settings/voice/speech-provider-sheet.tsx

@@ -487,7 +487,10 @@ function LocalModelRow({
   }
 
   const rowStyle = useCallback(
-    ({ hovered }: HoverState) => [!selectionLocked && hovered && styles.rowHovered],
+    ({ hovered, pressed }: HoverState) => [
+      !selectionLocked && hovered && styles.rowHovered,
+      !selectionLocked && pressed && styles.rowPressed,
+    ],
     [selectionLocked],
   );
   const accessibilityState = useMemo(

packages/app/src/stores/keyboard-shortcuts-store.test.ts

@@ -4,7 +4,7 @@ import { useKeyboardShortcutsStore } from "./keyboard-shortcuts-store";
 beforeEach(() => {
   useKeyboardShortcutsStore.setState({
     commandCenterOpen: false,
-    commandCenterScope: null,
+    commandCenterTab: "all",
     shortcutsDialogOpen: false,
     capturingShortcut: false,
     altDown: false,
@@ -20,18 +20,21 @@ describe("keyboard-shortcuts-store", () => {
     expect(useKeyboardShortcutsStore.getState().commandCenterOpen).toBe(true);
   });
 
-  it("opens the command center with a scope and clears it when closed", () => {
+  it("opens the command center on a tab and returns to All when closed", () => {
     useKeyboardShortcutsStore.getState().setCommandCenterOpen(true, "files");
     expect(useKeyboardShortcutsStore.getState()).toMatchObject({
       commandCenterOpen: true,
-      commandCenterScope: "files",
+      commandCenterTab: "files",
     });
 
     useKeyboardShortcutsStore.getState().setCommandCenterOpen(false);
     expect(useKeyboardShortcutsStore.getState()).toMatchObject({
       commandCenterOpen: false,
-      commandCenterScope: null,
+      commandCenterTab: "all",
     });
+
+    useKeyboardShortcutsStore.getState().setCommandCenterOpen(true);
+    expect(useKeyboardShortcutsStore.getState().commandCenterTab).toBe("all");
   });
 
   it("toggles shortcut capture state", () => {

packages/app/src/stores/keyboard-shortcuts-store.ts

@@ -1,13 +1,13 @@
 import { create } from "zustand";
+import type { CommandCenterTab } from "@/command-center/tabs";
 import type { SidebarShortcutWorkspaceTarget } from "@/utils/sidebar-shortcuts";
 
 const SHORTCUT_BADGE_DELAY_MS = 150;
 
-export type CommandCenterScope = "files" | null;
-
 interface KeyboardShortcutsState {
   commandCenterOpen: boolean;
-  commandCenterScope: CommandCenterScope;
+  /** The tab the open command center shows. Every opening starts on the tab it asks for. */
+  commandCenterTab: CommandCenterTab;
   shortcutsDialogOpen: boolean;
   capturingShortcut: boolean;
   altDown: boolean;
@@ -16,8 +16,8 @@ interface KeyboardShortcutsState {
   /** Sidebar-visible workspace targets (up to 9), in top-to-bottom visual order. */
   sidebarShortcutWorkspaceTargets: SidebarShortcutWorkspaceTarget[];
 
-  setCommandCenterOpen: (open: boolean, scope?: CommandCenterScope) => void;
-  setCommandCenterScope: (scope: CommandCenterScope) => void;
+  setCommandCenterOpen: (open: boolean, tab?: CommandCenterTab) => void;
+  setCommandCenterTab: (tab: CommandCenterTab) => void;
   setShortcutsDialogOpen: (open: boolean) => void;
   setCapturingShortcut: (capturing: boolean) => void;
   setAltDown: (down: boolean) => void;
@@ -51,7 +51,7 @@ function updateBadgeTimer(
 
 export const useKeyboardShortcutsStore = create<KeyboardShortcutsState>((set, get) => ({
   commandCenterOpen: false,
-  commandCenterScope: null,
+  commandCenterTab: "all",
   shortcutsDialogOpen: false,
   capturingShortcut: false,
   altDown: false,
@@ -59,9 +59,9 @@ export const useKeyboardShortcutsStore = create<KeyboardShortcutsState>((set, ge
   showShortcutBadges: false,
   sidebarShortcutWorkspaceTargets: [],
 
-  setCommandCenterOpen: (open, scope = null) =>
-    set({ commandCenterOpen: open, commandCenterScope: open ? scope : null }),
-  setCommandCenterScope: (scope) => set({ commandCenterScope: scope }),
+  setCommandCenterOpen: (open, tab = "all") =>
+    set({ commandCenterOpen: open, commandCenterTab: open ? tab : "all" }),
+  setCommandCenterTab: (tab) => set({ commandCenterTab: tab }),
   setShortcutsDialogOpen: (open) => set({ shortcutsDialogOpen: open }),
   setCapturingShortcut: (capturing) => set({ capturingShortcut: capturing }),
   setAltDown: (down) => {

packages/app/src/usage/sidebar-item.tsx

@@ -113,8 +113,8 @@ function pinnedUsageLabel(
   return `${label}: ${summary}${error}`;
 }
 
-function triggerStyle({ hovered }: PressableStateCallbackType & { hovered?: boolean }) {
-  return [styles.trigger, hovered && styles.triggerHovered];
+function triggerStyle({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) {
+  return [styles.trigger, hovered && styles.triggerHovered, pressed && styles.triggerPressed];
 }
 
 function layoutWidth(event: LayoutChangeEvent): number {
@@ -161,7 +161,6 @@ function PinnedUsageTrigger({
       accessibilityRole="button"
       accessibilityLabel={pinnedUsageLabel(label, sources, errorLabel)}
       style={triggerStyle}
-      highlightStyle={styles.triggerPressed}
       testID="sidebar-usage"
     >
       <View style={styles.line} onLayout={handleAvailableLayout}>

packages/app/src/utils/projects.ts

@@ -8,6 +8,8 @@ export interface WorkspaceSummary {
   name: string;
   title?: string;
   workspaceKind: WorkspaceDescriptor["workspaceKind"];
+  /** Started by automation rather than the user. The sidebar hides it unless asked. */
+  background: boolean;
   status: WorkspaceDescriptor["status"];
   currentBranch: string | null;
   archivingAt?: string;
@@ -158,6 +160,7 @@ function toWorkspaceSummary(workspace: WorkspaceDescriptor): WorkspaceSummary {
     name: workspace.name,
     ...(workspace.title ? { title: workspace.title } : {}),
     workspaceKind: workspace.workspaceKind,
+    background: workspace.background ?? false,
     status: workspace.status,
     currentBranch: currentBranch && currentBranch !== "HEAD" ? currentBranch : null,
     ...(workspace.archivingAt ? { archivingAt: workspace.archivingAt } : {}),

packages/app/src/workspace/use-workspace-archive.ts

@@ -1,21 +1,17 @@
-import { useCallback, useRef } from "react";
+import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { useToast } from "@/contexts/toast-context";
 import {
   confirmRiskyWorktreeArchive,
   DEFAULT_WORKTREE_ARCHIVE_WARNING_LABELS,
-  readWorktreeArchiveRisk,
   type WorktreeArchiveWarningLabels,
 } from "@/git/worktree-archive-warning";
 import type { WorkspaceDescriptor } from "@/stores/session-store";
 import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
 import { buildWorkspaceTabPersistenceKey } from "@/workspace-tabs/model";
 import { archiveWorkspaceWithUndo, supportsWorkspaceArchiveUndo } from "@/workspace/archive-undo";
-import {
-  archiveWorkspaceOptimistically,
-  type WorkspaceArchiveTarget,
-} from "@/workspace/workspace-archive";
+import { archiveWorkspaceOptimistically } from "@/workspace/workspace-archive";
 
 function purgeArchivedWorkspaceState(input: { serverId: string; workspaceId: string }): void {
   const workspaceKey = buildWorkspaceTabPersistenceKey(input);
@@ -28,13 +24,12 @@ export interface ArchiveWorkspaceInput {
   serverId: string;
   workspaceId: string;
   workspaceKind: WorkspaceDescriptor["workspaceKind"];
-  workspaceDirectory: string;
   name: string;
-  /** Labels the warning's line counts. Whether to warn comes from the host's git state. */
+  isDirty?: boolean | null;
+  aheadOfOrigin?: number | null;
   diffStat?: { additions: number; deletions: number } | null;
   warningLabels?: WorktreeArchiveWarningLabels;
-  /** Runs once the archive starts, with the workspace being archived. */
-  onArchiveStarted: (workspace: WorkspaceArchiveTarget) => void;
+  onArchiveStarted: () => void;
   onSetHiding?: (hiding: boolean) => void;
 }
 
@@ -47,8 +42,9 @@ export function useWorkspaceArchive(input: ArchiveWorkspaceInput): WorkspaceArch
     serverId,
     workspaceId,
     workspaceKind,
-    workspaceDirectory,
     name,
+    isDirty,
+    aheadOfOrigin,
     diffStat,
     warningLabels = DEFAULT_WORKTREE_ARCHIVE_WARNING_LABELS,
     onArchiveStarted,
@@ -56,11 +52,6 @@ export function useWorkspaceArchive(input: ArchiveWorkspaceInput): WorkspaceArch
   } = input;
   const { t } = useTranslation();
   const toast = useToast();
-  const confirmingRef = useRef(false);
-  // The archive starts after the host answers and you confirm. By then you may have opened another
-  // workspace, so the redirect reads the selection from the latest render.
-  const onArchiveStartedRef = useRef(onArchiveStarted);
-  onArchiveStartedRef.current = onArchiveStarted;
 
   const archiveWorkspaceRecord = useCallback(async () => {
     const client = getHostRuntimeStore().getClient(serverId);
@@ -71,7 +62,7 @@ export function useWorkspaceArchive(input: ArchiveWorkspaceInput): WorkspaceArch
     const workspace = { serverId, workspaceId };
     onSetHiding?.(true);
     try {
-      onArchiveStartedRef.current(workspace);
+      onArchiveStarted();
       if (supportsWorkspaceArchiveUndo(serverId)) {
         await archiveWorkspaceWithUndo({
           client,
@@ -91,54 +82,35 @@ export function useWorkspaceArchive(input: ArchiveWorkspaceInput): WorkspaceArch
     } finally {
       onSetHiding?.(false);
     }
-  }, [onSetHiding, serverId, t, toast, workspaceId]);
-
-  // The host removes a worktree it archives, uncommitted work included. Ask it what that would
-  // lose: the sidebar row's git status is empty until the row receives it.
-  const confirmWorktreeArchive = useCallback(async (): Promise<boolean> => {
-    const client = getHostRuntimeStore().getClient(serverId);
-    if (!client) {
-      toast.error(t("sidebar.workspace.toasts.hostDisconnected"));
-      return false;
-    }
-    const risk = await readWorktreeArchiveRisk(client, workspaceDirectory).catch(
-      (error: unknown) => {
-        toast.error(
-          error instanceof Error ? error.message : t("sidebar.workspace.toasts.archiveFailed"),
-        );
-        return null;
-      },
-    );
-    if (!risk) {
-      return false;
-    }
-    return await confirmRiskyWorktreeArchive(
-      { workspaceName: name, diffStat, ...risk },
-      warningLabels,
-    );
-  }, [diffStat, name, serverId, t, toast, warningLabels, workspaceDirectory]);
+  }, [onArchiveStarted, onSetHiding, serverId, t, toast, workspaceId]);
 
   const archive = useCallback(() => {
-    // A second press while the host answers or the warning is open would ask twice.
-    if (confirmingRef.current) {
-      return;
-    }
     void (async () => {
       if (workspaceKind === "worktree") {
-        confirmingRef.current = true;
-        let confirmed: boolean;
-        try {
-          confirmed = await confirmWorktreeArchive();
-        } finally {
-          confirmingRef.current = false;
-        }
+        const confirmed = await confirmRiskyWorktreeArchive(
+          {
+            workspaceName: name,
+            isDirty,
+            aheadOfOrigin,
+            diffStat,
+          },
+          warningLabels,
+        );
         if (!confirmed) {
           return;
         }
       }
       await archiveWorkspaceRecord();
     })();
-  }, [archiveWorkspaceRecord, confirmWorktreeArchive, workspaceKind]);
+  }, [
+    aheadOfOrigin,
+    archiveWorkspaceRecord,
+    diffStat,
+    isDirty,
+    name,
+    warningLabels,
+    workspaceKind,
+  ]);
 
   return {
     archive,

packages/app/src/workspace/workspace-archive.test.ts

@@ -7,6 +7,8 @@ import {
   isWorkspaceArchivePending,
   isWorkspaceArchiveUndoPending,
 } from "@/contexts/session-workspace-upserts";
+import { queryClient } from "@/data/query-client";
+import { allAgentHistoryQueryKey } from "@/hooks/agent-history-query-key";
 import { useSessionStore, type WorkspaceDescriptor } from "@/stores/session-store";
 import {
   archiveWorkspaceOptimistically,
@@ -133,6 +135,17 @@ describe("archiveWorkspaceOptimistically", () => {
     expect(storedWorkspace(archived.id)).toBeUndefined();
   });
 
+  it("marks cached agent history stale once the host has archived the workspace", async () => {
+    const historyKey = [...allAgentHistoryQueryKey([SERVER_ID]), "workspace-1"];
+    queryClient.setQueryData(historyKey, { pages: [], pageParams: [] });
+    const client = createClient(vi.fn(async () => archivePayload({ workspaceId: "workspace-1" })));
+
+    await archiveWorkspaceOptimistically({ client, workspace: target() });
+
+    expect(queryClient.getQueryState(historyKey)?.isInvalidated).toBe(true);
+    queryClient.removeQueries({ queryKey: historyKey });
+  });
+
   it("restores the workspace and clears pending state when the daemon rejects the archive", async () => {
     const archived = workspace();
     getHostRuntimeStore().acceptWorkspaceSnapshots(SERVER_ID, [archived]);

packages/app/src/workspace/workspace-archive.ts

@@ -1,3 +1,5 @@
+import { queryClient } from "@/data/query-client";
+import { agentHistoryQueryKey, allAgentHistoryQueryRootKey } from "@/hooks/agent-history-query-key";
 import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import {
   isWorkspaceArchiveIntentCurrent,
@@ -96,6 +98,12 @@ function restoreOptimisticallyHiddenWorkspace(input: {
   }
 }
 
+/** History fetched before the archive still lists the workspace's agents as active. */
+function invalidateAgentHistory(serverId: string): void {
+  void queryClient.invalidateQueries({ queryKey: agentHistoryQueryKey(serverId) });
+  void queryClient.invalidateQueries({ queryKey: allAgentHistoryQueryRootKey() });
+}
+
 async function archiveWorkspaceOrThrow(input: {
   client: WorkspaceArchiveClient;
   workspaceId: string;
@@ -127,6 +135,8 @@ export function beginOptimisticWorkspaceArchive(input: {
       });
       if (outcome === "canceled") {
         restoreOptimisticallyHiddenWorkspace({ serverId: input.workspace.serverId, snapshot });
+      } else {
+        invalidateAgentHistory(input.workspace.serverId);
       }
       return outcome;
     } catch (error) {

packages/app/test-stubs/react-native-unistyles.ts

@@ -1,8 +1,7 @@
-import { createElement, type ElementType } from "react";
 import { lightHighlightColors } from "@getpaseo/highlight";
 import { lightTheme } from "../src/styles/theme";
 
-const pinnedTheme = {
+const testTheme = {
   colorScheme: "light",
   colors: {
     syntax: lightHighlightColors,
@@ -87,14 +86,6 @@ const pinnedTheme = {
   },
 };
 
-// Tokens a test does not pin come from the real light theme, so a style or `uniProps` mapping
-// that reads one (the markdown renderer reads `colors.terminal`) gets a value instead of crashing.
-const testTheme = {
-  ...lightTheme,
-  ...pinnedTheme,
-  colors: { ...lightTheme.colors, ...pinnedTheme.colors },
-};
-
 type StyleFactory<T> = (theme: typeof testTheme) => T;
 
 function isStyleFactory<T>(styles: T | StyleFactory<T>): styles is StyleFactory<T> {
@@ -151,19 +142,7 @@ export const StyleSheet = {
     resolveStyles(isStyleFactory(styles) ? styles(testTheme) : styles),
 };
 
-type UniPropsMapping = (theme: typeof testTheme, runtime: object) => Record<string, unknown>;
-
-/** Applies `uniProps` with the test theme, the way Unistyles maps theme values onto props. */
-export const withUnistyles = <T>(Component: T): T => {
-  function ThemedComponent({ uniProps, ...props }: { uniProps?: UniPropsMapping }) {
-    // Explicit props win over mapped ones, as in Unistyles' `deepMergeObjects(mappings, uniProps, props)`.
-    return createElement(Component as ElementType, {
-      ...(uniProps ? uniProps(testTheme, {}) : {}),
-      ...props,
-    });
-  }
-  return ThemedComponent as T;
-};
+export const withUnistyles = <T>(Component: T): T => Component;
 
 export const useUnistyles = () => ({
   theme: testTheme,

packages/cli/src/utils/client.ts

@@ -236,8 +236,6 @@ interface AgentLike {
   title?: string | null;
 }
 
-const FULL_AGENT_UUID_PATTERN = /^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/i;
-
 /**
  * Resolve an agent ID from a partial ID or name.
  * Supports:
@@ -254,11 +252,6 @@ export function resolveAgentId(idOrName: string, agents: AgentLike[]): string |
 
   const query = idOrName.toLowerCase();
 
-  // A complete agent UUID is an exact identity, never a name search fallback.
-  if (FULL_AGENT_UUID_PATTERN.test(idOrName)) {
-    return agents.find((a) => a.id.toLowerCase() === query)?.id ?? null;
-  }
-
   // Try exact ID match first
   const exactMatch = agents.find((a) => a.id === idOrName);
   if (exactMatch) {

packages/cli/tests/29-agent-id-resolution.test.ts

@@ -18,52 +18,25 @@ const agents = [
 }
 
 {
-  console.log("Test 2: full UUID resolves exactly, case-insensitively");
-  const exactId = "9eac296c-4d60-4189-a0b5-ae71dd9c6ad9";
-  const agentsWithNameCollision = [
-    { id: exactId, title: "target agent" },
-    {
-      id: "c9a97e5d-4a92-4646-a016-53032146d0a1",
-      title: `worker ${exactId}`,
-    },
-  ];
-  assert.strictEqual(resolveAgentId(exactId.toUpperCase(), agentsWithNameCollision), exactId);
-  console.log("✓ full UUID resolves exactly, case-insensitively\n");
-}
-
-{
-  console.log("Test 3: missing full UUID does not match another agent name");
-  const missingId = "9eac296c-4d60-4189-a0b5-ae71dd9c6ad9";
-  const nameCollision = [
-    {
-      id: "c9a97e5d-4a92-4646-a016-53032146d0a1",
-      title: `worker ${missingId}`,
-    },
-  ];
-  assert.strictEqual(resolveAgentId(missingId, nameCollision), null);
-  console.log("✓ missing full UUID does not match another agent name\n");
-}
-
-{
-  console.log("Test 4: ID prefix resolves");
+  console.log("Test 2: ID prefix resolves");
   assert.strictEqual(resolveAgentId("def5678", agents), "def5678-other-agent-id");
   console.log("✓ ID prefix resolves\n");
 }
 
 {
-  console.log("Test 5: exact name match resolves case-insensitively");
+  console.log("Test 3: exact name match resolves case-insensitively");
   assert.strictEqual(resolveAgentId("fix archive flow", agents), "def5678-other-agent-id");
   console.log("✓ exact name match resolves case-insensitively\n");
 }
 
 {
-  console.log("Test 6: partial name match resolves when unique");
+  console.log("Test 4: partial name match resolves when unique");
   assert.strictEqual(resolveAgentId("review", agents), "987zyxw-third-agent-id");
   console.log("✓ partial name match resolves when unique\n");
 }
 
 {
-  console.log("Test 7: missing agent returns null");
+  console.log("Test 5: missing agent returns null");
   assert.strictEqual(resolveAgentId("does not exist", agents), null);
   console.log("✓ missing agent returns null\n");
 }

packages/plugin/src/server/provider.test.ts

@@ -1,66 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { ProviderInputSchema, type ProviderInput } from "./provider.js";
-
-type ReviewMode = "uncommitted" | "base" | "all";
-type Delivery = "auto" | "steer";
-
-const contextLine = {
-  oldLineNumber: null,
-  newLineNumber: 12,
-  type: "add",
-  content: "const value = 1;",
-} as const;
-
-function reviewPrompt(mode: ReviewMode, delivery: Delivery): ProviderInput {
-  return {
-    type: "session.prompt",
-    sessionId: "session-1",
-    prompt: {
-      clientMessageId: "message-1",
-      delivery,
-      input: {
-        type: "message",
-        content: [
-          {
-            type: "review",
-            mimeType: "application/paseo-review",
-            cwd: "/workspace",
-            mode,
-            baseRef: "main",
-            comments: [
-              {
-                filePath: "src/index.ts",
-                side: "new",
-                lineNumber: 12,
-                body: "Please review this change.",
-                context: {
-                  hunkHeader: "@@ -10,2 +10,3 @@",
-                  targetLine: contextLine,
-                  lines: [{ ...contextLine, type: "context", oldLineNumber: 11 }, contextLine],
-                },
-              },
-            ],
-          },
-        ],
-      },
-    },
-  };
-}
-
-describe("Provider review attachments", () => {
-  it.each(["uncommitted", "base", "all"] as const)(
-    "preserves mode %s on an ordinary prompt",
-    (mode) => {
-      const input = reviewPrompt(mode, "auto");
-      expect(ProviderInputSchema.parse(input)).toEqual(input);
-    },
-  );
-
-  it.each(["uncommitted", "base", "all"] as const)(
-    "preserves mode %s on a steering prompt",
-    (mode) => {
-      const input = reviewPrompt(mode, "steer");
-      expect(ProviderInputSchema.parse(input)).toEqual(input);
-    },
-  );
-});

packages/plugin/src/server/provider.ts

@@ -213,7 +213,7 @@ interface ProviderReviewAttachment {
   type: "review";
   mimeType: "application/paseo-review";
   cwd: string;
-  mode: "uncommitted" | "base" | "all";
+  mode: "uncommitted" | "base";
   baseRef?: string | null;
   comments: Array<{
     filePath: string;
@@ -881,7 +881,7 @@ const providerContentSchema: z.ZodType<ProviderContent> = z.union([
       type: z.literal("review"),
       mimeType: z.literal("application/paseo-review"),
       cwd: z.string(),
-      mode: z.enum(["uncommitted", "base", "all"]),
+      mode: z.enum(["uncommitted", "base"]),
       baseRef: z.string().nullable().optional(),
       comments: z.array(
         z

packages/protocol/src/search/text-match.test.ts

@@ -7,6 +7,7 @@ import {
   scoreMatch,
   scorePathMatch,
   scoreTextFields,
+  textFieldsMatchClass,
 } from "./text-match.js";
 
 function markUp(query: string, text: string, options?: Parameters<typeof scoreMatch>[2]): string {
@@ -248,6 +249,24 @@ describe("scoreTextFields", () => {
   });
 });
 
+describe("textFieldsMatchClass", () => {
+  it("keeps positional tier differences inside one class", () => {
+    expect(textFieldsMatchClass("lo", ["fix-login-bug"])).toBe("word");
+    expect(textFieldsMatchClass("lo", ["Login page fix"])).toBe("word");
+  });
+
+  it("takes the loosest token's class", () => {
+    expect(textFieldsMatchClass("auth", ["oauth-refactor"])).toBe("inside-word");
+    expect(textFieldsMatchClass("fix auth", ["fix", "oauth"])).toBe("inside-word");
+    expect(textFieldsMatchClass("fix lgn", ["fix", "login"])).toBe("scattered");
+    expect(textFieldsMatchClass("stipe", ["stripe"], { typoTolerant: true })).toBe("scattered");
+  });
+
+  it("returns null when a token matches no field", () => {
+    expect(textFieldsMatchClass("fix zebra", ["fix"])).toBeNull();
+  });
+});
+
 describe("compareMatchScores", () => {
   it("sorts by tier ascending", () => {
     expect(compareMatchScores({ tier: 1, offset: 10 }, { tier: 2, offset: 0 })).toBeLessThan(0);

packages/protocol/src/search/text-match.ts

@@ -331,16 +331,14 @@ export interface TextFieldsOptions {
   subsequence?: boolean;
 }
 
-export function scoreTextFields(
+/** Each token's best score across the fields, or null when some token matches none. */
+function scoreTokens(
   query: string,
   fields: string[],
-  options: TextFieldsOptions = {},
-): MatchScore | null {
-  const tokens = tokenizeQuery(query);
-  if (tokens.length === 0) return { tier: TIER_EXACT, offset: 0, spread: 0 };
-
-  const aggregate: MatchScore = { tier: TIER_EXACT, offset: 0, spread: 0 };
-  for (const token of tokens) {
+  options: TextFieldsOptions,
+): { token: string; score: MatchScore }[] | null {
+  const scores: { token: string; score: MatchScore }[] = [];
+  for (const token of tokenizeQuery(query)) {
     const fuzzy = options.typoTolerant ? fuzzyPolicyForToken(token) : null;
     let best: MatchScore | null = null;
     for (const field of fields) {
@@ -350,9 +348,59 @@ export function scoreTextFields(
       }
     }
     if (!best) return null;
-    aggregate.tier += best.tier;
-    aggregate.offset += best.offset;
-    aggregate.spread = (aggregate.spread ?? 0) + (best.spread ?? token.length);
+    scores.push({ token, score: best });
+  }
+  return scores;
+}
+
+export function scoreTextFields(
+  query: string,
+  fields: string[],
+  options: TextFieldsOptions = {},
+): MatchScore | null {
+  const scores = scoreTokens(query, fields, options);
+  if (!scores) return null;
+  const aggregate: MatchScore = { tier: TIER_EXACT, offset: 0, spread: 0 };
+  for (const { token, score } of scores) {
+    aggregate.tier += score.tier;
+    aggregate.offset += score.offset;
+    aggregate.spread = (aggregate.spread ?? 0) + (score.spread ?? token.length);
   }
   return aggregate;
 }
+
+/**
+ * How closely a query matched, coarser than a tier: every token at a word boundary, some token
+ * inside a word, or some token only scattered across a word or misspelled. Positional tier
+ * differences ("lo" at a title's start versus a branch's middle word) stay within one class.
+ */
+export type MatchClass = "word" | "inside-word" | "scattered";
+
+const MATCH_CLASS_ORDER: readonly MatchClass[] = ["word", "inside-word", "scattered"];
+
+function matchClassOfTier(tier: number): MatchClass {
+  if (tier <= TIER_WORD_START) return "word";
+  if (tier === TIER_SUBSTRING) return "inside-word";
+  return "scattered";
+}
+
+/** Closer classes first. */
+export function compareMatchClasses(a: MatchClass, b: MatchClass): number {
+  return MATCH_CLASS_ORDER.indexOf(a) - MATCH_CLASS_ORDER.indexOf(b);
+}
+
+/** The class of the query's loosest token, or null when some token matches no field. */
+export function textFieldsMatchClass(
+  query: string,
+  fields: string[],
+  options: TextFieldsOptions = {},
+): MatchClass | null {
+  const scores = scoreTokens(query, fields, options);
+  if (!scores) return null;
+  let loosest: MatchClass = "word";
+  for (const { score } of scores) {
+    const tokenClass = matchClassOfTier(score.tier);
+    if (compareMatchClasses(tokenClass, loosest) > 0) loosest = tokenClass;
+  }
+  return loosest;
+}