test(app): reproduce stale draft error after host reconnects

After an offline draft submit, reconnecting restores model selection but leaves the connection alert visible. Keep the failing browser assertion to guide the submission error ownership decision in #7307.
2026-10-27 03:32:55 +00:00 · 2026-10-19 00:38:12 +02:00
174 changed files with 1192 additions and 4908 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.
@@ -240,9 +240,8 @@ Do not put any other code modules in the plugin root.

 Shared files import contract helpers and types from `@getpaseo/plugin`. Server handler files import
 `PluginHandlerContext` from `@getpaseo/plugin/server`. Client files import Paseo UI from
-`@getpaseo/plugin/client/react-native`. Its `Icon` draws a Lucide name from the client's installed
-icon set, or any `PluginIcon` through its `icon` prop; an unknown name or unsafe SVG renders nothing
-so it cannot break the plugin surface.
+`@getpaseo/plugin/client/react-native`. Its `Icon` resolves a Lucide name using the client's installed icon
+set; an unknown name renders nothing so it cannot break the plugin surface.
 Its controlled modal keeps presentation metadata on `<Modal title="…" icon={…}>` and body UI in
 `<Modal.Content>`. Body layout, sheet-aware scrolling, and clipboard actions follow the
 [host UI contract](../public-docs/plugins/reference.md#host-ui).
@@ -333,7 +332,7 @@ created by plugin code. Paseo removes registered contributions, unmounts surface
 state, rejects pending RPCs, closes the plugin's daemon session, and stops the subprocess. Cleanup
 errors are logged and do not interrupt host teardown.

-Paseo owns the route, screen header, icon validation, close action, theme DTO, layout facts,
+Paseo owns the route, screen header, Lucide icon validation, close action, theme DTO, layout facts,
 and render error boundary. The contributed component owns the complete body below the header.
 The plugin owns the header's text through the screen's `title` (`resolvePluginScreenTitle` in
 `plugins/surface-contribution.ts`). A legacy `addSidebarItem` route (`/sidebar/<id>`) shows the
@@ -401,25 +400,6 @@ See the public [navigation fields](../public-docs/plugins/reference.md#screens-a
 and [external links and workspace browsers](../public-docs/plugins/reference.md#external-links-and-workspace-browsers)
 for the author-facing contract.

-### Plugin icons
-
-The [public reference](../public-docs/plugins/reference.md#icons) owns the author API: a contribution
-`icon` is a Lucide name, `{ svg }`, or a component.
-
- `findSvgIconProblem` in the SDK root (`packages/plugin/src/icons.ts`) is the only SVG rule set.
-  The daemon applies it to provider and usage-source icon files; the app applies it to inline
-  icons. Change the rules there, never at a call site.
- The app validates each icon once, at registration, through `parsePluginIcon` in
-  `packages/app/src/plugins/icons.ts`. Rendering trusts the stored icon.
- That module is the only code that branches on the icon form. Surfaces draw with
-  `PluginIconView`, or take a stable component from `pluginIconComponent` when their slot expects
-  one. Lucide and SVG icons receive only size and color, so the host props a button passes to its
-  component icon never reach an SVG element.
- Attachment sources take `PluginSerializableIcon`: composer drafts persist the source's icon with
-  each attachment, and a component cannot be stored.
- The plugin compiler loads `.svg` imports as text, so `import icon from "./client/icon.svg"` is the
-  markup string.
-
 ## Lifecycle hooks

 Server entries register lifecycle observers with `server.on()` and request transforms with
@@ -511,13 +491,15 @@ provider implementation. The public [provider plugin guide](../public-docs/plugi
 owns author workflow, lifecycle, testing, and distribution guidance.

 `ProviderRegistration.icon` is a file path relative to the plugin directory, such as `icon.svg`.
-It must resolve inside that directory to a regular file that passes the shared SVG icon rules
-(see [Plugin icons](#plugin-icons)). Paseo reads and validates the file when the plugin starts; the
-string is never inline SVG or a URL.
+It must resolve inside that directory to a regular SVG file no larger than 64 KiB. The SVG must be
+self-contained: scripts, styles, `foreignObject`, event-handler attributes, JavaScript URLs, and
+external `href` or `xlink:href` references are rejected. Fragment references such as `#mark` are
+allowed. Paseo reads and sanitizes the file when the plugin starts; the string is never an inline
+SVG or URL.

 ## Usage sources

-Register a usage source from `index.server.ts` with `server.registerUsageSource()`. Import `UsageSourceRegistration` and normalization helpers from `@getpaseo/plugin/server/usage`. The plugin owns account discovery, harness labels, and credential-store reads; the daemon owns account grouping and the fetch cache. Agent popovers use only the agent's own login. The host-wide Usage modal falls back across an account's logins; any success shows usage only, and all failures show every login's labeled error and remedy. Follow the [usage source discovery contract](../public-docs/plugins/reference.md#usage-sources). The resolved launch environment crosses into the trusted, unsandboxed plugin subprocess for session discovery. Usage queries never run lifecycle hooks. Inputs are validated in the plugin process and remain daemon-side. `icon` uses the same SVG file rules as provider icons.
+Register a usage source from `index.server.ts` with `server.registerUsageSource()`. Import `UsageSourceRegistration` and normalization helpers from `@getpaseo/plugin/server/usage`. The plugin owns account discovery, harness labels, and credential-store reads; the daemon owns account grouping and the fetch cache. Agent popovers use only the agent's own login. The host-wide Usage modal falls back across an account's logins; any success shows usage only, and all failures show every login's labeled error and remedy. Follow the [usage source discovery contract](../public-docs/plugins/reference.md#usage-sources). The resolved launch environment crosses into the trusted, unsandboxed plugin subprocess for session discovery. Usage queries never run lifecycle hooks. Inputs are validated in the plugin process and remain daemon-side. `icon` uses the same sanitized SVG file rules as provider icons.

 The daemon calls discovery for `usage.list_reports`; the client gates this RPC on `server_info.features.usageSources`. The old `provider.usage.list` RPC maps discovered reports for older clients.

@@ -74,14 +74,6 @@ The adapter keys legacy slots by physical socket, so an old connection cannot re
 sibling's observation even when both use the same logical client ID. Optional wire IDs stay accepted
 for parsing compatibility; modern requests cannot select their subscription ID.

-Workspace setup details negotiate `workspace_setup_observation` with
-`server_info.features.workspaceSetupObservation`. Capable clients cannot request details through
-the legacy session event category. The setup panel owns a workspace-scoped observation while
-active and visible; directory metadata signals failures without requesting output. Older clients
-retain their legacy event delivery. A new app makes no setup event demand on older hosts and
-requires a host update to view details. Subscription-capable older hosts honor that absence of
-demand; broadcast-era hosts require an update before wire silence is guaranteed.
-
 ## Every shim is tagged and dated

 A shim that exists for old-app or old-daemon support carries a comment naming it, the version it arrived in, and when it can go:
@@ -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();
    }
@@ -11,7 +11,7 @@ async function restoreHostConnection(gate: Awaited<ReturnType<typeof installDaem
  gate.releaseHeldServerMessage("status");
 }

-test("an offline workspace draft reports the disconnected host instead of loading models", async ({
+test("an offline workspace draft clears its connection error when the host reconnects", async ({
  page,
  withWorkspace,
 }) => {
@@ -28,5 +28,6 @@ test("an offline workspace draft reports the disconnected host instead of loadin
  await expect(page.getByText("Loading...", { exact: true })).toHaveCount(0);
  await restoreHostConnection(gate);
  await expectComposerModel(page, "Ten second stream");
+  await expect(page.getByRole("alert").filter({ hasText: "Host is not connected" })).toHaveCount(0);
  await expect(page.getByRole("textbox", { name: "Message agent..." })).toHaveValue("hello");
 });
@@ -1,138 +0,0 @@
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import path from "node:path";
-import type { Locator, TestInfo } from "@playwright/test";
-import { expect, test, type Page } from "../support/fixtures";
-import { openCommandCenter } from "../support/helpers/command-center";
-import { gotoAppShell } from "../support/helpers/app";
-import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
-import { pluginRequirements } from "../support/helpers/plugin-fixture";
-import { seedWorkspace } from "../support/helpers/seed-client";
-import { getServerId } from "../support/helpers/server-id";
-import {
-  switchWorkspaceViaSidebar,
-  waitForWorkspaceInSidebar,
-} from "../support/helpers/workspace-ui";
-
-const PLUGIN_ID = "plugin-icons-e2e";
-const SVG_PATH = "M4 12l5 5L20 6";
-
-const pluginClientSource = `import React from "react";
-import { Text, View } from "react-native";
-
-const checkIcon = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3"><path d="${SVG_PATH}" /></svg>';
-
-function BadgeIcon({ size, color }) {
-  return <View testID="plugin-component-icon" style={{ width: size, height: size, borderRadius: size / 2, backgroundColor: color }} />;
-}
-
-function Panel() {
-  return <View><Text>Plugin icon panel</Text></View>;
-}
-
-const panels = [
-  { id: "lucide", title: "Lucide icon panel", icon: "Scan" },
-  { id: "svg", title: "SVG icon panel", icon: { svg: checkIcon } },
-  { id: "component", title: "Component icon panel", icon: BadgeIcon },
-];
-
-export default function contribute(client) {
-  for (const panel of panels) {
-    client.addWorkspacePanel({ ...panel, context: "workspace", Component: Panel });
-    client.addCommandCenterItem({
-      id: panel.id,
-      title: "Open " + panel.title,
-      icon: panel.icon,
-      context: "workspace",
-      onSelect({ openPanel }) { openPanel(panel.id); },
-    });
-  }
-  return () => {};
-}`;
-
-function pluginTab(page: Page, panelId: string): Locator {
-  const identity = `${PLUGIN_ID.length}_${PLUGIN_ID}_${panelId.length}_${panelId}`;
-  return page.getByTestId(`workspace-tab-plugin_workspace_${identity}`).filter({ visible: true });
-}
-
-async function runCommand(page: Page, title: string): Promise<void> {
-  const panel = await openCommandCenter(page);
-  await panel.getByTestId("command-center-input").fill(title);
-  await panel.getByRole("button", { name: title, exact: true }).click();
-  await expect(panel).not.toBeVisible();
-}
-
-async function capture(page: Page, testInfo: TestInfo, name: string): Promise<void> {
-  const screenshot = testInfo.outputPath(`${name}.png`);
-  await page.screenshot({ path: screenshot });
-  await testInfo.attach(name, { path: screenshot, contentType: "image/png" });
-}
-
-test.describe("plugin icons", () => {
-  test.describe.configure({ timeout: 180_000 });
-
-  test("renders a Lucide name, inline SVG, and a component", async ({ page }, testInfo) => {
-    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-icons-e2e-"));
-    const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
-    const previous = await client.getDaemonConfig();
-    const workspace = await seedWorkspace({ repoPrefix: "plugin-icons-" });
-    await writeFile(
-      path.join(directory, "paseo-plugin.json"),
-      JSON.stringify({ id: PLUGIN_ID, requirements: pluginRequirements }),
-    );
-    await writeFile(path.join(directory, "index.client.tsx"), pluginClientSource);
-
-    try {
-      await client.patchDaemonConfig({ pluginsEnabled: true });
-      await client.installDirectoryPlugin(directory);
-      await page.setViewportSize({ width: 1280, height: 800 });
-      await gotoAppShell(page);
-      const target = { serverId: getServerId(), workspaceId: workspace.workspaceId };
-      await waitForWorkspaceInSidebar(page, target);
-      await switchWorkspaceViaSidebar({ page, ...target });
-
-      await test.step("Command Center rows draw each icon form", async () => {
-        const panel = await openCommandCenter(page);
-        await panel.getByTestId("command-center-input").fill("icon panel");
-        for (const title of ["Lucide icon panel", "SVG icon panel", "Component icon panel"]) {
-          await expect(
-            panel.getByRole("button", { name: `Open ${title}`, exact: true }),
-          ).toBeVisible();
-        }
-        await expect(
-          panel
-            .getByRole("button", { name: "Open SVG icon panel", exact: true })
-            .locator(`path[d="${SVG_PATH}"]`),
-        ).toBeVisible();
-        await expect(
-          panel
-            .getByRole("button", { name: "Open Component icon panel", exact: true })
-            .getByTestId("plugin-component-icon"),
-        ).toBeVisible();
-        await capture(page, testInfo, "command-center-icons");
-        await page.keyboard.press("Escape");
-      });
-
-      await test.step("workspace panel tabs draw each icon form", async () => {
-        await runCommand(page, "Open Lucide icon panel");
-        await runCommand(page, "Open SVG icon panel");
-        await runCommand(page, "Open Component icon panel");
-        await expect(pluginTab(page, "lucide").locator("svg")).toBeVisible();
-        await expect(pluginTab(page, "svg").locator(`path[d="${SVG_PATH}"]`)).toBeVisible();
-        await expect(
-          pluginTab(page, "component").getByTestId("plugin-component-icon"),
-        ).toBeVisible();
-        await capture(page, testInfo, "workspace-tab-icons");
-      });
-    } finally {
-      try {
-        await client.removePlugin(PLUGIN_ID);
-      } finally {
-        await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
-        await workspace.cleanup();
-        await client.close();
-        await rm(directory, { recursive: true, force: true });
-      }
-    }
-  });
-});
@@ -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();
  }
@@ -28,7 +28,6 @@ import {
  closeWorkspaceScriptsMenu,
  seedProjectForWorkspaceSetup,
  waitForWorkspaceSetupProgress,
-  observeSetupPanelTraffic,
 } from "../support/helpers/workspace-setup";

 interface WorkspaceScriptStarter {
@@ -117,45 +116,6 @@ test.describe("Workspace setup streaming", () => {
    }
  });

-  test("setup panel releases details while retained behind another tab and resubscribes when shown", async ({
-    page,
-  }) => {
-    const client = await connectWorkspaceSetupClient();
-    const repo = await createTempGitRepo("setup-membership-", {
-      paseoConfig: { worktree: { setup: ["echo setup complete"] } },
-    });
-    const traffic = observeSetupPanelTraffic(page);
-    try {
-      await seedProjectForWorkspaceSetup(client, repo.path);
-      const completed = waitForWorkspaceSetupProgress(
-        client,
-        (payload) => payload.status === "completed",
-      );
-      const workspace = await createWorkspaceThroughDaemon(client, {
-        cwd: repo.path,
-        worktreeSlug: "setup-membership",
-      });
-      await completed;
-      await openHomeWithProject(page, repo.path);
-      await navigateToWorkspaceViaSidebar(page, workspace.id);
-      await expectSetupTabNotSeeded(page, workspace.id);
-      await traffic.expectNoDemand();
-      await expectSetupPanel(page);
-      await traffic.expectSubscribed(workspace.id, 1);
-      await expect(page.getByTestId("workspace-setup-log").first()).toContainText("setup complete");
-      await clickNewChat(page);
-      await expectComposerVisible(page);
-      await traffic.expectReleased(0);
-      await expectSetupPanel(page);
-      await traffic.expectSubscribed(workspace.id, 2);
-      await closeSetupTab(page, workspace.id);
-      await traffic.expectReleased(1);
-    } finally {
-      await client.close();
-      await repo.cleanup();
-    }
-  });
-
  daemonTest("streams running and completed setup snapshots for a successful setup", async () => {
    const client = await connectWorkspaceSetupClient();
    const repo = await createTempGitRepo("setup-success-", {
@@ -1,91 +0,0 @@
-package sh.paseo.diagnosis;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.text.Layout;
-import android.text.Spannable;
-import android.util.Log;
-import android.view.View;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.platform.app.InstrumentationRegistry;
-import com.facebook.react.bridge.BridgeReactContext;
-import com.facebook.react.common.mapbuffer.WritableMapBuffer;
-import com.facebook.react.soloader.OpenSourceMergedSoMapping;
-import com.facebook.react.uimanager.DisplayMetricsHolder;
-import com.facebook.react.uimanager.PixelUtil;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.views.text.ReactTextUpdate;
-import com.facebook.react.views.text.ReactTextView;
-import com.facebook.react.views.text.TextLayoutManager;
-import com.facebook.soloader.SoLoader;
-import com.facebook.yoga.YogaMeasureMode;
-import com.facebook.yoga.YogaMeasureOutput;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-/** Native reproduction for #4368. Uses the measurement and rendering paths used by RN Text. */
-@RunWith(AndroidJUnit4.class)
-public class AboutFontWeightTest {
-  @Test public void ordinaryVersionFitsItsMeasuredBox() { checkVersion(0); }
-  @Test public void boldVersionFitsItsMeasuredBox() { checkVersion(300); }
-
-  private void checkVersion(int adjustment) {
-    InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-      Context app = InstrumentationRegistry.getInstrumentation().getTargetContext();
-      Configuration configuration = new Configuration(app.getResources().getConfiguration());
-      configuration.fontWeightAdjustment = adjustment;
-      Context configured = app.createConfigurationContext(configuration);
-      try {
-        SoLoader.init(app, OpenSourceMergedSoMapping.INSTANCE);
-      } catch (java.io.IOException error) {
-        throw new AssertionError("Could not initialize React Native", error);
-      }
-      DisplayMetricsHolder.initDisplayMetrics(configured);
-      ThemedReactContext context = new ThemedReactContext(new BridgeReactContext(configured), configured);
-
-      WritableMapBuffer attributes = new WritableMapBuffer();
-      attributes.put(4, 15.0); // TextAttributeProps.TA_KEY_FONT_SIZE
-      attributes.put(9, true); // TextAttributeProps.TA_KEY_ALLOW_FONT_SCALING
-      WritableMapBuffer fragment = new WritableMapBuffer();
-      fragment.put(0, "v0.12.0");
-      fragment.put(1, 1);
-      fragment.put(5, attributes);
-      WritableMapBuffer fragments = new WritableMapBuffer();
-      fragments.put(0, fragment);
-      WritableMapBuffer text = new WritableMapBuffer();
-      text.put(1, "v0.12.0");
-      text.put(2, fragments);
-      text.put(4, attributes);
-      WritableMapBuffer paragraph = new WritableMapBuffer();
-      paragraph.put(2, "highQuality");
-      paragraph.put(5, "none");
-
-      long measured = TextLayoutManager.measureText(context, text, paragraph,
-          1000, YogaMeasureMode.AT_MOST, 1000, YogaMeasureMode.AT_MOST, null, null);
-      int width = (int) Math.ceil(PixelUtil.toPixelFromDIP(YogaMeasureOutput.getWidth(measured)));
-      int height = (int) Math.ceil(PixelUtil.toPixelFromDIP(YogaMeasureOutput.getHeight(measured)));
-      Spannable content = TextLayoutManager.INSTANCE.getOrCreateSpannableForText(context, text, null);
-      ReactTextView view = new ReactTextView(context);
-      view.setId(2); // Fabric tag, matching the app's new-architecture Text path.
-      view.setText(new ReactTextUpdate(content, -1, false, 0,
-          Layout.BREAK_STRATEGY_HIGH_QUALITY, Layout.JUSTIFICATION_MODE_NONE));
-      view.measure(exact(width), exact(height));
-      view.layout(0, 0, width, height);
-      Layout rendered = view.getLayout();
-      Log.i("AboutFontWeightTest", "adjustment=" + adjustment + " box=" + width + "x" + height
-          + " lines=" + rendered.getLineCount() + " lineWidth=" + rendered.getLineWidth(0)
-          + " weight=" + view.getTypeface().getWeight());
-      assertEquals("The complete version should fit on its measured line", 1, rendered.getLineCount());
-      assertTrue("The last digit must remain inside the allocated width",
-          rendered.getLineWidth(0) <= width);
-      assertTrue("The complete line must remain inside the allocated height",
-          rendered.getLineBottom(0) <= height);
-    });
-  }
-
-  private static int exact(int size) {
-    return View.MeasureSpec.makeMeasureSpec(size, View.MeasureSpec.EXACTLY);
-  }
-}
@@ -1,66 +0,0 @@
-# About version clipping reproduction ([#4368](https://github.com/getpaseo/paseo/issues/4368))
-
-This is a diagnostic branch, with no production fix. The Android test compares
-React Native's measured box for `v0.12.0` with the native TextView layout that
-renders the same attributed text. It runs both ordinary and system-bold text.
-It does not turn off accessibility scaling or bold text.
-
-## Run the native test
-
-From the repository root, prepare a development Android project if necessary:
-
-```sh
-cd packages/app
-APP_VARIANT=development npx expo prebuild --platform android --no-install
-```
-
-In generated `android/app/build.gradle`, add:
-
-```groovy
-android.defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-dependencies {
-    androidTestImplementation 'androidx.test:runner:1.6.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-}
-```
-
-Copy this test into the generated test source set, then build the app and tests:
-
-```sh
-mkdir -p android/app/src/androidTest/java/sh/paseo/diagnosis
-cp e2e/mobile/about-font-size/AboutFontWeightTest.java android/app/src/androidTest/java/sh/paseo/diagnosis/
-cd android
-APP_VARIANT=development ./gradlew :app:assembleDebug :app:assembleDebugAndroidTest \
-  -PreactNativeArchitectures=x86_64 --no-daemon --max-workers=2 -Dorg.gradle.parallel=false
-adb install -r app/build/outputs/apk/debug/app-debug.apk
-adb install -r app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
-adb shell am instrument -w -e class sh.paseo.diagnosis.AboutFontWeightTest \
-  sh.paseo.debug.test/androidx.test.runner.AndroidJUnitRunner
-```
-
-The test requires Android 12 or later for `fontWeightAdjustment`. The native
-contexts set that adjustment to 0 and 300 independently; they do not change the
-device setting. The selected device's density and font scale still apply.
-
-On Android 16 at 540 dpi and 2× font scale, both contexts receive a 301×123-pixel
-box. The ordinary-weight control passes, with one rendered line. The bold test
-fails with two rendered lines, so the final digit falls outside the allocated
-single-line height. This isolates the measurement/rendering disagreement from
-the About row's flex layout. A native dependency/build decision is still needed
-before implementing a fix; changing an About-row style would leave the producer
-of the incorrect measurement in place.
-
-## UI comparison
-
-Observed on Android 16, with current main's JavaScript and a freshly built native
-development app: open Settings → About with 2× system font scale and 540 dpi on
-a 1080-pixel-wide emulator. With system bold text, the displayed app version
-loses its final digit (`v0.12.`). At the same display and text sizes without
-system bold, the complete `v0.12.0` is visible. Cold-launch after configuration
-changes before comparing; changing font scale in a running app also produced
-temporary vertical clipping, which disappeared after a cold launch.
-
-This substitutes standard Android accessibility settings for Samsung Easy Mode.
-It verifies the truncated-version symptom, not Samsung's complete UI or the
-already-fixed home-screen overlap. The reporter used Paseo 0.7.2; this branch
-uses main `dd244c076d5f17d56d5592c7fb173dc7fdc2bbae`.
@@ -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,145 +0,0 @@
-// Run against an Android dev client serving this checkout, with a real software keyboard.
-// node packages/app/e2e/mobile/appearance-keyboard/android.mjs <session> <metro-url> <server-id> [app-id]
-import assert from "node:assert/strict";
-import { execFileSync } from "node:child_process";
-import { mkdirSync } from "node:fs";
-import { resolve } from "node:path";
-import { setTimeout as delay } from "node:timers/promises";
-
-const [, , session, metroUrl, serverId, appId = "sh.paseo.debug"] = process.argv;
-assert(
-  session && metroUrl && serverId,
-  "Pass the agent-device session, Metro URL and connected host ID",
-);
-const artifacts = resolve(".dev/agent-device-artifacts/appearance-keyboard-android");
-mkdirSync(artifacts, { recursive: true });
-
-function ad(...args) {
-  return execFileSync("agent-device", ["--session", session, ...args], {
-    encoding: "utf8",
-    timeout: 60_000,
-  });
-}
-
-function evaluate(expression) {
-  return ad("cdp", "runtime", "eval", "--expr", expression, "--json");
-}
-
-// Read the mounted app's public React Native APIs through Metro. Accessibility
-// snapshots with Gboard open can block while waiting for an idle hierarchy.
-const reactNative = `Array.from(__r.getModules().values()).find(
-  m => m.verboseName?.endsWith("/react-native/index.js")
-).publicModule.exports`;
-
-function measureFocusedInput() {
-  evaluate(`(() => {
-    const rn = ${reactNative};
-    globalThis.__appearanceKeyboardMeasurement = null;
-    rn.TextInput.State.currentlyFocusedInput()?.measureInWindow((x, y, width, height) => {
-      globalThis.__appearanceKeyboardMeasurement = JSON.stringify({
-        x, y, width, height,
-        statusBarHeight: rn.StatusBar.currentHeight,
-        scale: rn.PixelRatio.get(),
-        keyboard: rn.Keyboard.metrics(),
-      });
-    });
-  })()`);
-  const value = JSON.parse(evaluate("globalThis.__appearanceKeyboardMeasurement"));
-  return value ? JSON.parse(value) : null;
-}
-
-async function waitForFocusedInput() {
-  let measurement;
-  let previous;
-  let stable = 0;
-  const deadline = Date.now() + 30_000;
-  do {
-    measurement = measureFocusedInput();
-    const current = measurement?.keyboard
-      ? [measurement.y, measurement.height, measurement.keyboard.screenY].map(Math.round).join(",")
-      : null;
-    stable = measurement?.keyboard && current === previous ? stable + 1 : 0;
-    previous = current;
-    if (stable >= 3) break;
-    await delay(150);
-  } while (Date.now() < deadline);
-
-  assert(stable >= 3, `Focused input and keyboard must settle: ${JSON.stringify(measurement)}`);
-  return measurement;
-}
-
-ad("open", appId, "--platform", "android", "--no-test-ime");
-const targets = ad("cdp", "target", "list", "--url", metroUrl)
-  .split("\n")
-  .filter((line) => line.includes(appId));
-assert.equal(targets.length, 1, "Connect only the test app to this Metro server");
-ad("cdp", "target", "select", targets[0].split(/\s+/)[0]);
-
-try {
-  evaluate(`(${reactNative}).Keyboard.dismiss()`);
-  ad("open", appId, "paseo://settings", "--platform", "android", "--no-test-ime");
-  ad("wait", "text", "Appearance", "5000");
-  ad("open", appId, "paseo://settings/appearance", "--platform", "android", "--no-test-ime");
-  ad("wait", "text", "Code size", "5000");
-  const snapshot = JSON.parse(ad("snapshot", "-i", "--json"));
-  const numericFields = snapshot.data.nodes.filter(
-    (node) => node.type === "android.widget.EditText" && /^\d+$/.test(node.value ?? ""),
-  );
-  assert.equal(numericFields.length, 3, "All three font sizes must be visible without scrolling");
-  ad("screenshot", resolve(artifacts, "before-keyboard.png"));
-  // Appearance orders Interface size, Content size, then Code size.
-  ad("press", `@${numericFields[2].ref}`);
-
-  const measurement = await waitForFocusedInput();
-  // Android measureInWindow excludes the status bar, Keyboard.metrics uses screen coordinates.
-  const inputBottom = measurement.y + measurement.height + measurement.statusBarHeight;
-  const keyboardTop = measurement.keyboard.screenY;
-  console.log(JSON.stringify({ inputBottom, keyboardTop, measurement }));
-  ad("screenshot", resolve(artifacts, "keyboard.png"));
-  assert(
-    inputBottom <= keyboardTop + 1 / measurement.scale,
-    "Code size must be fully visible above the number keyboard (within one physical pixel)",
-  );
-  console.log("PASS: focusing Code size reveals the whole field above the keyboard");
-
-  evaluate(`(${reactNative}).Keyboard.dismiss()`);
-  ad(
-    "open",
-    appId,
-    `paseo://settings/hosts/${encodeURIComponent(serverId)}/plugins`,
-    "--platform",
-    "android",
-    "--no-test-ime",
-  );
-  ad("wait", "text", "Plugin source", "5000");
-  const plugins = JSON.parse(ad("snapshot", "-i", "--json"));
-  const source = plugins.data.nodes.find((node) => node.type === "android.widget.EditText");
-  assert(source, "The connected host must support installing plugins from source");
-  ad("press", `@${source.ref}`);
-  ad("type", "qa-source");
-  const pluginMeasurement = await waitForFocusedInput();
-  // A FormTextInput draws its border and padding on the native input's parent.
-  // Measure that visible frame, rather than accepting only the text as visible.
-  const hierarchy = JSON.parse(ad("snapshot", "--json")).data.nodes;
-  const focused = hierarchy.find((node) => node.type === "android.widget.EditText" && node.focused);
-  assert(focused, "Plugin source must remain focused after typing");
-  assert.equal(focused.value, "qa-source", "Typed source must remain in the focused field");
-  const frame = hierarchy.find((node) => node.index === focused.parentIndex);
-  assert(frame, "The source input's visible frame must be present in the native hierarchy");
-  assert(
-    frame.rect.height > focused.rect.height,
-    "Measure the surrounding frame, including padding",
-  );
-  const frameBottom = frame.rect.y + frame.rect.height;
-  const pluginKeyboardTop = pluginMeasurement.keyboard.screenY * pluginMeasurement.scale;
-  console.log(JSON.stringify({ frameBottom, keyboardTop: pluginKeyboardTop, frame: frame.rect }));
-  ad("screenshot", resolve(artifacts, "plugin-source-keyboard.png"));
-  assert(
-    frameBottom <= pluginKeyboardTop + 1,
-    "Plugin source frame must be fully visible above the keyboard (within one physical pixel)",
-  );
-  console.log("PASS: focusing Plugin source reveals the whole field frame above the keyboard");
-} finally {
-  evaluate(`(${reactNative}).Keyboard.dismiss()`);
-  evaluate("delete globalThis.__appearanceKeyboardMeasurement");
-}
@@ -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);
-}
@@ -24,7 +24,6 @@ interface E2EDaemonClientConfig {
  clientType: "cli";
  appVersion?: string;
  webSocketFactory?: NodeWebSocketFactory;
-  capabilities?: Record<string, unknown>;
 }

 function resolveDaemonWsUrl(port?: number): string {
@@ -35,7 +34,6 @@ export interface ConnectDaemonClientOptions {
  clientIdPrefix: string;
  appVersion?: string;
  port?: number;
-  capabilities?: Record<string, unknown>;
 }

 /**
@@ -53,7 +51,6 @@ export async function connectDaemonClient<ClientInstance extends { connect(): Pr
    clientType: "cli",
    appVersion: options.appVersion ?? loadAppVersion(),
    webSocketFactory: createNodeWebSocketFactory(),
-    capabilities: options.capabilities,
  });
  await client.connect();
  return client;
@@ -35,8 +35,6 @@ export type { WorkspaceSetupDaemonClient };
 export async function connectWorkspaceSetupClient(): Promise<WorkspaceSetupDaemonClient> {
  const client = await connectDaemonClient<WorkspaceSetupDaemonClient>({
    clientIdPrefix: "workspace-setup",
-    // COMPAT(workspaceSetupObservation): legacy streaming coverage; remove after 2027-04-19.
-    capabilities: { workspace_setup_observation: false },
  });
  // Establish demand before a caller can launch setup. Client close releases it.
  try {
@@ -328,51 +326,3 @@ export async function waitForWorkspaceSetupProgress(
    });
  });
 }
-
-/** Observe the browser's actual setup membership without requesting any output. */
-export function observeSetupPanelTraffic(page: Page) {
-  const subscriptions: Array<{ workspaceId: string; subscriptionId: string }> = [];
-  const releases = new Set<string>();
-  const requests: string[] = [];
-  let legacySetupDemand = false;
-  const outputWorkspaces: string[] = [];
-  page.on("websocket", (socket) => {
-    socket.on("framesent", ({ payload }) => {
-      const frame = JSON.parse(String(payload));
-      if (frame.type !== "session") return;
-      if (frame.message?.type === "subscription.release.request")
-        releases.add(frame.message.subscriptionId);
-      if (frame.message?.type === "workspace.setup.subscribe.request")
-        requests.push(frame.message.workspaceId);
-      if (
-        frame.message?.type === "session.events.set_subscription.request" &&
-        frame.message.events.includes("workspace_setup_progress")
-      )
-        legacySetupDemand = true;
-    });
-    socket.on("framereceived", ({ payload }) => {
-      const frame = JSON.parse(String(payload));
-      if (frame.type !== "session") return;
-      if (frame.message?.type === "workspace.setup.subscribe.response")
-        subscriptions.push(frame.message.payload);
-      if (frame.message?.type === "workspace_setup_progress")
-        outputWorkspaces.push(frame.message.payload.workspaceId);
-    });
-  });
-  return {
-    async expectNoDemand() {
-      expect(requests).toEqual([]);
-      expect(legacySetupDemand).toBe(false);
-      expect(subscriptions).toEqual([]);
-      expect(outputWorkspaces).toEqual([]);
-    },
-    async expectSubscribed(workspaceId: string, count: number) {
-      await expect.poll(() => subscriptions.length).toBe(count);
-      expect(subscriptions[count - 1].workspaceId).toBe(workspaceId);
-      expect(requests).toEqual(Array(count).fill(workspaceId));
-    },
-    async expectReleased(index: number) {
-      await expect.poll(() => releases.has(subscriptions[index].subscriptionId)).toBe(true);
-    },
-  };
-}
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.3",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -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"));
  }

@@ -41,7 +41,7 @@ import {
  findPaneById,
  useWorkspaceLayoutStore,
 } from "@/stores/workspace-layout-store";
-import { shouldShowWorkspaceSetup } from "@/stores/workspace-setup-store";
+import { shouldShowWorkspaceSetup, useWorkspaceSetupStore } from "@/stores/workspace-setup-store";
 import { clearCommandCenterFocusRestoreElement } from "@/utils/command-center-focus-restore";
 import { getShortcutOs } from "@/utils/shortcut-platform";
 import {
@@ -188,7 +188,6 @@ export function useWorkspaceCommandCenterActions(): void {
    workspaceDirectory: workspace.workspaceDirectory ?? null,
    currentBranch: workspace.gitRuntime?.currentBranch ?? null,
    pinnedAt: workspace.pinnedAt ?? null,
-    setupStatus: workspace.setupStatus ?? null,
    labels: workspace.labels ?? [],
  }));
  const cwd = useWorkspaceDirectory(serverId, workspaceId);
@@ -196,10 +195,12 @@ export function useWorkspaceCommandCenterActions(): void {
  const isPinned = fields?.pinnedAt != null;
  const isCompact = useIsCompactFormFactor();
  const canPin = useHostFeature(serverId, "workspacePinning");
-  const supportsSetupObservation = useHostFeature(serverId, "workspaceSetupObservation");
-  const canShowSetup = shouldShowWorkspaceSetup(
-    fields?.setupStatus ?? null,
-    supportsSetupObservation,
+  const persistenceKey =
+    serverId && fields
+      ? buildWorkspaceTabPersistenceKey({ serverId, workspaceId: fields.id })
+      : null;
+  const canShowSetup = useWorkspaceSetupStore((state) =>
+    shouldShowWorkspaceSetup(persistenceKey ? (state.snapshots[persistenceKey] ?? null) : null),
  );
  const { overrides } = useKeyboardShortcutOverrides();
  const { gitActions, isGit } = useGitActions({
@@ -1,15 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { builtinFilePanels, isRenderedMarkdownFile } from "./catalog";
-import { resolveFilePanel } from "./resolve";
-
-function filePreviewRenderKind(path: string) {
-  const { panel } = resolveFilePanel({
-    file: { path, kind: "text", size: 100, hasBytes: false },
-    candidates: builtinFilePanels,
-    associations: {},
-  });
-  return panel ? panel.id.slice("builtin:".length) : null;
-}
+import { filePreviewRenderKind, isRenderedMarkdownFile } from "@/components/file-pane-render-mode";

 describe("isRenderedMarkdownFile", () => {
  it("detects .md files", () => {
@@ -48,39 +38,3 @@ describe("filePreviewRenderKind", () => {
    expect(filePreviewRenderKind("index.html.erb")).toBe(null);
  });
 });
-
-describe("built-in file panels", () => {
-  it.each(["png", "jpg", "jpeg", "gif", "webp", "svg"])(
-    "registers the image extension %s",
-    (extension) => {
-      const resolution = resolveFilePanel({
-        file: {
-          path: `/capture.${extension.toUpperCase()}`,
-          kind: "image",
-          size: 512,
-          hasBytes: true,
-        },
-        candidates: builtinFilePanels,
-        associations: { [`ext:${extension}`]: "builtin:markdown" },
-      });
-      expect(resolution.panel?.id).toBe("builtin:image");
-      expect(
-        resolveFilePanel({
-          file: { path: "capture.png", kind: "binary", size: 512, hasBytes: false },
-          candidates: builtinFilePanels,
-          associations: {},
-        }).panel,
-      ).toBeNull();
-    },
-  );
-
-  it("does not impose a new preview size limit on built-in text panels", () => {
-    expect(
-      resolveFilePanel({
-        file: { path: "notes.md", kind: "text", size: 11 * 1024 * 1024, hasBytes: false },
-        candidates: builtinFilePanels,
-        associations: {},
-      }).panel?.id,
-    ).toBe("builtin:markdown");
-  });
-});
@@ -0,0 +1,17 @@
+export type FilePreviewRenderKind = "markdown" | "html";
+
+export function isRenderedMarkdownFile(filePath: string): boolean {
+  const normalizedPath = filePath.trim().toLowerCase();
+  return normalizedPath.endsWith(".md") || normalizedPath.endsWith(".markdown");
+}
+
+function isRenderedHtmlFile(filePath: string): boolean {
+  const normalizedPath = filePath.trim().toLowerCase();
+  return normalizedPath.endsWith(".html") || normalizedPath.endsWith(".htm");
+}
+
+export function filePreviewRenderKind(filePath: string): FilePreviewRenderKind | null {
+  if (isRenderedMarkdownFile(filePath)) return "markdown";
+  if (isRenderedHtmlFile(filePath)) return "html";
+  return null;
+}
@@ -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,
@@ -1,14 +1,10 @@
 import { useMemo, type ReactNode } from "react";
-import { Platform, ScrollView, Text, View } from "react-native";
-import { KeyboardAwareScrollView } from "react-native-keyboard-controller";
+import { ScrollView, Text, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { StyleSheet } from "react-native-unistyles";
 import { BackHeader } from "@/components/headers/back-header";
 import { MenuHeader } from "@/components/headers/menu-header";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { SPACING } from "@/styles/theme";
-
-const PageScrollView = Platform.OS === "android" ? KeyboardAwareScrollView : ScrollView;

 interface PageLayoutProps {
  title?: string;
@@ -46,13 +42,7 @@ export function PageLayout({
      ) : (
        <MenuHeader borderless />
      )}
-      <PageScrollView
-        // Leave room for field borders and padding around the focused native input.
-        {...(Platform.OS === "android" ? { bottomOffset: SPACING[4] } : {})}
-        style={styles.scroll}
-        contentContainerStyle={scrollContentStyle}
-        testID={testID}
-      >
+      <ScrollView style={styles.scroll} contentContainerStyle={scrollContentStyle} testID={testID}>
        <View style={styles.content}>
          {showTitle ? (
            <View style={styles.titleRow} testID={titleTestID}>
@@ -64,7 +54,7 @@ export function PageLayout({
          ) : null}
          {children}
        </View>
-      </PageScrollView>
+      </ScrollView>
    </View>
  );
 }
@@ -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: {
@@ -36,6 +36,7 @@ import {
  useSessionStore,
  type SessionState,
 } from "@/stores/session-store";
+import { useWorkspaceSetupStore } from "@/stores/workspace-setup-store";
 import { sendOsNotification } from "@/utils/os-notifications";
 import { getIsAppActivelyVisible, getIsAppVisible } from "@/utils/app-visibility";
 import {
@@ -167,6 +168,11 @@ function resolveAgentAttentionNotification(
  });
 }

+type WorkspaceSetupProgressPayload = Extract<
+  SessionOutboundMessage,
+  { type: "workspace_setup_progress" }
+>["payload"];
+
 function notifyVoiceAbortFailure(
  data: Extract<SessionOutboundMessage, { type: "activity_log" }>["payload"],
  notifyError: (message: string) => void,
@@ -219,6 +225,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
  const setPendingPermissions = useSessionStore((state) => state.setPendingPermissions);
  const updateSessionServerInfo = useSessionStore((state) => state.updateSessionServerInfo);
  const setViewedTimelineSync = useSessionStore((state) => state.setViewedTimelineSync);
+  const upsertWorkspaceSetupProgress = useWorkspaceSetupStore((state) => state.upsertProgress);

  // Track focused agent for heartbeat
  const focusedAgentId = useSessionStore(
@@ -358,6 +365,13 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
    }
  }, [flushAgentLastActivity, serverId, isConnected, setInitializingAgents]);

+  const applyWorkspaceSetupProgress = useCallback(
+    (payload: WorkspaceSetupProgressPayload) => {
+      upsertWorkspaceSetupProgress({ serverId, payload });
+    },
+    [serverId, upsertWorkspaceSetupProgress],
+  );
+
  useEffect(() => {
    const setAgentInitializing = createSetAgentInitializing(serverId, setInitializingAgents);
    const onStream = (message: SessionOutboundMessage) => {
@@ -494,6 +508,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
        "agent_permission_resolved",
        "agent.provider_subagents.update",
        "checkout_status_update",
+        "workspace_setup_progress",
        "status.server_info",
      ],
      { notifications: true },
@@ -532,6 +547,11 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
      applyCheckoutStatusUpdateFromEvent({ queryClient, serverId, message });
    });

+    const unsubWorkspaceSetupProgress = onFeed("workspace_setup_progress", (message) => {
+      if (message.type !== "workspace_setup_progress") return;
+      applyWorkspaceSetupProgress(message.payload);
+    });
+
    const unsubStatus = onFeed("status", (message) => {
      if (message.type !== "status") return;
      const serverInfo = parseServerInfoStatusPayload(message.payload);
@@ -690,6 +710,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
      unsubProviderSubagentUpdate();
      unsubAgentAttention();
      unsubCheckoutStatusUpdate();
+      unsubWorkspaceSetupProgress();
      unsubStatus();
      unsubPermissionRequest();
      unsubPermissionResolved();
@@ -711,6 +732,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
    setAgents,
    setPendingPermissions,
    notifyAgentAttention,
+    applyWorkspaceSetupProgress,
    updateSessionServerInfo,
    toast,
    voiceRuntime,
@@ -4,7 +4,7 @@ import { Annotation, Compartment, EditorState, Transaction } from "@codemirror/s
 import { EditorView } from "@codemirror/view";
 import { getLanguageForFile } from "@getpaseo/highlight";
 import { getCM, vim } from "@replit/codemirror-vim";
-import { isRenderedMarkdownFile } from "@/file-panels";
+import { isRenderedMarkdownFile } from "@/components/file-pane-render-mode";
 import type { WorkspaceFileLocation } from "@/workspace/file-open";
 import type { FileEditorModel } from "./model";
 import { editorBaseExtensions, editorTheme, type EditorVisualTheme } from "./extensions.web";
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { withPreviewCsp } from "./html-preview-csp";
+import { withPreviewCsp } from "@/file-pane/html-preview-csp";

 describe("withPreviewCsp", () => {
  it("places the policy before the complete source document", () => {
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { htmlPreviewNavigationKind } from "./html-preview-navigation";
+import { htmlPreviewNavigationKind } from "@/file-pane/html-preview-navigation";

 describe("htmlPreviewNavigationKind", () => {
  it("allows the WebView's initial document URLs", () => {
@@ -1,13 +1,20 @@
 import { Button } from "@/components/ui/button";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
-import React, { useCallback, useEffect, useMemo, useState, useSyncExternalStore } from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  useSyncExternalStore,
+} from "react";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { Text, View } from "react-native";
+import { ScrollView as RNScrollView, Text, View } from "react-native";
 import { StyleSheet, UnistylesRuntime, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { useSessionStore, type ExplorerFile } from "@/stores/session-store";
-import { FilePanelPreview, resolveFilePreviewPanel, type FilePanel } from "@/file-panels";
+import { filePreviewRenderKind } from "@/components/file-pane-render-mode";
 import { useAttachmentPreviewUrl } from "@/attachments/use-attachment-preview-url";
 import { getFileNameFromPath } from "@/attachments/utils";
 import { resolveFilePreviewReadTarget } from "@/file-explorer/preview-target";
@@ -21,6 +28,8 @@ import { useLiveFile } from "./live-file/hook";
 import { useFilePreview } from "./preview-lifecycle/hook";
 import { resolveFilePreviewLifecycle } from "./preview-lifecycle/model";
 import { FilePanelBar } from "./bar";
+import { FileHtmlPreview } from "./html-preview";
+import { FileMarkdownPreview } from "./markdown-preview";
 import { FileEditorModel, getFileConflictCallout, type FileConflictCallout } from "./editor/model";
 import { createFileObservationSource } from "./editor/observation-source";
 import { FileEditorView } from "./editor/view";
@@ -30,6 +39,7 @@ import type { LiveFileModel } from "./live-file/model";
 import { confirmDialog } from "@/utils/confirm-dialog";
 import { usePublishPanelInstanceAttributes } from "@/panels/panel-instance-attributes";
 import type { Theme } from "@/styles/theme";
+import { ZoomableImage } from "@/components/zoomable-viewport/image";

 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
 const foregroundMutedColorMapping = (theme: Theme) => ({
@@ -37,7 +47,6 @@ const foregroundMutedColorMapping = (theme: Theme) => ({
 });

 interface FilePreviewBodyProps {
-  panel: FilePanel | null;
  preview: ExplorerFile | null;
  mode?: "preview" | "source";
  isLoading: boolean;
@@ -122,7 +131,6 @@ function TooLargeSource({ size }: { size?: number }) {
 }

 function FilePreviewBody({
-  panel,
  preview,
  mode,
  isLoading,
@@ -136,6 +144,14 @@ function FilePreviewBody({
 }: FilePreviewBodyProps) {
  const { t } = useTranslation();
  const filePath = location.path;
+  // A line target means the caller wants to land on that line, so fall back to
+  // the highlighted source view even for renderable files.
+  const renderKind =
+    preview?.kind === "text" && !location.lineStart && mode !== "source"
+      ? filePreviewRenderKind(filePath)
+      : null;
+
+  const previewScrollRef = useRef<RNScrollView>(null);

  if (isLoading && !preview) {
    return (
@@ -154,21 +170,36 @@ function FilePreviewBody({
    );
  }

-  const showSource = preview.kind === "text" && (Boolean(location.lineStart) || mode === "source");
-  if (panel && !showSource) {
-    return (
-      <FilePanelPreview
-        panel={panel}
-        content={preview.content ?? ""}
-        filePath={filePath}
-        workspaceRoot={workspaceRoot}
-        client={client}
-        serverId={serverId}
-        imagePreviewUri={imagePreviewUri}
-      />
-    );
-  }
  if (preview.kind === "text") {
+    if (renderKind === "html") {
+      // The HTML document owns its own scrolling, so no ScrollView wrapper here.
+      return (
+        <View style={styles.previewScrollContainer}>
+          <FileHtmlPreview html={preview.content ?? ""} testID="file-html-preview" />
+        </View>
+      );
+    }
+
+    if (renderKind === "markdown") {
+      return (
+        <View style={styles.previewScrollContainer}>
+          <RNScrollView
+            ref={previewScrollRef}
+            style={styles.previewContent}
+            showsVerticalScrollIndicator
+          >
+            <FileMarkdownPreview
+              source={preview.content ?? ""}
+              filePath={filePath}
+              workspaceRoot={workspaceRoot}
+              client={client}
+              serverId={serverId}
+            />
+          </RNScrollView>
+        </View>
+      );
+    }
+
    return (
      <ReadonlySource
        preview={preview}
@@ -179,6 +210,19 @@ function FilePreviewBody({
    );
  }

+  if (preview.kind === "image") {
+    if (!imagePreviewUri) {
+      return (
+        <View style={styles.centerState}>
+          <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
+          <Text style={styles.loadingText}>{t("panels.file.loading")}</Text>
+        </View>
+      );
+    }
+
+    return <ZoomableImage uri={imagePreviewUri} testID="image-file-preview" />;
+  }
+
  return (
    <View style={styles.centerState}>
      <Text style={styles.emptyText}>{t("panels.file.binaryPreviewUnavailable")}</Text>
@@ -199,7 +243,6 @@ export function FilePane({
  navigationRevision: number;
 }) {
  const { t } = useTranslation();
-  const { settings } = useAppSettings();
  const isMobile = useIsCompactFormFactor();
  const [previewMode, setPreviewMode] = useState<"preview" | "source">("preview");

@@ -249,12 +292,7 @@ export function FilePane({

  const { file: preview, imageAttachment } = resolveFilePreviewLifecycle(previewLifecycle);
  const imagePreviewUri = useAttachmentPreviewUrl(imageAttachment);
-  const panel = resolveFilePreviewPanel({
-    preview,
-    path: location.path,
-    associations: settings.filePanelAssociations,
-  });
-  const isRenderable = preview?.kind === "text" && panel !== null;
+  const isRenderable = isRenderablePreview(preview, location.path);
  const editable = isEditableTextFile({
    preview,
    supportsEditing,
@@ -270,7 +308,6 @@ export function FilePane({

  return (
    <FilePanePresentation
-      panel={panel}
      serverId={serverId}
      workspaceRoot={normalizedWorkspaceRoot}
      client={client}
@@ -296,6 +333,10 @@ export function FilePane({
  );
 }

+function isRenderablePreview(preview: ExplorerFile | null, path: string): boolean {
+  return preview?.kind === "text" && filePreviewRenderKind(path) !== null;
+}
+
 function isEditableTextFile(input: {
  preview: ExplorerFile | null;
  supportsEditing: boolean;
@@ -309,7 +350,6 @@ function isEditableTextFile(input: {
 }

 function FilePanePresentation({
-  panel,
  serverId,
  workspaceRoot,
  client,
@@ -332,7 +372,6 @@ function FilePanePresentation({
  navigationRevision,
  imagePreviewUri,
 }: {
-  panel: FilePanel | null;
  serverId: string;
  workspaceRoot: string;
  client: DaemonClient | null;
@@ -368,7 +407,6 @@ function FilePanePresentation({
  if (editable && client && readTarget && preview?.kind === "text") {
    return (
      <EditableFilePane
-        panel={panel}
        key={`${serverId}:${readTarget.cwd}:${readTarget.path}`}
        serverId={serverId}
        workspaceRoot={workspaceRoot}
@@ -421,7 +459,6 @@ function FilePanePresentation({
        />
      ) : null}
      <FilePreviewBody
-        panel={panel}
        preview={preview}
        mode={previewMode}
        isLoading={isLoading}
@@ -438,7 +475,6 @@ function FilePanePresentation({
 }

 function EditableFilePane({
-  panel,
  serverId,
  workspaceRoot,
  client,
@@ -456,7 +492,6 @@ function EditableFilePane({
  location,
  navigationRevision,
 }: {
-  panel: FilePanel | null;
  serverId: string;
  workspaceRoot: string;
  client: DaemonClient;
@@ -604,7 +639,6 @@ function EditableFilePane({
        />
      ) : (
        <FilePreviewBody
-          panel={panel}
          preview={renderedPreview}
          mode={mode}
          isLoading={isLoading}
@@ -674,4 +708,15 @@ const styles = StyleSheet.create((theme) => ({
    color: theme.colors.foregroundMuted,
    fontSize: theme.fontSize.base,
  },
+  previewScrollContainer: {
+    flex: 1,
+    minHeight: 0,
+  },
+  previewContent: {
+    flex: 1,
+    minHeight: 0,
+  },
+  previewCodeScrollContent: {
+    padding: theme.spacing[4],
+  },
 }));
@@ -1,92 +0,0 @@
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { ScrollView, Text, View } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { useTranslation } from "react-i18next";
-import { LoadingSpinner } from "@/components/ui/loading-spinner";
-import { ZoomableImage } from "@/components/zoomable-viewport/image";
-import type { Theme } from "@/styles/theme";
-import { FileHtmlPreview } from "./html-preview";
-import { FileMarkdownPreview } from "./markdown-preview";
-import type { builtinFilePanels } from "./catalog";
-
-interface FilePanelPreviewProps {
-  content: string;
-  filePath: string;
-  workspaceRoot: string;
-  client: DaemonClient | null;
-  serverId: string;
-  imagePreviewUri: string | null;
-}
-
-function MarkdownPanel(props: FilePanelPreviewProps) {
-  return (
-    <View style={styles.previewScrollContainer}>
-      <ScrollView style={styles.previewContent} showsVerticalScrollIndicator>
-        <FileMarkdownPreview
-          source={props.content}
-          filePath={props.filePath}
-          workspaceRoot={props.workspaceRoot}
-          client={props.client}
-          serverId={props.serverId}
-        />
-      </ScrollView>
-    </View>
-  );
-}
-
-function HtmlPanel({ content }: FilePanelPreviewProps) {
-  return (
-    <View style={styles.previewScrollContainer}>
-      <FileHtmlPreview html={content} testID="file-html-preview" />
-    </View>
-  );
-}
-
-const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
-const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-
-function ImagePanel({ imagePreviewUri }: FilePanelPreviewProps) {
-  const { t } = useTranslation();
-  if (!imagePreviewUri) {
-    return (
-      <View style={styles.centerState}>
-        <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
-        <Text style={styles.loadingText}>{t("panels.file.loading")}</Text>
-      </View>
-    );
-  }
-  return <ZoomableImage uri={imagePreviewUri} testID="image-file-preview" />;
-}
-
-const components = {
-  "builtin:markdown": MarkdownPanel,
-  "builtin:html": HtmlPanel,
-  "builtin:image": ImagePanel,
-};
-
-export function FilePanelPreview({
-  panel,
-  ...props
-}: FilePanelPreviewProps & {
-  panel: (typeof builtinFilePanels)[number];
-}) {
-  const Component = components[panel.id];
-  return <Component {...props} />;
-}
-
-const styles = StyleSheet.create((theme) => ({
-  previewScrollContainer: { flex: 1, minHeight: 0 },
-  previewContent: { flex: 1, minHeight: 0 },
-  centerState: {
-    flex: 1,
-    alignItems: "center",
-    justifyContent: "center",
-    gap: theme.spacing[3],
-    padding: theme.spacing[4],
-  },
-  loadingText: {
-    marginTop: theme.spacing[2],
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
-  },
-}));
@@ -1,28 +0,0 @@
-import { filePanelExtension, type FilePanelCandidate } from "./resolve";
-
-const markdownPanel = {
-  id: "builtin:markdown",
-  files: { extensions: ["md", "markdown"] },
-  document: "text",
-  maxBytes: Infinity,
-} as const satisfies FilePanelCandidate;
-
-export const builtinFilePanels = [
-  markdownPanel,
-  {
-    id: "builtin:html",
-    files: { extensions: ["html", "htm"] },
-    document: "text",
-    maxBytes: Infinity,
-  },
-  {
-    id: "builtin:image",
-    files: { extensions: ["png", "jpg", "jpeg", "gif", "webp", "svg"] },
-    document: "bytes",
-    maxBytes: Infinity,
-  },
-] as const satisfies readonly FilePanelCandidate[];
-
-export function isRenderedMarkdownFile(path: string): boolean {
-  return markdownPanel.files.extensions.some((extension) => extension === filePanelExtension(path));
-}
@@ -1,23 +0,0 @@
-import type { ExplorerFile } from "@/stores/session-store";
-import { builtinFilePanels } from "./catalog";
-import { resolveFilePanel } from "./resolve";
-
-export { resolveFilePanel, type FilePanelCandidate, type FilePanelFile } from "./resolve";
-export { builtinFilePanels, isRenderedMarkdownFile } from "./catalog";
-export { FilePanelPreview } from "./builtin";
-
-export type FilePanel = (typeof builtinFilePanels)[number];
-
-export function resolveFilePreviewPanel(input: {
-  preview: ExplorerFile | null;
-  path: string;
-  associations: Readonly<Record<string, string>>;
-}) {
-  const { preview, path, associations } = input;
-  if (!preview) return null;
-  return resolveFilePanel({
-    file: { path, kind: preview.kind, size: preview.size, hasBytes: preview.kind === "image" },
-    candidates: builtinFilePanels,
-    associations,
-  }).panel;
-}
@@ -1,105 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { resolveFilePanel, type FilePanelCandidate, type FilePanelFile } from "./resolve";
-
-const markdown: FilePanelCandidate = {
-  id: "builtin:markdown",
-  files: { extensions: ["md", "markdown"] },
-  document: "text",
-  maxBytes: Infinity,
-};
-const alternative: FilePanelCandidate = { ...markdown, id: "plugin:notes/markdown" };
-const file: FilePanelFile = { path: "/docs/README.MD", kind: "text", size: 100, hasBytes: true };
-
-function resolve(
-  overrides: Partial<Parameters<typeof resolveFilePanel<FilePanelCandidate>>[0]> = {},
-) {
-  return resolveFilePanel({
-    file,
-    candidates: [markdown, alternative],
-    associations: {},
-    ...overrides,
-  });
-}
-
-describe("resolveFilePanel", () => {
-  it("uses the associated candidate before catalog order", () => {
-    expect(resolve({ associations: { "ext:md": alternative.id } })).toEqual({
-      panel: alternative,
-      candidates: [markdown, alternative],
-      selectorKey: "ext:md",
-    });
-  });
-  it("ignores an absent association without deleting it", () => {
-    const associations = { "ext:md": "plugin:absent/markdown" };
-    expect(resolve({ associations }).panel).toBe(markdown);
-    expect(associations).toEqual({ "ext:md": "plugin:absent/markdown" });
-  });
-  it("uses a single candidate and preserves catalog order for multiple candidates", () => {
-    expect(resolve({ candidates: [alternative] }).panel).toBe(alternative);
-    expect(resolve().panel).toBe(markdown);
-    expect(resolve({ candidates: [alternative, markdown] }).panel).toBe(alternative);
-  });
-  it("returns the floor when no selector matches", () => {
-    expect(resolve({ file: { ...file, path: "index.ts" } })).toEqual({
-      panel: null,
-      candidates: [],
-      selectorKey: "ext:ts",
-    });
-  });
-  it("filters text panels for binary files even with an association", () => {
-    expect(
-      resolve({ file: { ...file, kind: "binary" }, associations: { "ext:md": markdown.id } }).panel,
-    ).toBeNull();
-  });
-  it("requires bytes for bytes panels and accepts binary files with bytes", () => {
-    const bytes: FilePanelCandidate = { ...alternative, document: "bytes" };
-    expect(resolve({ file: { ...file, hasBytes: false }, candidates: [bytes] }).panel).toBeNull();
-    expect(resolve({ file: { ...file, kind: "binary" }, candidates: [bytes] }).panel).toBe(bytes);
-  });
-  it("includes the maxBytes boundary and skips oversized associated panels", () => {
-    const limited = { ...alternative, maxBytes: 100 };
-    expect(resolve({ candidates: [limited] }).panel).toBe(limited);
-    expect(
-      resolve({
-        file: { ...file, size: 101 },
-        candidates: [limited, markdown],
-        associations: { "ext:md": limited.id },
-      }).panel,
-    ).toBe(markdown);
-  });
-  it("uses exact basename keys when an eligible candidate matches by filename", () => {
-    const named = { ...alternative, files: { extensions: [], filenames: ["README.MD"] } };
-    expect(
-      resolve({ candidates: [markdown, named], associations: { "name:README.MD": named.id } }),
-    ).toEqual({
-      panel: named,
-      candidates: [markdown, named],
-      selectorKey: "name:README.MD",
-    });
-    expect(resolve({ file: { ...file, path: "README.md" }, candidates: [named] }).panel).toBeNull();
-  });
-  it("uses extension keys when filename candidates were filtered out", () => {
-    const named = {
-      ...alternative,
-      maxBytes: 1,
-      files: { extensions: [], filenames: ["README.MD"] },
-    };
-    expect(resolve({ candidates: [named, markdown] }).selectorKey).toBe("ext:md");
-  });
-  it.each(["/src/Dockerfile", "C:\\src\\Dockerfile"])(
-    "matches an extensionless exact filename: %s",
-    (path) => {
-      const named = { ...alternative, files: { extensions: [], filenames: ["Dockerfile"] } };
-      expect(resolve({ file: { ...file, path }, candidates: [named] })).toEqual({
-        panel: named,
-        candidates: [named],
-        selectorKey: "name:Dockerfile",
-      });
-    },
-  );
-  it("normalizes extension selectors and keeps extensionless files distinct", () => {
-    const upper = { ...alternative, files: { extensions: ["MD"] } };
-    expect(resolve({ candidates: [upper] }).panel).toBe(upper);
-    expect(resolve({ file: { ...file, path: "README" } }).selectorKey).toBe("ext:");
-  });
-});
@@ -1,63 +0,0 @@
-export interface FilePanelFile {
-  path: string;
-  kind: "text" | "image" | "binary";
-  size: number;
-  hasBytes: boolean;
-}
-
-export interface FilePanelSelector {
-  extensions: readonly string[];
-  filenames?: readonly string[];
-}
-
-export interface FilePanelCandidate {
-  id: string;
-  files: FilePanelSelector;
-  document: "text" | "bytes";
-  maxBytes: number;
-}
-
-export interface FilePanelResolution<Candidate> {
-  panel: Candidate | null;
-  candidates: readonly Candidate[];
-  selectorKey: string;
-}
-
-export function filePanelExtension(path: string): string {
-  const name = filePanelBasename(path);
-  const dot = name.lastIndexOf(".");
-  return dot < 0 ? "" : name.slice(dot + 1).toLowerCase();
-}
-
-function filePanelBasename(path: string): string {
-  return path.trim().split(/[\\/]/).pop() ?? "";
-}
-
-function matchesSelector(file: FilePanelFile, selector: FilePanelSelector): boolean {
-  if (selector.filenames?.includes(filePanelBasename(file.path))) return true;
-  const extension = filePanelExtension(file.path);
-  return selector.extensions.some((entry) => entry.toLowerCase() === extension);
-}
-
-export function resolveFilePanel<Candidate extends FilePanelCandidate>(input: {
-  file: FilePanelFile;
-  candidates: readonly Candidate[];
-  associations: Readonly<Record<string, string>>;
-}): FilePanelResolution<Candidate> {
-  const { file, associations } = input;
-  const candidates = input.candidates.filter((candidate) => {
-    const documentAvailable = candidate.document === "text" ? file.kind === "text" : file.hasBytes;
-    return (
-      documentAvailable && file.size <= candidate.maxBytes && matchesSelector(file, candidate.files)
-    );
-  });
-  const filename = filePanelBasename(file.path);
-  const matchedFilename = candidates.some((candidate) =>
-    candidate.files.filenames?.includes(filename),
-  );
-  const selectorKey = matchedFilename ? `name:${filename}` : `ext:${filePanelExtension(file.path)}`;
-  const association = associations[selectorKey];
-  const panel =
-    candidates.find((candidate) => candidate.id === association) ?? candidates[0] ?? null;
-  return { panel, candidates, selectorKey };
-}
@@ -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";
@@ -44,33 +44,6 @@ function makeDeps(
 }

 describe("loadAppSettingsFromStorage", () => {
-  it("persists file panel associations, including panels absent from this host", async () => {
-    const deps = makeDeps();
-    const queryClient = new QueryClient();
-    const filePanelAssociations = {
-      "ext:md": "builtin:markdown",
-      "name:Dockerfile": "plugin:absent/container",
-    };
-    await saveAppSettings({ queryClient, deps, updates: { filePanelAssociations } });
-    expect((await loadAppSettingsFromStorage(deps)).filePanelAssociations).toEqual(
-      filePanelAssociations,
-    );
-  });
-
-  it.each([undefined, null, [], "invalid", { "ext:md": 42 }])(
-    "defaults malformed file panel associations without discarding other settings: %j",
-    async (filePanelAssociations) => {
-      const deps = makeDeps({
-        storage: createInMemoryKeyValueStorage({
-          [APP_SETTINGS_KEY]: JSON.stringify({ filePanelAssociations, vimKeybindings: true }),
-        }),
-      });
-      const settings = await loadAppSettingsFromStorage(deps);
-      expect(settings.filePanelAssociations).toEqual({});
-      expect(settings.vimKeybindings).toBe(true);
-    },
-  );
-
  it("preserves a persisted steer send behavior", async () => {
    const deps = makeDeps({
      storage: createInMemoryKeyValueStorage({
@@ -104,7 +104,6 @@ export interface AppSettings {
  toolCallDetailLevel: ToolCallDetailLevel;
  chatOutlineEnabled: boolean;
  vimKeybindings: boolean;
-  filePanelAssociations: Record<string, string>;
  /** Desktop-only preferences for implicit opens into the ordinary side pane. */
  openInSidePane: OpenInSidePanePreferences;
  pullRequestOpenLocation: PullRequestOpenLocation;
@@ -161,7 +160,6 @@ export const DEFAULT_CLIENT_SETTINGS: AppSettings = {
  toolCallDetailLevel: "detailed",
  chatOutlineEnabled: true,
  vimKeybindings: false,
-  filePanelAssociations: {},
  openInSidePane: DEFAULT_OPEN_IN_SIDE_PANE_PREFERENCES,
  pullRequestOpenLocation: "explorer",
 };
@@ -263,7 +261,6 @@ const StoredAppSettingsSchema = z
    compactToolCalls: z.boolean().optional().catch(undefined),
    chatOutlineEnabled: z.boolean().catch(true),
    vimKeybindings: z.boolean().catch(false),
-    filePanelAssociations: z.record(z.string(), z.string()).catch({}),
    openInSidePane: z
      .object({
        explorerFiles: z.boolean().catch(false),
@@ -538,7 +538,6 @@ export const ar: TranslationResources = {
      },
    },
    setup: {
-      updateHost: "حدّث المضيف لعرض تفاصيل إعداد مساحة العمل",
      descriptor: {
        label: "يثبت",
        completed: "اكتمل الإعداد",
@@ -2334,7 +2333,6 @@ export const ar: TranslationResources = {
      searchPlaceholder: "البحث في الاختصارات",
      unavailableOnMobile: "اختصارات لوحة المفاتيح متاحة فقط على سطح المكتب",
      capturePrompt: "اضغط على الاختصار...",
-      captureIndexPrompt: "اختم برقم من 1 إلى 9.",
      unassigned: "غير معين",
      actions: {
        menu: "إجراءات {{name}}",
@@ -535,7 +535,6 @@ export const en = {
      },
    },
    setup: {
-      updateHost: "Update the host to view workspace setup details",
      descriptor: {
        label: "Setup",
        completed: "Setup completed",
@@ -2457,7 +2456,6 @@ export const en = {
      searchPlaceholder: "Search shortcuts",
      unavailableOnMobile: "Keyboard shortcuts are only available on desktop",
      capturePrompt: "Press shortcut...",
-      captureIndexPrompt: "End with a number from 1 to 9.",
      unassigned: "Not set",
      actions: {
        menu: "Actions for {{name}}",
@@ -544,7 +544,6 @@ export const es: TranslationResources = {
      },
    },
    setup: {
-      updateHost: "Actualiza el host para ver los detalles de configuración del espacio de trabajo",
      descriptor: {
        label: "Configuración",
        completed: "Configuración completada",
@@ -2388,7 +2387,6 @@ export const es: TranslationResources = {
      searchPlaceholder: "Buscar atajos",
      unavailableOnMobile: "Los atajos de teclado solo están disponibles en el escritorio",
      capturePrompt: "Presione el acceso directo...",
-      captureIndexPrompt: "Termina con un número del 1 al 9.",
      unassigned: "Sin asignar",
      actions: {
        menu: "Acciones para {{name}}",
@@ -543,8 +543,6 @@ export const fr: TranslationResources = {
      },
    },
    setup: {
-      updateHost:
-        "Mettez à jour l’hôte pour afficher les détails de configuration de l’espace de travail",
      descriptor: {
        label: "Configuration",
        completed: "Configuration terminée",
@@ -2389,7 +2387,6 @@ export const fr: TranslationResources = {
      searchPlaceholder: "Rechercher des raccourcis",
      unavailableOnMobile: "Les raccourcis clavier ne sont disponibles que sur l’app de bureau",
      capturePrompt: "Appuyez sur le raccourci…",
-      captureIndexPrompt: "Terminez par un chiffre de 1 à 9.",
      unassigned: "Non attribué",
      actions: {
        menu: "Actions pour {{name}}",
@@ -544,7 +544,6 @@ export const ja: TranslationResources = {
      },
    },
    setup: {
-      updateHost: "ワークスペースのセットアップ詳細を表示するにはホストを更新してください",
      descriptor: {
        label: "セットアップ",
        completed: "セットアップ完了",
@@ -2355,7 +2354,6 @@ export const ja: TranslationResources = {
      searchPlaceholder: "ショートカットを検索",
      unavailableOnMobile: "キーボードショートカットはデスクトップでのみ利用できます",
      capturePrompt: "ショートカットを押してください...",
-      captureIndexPrompt: "最後に1〜9の数字を入力してください。",
      unassigned: "未設定",
      actions: {
        menu: "{{name}} のアクション",
@@ -539,7 +539,6 @@ export const ko: TranslationResources = {
      },
    },
    setup: {
-      updateHost: "작업 공간 설정 세부 정보를 보려면 호스트를 업데이트하세요",
      descriptor: {
        label: "설정",
        completed: "설정 완료",
@@ -2344,7 +2343,6 @@ export const ko: TranslationResources = {
      searchPlaceholder: "검색 단축키",
      unavailableOnMobile: "키보드 단축키는 데스크톱에서만 사용할 수 있습니다",
      capturePrompt: "단축키를 누르세요...",
-      captureIndexPrompt: "마지막에 1부터 9까지의 숫자를 입력하세요.",
      unassigned: "설정되지 않음",
      actions: {
        menu: "{{name}} 작업",
@@ -543,7 +543,6 @@ export const ptBR: TranslationResources = {
      },
    },
    setup: {
-      updateHost: "Atualize o host para ver os detalhes da configuração do espaço de trabalho",
      descriptor: {
        label: "Configuração",
        completed: "Configuração concluída",
@@ -2369,7 +2368,6 @@ export const ptBR: TranslationResources = {
      searchPlaceholder: "Pesquisar atalhos",
      unavailableOnMobile: "Atalhos de teclado estão disponíveis apenas no desktop",
      capturePrompt: "Pressione o atalho...",
-      captureIndexPrompt: "Termine com um número de 1 a 9.",
      unassigned: "Não definido",
      actions: {
        menu: "Ações para {{name}}",
@@ -543,7 +543,6 @@ export const ru: TranslationResources = {
      },
    },
    setup: {
-      updateHost: "Обновите хост, чтобы просмотреть сведения о настройке рабочего пространства",
      descriptor: {
        label: "Настройка",
        completed: "Настройка завершена",
@@ -2374,7 +2373,6 @@ export const ru: TranslationResources = {
      searchPlaceholder: "Поиск сочетаний клавиш",
      unavailableOnMobile: "Сочетания клавиш доступны только на рабочем столе.",
      capturePrompt: "Нажмите сочетание клавиш...",
-      captureIndexPrompt: "Завершите цифрой от 1 до 9.",
      unassigned: "Не задано",
      actions: {
        menu: "Действия для {{name}}",
@@ -538,7 +538,6 @@ export const zhCN: TranslationResources = {
      },
    },
    setup: {
-      updateHost: "更新主机以查看工作区设置详情",
      descriptor: {
        label: "Setup",
        completed: "Setup 已完成",
@@ -2306,7 +2305,6 @@ export const zhCN: TranslationResources = {
      searchPlaceholder: "搜索快捷键",
      unavailableOnMobile: "键盘快捷键仅在桌面端可用",
      capturePrompt: "按下快捷键...",
-      captureIndexPrompt: "请以 1 到 9 的数字结尾。",
      unassigned: "未设置",
      actions: {
        menu: "{{name}} 的操作",
@@ -4,9 +4,7 @@ import { keyboardEventToComboString } from "./shortcut-string";
 import {
  buildKeyboardShortcutHelpSections,
  buildEffectiveBindings,
-  DEFAULT_BINDINGS,
  normalizeCapturedShortcutCombo,
-  isShortcutCaptureComplete,
  getBindingIdForAction,
  getDefaultKeysForAction,
  getWorkspaceIndexJumpModifierKey,
@@ -1392,22 +1390,3 @@ describe("number-group shortcut capture", () => {
    expect(normalizeCapturedShortcutCombo(tabBindingId, "Ctrl+9")).toBe("Ctrl+Digit");
  });
 });
-
-describe("shortcut capture completion", () => {
-  const indexBindings = DEFAULT_BINDINGS.filter((binding) => binding.payload?.type === "index");
-  it.each(indexBindings)("requires a final 1–9 number for $id", ({ id }) => {
-    for (const combos of [[], ["Ctrl+K"], ["Ctrl+0"], ["Ctrl+Digit", "Ctrl+K"]]) {
-      expect(isShortcutCaptureComplete(id, combos)).toBe(false);
-    }
-    for (let index = 1; index <= 9; index++) {
-      const combo = normalizeCapturedShortcutCombo(id, `Ctrl+${index}`);
-      expect(isShortcutCaptureComplete(id, [combo])).toBe(true);
-      expect(isShortcutCaptureComplete(id, ["Ctrl+K", combo])).toBe(true);
-    }
-  });
-  it("keeps ordinary shortcuts available without a number", () => {
-    expect(isShortcutCaptureComplete("show-shortcuts", [])).toBe(false);
-    expect(isShortcutCaptureComplete("show-shortcuts", ["Ctrl+K"])).toBe(true);
-    expect(isShortcutCaptureComplete("show-shortcuts", ["Ctrl+0"])).toBe(true);
-  });
-});
@@ -1217,14 +1217,6 @@ export function normalizeCapturedShortcutCombo(bindingId: string, combo: string)
  return combo.replace(/(^|\+)[1-9]$/, "$1Digit");
 }

-/** Index navigation needs a final number; earlier combos may be any chord prefix. */
-export function isShortcutCaptureComplete(bindingId: string, combos: readonly string[]): boolean {
-  const lastCombo = combos.at(-1);
-  if (!lastCombo) return false;
-  const binding = DEFAULT_BINDINGS.find((candidate) => candidate.id === bindingId);
-  return binding?.payload?.type !== "index" || /(^|\+)(Digit|[1-9])$/.test(lastCombo);
-}
-
 export function buildEffectiveBindings(overrides: ShortcutOverrides): ParsedShortcutBinding[] {
  return DEFAULT_BINDINGS.map(function (binding) {
    const override = overrides[binding.id];
@@ -1,7 +1,7 @@
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { Alert } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { CheckCircle2, ChevronRight, CircleAlert, SquareTerminal } from "lucide-react-native";
 import { useTranslation } from "react-i18next";
 import { Pressable, type PressableStateCallbackType, ScrollView, Text, View } from "react-native";
@@ -17,9 +17,6 @@ import {
  type WorkspaceSetupSnapshot,
 } from "@/stores/workspace-setup-store";
 import { useHostRuntimeClient } from "@/runtime/host-runtime";
-import { useWorkspaceFields } from "@/stores/session-store-hooks";
-import { useRetainedPanelActive } from "@/components/retained-panel";
-import { useAppActivelyVisible } from "@/hooks/use-app-visible";
 import { useHostFeature } from "@/runtime/host-features";

 function useSetupPanelDescriptor(
@@ -27,11 +24,13 @@ function useSetupPanelDescriptor(
  context: { serverId: string; workspaceId: string },
 ): PanelDescriptor {
  const { t } = useTranslation();
-  const fields = useWorkspaceFields(context.serverId, target.workspaceId, (workspace) => ({
-    status: workspace.setupStatus ?? null,
-  }));
+  const key = buildWorkspaceTabPersistenceKey({
+    serverId: context.serverId,
+    workspaceId: target.workspaceId,
+  });
+  const snapshot = useWorkspaceSetupStore((state) => (key ? (state.snapshots[key] ?? null) : null));

-  if (fields?.status === "completed") {
+  if (snapshot?.status === "completed") {
    return {
      label: t("workspace.setup.descriptor.label"),
      subtitle: t("workspace.setup.descriptor.completed"),
@@ -42,7 +41,7 @@ function useSetupPanelDescriptor(
    };
  }

-  if (fields?.status === "failed") {
+  if (snapshot?.status === "failed") {
    return {
      label: t("workspace.setup.descriptor.label"),
      subtitle: t("workspace.setup.descriptor.failed"),
@@ -53,7 +52,7 @@ function useSetupPanelDescriptor(
    };
  }

-  if (fields?.status === "blocked") {
+  if (snapshot?.status === "blocked") {
    return {
      label: t("workspace.setup.descriptor.label"),
      subtitle: t("workspace.setup.descriptor.blocked"),
@@ -70,7 +69,7 @@ function useSetupPanelDescriptor(
    tooltip: t("workspace.setup.descriptor.workspace"),
    titleState: "ready",
    icon: SquareTerminal,
-    statusBucket: fields?.status === "running" ? "running" : null,
+    statusBucket: snapshot?.status === "running" ? "running" : null,
  };
 }

@@ -217,34 +216,33 @@ function buildCommandRowState(args: BuildCommandRowPropsArgs) {
  return { hasError, hasLog, isExpandable, isAutoExpanded, showDetail, processedLog };
 }

-function useWorkspaceSetupSnapshot(serverId: string, workspaceId: string, enabled: boolean) {
+function useWorkspaceSetupSnapshot(serverId: string, workspaceId: string) {
  const client = useHostRuntimeClient(serverId);
  const key = buildWorkspaceTabPersistenceKey({ serverId, workspaceId });
  const snapshot = useWorkspaceSetupStore((state) => (key ? (state.snapshots[key] ?? null) : null));
-  const applySnapshot = useWorkspaceSetupStore((state) => state.applySnapshot);
-  const [error, setError] = useState<string | null>(null);
+  const upsertProgress = useWorkspaceSetupStore((state) => state.upsertProgress);
+  const requestedRef = useRef(false);
+
  useEffect(() => {
-    if (!client || !enabled) return;
-    setError(null);
-    const subscription = client.observeWorkspaceSetup(workspaceId);
-    const detach = subscription.subscribe({
-      snapshot: (response) => {
-        applySnapshot({ serverId, workspaceId, snapshot: response.snapshot });
-      },
-      update: (message) => {
-        if (message.type === "workspace_setup_progress")
-          applySnapshot({ serverId, workspaceId, snapshot: message.payload });
-      },
-      error: (failure) => setError(failure instanceof Error ? failure.message : String(failure)),
-    });
-    return () => {
-      detach();
-      void subscription
-        .release()
-        .catch((failure) => console.warn("Failed to release setup observation", failure));
-    };
-  }, [client, enabled, serverId, applySnapshot, workspaceId]);
-  return { snapshot, error };
+    if (snapshot || requestedRef.current || !client) return;
+    requestedRef.current = true;
+    client
+      .fetchWorkspaceSetupStatus(workspaceId)
+      .then((response) => {
+        if (response.snapshot) {
+          upsertProgress({
+            serverId,
+            payload: { workspaceId: response.workspaceId, ...response.snapshot },
+          });
+        }
+        return;
+      })
+      .catch(() => {
+        // Server may not support this yet — ignore.
+      });
+  }, [client, snapshot, serverId, upsertProgress, workspaceId]);
+
+  return snapshot;
 }

 function useExpandedSetupCommands() {
@@ -275,14 +273,7 @@ function SetupPanel() {
  const { serverId, target } = usePaneContext();
  invariant(target.kind === "setup", "SetupPanel requires setup target");

-  const isActive = useRetainedPanelActive();
-  const isVisible = useAppActivelyVisible();
-  const supportsObservation = useHostFeature(serverId, "workspaceSetupObservation");
-  const { snapshot, error: observationError } = useWorkspaceSetupSnapshot(
-    serverId,
-    target.workspaceId,
-    isActive && isVisible && supportsObservation,
-  );
+  const snapshot = useWorkspaceSetupSnapshot(serverId, target.workspaceId);

  const commands = snapshot?.detail.commands ?? EMPTY_COMMANDS;
  const log = snapshot?.detail.log ?? "";
@@ -315,23 +306,19 @@ function SetupPanel() {
      <Text style={styles.hiddenStatus} testID="workspace-setup-status">
        {statusLabel}
      </Text>
-      {!supportsObservation && <Alert variant="warning" title={t("workspace.setup.updateHost")} />}
-      {observationError && <Alert variant="error" title={observationError} />}
-      {supportsObservation && !observationError && (
-        <SetupPanelBody
-          serverId={serverId}
-          workspaceId={target.workspaceId}
-          snapshot={snapshot}
-          commands={commands}
-          log={log}
-          isWaiting={isWaiting}
-          hasNoSetupCommands={hasNoSetupCommands}
-          autoExpandIndex={autoExpandIndex}
-          expandedIndices={expandedIndices}
-          manuallyCollapsed={manuallyCollapsed}
-          onToggle={toggleExpanded}
-        />
-      )}
+      <SetupPanelBody
+        serverId={serverId}
+        workspaceId={target.workspaceId}
+        snapshot={snapshot}
+        commands={commands}
+        log={log}
+        isWaiting={isWaiting}
+        hasNoSetupCommands={hasNoSetupCommands}
+        autoExpandIndex={autoExpandIndex}
+        expandedIndices={expandedIndices}
+        manuallyCollapsed={manuallyCollapsed}
+        onToggle={toggleExpanded}
+      />
    </ScrollView>
  );
 }
@@ -1,10 +1,6 @@
 import { z } from "zod";
 import type { AgentAttachment } from "@getpaseo/protocol/messages";
-import {
-  PluginAttachmentItemSchema,
-  type PluginAttachmentItem,
-  type PluginSerializableIcon,
-} from "@getpaseo/plugin";
+import { PluginAttachmentItemSchema, type PluginAttachmentItem } from "@getpaseo/plugin";
 import type { UserComposerAttachment } from "@/attachments/types";

 export const PluginResourceComposerAttachmentSchema = z.object({
@@ -12,8 +8,7 @@ export const PluginResourceComposerAttachmentSchema = z.object({
  pluginId: z.string().min(1),
  sourceId: z.string().min(1),
  sourceTitle: z.string().min(1),
-  // Validated when the source registered; a draft keeps the icon its source had then.
-  sourceIcon: z.union([z.string().min(1), z.object({ svg: z.string().min(1) })]),
+  sourceIcon: z.string().min(1),
  item: PluginAttachmentItemSchema,
 });

@@ -25,7 +20,7 @@ export interface PluginResourceSourceIdentity {
  pluginId: string;
  sourceId: string;
  sourceTitle: string;
-  sourceIcon: PluginSerializableIcon;
+  sourceIcon: string;
 }

 export function createPluginResourceAttachment(
@@ -2,18 +2,15 @@ import { useCallback, useMemo, useState, type ReactElement, type RefObject } fro
 import { View } from "react-native";
 import { withUnistyles } from "react-native-unistyles";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import type {
-  PluginAttachmentItem,
-  PluginAttachmentSourceContribution,
-  PluginSerializableIcon,
-} from "@getpaseo/plugin";
+import type { PluginAttachmentItem, PluginAttachmentSourceContribution } from "@getpaseo/plugin";
 import { searchPluginAttachments } from "@getpaseo/plugin/client/host";
+import type { LucideIcon } from "lucide-react-native";
 import type { UserComposerAttachment } from "@/attachments/types";
 import type { AttachmentMenuItem } from "@/composer/input/input";
 import { Combobox, type ComboboxOption } from "@/components/ui/combobox";
 import { useFetchQuery } from "@/data/query";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
-import { PluginIconView } from "../icons";
+import { resolvePluginIcon } from "../icons";
 import { useInstalledPlugins } from "../registry";
 import type { InstalledPlugin } from "../types";
 import { createPluginResourceAttachment, togglePluginResourceAttachment } from "./model";
@@ -22,8 +19,8 @@ const SEARCH_STALE_TIME_MS = 30_000;
 const EMPTY_ATTACHMENT_ITEMS: PluginAttachmentItem[] = [];
 const iconColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });

-function SourceIcon({ icon, color = "" }: { icon: PluginSerializableIcon; color?: string }) {
-  return <PluginIconView icon={icon} size={ICON_SIZE.md} color={color} />;
+function SourceIcon({ Icon, color = "" }: { Icon: LucideIcon; color?: string }) {
+  return <Icon size={ICON_SIZE.md} color={color} />;
 }

 const ThemedSourceIcon = withUnistyles(SourceIcon);
@@ -148,12 +145,15 @@ export function usePluginAttachmentPicker(
  );
  const menuItems = useMemo(
    () =>
-      sources.map(({ key, source }) => ({
-        id: `plugin:${key}`,
-        label: `Attach ${source.title}`,
-        icon: <ThemedSourceIcon icon={source.icon} uniProps={iconColorMapping} />,
-        onSelect: () => setActiveKey(key),
-      })),
+      sources.map(({ key, source }) => {
+        const Icon = resolvePluginIcon(source.icon);
+        return {
+          id: `plugin:${key}`,
+          label: `Attach ${source.title}`,
+          icon: <ThemedSourceIcon Icon={Icon} uniProps={iconColorMapping} />,
+          onSelect: () => setActiveKey(key),
+        };
+      }),
    [sources],
  );
  if (!active) return { menuItems, picker: null };
@@ -3,14 +3,19 @@ import { withUnistyles } from "react-native-unistyles";
 import { AttachmentLabel, AttachmentPill } from "@/components/attachment-pill";
 import type { ComposerAttachment } from "@/attachments/types";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
-import type { PluginSerializableIcon } from "@getpaseo/plugin";
-import { PluginIconView } from "../icons";
+import { resolvePluginIcon } from "../icons";
 import type { PluginResourceComposerAttachment } from "./model";

 const iconColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });

-function ResourceIcon({ icon, color = "" }: { icon: PluginSerializableIcon; color?: string }) {
-  return <PluginIconView icon={icon} size={ICON_SIZE.sm} color={color} />;
+function ResourceIcon({
+  Icon,
+  color = "",
+}: {
+  Icon: ReturnType<typeof resolvePluginIcon>;
+  color?: string;
+}) {
+  return <Icon size={ICON_SIZE.sm} color={color} />;
 }

 const ThemedResourceIcon = withUnistyles(ResourceIcon);
@@ -34,11 +39,12 @@ export function PluginResourceAttachmentPill({
  openLabel,
  removeLabel,
 }: PluginResourceAttachmentPillProps) {
+  const Icon = resolvePluginIcon(attachment.sourceIcon);
  const handleOpen = useCallback(() => onOpen(attachment), [attachment, onOpen]);
  const handleRemove = useCallback(() => onRemove(index), [index, onRemove]);
  const icon = useMemo(
-    () => <ThemedResourceIcon icon={attachment.sourceIcon} uniProps={iconColorMapping} />,
-    [attachment.sourceIcon],
+    () => <ThemedResourceIcon Icon={Icon} uniProps={iconColorMapping} />,
+    [Icon],
  );
  return (
    <AttachmentPill
@@ -30,9 +30,8 @@ function installation(): InstalledPlugin {

 function store() {
  return new PluginButtonStore({
-    parseIcon(icon) {
-      if (icon !== "Scan") throw new Error("Unknown icon");
-      return icon;
+    validateIconName(name) {
+      if (name !== "Scan") throw new Error("Unknown icon");
    },
  });
 }
@@ -1,6 +1,4 @@
-import { parsePluginIcon } from "../icons";
+import { resolvePluginIcon } from "../icons";
 import { PluginButtonStore } from "./model";

-export const pluginButtonStore = new PluginButtonStore({
-  parseIcon: (icon) => parsePluginIcon("Plugin button", icon),
-});
+export const pluginButtonStore = new PluginButtonStore({ validateIconName: resolvePluginIcon });
@@ -1,8 +1,7 @@
 import type { PluginButton, PluginButtonBehavior, PluginButtonIcon } from "@getpaseo/plugin/client";

 export interface ButtonValidation {
-  /** Returns the normalized icon, or throws naming why the icon is unusable. */
-  parseIcon(icon: PluginButtonIcon): PluginButtonIcon;
+  validateIconName(name: string): void;
 }

 export function requireButtonId(value: string): string {
@@ -30,6 +29,12 @@ function isComponent(value: unknown): boolean {
  );
 }

+function validateIcon(icon: PluginButtonIcon, validation: ButtonValidation): void {
+  if (typeof icon === "string") validation.validateIconName(icon);
+  else if (!isComponent(icon))
+    throw new Error("Plugin button icon must be a Lucide name or component");
+}
+
 function validateBehavior(
  behavior: PluginButtonBehavior,
  validation: ButtonValidation,
@@ -52,9 +57,9 @@ function validateBehavior(
          ids.add(item.id);
          if (item.kind === "separator") return { ...item };
          if (item.kind !== "item") throw new Error("Invalid plugin button menu entry");
+          if (item.icon !== undefined) validateIcon(item.icon, validation);
          return {
            ...item,
-            icon: item.icon === undefined ? undefined : validation.parseIcon(item.icon),
            title: requireText(item.title, "menu item title"),
            visible: optionalBoolean(item.visible, true),
            disabled: optionalBoolean(item.disabled, false),
@@ -78,9 +83,9 @@ export function validateButton(
  button: PluginButton,
  validation: ButtonValidation,
 ): ResolvedPluginButton {
+  validateIcon(button.icon, validation);
  return {
    ...button,
-    icon: validation.parseIcon(button.icon),
    title: requireText(button.title, "title"),
    label: button.label === undefined ? undefined : requireText(button.label, "label"),
    visible: optionalBoolean(button.visible, true),
@@ -32,7 +32,7 @@ import { useToast } from "@/contexts/toast-context";
 import { useHostRuntimeClient, useHosts } from "@/runtime/host-runtime";
 import type { Theme } from "@/styles/theme";
 import { createPluginClientStateSource } from "../client-state/source";
-import { pluginIconComponent } from "../icons";
+import { Icon } from "../icons";
 import {
  PluginEnvironmentProvider,
  PluginPopoverContent,
@@ -79,7 +79,6 @@ function ButtonEnvironment({ view, children }: { view: ButtonView; children: Rea
 function ButtonIcon({ view, icon }: { view: ButtonView; icon: PluginButtonIcon }) {
  const color = view.props.theme.colors.foregroundMuted;
  const size = view.entry.placement === "composer" ? 14 : 16;
-  const Icon = pluginIconComponent(icon);
  return (
    <View
      style={styles.icon}
@@ -88,11 +87,24 @@ function ButtonIcon({ view, icon }: { view: ButtonView; icon: PluginButtonIcon }
      accessibilityElementsHidden
      importantForAccessibility="no-hide-descendants"
    >
-      <Icon {...view.props} size={size} color={color} />
+      {typeof icon === "string" ? (
+        <Icon name={icon} size={size} color={color} />
+      ) : (
+        renderCustomIcon(icon, view, size, color)
+      )}
    </View>
  );
 }

+function renderCustomIcon(
+  CustomIcon: Exclude<PluginButtonIcon, string>,
+  view: ButtonView,
+  size: number,
+  color: string,
+) {
+  return <CustomIcon {...view.props} size={size} color={color} />;
+}
+
 function pressButton(view: ButtonView, path: readonly string[]) {
  void pluginButtonStore.run(view.entry.key, path).catch((error: unknown) => {
    view.toast.error(error instanceof Error ? error.message : String(error));
@@ -1,7 +1,7 @@
 import type { PluginClientStateSource } from "@getpaseo/plugin/client/host";
 import type { CommandCenterContribution } from "@/command-center/contributions";
 import { getCommandCenterIcon } from "@/command-center/icon";
-import { pluginIconComponent } from "../icons";
+import { resolvePluginIcon } from "../icons";
 import { resolvePluginPanelOpenLocation } from "../workspace-panels/locations";
 import type { InstalledPlugin } from "../types";
 import { createPluginCapabilities, type PluginNavigation } from "../actions";
@@ -83,7 +83,7 @@ export function buildPluginCommandCenterContributions(
          kind: "action",
          title: item.title,
          sectionTitle: plugin.id,
-          icon: getCommandCenterIcon(pluginIconComponent(item.icon)),
+          icon: getCommandCenterIcon(resolvePluginIcon(item.icon)),
        },
        run,
      });
@@ -381,72 +381,6 @@ describe("evaluatePluginClientBundle", () => {
    ).toEqual([{ id: "open-review", title: "Open review", icon: "Scan", context: "agent" }]);
  });

-  it("registers inline SVG and component icons", () => {
-    const svg = '<svg viewBox="0 0 24 24"><path fill="currentColor" d="M4 4h16v16H4z" /></svg>';
-    const plugin = evaluatePluginClientBundle(
-      "review",
-      bundle(`
-        function ReviewPanel() { return null; }
-        function BadgeIcon() { return null; }
-        plugin.addWorkspacePanel({
-          id: "review",
-          title: "Review",
-          icon: { svg: ${JSON.stringify(`  ${svg}\n`)} },
-          context: "workspace",
-          Component: ReviewPanel,
-        });
-        plugin.addCommandCenterItem({
-          id: "open-review",
-          title: "Open review",
-          icon: BadgeIcon,
-          context: "global",
-          onSelect() {},
-        });
-        plugin.addAttachmentSource({
-          id: "issues",
-          title: "Issues",
-          icon: { svg: ${JSON.stringify(svg)} },
-          pickerTitle: "Attach issue",
-          searchPlaceholder: "Search",
-          search: { name: "issues.search", input: {}, output: {} },
-        });
-      `),
-    );
-
-    expect(plugin.workspacePanels[0]?.icon).toEqual({ svg });
-    expect(plugin.commandCenterItems[0]?.icon).toHaveProperty("name", "BadgeIcon");
-    expect(plugin.attachmentSources[0]?.icon).toEqual({ svg });
-  });
-
-  it.each([
-    [
-      "workspace panel",
-      `plugin.addWorkspacePanel({ id: "review", title: "Review", icon: ICON, context: "workspace", Component() { return null; } })`,
-      "Workspace panel review has an invalid icon: script elements are not allowed",
-    ],
-    [
-      "Command Center item",
-      `plugin.addCommandCenterItem({ id: "review", title: "Review", icon: ICON, context: "global", onSelect() {} })`,
-      "Command Center item review has an invalid icon: script elements are not allowed",
-    ],
-    [
-      "settings screen",
-      `plugin.addSettingsScreen({ id: "review", title: "Review", icon: ICON, Component() { return null; } })`,
-      "Settings screen review has an invalid icon: script elements are not allowed",
-    ],
-    [
-      "attachment source",
-      `plugin.addAttachmentSource({ id: "review", title: "Review", icon: ICON, pickerTitle: "Pick", searchPlaceholder: "Search", search: { name: "issues.search", input: {}, output: {} } })`,
-      "Attachment source review has an invalid icon: script elements are not allowed",
-    ],
-  ])("fails the plugin when a %s registers an unsafe SVG", (_kind, registration, message) => {
-    const icon = JSON.stringify({ svg: "<svg><script>run()</script></svg>" });
-
-    expect(() =>
-      evaluatePluginClientBundle("review", bundle(registration.replace("ICON", icon))),
-    ).toThrow(message);
-  });
-
  it("normalizes and validates workspace panel locations", () => {
    const plugin = evaluatePluginClientBundle(
      "review",
@@ -33,7 +33,7 @@ import {
 } from "@getpaseo/plugin/client";
 import type { EvaluatedPlugin, PluginSidebarSection } from "./types";
 import type { ComponentType } from "react";
-import { parsePluginIcon, parseSerializablePluginIcon } from "./icons";
+import { resolvePluginIcon } from "./icons";
 import { pluginReactNativeRuntime } from "./react-native/runtime";
 import { parsePluginThemeContribution } from "./themes";

@@ -199,9 +199,9 @@ export function runPluginClientBundle(
      if (settingsScreenIds.has(screenId))
        throw new Error(`Duplicate settings screen: ${screenId}`);
      if (!contribution.title.trim()) throw new Error(`Invalid settings screen: ${screenId}`);
-      const icon = parsePluginIcon(`Settings screen ${screenId}`, contribution.icon);
+      resolvePluginIcon(contribution.icon);
      settingsScreenIds.add(screenId);
-      return register(collector.settingsScreens, { ...contribution, id: screenId, icon }, () =>
+      return register(collector.settingsScreens, { ...contribution, id: screenId }, () =>
        settingsScreenIds.delete(screenId),
      );
    },
@@ -241,10 +241,12 @@ export function runPluginClientBundle(
    // COMPAT(pluginSidebarAliases): added in v0.11.0, remove after 2027-03-29
    addSidebarItem(contribution: PluginSidebarContribution) {
      const normalizedId = requireId(contribution.id, "sidebar item id");
+      if (!contribution.icon.trim()) throw new Error(`Sidebar item ${normalizedId} has no icon`);
+      resolvePluginIcon(contribution.icon.trim());
      const legacy = {
        id: normalizedId,
        title: contribution.title.trim(),
-        icon: parsePluginIcon(`Sidebar item ${normalizedId}`, contribution.icon),
+        icon: contribution.icon.trim(),
        surface: requireId(contribution.surface, "sidebar surface id"),
      };
      // Shares the header's ids: the sidebar orders both kinds of item under one key.
@@ -260,14 +262,16 @@ export function runPluginClientBundle(
        throw new Error(`Duplicate workspace panel: ${normalizedId}`);
      }
      const title = contribution.title.trim();
+      const icon = contribution.icon.trim();
      if (!title) throw new Error(`Workspace panel ${normalizedId} has no title`);
-      const icon = parsePluginIcon(`Workspace panel ${normalizedId}`, contribution.icon);
+      if (!icon) throw new Error(`Workspace panel ${normalizedId} has no icon`);
      if (contribution.context !== "workspace" && contribution.context !== "agent") {
        throw new Error(`Workspace panel ${normalizedId} has invalid context`);
      }
      if (typeof contribution.Component !== "function") {
        throw new Error(`Workspace panel ${normalizedId} is not a component`);
      }
+      resolvePluginIcon(icon);
      const locations = normalizePanelLocations(normalizedId, contribution.locations);
      workspacePanelIds.add(normalizedId);
      return register(
@@ -288,8 +292,9 @@ export function runPluginClientBundle(
        throw new Error(`Duplicate Command Center item: ${normalizedId}`);
      }
      const title = contribution.title.trim();
+      const icon = contribution.icon.trim();
      if (!title) throw new Error(`Command Center item ${normalizedId} has no title`);
-      const icon = parsePluginIcon(`Command Center item ${normalizedId}`, contribution.icon);
+      if (!icon) throw new Error(`Command Center item ${normalizedId} has no icon`);
      if (
        contribution.context !== "global" &&
        contribution.context !== "workspace" &&
@@ -300,6 +305,7 @@ export function runPluginClientBundle(
      if (typeof contribution.onSelect !== "function") {
        throw new Error(`Command Center item ${normalizedId} has no callback`);
      }
+      resolvePluginIcon(icon);
      commandCenterItemIds.add(normalizedId);
      return register(
        collector.commandCenterItems,
@@ -344,19 +350,18 @@ export function runPluginClientBundle(
        throw new Error(`Duplicate attachment source: ${normalizedId}`);
      }
      const title = contribution.title.trim();
+      const icon = contribution.icon.trim();
      const pickerTitle = contribution.pickerTitle.trim();
      const searchPlaceholder = contribution.searchPlaceholder.trim();
      const method = contribution.search.name.trim();
      if (!title) throw new Error(`Attachment source ${normalizedId} has no title`);
-      const icon = parseSerializablePluginIcon(
-        `Attachment source ${normalizedId}`,
-        contribution.icon,
-      );
+      if (!icon) throw new Error(`Attachment source ${normalizedId} has no icon`);
      if (!pickerTitle) throw new Error(`Attachment source ${normalizedId} has no picker title`);
      if (!searchPlaceholder) {
        throw new Error(`Attachment source ${normalizedId} has no search placeholder`);
      }
      if (!method) throw new Error(`Attachment source ${normalizedId} has no search RPC`);
+      resolvePluginIcon(icon);
      attachmentSourceIds.add(normalizedId);
      return register(
        collector.attachmentSources,
@@ -0,0 +1,18 @@
+import { Settings } from "lucide-react-native";
+import { describe, expect, it } from "vitest";
+import { Icon } from "./icons";
+
+describe("Icon", () => {
+  it("renders a host Lucide icon with the requested presentation", () => {
+    expect(Icon({ name: "Settings", size: 18, color: "#123456" })).toMatchObject({
+      type: Settings,
+      props: { size: 18, color: "#123456" },
+    });
+  });
+
+  it("renders nothing for an unknown icon name", () => {
+    expect(Icon({ name: "NotALucideIcon" })).toBeNull();
+    expect(Icon({ name: "Icon" })).toBeNull();
+    expect(Icon({ name: "createLucideIcon" })).toBeNull();
+  });
+});
@@ -1,104 +0,0 @@
-import { Settings } from "lucide-react-native";
-import React, { isValidElement, type ReactElement, type ReactNode } from "react";
-import { SvgXml } from "react-native-svg";
-import { describe, expect, it } from "vitest";
-import type { PluginIconProps } from "@getpaseo/plugin";
-import { Icon, parsePluginIcon, parseSerializablePluginIcon, PluginIconView } from "./icons";
-
-const SVG = '<svg viewBox="0 0 24 24"><path fill="currentColor" d="M4 4h16v16H4z" /></svg>';
-const SVG_ICON = { svg: SVG };
-
-const GLYPHS = new Set<unknown>([Settings, SvgXml]);
-
-/** Expands function components down to what reaches the screen: a Lucide glyph, SvgXml, or DOM. */
-function draw(node: ReactNode): ReactElement | null {
-  if (!isValidElement(node)) return null;
-  const { type } = node;
-  if (typeof type !== "function" || GLYPHS.has(type)) return node;
-  return draw((type as (props: unknown) => ReactNode)(node.props));
-}
-
-function BadgeIcon({ size, color }: PluginIconProps) {
-  return <span data-size={size} data-color={color} />;
-}
-
-describe("PluginIconView", () => {
-  it("draws a Lucide name as that Lucide icon", () => {
-    expect(draw(<PluginIconView icon="Settings" size={18} color="#123456" />)).toMatchObject({
-      type: Settings,
-      props: { size: 18, color: "#123456" },
-    });
-  });
-
-  it("draws inline SVG sized to the surface, with color reaching currentColor", () => {
-    expect(draw(<PluginIconView icon={SVG_ICON} size={18} color="#123456" />)).toMatchObject({
-      type: SvgXml,
-      props: { xml: SVG, width: 18, height: 18, color: "#123456" },
-    });
-  });
-
-  it("draws a component with the surface's size and color", () => {
-    expect(draw(<PluginIconView icon={BadgeIcon} size={18} color="#123456" />)).toMatchObject({
-      type: "span",
-      props: { "data-size": 18, "data-color": "#123456" },
-    });
-  });
-});
-
-describe("parsePluginIcon", () => {
-  it("normalizes each icon form", () => {
-    expect(parsePluginIcon("Workspace panel files", " Settings ")).toBe("Settings");
-    expect(parsePluginIcon("Workspace panel files", { svg: `\n${SVG}\n` })).toEqual({ svg: SVG });
-    expect(parsePluginIcon("Workspace panel files", BadgeIcon)).toBe(BadgeIcon);
-  });
-
-  it.each([
-    ["", "Workspace panel files has no icon"],
-    [
-      "NotALucideIcon",
-      'Workspace panel files has an invalid icon: unknown Lucide icon "NotALucideIcon"',
-    ],
-    [
-      { svg: "<svg><script>run()</script></svg>" },
-      "Workspace panel files has an invalid icon: script elements are not allowed",
-    ],
-    [{ svg: "hello" }, "Workspace panel files has an invalid icon: not an SVG document"],
-    [
-      { path: "icon.svg" },
-      "Workspace panel files has an invalid icon: expected a Lucide icon name, { svg }, or a component",
-    ],
-  ])("rejects %j", (icon, message) => {
-    expect(() => parsePluginIcon("Workspace panel files", icon as never)).toThrow(message);
-  });
-
-  it("refuses a component where the icon is stored as data", () => {
-    expect(() =>
-      parseSerializablePluginIcon("Attachment source issues", BadgeIcon as never),
-    ).toThrow(
-      "Attachment source issues has an invalid icon: expected a Lucide icon name or { svg }",
-    );
-  });
-});
-
-describe("Icon", () => {
-  it("renders a host Lucide icon by name with the requested presentation", () => {
-    expect(draw(Icon({ name: "Settings", size: 18, color: "#123456" }))).toMatchObject({
-      type: Settings,
-      props: { size: 18, color: "#123456" },
-    });
-  });
-
-  it("renders a plugin's own SVG through the icon prop", () => {
-    expect(draw(Icon({ icon: { svg: SVG }, size: 18, color: "#123456" }))).toMatchObject({
-      type: SvgXml,
-      props: { xml: SVG, width: 18, color: "#123456" },
-    });
-  });
-
-  it("renders nothing for an unusable icon", () => {
-    expect(Icon({ name: "NotALucideIcon" })).toBeNull();
-    expect(Icon({ name: "Icon" })).toBeNull();
-    expect(Icon({ name: "createLucideIcon" })).toBeNull();
-    expect(Icon({ icon: { svg: '<svg onload="run()"></svg>' } })).toBeNull();
-  });
-});
@@ -1,150 +1,24 @@
-import { createElement, type ComponentType, type ReactElement } from "react";
+import { createElement, type ReactElement } from "react";
 import * as LucideIcons from "lucide-react-native";
+import type { PluginIconProps } from "@getpaseo/plugin/client";
 import type { LucideIcon } from "lucide-react-native";
-import {
-  findSvgIconProblem,
-  type PluginIconProps,
-  type PluginSerializableIcon,
-  type PluginSvgIcon,
-} from "@getpaseo/plugin";
-import type { PluginIcon } from "@getpaseo/plugin/client";
-import type { IconProps } from "@getpaseo/plugin/client/react-native";
-import { SvgIcon } from "@/components/provider-icons";

-/** Host surfaces may thin a Lucide stroke; SVG and plugin components ignore it. */
-type HostIconProps = PluginIconProps & { strokeWidth?: number };
-/** A host-drawn icon. A plain function, so it stands in for any plugin icon component type. */
-type HostIcon = (props: HostIconProps) => ReactElement | null;
-
-const lucideIconComponents = new Map<string, HostIcon>();
-const svgIconComponents = new Map<string, HostIcon>();
-
-function findLucideIcon(name: string): LucideIcon | null {
+function findPluginIcon(name: string): LucideIcon | null {
  const candidate = Reflect.get(LucideIcons, name);
  if (candidate === LucideIcons.Icon || candidate === LucideIcons.createLucideIcon) return null;
-  return isComponent(candidate) ? (candidate as LucideIcon) : null;
+  const isComponent =
+    typeof candidate === "function" ||
+    (typeof candidate === "object" && candidate !== null && "$$typeof" in candidate);
+  return isComponent ? (candidate as LucideIcon) : null;
 }

-function isComponent(value: unknown): boolean {
-  return (
-    typeof value === "function" ||
-    (typeof value === "object" && value !== null && "$$typeof" in value)
-  );
-}
-
-function isSvgIcon(icon: unknown): icon is PluginSvgIcon {
-  return (
-    typeof icon === "object" &&
-    icon !== null &&
-    !("$$typeof" in icon) &&
-    typeof Reflect.get(icon, "svg") === "string"
-  );
-}
-
-function isComponentIcon<Props extends PluginIconProps>(
-  icon: PluginIcon<Props>,
-): icon is ComponentType<Props> {
-  return isComponent(icon);
-}
-
-function invalidIcon(owner: string, reason: string): Error {
-  return new Error(`${owner} has an invalid icon: ${reason}`);
-}
-
-/** Validates an icon that is stored with the data it labels. Returns the normalized icon. */
-export function parseSerializablePluginIcon(
-  owner: string,
-  icon: PluginSerializableIcon,
-): PluginSerializableIcon {
-  if (typeof icon === "string") {
-    const name = icon.trim();
-    if (!name) throw new Error(`${owner} has no icon`);
-    if (!findLucideIcon(name)) throw invalidIcon(owner, `unknown Lucide icon "${name}"`);
-    return name;
-  }
-  if (!isSvgIcon(icon)) throw invalidIcon(owner, "expected a Lucide icon name or { svg }");
-  const svg = icon.svg.trim();
-  const problem = findSvgIconProblem(svg);
-  if (problem) throw invalidIcon(owner, problem);
-  return { svg };
-}
-
-/** Validates a contribution's icon once, at registration. Rendering trusts the result. */
-export function parsePluginIcon<Props extends PluginIconProps>(
-  owner: string,
-  icon: PluginIcon<Props>,
-): PluginIcon<Props> {
-  if (isComponentIcon(icon)) return icon;
-  if (typeof icon !== "string" && !isSvgIcon(icon)) {
-    throw invalidIcon(owner, "expected a Lucide icon name, { svg }, or a component");
-  }
-  return parseSerializablePluginIcon(owner, icon);
-}
-
-function MissingIcon(): null {
-  return null;
-}
-
-function createLucideIcon(name: string, Lucide: LucideIcon): HostIcon {
-  function PluginLucideIcon({ size, color, strokeWidth }: HostIconProps) {
-    return createElement(Lucide, { size, color, strokeWidth });
-  }
-  PluginLucideIcon.displayName = `PluginLucideIcon(${name})`;
-  return PluginLucideIcon;
-}
-
-function lucideIconComponent(name: string): HostIcon {
-  const cached = lucideIconComponents.get(name);
-  if (cached) return cached;
-  const Lucide = findLucideIcon(name);
-  if (!Lucide) return MissingIcon;
-  const icon = createLucideIcon(name, Lucide);
-  lucideIconComponents.set(name, icon);
+export function resolvePluginIcon(name: string): LucideIcon {
+  const icon = findPluginIcon(name);
+  if (!icon) throw new Error(`Unknown Lucide icon: ${name}`);
  return icon;
 }

-function svgIconComponent(svg: string): HostIcon {
-  const cached = svgIconComponents.get(svg);
-  if (cached) return cached;
-  function PluginSvgIcon({ size, color }: PluginIconProps) {
-    return createElement(SvgIcon, { svg, size, color });
-  }
-  svgIconComponents.set(svg, PluginSvgIcon);
-  return PluginSvgIcon;
-}
-
-/**
- * A stable component for a registered icon, for surfaces that take an icon component. Lucide and
- * SVG icons draw from `size` and `color` only; a plugin component receives every prop.
- */
-export function pluginIconComponent<Props extends PluginIconProps>(
-  icon: PluginIcon<Props>,
-): ComponentType<Props> {
-  if (typeof icon === "string") return lucideIconComponent(icon);
-  if (isSvgIcon(icon)) return svgIconComponent(icon.svg);
-  return icon;
-}
-
-export interface PluginIconViewProps extends PluginIconProps {
-  icon: PluginIcon;
-}
-
-/** Draws a registered plugin icon. `color` tints Lucide icons and `currentColor` in SVG. */
-export function PluginIconView({ icon, size, color }: PluginIconViewProps): ReactElement {
-  return createElement(pluginIconComponent(icon), { size, color });
-}
-
-function isRenderable(icon: PluginIcon): boolean {
-  if (typeof icon === "string") return findLucideIcon(icon) !== null;
-  if (isSvgIcon(icon)) return findSvgIconProblem(icon.svg) === null;
-  return isComponent(icon);
-}
-
-/** The kit `Icon`. Plugin code passes it anything, so an unusable icon renders nothing. */
-export function Icon(props: IconProps): ReactElement | null {
-  const icon = props.icon === undefined ? props.name : props.icon;
-  if (!isRenderable(icon)) return null;
-  const size = props.size ?? 24;
-  const color = props.color ?? "currentColor";
-  return createElement(PluginIconView, { icon, size, color });
+export function Icon({ name, size, color }: PluginIconProps): ReactElement | null {
+  const icon = findPluginIcon(name);
+  return icon ? createElement(icon, { size, color }) : null;
 }
@@ -9,7 +9,6 @@ import type {
  PluginSidebarItemContribution,
  PluginSidebarSection,
 } from "./types";
-import type { PluginIcon } from "@getpaseo/plugin/client";

 export interface PluginSidebarTarget {
  plugin: InstalledPlugin;
@@ -37,7 +36,7 @@ export type PluginSidebarGroup =
  | (PluginSidebarGroupBase & { kind: "item"; targets: PluginSidebarTarget[] })
  | (PluginSidebarGroupBase & {
      kind: "legacy";
-      icon: PluginIcon;
+      icon: string;
      targets: PluginLegacySidebarTarget[];
    });

@@ -1,12 +1,16 @@
-import type { SidebarRowProps } from "@getpaseo/plugin/client/ui";
-import { useCallback, useEffect, useMemo, useRef } from "react";
+import type { SidebarIcon, SidebarRowProps } from "@getpaseo/plugin/client/ui";
+import { useCallback, useEffect, useRef } from "react";
 import { View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { SidebarHeaderRow } from "@/components/sidebar/sidebar-header-row";
 import { SidebarSeparator as AppSidebarSeparator } from "@/components/sidebar/sidebar-separator";
-import { parsePluginIcon, pluginIconComponent } from "../icons";
+import { resolvePluginIcon } from "../icons";
 import { useSidebarItemFrame } from "./frame";

+function resolveIcon(icon: SidebarIcon) {
+  return typeof icon === "string" ? resolvePluginIcon(icon) : icon;
+}
+
 /**
 * An item may render several rows. Any press inside a row, on the row or on its trailing content,
 * makes that row the popover anchor: the capture-phase responder check runs before the pressed
@@ -25,11 +29,6 @@ export function SidebarRow({ id, icon, label, onPress, active, trailing }: Sideb
    anchorTo(rowRef.current);
    return false;
  }, [anchorTo]);
-  // Rows get their icon at render, not registration, so an invalid icon throws to the item's boundary.
-  const iconComponent = useMemo(
-    () => (icon ? pluginIconComponent(parsePluginIcon("Sidebar row", icon)) : null),
-    [icon],
-  );
  // Keyboard activation skips the responder system, so the row's own press anchors as well.
  const handlePress = useCallback(() => {
    anchorTo(rowRef.current);
@@ -38,7 +37,7 @@ export function SidebarRow({ id, icon, label, onPress, active, trailing }: Sideb
  return (
    <View ref={rowRef} collapsable={false} onStartShouldSetResponderCapture={anchorHere}>
      <SidebarHeaderRow
-        icon={iconComponent}
+        icon={icon ? resolveIcon(icon) : null}
        label={label ?? frame.title}
        onPress={handlePress}
        isActive={active}
@@ -2,7 +2,7 @@ import { router, usePathname } from "expo-router";
 import { useCallback } from "react";
 import { SidebarHeaderRow } from "@/components/sidebar/sidebar-header-row";
 import { rememberPluginContributionHost } from "../contribution-host";
-import { pluginIconComponent } from "../icons";
+import { resolvePluginIcon } from "../icons";
 import { buildPluginSurfaceRoute, hostIdFromPathname } from "../routes";
 import { selectPluginSidebarTarget, type PluginSidebarGroup } from "../sidebar-groups";

@@ -33,7 +33,7 @@ export function LegacyPluginSidebarRow({
  }, [group.key, onBeforeNavigate, route, target.plugin.serverId]);
  return (
    <SidebarHeaderRow
-      icon={pluginIconComponent(group.icon)}
+      icon={resolvePluginIcon(group.icon)}
      label={group.title}
      onPress={navigate}
      isActive={isActive}
@@ -1,5 +1,5 @@
 import { router, useLocalSearchParams } from "expo-router";
-import type { PluginIcon, PluginScreenParams, PluginScreenProps } from "@getpaseo/plugin/client";
+import type { PluginScreenParams, PluginScreenProps } from "@getpaseo/plugin/client";
 import type { PluginTheme } from "@getpaseo/plugin";
 import { X } from "lucide-react-native";
 import { useCallback, useMemo, type ComponentType } from "react";
@@ -17,7 +17,7 @@ import { useHostRuntimeClient, useHosts } from "@/runtime/host-runtime";
 import type { Theme } from "@/styles/theme";
 import type { ShortcutKey } from "@/utils/format-shortcut";
 import { usePluginHostNavigation } from "./host-navigation";
-import { PluginIconView } from "./icons";
+import { resolvePluginIcon } from "./icons";
 import { toPluginTheme } from "./theme";
 import { useInstalledPlugin, usePluginInstallations } from "./registry";
 import { buildPluginSurfaceRoute, pluginScreenParamsFromRoute } from "./routes";
@@ -47,8 +47,14 @@ function routeParam(value: string | string[] | undefined): string {
  return typeof value === "string" ? value : "";
 }

-function PluginHeaderIcon({ icon, color = "" }: { icon: PluginIcon; color?: string }) {
-  return <PluginIconView icon={icon} size={16} color={color} />;
+function PluginHeaderIcon({
+  Icon,
+  color = "",
+}: {
+  Icon: ReturnType<typeof resolvePluginIcon>;
+  color?: string;
+}) {
+  return <Icon size={16} color={color} />;
 }

 const ThemedPluginHeaderIcon = withUnistyles(PluginHeaderIcon);
@@ -156,7 +162,7 @@ export function PluginSurfaceScreen() {
        : (sidebarItem?.title ?? (pluginId || "Plugin")),
    [params, pluginId, sidebarItem, surface],
  );
-  const icon = sidebarItem?.icon ?? null;
+  const Icon = sidebarItem ? resolvePluginIcon(sidebarItem.icon) : null;
  const close = useCallback(() => {
    if (router.canGoBack()) router.back();
    else router.replace(`/h/${encodeURIComponent(serverId)}`);
@@ -166,15 +172,15 @@ export function PluginSurfaceScreen() {
  const headerLeft = useMemo(
    () => (
      <>
-        {icon ? (
+        {Icon ? (
          <HeaderIconBadge>
-            <ThemedPluginHeaderIcon icon={icon} uniProps={mutedColorMapping} />
+            <ThemedPluginHeaderIcon Icon={Icon} uniProps={mutedColorMapping} />
          </HeaderIconBadge>
        ) : null}
        <ScreenTitle testID="plugin-surface-title">{title}</ScreenTitle>
      </>
    ),
-    [icon, title],
+    [Icon, title],
  );
  const hostFilter = useMemo(
    () =>
@@ -33,7 +33,7 @@ vi.mock("../client-runtime", () => ({
 }));
 vi.mock("../icons", () => ({
  Icon: () => null,
-  pluginIconComponent: () => () => null,
+  resolvePluginIcon: () => () => null,
 }));

 import { pluginRegistry } from "../registry";
@@ -17,7 +17,7 @@ import { normalizeWorkspaceOpaqueId } from "@/utils/workspace-identity";
 import { usePluginHostNavigation } from "../host-navigation";
 import { createPluginClientStateSource } from "../client-state/source";
 import { toPluginTheme } from "../theme";
-import { pluginIconComponent } from "../icons";
+import { resolvePluginIcon } from "../icons";
 import { useInstalledPlugin } from "../registry";
 import { PluginInstallationProvider } from "../installation-provider";
 import { SurfaceErrorBoundary } from "../surface-error-boundary";
@@ -144,7 +144,7 @@ function usePluginPanelDescriptor(
    subtitle: target.pluginId,
    tooltip: panel.title,
    titleState: "ready",
-    icon: pluginIconComponent(panel.icon),
+    icon: resolvePluginIcon(panel.icon),
    statusBucket: null,
  };
 }
@@ -10,7 +10,6 @@ import {
  clearWorkspaceArchivePending,
  markWorkspaceArchivePending,
 } from "@/contexts/session-workspace-upserts";
-import { useWorkspaceSetupStore } from "@/stores/workspace-setup-store";
 import { WorkspaceDirectoryReplica } from "./workspace-replica";

 function workspace(id: string, projectId = "project"): WorkspaceDescriptorPayload {
@@ -231,38 +230,3 @@ it("does not restore a targeted cached workspace while its archive is pending",
    store.clearSession(serverId);
  }
 });
-
-it("setup metadata from directory snapshots and transitions resets failure surfacing without details", () => {
-  const serverId = "setup-metadata";
-  useSessionStore.getState().initializeSession(serverId, null as unknown as DaemonClient);
-  const replica = new WorkspaceDirectoryReplica(serverId);
-  const identity = { serverId, workspaceId: "setup" };
-  const store = useWorkspaceSetupStore.getState();
-  replica.commitSnapshot(
-    {
-      workspaces: new Map([
-        ["setup", normalizeWorkspaceDescriptor({ ...workspace("setup"), setupStatus: "blocked" })],
-      ]),
-      projects: new Map(),
-    },
-    [],
-  );
-  expect(useSessionStore.getState().sessions[serverId].workspaces.get("setup")?.setupStatus).toBe(
-    "blocked",
-  );
-  expect(store.claimFailedSetupSurface({ ...identity, status: "blocked" })).toBe(true);
-  replica.applyDelta({
-    kind: "upsert",
-    workspace: { ...workspace("setup"), setupStatus: "running" },
-  });
-  replica.applyDelta({
-    kind: "upsert",
-    workspace: { ...workspace("setup"), setupStatus: "failed" },
-  });
-  expect(useSessionStore.getState().sessions[serverId].workspaces.get("setup")?.setupStatus).toBe(
-    "failed",
-  );
-  expect(store.claimFailedSetupSurface({ ...identity, status: "failed" })).toBe(true);
-  expect(store.claimFailedSetupSurface({ ...identity, status: "failed" })).toBe(false);
-  expect(useWorkspaceSetupStore.getState().snapshots).toEqual({});
-});
@@ -102,7 +102,6 @@ export class WorkspaceDirectoryReplica {
        workspaces.set(workspaceId, workspace);
      }
    }
-    for (const workspace of workspaces.values()) this.applySetupStatus(workspace);
    this.workspaces = workspaces;
    this.projects = new Map(snapshot.projects);
    this.rebuildProjectIndex();
@@ -199,16 +198,7 @@ export class WorkspaceDirectoryReplica {
    return [{ kind: "workspace", type: "upsert", id: workspace.id, value: workspace }];
  }

-  private applySetupStatus(workspace: WorkspaceDescriptor): void {
-    useWorkspaceSetupStore.getState().applySetupStatus({
-      serverId: this.serverId,
-      workspaceId: workspace.id,
-      status: workspace.setupStatus ?? null,
-    });
-  }
-
  private setWorkspace(workspace: WorkspaceDescriptor): void {
-    this.applySetupStatus(workspace);
    const previous = this.workspaces.get(workspace.id);
    if (previous?.projectId !== workspace.projectId) {
      this.workspaceIdsByProject.get(previous?.projectId ?? "")?.delete(workspace.id);
@@ -20,7 +20,6 @@ import {
  buildKeyboardShortcutHelpSections,
  getBindingIdForAction,
  normalizeCapturedShortcutCombo,
-  isShortcutCaptureComplete,
  getDefaultKeysForAction,
  resolveShortcutKeysForAction,
  type KeyboardShortcutHelpRow,
@@ -270,8 +269,6 @@ function ShortcutRow({

  const isBindable = bindingId !== null;
  const showDone = isCapturing && capturedCombos.length > 0;
-  const captureComplete =
-    bindingId !== null && isShortcutCaptureComplete(bindingId, capturedCombos);
  const showClear = displayChord !== null;
  // Reset restores the default, so it is only meaningful when there is a
  // default to restore. A binding that ships without one would otherwise show a
@@ -291,14 +288,11 @@ function ShortcutRow({
            capturedCombos={capturedCombos}
            heldModifiers={heldModifiers}
          />
-          {showDone && !captureComplete && (
-            <Text style={styles.capturingText}>{t("settings.shortcuts.captureIndexPrompt")}</Text>
-          )}
        </View>
        {isCapturing ? (
          <>
            {showDone && (
-              <Button variant="ghost" size="sm" disabled={!captureComplete} onPress={onDone}>
+              <Button variant="ghost" size="sm" onPress={onDone}>
                {t("settings.shortcuts.actions.done")}
              </Button>
            )}
@@ -363,10 +357,7 @@ export function KeyboardShortcutsSection() {
  );

  const saveCapture = useCallback(() => {
-    if (
-      capturingBindingId === null ||
-      !isShortcutCaptureComplete(capturingBindingId, capturedCombos)
-    ) {
+    if (capturingBindingId === null || capturedCombos.length === 0) {
      return;
    }
    void setOverride(capturingBindingId, capturedCombos.join(" "));
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, type ComponentType, type ReactElement } from "react";
+import { useCallback, useMemo, type ReactElement } from "react";
 import { Text, View } from "react-native";
 import { useTranslation } from "react-i18next";
 import type { TFunction } from "i18next";
@@ -26,7 +26,7 @@ import {
  type SidebarNavItem,
  type SidebarSection,
 } from "@/sidebar-nav/model";
-import { pluginIconComponent } from "@/plugins/icons";
+import { resolvePluginIcon } from "@/plugins/icons";
 import { useSidebarNavItems } from "@/sidebar-nav/use-sidebar-nav-items";
 import { settingsStyles } from "@/styles/settings";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
@@ -50,17 +50,15 @@ const BUILTIN_ICONS: Record<BuiltinSidebarItemId, LucideIcon> = {
 /** Plugin items register no icon, so they share this one; a legacy `addSidebarItem` keeps its own. */
 const PLUGIN_ICON = Blocks;

-type NavIconComponent = ComponentType<{ size: number; color: string }>;
-
-function NavIcon({ Icon, color = "" }: { Icon: NavIconComponent; color?: string }) {
+function NavIcon({ Icon, color = "" }: { Icon: LucideIcon; color?: string }) {
  return <Icon size={ICON_SIZE.md} color={color} />;
 }

 const ThemedNavIcon = withUnistyles(NavIcon);

-function navItemIcon(item: SidebarNavItem): NavIconComponent {
+function navItemIcon(item: SidebarNavItem): LucideIcon {
  if (item.kind === "builtin") return BUILTIN_ICONS[item.id];
-  return item.group.kind === "legacy" ? pluginIconComponent(item.group.icon) : PLUGIN_ICON;
+  return item.group.kind === "legacy" ? resolvePluginIcon(item.group.icon) : PLUGIN_ICON;
 }

 function navItemLabel(t: TFunction, item: SidebarNavItem): string {
@@ -1,4 +1,3 @@
-import { useHostFeature } from "@/runtime/host-features";
 import {
  AssistantFileLinkResolverProvider,
  createInlinePathOpener,
@@ -163,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";
@@ -224,10 +223,6 @@ const EMPTY_WORKSPACE_SCRIPTS: WorkspaceDescriptor["scripts"] = [];
 const EMPTY_PINNED_AGENT_IDS = new Set<string>();
 const EMPTY_SET = new Set<string>();

-function getWorkspaceSetupStatus(workspace: WorkspaceDescriptor | null | undefined) {
-  return workspace?.setupStatus ?? null;
-}
-
 function getWorkspaceScripts(
  workspaceDescriptor: WorkspaceDescriptor | null | undefined,
 ): WorkspaceDescriptor["scripts"] {
@@ -1153,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,
  );

@@ -1318,13 +1310,12 @@ function WorkspaceScreenContent({
  });
  const lastMainPaneId = lastMainPaneRef.current.paneId;
  const hasHydratedWorkspaceLayoutStore = useWorkspaceLayoutStoreHydrated();
-  const workspaceSetupStatus = getWorkspaceSetupStatus(workspaceDescriptor);
-  const claimFailedSetupSurface = useWorkspaceSetupStore((state) => state.claimFailedSetupSurface);
-  const supportsSetupObservation = useHostFeature(normalizedServerId, "workspaceSetupObservation");
-  const showWorkspaceSetup = shouldShowWorkspaceSetup(
-    workspaceSetupStatus,
-    supportsSetupObservation,
+  const workspaceSetupSnapshot = useWorkspaceSetupStore((state) =>
+    persistenceKey ? (state.snapshots[persistenceKey] ?? null) : null,
  );
+  const ensureWorkspaceSetupStatus = useWorkspaceSetupStore((state) => state.ensureSetupStatus);
+  const claimFailedSetupSurface = useWorkspaceSetupStore((state) => state.claimFailedSetupSurface);
+  const showWorkspaceSetup = shouldShowWorkspaceSetup(workspaceSetupSnapshot);
  const uiTabs = useMemo(
    () => (workspaceLayout ? collectAllTabs(workspaceLayout.root) : EMPTY_UI_TABS),
    [workspaceLayout],
@@ -1630,7 +1621,7 @@ function WorkspaceScreenContent({
    if (!persistenceKey) {
      return;
    }
-    if (!shouldSeedWorkspaceSetupTab(workspaceSetupStatus)) {
+    if (!shouldSeedWorkspaceSetupTab(workspaceSetupSnapshot)) {
      return;
    }

@@ -1645,7 +1636,6 @@ function WorkspaceScreenContent({
      !claimFailedSetupSurface({
        serverId: normalizedServerId,
        workspaceId: normalizedWorkspaceId,
-        status: workspaceSetupStatus,
      })
    ) {
      return;
@@ -1666,7 +1656,24 @@ function WorkspaceScreenContent({
    normalizedServerId,
    openWorkspaceTabInBackground,
    persistenceKey,
-    workspaceSetupStatus,
+    workspaceSetupSnapshot,
+  ]);
+
+  useEffect(() => {
+    if (!isRouteFocused || !client || !normalizedServerId || !normalizedWorkspaceId) {
+      return;
+    }
+    ensureWorkspaceSetupStatus({
+      serverId: normalizedServerId,
+      workspaceId: normalizedWorkspaceId,
+      client,
+    });
+  }, [
+    client,
+    ensureWorkspaceSetupStatus,
+    isRouteFocused,
+    normalizedServerId,
+    normalizedWorkspaceId,
  ]);

  const handleOpenFileFromChat = useCallback(
@@ -63,66 +63,3 @@ describe("createValidatedPersistStorage", () => {
    expect(backing.values.has("settings")).toBe(false);
  });
 });
-
-it("skips repeated immutable states only when requested", async () => {
-  let writes = 0;
-  const backing: StateStorage = {
-    getItem: () => null,
-    setItem: () => {
-      writes += 1;
-    },
-    removeItem: () => {},
-  };
-  const value = { state: { enabled: true }, version: 1 };
-  const regular = createValidatedPersistStorage(backing, StateSchema);
-  await regular.setItem("regular", value);
-  await regular.setItem("regular", value);
-  expect(writes).toBe(2);
-
-  const deduplicated = createValidatedPersistStorage(backing, StateSchema, { skipUnchanged: true });
-  await deduplicated.setItem("first", value);
-  await deduplicated.setItem("first", { ...value });
-  expect(writes).toBe(3);
-  await deduplicated.setItem("second", value);
-  expect(writes).toBe(4);
-  await deduplicated.setItem("first", { ...value, version: 2 });
-  expect(writes).toBe(5);
-});
-
-it("retries an unchanged state after a failed save", async () => {
-  let attempts = 0;
-  const backing = new MemoryStorage();
-  const storage = createValidatedPersistStorage(
-    {
-      getItem: (name) => backing.getItem(name),
-      setItem: (name, value) => {
-        attempts += 1;
-        if (attempts === 1) return Promise.reject(new Error("storage unavailable"));
-        backing.setItem(name, value);
-      },
-      removeItem: (name) => backing.removeItem(name),
-    },
-    StateSchema,
-    { skipUnchanged: true },
-  );
-  const value = { state: { enabled: true }, version: 1 };
-  await expect(storage.setItem("layout", value)).rejects.toThrow("storage unavailable");
-  await storage.setItem("layout", value);
-  expect(attempts).toBe(2);
-  expect(backing.getItem("layout")).toBe(JSON.stringify(value));
-});
-
-it("saves the same state again after removal or rehydration clears invalid storage", async () => {
-  const backing = new MemoryStorage();
-  const storage = createValidatedPersistStorage(backing, StateSchema, { skipUnchanged: true });
-  const value = { state: { enabled: true }, version: 1 };
-  await storage.setItem("layout", value);
-  await storage.removeItem("layout");
-  await storage.setItem("layout", value);
-  expect(backing.getItem("layout")).toBe(JSON.stringify(value));
-
-  backing.values.set("layout", "{");
-  await expect(storage.getItem("layout")).resolves.toBeNull();
-  await storage.setItem("layout", value);
-  expect(backing.getItem("layout")).toBe(JSON.stringify(value));
-});
@@ -1,22 +1,17 @@
 import { z } from "zod";
-import type { PersistStorage, StateStorage, StorageValue } from "zustand/middleware";
+import type { PersistStorage, StateStorage } from "zustand/middleware";

 export function createValidatedPersistStorage<State>(
  backingStorage: StateStorage,
  stateSchema: z.ZodType<State>,
-  // Opt in only when callers preserve state references until values change.
-  options: { skipUnchanged?: boolean } = {},
 ): PersistStorage<State> {
  const envelopeSchema = z.strictObject({
    state: stateSchema,
    version: z.number().int().nonnegative().optional(),
  });

-  const accepted = new Map<string, StorageValue<State>>();
-
  return {
    getItem: async (name) => {
-      accepted.delete(name);
      const raw = await backingStorage.getItem(name);
      if (raw === null) return null;

@@ -36,31 +31,13 @@ export function createValidatedPersistStorage<State>(
      return result.data;
    },
    setItem: async (name, value) => {
-      const previous = accepted.get(name);
-      if (
-        options.skipUnchanged &&
-        previous &&
-        previous.state === value.state &&
-        previous.version === value.version
-      )
-        return;
      const result = envelopeSchema.safeParse(value);
      if (!result.success) {
-        accepted.delete(name);
        await backingStorage.removeItem(name);
        return;
      }
-      if (options.skipUnchanged) accepted.set(name, value);
-      try {
-        await backingStorage.setItem(name, JSON.stringify(result.data));
-      } catch (error) {
-        if (accepted.get(name) === value) accepted.delete(name);
-        throw error;
-      }
-    },
-    removeItem: (name) => {
-      accepted.delete(name);
-      return backingStorage.removeItem(name);
+      await backingStorage.setItem(name, JSON.stringify(result.data));
    },
+    removeItem: (name) => backingStorage.removeItem(name),
  };
 }
@@ -111,7 +111,6 @@ export interface WorkspaceDescriptor {
  projectRootPath: string;
  workspaceDirectory: string;
  worktreeSlug?: WorkspaceDescriptorPayload["worktreeSlug"];
-  setupStatus?: WorkspaceDescriptorPayload["setupStatus"];
  projectKind: WorkspaceDescriptorPayload["projectKind"];
  workspaceKind: WorkspaceDescriptorPayload["workspaceKind"];
  background?: boolean;
@@ -150,8 +149,6 @@ export function normalizeWorkspaceDescriptor(
    // usable directory" (older daemons may omit it; the wire field is optional).
    workspaceDirectory: normalizeWorkspacePath(payload.workspaceDirectory) ?? "",
    worktreeSlug: payload.worktreeSlug,
-    // COMPAT(workspaceSetupObservation): added in v0.12.0, old hosts omit metadata; remove after 2027-04-19.
-    setupStatus: payload.setupStatus ?? null,
    projectKind: payload.projectKind,
    workspaceKind: payload.workspaceKind,
    background: payload.background ?? false,
--- a/Show More
+++ b/Show More