test(server): reproduce missed cross-client agent deletion

Retain the failing reproduction for #4870. Deletion reaches the requesting subscription but leaves other connected agent subscriptions stale. No production behavior is changed.
2026-10-19 07:42:52 +00:00 · 2026-10-18 19:03:06 +02:00
92 changed files with 368 additions and 2543 deletions
@@ -93,10 +93,6 @@ jobs:
        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
        run: npm run lint

-      - name: Test lint rules
-        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
-        run: node --test scripts/oxlint/paseo-plugin.test.mjs
-
      - name: Build relay
        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.relay != 'false') }}
        run: npm run build:relay
@@ -5,7 +5,6 @@
  },
  "ignorePatterns": [".dev/**"],
  "plugins": ["react", "react-perf", "unicorn", "typescript", "oxc", "import", "promise"],
-  "jsPlugins": ["./scripts/oxlint/paseo-plugin.mjs"],
  "categories": {
    "correctness": "error",
    "suspicious": "error",
@@ -357,117 +356,6 @@
        "no-restricted-imports": "off"
      }
    },
-    {
-      "files": ["packages/app/src/**/*.{ts,tsx}"],
-      "rules": {
-        "paseo/no-raw-pressable": "error"
-      }
-    },
-    // Press feedback is owned by the primitives in components/ui. Raw pressable burn-down:
-    // 94 files. They may only leave this list.
-    {
-      "files": [
-        "packages/app/src/components/ui/**/*.{ts,tsx}",
-        "packages/app/src/**/*.{test,spec}.{ts,tsx}",
-        "packages/app/src/agent-profiles/settings/agent-profile-appearance-field.tsx",
-        "packages/app/src/agent-skills/selection-sheet.tsx",
-        "packages/app/src/agent-stream/chat-outline/rail.web.tsx",
-        "packages/app/src/agent-stream/view.tsx",
-        "packages/app/src/app/pair-scan.tsx",
-        "packages/app/src/changelog/internal/changelog-sheet.tsx",
-        "packages/app/src/command-center/command-center.tsx",
-        "packages/app/src/components/adaptive-modal-sheet.tsx",
-        "packages/app/src/components/add-host-method-modal.tsx",
-        "packages/app/src/components/add-host-modal.tsx",
-        "packages/app/src/components/add-project-flow.tsx",
-        "packages/app/src/components/add-remote-ssh-host-modal.tsx",
-        "packages/app/src/components/agent-list.tsx",
-        "packages/app/src/components/app-diagnostic-sheet.tsx",
-        "packages/app/src/components/attachment-lightbox.tsx",
-        "packages/app/src/components/attachment-pill.tsx",
-        "packages/app/src/components/combined-model-selector.tsx",
-        "packages/app/src/components/compact-explorer-sidebar.tsx",
-        "packages/app/src/components/context-window-meter.tsx",
-        "packages/app/src/components/desktop/window-controls.tsx",
-        "packages/app/src/components/dictation-controls.tsx",
-        "packages/app/src/components/download-toast.tsx",
-        "packages/app/src/components/file-explorer-pane.tsx",
-        "packages/app/src/components/headers/back-header.tsx",
-        "packages/app/src/components/highlighted-code-block.tsx",
-        "packages/app/src/components/hosts/host-filter.tsx",
-        "packages/app/src/components/hosts/host-picker.tsx",
-        "packages/app/src/components/import-session-sheet.tsx",
-        "packages/app/src/components/left-sidebar.tsx",
-        "packages/app/src/components/markdown/fence/mermaid/host.native.tsx",
-        "packages/app/src/components/markdown/fence/mermaid/host.web.tsx",
-        "packages/app/src/components/message.tsx",
-        "packages/app/src/components/model-browser.tsx",
-        "packages/app/src/components/plan-card.tsx",
-        "packages/app/src/components/provider-diagnostic-sheet.tsx",
-        "packages/app/src/components/question-form-card.tsx",
-        "packages/app/src/components/realtime-voice-overlay.tsx",
-        "packages/app/src/components/schedules/schedule-row.tsx",
-        "packages/app/src/components/settings/collapsible-row.tsx",
-        "packages/app/src/components/settings/headings/settings-info-tip.tsx",
-        "packages/app/src/components/sidebar-callout.tsx",
-        "packages/app/src/components/sidebar-resize-handle.tsx",
-        "packages/app/src/components/sidebar-workspace-list.tsx",
-        "packages/app/src/components/sidebar/sidebar-group-toggle-row.tsx",
-        "packages/app/src/components/sidebar/sidebar-header-row.tsx",
-        "packages/app/src/components/sidebar/sidebar-section-header.tsx",
-        "packages/app/src/components/sidebar/sidebar-status-list.tsx",
-        "packages/app/src/components/sidebar/workspace-meta-row/index.tsx",
-        "packages/app/src/components/terminal-copy-paste-actions.tsx",
-        "packages/app/src/components/terminal-emulator-native-grid.native.tsx",
-        "packages/app/src/components/terminal-pane.tsx",
-        "packages/app/src/components/toast-host.tsx",
-        "packages/app/src/components/tool-call-sheet.tsx",
-        "packages/app/src/components/welcome-screen.tsx",
-        "packages/app/src/components/workspace-hover-card.tsx",
-        "packages/app/src/components/zoomable-viewport/toolbar.tsx",
-        "packages/app/src/composer/agent-controls/index.tsx",
-        "packages/app/src/composer/diff-stat-pill.tsx",
-        "packages/app/src/composer/dock/internal/background.native.tsx",
-        "packages/app/src/composer/draft/import-pill.tsx",
-        "packages/app/src/composer/index.tsx",
-        "packages/app/src/composer/tracks.tsx",
-        "packages/app/src/desktop/browser/pane/index.electron.tsx",
-        "packages/app/src/git/actions-split-button.tsx",
-        "packages/app/src/git/commits-section/commit-row.tsx",
-        "packages/app/src/git/commits-section/commits-section.tsx",
-        "packages/app/src/git/diff-pane.tsx",
-        "packages/app/src/git/forges/gitlab.view.tsx",
-        "packages/app/src/git/pull-request-panel/checks-section.tsx",
-        "packages/app/src/git/pull-request-panel/pane.tsx",
-        "packages/app/src/git/pull-request-panel/section-kit.tsx",
-        "packages/app/src/hosts/host-chooser.tsx",
-        "packages/app/src/mobile-panels/presentation.tsx",
-        "packages/app/src/panels/new-tab-panel.tsx",
-        "packages/app/src/panels/setup-panel.tsx",
-        "packages/app/src/plugins/buttons/view.tsx",
-        "packages/app/src/review/surface.tsx",
-        "packages/app/src/screens/open-project-screen.tsx",
-        "packages/app/src/screens/project-settings-screen.tsx",
-        "packages/app/src/screens/projects-screen.tsx",
-        "packages/app/src/screens/settings-screen.tsx",
-        "packages/app/src/screens/settings/host-appearance-section.tsx",
-        "packages/app/src/screens/settings/host-page.tsx",
-        "packages/app/src/screens/settings/providers-section.tsx",
-        "packages/app/src/screens/workspace/compact-workspace-header/tab-switcher.tsx",
-        "packages/app/src/screens/workspace/scripts/workspace-scripts-button.tsx",
-        "packages/app/src/screens/workspace/workspace-desktop-tabs-row.tsx",
-        "packages/app/src/screens/workspace/workspace-tab-presentation.tsx",
-        "packages/app/src/tool-calls/detail-level/overview/sheet.tsx",
-        "packages/app/src/usage/sidebar-item.tsx",
-        "packages/app/src/usage/window-bar.tsx",
-        "packages/app/src/workspace-labels/manager-modal.tsx",
-        "packages/app/src/workspace-labels/swatch.tsx",
-        "packages/app/src/workspace/open-in-editor/button.tsx"
-      ],
-      "rules": {
-        "paseo/no-raw-pressable": "off"
-      }
-    },
    {
      "files": ["**/e2e/**/fixtures.ts"],
      "rules": {
@@ -1,8 +1,8 @@
 # Changelog

-## 0.12.0 - 2026-10-19
+## 0.12.0-beta.3 - 2026-10-18

-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
+Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and close to 100 fixes.

 **Before upgrading:** `paseo run --background` is deprecated in favor of `--no-wait`, and `paseo permit allow` and `deny` now exit non-zero when the daemon doesn't confirm within 15 seconds

@@ -29,10 +29,9 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Changed Settings on phones to large tiles grouped into App and Host ([#7129](https://github.com/getpaseo/paseo/pull/7129))
 - Changed Command Center to rank workspaces and agents by match and then recency, and to show timestamps, project icons, and highlighted matches ([#7277](https://github.com/getpaseo/paseo/pull/7277))
 - Added each Paseo subagent's model, thinking, mode, and context under its title in the subagents list ([#7290](https://github.com/getpaseo/paseo/pull/7290))
- Made subagent rows in the Subagents panel taller on phones, and gave their archive and detach buttons the standard press highlight ([#7364](https://github.com/getpaseo/paseo/pull/7364))
 - Changed Paseo tool calls in chats to lead with the action and its context, such as Send message · the first line of the prompt ([#7283](https://github.com/getpaseo/paseo/pull/7283))
 - Changed the New workspace form on phones to full-width fields, with Import session in the header ([#7239](https://github.com/getpaseo/paseo/pull/7239))
- Reduced rendering work in long chats while a reply streams ([#7052](https://github.com/getpaseo/paseo/pull/7052) by [@colonelpanic8](https://github.com/colonelpanic8), [#7342](https://github.com/getpaseo/paseo/pull/7342))
+- Reduced rendering work in long chats while a reply streams ([#7052](https://github.com/getpaseo/paseo/pull/7052) by [@colonelpanic8](https://github.com/colonelpanic8))
 - Made reopening the sidebar about 45% faster ([#7157](https://github.com/getpaseo/paseo/pull/7157))
 - Made projects and workspaces load faster after the app reconnects ([#7242](https://github.com/getpaseo/paseo/pull/7242))
 - Changed messages one agent sends another through the CLI or MCP to steer its running turn instead of interrupting it ([#5164](https://github.com/getpaseo/paseo/pull/5164) by [@derwells](https://github.com/derwells))
@@ -47,7 +46,6 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed `paseo plugin reload` failing with a 60-second timeout while the reload was still running ([#6306](https://github.com/getpaseo/paseo/pull/6306) by [@Mtuchel](https://github.com/Mtuchel))
 - Fixed follow-ups sent while a plugin ACP agent runs failing with "Provider does not support prompt.steer" ([#7270](https://github.com/getpaseo/paseo/pull/7270) by [@simonepri](https://github.com/simonepri))
 - Fixed Find showing no matches for prompt text drawn by a timeline plugin ([#7253](https://github.com/getpaseo/paseo/pull/7253) by [@a-grasso](https://github.com/a-grasso))
- Fixed late-loading composer plugin pills covering Copy and Fork after reopening a chat ([#7341](https://github.com/getpaseo/paseo/pull/7341) by [@sholiday](https://github.com/sholiday))

 ### Fixed

@@ -61,8 +59,6 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed an incomplete font name in Appearance breaking the app's styling ([#6695](https://github.com/getpaseo/paseo/pull/6695))
 - Fixed the Linux desktop window never appearing when the hidden window renders no frames ([#6726](https://github.com/getpaseo/paseo/pull/6726) by [@EhEo](https://github.com/EhEo))
 - Fixed opening another agent or workspace stalling while a different agent on the same host is streaming ([#7074](https://github.com/getpaseo/paseo/pull/7074) by [@colonelpanic8](https://github.com/colonelpanic8))
- Fixed the project's New workspace button choosing the first host instead of the active workspace's host ([#7308](https://github.com/getpaseo/paseo/pull/7308))
- Fixed the composer staying focused after switching tabs with keyboard shortcuts in touch browsers ([#7352](https://github.com/getpaseo/paseo/pull/7352))
 - Fixed the daemon running out of memory when several directory searches overlap on a large folder tree ([#7265](https://github.com/getpaseo/paseo/pull/7265))
 - Fixed dragging the Explorer edge stuttering with several panes open ([#7284](https://github.com/getpaseo/paseo/pull/7284) by [@colonelpanic8](https://github.com/colonelpanic8))
 - Fixed agent creation showing an error and a retry draft when the provider rejected the first prompt ([#6379](https://github.com/getpaseo/paseo/pull/6379))
@@ -72,7 +68,6 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed parent agents missing the finish notification when a child finished its first turn very quickly ([#6008](https://github.com/getpaseo/paseo/pull/6008) by [@ahmet-izgi](https://github.com/ahmet-izgi))
 - Fixed parent agents being told a child finished when its task was stopped or reloaded ([#6660](https://github.com/getpaseo/paseo/pull/6660) by [@Mar-garet](https://github.com/Mar-garet))
 - Fixed Codex chats containing U+2028 or U+2029 failing to reopen on Node 24 ([#5999](https://github.com/getpaseo/paseo/pull/5999) by [@grahameger](https://github.com/grahameger), [@jtsang4](https://github.com/jtsang4), [@kotusenka](https://github.com/kotusenka))
- Fixed resumed Codex goals appearing idle and refusing Stop after a continuation ([#7339](https://github.com/getpaseo/paseo/pull/7339) by [@hemaaanth](https://github.com/hemaaanth))
 - Fixed Add Project directory search hanging the daemon on macOS when it entered `~/Library` ([#5789](https://github.com/getpaseo/paseo/pull/5789) by [@lardissone](https://github.com/lardissone))
 - Fixed New workspace failing with "Invalid mode" when the saved mode isn't offered by the provider ([#5847](https://github.com/getpaseo/paseo/pull/5847) by [@mcowger](https://github.com/mcowger))
 - Fixed answering multi-select OpenCode v2 questions failing with "Invalid answer" ([#6149](https://github.com/getpaseo/paseo/pull/6149) by [@gammons](https://github.com/gammons))
@@ -104,13 +99,9 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed a service newly added to `paseo.json` failing to start until the daemon restarted ([#6542](https://github.com/getpaseo/paseo/pull/6542))
 - Fixed workspace service URLs returning 502 when the service listens only on IPv6 localhost ([#6753](https://github.com/getpaseo/paseo/pull/6753) by [@marcelocastrobarbosa](https://github.com/marcelocastrobarbosa))
 - Fixed terminals that could not be closed when their command was missing or exited immediately ([#6792](https://github.com/getpaseo/paseo/pull/6792) by [@KiraPC](https://github.com/KiraPC))
- Fixed MCP terminal key commands typing arrow and modifier key names instead of sending the keys ([#7343](https://github.com/getpaseo/paseo/pull/7343) by [@Aling33](https://github.com/Aling33))
- Fixed CJK text gaining spaces between characters after returning to a workspace in the native terminal ([#6452](https://github.com/getpaseo/paseo/pull/6452) by [@jasonhnd](https://github.com/jasonhnd), [@liujin0506](https://github.com/liujin0506), [@seob717](https://github.com/seob717))
+- Fixed CJK terminal text gaining spaces between characters after returning to a workspace ([#6452](https://github.com/getpaseo/paseo/pull/6452) by [@jasonhnd](https://github.com/jasonhnd), [@liujin0506](https://github.com/liujin0506), [@seob717](https://github.com/seob717))
 - Fixed copying Korean text from the terminal on iOS and Android adding spaces between characters or dropping the first one ([#7254](https://github.com/getpaseo/paseo/pull/7254), [#7260](https://github.com/getpaseo/paseo/pull/7260) by [@helloimdevman](https://github.com/helloimdevman))
- Fixed long-pressing a Korean word in the terminal on iOS and Android selecting only one character instead of the whole word ([#7353](https://github.com/getpaseo/paseo/pull/7353))
 - Fixed the self-hosted web app failing to connect through a reverse proxy on port 80 or 443 ([#6638](https://github.com/getpaseo/paseo/pull/6638) by [@kiawin](https://github.com/kiawin))
- Fixed the Hub connection never reconnecting after a silent network failure ([#7315](https://github.com/getpaseo/paseo/pull/7315))
- Fixed remote connections failing on slow networks when another resolved address is unreachable ([#7336](https://github.com/getpaseo/paseo/pull/7336))
 - Fixed assistant file links with spaces or non-ASCII characters failing with ENOENT ([#6520](https://github.com/getpaseo/paseo/pull/6520) by [@apple-ouyang](https://github.com/apple-ouyang), [@sunshinehomeyu-blip](https://github.com/sunshinehomeyu-blip))
 - Fixed local images in agent replies failing to load when their path contains spaces or non-ASCII characters ([#6877](https://github.com/getpaseo/paseo/pull/6877))
 - Fixed Markdown file previews not showing images referenced by relative paths ([#6750](https://github.com/getpaseo/paseo/pull/6750) by [@apple-ouyang](https://github.com/apple-ouyang))
@@ -167,10 +158,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed `nix build .#desktop` running out of memory on Macs with less than 15 GB of RAM ([#6537](https://github.com/getpaseo/paseo/pull/6537) by [@truelecter](https://github.com/truelecter))
 - Fixed usage providers changing places after Refresh all ([#6947](https://github.com/getpaseo/paseo/pull/6947) by [@sleroq](https://github.com/sleroq))
 - Fixed usage cards losing their last values and showing "Updated" when a refresh fails ([#7246](https://github.com/getpaseo/paseo/pull/7246))
- Fixed Usage merging distinct Cursor accounts into one card ([#7344](https://github.com/getpaseo/paseo/pull/7344))
 - Fixed the OpenCode Go usage icon being nearly invisible on dark themes ([#6362](https://github.com/getpaseo/paseo/pull/6362) by [@az33zy](https://github.com/az33zy))
- Fixed generic icons for Devin, Hermes, Kiro, and Antigravity in provider lists ([#7330](https://github.com/getpaseo/paseo/pull/7330) by [@OMEG-Lu](https://github.com/OMEG-Lu), [@kevenhu001-cyber](https://github.com/kevenhu001-cyber))
- Fixed sidebar setup buttons overflowing the card with long translated labels ([#7312](https://github.com/getpaseo/paseo/pull/7312) by [@gentslava](https://github.com/gentslava))

 ## 0.11.4 - 2026-10-15

@@ -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 flashes on native the moment a finger lands. A bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/screens/settings/settings-section.tsx`). 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 bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/screens/settings/settings-section.tsx`). 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.

@@ -249,7 +249,6 @@ New status pills use `<StatusBadge>`. Identity, shortcut, and interactive link b

 - `fontWeight.medium` on row titles, body text, button labels, badge text, or `<SidebarCallout>` titles. Medium is reserved for the structural-label tier described in §3 — section labels, modal/sheet titles, dense metadata emphasis, and tight action labels. Anything else is `normal`. `<ScreenTitle>` is responsive `400/300` and is never overridden.
 - `<Pressable>` wrapping `<Text>` to make a button. `<Button>` exists.
- Importing `Pressable` or a `Touchable*` outside `components/ui/`. A raw pressable has no standard press or hover feedback, so every one drifts. `paseo/no-raw-pressable` reports it; the files on its burn-down list in `.oxlintrc.json` may only leave it.
 - Bare `<Text>` for a section header inside settings. `<SettingsSection>` exists.
 - A muted paragraph between a section header and its card. Section-level explanation is the header's `info` tooltip (§7).
 - A "Settings" CTA on a detail page. Detail pages are settings; settings is reached from the sidebar, the host entry, or a row's kebab menu.
@@ -1,8 +0,0 @@
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
-
-Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
-
-Added
- Added background workspaces, hidden from the sidebar unless Show background is on
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
-
-Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
-
-Added
- Added background workspaces, hidden from the sidebar unless Show background is on
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
-
-Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
-
-Added
- Added background workspaces, hidden from the sidebar unless Show background is on
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
-
-Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
-
-Added
- Added background workspaces, hidden from the sidebar unless Show background is on
-
-Full notes: https://paseo.sh/changelog
@@ -1 +1 @@
-sha256-ObBdUmNSW+vDjzA7EbCDfZrB0nYDmcWmWe+UCoTMh/M=
+sha256-tSE4nb4E06GFZ8I9UEbo93nlPiAKtW00nkywgKQmMhI=
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "workspaces": [
@@ -36349,7 +36349,7 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "dependencies": {
        "@codemirror/commands": "6.10.4",
        "@codemirror/language": "6.12.4",
@@ -37469,12 +37469,12 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.12.0",
-        "@getpaseo/protocol": "0.12.0",
-        "@getpaseo/server": "0.12.0",
+        "@getpaseo/client": "0.12.0-beta.3",
+        "@getpaseo/protocol": "0.12.0-beta.3",
+        "@getpaseo/server": "0.12.0-beta.3",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -37721,10 +37721,10 @@
    },
    "packages/client": {
      "name": "@getpaseo/client",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "dependencies": {
-        "@getpaseo/protocol": "0.12.0",
-        "@getpaseo/relay": "0.12.0",
+        "@getpaseo/protocol": "0.12.0-beta.3",
+        "@getpaseo/relay": "0.12.0-beta.3",
        "zod": "^4.4.3"
      },
      "devDependencies": {
@@ -37735,7 +37735,7 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "license": "Apache-2.0",
      "dependencies": {
        "@getpaseo/cli": "*",
@@ -37979,7 +37979,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "license": "MIT",
      "devDependencies": {
        "@types/jest": "^29.5.14",
@@ -38875,7 +38875,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "dependencies": {
        "@codemirror/language": "6.12.4",
        "@codemirror/legacy-modes": "^6.5.3",
@@ -38904,14 +38904,14 @@
    },
    "packages/plugin": {
      "name": "@getpaseo/plugin",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "dependencies": {
        "@agentclientprotocol/sdk": "^1.4.0",
        "use-sync-external-store": "^1.6.0"
      },
      "devDependencies": {
-        "@getpaseo/client": "0.12.0",
-        "@getpaseo/protocol": "0.12.0",
+        "@getpaseo/client": "0.12.0-beta.3",
+        "@getpaseo/protocol": "0.12.0-beta.3",
        "@types/node": "^20.9.0",
        "@types/react": "~19.2.0",
        "react": "19.1.0",
@@ -38921,8 +38921,8 @@
        "zod": "^4.4.3"
      },
      "peerDependencies": {
-        "@getpaseo/client": "0.12.0",
-        "@getpaseo/protocol": "0.12.0",
+        "@getpaseo/client": "0.12.0-beta.3",
+        "@getpaseo/protocol": "0.12.0-beta.3",
        "react": "~19.1.0",
        "react-native": ">=0.81.5",
        "zod": "^4.4.3"
@@ -38944,7 +38944,7 @@
    },
    "packages/protocol": {
      "name": "@getpaseo/protocol",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "dependencies": {
        "semver": "^7.8.5",
        "zod": "^4.4.3"
@@ -38971,7 +38971,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "dependencies": {
        "base64-js": "^1.5.1",
        "tweetnacl": "^1.0.3",
@@ -39189,16 +39189,16 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.17.1",
        "@anthropic-ai/claude-agent-sdk": "0.3.246",
        "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.12.0",
-        "@getpaseo/highlight": "0.12.0",
-        "@getpaseo/plugin": "0.12.0",
-        "@getpaseo/protocol": "0.12.0",
-        "@getpaseo/relay": "0.12.0",
+        "@getpaseo/client": "0.12.0-beta.3",
+        "@getpaseo/highlight": "0.12.0-beta.3",
+        "@getpaseo/plugin": "0.12.0-beta.3",
+        "@getpaseo/protocol": "0.12.0-beta.3",
+        "@getpaseo/relay": "0.12.0-beta.3",
        "@isaacs/ttlcache": "^2.1.4",
        "@modelcontextprotocol/sdk": "1.29.0",
        "@opencode-ai/sdk": "1.14.46",
@@ -40119,7 +40119,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.29.1",
        "@cloudflare/workers-types": "^4.20260317.1",
@@ -41727,7 +41727,7 @@
    },
    "plugins": {
      "name": "@getpaseo/builtin-plugins",
-      "version": "0.12.0",
+      "version": "0.12.0-beta.3",
      "dependencies": {
        "@getpaseo/plugin": "*",
        "zod": "^4.4.3"
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -1,115 +0,0 @@
-import { execFileSync } from "node:child_process";
-import { mkdtemp, writeFile } from "node:fs/promises";
-import path from "node:path";
-import { test, expect, type Page } from "../support/fixtures";
-import { getServerId } from "../support/helpers/server-id";
-import { connectSeedClient } from "../support/helpers/seed-client";
-import { createTempGitRepo, resolveTempRoot } from "../support/helpers/workspace";
-import { buildHostWorkspaceRoute } from "../../src/utils/host-routes";
-
-// The compact toolbar flattens every git action into one menu, and the policy keeps the actions
-// it can promote to `primary` in `secondary` as well. A promoted action must still show once.
-const cleanupTasks: Array<() => Promise<void>> = [];
-
-test.afterEach(async () => {
-  for (const task of cleanupTasks.splice(0)) {
-    await task();
-  }
-});
-
-async function createRemoteRepo(prefix: string): Promise<string> {
-  const repo = await createTempGitRepo(prefix, {
-    withRemote: true,
-    files: [{ path: "src/app.ts", content: "export const app = 1;\n" }],
-  });
-  cleanupTasks.push(repo.cleanup);
-  // The helper puts the bare remote inside the checkout; keep it out of the status.
-  await writeFile(path.join(repo.path, ".git/info/exclude"), "remote.git/\n");
-  return repo.path;
-}
-
-async function registerWorkspace(repoPath: string): Promise<string> {
-  const client = await connectSeedClient();
-  cleanupTasks.push(async () => {
-    await client.close().catch(() => undefined);
-  });
-  const created = await client.createWorkspace({ source: { kind: "directory", path: repoPath } });
-  if (!created.workspace) {
-    throw new Error(created.error ?? `Failed to create workspace ${repoPath}`);
-  }
-  return created.workspace.id;
-}
-
-async function openCompactActionsMenu(page: Page, workspaceId: string) {
-  await page.setViewportSize({ width: 390, height: 844 });
-  await page.goto(buildHostWorkspaceRoute(getServerId(), workspaceId));
-  await page.reload();
-  await page.getByTestId("workspace-explorer-toggle").first().click();
-  const changesTab = page.getByTestId("explorer-tab-changes").filter({ visible: true });
-  await expect(changesTab).toBeVisible({ timeout: 30_000 });
-  await changesTab.click();
-  const explorer = page.getByTestId("explorer-content-area").filter({ visible: true });
-  await expect(explorer.getByTestId("changes-header")).toBeVisible({ timeout: 30_000 });
-
-  const trigger = explorer.getByTestId("changes-actions-menu-trigger");
-  await expect(trigger).toBeVisible({ timeout: 30_000 });
-  await trigger.click();
-  const menu = page.getByTestId("changes-primary-cta-menu");
-  await expect(menu).toBeVisible();
-  return menu;
-}
-
-test("compact git actions menu lists a promoted Pull once", async ({ page }) => {
-  const repoPath = await createRemoteRepo("compact-menu-pull-");
-  cleanupTasks.push(async () => {
-    execFileSync("rm", ["-rf", repoPath]);
-  });
-
-  // Advance origin so the clean checkout is behind it and Pull is the promoted action.
-  const other = await mkdtemp(path.join(await resolveTempRoot(), "compact-menu-other-"));
-  cleanupTasks.push(async () => {
-    execFileSync("rm", ["-rf", other]);
-  });
-  execFileSync("git", ["clone", path.join(repoPath, "remote.git"), other], { stdio: "ignore" });
-  execFileSync("git", ["config", "user.email", "e2e@paseo.test"], { cwd: other, stdio: "ignore" });
-  execFileSync("git", ["config", "user.name", "Paseo E2E"], { cwd: other, stdio: "ignore" });
-  await writeFile(path.join(other, "src/incoming.ts"), "export const incoming = 1;\n");
-  execFileSync("git", ["add", "--all"], { cwd: other, stdio: "ignore" });
-  execFileSync("git", ["commit", "-m", "Incoming commit"], { cwd: other, stdio: "ignore" });
-  execFileSync("git", ["push", "origin", "main"], { cwd: other, stdio: "ignore" });
-  execFileSync("git", ["fetch", "origin"], { cwd: repoPath, stdio: "ignore" });
-
-  const workspaceId = await registerWorkspace(repoPath);
-  const menu = await openCompactActionsMenu(page, workspaceId);
-
-  await expect(menu.getByTestId("changes-menu-pull")).toHaveCount(1);
-  await expect(menu.getByRole("menuitem")).toHaveText([
-    "Pull",
-    "Push",
-    "Pull and push",
-    "Archive workspace",
-  ]);
-});
-
-test("compact git actions menu lists a promoted Push once", async ({ page }) => {
-  const repoPath = await createRemoteRepo("compact-menu-push-");
-  cleanupTasks.push(async () => {
-    execFileSync("rm", ["-rf", repoPath]);
-  });
-  const workspaceId = await registerWorkspace(repoPath);
-
-  // Commit so the clean checkout is ahead of origin and Push is the promoted action.
-  await writeFile(path.join(repoPath, "src/mine.ts"), "export const mine = 1;\n");
-  execFileSync("git", ["add", "--all"], { cwd: repoPath, stdio: "ignore" });
-  execFileSync("git", ["commit", "-m", "Local commit"], { cwd: repoPath, stdio: "ignore" });
-
-  const menu = await openCompactActionsMenu(page, workspaceId);
-
-  await expect(menu.getByTestId("changes-menu-push")).toHaveCount(1);
-  await expect(menu.getByRole("menuitem")).toHaveText([
-    "Push",
-    "Pull",
-    "Pull and push",
-    "Archive workspace",
-  ]);
-});
@@ -1,7 +1,6 @@
 import { expect, test, type Page } from "../support/fixtures";
 import {
  blurComposerInput,
-  roundTripComposerTabBeforePaint,
  composerLocator,
  enterComposerFullscreen,
  exitComposerFullscreen,
@@ -18,6 +17,7 @@ import {
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 import { createMockIdleAgent, openWorkspaceWithAgents } from "../support/helpers/archive-tab";
 import { seedWorkspace } from "../support/helpers/seed-client";
+import { switchComposerTabWithKeyboard } from "../support/helpers/composer";
 import {
  closeMobileAgentSidebar,
  closeMobileExplorer,
@@ -205,21 +205,19 @@ test.describe("touch screen wide enough for the desktop layout", () => {
        title: "Second touch chat",
      });
      await openWorkspaceWithAgents(page, [first, second]);
-      // Repeat after an explicit edit so retained focus from an earlier visit is
-      // also dismissed when the same mounted editor becomes inactive again.
-      for (const draft of ["Keep this touch draft", "Edit this touch draft again"]) {
-        await composerLocator(page).fill(draft);
-        await expectComposerFocused(page);
-        // An external keyboard changes tabs without a pointer click blurring the
-        // editor first. The device still has a touch-primary focus policy.
-        await roundTripComposerTabBeforePaint(page, "Second touch chat");
-        await expectComposerDraft(page, draft);
-        await expectComposerNotFocused(page);
-        await composerLocator(page).tap();
-        await expectComposerFocused(page);
-        await typeIntoFocusedComposer(page, " after return");
-        await expectComposerDraft(page, `${draft} after return`);
-      }
+      await composerLocator(page).fill("Keep this touch draft");
+      await expectComposerFocused(page);
+      // An external keyboard changes tabs without a pointer click blurring the
+      // editor first. The device still has a touch-primary focus policy.
+      await switchComposerTabWithKeyboard(page, "previous");
+      await expectComposerDraft(page, "");
+      await switchComposerTabWithKeyboard(page, "next");
+      await expectComposerDraft(page, "Keep this touch draft");
+      await expectComposerNotFocused(page);
+      await composerLocator(page).tap();
+      await expectComposerFocused(page);
+      await typeIntoFocusedComposer(page, " after return");
+      await expectComposerDraft(page, "Keep this touch draft after return");
    } finally {
      await workspace.cleanup();
    }
@@ -1,51 +0,0 @@
-import { ACP_PROVIDER_ICON_SVGS } from "../../src/assets/acp-provider-icons";
-import { expect, test, type Page } from "../support/fixtures";
-import type { TestInfo } from "@playwright/test";
-import { gotoAppShell, openSettings } from "../support/helpers/app";
-import { getServerId } from "../support/helpers/server-id";
-import {
-  findAcpCatalogProvider,
-  openAddProviderArea,
-  openSettingsHost,
-  openSettingsHostSection,
-} from "../support/helpers/settings";
-
-async function openProviderCatalog(page: Page) {
-  await gotoAppShell(page);
-  await openSettings(page);
-  await openSettingsHost(page, getServerId());
-  await openSettingsHostSection(page, getServerId(), "providers");
-  await openAddProviderArea(page);
-}
-
-async function expectProviderArtwork(
-  page: Page,
-  testInfo: TestInfo,
-  id: "devin" | "hermes" | "kiro",
-  name: string,
-) {
-  await findAcpCatalogProvider(page, name);
-  // Catalog tiles have no semantic role; scope artwork to the named provider's tile.
-  const icon = page.getByTestId(`provider-catalog-tile-${id}`).locator("svg").first();
-  await expect(icon).toBeVisible();
-  // Provider artwork is 24px; the generic PackagePlus fallback is 20px.
-  await expect.soft(icon).toHaveAttribute("width", "24");
-  const expectedPaths = await page.evaluate((xml) => {
-    const document = new DOMParser().parseFromString(xml, "image/svg+xml");
-    return Array.from(document.querySelectorAll("path"), (path) => path.getAttribute("d")!);
-  }, ACP_PROVIDER_ICON_SVGS[id]);
-  await expect(icon.locator("path")).toHaveCount(expectedPaths.length);
-  for (const [index, path] of expectedPaths.entries()) {
-    await expect(icon.locator("path").nth(index)).toHaveAttribute("d", path);
-  }
-  await page.screenshot({ path: testInfo.outputPath(`${id}-catalog.png`) });
-}
-
-test("#7087: the provider catalog shows Devin, Hermes, and Kiro artwork", async ({
-  page,
-}, testInfo) => {
-  await openProviderCatalog(page);
-  await expectProviderArtwork(page, testInfo, "devin", "Devin CLI");
-  await expectProviderArtwork(page, testInfo, "hermes", "Hermes");
-  await expectProviderArtwork(page, testInfo, "kiro", "Kiro CLI");
-});
@@ -266,22 +266,14 @@ test("keeps overview tool calls inline on desktop", async ({ page }) => {
  const agent = await createOverviewAgent(page, "Desktop overview tool calls");

  try {
-    const gate = await holdStreamAfterFirstCompletedToolCall(page, agent.agentId);
    await openOverviewAgent(page, agent);
    await agent.client.sendAgentMessage(agent.agentId, "Exercise desktop overview tool calls.");
-    await gate.waitForFirstCompleted();
    const group = page.getByTestId("tool-call-group").first();
    await expect(group).toBeVisible();

-    // Keep streaming layout changes out of the pointer-down/pointer-up interval.
-    const header = group.getByRole("button").first();
-    await header.click();
+    await group.click();
+    await expect(page.getByTestId("tool-call-group-sheet")).toHaveCount(0);
    await expect(group.getByTestId("tool-call-badge").first()).toBeVisible();
-    await expect(page.getByTestId("tool-call-group-sheet")).toHaveCount(0);
-
-    gate.release(1);
-    await expect.poll(() => group.getByTestId("tool-call-badge").count()).toBeGreaterThanOrEqual(2);
-    await expect(page.getByTestId("tool-call-group-sheet")).toHaveCount(0);
  } finally {
    await agent.cleanup();
  }
@@ -1,19 +0,0 @@
-# Prerequisite: a native terminal showing the output of echo '한글 문장'
-# on its first row, with no active selection. Use a dedicated QA workspace.
-# Coordinates target the first half of 문 on a 1080x1920 phone at default
-# code size. Override WORD_X/WORD_Y for other device geometry.
-context platform=android timeout=30000 retries=0
-env APP_ID=sh.paseo.debug
-env WORD_X=105
-env WORD_Y=251
-
-open "${APP_ID}"
-wait "label=\"Terminal input\"" 10000
-wait "label=\"한글 문장\"" 10000
-longpress "${WORD_X}" "${WORD_Y}" 650
-wait "id=\"terminal-copy\"" 5000
-press "id=\"terminal-copy\""
-# Copy clears the selection; only Android's clipboard preview has this exact
-# text, since the unselected terminal row contains the full sentence.
-wait "text=\"문장\"" 3000
-close
@@ -1,47 +0,0 @@
-# Late composer pill clearance
-
-This regression opens a completed conversation, relaunches the Android app, and
-registers a composer pill five seconds after the client plugin loads. It checks
-that the completed turn's Copy and Fork buttons remain fully above the pill.
-The daemon, plugin API, native app, layout, and accessibility bounds are real;
-no provider calls are needed during the test.
-
-Prerequisites:
-
- Build the server and app dependencies with `npm run build:server` and
-  `npm run build --workspace=@getpaseo/expo-two-way-audio`.
- Run an isolated development daemon on a non-default port.
- Run this checkout's Metro server and open the connected Android dev client
-  with `agent-device`. The app must already know the isolated daemon.
- Open a completed conversation on a compact portrait Android emulator, at the
-  latest turn, with no other composer tracks visible. Keep the software keyboard
-  closed. Note the workspace and agent IDs from the daemon.
-
-Set `WORKSPACE_ID` and `AGENT_ID` to that conversation, then run from the
-repository root, substituting the session and ports:
-
-```sh
-PASEO_OVERLAY_ARTIFACTS_DIR=.dev/composer-overlay-evidence \
-  node packages/app/e2e/mobile/composer-overlay/android.mjs \
-  composer-overlay ws://127.0.0.1:6843/ws "$WORKSPACE_ID" "$AGENT_ID" sh.paseo.debug 8193
-```
-
-The runner installs and removes its delayed plugin and leaves the conversation
-intact. It preserves the daemon's previous plugins-enabled setting. The evidence directory
-contains the cold-reopen screenshot and raw accessibility snapshot. Without an
-explicit directory, temporary evidence is removed with the fixture.
-
-To check an existing capture independently:
-
-```sh
-node packages/app/e2e/mobile/composer-overlay/assert-footer-clear.mjs \
-  .dev/composer-overlay-evidence/cold-reopen.json 'Overlay regression pill'
-```
-
-On the failing baseline, the Copy button extends below the pill's top edge. With
-the correction, both actions are clear before the composer receives focus.
-
-Additional checks on the same conversation: opening the keyboard keeps the footer
-clear; after scrolling up, a newly registered pill must not jump back to the latest
-turn. Native iOS uses a different keyboard implementation and needs its own device
-verification.
@@ -1,95 +0,0 @@
-// Start on a completed conversation in the connected Android dev client.
-// node android.mjs <session> <daemon-ws-url> <workspace-id> <agent-id> [app-id] [metro-port]
-import assert from "node:assert/strict";
-import { execFileSync } from "node:child_process";
-import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { WebSocket } from "ws";
-import { DaemonClient } from "../../../../client/dist/daemon-client.js";
-
-const [, , session, daemonUrl, workspaceId, agentId, appId = "sh.paseo.debug", metroPort = "8081"] =
-  process.argv;
-assert(
-  session && daemonUrl && workspaceId && agentId,
-  "Pass a session, isolated daemon URL, workspace ID, and agent ID",
-);
-const url = new URL(daemonUrl);
-assert(["127.0.0.1", "localhost"].includes(url.hostname), "Use an isolated loopback daemon");
-assert(!["", "6767", "6768"].includes(url.port), "Do not use the installed or development daemon");
-const directory = await mkdtemp(path.join(tmpdir(), "paseo-composer-overlay-"));
-const artifacts = process.env.PASEO_OVERLAY_ARTIFACTS_DIR ?? path.join(directory, "evidence");
-await mkdir(artifacts, { recursive: true });
-const pluginId = "composer-overlay-mobile-repro";
-const pillLabel = "Overlay regression pill";
-const client = new DaemonClient({
-  url: daemonUrl,
-  clientId: "composer-overlay-mobile-regression",
-  clientType: "cli",
-  appVersion: JSON.parse(await readFile(new URL("../../../package.json", import.meta.url))).version,
-  webSocketFactory: (address, options) => new WebSocket(address, options),
-});
-function ad(...args) {
-  return execFileSync("agent-device", [...args, "--session", session], {
-    encoding: "utf8",
-    timeout: 90_000,
-  });
-}
-let installed = false;
-let previousConfig;
-try {
-  ad("wait", 'label="Copy turn"', "20000");
-  await client.connect();
-  previousConfig = (await client.getDaemonConfig()).config;
-  await client.patchDaemonConfig({ pluginsEnabled: true });
-  await writeFile(
-    path.join(directory, "paseo-plugin.json"),
-    JSON.stringify({
-      id: pluginId,
-      requirements: { paseo: ">=0.11.4" },
-    }),
-  );
-  await writeFile(
-    path.join(directory, "index.client.tsx"),
-    `export default function contribute(client) {
-    let pill;
-    const timer = setTimeout(() => {
-      pill = client.addComposerPill({
-        id: "late-pill", workspaceId: ${JSON.stringify(workspaceId)}, agentId: ${JSON.stringify(agentId)},
-        button: { title: ${JSON.stringify(pillLabel)}, icon: "Clock", behavior: { kind: "action", onPress() {} } },
-      });
-    }, 5000);
-    return () => { clearTimeout(timer); pill?.remove(); };
-  }`,
-  );
-  await client.installDirectoryPlugin(directory);
-  installed = true;
-  ad("wait", `label="${pillLabel}"`, "20000");
-  // Match the report: reopen a completed conversation, then let the plugin register late.
-  ad(
-    "open",
-    appId,
-    "--platform",
-    "android",
-    "--metro-port",
-    metroPort,
-    "--no-test-ime",
-    "--relaunch",
-  );
-  ad("wait", `label="${pillLabel}"`, "20000");
-  const capture = path.join(artifacts, "cold-reopen.json");
-  await writeFile(capture, ad("snapshot", "--raw", "--json"));
-  ad("screenshot", path.join(artifacts, "cold-reopen.png"));
-  execFileSync(
-    process.execPath,
-    [fileURLToPath(new URL("./assert-footer-clear.mjs", import.meta.url)), capture, pillLabel],
-    { stdio: "inherit" },
-  );
-} finally {
-  if (installed) await client.removePlugin(pluginId);
-  if (previousConfig)
-    await client.patchDaemonConfig({ pluginsEnabled: previousConfig.pluginsEnabled });
-  await client.close();
-  await rm(directory, { recursive: true, force: true });
-}
@@ -1,21 +0,0 @@
-// Assert geometry from a fresh agent-device snapshot --raw --json capture.
-// node assert-footer-clear.mjs <snapshot.json> <composer-pill-label>
-import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-
-const [, , snapshotPath, pillLabel] = process.argv;
-assert(snapshotPath && pillLabel, "Pass a snapshot JSON path and composer pill label");
-const { data } = JSON.parse(readFileSync(snapshotPath, "utf8"));
-const buttons = data.nodes.filter((node) => node.type === "android.widget.Button");
-const pill = buttons.find((node) => node.label === pillLabel);
-assert(pill?.rect, `Composer pill '${pillLabel}' must be visible`);
-for (const label of ["Copy turn", "Fork chat from here"]) {
-  const button = buttons.find((node) => node.label === label);
-  assert(button?.rect, `Completed-turn action '${label}' must be visible`);
-  const bottom = button.rect.y + button.rect.height;
-  assert(
-    bottom <= pill.rect.y,
-    `${label} ends at ${bottom}, below composer pill top ${pill.rect.y}`,
-  );
-}
-console.log("PASS: completed-turn actions remain fully above the composer pill");
@@ -501,59 +501,3 @@ export async function expectNoCollapsedVisibleComposer(page: Page): Promise<void
  expect(frames.length).toBeGreaterThan(0);
  expect(frames.filter((frame) => frame.root < 42 || frame.input < 42)).toEqual([]);
 }
-
-/** Exercise the quick-return race before a hidden pane gets a rendering frame. */
-export async function roundTripComposerTabBeforePaint(
-  page: Page,
-  activeChatTitle: string,
-): Promise<void> {
-  const activeTab = page.getByRole("button", { name: activeChatTitle, exact: true });
-  await expect(activeTab).toHaveAttribute("aria-selected", "true");
-  const result = await activeTab.evaluate((tab) => {
-    const editor = document.activeElement;
-    return new Promise<{ returnedBeforePaint: boolean; focused: boolean }>((resolve) => {
-      let switchedAway = false;
-      let painted = false;
-      let frame = 0;
-      const shortcut = (code: "BracketLeft" | "BracketRight") => {
-        document.dispatchEvent(
-          new KeyboardEvent("keydown", {
-            key: code === "BracketLeft" ? "{" : "}",
-            code,
-            altKey: true,
-            shiftKey: true,
-            bubbles: true,
-            cancelable: true,
-          }),
-        );
-      };
-      // Watch selection commits without reading layout: a layout read could make
-      // Chromium blur the hidden editor and erase the condition under test.
-      const observer = new MutationObserver(() => {
-        if (!switchedAway && tab.getAttribute("aria-selected") === "false") {
-          switchedAway = true;
-          frame = requestAnimationFrame(() => {
-            painted = true;
-          });
-          // Deliver the return shortcut before rendering, without a Playwright
-          // round trip allowing the browser to paint the inactive tab first.
-          shortcut("BracketRight");
-        } else if (switchedAway && tab.getAttribute("aria-selected") === "true") {
-          observer.disconnect();
-          cancelAnimationFrame(frame);
-          return resolve({
-            returnedBeforePaint: !painted,
-            focused: document.activeElement === editor,
-          });
-        }
-      });
-      observer.observe(tab, { attributes: true, attributeFilter: ["aria-selected"] });
-      shortcut("BracketLeft");
-    });
-  });
-  expect(
-    result.returnedBeforePaint,
-    "tab round trip must finish before rendering the hidden pane",
-  ).toBe(true);
-  expect(result.focused, "returning on touch must leave the composer unfocused").toBe(false);
-}
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -1252,12 +1252,6 @@ function agentStreamViewPropsEqual(
  if (left.isAuthoritativeHistoryReady !== right.isAuthoritativeHistoryReady) {
    reasons.push("isAuthoritativeHistoryReady");
  }
-  if (left.bottomOverlayTailClearance !== right.bottomOverlayTailClearance) {
-    reasons.push("bottomOverlayTailClearance");
-  }
-  if (left.bottomOverlayControlClearance !== right.bottomOverlayControlClearance) {
-    reasons.push("bottomOverlayControlClearance");
-  }
  if (left.toast !== right.toast) reasons.push("toast");
  if (left.onOpenWorkspaceFile !== right.onOpenWorkspaceFile) reasons.push("onOpenWorkspaceFile");
  if (left.readOnly !== right.readOnly) reasons.push("readOnly");
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-  <path d="M2.033 9.867l2.554 1.483a.589.589 0 00.592 0l2.554-1.483.01-.008a.608.608 0 00.11-.084l.013-.015a.631.631 0 00.076-.1c.003-.005.008-.01.01-.016a.558.558 0 00.052-.125l.007-.028a.611.611 0 00.019-.14V7.868c0-.572.307-1.105.8-1.392a1.595 1.595 0 011.598 0l1.277.742a.54.54 0 00.129.053l.028.01c.044.01.088.015.133.016h.006l.013-.002a.587.587 0 00.27-.074l.011-.004 2.554-1.483a.596.596 0 00.297-.516V2.253a.595.595 0 00-.297-.516L12.293.257a.587.587 0 00-.591 0L9.148 1.737l-.01.01a.609.609 0 00-.109.083l-.014.015a.632.632 0 00-.076.1c-.003.005-.008.01-.01.016a.57.57 0 00-.052.124l-.007.028a.612.612 0 00-.018.14v1.483c0 .572-.307 1.105-.8 1.393a1.597 1.597 0 01-1.599 0l-1.276-.742a.603.603 0 00-.13-.053l-.028-.008a.658.658 0 00-.133-.018h-.02a.57.57 0 00-.269.074c-.003.002-.008.002-.012.005L2.033 5.872a.596.596 0 00-.297.515v2.966c0 .213.113.41.297.515z" fill="currentColor"></path><path d="M15.943 10.607a1.596 1.596 0 011.599 0l1.276.74c.041.025.085.04.13.055l.028.008c.043.01.088.016.133.018h.005c.005 0 .01-.002.014-.003a.474.474 0 00.122-.016l.021-.005a.616.616 0 00.126-.052c.004-.002.009-.002.013-.005l2.554-1.482a.597.597 0 00.297-.516V6.383a.596.596 0 00-.297-.515l-2.552-1.483a.587.587 0 00-.592 0l-2.553 1.482-.011.008a.61.61 0 00-.108.084l-.014.016a.637.637 0 00-.076.1c-.003.005-.008.01-.01.016a.57.57 0 00-.052.124l-.007.029a.612.612 0 00-.018.14v1.482c0 .572-.307 1.105-.8 1.393a1.597 1.597 0 01-1.599 0l-1.276-.742a.584.584 0 00-.13-.053l-.028-.008a.62.62 0 00-.133-.018h-.02a.587.587 0 00-.269.074l-.012.004L9.15 10a.596.596 0 00-.296.516v2.966c0 .212.112.409.296.515l2.554 1.483s.008.002.012.005c.04.022.082.04.126.052l.02.004a.57.57 0 00.123.017l.014.002h.006c.054 0 .108-.01.16-.025a.587.587 0 00.13-.054l1.277-.741a1.597 1.597 0 012.398 1.392v1.482c0 .049.007.095.019.14l.007.028a.619.619 0 00.051.125c.004.006.008.01.01.016a.6.6 0 00.076.1l.014.015c.033.032.069.06.108.084.004.002.006.006.011.008l2.554 1.483a.59.59 0 00.593 0l2.554-1.483a.597.597 0 00.296-.516v-2.965a.595.595 0 00-.296-.516l-2.554-1.483s-.008-.002-.012-.005a.54.54 0 00-.126-.051c-.007-.003-.013-.003-.02-.005a.635.635 0 00-.125-.017h-.018a.557.557 0 00-.16.026.588.588 0 00-.13.053l-1.276.742a1.595 1.595 0 01-1.598 0 1.615 1.615 0 010-2.785l-.005-.001z" fill="currentColor"></path><path d="M14.848 18.265l-2.554-1.482-.012-.005a.526.526 0 00-.126-.052c-.007-.002-.014-.002-.02-.005a.64.64 0 00-.124-.017h-.02a.56.56 0 00-.16.026.588.588 0 00-.13.053l-1.276.742a1.594 1.594 0 01-1.598 0c-.493-.286-.8-.82-.8-1.393V14.65a.563.563 0 00-.018-.14l-.008-.028a.604.604 0 00-.051-.124l-.01-.017a.603.603 0 00-.076-.1l-.014-.015a.596.596 0 00-.109-.084c-.003-.002-.005-.006-.01-.008L5.178 12.65a.587.587 0 00-.591 0l-2.554 1.483a.596.596 0 00-.297.516v2.965c0 .213.113.41.297.516l2.554 1.483.012.004a.618.618 0 00.267.074l.016.002h.007a.55.55 0 00.16-.026.584.584 0 00.129-.053l1.277-.742a1.597 1.597 0 012.398 1.393v1.482c0 .05.007.095.019.14l.007.028c.013.044.03.085.051.125l.01.016c.022.036.047.07.076.1l.014.015c.032.032.069.06.109.084l.01.008 2.554 1.483a.587.587 0 00.593 0l2.554-1.483a.596.596 0 00.296-.515v-2.966a.596.596 0 00-.296-.516h-.002z" fill="currentColor"></path>
-</svg>
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 1024 1024" fill="none">
-  <path fill="currentColor" d="M395.479 633.828L735.91 381.105C752.599 368.715 776.454 373.548 784.406 392.792C826.26 494.285 807.561 616.253 724.288 699.996C641.016 783.739 525.151 802.104 419.247 760.277L303.556 814.143C469.49 928.202 670.987 899.995 796.901 773.282C896.776 672.843 927.708 535.937 898.785 412.476L899.047 412.739C857.105 231.37 909.358 158.874 1016.4 10.6326C1018.93 7.11771 1021.47 3.60279 1024 0L883.144 141.651V141.212L395.392 633.916"/>
-  <path fill="currentColor" d="M325.226 695.251C206.128 580.84 226.662 403.776 328.285 301.668C403.431 226.097 526.549 195.254 634.026 240.596L749.454 186.994C728.657 171.88 702.007 155.623 671.424 144.2C533.19 86.9942 367.693 115.465 255.323 228.382C147.234 337.081 113.244 504.215 171.613 646.833C215.216 753.423 143.739 828.818 71.7385 904.916C46.2237 931.893 20.6216 958.87 0 987.429L325.139 695.339"/>
-</svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M18.8 0H5.2A5.2 5.2 0 000 5.2v13.6A5.2 5.2 0 005.2 24h13.6a5.2 5.2 0 005.2-5.2V5.2A5.2 5.2 0 0018.8 0z" fill="#9046FF" /> <path d="M7.97 16.376c-1.644 3.642 1.86 4.556 4.443 2.424.76 2.39 3.608.607 4.631-1.247 2.251-4.084 1.342-8.249 1.108-9.108-1.6-5.859-9.6-5.869-10.976.03-.323 1.033-.328 2.206-.507 3.423-.09.617-.16 1.009-.393 1.655-.139.373-.323.7-.62 1.257-.458.865-.264 2.53 2.101 1.665l.224-.1h-.01l-.001.001z" fill="#fff" /> <path d="M12.722 10.985c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.218-.97a.61.61 0 01.537-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005zm2.703 0c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.219-.97a.61.61 0 01.536-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005z" fill="#000" /></svg>
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-  <path d="M16.278 2c1.156 0 2.093.927 2.093 2.07v12.501a.74.74 0 00.744.709.74.74 0 00.743-.709V9.099a2.06 2.06 0 012.071-2.049A2.06 2.06 0 0124 9.1v6.561a.649.649 0 01-.652.645.649.649 0 01-.653-.645V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v7.472a2.037 2.037 0 01-2.048 2.026 2.037 2.037 0 01-2.048-2.026v-12.5a.785.785 0 00-.788-.753.785.785 0 00-.789.752l-.001 15.904A2.037 2.037 0 0113.441 22a2.037 2.037 0 01-2.048-2.026V18.04c0-.356.292-.645.652-.645.36 0 .652.289.652.645v1.934c0 .263.142.506.372.638.23.131.514.131.744 0a.734.734 0 00.372-.638V4.07c0-1.143.937-2.07 2.093-2.07zm-5.674 0c1.156 0 2.093.927 2.093 2.07v11.523a.648.648 0 01-.652.645.648.648 0 01-.652-.645V4.07a.785.785 0 00-.789-.78.785.785 0 00-.789.78v14.013a2.06 2.06 0 01-2.07 2.048 2.06 2.06 0 01-2.071-2.048V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v3.8a2.06 2.06 0 01-2.071 2.049A2.06 2.06 0 010 12.9v-1.378c0-.357.292-.646.652-.646.36 0 .653.29.653.646V12.9c0 .418.343.757.766.757s.766-.339.766-.757V9.099a2.06 2.06 0 012.07-2.048 2.06 2.06 0 012.071 2.048v8.984c0 .419.343.758.767.758.423 0 .766-.339.766-.758V4.07c0-1.143.937-2.07 2.093-2.07z" fill="currentColor" fill-rule="nonzero"></path>
-</svg>
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-  <path d="M24 20.541H3.428v-3.426H0V3.4h24V20.54zM3.428 17.115h17.144V6.827H3.428v10.288zm8.573-5.196l-2.425 2.424-2.424-2.424 2.424-2.424 2.425 2.424zm6.857-.001l-2.424 2.423-2.425-2.423 2.425-2.425 2.424 2.425z" fill="currentColor"></path>
-</svg>
@@ -1,4 +1,4 @@
-import { actionsWithoutPrimary, type GitAction, type GitActions } from "@/git/policy";
+import type { GitAction, GitActions } from "@/git/policy";
 import type { KeyboardActionDefinition } from "@/keyboard/keyboard-action-dispatcher";
 import type {
  WorkspacePanelPlacement,
@@ -581,7 +581,9 @@ export function buildWorkspaceCommandCenterContributions(
    ...(source.capabilities.canSplitPanes ? buildPaneContributions(source) : []),
  ];

-  for (const [index, action] of actionsWithoutPrimary(source.gitActions).entries()) {
+  const primary = source.gitActions.primary;
+  for (const [index, action] of source.gitActions.secondary.entries()) {
+    if (action.id === primary?.id) continue;
    contributions.push(buildGitContribution(source, action, 100 + index, "query"));
  }

@@ -1,17 +0,0 @@
-import Svg, { Path } from "react-native-svg";
-
-interface AntigravityIconProps {
-  size?: number;
-  color?: string;
-}
-
-export function AntigravityIcon({ size = 16, color = "currentColor" }: AntigravityIconProps) {
-  return (
-    <Svg width={size} height={size} viewBox="0 0 24 24" fill={color}>
-      <Path
-        transform="translate(12 12) scale(0.24) translate(-55.738 -56.945)"
-        d="M89.6992 93.695C94.3659 97.195 101.366 94.8617 94.9492 88.445C75.6992 69.7783 79.7825 18.445 55.8659 18.445C31.9492 18.445 36.0325 69.7783 16.7825 88.445C9.78251 95.445 17.3658 97.195 22.0325 93.695C40.1159 81.445 38.9492 59.8617 55.8659 59.8617C72.7825 59.8617 71.6159 81.445 89.6992 93.695Z"
-      />
-    </Svg>
-  );
-}
@@ -1,18 +0,0 @@
-import Svg, { Path } from "react-native-svg";
-
-interface KiroIconProps {
-  size?: number;
-  color?: string;
-}
-
-export function KiroIcon({ size = 16, color = "currentColor" }: KiroIconProps) {
-  return (
-    <Svg width={size} height={size} viewBox="0 0 24 24" fill={color}>
-      <Path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M7.97 16.376c-1.644 3.642 1.86 4.556 4.443 2.424.76 2.39 3.608.607 4.631-1.247 2.251-4.084 1.342-8.249 1.108-9.108-1.6-5.859-9.6-5.869-10.976.03-.323 1.033-.328 2.206-.507 3.423-.09.617-.16 1.009-.393 1.655-.139.373-.323.7-.62 1.257-.458.865-.264 2.53 2.101 1.665l.224-.1h-.01l-.001.001zM12.722 10.985c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.218-.97a.61.61 0 01.537-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005zm2.703 0c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.219-.97a.61.61 0 01.536-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005z"
-      />
-    </Svg>
-  );
-}
@@ -208,56 +208,6 @@ it("lets the engine own code boundaries while classifying candidate values", asy
  ]);
 });

-describe("bare URL sentence punctuation", () => {
-  it.each([".", ",", ";", ":", "!", "?", ")", ").", "...", "?!"])(
-    "leaves %s outside the link and preserves the rendered sentence",
-    async (punctuation) => {
-      const url = "https://github.com/getpaseo/paseo/pull/7357";
-      const source = `${url}${punctuation} Not merged.`;
-      const prepared = prepareMarkdownSource(source);
-      const tree = recognizeTextLinks(
-        await parseMarkdown(prepared.render(), { latexMath: false }),
-        prepared.linkRecognition.text,
-        prepared.linkRecognition.inlineCode,
-      );
-      expect(tree.children?.[0]?.children).toEqual([
-        {
-          type: "Link",
-          attributes: { url },
-          children: [{ type: "Text", content: url }],
-        },
-        { type: "Text", content: `${punctuation} Not merged.` },
-      ]);
-    },
-  );
-
-  it.each([
-    "https://example.com/a.b",
-    "https://example.com/a?foo=bar&baz=2",
-    "https://example.com/a#L10",
-    "https://en.wikipedia.org/wiki/Function_(mathematics)",
-    "https://example.com/a_(b_(c))",
-  ])("preserves internal URL punctuation: %s", async (url) => {
-    const tree = await parseMarkdown(prepareMarkdownSource(`${url}.`).render());
-    expect(tree.children?.[0]?.children).toEqual([
-      {
-        type: "Link",
-        attributes: { url },
-        children: [{ type: "Text", content: url }],
-      },
-      { type: "Text", content: "." },
-    ]);
-  });
-
-  it.each(["[Authored](https://example.com/a.)", "<https://example.com/a.>"])(
-    "preserves punctuation in explicit destinations: %s",
-    async (source) => {
-      const tree = await parseMarkdown(prepareMarkdownSource(source).render());
-      expect(tree.children?.[0]?.children?.[0]?.attributes?.url).toBe("https://example.com/a.");
-    },
-  );
-});
-
 it("requires workspace context for relative inline paths and escapes literal regex characters", () => {
  const source = "`src/app/[id].tsx` and `src/a+b.ts` and `README.md` and `/tmp/file.ts`";
  const withoutWorkspace = prepareMarkdownSource(source).linkRecognition.inlineCode;
@@ -768,10 +718,3 @@ it("replaces the native placeholder only after the resolved URL decodes", () =>
  const prepared = prepareMarkdownSource("![image](shot.png)", undefined, { supportsSvg: false });
  expect(prepared.render(new Map([["shot.png", url]]))).toBe(`![image](<${url}>)`);
 });
-
-it("makes the web Markdown container selectable in Safari as well as unprefixed browsers", () => {
-  expect(createMarkdownStyles(lightTheme, { blockGap: 12 }).containerStyle).toEqual({
-    userSelect: "text",
-    WebkitUserSelect: "text",
-  });
-});
@@ -27,6 +27,7 @@ const markdownStyle = (compact: boolean) => (theme: Theme, rt: { breakpoint?: st
  createMarkdownStyles(theme, { compact, blockGap: resolveDensity(rt, density.blockGap) });
 const regularStyle = markdownStyle(false);
 const compactStyle = markdownStyle(true);
+const WEB_CONTAINER = { userSelect: "text" as const };

 export interface MarkdownRendererProps extends MarkdownImageContext {
  text: string;
@@ -98,6 +99,7 @@ const MarkdownPart = memo(function MarkdownPart({
            <ThemedMarkdown
              key={`${segment.kind}:${segment.id}`}
              markdown={segment.source}
+              containerStyle={isWeb ? WEB_CONTAINER : undefined}
              uniProps={compact ? compactStyle : regularStyle}
              flavor="github"
              selectable
@@ -2,13 +2,10 @@ import type { MarkdownStyle } from "react-native-enriched-markdown";
 import type { Theme } from "@/styles/theme";
 import { isWeb } from "@/constants/platform";

-// iOS Safari needs the prefix to override the gesture host's selection suppression.
-const WEB_CONTAINER = { userSelect: "text", WebkitUserSelect: "text" } as const;
-
 export function createMarkdownStyles(
  theme: Theme,
  { compact = false, blockGap }: { compact?: boolean; blockGap: number },
-): { markdownStyle: MarkdownStyle; selectionColor: string; containerStyle?: typeof WEB_CONTAINER } {
+): { markdownStyle: MarkdownStyle; selectionColor: string } {
  const fontSize = compact ? theme.fontSize.base : theme.fontSize.content;
  // Every block is followed by the same gap; the library drops it after the last block.
  const block = { marginTop: 0, marginBottom: blockGap };
@@ -26,7 +23,6 @@ export function createMarkdownStyles(
    fontWeight: "bold",
  });
  return {
-    containerStyle: isWeb ? WEB_CONTAINER : undefined,
    selectionColor: theme.colors.terminal.selectionBackground,
    markdownStyle: {
      paragraph,
@@ -17,10 +17,8 @@ describe("resolveProviderIconName", () => {

  it("returns the catalog identifier for ACP catalog provider ids that ship an icon", () => {
    expect(resolveProviderIconName("amp-acp")).toEqual({ kind: "catalog", id: "amp-acp" });
-    expect(resolveProviderIconName("devin")).toEqual({ kind: "catalog", id: "devin" });
    expect(resolveProviderIconName("gemini")).toEqual({ kind: "catalog", id: "gemini" });
    expect(resolveProviderIconName("gjc")).toEqual({ kind: "catalog", id: "gjc" });
-    expect(resolveProviderIconName("hermes")).toEqual({ kind: "catalog", id: "hermes" });
    expect(resolveProviderIconName("traecli")).toEqual({ kind: "catalog", id: "traecli" });
  });

@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
 import { act, cleanup, renderHook } from "@testing-library/react";
-import { Bot, PackagePlus } from "lucide-react-native";
+import { Bot } from "lucide-react-native";
 import { SvgXml } from "react-native-svg";
 import { afterEach, describe, expect, it } from "vitest";
 import { replaceProviderSnapshotIcons } from "@/data/provider-icons";
@@ -17,16 +17,6 @@ function renderIcon(Component: ProviderIconComponent) {
 }

 describe("useProviderIcon", () => {
-  it.each(["devin", "hermes", "kiro", "antigravity"])(
-    "#7087: %s has a provider mark before a host snapshot arrives",
-    (provider) => {
-      const Icon = renderHook(() => useProviderIcon(provider)).result.current;
-      expect(Icon).not.toBe(Bot);
-      expect(Icon).not.toBe(PackagePlus);
-      expect(typeof Icon).toBe("function");
-    },
-  );
-
  it("renders registered snapshot SVG metadata with the requested size and color", () => {
    const svg = '<svg viewBox="0 0 24 24"><path d="M4 4h16v16H4z" /></svg>';
    replaceProviderSnapshotIcons("server-1", [{ provider: "rendered-provider", iconSvg: svg }]);
@@ -1,14 +1,12 @@
 import { useStore } from "zustand";
 import { providerSnapshotIcons } from "@/data/provider-icons";
-import { Bot } from "lucide-react-native";
+import { Bot, PackagePlus } from "lucide-react-native";
 import { createElement, useCallback, type ComponentType } from "react";
 import { SvgXml } from "react-native-svg";
 import { TERMINAL_PROFILE_ICON_NAMES } from "@getpaseo/protocol/provider-icon-names";
-import { AntigravityIcon } from "@/components/icons/antigravity-icon";
 import { ClaudeIcon } from "@/components/icons/claude-icon";
 import { CodexIcon } from "@/components/icons/codex-icon";
 import { CopilotIcon } from "@/components/icons/copilot-icon";
-import { KiroIcon } from "@/components/icons/kiro-icon";
 import { MiniMaxIcon } from "@/components/icons/minimax-icon";
 import { OpenCodeIcon } from "@/components/icons/opencode-icon";
 import { OmpIcon } from "@/components/icons/omp-icon";
@@ -25,11 +23,10 @@ export interface ProviderIconProps {
 export type ProviderIconComponent = ComponentType<ProviderIconProps>;

 const BUILTIN_PROVIDER_ICONS: Record<string, ProviderIconComponent> = {
-  antigravity: AntigravityIcon as unknown as ProviderIconComponent,
  claude: ClaudeIcon as unknown as ProviderIconComponent,
  codex: CodexIcon as unknown as ProviderIconComponent,
  copilot: CopilotIcon as unknown as ProviderIconComponent,
-  kiro: KiroIcon as unknown as ProviderIconComponent,
+  kiro: PackagePlus,
  minimax: MiniMaxIcon as unknown as ProviderIconComponent,
  omp: OmpIcon as unknown as ProviderIconComponent,
  opencode: OpenCodeIcon as unknown as ProviderIconComponent,
@@ -868,9 +868,7 @@ function NativeTerminalEmulator({
            panState.movedBeyondTapTolerance = true;
          }
          if (selectionPress?.status === "selecting") {
-            if (panState.movedBeyondTapTolerance) {
-              updateSelectionAtPoint(resolvePanResponderPoint(selectionPress, event, gesture));
-            }
+            updateSelectionAtPoint(resolvePanResponderPoint(selectionPress, event, gesture));
            return;
          }

@@ -917,10 +915,7 @@ function NativeTerminalEmulator({
        onPanResponderRelease: (event, gesture) => {
          clearSelectionLongPressTimeout();
          const selectionPress = selectionPressRef.current;
-          if (
-            selectionPress?.status === "selecting" &&
-            panStateRef.current.movedBeyondTapTolerance
-          ) {
+          if (selectionPress?.status === "selecting") {
            updateSelectionAtPoint(resolvePanResponderPoint(selectionPress, event, gesture));
          }
          selectionPressRef.current = null;
@@ -1295,12 +1295,7 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
    // Read pointer capability when restoring, without making a pointer change itself
    // a focus trigger.
    useLayoutEffect(() => {
-      const finePointer = hasFinePointer();
-      if (!isPaneFocused && isWeb && !finePointer) {
-        // Hiding a retained tab only blurs its editor after the browser renders.
-        // A quick return before that frame would otherwise keep touch focus.
-        textInputRef.current?.blur();
-      } else if (isPaneFocused && focusIntentRef.current && finePointer) {
+      if (isPaneFocused && focusIntentRef.current && hasFinePointer()) {
        textInputRef.current?.focus();
      }
    }, [isPaneFocused]);
@@ -4,7 +4,6 @@ import {
  beginMessageSubmission,
  getActiveMessageSubmissions,
  getSendingClientMessageIds,
-  hasActiveMessageSubmission,
  observeMessageSubmissionCanonical,
  rejectMessageSubmission,
 } from "./model";
@@ -54,21 +53,6 @@ describe("message submission transactions", () => {
    expect(observeMessageSubmissionCanonical(accepted, ["client-1"])).toEqual([]);
  });

-  it("reports activity until every submission is provider acknowledged", () => {
-    const both = beginMessageSubmission(
-      beginMessageSubmission([], { clientMessageId: "client-1" }),
-      { clientMessageId: "client-2" },
-    );
-    const oneAcknowledged = observeMessageSubmissionCanonical(both, ["client-1"]);
-
-    expect(hasActiveMessageSubmission(undefined)).toBe(false);
-    expect(hasActiveMessageSubmission(both)).toBe(true);
-    expect(hasActiveMessageSubmission(oneAcknowledged)).toBe(true);
-    expect(
-      hasActiveMessageSubmission(observeMessageSubmissionCanonical(oneAcknowledged, ["client-2"])),
-    ).toBe(false);
-  });
-
  it("records provider acknowledgement without settling another transaction", () => {
    const both = beginMessageSubmission(
      beginMessageSubmission([], { clientMessageId: "client-1" }),
@@ -2,7 +2,6 @@ import { useCallback, useMemo, useState, type ReactElement, type ReactNode } fro
 import { Pressable, Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import {
-  MENU_ITEM_HEIGHT,
  MenuRoot,
  MenuSeparator,
  MenuSurface,
@@ -313,22 +312,6 @@ const styles = StyleSheet.create((theme) => {
    backgroundColor: getStatusDotColor({ theme, bucket, showDoneAsInactive: true }) ?? undefined,
  });

-  // The rail every panel row sits on: inset from the panel edge so the fill is a rounded block
-  // inside it, and tall enough that revealing an action button cannot resize the row.
-  //
-  // Compact and desktop differ here and only here. A finger needs the taller row a menu row gets
-  // on compact; a pointer does not, and the popover keeps its density.
-  const trackRow = {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    minHeight: { xs: MENU_ITEM_HEIGHT.xs, md: 32 },
-    marginHorizontal: theme.spacing[1],
-    paddingHorizontal: theme.spacing[2],
-    paddingVertical: { xs: theme.spacing[2], md: theme.spacing[1] },
-    borderRadius: theme.borderRadius.md,
-  } as const;
-
  return {
    bar: {
      position: "absolute",
@@ -349,8 +332,29 @@ const styles = StyleSheet.create((theme) => {
      alignItems: "center",
      gap: theme.spacing[1],
    },
-    row: trackRow,
-    rowActive: { ...trackRow, backgroundColor: theme.colors.surface2 },
+    // The rail every panel row sits on: inset from the panel edge so the fill is a rounded block
+    // inside it, and tall enough that revealing an action button cannot resize the row.
+    row: {
+      flexDirection: "row",
+      alignItems: "center",
+      gap: theme.spacing[2],
+      minHeight: 32,
+      marginHorizontal: theme.spacing[1],
+      paddingHorizontal: theme.spacing[2],
+      paddingVertical: theme.spacing[1],
+      borderRadius: theme.borderRadius.md,
+    },
+    rowActive: {
+      flexDirection: "row",
+      alignItems: "center",
+      gap: theme.spacing[2],
+      minHeight: 32,
+      marginHorizontal: theme.spacing[1],
+      paddingHorizontal: theme.spacing[2],
+      paddingVertical: theme.spacing[1],
+      borderRadius: theme.borderRadius.md,
+      backgroundColor: theme.colors.surface2,
+    },
    // Segments sit twice as far apart as a mark sits from its own text, so a count reads as
    // belonging to the mark on its left rather than to the words on its right.
    segments: {
@@ -133,7 +133,7 @@ const CATALOG_DATA = [
    title: "Devin CLI",
    description: "Cognition's Devin for Terminal via Agent Client Protocol",
    version: "manual",
-    iconId: "devin",
+    iconId: null,
    installLink: "https://cli.devin.ai/docs",
    command: ["devin", "acp"],
  },
@@ -235,7 +235,7 @@ const CATALOG_DATA = [
    title: "Hermes",
    description: "Nous Research self-improving AI agent",
    version: "manual",
-    iconId: "hermes",
+    iconId: null,
    installLink: "https://hermes-agent.nousresearch.com/docs/user-guide/features/acp",
    command: ["hermes", "acp"],
  },
@@ -272,7 +272,7 @@ const CATALOG_DATA = [
    title: "Kiro CLI",
    description: "Amazon's AI coding agent with native ACP support",
    version: "manual",
-    iconId: "kiro",
+    iconId: null,
    installLink: "https://kiro.dev/docs/cli/acp/",
    command: ["kiro-cli", "acp"],
  },
@@ -15,7 +15,7 @@ import { Shortcut } from "@/components/ui/shortcut";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
 import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 import type { ShortcutKey } from "@/utils/format-shortcut";
-import { actionsWithoutPrimary, type GitAction, type GitActions } from "@/git/policy";
+import type { GitAction, GitActions } from "@/git/policy";
 import { useGitActionRunner } from "@/git/use-actions";
 import { buttonControlHeight, HEADER_CONTROL_HEIGHT } from "@/components/ui/control-geometry";

@@ -129,10 +129,14 @@ export function GitActionsSplitButton({
    [theme.colors.surface2],
  );

-  const menuOnlyActions = [
-    ...(gitActions.primary ? [gitActions.primary] : []),
-    ...actionsWithoutPrimary(gitActions),
-  ];
+  const menuOnlyActions = useMemo(
+    () => [
+      ...(gitActions.primary ? [gitActions.primary] : []),
+      ...gitActions.secondary,
+      ...gitActions.menu,
+    ],
+    [gitActions.menu, gitActions.primary, gitActions.secondary],
+  );

  if (menuOnly) {
    if (menuOnlyActions.length === 0) {
@@ -2,7 +2,7 @@ import { afterEach, describe, expect, it } from "vitest";
 import { CheckoutPrStatusSchema } from "@getpaseo/protocol/messages";
 import { i18n } from "@/i18n/i18next";

-import { actionsWithoutPrimary, buildGitActions, type BuildGitActionsInput } from "./policy";
+import { buildGitActions, type BuildGitActionsInput } from "./policy";
 import { deriveMergeCapability, type ForgeSpecificStatusFacts } from "./merge-capability";

 type GithubMergeFactsFixture = ForgeSpecificStatusFacts & {
@@ -190,59 +190,6 @@ describe("git-actions-policy", () => {
    expect(actions.primary).toMatchObject({ id: "pull", label: "Pull" });
  });

-  it("drops a promoted remote action from the remaining menu actions", () => {
-    const pull = buildGitActions(createInput({ hasRemote: true, behindOfOrigin: 2 }));
-    expect(pull.primary?.id).toBe("pull");
-    expect(actionsWithoutPrimary(pull).map((action) => action.id)).toEqual([
-      "push",
-      "pull-and-push",
-      "archive-workspace",
-    ]);
-
-    const push = buildGitActions(createInput({ hasRemote: true, aheadOfOrigin: 1 }));
-    expect(push.primary?.id).toBe("push");
-    expect(actionsWithoutPrimary(push).map((action) => action.id)).toEqual([
-      "pull",
-      "pull-and-push",
-      "archive-workspace",
-    ]);
-  });
-
-  it("drops a promoted merge action from the remaining menu actions", () => {
-    const actions = buildGitActions(
-      createInput({
-        hasRemote: true,
-        isOnBaseBranch: false,
-        aheadCount: 2,
-        hasPullRequest: true,
-        pullRequestUrl: "https://example.com/pr/456",
-        pullRequestState: "open",
-        pullRequestMergeable: "MERGEABLE",
-        pullRequestGithub: githubStatus({
-          repository: {
-            autoMergeAllowed: true,
-            mergeCommitAllowed: true,
-            squashMergeAllowed: false,
-            rebaseMergeAllowed: false,
-            viewerDefaultMergeMethod: "SQUASH",
-          },
-        }),
-        shipDefault: "pr",
-      }),
-    );
-
-    expect(actions.primary).toMatchObject({ id: "merge-pr-merge", label: "Merge PR (merge)" });
-    expect(actionsWithoutPrimary(actions).map((action) => action.id)).toEqual([
-      "pull",
-      "push",
-      "pull-and-push",
-      "merge-from-base",
-      "merge-branch",
-      "pr",
-      "archive-workspace",
-    ]);
-  });
-
  it("keeps push clickable with a clearer message when the branch diverged", () => {
    const actions = buildGitActions(
      createInput({
@@ -312,18 +312,6 @@ export function buildGitActions(input: BuildGitActionsInput): GitActions {
  };
 }

-/**
- * The actions a flattened list shows after the primary. `secondary` keeps the actions the policy
- * can promote to `primary`, and the translator rebuilds those objects, so a flattening consumer
- * has to drop the promoted one by id or it renders it twice.
- */
-export function actionsWithoutPrimary(gitActions: GitActions): GitAction[] {
-  const primaryActionId = gitActions.primary?.id;
-  return [...gitActions.secondary, ...gitActions.menu].filter(
-    (action) => action.id !== primaryActionId,
-  );
-}
-
 function getPrimaryActionId(input: BuildGitActionsInput): GitActionId | null {
  if (input.shouldPromoteArchive) {
    return "archive-workspace";
@@ -11,13 +11,6 @@ function findProvider(id: string) {
 }

 describe("ACP provider catalog", () => {
-  it.each(["devin", "hermes", "kiro"])(
-    "#7087: %s supplies its provider mark to the catalog picker",
-    (provider) => {
-      expect(findProvider(provider).iconSvg).toContain("<svg");
-    },
-  );
-
  it("vendors provider entries with unique ids and concrete commands", () => {
    const ids = new Set<string>();

@@ -162,7 +162,7 @@ import { useWorkspaceRecovery } from "@/workspace-recovery/use-workspace-recover
 import type { WorkspaceRecoveryModel } from "@/workspace-recovery/model";
 import {
  buildWorkspaceTabSnapshot,
-  createWorkspaceAgentVisibilitySelector,
+  deriveWorkspaceAgentVisibility,
  workspaceAgentVisibilityEqual,
 } from "@/workspace-tabs/agent-visibility";
 import { deriveWorkspacePaneState } from "@/screens/workspace/workspace-pane-state";
@@ -1148,17 +1148,14 @@ function WorkspaceScreenContent({
    ),
  });

-  const selectWorkspaceAgentVisibility = useMemo(
-    () =>
-      createWorkspaceAgentVisibilitySelector({
-        serverId: normalizedServerId,
-        workspaceId: normalizedWorkspaceId,
-      }),
-    [normalizedServerId, normalizedWorkspaceId],
-  );
  const workspaceAgentVisibility = useStoreWithEqualityFn(
    useSessionStore,
-    selectWorkspaceAgentVisibility,
+    (state) =>
+      deriveWorkspaceAgentVisibility({
+        sessionAgents: state.sessions[normalizedServerId]?.agents,
+        agentDetails: state.sessions[normalizedServerId]?.agentDetails,
+        workspaceId: normalizedWorkspaceId,
+      }),
    workspaceAgentVisibilityEqual,
  );

@@ -1,11 +1,6 @@
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { afterEach, describe, expect, it } from "vitest";
-import {
-  createSubagentsForParentSelector,
-  selectProviderSubagentsForParent,
-  selectSubagentsForParent,
-} from "./select";
-import { createWorkspaceAgentVisibilitySelector } from "@/workspace-tabs/agent-visibility";
+import { selectProviderSubagentsForParent, selectSubagentsForParent } from "./select";
 import { useProviderSubagentStore } from "./provider-store";
 import { useSessionStore, type Agent } from "@/stores/session-store";

@@ -440,160 +435,3 @@ describe("selectSubagentsForParent", () => {
    );
  });
 });
-
-describe("createSubagentsForParentSelector", () => {
-  class IterationCountingMap<K, V> extends Map<K, V> {
-    iterations = 0;
-    override values() {
-      this.iterations += 1;
-      return super.values();
-    }
-    override entries() {
-      this.iterations += 1;
-      return super.entries();
-    }
-    override [Symbol.iterator]() {
-      this.iterations += 1;
-      return super[Symbol.iterator]();
-    }
-  }
-
-  const params = { serverId: SERVER_ID, parentAgentId: "parent" };
-
-  function streamTick(text: string): void {
-    useSessionStore.getState().setAgentStreamState(SERVER_ID, "parent", {
-      head: [
-        {
-          kind: "assistant_message",
-          id: "message-1",
-          text,
-          timestamp: new Date("2026-03-08T10:05:00.000Z"),
-        },
-      ],
-    });
-  }
-
-  it("returns the cached rows without walking agents when a stream tick leaves them unchanged", () => {
-    const agents = new IterationCountingMap<string, Agent>(
-      [
-        makeAgent({ id: "parent" }),
-        makeAgent({ id: "child", parentAgentId: "parent" }),
-        makeAgent({ id: "unrelated" }),
-      ].map((agent) => [agent.id, agent]),
-    );
-    useSessionStore.getState().initializeSession(SERVER_ID, null as unknown as DaemonClient);
-    useSessionStore.getState().setAgents(SERVER_ID, agents);
-    const select = createSubagentsForParentSelector(params, EMPTY_PENDING_ARCHIVE_IDS);
-    const before = select(useSessionStore.getState());
-    const iterationsAfterFirstSelect = agents.iterations;
-
-    for (let tick = 0; tick < 100; tick += 1) {
-      streamTick(`token ${tick}`);
-      expect(select(useSessionStore.getState())).toBe(before);
-    }
-
-    expect(useSessionStore.getState().sessions[SERVER_ID]?.agents).toBe(agents);
-    expect(agents.iterations).toBe(iterationsAfterFirstSelect);
-    expect(before.map((row) => row.id)).toEqual(["child"]);
-  });
-
-  it("recomputes when the agents map changes", () => {
-    setAgents([makeAgent({ id: "parent" }), makeAgent({ id: "child-a", parentAgentId: "parent" })]);
-    const select = createSubagentsForParentSelector(params, EMPTY_PENDING_ARCHIVE_IDS);
-    const before = select(useSessionStore.getState());
-
-    useSessionStore.getState().setAgents(SERVER_ID, (current) => {
-      const child = makeAgent({
-        id: "child-b",
-        parentAgentId: "parent",
-        createdAt: new Date("2026-03-08T10:01:00.000Z"),
-      });
-      return new Map(current).set(child.id, child);
-    });
-    const after = select(useSessionStore.getState());
-
-    expect(after).not.toBe(before);
-    expect(after.map((row) => row.id)).toEqual(["child-a", "child-b"]);
-  });
-
-  it("keeps the previous rows when a changed agents map yields the same rows", () => {
-    setAgents([
-      makeAgent({ id: "parent" }),
-      makeAgent({ id: "child", parentAgentId: "parent" }),
-      makeAgent({ id: "unrelated" }),
-    ]);
-    const select = createSubagentsForParentSelector(params, EMPTY_PENDING_ARCHIVE_IDS);
-    const before = select(useSessionStore.getState());
-
-    useSessionStore.getState().setAgents(SERVER_ID, (current) => {
-      return new Map(current).set("unrelated", makeAgent({ id: "unrelated", status: "running" }));
-    });
-
-    expect(select(useSessionStore.getState())).toBe(before);
-  });
-
-  it("applies the pending archive ids it was created with", () => {
-    setAgents([
-      makeAgent({ id: "parent" }),
-      makeAgent({ id: "child-a", parentAgentId: "parent" }),
-      makeAgent({ id: "child-b", parentAgentId: "parent" }),
-    ]);
-
-    const rows = createSubagentsForParentSelector(
-      params,
-      new Set(["child-b"]),
-    )(useSessionStore.getState());
-
-    expect(rows.map((row) => row.id)).toEqual(["child-a"]);
-  });
-  it("does no agent map walks for 100 stream commits with unchanged source maps", () => {
-    const agents = new IterationCountingMap<string, Agent>(
-      Array.from({ length: 200 }, (_, i) => {
-        const agent = makeAgent({
-          id: `agent-${i}`,
-          workspaceId: "workspace",
-          parentAgentId: i < 3 ? null : `agent-${i % 3}`,
-        });
-        return [agent.id, agent] as const;
-      }),
-    );
-    useSessionStore.getState().initializeSession(SERVER_ID, null as unknown as DaemonClient);
-    useSessionStore.getState().setAgents(SERVER_ID, agents);
-    const selectVisibility = createWorkspaceAgentVisibilitySelector({
-      serverId: SERVER_ID,
-      workspaceId: "workspace",
-    });
-    const selectChildren = Array.from({ length: 3 }, (_, i) =>
-      createSubagentsForParentSelector(
-        { serverId: SERVER_ID, parentAgentId: `agent-${i}` },
-        EMPTY_PENDING_ARCHIVE_IDS,
-      ),
-    );
-    const select = (state: ReturnType<typeof useSessionStore.getState>) => {
-      selectVisibility(state);
-      selectChildren.forEach((selector) => selector(state));
-    };
-    select(useSessionStore.getState());
-    const before = agents.iterations;
-    const unsubscribe = useSessionStore.subscribe(select);
-    try {
-      for (let tick = 0; tick < 100; tick++) {
-        useSessionStore.getState().setAgentStreamState(SERVER_ID, "agent-0", {
-          head: [
-            {
-              kind: "assistant_message",
-              id: "message",
-              text: `token ${tick}`,
-              timestamp: AGENT_TIMESTAMP,
-            },
-          ],
-        });
-      }
-      expect(useSessionStore.getState().sessions[SERVER_ID]?.agents).toBe(agents);
-      expect(agents.iterations - before).toBe(0);
-    } finally {
-      unsubscribe();
-      useSessionStore.getState().clearSession(SERVER_ID);
-    }
-  });
-});
@@ -97,31 +97,6 @@ export function selectSubagentsForParent(
  return rows;
 }

-// Session-store selectors run on every store update, including every stream tick, which
-// leaves the agent map untouched. Reuse the previous rows until the map changes, and keep
-// them when a recompute yields equal rows so the hook's equality check stays O(1).
-export function createSubagentsForParentSelector(
-  params: SelectSubagentsParams,
-  pendingArchiveIds: ReadonlySet<string>,
-): (state: SessionStoreSnapshot) => SubagentRow[] {
-  let previousAgents: Map<string, Agent> | undefined;
-  let previousRows: SubagentRow[] | null = null;
-
-  return (state) => {
-    const agents = state.sessions[params.serverId]?.agents;
-    if (previousRows && agents === previousAgents) {
-      return previousRows;
-    }
-
-    const rows = selectSubagentsForParent(state, params, pendingArchiveIds);
-    previousAgents = agents;
-    if (!previousRows || !equal(previousRows, rows)) {
-      previousRows = rows;
-    }
-    return previousRows;
-  };
-}
-
 export function selectProviderSubagentsForParent(
  state: ProviderSubagentStoreSnapshot,
  params: SelectSubagentsParams,
@@ -158,13 +133,12 @@ export function selectProviderSubagentsForParent(
 }

 export function useSubagentsForParent(params: SelectSubagentsParams): SubagentRow[] {
-  const { serverId, parentAgentId } = params;
-  const pendingArchiveIds = usePendingArchiveAgentIds(serverId);
-  const selectPaseoRows = useMemo(
-    () => createSubagentsForParentSelector({ serverId, parentAgentId }, pendingArchiveIds),
-    [serverId, parentAgentId, pendingArchiveIds],
+  const pendingArchiveIds = usePendingArchiveAgentIds(params.serverId);
+  const paseoRows = useStoreWithEqualityFn(
+    useSessionStore,
+    (state) => selectSubagentsForParent(state, params, pendingArchiveIds),
+    equal,
  );
-  const paseoRows = useStoreWithEqualityFn(useSessionStore, selectPaseoRows, equal);
  const supported = useSessionStore(
    (state) => state.sessions[params.serverId]?.serverInfo?.features?.providerSubagents === true,
  );
@@ -1,12 +1,11 @@
-import { useCallback, useMemo, type ReactElement, type ReactNode } from "react";
-import { Text, View } from "react-native";
+import { useCallback, type ReactElement } from "react";
+import { Pressable, Text, View } from "react-native";
 import { useTranslation } from "react-i18next";
 import { Archive, Unlink } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useProviderIcon } from "@/components/provider-icons";
 import { ComposerTrackActions, ComposerTrackPill, ComposerTrackRow } from "@/composer/tracks";
-import { mutedIconColorMapping } from "@/components/ui/icon-button-chrome";
-import { ToolbarButton, paneContentToolbarIconSize } from "@/components/ui/pane-content-toolbar";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { isNative } from "@/constants/platform";
 import {
@@ -50,6 +49,7 @@ export interface SubagentsTrackProps {

 const IDLE_ARCHIVE_FINISHED_STATUS: ArchiveFinishedStatus = { kind: "idle" };

+/** Leading and action glyphs share one size so rows keep a single icon column. */
 const ROW_ICON_SIZE = 14;

 function useRowPresentation(row: SubagentRow, serverId: string): WorkspaceTabPresentation {
@@ -234,7 +234,6 @@ function SubagentsTrackRow({
          <SubagentRowActions
            rowId={row.id}
            displayLabel={displayLabel}
-            compact={isCompact}
            visible={actionsAlwaysVisible || active}
            onDetachPress={onDetachSubagent ? handleDetachPress : undefined}
            onArchivePress={handleArchivePress}
@@ -247,7 +246,6 @@ function SubagentsTrackRow({
      displayLabel,
      handleArchivePress,
      handleDetachPress,
-      isCompact,
      onDetachSubagent,
      presentation,
      row.kind,
@@ -286,20 +284,17 @@ function SubagentFacts({ rowId, text }: { rowId: string; text: string | null })
 function SubagentRowActions({
  rowId,
  displayLabel,
-  compact,
  visible,
  onDetachPress,
  onArchivePress,
 }: {
  rowId: string;
  displayLabel: string;
-  compact: boolean;
  visible: boolean;
  onDetachPress?: () => void;
  onArchivePress: () => void;
 }): ReactElement {
  const { t } = useTranslation();
-  const iconSize = paneContentToolbarIconSize(compact);
  return (
    <View
      style={visible ? styles.actionClusterVisible : styles.actionClusterHidden}
@@ -307,59 +302,69 @@ function SubagentRowActions({
    >
      {onDetachPress ? (
        <SubagentActionButton
-          label={t("subagents.detachAction", { label: displayLabel })}
-          tooltipLabel={t("subagents.detachTooltip")}
-          compact={compact}
-          onPress={onDetachPress}
+          accessibilityLabel={t("subagents.detachAction", { label: displayLabel })}
          testID={`subagents-track-detach-${rowId}`}
-        >
-          <ThemedUnlink size={iconSize} uniProps={mutedIconColorMapping} />
-        </SubagentActionButton>
+          tooltipLabel={t("subagents.detachTooltip")}
+          icon="detach"
+          visible={visible}
+          onPress={onDetachPress}
+        />
      ) : null}
      <SubagentActionButton
-        label={t("subagents.archiveAction", { label: displayLabel })}
-        tooltipLabel={t("subagents.archiveTooltip")}
-        compact={compact}
-        onPress={onArchivePress}
+        accessibilityLabel={t("subagents.archiveAction", { label: displayLabel })}
        testID={`subagents-track-archive-${rowId}`}
-      >
-        <ThemedArchive size={iconSize} uniProps={mutedIconColorMapping} />
-      </SubagentActionButton>
+        tooltipLabel={t("subagents.archiveTooltip")}
+        icon="archive"
+        visible={visible}
+        onPress={onArchivePress}
+      />
    </View>
  );
 }

-/** The standard icon action, with a tooltip that names the action without repeating the row. */
+type SubagentActionIcon = "archive" | "detach";
+
+function renderSubagentActionIcon(icon: SubagentActionIcon, isActive: boolean): ReactElement {
+  const uniProps = isActive ? foregroundColorMapping : foregroundMutedColorMapping;
+  if (icon === "detach") {
+    return <ThemedUnlink size={ROW_ICON_SIZE} uniProps={uniProps} />;
+  }
+  return <ThemedArchive size={ROW_ICON_SIZE} uniProps={uniProps} />;
+}
+
 function SubagentActionButton({
-  label,
-  tooltipLabel,
-  compact,
-  onPress,
+  accessibilityLabel,
  testID,
-  children,
+  tooltipLabel,
+  icon,
+  visible,
+  onPress,
 }: {
-  label: string;
-  tooltipLabel: string;
-  compact: boolean;
-  onPress: () => void;
+  accessibilityLabel: string;
  testID: string;
-  children: ReactNode;
+  tooltipLabel: string;
+  icon: SubagentActionIcon;
+  visible: boolean;
+  onPress: () => void;
 }): ReactElement {
-  const tooltip = useMemo(
-    () => <Text style={styles.tooltipText}>{tooltipLabel}</Text>,
-    [tooltipLabel],
-  );
  return (
-    <ToolbarButton
-      label={label}
-      tooltip={tooltip}
-      tooltipSide="top"
-      compact={compact}
-      onPress={onPress}
-      testID={testID}
-    >
-      {children}
-    </ToolbarButton>
+    <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile={false}>
+      <TooltipTrigger asChild disabled={!visible}>
+        <Pressable
+          accessibilityRole="button"
+          accessibilityLabel={accessibilityLabel}
+          testID={testID}
+          onPress={onPress}
+          style={styles.actionButton}
+          hitSlop={8}
+        >
+          {({ hovered, pressed }) => renderSubagentActionIcon(icon, hovered || pressed)}
+        </Pressable>
+      </TooltipTrigger>
+      <TooltipContent side="top" align="center" offset={8}>
+        <Text style={styles.tooltipText}>{tooltipLabel}</Text>
+      </TooltipContent>
+    </Tooltip>
  );
 }

@@ -410,6 +415,11 @@ const styles = StyleSheet.create((theme) => ({
    gap: theme.spacing[1],
    opacity: 0,
  },
+  actionButton: {
+    padding: theme.spacing[1],
+    alignItems: "center",
+    justifyContent: "center",
+  },
  tooltipText: {
    fontSize: theme.fontSize.sm,
    color: theme.colors.foreground,
@@ -151,61 +151,6 @@ describe("native terminal selection", () => {
    });
  });

-  it.each([
-    { col: 0, expected: "한글", startCol: 0, endCol: 3 },
-    { col: 1, expected: "한글", startCol: 0, endCol: 3 },
-    { col: 2, expected: "한글", startCol: 0, endCol: 3 },
-    { col: 3, expected: "한글", startCol: 0, endCol: 3 },
-    { col: 5, expected: "문장", startCol: 5, endCol: 8 },
-    { col: 6, expected: "문장", startCol: 5, endCol: 8 },
-    { col: 7, expected: "문장", startCol: 5, endCol: 8 },
-    { col: 8, expected: "문장", startCol: 5, endCol: 8 },
-  ])(
-    "selects the whole Korean word from column $col, including continuation cells",
-    async ({ col, expected, startCol, endCol }) => {
-      const terminal = createNativeHeadlessTerminal({ rows: 3, cols: 30 });
-      try {
-        await terminal.write("한글 문장");
-        const bounds = terminal.getBufferBounds();
-        const row = bounds.cursorRow;
-        const selection = resolveTerminalWordSelection({ terminal, coordinate: { row, col } });
-
-        expect({ selection, text: extractTerminalSelectedText({ terminal, selection }) }).toEqual({
-          selection: {
-            start: { row, col: startCol },
-            end: { row, col: endCol },
-            coordinateEpoch: bounds.coordinateEpoch,
-          },
-          text: expected,
-        });
-      } finally {
-        terminal.dispose();
-      }
-    },
-  );
-
-  it.each([
-    { text: "한글 문장", col: 4, expected: "" },
-    { text: "(한글)", col: 2, expected: "한글" },
-    { text: "漢字 test", col: 1, expected: "漢字" },
-    { text: "a한b x", col: 2, expected: "a한b" },
-    { text: "🙂🙂 ok", col: 1, expected: "🙂🙂" },
-    { text: "e\u0301한 ok", col: 2, expected: "e\u0301한" },
-    { text: "한글", col: 3, expected: "한글" },
-  ])("preserves word boundaries in $text at column $col", async ({ text, col, expected }) => {
-    const terminal = createNativeHeadlessTerminal({ rows: 3, cols: 30 });
-    try {
-      await terminal.write(text);
-      const selection = resolveTerminalWordSelection({
-        terminal,
-        coordinate: { row: terminal.getBufferBounds().cursorRow, col },
-      });
-      expect(extractTerminalSelectedText({ terminal, selection })).toBe(expected);
-    } finally {
-      terminal.dispose();
-    }
-  });
-
  it("maps screen coordinates through the current visible window", () => {
    expect(
      hitTestTerminalSelectionCell({
@@ -1,4 +1,4 @@
-import type { NativeHeadlessTerminal, NativeTerminalCell } from "./headless-terminal-state";
+import type { NativeHeadlessTerminal } from "./headless-terminal-state";
 import type { TerminalGridCellMetrics } from "./terminal-grid-metrics";

 export interface TerminalBufferCoordinate {
@@ -101,10 +101,6 @@ interface TerminalSelectionState {

 const TERMINAL_WORD_SEPARATORS = " ()[]{}',\"`";

-function isTerminalWordSeparator(cell: NativeTerminalCell): boolean {
-  return cell.width !== 0 && TERMINAL_WORD_SEPARATORS.includes(cell.char || " ");
-}
-
 function compareCoordinates(
  left: TerminalBufferCoordinate,
  right: TerminalBufferCoordinate,
@@ -187,7 +183,8 @@ export function resolveTerminalWordSelection(
  if (!cells || input.coordinate.col < 0 || input.coordinate.col >= cells.length) {
    return null;
  }
-  if (isTerminalWordSeparator(cells[input.coordinate.col])) {
+  const target = cells[input.coordinate.col]?.char || " ";
+  if (TERMINAL_WORD_SEPARATORS.includes(target)) {
    return {
      start: input.coordinate,
      end: input.coordinate,
@@ -198,11 +195,13 @@ export function resolveTerminalWordSelection(
  let startCol = input.coordinate.col;
  let endCol = input.coordinate.col;
  while (startCol > 0) {
-    if (isTerminalWordSeparator(cells[startCol - 1])) break;
+    const previous = cells[startCol - 1]?.char || " ";
+    if (TERMINAL_WORD_SEPARATORS.includes(previous)) break;
    startCol -= 1;
  }
  while (endCol + 1 < cells.length) {
-    if (isTerminalWordSeparator(cells[endCol + 1])) break;
+    const next = cells[endCol + 1]?.char || " ";
+    if (TERMINAL_WORD_SEPARATORS.includes(next)) break;
    endCol += 1;
  }

@@ -1,9 +1,7 @@
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { afterEach, describe, expect, it } from "vitest";
-import { useSessionStore, type Agent } from "@/stores/session-store";
+import { describe, expect, it } from "vitest";
+import type { Agent } from "@/stores/session-store";
 import {
  buildWorkspaceTabSnapshot,
-  createWorkspaceAgentVisibilitySelector,
  deriveWorkspaceAgentVisibility,
  shouldPruneWorkspaceAgentTab,
  workspaceAgentVisibilityEqual,
@@ -338,139 +336,6 @@ describe("workspace agent visibility", () => {
    });
  });

-  describe("createWorkspaceAgentVisibilitySelector", () => {
-    const SERVER_ID = "srv";
-
-    class IterationCountingMap<K, V> extends Map<K, V> {
-      iterations = 0;
-      override values() {
-        this.iterations += 1;
-        return super.values();
-      }
-      override entries() {
-        this.iterations += 1;
-        return super.entries();
-      }
-      override [Symbol.iterator]() {
-        this.iterations += 1;
-        return super[Symbol.iterator]();
-      }
-    }
-
-    function seedSession(agents: Map<string, Agent>): void {
-      useSessionStore.getState().initializeSession(SERVER_ID, null as unknown as DaemonClient);
-      useSessionStore.getState().setAgents(SERVER_ID, agents);
-    }
-
-    function streamTick(text: string): void {
-      useSessionStore.getState().setAgentStreamState(SERVER_ID, "parent-agent", {
-        head: [
-          {
-            kind: "assistant_message",
-            id: "message-1",
-            text,
-            timestamp: new Date("2026-03-04T00:02:00.000Z"),
-          },
-        ],
-      });
-    }
-
-    const parent = makeAgent({ id: "parent-agent", cwd: "/repo", workspaceId: WORKSPACE_ID });
-    const child = makeAgent({
-      id: "child-agent",
-      cwd: "/repo",
-      workspaceId: WORKSPACE_ID,
-      parentAgentId: parent.id,
-    });
-    const otherWorkspace = makeAgent({ id: "other-agent", cwd: "/other", workspaceId: "ws-2" });
-
-    afterEach(() => {
-      useSessionStore.getState().clearSession(SERVER_ID);
-    });
-
-    it("returns the cached result without walking agents when a stream tick leaves them unchanged", () => {
-      const agents = new IterationCountingMap<string, Agent>([
-        [parent.id, parent],
-        [otherWorkspace.id, otherWorkspace],
-      ]);
-      seedSession(agents);
-      const select = createWorkspaceAgentVisibilitySelector({
-        serverId: SERVER_ID,
-        workspaceId: WORKSPACE_ID,
-      });
-      const before = select(useSessionStore.getState());
-      const iterationsAfterFirstSelect = agents.iterations;
-
-      for (let tick = 0; tick < 100; tick += 1) {
-        streamTick(`token ${tick}`);
-        expect(select(useSessionStore.getState())).toBe(before);
-      }
-
-      expect(useSessionStore.getState().sessions[SERVER_ID]?.agents).toBe(agents);
-      expect(agents.iterations).toBe(iterationsAfterFirstSelect);
-      expect(before.activeAgentIds).toEqual(new Set([parent.id]));
-    });
-
-    it("recomputes when the agents map changes", () => {
-      const agents = new Map([[parent.id, parent]]);
-      seedSession(agents);
-      const select = createWorkspaceAgentVisibilitySelector({
-        serverId: SERVER_ID,
-        workspaceId: WORKSPACE_ID,
-      });
-      const before = select(useSessionStore.getState());
-
-      useSessionStore.getState().setAgents(SERVER_ID, new Map(agents).set(child.id, child));
-      const after = select(useSessionStore.getState());
-
-      expect(after).not.toBe(before);
-      expect(after.activeAgentIds).toEqual(new Set([parent.id, child.id]));
-      expect(after.autoOpenAgentIds).toEqual(new Set([parent.id]));
-    });
-
-    it("keeps the previous result when a changed agents map yields the same sets", () => {
-      const agents = new Map([
-        [parent.id, parent],
-        [otherWorkspace.id, otherWorkspace],
-      ]);
-      seedSession(agents);
-      const select = createWorkspaceAgentVisibilitySelector({
-        serverId: SERVER_ID,
-        workspaceId: WORKSPACE_ID,
-      });
-      const before = select(useSessionStore.getState());
-
-      useSessionStore
-        .getState()
-        .setAgents(
-          SERVER_ID,
-          new Map(agents).set(otherWorkspace.id, { ...otherWorkspace, title: "Renamed" }),
-        );
-
-      expect(select(useSessionStore.getState())).toBe(before);
-    });
-
-    it("recomputes when agent details reveal a parent in another workspace", () => {
-      seedSession(new Map([[child.id, child]]));
-      const select = createWorkspaceAgentVisibilitySelector({
-        serverId: SERVER_ID,
-        workspaceId: WORKSPACE_ID,
-      });
-      expect(select(useSessionStore.getState()).autoOpenAgentIds).toEqual(new Set<string>());
-
-      useSessionStore
-        .getState()
-        .setAgentDetails(
-          SERVER_ID,
-          new Map([[parent.id, { ...parent, workspaceId: "ws-parent" }]]),
-        );
-      const after = select(useSessionStore.getState());
-
-      expect(after.activeAgentIds).toEqual(new Set([child.id]));
-      expect(after.autoOpenAgentIds).toEqual(new Set([child.id]));
-    });
-  });
-
  describe("workspaceAgentVisibilityEqual", () => {
    it("returns true for identical sets", () => {
      const a = {
@@ -28,15 +28,17 @@ export function deriveWorkspaceAgentVisibility(input: {

  const activeAgentIds = new Set<string>();
  const autoOpenAgentIds = new Set<string>();
+  const agentsById = new Map<string, Agent>([
+    ...(agentDetails?.entries() ?? []),
+    ...(sessionAgents?.entries() ?? []),
+  ]);
  for (const agent of sessionAgents?.values() ?? []) {
    if (!agentBelongsToWorkspace(agent, workspaceId)) {
      continue;
    }
    if (!agent.archivedAt) {
      activeAgentIds.add(agent.id);
-      const parentAgent = agent.parentAgentId
-        ? (sessionAgents?.get(agent.parentAgentId) ?? agentDetails?.get(agent.parentAgentId))
-        : undefined;
+      const parentAgent = agent.parentAgentId ? agentsById.get(agent.parentAgentId) : undefined;
      if (isWorkspaceRootAgent(agent, parentAgent)) {
        autoOpenAgentIds.add(agent.id);
      }
@@ -45,46 +47,6 @@ export function deriveWorkspaceAgentVisibility(input: {
  return { activeAgentIds, autoOpenAgentIds };
 }

-interface AgentMapsSnapshot {
-  sessions: Record<
-    string,
-    { agents: Map<string, Agent>; agentDetails: Map<string, Agent> } | undefined
-  >;
-}
-
-// Session-store selectors run on every store update, including every stream tick, which
-// leaves the agent maps untouched. Reuse the previous result until either map changes, and
-// keep it when a recompute yields the same sets so the hook's equality check stays O(1).
-export function createWorkspaceAgentVisibilitySelector(input: {
-  serverId: string;
-  workspaceId: string | null | undefined;
-}): (state: AgentMapsSnapshot) => WorkspaceAgentVisibility {
-  let previousAgents: Map<string, Agent> | undefined;
-  let previousAgentDetails: Map<string, Agent> | undefined;
-  let previousVisibility: WorkspaceAgentVisibility | null = null;
-
-  return (state) => {
-    const session = state.sessions[input.serverId];
-    const agents = session?.agents;
-    const agentDetails = session?.agentDetails;
-    if (previousVisibility && agents === previousAgents && agentDetails === previousAgentDetails) {
-      return previousVisibility;
-    }
-
-    const visibility = deriveWorkspaceAgentVisibility({
-      sessionAgents: agents,
-      agentDetails,
-      workspaceId: input.workspaceId,
-    });
-    previousAgents = agents;
-    previousAgentDetails = agentDetails;
-    if (!previousVisibility || !workspaceAgentVisibilityEqual(previousVisibility, visibility)) {
-      previousVisibility = visibility;
-    }
-    return previousVisibility;
-  };
-}
-
 export function buildWorkspaceTabSnapshot(input: {
  agentVisibility: WorkspaceAgentVisibility;
  agentsHydrated: boolean;
@@ -111,9 +73,8 @@ export function workspaceAgentVisibilityEqual(
  b: WorkspaceAgentVisibility,
 ): boolean {
  return (
-    a === b ||
-    (setsEqual(a.activeAgentIds, b.activeAgentIds) &&
-      setsEqual(a.autoOpenAgentIds, b.autoOpenAgentIds))
+    setsEqual(a.activeAgentIds, b.activeAgentIds) &&
+    setsEqual(a.autoOpenAgentIds, b.autoOpenAgentIds)
  );
 }

@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/cli",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "description": "Paseo CLI - control your AI coding agents from the command line",
  "bin": {
    "paseo": "bin/paseo"
@@ -28,9 +28,9 @@
  },
  "dependencies": {
    "@clack/prompts": "^1.0.0",
-    "@getpaseo/client": "0.12.0",
-    "@getpaseo/protocol": "0.12.0",
-    "@getpaseo/server": "0.12.0",
+    "@getpaseo/client": "0.12.0-beta.3",
+    "@getpaseo/protocol": "0.12.0-beta.3",
+    "@getpaseo/server": "0.12.0-beta.3",
    "chalk": "^5.3.0",
    "commander": "^12.0.0",
    "mime-types": "^2.1.35",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/client",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "description": "Paseo client SDK package",
  "files": [
    "dist",
@@ -39,8 +39,8 @@
    "test": "vitest run"
  },
  "dependencies": {
-    "@getpaseo/protocol": "0.12.0",
-    "@getpaseo/relay": "0.12.0",
+    "@getpaseo/protocol": "0.12.0-beta.3",
+    "@getpaseo/relay": "0.12.0-beta.3",
    "zod": "^4.4.3"
  },
  "devDependencies": {
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/desktop",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "private": true,
  "description": "Paseo desktop app (Electron wrapper)",
  "homepage": "https://paseo.sh",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "description": "Native module for two way audio streaming",
  "keywords": [
    "ExpoTwoWayAudio",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/highlight",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "files": [
    "dist",
    "!dist/**/*.map",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/plugin",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "description": "Paseo plugin SDK package",
  "files": [
    "dist",
@@ -70,8 +70,8 @@
    "use-sync-external-store": "^1.6.0"
  },
  "devDependencies": {
-    "@getpaseo/client": "0.12.0",
-    "@getpaseo/protocol": "0.12.0",
+    "@getpaseo/client": "0.12.0-beta.3",
+    "@getpaseo/protocol": "0.12.0-beta.3",
    "@types/node": "^20.9.0",
    "@types/react": "~19.2.0",
    "react": "19.1.0",
@@ -81,8 +81,8 @@
    "zod": "^4.4.3"
  },
  "peerDependencies": {
-    "@getpaseo/client": "0.12.0",
-    "@getpaseo/protocol": "0.12.0",
+    "@getpaseo/client": "0.12.0-beta.3",
+    "@getpaseo/protocol": "0.12.0-beta.3",
    "react": "~19.1.0",
    "react-native": ">=0.81.5",
    "zod": "^4.4.3"
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/protocol",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "description": "Paseo shared protocol schemas and wire types",
  "files": [
    "dist",
@@ -1,6 +0,0 @@
-// COMPAT(paseoToolCallDetail): added in v0.12.0, remove after 2027-04-19 once plugins have migrated to paseo-tool-presentation/index.
-export {
-  buildPaseoToolDetailSections,
-  type PaseoToolDetailField,
-  type PaseoToolDetailSection,
-} from "./paseo-tool-presentation/index.js";
@@ -1,8 +1,3 @@
-import { execFileSync } from "node:child_process";
-import { copyFileSync, mkdtempSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
 import { describe, expect, it } from "vitest";

 import { buildPaseoToolDetailSections } from "./index.js";
@@ -152,75 +147,3 @@ describe("Paseo tool-call detail presentation", () => {
    expect(buildPaseoToolDetailSections("mcp__github__create_issue", {}, {})).toBeNull();
  });
 });
-
-describe("published Paseo tool-call detail entry", () => {
-  it("preserves the 0.11.4 runtime export and types at the old subpath", () => {
-    const packageRoot = fileURLToPath(new URL("../../", import.meta.url));
-    const compiler = fileURLToPath(
-      new URL("../../../../node_modules/typescript/bin/tsc", import.meta.url),
-    );
-    const fixture = mkdtempSync(path.join(tmpdir(), "paseo-tool-call-detail-"));
-    try {
-      copyFileSync(path.join(packageRoot, "package.json"), path.join(fixture, "package.json"));
-      symlinkSync(
-        path.join(packageRoot, "../../node_modules"),
-        path.join(fixture, "node_modules"),
-        "junction",
-      );
-      execFileSync(
-        process.execPath,
-        [
-          compiler,
-          "-p",
-          path.join(packageRoot, "tsconfig.json"),
-          "--outDir",
-          path.join(fixture, "dist"),
-          "--incremental",
-          "false",
-        ],
-        { stdio: "pipe" },
-      );
-      writeFileSync(
-        path.join(fixture, "consumer.mts"),
-        `
-import { strict as assert } from "node:assert";
-import {
-  buildPaseoToolDetailSections,
-  type PaseoToolDetailField,
-  type PaseoToolDetailSection,
-} from "@getpaseo/protocol/paseo-tool-call-detail";
-import { buildPaseoToolDetailSections as current } from "@getpaseo/protocol/paseo-tool-presentation/index";
-const field: PaseoToolDetailField = { label: "Agent", value: "agt_123" };
-const sections: PaseoToolDetailSection[] = [
-  { kind: "prose", title: "Prompt", text: "Hello" },
-  { kind: "fields", title: "Details", fields: [field] },
-];
-const build: (toolName: string, input: unknown, output: unknown) => PaseoToolDetailSection[] | null = buildPaseoToolDetailSections;
-assert.equal(build, current);
-assert.deepEqual(build("mcp__paseo__send_agent_prompt", { prompt: "Hello", agentId: "agt_123" }, undefined), sections);
-`,
-      );
-      execFileSync(
-        process.execPath,
-        [
-          compiler,
-          path.join(fixture, "consumer.mts"),
-          "--module",
-          "NodeNext",
-          "--moduleResolution",
-          "NodeNext",
-          "--target",
-          "ES2020",
-          "--strict",
-          "--skipLibCheck",
-        ],
-        { stdio: "inherit" },
-      );
-      expect(
-        execFileSync(process.execPath, [path.join(fixture, "consumer.mjs")], { encoding: "utf8" }),
-      ).toBe("");
-    } finally {
-      rmSync(fixture, { recursive: true, force: true });
-    }
-  }, 30_000);
-});
@@ -1,5 +1,4 @@
 export const BUILTIN_PROVIDER_ICON_NAMES = [
-  "antigravity",
  "claude",
  "codex",
  "copilot",
@@ -23,7 +22,6 @@ export const ACP_PROVIDER_ICON_NAMES = [
  "crow-cli",
  "cursor",
  "deepagents",
-  "devin",
  "dimcode",
  "dirac",
  "factory-droid",
@@ -33,7 +31,6 @@ export const ACP_PROVIDER_ICON_NAMES = [
  "glm-acp-agent",
  "goose",
  "grok",
-  "hermes",
  "hoplite",
  "junie",
  "kilo",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/relay",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "description": "Paseo relay for bridging daemon and client connections",
  "files": [
    "dist",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/server",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "description": "Paseo backend server",
  "files": [
    "dist/server",
@@ -107,11 +107,11 @@
    "@agentclientprotocol/sdk": "^0.17.1",
    "@anthropic-ai/claude-agent-sdk": "0.3.246",
    "@anthropic-ai/sdk": "^0.104.2",
-    "@getpaseo/client": "0.12.0",
-    "@getpaseo/highlight": "0.12.0",
-    "@getpaseo/plugin": "0.12.0",
-    "@getpaseo/protocol": "0.12.0",
-    "@getpaseo/relay": "0.12.0",
+    "@getpaseo/client": "0.12.0-beta.3",
+    "@getpaseo/highlight": "0.12.0-beta.3",
+    "@getpaseo/plugin": "0.12.0-beta.3",
+    "@getpaseo/protocol": "0.12.0-beta.3",
+    "@getpaseo/relay": "0.12.0-beta.3",
    "@isaacs/ttlcache": "^2.1.4",
    "@modelcontextprotocol/sdk": "1.29.0",
    "@opencode-ai/sdk": "1.14.46",
@@ -1,59 +0,0 @@
-import { execFile } from "node:child_process";
-import { mkdtemp, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { fileURLToPath } from "node:url";
-import { promisify } from "node:util";
-import { expect, test } from "vitest";
-
-const execFileAsync = promisify(execFile);
-
-// Linux delivers the existing inventory as one batch. Other backends have
-// different startup semantics, so they do not exercise this regression.
-test.skipIf(process.platform !== "linux").each(["healthy", "directory-churn"])(
-  "%s benchmark collects a startup batch larger than the argument limit",
-  async (mode) => {
-    const temporaryRoot = await mkdtemp(join(tmpdir(), "paseo-watch-benchmark-test-"));
-    try {
-      const { stdout } = await execFileAsync(
-        process.execPath,
-        [
-          // Lower the argument limit instead of creating hundreds of thousands
-          // of files. This still runs the real observer and benchmark CLI.
-          "--stack-size=256",
-          "--import",
-          "tsx",
-          fileURLToPath(new URL("./measure-file-observer.ts", import.meta.url)),
-          "--child",
-        ],
-        {
-          timeout: 60_000,
-          env: {
-            ...process.env,
-            TMPDIR: temporaryRoot,
-            PASEO_WATCH_BENCH_MODE: mode,
-            PASEO_WATCH_BENCH_ROOTS: "1",
-            PASEO_WATCH_BENCH_DIRS: "10",
-            PASEO_WATCH_BENCH_PREEXISTING_FILES: "40000",
-            PASEO_WATCH_BENCH_IGNORED_FILES: "1",
-            PASEO_WATCH_BENCH_EDITS: "1",
-            PASEO_WATCH_BENCH_SUSTAINED_EDITS: "1",
-            PASEO_WATCH_BENCH_SUSTAINED_INTERVAL_MS: "1",
-            PASEO_WATCH_BENCH_CHURN_DIRECTORIES: "10",
-            PASEO_WATCH_BENCH_CHURN_FILES_PER_DIRECTORY: "4000",
-            PASEO_WATCH_BENCH_CHURN_ROUNDS: "1",
-            PASEO_WATCH_BENCH_CHURN_DIRECTORIES_PER_ROUND: "2",
-          },
-        },
-      );
-      const measurement = JSON.parse(stdout);
-      expect(measurement.startupEvents).toBe(40_000);
-      expect(measurement.deliveredEvents).toBeGreaterThan(measurement.startupEvents);
-      expect(measurement.missedTrackedPaths).toBe(0);
-      expect(measurement.ignoredEvents).toBe(0);
-    } finally {
-      await rm(temporaryRoot, { recursive: true, force: true });
-    }
-  },
-  90_000,
-);
@@ -199,8 +199,8 @@ async function measure(run: number): Promise<Measurement> {
        root,
        (nextError, events) => {
          error ??= nextError;
+          delivered.push(...events);
          for (const event of events) {
-            delivered.push(event);
            if (!firstObservedAt.has(event.path))
              firstObservedAt.set(event.path, performance.now());
          }
@@ -456,7 +456,7 @@ async function measureDirectoryChurn(run: number): Promise<Measurement> {
    const setupStarted = performance.now();
    subscription = await observer.subscribe(root, (nextError, events) => {
      error ??= nextError;
-      for (const event of events) delivered.push(event);
+      delivered.push(...events);
    });
    const setupMs = performance.now() - setupStarted;

@@ -3654,8 +3654,6 @@ export class AgentManager {
      this.assertAgentRegistrationActive(managed);
      this.emitState(managed, { persist: false });
      this.subscribeToSession(managed);
-      await this.drainSessionEvents(managed.id);
-      this.assertAgentRegistrationActive(managed);
      return { ...managed };
    } catch (error) {
      if (!registered) {
@@ -64,8 +64,7 @@ import { createGitMutationService } from "../session/git-mutation/git-mutation-s
 import type { GeneratedWorkspaceName } from "../worktree-branch-name-generator.js";
 import type { ForgeService } from "../../services/forge-service.js";
 import { areEquivalentPaths } from "../../utils/path.js";
-import { createTerminalManager, type TerminalManager } from "../../terminal/terminal-manager.js";
-import { createWorkerTerminalManager } from "../../terminal/worker-terminal-manager.js";
+import type { TerminalManager } from "../../terminal/terminal-manager.js";
 import { PARENT_AGENT_ID_LABEL } from "@getpaseo/protocol/agent-labels";
 import { PASEO_TOOL_NAMES } from "@getpaseo/protocol/paseo-tool-presentation/index";
 import { MutableDaemonConfigSchema, type AgentProfile } from "@getpaseo/protocol/messages";
@@ -1252,168 +1251,6 @@ describe("browser MCP tools", () => {
 describe("terminal MCP tools", () => {
  const logger = createTestLogger();

-  it.each<[string, string, string, boolean]>([
-    ["Down", "\x1b[B", "", false],
-    ["Up", "\x1b[A", "", false],
-    ["Left", "\x1b[D", "", false],
-    ["Right", "\x1b[C", "", false],
-    ["PageUp", "\x1b[5~", "", false],
-    ["PageDown", "\x1b[6~", "", false],
-    ["Home", "\x1b[H", "", false],
-    ["End", "\x1b[F", "", false],
-    ["Insert", "\x1b[2~", "", false],
-    ["Delete", "\x1b[3~", "", false],
-    ["F1", "\x1bOP", "", false],
-    ["F5", "\x1b[15~", "", false],
-    ["F12", "\x1b[24~", "", false],
-    ["S-Tab", "\x1b[Z", "", false],
-    ["C-r", "\x12", "", false],
-    ["M-b", "\x1bb", "", false],
-    ["C-M-Left", "\x1b[1;7D", "", false],
-    ["C-S-Up", "\x1b[1;6A", "", false],
-    ["C-Space", "\x00", "", false],
-    ["Enter", "\r", "", false],
-    ["Tab", "\t", "", false],
-    ["Escape", "\x1b", "", false],
-    ["Space", " ", "", false],
-    ["BSpace", "\x7f", "", false],
-    ["C-c", "\x03", "", false],
-    ["C-d", "\x04", "", false],
-    ["C-z", "\x1a", "", false],
-    ["C-l", "\x0c", "", false],
-    ["C-a", "\x01", "", false],
-    ["C-e", "\x05", "", false],
-    ["Down", "\x1bOB", "\x1b[?1h", false],
-    ["S-Enter", "\x1b[13;2u", "\x1b[=1;1u", false],
-    ["C-Enter", "\x1b[13;28;13;1;8;1_", "\x1b[?9001h", false],
-    ["echo hello\r", "echo hello\r", "", false],
-    ["\x1b[B", "\x1b[B", "", false],
-    ["UnknownKey", "UnknownKey", "", false],
-    ["constructor", "constructor", "", false],
-    ["__proto__", "__proto__", "", false],
-    ["", "", "", false],
-    ["Down", "Down", "\x1b[?1h", true],
-    ["C-r", "C-r", "", true],
-    ["S-Tab", "S-Tab", "", true],
-  ])(
-    "sends terminal token %j as %j (preamble=%j, literal=%s)",
-    async (keys, data, preamble, literal) => {
-      const { agentManager, agentStorage } = createTestDeps();
-      const send = vi.fn();
-      const terminalManager = createTerminalManagerStub({
-        getTerminal: vi.fn().mockReturnValue({
-          send,
-          getReplayPreamble: () => preamble,
-        }),
-      });
-      const server = await createAgentMcpServer({
-        agentManager,
-        agentStorage,
-        providerSnapshotManager: createClaudeOnlyManager(),
-        terminalManager,
-        logger,
-      });
-
-      try {
-        const response = await registeredTool(server, "send_terminal_keys").handler({
-          terminalId: "term-1",
-          keys,
-          literal,
-        });
-        expect(response.structuredContent).toEqual({ success: true });
-        expect(send).toHaveBeenCalledExactlyOnceWith({ type: "input", data });
-      } finally {
-        await server.close();
-      }
-    },
-  );
-
-  it.each([
-    ["in-process", createTerminalManager],
-    ["worker", createWorkerTerminalManager],
-  ] as const)(
-    "delivers MCP key tokens through %s after terminal input modes change",
-    async (_name, createManager) => {
-      const { agentManager, agentStorage } = createTestDeps();
-      const terminalManager = createManager();
-      const terminal = await terminalManager.createTerminal({
-        cwd: process.cwd(),
-        workspaceId: "ws-terminal-keys",
-        command: process.execPath,
-        args: [
-          "-e",
-          `process.stdin.setRawMode(true);
-         process.stdout.write("READY\\r\\n");
-         process.stdin.on("data", data => {
-           if (data.toString() === "application") {
-             process.stdout.write("\\x1b[?1hAPPLICATION_READY\\r\\n");
-             return;
-           }
-           if (data.toString() === "normal") {
-             process.stdout.write("\\x1b[?1lNORMAL_READY\\r\\n");
-             return;
-           }
-           process.stdout.write("HEX:" + data.toString("hex") + "\\r\\n");
-         });`,
-        ],
-      });
-      const server = await createAgentMcpServer({
-        agentManager,
-        agentStorage,
-        providerSnapshotManager: createClaudeOnlyManager(),
-        terminalManager,
-        logger,
-      });
-
-      let output = "";
-      const unsubscribe = terminal.subscribe((message) => {
-        if (message.type === "output") {
-          output += message.data;
-        }
-      });
-      try {
-        await vi.waitFor(
-          async () => {
-            const capture = await terminalManager.captureTerminal(terminal.id);
-            expect(capture.lines).toContain("READY");
-          },
-          { timeout: 5000 },
-        );
-        const tool = registeredTool(server, "send_terminal_keys");
-        await tool.handler({ terminalId: terminal.id, keys: "application", literal: true });
-        await vi.waitFor(() => expect(output).toContain("APPLICATION_READY"));
-        for (const [keys, hex] of [
-          ["Down", "1b4f42"],
-          ["Up", "1b4f41"],
-          ["Left", "1b4f44"],
-          ["Right", "1b4f43"],
-          ["PageDown", "1b5b367e"],
-          ["S-Tab", "1b5b5a"],
-          ["C-r", "12"],
-          ["M-b", "1b62"],
-        ]) {
-          await tool.handler({ terminalId: terminal.id, keys });
-          await vi.waitFor(async () => {
-            const capture = await terminalManager.captureTerminal(terminal.id);
-            expect(capture.lines.join("\n")).toContain(`HEX:${hex}`);
-          });
-        }
-        await tool.handler({ terminalId: terminal.id, keys: "normal", literal: true });
-        await vi.waitFor(() => expect(output).toContain("NORMAL_READY"));
-        await tool.handler({ terminalId: terminal.id, keys: "Down" });
-        await vi.waitFor(async () => {
-          const capture = await terminalManager.captureTerminal(terminal.id);
-          expect(capture.lines).toContain("HEX:1b5b42");
-        });
-      } finally {
-        unsubscribe();
-        await server.close();
-        await terminalManager.killTerminalAndWait(terminal.id);
-        terminalManager.killAll();
-      }
-    },
-  );
-
  it("captures terminal output through the terminal manager authority", async () => {
    const { agentManager, agentStorage } = createTestDeps();
    const captureTerminal = vi.fn().mockResolvedValue({
@@ -9,7 +9,6 @@ import { PassThrough } from "node:stream";
 import { fileURLToPath } from "node:url";

 import type {
-  AgentClient,
  AgentLaunchContext,
  AgentPermissionRequest,
  AgentSession,
@@ -95,7 +94,6 @@ import {
 } from "./codex/test-utils/fake-app-server.js";
 import { createTestLogger } from "../../../test-utils/test-logger.js";
 import { asInternals as castInternals, createStub } from "../../test-utils/class-mocks.js";
-import { AgentManager } from "../agent-manager.js";
 import { buildProviderRegistry } from "../provider-registry.js";

 interface CollaborationModeRecord {
@@ -7075,95 +7073,3 @@ describe("Codex denied plan approvals", () => {
    });
  });
 });
-
-describe("Codex interactive resume startup", () => {
-  test("delivers an autonomous turn that starts during resume to the first subscriber", async () => {
-    const appServer = createFakeCodexAppServer({
-      "turn/interrupt": () => ({}),
-      "thread/resume": () => {
-        appServer.startsTurn({ threadId: "saved-thread", turnId: "autonomous-turn" });
-        appServer.says({ threadId: "saved-thread", text: "Working on the goal" });
-        return { thread: { id: "saved-thread" } };
-      },
-      "thread/read": () => ({ thread: { turns: [] } }),
-    });
-    const session = new CodexAppServerAgentSession(
-      createConfig({ modeId: "full-access" }),
-      { sessionId: "saved-thread" },
-      createTestLogger(),
-      async () => appServer.child,
-    );
-    try {
-      await session.connect();
-      const events: AgentStreamEvent[] = [];
-      const unsubscribe = session.subscribe((event) => events.push(event));
-      expect(events.some((event) => event.type === "turn_started")).toBe(true);
-      expect(
-        events.some(
-          (event) =>
-            event.type === "timeline" &&
-            event.item.type === "assistant_message" &&
-            event.item.text.includes("Working on the goal"),
-        ),
-      ).toBe(true);
-      await session.interrupt();
-      expect(
-        appServer.requests().find((request) => request.method === "turn/interrupt"),
-      ).toMatchObject({ params: { threadId: "saved-thread", turnId: "autonomous-turn" } });
-      unsubscribe();
-      const laterEvents: AgentStreamEvent[] = [];
-      session.subscribe((event) => laterEvents.push(event));
-      expect(laterEvents).toEqual([]);
-    } finally {
-      await session.close();
-      appServer.assertNoErrors();
-    }
-  });
-  test.each([false, true])(
-    "applies resumed goal events before returning (completed during resume: %s)",
-    async (completedDuringResume) => {
-      const appServer = createFakeCodexAppServer({
-        "thread/resume": () => {
-          appServer.startsTurn({ threadId: "saved-thread", turnId: "autonomous-turn" });
-          if (completedDuringResume) appServer.completeTurn({ threadId: "saved-thread" });
-          return { thread: { id: "saved-thread" } };
-        },
-        "thread/read": () => ({ thread: { turns: [] } }),
-      });
-      const session = new CodexAppServerAgentSession(
-        createConfig({ title: "Resumed goal", cwd: process.cwd() }),
-        { sessionId: "saved-thread" },
-        createTestLogger(),
-        async () => appServer.child,
-      );
-      const client: AgentClient = {
-        provider: "codex",
-        capabilities: session.capabilities,
-        isAvailable: async () => true,
-        fetchCatalog: async () => ({ models: [], modes: [] }),
-        createSession: async () => {
-          throw new Error("Unexpected create");
-        },
-        resumeSession: async () => {
-          await session.connect();
-          return session;
-        },
-      };
-      const manager = new AgentManager({ clients: { codex: client }, logger: createTestLogger() });
-      let id: string | undefined;
-      try {
-        const resumed = await manager.resumeAgentFromPersistence(
-          { provider: "codex", sessionId: "saved-thread" },
-          createConfig({ title: "Resumed goal", cwd: process.cwd() }),
-        );
-        id = resumed.id;
-        expect(resumed.lifecycle).toBe(completedDuringResume ? "idle" : "running");
-        expect(manager.getAgent(id)?.lifecycle).toBe(completedDuringResume ? "idle" : "running");
-      } finally {
-        if (id) await manager.closeAgent(id);
-        await session.close();
-        appServer.assertNoErrors();
-      }
-    },
-  );
-});
@@ -3453,7 +3453,6 @@ export class CodexAppServerAgentSession implements AgentSession {
  private client: CodexAppServerClient | null = null;
  private threadRollbackAvailable = true;
  private readonly subscribers = new Set<(event: AgentStreamEvent) => void>();
-  private startupEvents: AgentStreamEvent[] | null = null;
  private nextTurnOrdinal = 0;
  private activeForegroundTurnId: string | null = null;
  private activeClientMessageId: string | null = null;
@@ -3572,8 +3571,6 @@ export class CodexAppServerAgentSession implements AgentSession {
    if (this.resumeHandle?.sessionId) {
      this.currentThreadId = this.resumeHandle.sessionId;
      this.historyPending = true;
-      // Resuming can start a goal before the caller receives the session.
-      if (this.initialResumePurpose === "interactive") this.startupEvents = [];
    }
  }

@@ -4546,9 +4543,6 @@ export class CodexAppServerAgentSession implements AgentSession {

  subscribe(callback: (event: AgentStreamEvent) => void): () => void {
    this.subscribers.add(callback);
-    const startupEvents = this.startupEvents;
-    this.startupEvents = null;
-    for (const event of startupEvents ?? []) this.notifySubscribers(event);
    return () => {
      this.subscribers.delete(callback);
    };
@@ -5034,7 +5028,6 @@ export class CodexAppServerAgentSession implements AgentSession {
    this.clearPendingPermissions();
    this.pendingSubAgentNotificationsByThreadId.clear();
    this.subscribers.clear();
-    this.startupEvents = null;
    this.activeForegroundTurnId = null;
    this.activeClientMessageId = null;
    this.pendingForegroundTurnIdentification?.resolve(null);
@@ -5382,10 +5375,6 @@ export class CodexAppServerAgentSession implements AgentSession {
  private notifySubscribers(event: AgentStreamEvent): void {
    const turnId = getAgentStreamEventTurnId(event) ?? this.activeForegroundTurnId;
    const tagged = turnId ? { ...event, turnId } : event;
-    if (this.startupEvents) {
-      this.startupEvents.push(tagged);
-      return;
-    }
    this.logger.trace(
      {
        agentId: this.agentId,
@@ -39,8 +39,6 @@ import type { FirstAgentContext } from "../../messages.js";
 import { everyMsToFiveFieldCron } from "@getpaseo/protocol/schedule/cadence";
 import { expandUserPath, isSameOrDescendantPath, resolvePathFromBase } from "../../path-utils.js";
 import type { TerminalManager } from "../../../terminal/terminal-manager.js";
-import { encodeTerminalKeyInput } from "@getpaseo/protocol/terminal-key-input";
-import { TerminalInputModeTracker } from "@getpaseo/protocol/terminal-input-mode";
 import type { CreatePaseoWorktreeWorkflowFn } from "../../worktree-session.js";
 import { computeNextRunAt, validateScheduleCadence } from "../../schedule/cron.js";
 import {
@@ -596,44 +594,37 @@ const TerminalSummarySchema = z.object({
  cwd: z.string(),
 });

-interface TerminalKeyTokenInput {
-  key: string;
-  literal: boolean;
-  preamble: string;
-}
-
-function resolveTerminalKeyToken({ key, literal, preamble }: TerminalKeyTokenInput): string {
+function resolveTerminalKeyToken(key: string, literal: boolean): string {
  if (literal) {
    return key;
  }

-  const match = /^((?:[CMS]-)*)(.+)$/.exec(key);
-  if (!match) {
-    return key;
+  switch (key) {
+    case "Enter":
+      return "\r";
+    case "Tab":
+      return "\t";
+    case "Escape":
+      return "\u001b";
+    case "Space":
+      return " ";
+    case "BSpace":
+      return "\u007f";
+    case "C-c":
+      return "\u0003";
+    case "C-d":
+      return "\u0004";
+    case "C-z":
+      return "\u001a";
+    case "C-l":
+      return "\u000c";
+    case "C-a":
+      return "\u0001";
+    case "C-e":
+      return "\u0005";
+    default:
+      return key;
  }
-  const [, modifiers, token] = match;
-  const aliases: Record<string, string> = {
-    Up: "ArrowUp",
-    Down: "ArrowDown",
-    Left: "ArrowLeft",
-    Right: "ArrowRight",
-    BSpace: "Backspace",
-    Space: " ",
-  };
-  const inputMode = new TerminalInputModeTracker();
-  inputMode.feed(preamble);
-  const encodedKey = Object.hasOwn(aliases, token) ? aliases[token] : token;
-  return (
-    encodeTerminalKeyInput(
-      {
-        key: encodedKey,
-        ctrl: modifiers.includes("C-"),
-        alt: modifiers.includes("M-"),
-        shift: modifiers.includes("S-"),
-      },
-      { inputMode: inputMode.getState() },
-    ) || key
-  );
 }

 export function createPaseoToolCatalog(options: PaseoToolHostDependencies): PaseoToolCatalog {
@@ -2600,8 +2591,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
    "send_terminal_keys",
    {
      title: "Send terminal keys",
-      description:
-        "Send text or a key token: Enter, Tab, Escape, Space, BSpace, Up, Down, Left, Right, Home, End, Insert, Delete, PageUp, PageDown, or F1-F12. Combine C- (Ctrl), M- (Alt), and S- (Shift) prefixes, e.g. C-r, S-Tab, or C-M-Left. Set literal=true to send the text unchanged.",
+      description: "Send literal text or special key tokens to a terminal session.",
      inputSchema: {
        terminalId: z.string(),
        keys: z.string(),
@@ -2623,11 +2613,7 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase

      terminal.send({
        type: "input",
-        data: resolveTerminalKeyToken({
-          key: keys,
-          literal,
-          preamble: terminal.getReplayPreamble(),
-        }),
+        data: resolveTerminalKeyToken(keys, literal),
      });

      return {
@@ -0,0 +1,57 @@
+import { expect, test } from "vitest";
+import { createDaemonTestContext } from "../test-utils/index.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+import type { SessionOutboundMessage } from "../messages.js";
+
+test("deleting an agent removes it from every connected agent subscription", async () => {
+  const ctx = await createDaemonTestContext();
+  const observer = new DaemonClient({ url: `ws://127.0.0.1:${ctx.daemon.port}/ws` });
+  const updates: SessionOutboundMessage[] = [];
+  const requestorUpdates: SessionOutboundMessage[] = [];
+  try {
+    await observer.connect();
+    const agent = await ctx.client.createAgent({
+      provider: "codex",
+      cwd: ctx.daemon.staticDir,
+      title: "Cross-client deletion",
+    });
+    const snapshot = await observer.fetchAgents({ subscribe: {} });
+    expect(snapshot.entries.some((entry) => entry.agent.id === agent.id)).toBe(true);
+    observer.subscribeRawMessages((message) => updates.push(message));
+    ctx.client.subscribeRawMessages((message) => requestorUpdates.push(message));
+
+    await ctx.client.deleteAgent(agent.id);
+
+    // The record is gone, and a fresh query sees that. An existing subscriber
+    // must learn the same fact without reconnecting or fetching another list.
+    const afterDelete = await ctx.client.fetchAgents();
+    expect(afterDelete.entries.some((entry) => entry.agent.id === agent.id)).toBe(false);
+    expect(
+      requestorUpdates.some(
+        (message) =>
+          message.type === "agent_update" &&
+          message.payload.kind === "remove" &&
+          message.payload.agentId === agent.id,
+      ),
+    ).toBe(true);
+    await expect(observer.fetchAgentTimeline(agent.id, { direction: "tail" })).rejects.toThrow(
+      "Agent not found",
+    );
+
+    await expect
+      .poll(
+        () =>
+          updates.some(
+            (message) =>
+              message.type === "agent_update" &&
+              message.payload.kind === "remove" &&
+              message.payload.agentId === agent.id,
+          ),
+        { timeout: 2_000 },
+      )
+      .toBe(true);
+  } finally {
+    await observer.close();
+    await ctx.cleanup();
+  }
+});
@@ -1,72 +1,5 @@
 import { expect, test } from "vitest";
 import { UsageSourceRegistry } from "./index.js";
-import { mkdtemp, mkdir, writeFile, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import {
-  discoverSession as discoverCursorSession,
-  fetchUsage as fetchCursorUsage,
-} from "../../../../../../plugins/cursor-usage-source/server/usage.js";
-import { inputSchema as cursorInputSchema } from "../../../../../../plugins/cursor-usage-source/shared/input.js";
-
-test("#7142: host usage retains distinct Cursor accounts after their individual details are read", async () => {
-  const root = await mkdtemp(join(tmpdir(), "cursor-accounts-"));
-  try {
-    const sessions = new Map<
-      string,
-      { provider: string; sessionKey: string; env: Record<string, string> }
-    >();
-    const spends = new Map<string, number>();
-    for (const [agentId, account, spend] of [
-      ["a", "user-a", 100],
-      ["b", "user-b", 200],
-      ["a-copy", "user-a", 100],
-    ] as const) {
-      const configHome = join(root, agentId);
-      const token = `e30.${Buffer.from(JSON.stringify({ sub: account, nonce: agentId })).toString("base64url")}.signature`;
-      await mkdir(join(configHome, "cursor"), { recursive: true });
-      await writeFile(
-        join(configHome, "cursor", "auth.json"),
-        JSON.stringify({ accessToken: token }),
-      );
-      spends.set(`Bearer ${token}`, spend);
-      sessions.set(agentId, {
-        provider: "cursor",
-        sessionKey: agentId,
-        env: { XDG_CONFIG_HOME: configHome },
-      });
-    }
-    const registry = new UsageSourceRegistry(Date.now, 300_000, undefined, {
-      hasAgent: (id) => sessions.has(id),
-      usageSession: (id) => sessions.get(id) ?? null,
-    });
-    const fetchApi: typeof fetch = async (_url, init) => {
-      const authorization = new Headers(init?.headers).get("Authorization") ?? "";
-      const spend = spends.get(authorization);
-      if (spend === undefined) throw new Error("Unexpected fixture login");
-      return new Response(JSON.stringify({ planUsage: { totalSpend: spend, limit: 1000 } }));
-    };
-    registry.register({
-      id: "cursor",
-      label: "Cursor",
-      discover: (scope) =>
-        scope.kind === "session" ? discoverCursorSession(scope, "linux") : Promise.resolve([]),
-      fetch: (input) => fetchCursorUsage(cursorInputSchema.parse(input), fetchApi),
-    });
-    const spent = (reports: Awaited<ReturnType<typeof registry.listReports>>) =>
-      reports.map((entry) => {
-        if (entry.report.status !== "available")
-          throw new Error("Expected available fixture usage");
-        return entry.report.balances?.[0]?.used;
-      });
-    expect(spent(await registry.listReports({ agentId: "a" }))).toEqual([1]);
-    expect(spent(await registry.listReports({ agentId: "b" }))).toEqual([2]);
-    expect(spent(await registry.listReports({ agentId: "a-copy" }))).toEqual([1]);
-    expect(spent(await registry.listReports())).toEqual([1, 2]);
-  } finally {
-    await rm(root, { recursive: true, force: true });
-  }
-});

 function source(input: {
  id: string;
@@ -1,61 +0,0 @@
-import { execFile } from "node:child_process";
-import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { promisify } from "node:util";
-import { expect, test } from "vitest";
-
-const run = promisify(execFile);
-
-// Opt in on Linux with passwordless sudo, unshare, ip, mount, and tc available:
-// RUN_RELAY_LATENCY_E2E=1 npx vitest run src/server/relay-transport.latency.e2e.test.ts
-// All networking and the hosts-file mount are private to the child namespaces.
-test.runIf(process.platform === "linux" && process.env.RUN_RELAY_LATENCY_E2E === "1")(
-  "connects relay control and data over a slow dual-stack route with an unreachable address",
-  async () => {
-    const directory = await mkdtemp(path.join(os.tmpdir(), "paseo-relay-latency-"));
-    try {
-      const hosts = path.join(directory, "hosts");
-      await writeFile(
-        hosts,
-        `${await readFile("/etc/hosts", "utf8")}\n127.0.0.1 relay-latency.test\n2001:db8:1::1 relay-latency.test\n`,
-      );
-      const fixture = fileURLToPath(
-        new URL("./test-utils/relay-latency-fixture.ts", import.meta.url),
-      );
-      for (const order of ["ipv4first", "ipv6first"]) {
-        const { stdout } = await run(
-          "sudo",
-          [
-            "-n",
-            "unshare",
-            "--mount",
-            "--net",
-            "sh",
-            "-ec",
-            `mount --make-rprivate /
-mount --bind "$1" /etc/hosts
-ip link set lo up
-ip link add relay-test type dummy
-ip addr add 192.0.2.2/32 dev relay-test
-ip -6 addr add 2001:db8::2/128 dev relay-test
-ip link set relay-test up
-tc qdisc add dev lo root netem delay 350ms
-exec "$2" --import tsx "$3" "$4"`,
-            "sh",
-            hosts,
-            process.execPath,
-            fixture,
-            order,
-          ],
-          { timeout: 20_000 },
-        );
-        expect(stdout).toContain("relay data round trip passed");
-      }
-    } finally {
-      await rm(directory, { recursive: true, force: true });
-    }
-  },
-  45_000,
-);
@@ -56,13 +56,7 @@ type ControlMessage =
 const CONTROL_PING_INTERVAL_MS = 10_000;
 const CONTROL_STALE_TIMEOUT_MS = 30_000;
 const CONTROL_READY_TIMEOUT_MS = 8_000;
-const RELAY_WEBSOCKET_OPTIONS = {
-  handshakeTimeout: 10_000,
-  perMessageDeflate: false,
-  // Node cancels each non-final address when this expires, even if the next
-  // address is unreachable. Allow high-latency routes time to connect.
-  autoSelectFamilyAttemptTimeout: 5_000,
-} as const;
+const RELAY_WEBSOCKET_OPTIONS = { handshakeTimeout: 10_000, perMessageDeflate: false } as const;

 function createDefaultRelayWebSocket(url: string): RelayWebSocketLike {
  return new WebSocket(url, RELAY_WEBSOCKET_OPTIONS);
@@ -1,75 +0,0 @@
-import assert from "node:assert/strict";
-import dns from "node:dns";
-import { once } from "node:events";
-import net from "node:net";
-import { Writable } from "node:stream";
-import pino from "pino";
-import { WebSocketServer } from "ws";
-import { startRelayTransport } from "../relay-transport.js";
-
-// Match the reported runtime even on Node versions with a newer default.
-net.setDefaultAutoSelectFamilyAttemptTimeout(250);
-const order = process.argv[2];
-assert.ok(order === "ipv4first" || order === "ipv6first");
-dns.setDefaultResultOrder(order);
-
-const logs: string[] = [];
-const logger = pino(
-  { level: "debug" },
-  new Writable({
-    write(chunk, _encoding, callback) {
-      logs.push(chunk.toString());
-      callback();
-    },
-  }),
-);
-const relay = new WebSocketServer({ host: "127.0.0.1", port: 0 });
-await once(relay, "listening");
-const address = relay.address();
-assert.ok(address && typeof address !== "string");
-relay.on("connection", (socket, request) => {
-  const url = new URL(request.url!, "http://relay-latency.test");
-  if (url.searchParams.has("connectionId")) {
-    socket.on("message", (data) => socket.send(data));
-  } else {
-    socket.send(JSON.stringify({ type: "sync", connectionIds: ["latency-client"] }));
-  }
-});
-
-let complete!: () => void;
-let fail!: (error: Error) => void;
-const delivered = new Promise<void>((resolve, reject) => {
-  complete = resolve;
-  fail = reject;
-});
-const deadline = setTimeout(() => fail(new Error(logs.join(""))), 8_000);
-const transport = startRelayTransport({
-  logger,
-  relayEndpoint: `relay-latency.test:${address.port}`,
-  relayUseTls: false,
-  serverId: "latency-server",
-  attachSocket: async (socket) => {
-    socket.on("message", (data) => {
-      try {
-        assert.equal(String(data), "latency round trip");
-        complete();
-      } catch (error) {
-        fail(error as Error);
-      }
-    });
-    socket.send("latency round trip");
-  },
-});
-
-try {
-  await delivered;
-  assert.ok(logs.some((line) => JSON.parse(line).msg === "relay_control_connected"));
-  assert.ok(logs.some((line) => JSON.parse(line).msg === "relay_data_connected"));
-  assert.ok(!logs.some((line) => JSON.parse(line).msg === "relay_error"));
-  console.log("relay data round trip passed");
-} finally {
-  clearTimeout(deadline);
-  await transport.stop();
-  for (const socket of relay.clients) socket.terminate();
-  await new Promise<void>((resolve) => relay.close(() => resolve()));
-}
@@ -125,7 +125,6 @@ function watchTerminal(session: TerminalSession): void {
        type: "terminalMessage",
        terminalId: session.id,
        message: { type: "output", data: payload.toString("utf8"), revision },
-        replayPreamble: session.getReplayPreamble(),
      });
    },
  });
@@ -145,7 +144,6 @@ function watchTerminal(session: TerminalSession): void {
        type: "terminalMessage",
        terminalId: session.id,
        message,
-        replayPreamble: session.getReplayPreamble(),
      });
    },
    // Creation already sends an authoritative state in terminalCreated. A second
@@ -121,7 +121,6 @@ export type TerminalWorkerEvent =
      type: "terminalMessage";
      terminalId: string;
      message: ServerMessage;
-      replayPreamble: string;
    }
  | {
      type: "terminalExit";
@@ -67,7 +67,8 @@ interface WorkerTerminalRecord {
  state: TerminalState;
  activity: TerminalActivity | null;
  // Cached input-mode preamble from the worker (the authoritative tracker lives
-  // in the worker process). Updated with streamed output and snapshot responses.
+  // in the worker process). Refreshed on every getTerminalState response and on
+  // the snapshotReady event that precedes a live-restore replay.
  replayPreamble: string;
  exitInfo: TerminalExitInfo | null;
  messageListeners: Set<(msg: ServerMessage) => void>;
@@ -355,6 +356,11 @@ export function createWorkerTerminalManager(
        };
      },
      getReplayPreamble(): string {
+        // Refreshed from every getTerminalState response, which the controller fetches
+        // before every snapshot replay (legacy + visible-snapshot restore). The one
+        // gap is restore.mode === "live", which replays without fetching state — there
+        // this can be stale/empty. No client sends "live" today; revisit (ship the
+        // preamble on the worker's snapshotReady) if one ever does.
        return record.replayPreamble;
      },
      getTitle(): string | undefined {
@@ -423,7 +429,9 @@ export function createWorkerTerminalManager(
    if (message.message.type === "snapshot") {
      record.state = message.message.state;
    }
-    record.replayPreamble = message.replayPreamble;
+    if (message.message.type === "snapshotReady" && message.message.replayPreamble !== undefined) {
+      record.replayPreamble = message.message.replayPreamble;
+    }
    for (const listener of Array.from(record.messageListeners)) {
      listener(message.message);
    }
@@ -1,26 +0,0 @@
-import { expect, test, type Page } from "playwright/test";
-
-test("keeps unrelated agent artwork unchanged while adding the Hermes mark", async ({ page }) => {
-  await openSupportedAgents(page);
-  await expectGenericAgentMark(page, "CodeWhale");
-  await expectVendoredAgentMark(page, "Hermes Agent");
-});
-
-async function openSupportedAgents(page: Page) {
-  await page.goto("/agents");
-  await expect(page.getByRole("heading", { level: 1, name: "Supported agents" })).toBeVisible();
-}
-
-async function expectGenericAgentMark(page: Page, name: string) {
-  const card = page.getByRole("link", { name, exact: true });
-  await expect(card).toBeVisible();
-  // Decorative SVGs have no accessible role; the fallback is Lucide's bot mark.
-  await expect(card.locator("svg.lucide-bot")).toBeVisible();
-}
-
-async function expectVendoredAgentMark(page: Page, name: string) {
-  const card = page.getByRole("link", { name, exact: true });
-  await expect(card).toBeVisible();
-  await expect(card.locator("svg")).toBeVisible();
-  await expect(card.locator("svg.lucide-bot")).toHaveCount(0);
-}
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/website",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "private": true,
  "type": "module",
  "scripts": {
@@ -273,50 +273,13 @@ describe("cursor usage source", () => {
      writeFileSync(path, JSON.stringify({ accessToken: "session-token" }));
    }

-    it("keeps different accounts separate while joining global and session logins for the same account", async () => {
-      function token(sub: string, nonce: string) {
-        return `e30.${Buffer.from(JSON.stringify({ sub, nonce })).toString("base64url")}.signature`;
-      }
-      writeCursorAuthJson(homeDir, token("user-a", "desktop"));
-      writeCursorAuthJson(sessionHome, token("user-b", "session"));
-      const globalAccounts = await discover();
-      const differentAccount = await discoverSession(cursorSession({}), "linux");
-      expect(globalAccounts).toHaveLength(1);
-      expect(differentAccount).toHaveLength(1);
-      expect(differentAccount[0]!.key).not.toBe(globalAccounts[0]!.key);
-
-      writeCursorAuthJson(sessionHome, token("user-a", "refreshed-session"));
-      const sameAccount = await discoverSession(cursorSession({}), "linux");
-      expect(sameAccount).toHaveLength(1);
-      expect(sameAccount[0]!.key).toBe(globalAccounts[0]!.key);
-    });
-
-    it("isolates logins without a readable subject by store and keeps their key across token rotation", async () => {
-      writeCursorAuthJson(homeDir, "opaque-global-token");
-      writeCursorAuthJson(sessionHome, "opaque-session-token");
-      const globalAccounts = await discover();
-      const sessionAccounts = await discoverSession(cursorSession({}), "linux");
-      expect(sessionAccounts).toHaveLength(1);
-      expect(globalAccounts).toHaveLength(1);
-      expect(sessionAccounts[0]!.key).not.toBe(globalAccounts[0]!.key);
-      writeCursorAuthJson(sessionHome, "e30.invalid-json.signature");
-      expect(await discoverSession(cursorSession({}), "linux")).toEqual(sessionAccounts);
-      writeCursorAuthJson(sessionHome, "e30.e30.signature");
-      expect(await discoverSession(cursorSession({}), "linux")).toEqual(sessionAccounts);
-    });
-
    it("reads the login cursor-agent uses under the session's XDG_CONFIG_HOME", async () => {
      const configHome = join(sessionHome, "xdg");
      const authPath = join(configHome, "cursor", "auth.json");
      writeAuthJson(authPath);
      expect(
        await discoverSession(cursorSession({ XDG_CONFIG_HOME: configHome }), "linux"),
-      ).toEqual([
-        {
-          key: expect.stringMatching(/^store-[a-f0-9]{64}$/),
-          input: { store: "file", locator: authPath },
-        },
-      ]);
+      ).toEqual([{ key: "default", input: { store: "file", locator: authPath } }]);
    });

    it("reads the login under the session's HOME, not the daemon's", async () => {
@@ -324,7 +287,7 @@ describe("cursor usage source", () => {
      writeCursorAuthJson(sessionHome, "session-token");
      expect(await discoverSession(cursorSession({}), "linux")).toEqual([
        {
-          key: expect.stringMatching(/^store-[a-f0-9]{64}$/),
+          key: "default",
          input: { store: "file", locator: join(sessionHome, ".config", "cursor", "auth.json") },
        },
      ]);
@@ -335,10 +298,7 @@ describe("cursor usage source", () => {
      const authPath = join(appData, "Cursor", "auth.json");
      writeAuthJson(authPath);
      expect(await discoverSession(cursorSession({ APPDATA: appData }), "win32")).toEqual([
-        {
-          key: expect.stringMatching(/^store-[a-f0-9]{64}$/),
-          input: { store: "file", locator: authPath },
-        },
+        { key: "default", input: { store: "file", locator: authPath } },
      ]);
    });

@@ -348,12 +308,7 @@ describe("cursor usage source", () => {
      expect(await discoverSession(cursorSession({}), "darwin")).toEqual([]);
      expect(
        await discoverSession(cursorSession({ AGENT_CLI_CREDENTIAL_STORE: "file" }), "darwin"),
-      ).toEqual([
-        {
-          key: expect.stringMatching(/^store-[a-f0-9]{64}$/),
-          input: { store: "file", locator: authPath },
-        },
-      ]);
+      ).toEqual([{ key: "default", input: { store: "file", locator: authPath } }]);
    });

    it.each([
@@ -386,10 +341,7 @@ it("discovery returns a locator when fetch finds cursor credentials", async () =
    });
    expect(requested).toBe(true);
    expect(await discover()).toEqual([
-      {
-        key: expect.stringMatching(/^store-[a-f0-9]{64}$/),
-        input: { store: "env", locator: "CURSOR_ACCESS_TOKEN" },
-      },
+      { key: "default", input: { store: "env", locator: "CURSOR_ACCESS_TOKEN" } },
    ]);
  } finally {
    if (previous === undefined) delete process.env["CURSOR_ACCESS_TOKEN"];
@@ -1,5 +1,4 @@
 import type { UsageInput } from "../shared/input.js";
-import { createHash } from "node:crypto";
 import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
@@ -212,26 +211,6 @@ async function readToken(input: UsageInput): Promise<string | undefined> {
  return token ?? undefined;
 }

-const CursorIdentitySchema = z.object({ sub: z.string().min(1) });
-
-function cursorAccount(token: string, input: UsageInput): UsageAccount {
-  const parts = token.split(".");
-  if (parts.length === 3) {
-    try {
-      const payload: unknown = JSON.parse(Buffer.from(parts[1]!, "base64url").toString("utf8"));
-      const identity = CursorIdentitySchema.safeParse(payload);
-      if (identity.success) {
-        const key = createHash("sha256").update(identity.data.sub).digest("hex");
-        return { key: `account-${key}`, input };
-      }
-    } catch {
-      // Non-JWT logins still have a usage card, isolated to their credential store.
-    }
-  }
-  const key = createHash("sha256").update(JSON.stringify(input)).digest("hex");
-  return { key: `store-${key}`, input };
-}
-
 export async function discover(): Promise<UsageAccount[]> {
  const home = homedir();
  const candidates: UsageInput[] = ["CURSOR_ACCESS_TOKEN", "CURSOR_TOKEN"].map((locator) => ({
@@ -258,14 +237,12 @@ export async function discover(): Promise<UsageAccount[]> {
    ].map((locator) => ({ store: "sqlite" as const, locator })),
    { store: "file", locator: join(home, ".config", "cursor", "auth.json") },
  );
-  for (const input of candidates) {
-    const token = await readToken(input);
-    if (token) return [cursorAccount(token, input)];
-  }
+  for (const input of candidates) if (await readToken(input)) return [{ key: "default", input }];
  return [];
 }

-// Account identity joins global and session logins without merging different users.
+// Resolves the login a cursor-agent session runs on. The key matches global discovery so
+// the session's login joins the host's Cursor card instead of adding a second one.
 export async function discoverSession(
  scope: Extract<UsageScope, { kind: "session" }>,
  platform: NodeJS.Platform = process.platform,
@@ -274,8 +251,7 @@ export async function discoverSession(
  const locator = cursorAgentAuthPath(scope.env, platform);
  if (!locator) return [];
  const input: UsageInput = { store: "file", locator };
-  const token = await readToken(input);
-  return token ? [cursorAccount(token, input)] : [];
+  return (await readToken(input)) ? [{ key: "default", input }] : [];
 }

 // Mirrors cursor-agent's credential store. Env credentials win over the stored login and
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/builtin-plugins",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "private": true,
  "type": "module",
  "scripts": {
@@ -379,7 +379,6 @@ test("quality preserves commands and routes each domain independently after fail
      "npx --yes lockfile-lint --path package-lock.json --type npm --allowed-hosts npm --validate-https --validate-integrity",
      "npm audit signatures",
      "npm run lint",
-      "node --test scripts/oxlint/paseo-plugin.test.mjs",
    ],
    relay: ["npm run build:relay", "npm run test --workspace=@getpaseo/relay"],
    sdk: [
@@ -1,42 +0,0 @@
-// Repo-specific oxlint rules. Each rule is its own name, so its burn-down list in .oxlintrc.json
-// is one override that cannot interact with the `no-restricted-imports` burn-downs.
-
-const PRESS_PRIMITIVE_SOURCES = new Set(["react-native", "react-native-gesture-handler"]);
-const PRESS_PRIMITIVE_NAMES = new Set([
-  "Pressable",
-  "TouchableHighlight",
-  "TouchableNativeFeedback",
-  "TouchableOpacity",
-  "TouchableWithoutFeedback",
-]);
-
-export const NO_RAW_PRESSABLE_MESSAGE =
-  "A raw pressable has no standard press or hover feedback. Icon actions use ToolbarButton " +
-  "(@/components/ui/pane-content-toolbar); rows on a menu surface use MenuItem or " +
-  "ComposerTrackRow; other rows use PressHighlight (@/components/ui/press-highlight); labelled " +
-  "buttons use Button. See docs/design.md §2.";
-
-const noRawPressable = {
-  create(context) {
-    return {
-      ImportDeclaration(node) {
-        if (!PRESS_PRIMITIVE_SOURCES.has(node.source.value)) return;
-        for (const specifier of node.specifiers) {
-          if (
-            specifier.type === "ImportSpecifier" &&
-            PRESS_PRIMITIVE_NAMES.has(specifier.imported.name)
-          ) {
-            context.report({ node: specifier, message: NO_RAW_PRESSABLE_MESSAGE });
-          }
-        }
-      },
-    };
-  },
-};
-
-export default {
-  meta: { name: "paseo" },
-  rules: {
-    "no-raw-pressable": noRawPressable,
-  },
-};
@@ -1,54 +0,0 @@
-import assert from "node:assert/strict";
-import { spawnSync } from "node:child_process";
-import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import path from "node:path";
-import { test } from "node:test";
-import { fileURLToPath } from "node:url";
-
-const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../..");
-const oxlintBin = path.join(repoRoot, "node_modules/.bin/oxlint");
-const pluginPath = path.join(repoRoot, "scripts/oxlint/paseo-plugin.mjs");
-
-function lint(source) {
-  const dir = mkdtempSync(path.join(tmpdir(), "paseo-oxlint-"));
-  try {
-    writeFileSync(
-      path.join(dir, ".oxlintrc.json"),
-      JSON.stringify({ jsPlugins: [pluginPath], rules: { "paseo/no-raw-pressable": "error" } }),
-    );
-    writeFileSync(path.join(dir, "probe.tsx"), source);
-    const result = spawnSync(oxlintBin, ["-c", ".oxlintrc.json", "probe.tsx"], {
-      cwd: dir,
-      encoding: "utf8",
-    });
-    return { failed: result.status !== 0, output: result.stdout + result.stderr };
-  } finally {
-    rmSync(dir, { recursive: true, force: true });
-  }
-}
-
-test("a raw Pressable from react-native is reported", () => {
-  const result = lint(
-    'import { Pressable, View } from "react-native";\nexport { Pressable, View };\n',
-  );
-  assert.equal(result.failed, true);
-  assert.match(result.output, /no-raw-pressable/);
-});
-
-test("an aliased gesture-handler touchable is reported", () => {
-  const result = lint(
-    'import { TouchableOpacity as Tap } from "react-native-gesture-handler";\nexport { Tap };\n',
-  );
-  assert.equal(result.failed, true);
-  assert.match(result.output, /no-raw-pressable/);
-});
-
-test("press primitives and pressable types are allowed", () => {
-  const result = lint(
-    'import { View, type PressableProps } from "react-native";\n' +
-      'import { ToolbarButton } from "@/components/ui/pane-content-toolbar";\n' +
-      "export type Props = PressableProps;\nexport { View, ToolbarButton };\n",
-  );
-  assert.equal(result.failed, false, result.output);
-});
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M18.8 0H5.2A5.2 5.2 0 000 5.2v13.6A5.2 5.2 0 005.2 24h13.6a5.2 5.2 0 005.2-5.2V5.2A5.2 5.2 0 0018.8 0z" fill="#9046FF" /> <path d="M7.97 16.376c-1.644 3.642 1.86 4.556 4.443 2.424.76 2.39 3.608.607 4.631-1.247 2.251-4.084 1.342-8.249 1.108-9.108-1.6-5.859-9.6-5.869-10.976.03-.323 1.033-.328 2.206-.507 3.423-.09.617-.16 1.009-.393 1.655-.139.373-.323.7-.62 1.257-.458.865-.264 2.53 2.101 1.665l.224-.1h-.01l-.001.001z" fill="#fff" /> <path d="M12.722 10.985c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.218-.97a.61.61 0 01.537-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005zm2.703 0c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.219-.97a.61.61 0 01.536-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005z" fill="#000" /></svg>