test(app): capture Android terminal keyboard frame drops

Retain a real-device diagnostic for #4811 while its cost owner remains unconfirmed. The caller supplies the comparison budget; this does not add a release performance guarantee or a production fix.
2026-10-20 08:12:53 +00:00 · 2026-10-18 03:10:19 +02:00
470 changed files with 9082 additions and 21432 deletions
@@ -8,13 +8,9 @@ on:
  merge_group:
  workflow_dispatch:

-# A newer push to the same ref cancels the run still in progress, main included.
-# A full run costs about 200 runner-minutes against the org's 20 concurrent
-# jobs, and a superseded main run only answers a question the newer commit
-# answers again.
 concurrency:
  group: ci-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}

 env:
  # CI does not use the CUDA execution provider, and the onnxruntime-node
@@ -58,10 +54,10 @@ jobs:
      - name: Validate CI contracts
        run: node --test scripts/ci-workflow.test.mjs scripts/daemon-launch-contract.test.mjs scripts/sync-fdroid-changelogs.test.mjs scripts/upload-release-assets.test.mjs

-  quality:
-    name: quality
+  format:
+    name: format
    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.format != 'false' || needs.changes.outputs.quality != 'false' || needs.changes.outputs.relay != 'false' || needs.changes.outputs.sdk != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.format != 'false') }}
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
@@ -72,67 +68,36 @@ jobs:
          cache: "npm"

      - name: Install dependencies
-        id: install
        run: node scripts/npm-retry.mjs ci

-      # Explicit status checks keep independent domains running after a failure.
-      # A failed step still fails quality; no continue-on-error or success shim.
      - name: Check formatting
-        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.format != 'false') }}
        run: npm run format:check

+  lint:
+    name: lint
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: "npm"
+
+      - name: Install dependencies
+        run: node scripts/npm-retry.mjs ci
+
      - name: Lint lockfile
-        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
        run: npx --yes lockfile-lint --path package-lock.json --type npm --allowed-hosts npm --validate-https --validate-integrity

      - name: Verify dependency signatures
-        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.quality != 'false') }}
        run: npm audit signatures

      - name: Lint
-        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
-
-      - name: Run relay tests
-        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.relay != 'false') }}
-        run: npm run test --workspace=@getpaseo/relay
-
-      - name: Build client dependencies
-        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
-        run: npm run build:relay && npm run build:client
-
-      - name: Build plugin SDK
-        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
-        run: npm run build:plugin
-
-      - name: Run plugin SDK tests
-        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
-        run: npm run test --workspace=@getpaseo/plugin
-
-      - name: Run protocol tests
-        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
-        run: npm run test --workspace=@getpaseo/protocol
-
-      - name: Run client tests
-        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
-        run: npm run test --workspace=@getpaseo/client
-
-      - name: Run highlight tests
-        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
-        run: npm run test --workspace=@getpaseo/highlight
-
-      - name: Typecheck client examples
-        if: ${{ !cancelled() && steps.install.outcome == 'success' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
-        run: npm run typecheck:examples --workspace=@getpaseo/client
-
  typecheck:
    name: typecheck
    needs: changes
@@ -149,9 +114,6 @@ jobs:
      - name: Install dependencies
        run: node scripts/npm-retry.mjs ci

-      - name: Verify dependency patch recovery
-        run: node --test scripts/postinstall-patches.test.mjs
-
      - name: Build server stack
        run: npm run build:server

@@ -181,56 +143,43 @@ jobs:
    needs: changes
    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' || needs.changes.outputs.hub != 'false') }}
    runs-on: ubuntu-latest
-    steps:
-      - &server_capacity
-        name: Log runner capacity
-        run: |
-          node -e "const os = require('node:os'); console.log(JSON.stringify({cpus: os.cpus().length, model: os.cpus()[0].model, ramGiB: os.totalmem() / 2 ** 30}))"
-
-      - &server_checkout
-        uses: actions/checkout@v4
+    steps: &server_test_steps
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0

-      - &server_node
-        uses: actions/setup-node@v4
+      - uses: actions/setup-node@v4
        with:
          node-version: "22"
          cache: "npm"

-      - &server_fetch
-        name: Fetch origin/main (worktree tests)
+      - name: Fetch origin/main (worktree tests)
        if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
        run: git fetch --no-tags origin main:refs/remotes/origin/main

-      - &server_install
-        name: Install dependencies
+      - name: Install dependencies
        run: node scripts/npm-retry.mjs ci

-      - &server_agent_clis
-        name: Install agent CLIs for provider tests
+      - name: Install agent CLIs for provider tests
        if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
        run: node scripts/npm-retry.mjs install -g @anthropic-ai/claude-code opencode-ai

-      - &server_build
-        name: Build server dependencies
+      - name: Build server dependencies
        run: npm run build:server-deps

      - name: Run server tests
        if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
        run: npm run test --workspace=@getpaseo/server
-        env: &server_test_env
+        env:
          CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
          OPENROUTER_API_KEY: ${{ secrets.OPENROUTER_API_KEY }}

-      - &server_plugin_tests
-        name: Run built-in plugin tests
+      - name: Run built-in plugin tests
        if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
        run: npm run test --workspace=@getpaseo/builtin-plugins

-      - &server_hub_contract
-        name: Run Hub CLI/daemon contract
+      - name: Run Hub CLI/daemon contract
        if: ${{ needs.changes.outputs.full == 'false' && needs.changes.outputs.server == 'false' && needs.changes.outputs.hub != 'false' }}
        run: npm run test:hub-cli-contract --workspace=@getpaseo/server

@@ -239,41 +188,7 @@ jobs:
    needs: changes
    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' || needs.changes.outputs.hub != 'false') }}
    runs-on: windows-latest
-    steps:
-      - *server_capacity
-      - *server_checkout
-      - *server_node
-      - *server_fetch
-      - *server_install
-      - *server_agent_clis
-      - *server_build
-
-      - name: Run server unit tests
-        if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false' }}
-        run: npm run test:unit --workspace=@getpaseo/server
-        env: *server_test_env
-
-      - *server_plugin_tests
-      - *server_hub_contract
-
-  # Keep the serial integration chain off the Windows unit critical path.
-  server-integration-windows:
-    name: server-integration (windows-latest)
-    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.server != 'false') }}
-    runs-on: windows-latest
-    steps:
-      - *server_capacity
-      - *server_checkout
-      - *server_node
-      - *server_fetch
-      - *server_install
-      - *server_agent_clis
-      - *server_build
-
-      - name: Run server integration tests
-        run: npm run test:integration --workspace=@getpaseo/server
-        env: *server_test_env
+    steps: *server_test_steps

  # native-recursive.ts serves darwin and win32, but windows-latest above is the only
  # runner that exercises it. macOS — the platform the reported watcher bug was on —
@@ -417,19 +332,52 @@ jobs:
      - name: Run app unit tests
        run: npm run test --workspace=@getpaseo/app

+  sdk-tests:
+    name: sdk-tests
+    needs: changes
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.sdk != 'false') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: "npm"
+
+      - name: Install dependencies
+        run: node scripts/npm-retry.mjs ci
+
+      - name: Build client dependencies
+        run: npm run build:relay && npm run build:client
+
+      - name: Build plugin SDK
+        run: npm run build:plugin
+
+      - name: Run plugin SDK tests
+        run: npm run test --workspace=@getpaseo/plugin
+
+      - name: Run protocol tests
+        run: npm run test --workspace=@getpaseo/protocol
+
+      - name: Run client tests
+        run: npm run test --workspace=@getpaseo/client
+
+      - name: Run highlight tests
+        run: npm run test --workspace=@getpaseo/highlight
+
+      - name: Typecheck client examples
+        run: npm run typecheck:examples --workspace=@getpaseo/client
+
  playwright-1:
-    name: playwright (shard 1/8)
+    name: playwright (shard 1/4)
    needs: changes
    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
    runs-on: ubuntu-latest
    env:
-      PLAYWRIGHT_SHARD: "1/8"
+      PLAYWRIGHT_SHARD: "1/4"
      PLAYWRIGHT_ARTIFACT: "1"
    steps: &playwright_test_steps
-      - name: Log runner capacity
-        run: |
-          node -e "const os = require('node:os'); console.log(JSON.stringify({cpus: os.cpus().length, model: os.cpus()[0].model, ramGiB: os.totalmem() / 2 ** 30}))"
-
      - uses: actions/checkout@v4

      - uses: actions/setup-node@v4
@@ -457,11 +405,9 @@ jobs:
        run: npm run test:e2e --workspace=@getpaseo/app -- --shard=${{ env.PLAYWRIGHT_SHARD }}
        env:
          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          E2E_WORKERS: "2"
-          # File groups are weighted by observed reporter durations.
-          # Share of the test list per shard, rebalanced from the Playwright step
-          # minutes of five eight-shard runs so the slowest and fastest shards meet.
-          PWTEST_SHARD_WEIGHTS: "85:94:117:128:91:103:127:85"
+          # Weight file groups by observed duration; raw test counts overload
+          # early agent/Changes specs. Required check names remain unchanged.
+          PWTEST_SHARD_WEIGHTS: "111:172:137:160"

      - name: Upload test artifacts
        uses: actions/upload-artifact@v4
@@ -474,74 +420,56 @@ jobs:
          retention-days: 7

  playwright-2:
-    name: playwright (shard 2/8)
+    name: playwright (shard 2/4)
    needs: changes
    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
    runs-on: ubuntu-latest
    env:
-      PLAYWRIGHT_SHARD: "2/8"
+      PLAYWRIGHT_SHARD: "2/4"
      PLAYWRIGHT_ARTIFACT: "2"
    steps: *playwright_test_steps

  playwright-3:
-    name: playwright (shard 3/8)
+    name: playwright (shard 3/4)
    needs: changes
    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
    runs-on: ubuntu-latest
    env:
-      PLAYWRIGHT_SHARD: "3/8"
+      PLAYWRIGHT_SHARD: "3/4"
      PLAYWRIGHT_ARTIFACT: "3"
    steps: *playwright_test_steps

  playwright-4:
-    name: playwright (shard 4/8)
+    name: playwright (shard 4/4)
    needs: changes
    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
    runs-on: ubuntu-latest
    env:
-      PLAYWRIGHT_SHARD: "4/8"
+      PLAYWRIGHT_SHARD: "4/4"
      PLAYWRIGHT_ARTIFACT: "4"
    steps: *playwright_test_steps

-  playwright-5:
-    name: playwright (shard 5/8)
+  relay-tests:
+    name: relay-tests
    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.relay != 'false') }}
    runs-on: ubuntu-latest
-    env:
-      PLAYWRIGHT_SHARD: "5/8"
-      PLAYWRIGHT_ARTIFACT: "5"
-    steps: *playwright_test_steps
+    steps:
+      - uses: actions/checkout@v4

-  playwright-6:
-    name: playwright (shard 6/8)
-    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
-    runs-on: ubuntu-latest
-    env:
-      PLAYWRIGHT_SHARD: "6/8"
-      PLAYWRIGHT_ARTIFACT: "6"
-    steps: *playwright_test_steps
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: "npm"

-  playwright-7:
-    name: playwright (shard 7/8)
-    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
-    runs-on: ubuntu-latest
-    env:
-      PLAYWRIGHT_SHARD: "7/8"
-      PLAYWRIGHT_ARTIFACT: "7"
-    steps: *playwright_test_steps
+      - name: Install dependencies
+        run: node scripts/npm-retry.mjs ci

-  playwright-8:
-    name: playwright (shard 8/8)
-    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
-    runs-on: ubuntu-latest
-    env:
-      PLAYWRIGHT_SHARD: "8/8"
-      PLAYWRIGHT_ARTIFACT: "8"
-    steps: *playwright_test_steps
+      - name: Build relay
+        run: npm run build:relay
+
+      - name: Run relay tests
+        run: npm run test --workspace=@getpaseo/relay

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

-## 0.12.0 - 2026-10-19
+## 0.12.0-beta.2 - 2026-10-17

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

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

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

 ### Fixed

