test(server): reproduce ACP restart after failed process termination

Refs #3256 and #7472. A real ACP subprocess remains alive when the injected termination dependency returns kill-timeout. The following prompt starts a second live subprocess, violating exclusive runtime ownership. This regression test intentionally fails on the inspected contributor commit.

Co-authored-by: Ouyang Xingyuan <galaxyroaming@qq.com>

.github/workflows/ci.yml

@@ -93,6 +93,10 @@ 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

.oxlintrc.json

@@ -5,6 +5,7 @@
   },
   "ignorePatterns": [".dev/**"],
   "plugins": ["react", "react-perf", "unicorn", "typescript", "oxc", "import", "promise"],
+  "jsPlugins": ["./scripts/oxlint/paseo-plugin.mjs"],
   "categories": {
     "correctness": "error",
     "suspicious": "error",
@@ -356,6 +357,117 @@
         "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": {

CHANGELOG.md

@@ -1,8 +1,8 @@
 # Changelog
 
-## 0.12.0-beta.3 - 2026-10-18
+## 0.12.0 - 2026-10-19
 
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and close to 100 fixes.
+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
 
@@ -29,9 +29,10 @@ 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))
+- 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))
 - 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))
@@ -46,6 +47,7 @@ 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
 
@@ -59,6 +61,8 @@ 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))
@@ -68,6 +72,7 @@ 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))
@@ -99,9 +104,13 @@ 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 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 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 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))
@@ -158,7 +167,10 @@ 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
 

docs/agent-lifecycle.md

@@ -50,6 +50,15 @@ older cancellation from settling a newer turn. If interruption is rejected or ti
 keeps its active foreground turn and replacement, reload, rewind, and Stop report the failure.
 Accepting new work after an ambiguous interruption would create a split-brain session.
 
+A forced settlement leaves two owners of "is a turn running": the manager has settled the run, while
+the provider session still holds the turn slot it never confirmed ending. `AgentSession.abandonForegroundTurn`
+is the optional seam for that case. The manager calls it after force-canceling, and only then. A
+provider that implements it must make the session usable again, not just clear a local flag: the ACP
+adapter kills the process that owned the turn and drops the slot, and its next `startTurn` resumes the
+durable session in a new process. Clearing the slot while reusing a runtime that may still be working
+would be the split-brain shape this section forbids. Providers that omit the hook keep today's
+behavior, and a rejected release is logged without undoing the settlement.
+
 ## Relationships
 
 Agents can launch other agents via the agent-scoped `create_agent` MCP tool. Agent-scoped creation is always asynchronous and always stamps `paseo.parent-agent-id`, pointing back at the caller. Omit `workspaceId` to use the caller's workspace, or pass an existing workspace ID returned by `create_workspace`. Placement never changes parentage.

docs/design.md

@@ -20,7 +20,7 @@ A semantic element used in three or more places is a primitive. One of a kind is
 
 Primitives live in `packages/app/src/components/ui/` and `packages/app/src/components/headers/`. Card and row layout live in `packages/app/src/styles/settings.ts`. Section structure lives in `packages/app/src/screens/settings/settings-section.tsx`.
 
-A pressable styled to look like a button is wrong; the button is `<Button>` (`packages/app/src/components/ui/button.tsx`). A 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 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.
 
 Before adding a new component, read `components/ui/`. The primitive usually exists.
 
@@ -249,6 +249,7 @@ 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.

docs/plugins.md

@@ -240,8 +240,9 @@ 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` resolves a Lucide name using the client's installed icon
-set; an unknown name renders nothing so it cannot break the plugin surface.
+`@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.
 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).
@@ -332,7 +333,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, Lucide icon validation, close action, theme DTO, layout facts,
+Paseo owns the route, screen header, 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
@@ -400,6 +401,25 @@ 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
@@ -491,15 +511,13 @@ 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 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.
+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.
 
 ## 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 sanitized 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 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.
 

docs/protocol-compatibility.md

@@ -74,6 +74,14 @@ 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:

docs/providers.md

@@ -95,7 +95,7 @@ Use OpenCode v2 execution events to trigger turn completion, with active-state a
 
 V2.0.4 also removed the activation endpoint that gated a cold location, and a cold location registers its config-derived commands, skills, and providers asynchronously. Wait until `plugin.list` returns a populated inventory before reading the catalog or commands; an empty inventory means the location is still warming. Fail when the readiness deadline expires, including when an inventory request stalls.
 
-Paseo installs its OpenCode tool bridge through `OPENCODE_CONFIG_CONTENT`. V1 accepts a plugin file; v2 silently skips configured files and requires a package directory with a server entry point. Both versions use the daemon's private loopback bridge for caller-scoped tools. Bridge context lives only in daemon memory and is removed when the Paseo session closes. The content-addressed plugin artifacts contain no session data or secrets. V2 also needs this plugin when native Paseo tools are disabled: its prompt API has no structured-output format, so the plugin supplies a schema-validated final-answer tool.
+Paseo installs its OpenCode tool bridge through `OPENCODE_CONFIG_CONTENT`. V1 accepts a plugin file; v2 silently skips configured files and requires a package directory with a server entry point. Both versions use the daemon's private loopback bridge for caller-scoped tools. The global manifest must use agent-scoped schemas before a session is bound, because every bridge call executes in an agent session. Bridge context lives only in daemon memory and is removed when the Paseo session closes. The content-addressed plugin artifacts contain no session data or secrets. V2 also needs this plugin when native Paseo tools are disabled: its prompt API has no structured-output format, so the plugin supplies a schema-validated final-answer tool.
 
 An agent with custom environment variables or user-configured MCP servers gets a dedicated OpenCode server. V2 supports session environment, but its MCP configuration remains location-scoped, so separate servers still prevent one agent from changing another agent's MCP setup. Configure custom MCP with `mcp.add`; do not follow it with `mcp.connect`, which only toggles config-backed servers.
 

fastlane/metadata/android/en-US/changelogs/120001.txt

@@ -0,0 +1,8 @@
+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

fastlane/metadata/android/en-US/changelogs/120002.txt

@@ -0,0 +1,8 @@
+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

fastlane/metadata/android/en-US/changelogs/120003.txt

@@ -0,0 +1,8 @@
+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

fastlane/metadata/android/en-US/changelogs/120004.txt

@@ -0,0 +1,8 @@
+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

flake.nix

@@ -45,6 +45,21 @@
         }
       );
 
+      checks = forAllSystems (
+        system:
+        let
+          pkgs = pkgsFor system;
+          packages = self.packages.${system};
+          license = (builtins.fromJSON (builtins.readFile ./package.json)).license;
+        in
+        {
+          license-metadata =
+            assert packages.paseo.meta.license.spdxId == license;
+            assert packages.desktop.meta.license.spdxId == license;
+            pkgs.runCommand "paseo-license-metadata" { } "touch $out";
+        }
+      );
+
       nixosModules.default = self.nixosModules.paseo;
       nixosModules.paseo =
         { pkgs, lib, ... }:

nix/desktop-package.nix

@@ -257,7 +257,7 @@ buildNpmPackage {
   meta = {
     description = "Paseo desktop app (Electron wrapper)";
     homepage = "https://github.com/getpaseo/paseo";
-    license = lib.licenses.agpl3Plus;
+    license = lib.licenses.asl20;
     mainProgram = "paseo-desktop";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };

nix/npm-deps.hash

@@ -1 +1 @@
-sha256-tSE4nb4E06GFZ8I9UEbo93nlPiAKtW00nkywgKQmMhI=
+sha256-ObBdUmNSW+vDjzA7EbCDfZrB0nYDmcWmWe+UCoTMh/M=

nix/package.nix

@@ -148,7 +148,7 @@ buildNpmPackage rec {
   meta = {
     description = "Self-hosted daemon for Claude Code, Codex, and OpenCode";
     homepage = "https://github.com/getpaseo/paseo";
-    license = lib.licenses.agpl3Plus;
+    license = lib.licenses.asl20;
     mainProgram = "paseo";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.12.0-beta.3",
+  "version": "0.12.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.12.0-beta.3",
+      "version": "0.12.0",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -36349,7 +36349,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.12.0-beta.3",
+      "version": "0.12.0",
       "dependencies": {
         "@codemirror/commands": "6.10.4",
         "@codemirror/language": "6.12.4",
@@ -37469,12 +37469,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.12.0-beta.3",
+      "version": "0.12.0",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.12.0-beta.3",
-        "@getpaseo/protocol": "0.12.0-beta.3",
-        "@getpaseo/server": "0.12.0-beta.3",
+        "@getpaseo/client": "0.12.0",
+        "@getpaseo/protocol": "0.12.0",
+        "@getpaseo/server": "0.12.0",
         "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-beta.3",
+      "version": "0.12.0",
       "dependencies": {
-        "@getpaseo/protocol": "0.12.0-beta.3",
-        "@getpaseo/relay": "0.12.0-beta.3",
+        "@getpaseo/protocol": "0.12.0",
+        "@getpaseo/relay": "0.12.0",
         "zod": "^4.4.3"
       },
       "devDependencies": {
@@ -37735,7 +37735,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.12.0-beta.3",
+      "version": "0.12.0",
       "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-beta.3",
+      "version": "0.12.0",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -38875,7 +38875,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.12.0-beta.3",
+      "version": "0.12.0",
       "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-beta.3",
+      "version": "0.12.0",
       "dependencies": {
         "@agentclientprotocol/sdk": "^1.4.0",
         "use-sync-external-store": "^1.6.0"
       },
       "devDependencies": {
-        "@getpaseo/client": "0.12.0-beta.3",
-        "@getpaseo/protocol": "0.12.0-beta.3",
+        "@getpaseo/client": "0.12.0",
+        "@getpaseo/protocol": "0.12.0",
         "@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-beta.3",
-        "@getpaseo/protocol": "0.12.0-beta.3",
+        "@getpaseo/client": "0.12.0",
+        "@getpaseo/protocol": "0.12.0",
         "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-beta.3",
+      "version": "0.12.0",
       "dependencies": {
         "semver": "^7.8.5",
         "zod": "^4.4.3"
@@ -38971,7 +38971,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.12.0-beta.3",
+      "version": "0.12.0",
       "dependencies": {
         "base64-js": "^1.5.1",
         "tweetnacl": "^1.0.3",
@@ -39189,16 +39189,16 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.12.0-beta.3",
+      "version": "0.12.0",
       "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-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",
+        "@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",
         "@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-beta.3",
+      "version": "0.12.0",
       "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-beta.3",
+      "version": "0.12.0",
       "dependencies": {
         "@getpaseo/plugin": "*",
         "zod": "^4.4.3"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.12.0-beta.3",
+  "version": "0.12.0",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [

packages/app/e2e/browser/compact-git-actions-menu.spec.ts

@@ -0,0 +1,115 @@
+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",
+  ]);
+});

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

@@ -1,6 +1,7 @@
 import { expect, test, type Page } from "../support/fixtures";
 import {
   blurComposerInput,
+  roundTripComposerTabBeforePaint,
   composerLocator,
   enterComposerFullscreen,
   exitComposerFullscreen,
@@ -17,7 +18,6 @@ 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,19 +205,21 @@ test.describe("touch screen wide enough for the desktop layout", () => {
         title: "Second touch chat",
       });
       await openWorkspaceWithAgents(page, [first, second]);
-      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");
+      // 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`);
+      }
     } finally {
       await workspace.cleanup();
     }

packages/app/e2e/browser/context-window-meter.spec.ts

@@ -149,7 +149,7 @@ for (const layout of [
           await expect(details.getByText(/tokens$/)).toHaveCount(0);
           const account = usageCard(details, "login-journey:account");
           await expect(account.getByText("Session", { exact: true })).toBeVisible();
-          await expect(account.getByText("31%", { exact: true })).toBeVisible();
+          await expect(account.getByText("31% used", { exact: true })).toBeVisible();
           await qaScreenshot(page, `context-without-data-${layout.name}`);
           await layout.close(page);
         });
@@ -161,7 +161,7 @@ for (const layout of [
           await expect(details.getByText("32k / 128k tokens", { exact: true })).toBeVisible();
           await expect(details.getByText("No context data", { exact: true })).toHaveCount(0);
           await expect(
-            usageCard(details, "login-journey:account").getByText("31%", { exact: true }),
+            usageCard(details, "login-journey:account").getByText("31% used", { exact: true }),
           ).toBeVisible();
         });
       } finally {

packages/app/e2e/browser/plugin-icons.spec.ts

@@ -0,0 +1,138 @@
+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 });
+      }
+    }
+  });
+});

packages/app/e2e/browser/provider-catalog-icons.spec.ts

@@ -0,0 +1,51 @@
+import { ACP_PROVIDER_ICON_SVGS } from "../../src/assets/acp-provider-icons";
+import { expect, test, type Page } from "../support/fixtures";
+import type { TestInfo } from "@playwright/test";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { getServerId } from "../support/helpers/server-id";
+import {
+  findAcpCatalogProvider,
+  openAddProviderArea,
+  openSettingsHost,
+  openSettingsHostSection,
+} from "../support/helpers/settings";
+
+async function openProviderCatalog(page: Page) {
+  await gotoAppShell(page);
+  await openSettings(page);
+  await openSettingsHost(page, getServerId());
+  await openSettingsHostSection(page, getServerId(), "providers");
+  await openAddProviderArea(page);
+}
+
+async function expectProviderArtwork(
+  page: Page,
+  testInfo: TestInfo,
+  id: "devin" | "hermes" | "kiro",
+  name: string,
+) {
+  await findAcpCatalogProvider(page, name);
+  // Catalog tiles have no semantic role; scope artwork to the named provider's tile.
+  const icon = page.getByTestId(`provider-catalog-tile-${id}`).locator("svg").first();
+  await expect(icon).toBeVisible();
+  // Provider artwork is 24px; the generic PackagePlus fallback is 20px.
+  await expect.soft(icon).toHaveAttribute("width", "24");
+  const expectedPaths = await page.evaluate((xml) => {
+    const document = new DOMParser().parseFromString(xml, "image/svg+xml");
+    return Array.from(document.querySelectorAll("path"), (path) => path.getAttribute("d")!);
+  }, ACP_PROVIDER_ICON_SVGS[id]);
+  await expect(icon.locator("path")).toHaveCount(expectedPaths.length);
+  for (const [index, path] of expectedPaths.entries()) {
+    await expect(icon.locator("path").nth(index)).toHaveAttribute("d", path);
+  }
+  await page.screenshot({ path: testInfo.outputPath(`${id}-catalog.png`) });
+}
+
+test("#7087: the provider catalog shows Devin, Hermes, and Kiro artwork", async ({
+  page,
+}, testInfo) => {
+  await openProviderCatalog(page);
+  await expectProviderArtwork(page, testInfo, "devin", "Devin CLI");
+  await expectProviderArtwork(page, testInfo, "hermes", "Hermes");
+  await expectProviderArtwork(page, testInfo, "kiro", "Kiro CLI");
+});

packages/app/e2e/browser/tool-call-overview-sheet.spec.ts

@@ -266,14 +266,22 @@ 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();
 
-    await group.click();
-    await expect(page.getByTestId("tool-call-group-sheet")).toHaveCount(0);
+    // Keep streaming layout changes out of the pointer-down/pointer-up interval.
+    const header = group.getByRole("button").first();
+    await header.click();
     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();
   }

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

@@ -4,9 +4,10 @@ import path from "node:path";
 import type { Page } from "@playwright/test";
 import type { UsageReportEntry } from "@getpaseo/protocol/messages";
 import { expect, test } from "../support/fixtures";
-import { gotoAppShell } from "../support/helpers/app";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
 import { addConnectedHostAndReload } from "../support/helpers/hosts";
 import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