@@ -61,18 +54,11 @@ 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))
- Fixed new agent drafts staying on "Loading…" when the host is disconnected; they now say "Host is not connected" and keep your draft ([#7303](https://github.com/getpaseo/paseo/pull/7303) by [@colonelpanic8](https://github.com/colonelpanic8))
- Fixed reloading a chat during a streaming reply showing a frozen copy above the live one and dropping the ending ([#7256](https://github.com/getpaseo/paseo/pull/7256))
 - Fixed question cards spinning forever when an answer fails to send; they now show the error and keep your answers ([#7098](https://github.com/getpaseo/paseo/pull/7098) by [@xzthemeofsss](https://github.com/xzthemeofsss))
 - 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))
@@ -82,7 +68,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed rewinding a Claude conversation failing with "Session not found" when the provider sets `CLAUDE_CONFIG_DIR` ([#6325](https://github.com/getpaseo/paseo/pull/6325))
 - Fixed changing a running Claude agent's thinking level and then its mode killing its running command ([#7179](https://github.com/getpaseo/paseo/pull/7179))
 - Fixed Claude models that need a recent Claude Code being hidden when the provider command is a wrapper script ([#7209](https://github.com/getpaseo/paseo/pull/7209) by [@SulthanZahran1](https://github.com/SulthanZahran1))
- Fixed background Claude subagent cards staying empty while the subagent works, including after the parent finishes ([#6242](https://github.com/getpaseo/paseo/pull/6242), [#7266](https://github.com/getpaseo/paseo/pull/7266))
+- Fixed background Claude subagent cards staying empty while the subagent works ([#6242](https://github.com/getpaseo/paseo/pull/6242))
 - Fixed Copilot staying in Plan mode and refusing edits after you select Allow All ([#7234](https://github.com/getpaseo/paseo/pull/7234))
 - Fixed imported Claude Code sessions taking their first prompt as the name instead of their `/rename` title ([#6930](https://github.com/getpaseo/paseo/pull/6930) by [@platanus-kr](https://github.com/platanus-kr))
 - Fixed a wrongly shaped answer to a Claude question reporting success and discarding the question ([#6936](https://github.com/getpaseo/paseo/pull/6936) by [@thomasvan](https://github.com/thomasvan))
@@ -104,13 +90,8 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed a service newly added to `paseo.json` failing to start until the daemon restarted ([#6542](https://github.com/getpaseo/paseo/pull/6542))
 - Fixed workspace service URLs returning 502 when the service listens only on IPv6 localhost ([#6753](https://github.com/getpaseo/paseo/pull/6753) by [@marcelocastrobarbosa](https://github.com/marcelocastrobarbosa))
 - Fixed terminals that could not be closed when their command was missing or exited immediately ([#6792](https://github.com/getpaseo/paseo/pull/6792) by [@KiraPC](https://github.com/KiraPC))
- Fixed MCP terminal key commands typing arrow and modifier key names instead of sending the keys ([#7343](https://github.com/getpaseo/paseo/pull/7343) by [@Aling33](https://github.com/Aling33))
- Fixed CJK text gaining spaces between characters after returning to a workspace in the native terminal ([#6452](https://github.com/getpaseo/paseo/pull/6452) by [@jasonhnd](https://github.com/jasonhnd), [@liujin0506](https://github.com/liujin0506), [@seob717](https://github.com/seob717))
- Fixed 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 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 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))
@@ -121,7 +102,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed sidebar rows, footer buttons, and Settings items showing no feedback when tapped on touch devices ([#7150](https://github.com/getpaseo/paseo/pull/7150))
 - Fixed home screen actions being cut off on short phone screens ([#7167](https://github.com/getpaseo/paseo/pull/7167))
 - Fixed Android dictation stopping with "Dictation was interrupted by another audio source" when another app plays audio ([#7200](https://github.com/getpaseo/paseo/pull/7200))
- Fixed Page Up and Page Down not scrolling the chat after clicking a message or closing Find ([#7033](https://github.com/getpaseo/paseo/pull/7033), [#7263](https://github.com/getpaseo/paseo/pull/7263) by [@panta82](https://github.com/panta82))
+- Fixed Page Up and Page Down not scrolling the chat after clicking a message ([#7033](https://github.com/getpaseo/paseo/pull/7033) by [@panta82](https://github.com/panta82))
 - Fixed Add Project keyboard selection moving to directories scrolled out of view ([#7081](https://github.com/getpaseo/paseo/pull/7081) by [@superheher](https://github.com/superheher))
 - Fixed Enter replacing an email address in the composer with a file mention ([#6471](https://github.com/getpaseo/paseo/pull/6471) by [@jasonhnd](https://github.com/jasonhnd))
 - Fixed letter shortcuts not running with non-Latin keyboard layouts such as Russian ([#6755](https://github.com/getpaseo/paseo/pull/6755))
@@ -166,11 +147,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed Google Play listing Android devices without a camera as incompatible ([#6339](https://github.com/getpaseo/paseo/pull/6339))
 - Fixed `nix build .#desktop` running out of memory on Macs with less than 15 GB of RAM ([#6537](https://github.com/getpaseo/paseo/pull/6537) by [@truelecter](https://github.com/truelecter))
 - Fixed usage providers changing places after Refresh all ([#6947](https://github.com/getpaseo/paseo/pull/6947) by [@sleroq](https://github.com/sleroq))
- Fixed usage cards losing their last values and showing "Updated" when a refresh fails ([#7246](https://github.com/getpaseo/paseo/pull/7246))
- Fixed Usage merging distinct Cursor accounts into one card ([#7344](https://github.com/getpaseo/paseo/pull/7344))
 - Fixed the OpenCode Go usage icon being nearly invisible on dark themes ([#6362](https://github.com/getpaseo/paseo/pull/6362) by [@az33zy](https://github.com/az33zy))
- Fixed generic icons for Devin, Hermes, Kiro, and Antigravity in provider lists ([#7330](https://github.com/getpaseo/paseo/pull/7330) by [@OMEG-Lu](https://github.com/OMEG-Lu), [@kevenhu001-cyber](https://github.com/kevenhu001-cyber))
- Fixed sidebar setup buttons overflowing the card with long translated labels ([#7312](https://github.com/getpaseo/paseo/pull/7312) by [@gentslava](https://github.com/gentslava))

 ## 0.11.4 - 2026-10-15

@@ -20,7 +20,7 @@ A semantic element used in three or more places is a primitive. One of a kind is

 Primitives live in `packages/app/src/components/ui/` and `packages/app/src/components/headers/`. Card and row layout live in `packages/app/src/styles/settings.ts`. Section structure lives in `packages/app/src/screens/settings/settings-section.tsx`.

-A pressable styled to look like a button is wrong; the button is `<Button>` (`packages/app/src/components/ui/button.tsx`). A pressable wrapping an icon is wrong; the icon action is `<ToolbarButton>` (`packages/app/src/components/ui/pane-content-toolbar.tsx`), which owns the hitbox, the rounded `interactionHighlight` fill on hover and press, the compact size, and the tooltip. Rows on a menu surface are `<MenuItem>`, or `<ComposerTrackRow>` in a track panel; other rows are `<PressHighlight>` (`packages/app/src/components/ui/press-highlight.tsx`), which flashes on native the moment a finger lands. A bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/screens/settings/settings-section.tsx`). A custom `Modal` for a confirmation is wrong; the confirmation is `confirmDialog` (`packages/app/src/utils/confirm-dialog.ts`). A hand-rolled overflow menu is wrong; the menu is `<DropdownMenu>` (`packages/app/src/components/ui/dropdown-menu.tsx`). A hand-rolled status pill is wrong; the pill is `<StatusBadge>` (`packages/app/src/components/ui/status-badge.tsx`). A circle pinned over a scrolling surface is wrong; the floating action is `<FloatingActionButton>` (`packages/app/src/components/ui/floating-action-button.tsx`), one per surface, and the surface reserves `FLOATING_ACTION_BUTTON_CLEARANCE` below its content so the button never traps the last row.
+A pressable styled to look like a button is wrong; the button is `<Button>` (`packages/app/src/components/ui/button.tsx`). A bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/screens/settings/settings-section.tsx`). A custom `Modal` for a confirmation is wrong; the confirmation is `confirmDialog` (`packages/app/src/utils/confirm-dialog.ts`). A hand-rolled overflow menu is wrong; the menu is `<DropdownMenu>` (`packages/app/src/components/ui/dropdown-menu.tsx`). A hand-rolled status pill is wrong; the pill is `<StatusBadge>` (`packages/app/src/components/ui/status-badge.tsx`). A circle pinned over a scrolling surface is wrong; the floating action is `<FloatingActionButton>` (`packages/app/src/components/ui/floating-action-button.tsx`), one per surface, and the surface reserves `FLOATING_ACTION_BUTTON_CLEARANCE` below its content so the button never traps the last row.

 Before adding a new component, read `components/ui/`. The primitive usually exists.

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

 - `fontWeight.medium` on row titles, body text, button labels, badge text, or `<SidebarCallout>` titles. Medium is reserved for the structural-label tier described in §3 — section labels, modal/sheet titles, dense metadata emphasis, and tight action labels. Anything else is `normal`. `<ScreenTitle>` is responsive `400/300` and is never overridden.
 - `<Pressable>` wrapping `<Text>` to make a button. `<Button>` exists.
- Importing `Pressable` or a `Touchable*` outside `components/ui/`. A raw pressable has no standard press or hover feedback, so every one drifts. `paseo/no-raw-pressable` reports it; the files on its burn-down list in `.oxlintrc.json` may only leave it.
 - Bare `<Text>` for a section header inside settings. `<SettingsSection>` exists.
 - A muted paragraph between a section header and its card. Section-level explanation is the header's `info` tooltip (§7).
 - A "Settings" CTA on a detail page. Detail pages are settings; settings is reached from the sidebar, the host entry, or a row's kebab menu.
@@ -535,9 +535,7 @@ For tighter loops, you can rebuild a single workspace:
 `patches/*.patch` are applied by `scripts/postinstall-patches.mjs` on every install. A patch only
 runs when its package is actually present, so add the package to that script's `patchedPackages`
 list when you introduce a new patch — otherwise the file sits in `patches/` and never applies.
-patch-package cannot apply a patch that changed after an earlier version was applied, so the
-script removes that package and fails the install; the next `npm install` reinstalls it clean
-with the current patch. Regenerate a patch with `npx patch-package <package>` after editing `node_modules/<package>`, and
+Regenerate a patch with `npx patch-package <package>` after editing `node_modules/<package>`, and
 patch every build the consumers use: Metro resolves the `react-native` field of a package
 (`src/*.ts` for `react-native-svg`), while Node and Vitest resolve `main`/`module`
 (`lib/commonjs`, `lib/module`). Patching only `lib/` leaves the app bundle unfixed.
@@ -11,7 +11,7 @@ contracts.

 ## Panel host contract

-Every panel registers its supported `PaneHost` values and presentation. Launchers derive
+Every desktop panel registers its supported `PaneHost` values and presentation. Launchers derive
 fixed-target labels and icons from that registration, filter by host, and never substitute one
 panel type for another. Tab moves reject unsupported destinations, and placement resolves only to
 a compatible pane.
@@ -21,10 +21,7 @@ so a pane’s + menu omits each while that pane already contains it. Closing one
 item available again. Other compatible tabs, including agents, terminals, files, and diffs,
 can move between Explorer and main panes.
 Keep panel implementations independent of either shell. `WorkspacePanelHost` owns mounting and
-retention. The shared Explorer owns its tab rail; its shared frame owns visibility, activity and
-close-gesture lifetime. Platform adapters own resizing and inset geometry.
-The host keeps three recently used tabs plus modified tabs; unmodified tabs beyond that budget
-can remount. Native retained content stays live, while web chat uses its existing deferred Freeze.
+retention, while each shell owns its tabs, focus, dragging, resizing, and shortcuts.

 ## Sheets

@@ -43,11 +40,11 @@ remounts its panel. Revealing a target that already has a sheet uncovers that sh
 ones above it, except ones holding unsaved work, which stay where they are. Opening a sheet as a tab
 dismisses the sheets above it, since the tab would sit under them. The stack is not persisted.

-Sheets are modal and cover the whole compact workspace, including the header and Explorer. A sheet's header is its drag
+Sheets are modal and cover the whole compact column, header included. A sheet's header is its drag
 handle, because the panel scrolls on its own and content panning would fight it. Its trailing rail
 holds icon buttons only (`SheetHeaderIconButton`): Open as tab is the full-screen glyph beside
 Close, so the title keeps its width. The sheets present
-from the shared workspace's `SheetHostScope`, so their panels read the navigator and every
+from inside the compact column's `SheetHostScope`, so their panels read the navigator and every
 workspace provider an ordinary pane has without a context bridge
 ([floating-panels.md Gotcha 6](floating-panels.md#gotcha-6--bottom-sheet-refs-are-not-lifecycle-truth)).

@@ -59,16 +56,12 @@ the sheet's tab into a pane, and edits the autosave has not started writing are
 ## Explorer sidebar

 `packages/app/src/workspace-tabs/explorer-sidebar.ts` owns show, hide, toggle, and view selection.
-One Explorer host stays beside the center column across compact overlays and docks. Keep its
-providers and gesture roots at the same React position when width or appearance changes. The
-workspace route preserves panel ancestry during appearance updates. Appearance-dependent leaves
-subscribe to theme changes; the file editor reconfigures its existing editor theme compartment.
-Ordinary leaf routes retain the stack appearance policy.
-The shell is outside the workspace split canvas so it divides the full workspace, including the header. It has its own persisted width and resize handle. Main-pane splits
+On desktop, the shell is rendered outside the workspace split canvas so it divides the full
+workspace, including the header. It has its own persisted width and resize handle. Main-pane splits
 never read or modify that width.

 `packages/app/src/workspace-tabs/open-supporting-view.ts` owns semantic Changes and pull-request
-opens. Compact and wide native layouts select the matching workspace tab in Explorer. Desktop Changes opens
+opens. Compact and wide native layouts select the matching Explorer tab. Desktop Changes opens
 follow the shared diff preference. Desktop pull requests use their Main panel, On the side, or
 Explorer sidebar setting. Automatic PR discovery follows that preference once per workspace without
 interrupting the user's work. Closing the tab opts that workspace out of future automatic opens,
@@ -83,37 +76,18 @@ literal `"explorer"` pane id and `explorerPaneIdByWorkspace` key for compatibili

 Explorer uses the shared workspace tab row and ordinary tab context menus. Files and Changes
 hide their close buttons through the panel manifest; close them from the tab context menu.
-Other tabs reveal the close control on hover. The + menu opens compatible panels in the dock, including Agent and terminal profiles.
-Web also supports dragging agents and terminals into Explorer.
+Other tabs reveal the close control on hover. The + menu opens compatible panels in the dock and
+omits Agent and terminal profiles. Agents and terminals can still be dragged into Explorer.
 Bulk-close actions apply only to the dock's tabs. Explorer tabs can be reordered and dragged
 between compatible panes, but the dock cannot be split or maximized. Selecting an Explorer tab
-does not change workspace focus. Web dragging shares the workspace drag scope; compact layouts
-accept only reordering inside the source pane.
+does not change workspace focus.

-Cmd+E shows or hides Explorer without changing its selected view. All layouts use the same
-workspace tabs, launcher, and panel host. Below 600 points the shell is the swipeable Explorer
-overlay; at 600 points and above it reserves width beside the workspace. Native docking keeps its
-touch resize handle. Full workspace splits remain a separate web-only capability.
-
-The dock reserves at least 240 points and the workspace 360. App navigation yields when it cannot
-share the remaining width with both. This keeps a portrait tablet from rendering three unusably
-narrow columns; widening restores navigation without changing its saved open state.
-
-Compact panel gestures own overlay visibility; the workspace layout owns its tab selection and
-contents on every platform. Explicit pane destinations bypass compact sheet placement, so choosing
-a panel in Explorer's + menu keeps it there. Ordinary compact file and subagent look-ups still use
-the sheet policy. Resolving an existing main tab reveals center immediately; a new file sheet
-keeps Explorer underneath and closing the sheet uncovers it. Semantic navigation resolves the
-actual destination before revealing it, including deduplicated targets.
-
-Compact overlay selection and saved dock visibility are independent. Folding changes geometry,
-not either mode’s visibility intent. Native workspace retention remains one workspace; web retains
-up to ten with its existing inactive TTL.
-
-PR discovery belongs to the active workspace: split layouts discover while active, and other
-layouts discover while Explorer is active. The rail requests summary status; selected visible PR
-content also requests timeline data. Inactive consumers read cached data without request demand.
-Discovery uses ordinary PR tabs and their existing once-per-workspace close opt-out.
+Cmd+E shows or hides Explorer without changing its selected view. Compact layouts use the combined
+full-screen Explorer overlay for Changes, Files, and pull requests, and close it after a file opens. Compact Changes has no tree rail; its overview is the Jump to file action (`packages/app/src/git/jump-to-file/`), a sheet over the same changed-files tree the desktop rail renders.
+Wide native layouts without pane splits use the same combined content in a resizable inline dock;
+opening a file leaves that dock visible. Both presentations keep their selection in the panel store
+and reuse the layout store's per-workspace Explorer width. They do not create a second Explorer
+lifecycle.

 ## Side pane

@@ -157,9 +157,7 @@ a small `withUnistyles` boundary without subscribing the route tree itself to
 every Unistyles runtime update.

 Navigators keep their identity across appearance changes. `ThemedStack` remounts
-each ordinary screen's content below the native stack when appearance tokens change.
-Workspace screens own retained panel lifetimes and update appearance at their
-leaves through `screenOwnedAppearance` ([Explorer](explorer-sidebar.md)). A
+each screen's content below the native stack when appearance tokens change; a
 keyed wrapper above a stack remounts the stack itself, and Android crashes when
 that happens while a FragmentManager transaction is running, which settings
 hydration at startup makes likely. A screen that mounts a nested navigator (the
@@ -4,10 +4,6 @@ Use `MarkdownRenderer` for chat replies, file previews, plans, pull requests and

 Native selection belongs to the library's text view. Keep an assistant message in one row so selection can cross paragraphs, headings and lists. Code blocks and tables use the library's native views and their selection behavior. Web uses browser selection over semantic HTML. Once its WASM parser is initialized, the library parses synchronously for the first commit of each mounted row; an empty interim row would corrupt virtualized measurements and move the reader. Chat owns paced reveal, the web render cap, message identity and list measurement. Native renders completed messages together. While streaming, it keeps closed blocks in one head view and updates a separate tail, then reunites the text on completion. See [native parsing cost](agent-stream-performance.md#native-parsing-cost) for the boundary and pacing constraints.

-## Block spacing
-
-Every block is separated by one gap, `density.blockGap`: 12 on compact layouts, 16 wider. Inside the library's text, every element style ends with that gap and the library drops it after the last block. Views stacked outside the library (Mermaid segments, streaming head and tail) use the same gap through `MarkdownBlockStack`. Do not give a block type its own margins; change the gap.
-
 ## Links and images

 Workspace file links use the shared file-link resolver. The workspace supplies its client, root and open-file action once; chat can supply the agent's more specific context. URLs use the same link press path. Recognized inline-code paths stay tappable. The library callback carries the tapped occurrence’s syntax context. Preserve it when opening files: explicit Markdown links decode URL escapes, while recognized inline-code paths preserve literal percent characters and use suffix lookup. Identical URL strings in different occurrences must stay distinct. Explicit absolute workspace links receive a relative hover title; existing authored titles remain intact.
@@ -22,7 +18,7 @@ Math and video are disabled. Task lists and admonitions are enabled; task checkb

 Mermaid fences use the existing isolated diagram runtime and fullscreen viewer. Web dispatches them through the library’s code-block override. Native has no block-renderer hook, so the renderer extracts only Mermaid fences and places the existing WebView host between library-rendered segments. This is the only block exception; see [native selection limitations](native-text-selection.md) for diagram grouping and leading inline images. Streaming keeps the last valid diagram visible while the next revision renders.

-Native code blocks use the library's copy control and compiled grammars. Web code blocks use `HighlightedCodeBlock` through the library's `renderers.codeBlock` override. The patch also keeps the library's block spacing around the web code block override, preserves web list numbering and link titles, marks pending parses with `aria-busy` so Find waits for rendered text, and carries link syntax through native and web tap events. Web inline code inside a link inherits only the link colour; its code font, size and background stay intact. Keep link variants colour-only: native pills replace text runs and prevent paths from wrapping; Android pills also use the surrounding block’s font size. The package patch is tracked by [upstream PR #997](https://github.com/software-mansion/enriched-markdown/pull/997); remove the patch when the pinned release includes it.
+Native code blocks use the library's copy control and compiled grammars. Web code blocks use `HighlightedCodeBlock` through the library's `renderers.codeBlock` override. The patch also preserves web list numbering and link titles, marks pending parses with `aria-busy` so Find waits for rendered text, and carries link syntax through native and web tap events. Web inline code inside a link inherits only the link colour; its code font, size and background stay intact. Keep link variants colour-only: native pills replace text runs and prevent paths from wrapping; Android pills also use the surrounding block’s font size. The package patch is tracked by [upstream PR #997](https://github.com/software-mansion/enriched-markdown/pull/997); remove the patch when the pinned release includes it.

 The package patch also keeps overflowing native horizontal blocks in control of their drags: Android claims parent interception at touch-down and releases it for vertical drags so the chat list can scroll; iOS keeps its scroll recognizer active for outward drags at the leading edge. This prevents compact sidebar pans from taking block scrolling without changing sidebar swipes on prose or non-overflowing blocks. Native changes require a client rebuild.

@@ -32,9 +32,7 @@ The UI worklet owns transient motion:

 React publishes the active panel only when the canonical target and the UI-thread position agree at
 the final anchor. Retained content never observes gesture previews, progress, or an unsettled target.
-The gesture hosts stay mounted. The Gesture Handler web patch keeps initially disabled hosts
-from capturing paragraph pointers; that capture confines browser selection to its starting paragraph.
-Native worklets own overlay opacity and pointer events while
+The gesture hosts stay mounted. Native worklets own overlay opacity and pointer events while
 React owns settled panel activity and accessibility. Keep hidden native overlays laid out: collapsing
 their scroll ranges makes Android spring retained offsets back to zero during touch cancellation or
 release. Native panel hosts and their dependent draggable lists
@@ -240,9 +240,8 @@ Do not put any other code modules in the plugin root.

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

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

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

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

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

 ## Usage sources

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

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

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

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

 A shim that exists for old-app or old-daemon support carries a comment naming it, the version it arrived in, and when it can go:
@@ -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. 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.
+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.

 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.

@@ -193,7 +193,7 @@ Test suites in this repo are heavy. Running them in bulk freezes the machine, es
 - Playwright specs that exercise only the daemon import `daemonTest` from the shared fixtures so they do not create a browser context or page.
 - Helpers that create projects or workspaces own those records until cleanup. Their clients remove the daemon project on close, and an automatic fixture fails any test that still leaks a project record. Deleting only the temporary directory is not cleanup. Agent helpers pass the intended `workspaceId` through to agent creation; they never infer ownership from `cwd`.
 - Tests whose subject is daemon-global state, such as an empty history or daemon restart, start a dedicated host explicitly. Filenames and directories describe product behavior, never execution order or isolation mechanics.
- Global setup accepts Metro as ready only when `/status` returns `packager-status:running`, then fetches the document's scripts so the cold bundle compilation finishes before Playwright's per-test timeout starts. A generic TCP listener is not sufficient readiness evidence. The browser suite uses direct local daemon connections and does not start a relay. Automated Metro launches set `EXPO_UNSTABLE_HEADLESS=1` so Expo does not download the native DevTools shell into temporary test homes; its read-only cache breaks teardown. Browser fixtures and the standalone Electron browser runner share the developer-toast dismissal helper while retaining console logs. A pointer click moves hover away from the tested control and stalls behind app modal backdrops.
+- Global setup accepts Metro as ready only when `/status` returns `packager-status:running`, then fetches the document's scripts so the cold bundle compilation finishes before Playwright's per-test timeout starts. A generic TCP listener is not sufficient readiness evidence. The browser suite uses direct local daemon connections and does not start a relay.
 - The app Playwright harness boots on Windows as well as POSIX. Spawn Node entrypoints through `process.execPath`, not `npx` or `node_modules/.bin` shims: Node refuses to spawn `.cmd` or `.bat` without `shell: true`, and shell mode concatenates argv without escaping and sends kill signals to `cmd.exe` instead of the real child.
 - Teardown kills the process tree, because a Windows signal reaches only the direct child and leaves forked workers holding the listening port.
 - The `asdf`-backed local Elixir relay stays POSIX-only, so the `relay-deployment` Playwright project is unavailable on Windows.
@@ -251,8 +251,7 @@ do not imply local ownership or authorization. Capture the sender title at deliv
 removed senders must remain understandable without a live directory lookup.

 The optional `agentMessage` payload carries event, sender, and delivered text. Shared client
-presentation (`protocol/paseo-tool-presentation`) owns its heading and expanded details, next to the
-labels for every Paseo MCP tool. The daemon
+presentation (`protocol/agent-message-display`) owns its heading and expanded details. The daemon
 must not construct UI labels or prepend sender labels to the semantic message body. The existing
 `tool_call` / `plain_text` envelope is a compatibility adapter: older clients still parse the row and
 expand its body. New clients use the typed payload, never infer the event from a tool name or parse
@@ -1,8 +0,0 @@
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
-
-Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
-
-Added
- Added background workspaces, hidden from the sidebar unless Show background is on
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
-
-Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
-
-Added
- Added background workspaces, hidden from the sidebar unless Show background is on
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
-
-Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
-
-Added
- Added background workspaces, hidden from the sidebar unless Show background is on
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and more than 120 fixes.
-
-Before upgrading: paseo run --background is deprecated in favor of --no-wait, and paseo permit allow and deny now exit non-zero when the daemon doesn't confirm within 15 seconds
-
-Added
- Added background workspaces, hidden from the sidebar unless Show background is on
-
-Full notes: https://paseo.sh/changelog
@@ -45,21 +45,6 @@
        }
      );

-      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, ... }:
@@ -257,7 +257,7 @@ buildNpmPackage {
  meta = {
    description = "Paseo desktop app (Electron wrapper)";
    homepage = "https://github.com/getpaseo/paseo";
-    license = lib.licenses.asl20;
+    license = lib.licenses.agpl3Plus;
    mainProgram = "paseo-desktop";
    platforms = lib.platforms.linux ++ lib.platforms.darwin;
  };
@@ -1 +1 @@
-sha256-7B/Zyo/DaHdd3PVq8Hn1HG+x+wLdZBVxgx/cbtaM/S8=
+sha256-O8sNh6oXFIddUljYiC6RbVZF5/7a7A7W9UWrOd0tIV4=
@@ -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.asl20;
+    license = lib.licenses.agpl3Plus;
    mainProgram = "paseo";
    platforms = lib.platforms.linux ++ lib.platforms.darwin;
  };
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.2",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -137,21 +137,16 @@
    "oxlint-tsgolint": "^0.22.1",
    "patch-package": "^8.0.1",
    "playwright": "^1.56.1",
-    "react-dom": "19.2.3",
    "typescript": "^5.9.3",
    "ws": "^8.20.0"
  },
  "overrides": {
    "@codemirror/language": "6.12.4",
    "@codemirror/view": "6.43.6",
-    "expo": "~57.0.30",
-    "expo-router": "~57.0.28",
    "lightningcss": "1.30.1",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
-    "react-native": "0.86.3",
-    "react-native-gesture-handler": "~2.32.0",
-    "react-native-reanimated": "4.5.1",
-    "react-native-worklets": "0.10.1"
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
+    "react-native-reanimated": "4.3.1",
+    "react-native-worklets": "0.8.3"
  }
 }
@@ -171,7 +171,6 @@ export default {
      [
        "expo-build-properties",
        {
-          ios: { enableSceneSupport: true },
          android: {
            minSdkVersion: 29,
            kotlinVersion: "2.1.20",
@@ -2,56 +2,48 @@ import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { test, expect, type Page } from "../support/fixtures";
 import { seedMockAgentWorkspace, openAgentRoute } from "../support/helpers/mock-agent";
-import { openChangesPanel, openChangesTreePanel } from "../support/helpers/workspace-tabs";
+import { openChangesPanel } from "../support/helpers/workspace-tabs";

 function visibleComposer(page: Page) {
  return page.locator("textarea[data-composer-input]").filter({ visible: true }).first();
 }

-for (const width of [1400, 390]) {
-  test(`adds a changed file to the focused chat without replacing its composer draft at ${width}px`, async ({
-    page,
-  }) => {
-    const workspace = await seedMockAgentWorkspace({
-      repoPrefix: "add-file-to-chat-",
-      title: "Target chat",
-    });
-    const relativePath = "src/changed file.ts";
-
-    try {
-      await mkdir(path.join(workspace.cwd, "src"), { recursive: true });
-      await writeFile(path.join(workspace.cwd, relativePath), "export const changed = true;\n");
-      await workspace.client.checkoutRefresh(workspace.cwd);
-
-      await page.setViewportSize({ width, height: 900 });
-      await openAgentRoute(page, {
-        workspaceId: workspace.workspaceId,
-        agentId: workspace.agentId,
-      });
-
-      const agentComposer = visibleComposer(page);
-      await expect(agentComposer).toBeEditable({ timeout: 30_000 });
-      await agentComposer.fill("Preserve this thought");
-
-      if (width < 600) await openChangesTreePanel(page);
-      else await openChangesPanel(page);
-      const changedFile = page.getByTestId("diff-file-0-toggle");
-      await expect(changedFile).toBeVisible({ timeout: 30_000 });
-      await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
-      await page.getByTestId("diff-file-0-add-to-chat").click();
-
-      const attachment = page.getByTestId("composer-workspace-file-attachment-pill");
-      if (width < 600)
-        await expect(
-          page.getByTestId("workspace-explorer-sidebar").filter({ visible: true }),
-        ).toHaveCount(0);
-      await expect(attachment).toContainText("changed file.ts");
-      await expect(attachment).toContainText(relativePath);
-      await expect(agentComposer).toHaveValue("Preserve this thought");
-      if (width >= 600) await expect(agentComposer).toBeFocused();
-      else await expect(agentComposer).toBeEditable();
-    } finally {
-      await workspace.cleanup();
-    }
+test("adds a changed file to the focused chat without replacing its composer draft", async ({
+  page,
+}) => {
+  const workspace = await seedMockAgentWorkspace({
+    repoPrefix: "add-file-to-chat-",
+    title: "Target chat",
  });
-}
+  const relativePath = "src/changed file.ts";
+
+  try {
+    await mkdir(path.join(workspace.cwd, "src"), { recursive: true });
+    await writeFile(path.join(workspace.cwd, relativePath), "export const changed = true;\n");
+    await workspace.client.checkoutRefresh(workspace.cwd);
+
+    await page.setViewportSize({ width: 1400, height: 900 });
+    await openAgentRoute(page, {
+      workspaceId: workspace.workspaceId,
+      agentId: workspace.agentId,
+    });
+
+    const agentComposer = visibleComposer(page);
+    await expect(agentComposer).toBeEditable({ timeout: 30_000 });
+    await agentComposer.fill("Preserve this thought");
+
+    await openChangesPanel(page);
+    const changedFile = page.getByText("changed file.ts", { exact: true }).first();
+    await expect(changedFile).toBeVisible({ timeout: 30_000 });
+    await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
+    await page.getByTestId("diff-file-0-add-to-chat").click();
+
+    const attachment = page.getByTestId("composer-workspace-file-attachment-pill");
+    await expect(attachment).toContainText("changed file.ts");
+    await expect(attachment).toContainText(relativePath);
+    await expect(agentComposer).toHaveValue("Preserve this thought");
+    await expect(agentComposer).toBeFocused();
+  } finally {
+    await workspace.cleanup();
+  }
+});
@@ -26,7 +26,7 @@ test("agent list age advances and command center says just now for a fresh agent
    const agentResult = commandCenter.getByTestId(
      `command-center-agent-${getServerId()}:${session.agentId}`,
    );
-    await expect(agentResult.getByTestId("command-center-result-timestamp")).toContainText(
+    await expect(agentResult.getByTestId("command-center-agent-subtitle")).toContainText(
      "just now",
    );
    await page.keyboard.press("Escape");
@@ -833,15 +833,13 @@ test("compact Changes keeps its actions compact and menu-only", async ({ page })
  await openWorkspaceChanges(page, workspace);
  await page.setViewportSize({ width: 480, height: 900 });

-  const compactChangesTab = page
-    .getByTestId("workspace-tab-changes_tree")
-    .filter({ visible: true });
+  const compactChangesTab = page.getByTestId("explorer-tab-changes").filter({ visible: true });
  if (!(await compactChangesTab.isVisible())) {
    await page.getByTestId("workspace-explorer-toggle").first().click();
  }
  await expect(compactChangesTab).toBeVisible();
  await compactChangesTab.click();
-  const compactExplorer = page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
+  const compactExplorer = page.getByTestId("explorer-content-area").filter({ visible: true });
  await expect(compactExplorer.getByTestId("changes-header")).toBeVisible();

  const actions = compactExplorer.getByTestId("changes-actions-menu-trigger");
@@ -878,27 +876,6 @@ test("compact Changes keeps its actions compact and menu-only", async ({ page })
  ).toContainText("Scroll long lines");
 });

-test("compact Explorer renders inline hunks with a saved tree-only desktop preference", async ({
-  page,
-}) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await page.addInitScript(
-    ({ key }) => {
-      localStorage.setItem(key, JSON.stringify({ inlineDiff: false, layout: "split" }));
-    },
-    { key: CHANGES_PREFERENCES_KEY },
-  );
-  const explorer = await openCompactChanges(page, workspace);
-  await expect(explorer.getByTestId("git-diff-canvas")).toBeVisible();
-  await expect(explorer.getByTestId("diff-file-0-toggle")).toBeVisible();
-  await explorer.getByTestId("diff-file-0-toggle").click({ button: "right" });
-  page.once("dialog", (dialog) => dialog.accept());
-  await page.getByTestId("diff-file-0-revert").click();
-  await expect
-    .poll(() => readFile(path.join(workspace.repoPath, "src/use-mounted-tab-set.ts"), "utf8"))
-    .toBe(BEFORE);
-});
-
 test("compact Changes jumps to a file from the changed-files sheet", async ({ page }) => {
  const workspace = await createWorkspaceWithMountedTabDiff({ includeNestedFolders: true });
  await useUnwrappedDiffLines(page);
@@ -1697,10 +1674,10 @@ async function openCompactChanges(page: Page, workspace: DirtyWorkspace): Promis
  await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.id));
  await page.reload();
  await page.getByTestId("workspace-explorer-toggle").first().click();
-  const changesTab = page.getByTestId("workspace-tab-changes_tree").filter({ visible: true });
+  const changesTab = page.getByTestId("explorer-tab-changes").filter({ visible: true });
  await expect(changesTab).toBeVisible({ timeout: 30_000 });
  await changesTab.click();
-  const explorer = page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
+  const explorer = page.getByTestId("explorer-content-area").filter({ visible: true });
  await expect(explorer.getByTestId("changes-header")).toBeVisible({ timeout: 30_000 });
  return explorer;
 }
@@ -45,8 +45,7 @@ test("opening the command center keeps its first result fully visible", async ({
    await expectCommandCenterToRemainAtTheTop(page);
    await expectPrimaryCommandCenterActions(panel);
    await expectVisibleKeyboardNavigationNotToScroll(page, panel);
-    // The empty query lists the most recent workspaces, so the last one seeded leads it.
-    await expectTightTwoLineResultSpacing(panel, "Command Center Scroll 08");
+    await expectTightTwoLineResultSpacing(panel, "Command Center Scroll 00");
    await expectWorkspaceResultsToBeLimitedUntilSearch(panel);
  } finally {
    await seeded.cleanup();
@@ -1,115 +0,0 @@
-import { execFileSync } from "node:child_process";
-import { mkdtemp, writeFile } from "node:fs/promises";
-import path from "node:path";
-import { test, expect, type Page } from "../support/fixtures";
-import { getServerId } from "../support/helpers/server-id";
-import { connectSeedClient } from "../support/helpers/seed-client";
-import { createTempGitRepo, resolveTempRoot } from "../support/helpers/workspace";
-import { buildHostWorkspaceRoute } from "../../src/utils/host-routes";
-
-// The compact toolbar flattens every git action into one menu, and the policy keeps the actions
-// it can promote to `primary` in `secondary` as well. A promoted action must still show once.
-const cleanupTasks: Array<() => Promise<void>> = [];
-
-test.afterEach(async () => {
-  for (const task of cleanupTasks.splice(0)) {
-    await task();
-  }
-});
-
-async function createRemoteRepo(prefix: string): Promise<string> {
-  const repo = await createTempGitRepo(prefix, {
-    withRemote: true,
-    files: [{ path: "src/app.ts", content: "export const app = 1;\n" }],
-  });
-  cleanupTasks.push(repo.cleanup);
-  // The helper puts the bare remote inside the checkout; keep it out of the status.
-  await writeFile(path.join(repo.path, ".git/info/exclude"), "remote.git/\n");
-  return repo.path;
-}
-
-async function registerWorkspace(repoPath: string): Promise<string> {
-  const client = await connectSeedClient();
-  cleanupTasks.push(async () => {
-    await client.close().catch(() => undefined);
-  });
-  const created = await client.createWorkspace({ source: { kind: "directory", path: repoPath } });
-  if (!created.workspace) {
-    throw new Error(created.error ?? `Failed to create workspace ${repoPath}`);
-  }
-  return created.workspace.id;
-}
-
-async function openCompactActionsMenu(page: Page, workspaceId: string) {
-  await page.setViewportSize({ width: 390, height: 844 });
-  await page.goto(buildHostWorkspaceRoute(getServerId(), workspaceId));
-  await page.reload();
-  await page.getByTestId("workspace-explorer-toggle").first().click();
-  const changesTab = page.getByTestId("workspace-tab-changes_tree").filter({ visible: true });
-  await expect(changesTab).toBeVisible({ timeout: 30_000 });
-  await changesTab.click();
-  const explorer = page.getByTestId("workspace-explorer-sidebar").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",
-  ]);
-});
@@ -71,14 +71,6 @@ test("compact opens files and subagents in a sheet, leaving the tabs for agents"
      await closeSheet(page, "linked.ts");
    });

-    await test.step("a subagent's row shows the facts its sheet shows", async () => {
-      await page.getByTestId("subagents-track-header").click();
-      await expect(page.getByTestId(`subagents-track-row-facts-${child.id}`)).toHaveText(
-        "Ten second stream · Low · Load test",
-      );
-      await tapSheetBackdrop(page);
-    });
-
    await test.step("a subagent opens in a sheet over the subagents list", async () => {
      await openSubagentFromCompactTrack(page, child.id);

@@ -125,7 +125,7 @@ test("composer diff stat opens the compact explorer instead of a Changes tab", a
    });

    const closeExplorer = page
-      .getByTestId("workspace-explorer-sidebar")
+      .getByTestId("explorer-header")
      .getByRole("button", { name: "Close Explorer sidebar" });
    await expect(closeExplorer).not.toBeInViewport();

@@ -809,7 +809,7 @@ async function expectUnmatchedFeedback(page: Page) {
 }

 function compactReviewSurface(page: Page) {
-  return page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
+  return page.getByTestId("explorer-content-area").filter({ visible: true });
 }
 async function openCompactReviewExplorer(
  page: Page,
@@ -847,10 +847,7 @@ async function scrollReviewToLastLine(page: Page) {

 async function revealCompactChanges(page: Page) {
  await page.getByTestId("workspace-explorer-toggle").first().click();
-  await page
-    .getByTestId("workspace-explorer-sidebar")
-    .getByTestId("workspace-tab-changes_tree")
-    .click();
+  await page.getByTestId("explorer-header").getByText("Changes", { exact: true }).click();
  await expect(compactReviewSurface(page).getByTestId("diff-file-0-body")).toBeVisible();
 }
 async function expectReviewEditorBody(page: Page, body: string) {
@@ -1,7 +1,6 @@
 import { expect, test, type Page } from "../support/fixtures";
 import {
  blurComposerInput,
-  roundTripComposerTabBeforePaint,
  composerLocator,
  enterComposerFullscreen,
  exitComposerFullscreen,
@@ -18,6 +17,7 @@ import {
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 import { createMockIdleAgent, openWorkspaceWithAgents } from "../support/helpers/archive-tab";
 import { seedWorkspace } from "../support/helpers/seed-client";
+import { switchComposerTabWithKeyboard } from "../support/helpers/composer";
 import {
  closeMobileAgentSidebar,
  closeMobileExplorer,
@@ -205,21 +205,19 @@ test.describe("touch screen wide enough for the desktop layout", () => {
        title: "Second touch chat",
      });
      await openWorkspaceWithAgents(page, [first, second]);
-      // Repeat after an explicit edit so retained focus from an earlier visit is
-      // also dismissed when the same mounted editor becomes inactive again.
-      for (const draft of ["Keep this touch draft", "Edit this touch draft again"]) {
-        await composerLocator(page).fill(draft);
-        await expectComposerFocused(page);
-        // An external keyboard changes tabs without a pointer click blurring the
-        // editor first. The device still has a touch-primary focus policy.
-        await roundTripComposerTabBeforePaint(page, "Second touch chat");
-        await expectComposerDraft(page, draft);
-        await expectComposerNotFocused(page);
-        await composerLocator(page).tap();
-        await expectComposerFocused(page);
-        await typeIntoFocusedComposer(page, " after return");
-        await expectComposerDraft(page, `${draft} after return`);
-      }
+      await composerLocator(page).fill("Keep this touch draft");
+      await expectComposerFocused(page);
+      // An external keyboard changes tabs without a pointer click blurring the
+      // editor first. The device still has a touch-primary focus policy.
+      await switchComposerTabWithKeyboard(page, "previous");
+      await expectComposerDraft(page, "");
+      await switchComposerTabWithKeyboard(page, "next");
+      await expectComposerDraft(page, "Keep this touch draft");
+      await expectComposerNotFocused(page);
+      await composerLocator(page).tap();
+      await expectComposerFocused(page);
+      await typeIntoFocusedComposer(page, " after return");
+      await expectComposerDraft(page, "Keep this touch draft after return");
    } finally {
      await workspace.cleanup();
    }
@@ -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% used", { exact: true })).toBeVisible();
+          await expect(account.getByText("31%", { 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% used", { exact: true }),
+            usageCard(details, "login-journey:account").getByText("31%", { exact: true }),
          ).toBeVisible();
        });
      } finally {
@@ -1,118 +0,0 @@
-import type { Page } from "@playwright/test";
-import { test, expect } from "../support/fixtures";
-import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
-
-interface DragMeasurement {
-  observer: MutationObserver;
-  stylesheetMutations: number;
-}
-
-declare global {
-  interface Window {
-    __PASEO_EXPLORER_DRAG_MEASUREMENT__?: DragMeasurement;
-  }
-}
-
-async function waitForResizePaint(page: Page): Promise<void> {
-  await page.evaluate(
-    () =>
-      new Promise<void>((resolve) => {
-        requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
-      }),
-  );
-}
-
-async function beginResizeMeasurement(page: Page): Promise<void> {
-  await page.evaluate(() => {
-    const stylesheet = document.getElementById("unistyles-web");
-    if (!stylesheet) throw new Error("Shared stylesheet is missing");
-    globalThis.__PASEO_RESET_RENDER_PROFILE__!();
-    const measurement: DragMeasurement = {
-      stylesheetMutations: 0,
-      observer: new MutationObserver((records) => {
-        measurement.stylesheetMutations += records.length;
-      }),
-    };
-    measurement.observer.observe(stylesheet, {
-      childList: true,
-      subtree: true,
-      characterData: true,
-    });
-    window.__PASEO_EXPLORER_DRAG_MEASUREMENT__ = measurement;
-  });
-}
-
-async function previewExplorerResize(page: Page, distance: number) {
-  const handle = page
-    .getByTestId("workspace-explorer-sidebar-resize-handle")
-    .getByRole("separator");
-  const explorer = page.getByTestId("workspace-explorer-sidebar");
-  const bounds = await handle.boundingBox();
-  if (!bounds) throw new Error("Explorer resize handle is missing");
-  const before = (await explorer.boundingBox())!.width;
-  const x = bounds.x + bounds.width / 2;
-  const y = bounds.y + 100;
-  await page.mouse.move(x, y);
-  await page.mouse.down();
-  await waitForResizePaint(page);
-  await beginResizeMeasurement(page);
-  for (let move = 1; move <= 20; move++) {
-    await page.mouse.move(x + (distance * move) / 20, y);
-    await waitForResizePaint(page);
-  }
-  const during = (await explorer.boundingBox())!.width;
-  const measurement = await page.evaluate(() => {
-    const state = window.__PASEO_EXPLORER_DRAG_MEASUREMENT__!;
-    state.observer.disconnect();
-    return {
-      stylesheetMutations: state.stylesheetMutations,
-      paneRenders: Object.entries(globalThis.__PASEO_RENDER_PROFILE_REASONS__ ?? {})
-        .filter(([id]) => id.startsWith("SplitPaneView:"))
-        .reduce((sum, [, reasons]) => sum + (reasons.render ?? 0), 0),
-    };
-  });
-  await page.mouse.up();
-  await waitForResizePaint(page);
-  const after = (await explorer.boundingBox())!.width;
-  expect(during).toBeCloseTo(before - distance, 0);
-  expect(after).toBeCloseTo(during, 0);
-  return { ...measurement, width: after };
-}
-
-async function expectExplorerWidthSurvivesReload(page: Page, width: number): Promise<void> {
-  await page.reload();
-  const explorer = page.getByTestId("workspace-explorer-sidebar");
-  await expect(explorer).toBeVisible();
-  await expect.poll(async () => (await explorer.boundingBox())?.width).toBeCloseTo(width, 0);
-}
-
-test("Explorer drag previews without rerendering panes or rewriting the shared stylesheet", async ({
-  page,
-  withWorkspace,
-}) => {
-  await page.setViewportSize({ width: 1600, height: 1000 });
-  await page.addInitScript(() => {
-    globalThis.__PASEO_RENDER_PROFILE_ENABLED__ = true;
-  });
-  const workspace = await withWorkspace();
-  await workspace.navigateTo();
-  await runWorkspaceActionFromCommandCenter(page, "Split pane right");
-  await runWorkspaceActionFromCommandCenter(page, "Split pane right");
-  await page.getByTestId("workspace-explorer-toggle").first().click();
-  await expect(page.getByTestId("workspace-explorer-sidebar")).toBeVisible();
-  // Verify that direct pane renders are being counted before resetting them.
-  expect(
-    await page.evaluate(() =>
-      Object.keys(globalThis.__PASEO_RENDER_PROFILE_REASONS__ ?? {}).some((id) =>
-        id.startsWith("SplitPaneView:"),
-      ),
-    ),
-  ).toBe(true);
-  const grown = await previewExplorerResize(page, -100);
-  const shrunk = await previewExplorerResize(page, 50);
-  expect(grown.stylesheetMutations).toBe(0);
-  expect(grown.paneRenders).toBe(0);
-  expect(shrunk.stylesheetMutations).toBe(0);
-  expect(shrunk.paneRenders).toBe(0);
-  await expectExplorerWidthSurvivesReload(page, shrunk.width);
-});
@@ -1,7 +1,3 @@
-import { seedMockAgentWorkspace, openAgentRoute } from "../support/helpers/mock-agent";
-import { writeFile } from "node:fs/promises";
-import { openFileFromExplorer } from "../support/helpers/file-explorer";
-import { openSettingsSection, clickSettingsBackToWorkspace } from "../support/helpers/settings";
 import { expect, test } from "../support/fixtures";
 import {
  gotoWorkspace,
@@ -140,9 +136,10 @@ test("Explorer keeps Files and Changes close actions in the context menu", async
      await explorer.getByRole("button", { name: "New tab", exact: true }).click();
      const menu = page.getByTestId("workspace-new-tab-menu").filter({ visible: true });
      await expect(menu).toBeVisible();
-      await expect(menu.getByRole("menuitem", { name: /^Agent/ })).toHaveCount(1);
+      await expect(menu.getByRole("menuitem", { name: /^Agent/ })).toHaveCount(0);
      await expect(menu.getByRole("menuitem", { name: /^Files/ })).toHaveCount(0);
      await expect(menu.getByRole("menuitem", { name: /^Changes/ })).toHaveCount(0);
+      await expect(menu.getByText("Terminal profiles", { exact: true })).toHaveCount(0);
      await expect(menu.getByRole("menuitem", { name: /^Terminal/ })).toBeVisible();
      const entries = await menu.getByRole("menuitem").allTextContents();
      expect(entries.findIndex((entry) => entry.startsWith("Terminal"))).toBeLessThan(
@@ -194,11 +191,13 @@ test("Explorer keeps Files and Changes close actions in the context menu", async
  }
 });

-async function dragTabIntoExplorer(
+async function dragAgentIntoExplorer(
  page: Parameters<typeof ensureExplorerSidebar>[0],
-  tabId: string,
+  agentId: string,
 ) {
-  const source = page.getByTestId("workspace-pane-main").getByTestId(`workspace-tab-${tabId}`);
+  const source = page
+    .getByTestId("workspace-pane-main")
+    .getByTestId(`workspace-tab-agent_${agentId}`);
  const destination = explorerSidebar(page).getByTestId("workspace-tab-files");
  const sourceBox = await source.boundingBox();
  const destinationBox = await destination.boundingBox();
@@ -214,7 +213,7 @@ async function dragTabIntoExplorer(
  await page.mouse.up();
 }

-test("moves agents into Explorer and keeps the shared Agent launcher available", async ({
+test("agents can still be dragged into Explorer when absent from its + menu", async ({
  page,
 }, testInfo) => {
  const workspace = await seedWorkspace({ repoPrefix: "explorer-agent-drag-" });
@@ -231,13 +230,14 @@ test("moves agents into Explorer and keeps the shared Agent launcher available",
    });
    const main = page.getByTestId("workspace-pane-main");
    await expect(main.getByTestId(`workspace-tab-agent_${agent.id}`)).toBeVisible();
-    await dragTabIntoExplorer(page, `agent_${agent.id}`);
+    await dragAgentIntoExplorer(page, agent.id);
    await expect(explorer.getByTestId(`workspace-tab-agent_${agent.id}`)).toBeVisible();
    await expect(main.getByTestId(`workspace-tab-agent_${agent.id}`)).toHaveCount(0);
    await explorer.getByRole("button", { name: "New tab", exact: true }).click();
    const menu = page.getByTestId("workspace-new-tab-menu").filter({ visible: true });
    await expect(menu).toBeVisible();
-    await expect(menu.getByRole("menuitem", { name: /^Agent/ })).toHaveCount(1);
+    await expect(menu.getByRole("menuitem", { name: /^Agent/ })).toHaveCount(0);
+    await expect(menu.getByText("Terminal profiles", { exact: true })).toHaveCount(0);
    await page.keyboard.press("Escape");
    await testInfo.attach("agent-in-explorer", {
      body: await page.screenshot(),
@@ -247,273 +247,3 @@ test("moves agents into Explorer and keeps the shared Agent launcher available",
    await workspace.cleanup();
  }
 });
-
-test("tablet prototype keeps Explorer tabs when resizing down to a phone", async ({
-  page,
-}, testInfo) => {
-  const workspace = await seedWorkspace({ repoPrefix: "tablet-explorer-" });
-  try {
-    await page.setViewportSize({ width: 951, height: 669 });
-    await gotoWorkspace(page, workspace.workspaceId);
-    await waitForWorkspaceTabsVisible(page);
-    await ensureExplorerSidebar(page);
-    await expect(
-      explorerSidebar(page).getByRole("button", { name: "Browse workspace files", exact: true }),
-    ).toBeVisible();
-    await page.screenshot({ path: testInfo.outputPath("tablet-951.png") });
-    await openExplorerAgentDraft(page);
-    await page.screenshot({ path: testInfo.outputPath("tablet-agent-draft.png") });
-    await page.setViewportSize({ width: 390, height: 844 });
-    await revealPhoneExplorer(page);
-    await expect(
-      explorerSidebar(page).getByRole("button", { name: "New tab", exact: true }),
-    ).toBeVisible();
-    await page.screenshot({ path: testInfo.outputPath("phone-shared-explorer.png") });
-  } finally {
-    await workspace.cleanup();
-  }
-});
-
-async function openExplorerAgentDraft(page: Parameters<typeof ensureExplorerSidebar>[0]) {
-  await explorerSidebar(page).getByRole("button", { name: "New tab", exact: true }).click();
-  await page.getByRole("menuitem", { name: /^Agent/ }).click();
-  await expect(explorerSidebar(page).getByRole("textbox").first()).toBeVisible();
-}
-
-async function revealPhoneExplorer(page: Parameters<typeof ensureExplorerSidebar>[0]) {
-  await page.getByRole("button", { name: "Open Explorer sidebar", exact: true }).click();
-  await expect(explorerSidebar(page)).toBeVisible();
-  await expect(
-    explorerSidebar(page).getByRole("button", { name: "Close Explorer sidebar", exact: true }),
-  ).toBeInViewport({ ratio: 1 });
-}
-
-async function cycleWorkspaceTheme(page: Parameters<typeof ensureExplorerSidebar>[0]) {
-  await page.keyboard.press("Control+Alt+t");
-}
-
-test("retains the Explorer host through appearance changes and folding", async ({ page }) => {
-  const workspace = await seedWorkspace({ repoPrefix: "explorer-lifetime-" });
-  try {
-    await gotoWorkspace(page, workspace.workspaceId);
-    const explorer = await ensureExplorerSidebar(page);
-    await openFilesPanel(page);
-    const host = await explorer.elementHandle();
-    if (!host) throw new Error("Explorer must be mounted before changing appearance");
-    const previousColor = await explorer.evaluate(
-      (element) => getComputedStyle(element).backgroundColor,
-    );
-    await cycleWorkspaceTheme(page);
-    await expect
-      .poll(() => explorer.evaluate((element) => getComputedStyle(element).backgroundColor))
-      .not.toBe(previousColor);
-    expect(await host.evaluate((element) => element.isConnected)).toBe(true);
-    await page.setViewportSize({ width: 390, height: 844 });
-    await ensureExplorerSidebar(page);
-    expect(await host.evaluate((element) => element.isConnected)).toBe(true);
-    await page.setViewportSize({ width: 1280, height: 900 });
-    await expect(explorer).toBeVisible();
-    expect(await host.evaluate((element) => element.isConnected)).toBe(true);
-  } finally {
-    await workspace.cleanup();
-  }
-});
-
-async function reorderCompactExplorerTabs(page: Parameters<typeof ensureExplorerSidebar>[0]) {
-  const explorer = explorerSidebar(page);
-  const files = explorer.getByTestId("workspace-tab-files");
-  const changes = explorer.getByTestId("workspace-tab-changes_tree");
-  const source = await changes.boundingBox();
-  const target = await files.boundingBox();
-  if (!source || !target) throw new Error("Explorer tabs must be visible to reorder");
-  await page.mouse.move(source.x + source.width / 2, source.y + source.height / 2);
-  await page.mouse.down();
-  await page.mouse.move(source.x + source.width / 2 - 12, source.y + source.height / 2);
-  await page.mouse.move(target.x + 3, target.y + target.height / 2, { steps: 20 });
-  await page.mouse.up();
-  await expect
-    .poll(async () => {
-      const afterFiles = await files.boundingBox();
-      const afterChanges = await changes.boundingBox();
-      return Boolean(afterFiles && afterChanges && afterChanges.x < afterFiles.x);
-    })
-    .toBe(true);
-}
-
-test("reorders compact Explorer tabs with a pointer without changing selection", async ({
-  page,
-}) => {
-  const workspace = await seedWorkspace({ repoPrefix: "explorer-compact-drag-" });
-  try {
-    await gotoWorkspace(page, workspace.workspaceId);
-    await page.setViewportSize({ width: 390, height: 844 });
-    await openFilesPanel(page);
-    await reorderCompactExplorerTabs(page);
-    await expect(
-      explorerSidebar(page).getByRole("button", { name: "Browse workspace files", exact: true }),
-    ).toHaveAttribute("aria-selected", "true");
-  } finally {
-    await workspace.cleanup();
-  }
-});
-
-// Exercise appearance at its consumers while the real workspace navigator retains the panels.
-test("updates populated code and diff appearance without losing the editor instance or draft", async ({
-  page,
-}) => {
-  const workspace = await seedWorkspace({ repoPrefix: "explorer-populated-appearance-" });
-  const source = Array.from(
-    { length: 120 },
-    (_, index) => `export const line${index} = "retained ${index}";`,
-  ).join("\n");
-  try {
-    await writeFile(`${workspace.repoPath}/appearance.ts`, source);
-    await page.addInitScript(() => {
-      localStorage.setItem(
-        "@paseo:app-settings",
-        JSON.stringify({ codeFontSize: 13, theme: "light" }),
-      );
-      localStorage.setItem(
-        "@paseo:changes-preferences",
-        JSON.stringify({ inlineDiff: true, layout: "unified" }),
-      );
-    });
-    await gotoWorkspace(page, workspace.workspaceId);
-    await openFilesPanel(page);
-    await openFileFromExplorer(page, "appearance.ts");
-    const editor = page.getByTestId("file-source-editor").filter({ visible: true });
-    const text = editor.locator(".cm-content");
-    await expect(text).toBeVisible();
-    await text.fill(`${source}\n// unsaved local edit`);
-    const instance = await editor.elementHandle();
-    const scroller = editor.locator(".cm-scroller");
-    await scroller.evaluate((node) => {
-      node.scrollTop = 400;
-    });
-    const scrollBefore = await scroller.evaluate((node) => node.scrollTop);
-    await explorerSidebar(page).getByTestId("workspace-tab-changes_tree").click();
-    const diff = explorerSidebar(page).getByTestId("git-diff-canvas");
-    await expect(diff).toBeVisible();
-    await page.keyboard.press("Control+,");
-    await openSettingsSection(page, "appearance");
-    await page.getByLabel("Code font size", { exact: true }).fill("19");
-    await page.getByLabel("Code font size", { exact: true }).press("Tab");
-    await clickSettingsBackToWorkspace(page);
-    await expect(text).toHaveCSS("font-size", "19px");
-    expect(await instance!.evaluate((node) => node.isConnected)).toBe(true);
-    await expect(text).toContainText("unsaved local edit");
-    expect(await scroller.evaluate((node) => node.scrollTop)).toBe(scrollBefore);
-    await expect(diff).toHaveCSS("font-size", "19px");
-    await cycleWorkspaceTheme(page);
-    expect(await instance!.evaluate((node) => node.isConnected)).toBe(true);
-    await expect(text).toContainText("unsaved local edit");
-    await dragTabIntoExplorer(page, "file_appearance.ts");
-    await expect(explorerSidebar(page).getByTestId("file-source-editor")).toBeVisible();
-    const explorerEditor = await explorerSidebar(page)
-      .getByTestId("file-source-editor")
-      .elementHandle();
-    await text.fill(`${source}\n// retained Explorer edit`);
-    await page.setViewportSize({ width: 390, height: 844 });
-    await ensureExplorerSidebar(page);
-    await page.setViewportSize({ width: 1280, height: 900 });
-    expect(await explorerEditor!.evaluate((node) => node.isConnected)).toBe(true);
-    await expect(text).toContainText("retained Explorer edit");
-  } finally {
-    await workspace.cleanup();
-  }
-});
-
-test("retains populated Explorer chat and terminal attachments through appearance, hide and fold", async ({
-  page,
-}) => {
-  const workspace = await seedMockAgentWorkspace({
-    repoPrefix: "explorer-chat-appearance-",
-    title: "Retained chat",
-    initialPrompt: "Show the retention marker",
-    featureValues: {
-      mockAssistantResponse: "Explorer populated paragraph.\n\n```ts\nconst retained = 42;\n```",
-    },
-  });
-  const attaches: string[] = [];
-  page.on("websocket", (socket) =>
-    socket.on("framesent", (frame) => {
-      if (typeof frame.payload !== "string") return;
-      try {
-        const message = JSON.parse(frame.payload).message;
-        if (message?.type === "subscribe_terminal_request") attaches.push(message.terminalId);
-      } catch {
-        /* Binary terminal traffic is not a JSON request. */
-      }
-    }),
-  );
-  try {
-    await openAgentRoute(page, workspace);
-    await ensureExplorerSidebar(page);
-    await dragTabIntoExplorer(page, `agent_${workspace.agentId}`);
-    const explorer = explorerSidebar(page);
-    const paragraph = explorer.getByText("Explorer populated paragraph.", { exact: true });
-    await expect(paragraph).toBeVisible();
-    const composer = explorer.getByRole("textbox", { name: "Message agent..." });
-    await composer.fill("Unsubmitted Explorer draft");
-    const composerNode = await composer.elementHandle();
-    await page.keyboard.press("Control+,");
-    await openSettingsSection(page, "appearance");
-    await page.getByLabel("Content font size", { exact: true }).fill("20");
-    await page.getByLabel("Content font size", { exact: true }).press("Tab");
-    await clickSettingsBackToWorkspace(page);
-    await expect(paragraph).toHaveCSS("font-size", "20px");
-    expect(await composerNode!.evaluate((node) => node.isConnected)).toBe(true);
-    await expect(composer).toHaveValue("Unsubmitted Explorer draft");
-    const previousColor = await paragraph.evaluate((node) => getComputedStyle(node).color);
-    await cycleWorkspaceTheme(page);
-    await expect
-      .poll(() => paragraph.evaluate((node) => getComputedStyle(node).color))
-      .not.toBe(previousColor);
-    await explorer.getByRole("button", { name: "New tab", exact: true }).click();
-    await page
-      .getByRole("menuitem", { name: /^Terminal/ })
-      .first()
-      .click();
-    const terminal = explorer.getByTestId("terminal-surface");
-    await expect(terminal).toBeVisible();
-    await expect.poll(() => attaches.length).toBe(1);
-    const terminalNode = await terminal.elementHandle();
-    await page.getByTestId("workspace-explorer-toggle").first().click();
-    await ensureExplorerSidebar(page);
-    await page.setViewportSize({ width: 390, height: 844 });
-    await ensureExplorerSidebar(page);
-    await page.setViewportSize({ width: 1280, height: 900 });
-    await cycleWorkspaceTheme(page);
-    expect(await terminalNode!.evaluate((node) => node.isConnected)).toBe(true);
-    expect(attaches).toHaveLength(1);
-    await explorer.getByTestId(`workspace-tab-agent_${workspace.agentId}`).click();
-    expect(await composerNode!.evaluate((node) => node.isConnected)).toBe(true);
-    await expect(composer).toHaveValue("Unsubmitted Explorer draft");
-    await expect(paragraph).toHaveCSS("font-size", "20px");
-  } finally {
-    await workspace.cleanup();
-  }
-});
-
-test("compact file sheets cover Explorer and return to its retained file list", async ({
-  page,
-}) => {
-  const workspace = await seedWorkspace({ repoPrefix: "explorer-sheet-layer-" });
-  try {
-    await writeFile(`${workspace.repoPath}/sheet-marker.txt`, "Explorer sheet marker\n");
-    await gotoWorkspace(page, workspace.workspaceId);
-    await page.setViewportSize({ width: 390, height: 844 });
-    const explorer = await ensureExplorerSidebar(page);
-    await openFilesPanel(page);
-    const host = await explorer.elementHandle();
-    await openFileFromExplorer(page, "sheet-marker.txt");
-    await expect(page.getByText("Explorer sheet marker", { exact: true })).toBeVisible();
-    // A real click also proves the sheet draws above the retained Explorer overlay.
-    await page.getByRole("button", { name: "Close", exact: true }).click();
-    await expect(page.getByText("Explorer sheet marker", { exact: true })).toHaveCount(0);
-    await expect(explorer.getByTestId("file-explorer-tree-scroll")).toBeVisible();
-    expect(await host!.evaluate((node) => node.isConnected)).toBe(true);
-  } finally {
-    await workspace.cleanup();
-  }
-});
@@ -247,7 +247,9 @@ test.describe("New workspace: fullscreen composer across the compact breakpoint"
      await expectNewWorkspaceDraft(page, `${draft} wide`);
    });

-    // Exercise the terminal prompt's fullscreen and compact launch sheet on the phone.
+    // Terminal mode and its prompt are screen state, and the shell remounts the screen
+    // at the breakpoint, so the terminal prompt's fullscreen is exercised on the phone
+    // layout only.
    await test.step("terminal: the prompt's fullscreen shows only exit and Launch", async () => {
      await resizeComposerViewport(page, "portrait");
      // The compact launch control opens a sheet, not the desktop menu.
@@ -1,32 +0,0 @@
-import { expect, test } from "../support/fixtures";
-import { expectComposerModel } from "../support/helpers/agent-profiles";
-import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
-import { createAgentTabFromMenu } from "../support/helpers/workspace-tabs";
-import { submitMessage } from "../support/helpers/composer";
-
-async function restoreHostConnection(gate: Awaited<ReturnType<typeof installDaemonWebSocketGate>>) {
-  gate.holdNextServerMessage("status");
-  gate.restore();
-  await gate.waitForHeldServerMessage("status");
-  gate.releaseHeldServerMessage("status");
-}
-
-test("an offline workspace draft reports the disconnected host instead of loading models", async ({
-  page,
-  withWorkspace,
-}) => {
-  const gate = await installDaemonWebSocketGate(page);
-  const workspace = await withWorkspace();
-  await workspace.navigateTo();
-  await gate.drop();
-  await gate.waitForBlockedConnection();
-  await createAgentTabFromMenu(page);
-  await submitMessage(page, "hello");
-  await expect(page.getByRole("alert").filter({ hasText: "Host is not connected" })).toHaveText(
-    "Host is not connected",
-  );
-  await expect(page.getByText("Loading...", { exact: true })).toHaveCount(0);
-  await restoreHostConnection(gate);
-  await expectComposerModel(page, "Ten second stream");
-  await expect(page.getByRole("textbox", { name: "Message agent..." })).toHaveValue("hello");
-});
@@ -84,7 +84,7 @@ test.describe("real Codex Paseo tool-call presentation", () => {
        expectedText: ["Prompt", GREETING, "Greeting child", "codex/gpt-5.4-mini", "Result"],
      });
      await captureToolCall(page, testInfo, {
-        label: "Send message",
+        label: "Send agent prompt",
        artifact: "send-prompt-presentation",
        expectedText: ["Prompt", GREETING, "Agent", "Result"],
      });
@@ -259,50 +259,3 @@ async function openInlineRegressionFile(page: Page, path: string) {
    .getByRole("link", { name: path, exact: true })
    .click();
 }
-
-// Web links are styled inline by the library, so hover state has to restyle the anchor.
-test("markdown links underline on hover", async ({ page }) => {
-  const session = await seedMockAgentWorkspace({
-    repoPrefix: "markdown-link-hover-",
-    title: "Markdown link hover",
-    featureValues: {
-      mockAssistantResponse: "See [the docs](https://example.com/docs) and [README](README.md).",
-    },
-    initialPrompt: "Show links",
-  });
-  try {
-    await session.client.waitForFinish(session.agentId, 30_000);
-    await openAgentRoute(page, session);
-    const message = page.getByTestId("assistant-message");
-    for (const name of ["the docs", "README"]) {
-      const link = message.getByRole("link", { name, exact: true });
-      await expect(link).toHaveCSS("text-decoration-line", "none");
-      await link.hover();
-      await expect(link).toHaveCSS("text-decoration-line", "underline");
-      await page.mouse.move(0, 0);
-      await expect(link).toHaveCSS("text-decoration-line", "none");
-    }
-  } finally {
-    await session.cleanup();
-  }
-});
-
-const PIXEL_PNG =
-  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
-
-test("Markdown images show a zoom-in cursor", async ({ page }) => {
-  const session = await seedMockAgentWorkspace({
-    repoPrefix: "markdown-image-cursor-",
-    title: "Markdown image cursor",
-    featureValues: { mockAssistantResponse: `Before.\n\n![pixel](${PIXEL_PNG})\n\nAfter.` },
-    initialPrompt: "Show image",
-  });
-  try {
-    await session.client.waitForFinish(session.agentId, 30_000);
-    await openAgentRoute(page, session);
-    const image = page.getByTestId("assistant-message").getByRole("button", { name: "pixel" });
-    await expect(image).toHaveCSS("cursor", "zoom-in");
-  } finally {
-    await session.cleanup();
-  }
-});
@@ -5,6 +5,10 @@ import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
+import {
+  expectMobileAgentSidebarVisible,
+  openMobileAgentSidebar,
+} from "../support/helpers/sidebar";

 const PLUGIN_ID = "plugin-host-ui-e2e";

@@ -87,6 +91,12 @@ async function useCompactLayout(page: Page): Promise<void> {
  await page.setViewportSize({ width: 390, height: 844 });
 }

+async function reopenHostUiPluginFromCompactSidebar(page: Page): Promise<void> {
+  await openMobileAgentSidebar(page);
+  await expectMobileAgentSidebarVisible(page);
+  await page.getByRole("button", { name: "Host UI", exact: true }).click();
+}
+
 async function openPluginModal(page: Page): Promise<void> {
  await page.getByRole("button", { name: "Open plugin modal", exact: true }).click();
 }
@@ -148,6 +158,7 @@ test("plugin modal adapts its presentation and preserves host contexts", async (

    await test.step("compact layouts preserve host contexts inside a sheet", async () => {
      await useCompactLayout(page);
+      await reopenHostUiPluginFromCompactSidebar(page);
      await openPluginModal(page);
      await expectCompactPluginSheet(page);
      await savePluginIssue(page);
@@ -1,138 +0,0 @@
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import path from "node:path";
-import type { Locator, TestInfo } from "@playwright/test";
-import { expect, test, type Page } from "../support/fixtures";
-import { openCommandCenter } from "../support/helpers/command-center";
-import { gotoAppShell } from "../support/helpers/app";
-import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
-import { pluginRequirements } from "../support/helpers/plugin-fixture";
-import { seedWorkspace } from "../support/helpers/seed-client";
-import { getServerId } from "../support/helpers/server-id";
-import {
-  switchWorkspaceViaSidebar,
-  waitForWorkspaceInSidebar,
-} from "../support/helpers/workspace-ui";
-
-const PLUGIN_ID = "plugin-icons-e2e";
-const SVG_PATH = "M4 12l5 5L20 6";
-
-const pluginClientSource = `import React from "react";
-import { Text, View } from "react-native";
-
-const checkIcon = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3"><path d="${SVG_PATH}" /></svg>';
-
-function BadgeIcon({ size, color }) {
-  return <View testID="plugin-component-icon" style={{ width: size, height: size, borderRadius: size / 2, backgroundColor: color }} />;
-}
-
-function Panel() {
-  return <View><Text>Plugin icon panel</Text></View>;
-}
-
-const panels = [
-  { id: "lucide", title: "Lucide icon panel", icon: "Scan" },
-  { id: "svg", title: "SVG icon panel", icon: { svg: checkIcon } },
-  { id: "component", title: "Component icon panel", icon: BadgeIcon },
-];
-
-export default function contribute(client) {
-  for (const panel of panels) {
-    client.addWorkspacePanel({ ...panel, context: "workspace", Component: Panel });
-    client.addCommandCenterItem({
-      id: panel.id,
-      title: "Open " + panel.title,
-      icon: panel.icon,
-      context: "workspace",
-      onSelect({ openPanel }) { openPanel(panel.id); },
-    });
-  }
-  return () => {};
-}`;
-
-function pluginTab(page: Page, panelId: string): Locator {
-  const identity = `${PLUGIN_ID.length}_${PLUGIN_ID}_${panelId.length}_${panelId}`;
-  return page.getByTestId(`workspace-tab-plugin_workspace_${identity}`).filter({ visible: true });
-}
-
-async function runCommand(page: Page, title: string): Promise<void> {
-  const panel = await openCommandCenter(page);
-  await panel.getByTestId("command-center-input").fill(title);
-  await panel.getByRole("button", { name: title, exact: true }).click();
-  await expect(panel).not.toBeVisible();
-}
-
-async function capture(page: Page, testInfo: TestInfo, name: string): Promise<void> {
-  const screenshot = testInfo.outputPath(`${name}.png`);
-  await page.screenshot({ path: screenshot });
-  await testInfo.attach(name, { path: screenshot, contentType: "image/png" });
-}
-
-test.describe("plugin icons", () => {
-  test.describe.configure({ timeout: 180_000 });
-
-  test("renders a Lucide name, inline SVG, and a component", async ({ page }, testInfo) => {
-    const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-icons-e2e-"));
-    const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
-    const previous = await client.getDaemonConfig();
-    const workspace = await seedWorkspace({ repoPrefix: "plugin-icons-" });
-    await writeFile(
-      path.join(directory, "paseo-plugin.json"),
-      JSON.stringify({ id: PLUGIN_ID, requirements: pluginRequirements }),
-    );
-    await writeFile(path.join(directory, "index.client.tsx"), pluginClientSource);
-
-    try {
-      await client.patchDaemonConfig({ pluginsEnabled: true });
-      await client.installDirectoryPlugin(directory);
-      await page.setViewportSize({ width: 1280, height: 800 });
-      await gotoAppShell(page);
-      const target = { serverId: getServerId(), workspaceId: workspace.workspaceId };
-      await waitForWorkspaceInSidebar(page, target);
-      await switchWorkspaceViaSidebar({ page, ...target });
-
-      await test.step("Command Center rows draw each icon form", async () => {
-        const panel = await openCommandCenter(page);
-        await panel.getByTestId("command-center-input").fill("icon panel");
-        for (const title of ["Lucide icon panel", "SVG icon panel", "Component icon panel"]) {
-          await expect(
-            panel.getByRole("button", { name: `Open ${title}`, exact: true }),
-          ).toBeVisible();
-        }
-        await expect(
-          panel
-            .getByRole("button", { name: "Open SVG icon panel", exact: true })
-            .locator(`path[d="${SVG_PATH}"]`),
-        ).toBeVisible();
-        await expect(
-          panel
-            .getByRole("button", { name: "Open Component icon panel", exact: true })
-            .getByTestId("plugin-component-icon"),
-        ).toBeVisible();
-        await capture(page, testInfo, "command-center-icons");
-        await page.keyboard.press("Escape");
-      });
-
-      await test.step("workspace panel tabs draw each icon form", async () => {
-        await runCommand(page, "Open Lucide icon panel");
-        await runCommand(page, "Open SVG icon panel");
-        await runCommand(page, "Open Component icon panel");
-        await expect(pluginTab(page, "lucide").locator("svg")).toBeVisible();
-        await expect(pluginTab(page, "svg").locator(`path[d="${SVG_PATH}"]`)).toBeVisible();
-        await expect(
-          pluginTab(page, "component").getByTestId("plugin-component-icon"),
-        ).toBeVisible();
-        await capture(page, testInfo, "workspace-tab-icons");
-      });
-    } finally {
-      try {
-        await client.removePlugin(PLUGIN_ID);
-      } finally {
-        await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
-        await workspace.cleanup();
-        await client.close();
-        await rm(directory, { recursive: true, force: true });
-      }
-    }
-  });
-});
@@ -2,6 +2,10 @@ import { copyPluginExample } from "../support/helpers/plugin-fixture";
 import { expect, test as base, type Page } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
 import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
+import {
+  openMobileAgentSidebar,
+  expectMobileAgentSidebarVisible,
+} from "../support/helpers/sidebar";

 async function openExample(page: Page, example: string) {
  await page.getByRole("button", { name: `Open ${example}`, exact: true }).click();
@@ -118,7 +122,9 @@ async function openWideExamples(page: Page) {

 async function openCompactExamples(page: Page) {
  await page.setViewportSize({ width: 390, height: 844 });
-  await expect(page.getByRole("button", { name: "Open Form", exact: true })).toBeVisible();
+  await openMobileAgentSidebar(page);
+  await expectMobileAgentSidebarVisible(page);
+  await page.getByRole("button", { name: "Modal examples", exact: true }).click();
 }

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

 test("project and workspace kebabs open action sheets on compact layouts", async ({ page }) => {
  const seeded = await seedWorkspace({ repoPrefix: "sidebar-mobile-menu-sheet-" });
-  const secondProject = await seedWorkspace({ repoPrefix: "sidebar-mobile-menu-filter-" });

  try {
    await gotoAppShell(page);
@@ -27,7 +26,6 @@ test("project and workspace kebabs open action sheets on compact layouts", async
      /^Grouping/,
      /^Title/,
      "Show",
-      "Project",
      "Show background",
    ]);
    await closeMenuSheet(page);
@@ -55,7 +53,6 @@ test("project and workspace kebabs open action sheets on compact layouts", async
    });
    await expect(page.getByText("Workspace actions", { exact: true })).toBeVisible();
  } finally {
-    await secondProject.cleanup();
    await seeded.cleanup();
  }
 });
@@ -9,8 +9,6 @@ import {
  expectProjectWorkspaceCountForHost,
  expectSeparateProjects,
  openGroupedProjectSettings,
-  openGroupedProjectWorkspace,
-  expectWorkspaceHost,
  openProjectsForSettingsHost,
  openProjectDirectory,
  openProjectDirectoryWithHosts,
@@ -420,29 +418,4 @@ test.describe("Sidebar project grouping", () => {
      count: 2,
    });
  });
-  test("creates grouped project workspaces on the active workspace host", async ({
-    page,
-    crossHostProject,
-  }) => {
-    await openScenario(page, crossHostProject);
-    await openGroupedProjectWorkspace(page, GROUPED_PROJECT_NAME, "Secondary workspace");
-    await beginWorkspaceFromProject(page, GROUPED_PROJECT_NAME);
-    await expectWorkspaceHost(page, SECONDARY_HOST_LABEL);
-    await createWorkspaceWithoutAgent(page);
-    await expectProjectWorkspaceCountForHost(page, {
-      projectName: GROUPED_PROJECT_NAME,
-      hostName: SECONDARY_HOST_LABEL,
-      count: 2,
-    });
-
-    await openGroupedProjectWorkspace(page, GROUPED_PROJECT_NAME, "Primary workspace");
-    await beginWorkspaceFromProject(page, GROUPED_PROJECT_NAME);
-    await expectWorkspaceHost(page, PRIMARY_HOST_LABEL);
-    await createWorkspaceWithoutAgent(page);
-    await expectProjectWorkspaceCountForHost(page, {
-      projectName: GROUPED_PROJECT_NAME,
-      hostName: PRIMARY_HOST_LABEL,
-      count: 2,
-    });
-  });
 });
@@ -624,9 +624,7 @@ test.describe("Half-screen desktop layout", () => {
    await expect(page.getByTestId("sidebar-settings")).not.toBeVisible();
  });

-  test("yields app navigation to Explorer and restores it when Explorer closes", async ({
-    page,
-  }) => {
+  test("keeps app navigation beside the Explorer pane", async ({ page }) => {
    const workspace = await seedWorkspace({ repoPrefix: "sidebar-half-screen-explorer-" });

    try {
@@ -638,7 +636,7 @@ test.describe("Half-screen desktop layout", () => {
      const explorerToggle = page.getByTestId("workspace-explorer-toggle").first();
      await expect(page.getByTestId("workspace-tab-files").filter({ visible: true })).toBeVisible();
      await expect(explorerToggle).toHaveAccessibleName("Close Explorer sidebar");
-      await expect(page.getByTestId("sidebar-global-new-workspace")).not.toBeVisible();
+      await expect(page.getByTestId("sidebar-global-new-workspace")).toBeVisible();
      await expect(page.getByTestId("workspace-explorer-sidebar")).toBeVisible();
      await expect(
        page
@@ -266,22 +266,14 @@ test("keeps overview tool calls inline on desktop", async ({ page }) => {
  const agent = await createOverviewAgent(page, "Desktop overview tool calls");

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

-    // Keep streaming layout changes out of the pointer-down/pointer-up interval.
-    const header = group.getByRole("button").first();
-    await header.click();
+    await group.click();
+    await expect(page.getByTestId("tool-call-group-sheet")).toHaveCount(0);
    await expect(group.getByTestId("tool-call-badge").first()).toBeVisible();
-    await expect(page.getByTestId("tool-call-group-sheet")).toHaveCount(0);
-
-    gate.release(1);
-    await expect.poll(() => group.getByTestId("tool-call-badge").count()).toBeGreaterThanOrEqual(2);
-    await expect(page.getByTestId("tool-call-group-sheet")).toHaveCount(0);
  } finally {
    await agent.cleanup();
  }
@@ -4,10 +4,9 @@ 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, openSettings } from "../support/helpers/app";
+import { gotoAppShell } 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 {
@@ -17,7 +16,6 @@ import {
 } from "../support/helpers/usage-reports";
 import {
  installLoginUsage,
-  expectLoginUsageFreshness,
  installCodexWindowUsage,
  expectCodexReportedWindows,
  refreshLoginUsage,
@@ -132,7 +130,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% used", { exact: true })).toBeVisible();
+  await expect(group.getByText("41%", { exact: true })).toBeVisible();
  await expect(page.getByRole("button", { name: "Refresh all", exact: true })).toBeEnabled();
 }

@@ -179,7 +177,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% used")).toBeVisible();
+    await expect(group.getByText("31%")).toBeVisible();
    await expect(group.getByText("Beta plan", { exact: true })).toBeVisible();
    await expect(group.getByText("Unavailable", { exact: true })).toBeVisible();

@@ -241,15 +239,15 @@ test.describe("usage modal", () => {
    await gotoAppShell(page);
    await openUsageFromItem(page);
    const group = page.getByTestId(`usage-host-${serverId}`);
-    await expect(group.getByText("31% used")).toBeVisible({ timeout: 10_000 });
+    await expect(group.getByText("31%")).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% used")).toBeVisible();
-    await expect(group.getByText("12% used")).toBeVisible();
+    await expect(group.getByText("58%")).toBeVisible();
+    await expect(group.getByText("12%")).toBeVisible();

    await group.getByTestId("usage-refresh").nth(1).hover();
    await expect(page.getByTestId("usage-freshness-tooltip")).toHaveText("Updated 2h ago");
@@ -333,7 +331,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% used"),
+        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12%"),
      ).toBeVisible({ timeout: 30_000 });
      await expect(hostFilter(page)).toContainText("Secondary box");
      await qaScreenshot(page, "usage-modal-picked-host");
@@ -348,7 +346,7 @@ test.describe("usage modal", () => {
      await expectPinnedUsage(page, ["12% Weekly"]);
      await openUsageFromItem(page);
      await expect(
-        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12% used"),
+        page.getByTestId(`usage-host-${secondary.serverId}`).getByText("12%"),
      ).toBeVisible({ timeout: 30_000 });
    } finally {
      await secondary.close().catch(() => undefined);
@@ -514,7 +512,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% used · resets /,
+        /^Pin Claude Session, 31% · resets /,
      );
      await openUsageOptions(page);
      await closeUsageOptions(page);
@@ -577,7 +575,7 @@ test("an account with all logins failing shows each harness and remedy, then onl
      },
    ]);
    await refreshLoginUsage(page);
-    await expectLoginUsageOnly(page, "42% used");
+    await expectLoginUsageOnly(page, "42%");
  } finally {
    await fixture.cleanup();
  }
@@ -590,156 +588,6 @@ async function expectLoginErrors(page: Page, lines: string[]) {

 async function expectLoginUsageOnly(page: Page, percentage: string) {
  const card = page.getByTestId("usage-report-login-journey:account");
-  await expect(card.getByText(new RegExp(`^${percentage}(?:$| ·)`))).toBeVisible();
+  await expect(card.getByText(percentage, { exact: true })).toBeVisible();
  await expect(card.getByTestId("usage-login-error")).toHaveCount(0);
 }
-
-for (const compact of [false, true]) {
-  test(`failed polls retain usage and successful freshness (${compact ? "footer" : "tooltip"})`, async ({
-    page,
-  }) => {
-    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 },
-      );
-      await gotoAppShell(page);
-      if (compact) await openCompactSidebar(page);
-      await openUsageFromIcon(page);
-      await expectLoginErrors(page, ["Claude: Initial failure"]);
-      await test.step("developer errors do not interrupt freshness inspection", async () => {
-        await page.evaluate(() => console.error("E2E: developer toast while Usage is open"));
-        await expectLoginUsageFreshness(page, "No successful update", compact);
-      });
-
-      await fixture.setReport({
-        status: "available",
-        windows: [{ id: "weekly", label: "Weekly", usedPct: 42, resetsAt: "2000-01-01T00:00:00Z" }],
-      });
-      // 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% used");
-      await advanceUsageClock(page, 60_000);
-      await expectLoginUsageFreshness(page, "Updated 1h ago", compact);
-
-      await fixture.setReport({ status: "error", error: "Rate limited" });
-      await refreshLoginUsage(page);
-      await expectRetainedLoginUsage(page, "Claude: Rate limited");
-      await expectLoginUsageFreshness(page, "Last updated 1h ago", compact);
-      await refreshLoginUsage(page);
-      await expectRetainedLoginUsage(page, "Claude: Rate limited");
-      await expectLoginUsageFreshness(page, "Last updated 1h ago", compact);
-
-      await fixture.setReport({
-        status: "unavailable",
-        problem: { kind: "no_quota", detail: "No active quota" },
-      });
-      await refreshLoginUsage(page);
-      await expectRetainedLoginUsage(page, "Claude: No active quota");
-      await expectLoginUsageFreshness(page, "Last updated 1h ago", compact);
-
-      await fixture.setReport({
-        status: "available",
-        windows: [{ id: "weekly", label: "Weekly", usedPct: 43 }],
-      });
-      await page.clock.setFixedTime(new Date(Date.now() + 150_000));
-      await refreshLoginUsage(page);
-      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();
-    }
-  });
-}
-
-async function expectRetainedLoginUsage(page: Page, message: string) {
-  const card = page.getByTestId("usage-report-login-journey:account");
-  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);
-}
@@ -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% used")).toBeVisible();
+    await expect(card.getByText("70%")).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% used")).toBeVisible({ timeout: 10_000 });
+    await expect(card.getByText("23%")).toBeVisible({ timeout: 10_000 });

    await refreshAllUsage(page);
    await expect.poll(() => forcedRefreshCount(usage)).toBe(1);
-    await expect(card.getByText("64% used")).toBeVisible();
+    await expect(card.getByText("64%")).toBeVisible();
  });

  test("asks to update a host without usage support and never calls it", async ({ page }) => {
@@ -28,7 +28,6 @@ import {
  closeWorkspaceScriptsMenu,
  seedProjectForWorkspaceSetup,
  waitForWorkspaceSetupProgress,
-  observeSetupPanelTraffic,
 } from "../support/helpers/workspace-setup";

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

-  test("setup panel releases details while retained behind another tab and resubscribes when shown", async ({
-    page,
-  }) => {
-    const client = await connectWorkspaceSetupClient();
-    const repo = await createTempGitRepo("setup-membership-", {
-      paseoConfig: { worktree: { setup: ["echo setup complete"] } },
-    });
-    const traffic = observeSetupPanelTraffic(page);
-    try {
-      await seedProjectForWorkspaceSetup(client, repo.path);
-      const completed = waitForWorkspaceSetupProgress(
-        client,
-        (payload) => payload.status === "completed",
-      );
-      const workspace = await createWorkspaceThroughDaemon(client, {
-        cwd: repo.path,
-        worktreeSlug: "setup-membership",
-      });
-      await completed;
-      await openHomeWithProject(page, repo.path);
-      await navigateToWorkspaceViaSidebar(page, workspace.id);
-      await expectSetupTabNotSeeded(page, workspace.id);
-      await traffic.expectNoDemand();
-      await expectSetupPanel(page);
-      await traffic.expectSubscribed(workspace.id, 1);
-      await expect(page.getByTestId("workspace-setup-log").first()).toContainText("setup complete");
-      await clickNewChat(page);
-      await expectComposerVisible(page);
-      await traffic.expectReleased(0);
-      await expectSetupPanel(page);
-      await traffic.expectSubscribed(workspace.id, 2);
-      await closeSetupTab(page, workspace.id);
-      await traffic.expectReleased(1);
-    } finally {
-      await client.close();
-      await repo.cleanup();
-    }
-  });
-
  daemonTest("streams running and completed setup snapshots for a successful setup", async () => {
    const client = await connectWorkspaceSetupClient();
    const repo = await createTempGitRepo("setup-success-", {
@@ -4,8 +4,8 @@ env APP_ID=sh.paseo.debug
 open "${APP_ID}"
 wait "id=\"workspace-header-menu-trigger\"" 20000
 press "id=\"workspace-explorer-toggle\""
-wait "id=\"workspace-tab-files\"" 10000
-press "id=\"workspace-tab-files\""
+wait "id=\"explorer-tab-files\"" 10000
+press "id=\"explorer-tab-files\""
 wait "id=\"file-explorer-row-0\"" 10000
 longpress "id=\"file-explorer-row-0\"" 600
 wait "id=\"file-explorer-row-0-context-menu-content\"" 10000
@@ -1,19 +0,0 @@
-# Prerequisite: a native terminal showing the output of echo '한글 문장'
-# on its first row, with no active selection. Use a dedicated QA workspace.
-# Coordinates target the first half of 문 on a 1080x1920 phone at default
-# code size. Override WORD_X/WORD_Y for other device geometry.
-context platform=android timeout=30000 retries=0
-env APP_ID=sh.paseo.debug
-env WORD_X=105
-env WORD_Y=251
-
-open "${APP_ID}"
-wait "label=\"Terminal input\"" 10000
-wait "label=\"한글 문장\"" 10000
-longpress "${WORD_X}" "${WORD_Y}" 650
-wait "id=\"terminal-copy\"" 5000
-press "id=\"terminal-copy\""
-# Copy clears the selection; only Android's clipboard preview has this exact
-# text, since the unselected terminal row contains the full sentence.
-wait "text=\"문장\"" 3000
-close
@@ -1,145 +0,0 @@
-// Run against an Android dev client serving this checkout, with a real software keyboard.
-// node packages/app/e2e/mobile/appearance-keyboard/android.mjs <session> <metro-url> <server-id> [app-id]
-import assert from "node:assert/strict";
-import { execFileSync } from "node:child_process";
-import { mkdirSync } from "node:fs";
-import { resolve } from "node:path";
-import { setTimeout as delay } from "node:timers/promises";
-
-const [, , session, metroUrl, serverId, appId = "sh.paseo.debug"] = process.argv;
-assert(
-  session && metroUrl && serverId,
-  "Pass the agent-device session, Metro URL and connected host ID",
-);
-const artifacts = resolve(".dev/agent-device-artifacts/appearance-keyboard-android");
-mkdirSync(artifacts, { recursive: true });
-
-function ad(...args) {
-  return execFileSync("agent-device", ["--session", session, ...args], {
-    encoding: "utf8",
-    timeout: 60_000,
-  });
-}
-
-function evaluate(expression) {
-  return ad("cdp", "runtime", "eval", "--expr", expression, "--json");
-}
-
-// Read the mounted app's public React Native APIs through Metro. Accessibility
-// snapshots with Gboard open can block while waiting for an idle hierarchy.
-const reactNative = `Array.from(__r.getModules().values()).find(
-  m => m.verboseName?.endsWith("/react-native/index.js")
-).publicModule.exports`;
-
-function measureFocusedInput() {
-  evaluate(`(() => {
-    const rn = ${reactNative};
-    globalThis.__appearanceKeyboardMeasurement = null;
-    rn.TextInput.State.currentlyFocusedInput()?.measureInWindow((x, y, width, height) => {
-      globalThis.__appearanceKeyboardMeasurement = JSON.stringify({
-        x, y, width, height,
-        statusBarHeight: rn.StatusBar.currentHeight,
-        scale: rn.PixelRatio.get(),
-        keyboard: rn.Keyboard.metrics(),
-      });
-    });
-  })()`);
-  const value = JSON.parse(evaluate("globalThis.__appearanceKeyboardMeasurement"));
-  return value ? JSON.parse(value) : null;
-}
-
-async function waitForFocusedInput() {
-  let measurement;
-  let previous;
-  let stable = 0;
-  const deadline = Date.now() + 30_000;
-  do {
-    measurement = measureFocusedInput();
-    const current = measurement?.keyboard
-      ? [measurement.y, measurement.height, measurement.keyboard.screenY].map(Math.round).join(",")
-      : null;
-    stable = measurement?.keyboard && current === previous ? stable + 1 : 0;
-    previous = current;
-    if (stable >= 3) break;
-    await delay(150);
-  } while (Date.now() < deadline);
-
-  assert(stable >= 3, `Focused input and keyboard must settle: ${JSON.stringify(measurement)}`);
-  return measurement;
-}
-
-ad("open", appId, "--platform", "android", "--no-test-ime");
-const targets = ad("cdp", "target", "list", "--url", metroUrl)
-  .split("\n")
-  .filter((line) => line.includes(appId));
-assert.equal(targets.length, 1, "Connect only the test app to this Metro server");
-ad("cdp", "target", "select", targets[0].split(/\s+/)[0]);
-
-try {
-  evaluate(`(${reactNative}).Keyboard.dismiss()`);
-  ad("open", appId, "paseo://settings", "--platform", "android", "--no-test-ime");
-  ad("wait", "text", "Appearance", "5000");
-  ad("open", appId, "paseo://settings/appearance", "--platform", "android", "--no-test-ime");
-  ad("wait", "text", "Code size", "5000");
-  const snapshot = JSON.parse(ad("snapshot", "-i", "--json"));
-  const numericFields = snapshot.data.nodes.filter(
-    (node) => node.type === "android.widget.EditText" && /^\d+$/.test(node.value ?? ""),
-  );
-  assert.equal(numericFields.length, 3, "All three font sizes must be visible without scrolling");
-  ad("screenshot", resolve(artifacts, "before-keyboard.png"));
-  // Appearance orders Interface size, Content size, then Code size.
-  ad("press", `@${numericFields[2].ref}`);
-
-  const measurement = await waitForFocusedInput();
-  // Android measureInWindow excludes the status bar, Keyboard.metrics uses screen coordinates.
-  const inputBottom = measurement.y + measurement.height + measurement.statusBarHeight;
-  const keyboardTop = measurement.keyboard.screenY;
-  console.log(JSON.stringify({ inputBottom, keyboardTop, measurement }));
-  ad("screenshot", resolve(artifacts, "keyboard.png"));
-  assert(
-    inputBottom <= keyboardTop + 1 / measurement.scale,
-    "Code size must be fully visible above the number keyboard (within one physical pixel)",
-  );
-  console.log("PASS: focusing Code size reveals the whole field above the keyboard");
-
-  evaluate(`(${reactNative}).Keyboard.dismiss()`);
-  ad(
-    "open",
-    appId,
-    `paseo://settings/hosts/${encodeURIComponent(serverId)}/plugins`,
-    "--platform",
-    "android",
-    "--no-test-ime",
-  );
-  ad("wait", "text", "Plugin source", "5000");
-  const plugins = JSON.parse(ad("snapshot", "-i", "--json"));
-  const source = plugins.data.nodes.find((node) => node.type === "android.widget.EditText");
-  assert(source, "The connected host must support installing plugins from source");
-  ad("press", `@${source.ref}`);
-  ad("type", "qa-source");
-  const pluginMeasurement = await waitForFocusedInput();
-  // A FormTextInput draws its border and padding on the native input's parent.
-  // Measure that visible frame, rather than accepting only the text as visible.
-  const hierarchy = JSON.parse(ad("snapshot", "--json")).data.nodes;
-  const focused = hierarchy.find((node) => node.type === "android.widget.EditText" && node.focused);
-  assert(focused, "Plugin source must remain focused after typing");
-  assert.equal(focused.value, "qa-source", "Typed source must remain in the focused field");
-  const frame = hierarchy.find((node) => node.index === focused.parentIndex);
-  assert(frame, "The source input's visible frame must be present in the native hierarchy");
-  assert(
-    frame.rect.height > focused.rect.height,
-    "Measure the surrounding frame, including padding",
-  );
-  const frameBottom = frame.rect.y + frame.rect.height;
-  const pluginKeyboardTop = pluginMeasurement.keyboard.screenY * pluginMeasurement.scale;
-  console.log(JSON.stringify({ frameBottom, keyboardTop: pluginKeyboardTop, frame: frame.rect }));
-  ad("screenshot", resolve(artifacts, "plugin-source-keyboard.png"));
-  assert(
-    frameBottom <= pluginKeyboardTop + 1,
-    "Plugin source frame must be fully visible above the keyboard (within one physical pixel)",
-  );
-  console.log("PASS: focusing Plugin source reveals the whole field frame above the keyboard");
-} finally {
-  evaluate(`(${reactNative}).Keyboard.dismiss()`);
-  evaluate("delete globalThis.__appearanceKeyboardMeasurement");
-}
@@ -1,47 +0,0 @@
-# Late composer pill clearance
-
-This regression opens a completed conversation, relaunches the Android app, and
-registers a composer pill five seconds after the client plugin loads. It checks
-that the completed turn's Copy and Fork buttons remain fully above the pill.
-The daemon, plugin API, native app, layout, and accessibility bounds are real;
-no provider calls are needed during the test.
-
-Prerequisites:
-
- Build the server and app dependencies with `npm run build:server` and
-  `npm run build --workspace=@getpaseo/expo-two-way-audio`.
- Run an isolated development daemon on a non-default port.
- Run this checkout's Metro server and open the connected Android dev client
-  with `agent-device`. The app must already know the isolated daemon.
- Open a completed conversation on a compact portrait Android emulator, at the
-  latest turn, with no other composer tracks visible. Keep the software keyboard
-  closed. Note the workspace and agent IDs from the daemon.
-
-Set `WORKSPACE_ID` and `AGENT_ID` to that conversation, then run from the
-repository root, substituting the session and ports:
-
-```sh
-PASEO_OVERLAY_ARTIFACTS_DIR=.dev/composer-overlay-evidence \
-  node packages/app/e2e/mobile/composer-overlay/android.mjs \
-  composer-overlay ws://127.0.0.1:6843/ws "$WORKSPACE_ID" "$AGENT_ID" sh.paseo.debug 8193
-```
-
-The runner installs and removes its delayed plugin and leaves the conversation
-intact. It preserves the daemon's previous plugins-enabled setting. The evidence directory
-contains the cold-reopen screenshot and raw accessibility snapshot. Without an
-explicit directory, temporary evidence is removed with the fixture.
-
-To check an existing capture independently:
-
-```sh
-node packages/app/e2e/mobile/composer-overlay/assert-footer-clear.mjs \
-  .dev/composer-overlay-evidence/cold-reopen.json 'Overlay regression pill'
-```
-
-On the failing baseline, the Copy button extends below the pill's top edge. With
-the correction, both actions are clear before the composer receives focus.
-
-Additional checks on the same conversation: opening the keyboard keeps the footer
-clear; after scrolling up, a newly registered pill must not jump back to the latest
-turn. Native iOS uses a different keyboard implementation and needs its own device
-verification.
@@ -1,95 +0,0 @@
-// Start on a completed conversation in the connected Android dev client.
-// node android.mjs <session> <daemon-ws-url> <workspace-id> <agent-id> [app-id] [metro-port]
-import assert from "node:assert/strict";
-import { execFileSync } from "node:child_process";
-import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { WebSocket } from "ws";
-import { DaemonClient } from "../../../../client/dist/daemon-client.js";
-
-const [, , session, daemonUrl, workspaceId, agentId, appId = "sh.paseo.debug", metroPort = "8081"] =
-  process.argv;
-assert(
-  session && daemonUrl && workspaceId && agentId,
-  "Pass a session, isolated daemon URL, workspace ID, and agent ID",
-);
-const url = new URL(daemonUrl);
-assert(["127.0.0.1", "localhost"].includes(url.hostname), "Use an isolated loopback daemon");
-assert(!["", "6767", "6768"].includes(url.port), "Do not use the installed or development daemon");
-const directory = await mkdtemp(path.join(tmpdir(), "paseo-composer-overlay-"));
-const artifacts = process.env.PASEO_OVERLAY_ARTIFACTS_DIR ?? path.join(directory, "evidence");
-await mkdir(artifacts, { recursive: true });
-const pluginId = "composer-overlay-mobile-repro";
-const pillLabel = "Overlay regression pill";
-const client = new DaemonClient({
-  url: daemonUrl,
-  clientId: "composer-overlay-mobile-regression",
-  clientType: "cli",
-  appVersion: JSON.parse(await readFile(new URL("../../../package.json", import.meta.url))).version,
-  webSocketFactory: (address, options) => new WebSocket(address, options),
-});
-function ad(...args) {
-  return execFileSync("agent-device", [...args, "--session", session], {
-    encoding: "utf8",
-    timeout: 90_000,
-  });
-}
-let installed = false;
-let previousConfig;
-try {
-  ad("wait", 'label="Copy turn"', "20000");
-  await client.connect();
-  previousConfig = (await client.getDaemonConfig()).config;
-  await client.patchDaemonConfig({ pluginsEnabled: true });
-  await writeFile(
-    path.join(directory, "paseo-plugin.json"),
-    JSON.stringify({
-      id: pluginId,
-      requirements: { paseo: ">=0.11.4" },
-    }),
-  );
-  await writeFile(
-    path.join(directory, "index.client.tsx"),
-    `export default function contribute(client) {
-    let pill;
-    const timer = setTimeout(() => {
-      pill = client.addComposerPill({
-        id: "late-pill", workspaceId: ${JSON.stringify(workspaceId)}, agentId: ${JSON.stringify(agentId)},
-        button: { title: ${JSON.stringify(pillLabel)}, icon: "Clock", behavior: { kind: "action", onPress() {} } },
-      });
-    }, 5000);
-    return () => { clearTimeout(timer); pill?.remove(); };
-  }`,
-  );
-  await client.installDirectoryPlugin(directory);
-  installed = true;
-  ad("wait", `label="${pillLabel}"`, "20000");
-  // Match the report: reopen a completed conversation, then let the plugin register late.
-  ad(
-    "open",
-    appId,
-    "--platform",
-    "android",
-    "--metro-port",
-    metroPort,
-    "--no-test-ime",
-    "--relaunch",
-  );
-  ad("wait", `label="${pillLabel}"`, "20000");
-  const capture = path.join(artifacts, "cold-reopen.json");
-  await writeFile(capture, ad("snapshot", "--raw", "--json"));
-  ad("screenshot", path.join(artifacts, "cold-reopen.png"));
-  execFileSync(
-    process.execPath,
-    [fileURLToPath(new URL("./assert-footer-clear.mjs", import.meta.url)), capture, pillLabel],
-    { stdio: "inherit" },
-  );
-} finally {
-  if (installed) await client.removePlugin(pluginId);
-  if (previousConfig)
-    await client.patchDaemonConfig({ pluginsEnabled: previousConfig.pluginsEnabled });
-  await client.close();
-  await rm(directory, { recursive: true, force: true });
-}
@@ -1,21 +0,0 @@
-// Assert geometry from a fresh agent-device snapshot --raw --json capture.
-// node assert-footer-clear.mjs <snapshot.json> <composer-pill-label>
-import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-
-const [, , snapshotPath, pillLabel] = process.argv;
-assert(snapshotPath && pillLabel, "Pass a snapshot JSON path and composer pill label");
-const { data } = JSON.parse(readFileSync(snapshotPath, "utf8"));
-const buttons = data.nodes.filter((node) => node.type === "android.widget.Button");
-const pill = buttons.find((node) => node.label === pillLabel);
-assert(pill?.rect, `Composer pill '${pillLabel}' must be visible`);
-for (const label of ["Copy turn", "Fork chat from here"]) {
-  const button = buttons.find((node) => node.label === label);
-  assert(button?.rect, `Completed-turn action '${label}' must be visible`);
-  const bottom = button.rect.y + button.rect.height;
-  assert(
-    bottom <= pill.rect.y,
-    `${label} ends at ${bottom}, below composer pill top ${pill.rect.y}`,
-  );
-}
-console.log("PASS: completed-turn actions remain fully above the composer pill");
@@ -1,45 +0,0 @@
-# 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.
@@ -1,71 +0,0 @@
-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");
@@ -1,69 +0,0 @@
-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>
-  );
-}
@@ -0,0 +1,16 @@
+# Android terminal keyboard diagnostic
+
+This is a device diagnostic for #4811, not a CI test or an established release performance budget. It measures the real native terminal and real software keyboard through agent-device. It does not inject keyboard frames or replace the terminal.
+
+Open a terminal against an isolated daemon, hide its keyboard, and leave Android animations enabled. Use an existing agent-device session bound to the app and device being measured. For example, from the repository root:
+
+```sh
+PASEO_AGENT_DEVICE_SESSION=terminal-keyboard-stutter \
+  node packages/app/e2e/mobile/terminal-keyboard/stutter.android.mjs 20
+```
+
+Pass a maximum median janky-frame percentage explicitly. The example's 20% is a diagnostic comparison threshold, not an agreed product requirement. The script warms one complete cycle, measures five opening/closing cycles, saves raw Android frame metrics to `.dev/agent-device-artifacts/terminal-keyboard-stutter/frames.json`, then fails if either median exceeds the supplied threshold. `AGENT_DEVICE_STATE_DIR` and `ANDROID_SERIAL` are honored.
+
+Each opening uses the terminal keyboard toggle, and each closing uses Android Back. Accessibility is read only before opening, because real-IME accessibility snapshots stalled during investigation. The script verifies that the real keyboard changes visibility, waits for three stable samples, and includes another 500 ms for delayed terminal refits. It leaves the keyboard hidden and keeps the caller's session open.
+
+Compare the same app build mode, terminal contents, device, animation settings, and threshold. Development-build and emulator numbers do not establish release or physical-device performance. A failure reproduces frame drops; it does not identify their cause or prove a proposed fix.
@@ -0,0 +1,105 @@
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { mkdirSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { setTimeout as delay } from "node:timers/promises";
+
+// Start an agent-device Android session on an idle terminal with its keyboard hidden.
+// The explicit budget is a diagnostic comparison parameter, not a shipped performance guarantee.
+const maxJankPercent = Number(process.argv[2]);
+assert(
+  process.argv[2] &&
+    Number.isFinite(maxJankPercent) &&
+    maxJankPercent >= 0 &&
+    maxJankPercent <= 100,
+  "Pass the maximum median janky-frame percentage, for example: node stutter.android.mjs 20",
+);
+const session = process.env.PASEO_AGENT_DEVICE_SESSION ?? "terminal-keyboard-stutter";
+const serial = process.env.ANDROID_SERIAL ?? "emulator-5554";
+const artifacts = resolve(".dev/agent-device-artifacts/terminal-keyboard-stutter");
+mkdirSync(artifacts, { recursive: true });
+
+function ad(...args) {
+  return execFileSync("agent-device", [...args, "--session", session], {
+    encoding: "utf8",
+    timeout: 20_000,
+  });
+}
+
+function keyboardShown() {
+  return /^  mInputShown=true$/m.test(
+    execFileSync("adb", ["-s", serial, "shell", "dumpsys", "input_method"], {
+      encoding: "utf8",
+      timeout: 10_000,
+    }),
+  );
+}
+
+async function waitForKeyboard(shown) {
+  const deadline = Date.now() + 5000;
+  let stableSamples = 0;
+  while (Date.now() < deadline) {
+    stableSamples = keyboardShown() === shown ? stableSamples + 1 : 0;
+    if (stableSamples === 3) {
+      // Include the pane's delayed refits after the keyboard animation ends.
+      await delay(500);
+      return;
+    }
+    await delay(100);
+  }
+  throw new Error(`Keyboard did not settle at shown=${shown}`);
+}
+
+function frames() {
+  const result = JSON.parse(ad("perf", "frames", "--json"));
+  const sample = result.data.metrics.fps;
+  assert(sample.available, "Android frame metrics must be available");
+  return sample;
+}
+
+function keyboardTogglePoint() {
+  const { data } = JSON.parse(ad("snapshot", "-i", "--json"));
+  const toggle = data.nodes.find((node) => node.identifier === "terminal-keyboard-toggle");
+  const input = data.nodes.find((node) => node.identifier === "terminal-native-input");
+  assert(input && toggle?.rect, "Open a native terminal before running this diagnostic");
+  return {
+    x: String(Math.round(toggle.rect.x + toggle.rect.width / 2)),
+    y: String(Math.round(toggle.rect.y + toggle.rect.height / 2)),
+  };
+}
+
+async function keyboardCycle(point) {
+  ad("press", point.x, point.y);
+  await waitForKeyboard(true);
+  const open = frames();
+  ad("back");
+  await waitForKeyboard(false);
+  const close = frames();
+  return { open, close };
+}
+
+function median(values) {
+  const sorted = [...values].sort((a, b) => a - b);
+  return sorted[Math.floor(sorted.length / 2)];
+}
+
+async function captureKeyboardCycles() {
+  assert.equal(keyboardShown(), false, "Start with the software keyboard hidden");
+  const point = keyboardTogglePoint();
+  frames();
+  await keyboardCycle(point); // Warm the keyboard and terminal before measuring.
+  const samples = [];
+  for (let cycle = 0; cycle < 5; cycle += 1) {
+    samples.push(await keyboardCycle(point));
+  }
+  return samples;
+}
+
+const samples = await captureKeyboardCycles();
+const open = median(samples.map((sample) => sample.open.droppedFramePercent));
+const close = median(samples.map((sample) => sample.close.droppedFramePercent));
+const result = { maxJankPercent, medianJankPercent: { open, close }, samples };
+writeFileSync(resolve(artifacts, "frames.json"), JSON.stringify(result, null, 2));
+console.log(JSON.stringify({ maxJankPercent, medianJankPercent: { open, close } }));
+assert(open <= maxJankPercent, `Keyboard opening: ${open}% exceeds ${maxJankPercent}%`);
+assert(close <= maxJankPercent, `Keyboard closing: ${close}% exceeds ${maxJankPercent}%`);
@@ -1,10 +0,0 @@
-/** @param {import('@playwright/test').Page} page */
-export async function installDeveloperToastDismissal(page) {
-  // Developer chrome must not cover app actions or move the test's pointer/focus.
-  // Console errors remain in the runner's logs.
-  const dismiss = page.locator("#error-toast").getByRole("button", { name: "", exact: true });
-  await page.addLocatorHandler(dismiss, () => dismiss.dispatchEvent("click"), {
-    // A new logged error can replace the toast before the old one disappears.
-    noWaitAfter: true,
-  });
-}
@@ -1,5 +1,4 @@
 import { test as base, expect, type Page } from "@playwright/test";
-import { installDeveloperToastDismissal } from "./developer-ui.mjs";
 import { startOutdatedDaemon, type OutdatedDaemon } from "./helpers/daemon-update";
 import { startE2EWorker } from "./helpers/e2e-worker";
 import { getE2EDaemonPort } from "./helpers/daemon-port";
@@ -131,8 +130,6 @@ const test = daemonTest.extend<{
        await ws.close({ code: 1008, reason: "Blocked connection to localhost:6767 during e2e." });
      });

-      await installDeveloperToastDismissal(page);
-
      const entries: string[] = [];

      page.on("console", (message) => {
@@ -134,8 +134,6 @@ function startMetro(port: number, buffer: ReturnType<typeof createLineBuffer>):
    env: {
      ...process.env,
      BROWSER: "none",
-      // Automation never opens native DevTools or installs its desktop shell.
-      EXPO_UNSTABLE_HEADLESS: "1",
      ...(process.env.E2E_DESKTOP_RUNTIME === "1" ? { PASEO_WEB_PLATFORM: "electron" } : {}),
    },
    stdio: ["ignore", "pipe", "pipe"],
@@ -203,8 +203,7 @@ export async function expectOneLineTruncatedFileResult(
  expect(lineBox).not.toBeNull();
  expect(filenameBox).not.toBeNull();
  expect(pathBox).not.toBeNull();
-  // COMMAND_CENTER_LIST_METRICS.desktop.singleLineRow (list-metrics imports react-native).
-  expect(rowBox?.height).toBe(32);
+  expect(rowBox?.height).toBe(36);
  expect(Math.abs((filenameBox?.y ?? 0) - (pathBox?.y ?? 0))).toBeLessThanOrEqual(1);
  expect(overflow.scrollWidth).toBeGreaterThan(overflow.clientWidth);
  expect(overflow.overflow).toBe("hidden");
@@ -363,11 +363,10 @@ export async function resizeComposerViewport(
  await page.setViewportSize(sizes[orientation]);
  // Before the app has loaded there is no layout to wait for.
  if (page.url() === "about:blank") return;
-  // The shell and editor survive the breakpoint. Wait for the shell's layout
-  // marker to update before interacting with the resized composer.
-  await expect(
-    page.getByTestId(orientation === "landscape" ? "wide-shell" : "compact-shell"),
-  ).toBeVisible();
+  // Crossing the compact breakpoint remounts the shell and the editor. Anything that
+  // follows (a shortcut, a locator) belongs to the layout the new size implies, so
+  // wait for that layout before returning.
+  await expect(page.getByTestId("compact-shell")).toHaveCount(orientation === "landscape" ? 0 : 1);
 }
 export async function selectComposerDraftRange(
  page: Page,
@@ -502,59 +501,3 @@ export async function expectNoCollapsedVisibleComposer(page: Page): Promise<void
  expect(frames.length).toBeGreaterThan(0);
  expect(frames.filter((frame) => frame.root < 42 || frame.input < 42)).toEqual([]);
 }
-
-/** Exercise the quick-return race before a hidden pane gets a rendering frame. */
-export async function roundTripComposerTabBeforePaint(
-  page: Page,
-  activeChatTitle: string,
-): Promise<void> {
-  const activeTab = page.getByRole("button", { name: activeChatTitle, exact: true });
-  await expect(activeTab).toHaveAttribute("aria-selected", "true");
-  const result = await activeTab.evaluate((tab) => {
-    const editor = document.activeElement;
-    return new Promise<{ returnedBeforePaint: boolean; focused: boolean }>((resolve) => {
-      let switchedAway = false;
-      let painted = false;
-      let frame = 0;
-      const shortcut = (code: "BracketLeft" | "BracketRight") => {
-        document.dispatchEvent(
-          new KeyboardEvent("keydown", {
-            key: code === "BracketLeft" ? "{" : "}",
-            code,
-            altKey: true,
-            shiftKey: true,
-            bubbles: true,
-            cancelable: true,
-          }),
-        );
-      };
-      // Watch selection commits without reading layout: a layout read could make
-      // Chromium blur the hidden editor and erase the condition under test.
-      const observer = new MutationObserver(() => {
-        if (!switchedAway && tab.getAttribute("aria-selected") === "false") {
-          switchedAway = true;
-          frame = requestAnimationFrame(() => {
-            painted = true;
-          });
-          // Deliver the return shortcut before rendering, without a Playwright
-          // round trip allowing the browser to paint the inactive tab first.
-          shortcut("BracketRight");
-        } else if (switchedAway && tab.getAttribute("aria-selected") === "true") {
-          observer.disconnect();
-          cancelAnimationFrame(frame);
-          return resolve({
-            returnedBeforePaint: !painted,
-            focused: document.activeElement === editor,
-          });
-        }
-      });
-      observer.observe(tab, { attributes: true, attributeFilter: ["aria-selected"] });
-      shortcut("BracketLeft");
-    });
-  });
-  expect(
-    result.returnedBeforePaint,
-    "tab round trip must finish before rendering the hidden pane",
-  ).toBe(true);
-  expect(result.focused, "returning on touch must leave the composer unfocused").toBe(false);
-}
@@ -37,7 +37,7 @@ export async function hoverContextWindowMeter(page: Page, name = METER_NAME): Pr
  await page.getByRole("img", { name, exact: true }).hover({ timeout: 30_000 });
  const card = contextWindowDetails(page);
  await expect(card).toBeVisible();
-  await expect(card).toBeInViewport({ ratio: 1 });
+  await expect(card).toBeInViewport();
  return card;
 }

@@ -24,7 +24,6 @@ interface E2EDaemonClientConfig {
  clientType: "cli";
  appVersion?: string;
  webSocketFactory?: NodeWebSocketFactory;
-  capabilities?: Record<string, unknown>;
 }

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

 /**
@@ -53,7 +51,6 @@ export async function connectDaemonClient<ClientInstance extends { connect(): Pr
    clientType: "cli",
    appVersion: options.appVersion ?? loadAppVersion(),
    webSocketFactory: createNodeWebSocketFactory(),
-    capabilities: options.capabilities,
  });
  await client.connect();
  return client;
@@ -134,19 +134,3 @@ export async function expectProjectSettingsName(page: Page, projectName: string)
    timeout: PROJECT_VISIBILITY_TIMEOUT,
  });
 }
-
-export async function openGroupedProjectWorkspace(
-  page: Page,
-  projectName: string,
-  workspaceName: string,
-): Promise<void> {
-  await projectGroup(page, projectName)
-    .getByRole("button")
-    .filter({ hasText: workspaceName })
-    .click();
-  await expect(page).toHaveURL(/\/workspace\//);
-}
-
-export async function expectWorkspaceHost(page: Page, hostName: string): Promise<void> {
-  await expect(page.getByRole("button", { name: "Host", exact: true })).toContainText(hostName);
-}
@@ -276,22 +276,15 @@ export async function swipeOpenMobileExplorer(page: Page): Promise<void> {
 }

 export async function closeMobileExplorer(page: Page): Promise<void> {
-  const closeButton = page
-    .getByTestId("workspace-explorer-sidebar")
-    .getByRole("button", { name: "Close Explorer sidebar", exact: true });
+  const closeButton = page.getByTestId("explorer-close");
  await expect(closeButton).toBeInViewport({ ratio: 1, timeout: 5_000 });
  await closeButton.click();
 }

 export async function expectMobileExplorerVisible(page: Page): Promise<void> {
-  await expect(page.getByTestId("workspace-explorer-sidebar")).toBeInViewport({
-    ratio: 1,
-    timeout: 5_000,
-  });
+  await expect(page.getByTestId("explorer-header")).toBeInViewport({ ratio: 1, timeout: 5_000 });
 }

 export async function expectMobileExplorerHidden(page: Page): Promise<void> {
-  await expect(page.getByTestId("workspace-explorer-sidebar")).not.toBeInViewport({
-    timeout: 5_000,
-  });
+  await expect(page.getByTestId("explorer-header")).not.toBeInViewport({ timeout: 5_000 });
 }
@@ -135,14 +135,3 @@ export async function expectCodexReportedWindows(page: Page, shape: "seven-day-o
    );
  }
 }
-
-export async function expectLoginUsageFreshness(page: Page, text: string, compact: boolean) {
-  const card = page.getByTestId("usage-report-login-journey:account");
-  if (compact) {
-    await expect(card.getByTestId("usage-freshness")).toHaveText(text);
-    return;
-  }
-  await card.getByRole("button", { name: "Refresh Claude", exact: true }).hover();
-  await expect(page.getByTestId("usage-freshness-tooltip")).toHaveText(text);
-  await page.mouse.move(0, 0);
-}
@@ -35,8 +35,6 @@ export type { WorkspaceSetupDaemonClient };
 export async function connectWorkspaceSetupClient(): Promise<WorkspaceSetupDaemonClient> {
  const client = await connectDaemonClient<WorkspaceSetupDaemonClient>({
    clientIdPrefix: "workspace-setup",
-    // COMPAT(workspaceSetupObservation): legacy streaming coverage; remove after 2027-04-19.
-    capabilities: { workspace_setup_observation: false },
  });
  // Establish demand before a caller can launch setup. Client close releases it.
  try {
@@ -328,51 +326,3 @@ export async function waitForWorkspaceSetupProgress(
    });
  });
 }
-
-/** Observe the browser's actual setup membership without requesting any output. */
-export function observeSetupPanelTraffic(page: Page) {
-  const subscriptions: Array<{ workspaceId: string; subscriptionId: string }> = [];
-  const releases = new Set<string>();
-  const requests: string[] = [];
-  let legacySetupDemand = false;
-  const outputWorkspaces: string[] = [];
-  page.on("websocket", (socket) => {
-    socket.on("framesent", ({ payload }) => {
-      const frame = JSON.parse(String(payload));
-      if (frame.type !== "session") return;
-      if (frame.message?.type === "subscription.release.request")
-        releases.add(frame.message.subscriptionId);
-      if (frame.message?.type === "workspace.setup.subscribe.request")
-        requests.push(frame.message.workspaceId);
-      if (
-        frame.message?.type === "session.events.set_subscription.request" &&
-        frame.message.events.includes("workspace_setup_progress")
-      )
-        legacySetupDemand = true;
-    });
-    socket.on("framereceived", ({ payload }) => {
-      const frame = JSON.parse(String(payload));
-      if (frame.type !== "session") return;
-      if (frame.message?.type === "workspace.setup.subscribe.response")
-        subscriptions.push(frame.message.payload);
-      if (frame.message?.type === "workspace_setup_progress")
-        outputWorkspaces.push(frame.message.payload.workspaceId);
-    });
-  });
-  return {
-    async expectNoDemand() {
-      expect(requests).toEqual([]);
-      expect(legacySetupDemand).toBe(false);
-      expect(subscriptions).toEqual([]);
-      expect(outputWorkspaces).toEqual([]);
-    },
-    async expectSubscribed(workspaceId: string, count: number) {
-      await expect.poll(() => subscriptions.length).toBe(count);
-      expect(subscriptions[count - 1].workspaceId).toBe(workspaceId);
-      expect(requests).toEqual(Array(count).fill(workspaceId));
-    },
-    async expectReleased(index: number) {
-      await expect.poll(() => releases.has(subscriptions[index].subscriptionId)).toBe(true);
-    },
-  };
-}
@@ -12,7 +12,6 @@ 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 {
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.12.0",
+  "version": "0.12.0-beta.2",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -58,11 +58,11 @@
    "@marijn/find-cluster-break": "^1.0.2",
    "@mattermost/react-native-paste-input": "2.0.1",
    "@react-native-async-storage/async-storage": "2.2.0",
-    "@react-native-masked-view/masked-view": "0.3.2",
-    "@react-native/normalize-colors": "0.86.3",
+    "@react-native-masked-view/masked-view": "^0.3.2",
+    "@react-native/normalize-colors": "^0.81.5",
    "@react-navigation/native": "^7.1.8",
    "@replit/codemirror-vim": "6.3.0",
-    "@shopify/react-native-skia": "2.6.2",
+    "@shopify/react-native-skia": "2.2.12",
    "@tanstack/react-query": "^5.90.11",
    "@tanstack/react-virtual": "^3.13.21",
    "@xterm/addon-clipboard": "^0.3.0-beta.213",
@@ -75,30 +75,30 @@
    "@xterm/addon-webgl": "^0.20.0-beta.212",
    "@xterm/xterm": "^6.1.0-beta.213",
    "buffer": "^6.0.3",
-    "expo": "~57.0.30",
-    "expo-asset": "~57.0.20",
-    "expo-audio": "~57.0.5",
-    "expo-build-properties": "~57.0.22",
-    "expo-camera": "~57.0.6",
-    "expo-clipboard": "~57.0.2",
-    "expo-constants": "~57.0.22",
-    "expo-crypto": "~57.0.4",
-    "expo-dev-client": "~57.0.20",
-    "expo-document-picker": "~57.0.3",
-    "expo-file-system": "~57.0.7",
-    "expo-haptics": "~57.0.3",
-    "expo-image": "~57.0.5",
-    "expo-image-manipulator": "~57.0.21",
-    "expo-image-picker": "~57.0.20",
-    "expo-keep-awake": "~57.0.2",
-    "expo-linking": "~57.0.13",
-    "expo-localization": "~57.0.2",
-    "expo-notifications": "~57.0.23",
-    "expo-router": "~57.0.28",
-    "expo-sharing": "~57.0.23",
-    "expo-splash-screen": "~57.0.10",
-    "expo-sqlite": "~57.0.4",
-    "expo-system-ui": "~57.0.4",
+    "expo": "^54.0.18",
+    "expo-asset": "~12.0.12",
+    "expo-audio": "~1.0.13",
+    "expo-build-properties": "^1.0.9",
+    "expo-camera": "~17.0.10",
+    "expo-clipboard": "~8.0.7",
+    "expo-constants": "~18.0.9",
+    "expo-crypto": "^15.0.8",
+    "expo-dev-client": "^6.0.15",
+    "expo-document-picker": "~14.0.8",
+    "expo-file-system": "~19.0.17",
+    "expo-haptics": "~15.0.7",
+    "expo-image": "~3.0.10",
+    "expo-image-manipulator": "~14.0.8",
+    "expo-image-picker": "^17.0.8",
+    "expo-keep-awake": "^15.0.7",
+    "expo-linking": "~8.0.8",
+    "expo-localization": "~17.0.9",
+    "expo-notifications": "^0.32.16",
+    "expo-router": "~6.0.13",
+    "expo-sharing": "^14.0.8",
+    "expo-splash-screen": "~31.0.10",
+    "expo-sqlite": "~16.0.10",
+    "expo-system-ui": "~6.0.7",
    "fast-deep-equal": "^3.1.3",
    "htmlparser2": "^12.0.0",
    "i18next": "^26.3.0",
@@ -111,25 +111,25 @@
    "micromark-util-decode-string": "2.0.1",
    "mnemonic-id": "^3.2.7",
    "qrcode": "^1.5.4",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
    "react-freeze": "1.0.4",
    "react-i18next": "^17.0.8",
-    "react-native": "0.86.3",
+    "react-native": "0.81.5",
    "react-native-draggable-flatlist": "^4.0.3",
    "react-native-edge-to-edge": "^1.7.0",
    "react-native-enriched-markdown": "1.2.0-nightly-20261014-766fc0e67",
-    "react-native-gesture-handler": "~2.32.0",
+    "react-native-gesture-handler": "~2.28.0",
    "react-native-keyboard-controller": "1.21.12",
    "react-native-nitro-modules": "0.35.5",
-    "react-native-reanimated": "4.5.1",
-    "react-native-safe-area-context": "~5.7.0",
-    "react-native-screens": "~4.26.0",
-    "react-native-svg": "15.15.4",
+    "react-native-reanimated": "~4.3.1",
+    "react-native-safe-area-context": "~5.6.0",
+    "react-native-screens": "~4.16.0",
+    "react-native-svg": "^15.14.0",
    "react-native-unistyles": "^3.2.4",
    "react-native-web": "~0.21.0",
-    "react-native-webview": "13.16.1",
-    "react-native-worklets": "0.10.1",
+    "react-native-webview": "^13.16.0",
+    "react-native-worklets": "~0.8.3",
    "tiny-invariant": "^1.3.3",
    "turndown": "^7.2.4",
    "turndown-plugin-gfm": "^1.0.2",
@@ -151,12 +151,11 @@
    "@vitest/browser": "^4.1.7",
    "@vitest/browser-playwright": "^4.1.7",
    "@xterm/headless": "^6.1.0-beta.213",
-    "babel-preset-expo": "~57.0.16",
    "dotenv": "^17.2.3",
    "eas-cli": "^16.24.1",
    "esbuild": "0.28.1",
    "eslint": "^9.25.0",
-    "eslint-config-expo": "~57.0.2",
+    "eslint-config-expo": "~10.0.0",
    "expo-gradle-jvmargs": "^1.1.2",
    "fake-indexeddb": "^6.2.5",
    "jsdom": "^20.0.3",
@@ -4,33 +4,26 @@ const {
  IOSConfig,
  withAppDelegate,
  withDangerousMod,
-  withInfoPlist,
  withPodfile,
 } = require("expo/config-plugins");

+const MODULE_SETUP = "    PasteInputModule.setup(factory.rootViewFactory)";
+const REACT_NATIVE_START_END = "      launchOptions: launchOptions)\n#endif";
 const BRIDGING_HEADER_IMPORT = "#import <react-native-paste-input/PasteInputModule.h>";
-const SCENE_DELEGATE = `
-@objc(PaseoSceneDelegate)
-class PaseoSceneDelegate: ExpoAppSceneDelegate {
-  override func scene(
-    _ scene: UIScene,
-    willConnectTo session: UISceneSession,
-    options connectionOptions: UIScene.ConnectionOptions
-  ) {
-    super.scene(scene, willConnectTo: session, options: connectionOptions)
-    guard let provider = UIApplication.shared.delegate as? ExpoReactNativeFactoryProvider,
-      let factory = provider.reactNativeFactory else { return }
-    PasteInputModule.setup(factory.rootViewFactory)
-  }
-}
-`;
+const PODFILE_NEW_ARCH_DISABLED =
+  "ENV['RCT_NEW_ARCH_ENABLED'] ||= '0' if podfile_properties['newArchEnabled'] == 'false'";
+const PODFILE_NEW_ARCH_ENABLED =
+  "ENV['RCT_NEW_ARCH_ENABLED'] ||= '1' if podfile_properties['newArchEnabled'] == 'true'";

 function configurePasteInputAppDelegate(contents) {
-  if (contents.includes("class PaseoSceneDelegate:")) return contents;
-  if (!contents.includes("ExpoReactNativeFactoryProvider")) {
-    throw new Error("Paste input requires Expo scene support");
+  const configured = contents.replace(`\n${MODULE_SETUP}`, "");
+  if (!configured.includes(REACT_NATIVE_START_END)) {
+    throw new Error("Could not register paste input after React Native starts");
  }
-  return `${contents.trimEnd()}\n${SCENE_DELEGATE}`;
+  return configured.replace(
+    REACT_NATIVE_START_END,
+    `      launchOptions: launchOptions)\n${MODULE_SETUP}\n#endif`,
+  );
 }

 function configurePasteInputBridgingHeader(contents) {
@@ -40,6 +33,19 @@ function configurePasteInputBridgingHeader(contents) {
  return `${contents.trimEnd()}\n${BRIDGING_HEADER_IMPORT}\n`;
 }

+function configurePasteInputPodfile(contents) {
+  if (contents.includes(PODFILE_NEW_ARCH_ENABLED)) {
+    return contents;
+  }
+  if (!contents.includes(PODFILE_NEW_ARCH_DISABLED)) {
+    throw new Error("Could not configure the new architecture for paste input");
+  }
+  return contents.replace(
+    PODFILE_NEW_ARCH_DISABLED,
+    `${PODFILE_NEW_ARCH_DISABLED}\n${PODFILE_NEW_ARCH_ENABLED}`,
+  );
+}
+
 function withPasteInput(config) {
  const withDelegate = withAppDelegate(config, (modConfig) => {
    if (modConfig.modResults.language !== "swift") {
@@ -48,18 +54,7 @@ function withPasteInput(config) {
    modConfig.modResults.contents = configurePasteInputAppDelegate(modConfig.modResults.contents);
    return modConfig;
  });
-  const withScene = withInfoPlist(withDelegate, (modConfig) => {
-    const scenes =
-      modConfig.modResults.UIApplicationSceneManifest?.UISceneConfigurations
-        ?.UIWindowSceneSessionRoleApplication;
-    if (!scenes || scenes.length !== 1) {
-      throw new Error("Paste input requires Expo's single scene configuration");
-    }
-    scenes[0].UISceneDelegateClassName = "PaseoSceneDelegate";
-    return modConfig;
-  });
-  const withPods = withPodfile(withScene, (modConfig) => {
-    // Paste input checks this legacy flag even though RN 0.86 only supports Fabric.
+  const withPods = withPodfile(withDelegate, (modConfig) => {
    modConfig.modResults.contents = configurePasteInputPodfile(modConfig.modResults.contents);
    return modConfig;
  });
@@ -84,9 +79,4 @@ function withPasteInputBridgingHeader(config) {
 module.exports = withPasteInput;
 module.exports.configurePasteInputAppDelegate = configurePasteInputAppDelegate;
 module.exports.configurePasteInputBridgingHeader = configurePasteInputBridgingHeader;
-
-function configurePasteInputPodfile(contents) {
-  const flag = "ENV['RCT_NEW_ARCH_ENABLED'] = '1'";
-  return contents.includes(flag) ? contents : `${flag}\n${contents}`;
-}
 module.exports.configurePasteInputPodfile = configurePasteInputPodfile;
@@ -7,14 +7,22 @@ const {
 } = require("./with-paste-input");

 describe("withPasteInput", () => {
-  it("registers paste input after Expo connects the React Native scene", () => {
-    const source = "class AppDelegate: ExpoAppDelegate, ExpoReactNativeFactoryProvider {}";
+  it("registers the module after React Native starts", () => {
+    const source = [
+      "import ReactAppDependencyProvider",
+      "",
+      "    bindReactNativeFactory(factory)",
+      "    factory.startReactNative(",
+      '      withModuleName: "main",',
+      "      in: window,",
+      "      launchOptions: launchOptions)",
+      "#endif",
+    ].join("\n");
    const configured = configurePasteInputAppDelegate(source);
-    expect(configured).toContain("class PaseoSceneDelegate: ExpoAppSceneDelegate");
-    expect(configured.indexOf("super.scene(")).toBeLessThan(
-      configured.indexOf("PasteInputModule.setup("),
+
+    expect(configured).toContain(
+      "      launchOptions: launchOptions)\n    PasteInputModule.setup(factory.rootViewFactory)\n#endif",
    );
-    expect(configured).toContain("provider.reactNativeFactory");
    expect(configurePasteInputAppDelegate(configured)).toBe(configured);
  });

@@ -25,11 +33,15 @@ describe("withPasteInput", () => {
    expect(configured).toContain("#import <react-native-paste-input/PasteInputModule.h>");
    expect(configurePasteInputBridgingHeader(configured)).toBe(configured);
  });
-  it("enables the legacy new-architecture flag required by the paste input podspec", () => {
+
+  it("sets the new architecture environment before CocoaPods evaluates dependencies", () => {
    const source =
-      "require File.join(File.dirname(`node --print \"require.resolve('expo/package.json')\"`), 'scripts/autolinking')";
+      "ENV['RCT_NEW_ARCH_ENABLED'] ||= '0' if podfile_properties['newArchEnabled'] == 'false'";
    const configured = configurePasteInputPodfile(source);
-    expect(configured).toBe("ENV['RCT_NEW_ARCH_ENABLED'] = '1'\n" + source);
+
+    expect(configured).toContain(
+      "ENV['RCT_NEW_ARCH_ENABLED'] ||= '1' if podfile_properties['newArchEnabled'] == 'true'",
+    );
    expect(configurePasteInputPodfile(configured)).toBe(configured);
  });
 });
@@ -1,22 +0,0 @@
-// 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}"
-        }
-    }
-}
@@ -1,7 +1,7 @@
 import { useCallback, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Text, View } from "react-native";
-import { useFocusEffect } from "expo-router/react-navigation";
+import { useFocusEffect } from "@react-navigation/native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { ArrowUpRight, Blocks, Check, Settings2 } from "lucide-react-native";
 import type { AgentSkillOperation, AgentSkillsStatus } from "@getpaseo/protocol/messages";
@@ -1,34 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { shouldAnimateNativeScrollToBottom } from "./native-scroll-animation";
-
-describe("native scroll-to-bottom animation", () => {
-  it("jumps across unmounted history instead of animating through blank rows", () => {
-    expect(
-      shouldAnimateNativeScrollToBottom({ offsetY: 60_000, viewportHeight: 600, windowSize: 10 }),
-    ).toBe(false);
-  });
-
-  it("keeps near-bottom movement eligible for animation", () => {
-    expect(
-      shouldAnimateNativeScrollToBottom({ offsetY: 300, viewportHeight: 600, windowSize: 10 }),
-    ).toBe(true);
-  });
-
-  it("bounds travel by the bottom-side overscan, not the whole window", () => {
-    expect(
-      shouldAnimateNativeScrollToBottom({ offsetY: 2700, viewportHeight: 600, windowSize: 10 }),
-    ).toBe(true);
-    expect(
-      shouldAnimateNativeScrollToBottom({ offsetY: 2701, viewportHeight: 600, windowSize: 10 }),
-    ).toBe(false);
-    expect(
-      shouldAnimateNativeScrollToBottom({ offsetY: 1500, viewportHeight: 600, windowSize: 5 }),
-    ).toBe(false);
-  });
-
-  it("does not animate before the viewport has been measured", () => {
-    expect(
-      shouldAnimateNativeScrollToBottom({ offsetY: 0, viewportHeight: 0, windowSize: 10 }),
-    ).toBe(false);
-  });
-});
@@ -1,10 +0,0 @@
-export function shouldAnimateNativeScrollToBottom(input: {
-  offsetY: number;
-  viewportHeight: number;
-  windowSize: number;
-}): boolean {
-  // VirtualizedList splits the extra window around the viewport. An animated
-  // jump farther than the bottom-side overscan crosses unmounted history.
-  const bottomOverscanHeight = ((input.windowSize - 1) / 2) * input.viewportHeight;
-  return input.viewportHeight > 0 && input.offsetY <= bottomOverscanHeight;
-}
@@ -23,7 +23,6 @@ import type { StreamItem } from "@/types/stream";
 import type { Theme } from "@/styles/theme";
 import { useStableEvent } from "@/hooks/use-stable-event";
 import { useKeyboardStreamInset } from "@/keyboard/shift";
-import { shouldAnimateNativeScrollToBottom } from "./native-scroll-animation";
 import { useRevisedHistoryRows } from "./history-row-revision";
 import { useBottomAnchorController } from "./bottom-anchor-controller";
 import { useScrollKeyboardDismiss } from "./scroll-keyboard-dismiss/use-scroll-keyboard-dismiss";
@@ -65,7 +64,6 @@ const historyStartSlotStyle: ViewStyle = {
  flexShrink: 0,
 };
 const HISTORY_START_SETTLE_FRAMES = 2;
-const NATIVE_STREAM_WINDOW_SIZE = 10;

 function keyExtractor(item: { id: string }): string {
  return item.id;
@@ -240,13 +238,7 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
      programmaticScrollEventBudgetRef.current = 3;
      flatListRef.current?.scrollToOffset({
        offset: 0,
-        animated:
-          animated &&
-          shouldAnimateNativeScrollToBottom({
-            offsetY: scrollOffsetYRef.current,
-            viewportHeight: streamViewportMetricsRef.current.viewportHeight,
-            windowSize: NATIVE_STREAM_WINDOW_SIZE,
-          }),
+        animated,
      });
      scrollOffsetYRef.current = 0;
      streamViewportMetricsRef.current = {
@@ -599,11 +591,11 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
      scrollEventThrottle={16}
      onContentSizeChange={handleContentSizeChange}
      maintainVisibleContentPosition={maintainVisibleContentPosition}
-      // Tall Markdown rows exhaust a shallow window during flings. Keep the initial
-      // render small, then refill a deeper window in batches large enough to keep up.
+      // A history row can contain an entire long reply. Keep synchronous native
+      // Markdown measurement bounded while FlatList fills the surrounding window.
      initialNumToRender={2}
-      maxToRenderPerBatch={10}
-      windowSize={NATIVE_STREAM_WINDOW_SIZE}
+      maxToRenderPerBatch={2}
+      windowSize={5}
      removeClippedSubviews={false}
      scrollEnabled={scrollEnabled}
      showsVerticalScrollIndicator
@@ -445,6 +445,11 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
          serverId: resolvedServerId,
          workspaceId: context.workspaceId ?? "",
        }),
+        checkout: {
+          serverId: resolvedServerId,
+          cwd: context.cwd,
+          isGit: context.projectPlacement?.checkout?.isGit ?? true,
+        },
        view: "files",
      });
    });
@@ -766,7 +771,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
              status={data.status}
              detail={data.detail}
              cwd={context.cwd}
-              serverId={resolvedServerId}
              metadata={data.metadata}
              agentMessage={data.agentMessage}
              isLastInSequence={isLastInSequence}
@@ -791,7 +795,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
          />
        );
      },
-      [context.cwd, resolvedServerId, setInlineDetailsExpanded, handleToolCallOpenFile],
+      [context.cwd, setInlineDetailsExpanded, handleToolCallOpenFile],
    );

    // Read through a stable event so live group updates do not change the renderer identity
@@ -1247,12 +1251,6 @@ function agentStreamViewPropsEqual(
  if (left.isAuthoritativeHistoryReady !== right.isAuthoritativeHistoryReady) {
    reasons.push("isAuthoritativeHistoryReady");
  }
-  if (left.bottomOverlayTailClearance !== right.bottomOverlayTailClearance) {
-    reasons.push("bottomOverlayTailClearance");
-  }
-  if (left.bottomOverlayControlClearance !== right.bottomOverlayControlClearance) {
-    reasons.push("bottomOverlayControlClearance");
-  }
  if (left.toast !== right.toast) reasons.push("toast");
  if (left.onOpenWorkspaceFile !== right.onOpenWorkspaceFile) reasons.push("onOpenWorkspaceFile");
  if (left.readOnly !== right.readOnly) reasons.push("readOnly");
@@ -1,6 +1,3 @@
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
-import { useIsExplorerSidebarOpen } from "@/workspace-tabs/explorer-sidebar";
 import { ComposerEditingSessionsProvider } from "@/composer/editing-session";
 import "@/styles/unistyles";
 import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
@@ -44,7 +41,7 @@ import { DesktopWindowControls } from "@/components/desktop/window-controls";
 import { SidebarModelProvider } from "@/components/sidebar/sidebar-model";
 import { WorkspacePinShortcutHandler } from "@/components/workspace-pin-shortcut-handler";
 import { WorkspaceRenameHost } from "@/components/workspace-rename-host";
-import { WorkspaceExplorerOpenGesture } from "@/mobile-panels/explorer-open-gesture";
+import { CompactExplorerSidebarHost } from "@/components/compact-explorer-sidebar-host";
 import { ProviderSettingsHost } from "@/components/provider-settings-host";
 import { WorkspaceSetupDialog } from "@/components/workspace-setup-dialog";
 import { WorkspaceShortcutTargetsSubscriber } from "@/components/workspace-shortcut-targets-subscriber";
@@ -93,6 +90,7 @@ import { useGlobalNewWorkspaceAction } from "@/hooks/use-global-new-workspace-ac
 import { useLatchedBoolean } from "@/hooks/use-latched-boolean";
 import { useFaviconStatus } from "@/hooks/use-favicon-status";
 import { useKeyboardShortcuts } from "@/hooks/use-keyboard-shortcuts";
+import { resolveExplorerSidebarPresentation } from "@/workspace-tabs/explorer-sidebar";
 import { KeyboardShiftProvider } from "@/keyboard/shift";
 import { useCompactWebViewportZoomLock } from "@/hooks/use-compact-web-viewport-zoom-lock";
 import { useOpenProject } from "@/hooks/use-open-project";
@@ -470,15 +468,17 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
  const isFocusModeEnabled = usePanelStore((state) => state.desktop.focusModeEnabled);
  const isDesktopAgentListOpen = usePanelStore((state) => state.desktop.agentListOpen);
  const sidebarWidth = usePanelStore((state) => state.sidebarWidth);
-  const { width: windowWidth } = useWindowDimensions();
-  const insets = useSafeAreaInsets();
-  const viewportWidth = windowWidth - insets.left - insets.right;
+  const { width: viewportWidth } = useWindowDimensions();

  const cycleTheme = useCallback(() => {
    void updateSettings({ theme: getNextThemePreference(settings.theme) });
  }, [settings.theme, updateSettings]);

  const isCompactLayout = useIsCompactFormFactor();
+  const explorerSidebarPresentation = resolveExplorerSidebarPresentation({
+    isCompact: isCompactLayout,
+  });
+  const usesCompactExplorerHost = explorerSidebarPresentation !== "pane";
  useCompactWebViewportZoomLock(isCompactLayout);
  const pathname = usePathname();
  const isWorkspaceRoute = parseHostWorkspaceRouteFromPathname(pathname) !== null;
@@ -516,15 +516,7 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
  useActiveWorktreeNewAction();
  useGlobalNewWorkspaceAction();

-  const activeWorkspace = useActiveWorkspaceSelection();
-  const explorerVisible = useIsExplorerSidebarOpen({
-    isCompact: isCompactLayout,
-    workspaceKey: activeWorkspace
-      ? `${activeWorkspace.serverId}:${activeWorkspace.workspaceId}`
-      : null,
-  });
  const appContentMinimumWidth = resolveDesktopAppContentMinimum({
-    explorerVisible: isWorkspaceRoute && explorerVisible,
    isSettingsRoute: pathname.includes("/settings"),
  });
  const desktopSidebarMounted = hasMountedDesktopSidebar && !isWorkspaceFocusModeEnabled;
@@ -556,25 +548,28 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
  if (isWeb) {
    themedSidebarChrome = <AppearanceStyleBoundary>{sidebarChrome}</AppearanceStyleBoundary>;
  }
-  const workspaceChromeStyle = useMemo(
-    () => [rowStyle, !isCompactLayout && { paddingLeft: insets.left, paddingRight: insets.right }],
-    [insets.left, insets.right, isCompactLayout],
-  );
  const workspaceChrome = (
-    <View style={workspaceChromeStyle}>
+    <View style={rowStyle}>
      <WorkspaceLayoutModePublisher />
      {!isCompactLayout ? (
        <WindowChromeRegion corners={appChromeLayout.sidebarCorners}>
          {themedSidebarChrome}
        </WindowChromeRegion>
      ) : null}
-      <WorkspaceExplorerOpenGesture enabled={chromeEnabled && isCompactLayout}>
-        <WindowChromeRegion
-          corners={isCompactLayout && chromeEnabled ? "both" : appChromeLayout.contentCorners}
+      {usesCompactExplorerHost ? (
+        <CompactExplorerSidebarHost
+          enabled={chromeEnabled}
+          presentation={explorerSidebarPresentation === "dock" ? "dock" : "overlay"}
        >
+          <WindowChromeRegion corners={chromeEnabled ? "both" : appChromeLayout.contentCorners}>
+            <View style={flexStyle}>{children}</View>
+          </WindowChromeRegion>
+        </CompactExplorerSidebarHost>
+      ) : (
+        <WindowChromeRegion corners={appChromeLayout.contentCorners}>
          <View style={flexStyle}>{children}</View>
        </WindowChromeRegion>
-      </WorkspaceExplorerOpenGesture>
+      )}
    </View>
  );

@@ -625,27 +620,15 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
    </View>
  );

-  return (
-    <AppContainerLifetime compactGesturesEnabled={chromeEnabled && isCompactLayout}>
-      {surface}
-    </AppContainerLifetime>
+  const content = isCompactLayout ? (
+    <MobileGestureWrapper chromeEnabled={chromeEnabled}>{surface}</MobileGestureWrapper>
+  ) : (
+    surface
  );
-}

-function AppContainerLifetime({
-  children,
-  compactGesturesEnabled,
-}: {
-  children: ReactNode;
-  compactGesturesEnabled: boolean;
-}) {
  return (
    <ComposerEditingSessionsProvider>
-      <CommandCenterProvider>
-        <MobileGestureWrapper chromeEnabled={compactGesturesEnabled}>
-          {children}
-        </MobileGestureWrapper>
-      </CommandCenterProvider>
+      <CommandCenterProvider>{content}</CommandCenterProvider>
    </ComposerEditingSessionsProvider>
  );
 }
@@ -679,15 +662,10 @@ function MobileGestureWrapper({
  chromeEnabled: boolean;
 }) {
  const openGesture = useOpenAgentListGesture(chromeEnabled);
-  const isCompactLayout = useIsCompactFormFactor();

  return (
    <GestureDetector gesture={openGesture} touchAction={MOBILE_WEB_GESTURE_TOUCH_ACTION}>
-      <View
-        collapsable={false}
-        style={layoutStyles.surfaceFill}
-        testID={isCompactLayout ? "compact-shell" : "wide-shell"}
-      >
+      <View collapsable={false} style={layoutStyles.surfaceFill} testID="compact-shell">
        {children}
      </View>
    </GestureDetector>
@@ -10,8 +10,6 @@ const HOST_STACK_SCREEN_OPTIONS = {
  animation: "none" as const,
 };

-const SCREEN_OWNED_APPEARANCE = ["workspace/[workspaceId]/index"] as const;
-
 const AGENT_SCREEN_OPTIONS = { gestureEnabled: false };

 export default function HostRouteLayout() {
@@ -36,10 +34,7 @@ function KnownHostRoute() {
  }

  const stack = (
-    <ThemedStack
-      screenOptions={HOST_STACK_SCREEN_OPTIONS}
-      screenOwnedAppearance={SCREEN_OWNED_APPEARANCE}
-    >
+    <ThemedStack screenOptions={HOST_STACK_SCREEN_OPTIONS}>
      <Stack.Screen name="index" />
      <Stack.Screen name="workspace/[workspaceId]/index" />
      <Stack.Screen name="agent/[agentId]" options={AGENT_SCREEN_OPTIONS} />
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
-import { useNavigation } from "expo-router/react-navigation";
+import { useNavigation } from "@react-navigation/native";
 import { StyleSheet, View } from "react-native";
 import { useGlobalSearchParams, useLocalSearchParams, useRootNavigationState } from "expo-router";
 import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
@@ -33,7 +33,7 @@ const styles = StyleSheet.create((theme) => ({
    flex: 1,
  },
  overlay: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
    justifyContent: "center",
    alignItems: "center",
  },
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-  <path d="M2.033 9.867l2.554 1.483a.589.589 0 00.592 0l2.554-1.483.01-.008a.608.608 0 00.11-.084l.013-.015a.631.631 0 00.076-.1c.003-.005.008-.01.01-.016a.558.558 0 00.052-.125l.007-.028a.611.611 0 00.019-.14V7.868c0-.572.307-1.105.8-1.392a1.595 1.595 0 011.598 0l1.277.742a.54.54 0 00.129.053l.028.01c.044.01.088.015.133.016h.006l.013-.002a.587.587 0 00.27-.074l.011-.004 2.554-1.483a.596.596 0 00.297-.516V2.253a.595.595 0 00-.297-.516L12.293.257a.587.587 0 00-.591 0L9.148 1.737l-.01.01a.609.609 0 00-.109.083l-.014.015a.632.632 0 00-.076.1c-.003.005-.008.01-.01.016a.57.57 0 00-.052.124l-.007.028a.612.612 0 00-.018.14v1.483c0 .572-.307 1.105-.8 1.393a1.597 1.597 0 01-1.599 0l-1.276-.742a.603.603 0 00-.13-.053l-.028-.008a.658.658 0 00-.133-.018h-.02a.57.57 0 00-.269.074c-.003.002-.008.002-.012.005L2.033 5.872a.596.596 0 00-.297.515v2.966c0 .213.113.41.297.515z" fill="currentColor"></path><path d="M15.943 10.607a1.596 1.596 0 011.599 0l1.276.74c.041.025.085.04.13.055l.028.008c.043.01.088.016.133.018h.005c.005 0 .01-.002.014-.003a.474.474 0 00.122-.016l.021-.005a.616.616 0 00.126-.052c.004-.002.009-.002.013-.005l2.554-1.482a.597.597 0 00.297-.516V6.383a.596.596 0 00-.297-.515l-2.552-1.483a.587.587 0 00-.592 0l-2.553 1.482-.011.008a.61.61 0 00-.108.084l-.014.016a.637.637 0 00-.076.1c-.003.005-.008.01-.01.016a.57.57 0 00-.052.124l-.007.029a.612.612 0 00-.018.14v1.482c0 .572-.307 1.105-.8 1.393a1.597 1.597 0 01-1.599 0l-1.276-.742a.584.584 0 00-.13-.053l-.028-.008a.62.62 0 00-.133-.018h-.02a.587.587 0 00-.269.074l-.012.004L9.15 10a.596.596 0 00-.296.516v2.966c0 .212.112.409.296.515l2.554 1.483s.008.002.012.005c.04.022.082.04.126.052l.02.004a.57.57 0 00.123.017l.014.002h.006c.054 0 .108-.01.16-.025a.587.587 0 00.13-.054l1.277-.741a1.597 1.597 0 012.398 1.392v1.482c0 .049.007.095.019.14l.007.028a.619.619 0 00.051.125c.004.006.008.01.01.016a.6.6 0 00.076.1l.014.015c.033.032.069.06.108.084.004.002.006.006.011.008l2.554 1.483a.59.59 0 00.593 0l2.554-1.483a.597.597 0 00.296-.516v-2.965a.595.595 0 00-.296-.516l-2.554-1.483s-.008-.002-.012-.005a.54.54 0 00-.126-.051c-.007-.003-.013-.003-.02-.005a.635.635 0 00-.125-.017h-.018a.557.557 0 00-.16.026.588.588 0 00-.13.053l-1.276.742a1.595 1.595 0 01-1.598 0 1.615 1.615 0 010-2.785l-.005-.001z" fill="currentColor"></path><path d="M14.848 18.265l-2.554-1.482-.012-.005a.526.526 0 00-.126-.052c-.007-.002-.014-.002-.02-.005a.64.64 0 00-.124-.017h-.02a.56.56 0 00-.16.026.588.588 0 00-.13.053l-1.276.742a1.594 1.594 0 01-1.598 0c-.493-.286-.8-.82-.8-1.393V14.65a.563.563 0 00-.018-.14l-.008-.028a.604.604 0 00-.051-.124l-.01-.017a.603.603 0 00-.076-.1l-.014-.015a.596.596 0 00-.109-.084c-.003-.002-.005-.006-.01-.008L5.178 12.65a.587.587 0 00-.591 0l-2.554 1.483a.596.596 0 00-.297.516v2.965c0 .213.113.41.297.516l2.554 1.483.012.004a.618.618 0 00.267.074l.016.002h.007a.55.55 0 00.16-.026.584.584 0 00.129-.053l1.277-.742a1.597 1.597 0 012.398 1.393v1.482c0 .05.007.095.019.14l.007.028c.013.044.03.085.051.125l.01.016c.022.036.047.07.076.1l.014.015c.032.032.069.06.109.084l.01.008 2.554 1.483a.587.587 0 00.593 0l2.554-1.483a.596.596 0 00.296-.515v-2.966a.596.596 0 00-.296-.516h-.002z" fill="currentColor"></path>
-</svg>
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 1024 1024" fill="none">
-  <path fill="currentColor" d="M395.479 633.828L735.91 381.105C752.599 368.715 776.454 373.548 784.406 392.792C826.26 494.285 807.561 616.253 724.288 699.996C641.016 783.739 525.151 802.104 419.247 760.277L303.556 814.143C469.49 928.202 670.987 899.995 796.901 773.282C896.776 672.843 927.708 535.937 898.785 412.476L899.047 412.739C857.105 231.37 909.358 158.874 1016.4 10.6326C1018.93 7.11771 1021.47 3.60279 1024 0L883.144 141.651V141.212L395.392 633.916"/>
-  <path fill="currentColor" d="M325.226 695.251C206.128 580.84 226.662 403.776 328.285 301.668C403.431 226.097 526.549 195.254 634.026 240.596L749.454 186.994C728.657 171.88 702.007 155.623 671.424 144.2C533.19 86.9942 367.693 115.465 255.323 228.382C147.234 337.081 113.244 504.215 171.613 646.833C215.216 753.423 143.739 828.818 71.7385 904.916C46.2237 931.893 20.6216 958.87 0 987.429L325.139 695.339"/>
-</svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M18.8 0H5.2A5.2 5.2 0 000 5.2v13.6A5.2 5.2 0 005.2 24h13.6a5.2 5.2 0 005.2-5.2V5.2A5.2 5.2 0 0018.8 0z" fill="#9046FF" /> <path d="M7.97 16.376c-1.644 3.642 1.86 4.556 4.443 2.424.76 2.39 3.608.607 4.631-1.247 2.251-4.084 1.342-8.249 1.108-9.108-1.6-5.859-9.6-5.869-10.976.03-.323 1.033-.328 2.206-.507 3.423-.09.617-.16 1.009-.393 1.655-.139.373-.323.7-.62 1.257-.458.865-.264 2.53 2.101 1.665l.224-.1h-.01l-.001.001z" fill="#fff" /> <path d="M12.722 10.985c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.218-.97a.61.61 0 01.537-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005zm2.703 0c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.219-.97a.61.61 0 01.536-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005z" fill="#000" /></svg>
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-  <path d="M16.278 2c1.156 0 2.093.927 2.093 2.07v12.501a.74.74 0 00.744.709.74.74 0 00.743-.709V9.099a2.06 2.06 0 012.071-2.049A2.06 2.06 0 0124 9.1v6.561a.649.649 0 01-.652.645.649.649 0 01-.653-.645V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v7.472a2.037 2.037 0 01-2.048 2.026 2.037 2.037 0 01-2.048-2.026v-12.5a.785.785 0 00-.788-.753.785.785 0 00-.789.752l-.001 15.904A2.037 2.037 0 0113.441 22a2.037 2.037 0 01-2.048-2.026V18.04c0-.356.292-.645.652-.645.36 0 .652.289.652.645v1.934c0 .263.142.506.372.638.23.131.514.131.744 0a.734.734 0 00.372-.638V4.07c0-1.143.937-2.07 2.093-2.07zm-5.674 0c1.156 0 2.093.927 2.093 2.07v11.523a.648.648 0 01-.652.645.648.648 0 01-.652-.645V4.07a.785.785 0 00-.789-.78.785.785 0 00-.789.78v14.013a2.06 2.06 0 01-2.07 2.048 2.06 2.06 0 01-2.071-2.048V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v3.8a2.06 2.06 0 01-2.071 2.049A2.06 2.06 0 010 12.9v-1.378c0-.357.292-.646.652-.646.36 0 .653.29.653.646V12.9c0 .418.343.757.766.757s.766-.339.766-.757V9.099a2.06 2.06 0 012.07-2.048 2.06 2.06 0 012.071 2.048v8.984c0 .419.343.758.767.758.423 0 .766-.339.766-.758V4.07c0-1.143.937-2.07 2.093-2.07z" fill="currentColor" fill-rule="nonzero"></path>
-</svg>
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-  <path d="M24 20.541H3.428v-3.426H0V3.4h24V20.54zM3.428 17.115h17.144V6.827H3.428v10.288zm8.573-5.196l-2.425 2.424-2.424-2.424 2.424-2.424 2.425 2.424zm6.857-.001l-2.424 2.423-2.425-2.423 2.425-2.425 2.424 2.425z" fill="currentColor"></path>
-</svg>
@@ -16,10 +16,7 @@ import { Check, ChevronRight, Folder, X } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { BottomSheetFlatList, type BottomSheetFlatListMethods } from "@gorhom/bottom-sheet";
 import { AgentStatusDot } from "@/components/agent-status-dot";
-import { HighlightedText, type HighlightedTextProps } from "@/components/ui/highlighted-text";
-import { findHighlightRanges } from "@/components/ui/highlighted-text-segments";
 import { MaterialFileIcon } from "@/components/material-file-icon";
-import { ProjectIconView } from "@/components/project-icon-view";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import {
  EditingTextInput as TextInput,
@@ -32,11 +29,8 @@ import {
 } from "@/components/ui/isolated-bottom-sheet-modal";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { isNative, isWeb } from "@/constants/platform";
-import { useAggregatedAgents } from "@/hooks/use-aggregated-agents";
+import { useAggregatedAgents, type AggregatedAgent } from "@/hooks/use-aggregated-agents";
 import { useProjects } from "@/hooks/use-projects";
-import { useTimeAgo } from "@/hooks/use-time-ago";
-import { createProjectIconTarget } from "@/projects/icon-target";
-import { useProjectIcons } from "@/projects/icons";
 import {
  OverlayLayerProvider,
  useGlobalWebOverlayLayer,
@@ -55,14 +49,8 @@ import {
 } from "@/utils/command-center-focus-restore";
 import { focusWithRetries } from "@/utils/web-focus";
 import { navigateToAgent } from "@/utils/navigate-to-agent";
+import { formatTimeAgo } from "@/utils/time";
 import { shortenPath } from "@/utils/shorten-path";
-import { projectIconPlaceholderLabelFromDisplayName } from "@/utils/project-display-name";
-import {
-  COMMAND_CENTER_LINE_HEIGHT,
-  COMMAND_CENTER_LIST_METRICS,
-  COMMAND_CENTER_SECTION_GAP,
-  type CommandCenterListMetrics,
-} from "./list-metrics";
 import { useCommandCenterContributions } from "./provider";
 import { filterAndRankWorkspaces } from "./workspace-search";
 import {
@@ -101,14 +89,42 @@ const ThemedLoadingSpinner = withUnistyles(LoadingSpinner, (theme) => ({
 const COMMAND_CENTER_SNAP_POINTS = ["60%", "90%"];
 const KEYBOARD_SHOULD_PERSIST_TAPS = "always" as const;

+function sortAgents(left: AggregatedAgent, right: AggregatedAgent): number {
+  const leftNeedsInput = (left.pendingPermissionCount ?? 0) > 0 ? 1 : 0;
+  const rightNeedsInput = (right.pendingPermissionCount ?? 0) > 0 ? 1 : 0;
+  if (leftNeedsInput !== rightNeedsInput) return rightNeedsInput - leftNeedsInput;
+  const leftAttention = left.requiresAttention ? 1 : 0;
+  const rightAttention = right.requiresAttention ? 1 : 0;
+  if (leftAttention !== rightAttention) return rightAttention - leftAttention;
+  const leftRunning = left.status === "running" ? 1 : 0;
+  const rightRunning = right.status === "running" ? 1 : 0;
+  if (leftRunning !== rightRunning) return rightRunning - leftRunning;
+  return right.lastActivityAt.getTime() - left.lastActivityAt.getTime();
+}
+
+function compareWorkspacesByTitle(
+  left: CommandCenterWorkspaceResult,
+  right: CommandCenterWorkspaceResult,
+): number {
+  const titleDelta = left.title.localeCompare(right.title, undefined, {
+    numeric: true,
+    sensitivity: "base",
+  });
+  return titleDelta || left.subtitle.localeCompare(right.subtitle);
+}
+
 /** `cwd` is not rendered, so a path match must never outrank a match on text the user can see. */
 function agentSearchFields(result: CommandCenterAgentResult): CommandCenterSearchFields {
  return { visible: [result.title, result.subtitle], hidden: [result.agent.cwd] };
 }

 /**
- * Build every pinned row. Deliberately not keyed on `query`: none of this work depends on what
- * was typed. Ordering belongs to `filterAndRankBuiltInResults`, which ranks on every keystroke.
+ * Build every pinned row, in its default order. Deliberately not keyed on `query`: none of this
+ * work depends on what was typed, and rebuilding it per keystroke means re-running an Intl
+ * collation sort over every workspace.
+ *
+ * The cost is that `formatTimeAgo` is baked into the agent subtitle here, so relative timestamps
+ * now refresh when agents or projects change rather than on every keystroke.
 */
 function useBuiltInRows(open: boolean): {
  workspaces: CommandCenterWorkspaceResult[];
@@ -118,32 +134,11 @@ function useBuiltInRows(open: boolean): {
  const { agents } = useAggregatedAgents({ demand: open });
  const { projects } = useProjects({ enabled: open });
  const showHost = useHosts().length > 1;
-  const iconTargets = useMemo(
-    () =>
-      open
-        ? projects.flatMap((project) =>
-            project.hosts.flatMap((host) => {
-              const target = createProjectIconTarget({
-                projectViewKey: project.viewKey,
-                placement: { ...host, iconWorkingDir: host.repoRoot },
-              });
-              return target ? [target] : [];
-            }),
-          )
-        : [],
-    [open, projects],
-  );
-  const iconDataByProjectViewKey = useProjectIcons({ projects: iconTargets });

  return useMemo(() => {
    if (!open) return { workspaces: [], agents: [] };
    const allWorkspaces: CommandCenterWorkspaceResult[] = [];
    for (const project of projects) {
-      const workspaceProject = {
-        viewKey: project.viewKey,
-        name: project.projectName,
-        iconDataUri: iconDataByProjectViewKey.get(project.viewKey) ?? null,
-      };
      for (const host of project.hosts) {
        for (const workspace of host.workspaces) {
          if (workspace.archivingAt) continue;
@@ -156,9 +151,7 @@ function useBuiltInRows(open: boolean): {
              project.projectName,
              workspace.currentBranch,
            ]),
-            project: workspaceProject,
            changeRequestNumber: workspace.changeRequestNumber,
-            activityAt: workspace.statusEnteredAt,
            run: () => {
              clearCommandCenterFocusRestoreElement();
              navigateToWorkspace({ serverId: host.serverId, workspaceId: workspace.id });
@@ -167,31 +160,34 @@ function useBuiltInRows(open: boolean): {
        }
      }
    }
+    allWorkspaces.sort(compareWorkspacesByTitle);
    const workspaceTitleByKey = new Map(
      allWorkspaces.map((workspace) => [workspace.id.slice("workspace:".length), workspace.title]),
    );
-    const agentRows = agents.map<CommandCenterAgentResult>((agent) => {
-      const workspaceTitle = agent.workspaceId
-        ? workspaceTitleByKey.get(`${agent.serverId}:${agent.workspaceId}`)
-        : undefined;
-      return {
-        kind: "agent",
-        id: `agent:${agent.serverId}:${agent.id}`,
-        agent,
-        title: agent.title || t("shell.commandCenter.newAgent"),
-        subtitle: joinSubtitleParts([
-          showHost ? agent.serverLabel : null,
-          workspaceTitle ?? shortenPath(agent.cwd),
-        ]),
-        activityAt: agent.lastActivityAt,
-        run: () => {
-          clearCommandCenterFocusRestoreElement();
-          navigateToAgent({ serverId: agent.serverId, agentId: agent.id });
-        },
-      };
-    });
+    const agentRows = agents
+      .map<CommandCenterAgentResult>((agent) => {
+        const workspaceTitle = agent.workspaceId
+          ? workspaceTitleByKey.get(`${agent.serverId}:${agent.workspaceId}`)
+          : undefined;
+        return {
+          kind: "agent",
+          id: `agent:${agent.serverId}:${agent.id}`,
+          agent,
+          title: agent.title || t("shell.commandCenter.newAgent"),
+          subtitle: joinSubtitleParts([
+            showHost ? agent.serverLabel : null,
+            workspaceTitle ?? shortenPath(agent.cwd),
+            formatTimeAgo(agent.lastActivityAt),
+          ]),
+          run: () => {
+            clearCommandCenterFocusRestoreElement();
+            navigateToAgent({ serverId: agent.serverId, agentId: agent.id });
+          },
+        };
+      })
+      .sort((left, right) => sortAgents(left.agent, right.agent));
    return { workspaces: allWorkspaces, agents: agentRows };
-  }, [agents, iconDataByProjectViewKey, open, projects, showHost, t]);
+  }, [agents, open, projects, showHost, t]);
 }

 function useBuiltInSections(open: boolean, query: string): CommandCenterResultSection[] {
@@ -206,14 +202,16 @@ function useBuiltInSections(open: boolean, query: string): CommandCenterResultSe
        band: PINNED_SECTION_BAND,
        rank: 2,
        title: t("shell.commandCenter.workspaces"),
-        results: filterAndRankWorkspaces(rows.workspaces, query),
+        results: filterAndRankWorkspaces(rows.workspaces, query, compareWorkspacesByTitle),
      },
      {
        id: "agents",
        band: PINNED_SECTION_BAND,
        rank: 3,
        title: t("shell.commandCenter.agents"),
-        results: filterAndRankBuiltInResults(rows.agents, query, agentSearchFields),
+        results: filterAndRankBuiltInResults(rows.agents, query, agentSearchFields, (left, right) =>
+          sortAgents(left.agent, right.agent),
+        ),
      },
    ];
  }, [open, query, rows, t]);
@@ -238,7 +236,7 @@ interface CommandCenterState {
  key(key: string): boolean;
 }

-function useCommandCenterState(listMetrics: CommandCenterListMetrics): CommandCenterState {
+function useCommandCenterState(): CommandCenterState {
  const keyboardActionDispatcher = useKeyboardActionDispatcher();
  const { t } = useTranslation();
  const open = useKeyboardShortcutsStore((state) => state.commandCenterOpen);
@@ -292,9 +290,8 @@ function useCommandCenterState(listMetrics: CommandCenterListMetrics): CommandCe
        scope === "files"
          ? fileSections
          : [...contributionSections, ...fileSections, ...builtInSections],
-        listMetrics,
      ),
-    [builtInSections, contributionSections, fileSections, listMetrics, scope],
+    [builtInSections, contributionSections, fileSections, scope],
  );
  const resolvedActiveId = preserveActiveResultId(activeId, projection.selectableResults);

@@ -384,19 +381,11 @@ function useCommandCenterState(listMetrics: CommandCenterListMetrics): CommandCe

 interface ResultRowProps {
  result: CommandCenterResult;
-  height: number;
-  query: string;
  active: boolean;
  onSelect(result: CommandCenterResult): void;
 }

-const ResultRow = memo(function ResultRow({
-  result,
-  height,
-  query,
-  active,
-  onSelect,
-}: ResultRowProps) {
+const ResultRow = memo(function ResultRow({ result, active, onSelect }: ResultRowProps) {
  const press = useCallback(() => onSelect(result), [onSelect, result]);
  const choice =
    result.kind === "contribution" && result.contribution.presentation.kind === "choice"
@@ -413,10 +402,15 @@ const ResultRow = memo(function ResultRow({
  const style = useCallback(
    ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
      styles.row,
-      { height },
+      (result.kind === "agent" ||
+        result.kind === "workspace" ||
+        (result.kind === "contribution" &&
+          result.contribution.presentation.kind === "action" &&
+          Boolean(result.contribution.presentation.subtitle))) &&
+        styles.tallRow,
      (Boolean(hovered) || pressed || active) && styles.activeRow,
    ],
-    [active, height],
+    [active, result],
  );
  return (
    <Pressable
@@ -430,75 +424,12 @@ const ResultRow = memo(function ResultRow({
        result.kind === "file" ? `command-center-file-row-${result.filePath}` : choice?.testId
      }
    >
-      <ResultContent result={result} query={query} />
+      <ResultContent result={result} />
    </Pressable>
  );
 });

-/**
- * Text with the query's terms marked. Marks use the same matcher options the rows were ranked
- * with, so a mark always points at something that made the row match.
- */
-function QueryHighlightedText({
-  query,
-  text,
-  ...props
-}: { query: string } & Omit<HighlightedTextProps, "ranges">) {
-  const ranges = useMemo(() => findHighlightRanges(query, text), [query, text]);
-  return <HighlightedText text={text} ranges={ranges} {...props} />;
-}
-
-/**
- * The subtitle line of a workspace or agent row. The timestamp is its own text so a long branch
- * truncates without pushing the time out of view, and so the time is never part of what the
- * query matches against. It keeps itself current while the command center stays open.
- */
-function SubtitleWithTimestamp({
-  query,
-  subtitle,
-  activityAt,
-  testID,
-}: {
-  query: string;
-  subtitle: string;
-  activityAt: Date | null;
-  testID: string;
-}) {
-  const timeAgo = useTimeAgo(activityAt);
-  return (
-    <View style={styles.subtitleLine}>
-      <QueryHighlightedText
-        query={query}
-        text={subtitle}
-        style={[styles.subtitle, styles.subtitleText]}
-        numberOfLines={1}
-        testID={testID}
-      />
-      {timeAgo ? (
-        <Text style={styles.subtitle} numberOfLines={1} testID="command-center-result-timestamp">
-          {/* Non-breaking: web collapses a leading plain space in its own flex item. */}
-          {subtitle ? `\u00a0· ${timeAgo}` : timeAgo}
-        </Text>
-      ) : null}
-    </View>
-  );
-}
-
-/** The same project icon the sidebar's workspace rows lead with: its image, or a lettered square. */
-function WorkspaceProjectIcon({ project }: { project: CommandCenterWorkspaceResult["project"] }) {
-  const initial = projectIconPlaceholderLabelFromDisplayName(project.name).charAt(0).toUpperCase();
-  return (
-    <ProjectIconView
-      iconDataUri={project.iconDataUri}
-      initial={initial}
-      projectViewKey={project.viewKey}
-      size={16}
-      textStyle={styles.projectIconFallbackText}
-    />
-  );
-}
-
-function ResultContent({ result, query }: { result: CommandCenterResult; query: string }) {
+function ResultContent({ result }: { result: CommandCenterResult }) {
  if (result.kind === "file") {
    return (
      <View style={styles.rowContent}>
@@ -507,16 +438,13 @@ function ResultContent({ result, query }: { result: CommandCenterResult; query:
            <MaterialFileIcon fileName={result.title} size={16} />
          </View>
          <Text style={styles.fileLine} numberOfLines={1} testID="command-center-file-line">
-            <QueryHighlightedText
-              query={query}
-              text={result.title}
-              style={styles.fileName}
-              testID="command-center-file-name"
-            />
+            <Text style={styles.fileName} testID="command-center-file-name">
+              {result.title}
+            </Text>
            {result.subtitle ? (
              <Text style={styles.filePath} testID="command-center-file-path">
                {" "}
-                <QueryHighlightedText query={query} text={result.subtitle} />
+                {result.subtitle}
              </Text>
            ) : null}
          </Text>
@@ -537,18 +465,12 @@ function ResultContent({ result, query }: { result: CommandCenterResult; query:
            />
          </View>
          <View style={styles.textContent}>
-            <QueryHighlightedText
-              query={query}
-              text={result.title}
-              style={styles.title}
-              numberOfLines={1}
-            />
-            <SubtitleWithTimestamp
-              query={query}
-              subtitle={result.subtitle}
-              activityAt={result.activityAt}
-              testID="command-center-agent-subtitle"
-            />
+            <Text style={styles.title} numberOfLines={1}>
+              {result.title}
+            </Text>
+            <Text style={styles.subtitle} numberOfLines={1} testID="command-center-agent-subtitle">
+              {result.subtitle}
+            </Text>
          </View>
        </View>
      </View>
@@ -559,28 +481,20 @@ function ResultContent({ result, query }: { result: CommandCenterResult; query:
    return (
      <View style={styles.rowContent} testID={`command-center-workspace-${key}`}>
        <View style={styles.rowMain}>
-          {/* Decorative: the fallback icon's initial must not prefix the row's accessible name. */}
-          <View
-            style={styles.iconSlot}
-            accessibilityElementsHidden
-            importantForAccessibility="no-hide-descendants"
-            aria-hidden
-          >
-            <WorkspaceProjectIcon project={result.project} />
+          <View style={styles.iconSlot}>
+            <ThemedFolder size={16} strokeWidth={2.2} />
          </View>
          <View style={styles.textContent}>
-            <QueryHighlightedText
-              query={query}
-              text={result.title}
-              style={styles.title}
+            <Text style={styles.title} numberOfLines={1}>
+              {result.title}
+            </Text>
+            <Text
+              style={styles.subtitle}
              numberOfLines={1}
-            />
-            <SubtitleWithTimestamp
-              query={query}
-              subtitle={result.subtitle}
-              activityAt={result.activityAt}
              testID="command-center-workspace-subtitle"
-            />
+            >
+              {result.subtitle}
+            </Text>
          </View>
        </View>
      </View>
@@ -598,19 +512,11 @@ function ResultContent({ result, query }: { result: CommandCenterResult; query:
            </View>
          ) : null}
          <View style={styles.textContent}>
-            <QueryHighlightedText
-              query={query}
-              text={presentation.title}
-              style={styles.title}
-              numberOfLines={1}
-            />
+            <Text style={styles.title} numberOfLines={1}>
+              {presentation.title}
+            </Text>
            {presentation.subtitle ? (
-              <QueryHighlightedText
-                query={query}
-                text={presentation.subtitle}
-                style={styles.subtitle}
-                numberOfLines={1}
-              />
+              <Text style={styles.subtitle}>{presentation.subtitle}</Text>
            ) : null}
          </View>
        </View>
@@ -635,14 +541,14 @@ function ResultContent({ result, query }: { result: CommandCenterResult; query:
              style={styles.breadcrumbPart}
            >
              {index > 0 ? <ThemedChevronRight size={13} strokeWidth={2} /> : null}
-              <QueryHighlightedText
-                query={query}
-                text={part}
+              <Text
                style={
                  index === presentation.path.length - 1 ? styles.title : styles.breadcrumbGroup
                }
                numberOfLines={1}
-              />
+              >
+                {part}
+              </Text>
            </View>
          ))}
        </View>
@@ -657,9 +563,11 @@ function ResultContent({ result, query }: { result: CommandCenterResult; query:
 }

 function SectionRow({ row }: { row: Extract<CommandCenterListRow, { kind: "section" }> }) {
-  const style = useMemo(() => [styles.section, { height: row.height }], [row.height]);
+  let sizeStyle = styles.dividerSection;
+  if (row.title && row.divider) sizeStyle = styles.dividedSection;
+  if (row.title && !row.divider) sizeStyle = styles.titledSection;
  return (
-    <View style={style}>
+    <View style={sizeStyle}>
      {row.divider ? <View style={styles.sectionDivider} /> : null}
      {row.title ? <Text style={styles.sectionLabel}>{row.title}</Text> : null}
    </View>
@@ -668,10 +576,8 @@ function SectionRow({ row }: { row: Extract<CommandCenterListRow, { kind: "secti

 export function CommandCenter() {
  const { t } = useTranslation();
+  const state = useCommandCenterState();
  const isCompact = useIsCompactFormFactor();
-  const state = useCommandCenterState(
-    isCompact ? COMMAND_CENTER_LIST_METRICS.compact : COMMAND_CENTER_LIST_METRICS.desktop,
-  );
  const showBottomSheet = isCompact && isNative;
  const modalLayer = useGlobalWebOverlayLayer("modal", isWeb && state.open && !showBottomSheet);
  const listRef = useRef<FlatList<CommandCenterListRow>>(null);
@@ -738,13 +644,11 @@ export function CommandCenter() {
      ) : (
        <ResultRow
          result={item.result}
-          height={item.height}
-          query={state.query}
          active={item.result.id === state.activeId}
          onSelect={state.select}
        />
      ),
-    [state.activeId, state.query, state.select],
+    [state.activeId, state.select],
  );
  const getItemLayout = useCallback(
    (_data: ArrayLike<CommandCenterListRow> | null | undefined, index: number) => ({
@@ -943,7 +847,7 @@ const styles = StyleSheet.create((theme) => ({
    alignItems: "center",
    paddingTop: theme.spacing[12],
  },
-  backdrop: { ...StyleSheet.absoluteFill, backgroundColor: "rgba(0, 0, 0, 0.5)" },
+  backdrop: { ...StyleSheet.absoluteFillObject, backgroundColor: "rgba(0, 0, 0, 0.5)" },
  panel: {
    width: 640,
    height: 560,
@@ -997,21 +901,20 @@ const styles = StyleSheet.create((theme) => ({
    fontWeight: "500",
  },
  results: { flex: 1 },
-  // Sections and rows take their height from list-metrics; these styles only place content in it.
-  section: { justifyContent: "flex-end" },
  sectionLabel: {
    paddingHorizontal: theme.spacing[4],
-    paddingBottom: COMMAND_CENTER_SECTION_GAP,
+    paddingBottom: theme.spacing[2],
    fontSize: theme.fontSize.sm,
-    lineHeight: COMMAND_CENTER_LINE_HEIGHT.sectionLabel,
    color: theme.colors.foregroundMuted,
  },
  sectionDivider: {
    height: 1,
-    marginVertical: COMMAND_CENTER_SECTION_GAP,
+    marginTop: theme.spacing[2],
+    marginBottom: theme.spacing[2],
    backgroundColor: theme.colors.border,
  },
-  row: { paddingHorizontal: theme.spacing[4], justifyContent: "center" },
+  row: { height: 36, paddingHorizontal: theme.spacing[4], paddingVertical: theme.spacing[2] },
+  tallRow: { height: 56 },
  activeRow: { backgroundColor: theme.colors.surface1 },
  rowContent: {
    flexDirection: "row",
@@ -1030,31 +933,14 @@ const styles = StyleSheet.create((theme) => ({
  title: {
    color: theme.colors.foreground,
    fontSize: theme.fontSize.base,
-    lineHeight: COMMAND_CENTER_LINE_HEIGHT.title,
+    lineHeight: 18,
    flexShrink: 1,
  },
-  fileLine: {
-    flex: 1,
-    minWidth: 0,
-    fontSize: theme.fontSize.base,
-    lineHeight: COMMAND_CENTER_LINE_HEIGHT.singleLine,
-  },
+  fileLine: { flex: 1, minWidth: 0, fontSize: theme.fontSize.base, lineHeight: 20 },
  fileName: { color: theme.colors.foreground },
  filePath: { color: theme.colors.foregroundMuted },
-  subtitle: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-    lineHeight: COMMAND_CENTER_LINE_HEIGHT.subtitle,
-  },
-  subtitleLine: { flexDirection: "row", minWidth: 0 },
-  subtitleText: { flexShrink: 1, minWidth: 0 },
-  iconSlot: {
-    width: 16,
-    height: COMMAND_CENTER_LINE_HEIGHT.singleLine,
-    alignItems: "center",
-    justifyContent: "center",
-  },
-  projectIconFallbackText: { fontSize: 9 },
+  subtitle: { color: theme.colors.foregroundMuted, fontSize: theme.fontSize.sm, lineHeight: 16 },
+  iconSlot: { width: 16, height: 20, alignItems: "center", justifyContent: "center" },
  rowShortcut: { flexShrink: 0 },
  breadcrumb: {
    flex: 1,
@@ -1072,7 +958,7 @@ const styles = StyleSheet.create((theme) => ({
  breadcrumbGroup: {
    color: theme.colors.foregroundMuted,
    fontSize: theme.fontSize.base,
-    lineHeight: COMMAND_CENTER_LINE_HEIGHT.singleLine,
+    lineHeight: 20,
    flexShrink: 0,
  },
  emptyText: {
@@ -1092,4 +978,7 @@ const styles = StyleSheet.create((theme) => ({
  },
  sheetBackground: { backgroundColor: theme.colors.surface0 },
  sheetHandle: { backgroundColor: theme.colors.palette.zinc[600] },
+  titledSection: { height: 32, justifyContent: "flex-end" },
+  dividedSection: { height: 49, justifyContent: "flex-end" },
+  dividerSection: { height: 17, justifyContent: "flex-end" },
 }));
@@ -1,53 +0,0 @@
-import { SPACING } from "@/styles/theme";
-
-/**
- * Every vertical size in the Command Center list, in one place.
- *
- * The list is virtualized, so it needs each row's height before rendering it. Rather than keep
- * those numbers in sync with the styles by hand, rows render at exactly the height computed here
- * and center their content. The styles read the line heights below, so this arithmetic is the
- * layout.
- *
- * A layout chooses one thing: the inset above and below a row's text. Both layouts share the same
- * shape, so nothing downstream asks which one it got.
- */
-export const COMMAND_CENTER_LINE_HEIGHT = {
-  /** A row with no subtitle. Also the icon slot, so the icon centers on the title. */
-  singleLine: 20,
-  title: 18,
-  subtitle: 16,
-  sectionLabel: 16,
-} as const;
-
-/** Space around a section's label and around the rule between sections. */
-export const COMMAND_CENTER_SECTION_GAP = SPACING[2];
-const SECTION_DIVIDER_THICKNESS = 1;
-
-export interface CommandCenterListMetrics {
-  singleLineRow: number;
-  twoLineRow: number;
-  /** A section label and the gaps around it. */
-  sectionTitle: number;
-  /** The rule between two sections and the gaps around it. */
-  sectionDivider: number;
-}
-
-function listMetrics(rowInset: number): CommandCenterListMetrics {
-  const line = COMMAND_CENTER_LINE_HEIGHT;
-  return {
-    singleLineRow: rowInset + line.singleLine + rowInset,
-    twoLineRow: rowInset + line.title + line.subtitle + rowInset,
-    sectionTitle: COMMAND_CENTER_SECTION_GAP + line.sectionLabel + COMMAND_CENTER_SECTION_GAP,
-    sectionDivider:
-      COMMAND_CENTER_SECTION_GAP + SECTION_DIVIDER_THICKNESS + COMMAND_CENTER_SECTION_GAP,
-  };
-}
-
-/**
- * Desktop is dense for a pointer. Compact keeps single-line rows at the 44pt touch height that
- * `density.rowHeight` uses on compact layouts.
- */
-export const COMMAND_CENTER_LIST_METRICS = {
-  desktop: listMetrics(SPACING[1.5]),
-  compact: listMetrics(SPACING[3]),
-} as const satisfies Record<string, CommandCenterListMetrics>;
@@ -1,6 +1,5 @@
 import { describe, expect, it } from "vitest";
 import type { CommandCenterContribution } from "./contributions";
-import { COMMAND_CENTER_LIST_METRICS } from "./list-metrics";
 import {
  buildContributionSections,
  filterAndRankBuiltInResults,
@@ -102,28 +101,17 @@ function autoModeChoice(): CommandCenterContribution {
  });
 }

-function workspace(
-  id: string,
-  title = id,
-  subtitle = "host",
-  activityAt: Date | null = null,
-): CommandCenterWorkspaceResult {
+function workspace(id: string, title = id, subtitle = "host"): CommandCenterWorkspaceResult {
  return {
    kind: "workspace",
    id,
    title,
    subtitle,
-    project: { viewKey: "project", name: "project", iconDataUri: null },
    changeRequestNumber: null,
-    activityAt,
    run: () => undefined,
  };
 }

-function minutesAgo(minutes: number): Date {
-  return new Date(Date.UTC(2026, 9, 18, 12, 0) - minutes * 60_000);
-}
-
 function sectionResultIds(sections: ReturnType<typeof buildContributionSections>): string[] {
  const ids: string[] = [];
  for (const section of sections) {
@@ -132,8 +120,6 @@ function sectionResultIds(sections: ReturnType<typeof buildContributionSections>
  return ids;
 }

-const metrics = COMMAND_CENTER_LIST_METRICS.desktop;
-
 describe("Command Center result projection", () => {
  it("query-gates model choices and creates one flat row index", () => {
    const contributions = [
@@ -144,19 +130,16 @@ describe("Command Center result projection", () => {
    expect(sectionResultIds(emptySections)).toEqual(["settings"]);

    const sections = buildContributionSections(contributions, "o");
-    const projection = projectCommandCenterRows(
-      [
-        ...sections,
-        {
-          id: "workspaces",
-          band: PINNED_SECTION_BAND,
-          rank: 2,
-          title: "Workspaces",
-          results: [workspace("workspace:1")],
-        },
-      ],
-      metrics,
-    );
+    const projection = projectCommandCenterRows([
+      ...sections,
+      {
+        id: "workspaces",
+        band: PINNED_SECTION_BAND,
+        rank: 2,
+        title: "Workspaces",
+        results: [workspace("workspace:1")],
+      },
+    ]);
    expect(projection.rows.map((row) => row.key)).toEqual([
      "section:models",
      "opus",
@@ -164,12 +147,7 @@ describe("Command Center result projection", () => {
      "workspace:1",
    ]);
    expect(projection.rowIndexByResultId.get("workspace:1")).toBe(3);
-    expect(projection.offsets).toEqual([
-      0,
-      metrics.sectionTitle,
-      metrics.sectionTitle + metrics.singleLineRow,
-      metrics.sectionTitle + metrics.singleLineRow + metrics.sectionDivider + metrics.sectionTitle,
-    ]);
+    expect(projection.offsets).toEqual([0, 32, 68, 117]);
  });

  it("shows query-only actions only when their group matches a search", () => {
@@ -199,18 +177,15 @@ describe("Command Center result projection", () => {

  it("keeps keyboard selection aligned with rows beyond the render window", () => {
    const workspaces = Array.from({ length: 200 }, (_, index) => workspace(`workspace:${index}`));
-    const projection = projectCommandCenterRows(
-      [
-        {
-          id: "workspaces",
-          band: PINNED_SECTION_BAND,
-          rank: 0,
-          title: "Workspaces",
-          results: workspaces,
-        },
-      ],
-      metrics,
-    );
+    const projection = projectCommandCenterRows([
+      {
+        id: "workspaces",
+        band: PINNED_SECTION_BAND,
+        rank: 0,
+        title: "Workspaces",
+        results: workspaces,
+      },
+    ]);

    let activeId: string | null = workspaces[0].id;
    for (let index = 0; index < 150; index += 1) {
@@ -220,7 +195,7 @@ describe("Command Center result projection", () => {
    const targetId = workspaces[150].id;
    expect(activeId).toBe(targetId);
    expect(projection.rowIndexByResultId.get(targetId)).toBe(151);
-    expect(projection.offsets[151]).toBe(metrics.sectionTitle + 150 * metrics.twoLineRow);
+    expect(projection.offsets[151]).toBe(32 + 150 * 56);
  });
 });

@@ -273,7 +248,7 @@ describe("Command Center relevance ordering", () => {
      schedulesAction(),
      action({ id: "new-agent", group: "workspace", groupRank: -1, title: "New agent" }),
    ];
-    const projection = projectCommandCenterRows(buildContributionSections(shuffled, ""), metrics);
+    const projection = projectCommandCenterRows(buildContributionSections(shuffled, ""));

    // Query-gated choices stay hidden; the rest fall back to groupRank, unchanged by this feature.
    expect(projection.selectableResults.map((result) => result.id)).toEqual([
@@ -326,19 +301,16 @@ describe("Command Center relevance ordering", () => {
  });

  it("keeps Workspaces below contributions even on a perfect match", () => {
-    const projection = projectCommandCenterRows(
-      [
-        ...buildContributionSections([schedulesAction()], "auto"),
-        {
-          id: "workspaces",
-          band: PINNED_SECTION_BAND,
-          rank: 2,
-          title: "Workspaces",
-          results: [workspace("auto")],
-        },
-      ],
-      metrics,
-    );
+    const projection = projectCommandCenterRows([
+      ...buildContributionSections([schedulesAction()], "auto"),
+      {
+        id: "workspaces",
+        band: PINNED_SECTION_BAND,
+        rank: 2,
+        title: "Workspaces",
+        results: [workspace("auto")],
+      },
+    ]);

    expect(projection.selectableResults.map((result) => result.id)).toEqual(["schedules", "auto"]);
  });
@@ -352,7 +324,7 @@ describe("Command Center relevance ordering", () => {
      title: "Workspaces",
      results: [workspace("auto")],
    };
-    const projection = projectCommandCenterRows([workspaces, ...sections.toReversed()], metrics);
+    const projection = projectCommandCenterRows([workspaces, ...sections.toReversed()]);

    expect(projection.selectableResults.map((result) => result.id)).toEqual([
      "mode:auto",
@@ -489,19 +461,15 @@ describe("filterAndRankBuiltInResults", () => {
    visible: [row.title, row.subtitle],
    hidden: [],
  });
+  const byTitle = (left: CommandCenterWorkspaceResult, right: CommandCenterWorkspaceResult) =>
+    left.title.localeCompare(right.title);

-  it("shows the five most recent rows for an empty query", () => {
-    const rows = Array.from({ length: 8 }, (_, index) =>
-      workspace(`w${index}`, `w${index}`, "host", minutesAgo(8 - index)),
-    );
+  it("caps an empty query and preserves the caller's order", () => {
+    const rows = Array.from({ length: 8 }, (_, index) => workspace(`w${index}`));

-    expect(filterAndRankBuiltInResults(rows, "", visibleOnly).map((row) => row.id)).toEqual([
-      "w7",
-      "w6",
-      "w5",
-      "w4",
-      "w3",
-    ]);
+    expect(
+      filterAndRankBuiltInResults(rows, "", visibleOnly, byTitle).map((row) => row.id),
+    ).toEqual(["w0", "w1", "w2", "w3", "w4"]);
  });

  it("puts the best match first even when it sorts last alphabetically", () => {
@@ -512,9 +480,9 @@ describe("filterAndRankBuiltInResults", () => {
    ];

    // Alphabetically this is Alpha, Label, Zebra. "lab des" only matches Label as Design.
-    expect(filterAndRankBuiltInResults(rows, "lab des", visibleOnly).map((row) => row.id)).toEqual([
-      "c",
-    ]);
+    expect(
+      filterAndRankBuiltInResults(rows, "lab des", visibleOnly, byTitle).map((row) => row.id),
+    ).toEqual(["c"]);
  });

  it("ranks a title match above a match that only the hidden field reached", () => {
@@ -524,41 +492,24 @@ describe("filterAndRankBuiltInResults", () => {
        ? { visible: [row.title], hidden: ["deploy"] }
        : { visible: [row.title], hidden: [] };

-    expect(filterAndRankBuiltInResults(rows, "deploy", fields).map((row) => row.id)).toEqual([
-      "title-hit",
-      "hidden-hit",
-    ]);
+    expect(
+      filterAndRankBuiltInResults(rows, "deploy", fields, byTitle).map((row) => row.id),
+    ).toEqual(["title-hit", "hidden-hit"]);
  });

-  it("orders rows in the same match tier by recency, not by where the word sits", () => {
-    // Both are whole-word matches for "usage"; the older one finds it earlier in the title.
-    const rows = [
-      workspace("older", "Deliver sidebar usage", "host", minutesAgo(60)),
-      workspace("newer", "design the cli interface to expose usage data", "host", minutesAgo(5)),
-    ];
+  it("breaks an equal score with the caller's tiebreak, not with match order", () => {
+    // Both titles are an exact prefix match for "task", so only the tiebreak separates them.
+    const rows = [workspace("second", "Task zebra"), workspace("first", "Task alpha")];

-    expect(filterAndRankBuiltInResults(rows, "usage", visibleOnly).map((row) => row.id)).toEqual([
-      "newer",
-      "older",
-    ]);
-  });
-
-  it("keeps a better match tier above a more recent weaker match", () => {
-    const rows = [
-      workspace("subsequence", "Fix stuck toast", "fix/updating-messages", minutesAgo(1)),
-      workspace("whole-word", "Usage hover card", "host", minutesAgo(600)),
-    ];
-
-    expect(filterAndRankBuiltInResults(rows, "usage", visibleOnly).map((row) => row.id)).toEqual([
-      "whole-word",
-      "subsequence",
-    ]);
+    expect(
+      filterAndRankBuiltInResults(rows, "task", visibleOnly, byTitle).map((row) => row.id),
+    ).toEqual(["first", "second"]);
  });

  it("drops a row when one token matches nothing", () => {
    const rows = [workspace("a", "Label as Design")];

-    expect(filterAndRankBuiltInResults(rows, "lab zzz", visibleOnly)).toEqual([]);
+    expect(filterAndRankBuiltInResults(rows, "lab zzz", visibleOnly, byTitle)).toEqual([]);
  });
 });

@@ -5,7 +5,6 @@ import {
  scoreTextFields,
 } from "@getpaseo/protocol/search/text-match";
 import type { CommandCenterContribution } from "./contributions";
-import type { CommandCenterListMetrics } from "./list-metrics";

 /** Sections that reorder by how well they match the query. */
 export const CONTRIBUTION_SECTION_BAND = 0;
@@ -44,21 +43,13 @@ export function compareCommandCenterScores(
  return left.fieldRank - right.fieldRank || compareMatchScores(left.match, right.match);
 }

-export interface CommandCenterWorkspaceProject {
-  viewKey: string;
-  name: string;
-  iconDataUri: string | null;
-}
-
 export interface CommandCenterWorkspaceResult {
  kind: "workspace";
  id: string;
  title: string;
  subtitle: string;
-  project: CommandCenterWorkspaceProject;
  /** PR/MR number backing this workspace, so a number query can match it exactly. */
  changeRequestNumber: number | null;
-  activityAt: Date | null;
  run(): void;
 }

@@ -68,7 +59,6 @@ export interface CommandCenterAgentResult {
  agent: AggregatedAgent;
  title: string;
  subtitle: string;
-  activityAt: Date | null;
  run(): void;
 }

@@ -179,12 +169,13 @@ function contributionSearchFields(
  return { visible, hidden: contribution.keywords };
 }

-/** Whether the row draws a second, subtitle line under its title. */
-function hasSubtitleLine(result: CommandCenterResult): boolean {
-  if (result.kind === "workspace" || result.kind === "agent") return true;
-  if (result.kind === "file") return false;
-  const presentation = result.contribution.presentation;
-  return presentation.kind === "action" && Boolean(presentation.subtitle);
+function resultHeight(result: CommandCenterResult): number {
+  if (result.kind === "workspace" || result.kind === "agent") return 56;
+  if (result.kind === "file") return 36;
+  if (result.contribution.presentation.kind === "action") {
+    return result.contribution.presentation.subtitle ? 56 : 36;
+  }
+  return 36;
 }

 /**
@@ -212,42 +203,22 @@ function resultScore(result: CommandCenterResult): CommandCenterScore | undefine
 /** Rows shown when nothing has been typed, per pinned category. */
 const DEFAULT_CATEGORY_RESULT_LIMIT = 5;

-/** A built-in row (workspace or agent) that orders by how recently it saw activity. */
-export interface CommandCenterRecentRow {
-  activityAt: Date | null;
-}
-
-/** Most recent first. A row with no timestamp sorts after every row that has one. */
-export function compareByRecency(left: CommandCenterRecentRow, right: CommandCenterRecentRow) {
-  return (right.activityAt?.getTime() ?? 0) - (left.activityAt?.getTime() ?? 0);
-}
-
-/**
- * Rank built-in rows by the kind of match they made: which fields matched, then the matcher's
- * tier. Offset and spread are deliberately left out. They only say where in the title the word
- * happened to sit, so "usage" in "Deliver sidebar usage" and in "expose usage data" would be
- * ordered by sentence position. Leaving them out makes those rows equal, and recency decides.
- */
-export function compareBuiltInScores(left: CommandCenterScore, right: CommandCenterScore): number {
-  return left.fieldRank - right.fieldRank || left.match.tier - right.match.tier;
-}
-
 /**
 * Filter and rank already-built rows. Rows in, rows out — building them needs translations,
 * navigation callbacks and the project tree, none of which matching cares about, so that stays
 * with the caller and this stays testable without mounting React.
 *
- * Rows rank by `compareBuiltInScores`; rows that rank equally, including every row of an empty
- * query, go most recent first.
+ * `tiebreak` is the caller's own ordering (alphabetical for workspaces, status and recency for
+ * agents). It decides equal-scoring rows, so an agent awaiting input still outranks an idle one
+ * that matched exactly as well.
 */
-export function filterAndRankBuiltInResults<Row extends CommandCenterRecentRow>(
+export function filterAndRankBuiltInResults<Row>(
  rows: readonly Row[],
  query: string,
  fieldsOf: (row: Row) => CommandCenterSearchFields,
+  tiebreak: (left: Row, right: Row) => number,
 ): Row[] {
-  if (!query.trim()) {
-    return [...rows].sort(compareByRecency).slice(0, DEFAULT_CATEGORY_RESULT_LIMIT);
-  }
+  if (!query.trim()) return rows.slice(0, DEFAULT_CATEGORY_RESULT_LIMIT);

  const scored: { row: Row; score: CommandCenterScore }[] = [];
  for (const row of rows) {
@@ -256,7 +227,7 @@ export function filterAndRankBuiltInResults<Row extends CommandCenterRecentRow>(
  }
  scored.sort(
    (left, right) =>
-      compareBuiltInScores(left.score, right.score) || compareByRecency(left.row, right.row),
+      compareCommandCenterScores(left.score, right.score) || tiebreak(left.row, right.row),
  );
  return scored.map((entry) => entry.row);
 }
@@ -322,7 +293,6 @@ export function buildContributionSections(

 export function projectCommandCenterRows(
  sections: readonly CommandCenterResultSection[],
-  metrics: CommandCenterListMetrics,
 ): CommandCenterListProjection {
  const populated = sections
    .filter((section) => section.results.length > 0)
@@ -335,8 +305,10 @@ export function projectCommandCenterRows(

  for (const [sectionIndex, section] of populated.entries()) {
    const divider = sectionIndex > 0;
-    const sectionHeight =
-      (divider ? metrics.sectionDivider : 0) + (section.title ? metrics.sectionTitle : 0);
+    let sectionHeight = 0;
+    if (section.title && divider) sectionHeight = 49;
+    if (section.title && !divider) sectionHeight = 32;
+    if (!section.title && divider) sectionHeight = 17;
    if (sectionHeight > 0) {
      offsets.push(offset);
      rows.push({
@@ -349,7 +321,7 @@ export function projectCommandCenterRows(
      offset += sectionHeight;
    }
    for (const result of section.results) {
-      const height = hasSubtitleLine(result) ? metrics.twoLineRow : metrics.singleLineRow;
+      const height = resultHeight(result);
      offsets.push(offset);
      rowIndexByResultId.set(result.id, rows.length);
      rows.push({ kind: "result", key: result.id, result, height });
@@ -1,4 +1,4 @@
-import { actionsWithoutPrimary, type GitAction, type GitActions } from "@/git/policy";
+import type { GitAction, GitActions } from "@/git/policy";
 import type { KeyboardActionDefinition } from "@/keyboard/keyboard-action-dispatcher";
 import type {
  WorkspacePanelPlacement,
@@ -581,7 +581,9 @@ export function buildWorkspaceCommandCenterContributions(
    ...(source.capabilities.canSplitPanes ? buildPaneContributions(source) : []),
  ];

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

@@ -41,7 +41,7 @@ import {
  findPaneById,
  useWorkspaceLayoutStore,
 } from "@/stores/workspace-layout-store";
-import { shouldShowWorkspaceSetup } from "@/stores/workspace-setup-store";
+import { shouldShowWorkspaceSetup, useWorkspaceSetupStore } from "@/stores/workspace-setup-store";
 import { clearCommandCenterFocusRestoreElement } from "@/utils/command-center-focus-restore";
 import { getShortcutOs } from "@/utils/shortcut-platform";
 import {
@@ -188,7 +188,6 @@ export function useWorkspaceCommandCenterActions(): void {
    workspaceDirectory: workspace.workspaceDirectory ?? null,
    currentBranch: workspace.gitRuntime?.currentBranch ?? null,
    pinnedAt: workspace.pinnedAt ?? null,
-    setupStatus: workspace.setupStatus ?? null,
    labels: workspace.labels ?? [],
  }));
  const cwd = useWorkspaceDirectory(serverId, workspaceId);
@@ -196,10 +195,12 @@ export function useWorkspaceCommandCenterActions(): void {
  const isPinned = fields?.pinnedAt != null;
  const isCompact = useIsCompactFormFactor();
  const canPin = useHostFeature(serverId, "workspacePinning");
-  const supportsSetupObservation = useHostFeature(serverId, "workspaceSetupObservation");
-  const canShowSetup = shouldShowWorkspaceSetup(
-    fields?.setupStatus ?? null,
-    supportsSetupObservation,
+  const persistenceKey =
+    serverId && fields
+      ? buildWorkspaceTabPersistenceKey({ serverId, workspaceId: fields.id })
+      : null;
+  const canShowSetup = useWorkspaceSetupStore((state) =>
+    shouldShowWorkspaceSetup(persistenceKey ? (state.snapshots[persistenceKey] ?? null) : null),
  );
  const { overrides } = useKeyboardShortcutOverrides();
  const { gitActions, isGit } = useGitActions({
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M18.8 0H5.2A5.2 5.2 0 000 5.2v13.6A5.2 5.2 0 005.2 24h13.6a5.2 5.2 0 005.2-5.2V5.2A5.2 5.2 0 0018.8 0z" fill="#9046FF" /> <path d="M7.97 16.376c-1.644 3.642 1.86 4.556 4.443 2.424.76 2.39 3.608.607 4.631-1.247 2.251-4.084 1.342-8.249 1.108-9.108-1.6-5.859-9.6-5.869-10.976.03-.323 1.033-.328 2.206-.507 3.423-.09.617-.16 1.009-.393 1.655-.139.373-.323.7-.62 1.257-.458.865-.264 2.53 2.101 1.665l.224-.1h-.01l-.001.001z" fill="#fff" /> <path d="M12.722 10.985c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.218-.97a.61.61 0 01.537-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005zm2.703 0c-.656 0-.755-.785-.755-1.252 0-.423.074-.756.219-.97a.61.61 0 01.536-.283c.229 0 .428.095.567.289.159.218.243.55.243.964 0 .785-.303 1.252-.805 1.252h-.005z" fill="#000" /></svg>