+import { openSettingsSection } from "../support/helpers/settings";
 import { getServerId } from "../support/helpers/server-id";
 import { seedSidebarFooterPreferences } from "../support/helpers/sidebar-nav-settings";
 import {
@@ -131,7 +132,7 @@ async function refreshUsageAndWaitForReports(page: Page, usage: UsageReportsFixt
   await refreshAllUsage(page);
   await usage.waitForListRequests(requestCount + 1);
   const group = page.getByTestId(`usage-host-${getServerId()}`);
-  await expect(group.getByText("41%", { exact: true })).toBeVisible();
+  await expect(group.getByText("41% used", { exact: true })).toBeVisible();
   await expect(page.getByRole("button", { name: "Refresh all", exact: true })).toBeEnabled();
 }
 
@@ -178,7 +179,7 @@ test.describe("usage modal", () => {
     await expect(group.getByText("Alpha plan", { exact: true })).toBeVisible({ timeout: 10_000 });
     await expect(hostFilter(page)).toHaveCount(0);
     await qaScreenshot(page, "usage-modal-one-host");
-    await expect(group.getByText("31%")).toBeVisible();
+    await expect(group.getByText("31% used")).toBeVisible();
     await expect(group.getByText("Beta plan", { exact: true })).toBeVisible();
     await expect(group.getByText("Unavailable", { exact: true })).toBeVisible();
 
@@ -240,15 +241,15 @@ test.describe("usage modal", () => {
     await gotoAppShell(page);
     await openUsageFromItem(page);
     const group = page.getByTestId(`usage-host-${serverId}`);
-    await expect(group.getByText("31%")).toBeVisible({ timeout: 10_000 });
+    await expect(group.getByText("31% used")).toBeVisible({ timeout: 10_000 });
 
     const alphaRefresh = group.getByTestId("usage-refresh").first();
     await alphaRefresh.click();
     await expect
       .poll(() => forcedRefreshes(usage))
       .toEqual([{ forceRefresh: true, reportIds: ["alpha:a"] }]);
-    await expect(group.getByText("58%")).toBeVisible();
-    await expect(group.getByText("12%")).toBeVisible();
+    await expect(group.getByText("58% used")).toBeVisible();
+    await expect(group.getByText("12% used")).toBeVisible();
 
     await group.getByTestId("usage-refresh").nth(1).hover();
     await expect(page.getByTestId("usage-freshness-tooltip")).toHaveText("Updated 2h ago");
@@ -332,7 +333,7 @@ test.describe("usage modal", () => {
       await hostFilter(page).click();
       await page.getByTestId(`usage-host-filter-item-${secondary.serverId}`).click();
       await expect(
-        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12%"),
+        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12% used"),
       ).toBeVisible({ timeout: 30_000 });
       await expect(hostFilter(page)).toContainText("Secondary box");
       await qaScreenshot(page, "usage-modal-picked-host");
@@ -347,7 +348,7 @@ test.describe("usage modal", () => {
       await expectPinnedUsage(page, ["12% Weekly"]);
       await openUsageFromItem(page);
       await expect(
-        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12%"),
+        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12% used"),
       ).toBeVisible({ timeout: 30_000 });
     } finally {
       await secondary.close().catch(() => undefined);
@@ -513,7 +514,7 @@ for (const theme of ["light", "dark"] as const) {
       await expect(screen.getByText("69% left")).toBeVisible();
       await showUsageAs(page, "used");
       await expect(pinRow(screen, "Claude", "Session")).toHaveAccessibleName(
-        /^Pin Claude Session, 31% · resets /,
+        /^Pin Claude Session, 31% used · resets /,
       );
       await openUsageOptions(page);
       await closeUsageOptions(page);
@@ -576,7 +577,7 @@ test("an account with all logins failing shows each harness and remedy, then onl
       },
     ]);
     await refreshLoginUsage(page);
-    await expectLoginUsageOnly(page, "42%");
+    await expectLoginUsageOnly(page, "42% used");
   } finally {
     await fixture.cleanup();
   }
@@ -599,6 +600,7 @@ for (const compact of [false, true]) {
   }) => {
     const fixture = await installLoginUsage({ status: "error", error: "Initial failure" });
     try {
+      await page.clock.install();
       await page.setViewportSize(
         compact ? { width: 390, height: 844 } : { width: 1440, height: 900 },
       );
@@ -615,7 +617,8 @@ for (const compact of [false, true]) {
       // Move only the browser clock; real daemon fetches continue using the host clock.
       await page.clock.setFixedTime(new Date(Date.now() + 3_900_000));
       await refreshLoginUsage(page);
-      await expectLoginUsageOnly(page, "42%");
+      await expectLoginUsageOnly(page, "42% used");
+      await advanceUsageClock(page, 60_000);
       await expectLoginUsageFreshness(page, "Updated 1h ago", compact);
 
       await fixture.setReport({ status: "error", error: "Rate limited" });
@@ -640,8 +643,9 @@ for (const compact of [false, true]) {
       });
       await page.clock.setFixedTime(new Date(Date.now() + 150_000));
       await refreshLoginUsage(page);
-      await expectLoginUsageOnly(page, "43%");
-      await expect(page.getByText("42%", { exact: true })).toHaveCount(0);
+      await expectLoginUsageOnly(page, "43% used");
+      await advanceUsageClock(page, 60_000);
+      await expect(page.getByText("42% used", { exact: true })).toHaveCount(0);
       await expectLoginUsageFreshness(page, "Updated 2m ago", compact);
     } finally {
       await fixture.cleanup();
@@ -651,7 +655,88 @@ for (const compact of [false, true]) {
 
 async function expectRetainedLoginUsage(page: Page, message: string) {
   const card = page.getByTestId("usage-report-login-journey:account");
-  await expect(card.getByText(/^42%(?:$| ·)/)).toBeVisible();
+  await expect(card.getByText(/^42% used(?:$| ·)/)).toBeVisible();
   await expect(card.getByTestId("usage-login-error")).toHaveText(message);
   await expect(card.getByText("Reset time passed", { exact: false })).toBeVisible();
 }
+
+async function switchToJapanese(page: Page) {
+  await page.getByRole("button", { name: "Close", exact: true }).click();
+  await openSettings(page);
+  await openSettingsSection(page, "general");
+  await page.getByRole("button", { name: "System", exact: true }).click();
+  await page.getByRole("menuitem", { name: "日本語 - Japanese", exact: true }).click();
+  await page.getByRole("button", { name: "戻る", exact: true }).click();
+}
+
+async function openJapaneseUsage(page: Page) {
+  await page.getByRole("button", { name: "使用状況", exact: true }).click();
+  await expect(page.getByTestId("usage-modal").first()).toBeVisible();
+}
+
+test("usage percentages state their meaning and follow the selected language", async ({ page }) => {
+  test.setTimeout(120_000);
+  const login = await installLoginUsage({
+    status: "available",
+    windows: [{ id: "session", label: "Session", usedPct: 70, summary: true }],
+  });
+  try {
+    await gotoAppShell(page);
+    await openUsageFromIcon(page);
+    await expect(page.getByText("70% used", { exact: true })).toBeVisible();
+    await switchToJapanese(page);
+    await expect(usageItem(page)).toHaveAccessibleName(/Claude セッション 70% 使用済み/);
+    await openJapaneseUsage(page);
+    await expect(page.getByText("70% 使用済み", { exact: true })).toBeVisible();
+    await expect(page.getByRole("button", { name: "すべて更新", exact: true })).toBeVisible();
+    await page.getByRole("button", { name: "設定", exact: true }).last().click();
+    await expect(page.getByText("割合", { exact: true })).toBeVisible();
+    await expect(page.getByText("使用済み", { exact: true })).toBeVisible();
+    await expect(page.getByText("残り", { exact: true })).toBeVisible();
+  } finally {
+    await login.cleanup();
+  }
+});
+
+test("open usage clocks advance without refreshing or reopening", async ({ page }) => {
+  test.setTimeout(120_000);
+  const now = new Date();
+  const reset = new Date(now.getTime() + 30.5 * 60_000).toISOString();
+  const login = await installLoginUsage({
+    status: "available",
+    windows: [
+      { id: "session", label: "Session", usedPct: 42, resetsAt: reset },
+      { id: "weekly", label: "Weekly", usedPct: 80, runsOutAt: reset, shortfallPct: 10 },
+    ],
+    balances: [{ id: "credits", label: "Credits", unit: "usd", remaining: 12, resetsAt: reset }],
+  });
+  try {
+    await openCompactUsageWithClock(page, now);
+    const card = page.getByTestId("usage-report-login-journey:account");
+    await expect(card.getByTestId("usage-freshness")).toHaveText("Updated just now");
+    await expect(card.getByText("resets 30m", { exact: false }).first()).toBeVisible();
+    // The shared minute clock is wall-aligned, and the daemon timestamps use real time.
+    // After two browser minutes the latest displayed tick is one or two minutes old.
+    await advanceUsageClock(page, 120_000);
+    await expect(card.getByTestId("usage-freshness")).toHaveText(/^Updated [12]m ago$/);
+    await expect(card.getByText(/resets (28|29)m/).first()).toBeVisible();
+    await expect(card.getByText(/runs out (28|29)m/)).toBeVisible();
+    await expect(card.getByTestId("provider-usage-balance-credits-reset")).toHaveText(
+      /^resets (28|29)m$/,
+    );
+  } finally {
+    await login.cleanup();
+  }
+});
+
+async function openCompactUsageWithClock(page: Page, now: Date) {
+  await page.setViewportSize({ width: 390, height: 844 });
+  await page.clock.install({ time: now });
+  await gotoAppShell(page);
+  await openCompactSidebar(page);
+  await openUsageFromIcon(page);
+}
+
+async function advanceUsageClock(page: Page, milliseconds: number) {
+  await page.clock.fastForward(milliseconds);
+}

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

@@ -93,7 +93,7 @@ test.describe("usage settings", () => {
     await expect(card.getByText("Alpha plan", { exact: true })).toBeVisible({ timeout: 10_000 });
     await expect(card.getByText("dev@example.com", { exact: true })).toBeVisible();
     await expect(card.getByText("Beta plan", { exact: true })).toBeVisible();
-    await expect(card.getByText("70%")).toBeVisible();
+    await expect(card.getByText("70% used")).toBeVisible();
     await expect(card.getByText("1,234 left", { exact: true })).toBeVisible();
     await expect(card.getByText("$5.00 / $20.00", { exact: true })).toBeVisible();
     await expect(card.getByText("2026-12-31", { exact: true })).toBeVisible();
@@ -131,11 +131,11 @@ test.describe("usage settings", () => {
     await openSettings(page);
     await openSettingsHostSection(page, serverId, "usage");
     const card = page.getByTestId("usage-card");
-    await expect(card.getByText("23%")).toBeVisible({ timeout: 10_000 });
+    await expect(card.getByText("23% used")).toBeVisible({ timeout: 10_000 });
 
     await refreshAllUsage(page);
     await expect.poll(() => forcedRefreshCount(usage)).toBe(1);
-    await expect(card.getByText("64%")).toBeVisible();
+    await expect(card.getByText("64% used")).toBeVisible();
   });
 
   test("asks to update a host without usage support and never calls it", async ({ page }) => {

packages/app/e2e/browser/workspace-setup-streaming.spec.ts

@@ -28,6 +28,7 @@ import {
   closeWorkspaceScriptsMenu,
   seedProjectForWorkspaceSetup,
   waitForWorkspaceSetupProgress,
+  observeSetupPanelTraffic,
 } from "../support/helpers/workspace-setup";
 
 interface WorkspaceScriptStarter {
@@ -116,6 +117,45 @@ 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-", {

packages/app/e2e/mobile/agent-device/native-terminal-word-selection.android.ad

@@ -0,0 +1,19 @@
+# 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

packages/app/e2e/mobile/appearance-keyboard/android.mjs

@@ -0,0 +1,145 @@
+// 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");
+}

packages/app/e2e/mobile/composer-overlay/README.md

@@ -0,0 +1,47 @@
+# Late composer pill clearance
+
+This regression opens a completed conversation, relaunches the Android app, and
+registers a composer pill five seconds after the client plugin loads. It checks
+that the completed turn's Copy and Fork buttons remain fully above the pill.
+The daemon, plugin API, native app, layout, and accessibility bounds are real;
+no provider calls are needed during the test.
+
+Prerequisites:
+
+- Build the server and app dependencies with `npm run build:server` and
+  `npm run build --workspace=@getpaseo/expo-two-way-audio`.
+- Run an isolated development daemon on a non-default port.
+- Run this checkout's Metro server and open the connected Android dev client
+  with `agent-device`. The app must already know the isolated daemon.
+- Open a completed conversation on a compact portrait Android emulator, at the
+  latest turn, with no other composer tracks visible. Keep the software keyboard
+  closed. Note the workspace and agent IDs from the daemon.
+
+Set `WORKSPACE_ID` and `AGENT_ID` to that conversation, then run from the
+repository root, substituting the session and ports:
+
+```sh
+PASEO_OVERLAY_ARTIFACTS_DIR=.dev/composer-overlay-evidence \
+  node packages/app/e2e/mobile/composer-overlay/android.mjs \
+  composer-overlay ws://127.0.0.1:6843/ws "$WORKSPACE_ID" "$AGENT_ID" sh.paseo.debug 8193
+```
+
+The runner installs and removes its delayed plugin and leaves the conversation
+intact. It preserves the daemon's previous plugins-enabled setting. The evidence directory
+contains the cold-reopen screenshot and raw accessibility snapshot. Without an
+explicit directory, temporary evidence is removed with the fixture.
+
+To check an existing capture independently:
+
+```sh
+node packages/app/e2e/mobile/composer-overlay/assert-footer-clear.mjs \
+  .dev/composer-overlay-evidence/cold-reopen.json 'Overlay regression pill'
+```
+
+On the failing baseline, the Copy button extends below the pill's top edge. With
+the correction, both actions are clear before the composer receives focus.
+
+Additional checks on the same conversation: opening the keyboard keeps the footer
+clear; after scrolling up, a newly registered pill must not jump back to the latest
+turn. Native iOS uses a different keyboard implementation and needs its own device
+verification.

packages/app/e2e/mobile/composer-overlay/android.mjs

@@ -0,0 +1,95 @@
+// Start on a completed conversation in the connected Android dev client.
+// node android.mjs <session> <daemon-ws-url> <workspace-id> <agent-id> [app-id] [metro-port]
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { WebSocket } from "ws";
+import { DaemonClient } from "../../../../client/dist/daemon-client.js";
+
+const [, , session, daemonUrl, workspaceId, agentId, appId = "sh.paseo.debug", metroPort = "8081"] =
+  process.argv;
+assert(
+  session && daemonUrl && workspaceId && agentId,
+  "Pass a session, isolated daemon URL, workspace ID, and agent ID",
+);
+const url = new URL(daemonUrl);
+assert(["127.0.0.1", "localhost"].includes(url.hostname), "Use an isolated loopback daemon");
+assert(!["", "6767", "6768"].includes(url.port), "Do not use the installed or development daemon");
+const directory = await mkdtemp(path.join(tmpdir(), "paseo-composer-overlay-"));
+const artifacts = process.env.PASEO_OVERLAY_ARTIFACTS_DIR ?? path.join(directory, "evidence");
+await mkdir(artifacts, { recursive: true });
+const pluginId = "composer-overlay-mobile-repro";
+const pillLabel = "Overlay regression pill";
+const client = new DaemonClient({
+  url: daemonUrl,
+  clientId: "composer-overlay-mobile-regression",
+  clientType: "cli",
+  appVersion: JSON.parse(await readFile(new URL("../../../package.json", import.meta.url))).version,
+  webSocketFactory: (address, options) => new WebSocket(address, options),
+});
+function ad(...args) {
+  return execFileSync("agent-device", [...args, "--session", session], {
+    encoding: "utf8",
+    timeout: 90_000,
+  });
+}
+let installed = false;
+let previousConfig;
+try {
+  ad("wait", 'label="Copy turn"', "20000");
+  await client.connect();
+  previousConfig = (await client.getDaemonConfig()).config;
+  await client.patchDaemonConfig({ pluginsEnabled: true });
+  await writeFile(
+    path.join(directory, "paseo-plugin.json"),
+    JSON.stringify({
+      id: pluginId,
+      requirements: { paseo: ">=0.11.4" },
+    }),
+  );
+  await writeFile(
+    path.join(directory, "index.client.tsx"),
+    `export default function contribute(client) {
+    let pill;
+    const timer = setTimeout(() => {
+      pill = client.addComposerPill({
+        id: "late-pill", workspaceId: ${JSON.stringify(workspaceId)}, agentId: ${JSON.stringify(agentId)},
+        button: { title: ${JSON.stringify(pillLabel)}, icon: "Clock", behavior: { kind: "action", onPress() {} } },
+      });
+    }, 5000);
+    return () => { clearTimeout(timer); pill?.remove(); };
+  }`,
+  );
+  await client.installDirectoryPlugin(directory);
+  installed = true;
+  ad("wait", `label="${pillLabel}"`, "20000");
+  // Match the report: reopen a completed conversation, then let the plugin register late.
+  ad(
+    "open",
+    appId,
+    "--platform",
+    "android",
+    "--metro-port",
+    metroPort,
+    "--no-test-ime",
+    "--relaunch",
+  );
+  ad("wait", `label="${pillLabel}"`, "20000");
+  const capture = path.join(artifacts, "cold-reopen.json");
+  await writeFile(capture, ad("snapshot", "--raw", "--json"));
+  ad("screenshot", path.join(artifacts, "cold-reopen.png"));
+  execFileSync(
+    process.execPath,
+    [fileURLToPath(new URL("./assert-footer-clear.mjs", import.meta.url)), capture, pillLabel],
+    { stdio: "inherit" },
+  );
+} finally {
+  if (installed) await client.removePlugin(pluginId);
+  if (previousConfig)
+    await client.patchDaemonConfig({ pluginsEnabled: previousConfig.pluginsEnabled });
+  await client.close();
+  await rm(directory, { recursive: true, force: true });
+}

packages/app/e2e/mobile/composer-overlay/assert-footer-clear.mjs

@@ -0,0 +1,21 @@
+// Assert geometry from a fresh agent-device snapshot --raw --json capture.
+// node assert-footer-clear.mjs <snapshot.json> <composer-pill-label>
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+
+const [, , snapshotPath, pillLabel] = process.argv;
+assert(snapshotPath && pillLabel, "Pass a snapshot JSON path and composer pill label");
+const { data } = JSON.parse(readFileSync(snapshotPath, "utf8"));
+const buttons = data.nodes.filter((node) => node.type === "android.widget.Button");
+const pill = buttons.find((node) => node.label === pillLabel);
+assert(pill?.rect, `Composer pill '${pillLabel}' must be visible`);
+for (const label of ["Copy turn", "Fork chat from here"]) {
+  const button = buttons.find((node) => node.label === label);
+  assert(button?.rect, `Completed-turn action '${label}' must be visible`);
+  const bottom = button.rect.y + button.rect.height;
+  assert(
+    bottom <= pill.rect.y,
+    `${label} ends at ${bottom}, below composer pill top ${pill.rect.y}`,
+  );
+}
+console.log("PASS: completed-turn actions remain fully above the composer pill");

packages/app/e2e/mobile/status-ring/README.md

@@ -0,0 +1,45 @@
+# Native retained status-ring regression
+
+This runs the production native ring and clock inside real retained panels with
+Reanimated on Android. A probe consumes the same public rotation hook and counts
+UI-runtime value changes. No Reanimated mocks or provider processes are used.
+
+Use an Android development client compatible with the checkout's native dependencies.
+In a disposable checkout, temporarily replace `packages/app/index.ts` with:
+
+```tsx
+import "./src/polyfills/install-early";
+import "./src/styles/unistyles";
+import { registerRootComponent } from "expo";
+import NativeRingRegression from "./e2e/mobile/status-ring/native";
+registerRootComponent(NativeRingRegression);
+```
+
+Start Metro in `packages/app`:
+
+```sh
+APP_VARIANT=development npx expo start --localhost --port 8096
+```
+
+With one Android emulator running, open that bundle:
+
+```sh
+agent-device open sh.paseo.debug 'exp+voice-mobile://expo-development-client/?url=http%3A%2F%2F10.0.2.2%3A8096' --platform android --session status-ring --metro-port 8096
+```
+
+From the repository root:
+
+```sh
+node packages/app/e2e/mobile/status-ring/android.mjs status-ring http://127.0.0.1:8096
+```
+
+The test checks visible rotation, hidden-panel inactivity while another ring is
+visible, inactivity with both panels hidden, and synchronized resumption. Each
+sample reads counters on the UI runtime; elapsed time includes device-command
+latency. The baseline fails at the first hidden-panel assertion.
+
+Restore the original `packages/app/index.ts`, close the agent-device session,
+and stop Metro afterward. The fixture substitutes running rings for a live agent
+and toggles retained panels directly; it does not exercise workspace navigation
+or measure whole-app CPU usage. It is excluded from routine unit tests because
+it requires a native runtime.

packages/app/e2e/mobile/status-ring/android.mjs

@@ -0,0 +1,71 @@
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { setTimeout as delay } from "node:timers/promises";
+
+const [, , session, metroUrl] = process.argv;
+assert(session && metroUrl, "Pass an agent-device session and Metro URL serving native.tsx");
+function ad(...args) {
+  return execFileSync("agent-device", ["--session", session, ...args], {
+    encoding: "utf8",
+    timeout: 60_000,
+  });
+}
+function evaluate(expression) {
+  const value = ad("cdp", "runtime", "eval", "--expr", expression, "--json").trim();
+  return value === "undefined" ? undefined : JSON.parse(value);
+}
+let target;
+const deadline = Date.now() + 30_000;
+do {
+  target = ad("cdp", "target", "list", "--url", metroUrl)
+    .split("\n")
+    .find((line) => line.includes("sh.paseo.debug"));
+  if (!target) await delay(250);
+} while (!target && Date.now() < deadline);
+assert(target, "Open the Android dev client on this Metro bundle first");
+ad("cdp", "target", "select", target.split(/\s+/)[0]);
+let ready = false;
+do {
+  ready = evaluate("Object.keys(globalThis.__ringReaders ?? {}).length === 2");
+  if (!ready) await delay(250);
+} while (!ready && Date.now() < deadline);
+assert(ready, "The two native probes must mount before sampling");
+async function sample() {
+  evaluate("Object.values(globalThis.__ringReaders).forEach(read => read())");
+  await delay(100);
+  return JSON.parse(evaluate("JSON.stringify(globalThis.__ringSamples)"));
+}
+async function observe(label) {
+  const before = await sample();
+  await delay(600);
+  const after = await sample();
+  const deltas = Object.fromEntries(
+    Object.keys(before).map((key) => [key, after[key].updates - before[key].updates]),
+  );
+  console.log(JSON.stringify({ label, deltas, after }));
+  return { deltas, after };
+}
+const visible = await observe("both visible");
+assert(visible.deltas.first > 0 && visible.deltas.second > 0);
+assert.equal(visible.after.first.rotation, visible.after.second.rotation);
+ad("press", 'label="HIDE FIRST"');
+await delay(200);
+const hidden = await observe("first hidden, second visible");
+assert.equal(hidden.deltas.first, 0, "A retained hidden ring must stop UI-thread rotation updates");
+assert(hidden.deltas.second > 0, "Visible rings must continue rotating");
+ad("press", 'label="HIDE SECOND"');
+await delay(200);
+const allHidden = await observe("both hidden");
+assert.equal(allHidden.deltas.first, 0);
+assert.equal(allHidden.deltas.second, 0);
+ad("press", 'label="SHOW FIRST"');
+ad("press", 'label="SHOW SECOND"');
+await delay(200);
+const restored = await observe("both shown again");
+assert(restored.deltas.first > 0 && restored.deltas.second > 0);
+assert.equal(
+  restored.after.first.rotation,
+  restored.after.second.rotation,
+  "Restored rings must share the current phase",
+);
+console.log("PASS native retained-ring lifecycle");

packages/app/e2e/mobile/status-ring/native.tsx

@@ -0,0 +1,69 @@
+import { useCallback, useLayoutEffect, useState } from "react";
+import { Button, Text, View } from "react-native";
+import { useAnimatedReaction, useSharedValue } from "react-native-reanimated";
+import { scheduleOnRN, scheduleOnUI } from "react-native-worklets";
+import { RetainedPanel } from "@/components/retained-panel";
+import { useStatusRingRotation } from "@/components/status-ring/clock";
+import { StatusRing } from "@/components/status-ring";
+
+interface Sample {
+  updates: number;
+  rotation: number;
+}
+
+declare global {
+  var __ringSamples: Record<string, Sample>;
+  var __ringReaders: Record<string, () => void>;
+}
+
+function recordSample(name: string, value: { updates: number; rotation: number }) {
+  globalThis.__ringSamples[name] = value;
+}
+
+function Probe({ name }: { name: string }) {
+  const rotation = useStatusRingRotation();
+  const updates = useSharedValue(0);
+  useAnimatedReaction(
+    () => rotation.value,
+    () => {
+      updates.value += 1;
+    },
+  );
+  // Read the real UI runtime, without scheduling a continuous JS observer.
+  useLayoutEffect(() => {
+    globalThis.__ringSamples ??= {};
+    globalThis.__ringReaders ??= {};
+    globalThis.__ringReaders[name] = () =>
+      scheduleOnUI(() => {
+        "worklet";
+        const sample = { updates: updates.value, rotation: rotation.value };
+        scheduleOnRN(recordSample, name, sample);
+      });
+    return () => {
+      delete globalThis.__ringReaders[name];
+    };
+  }, [name, rotation, updates]);
+  return <StatusRing />;
+}
+
+const containerStyle = { flex: 1, padding: 60, backgroundColor: "white" };
+
+export default function NativeRingRegression() {
+  const [first, setFirst] = useState(true);
+  const [second, setSecond] = useState(true);
+  const toggleFirst = useCallback(() => setFirst((value) => !value), []);
+  const toggleSecond = useCallback(() => setSecond((value) => !value), []);
+  return (
+    <View style={containerStyle}>
+      <Text>Native retained status rings</Text>
+      <Button title={first ? "Hide first" : "Show first"} onPress={toggleFirst} />
+      <Button title={second ? "Hide second" : "Show second"} onPress={toggleSecond} />
+      <RetainedPanel active={first}>
+        <Probe name="first" />
+      </RetainedPanel>
+      <RetainedPanel active={second}>
+        <Probe name="second" />
+      </RetainedPanel>
+    </View>
+  );
+}

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

@@ -501,3 +501,59 @@ 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);
+}

packages/app/e2e/support/helpers/daemon-client-loader.ts

@@ -24,6 +24,7 @@ interface E2EDaemonClientConfig {
   clientType: "cli";
   appVersion?: string;
   webSocketFactory?: NodeWebSocketFactory;
+  capabilities?: Record<string, unknown>;
 }
 
 function resolveDaemonWsUrl(port?: number): string {
@@ -34,6 +35,7 @@ export interface ConnectDaemonClientOptions {
   clientIdPrefix: string;
   appVersion?: string;
   port?: number;
+  capabilities?: Record<string, unknown>;
 }
 
 /**
@@ -51,6 +53,7 @@ export async function connectDaemonClient<ClientInstance extends { connect(): Pr
     clientType: "cli",
     appVersion: options.appVersion ?? loadAppVersion(),
     webSocketFactory: createNodeWebSocketFactory(),
+    capabilities: options.capabilities,
   });
   await client.connect();
   return client;

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

@@ -35,6 +35,8 @@ 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 {
@@ -326,3 +328,51 @@ 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);
+    },
+  };
+}

packages/app/modules/paseo-diff-prototype/android/build.gradle

@@ -12,6 +12,7 @@ useDefaultAndroidSdkVersions()
 def skiaPackage = new File(["node", "--print", "require.resolve('@shopify/react-native-skia/package.json')"].execute(null, projectDir).text.trim()).parentFile
 
 android {
+  ndkVersion rootProject.ext.ndkVersion
   namespace "sh.paseo.diffprototype"
   defaultConfig {
     externalNativeBuild {

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.12.0-beta.3",
+  "version": "0.12.0",
   "private": true,
   "main": "index.ts",
   "scripts": {

packages/app/scripts/verify-android-ndk.gradle

@@ -0,0 +1,22 @@
+// After Expo prebuild, run from packages/app/android:
+// ./gradlew --init-script ../scripts/verify-android-ndk.gradle verifyAndroidNdk
+gradle.projectsEvaluated {
+    rootProject.tasks.register('verifyAndroidNdk') {
+        doLast {
+            def expected = rootProject.ext.ndkVersion
+            def nativeProjects = rootProject.subprojects.findAll { subproject ->
+                def android = subproject.extensions.findByName('android')
+                android != null && (android.externalNativeBuild.cmake.path != null ||
+                    android.externalNativeBuild.ndkBuild.path != null)
+            }
+            assert !nativeProjects.empty : 'No native Android modules found'
+            println "Project NDK: ${expected}"
+            def mismatches = nativeProjects.findAll { subproject ->
+                def actual = subproject.android.ndkVersion
+                println "${subproject.path} NDK: ${actual}"
+                actual != expected
+            }
+            assert mismatches.empty : "Native Android modules must use project NDK ${expected}: ${mismatches*.path}"
+        }
+    }
+}

packages/app/src/agent-stream/view.tsx

@@ -1252,6 +1252,12 @@ function agentStreamViewPropsEqual(
   if (left.isAuthoritativeHistoryReady !== right.isAuthoritativeHistoryReady) {
     reasons.push("isAuthoritativeHistoryReady");
   }
+  if (left.bottomOverlayTailClearance !== right.bottomOverlayTailClearance) {
+    reasons.push("bottomOverlayTailClearance");
+  }
+  if (left.bottomOverlayControlClearance !== right.bottomOverlayControlClearance) {
+    reasons.push("bottomOverlayControlClearance");
+  }
   if (left.toast !== right.toast) reasons.push("toast");
   if (left.onOpenWorkspaceFile !== right.onOpenWorkspaceFile) reasons.push("onOpenWorkspaceFile");
   if (left.readOnly !== right.readOnly) reasons.push("readOnly");

packages/app/src/assets/acp-provider-icons/devin.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
+  <path d="M2.033 9.867l2.554 1.483a.589.589 0 00.592 0l2.554-1.483.01-.008a.608.608 0 00.11-.084l.013-.015a.631.631 0 00.076-.1c.003-.005.008-.01.01-.016a.558.558 0 00.052-.125l.007-.028a.611.611 0 00.019-.14V7.868c0-.572.307-1.105.8-1.392a1.595 1.595 0 011.598 0l1.277.742a.54.54 0 00.129.053l.028.01c.044.01.088.015.133.016h.006l.013-.002a.587.587 0 00.27-.074l.011-.004 2.554-1.483a.596.596 0 00.297-.516V2.253a.595.595 0 00-.297-.516L12.293.257a.587.587 0 00-.591 0L9.148 1.737l-.01.01a.609.609 0 00-.109.083l-.014.015a.632.632 0 00-.076.1c-.003.005-.008.01-.01.016a.57.57 0 00-.052.124l-.007.028a.612.612 0 00-.018.14v1.483c0 .572-.307 1.105-.8 1.393a1.597 1.597 0 01-1.599 0l-1.276-.742a.603.603 0 00-.13-.053l-.028-.008a.658.658 0 00-.133-.018h-.02a.57.57 0 00-.269.074c-.003.002-.008.002-.012.005L2.033 5.872a.596.596 0 00-.297.515v2.966c0 .213.113.41.297.515z" fill="currentColor"></path><path d="M15.943 10.607a1.596 1.596 0 011.599 0l1.276.74c.041.025.085.04.13.055l.028.008c.043.01.088.016.133.018h.005c.005 0 .01-.002.014-.003a.474.474 0 00.122-.016l.021-.005a.616.616 0 00.126-.052c.004-.002.009-.002.013-.005l2.554-1.482a.597.597 0 00.297-.516V6.383a.596.596 0 00-.297-.515l-2.552-1.483a.587.587 0 00-.592 0l-2.553 1.482-.011.008a.61.61 0 00-.108.084l-.014.016a.637.637 0 00-.076.1c-.003.005-.008.01-.01.016a.57.57 0 00-.052.124l-.007.029a.612.612 0 00-.018.14v1.482c0 .572-.307 1.105-.8 1.393a1.597 1.597 0 01-1.599 0l-1.276-.742a.584.584 0 00-.13-.053l-.028-.008a.62.62 0 00-.133-.018h-.02a.587.587 0 00-.269.074l-.012.004L9.15 10a.596.596 0 00-.296.516v2.966c0 .212.112.409.296.515l2.554 1.483s.008.002.012.005c.04.022.082.04.126.052l.02.004a.57.57 0 00.123.017l.014.002h.006c.054 0 .108-.01.16-.025a.587.587 0 00.13-.054l1.277-.741a1.597 1.597 0 012.398 1.392v1.482c0 .049.007.095.019.14l.007.028a.619.619 0 00.051.125c.004.006.008.01.01.016a.6.6 0 00.076.1l.014.015c.033.032.069.06.108.084.004.002.006.006.011.008l2.554 1.483a.59.59 0 00.593 0l2.554-1.483a.597.597 0 00.296-.516v-2.965a.595.595 0 00-.296-.516l-2.554-1.483s-.008-.002-.012-.005a.54.54 0 00-.126-.051c-.007-.003-.013-.003-.02-.005a.635.635 0 00-.125-.017h-.018a.557.557 0 00-.16.026.588.588 0 00-.13.053l-1.276.742a1.595 1.595 0 01-1.598 0 1.615 1.615 0 010-2.785l-.005-.001z" fill="currentColor"></path><path d="M14.848 18.265l-2.554-1.482-.012-.005a.526.526 0 00-.126-.052c-.007-.002-.014-.002-.02-.005a.64.64 0 00-.124-.017h-.02a.56.56 0 00-.16.026.588.588 0 00-.13.053l-1.276.742a1.594 1.594 0 01-1.598 0c-.493-.286-.8-.82-.8-1.393V14.65a.563.563 0 00-.018-.14l-.008-.028a.604.604 0 00-.051-.124l-.01-.017a.603.603 0 00-.076-.1l-.014-.015a.596.596 0 00-.109-.084c-.003-.002-.005-.006-.01-.008L5.178 12.65a.587.587 0 00-.591 0l-2.554 1.483a.596.596 0 00-.297.516v2.965c0 .213.113.41.297.516l2.554 1.483.012.004a.618.618 0 00.267.074l.016.002h.007a.55.55 0 00.16-.026.584.584 0 00.129-.053l1.277-.742a1.597 1.597 0 012.398 1.393v1.482c0 .05.007.095.019.14l.007.028c.013.044.03.085.051.125l.01.016c.022.036.047.07.076.1l.014.015c.032.032.069.06.109.084l.01.008 2.554 1.483a.587.587 0 00.593 0l2.554-1.483a.596.596 0 00.296-.515v-2.966a.596.596 0 00-.296-.516h-.002z" fill="currentColor"></path>
+</svg>

packages/app/src/assets/acp-provider-icons/grok.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 1024 1024" fill="none">
+  <path fill="currentColor" d="M395.479 633.828L735.91 381.105C752.599 368.715 776.454 373.548 784.406 392.792C826.26 494.285 807.561 616.253 724.288 699.996C641.016 783.739 525.151 802.104 419.247 760.277L303.556 814.143C469.49 928.202 670.987 899.995 796.901 773.282C896.776 672.843 927.708 535.937 898.785 412.476L899.047 412.739C857.105 231.37 909.358 158.874 1016.4 10.6326C1018.93 7.11771 1021.47 3.60279 1024 0L883.144 141.651V141.212L395.392 633.916"/>
+  <path fill="currentColor" d="M325.226 695.251C206.128 580.84 226.662 403.776 328.285 301.668C403.431 226.097 526.549 195.254 634.026 240.596L749.454 186.994C728.657 171.88 702.007 155.623 671.424 144.2C533.19 86.9942 367.693 115.465 255.323 228.382C147.234 337.081 113.244 504.215 171.613 646.833C215.216 753.423 143.739 828.818 71.7385 904.916C46.2237 931.893 20.6216 958.87 0 987.429L325.139 695.339"/>
+</svg>

packages/app/src/assets/acp-provider-icons/kiro.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M18.8 0H5.2A5.2 5.2 0 000 5.2v13.6A5.2 5.2 0 005.2 24h13.6a5.2 5.2 0 005.2-5.2V5.2A5.2 5.2 0 0018.8 0z" fill="#9046FF" /> <path d="M7.97 16.376c-1.644 3.642 1.86 4.556 4.443 2.424.76 2.39 3.608.607 4.631-1.247 2.251-4.084 1.342-8.249 1.108-9.108-1.6-5.859-9.6-5.869-10.976.03-.323 1.033-.328 2.206-.507 3.423-.09.617-.16 1.009-.393 1.655-.139.373-.323.7-.62 1.257-.458.865-.264 2.53 2.101 1.665l.224-.1h-.01l-.001.001z" fill="#fff" /> <path d="M12.722 10.985c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.218-.97a.61.61 0 01.537-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005zm2.703 0c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.219-.97a.61.61 0 01.536-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005z" fill="#000" /></svg>

packages/app/src/assets/acp-provider-icons/minimax-code.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
+  <path d="M16.278 2c1.156 0 2.093.927 2.093 2.07v12.501a.74.74 0 00.744.709.74.74 0 00.743-.709V9.099a2.06 2.06 0 012.071-2.049A2.06 2.06 0 0124 9.1v6.561a.649.649 0 01-.652.645.649.649 0 01-.653-.645V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v7.472a2.037 2.037 0 01-2.048 2.026 2.037 2.037 0 01-2.048-2.026v-12.5a.785.785 0 00-.788-.753.785.785 0 00-.789.752l-.001 15.904A2.037 2.037 0 0113.441 22a2.037 2.037 0 01-2.048-2.026V18.04c0-.356.292-.645.652-.645.36 0 .652.289.652.645v1.934c0 .263.142.506.372.638.23.131.514.131.744 0a.734.734 0 00.372-.638V4.07c0-1.143.937-2.07 2.093-2.07zm-5.674 0c1.156 0 2.093.927 2.093 2.07v11.523a.648.648 0 01-.652.645.648.648 0 01-.652-.645V4.07a.785.785 0 00-.789-.78.785.785 0 00-.789.78v14.013a2.06 2.06 0 01-2.07 2.048 2.06 2.06 0 01-2.071-2.048V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v3.8a2.06 2.06 0 01-2.071 2.049A2.06 2.06 0 010 12.9v-1.378c0-.357.292-.646.652-.646.36 0 .653.29.653.646V12.9c0 .418.343.757.766.757s.766-.339.766-.757V9.099a2.06 2.06 0 012.07-2.048 2.06 2.06 0 012.071 2.048v8.984c0 .419.343.758.767.758.423 0 .766-.339.766-.758V4.07c0-1.143.937-2.07 2.093-2.07z" fill="currentColor" fill-rule="nonzero"></path>
+</svg>

packages/app/src/assets/acp-provider-icons/traecli.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
+  <path d="M24 20.541H3.428v-3.426H0V3.4h24V20.54zM3.428 17.115h17.144V6.827H3.428v10.288zm8.573-5.196l-2.425 2.424-2.424-2.424 2.424-2.424 2.425 2.424zm6.857-.001l-2.424 2.423-2.425-2.423 2.425-2.425 2.424 2.425z" fill="currentColor"></path>
+</svg>

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

@@ -1,4 +1,4 @@
-import type { GitAction, GitActions } from "@/git/policy";
+import { actionsWithoutPrimary, type GitAction, type GitActions } from "@/git/policy";
 import type { KeyboardActionDefinition } from "@/keyboard/keyboard-action-dispatcher";
 import type {
   WorkspacePanelPlacement,
@@ -581,9 +581,7 @@ export function buildWorkspaceCommandCenterContributions(
     ...(source.capabilities.canSplitPanes ? buildPaneContributions(source) : []),
   ];
 
-  const primary = source.gitActions.primary;
-  for (const [index, action] of source.gitActions.secondary.entries()) {
-    if (action.id === primary?.id) continue;
+  for (const [index, action] of actionsWithoutPrimary(source.gitActions).entries()) {
     contributions.push(buildGitContribution(source, action, 100 + index, "query"));
   }
 

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

@@ -41,7 +41,7 @@ import {
   findPaneById,
   useWorkspaceLayoutStore,
 } from "@/stores/workspace-layout-store";
-import { shouldShowWorkspaceSetup, useWorkspaceSetupStore } from "@/stores/workspace-setup-store";
+import { shouldShowWorkspaceSetup } from "@/stores/workspace-setup-store";
 import { clearCommandCenterFocusRestoreElement } from "@/utils/command-center-focus-restore";
 import { getShortcutOs } from "@/utils/shortcut-platform";
 import {
@@ -188,6 +188,7 @@ 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);
@@ -195,12 +196,10 @@ export function useWorkspaceCommandCenterActions(): void {
   const isPinned = fields?.pinnedAt != null;
   const isCompact = useIsCompactFormFactor();
   const canPin = useHostFeature(serverId, "workspacePinning");
-  const persistenceKey =
-    serverId && fields
-      ? buildWorkspaceTabPersistenceKey({ serverId, workspaceId: fields.id })
-      : null;
-  const canShowSetup = useWorkspaceSetupStore((state) =>
-    shouldShowWorkspaceSetup(persistenceKey ? (state.snapshots[persistenceKey] ?? null) : null),
+  const supportsSetupObservation = useHostFeature(serverId, "workspaceSetupObservation");
+  const canShowSetup = shouldShowWorkspaceSetup(
+    fields?.setupStatus ?? null,
+    supportsSetupObservation,
   );
   const { overrides } = useKeyboardShortcutOverrides();
   const { gitActions, isGit } = useGitActions({

packages/app/src/components/add-host-modal.tsx

@@ -11,10 +11,7 @@ import {
   serializeConnectionUri,
   serializeConnectionUriForStorage,
 } from "@/utils/daemon-endpoints";
-import {
-  DaemonConnectionTestError,
-  getConnectionAuthFailureReason,
-} from "@/utils/test-daemon-connection";
+import { buildConnectionFailureCopy } from "./connection-failure-copy";
 import { AdaptiveModalSheet, AdaptiveTextInput, type SheetHeader } from "./adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import { PairingTargetTracker } from "./pair-link-credentials";
@@ -195,92 +192,6 @@ function draftFromConnectionUri(uri: string): DirectConnectionDraft {
   };
 }
 
-function normalizeTransportMessage(message: string | null | undefined): string | null {
-  if (!message) return null;
-  const trimmed = message.trim();
-  if (!trimmed) return null;
-  return trimmed;
-}
-
-function formatTechnicalTransportDetails(
-  details: (string | null)[],
-  labels: DirectConnectionLabels,
-): string | null {
-  const unique = Array.from(
-    new Set(
-      details
-        .map((value) => normalizeTransportMessage(value))
-        .filter((value): value is string => Boolean(value))
-        .map((value) => value.trim())
-        .filter((value) => value.length > 0),
-    ),
-  );
-
-  if (unique.length === 0) return null;
-
-  const allGeneric = unique.every((value) => {
-    const lower = value.toLowerCase();
-    return lower === "transport error" || lower === "transport closed";
-  });
-
-  if (allGeneric) {
-    return labels.noAdditionalDetails(unique[0] ?? "");
-  }
-
-  return unique.join(" — ");
-}
-
-function buildConnectionFailureCopy(input: {
-  endpoint: string;
-  error: unknown;
-  labels: DirectConnectionLabels;
-}): { title: string; detail: string | null; raw: string | null } {
-  const { endpoint, error, labels } = input;
-  const title = labels.failedToConnect(endpoint);
-
-  const raw = (() => {
-    if (error instanceof DaemonConnectionTestError) {
-      return (
-        formatTechnicalTransportDetails([error.reason, error.lastError], labels) ??
-        normalizeTransportMessage(error.message)
-      );
-    }
-    if (error instanceof Error) {
-      return normalizeTransportMessage(error.message);
-    }
-    return null;
-  })();
-
-  const rawLower = raw?.toLowerCase() ?? "";
-  let detail: string | null = null;
-
-  if (getConnectionAuthFailureReason(error)) {
-    detail = error instanceof Error ? error.message : raw;
-  } else if (rawLower.includes("timed out")) {
-    detail = labels.timedOut;
-  } else if (
-    rawLower.includes("econnrefused") ||
-    rawLower.includes("connection refused") ||
-    rawLower.includes("err_connection_refused")
-  ) {
-    detail = labels.refused;
-  } else if (rawLower.includes("enotfound") || rawLower.includes("not found")) {
-    detail = labels.hostNotFound;
-  } else if (rawLower.includes("ehostunreach") || rawLower.includes("host is unreachable")) {
-    detail = labels.hostUnreachable;
-  } else if (
-    rawLower.includes("certificate") ||
-    rawLower.includes("tls") ||
-    rawLower.includes("ssl")
-  ) {
-    detail = labels.tlsError;
-  } else {
-    detail = labels.unableToConnect;
-  }
-
-  return { title, detail, raw };
-}
-
 export interface AddHostModalProps {
   visible: boolean;
   onClose: () => void;

packages/app/src/components/connection-failure-copy.test.ts

@@ -0,0 +1,69 @@
+import { describe, expect, it } from "vitest";
+import { DaemonConnectionTestError } from "@/utils/test-daemon-connection";
+import { buildConnectionFailureCopy } from "./connection-failure-copy";
+
+const labels = {
+  hostRequired: "host required",
+  invalidPort: "invalid port",
+  invalidConnection: "invalid connection",
+  failedToConnect: (endpoint: string) => `Failed: ${endpoint}`,
+  noAdditionalDetails: (detail: string) => `No details: ${detail}`,
+  timedOut: "timeout",
+  refused: "refused",
+  hostNotFound: "DNS failure",
+  hostUnreachable: "unreachable",
+  tlsError: "TLS failure",
+  unableToConnect: "connection failure",
+};
+
+function failure(message: string) {
+  return buildConnectionFailureCopy({
+    endpoint: "tcp://example.test:443?ssl=true",
+    error: new DaemonConnectionTestError(message, {
+      reason: "transport error",
+      lastError: message,
+    }),
+    labels,
+  });
+}
+
+describe("direct connection failure copy", () => {
+  it("identifies Android certificate validation errors without calling them DNS failures", () => {
+    const message =
+      "java.security.cert.CertPathValidatorException: Trust anchor for certification path not found.";
+    expect(failure(message)).toEqual({
+      title: "Failed: tcp://example.test:443?ssl=true",
+      detail: labels.tlsError,
+      raw: `transport error — ${message}`,
+    });
+  });
+
+  it.each([
+    ["certificate not found", labels.tlsError],
+    ["SSL handshake failed", labels.tlsError],
+    ["TLS handshake failed", labels.tlsError],
+    ["getaddrinfo ENOTFOUND example.test", labels.hostNotFound],
+    ["Host not found", labels.hostNotFound],
+    ["connect ECONNREFUSED", labels.refused],
+    ["connection timed out", labels.timedOut],
+    ["EHOSTUNREACH", labels.hostUnreachable],
+    ["unexpected transport failure", labels.unableToConnect],
+  ])("classifies %s", (message, expected) => {
+    expect(failure(message).detail).toBe(expected);
+  });
+
+  it("preserves authentication failures and their technical details", () => {
+    const message = "Invalid daemon password";
+    expect(
+      buildConnectionFailureCopy({
+        endpoint: "example.test:6767",
+        error: new DaemonConnectionTestError(message, {
+          reason: message,
+          lastError: message,
+          authFailureReason: "incorrect_password",
+        }),
+        labels,
+      }),
+    ).toMatchObject({ detail: message, raw: message });
+  });
+});

packages/app/src/components/connection-failure-copy.ts

@@ -0,0 +1,103 @@
+import {
+  DaemonConnectionTestError,
+  getConnectionAuthFailureReason,
+} from "@/utils/test-daemon-connection";
+
+interface ConnectionFailureLabels {
+  failedToConnect: (endpoint: string) => string;
+  noAdditionalDetails: (detail: string) => string;
+  timedOut: string;
+  refused: string;
+  hostNotFound: string;
+  hostUnreachable: string;
+  tlsError: string;
+  unableToConnect: string;
+}
+
+function normalizeTransportMessage(message: string | null | undefined): string | null {
+  if (!message) return null;
+  const trimmed = message.trim();
+  if (!trimmed) return null;
+  return trimmed;
+}
+
+function formatTechnicalTransportDetails(
+  details: (string | null)[],
+  labels: ConnectionFailureLabels,
+): string | null {
+  const unique = Array.from(
+    new Set(
+      details
+        .map((value) => normalizeTransportMessage(value))
+        .filter((value): value is string => Boolean(value))
+        .map((value) => value.trim())
+        .filter((value) => value.length > 0),
+    ),
+  );
+
+  if (unique.length === 0) return null;
+
+  const allGeneric = unique.every((value) => {
+    const lower = value.toLowerCase();
+    return lower === "transport error" || lower === "transport closed";
+  });
+
+  if (allGeneric) {
+    return labels.noAdditionalDetails(unique[0] ?? "");
+  }
+
+  return unique.join(" — ");
+}
+
+export function buildConnectionFailureCopy(input: {
+  endpoint: string;
+  error: unknown;
+  labels: ConnectionFailureLabels;
+}): { title: string; detail: string | null; raw: string | null } {
+  const { endpoint, error, labels } = input;
+  const title = labels.failedToConnect(endpoint);
+
+  const raw = (() => {
+    if (error instanceof DaemonConnectionTestError) {
+      return (
+        formatTechnicalTransportDetails([error.reason, error.lastError], labels) ??
+        normalizeTransportMessage(error.message)
+      );
+    }
+    if (error instanceof Error) {
+      return normalizeTransportMessage(error.message);
+    }
+    return null;
+  })();
+
+  const rawLower = raw?.toLowerCase() ?? "";
+  let detail: string | null = null;
+
+  if (getConnectionAuthFailureReason(error)) {
+    detail = error instanceof Error ? error.message : raw;
+  } else if (rawLower.includes("timed out")) {
+    detail = labels.timedOut;
+  } else if (
+    rawLower.includes("econnrefused") ||
+    rawLower.includes("connection refused") ||
+    rawLower.includes("err_connection_refused")
+  ) {
+    detail = labels.refused;
+  } else if (
+    rawLower.includes("certificate") ||
+    rawLower.includes("certpathvalidator") ||
+    rawLower.includes("trust anchor") ||
+    rawLower.includes("tls") ||
+    rawLower.includes("ssl")
+  ) {
+    detail = labels.tlsError;
+  } else if (rawLower.includes("enotfound") || rawLower.includes("not found")) {
+    detail = labels.hostNotFound;
+  } else if (rawLower.includes("ehostunreach") || rawLower.includes("host is unreachable")) {
+    detail = labels.hostUnreachable;
+  } else {
+    detail = labels.unableToConnect;
+  }
+
+  return { title, detail, raw };
+}

packages/app/src/components/context-window-meter.tsx

@@ -11,6 +11,7 @@ import { useHostReportsUsage } from "@/usage";
 import type { Theme } from "@/styles/theme";
 import { ContextWindowDetails } from "./context-window-details";
 import { ContextWindowSheet } from "./context-window-sheet";
+import { formatContextPercentage } from "./context-window-meter.utils";
 
 interface ContextWindowMeterProps {
   serverId: string;
@@ -150,7 +151,7 @@ export function ContextWindowMeter({
   showPercentage = false,
   glyphSize,
 }: ContextWindowMeterProps) {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const { width } = useWindowDimensions();
   // Usage cards need a wider popover; without them it keeps the plain tooltip shape.
   const showsUsage = useHostReportsUsage(serverId);
@@ -192,7 +193,9 @@ export function ContextWindowMeter({
   );
   const percentageLabel =
     showPercentage && context ? (
-      <Text style={styles.percentageLabel}>{`${context.percentage}%`}</Text>
+      <Text style={styles.percentageLabel}>
+        {formatContextPercentage(context.percentage, i18n.resolvedLanguage)}
+      </Text>
     ) : null;
   const accessibilityLabel = context
     ? t("contextWindow.accessibility", { percentage: context.percentage })

packages/app/src/components/context-window-meter.utils.test.ts

@@ -0,0 +1,9 @@
+import { describe, expect, it } from "vitest";
+import { formatContextPercentage } from "./context-window-meter.utils";
+
+describe("context window meter formatting", () => {
+  it("localizes percentages without hiding context overflow", () => {
+    expect(formatContextPercentage(125, "en")).toBe("125%");
+    expect(formatContextPercentage(42, "fr")).toBe("42\u00a0%");
+  });
+});

packages/app/src/components/context-window-meter.utils.ts

@@ -1,3 +1,10 @@
+export function formatContextPercentage(value: number, locale?: string): string {
+  return new Intl.NumberFormat(locale, {
+    style: "percent",
+    maximumFractionDigits: 0,
+  }).format(value / 100);
+}
+
 export function formatTokenCount(value: number): string {
   if (value >= 1_000_000) {
     return `${Math.round(value / 1_000_000)}m`;

packages/app/src/components/file-pane-render-mode.ts

@@ -1,17 +0,0 @@
-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;
-}

packages/app/src/components/icons/antigravity-icon.tsx

@@ -0,0 +1,17 @@
+import Svg, { Path } from "react-native-svg";
+
+interface AntigravityIconProps {
+  size?: number;
+  color?: string;
+}
+
+export function AntigravityIcon({ size = 16, color = "currentColor" }: AntigravityIconProps) {
+  return (
+    <Svg width={size} height={size} viewBox="0 0 24 24" fill={color}>
+      <Path
+        transform="translate(12 12) scale(0.24) translate(-55.738 -56.945)"
+        d="M89.6992 93.695C94.3659 97.195 101.366 94.8617 94.9492 88.445C75.6992 69.7783 79.7825 18.445 55.8659 18.445C31.9492 18.445 36.0325 69.7783 16.7825 88.445C9.78251 95.445 17.3658 97.195 22.0325 93.695C40.1159 81.445 38.9492 59.8617 55.8659 59.8617C72.7825 59.8617 71.6159 81.445 89.6992 93.695Z"
+      />
+    </Svg>
+  );
+}

packages/app/src/components/icons/kiro-icon.tsx

@@ -0,0 +1,18 @@
+import Svg, { Path } from "react-native-svg";
+
+interface KiroIconProps {
+  size?: number;
+  color?: string;
+}
+
+export function KiroIcon({ size = 16, color = "currentColor" }: KiroIconProps) {
+  return (
+    <Svg width={size} height={size} viewBox="0 0 24 24" fill={color}>
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M7.97 16.376c-1.644 3.642 1.86 4.556 4.443 2.424.76 2.39 3.608.607 4.631-1.247 2.251-4.084 1.342-8.249 1.108-9.108-1.6-5.859-9.6-5.869-10.976.03-.323 1.033-.328 2.206-.507 3.423-.09.617-.16 1.009-.393 1.655-.139.373-.323.7-.62 1.257-.458.865-.264 2.53 2.101 1.665l.224-.1h-.01l-.001.001zM12.722 10.985c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.218-.97a.61.61 0 01.537-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005zm2.703 0c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.219-.97a.61.61 0 01.536-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005z"
+      />
+    </Svg>
+  );
+}

packages/app/src/components/markdown/renderer.test.ts

@@ -208,6 +208,56 @@ 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;
@@ -718,3 +768,10 @@ 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",
+  });
+});

packages/app/src/components/markdown/renderer.tsx

@@ -27,7 +27,6 @@ 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;
@@ -99,7 +98,6 @@ 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

packages/app/src/components/markdown/styles.ts

@@ -2,10 +2,13 @@ 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 } {
+): { markdownStyle: MarkdownStyle; selectionColor: string; containerStyle?: typeof WEB_CONTAINER } {
   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 };
@@ -23,6 +26,7 @@ export function createMarkdownStyles(
     fontWeight: "bold",
   });
   return {
+    containerStyle: isWeb ? WEB_CONTAINER : undefined,
     selectionColor: theme.colors.terminal.selectionBackground,
     markdownStyle: {
       paragraph,

packages/app/src/components/page-layout/index.tsx

@@ -1,10 +1,14 @@
 import { useMemo, type ReactNode } from "react";
-import { ScrollView, Text, View } from "react-native";
+import { Platform, ScrollView, Text, View } from "react-native";
+import { KeyboardAwareScrollView } from "react-native-keyboard-controller";
 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;
@@ -42,7 +46,13 @@ export function PageLayout({
       ) : (
         <MenuHeader borderless />
       )}
-      <ScrollView style={styles.scroll} contentContainerStyle={scrollContentStyle} testID={testID}>
+      <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}
+      >
         <View style={styles.content}>
           {showTitle ? (
             <View style={styles.titleRow} testID={titleTestID}>
@@ -54,7 +64,7 @@ export function PageLayout({
           ) : null}
           {children}
         </View>
-      </ScrollView>
+      </PageScrollView>
     </View>
   );
 }

packages/app/src/components/provider-icon-name.test.ts

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

packages/app/src/components/provider-icons.test.ts

@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
 import { act, cleanup, renderHook } from "@testing-library/react";
-import { Bot } from "lucide-react-native";
+import { Bot, PackagePlus } from "lucide-react-native";
 import { SvgXml } from "react-native-svg";
 import { afterEach, describe, expect, it } from "vitest";
 import { replaceProviderSnapshotIcons } from "@/data/provider-icons";
@@ -17,6 +17,16 @@ function renderIcon(Component: ProviderIconComponent) {
 }
 
 describe("useProviderIcon", () => {
+  it.each(["devin", "hermes", "kiro", "antigravity"])(
+    "#7087: %s has a provider mark before a host snapshot arrives",
+    (provider) => {
+      const Icon = renderHook(() => useProviderIcon(provider)).result.current;
+      expect(Icon).not.toBe(Bot);
+      expect(Icon).not.toBe(PackagePlus);
+      expect(typeof Icon).toBe("function");
+    },
+  );
+
   it("renders registered snapshot SVG metadata with the requested size and color", () => {
     const svg = '<svg viewBox="0 0 24 24"><path d="M4 4h16v16H4z" /></svg>';
     replaceProviderSnapshotIcons("server-1", [{ provider: "rendered-provider", iconSvg: svg }]);

packages/app/src/components/provider-icons.ts

@@ -1,12 +1,14 @@
 import { useStore } from "zustand";
 import { providerSnapshotIcons } from "@/data/provider-icons";
-import { Bot, PackagePlus } from "lucide-react-native";
+import { Bot } from "lucide-react-native";
 import { createElement, useCallback, type ComponentType } from "react";
 import { SvgXml } from "react-native-svg";
 import { TERMINAL_PROFILE_ICON_NAMES } from "@getpaseo/protocol/provider-icon-names";
+import { AntigravityIcon } from "@/components/icons/antigravity-icon";
 import { ClaudeIcon } from "@/components/icons/claude-icon";
 import { CodexIcon } from "@/components/icons/codex-icon";
 import { CopilotIcon } from "@/components/icons/copilot-icon";
+import { KiroIcon } from "@/components/icons/kiro-icon";
 import { MiniMaxIcon } from "@/components/icons/minimax-icon";
 import { OpenCodeIcon } from "@/components/icons/opencode-icon";
 import { OmpIcon } from "@/components/icons/omp-icon";
@@ -23,10 +25,11 @@ export interface ProviderIconProps {
 export type ProviderIconComponent = ComponentType<ProviderIconProps>;
 
 const BUILTIN_PROVIDER_ICONS: Record<string, ProviderIconComponent> = {
+  antigravity: AntigravityIcon as unknown as ProviderIconComponent,
   claude: ClaudeIcon as unknown as ProviderIconComponent,
   codex: CodexIcon as unknown as ProviderIconComponent,
   copilot: CopilotIcon as unknown as ProviderIconComponent,
-  kiro: PackagePlus,
+  kiro: KiroIcon as unknown as ProviderIconComponent,
   minimax: MiniMaxIcon as unknown as ProviderIconComponent,
   omp: OmpIcon as unknown as ProviderIconComponent,
   opencode: OpenCodeIcon as unknown as ProviderIconComponent,

packages/app/src/components/status-ring/clock.ts

@@ -1,11 +1,13 @@
-import { useLayoutEffect } from "react";
+import { useLayoutEffect, useState } from "react";
 import { makeMutable, type SharedValue, useSharedValue } from "react-native-reanimated";
 import { scheduleOnUI } from "react-native-worklets";
+import { useRetainedPanelActive } from "@/components/retained-panel";
 import { getStatusRingRotation } from "@/components/status-ring/geometry";
 
 const sharedRotation = makeMutable(getStatusRingRotation(Date.now()));
 const activeRingCount = makeMutable(0);
 const clockRunning = makeMutable(false);
+let nextListenerId = 1;
 
 function advanceSharedRotation(): void {
   "worklet";
@@ -18,13 +20,21 @@ function advanceSharedRotation(): void {
   requestAnimationFrame(advanceSharedRotation);
 }
 
-function registerStatusRing(registered: SharedValue<boolean>): void {
+function registerStatusRing(
+  rotation: SharedValue<number>,
+  registered: SharedValue<boolean>,
+  listenerId: number,
+): void {
   "worklet";
   if (registered.value) {
     return;
   }
 
   registered.value = true;
+  rotation.value = getStatusRingRotation(Date.now());
+  sharedRotation.addListener(listenerId, (value) => {
+    rotation.value = value;
+  });
   activeRingCount.value += 1;
 
   if (!clockRunning.value) {
@@ -34,25 +44,31 @@ function registerStatusRing(registered: SharedValue<boolean>): void {
   }
 }
 
-function unregisterStatusRing(registered: SharedValue<boolean>): void {
+function unregisterStatusRing(registered: SharedValue<boolean>, listenerId: number): void {
   "worklet";
   if (!registered.value) {
     return;
   }
 
   registered.value = false;
+  sharedRotation.removeListener(listenerId);
   activeRingCount.value -= 1;
 }
 
 export function useStatusRingRotation(): SharedValue<number> {
+  const active = useRetainedPanelActive();
+  // Hidden retained views must not subscribe their animated styles to the shared clock.
+  const rotation = useSharedValue(getStatusRingRotation(Date.now()));
   const registered = useSharedValue(false);
+  const [listenerId] = useState(() => nextListenerId++);
 
   useLayoutEffect(() => {
-    scheduleOnUI(registerStatusRing, registered);
+    if (!active) return;
+    scheduleOnUI(registerStatusRing, rotation, registered, listenerId);
     return () => {
-      scheduleOnUI(unregisterStatusRing, registered);
+      scheduleOnUI(unregisterStatusRing, registered, listenerId);
     };
-  }, [registered]);
+  }, [active, listenerId, registered, rotation]);
 
-  return sharedRotation;
+  return rotation;
 }

packages/app/src/components/terminal-emulator-native-grid.native.tsx

@@ -868,7 +868,9 @@ function NativeTerminalEmulator({
             panState.movedBeyondTapTolerance = true;
           }
           if (selectionPress?.status === "selecting") {
-            updateSelectionAtPoint(resolvePanResponderPoint(selectionPress, event, gesture));
+            if (panState.movedBeyondTapTolerance) {
+              updateSelectionAtPoint(resolvePanResponderPoint(selectionPress, event, gesture));
+            }
             return;
           }
 
@@ -915,7 +917,10 @@ function NativeTerminalEmulator({
         onPanResponderRelease: (event, gesture) => {
           clearSelectionLongPressTimeout();
           const selectionPress = selectionPressRef.current;
-          if (selectionPress?.status === "selecting") {
+          if (
+            selectionPress?.status === "selecting" &&
+            panStateRef.current.movedBeyondTapTolerance
+          ) {
             updateSelectionAtPoint(resolvePanResponderPoint(selectionPress, event, gesture));
           }
           selectionPressRef.current = null;

packages/app/src/composer/input/input.tsx

@@ -1295,7 +1295,12 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
     // Read pointer capability when restoring, without making a pointer change itself
     // a focus trigger.
     useLayoutEffect(() => {
-      if (isPaneFocused && focusIntentRef.current && hasFinePointer()) {
+      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) {
         textInputRef.current?.focus();
       }
     }, [isPaneFocused]);

packages/app/src/composer/submission/model.test.ts

@@ -4,6 +4,7 @@ import {
   beginMessageSubmission,
   getActiveMessageSubmissions,
   getSendingClientMessageIds,
+  hasActiveMessageSubmission,
   observeMessageSubmissionCanonical,
   rejectMessageSubmission,
 } from "./model";
@@ -53,6 +54,21 @@ 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" }),

packages/app/src/composer/tracks.tsx

@@ -2,6 +2,7 @@ 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,
@@ -312,6 +313,22 @@ 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",
@@ -332,29 +349,8 @@ const styles = StyleSheet.create((theme) => {
       alignItems: "center",
       gap: theme.spacing[1],
     },
-    // 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,
-    },
+    row: trackRow,
+    rowActive: { ...trackRow, 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: {

packages/app/src/contexts/session-context.tsx

@@ -36,7 +36,6 @@ 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 {
@@ -168,11 +167,6 @@ function resolveAgentAttentionNotification(
   });
 }
 
-type WorkspaceSetupProgressPayload = Extract<
-  SessionOutboundMessage,
-  { type: "workspace_setup_progress" }
->["payload"];
-
 function notifyVoiceAbortFailure(
   data: Extract<SessionOutboundMessage, { type: "activity_log" }>["payload"],
   notifyError: (message: string) => void,
@@ -225,7 +219,6 @@ 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(
@@ -365,13 +358,6 @@ 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) => {
@@ -508,7 +494,6 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
         "agent_permission_resolved",
         "agent.provider_subagents.update",
         "checkout_status_update",
-        "workspace_setup_progress",
         "status.server_info",
       ],
       { notifications: true },
@@ -547,11 +532,6 @@ 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);
@@ -710,7 +690,6 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
       unsubProviderSubagentUpdate();
       unsubAgentAttention();
       unsubCheckoutStatusUpdate();
-      unsubWorkspaceSetupProgress();
       unsubStatus();
       unsubPermissionRequest();
       unsubPermissionResolved();
@@ -732,7 +711,6 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
     setAgents,
     setPendingPermissions,
     notifyAgentAttention,
-    applyWorkspaceSetupProgress,
     updateSessionServerInfo,
     toast,
     voiceRuntime,

packages/app/src/data/acp-provider-catalog.ts

@@ -133,7 +133,7 @@ const CATALOG_DATA = [
     title: "Devin CLI",
     description: "Cognition's Devin for Terminal via Agent Client Protocol",
     version: "manual",
-    iconId: null,
+    iconId: "devin",
     installLink: "https://cli.devin.ai/docs",
     command: ["devin", "acp"],
   },
@@ -235,7 +235,7 @@ const CATALOG_DATA = [
     title: "Hermes",
     description: "Nous Research self-improving AI agent",
     version: "manual",
-    iconId: null,
+    iconId: "hermes",
     installLink: "https://hermes-agent.nousresearch.com/docs/user-guide/features/acp",
     command: ["hermes", "acp"],
   },
@@ -272,7 +272,7 @@ const CATALOG_DATA = [
     title: "Kiro CLI",
     description: "Amazon's AI coding agent with native ACP support",
     version: "manual",
-    iconId: null,
+    iconId: "kiro",
     installLink: "https://kiro.dev/docs/cli/acp/",
     command: ["kiro-cli", "acp"],
   },

packages/app/src/file-pane/editor/view.web.tsx

@@ -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 "@/components/file-pane-render-mode";
+import { isRenderedMarkdownFile } from "@/file-panels";
 import type { WorkspaceFileLocation } from "@/workspace/file-open";
 import type { FileEditorModel } from "./model";
 import { editorBaseExtensions, editorTheme, type EditorVisualTheme } from "./extensions.web";

packages/app/src/file-pane/pane.tsx

@@ -1,20 +1,13 @@
 import { Button } from "@/components/ui/button";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-  useSyncExternalStore,
-} from "react";
+import React, { useCallback, useEffect, useMemo, useState, useSyncExternalStore } from "react";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { ScrollView as RNScrollView, Text, View } from "react-native";
+import { 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 { filePreviewRenderKind } from "@/components/file-pane-render-mode";
+import { FilePanelPreview, resolveFilePreviewPanel, type FilePanel } from "@/file-panels";
 import { useAttachmentPreviewUrl } from "@/attachments/use-attachment-preview-url";
 import { getFileNameFromPath } from "@/attachments/utils";
 import { resolveFilePreviewReadTarget } from "@/file-explorer/preview-target";
@@ -28,8 +21,6 @@ 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";
@@ -39,7 +30,6 @@ 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) => ({
@@ -47,6 +37,7 @@ const foregroundMutedColorMapping = (theme: Theme) => ({
 });
 
 interface FilePreviewBodyProps {
+  panel: FilePanel | null;
   preview: ExplorerFile | null;
   mode?: "preview" | "source";
   isLoading: boolean;
@@ -131,6 +122,7 @@ function TooLargeSource({ size }: { size?: number }) {
 }
 
 function FilePreviewBody({
+  panel,
   preview,
   mode,
   isLoading,
@@ -144,14 +136,6 @@ 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 (
@@ -170,36 +154,21 @@ 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}
@@ -210,19 +179,6 @@ 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>
@@ -243,6 +199,7 @@ export function FilePane({
   navigationRevision: number;
 }) {
   const { t } = useTranslation();
+  const { settings } = useAppSettings();
   const isMobile = useIsCompactFormFactor();
   const [previewMode, setPreviewMode] = useState<"preview" | "source">("preview");
 
@@ -292,7 +249,12 @@ export function FilePane({
 
   const { file: preview, imageAttachment } = resolveFilePreviewLifecycle(previewLifecycle);
   const imagePreviewUri = useAttachmentPreviewUrl(imageAttachment);
-  const isRenderable = isRenderablePreview(preview, location.path);
+  const panel = resolveFilePreviewPanel({
+    preview,
+    path: location.path,
+    associations: settings.filePanelAssociations,
+  });
+  const isRenderable = preview?.kind === "text" && panel !== null;
   const editable = isEditableTextFile({
     preview,
     supportsEditing,
@@ -308,6 +270,7 @@ export function FilePane({
 
   return (
     <FilePanePresentation
+      panel={panel}
       serverId={serverId}
       workspaceRoot={normalizedWorkspaceRoot}
       client={client}
@@ -333,10 +296,6 @@ 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;
@@ -350,6 +309,7 @@ function isEditableTextFile(input: {
 }
 
 function FilePanePresentation({
+  panel,
   serverId,
   workspaceRoot,
   client,
@@ -372,6 +332,7 @@ function FilePanePresentation({
   navigationRevision,
   imagePreviewUri,
 }: {
+  panel: FilePanel | null;
   serverId: string;
   workspaceRoot: string;
   client: DaemonClient | null;
@@ -407,6 +368,7 @@ function FilePanePresentation({
   if (editable && client && readTarget && preview?.kind === "text") {
     return (
       <EditableFilePane
+        panel={panel}
         key={`${serverId}:${readTarget.cwd}:${readTarget.path}`}
         serverId={serverId}
         workspaceRoot={workspaceRoot}
@@ -459,6 +421,7 @@ function FilePanePresentation({
         />
       ) : null}
       <FilePreviewBody
+        panel={panel}
         preview={preview}
         mode={previewMode}
         isLoading={isLoading}
@@ -475,6 +438,7 @@ function FilePanePresentation({
 }
 
 function EditableFilePane({
+  panel,
   serverId,
   workspaceRoot,
   client,
@@ -492,6 +456,7 @@ function EditableFilePane({
   location,
   navigationRevision,
 }: {
+  panel: FilePanel | null;
   serverId: string;
   workspaceRoot: string;
   client: DaemonClient;
@@ -639,6 +604,7 @@ function EditableFilePane({
         />
       ) : (
         <FilePreviewBody
+          panel={panel}
           preview={renderedPreview}
           mode={mode}
           isLoading={isLoading}
@@ -708,15 +674,4 @@ 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],
-  },
 }));

packages/app/src/file-panels/builtin.tsx

@@ -0,0 +1,92 @@
+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,
+  },
+}));

packages/app/src/file-panels/catalog.test.ts

@@ -1,5 +1,15 @@
 import { describe, expect, it } from "vitest";
-import { filePreviewRenderKind, isRenderedMarkdownFile } from "@/components/file-pane-render-mode";
+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;
+}
 
 describe("isRenderedMarkdownFile", () => {
   it("detects .md files", () => {
@@ -38,3 +48,39 @@ 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");
+  });
+});

packages/app/src/file-panels/catalog.ts

@@ -0,0 +1,28 @@
+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));
+}

packages/app/src/file-panels/html-preview-csp.test.ts

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

packages/app/src/file-panels/html-preview-navigation.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { htmlPreviewNavigationKind } from "@/file-pane/html-preview-navigation";
+import { htmlPreviewNavigationKind } from "./html-preview-navigation";
 
 describe("htmlPreviewNavigationKind", () => {
   it("allows the WebView's initial document URLs", () => {

packages/app/src/file-panels/index.ts

@@ -0,0 +1,23 @@
+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;
+}

packages/app/src/file-panels/resolve.test.ts

@@ -0,0 +1,105 @@
+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:");
+  });
+});

packages/app/src/file-panels/resolve.ts

@@ -0,0 +1,63 @@
+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 };
+}

packages/app/src/git/actions-split-button.tsx

@@ -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 type { GitAction, GitActions } from "@/git/policy";
+import { actionsWithoutPrimary, type GitAction, type GitActions } from "@/git/policy";
 import { useGitActionRunner } from "@/git/use-actions";
 import { buttonControlHeight, HEADER_CONTROL_HEIGHT } from "@/components/ui/control-geometry";
 
@@ -129,14 +129,10 @@ export function GitActionsSplitButton({
     [theme.colors.surface2],
   );
 
-  const menuOnlyActions = useMemo(
-    () => [
-      ...(gitActions.primary ? [gitActions.primary] : []),
-      ...gitActions.secondary,
-      ...gitActions.menu,
-    ],
-    [gitActions.menu, gitActions.primary, gitActions.secondary],
-  );
+  const menuOnlyActions = [
+    ...(gitActions.primary ? [gitActions.primary] : []),
+    ...actionsWithoutPrimary(gitActions),
+  ];
 
   if (menuOnly) {
     if (menuOnlyActions.length === 0) {

packages/app/src/git/policy.test.ts

@@ -2,7 +2,7 @@ import { afterEach, describe, expect, it } from "vitest";
 import { CheckoutPrStatusSchema } from "@getpaseo/protocol/messages";
 import { i18n } from "@/i18n/i18next";
 
-import { buildGitActions, type BuildGitActionsInput } from "./policy";
+import { actionsWithoutPrimary, buildGitActions, type BuildGitActionsInput } from "./policy";
 import { deriveMergeCapability, type ForgeSpecificStatusFacts } from "./merge-capability";
 
 type GithubMergeFactsFixture = ForgeSpecificStatusFacts & {
@@ -190,6 +190,59 @@ 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({

packages/app/src/git/policy.ts

@@ -312,6 +312,18 @@ 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";

packages/app/src/git/pull-request-panel/data.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { beforeAll, describe, expect, it } from "vitest";
 import type {
   CheckoutPipelineJob,
   CheckoutPrStatusResponse,
@@ -780,6 +780,11 @@ describe("formatAge", () => {
   });
 });
 
+// Fixed translators do not select a language, so request their resources first.
+beforeAll(async () => {
+  await i18n.loadLanguages("fr");
+});
+
 const english = i18n.getFixedT("en");
 const french = i18n.getFixedT("fr");
 

packages/app/src/hooks/use-acp-provider-catalog.test.ts

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

packages/app/src/hooks/use-settings/storage.test.ts

@@ -44,6 +44,33 @@ 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({

packages/app/src/hooks/use-settings/storage.ts

@@ -104,6 +104,7 @@ 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;
@@ -160,6 +161,7 @@ export const DEFAULT_CLIENT_SETTINGS: AppSettings = {
   toolCallDetailLevel: "detailed",
   chatOutlineEnabled: true,
   vimKeybindings: false,
+  filePanelAssociations: {},
   openInSidePane: DEFAULT_OPEN_IN_SIDE_PANE_PREFERENCES,
   pullRequestOpenLocation: "explorer",
 };
@@ -261,6 +263,7 @@ 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),

packages/app/src/i18n/i18next.startup.test.ts

@@ -0,0 +1,92 @@
+import { execFileSync } from "node:child_process";
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { build } from "esbuild";
+import { beforeAll, describe, expect, it } from "vitest";
+
+let bundle: string;
+
+// Exercise the bundled entry in fresh processes so the test runner's module cache
+// cannot hide eager evaluation. The probe only records resource module execution.
+beforeAll(async () => {
+  const result = await build({
+    entryPoints: [path.join(import.meta.dirname, "i18next.ts")],
+    bundle: true,
+    platform: "node",
+    format: "cjs",
+    external: ["i18next", "react-i18next"],
+    write: false,
+    plugins: [
+      {
+        name: "observe-translation-evaluation",
+        setup(builder) {
+          builder.onLoad(
+            { filter: /[/\\]i18n[/\\]resources[/\\][a-z]{2}(?:-[A-Z]{2})?\.ts$/ },
+            async ({ path: file }) => ({
+              contents: `globalThis.evaluatedLocales.push(${JSON.stringify(path.basename(file, ".ts"))});\n${await readFile(file, "utf8")}`,
+              loader: "ts",
+            }),
+          );
+        },
+      },
+    ],
+  });
+  bundle = result.outputFiles[0].text;
+});
+
+function runStartupProbe(actions = "") {
+  return JSON.parse(
+    execFileSync(process.execPath, ["-"], {
+      cwd: path.resolve(import.meta.dirname, "../.."),
+      encoding: "utf8",
+      input: `globalThis.evaluatedLocales = [];
+         (function () { ${bundle} })();
+         const { i18n } = module.exports;
+         ${actions}
+         console.log(JSON.stringify({
+           evaluated: globalThis.evaluatedLocales,
+           registered: Object.keys(i18n.store.data),
+           language: i18n.language,
+           cancel: i18n.t("common.actions.cancel"),
+           fallback: i18n.t("startupProbeOnlyInEnglish"),
+         }));`,
+    }),
+  );
+}
+
+describe("bundled translation startup", () => {
+  it("evaluates and registers only English before a language is selected", () => {
+    expect(runStartupProbe()).toMatchObject({
+      evaluated: ["en"],
+      registered: ["en"],
+      language: "en",
+      cancel: "Cancel",
+    });
+  });
+
+  it.each([
+    ["ar", "يلغي"],
+    ["es", "Cancelar"],
+    ["fr", "Annuler"],
+    ["ja", "キャンセル"],
+    ["ko", "취소"],
+    ["pt-BR", "Cancelar"],
+    ["ru", "Отмена"],
+    ["zh-CN", "取消"],
+  ])("loads %s synchronously on selection and reuses it", (locale, cancel) => {
+    const result = runStartupProbe(`
+      i18n.addResource("en", "translation", "startupProbeOnlyInEnglish", "English fallback");
+      i18n.changeLanguage(${JSON.stringify(locale)});
+      if (i18n.language !== ${JSON.stringify(locale)}) throw new Error("Language selection became asynchronous");
+      i18n.changeLanguage("en");
+      i18n.changeLanguage(${JSON.stringify(locale)});
+    `);
+    expect(result).toEqual({
+      evaluated: ["en", locale],
+      registered: ["en", locale],
+      language: locale,
+      cancel,
+      fallback: "English fallback",
+    });
+  });
+});

packages/app/src/i18n/i18next.ts

@@ -1,41 +1,70 @@
-import { createInstance } from "i18next";
+import { createInstance, type BackendModule } from "i18next";
 import { initReactI18next } from "react-i18next";
 import { observeI18nInit } from "./init";
-import { ar } from "./resources/ar";
 import { en } from "./resources/en";
-import { es } from "./resources/es";
-import { fr } from "./resources/fr";
-import { ja } from "./resources/ja";
-import { ko } from "./resources/ko";
-import { ptBR } from "./resources/pt-BR";
-import { ru } from "./resources/ru";
-import { zhCN } from "./resources/zh-CN";
+
+// Literal requires keep every locale bundled for offline use, while evaluating
+// its resource module only when selected. Synchronous reads preserve the language
+// provider's contract: translations are ready before it renders children.
+const bundledTranslations: BackendModule = {
+  type: "backend",
+  init() {},
+  read(language, _namespace, callback) {
+    switch (language) {
+      case "en":
+        callback(null, en);
+        return;
+      case "ar":
+        callback(null, require("./resources/ar").ar);
+        return;
+      case "es":
+        callback(null, require("./resources/es").es);
+        return;
+      case "fr":
+        callback(null, require("./resources/fr").fr);
+        return;
+      case "ja":
+        callback(null, require("./resources/ja").ja);
+        return;
+      case "ko":
+        callback(null, require("./resources/ko").ko);
+        return;
+      case "pt-BR":
+        callback(null, require("./resources/pt-BR").ptBR);
+        return;
+      case "ru":
+        callback(null, require("./resources/ru").ru);
+        return;
+      case "zh-CN":
+        callback(null, require("./resources/zh-CN").zhCN);
+        return;
+      default:
+        callback(null, undefined);
+    }
+  },
+};
 
 const i18n = createInstance();
 
 observeI18nInit(
-  i18n.use(initReactI18next).init({
-    compatibilityJSON: "v4",
-    fallbackLng: "en",
-    lng: "en",
-    resources: {
-      ar: { translation: ar },
-      en: { translation: en },
-      es: { translation: es },
-      fr: { translation: fr },
-      ja: { translation: ja },
-      ko: { translation: ko },
-      "pt-BR": { translation: ptBR },
-      ru: { translation: ru },
-      "zh-CN": { translation: zhCN },
-    },
-    interpolation: {
-      escapeValue: false,
-    },
-    react: {
-      useSuspense: false,
-    },
-  }),
+  i18n
+    .use(bundledTranslations)
+    .use(initReactI18next)
+    .init({
+      compatibilityJSON: "v4",
+      fallbackLng: "en",
+      lng: "en",
+      partialBundledLanguages: true,
+      resources: {
+        en: { translation: en },
+      },
+      interpolation: {
+        escapeValue: false,
+      },
+      react: {
+        useSuspense: false,
+      },
+    }),
 );
 
 export { i18n };