Fix Windows packaged CLI TTY prompts

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,121 +0,0 @@
-name: Bug report
-description: Something is broken or doesn't behave the way it should.
-title: "bug: "
-labels: ["bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Before opening, please:
-
-        - search existing issues for the same symptom
-        - try to reproduce on the latest version
-        - if it's a UI bug, capture a screenshot or short video. text descriptions of UI bugs almost always lose detail.
-
-  - type: textarea
-    id: description
-    attributes:
-      label: What's broken
-      description: What happened, and what did you expect to happen instead?
-      placeholder: |
-        I tried to X, expected Y, got Z.
-    validations:
-      required: true
-
-  - type: textarea
-    id: repro
-    attributes:
-      label: Steps to reproduce
-      description: The shortest sequence that triggers the bug. If you can't reproduce on demand, say so.
-      placeholder: |
-        1. Open the desktop app
-        2. Pair a daemon
-        3. Click X
-        4. ...
-    validations:
-      required: true
-
-  - type: dropdown
-    id: surface
-    attributes:
-      label: Where did this happen
-      description: The surface you saw the bug on. Pick the closest match.
-      options:
-        - iOS app
-        - Android app
-        - Web (browser)
-        - Desktop (Electron)
-        - CLI
-        - Daemon
-        - Other
-    validations:
-      required: true
-
-  - type: input
-    id: paseo-version
-    attributes:
-      label: Paseo version
-      description: Settings → About in the app, or `paseo --version` from the CLI.
-      placeholder: "0.1.71"
-    validations:
-      required: true
-
-  - type: input
-    id: os-version
-    attributes:
-      label: OS version
-      description: Only relevant for desktop, CLI, or daemon issues. Skip for mobile or web.
-      placeholder: "macOS 15.2, Windows 11, Ubuntu 24.04"
-
-  - type: dropdown
-    id: provider
-    attributes:
-      label: Agent provider
-      description: If the bug involves a specific agent provider, pick which one.
-      options:
-        - Not relevant
-        - Claude Code
-        - Codex
-        - OpenCode
-        - Custom provider
-
-  - type: textarea
-    id: provider-details
-    attributes:
-      label: Provider configuration
-      description: |
-        If the bug involves an agent, what version are you on and what API are you using? Provider behavior changes a lot across versions and API backends.
-      placeholder: |
-        Claude Code v1.2.3 with Anthropic API
-        Codex CLI v0.5.0 with OpenAI API
-        OpenCode v0.3.1
-        (or paste the relevant section of ~/.paseo/config.json for custom providers)
-
-  - type: textarea
-    id: logs
-    attributes:
-      label: Logs
-      description: |
-        Paste relevant log output. Strongly preferred for crashes and daemon issues.
-
-        - **Daemon log:** `~/.paseo/daemon.log` (override with `$PASEO_HOME`)
-        - **Electron log (macOS):** `~/Library/Logs/Paseo/main.log`
-        - **Electron log (Windows):** `%APPDATA%\Paseo\logs\main.log`
-        - **Electron log (Linux):** `~/.config/Paseo/logs/main.log`
-
-        Paste the **full log around the time of the bug**, not a summary. If you used an AI to investigate, paste the raw log it read, not the AI's interpretation. AI summaries skew the signal and waste my time.
-      render: text
-
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots or video
-      description: |
-        **Required for UI bugs.** Drag and drop directly into this field. Short videos beat screenshots for anything involving interaction or animation.
-
-  - type: markdown
-    attributes:
-      value: |
-        ---
-
-        **A note on AI-assisted reports.** Using an agent to gather information (logs, repro steps, version checks) is fine and useful. Using an agent to *diagnose* the bug and then submitting only that diagnosis is not. Agents routinely correlate adjacent log lines as cause-and-effect when they aren't related, and once a report is filtered through an AI summary I lose the signal I need to actually fix the bug. Paste the raw inputs.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Discord
-    url: https://discord.gg/jz8T2uahpH
-    about: Quick questions, sharing a video of a bug, or anything that's better as a chat. A lot of issues start better here.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,43 +0,0 @@
-name: Feature request
-description: Propose a new feature or a change to existing behavior.
-title: "feat: "
-labels: ["enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Paseo is opinionated and maintained by one person. Feature requests are welcome, but they get evaluated against product fit, not just usefulness, and the bar is whether the change keeps the product lean enough for one person to maintain.
-
-        Big ideas are better discussed in [Discord](https://discord.gg/jz8T2uahpH) first. And please don't open a feature request and a PR at the same time, get alignment on the idea before writing code.
-
-  - type: checkboxes
-    id: prior-search
-    attributes:
-      label: Prior search
-      options:
-        - label: I searched existing issues and discussions, and this isn't already proposed.
-          required: true
-
-  - type: textarea
-    id: problem
-    attributes:
-      label: What's the problem
-      description: What are you actually trying to do, and why is the current behavior in the way?
-      placeholder: |
-        When I'm doing X, I want to Y, but Paseo currently Z.
-    validations:
-      required: true
-
-  - type: textarea
-    id: proposal
-    attributes:
-      label: What would solve it
-      description: A rough sketch of the change. Mockups, screenshots from other apps, or a short video are very welcome, especially for UI proposals.
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives you considered
-      description: Optional. What else did you try, and why doesn't it work?

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,43 +0,0 @@
-<!--
-Please follow this template. The PR template applies whether you opened the PR via the web UI, `gh pr create`, or any other tool.
-
-If you're fixing an objective bug or a small focused issue, this should be quick. Big PRs without a prior issue or design discussion are likely to be closed or scoped down. See CONTRIBUTING.md.
--->
-
-### Linked issue
-
-Closes #
-
-<!-- Bug fixes and behavior changes should reference an issue. Pure docs and refactors can skip this. -->
-
-### Type of change
-
-- [ ] Bug fix
-- [ ] New feature (with prior issue + design alignment)
-- [ ] Refactor / code improvement
-- [ ] Docs
-
-### What does this PR do
-
-<!-- A short description of the change in your own words. What was wrong, what you changed, why it works. If you can't explain this briefly, the PR is probably too big. -->
-
-### How did you verify it
-
-<!--
-This is the section I read most carefully. I need to see that *you* tested this, not that the diff looks plausible.
-
-- For UI changes: a screenshot or short video on every affected platform (mobile, web, desktop). UI claims without visual proof are not enough.
-- For behavior changes: the actual steps you ran, and what you observed.
-- For bug fixes: how you reproduced the bug before, and confirmed it's fixed after.
-
-AI-generated PR descriptions are fine in principle. AI-generated *verification claims* with no actual testing behind them are not, and they're easy to spot.
--->
-
-### Checklist
-
-- [ ] One focused change. Unrelated cleanups split out.
-- [ ] `npm run typecheck` passes
-- [ ] `npm run lint` passes
-- [ ] `npm run format` ran (Biome)
-- [ ] UI changes include screenshots or video for every affected platform
-- [ ] Tests added or updated where it made sense

.github/workflows/ci.yml

@@ -5,18 +5,8 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
-  merge_group:
   workflow_dispatch:
 
-concurrency:
-  group: ci-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-env:
-  # CI does not use the CUDA execution provider, and the onnxruntime-node
-  # postinstall download from NuGet is large enough to make npm ci flaky.
-  ONNXRUNTIME_NODE_INSTALL: skip
-
 jobs:
   format:
     runs-on: ubuntu-latest
@@ -29,7 +19,7 @@ jobs:
           cache: "npm"
 
       - name: Install dependencies
-        run: npm ci
+        run: npm install
 
       - name: Check formatting
         run: npx oxfmt --check .
@@ -45,13 +35,7 @@ jobs:
           cache: "npm"
 
       - name: Install dependencies
-        run: npm ci
-
-      - name: Lint lockfile
-        run: npx --yes lockfile-lint --path package-lock.json --type npm --allowed-hosts npm --validate-https --validate-integrity
-
-      - name: Verify dependency signatures
-        run: npm audit signatures
+        run: npm install
 
       - name: Lint
         run: npm run lint
@@ -67,7 +51,7 @@ jobs:
           cache: "npm"
 
       - name: Install dependencies
-        run: npm ci
+        run: npm install
 
       - name: Build highlight dependency
         run: npm run build --workspace=@getpaseo/highlight
@@ -82,12 +66,7 @@ jobs:
         run: npm run typecheck
 
   server-tests:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
-    name: server-tests (${{ matrix.os }})
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -102,10 +81,7 @@ jobs:
         run: git fetch --no-tags origin main:refs/remotes/origin/main
 
       - name: Install dependencies
-        run: npm ci
-
-      - name: Install agent CLIs for provider tests
-        run: npm install -g @anthropic-ai/claude-code opencode-ai
+        run: npm install
 
       - name: Build highlight dependency
         run: npm run build --workspace=@getpaseo/highlight
@@ -118,7 +94,50 @@ jobs:
         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-tests-windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: "npm"
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build highlight dependency
+        run: npm run build --workspace=@getpaseo/highlight
+
+      - name: Build relay dependency
+        run: npm run build --workspace=@getpaseo/relay
+
+      - name: Run Windows-critical server tests
+        working-directory: packages/server
+        run: >
+          npx vitest run
+          src/utils/executable.probe.test.ts
+          src/utils/executable.test.ts
+          src/utils/spawn.launch-regression.test.ts
+          src/utils/spawn.percent-escape.test.ts
+          src/utils/spawn.test.ts
+          src/utils/tree-kill.test.ts
+          src/utils/run-git-command.test.ts
+          src/utils/checkout-git-rev-parse.test.ts
+          src/terminal/worker-terminal-manager.test.ts
+          src/server/agent/provider-registry.test.ts
+          src/server/agent/provider-launch-config.test.ts
+          src/server/agent/provider-snapshot-manager.test.ts
+          src/server/agent/providers/claude-agent.spawn.test.ts
+          src/server/agent/providers/provider-windows-launch.test.ts
+          src/server/agent/providers/provider-availability.test.ts
+          src/server/workspace-registry-model.test.ts
+          src/server/persisted-config.test.ts
+          src/server/bootstrap-provider-availability.test.ts
 
   desktop-tests:
     strategy:
@@ -135,7 +154,7 @@ jobs:
           cache: "npm"
 
       - name: Install dependencies
-        run: npm ci
+        run: npm install
 
       - name: Build highlight dependency
         run: npm run build --workspace=@getpaseo/highlight
@@ -160,7 +179,7 @@ jobs:
           cache: "npm"
 
       - name: Install dependencies
-        run: npm ci
+        run: npm install
 
       - name: Install Playwright browsers
         run: npx playwright install --with-deps chromium
@@ -182,7 +201,7 @@ jobs:
           cache: "npm"
 
       - name: Install dependencies
-        run: npm ci
+        run: npm install
 
       - name: Install Playwright browsers
         run: npx playwright install --with-deps chromium
@@ -197,7 +216,7 @@ jobs:
         run: npm run build --workspace=@getpaseo/server
 
       - name: Install agent CLIs for provider tests
-        run: npm install -g @anthropic-ai/claude-code @openai/codex@0.105.0 opencode-ai
+        run: npm install -g @openai/codex@0.105.0 opencode-ai
 
       - name: Run Playwright E2E tests
         run: npm run test:e2e --workspace=@getpaseo/app
@@ -225,7 +244,7 @@ jobs:
           cache: "npm"
 
       - name: Install dependencies
-        run: npm ci
+        run: npm install
 
       - name: Build relay
         run: npm run build --workspace=@getpaseo/relay
@@ -249,10 +268,10 @@ jobs:
           cache: "npm"
 
       - name: Install dependencies
-        run: npm ci
+        run: npm install
 
       - name: Install agent CLIs for provider tests
-        run: npm install -g @anthropic-ai/claude-code @openai/codex@0.105.0 opencode-ai
+        run: npm install -g @openai/codex@0.105.0 opencode-ai
 
       - name: Build highlight dependency
         run: npm run build --workspace=@getpaseo/highlight

.github/workflows/deploy-relay.yml

@@ -21,7 +21,7 @@ jobs:
           cache: "npm"
 
       - name: Install dependencies
-        run: npm ci --workspace=@getpaseo/relay --include-workspace-root
+        run: npm install --workspace=@getpaseo/relay --include-workspace-root
 
       - name: Typecheck
         run: npm run typecheck --workspace=@getpaseo/relay

.github/workflows/deploy-website.yml

@@ -28,7 +28,7 @@ jobs:
           cache: "npm"
 
       - name: Install dependencies
-        run: npm ci --workspace=@getpaseo/website --include-workspace-root
+        run: npm install --workspace=@getpaseo/website --include-workspace-root
 
       - name: Typecheck
         run: npm run typecheck --workspace=@getpaseo/website

.github/workflows/desktop-release.yml

@@ -40,7 +40,7 @@ on:
       rollout_hours:
         description: "Linear rollout duration in hours. Use 0 for instant rollout."
         required: false
-        default: "36"
+        default: "24"
         type: string
 
 concurrency:
@@ -51,7 +51,7 @@ env:
   SOURCE_TAG: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref_name }}
   CHECKOUT_REF: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.checkout_ref || github.ref_name) || github.ref_name }}
   SHOULD_PUBLISH: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.publish != 'false' }}
-  ROLLOUT_HOURS: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.rollout_hours || '36' }}
+  ROLLOUT_HOURS: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.rollout_hours || '24' }}
   DESKTOP_PACKAGE_PATH: "packages/desktop"
 
 jobs:

.github/workflows/fix-nix-hash.yml

@@ -0,0 +1,45 @@
+name: Fix Nix hash
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - "package.json"
+      - "package-lock.json"
+  pull_request:
+    paths:
+      - "package.json"
+      - "package-lock.json"
+
+permissions:
+  contents: write
+
+jobs:
+  fix-nix-hash:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref || github.ref }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: "npm"
+
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: Fix lockfile and update hash
+        run: ./scripts/update-nix.sh
+
+      - name: Commit changes
+        run: |
+          git diff --quiet package-lock.json nix/package.nix && exit 0
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add package-lock.json nix/package.nix
+          git commit -m "fix: update lockfile signatures and Nix hash"
+          git push

.github/workflows/nix-build.yml

@@ -0,0 +1,59 @@
+name: Nix Build
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - "nix/**"
+      - "flake.nix"
+      - "flake.lock"
+      - "package.json"
+      - "package-lock.json"
+      - "packages/highlight/**"
+      - "packages/server/**"
+      - "packages/relay/**"
+      - "packages/cli/**"
+  pull_request:
+    branches: [main]
+    paths:
+      - "nix/**"
+      - "flake.nix"
+      - "flake.lock"
+      - "package.json"
+      - "package-lock.json"
+      - "packages/highlight/**"
+      - "packages/server/**"
+      - "packages/relay/**"
+      - "packages/cli/**"
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    continue-on-error: false
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: Build Nix package
+        run: nix build .#default -o result
+
+      - name: Verify lockfile is complete
+        # npm silently omits resolved/integrity fields in workspace monorepos.
+        # Nix needs them for offline builds. See https://github.com/npm/cli/issues/4460
+        run: |
+          node scripts/fix-lockfile.mjs package-lock.json
+          git diff --exit-code package-lock.json || {
+            echo "ERROR: package-lock.json has missing resolved/integrity fields."
+            echo "This is a known npm bug: https://github.com/npm/cli/issues/4460"
+            echo "Run 'node scripts/fix-lockfile.mjs' and commit the result."
+            exit 1
+          }
+
+      - name: Check npmDepsHash is up to date
+        run: ./scripts/update-nix.sh --check

.github/workflows/nix-update-hash.yml

@@ -1,60 +0,0 @@
-name: Nix Update Hash
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - "nix/**"
-      - "flake.nix"
-      - "flake.lock"
-      - "package.json"
-      - "package-lock.json"
-      - "packages/highlight/**"
-      - "packages/server/**"
-      - "packages/relay/**"
-      - "packages/cli/**"
-      - "scripts/update-nix.sh"
-      - "scripts/fix-lockfile.mjs"
-      - ".github/workflows/nix-update-hash.yml"
-
-permissions:
-  contents: read
-
-jobs:
-  update-hash:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.PASEO_BOT_APP_ID }}
-          private-key: ${{ secrets.PASEO_BOT_APP_PRIVATE_KEY }}
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-          token: ${{ steps.app-token.outputs.token }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-          cache: "npm"
-
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-
-      - name: Update lockfile + Nix hash if stale
-        run: ./scripts/update-nix.sh
-
-      - name: Build Nix package
-        run: nix build .#default -o result
-
-      - name: Commit hash/lockfile updates
-        run: |
-          git diff --quiet package-lock.json nix/npm-deps.hash && exit 0
-          git config user.name "paseo-ai[bot]"
-          git config user.email "266920839+paseo-ai[bot]@users.noreply.github.com"
-          git add package-lock.json nix/npm-deps.hash
-          git commit -m "fix: update lockfile signatures and Nix hash [skip ci]"
-          git push

.github/workflows/nix.yml

@@ -1,99 +0,0 @@
-name: Nix
-
-on:
-  pull_request:
-    branches: [main]
-    paths:
-      - "nix/**"
-      - "flake.nix"
-      - "flake.lock"
-      - "package.json"
-      - "package-lock.json"
-      - "packages/highlight/**"
-      - "packages/server/**"
-      - "packages/relay/**"
-      - "packages/cli/**"
-      - "scripts/update-nix.sh"
-      - "scripts/fix-lockfile.mjs"
-      - ".github/workflows/nix.yml"
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-          cache: "npm"
-
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-
-      - name: Update lockfile + Nix hash if stale
-        run: ./scripts/update-nix.sh
-
-      - name: Build Nix package
-        run: nix build .#default -o result
-
-      - name: Smoke Nix daemon
-        run: |
-          set -euo pipefail
-
-          export PASEO_HOME
-          PASEO_HOME="$(mktemp -d)"
-          export PASEO_LISTEN=127.0.0.1:6767
-
-          WRAPPER_LOG="$PASEO_HOME/paseo-server-wrapper.log"
-
-          cleanup() {
-            if [[ -n "${DAEMON_PID:-}" ]] && kill -0 "$DAEMON_PID" 2>/dev/null; then
-              kill "$DAEMON_PID"
-              wait "$DAEMON_PID" || true
-            fi
-            rm -rf "$PASEO_HOME"
-          }
-          trap cleanup EXIT
-
-          ./result/bin/paseo-server --no-relay >"$WRAPPER_LOG" 2>&1 &
-          DAEMON_PID=$!
-
-          deadline=$((SECONDS + 30))
-          while (( SECONDS < deadline )); do
-            if STATUS_JSON="$(./result/bin/paseo daemon status --json)" \
-              && jq -e '.connectedDaemon == "reachable"' <<<"$STATUS_JSON" >/dev/null; then
-              echo "$STATUS_JSON"
-              exit 0
-            fi
-
-            if ! kill -0 "$DAEMON_PID" 2>/dev/null; then
-              echo "Nix daemon exited before becoming reachable."
-              break
-            fi
-
-            sleep 1
-          done
-
-          echo "::group::daemon.log"
-          cat "$PASEO_HOME/daemon.log" 2>/dev/null || echo "<missing>"
-          echo "::endgroup::"
-
-          echo "::group::paseo-server stdout/stderr"
-          cat "$WRAPPER_LOG" 2>/dev/null || echo "<missing>"
-          echo "::endgroup::"
-
-          echo "::group::paseo daemon status"
-          ./result/bin/paseo daemon status || true
-          echo "::endgroup::"
-
-          exit 1
-
-      - name: Build Nix desktop package
-        run: nix build .#desktop -o result-desktop

.github/workflows/server-ci.yml

@@ -0,0 +1,52 @@
+name: Server CI
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - "packages/server/**"
+      - "package.json"
+      - "package-lock.json"
+      - ".github/workflows/server-ci.yml"
+  pull_request:
+    branches: [main]
+    paths:
+      - "packages/server/**"
+      - "package.json"
+      - "package-lock.json"
+      - ".github/workflows/server-ci.yml"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: "npm"
+
+      - name: Fetch origin/main (worktree tests)
+        run: git fetch --no-tags origin main:refs/remotes/origin/main
+
+      - name: Install server dependencies
+        run: npm install --workspace=@getpaseo/server --include-workspace-root
+
+      - name: Build highlight dependency
+        run: npm run build --workspace=@getpaseo/highlight
+
+      - name: Build relay dependency
+        run: npm run build --workspace=@getpaseo/relay
+
+      - name: Typecheck
+        run: npm run typecheck --workspace=@getpaseo/server
+
+      - name: Test
+        run: npm run test --workspace=@getpaseo/server
+        env:
+          CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}

.gitignore

@@ -6,7 +6,6 @@ build/
 dist/
 .next/
 out/
-result
 
 # Environment variables
 .env
@@ -67,7 +66,6 @@ CLAUDE.local.md
 .paseo/
 .wrangler/
 **/.wrangler/
-**/.tanstack/
 
 # Local agent/tooling artifacts (do not commit)
 PLAN.md
@@ -87,4 +85,3 @@ packages/server/src/server/fixtures/dictation/dictation-debug-largest.transcript
 /artifacts
 packages/desktop/.cache/
 packages/desktop/src-tauri/resources/managed-runtime/
-app.json

.oxfmtrc.json

@@ -11,5 +11,5 @@
   "arrowParens": "always",
   "bracketSameLine": false,
   "bracketSpacing": true,
-  "ignorePatterns": ["*.lock", "**/*.gen.ts", "**/*.gen.tsx"]
+  "ignorePatterns": ["*.lock"]
 }

CLAUDE.md

@@ -15,34 +15,19 @@ This is an npm workspace monorepo:
 - `packages/desktop` — Electron desktop wrapper
 - `packages/website` — Marketing site (paseo.sh)
 
-## Docs
+## Documentation
 
-`docs/` is the source of truth for system-level and process-level knowledge. **"The docs", "check the docs", or "check the X docs" always mean this directory — not the web.** Look here before fetching anything online; the docs capture gotchas and conventions you cannot derive from the code or external sources.
-
-At the start of non-trivial work, list `docs/` and skim anything relevant to the task. When you learn something meta worth preserving — a gotcha, a convention, a workflow, a piece of system context that will outlive the current task — update an existing doc or propose a new one. Code-level facts belong in inline comments next to the code; system, process, and gotcha-level facts belong in `docs/`.
-
-| Doc                                                            | What's in it                                                                                                                   |
-| -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
-| [docs/product.md](docs/product.md)                             | What Paseo is, who it's for, where it's going                                                                                  |
-| [docs/architecture.md](docs/architecture.md)                   | System design, package layering, WebSocket protocol, agent lifecycle, data flow                                                |
-| [docs/agent-lifecycle.md](docs/agent-lifecycle.md)             | Agent states, parent/child relationships, archive semantics, tabs vs archive, subagents track                                  |
-| [docs/data-model.md](docs/data-model.md)                       | File-based JSON persistence, Zod schemas, atomic writes, no migrations                                                         |
-| [docs/glossary.md](docs/glossary.md)                           | Authoritative terminology — UI label wins, no synonyms                                                                         |
-| [docs/coding-standards.md](docs/coding-standards.md)           | Type hygiene, error handling, state design, React patterns, file organization                                                  |
-| [docs/design.md](docs/design.md)                               | Theme tokens — colors, fonts, spacing, radii, icons                                                                            |
-| [docs/hover.md](docs/hover.md)                                 | Hover — the canonical pattern (plain View + onPointerEnter/Leave, separate inner Pressable) and the three ways agents break it |
-| [docs/unistyles.md](docs/unistyles.md)                         | Unistyles gotchas — `useUnistyles()` is forbidden, alternatives in order                                                       |
-| [docs/file-icons.md](docs/file-icons.md)                       | Material icon theme integration for the file explorer                                                                          |
-| [docs/providers.md](docs/providers.md)                         | Adding a new agent provider end-to-end                                                                                         |
-| [docs/custom-providers.md](docs/custom-providers.md)           | Custom provider config: Z.AI, Alibaba/Qwen, ACP agents, profiles, custom binaries                                              |
-| [docs/development.md](docs/development.md)                     | Dev server, build sync gotchas, CLI reference, agent state, Playwright MCP                                                     |
-| [docs/rpc-namespacing.md](docs/rpc-namespacing.md)             | WebSocket RPC naming convention — dotted namespaces and `.request`/`.response` pairs                                           |
-| [docs/testing.md](docs/testing.md)                             | TDD workflow, determinism, real dependencies over mocks, test organization                                                     |
-| [docs/mobile-testing.md](docs/mobile-testing.md)               | Maestro and mobile test workflows                                                                                              |
-| [docs/ad-hoc-daemon-testing.md](docs/ad-hoc-daemon-testing.md) | Isolated in-process daemon test harness                                                                                        |
-| [docs/android.md](docs/android.md)                             | App variants, local/cloud builds, EAS workflows                                                                                |
-| [docs/release.md](docs/release.md)                             | Release playbook, draft releases, completion checklist                                                                         |
-| [SECURITY.md](SECURITY.md)                                     | Relay threat model, E2E encryption, DNS rebinding, agent auth                                                                  |
+| Doc                                                  | What's in it                                                                      |
+| ---------------------------------------------------- | --------------------------------------------------------------------------------- |
+| [docs/architecture.md](docs/architecture.md)         | System design, package layering, WebSocket protocol, agent lifecycle, data flow   |
+| [docs/coding-standards.md](docs/coding-standards.md) | Type hygiene, error handling, state design, React patterns, file organization     |
+| [docs/testing.md](docs/testing.md)                   | TDD workflow, determinism, real dependencies over mocks, test organization        |
+| [docs/development.md](docs/development.md)           | Dev server, build sync gotchas, CLI reference, agent state, Playwright MCP        |
+| [docs/release.md](docs/release.md)                   | Release playbook, draft releases, completion checklist                            |
+| [docs/custom-providers.md](docs/custom-providers.md) | Custom provider config: Z.AI, Alibaba/Qwen, ACP agents, profiles, custom binaries |
+| [docs/android.md](docs/android.md)                   | App variants, local/cloud builds, EAS workflows                                   |
+| [docs/design.md](docs/design.md)                     | How to design features before implementation                                      |
+| [SECURITY.md](SECURITY.md)                           | Relay threat model, E2E encryption, DNS rebinding, agent auth                     |
 
 ## Quick start
 
@@ -77,20 +62,12 @@ See [docs/development.md](docs/development.md) for full setup, build sync requir
 - **Always use npm scripts for linting and formatting.** Do not run tools directly with `npx eslint`, `npx oxfmt`, `npx oxlint`, or package-local binaries. For targeted checks, pass file paths through the npm script:
   - `npm run lint -- packages/app/src/components/message.tsx`
   - `npm run format:files -- CLAUDE.md packages/app/src/components/message.tsx`
-- **The protocol stays backward-compatible. Features don't have to.** Two separate contracts:
-  - **Protocol contract (always):** schema changes must not break parsing in either direction. An old client must still parse messages from a new daemon; a new daemon must still parse messages from an old client.
-    - New fields: `.optional()` with a sensible default or `.transform()` fallback.
-    - Never flip optional → required, remove fields, or narrow types (`string` → `enum`, `nullable` → non-null).
-    - Removed fields stay accepted (we stop sending them, not stop reading them).
-    - Test with: "does a 6-month-old client still parse this?" and "does a 6-month-old daemon still send something this client accepts?"
-  - **Feature contract (per-feature):** a new feature may require a new daemon capability. The client detects whether the capability is present and either runs the feature or shows "Update the host to use this." That's it.
-    - **No fallback paths.** Don't write a degraded version of a new feature that runs on old daemons. Don't fan out across legacy RPCs to simulate a missing capability. The user upgrades or doesn't get the feature.
-    - **No defensive branches scattered through the feature.** Capability detection happens in one place; downstream code reads a clean shape.
-    - **Capability flags live in `server_info.features.*`** with a single `// COMPAT(featureName): added in v0.1.X, drop the gate when floor >= v0.1.X` comment marking the cleanup site.
-    - Existing functionality keeps working across versions — that's the protocol contract doing its job. New-feature degradation is not the goal.
-    - **New RPCs use dotted namespaces with direction suffixes.** Follow [docs/rpc-namespacing.md](docs/rpc-namespacing.md): `domain.provider.operation.request` pairs with `domain.provider.operation.response`. Existing flat RPC names will migrate over time; don't add new ones.
-
-- **All back-compat shims are tagged and dated for cleanup.** Every shim that exists for old-client/old-daemon support carries a `COMPAT(name)` comment with the version it was added in and a target removal date (typically 6 months out). One grep — `rg "COMPAT\("` — should produce the full list of cleanup work. Don't bury back-compat in untagged `??`-fallbacks or optional-chain tunnels — that's how it stops being deletable.
+- **NEVER make breaking changes to WebSocket or message schemas.** The primary compatibility path is old mobile app clients talking to newly updated daemons. Users update desktop and daemon first, then keep running the old app for a while. Every schema change MUST be backward-compatible for old clients against new daemons:
+  - New fields: always `.optional()` with a sensible default or `.transform()` fallback.
+  - Never change a field from optional to required.
+  - Never remove a field — deprecate it (keep accepting it, stop sending it).
+  - Never narrow a field's type (e.g. `string` → `enum`, `nullable` → non-null).
+  - Test with: "does a 6-month-old client still parse this?" and "does a 6-month-old daemon still send something this client accepts?"
 
 ## Platform gating
 

CONTRIBUTING.md

@@ -1,32 +1,168 @@
 # Contributing to Paseo
 
-Paseo is an opinionated product maintained by one person.
+Thanks for taking the time to contribute.
 
-I read every issue and PR myself, and I am selective about what contributions I accept.
+## How this project works
 
-Good ideas still need to fit the shape of the product: a PR can be technically correct and still not belong in Paseo.
+Paseo is a BDFL project. Product direction, scope, and what ships are the maintainer's call.
 
-Core product, design, architecture, and workflow changes are not accepted.
+This means:
 
-Follow these rules if you want your PR to be merged:
+- PRs submitted without prior discussion will likely be rejected, heavily modified, or scoped down.
+- The maintainer may rewrite, split, cherry-pick from, or close any PR at their discretion.
+- There is no obligation to merge a PR as-submitted, regardless of code quality.
 
-- Keep it to one focused change
-- Link to an issue
-- Explain the problem you're solving
-- Include repro steps if it's a bug
-- Include QA/testing evidence
-- UI changes need screenshots or video for every affected platform: iOS, Android, desktop, and web
-- If you only tested one platform, say that clearly
+This is not meant to discourage contributions. It is meant to set clear expectations so nobody wastes their time.
 
-Your PR will be closed if you do any of these:
+## How to contribute
 
-- Bundle unrelated changes
-- Fail basic checks like typecheck, formatting or linting
-- Make product, design, or architecture changes without prior discussion
-- Submit no evidence of testing
-- Skip the linked issue
-- Clearly fully AI-generated PR
+1. **Open an issue first.** Describe the problem or improvement. Get a thumbs up before writing code.
+2. **Keep it small.** One bug, one flow, one focused change.
+3. **Open a PR** once there is alignment on scope.
 
-## AI assistance
+If you want to propose a direction change, start a conversation.
 
-AI in the loop is fine. The bar is whether _you_ tested the change and can explain why it works. A confident wall of AI prose with no evidence of testing is a red flag and will get closed.
+## Before you start
+
+Please read these first:
+
+- [README.md](README.md)
+- [docs/architecture.md](docs/architecture.md)
+- [docs/development.md](docs/development.md)
+- [docs/coding-standards.md](docs/coding-standards.md)
+- [docs/testing.md](docs/testing.md)
+- [CLAUDE.md](CLAUDE.md)
+
+## What is most helpful
+
+The most useful contributions right now are:
+
+- bug fixes
+- windows and linux specific fixes
+- regression fixes
+- doc improvements
+- packaging / platform fixes
+- focused UX improvements that fit the existing product direction
+- tests that lock down important behavior
+
+## Scope expectations
+
+Please keep PRs narrow.
+
+Good:
+
+- fix one bug
+- improve one flow
+- add one focused panel or command
+- tighten one piece of UI
+
+Bad:
+
+- combine multiple product ideas in one PR
+- bundle unrelated refactors with a feature
+- sneak in roadmap decisions
+
+If a contribution contains multiple ideas, split it up.
+
+## Product fit matters
+
+Paseo is an opinionated product.
+
+When reviewing contributions, the bar is not just:
+
+- is this useful?
+- is this well implemented?
+
+It is also:
+
+- does this fit Paseo?
+- does this add product surface that will be hard to maintain?
+- does the value justify the maintenance surface it adds?
+- does this solve a common need or over-serve an edge case?
+- does this preserve the product's current direction?
+
+## Development setup
+
+### Prerequisites
+
+- Node.js matching `.tool-versions`
+- npm workspaces
+
+### Start local development
+
+```bash
+# runs both daemon and expo app
+npm run dev
+```
+
+Useful commands:
+
+```bash
+npm run dev:server
+npm run dev:app
+npm run dev:desktop
+npm run dev:website
+npm run cli -- ls -a -g
+```
+
+Read [docs/development.md](docs/development.md) for build-sync gotchas, local state, ports, and daemon details.
+
+## Multi-platform testing
+
+Paseo ships to mobile (iOS/Android), web, and desktop (Electron). Every UI change must be tested on mobile and web at minimum, and desktop if relevant. Things that look fine on one surface regularly break on another.
+
+Common checks:
+
+```bash
+npm run typecheck
+npm run test --workspaces --if-present
+```
+
+Important rules:
+
+- always run `npm run typecheck` after changes
+- tests should be deterministic
+- prefer real dependencies over mocks when possible
+- do not make breaking WebSocket / protocol changes
+- app and daemon versions in the wild lag each other, so compatibility matters
+
+If you touch protocol or shared client/server behavior, read the compatibility notes in [CLAUDE.md](CLAUDE.md).
+
+## Coding standards
+
+Paseo has explicit standards. Follow them.
+
+The full guide lives in [docs/coding-standards.md](docs/coding-standards.md).
+
+## PR checklist
+
+Before opening a PR, make sure:
+
+- there was prior discussion and alignment on scope (issue or conversation)
+- the change is focused, one idea per PR
+- the PR description explains what changed and why
+- **UI changes include screenshots or videos** for every affected platform (mobile, web, desktop)
+- UI changes have been tested on mobile and web at minimum
+- typecheck passes
+- tests pass, or you clearly explain what could not be run
+- relevant docs were updated if needed
+
+## Communication
+
+If you are unsure whether something fits, ask first.
+
+That is especially true for:
+
+- new core UX
+- naming / terminology changes
+- new extension points
+- new orchestration models
+- anything that would be hard to remove later
+
+Early alignment saves everyone time.
+
+## Forks are fine
+
+If you want to explore a different product direction, a fork is completely fine.
+
+Paseo is open source on purpose. Not every idea needs to land in the main repo to be valuable.

SECURITY.md

@@ -19,19 +19,18 @@ The relay is designed to be untrusted. All traffic between your phone and daemon
 
 ### How it works
 
-1. The daemon generates a persistent Curve25519 keypair on first run and stores it at `$PASEO_HOME/daemon-keypair.json` with mode `0600`
-2. The pairing URL (rendered as a QR code or opened directly) carries the daemon's public key in its URL fragment (`https://app.paseo.sh/#offer=...`). Fragments are not sent to the web server, so `app.paseo.sh` never sees the key.
-3. When the phone connects via the relay, it generates a fresh ephemeral Curve25519 keypair and sends an `e2ee_hello` message containing its public key. The daemon will not process any application messages until this handshake completes.
-4. Both sides perform a Curve25519 ECDH key exchange to derive a shared key. All subsequent messages are encrypted with XSalsa20-Poly1305 (NaCl `box`). The wire format is `[24-byte nonce][ciphertext]`, base64-encoded as a WebSocket text frame.
+1. The daemon generates a persistent ECDH keypair and stores it locally
+2. When you scan the QR code or click the pairing link, your phone receives the daemon's public key
+3. Your phone sends a handshake message with its own public key. The daemon will not accept any commands until this handshake completes.
+4. Both sides perform an ECDH key exchange to derive a shared secret. All subsequent messages are encrypted with XSalsa20-Poly1305 (NaCl box).
 
-The relay sees only: IP addresses, timing, message sizes, session IDs, and the plaintext `e2ee_hello` / `e2ee_ready` handshake frames (which contain only public keys). It cannot read message contents, forge messages, or derive encryption keys from observing the handshake.
+The relay sees only: IP addresses, timing, message sizes, and session IDs. It cannot read message contents, forge messages, or derive encryption keys from observing the handshake.
 
 ### Why the relay can't attack you
 
 The daemon requires a valid cryptographic handshake before processing any commands. A compromised relay cannot:
 
-- **Impersonate the daemon to your phone** — Without the daemon's secret key, it cannot derive the shared key, so any traffic it injects fails authenticated decryption on the phone
-- **Send commands as you** — The daemon only accepts traffic that decrypts and authenticates under a shared key derived with its own secret key. The phone's keypair is ephemeral per connection, so there is no persistent phone-side secret to steal; protection comes from the daemon's secret key never leaving the daemon.
+- **Send commands** — Without your phone's private key, it cannot complete the handshake
 - **Read your traffic** — All messages are encrypted with XSalsa20-Poly1305 (NaCl box) after the handshake
 - **Forge messages** — NaCl box provides authenticated encryption; tampered messages are rejected
 - **Replay old messages across sessions** — Each session derives fresh encryption keys, so ciphertext from one session cannot be replayed into another session. Within a live session, replay protection is not yet implemented; the protocol uses random nonces and does not track nonce reuse or message counters.
@@ -42,11 +41,11 @@ The QR code or pairing link is the trust anchor. It contains the daemon's public
 
 ## Local daemon trust boundary
 
-By default, the daemon binds to `127.0.0.1`. With no password configured, the local control plane is trusted by network reachability — anything that can reach the daemon socket can control the daemon. This is the same security model Docker documents for its daemon: the security boundary is access to the socket or listening address.
+By default, the daemon binds to `127.0.0.1`. The local control plane is trusted by network reachability, not by an additional authentication token.
 
-The daemon also supports an optional shared-secret password (set via `auth.password` in `config.json` or the `PASEO_PASSWORD` env var; stored bcrypt-hashed). When configured, every HTTP request must carry `Authorization: Bearer <password>` and every WebSocket upgrade must include a `Sec-WebSocket-Protocol: paseo.bearer.<password>` subprotocol. Browser WebSocket cannot set custom headers, which is why the token rides in the subprotocol. Health (`GET /api/health`) and CORS preflight (`OPTIONS`) are exempt. The password is intended for direct-TCP exposure (e.g. `tcp://host:port?ssl=true&password=...`); it is **not** a substitute for the relay's E2E encryption when traversing untrusted networks.
+Anything that can reach the daemon socket can control the daemon. This is the same security model Docker documents for its daemon: the security boundary is access to the socket or listening address.
 
-If you expose the daemon beyond loopback, such as by binding to `0.0.0.0`, forwarding it through a tunnel or reverse proxy, or publishing it from a Docker container, you are responsible for restricting and securing that access. Setting a password is strongly recommended in that case.
+If you expose the daemon beyond loopback, such as by binding to `0.0.0.0`, forwarding it through a tunnel or reverse proxy, or publishing it from a Docker container, you are responsible for restricting and securing that access.
 
 For remote access, use the relay connection. It is the supported path for reaching the daemon off-machine, and it adds end-to-end encryption plus a pairing handshake before commands are accepted.
 
@@ -56,7 +55,7 @@ Host header validation and CORS origin checks are defense-in-depth controls for
 
 CORS is not a complete security boundary. It controls which browser origins can make requests, but does not prevent a malicious website from resolving its domain to your local machine (DNS rebinding).
 
-Paseo validates the `Host` header on every HTTP request and every WebSocket upgrade against an allowlist (Vite-style semantics). By default, only `localhost`, `*.localhost`, and any literal IP address (IPv4 or IPv6) are accepted. Additional hostnames can be configured via `hostnames` in `config.json` or the `PASEO_HOSTNAMES` env var (comma-separated; entries beginning with `.` match a domain and its subdomains; the value `true` disables the allowlist entirely). Requests with unrecognized hosts are rejected with `403 Host not allowed`.
+Paseo validates the `Host` header on incoming requests against configured hostnames. Requests with unrecognized hosts are rejected.
 
 ## Agent authentication
 

docs/ad-hoc-daemon-testing.md

@@ -48,7 +48,7 @@ const port = target!.type === "tcp" ? target!.port : null;
 
 const client = new DaemonClient({
   url: `ws://127.0.0.1:${port}/ws`,
-  appVersion: "0.1.70", // see gotcha #1
+  appVersion: "0.1.54", // see gotcha #1
 });
 await client.connect();
 await client.fetchAgents({ subscribe: { subscriptionId: "test" } });
@@ -78,7 +78,7 @@ import { DaemonClient } from "./test-utils/daemon-client.js";
 const daemon = await createTestPaseoDaemon();
 const client = new DaemonClient({
   url: `ws://127.0.0.1:${daemon.port}/ws`,
-  appVersion: "0.1.70",
+  appVersion: "0.1.54",
 });
 await client.connect();
 await client.fetchAgents({ subscribe: { subscriptionId: "test" } });
@@ -116,7 +116,7 @@ Always pass `appVersion`:
 ```typescript
 const client = new DaemonClient({
   url: `ws://127.0.0.1:${port}/ws`,
-  appVersion: "0.1.70",
+  appVersion: "0.1.54",
 });
 ```
 

docs/agent-lifecycle.md

@@ -1,107 +0,0 @@
-# Agent lifecycle
-
-How an agent is created, runs, becomes a subagent, gets archived, and disappears from the UI. The model spans the daemon (lifecycle, archive) and the client (tabs, the subagents track).
-
-## States
-
-```
-initializing → idle → running → idle (or error → closed)
-                 ↑        │
-                 └────────┘  (agent completes a turn, awaits next prompt)
-```
-
-Each agent in `AgentManager` carries a `lastStatus` of `initializing`, `idle`, `running`, `error`, or `closed`. State transitions persist to disk and stream to subscribed clients via WebSocket.
-
-## Relationships
-
-Agents can launch other agents via the `create_agent` MCP tool. When they do, the daemon stamps the new agent with a label `paseo.parent-agent-id` pointing back at the caller (`packages/server/src/server/agent/mcp-server.ts:804`). The client surfaces that as `agent.parentAgentId`.
-
-There is exactly one relationship type today: `parentAgentId`. The daemon does not distinguish between:
-
-- **Subagents** — children that exist as part of the parent's work (e.g. orchestration tasks the parent delegates and waits on)
-- **Detached agents** — children launched to take over from the parent (e.g. handoffs, fire-and-forget delegations)
-
-Both look the same in storage. This is an accepted limitation — see [Limitations](#limitations).
-
-## Archive
-
-Archive is a **soft delete**: the agent record stays on disk with `archivedAt` set, the runtime is closed, and the agent disappears from active lists. Archive is **global** — it lives on the server and propagates to every connected client.
-
-Archiving runs through `AgentManager.archiveAgent` (`packages/server/src/server/agent/agent-manager.ts`):
-
-1. Snapshot the current session into the registry
-2. Set `archivedAt` and normalize `lastStatus` away from `running`/`initializing`
-3. Notify subscribers
-4. Close the runtime (kills the process if still running)
-5. **Cascade-archive children** — any agent whose `paseo.parent-agent-id` label matches the archived agent gets archived too, recursively
-
-Cascade is what keeps subagent fleets from outliving their orchestrator.
-
-## Tabs vs archive
-
-These are two distinct concepts that used to be conflated:
-
-| Concept                    | Scope      | Triggers                   |
-| -------------------------- | ---------- | -------------------------- |
-| **Tab** (workspace layout) | Per-client | User opens/closes a view   |
-| **Archive** (lifecycle)    | Global     | Explicit lifecycle gesture |
-
-Closing a tab on a **root agent** still archives — the tab is the agent's home, so closing it means "I'm done with this agent." A confirm dialog protects against archiving a running agent by accident.
-
-Closing a tab on a **subagent** (any agent with `parentAgentId`) is **layout-only**. The agent stays unarchived and stays in its parent's track. The user can re-open the tab from the track at any time. This is implemented in `handleCloseAgentTab` (`packages/app/src/screens/workspace/workspace-screen.tsx`).
-
-The asymmetry is intentional: a subagent's home is the parent's track, not the tab. Tabs are ephemeral viewing slots; the track is the persistent record of the parent's children.
-
-## The subagents track
-
-The collapsible section above the composer in an agent's pane (`packages/app/src/subagents/subagents-section.tsx`). Membership rule (`packages/app/src/subagents/subagents.ts`):
-
-```
-parentAgentId === thisAgent.id  AND  !archivedAt
-```
-
-Archived subagents disappear from the track, by design. To remove a subagent from the track without closing its tab, use the **archive button (X)** on the row — it opens a confirm dialog and archives the subagent on confirm. That same archive shows the subagent leave the track on every connected client.
-
-## Why this shape
-
-The decision was to **decouple "close tab" from "archive" only for subagents**, rather than universally:
-
-- **Closing a tab on a root agent still archives** — preserves the existing UX users are trained on
-- **Closing a tab on a subagent is layout-only** — fixes the lossy "click to read, close to dismiss view, lose the row" flow
-- **Archive button on track rows** — gives subagents an explicit lifecycle gesture in their home surface
-- **Cascade archive on parent** — keeps subagents from leaking when the parent is archived
-
-We considered universal decoupling (no tab close ever archives, archive is always explicit) but rejected it: it changes a behavior root-agent users rely on.
-
-## Limitations
-
-### Detached agents are cascade-archived
-
-The daemon can't tell a "subagent" apart from a "detached agent" — both carry `paseo.parent-agent-id`. So when you archive an agent that previously launched a detached child (e.g. via `/paseo-handoff`), cascade will archive the detached child too, even though semantically it should outlive the originator.
-
-Until a richer relation model lands (e.g. a `relation: "subagent" | "detached"` field on creation, or a separate channel for handoff launches), this trade-off stands. Workaround: don't archive an agent whose work was handed off, or unarchive the detached child afterward.
-
-### Subagent accumulation under long-lived parents
-
-A parent that spawns many subagents will see the track grow. There's no automatic cleanup for completed subagents — the user prunes via the archive button on each row. A bulk gesture (e.g. "archive all idle children") could land later if this becomes a real problem.
-
-### Cross-client tab dismissal
-
-Closing a subagent's tab on one client doesn't affect other clients' layouts. This is the expected behavior of decoupled tabs and is consistent with how layouts have always worked. Archive remains the global gesture for cross-client cleanup.
-
-## Storage
-
-```
-$PASEO_HOME/agents/{cwd-with-dashes}/{agent-id}.json
-```
-
-Each agent is a single JSON file. Fields relevant to this doc:
-
-| Field                             | Type          | Meaning                                                       |
-| --------------------------------- | ------------- | ------------------------------------------------------------- |
-| `id`                              | `string`      | Stable identifier                                             |
-| `archivedAt`                      | `string?`     | Soft-delete timestamp (ISO 8601)                              |
-| `labels["paseo.parent-agent-id"]` | `string?`     | Parent agent ID, set automatically by `create_agent` MCP tool |
-| `lastStatus`                      | `AgentStatus` | `initializing` / `idle` / `running` / `error` / `closed`      |
-
-See [`docs/data-model.md`](./data-model.md) for the full agent record.

docs/android.md

@@ -27,12 +27,12 @@ Or from `packages/app`:
 
 ```bash
 # Debug
-npx cross-env APP_VARIANT=development expo prebuild --platform android --non-interactive
-npx cross-env APP_VARIANT=development expo run:android --variant=debug
+APP_VARIANT=development npx expo prebuild --platform android --non-interactive
+APP_VARIANT=development npx expo run:android --variant=debug
 
 # Release
-npx cross-env APP_VARIANT=production expo prebuild --platform android --non-interactive
-npx cross-env APP_VARIANT=production expo run:android --variant=release
+APP_VARIANT=production npx expo prebuild --platform android --non-interactive
+APP_VARIANT=production npx expo run:android --variant=release
 
 # Clear generated Android project
 rm -rf android
@@ -48,28 +48,22 @@ adb exec-out screencap -p > screenshot.png
 
 Stable tag pushes like `v0.1.0` trigger:
 
-- The EAS GitHub app on Expo servers (iOS + Android production builds + store submit). There is no workflow file in this repo for it.
-- `.github/workflows/android-apk-release.yml` on GitHub Actions (APK asset on GitHub Release).
-
-iOS auto-submits to App Store review via a Fastlane lane after EAS uploads to TestFlight. Android auto-submits to the Play Store via EAS-managed credentials.
+- `packages/app/.eas/workflows/release-mobile.yml` on Expo servers (iOS + Android build + submit)
+- `.github/workflows/android-apk-release.yml` on GitHub Actions (APK asset on GitHub Release)
 
 Beta tags like `v0.1.1-beta.1` only trigger the GitHub APK workflow. They publish a GitHub prerelease APK for testing and do not submit to the stores.
 
-`android-v*` tags also trigger only the GitHub APK workflow — useful when you want to ship an APK without going through stores. The GitHub APK workflow supports `workflow_dispatch` with an existing `tag` input so you can rebuild without cutting a new tag.
-
 ### Useful commands
 
 ```bash
 cd packages/app
 
-# Recent builds
-npx eas build:list --limit 10 --non-interactive --json | jq '.[] | {platform, status, appVersion, gitCommitHash}'
+# List recent workflow runs
+npx eas workflow:runs --workflow release-mobile.yml --limit 10
 
-# Inspect a build (the printed `Logs` URL opens the build's Expo dashboard page,
-# which has a Submissions section showing the auto-submit to the Play Store).
-npx eas build:view <build-id>
+# Inspect a run
+npx eas workflow:view <run-id>
+
+# Stream logs for a failed job
+npx eas workflow:logs <job-id> --non-interactive --all-steps
 ```
-
-The Play Console (Internal testing → Production tracks) is the final confirmation that the binary reached the store.
-
-See [docs/release.md](release.md) for the full mobile-build babysitting flow.

docs/architecture.md

@@ -51,51 +51,39 @@ The heart of Paseo. A Node.js process that:
 - Exposes an MCP server for agent-to-agent control
 - Optionally connects outbound to a relay for remote access
 
-All paths are under `packages/server/src/`.
-
 **Key modules:**
 
-| Module                          | Responsibility                                                               |
-| ------------------------------- | ---------------------------------------------------------------------------- |
-| `server/bootstrap.ts`           | Daemon initialization: HTTP server, WS server, agent manager, storage, relay |
-| `server/websocket-server.ts`    | WebSocket connection management, hello handshake, binary frame routing       |
-| `server/session.ts`             | Per-client session state, timeline subscriptions, terminal operations        |
-| `server/agent/agent-manager.ts` | Agent lifecycle state machine, timeline tracking, subscriber management      |
-| `server/agent/agent-storage.ts` | File-backed JSON persistence at `$PASEO_HOME/agents/`                        |
-| `server/agent/mcp-server.ts`    | MCP server for sub-agent creation, permissions, timeouts                     |
-| `server/agent/providers/`       | Provider adapters (see "Agent providers" below)                              |
-| `server/relay-transport.ts`     | Outbound relay connection with E2E encryption                                |
-| `server/schedule/`              | Cron-based scheduled agents                                                  |
-| `server/loop-service.ts`        | Looping agent runs that retry until an exit condition                        |
-| `server/chat/`                  | Chat rooms for agent-to-agent and human-to-agent messaging                   |
-| `client/daemon-client.ts`       | Client library for connecting to the daemon (used by CLI and app)            |
-| `shared/messages.ts`            | Zod schemas for the entire wire protocol                                     |
-| `shared/binary-frames/`         | Terminal stream and file transfer binary frame codecs                        |
+| Module                    | Responsibility                                                                |
+| ------------------------- | ----------------------------------------------------------------------------- |
+| `bootstrap.ts`            | Daemon initialization: HTTP server, WS server, agent manager, storage, relay  |
+| `websocket-server.ts`     | WebSocket connection management, hello/welcome handshake, binary multiplexing |
+| `session.ts`              | Per-client session state, timeline subscriptions, terminal operations         |
+| `agent/agent-manager.ts`  | Agent lifecycle state machine, timeline tracking, subscriber management       |
+| `agent/agent-storage.ts`  | File-backed JSON persistence at `$PASEO_HOME/agents/`                         |
+| `agent/mcp-server.ts`     | MCP server for sub-agent creation, permissions, timeouts                      |
+| `providers/`              | Provider adapters: Claude (Agent SDK), Codex (AppServer), OpenCode            |
+| `relay-transport.ts`      | Outbound relay connection with E2E encryption                                 |
+| `client/daemon-client.ts` | Client library for connecting to the daemon (used by CLI and app)             |
 
 ### `packages/app` — Mobile + web client (Expo)
 
 Cross-platform React Native app that connects to one or more daemons.
 
-- Expo Router navigation (`/h/[serverId]/workspace/[workspaceId]`, `/h/[serverId]/agent/[agentId]`, etc.)
-- `HostRuntimeController` manages saved host connections, reconnection, and per-host runtime state
+- Expo Router navigation (`/h/[serverId]/agents`, etc.)
+- `DaemonRegistryContext` manages saved daemon connections
 - `SessionContext` wraps the daemon client for the active session
-- Timeline reducers in `timeline/session-stream-reducers.ts` handle compaction, gap detection, sequence-based deduplication
+- `Stream` model handles timeline with compaction, gap detection, sequence-based deduplication
 - Voice features: dictation (STT) and voice agent (realtime)
 
 ### `packages/cli` — Command-line client
 
-Commander.js CLI with Docker-style commands. Common agent operations are also exposed at the top level (e.g. `paseo ls`, `paseo run`).
+Commander.js CLI with Docker-style commands:
 
-- `paseo agent ls/run/import/attach/logs/stop/delete/send/inspect/wait/archive/reload/update/mode`
-- `paseo daemon start/stop/restart/status/pair/set-password`
-- `paseo chat ls/create/inspect/post/read/wait/delete`
-- `paseo terminal ls/create/capture/send-keys/kill`
-- `paseo loop run/ls/inspect/logs/stop`
-- `paseo schedule create/ls/inspect/update/pause/resume/run-once/logs/delete`
+- `paseo agent ls/run/stop/logs/inspect/wait/send/attach`
+- `paseo daemon start/stop/restart/status/pair`
 - `paseo permit allow/deny/ls`
 - `paseo provider ls/models`
-- `paseo worktree create/ls/archive`
-- `paseo speech …`
+- `paseo worktree ls/archive`
 
 Communicates with the daemon via the same WebSocket protocol as the app.
 
@@ -103,11 +91,11 @@ Communicates with the daemon via the same WebSocket protocol as the app.
 
 Enables remote access when the daemon is behind a firewall.
 
-- Curve25519 ECDH key exchange + XSalsa20-Poly1305 (NaCl `box`) encryption
+- ECDH key exchange + AES-256-GCM encryption
 - Relay server is zero-knowledge — it routes encrypted bytes, cannot read content
 - Client and daemon channels with identical API (`createClientChannel`, `createDaemonChannel`)
 - Pairing via QR code transfers the daemon's public key to the client
-- Self-hosted relays opt into TLS with `daemon.relay.useTls` or `PASEO_RELAY_USE_TLS=true`; the public (client-facing) TLS setting can be overridden independently via `daemon.relay.publicUseTls` or `PASEO_RELAY_PUBLIC_USE_TLS`
+- Self-hosted relays opt into TLS with `daemon.relay.useTls` or `PASEO_RELAY_USE_TLS=true`
 
 See [SECURITY.md](../SECURITY.md) for the full threat model.
 
@@ -125,50 +113,30 @@ TanStack Router + Cloudflare Workers. Serves paseo.sh.
 
 ## WebSocket protocol
 
-All clients speak the same WebSocket protocol over a single connection that mixes JSON text frames and a small binary framing for terminal streams. Schemas live in `packages/server/src/shared/messages.ts`.
+All clients speak the same binary-multiplexed WebSocket protocol.
 
 **Handshake:**
 
 ```
-Client → Server:  WSHelloMessage {
-                    type: "hello",
-                    clientId,
-                    clientType: "mobile" | "browser" | "cli" | "mcp",
-                    protocolVersion,
-                    appVersion?,
-                    capabilities?: { voice?, pushNotifications?, ... },
-                  }
-Server → Client:  status message with payload { status: "server_info",
-                    serverId, hostname, version, capabilities?, features }
+Client → Server:  WSHelloMessage { id, clientId, version, timestamp }
+Server → Client:  WSWelcomeMessage { clientId, daemonVersion, sessionId, capabilities }
 ```
 
-There is no dedicated welcome message; the server emits a `status` session message after accepting the hello, then begins streaming. The session stores client capabilities from the hello and rehydrates them on reconnect, so the wire boundary can ask one question: `session.supports(...)`.
-
-**Top-level WS envelopes** are `hello`, `recording_state`, `ping`/`pong`, and `session` (which wraps the rich union of session messages).
-
-New session RPCs use dotted names with `.request` and `.response` suffixes, such as `checkout.github.set_auto_merge.request` and `checkout.github.set_auto_merge.response`. See [rpc-namespacing.md](rpc-namespacing.md) for the convention and migration rules for older flat RPC names.
-
-**Notable session message types:**
+**Message types:**
 
 - `agent_update` — Agent state changed (status, title, labels)
 - `agent_stream` — New timeline event from a running agent
-- `workspace_update`, `script_status_update`, `workspace_setup_progress` — Workspace state
-- `agent_permission_request` / `agent_permission_resolved` — Tool-call permission flow
-- `agent_deleted`, `agent_archived`, `agent_status`, `agent_list`
-- `checkout_status_update`, `checkout_diff_update`, and the full `checkout_*` request/response set for git operations
-- Terminal subscribe/input/capture commands
-- Voice/dictation streaming events (`dictation_stream_*`, `assistant_chunk`, `audio_output`, `transcription_result`)
-- Request/response pairs for fetch, list, create, etc., correlated by `requestId`; failures use `rpc_error`
+- `workspace_update` — Workspace state changed
+- `agent_permission_request` — Agent needs user approval for a tool call
+- Command-response pairs for fetch, list, create, etc.
 
-**Binary frames (terminal stream protocol):**
+**Binary multiplexing:**
 
-Terminal I/O is sent as binary WebSocket frames decoded by `decodeTerminalStreamFrame` in `shared/binary-frames/terminal.ts`. The layout is:
+Terminal I/O and agent streaming share the same connection via `BinaryMuxFrame`:
 
-- 1-byte opcode: `Output (0x01)`, `Input (0x02)`, `Resize (0x03)`, `Snapshot (0x04)`
-- 1-byte slot: terminal slot id
-- variable payload: bytes for output/input, JSON-encoded `{ rows, cols }` for resize, terminal snapshot for snapshot
-
-There is also a separate file-transfer binary frame format in the same directory, used for download/upload streams.
+- Channel 0: control messages
+- Channel 1: terminal data
+- 1-byte channel ID + 1-byte flags + variable payload
 
 ### Compatibility rules
 
@@ -187,45 +155,26 @@ Example: adding a new enum value
 
 ## Agent lifecycle
 
-The lifecycle states are defined in `shared/agent-lifecycle.ts`:
-
 ```
-initializing → idle ⇄ running
-        ↓       ↓        ↓
-              error
-                ↓
-              closed
+initializing → idle → running → idle (or error → closed)
+                 ↑        │
+                 └────────┘  (agent completes a turn, awaits next prompt)
 ```
 
-- `initializing` — provider session is being created
-- `idle` — has a live session, awaiting the next prompt
-- `running` — provider is currently producing a turn
-- `error` — last attempt failed; session is still attached
-- `closed` — terminal state, no live session
-
-`ManagedAgent` is a discriminated union over those lifecycle tags. Notes:
-
-- **AgentManager** is the source of truth for agent state and broadcasts updates to all subscribers
-- Timeline is append-only with epochs (each run starts a new epoch). Storage uses sequence numbers for client-side dedup; the default fetch page is 200 items
-- Timeline row `timestamp` values are canonical daemon-owned timestamps. Providers may supply original replay timestamps, but clients must not guess timestamp trust or hide time UI based on local clock heuristics.
+- **AgentManager** tracks up to 200 timeline items per agent
+- Timeline is append-only with epochs (each run starts a new epoch)
 - Events stream to all subscribed clients in real time
-- Agent state persists to `$PASEO_HOME/agents/{cwd-with-dashes}/{agent-id}.json` (timeline rows live alongside the record)
+- Agent state persists to `$PASEO_HOME/agents/{cwd-with-dashes}/{agent-id}.json`
 
 ## Agent providers
 
-Each provider implements the `AgentClient` interface in `agent/agent-sdk-types.ts`. Provider implementations live in `agent/providers/`.
+Each provider implements a common `AgentClient` interface:
 
-The three first-class, user-facing providers are Claude Code, Codex, and OpenCode. Additional adapters exist in the same directory for ACP-compatible agents and internal use:
-
-| Provider           | Wraps                                | Session format                                     |
-| ------------------ | ------------------------------------ | -------------------------------------------------- |
-| Claude (`claude/`) | Anthropic Agent SDK                  | `~/.claude/projects/{cwd}/{session-id}.jsonl`      |
-| Codex              | Codex AppServer (`codex-app-server`) | `~/.codex/sessions/{date}/rollout-{ts}-{id}.jsonl` |
-| OpenCode           | OpenCode server / CLI                | Provider-managed                                   |
-| Cursor / Copilot   | ACP wrapper (`acp-agent`)            | Provider-managed                                   |
-| Generic ACP        | ACP wrapper                          | Provider-managed                                   |
-| Pi-direct          | Direct Anthropic API call            | Stateless                                          |
-| Mock load test     | In-process fake                      | In-memory                                          |
+| Provider | Wraps               | Session format                                     |
+| -------- | ------------------- | -------------------------------------------------- |
+| Claude   | Anthropic Agent SDK | `~/.claude/projects/{cwd}/{session-id}.jsonl`      |
+| Codex    | CodexAppServer      | `~/.codex/sessions/{date}/rollout-{ts}-{id}.jsonl` |
+| OpenCode | OpenCode CLI        | Provider-managed                                   |
 
 All providers:
 
@@ -246,21 +195,12 @@ All providers:
 
 ## Storage
 
-`$PASEO_HOME` defaults to `~/.paseo`. The most important files:
-
 ```
 $PASEO_HOME/
-├── agents/{cwd-with-dashes}/{agent-id}.json   # Agent record + persisted timeline rows
+├── agents/{cwd-with-dashes}/{agent-id}.json   # Agent state + config
 ├── projects/projects.json                      # Project registry
 ├── projects/workspaces.json                    # Workspace registry
-├── chat/                                       # Chat rooms
-├── schedules/                                  # Scheduled-agent definitions and runs
-├── loops/                                      # Loop runs and logs
-├── config.json                                 # Daemon config (mutable)
-├── daemon-keypair.json                         # Daemon identity for relay/E2EE
-├── push-tokens.json                            # Mobile push tokens
-├── paseo.sock / paseo.pid                      # Local IPC socket and pidfile
-└── daemon.log                                  # Daemon trace logs (rotated)
+└── daemon.log                                  # Daemon trace logs
 ```
 
 ## Deployment models

docs/coding-standards.md

@@ -1,98 +1,188 @@
 # Coding Standards
 
-The core instinct: AI-generated code hedges — it covers every case, layers over instead of cutting in, scatters uncertainty everywhere, wraps in case. A senior engineer commits — to a shape, a boundary, a name, a happy path, a type — and lets everything else fall into place. Every rule below catches a different form of indecision.
-
-For testing rules, see [testing.md](testing.md).
+These standards apply to all code changes: features, bug fixes, refactors, and performance work.
 
 ## Core principles
 
-- **Zero complexity budget** — every abstraction must justify itself with a specific, current benefit.
-- **YAGNI** — build features and abstractions only when needed. A function called once is indirection, not abstraction.
-- **No "while I'm at it" cleanups** — make the change you came for. Drive-by edits hide in the diff.
-- **Functional and declarative** over object-oriented.
-- **`function` declarations** over arrow function assignments.
-- **`interface`** over `type` when both work.
-- **No `index.ts` barrel files** that only re-export — they create indirection and circular-dep risk. Import from the source.
+- **Zero complexity budget** — justify every abstraction with specific benefits
+- **Fully typed TypeScript** — no `any`, no untyped boundaries
+- **YAGNI** — build features and abstractions only when needed
+- **Functional and declarative** over object-oriented
+- **`interface`** over `type` when possible
+- **`function` declarations** over arrow function assignments
+- **Single-purpose functions** — one function, one job
+- **Design for edge cases through types** rather than explicit handling
+- **Don't catch errors** unless there's a strong reason to
+- **No index.ts barrel files** that only re-export — they create unnecessary indirection
+- **No "while I'm at it" improvements** — stay focused on the task
 
-## Comments and noise
+## Type hygiene
 
-- Delete any comment where removing it loses zero information. Comments explain _why_, not _what_.
-- No tutorial comments explaining language features (`// Use destructuring to...`).
-- No decorative section dividers (`// ===== Helpers =====`). Use files and modules to organize, not ASCII art.
-- No hedging comments (`// might need to revisit`, `// should work for most cases`). If you're unsure, investigate.
-- No commented-out code. Git remembers.
-- No `console.log` / `debugger` left behind. No `TODO: implement` stubs — if it needs to exist, write it.
+### Infer from schemas
 
-## Confidence: commit to a shape
+Never hand-write a TypeScript type that can be inferred from a Zod schema.
 
-- Validate at boundaries (network, IPC, user input, file I/O), trust types internally. After the parse, the value is what its type says.
-- Every `?.` and `??` past the validation boundary is unconfident code — either the boundary should resolve it, or the type should reflect reality.
-- No defensive checks for conditions the type system already rules out (`if (!agent) return` on a non-nullable parameter).
-- No `try/catch` "just in case." If you can't say what you're catching and why, don't catch.
-- Optionality is a design decision, not a migration shortcut. Distinct valid states → discriminated union. Intentionally empty → explicit `null`. Keep optionality at real boundaries.
+```typescript
+// Bad: duplicate type that can drift
+const schema = z.object({ procedure: z.string(), args: z.record(z.unknown()) });
+type RPCArgs = { procedure: string; args: Record<string, unknown> };
 
-## Types
+// Good: infer from schema
+type RPCArgs = z.infer<typeof schema>;
+```
 
-- No `any`. No `as` casts to bypass errors. No `@ts-ignore` / `@ts-expect-error`. Narrow with `if` / schema validation; let the compiler check harder, not less.
-- If a Zod schema exists, the TypeScript type is `z.infer<typeof schema>`. Never hand-write a parallel type.
-- One canonical type per concept. Layer-specific views are `Pick` / `Omit`, not duplicated fields.
-- Name multi-property object shapes — no inline `Array<{ ... }>` or `Promise<{ ... }>` in signatures, returns, or generic args.
-- Use string literal unions, not raw `string`, when the value is one of a known set. Catches typos at compile time.
-- Object parameters past the obvious-name threshold: 3+ args, any boolean arg, any optional arg → object. `(thing, true, false, true)` is unreadable at the call site.
-- Make impossible states impossible — discriminated unions over `{ isLoading; error?; data? }` bags.
+### Named types over inline
 
-## Errors
+No complex inline types in public function signatures.
 
-- Throw typed error classes that carry the fields a caller would want to read. Plain `Error("Provider X not found")` collapses structured info into a string.
-- Catch blocks branch on `instanceof` for what they can handle; rethrow the rest. No `catch (e) { return null }`.
-- Separate user-facing copy from log/debug strings — don't make one string serve telemetry, logs, and the UI.
-- Fail explicitly. If the caller asked for X and X isn't available, throw — don't silently substitute Y.
+```typescript
+// Bad
+function enqueueJob(input: { userId: string; priority: "low" | "normal" | "high" }) {}
 
-## Density
+// Good
+interface EnqueueJobInput {
+  userId: string;
+  priority: "low" | "normal" | "high";
+}
+function enqueueJob(input: EnqueueJobInput) {}
+```
 
-- Nested ternaries are forbidden. A single ternary is fine only when both branches are a single identifier or trivial access (`x ? a : b`).
-- Boolean expressions with 2+ clauses or mixed concerns → name the conditions.
-- Object literals assemble pre-computed values; don't pack branching and lookups into property positions.
-- Operations wrapping operations (`Object.fromEntries(arr.filter(...).map(...))`, `Math.max(...xs.map(...))`) → break into named intermediates.
-- Max 3 levels of nesting (callbacks, JSX, control flow). Above that, extract.
+### Object parameters
 
-## Structure and modules
+If a function needs more than one argument, use a single object parameter.
 
-- A directory is a module, not a namespace. One intentional public surface; internal files stay internal.
-- Path is part of the name — prefer `provider/registry.ts` over `provider/provider-registry.ts`. If the filename has to do double duty, deepen the path.
-- Filenames ending in `-utils`, `-helpers`, `-manager`, `-handler`, `-controller`, `-formatter`, `-builder` are a smell — the path didn't carry enough domain.
-- Boundary returns answer the caller's question (`getActiveAgents()`), not "here's my storage" (`getAgents().filter(...)` repeated everywhere).
-- One adapter means a hypothetical seam; two adapters means a real one. Don't define a port until something actually varies across it.
-- Pass-through modules fail the deletion test — if removing the module makes callers go straight to what they wanted, delete it.
-- Centralize policy. The same discriminator (`plan`, `provider`, `kind`, `status`) branched in 3+ files → policy table, not another `else if` per case.
-- New features get a home before implementation. A feature smeared across 5 shared files is the same slop as a flat-peer namespace.
-- Don't drop new files at the nearest root just because placement is unclear — say so and ask.
+```typescript
+// Bad: positional args
+function createToolCall(provider: string, toolName: string, payload: unknown) {}
 
-## Refactoring is a bolt-on test
+// Good: object param
+interface CreateToolCallInput {
+  provider: string;
+  toolName: string;
+  payload: unknown;
+}
+function createToolCall(input: CreateToolCallInput) {}
+```
 
-- A change should look like a thoughtful edit to existing code, not a new layer next to it. New coordinator wrapping a coordinator, new flag bypassing the normal path, new helper duplicating an existing selector — stop and reshape instead.
-- Refactors preserve behavior by default. No removing features to simplify code without explicit approval.
-- Have a verification plan _before_ refactoring — name the invariants, confirm a test holds them, write one if not. See [testing.md](testing.md).
-- Migrate all callers and remove old paths in the same refactor. No fallback behavior unless explicitly designed.
+### One canonical type per concept
 
-## React
+Don't redefine the same concept in different layer-specific shapes (`RpcX`, `DbX`, `UiX`). Keep one canonical type and add explicit layer wrappers that reference it.
 
-- `useEffect` is for synchronizing with external systems (DOM, network, timers, subscriptions). Not for transforming React state. Derived state → compute in render or `useMemo`.
-- No effect cascades — chains of effects setting state that triggers more effects almost always want React Query or a reducer.
-- `useRef` is for DOM refs and non-rendering identities (timer IDs, AbortController, latest-callback caches). If the value affects what renders next, it's state — model it explicitly with `useReducer` and a discriminated union.
-- Server state goes through React Query. Manual `useState` + `useEffect` + `isLoading` + `error` for fetched data is always worse.
-- Components render and dispatch — they don't compute transitions. Two-plus interacting `useState`s → extract a reducer.
-- Never define components inside other components. Module-scope only.
-- Subscribe narrowly: select primitives from stores, pass `status` not `agent`, use `useShallow` / deep-equal when returning derived arrays/objects.
-- Stable references for props that cross `memo` boundaries or feed dependency arrays. Static literals at module scope `as const`; derived with `useMemo`; handlers with `useCallback` only when there's a memoized beneficiary.
-- Use stable ids for `key`, never array index for reorderable/filterable lists.
-- Context for stable values (theme, auth). Store with selectors for state that changes.
+```typescript
+// Bad: duplicated fields across layers
+type RpcToolCall = { toolName: string; args: Record<string, unknown>; requestId: string };
+type DbToolCall = { toolName: string; args: Record<string, unknown>; id: string; createdAt: Date };
 
-## Naming
+// Good: canonical type + wrappers
+type ToolCall = { toolName: string; args: Record<string, unknown> };
+type ToolCallRequest = { requestId: string; toolCall: ToolCall };
+type ToolCallRecord = { id: string; createdAt: Date; toolCall: ToolCall };
+```
 
-- Names describe meaning, not mechanics. `submitForm` over `handleOnClickButtonSubmit`. `running` over `filteredArrayOfRunningAgents`.
-- The right length is the shortest unambiguous in context. Inside `AgentManager`, methods are `start`, `stop`, `list`.
-- Match the surrounding code's vocabulary. If the codebase uses `getX`, don't introduce `fetchX` / `retrieveX` for the same shape.
-- Don't leak implementation into names — `getAgent`, not `queryPostgresForAgent`. If swapping the impl would force a rename, the name is wrong.
-- Booleans read as yes/no questions: `isX`, `hasX`, `canX`. Avoid negative booleans (`isNotConnected`).
-- `data`, `result`, `info`, `manager`, `temp` are smells — say what the thing _is_.
+## Make impossible states impossible
+
+Use discriminated unions instead of bags of booleans and optionals.
+
+```typescript
+// Bad
+interface FetchState {
+  isLoading: boolean;
+  error?: Error;
+  data?: Data;
+}
+
+// Good
+type FetchState =
+  | { status: "idle" }
+  | { status: "loading" }
+  | { status: "error"; error: Error }
+  | { status: "success"; data: Data };
+```
+
+## Optionality is a design decision
+
+Don't mark fields optional to avoid migrations. Decide deliberately:
+
+1. Is optionality actually needed?
+2. If there are distinct valid states → discriminated union
+3. If value can be intentionally empty → explicit `null`
+4. Keep optionality at real boundaries (external input), then resolve it
+
+## Validate at boundaries, trust internally
+
+Parse external data once at the boundary with schema validation. Then use typed values everywhere else.
+
+```typescript
+// Bad: optional chaining because shape is unclear
+const value = response?.data?.items?.[0]?.name;
+
+// Good: validate at boundary, trust the types
+const parsed = responseSchema.parse(rawResponse);
+const value = parsed.data.items[0].name;
+```
+
+## Error handling
+
+- **Fail explicitly** — if caller requests X and X is unavailable, throw rather than silently returning Y
+- **Use typed domain errors** — not plain `Error`. Carry structured metadata for handling, logging, and user messaging
+- **Preserve error semantics** — don't collapse meaningful typed errors into generic `Error`
+
+```typescript
+class TimeoutError extends Error {
+  constructor(
+    public readonly operation: string,
+    public readonly waitedMs: number,
+  ) {
+    super(`${operation} timed out after ${waitedMs}ms`);
+    this.name = "TimeoutError";
+  }
+}
+```
+
+## Keep logic density low
+
+Avoid packing branching, lookup, and transformation into single dense expressions.
+
+```typescript
+// Bad: nested ternaries + inline lookups
+const billing = shouldUseLegacy(account)
+  ? getLegacy(account)
+  : buildBilling(
+      account,
+      rates.find((r) => r.region === account.region),
+    );
+
+// Good: named steps, then assemble
+const rate = rates.find((r) => r.region === account.region);
+if (!rate) throw new MissingRateError(account.region);
+const billing = shouldUseLegacy(account) ? getLegacy(account) : buildBilling(account, rate);
+```
+
+## Centralize policy
+
+When the same discriminator (`plan`, `provider`, `kind`, `status`) is checked across multiple files, centralize it into a policy model. A new case should require editing one place, not many.
+
+## React: keep components dumb
+
+- Components render state and dispatch events — they don't compute transitions
+- If a component has more than two interacting `useState` calls, extract a state machine or reducer
+- `useRef` for mutable coordination state (flags, timers) is a smell — model states explicitly
+- Never mirror a source of truth into local state; derive from it
+- Test state logic as pure functions without rendering
+
+## File organization
+
+- Organize by domain first (`providers/claude/`), not by technical type (`tool-parsers/`)
+- Name files after the main export (`create-toolcall.ts`)
+- Use `index.ts` as an entrypoint, not a dumping ground
+- Collocate tests with implementation (`thing.ts` + `thing.test.ts`)
+
+## Refactoring contract
+
+Refactoring is structure work, not feature work.
+
+- Preserve behavior by default, especially user-facing behavior
+- Do not remove features to simplify code without explicit approval
+- Have a verification strategy before you start
+- Fully migrate callers and remove old paths in the same refactor
+- No fallback behavior by default — prefer explicit error over silent degradation

docs/custom-providers.md

@@ -59,30 +59,6 @@ Required fields for custom providers:
 - `extends` — which built-in provider to inherit from (or `"acp"`)
 - `label` — display name in the UI
 
-### Codex with an OpenAI-compatible endpoint
-
-Custom providers that extend `"codex"` can point Codex at an OpenAI-compatible API by setting `OPENAI_BASE_URL` and `OPENAI_API_KEY` in the provider `env`. Paseo still passes those variables through to the Codex app-server process, and also maps them into Codex's thread config (`model_provider` / `model_providers`) because Codex reads provider routing from config rather than from `OPENAI_BASE_URL`.
-
-```json
-{
-  "agents": {
-    "providers": {
-      "my-codex": {
-        "extends": "codex",
-        "label": "My Codex",
-        "env": {
-          "OPENAI_API_KEY": "sk-...",
-          "OPENAI_BASE_URL": "https://custom-relay.example.com"
-        },
-        "models": [{ "id": "custom-model", "label": "Custom Model", "isDefault": true }]
-      }
-    }
-  }
-}
-```
-
-If the base URL does not end in `/v1`, Paseo appends `/v1` for Codex's OpenAI-compatible provider config. If it already ends in `/v1`, Paseo leaves it as-is.
-
 ---
 
 ## Z.AI (Zhipu) coding plan
@@ -107,7 +83,6 @@ If the base URL does not end in `/v1`, Paseo appends `/v1` for Codex's OpenAI-co
           "ANTHROPIC_BASE_URL": "https://api.z.ai/api/anthropic",
           "API_TIMEOUT_MS": "3000000"
         },
-        "disallowedTools": ["WebSearch"],
         "models": [
           { "id": "glm-4.5-air", "label": "GLM 4.5 Air" },
           { "id": "glm-5-turbo", "label": "GLM 5 Turbo", "isDefault": true },
@@ -161,7 +136,6 @@ If the base URL does not end in `/v1`, Paseo appends `/v1` for Codex's OpenAI-co
           "ANTHROPIC_AUTH_TOKEN": "sk-sp-<your-coding-plan-key>",
           "ANTHROPIC_BASE_URL": "https://coding-intl.dashscope.aliyuncs.com/apps/anthropic"
         },
-        "disallowedTools": ["WebSearch"],
         "models": [
           { "id": "qwen3.5-plus", "label": "Qwen 3.5 Plus", "isDefault": true },
           { "id": "qwen3-coder-next", "label": "Qwen 3 Coder Next" },
@@ -366,19 +340,11 @@ Required fields for ACP providers:
 - `label`
 - `command` — the command to spawn the agent process (must support ACP over stdio)
 
-### Generic ACP diagnostics
-
-Paseo diagnostics for `extends: "acp"` providers report the configured command, resolved launcher binary, version output, ACP `initialize`, ACP `session/new`, model count, modes, and final status.
-
-For package-runner commands such as `npx -y @google/gemini-cli --acp`, the version probe keeps the package spec and runs `npx -y @google/gemini-cli --version`. This diagnoses the actual agent package instead of only proving that `npx` exists.
-
-ACP probes use short timeouts and browser-suppression environment variables so agents that enter an auth/browser flow fail as a diagnostic error instead of hanging the provider screen.
-
 ### Example: Google Gemini CLI
 
 [Gemini CLI](https://github.com/google-gemini/gemini-cli) supports ACP via the `--acp` flag.
 
-1. Install: `npm install -g @google/gemini-cli` or see [Gemini CLI docs](https://github.com/google-gemini/gemini-cli)
+1. Install: `npm install -g @anthropic-ai/gemini-cli` or see [Gemini CLI docs](https://github.com/google-gemini/gemini-cli)
 2. Authenticate with Google (Gemini CLI handles its own auth)
 3. Add to config.json:
 
@@ -536,12 +502,6 @@ Each entry in the `models` array:
 | `description` | `string`  | No       | Short description                   |
 | `isDefault`   | `boolean` | No       | Mark as the default thinking option |
 
-### Claude settings.json model discovery
-
-The built-in `claude` provider appends concrete model IDs from `~/.claude/settings.json` to its first-party Claude model list. Paseo reads the top-level `model` field and these `env` keys: `ANTHROPIC_MODEL`, `ANTHROPIC_SMALL_FAST_MODEL`, `ANTHROPIC_DEFAULT_OPUS_MODEL`, `ANTHROPIC_DEFAULT_SONNET_MODEL`, and `ANTHROPIC_DEFAULT_HAIKU_MODEL`.
-
-This lets users who already configured Claude Code for Bedrock, OpenRouter, ollama, Z.AI, or another Anthropic-compatible gateway select the exact model ID in Paseo. `agents.providers.claude.models` is still supported and is additive for the built-in Claude provider; duplicate IDs are de-duplicated.
-
 ### Gotcha: `extends: "claude"` with third-party endpoints
 
 When a custom provider extends `"claude"` but points `ANTHROPIC_BASE_URL` at a non-Anthropic API (Z.AI, Alibaba/Qwen, proxies), the Claude Agent SDK may try to use Anthropic-only server-side tools like `WebSearch`. Third-party APIs don't support these tools, causing errors.
@@ -590,7 +550,6 @@ A config.json with multiple custom providers:
           "ANTHROPIC_BASE_URL": "https://api.z.ai/api/anthropic",
           "API_TIMEOUT_MS": "3000000"
         },
-        "disallowedTools": ["WebSearch"],
         "models": [
           { "id": "glm-4.5-air", "label": "GLM 4.5 Air" },
           { "id": "glm-5-turbo", "label": "GLM 5 Turbo", "isDefault": true },
@@ -605,7 +564,6 @@ A config.json with multiple custom providers:
           "ANTHROPIC_AUTH_TOKEN": "sk-sp-<coding-plan-key>",
           "ANTHROPIC_BASE_URL": "https://coding-intl.dashscope.aliyuncs.com/apps/anthropic"
         },
-        "disallowedTools": ["WebSearch"],
         "models": [
           { "id": "qwen3.5-plus", "label": "Qwen 3.5 Plus", "isDefault": true },
           { "id": "qwen3-coder-next", "label": "Qwen 3 Coder Next" }

docs/data-model.md

@@ -1,6 +1,6 @@
 # Data Model
 
-Paseo uses **file-based JSON persistence** instead of a traditional database. All data is validated at runtime with Zod schemas. Most stores write atomically (write to temp file, then rename); a few still use plain `writeFile` — see each section. There is no schema-versioning/migration framework — schemas rely on optional fields with defaults for forward compatibility, with a small amount of inline normalization in `persisted-config.ts` for legacy provider/speech entries.
+Paseo uses **file-based JSON persistence** instead of a traditional database. All data is validated at runtime with Zod schemas and written atomically (write to temp file, then rename). There are no migrations — schemas use optional fields with defaults for forward compatibility.
 
 All server-side stores live under `$PASEO_HOME` (defaults to `~/.paseo`).
 
@@ -11,12 +11,8 @@ All server-side stores live under `$PASEO_HOME` (defaults to `~/.paseo`).
 ```
 $PASEO_HOME/
 ├── config.json                          # Daemon configuration
-├── server-id                            # Stable daemon identifier (plain text, "srv_<base64url>")
-├── daemon-keypair.json                  # E2EE keypair for relay (mode 0600)
-├── paseo.pid                            # Daemon PID lock file
-├── daemon.log                           # Default log file (path configurable)
 ├── agents/
-│   └── {sanitized-cwd}/
+│   └── {project-dir}/
 │       └── {agentId}.json               # One file per agent
 ├── schedules/
 │   └── {scheduleId}.json                # One file per schedule
@@ -30,8 +26,6 @@ $PASEO_HOME/
 └── push-tokens.json                     # Expo push notification tokens
 ```
 
-The `agents/{sanitized-cwd}/` directory name is derived from the agent's `cwd` by stripping the filesystem root and replacing path separators with `-` (Windows drive letters become a `C-` style prefix). Atomic writes (temp file + rename): agent records, chat, project/workspace registries, push tokens. Non-atomic (plain `writeFile`): `config.json`, `schedules/*.json`, `loops/loops.json`, `server-id`, `daemon-keypair.json`.
-
 ---
 
 ## 1. Agent Record
@@ -40,29 +34,28 @@ The `agents/{sanitized-cwd}/` directory name is derived from the agent's `cwd` b
 
 Each agent is stored as a separate JSON file, grouped by project directory.
 
-| Field                | Type                                     | Description                                                                                                                                                               |
-| -------------------- | ---------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `id`                 | `string`                                 | UUID, primary key                                                                                                                                                         |
-| `provider`           | `string`                                 | Agent provider (`"claude"`, `"codex"`, `"opencode"`, etc.)                                                                                                                |
-| `cwd`                | `string`                                 | Working directory the agent operates in                                                                                                                                   |
-| `createdAt`          | `string` (ISO 8601)                      | Creation timestamp                                                                                                                                                        |
-| `updatedAt`          | `string` (ISO 8601)                      | Last update timestamp                                                                                                                                                     |
-| `lastActivityAt`     | `string?` (ISO 8601)                     | Last activity timestamp                                                                                                                                                   |
-| `lastUserMessageAt`  | `string?` (ISO 8601)                     | Last user message timestamp                                                                                                                                               |
-| `title`              | `string?`                                | User-visible title                                                                                                                                                        |
-| `labels`             | `Record<string, string>`                 | Key-value labels (default `{}`). `paseo.parent-agent-id` set automatically when launched via the `create_agent` MCP tool — see [agent-lifecycle.md](./agent-lifecycle.md) |
-| `lastStatus`         | `AgentStatus`                            | One of: `"initializing"`, `"idle"`, `"running"`, `"error"`, `"closed"`                                                                                                    |
-| `lastModeId`         | `string?`                                | Last active mode ID                                                                                                                                                       |
-| `config`             | `SerializableConfig?`                    | Agent session configuration (see below)                                                                                                                                   |
-| `runtimeInfo`        | `RuntimeInfo?`                           | Live runtime state (see below)                                                                                                                                            |
-| `features`           | `AgentFeature[]?`                        | Provider-reported features (toggles/selects)                                                                                                                              |
-| `persistence`        | `PersistenceHandle?`                     | Handle for resuming sessions                                                                                                                                              |
-| `lastError`          | `string?` (nullable)                     | Last error message, if any                                                                                                                                                |
-| `requiresAttention`  | `boolean?`                               | Whether the agent needs user attention                                                                                                                                    |
-| `attentionReason`    | `"finished" \| "error" \| "permission"?` | Why attention is needed                                                                                                                                                   |
-| `attentionTimestamp` | `string?` (ISO 8601)                     | When attention was flagged                                                                                                                                                |
-| `internal`           | `boolean?`                               | Whether this is a system-internal agent (loop workers, etc.)                                                                                                              |
-| `archivedAt`         | `string?` (ISO 8601)                     | Soft-delete timestamp                                                                                                                                                     |
+| Field                | Type                                     | Description                                                            |
+| -------------------- | ---------------------------------------- | ---------------------------------------------------------------------- |
+| `id`                 | `string`                                 | UUID, primary key                                                      |
+| `provider`           | `string`                                 | Agent provider (`"claude"`, `"codex"`, `"opencode"`, etc.)             |
+| `cwd`                | `string`                                 | Working directory the agent operates in                                |
+| `createdAt`          | `string` (ISO 8601)                      | Creation timestamp                                                     |
+| `updatedAt`          | `string` (ISO 8601)                      | Last update timestamp                                                  |
+| `lastActivityAt`     | `string?` (ISO 8601)                     | Last activity timestamp                                                |
+| `lastUserMessageAt`  | `string?` (ISO 8601)                     | Last user message timestamp                                            |
+| `title`              | `string?`                                | User-visible title                                                     |
+| `labels`             | `Record<string, string>`                 | Key-value labels (default `{}`)                                        |
+| `lastStatus`         | `AgentStatus`                            | One of: `"initializing"`, `"idle"`, `"running"`, `"error"`, `"closed"` |
+| `lastModeId`         | `string?`                                | Last active mode ID                                                    |
+| `config`             | `SerializableConfig?`                    | Agent session configuration (see below)                                |
+| `runtimeInfo`        | `RuntimeInfo?`                           | Live runtime state (see below)                                         |
+| `features`           | `AgentFeature[]?`                        | Provider-reported features (toggles/selects)                           |
+| `persistence`        | `PersistenceHandle?`                     | Handle for resuming sessions                                           |
+| `requiresAttention`  | `boolean?`                               | Whether the agent needs user attention                                 |
+| `attentionReason`    | `"finished" \| "error" \| "permission"?` | Why attention is needed                                                |
+| `attentionTimestamp` | `string?` (ISO 8601)                     | When attention was flagged                                             |
+| `internal`           | `boolean?`                               | Whether this is a system-internal agent (loop workers, etc.)           |
+| `archivedAt`         | `string?` (ISO 8601)                     | Soft-delete timestamp                                                  |
 
 ### Nested: SerializableConfig
 
@@ -121,7 +114,7 @@ Each agent is stored as a separate JSON file, grouped by project directory.
 | `description` | `string?`             |
 | `tooltip`     | `string?`             |
 | `icon`        | `string?`             |
-| `value`       | `string \| null`      |
+| `value`       | `string?`             |
 | `options`     | `AgentSelectOption[]` |
 
 ---
@@ -137,11 +130,10 @@ Single file, validated with `PersistedConfigSchema`.
   version: 1,
   daemon: {
     listen: "127.0.0.1:6767",
-    hostnames: true | string[],   // legacy alias `allowedHosts` is migrated on load
-    mcp: { enabled: boolean, injectIntoAgents: boolean },
+    hostnames: true | string[],
+    mcp: { enabled: boolean },
     cors: { allowedOrigins: string[] },
-    relay: { enabled: boolean, endpoint: string, publicEndpoint: string, useTls: boolean, publicUseTls: boolean },
-    auth: { password: string }    // bcrypt hash, optional
+    relay: { enabled: boolean, endpoint: string, publicEndpoint: string, useTls: boolean }
   },
   app: {
     baseUrl: string
@@ -151,14 +143,16 @@ Single file, validated with `PersistedConfigSchema`.
     local: { modelsDir: string }
   },
   agents: {
-    // ProviderOverrideSchema; legacy entries with `command: { mode, ... }` are migrated to the
-    // current shape on load via `migrateProviderSettings`. Custom provider IDs must declare
-    // `extends` (one of the built-ins or `"acp"`) and `label`. See `provider-launch-config.ts`.
-    providers: Record<providerId, ProviderOverride>
+    providers: {
+      [provider: string]: {
+        command: { mode: "default" } | { mode: "append", args: string[] } | { mode: "replace", argv: string[] },
+        env: Record<string, string>
+      }
+    }
   },
   features: {
-    dictation: { enabled, stt: { provider, model, language, confidenceThreshold } },
-    voiceMode: { enabled, llm, stt: { provider, model, language }, turnDetection, tts: { provider, model, voice, speakerId, speed } }
+    dictation: { enabled, stt: { provider, model, confidenceThreshold } },
+    voiceMode: { enabled, llm, stt, turnDetection, tts: { provider, model, voice, speakerId, speed } }
   },
   log: {
     level, format,
@@ -176,7 +170,7 @@ All fields are optional with sensible defaults.
 
 **Path:** `$PASEO_HOME/schedules/{id}.json`
 
-One file per schedule. ID is 8 hex characters. Writes are direct (not atomic).
+One file per schedule. ID is 8 hex characters.
 
 | Field       | Type                                  | Description                      |
 | ----------- | ------------------------------------- | -------------------------------- |
@@ -261,7 +255,7 @@ Single file containing all rooms and messages.
 
 **Path:** `$PASEO_HOME/loops/loops.json`
 
-Single file containing an array of all loop records. Writes are direct (not atomic) and serialized through an in-memory queue. On daemon startup any record with `status: "running"` is recovered as `"stopped"` with an interruption log entry.
+Single file containing an array of all loop records.
 
 | Field                   | Type                                                | Description                                |
 | ----------------------- | --------------------------------------------------- | ------------------------------------------ |
@@ -271,12 +265,10 @@ Single file containing an array of all loop records. Writes are direct (not atom
 | `cwd`                   | `string`                                            | Working directory                          |
 | `provider`              | `string`                                            | Default provider                           |
 | `model`                 | `string?`                                           | Default model                              |
-| `modeId`                | `string?`                                           | Default mode ID                            |
 | `workerProvider`        | `string?`                                           | Override provider for workers              |
 | `workerModel`           | `string?`                                           | Override model for workers                 |
 | `verifierProvider`      | `string?`                                           | Override provider for verifiers            |
 | `verifierModel`         | `string?`                                           | Override model for verifiers               |
-| `verifierModeId`        | `string?`                                           | Override mode ID for verifiers             |
 | `verifyPrompt`          | `string?`                                           | LLM verification prompt                    |
 | `verifyChecks`          | `string[]`                                          | Shell commands to run as checks            |
 | `archive`               | `boolean`                                           | Whether to archive worker agents after use |
@@ -352,20 +344,15 @@ Single file containing an array of all loop records. Writes are direct (not atom
 
 Array of project records.
 
-| Field         | Type                        | Description                              |
-| ------------- | --------------------------- | ---------------------------------------- |
-| `projectId`   | `string`                    | Primary key                              |
-| `rootPath`    | `string`                    | Filesystem root of the project           |
-| `kind`        | `"git" \| "non_git"`        |                                          |
-| `displayName` | `string`                    |                                          |
-| `createdAt`   | `string` (ISO 8601)         |                                          |
-| `updatedAt`   | `string` (ISO 8601)         |                                          |
-| `archivedAt`  | `string \| null` (ISO 8601) | Soft-delete timestamp; required nullable |
-
-Active git projects are unique by normalized `rootPath`. Startup reconciliation repairs older bad
-states by moving workspaces from duplicate path-keyed projects onto the canonical project,
-preferring remote-keyed project IDs such as `remote:github.com/owner/repo`, then archiving the
-emptied duplicate.
+| Field         | Type                 | Description                    |
+| ------------- | -------------------- | ------------------------------ |
+| `projectId`   | `string`             | Primary key                    |
+| `rootPath`    | `string`             | Filesystem root of the project |
+| `kind`        | `"git" \| "non_git"` |                                |
+| `displayName` | `string`             |                                |
+| `createdAt`   | `string` (ISO 8601)  |                                |
+| `updatedAt`   | `string` (ISO 8601)  |                                |
+| `archivedAt`  | `string?` (ISO 8601) | Soft-delete timestamp          |
 
 ---
 
@@ -375,16 +362,16 @@ emptied duplicate.
 
 Array of workspace records. A workspace is a specific working directory within a project.
 
-| Field         | Type                                            | Description                    |
-| ------------- | ----------------------------------------------- | ------------------------------ |
-| `workspaceId` | `string`                                        | Primary key                    |
-| `projectId`   | `string`                                        | FK to Project.projectId        |
-| `cwd`         | `string`                                        | Filesystem path                |
-| `kind`        | `"local_checkout" \| "worktree" \| "directory"` |                                |
-| `displayName` | `string`                                        |                                |
-| `createdAt`   | `string` (ISO 8601)                             |                                |
-| `updatedAt`   | `string` (ISO 8601)                             |                                |
-| `archivedAt`  | `string \| null` (ISO 8601)                     | Soft-delete; required nullable |
+| Field         | Type                                            | Description             |
+| ------------- | ----------------------------------------------- | ----------------------- |
+| `workspaceId` | `string`                                        | Primary key             |
+| `projectId`   | `string`                                        | FK to Project.projectId |
+| `cwd`         | `string`                                        | Filesystem path         |
+| `kind`        | `"local_checkout" \| "worktree" \| "directory"` |                         |
+| `displayName` | `string`                                        |                         |
+| `createdAt`   | `string` (ISO 8601)                             |                         |
+| `updatedAt`   | `string` (ISO 8601)                             |                         |
+| `archivedAt`  | `string?` (ISO 8601)                            | Soft-delete timestamp   |
 
 ---
 
@@ -398,20 +385,7 @@ Array of workspace records. A workspace is a specific working directory within a
 }
 ```
 
-Simple set of Expo push notification tokens. Loaded with permissive parsing (filters non-string entries). Persisted with atomic temp-file rename.
-
----
-
-## 9. Daemon meta files
-
-These small files are not validated as full Zod schemas but are persisted under `$PASEO_HOME` for daemon identity and runtime coordination.
-
-| Path                  | Format                                                         | Notes                                                                             |
-| --------------------- | -------------------------------------------------------------- | --------------------------------------------------------------------------------- |
-| `server-id`           | Plain text, e.g. `srv_<base64url>`                             | Stable per-`$PASEO_HOME` daemon ID. Overridable via `PASEO_SERVER_ID` env.        |
-| `daemon-keypair.json` | `{ v: 2, publicKeyB64, secretKeyB64 }` (libsodium box keypair) | E2EE relay identity. Written with mode `0600`. Regenerated if file is unreadable. |
-| `paseo.pid`           | JSON `{ pid, startedAt, ... }`                                 | PID lock; prevents two daemons sharing one `$PASEO_HOME`.                         |
-| `daemon.log`          | Pino log output                                                | Default location; path/rotation configurable via `log.file` in `config.json`.     |
+Simple set of Expo push notification tokens. No schema validation — just an array of strings.
 
 ---
 

docs/design-system.md

@@ -0,0 +1,247 @@
+# Design system
+
+Tokens — every color, font size, weight, spacing step, radius, icon size — live in `packages/app/src/styles/theme.ts`.
+
+---
+
+## 1. Character
+
+Paseo is minimal, spacious, quiet, confident. Whitespace is deliberate. Nothing crowds, nothing decorates, nothing apologizes. A row, a label, a control. That is the bar.
+
+The app is calm so the user's work is not. Every visual decision serves either _act on this_ or _understand this_ — never _look at this_.
+
+Consistency comes from component reuse, not from hand-matching styles across surfaces. A row in the projects list, a row in settings, and a row in a modal are the same component, not three implementations that happen to look alike. When two surfaces do the same semantic thing in two different ways, one of them is wrong.
+
+---
+
+## 2. Component reuse
+
+A semantic element used in three or more places is a primitive. One of a kind is a screen.
+
+Primitives live in `packages/app/src/components/ui/` and `packages/app/src/components/headers/`. Card and row layout live in `packages/app/src/styles/settings.ts`. Section structure lives in `packages/app/src/screens/settings/settings-section.tsx`.
+
+A pressable styled to look like a button is wrong; the button is `<Button>` (`packages/app/src/components/ui/button.tsx`). A bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/screens/settings/settings-section.tsx`). A custom `Modal` for a confirmation is wrong; the confirmation is `confirmDialog` (`packages/app/src/utils/confirm-dialog.ts`). A hand-rolled overflow menu is wrong; the menu is `<DropdownMenu>` (`packages/app/src/components/ui/dropdown-menu.tsx`). A hand-rolled status pill is wrong; the pill is `<StatusBadge>` (`packages/app/src/components/ui/status-badge.tsx`).
+
+Before adding a new component, read `components/ui/`. The primitive usually exists.
+
+---
+
+## 3. Hierarchy
+
+Hierarchy is conveyed through weight and color, not size. Most labels, titles, and hints across the app are `fontSize.base` or `fontSize.xs`. The distinction between a row's primary line and its secondary line is `foreground` versus `foregroundMuted`.
+
+Weight has three tiers, applied by role:
+
+- **Screen titles** — the title at the top of a screen — use `<ScreenTitle>` (`packages/app/src/components/headers/screen-title.tsx:31-34`), which renders `fontSize.base` at weight `400` on compact and `300` on desktop. Top-of-screen titles are lighter on desktop, not heavier. The workspace screen header follows the same rule (`packages/app/src/screens/workspace/workspace-screen.tsx:3052-3057`).
+- **Structural labels** use `fontWeight.medium`. This applies to section labels above a stack of rows (`packages/app/src/components/agent-list.tsx:519-523`, `packages/app/src/components/keyboard-shortcuts-dialog.tsx:63-67`), form field labels above an input inside a modal (`packages/app/src/components/add-host-modal.tsx:19-23`, `packages/app/src/components/pair-link-modal.tsx:24-28`), the title at the top of a modal/sheet/dialog (`packages/app/src/components/adaptive-modal-sheet.tsx:90-94`, `packages/app/src/components/ui/combobox.tsx:1607-1611`, `packages/app/src/components/welcome-screen.tsx:48-53`), action button labels in tight components such as the sidebar callout actions (`packages/app/src/components/sidebar-callout.tsx:218-221`), and inline data emphasis on dense metadata rows (`packages/app/src/components/git-diff-pane.tsx:2322-2327`, `packages/app/src/components/file-explorer-pane.tsx:1115-1122`).
+- **Content** uses `fontWeight.normal`. This applies to settings rows (`packages/app/src/styles/settings.ts`), sidebar primary list-item titles (`packages/app/src/components/sidebar-workspace-list.tsx:2680-2686`, `packages/app/src/components/agent-list.tsx:572-578`), `<Button>` text (`packages/app/src/components/ui/button.tsx:80-84`), `<StatusBadge>` text (`packages/app/src/components/ui/status-badge.tsx:56-60`), and `<SidebarCallout>` titles (`packages/app/src/components/sidebar-callout.tsx:175-180`).
+
+The rule, condensed: text that _names_ a surface or a group is `medium`. Text that lives _inside_ a surface or a group is `normal`. Top-of-screen titles are `<ScreenTitle>`, which is lighter still.
+
+Foreground is for the thing being acted on: row titles, section headings, the selected sidebar item. `foregroundMuted` is for context: hints, descriptions, secondary metadata, idle sidebar items, placeholders, status text.
+
+Accent is the one CTA per surface. A `<Button variant="default">` filled with `accent` appears at most once on a page. Most pages have zero — settings is mostly toggles and text, the workspace pane is mostly content, the chat composer is the input itself.
+
+Destructive is a color, not a click. Restart-daemon and remove-host are `<Button variant="outline">` in the row trailing slot; the destructive surface only appears inside the `confirmDialog` (`packages/app/src/screens/settings/host-page.tsx:541-547`). Workspace archive opens a confirm dialog before any red appears (`packages/app/src/components/sidebar-workspace-list.tsx`). Red appears after the user has indicated intent.
+
+---
+
+## 4. Buttons
+
+The button is `<Button>` (`packages/app/src/components/ui/button.tsx`). It has five variants. Each has one job.
+
+`default` is the one primary action on a surface — filled with `accent`. At most one per page. The primary slot inside an `<AdaptiveModalSheet>` and the highlighted action on the welcome screen are the canonical uses.
+
+`secondary` is the paired action when two actions carry equal weight — filled with `surface3`. The component default is `secondary`, which matches its frequency in the codebase.
+
+`outline` is the low-frequency action that lives on a row — transparent with `borderAccent`. Restart, Remove, Update on host detail (`packages/app/src/screens/settings/host-page.tsx:585-594`).
+
+`ghost` is structural and non-committal — no border, no fill. Back arrows, header toggles, "Load more" footers (`packages/app/src/screens/sessions-screen.tsx:54-63`), more-affordances. Ghost is used when the affordance is part of the chrome, not a decision.
+
+`destructive` is filled with `destructive`. It only appears inside a confirm. The button on the page is `outline`; the destructive button is the confirm button inside the dialog.
+
+Sizes: `sm` for any button sitting in a row. `md` is the page default. `lg` is reserved for large standalone CTAs.
+
+A `<Pressable>` wrapping a `<Text>` is a sixth variant. It is wrong. `<Button>` accepts `style`, `textStyle`, `leftIcon`, `disabled`, `size`, and `variant`.
+
+---
+
+## 5. Borders
+
+Borders group, separate, or rarely emphasize.
+
+A logical block of related rows lives inside a card — one border around the whole group. The card primitive is `settingsStyles.card`; the keyboard-shortcuts dialog uses the same shape inline (`packages/app/src/components/keyboard-shortcuts-dialog.tsx:68-73`). The border defines what belongs together.
+
+Rows after the first inside a card carry `settingsStyles.rowBorder` — a single top border. The first row never has one. The same divider pattern appears in the keyboard-shortcuts dialog rows (`packages/app/src/components/keyboard-shortcuts-dialog.tsx:74-83`). Rows do not need their own background to feel separated.
+
+A list that is itself the page content — sidebar items in `sidebar-workspace-list.tsx`, the workspace list, the agent list (`packages/app/src/components/agent-list.tsx`) — uses spacing and surface, not borders, to separate items. Rows-in-a-card is an interior pattern; lists-as-pages are not.
+
+Pane chrome — the workspace pane header, the file-explorer header, the diff pane header — uses a single bottom border to separate the header from the content (`packages/app/src/components/git-diff-pane.tsx:2328-2331`). One border, no shadow.
+
+`borderAccent` is reserved for the outline button. Inputs use `border`. Single-thing borders are wrong; a single bordered element is either a card with one row (use the card) or it does not need a border.
+
+---
+
+## 6. Pickers
+
+Five primitives. The pick is determined by option count, the need to search, and how the picker is anchored.
+
+`<DropdownMenu>` is for a small fixed set anchored to a trigger. Theme picker, kebab menus on workspace and project rows (`packages/app/src/components/sidebar-workspace-list.tsx:684-770`), row "more" menus. Items can be async (`status: "pending"`) and can include destructive entries. Under ~10 options where the user knows what they're looking for.
+
+`<Combobox>` is for a large or searchable list. Host switcher in the sidebar footer, model selector in the composer, branch switcher in the workspace header (`packages/app/src/components/branch-switcher.tsx`). The user types to find the option, or the list is long enough to scroll.
+
+`<ContextMenu>` is for right-click and long-press on a target. The row is the trigger; there is no visible affordance. Used for incidental actions on workspace rows in the sidebar (`packages/app/src/components/sidebar-workspace-list.tsx`).
+
+`<AdaptiveModalSheet>` is for a focused task. Multi-field forms (`packages/app/src/components/add-host-modal.tsx`, `packages/app/src/components/pair-link-modal.tsx`, `packages/app/src/components/project-picker-modal.tsx`), confirmations with detail, anything that earns a backdrop. Bottom sheet on compact, centered card on desktop. Raw `Modal` is wrong for any of these.
+
+`confirmDialog` is for destructive yes/no and imperative confirmation. Promise-based: `await confirmDialog({ destructive: true, ... })`. Anything where a wrong click loses work.
+
+Three themes is `DropdownMenu`. Thirty hosts is `Combobox`. A label and a value is `AdaptiveModalSheet`. "Are you sure?" is `confirmDialog`.
+
+---
+
+## 7. Density and rhythm
+
+Settings detail pages, the projects detail page, and any list+detail content sit inside a centered, max-width 720 column (`packages/app/src/screens/settings-screen.tsx:1056-1062`, `packages/app/src/screens/projects-screen.tsx`). Lines stay readable, the eye does not have to track wide horizontal distances. Form modals carry their own narrower content frame (`packages/app/src/components/add-host-modal.tsx`).
+
+Workspace and chat surfaces use the full width — these are working surfaces, not reading surfaces. The composer carries `MAX_CONTENT_WIDTH` from `packages/app/src/constants/layout.ts` to keep lines readable while letting the workspace pane fill the rest.
+
+Sections sit apart. `<SettingsSection>` owns its own bottom margin; the next thing is wrapped in another `<SettingsSection>`. The agent-list `sectionHeading` carries the same `marginTop`/`marginBottom` rhythm (`packages/app/src/components/agent-list.tsx:511-517`). Adding `marginBottom` to a section is wrong.
+
+Cards inside a section sit closer than sections. Rows inside a card touch — only the divider separates them. The rhythm is page → spacious; section → spacious; card → tight.
+
+Rows have generous vertical padding: roughly 16px of content plus 16px of vertical padding for settings rows, 8–12px for sidebar list items where many rows must fit. Compressing rows below the established density to fit more on the screen is wrong. Too many rows means more cards or more sections, not smaller rows.
+
+The whitespace is the design.
+
+---
+
+## 8. Responsiveness
+
+Compact-first. The small case is designed; the large case adds chrome around it.
+
+The list+detail pattern is canonical and reused across surfaces. The settings shell (`packages/app/src/screens/settings-screen.tsx`) and the projects screen (`packages/app/src/screens/projects-screen.tsx`) implement it identically:
+
+- On compact: full-screen list with `<BackHeader>` at the top. Tapping a row pushes a full-screen detail with its own `<BackHeader>` that returns to the list.
+- On desktop: a 320px sidebar on the left holds the list with `surfaceSidebar` background. The content pane on the right holds the selected detail with `<ScreenHeader>`, `<HeaderIconBadge>`, and `<ScreenTitle>`.
+
+The branching is one `useIsCompactFormFactor()` check at the top of the screen component. The list and the detail are the same components in both layouts; only the framing changes.
+
+The workspace screen (`packages/app/src/screens/workspace/workspace-screen.tsx`) follows a different but parallel rule: tabs collapse on compact, panes split on desktop. The sidebar (`packages/app/src/components/left-sidebar.tsx`) is overlaid on compact and pinned on desktop.
+
+A new list+detail feature copies the settings shell. A new workspace-shaped feature copies the workspace shell. Inventing a third shape happens in design review, not in a PR.
+
+---
+
+## 9. Copy and voice
+
+Sentence case. "Pair a device", "Danger zone", "Restart daemon", "Inject Paseo tools", "No sessions yet", "Load more". Proper nouns retain casing — Paseo, Beta, Stable, Local. Title case is wrong.
+
+No trailing periods on row titles, labels, or buttons. No trailing period on a single-clause hint: "What happens when you press Enter while the agent is running" (`packages/app/src/screens/settings-screen.tsx:271-272`). Periods exist inside multi-sentence prose: "Restarts the daemon process. The app will reconnect automatically."
+
+Empty-state strings are short noun phrases or short sentences: "No projects yet", "Select a project", "No sessions yet" (`packages/app/src/screens/sessions-screen.tsx:74-76`), "Host not found".
+
+Buttons are imperative: Save, Cancel, Restart, Remove, Update, Install update, Add host, Load more. In-flight labels are present-participle with a literal three-dot ellipsis: "Saving...", "Restarting...", "Removing...", "Loading...".
+
+Error copy is direct. "Unable to remove host" (`packages/app/src/screens/settings/host-page.tsx:697`), not "Sorry, we couldn't remove the host." Recovery instructions are concrete: "Wait for it to come online before restarting." Errors describe state; they do not editorialize.
+
+Terminology:
+
+- Workspace, never "checkout".
+- Host, except where the user-facing concept is the daemon process itself ("Restart daemon").
+- Project, not "repo" or "repository".
+- Provider, not "model provider".
+- Session and agent are distinct: a session is a historical entry in `sessions-screen.tsx`; an agent is a live entity in the workspace.
+
+---
+
+## 10. States
+
+Loading is inline by default. `<LoadingSpinner size={14} color={foregroundMuted} />` sits next to the thing it relates to (`packages/app/src/screens/settings/providers-section.tsx:227-231`). Page-level loading is a centered `<LoadingSpinner size="large">` (`packages/app/src/screens/sessions-screen.tsx:69-72`). Card-level loading is a single short line, not a spinner. In-row dropdown items use `<DropdownMenuItem status="pending" pendingLabel="Removing...">`; the menu item handles its own pending state.
+
+Empty states are short noun phrases. Centered, muted, one or two lines. Sessions screen pairs the empty noun with a single ghost button to navigate back (`packages/app/src/screens/sessions-screen.tsx:74-81`); that pairing is the maximum elaboration. Illustrations and CTAs disguised as empty states are wrong.
+
+Inline errors are a single sentence in `palette.red[300]` `xs`, sitting under the field or inside the card it relates to (`packages/app/src/screens/settings/providers-section.tsx:115-119`).
+
+Page-level alerts — informational notices, success confirmations, warnings, or recoverable errors that need a small visible block on the page — use `<Alert>` (`packages/app/src/components/ui/alert.tsx`). Variants: `default`, `info`, `success`, `warning`, `error`. The chrome is quiet by design: a 1px tinted border, transparent background, a small variant-tinted icon, the title in the variant accent, the description in `foregroundMuted`. Actions go in the `children` slot as `<Button variant="outline" size="sm">` — recovery actions are low-frequency and outline keeps them quiet alongside the alert's accent (`packages/app/src/screens/project-settings-screen.tsx`). One `<Alert>` at a time per region.
+
+Sidebar callouts — cross-cutting alerts that apply across the whole app, like daemon version mismatch and desktop update available — register through `useSidebarCallouts()` and render in the left sidebar via `<SidebarCallout>` (`packages/app/src/components/sidebar-callout.tsx`). The chrome (top-border-only, full-width action buttons) is tuned for that ~280px column. Canonical sources: `packages/app/src/components/daemon-version-mismatch-callout-source.tsx`, `packages/app/src/desktop/updates/update-callout-source.tsx`. Never import `<SidebarCallout>` into a page — that's what `<Alert>` is for.
+
+Imperative errors are `Alert.alert("Error", "Unable to ...")` (the React Native `Alert` API, not this component) for failures that interrupt the flow and have no place on the page.
+
+Disabled state is `opacity: theme.opacity[50]` on the outer pressable. Color changes for disabled state are wrong; a disabled button is the same button, dimmer.
+
+Partial failure (a list mostly fine but one source errored) is a bordered banner above the list, listing each failure in red-300 `xs` (`packages/app/src/screens/projects-screen.tsx:151-159`). The list still renders.
+
+State surfaces at the smallest scope it affects. Field error stays under the field; page error is a banner; flow-stopping error is an `Alert`.
+
+---
+
+## 11. List rows
+
+The row anatomy is a content column with an optional trailing slot. Inside a card the row is `settingsStyles.row`. Inside a sidebar list the row carries its own padding and `borderRadius.lg` per item (`packages/app/src/components/sidebar-workspace-list.tsx:2614-2625`).
+
+Rows that drill into a detail lead with a chevron in the trailing slot (`ChevronRight`, `iconSize.sm`, `foregroundMuted`). The whole row is the `<Pressable>`. Pair-device row (`packages/app/src/screens/settings/host-page.tsx:644-668`), provider row (`packages/app/src/screens/settings/providers-section.tsx:92-132`), project row in the projects list. Chevron means navigation.
+
+Kebab menus (`<DropdownMenu>` with `<MoreVertical size={14} />` trigger) are for actions on the row, not navigation. Trigger style: `padding: 2`, `borderRadius: 4`, hover background `surface2`. Menu position: `align="end"`. Items use `<DropdownMenuItem leading={<Icon size={14} color={foregroundMuted} />} ...>`. Visibility is `isHovered || isTouchPlatform` — hover-revealed on web, always visible on native (`packages/app/src/components/sidebar-workspace-list.tsx:684-770`).
+
+A row may carry both a chevron and a kebab when both navigation and row-level actions apply. Chevron sits at the end; kebab sits before it.
+
+Switches and segmented controls also sit in the trailing slot. A row that both navigates and toggles is a `<Pressable>` with a `<Switch>` in the trailing slot — the switch calls `event.stopPropagation()` so the row press does not fire (`packages/app/src/screens/settings/providers-section.tsx:92-132`). Sidebar items that hold a status dot, a count, and a kebab follow the same rule (`packages/app/src/components/sidebar-workspace-list.tsx`).
+
+Selected state on rows in a desktop list+detail uses `surfaceSidebarHover` as the background (`packages/app/src/screens/projects-screen.tsx`). Selected state on rows in the sidebar list uses `surface2` (`packages/app/src/components/agent-list.tsx:563-571`).
+
+---
+
+## 12. Status pills and badges
+
+Status pills are `palette.<color>[300]` foreground on a 10%-alpha background of the same color. Success uses green, warning uses amber, danger uses red, muted uses zinc. The `<StatusBadge>` primitive (`packages/app/src/components/ui/status-badge.tsx`) is canonical.
+
+Status dots — the small filled circles next to a host or agent name — are `borderRadius.full` filled with the status color (`statusSuccess`, `statusWarning`, `statusDanger`, or `foregroundMuted`). They sit in the trailing slot of a sidebar row or as a leading marker on a status pill.
+
+The bespoke pills in `packages/app/src/screens/settings/host-page.tsx:97-116`, `packages/app/src/components/agent-list.tsx:607-632`, and `packages/app/src/components/sidebar-workspace-list.tsx:2889-2894` are drift to be removed. New code uses `<StatusBadge>`.
+
+---
+
+## 13. Forbidden
+
+- `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.
+- Bare `<Text>` for a section header inside settings. `<SettingsSection>` exists.
+- 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.
+- The word "checkout" in UI strings or identifiers. The term is "workspace".
+- New color tokens or hardcoded hex outside the palette. Status pill rgba backgrounds are the documented pattern (§12), not a license.
+- Placeholder text dimmed beyond `foregroundMuted`. No extra opacity, no italics, no ghost-text.
+- `onPointerEnter` and `onPointerLeave`. They do not fire on native iOS. Hover uses Pressable's `onHoverIn`/`onHoverOut` gated with `isHovered || isCompact || isNative`.
+- Raw DOM APIs without an `isWeb` guard.
+- Spacing values outside the scale. `padding: 20` and `gap: 10` are wrong.
+- Color changes for disabled state. Opacity only.
+- Destructive actions without `confirmDialog`. Restart, remove, archive, and any future destructive action are confirmed.
+- Bespoke status pills. `<StatusBadge>` is the pill primitive.
+- Raw `Modal` for a focused task. `<AdaptiveModalSheet>` is the modal primitive.
+- Importing `ActivityIndicator` directly. `<LoadingSpinner>` is the loading primitive.
+
+---
+
+## 14. Canonical surfaces by pattern
+
+| Pattern                                             | Reference                                                                                                                                                                                                                                          |
+| --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| List+detail (compact stack, desktop sidebar+pane)   | `packages/app/src/screens/settings-screen.tsx`, `packages/app/src/screens/projects-screen.tsx`                                                                                                                                                     |
+| Detail card+row                                     | `packages/app/src/screens/settings/host-page.tsx`, `packages/app/src/screens/settings/providers-section.tsx`                                                                                                                                       |
+| Section grouping inside a card list                 | `packages/app/src/screens/settings/settings-section.tsx`                                                                                                                                                                                           |
+| Form modal (label + input fields, primary + cancel) | `packages/app/src/components/add-host-modal.tsx`, `packages/app/src/components/pair-link-modal.tsx`, `packages/app/src/components/project-picker-modal.tsx`                                                                                        |
+| Destructive confirmation                            | `confirmDialog` invoked from `packages/app/src/screens/settings/host-page.tsx:541-547`                                                                                                                                                             |
+| Centered hero / first-run                           | `packages/app/src/components/welcome-screen.tsx`                                                                                                                                                                                                   |
+| Sidebar list (workspaces, hosts)                    | `packages/app/src/components/sidebar-workspace-list.tsx`, `packages/app/src/components/left-sidebar.tsx`                                                                                                                                           |
+| Live list of items with sections (agents)           | `packages/app/src/components/agent-list.tsx`                                                                                                                                                                                                       |
+| Historical list (sessions)                          | `packages/app/src/screens/sessions-screen.tsx`                                                                                                                                                                                                     |
+| Workspace pane (multi-tab, split)                   | `packages/app/src/screens/workspace/workspace-screen.tsx`                                                                                                                                                                                          |
+| Composer / message input                            | `packages/app/src/components/composer.tsx`, `packages/app/src/components/message-input.tsx`                                                                                                                                                        |
+| Pane chrome with single bottom border               | `packages/app/src/components/git-diff-pane.tsx`, `packages/app/src/components/file-explorer-pane.tsx`, `packages/app/src/components/terminal-pane.tsx`                                                                                             |
+| Page-level alert (info / success / warning / error) | `packages/app/src/components/ui/alert.tsx`, `packages/app/src/screens/project-settings-screen.tsx`                                                                                                                                                 |
+| Sidebar callout (cross-cutting alert)               | `packages/app/src/components/sidebar-callout.tsx`, `packages/app/src/contexts/sidebar-callout-context.tsx`, `packages/app/src/components/daemon-version-mismatch-callout-source.tsx`, `packages/app/src/desktop/updates/update-callout-source.tsx` |
+| Searchable picker                                   | `packages/app/src/components/ui/combobox.tsx`, `packages/app/src/components/branch-switcher.tsx`                                                                                                                                                   |
+| Trigger-anchored menu                               | `packages/app/src/components/ui/dropdown-menu.tsx` (used in `sidebar-workspace-list.tsx`, theme picker)                                                                                                                                            |
+| Right-click / long-press menu                       | `packages/app/src/components/ui/context-menu.tsx` (used in `sidebar-workspace-list.tsx`)                                                                                                                                                           |
+| Headers (back, screen, menu)                        | `packages/app/src/components/headers/back-header.tsx`, `screen-header.tsx`, `menu-header.tsx`                                                                                                                                                      |

docs/design.md

@@ -1,247 +1,73 @@
-# Design
+# Designing Features
 
-Tokens — every color, font size, weight, spacing step, radius, icon size — live in `packages/app/src/styles/theme.ts`.
+How to think through a feature before writing code.
 
----
+## Start from the user
 
-## 1. Character
+Even for backend work, start from the user's perspective:
 
-Paseo is minimal, spacious, quiet, confident. Whitespace is deliberate. Nothing crowds, nothing decorates, nothing apologizes. A row, a label, a control. That is the bar.
+- What problem does this solve?
+- What triggers it? User action, schedule, event?
+- What does success look like from the user's perspective?
+- What data does it need? Where does that data come from?
 
-The app is calm so the user's work is not. Every visual decision serves either _act on this_ or _understand this_ — never _look at this_.
+## Map existing code
 
-Consistency comes from component reuse, not from hand-matching styles across surfaces. A row in the projects list, a row in settings, and a row in a modal are the same component, not three implementations that happen to look alike. When two surfaces do the same semantic thing in two different ways, one of them is wrong.
+Before designing anything new, understand what exists:
 
----
+- Where does similar functionality live?
+- What patterns does the codebase already use?
+- What layers exist? (See [architecture.md](./architecture.md))
+- What types and data shapes are already defined?
 
-## 2. Component reuse
+New features rarely mean only new code. Usually they require modifying existing interfaces, extending existing types, or refactoring to accommodate the new functionality. Identify what needs to change, not just what needs to be added.
 
-A semantic element used in three or more places is a primitive. One of a kind is a screen.
+## Define verification before implementation
 
-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`.
+Before designing the solution, define how you'll know it works:
 
-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`).
+- What tests will prove this feature is correct?
+- At what layer? Unit, integration, E2E?
+- What's the simplest way to verify the core behavior?
 
-Before adding a new component, read `components/ui/`. The primitive usually exists.
+If you can't define verification, you don't understand the feature well enough yet.
 
----
+## Design the shape
 
-## 3. Hierarchy
+### Data
 
-Hierarchy is conveyed through weight and color, not size. Most labels, titles, and hints across the app are `fontSize.base` or `fontSize.xs`. The distinction between a row's primary line and its secondary line is `foreground` versus `foregroundMuted`.
+- What types are needed?
+- Use discriminated unions — make impossible states impossible
+- One canonical type per concept (see [coding-standards.md](./coding-standards.md))
 
-Weight has three tiers, applied by role:
+### Layers
 
-- **Screen titles** — the title at the top of a screen — use `<ScreenTitle>` (`packages/app/src/components/headers/screen-title.tsx`), which renders `fontSize.base` at weight `400` on compact and `300` on desktop. Top-of-screen titles are lighter on desktop, not heavier. The workspace screen header follows the same rule (`packages/app/src/screens/workspace/workspace-screen.tsx`).
-- **Structural labels** use `fontWeight.medium`. This applies to section labels above a stack of rows (`packages/app/src/components/agent-list.tsx:519-523`, `packages/app/src/components/keyboard-shortcuts-dialog.tsx:63-67`), form field labels above an input inside a modal (`packages/app/src/components/add-host-modal.tsx:19-23`, `packages/app/src/components/pair-link-modal.tsx:24-28`), the title at the top of a modal/sheet/dialog (`packages/app/src/components/adaptive-modal-sheet.tsx:90-94`, `packages/app/src/components/ui/combobox.tsx:1607-1611`, `packages/app/src/components/welcome-screen.tsx:48-53`), action button labels in tight components such as the sidebar callout actions (`packages/app/src/components/sidebar-callout.tsx:218-221`), and inline data emphasis on dense metadata rows (`packages/app/src/components/git-diff-pane.tsx:2322-2327`, `packages/app/src/components/file-explorer-pane.tsx:1115-1122`).
-- **Content** uses `fontWeight.normal`. This applies to settings rows (`packages/app/src/styles/settings.ts`), sidebar primary list-item titles (`packages/app/src/components/sidebar-workspace-list.tsx:2680-2686`, `packages/app/src/components/agent-list.tsx:572-578`), `<Button>` text (`packages/app/src/components/ui/button.tsx:80-84`), `<StatusBadge>` text (`packages/app/src/components/ui/status-badge.tsx:56-60`), and `<SidebarCallout>` titles (`packages/app/src/components/sidebar-callout.tsx:175-180`).
+- What belongs in each layer?
+- Where are the boundaries?
+- What does each layer expose to the layer above?
 
-The rule, condensed: text that _names_ a surface or a group is `medium`. Text that lives _inside_ a surface or a group is `normal`. Top-of-screen titles are `<ScreenTitle>`, which is lighter still.
+### Interactions
 
-Foreground is for the thing being acted on: row titles, section headings, the selected sidebar item. `foregroundMuted` is for context: hints, descriptions, secondary metadata, idle sidebar items, placeholders, status text.
+- How does data flow through the system?
+- What triggers what?
+- Where do side effects happen?
 
-Accent is the one CTA per surface. A `<Button variant="default">` filled with `accent` appears at most once on a page. Most pages have zero — settings is mostly toggles and text, the workspace pane is mostly content, the chat composer is the input itself.
+### Refactoring
 
-Destructive is a color, not a click. Restart-daemon and remove-host are `<Button variant="outline">` in the row trailing slot; the destructive surface only appears inside the `confirmDialog` (`packages/app/src/screens/settings/host-page.tsx:541-547`). Workspace archive opens a confirm dialog before any red appears (`packages/app/src/components/sidebar-workspace-list.tsx`). Red appears after the user has indicated intent.
+- What existing code needs to change?
+- Is existing code testable enough? If not, that's part of the plan.
 
----
+## Create a concrete plan
 
-## 4. Buttons
+Once the design is clear:
 
-The button is `<Button>` (`packages/app/src/components/ui/button.tsx`). It has five variants. Each has one job.
+1. **Acceptance criteria** — specific, verifiable outcomes (not "should work well" but "returns X when given Y")
+2. **Ordered steps** — what to build first (usually: types, then lowest layer, then up)
+3. **What to refactor** before adding new code
+4. **How to verify** each step
 
-`default` is the one primary action on a surface — filled with `accent`. At most one per page. The primary slot inside an `<AdaptiveModalSheet>` and the highlighted action on the welcome screen are the canonical uses.
+## Principles
 
-`secondary` is the paired action when two actions carry equal weight — filled with `surface3`. The component default is `secondary`, which matches its frequency in the codebase.
-
-`outline` is the low-frequency action that lives on a row — transparent with `borderAccent`. Restart, Remove, Update on host detail (`packages/app/src/screens/settings/host-page.tsx:585-594`).
-
-`ghost` is structural and non-committal — no border, no fill. Back arrows, header toggles, "Load more" footers (`packages/app/src/screens/sessions-screen.tsx:54-63`), more-affordances. Ghost is used when the affordance is part of the chrome, not a decision.
-
-`destructive` is filled with `destructive`. It only appears inside a confirm. The button on the page is `outline`; the destructive button is the confirm button inside the dialog.
-
-Sizes: `xs` for ultra-tight inline triggers. `sm` for any button sitting in a row. `md` is the page default. `lg` is reserved for large standalone CTAs.
-
-A `<Pressable>` wrapping a `<Text>` is a sixth variant. It is wrong. `<Button>` accepts `style`, `textStyle`, `leftIcon`, `disabled`, `size`, and `variant`.
-
----
-
-## 5. Borders
-
-Borders group, separate, or rarely emphasize.
-
-A logical block of related rows lives inside a card — one border around the whole group. The card primitive is `settingsStyles.card`; the keyboard-shortcuts dialog uses the same shape inline (`packages/app/src/components/keyboard-shortcuts-dialog.tsx:68-73`). The border defines what belongs together.
-
-Rows after the first inside a card carry `settingsStyles.rowBorder` — a single top border. The first row never has one. The same divider pattern appears in the keyboard-shortcuts dialog rows (`packages/app/src/components/keyboard-shortcuts-dialog.tsx:74-83`). Rows do not need their own background to feel separated.
-
-A list that is itself the page content — sidebar items in `sidebar-workspace-list.tsx`, the workspace list, the agent list (`packages/app/src/components/agent-list.tsx`) — uses spacing and surface, not borders, to separate items. Rows-in-a-card is an interior pattern; lists-as-pages are not.
-
-Pane chrome — the workspace pane header, the file-explorer header, the diff pane header — uses a single bottom border to separate the header from the content (`packages/app/src/components/git-diff-pane.tsx:2328-2331`). One border, no shadow.
-
-`borderAccent` is reserved for the outline button. Inputs use `border`. Single-thing borders are wrong; a single bordered element is either a card with one row (use the card) or it does not need a border.
-
----
-
-## 6. Pickers
-
-Five primitives. The pick is determined by option count, the need to search, and how the picker is anchored.
-
-`<DropdownMenu>` is for a small fixed set anchored to a trigger. Theme picker, kebab menus on workspace and project rows (`packages/app/src/components/sidebar-workspace-list.tsx:684-770`), row "more" menus. Items can be async (`status: "pending"`) and can include destructive entries. Under ~10 options where the user knows what they're looking for.
-
-`<Combobox>` is for a large or searchable list. Host switcher in the sidebar footer, model selector in the composer, branch switcher in the workspace header (`packages/app/src/components/branch-switcher.tsx`). The user types to find the option, or the list is long enough to scroll.
-
-`<ContextMenu>` is for right-click and long-press on a target. The row is the trigger; there is no visible affordance. Used for incidental actions on workspace rows in the sidebar (`packages/app/src/components/sidebar-workspace-list.tsx`).
-
-`<AdaptiveModalSheet>` is for a focused task. Multi-field forms (`packages/app/src/components/add-host-modal.tsx`, `packages/app/src/components/pair-link-modal.tsx`, `packages/app/src/components/project-picker-modal.tsx`), confirmations with detail, anything that earns a backdrop. Bottom sheet on compact, centered card on desktop. Raw `Modal` is wrong for any of these.
-
-`confirmDialog` is for destructive yes/no and imperative confirmation. Promise-based: `await confirmDialog({ destructive: true, ... })`. Anything where a wrong click loses work.
-
-Three themes is `DropdownMenu`. Thirty hosts is `Combobox`. A label and a value is `AdaptiveModalSheet`. "Are you sure?" is `confirmDialog`.
-
----
-
-## 7. Density and rhythm
-
-Settings detail pages, the projects detail page, and any list+detail content sit inside a centered, max-width 720 column (`packages/app/src/screens/settings-screen.tsx`, `packages/app/src/screens/projects-screen.tsx`). Lines stay readable, the eye does not have to track wide horizontal distances. Form modals carry their own narrower content frame (`packages/app/src/components/add-host-modal.tsx`).
-
-Workspace and chat surfaces use the full width — these are working surfaces, not reading surfaces. The composer carries `MAX_CONTENT_WIDTH` from `packages/app/src/constants/layout.ts` to keep lines readable while letting the workspace pane fill the rest.
-
-Sections sit apart. `<SettingsSection>` owns its own bottom margin; the next thing is wrapped in another `<SettingsSection>`. The agent-list `sectionHeading` carries the same `marginTop`/`marginBottom` rhythm (`packages/app/src/components/agent-list.tsx:511-517`). Adding `marginBottom` to a section is wrong.
-
-Cards inside a section sit closer than sections. Rows inside a card touch — only the divider separates them. The rhythm is page → spacious; section → spacious; card → tight.
-
-Rows have generous vertical padding: roughly 16px of content plus 16px of vertical padding for settings rows, 8–12px for sidebar list items where many rows must fit. Compressing rows below the established density to fit more on the screen is wrong. Too many rows means more cards or more sections, not smaller rows.
-
-The whitespace is the design.
-
----
-
-## 8. Responsiveness
-
-Compact-first. The small case is designed; the large case adds chrome around it.
-
-The list+detail pattern is canonical and reused across surfaces. The settings shell (`packages/app/src/screens/settings-screen.tsx`) and the projects screen (`packages/app/src/screens/projects-screen.tsx`) implement it identically:
-
-- On compact: full-screen list with `<BackHeader>` at the top. Tapping a row pushes a full-screen detail with its own `<BackHeader>` that returns to the list.
-- On desktop: a 320px sidebar on the left holds the list with `surfaceSidebar` background. The content pane on the right holds the selected detail with `<ScreenHeader>`, `<HeaderIconBadge>`, and `<ScreenTitle>`.
-
-The branching is one `useIsCompactFormFactor()` check at the top of the screen component. The list and the detail are the same components in both layouts; only the framing changes.
-
-The workspace screen (`packages/app/src/screens/workspace/workspace-screen.tsx`) follows a different but parallel rule: tabs collapse on compact, panes split on desktop. The sidebar (`packages/app/src/components/left-sidebar.tsx`) is overlaid on compact and pinned on desktop.
-
-A new list+detail feature copies the settings shell. A new workspace-shaped feature copies the workspace shell. Inventing a third shape happens in design review, not in a PR.
-
----
-
-## 9. Copy and voice
-
-Sentence case. "Pair a device", "Danger zone", "Restart daemon", "Inject Paseo tools", "No sessions yet", "Load more". Proper nouns retain casing — Paseo, Beta, Stable, Local. Title case is wrong.
-
-No trailing periods on row titles, labels, or buttons. No trailing period on a single-clause hint: "What happens when you press Enter while the agent is running" (`packages/app/src/screens/settings-screen.tsx:271-272`). Periods exist inside multi-sentence prose: "Restarts the daemon process. The app will reconnect automatically."
-
-Empty-state strings are short noun phrases or short sentences: "No projects yet", "Select a project", "No sessions yet" (`packages/app/src/screens/sessions-screen.tsx:74-76`), "Host not found".
-
-Buttons are imperative: Save, Cancel, Restart, Remove, Update, Install update, Add host, Load more. In-flight labels are present-participle with a literal three-dot ellipsis: "Saving...", "Restarting...", "Removing...", "Loading...".
-
-Error copy is direct. "Unable to remove host" (`packages/app/src/screens/settings/host-page.tsx:697`), not "Sorry, we couldn't remove the host." Recovery instructions are concrete: "Wait for it to come online before restarting." Errors describe state; they do not editorialize.
-
-Terminology:
-
-- Workspace, never "checkout".
-- Host, except where the user-facing concept is the daemon process itself ("Restart daemon").
-- Project, not "repo" or "repository".
-- Provider, not "model provider".
-- Session and agent are distinct: a session is a historical entry in `sessions-screen.tsx`; an agent is a live entity in the workspace.
-
----
-
-## 10. States
-
-Loading is inline by default. `<LoadingSpinner size={14} color={foregroundMuted} />` sits next to the thing it relates to (`packages/app/src/screens/settings/providers-section.tsx:227-231`). Page-level loading is a centered `<LoadingSpinner size="large">` (`packages/app/src/screens/sessions-screen.tsx:69-72`). Card-level loading is a single short line, not a spinner. In-row dropdown items use `<DropdownMenuItem status="pending" pendingLabel="Removing...">`; the menu item handles its own pending state.
-
-Empty states are short noun phrases. Centered, muted, one or two lines. Sessions screen pairs the empty noun with a single ghost button to navigate back (`packages/app/src/screens/sessions-screen.tsx:74-81`); that pairing is the maximum elaboration. Illustrations and CTAs disguised as empty states are wrong.
-
-Inline errors are a single sentence in `palette.red[300]` `xs`, sitting under the field or inside the card it relates to (`packages/app/src/screens/settings/providers-section.tsx:115-119`).
-
-Page-level alerts — informational notices, success confirmations, warnings, or recoverable errors that need a small visible block on the page — use `<Alert>` (`packages/app/src/components/ui/alert.tsx`). Variants: `default`, `info`, `success`, `warning`, `error`. The chrome is quiet by design: a 1px tinted border, transparent background, a small variant-tinted icon, the title in the variant accent, the description in `foregroundMuted`. Actions go in the `children` slot as `<Button variant="outline" size="sm">` — recovery actions are low-frequency and outline keeps them quiet alongside the alert's accent (`packages/app/src/screens/project-settings-screen.tsx`). One `<Alert>` at a time per region.
-
-Sidebar callouts — cross-cutting alerts that apply across the whole app, like worktree setup, Rosetta install, and desktop update available — register through `useSidebarCallouts()` and render in the left sidebar via `<SidebarCallout>` (`packages/app/src/components/sidebar-callout.tsx`). The chrome (top-border-only, full-width action buttons) is tuned for that ~280px column. Canonical sources: `packages/app/src/components/worktree-setup-callout-source.tsx`, `packages/app/src/desktop/updates/rosetta-callout-source.tsx`, `packages/app/src/desktop/updates/update-callout-source.tsx`. Never import `<SidebarCallout>` into a page — that's what `<Alert>` is for.
-
-Imperative errors are `Alert.alert("Error", "Unable to ...")` (the React Native `Alert` API, not this component) for failures that interrupt the flow and have no place on the page.
-
-Disabled state is `opacity: theme.opacity[50]` on the outer pressable. Color changes for disabled state are wrong; a disabled button is the same button, dimmer.
-
-Partial failure (a list mostly fine but one source errored) is a bordered banner above the list, listing each failure in red-300 `xs` (`packages/app/src/screens/projects-screen.tsx:151-159`). The list still renders.
-
-State surfaces at the smallest scope it affects. Field error stays under the field; page error is a banner; flow-stopping error is an `Alert`.
-
----
-
-## 11. List rows
-
-The row anatomy is a content column with an optional trailing slot. Inside a card the row is `settingsStyles.row`. Inside a sidebar list the row carries its own padding and `borderRadius.lg` per item (`packages/app/src/components/sidebar-workspace-list.tsx:2614-2625`).
-
-Rows that drill into a detail lead with a chevron in the trailing slot (`ChevronRight`, `iconSize.sm`, `foregroundMuted`). The whole row is the `<Pressable>`. Pair-device row (`packages/app/src/screens/settings/host-page.tsx:644-668`), provider row (`packages/app/src/screens/settings/providers-section.tsx:92-132`), project row in the projects list. Chevron means navigation.
-
-Kebab menus (`<DropdownMenu>` with `<MoreVertical size={14} />` trigger) are for actions on the row, not navigation. Trigger style: `padding: 2`, `borderRadius: 4`, hover background `surface2`. Menu position: `align="end"`. Items use `<DropdownMenuItem leading={<Icon size={14} color={foregroundMuted} />} ...>`. Visibility is `isHovered || isTouchPlatform` — hover-revealed on web, always visible on native (`packages/app/src/components/sidebar-workspace-list.tsx:684-770`).
-
-A row may carry both a chevron and a kebab when both navigation and row-level actions apply. Chevron sits at the end; kebab sits before it.
-
-Switches and segmented controls also sit in the trailing slot. A row that both navigates and toggles is a `<Pressable>` with a `<Switch>` in the trailing slot — the switch calls `event.stopPropagation()` so the row press does not fire (`packages/app/src/screens/settings/providers-section.tsx:92-132`). Sidebar items that hold a status dot, a count, and a kebab follow the same rule (`packages/app/src/components/sidebar-workspace-list.tsx`).
-
-Selected state on rows in a desktop list+detail uses `surfaceSidebarHover` as the background (`packages/app/src/screens/projects-screen.tsx`). Selected state on rows in the sidebar list uses `surface2` (`packages/app/src/components/agent-list.tsx:563-571`).
-
----
-
-## 12. Status pills and badges
-
-Status pills are `palette.<color>[300]` foreground on a 10%-alpha background of the same color. Success uses green, warning uses amber, danger uses red, muted uses zinc. The `<StatusBadge>` primitive (`packages/app/src/components/ui/status-badge.tsx`) is canonical.
-
-Status dots — the small filled circles next to a host or agent name — are `borderRadius.full` filled with the status color (`statusSuccess`, `statusWarning`, `statusDanger`, or `foregroundMuted`). They sit in the trailing slot of a sidebar row or as a leading marker on a status pill.
-
-The bespoke pills in `packages/app/src/screens/settings/host-page.tsx:97-116`, `packages/app/src/components/agent-list.tsx:607-632`, and `packages/app/src/components/sidebar-workspace-list.tsx:2889-2894` are drift to be removed. New code uses `<StatusBadge>`.
-
----
-
-## 13. Forbidden
-
-- `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.
-- Bare `<Text>` for a section header inside settings. `<SettingsSection>` exists.
-- 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.
-- The word "checkout" in UI strings or identifiers. The term is "workspace".
-- New color tokens or hardcoded hex outside the palette. Status pill rgba backgrounds are the documented pattern (§12), not a license.
-- Placeholder text dimmed beyond `foregroundMuted`. No extra opacity, no italics, no ghost-text.
-- `onPointerEnter` and `onPointerLeave`. They do not fire on native iOS. Hover uses Pressable's `onHoverIn`/`onHoverOut` gated with `isHovered || isCompact || isNative`.
-- Raw DOM APIs without an `isWeb` guard.
-- Spacing values outside the scale. `padding: 20` and `gap: 10` are wrong.
-- Color changes for disabled state. Opacity only.
-- Destructive actions without `confirmDialog`. Restart, remove, and future destructive actions are confirmed. Worktree archive is confirmed only when git runtime reports uncommitted changes or unpushed commits; clean pushed worktrees archive immediately.
-- Bespoke status pills. `<StatusBadge>` is the pill primitive.
-- Raw `Modal` for a focused task. `<AdaptiveModalSheet>` is the modal primitive.
-- Importing `ActivityIndicator` directly. `<LoadingSpinner>` is the loading primitive.
-
----
-
-## 14. Canonical surfaces by pattern
-
-| Pattern                                             | Reference                                                                                                                                                                                                                                                                                                |
-| --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| List+detail (compact stack, desktop sidebar+pane)   | `packages/app/src/screens/settings-screen.tsx`, `packages/app/src/screens/projects-screen.tsx`                                                                                                                                                                                                           |
-| Detail card+row                                     | `packages/app/src/screens/settings/host-page.tsx`, `packages/app/src/screens/settings/providers-section.tsx`                                                                                                                                                                                             |
-| Section grouping inside a card list                 | `packages/app/src/screens/settings/settings-section.tsx`                                                                                                                                                                                                                                                 |
-| Form modal (label + input fields, primary + cancel) | `packages/app/src/components/add-host-modal.tsx`, `packages/app/src/components/pair-link-modal.tsx`, `packages/app/src/components/project-picker-modal.tsx`                                                                                                                                              |
-| Destructive confirmation                            | `confirmDialog` invoked from `packages/app/src/screens/settings/host-page.tsx:541-547`                                                                                                                                                                                                                   |
-| Centered hero / first-run                           | `packages/app/src/components/welcome-screen.tsx`                                                                                                                                                                                                                                                         |
-| Sidebar list (workspaces, hosts)                    | `packages/app/src/components/sidebar-workspace-list.tsx`, `packages/app/src/components/left-sidebar.tsx`                                                                                                                                                                                                 |
-| Live list of items with sections (agents)           | `packages/app/src/components/agent-list.tsx`                                                                                                                                                                                                                                                             |
-| Historical list (sessions)                          | `packages/app/src/screens/sessions-screen.tsx`                                                                                                                                                                                                                                                           |
-| Workspace pane (multi-tab, split)                   | `packages/app/src/screens/workspace/workspace-screen.tsx`                                                                                                                                                                                                                                                |
-| Composer / message input                            | `packages/app/src/components/composer.tsx`, `packages/app/src/components/message-input.tsx`                                                                                                                                                                                                              |
-| Pane chrome with single bottom border               | `packages/app/src/components/git-diff-pane.tsx`, `packages/app/src/components/file-explorer-pane.tsx`, `packages/app/src/components/terminal-pane.tsx`                                                                                                                                                   |
-| Page-level alert (info / success / warning / error) | `packages/app/src/components/ui/alert.tsx`, `packages/app/src/screens/project-settings-screen.tsx`                                                                                                                                                                                                       |
-| Sidebar callout (cross-cutting alert)               | `packages/app/src/components/sidebar-callout.tsx`, `packages/app/src/contexts/sidebar-callout-context.tsx`, `packages/app/src/components/worktree-setup-callout-source.tsx`, `packages/app/src/desktop/updates/rosetta-callout-source.tsx`, `packages/app/src/desktop/updates/update-callout-source.tsx` |
-| Searchable picker                                   | `packages/app/src/components/ui/combobox.tsx`, `packages/app/src/components/branch-switcher.tsx`                                                                                                                                                                                                         |
-| Trigger-anchored menu                               | `packages/app/src/components/ui/dropdown-menu.tsx` (used in `sidebar-workspace-list.tsx`, theme picker)                                                                                                                                                                                                  |
-| Right-click / long-press menu                       | `packages/app/src/components/ui/context-menu.tsx` (used in `sidebar-workspace-list.tsx`)                                                                                                                                                                                                                 |
-| Headers (back, screen, menu)                        | `packages/app/src/components/headers/back-header.tsx`, `screen-header.tsx`, `menu-header.tsx`                                                                                                                                                                                                            |
+- **Fit, don't force** — new code should fit existing patterns, or refactor first
+- **Simple** — the best design is the simplest one that works
+- **Verify early** — define how to test before designing the implementation

docs/development.md

@@ -11,48 +11,54 @@
 npm run dev
 ```
 
-`scripts/dev.sh` runs the daemon and Expo together via `concurrently`, fronted by [`portless`](https://www.npmjs.com/package/portless) so each service is reachable at a stable name like `https://daemon.localhost` / `https://app.localhost` instead of a fixed port. The underlying TCP ports are ephemeral — never hardcode them. (Windows uses `scripts/dev.ps1`, which still binds the daemon to `localhost:6767` directly.)
+The dev script automatically picks an available port. Both the server and Expo app run in a Tmux session — see `CLAUDE.local.md` for system-specific session details.
 
-### PASEO_HOME
+### Running alongside the main checkout
 
-`PASEO_HOME` is the directory that holds runtime state (agents, sockets, daemon log). Resolution rules:
-
-- The **server itself** (e.g. when launched by the desktop app or `npm run start`) defaults to `~/.paseo` (see `packages/server/src/server/paseo-home.ts`).
-- **`npm run dev` from a git worktree** derives a stable home like `~/.paseo-<worktree-name>` and, on first run, seeds it from `~/.paseo` by copying agent/project JSON metadata and `config.json`. Checkout/worktree directories are not copied.
-- **`npm run dev` from the main checkout** (not a worktree) uses a fresh `mktemp` directory under `$TMPDIR` and removes it on exit. Set `PASEO_HOME` explicitly to keep state across runs.
-
-Override knobs:
+Set `PASEO_HOME` to isolate state when running a second instance (e.g., in a worktree):
 
 ```bash
-PASEO_HOME=~/.paseo-blue npm run dev          # explicit home
-PASEO_DEV_SEED_HOME=/path/to/home npm run dev # seed from a different source home
-PASEO_DEV_RESET_HOME=1 npm run dev            # clear and reseed the derived worktree home
+PASEO_HOME=~/.paseo-blue npm run dev
 ```
 
-### Daemon endpoints
+- `PASEO_HOME` — path for runtime state (agents, sockets, etc.). Defaults to `~/.paseo`.
+- In git worktrees, `npm run dev` derives a stable home like `~/.paseo-<worktree-name>`.
+  On first run, it seeds that home from `~/.paseo` by copying agent/project JSON metadata
+  and `config.json`; actual checkout/worktree directories are not copied.
+- `PASEO_DEV_SEED_HOME=/path/to/home npm run dev` seeds from a different source home.
+- `PASEO_DEV_RESET_HOME=1 npm run dev` clears and reseeds the derived worktree home.
 
-- Stable daemon launched by the desktop app: `localhost:6767`.
-- `npm run dev` (macOS/Linux): portless URLs only — read them from the `dev.sh` banner or `portless get daemon` / `portless get app`.
-- `npm run dev` (Windows): `localhost:6767` for the daemon.
+### Default ports
 
-In any worktree-style or portless setup, never assume default ports.
+In the main checkout:
 
-### Desktop renderer profiling
+- Daemon: `localhost:6767`
+- Expo app: `localhost:8081`
 
-`npm run dev:desktop` starts Electron with Chromium remote debugging enabled on
-`http://127.0.0.1:9223` so renderer CPU profiles can be captured through CDP.
-Override the port with `PASEO_ELECTRON_REMOTE_DEBUGGING_PORT` when `9223` is busy.
+In worktrees or with `npm run dev`, ports may differ. Never assume defaults.
 
 ### Daemon logs
 
-Check `$PASEO_HOME/daemon.log` for daemon logs. The default level is `info`; set
-`PASEO_LOG_LEVEL=trace` before launching the daemon when you need full provider,
-session, and agent-manager traces for stuck-state debugging.
+Check `$PASEO_HOME/daemon.log` for trace-level logs.
 
-The supervisor rotates `daemon.log`. Persisted `log.file.rotate` settings in
-`$PASEO_HOME/config.json` win first. Without persisted config, the optional
-`PASEO_LOG_ROTATE_SIZE` and `PASEO_LOG_ROTATE_COUNT` env vars override the
-defaults. The default rotation is `10m` x `3` files everywhere.
+### Database queries
+
+Run arbitrary SQL against the SQLite database:
+
+```bash
+# Show table row counts
+npm run db:query
+
+# Run any SQL
+npm run db:query -- "SELECT agent_id, title, last_status FROM agent_snapshots"
+npm run db:query -- "SELECT agent_id, seq, item_kind FROM agent_timeline_rows ORDER BY committed_at DESC LIMIT 10"
+
+# Point at a specific DB directory
+npm run db:query -- --db /path/to/db "SELECT ..."
+```
+
+Auto-detects the running dev daemon's database from `/tmp/paseo-dev.*`, `PASEO_HOME`, or `~/.paseo/db`.
+Pass either a DB directory or a `paseo.sqlite` file to `--db`. The script opens the database directly in read-only mode.
 
 ## paseo.json service scripts
 
@@ -95,25 +101,29 @@ Every `scripts` entry with `"type": "service"` receives these environment variab
 
 ## Build sync gotchas
 
-The daemon and CLI consume sibling workspaces from compiled `dist/` output, not `src/`. When you change a workspace that something else imports, rebuild the producer first or the consumer will speak a stale protocol and fail with handshake warnings, timeouts, or stale type errors.
+### Relay → Daemon
 
-The fastest way to keep this consistent is to rebuild the whole daemon stack with one command:
+When changing `packages/relay/src/*`, rebuild before running the daemon:
 
 ```bash
-npm run build:daemon
+npm run build --workspace=@getpaseo/relay
 ```
 
-This rebuilds, in order, `@getpaseo/highlight` → `@getpaseo/relay` → `@getpaseo/server` → `@getpaseo/cli`. Use it whenever you have changed any of those four and need clean cross-package types or runtime behavior.
+The Node daemon imports `@getpaseo/relay` from `packages/relay/dist/*`, not `src/*`.
 
-For tighter loops, you can rebuild a single workspace:
+### Server → CLI
 
-- Changed `packages/relay/src/*`: `npm run build --workspace=@getpaseo/relay` (server imports `@getpaseo/relay` from `dist/*`).
-- Changed `packages/server/src/client/*` (especially `daemon-client.ts`) or shared WS protocol types: `npm run build --workspace=@getpaseo/server` (CLI imports `@getpaseo/server` via package exports resolving to `dist/*`).
-- Changed `packages/highlight/src/*`: `npm run build --workspace=@getpaseo/highlight` (server depends on it).
+When changing `packages/server/src/client/*` (especially `daemon-client.ts`) or shared WS protocol types, rebuild before running CLI commands:
+
+```bash
+npm run build --workspace=@getpaseo/server
+```
+
+The CLI imports `@getpaseo/server` via package exports resolving to `dist/*`. Stale `dist` means the CLI speaks an old protocol and fails with handshake warnings or timeouts.
 
 ## CLI reference
 
-Use `npm run cli` to run the in-repo CLI from source (`npx tsx packages/cli/src/index.ts`). The globally installed `paseo` binary on macOS is a symlink into the installed Paseo desktop app, not this checkout — use it to drive the desktop's built-in daemon, but use `npm run cli` when you want to talk to the CLI you are editing.
+Use `npm run cli` to run the local CLI (instead of the globally installed `paseo` which points to the main checkout).
 
 ```bash
 npm run cli -- ls -a -g              # List all agents globally
@@ -167,7 +177,7 @@ Get the session ID from the agent JSON (`persistence.sessionId`), then:
 
 ## Testing with Playwright MCP
 
-Point Playwright MCP at the running Expo web target. Under `npm run dev` (macOS/Linux) that is the portless URL printed in the dev banner — typically `https://app.localhost`. If you start Expo directly with `expo start --web` (no portless), Metro defaults to `http://localhost:8081`.
+Use Playwright MCP connecting to Metro at `http://localhost:8081` for UI testing.
 
 Do NOT use browser history (back/forward). Always navigate by clicking UI elements or using `browser_navigate` with the full URL — the app uses client-side routing and browser history breaks state.
 

docs/file-icons.md

@@ -15,7 +15,6 @@ This file is auto-generated. Do not edit it by hand.
 - `SVG_ICONS` maps icon names (e.g. `"typescript"`) to raw SVG strings
 - `EXTENSION_TO_ICON` maps file extensions (e.g. `"ts"`) to icon names
 - `getFileIconSvg(fileName)` returns the SVG string for a given filename, falling back to a generic file icon
-- `packages/app/src/components/file-explorer-pane.tsx` is the only consumer; it renders the SVG with `SvgXml` from `react-native-svg`
 
 ## Adding a new icon
 

docs/glossary.md

@@ -2,28 +2,44 @@
 
 Authoritative terminology. UI label wins. Don't invent synonyms; use what's here.
 
-- **Project** — Logical grouping of workspaces sharing a git remote (or main repo root). UI: "Project" / "Add project". Code: `ProjectSummary` (`packages/app/src/utils/projects.ts:22`), `projectKey` (`packages/server/src/server/workspace-registry-model.ts:16`). Forbidden: "Repo", "Repository" as UI label.
-- **Workspace** — One concrete `cwd` on one daemon, with git state; belongs to exactly one project. UI: "Workspace". Code: `WorkspaceDescriptorPayload` (`packages/server/src/shared/messages.ts:2178`). Don't confuse with: Branch (one branch can back many workspaces via worktrees). Forbidden: "Folder", "Directory" as UI label.
-- **Workspace kind** — `"directory" | "local_checkout" | "worktree"`. Code: `PersistedWorkspaceKind` (`packages/server/src/server/workspace-registry-model.ts:8`).
-- **Agent** — One AI coding agent run on a daemon (one provider, one model, one cwd, one timeline). UI: "Agent" / "New Agent". Code: `AgentSnapshotPayload` (`packages/server/src/shared/messages.ts:608`). Forbidden: "Task", "Job", "Run".
-- **Daemon** — Local Paseo server process; identified by `serverId`. UI: "Daemon" (system contexts only). Code: `serverId` in `ServerInfoStatusPayloadSchema` (`packages/server/src/shared/messages.ts:1936`), `DaemonClient` (`packages/server/src/client/daemon-client.ts`).
-- **Host** — Client-side connection profile pointing at a daemon; bundles one or more `HostConnection`s. UI: "Host" / "Add host" / "Switch host". Code: `HostProfile` (`packages/app/src/types/host-connection.ts:37`). Forbidden: "Connection" (means `HostConnection`, not host).
-- **Project host entry** — One row in a project for a single (project, daemon) pair, aggregating that daemon's workspaces in the project. Internal. Code: `ProjectHostEntry` (`packages/app/src/utils/projects.ts:11`). Don't introduce "Checkout" as a synonym.
-- **Placement** — One workspace's relationship to its project (projectKey, projectName, git checkout snapshot). Internal. Code: `ProjectPlacementPayload` (`packages/server/src/shared/messages.ts:2113`).
-- **Branch** — Plain git branch. UI: "Switch branch". Code: `currentBranch` in `WorkspaceGitRuntimePayloadSchema` (`packages/server/src/shared/messages.ts:2136`); `BranchSwitcher` (`packages/app/src/components/branch-switcher.tsx`).
-- **Worktree** — Paseo-managed git worktree (`~/.paseo/worktrees/{name}`); also a `workspaceKind` value. UI: CLI + `paseo.json` keys (`worktree.setup`, `worktree.teardown`) only. Code: `ProjectCheckoutLiteGitPaseoPayload` (`packages/server/src/shared/messages.ts:2092`); CLI `paseo worktree` (`packages/cli/src/commands/worktree/index.ts:8`). Forbidden: "Checkout" as a synonym.
+- **Project** — Logical grouping of workspaces sharing a git remote (or main repo root). UI: "Project" / "Add a project". Code: `ProjectSummary` (`packages/app/src/utils/projects.ts:17`), `projectKey` (`packages/server/src/server/workspace-registry-model.ts:88`). Forbidden: "Repo", "Repository" as UI label.
+- **Workspace** — One concrete `cwd` on one daemon, with git state; belongs to exactly one project. UI: "Workspace". Code: `WorkspaceDescriptorPayload` (`packages/server/src/shared/messages.ts:2128`). Don't confuse with: Branch (one branch can back many workspaces via worktrees). Forbidden: "Folder", "Directory" as UI label.
+- **Workspace kind** — `"directory" | "local_checkout" | "worktree"`. Code: `PersistedWorkspaceKind` (`packages/server/src/server/workspace-registry-model.ts:9`).
+- **Agent** — One AI coding agent run on a daemon (one provider, one model, one cwd, one timeline). UI: "Agent" / "New Agent". Code: `AgentSnapshotPayload` (`packages/server/src/shared/messages.ts:597`). Forbidden: "Task", "Job", "Run".
+- **Daemon** — Local Paseo server process; identified by `serverId`. UI: "Daemon" (system contexts only). Code: `serverId` (`packages/server/src/shared/messages.ts:1886`), `DaemonClient` (`packages/server/src/client/daemon-client.ts`).
+- **Host** — Client-side connection profile pointing at a daemon; bundles one or more `HostConnection`s. UI: "Host" / "Add host" / "Switch host". Code: `HostProfile` (`packages/app/src/types/host-connection.ts:36`). Forbidden: "Connection" (means `HostConnection`, not host).
+- **Placement** — One workspace's relationship to its project (projectKey, projectName, git checkout snapshot). Internal. Code: `ProjectPlacementPayload` (`packages/server/src/shared/messages.ts:2063`).
+- **Branch** — Plain git branch. UI: "Switch branch". Code: `currentBranch` (`packages/server/src/shared/messages.ts:2027`); `BranchSwitcher` (`packages/app/src/components/branch-switcher.tsx`).
+- **Worktree** — Paseo-managed git worktree (`~/.paseo/worktrees/{name}`); also a `workspaceKind` value. UI: CLI + `paseo.json` keys (`worktree.setup`, `worktree.teardown`) only. Code: `ProjectCheckoutLiteGitPaseoPayload` (`packages/server/src/shared/messages.ts:2042`); CLI `paseo worktree` (`packages/cli/src/commands/worktree/index.ts:8`). Forbidden: "Checkout" as a synonym.
 - **Repository / Remote** — Internal git inputs (`remoteUrl`, `mainRepoRoot`) used to derive `projectKey`. No UI label.
 - **Session** — Per-client connection to a daemon. Internal. Code: `Session` (`packages/server/src/server/session.ts`). Don't confuse with: provider-side agent session log.
-- **Profile** — Internal name for the persisted shape of a host. Code: `HostProfile` (`packages/app/src/types/host-connection.ts:37`). Never user-facing.
-- **Provider** — Agent backend (Claude Code, Codex, OpenCode). UI: "Provider". Code: `ProviderSnapshotEntry` (`packages/server/src/shared/messages.ts:198`).
-- **Model** — A specific LLM offered by a provider. UI: "Model" / "Select model". Code: `AgentModelDefinition` (`packages/server/src/shared/messages.ts:187`).
+- **Profile** — Internal name for the persisted shape of a host. Code: `HostProfile` (`packages/app/src/types/host-connection.ts:36`). Never user-facing.
+- **Provider** — Agent backend (Claude Code, Codex, OpenCode). UI: "Provider". Code: `ProviderSnapshotEntry` (`packages/server/src/shared/messages.ts:193`).
+- **Model** — A specific LLM offered by a provider. UI: "Model" / "Select model". Code: `AgentModelDefinition` (`packages/server/src/shared/messages.ts:182`).
 - **Terminal** — Workspace-scoped PTY shell streamed over the binary mux channel. UI: "Terminal". Code: `TerminalStreamFrame` (`packages/server/src/shared/terminal-stream-protocol.ts`).
 - **Schedule** — Cron-style trigger that creates remote agents. UI: CLI only (`paseo schedule`). Code: `ScheduleCreateRequest` (re-exported from `packages/server/src/shared/messages.ts`). Don't confuse with: Loop (iterative re-execution of one agent).
-- **Mode** — Provider-specific operational mode (plan, default, full-access, …). UI: icon-only. Code: `modeId` in `AgentSessionConfig` (`packages/server/src/shared/messages.ts:257`).
-- **Attachment** — GitHub PR or Issue bound to an agent prompt. UI: "Attach issue or PR". Code: `AgentAttachment` (`packages/server/src/shared/messages.ts:782`).
-- **Conflict** — Two distinct senses; do NOT use the bare word in UI copy without qualifying which: (a) **stale-write conflict** on `paseo.json` ("Config changed on disk", code `stale_project_config`, `packages/app/src/screens/project-settings-screen.tsx:593`); (b) **git merge conflict** (no current UI string).
+- **Mode** — Provider-specific operational mode (plan, default, full-access, …). UI: icon-only. Code: `modeId` in `AgentSessionConfig` (`packages/server/src/shared/messages.ts:249`).
+- **Attachment** — GitHub PR or Issue bound to an agent prompt. UI: "Attach issue or PR". Code: `AgentAttachment` (`packages/server/src/shared/messages.ts:736`).
+- **Conflict** — Two distinct senses; do NOT use the bare word in UI copy without qualifying which: (a) **stale-write conflict** on `paseo.json` ("Config changed on disk", code `stale_project_config`, `packages/app/src/screens/project-settings-screen.tsx:576`); (b) **git merge conflict** (no current UI string).
+
+## Open question — per-host project entry (TBD)
+
+A project aggregates workspaces across daemons. The projects screen and project-settings screen need a name for "one row in the project list per (project, daemon)". `ProjectPlacementPayload` is **per-workspace**, so it isn't this thing — but the noun "placement" could naturally extend (`ProjectDaemonPlacement`, or just "placements grouped by daemon"). The in-progress `ProjectCheckout` type (`packages/app/src/utils/projects.ts:4`) is also per-workspace today, even though the settings UI selector treats it per-daemon (matched on `serverId` alone) — so the code is currently inconsistent with itself.
+
+Candidates: (1) extend "placement" to the (project, daemon) bundle, (2) drop the wrapper type and use `{ host, project, workspaces[] }` plus descriptive UI copy ("project · host X · 2 online"). Recommendation: option (2) — no new noun, use existing terms compositionally. Do not introduce "Checkout" / `ProjectCheckout` as the canonical name.
+
+## Rename before landing (in-progress `Checkout*` references)
+
+- `packages/app/src/utils/projects.ts:4,20,22,23,46,85,104,120,124,126,146,148,155` — `ProjectCheckout`, `checkouts`, `checkoutCount`, `onlineCheckoutCount`, `buildCheckoutTarget`, `compareCheckouts`.
+- `packages/app/src/screens/projects-screen.tsx:73,74,77,90` — `checkoutLabel`, `${checkoutCount} checkout(s)`, `onlineSuffix`.
+- `packages/app/src/screens/project-settings-screen.tsx:17,41,46,55,76,81,110-152,323,443-600` — `ProjectCheckout` import, `CheckoutSelection`, `CheckoutSelector`, `CheckoutOption`, `usableCheckouts`, `onlineUsableCheckouts`, `selectedCheckout`, `selectedCheckoutKey`, "no online checkout", "no checkout with a valid server", `testID="checkout-selector"`, `testID="checkout-option-*"`, a11y `"Edit X checkout"`.
+- `packages/app/src/screens/project-settings-screen.test.tsx:185,195,196,366,369,378,389,412,415,431,432,456,464,478,481,490,501,504,521` — `checkouts`, `checkoutCount`, `onlineCheckoutCount`, "no checkouts are online", "checkout selector", "online checkout".
+- `packages/app/src/utils/projects.test.ts:107,108,111,259` — `checkoutCount`, `onlineCheckoutCount`, `checkouts`.
+
+(Out of scope for this rename: `ProjectCheckoutLite*Payload` and the git-`checkout` family in `packages/server/src/utils/checkout-*.ts`. Those refer to _git_ checkout state, not the rejected (project, daemon) sense.)
 
 ## Inconsistencies (documented, not papered over)
 
-- CLI `--host <host>` description `"Daemon host target"` (`packages/cli/src/utils/command-options.ts:5`) blurs daemon/host; the app keeps them distinct.
-- `WorkspaceDescriptorPayloadSchema.workspaceKind` accepts legacy `"checkout"` on the wire (`packages/server/src/shared/messages.ts:2187`) while `PersistedWorkspaceKind` does not (`packages/server/src/server/workspace-registry-model.ts:8`).
+- CLI `--host <host>` description `"Daemon host target"` (`packages/cli/src/commands/utils/command-options.ts:5`) blurs daemon/host; the app keeps them distinct.
+- `WorkspaceDescriptorPayloadSchema.workspaceKind` accepts legacy `"checkout"` on the wire (`packages/server/src/shared/messages.ts:2137`) while `PersistedWorkspaceKind` does not (`packages/server/src/server/workspace-registry-model.ts:9`).
+- In-progress `ProjectCheckout` (`packages/app/src/utils/projects.ts:4`) is per-workspace, but `project-settings-screen.tsx` selects by `serverId` alone — same daemon with multiple workspaces will produce duplicate React keys in the selector.

docs/hover.md

@@ -1,138 +0,0 @@
-# Hover
-
-Read this before writing any hover code. Every hover regression we ship is one of the three failure modes below, and every one of them is solved by the same canonical pattern. The pattern is hardwon — it survived every other shape we tried — so copy it, don't reinvent it.
-
-## The pattern
-
-The canonical implementation lives in `packages/app/src/components/sidebar-workspace-list.tsx`, in the workspace row (around line 1369). When in doubt, open that file and copy the shape.
-
-```tsx
-//
-//   ┌─ Plain View. Tracks hover via pointerenter/pointerleave.
-//   │
-<View
-  style={styles.workspaceRowContainer}
-  onPointerEnter={handlePointerEnter}
-  onPointerLeave={handlePointerLeave}
->
-  <Pressable                          // ┐ Separate inner Pressable.
-    onPress={handlePress}             // │ Handles press only.
-    onPressIn={...}                   // │ Never has onHoverIn/onHoverOut.
-    onPressOut={...}                  // ┘
-    style={workspaceRowStyle}
-  >
-    <View style={styles.workspaceRowMain}>
-      <View style={styles.workspaceRowLeft}>…</View>
-      <WorkspaceRowRightGroup isHovered={isHovered} />
-      {/*                    └─ Reveals content based on hover state. */}
-    </View>
-  </Pressable>
-</View>
-```
-
-Five things make this work. Every one of them matters.
-
-1. **Hover lives on a plain `View`, not a `Pressable`.** `Pressable` carries its own internal hover state machine. Nested `Pressable`s fight over it. A plain `View` just dispatches DOM events — no state machine, no fighting.
-2. **Press lives on a _separate_ inner `Pressable`.** Hover and press never share an element. The two state machines never see each other.
-3. **`onPointerEnter` / `onPointerLeave` are non-bubbling**, mouseenter-style by W3C spec. They fire only when crossing the outer `View`'s bounding box. Crossing into descendants — including descendant `Pressable`s (the kebab menu's buttons, a copy button, a tooltip target) — does **not** fire `pointerleave`. This is why nesting `Pressable`s inside is safe.
-4. **The row has a fixed `minHeight`.** When content swaps in on hover (kebab replacing a diff stat), both occupy the same fixed slot. Zero layout shift, zero geometry flicker.
-5. **The outer `View` has nothing but `position: relative`.** It exists only to be the hover target. All real layout lives on the inner `Pressable`. The hover-tracker is a sealed envelope around the row; layout changes inside it never leak out and re-enter through the side.
-
-That's the whole pattern. Internalize it.
-
-## When you skip the pattern, here is what breaks
-
-### Failure mode 1 — Nested Pressables fight over hover state
-
-If you put `onHoverIn` / `onHoverOut` on a `Pressable` that has another `Pressable` anywhere inside it (a copy button, an icon button, a nested action), the moment the cursor moves onto the inner `Pressable`, the inner one's hover state machine claims hover and the outer one's `onHoverOut` fires. Your reveal state flips off. The reveal hides. The cursor is no longer over the hidden reveal, so it ends up back over the trigger area. The outer's `onHoverIn` fires. Loop.
-
-This is the most common hover bug shipped in this codebase, by a wide margin. It is what the workspace row is structured to avoid. The fix is not "be clever about handlers" — it's "don't put hover on a Pressable that contains other Pressables."
-
-> **Rule:** the hover-tracking element is a plain `View` with `onPointerEnter` / `onPointerLeave`. Any `Pressable`s — including ones you forgot are Pressables, like `TurnCopyButton`, icon buttons, anything that handles a tap — live inside it.
-
-### Failure mode 2 — The hovered state changes the trigger's geometry
-
-Symptom: you hover a button, it changes appearance, then flickers between hovered and not-hovered without the cursor moving.
-
-Cause: the hover state changed the size or position of the trigger. The cursor was on the original element; the new layout shifts or shrinks it out from under the cursor; `onHoverOut` fires; state reverts; original layout returns; cursor is back over the trigger; `onHoverIn` fires; loop.
-
-Common variants:
-
-- Hover state changes the trigger's `width`, `height`, `padding`, or `borderWidth`.
-- Hover state mounts/unmounts a child that pushes the trigger to a new position.
-- Hover state swaps the trigger for a different element type, remounting it.
-
-Fixes, in preferred order:
-
-1. **Don't change the trigger's outer geometry on hover.** Change colors, opacity, borders that don't take layout space (`outlineWidth` on web, absolutely positioned overlays), or child content that fits inside the same fixed box. Never change `width`, `height`, `padding`, or `borderWidth` of the hover target itself.
-2. **Hide with `opacity` + `pointerEvents`, not conditional rendering**, when the hidden element lives inside the trigger. Mounting/unmounting on hover reflows the layout under the cursor.
-3. **Pin the hit area.** Set a fixed `minHeight` / `minWidth` on the trigger so internal swaps (icon-A becomes icon-B on hover) leave the bounding box unchanged. The workspace row's `minHeight: 36` is what makes the kebab/diff-stat swap stable.
-
-### Failure mode 3 — Revealed content lives outside the hover trigger
-
-If hovering element A reveals element B, B must be **inside** A's hover trigger. If B is a sibling, the moment the cursor moves from A toward B it crosses out of A's bounding box, `pointerleave` fires, B disappears.
-
-Wrong:
-
-```tsx
-<View>
-  <View onPointerEnter={...} onPointerLeave={...}>     {/* hover trigger */}
-    <Bubble />
-  </View>
-  <TrailingRow />                                       {/* OUTSIDE — sibling, not child */}
-</View>
-```
-
-Right:
-
-```tsx
-<View onPointerEnter={...} onPointerLeave={...}>      {/* hover trigger */}
-  <Bubble />
-  <TrailingRow />                                      {/* INSIDE — child */}
-</View>
-```
-
-Any gap between A and B (margins between siblings inside the same parent) is part of the parent's bounding box, so the cursor stays inside the hover region while crossing it. No bridge needed.
-
-If A and B genuinely can't share a parent — B portals into a different layer, floats above other content — see [Section: real gaps](#real-gaps-with-floating-panels) below.
-
-## Native fallback
-
-Hover doesn't exist on touch devices. Anything you hide behind hover must have a non-hover path on native and compact layouts:
-
-```tsx
-const showControls = isHovered || isNative || isCompact;
-```
-
-`isNative` and `isCompact` come from `@/constants/platform` and `@/constants/layout`. Don't use `Platform.OS === "ios"` as a proxy.
-
-`onPointerEnter` / `onPointerLeave` are DOM events. They do not fire on native. You do not need to gate them — on native, hover is unreachable anyway and visibility is driven by `isNative` / `isCompact` in your show-the-controls expression above. This is why the workspace row's pointer events are not wrapped in `if (isWeb)`.
-
-## What about `Pressable.onHoverIn` / `onHoverOut`?
-
-It's fine when a `Pressable` styles **itself** based on its own hover — for example, an icon button that changes color on hover. That's self-contained. The render-prop `<Pressable style={({ hovered }) => ...}>` does the same thing more cleanly and is the preferred form.
-
-It is **not** fine for tracking hover to drive state **outside** that `Pressable` (revealing a sibling, opening a tooltip, showing a kebab) when there is any other `Pressable` inside — because that's Failure Mode 1.
-
-Heuristic: if your hover state is going to be `useState`'d and read by anything other than the same `Pressable`'s own style, do not use `onHoverIn` / `onHoverOut`. Use the canonical pattern.
-
-## Real gaps with floating panels
-
-Sometimes the revealed content can't live inside the trigger — a hover card portals into a different layer, a tooltip floats above other content, a popover renders into a `Portal`. There's a real visual gap the user has to cross with the cursor.
-
-For this case, use `useHoverSafeZone` (`packages/app/src/hooks/use-hover-safe-zone.ts`). It computes a rectangular "bridge" between the trigger and the content; while the pointer is inside trigger, content, or the bridge, the card stays open. A short grace timer absorbs jitter at the edges. The canonical caller is `packages/app/src/components/workspace-hover-card.tsx`.
-
-Don't roll your own. The math is annoying, the edge cases (pointer leaves window, drag in progress, content unmounts) are subtle, and we already paid for the hook.
-
-## Pre-PR checklist
-
-Before opening a PR that touches hover:
-
-- [ ] Hover-tracking is on a plain `View` with `onPointerEnter` / `onPointerLeave`, **not** on a `Pressable` that wraps anything pressable.
-- [ ] Any press behavior lives on a separate inner `Pressable` that does not have `onHoverIn` / `onHoverOut`.
-- [ ] The hover trigger's bounding box contains every element the user might mouse into while interacting with the feature.
-- [ ] Hovered state does **not** change the trigger's outer geometry (`width`, `height`, `padding`, `borderWidth`, mount/unmount of siblings that shift it). Internal swaps fit inside a fixed `minHeight` / `minWidth`.
-- [ ] Revealed content inside the trigger uses `opacity` + `pointerEvents`, not conditional rendering, if mounting it would reflow the trigger.
-- [ ] Visibility on native and compact layouts works without hover (`isHovered || isNative || isCompact`).
-- [ ] If the revealed content sits in a separate layer (portal, floating panel), `useHoverSafeZone` is wired up.
-- [ ] You opened the dev server, hovered the trigger, and slowly moved the mouse along **every** revealed element — including any visible gaps — without losing hover state.

docs/mobile-testing.md

@@ -143,7 +143,7 @@ Maestro `inputText` fires one character at a time. React Native's **controlled**
 
 For inputs that E2E flows type into (host endpoint, pairing URL, etc.), use an **uncontrolled ref-backed input**: `defaultValue` + `onChangeText` writes into a `useRef`, reads via the ref on submit. No per-keystroke re-render, no dropped characters.
 
-See `pair-link-modal.tsx` for the pattern (`useRef`-backed `onChangeText`, no `value=` prop). Always pair the source change with a Maestro `assertVisible` on the input's `id + text` after `inputText`, so regressions are caught immediately.
+See `add-host-modal.tsx` and `pair-link-modal.tsx` for the pattern. Always pair the source change with a Maestro `assertVisible` on the input's `id + text` after `inputText`, so regressions are caught immediately.
 
 ### Dropdowns that launch native presenters (iOS)
 

docs/opencode-global-event-baseline.md

@@ -1,49 +0,0 @@
-# OpenCode Global Event Verification
-
-Date: 2026-05-11
-
-## Objective
-
-Replace the OpenCode provider's per-directory `/event` stream with OpenCode's `/global/event` stream and remove the EOF polling recovery path that was added for the `/event` regression.
-
-## Environment
-
-- `opencode --version`: `1.14.46`
-- `which opencode`: `/Users/moboudra/.asdf/installs/nodejs/22.20.0/bin/opencode`
-- `node --version`: `v22.20.0`
-- `npm --version`: `10.9.3`
-
-Each OpenCode test file was run independently with:
-
-```bash
-/opt/homebrew/bin/timeout 420s npx vitest run <file> --maxWorkers=1 --minWorkers=1
-```
-
-## Baseline
-
-Before the provider change, the OpenCode matrix had 16 passing files and 4 failing files:
-
-- `packages/cli/tests/e2e/opencode-invalid-model.test.ts`: Vitest reports "No test suite found in file".
-- `packages/server/src/server/agent/providers/opencode-agent.test.ts`: `plan mode blocks edits while build mode can write files` did not observe a completed tool call.
-- `packages/server/src/server/daemon-e2e/opencode-initial-prompt-wait.real.e2e.test.ts`: brittle unavailable-model assertion received an auth failure from the upstream API.
-- `packages/server/src/server/daemon-e2e/opencode-send-interrupt.real.e2e.test.ts`: timed out waiting for an interrupted sleep tool call, even though the recent bash tool call status was `failed`.
-
-## Post-Change Result
-
-After switching to `/global/event`, removing polling recovery, and replacing the brittle initial-prompt model case with `opencode/big-pickle`, the OpenCode matrix had 18 passing files and 2 baseline-equivalent failing files:
-
-- `packages/cli/tests/e2e/opencode-invalid-model.test.ts`: unchanged; Vitest still reports "No test suite found in file".
-- `packages/server/src/server/daemon-e2e/opencode-send-interrupt.real.e2e.test.ts`: unchanged; still times out after the interrupted sleep tool call is already marked `failed`.
-
-The previously failing provider unit file now passes, and `packages/server/src/server/daemon-e2e/opencode-initial-prompt-wait.real.e2e.test.ts` passes with `opencode/big-pickle`.
-
-One live reasoning-dedup matrix run returned no reasoning content; an immediate targeted rerun passed. This appears model-output dependent rather than related to the event-stream change.
-
-## Focused Verification
-
-- `npm run typecheck`
-- `npm run lint`
-- `git diff --check`
-- `npx vitest run packages/server/src/server/agent/providers/opencode-agent.test.ts --maxWorkers=1 --minWorkers=1`
-- `npx vitest run packages/server/src/server/agent/providers/opencode-agent.error-handling.real.e2e.test.ts --maxWorkers=1 --minWorkers=1`
-- `npx vitest run packages/server/src/server/daemon-e2e/opencode-initial-prompt-wait.real.e2e.test.ts --maxWorkers=1 --minWorkers=1`

docs/product.md

@@ -67,14 +67,10 @@ Anyone who builds software:
 3. **The daemon as infrastructure.** Server/client architecture enables deployment anywhere.
 4. **Open source outlasts funding.** Open source communities are resilient. Contributors become advocates.
 
-## Current state (May 2026)
+## Current state (March 2026)
 
 - Desktop (Electron), mobile (iOS/Android), web, CLI
-- Built-in providers: Claude Code (Agent SDK), Codex (app-server), GitHub Copilot (ACP), OpenCode, Pi
-- One-click ACP provider catalog: Cursor, Hermes, Qwen Coder, Kimi Code, and others — plus custom ACP providers
-- Voice mode: dictate prompts or talk through problems hands-free
-- MCP server exposes the daemon to other agents (create_agent, send_agent_prompt, schedules, terminals, worktrees)
-- Scheduled agents (cron-style triggers) via app, CLI, and MCP
-- Frequent releases (multiple per week)
-- Community contributions across packaging, providers, and bug fixes
-- Key UX: split panes, keybinding customization, workspace model, in-app browser
+- Providers: Claude Code (Agent SDK), Codex (app-server), OpenCode
+- Daily releases
+- Community contributions starting (packaging, bug fixes)
+- Key UX: split panes, keybinding customization, workspace model

docs/providers.md

@@ -6,27 +6,15 @@ This guide walks through adding a new agent provider end-to-end. There are two i
 
 ### ACP (Agent Client Protocol) -- recommended
 
-Extend `ACPAgentClient` from `packages/server/src/server/agent/providers/acp-agent.ts`. The base class handles process spawning, stdio transport, session lifecycle, streaming, permissions, and model discovery. You provide configuration (command, modes, capabilities) and optionally override `isAvailable()` for auth checks.
+Extend `ACPAgentClient`. The base class handles process spawning, stdio transport, session lifecycle, streaming, permissions, and model discovery. You provide configuration (command, modes, capabilities) and optionally override `isAvailable()` for auth checks.
 
-The only built-in ACP provider today is `copilot` (`copilot-acp-agent.ts`). `GenericACPAgentClient` (`generic-acp-agent.ts`) is also ACP-based but is used for user-defined custom providers configured via `extends: "acp"` overrides — see [docs/custom-providers.md](custom-providers.md).
+Existing ACP providers: `claude-acp`, `copilot`.
 
 ### Direct
 
-Implement the `AgentClient` and `AgentSession` interfaces from `agent-sdk-types.ts` yourself. This gives full control but requires you to handle process management, streaming, permissions, and session persistence from scratch.
+Implement the `AgentClient` and `AgentSession` interfaces yourself. This gives full control but requires you to handle process management, streaming, permissions, and session persistence from scratch.
 
-Existing direct providers: `claude` (in `providers/claude/agent.ts`), `codex` (`codex-app-server-agent.ts`), `opencode` (`opencode-agent.ts`), `pi` (`pi-direct-agent.ts`). The dev-only `mock` provider (`mock-load-test-agent.ts`) is also direct.
-
-Draft metadata lookups should avoid creating provider sessions when the upstream provider has top-level APIs for that metadata. Prefer `AgentClient.listModels`, `listModes`, `listCommands`, or `listFeatures` over creating a scratch `AgentSession`; scratch sessions can show up as empty native sessions in provider import/history UIs.
-
----
-
-## Provider Snapshot Refresh Contract
-
-The daemon keeps one global provider snapshot, keyed to the home directory, for settings, selectors, and old model/mode list requests. Snapshot reads may probe providers only while the snapshot is cold. Once an entry is warm, its `ready`, `error`, or `unavailable` state stays cached until the user forces a refresh from settings/provider management.
-
-Do not add TTL revalidation, focus-triggered refreshes, selector-open refreshes, or config-reload refreshes. Registry/config replacement may update visible metadata such as label, description, default mode, enabled state, and provider membership, but it must not spawn provider processes. If a provider needs to be re-probed after a config change, route that through the explicit settings refresh path.
-
-Boundary tests should assert observable behavior: cold reads may call provider availability/model/mode discovery; warm reads and registry replacement must not; explicit full or targeted refreshes must.
+Existing direct providers: `claude`, `codex`, `opencode`.
 
 ---
 
@@ -163,7 +151,7 @@ export const AGENT_PROVIDER_DEFINITIONS: AgentProviderDefinition[] = [
 
 ### 3. Add the factory to the provider registry
 
-In `packages/server/src/server/agent/provider-registry.ts`, import your class and add a factory entry to `PROVIDER_CLIENT_FACTORIES`:
+In `packages/server/src/server/agent/provider-registry.ts`, import your class and add a factory entry:
 
 ```ts
 import { MyProviderACPAgentClient } from "./providers/my-provider-agent.js";
@@ -173,13 +161,11 @@ const PROVIDER_CLIENT_FACTORIES: Record<string, ProviderClientFactory> = {
   "my-provider": (logger, runtimeSettings) =>
     new MyProviderACPAgentClient({
       logger,
-      runtimeSettings,
+      runtimeSettings: runtimeSettings?.["my-provider"],
     }),
 };
 ```
 
-The factory is invoked with `(logger, runtimeSettings, options)`; `options.workspaceGitService` is also available if you need it (see the `codex` factory for an example). The registry already passes the per-provider runtime settings slice through, so you don't index into the map yourself.
-
 ### 4. Add a provider icon (app)
 
 Create `packages/app/src/components/icons/my-provider-icon.tsx` following the pattern from existing icons (e.g., `claude-icon.tsx`):
@@ -201,18 +187,19 @@ export function MyProviderIcon({ size = 16, color = "currentColor" }: MyProvider
 }
 ```
 
-Then register it in `packages/app/src/components/provider-icons.ts` by adding an entry to the existing `PROVIDER_ICONS` map (which already covers the built-in providers):
+Then register it in `packages/app/src/components/provider-icons.ts`:
 
 ```ts
 import { MyProviderIcon } from "@/components/icons/my-provider-icon";
 
 const PROVIDER_ICONS: Record<string, typeof Bot> = {
-  // ... existing entries ...
+  claude: ClaudeIcon as unknown as typeof Bot,
+  codex: CodexIcon as unknown as typeof Bot,
   "my-provider": MyProviderIcon as unknown as typeof Bot,
 };
 ```
 
-If no icon is registered, `getProviderIcon()` falls back to a generic `Bot` icon from lucide.
+If no icon is registered, the app falls back to a generic `Bot` icon from lucide.
 
 ### 5. Add E2E test config
 
@@ -232,25 +219,25 @@ export const agentConfigs = {
 } as const satisfies Record<string, AgentTestConfig>;
 ```
 
-Add an availability check in `isProviderAvailable()`. Note `isCommandAvailable` is async, so all branches `await` it:
+Add an availability check in `isProviderAvailable()`:
 
 ```ts
 case "my-provider":
   return (
-    (await isCommandAvailable("my-agent-binary")) &&
+    isCommandAvailable("my-agent-binary") &&
     Boolean(process.env.MY_PROVIDER_API_KEY)
   );
 ```
 
-Add to the `allProviders` array (current built-ins are `claude`, `codex`, `copilot`, `opencode`, `pi`):
+Add to the `allProviders` array:
 
 ```ts
 export const allProviders: AgentProvider[] = [
   "claude",
+  "claude-acp",
   "codex",
   "copilot",
   "opencode",
-  "pi",
   "my-provider",
 ];
 ```
@@ -271,9 +258,7 @@ If your agent does not speak ACP, implement the interfaces from `agent-sdk-types
 
 ### Interfaces to implement
 
-The interfaces below are abridged signatures — read `agent-sdk-types.ts` for the full source of truth (option bag types, generics, etc.).
-
-**`AgentClient`** -- factory for sessions and model/mode listing:
+**`AgentClient`** -- factory for sessions and model listing:
 
 ```ts
 interface AgentClient {
@@ -282,19 +267,16 @@ interface AgentClient {
   createSession(
     config: AgentSessionConfig,
     launchContext?: AgentLaunchContext,
-    options?: AgentCreateSessionOptions,
   ): Promise<AgentSession>;
   resumeSession(
     handle: AgentPersistenceHandle,
     overrides?: Partial<AgentSessionConfig>,
     launchContext?: AgentLaunchContext,
   ): Promise<AgentSession>;
-  listModels(options: ListModelsOptions): Promise<AgentModelDefinition[]>;
+  listModels(options?: ListModelsOptions): Promise<AgentModelDefinition[]>;
   isAvailable(): Promise<boolean>;
   // Optional:
-  listModes?(options: ListModesOptions): Promise<AgentMode[]>;
   listPersistedAgents?(options?: ListPersistedAgentsOptions): Promise<PersistedAgentDescriptor[]>;
-  getDiagnostic?(): Promise<{ diagnostic: string }>;
 }
 ```
 
@@ -305,7 +287,6 @@ interface AgentSession {
   readonly provider: AgentProvider;
   readonly id: string | null;
   readonly capabilities: AgentCapabilityFlags;
-  readonly features?: AgentFeature[];
   run(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<AgentRunResult>;
   startTurn(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<{ turnId: string }>;
   subscribe(callback: (event: AgentStreamEvent) => void): () => void;
@@ -315,10 +296,7 @@ interface AgentSession {
   getCurrentMode(): Promise<string | null>;
   setMode(modeId: string): Promise<void>;
   getPendingPermissions(): AgentPermissionRequest[];
-  respondToPermission(
-    requestId: string,
-    response: AgentPermissionResponse,
-  ): Promise<AgentPermissionResult | void>;
+  respondToPermission(requestId: string, response: AgentPermissionResponse): Promise<void>;
   describePersistence(): AgentPersistenceHandle | null;
   interrupt(): Promise<void>;
   close(): Promise<void>;
@@ -326,10 +304,6 @@ interface AgentSession {
   listCommands?(): Promise<AgentSlashCommand[]>;
   setModel?(modelId: string | null): Promise<void>;
   setThinkingOption?(thinkingOptionId: string | null): Promise<void>;
-  setFeature?(featureId: string, value: unknown): Promise<void>;
-  tryHandleOutOfBand?(prompt: AgentPromptInput): {
-    run(ctx: { emit: (event: AgentStreamEvent) => void }): Promise<void>;
-  } | null;
 }
 ```
 

docs/release.md

@@ -14,18 +14,18 @@ There are two supported ways to ship from `main`:
 Before running any stable patch release command:
 
 - Make sure the intended release commit is already committed to `main` and the working tree is clean.
-- **Run `npm run format`, `npm run lint`, and `npm run typecheck` and commit any resulting changes BEFORE you start any `release:*` command.** `release:check` runs `npm install --workspaces --include-workspace-root` as part of `release:prepare`, which can mutate `package-lock.json` (e.g. churning `"dev": true` markers on optional deps). The next step, `version:all:*`, runs `npm version` which aborts when the working tree is dirty. If this happens mid-flight you have to commit the lockfile churn before retrying — and the pre-commit format hook will reject a lockfile-only commit because oxfmt internally skips `package-lock.json` while lefthook's glob still matches it. Avoid the whole mess by running format/lint/typecheck first, then `release:prepare` once on its own to absorb any lockfile churn into a normal commit, then start the release.
+- Make sure local `npm run typecheck` passes on that commit.
 - Do not use `npm run release:patch` as a substitute for checking whether the current commit is actually ready.
 
 ```bash
 npm run release:patch
 ```
 
-This bumps the version across all workspaces, runs checks, publishes to npm, and pushes the branch + tag. The tag push triggers `Desktop Release`, `Android APK Release`, and `Release Notes Sync` on GitHub Actions. EAS picks up the same tag via the EAS GitHub app and starts the iOS + Android store builds in parallel (see "Mobile builds (EAS)" below) — there is no `release-mobile.yml` in this repo.
+This bumps the version across all workspaces, runs checks, publishes to npm, and pushes the branch + tag (triggering desktop, APK, and EAS mobile workflows).
 
-**Releases are always patch.** "Release paseo", "release stable", "ship stable", and similar always mean a patch bump from the previous stable. Never bump minor or major to trigger a build, ever — minor and major bumps are reserved for genuinely larger product cuts and require an explicit user instruction with the word "minor" or "major". If you find yourself reaching for `release:minor` to retrigger a failed build, you are doing the wrong thing — push a retry tag instead (see "Fixing a failed release build" below).
+If asked to "release paseo" without specifying major/minor, treat it as a patch release.
 
-**Stable means stable.** If the user says "stable" or "ship stable", do not ask whether they want a beta first. They picked stable; treat it as a direct stable release. Only run the beta flow when the user explicitly says "beta".
+Use the direct stable path when the current `main` changes are ready to become the public release immediately.
 
 ## Manual step-by-step
 
@@ -61,7 +61,7 @@ Use the beta path when you need to:
 
 ## Staged rollout (stable channel)
 
-Stable desktop releases go out via a linear time-based rollout: 0% admitted when the updater manifests appear, 100% admitted 36 hours later, linear ramp in between. Beta releases bypass the rollout entirely — beta users always receive updates immediately.
+Stable desktop releases go out via a linear time-based rollout: 0% admitted when the updater manifests appear, 100% admitted 24 hours later, linear ramp in between. Beta releases bypass the rollout entirely — beta users always receive updates immediately.
 
 The rollout is driven by a `rolloutHours` field stamped into the GitHub Release manifests (`latest-mac.yml`, `latest-linux.yml`, `latest.yml`) by the `finalize-rollout` job in `desktop-release.yml`.
 
@@ -74,16 +74,16 @@ Updater clients only discover a release through those `.yml` manifests, so there
 
 ### Default behavior
 
-`npm run release:patch` → tag push → 36h ramp. No extra action needed.
+`npm run release:patch` → tag push → 24h ramp. No extra action needed.
 
-The `rollout_hours` input on `desktop-release.yml` is **only read on `workflow_dispatch`** — tag-push runs always default to 36. To get any other rollout duration on a fresh release, use the post-publish flip below.
+The `rollout_hours` input on `desktop-release.yml` is **only read on `workflow_dispatch`** — tag-push runs always default to 24. To get any other rollout duration on a fresh release, use the post-publish flip below.
 
 ### Instant-admit release (rollout_hours=0 from publish)
 
 For a fresh release that should admit everyone immediately (low-risk change, doc-only, hotfix, or just a release you want out fast), cut the release normally and queue the rollout flip immediately after:
 
 ```bash
-# 1. Cut and publish (default 36h ramp from tag push).
+# 1. Cut and publish (default 24h ramp from tag push).
 npm run release:patch
 
 # 2. Immediately queue the flip — runs as soon as finalize-rollout completes.
@@ -92,7 +92,7 @@ gh workflow run desktop-rollout.yml \
   -f rollout_hours=0
 ```
 
-**Why this is gap-free:** `desktop-release.yml`'s `finalize-rollout` job and `desktop-rollout.yml` share the concurrency group `desktop-rollout-<tag>`. Dispatching `desktop-rollout.yml` while the tag-push pipeline is still running queues it safely behind `finalize-rollout`. The first public manifests already carry `rolloutHours=36`, then `desktop-rollout.yml` flips them to `rolloutHours=0` shortly afterward. The renderer polls every 30 minutes, so active stable users pick up the new manifest on their next check.
+**Why this is gap-free:** `desktop-release.yml`'s `finalize-rollout` job and `desktop-rollout.yml` share the concurrency group `desktop-rollout-<tag>`. Dispatching `desktop-rollout.yml` while the tag-push pipeline is still running queues it safely behind `finalize-rollout`. The first public manifests already carry `rolloutHours=24`, then `desktop-rollout.yml` flips them to `rolloutHours=0` shortly afterward. The renderer polls every 30 minutes, so active stable users pick up the new manifest on their next check.
 
 Run the dispatch right after `release:patch` returns. Don't wait for the tag-push CI to finish.
 
@@ -132,7 +132,7 @@ gh workflow run desktop-release.yml \
   -f rollout_hours=6
 ```
 
-This does **not** apply to fresh releases cut via `npm run release:patch` — that path always tag-pushes and stamps 36. For a fresh release with a custom ramp, cut normally and then dispatch `desktop-rollout.yml` (same pattern as the instant-admit flow above, with your chosen `rollout_hours`).
+This does **not** apply to fresh releases cut via `npm run release:patch` — that path always tag-pushes and stamps 24. For a fresh release with a custom ramp, cut normally and then dispatch `desktop-rollout.yml` (same pattern as the instant-admit flow above, with your chosen `rollout_hours`).
 
 ### Releasing during an active rollout
 
@@ -147,73 +147,11 @@ If N+1 is a hotfix for a bug in N, dispatch `desktop-rollout.yml -f tag=v0.1.<N+
 - **Bootstrap caveat.** Clients running a build older than the rollout feature ignore `rolloutHours` and admit immediately. Rollout protection only applies to clients running the rollout-aware version or later.
 - **Up to ~30 min admission latency.** Renderer polls every 30 minutes, so a stable user may take up to that long to be evaluated against the rollout window.
 
-## Mobile builds (EAS)
-
-iOS and Android store builds are not in `.github/workflows`. They are triggered by the EAS GitHub app the moment the `v*` tag is pushed:
-
-- **Android (Play Store)** — EAS builds with profile `production` and auto-submits to the Play Store via `eas submit` (EAS-managed credentials, no Fastlane).
-- **iOS (TestFlight + App Store)** — EAS builds with profile `production`, uploads to TestFlight, and a Fastlane lane submits the build for App Store review.
-- **Android APK (GitHub Release asset)** — separate, via `.github/workflows/android-apk-release.yml`. This is the only Android-related workflow that lives in this repo.
-
-There is no `release-mobile.yml` in this repo. Earlier versions of these docs referenced one — that workflow was removed and the EAS GitHub app handles tag triggering directly.
-
-### Watching mobile builds from the terminal
-
-Use the EAS CLI from `packages/app/`:
-
-```bash
-cd packages/app
-
-# Recent builds (newest first). Pipe to jq for status only.
-npx eas build:list --limit 8 --non-interactive --json | jq '.[] | {platform, status, appVersion, gitCommitHash}'
-
-# Filter by platform.
-npx eas build:list --platform ios --limit 5 --non-interactive --json
-npx eas build:list --platform android --limit 5 --non-interactive --json
-
-# Inspect a specific build.
-npx eas build:view <build-id>
-
-# Stream logs for a build.
-npx eas build:view <build-id> --json | jq '.logFiles[]'
-```
-
-A build's `gitCommitHash` must match the release tag commit. `status` walks through `NEW` → `IN_QUEUE` → `IN_PROGRESS` → `FINISHED` (or `ERRORED`/`CANCELED`).
-
-Once a build is `FINISHED`, EAS auto-submits it to the store: Android via the `submit` block in `eas.json` (EAS-managed Play Console credentials), iOS via the Fastlane `submit_review` lane (uploads to TestFlight, then submits for App Store review). To confirm the submission landed, run `npx eas build:view <build-id>` and open the `Logs` URL it prints — the build's Expo dashboard page has a Submissions section listing each attempt with its store response. App Store Connect (TestFlight tab → ready for review) and the Play Console (Internal testing / Production tracks) are the final ground truth.
-
-### Babysitting mobile after a release
-
-The user rarely opens the Expo dashboard. A failed EAS build can sit silently until users complain about a stale version. After every stable release, set up a long-delay babysit that re-checks both EAS builds and GitHub Actions for the release tag. If anything is `ERRORED` or `FAILED`, surface it immediately. If everything is `FINISHED`/`SUCCESS`, confirm and stop.
-
-**Use a heartbeat schedule, never a new-agent schedule.** Babysitting fires back into the current conversation as a wake-up prompt — `target: "self"` in `mcp__paseo__create_schedule`. Never use `target: "new-agent"`. A new agent spawns a fresh conversation the user has to find and read; a heartbeat surfaces the build status inline in the conversation that owns the release, where it is impossible to miss. If you find yourself reaching for `new-agent` for a release babysit, you are about to ship a status report into a void.
-
-Pattern:
-
-```jsonc
-// mcp__paseo__create_schedule arguments
-{
-  "name": "vX.Y.Z release babysit heartbeat",
-  "every": "15m",
-  "maxRuns": 8, // covers ~2h of build + store-submission window
-  "target": "self", // heartbeat, NOT "new-agent"
-  "cwd": "/path/to/paseo",
-  "prompt": "Heartbeat: check vX.Y.Z release builds. Run gh run list + eas build:list, report concisely; flag any ERRORED/FAILED/CANCELED.",
-}
-```
-
-Tight cadence on purpose. The first run fires immediately, giving a near-real-time status check before the conversation closes. Subsequent runs at 15-minute intervals catch transitions quickly: a failed EAS build that errors at +20m should not wait until +50m to surface. Keep the prompt short — the heartbeat is a status probe, not a research task — and have it bail out as soon as everything is green so the remaining runs do not generate noise.
-
-## Release notes on GitHub
-
-The GitHub Release body is populated automatically by the `Release Notes Sync` workflow (`.github/workflows/release-notes-sync.yml`). It triggers on every `v*` tag push and on any push to `main` that touches `CHANGELOG.md`, then runs `scripts/sync-release-notes-from-changelog.mjs` to mirror the matching changelog entry into the release body. You don't need to write release notes on GitHub manually — keep `CHANGELOG.md` correct and the workflow will sync it. To force a re-sync, dispatch the workflow with the tag input.
-
 ## Website behavior
 
 - The website download page points to GitHub's latest published **stable** release.
 - Published beta prereleases are public on GitHub Releases, but they do **not** become the website download target.
 - The website only moves when you publish the final stable release tag like `v0.1.41`.
-- The website itself is deployed by `Deploy Website` (Cloudflare Workers), which redeploys on `release: published` for non-prerelease releases and on pushes to `main` that touch `CHANGELOG.md` or `packages/website/**`.
 
 ## Fixing a failed release build
 
@@ -287,20 +225,7 @@ No prefix (`v`), no extra text. The parser matches the first `## X.Y.Z` line to
 The changelog is shown on the Paseo homepage. Write it for **end users**, not developers.
 
 - **Frame everything from the user's perspective.** Describe what changed in the app, not what changed in the code. Users care that "workspaces load instantly" — not that a component no longer remounts.
-- **Never mention component names, internal modules, or implementation details.** No `WorkingIndicator`, no `accumulatedUsage`, no `reconcileAndEmitWorkspaceUpdates`. Also no "virtualized lists", no "remount", no "memoization", no "debounced", no "fuzzy ranking", no "controlled input", no "uncontrolled input" — these are implementation words masquerading as user-facing copy.
-- **Concrete WRONG → RIGHT examples** (real mistakes from past releases):
-
-  | Wrong (implementation-facing)                                                       | Right (user-facing)                                         |
-  | ----------------------------------------------------------------------------------- | ----------------------------------------------------------- |
-  | Switching layouts no longer remounts the active agent                               | Splitting a pane no longer loses your scroll position       |
-  | Model, mode, and thinking pickers — searchable virtualized lists with fuzzy ranking | Mobile model selector is faster and more straightforward    |
-  | Text inputs in mobile sheets no longer flicker while typing fast                    | Typing in mobile sheets no longer flickers                  |
-  | Compact web sheets no longer crash when swiped to dismiss                           | Sheets on mobile web no longer crash when swiped to dismiss |
-  | Reduced re-renders in the agent list                                                | Agent list scrolls smoothly                                 |
-  | Added debouncing to the search input                                                | Search results no longer lag behind typing                  |
-
-  Test: would a non-developer reader recognise what changed when using the app? If they'd need an engineer to translate ("what's a remount?"), the bullet is still implementation-facing — rewrite it as the symptom the user experiences.
-
+- **Never mention component names, internal modules, or implementation details.** No `WorkingIndicator`, no `accumulatedUsage`, no `reconcileAndEmitWorkspaceUpdates`.
 - **Collapse internal iterations.** If a feature was added and then fixed within the same release, just list the feature as working. Users never saw the broken version.
 - **Only list changes relative to the previous stable release.** The diff is `v(previous)..HEAD`. If something was introduced and fixed between those two tags, it never shipped — don't mention the fix.
   - **Common trap:** when drafting from `git log`, every commit looks like a separate bullet — including the "fix X" commits that landed on top of a brand-new feature in the same release window. Before listing a Fixed entry, check whether the thing being fixed was itself added in this same release. If so, drop the fix and fold it into the feature bullet.
@@ -311,12 +236,9 @@ The changelog is shown on the Paseo homepage. Write it for **end users**, not de
 
 Every bullet must be scannable at a glance. The changelog is not release documentation — it's a list.
 
-- **One sentence per bullet, max.** If a bullet contains two sentences, the second one is doing work that belongs in product docs, not the changelog. Cut it.
-- **No trailing periods.** Bullets are list items, not prose. Drop the period at the end of every bullet, including the period inside any bolded lead-in. `**Configurable terminal scrollback**` not `**Configurable terminal scrollback.**`.
 - **One line per bullet.** If a bullet wraps to three lines in a narrow column, it's too long.
 - **Split bullets that pack multiple distinct changes.** If a bullet uses "and", "plus", a comma list, or an em-dash to chain several independent improvements, break them into separate bullets — even when they share a theme or author. One bullet = one user-facing change.
 - **Trim qualifying clauses.** Drop "with a hint shown when…", "matching the CLI's behaviour", "across common install shapes". If the detail doesn't change whether a user cares, cut it.
-- **Lead with what the user can do, not the mechanism.** The reader cares about the capability, not how it works under the hood. Do not explain LAN vs WAN, TLS handshakes, IPC, the daemon-relay topology, or any internal concept the user has not asked about. "Self-hosted relays can use a different TLS setting for the public endpoint" — not "Self-hosted relays support a separate TLS setting for the public endpoint, so the daemon can reach the relay over the LAN while the phone reaches it over the public secure address." If a feature genuinely needs background to be understood, it belongs in product docs, with a one-line teaser in the changelog.
 - **Lead with the outcome.** "Windows: agents launch reliably from npm `.cmd` shims…" is better than "Windows: agents launch reliably across common install shapes. Claude, Codex, and OpenCode now start correctly…".
 - **Attribution follows the split.** When you split a dense bullet, move each PR/author to the bullet it belongs to. Never duplicate the same PR across multiple bullets.
 
@@ -392,5 +314,4 @@ In other words, betas are checkpoints along the way; the changelog entry remains
 - [ ] `npm run release:patch` or `npm run release:promote` completes successfully
 - [ ] GitHub `Desktop Release` workflow for the `v*` tag is green
 - [ ] GitHub `Android APK Release` workflow for the same tag is green
-- [ ] EAS iOS production build for the same tag completes and submits via Fastlane
-- [ ] EAS Android production build for the same tag completes and auto-submits to the Play Store
+- [ ] EAS `release-mobile.yml` workflow for the same tag is green

docs/rpc-namespacing.md

@@ -1,84 +0,0 @@
-# RPC Namespacing
-
-New WebSocket session RPCs use dotted names with the direction as the final segment:
-
-```ts
-checkout.github.set_auto_merge.request;
-checkout.github.set_auto_merge.response;
-```
-
-The namespace reads left to right:
-
-- Domain: `checkout`
-- Provider or subsystem: `github`
-- Operation: `set_auto_merge`
-- Direction: `request` or `response`
-
-Use dots, not slashes. Dots are protocol namespaces; slashes imply paths or transport routing.
-
-## Request/Response Pairs
-
-For ordinary correlated RPCs, a `.request` has a matching `.response` with the same prefix. The daemon client may derive the response type mechanically:
-
-```ts
-checkout.github.set_auto_merge.request;
-// -> checkout.github.set_auto_merge.response
-```
-
-Most new RPCs should follow this shape. If a request does not have a one-to-one response, call that out in the code near the schema.
-
-## Message Shape
-
-Requests keep their parameters at the top level:
-
-```ts
-{
-  type: "checkout.github.set_auto_merge.request",
-  cwd: "/repo",
-  enabled: true,
-  mergeMethod: "squash",
-  requestId: "req_123"
-}
-```
-
-Responses put correlated result data under `payload`:
-
-```ts
-{
-  type: "checkout.github.set_auto_merge.response",
-  payload: {
-    cwd: "/repo",
-    enabled: true,
-    success: true,
-    error: null,
-    requestId: "req_123"
-  }
-}
-```
-
-Keep `requestId` in both request and response payloads. It is the correlation key.
-
-## Provider Namespacing
-
-Provider-specific behavior belongs under the provider segment:
-
-- `checkout.github.*` for GitHub-specific checkout operations
-- `checkout.gitlab.*` for future GitLab-specific checkout operations
-
-Do not put GitHub-specific enums or semantics into generic checkout RPC names. A generic RPC should only exist when the behavior is genuinely provider-neutral.
-
-## Compatibility
-
-The existing flat RPC names remain part of the protocol until they are intentionally migrated:
-
-```ts
-checkout_pr_merge_request;
-checkout_pr_merge_response;
-```
-
-Do not add new flat names. When migrating old RPCs, keep protocol compatibility rules in mind:
-
-- Add the new names first.
-- Gate new feature behavior through `server_info.features.*` when an old host cannot support it.
-- Keep old names accepted until the compatibility window expires.
-- Mark shims with `COMPAT(...)` and a removal date.

docs/testing.md

@@ -98,37 +98,6 @@ When a test is labeled end-to-end, it calls the real service. No environment var
 - Test bodies should read like plain English
 - Build a vocabulary of test helpers that make complex flows simple
 
-### File naming
-
-Vitest picks up tests by suffix. The suffix tells the runner which category it belongs to.
-
-| Suffix                | What it is                                                                                         | Where it runs                                                                        |
-| --------------------- | -------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------ |
-| `*.test.ts(x)`        | Unit test — pure, fast, no daemon                                                                  | `npm run test:unit`                                                                  |
-| `*.posix.test.ts`     | Unit test that needs POSIX-only behavior                                                           | unit, skipped on Windows                                                             |
-| `*.browser.test.ts`   | App test that needs a real browser (DOM)                                                           | `npm run test:browser` (Vitest browser mode, Playwright provider, headless Chromium) |
-| `*.e2e.test.ts`       | End-to-end against a real daemon                                                                   | `npm run test:e2e`                                                                   |
-| `*.real.e2e.test.ts`  | E2E that hits a real provider (Claude/Codex/OpenCode) — needs creds in `packages/server/.env.test` | `npm run test:integration:real` / `test:e2e:real`                                    |
-| `*.local.e2e.test.ts` | E2E that needs a local-only resource                                                               | `npm run test:integration:local` / `test:e2e:local`                                  |
-
-App-level Playwright browser E2E lives in `packages/app/e2e/*.spec.ts` and runs via `npm run test:e2e --workspace=@getpaseo/app` (separate from Vitest E2E).
-
-### Test setup
-
-- Server: `packages/server/src/test-utils/vitest-setup.ts` loads `.env.test`, sets `PASEO_SUPERVISED=0`, and disables Git/SSH prompts. Add new global env shims here, not in individual tests.
-- App: `packages/app/vitest.setup.ts` provides `expo`/`__DEV__` shims and stubs a few native-only modules (`react-native-unistyles`, `react-native-svg`, `expo-linking`, `@xterm/addon-ligatures`). Stubbing here is for modules that have no meaningful Node behavior — not a license to mock app code.
-
-## Running tests locally
-
-Test suites in this repo are heavy. Running them in bulk freezes the machine, especially with multiple agents in parallel.
-
-- Run only the file you changed: `npx vitest run <path> --bail=1`
-- Never run `npm run test` for a whole workspace unless asked.
-- For a broad sweep, redirect to a file and read it after: `npx vitest run <path> --bail=1 > /tmp/test-output.txt 2>&1`
-- Never re-run a suite another agent already reported green.
-- For full-suite confidence, push to CI and check GitHub Actions.
-- Never run Playwright E2E (`packages/app/e2e/*.spec.ts`) locally — defer to CI.
-
 ## Agent authentication in tests
 
 Agent providers handle their own auth. Do not add auth checks, environment variable gates, or conditional skips to tests. If auth fails, report it.

docs/unistyles.md

@@ -64,9 +64,9 @@ If you add a new `useUnistyles()` call, leave a comment on the line explaining w
 Do not introduce `useUnistyles()` in or above any of these subtrees — re-renders here are observably expensive:
 
 - `AgentStreamView` and anything it renders (message rows, tool calls, plan card, todo list, activity log, compaction marker, copy buttons)
-- `AgentPanel` body (`packages/app/src/panels/agent-panel.tsx`)
+- `AgentPanel` body / `AgentStreamSection` / `AgentComposerSection`
 - `Composer` and `MessageInput`
-- `WorkspaceScreen` shell, `WorkspaceDesktopTabsRow`, deck wrapper
+- `WorkspaceScreen` shell, tabs row, deck wrapper
 - `LeftSidebar` row items, `SidebarWorkspaceList`, `CommandCenter`
 - Anything inside a virtualized list (`@tanstack/react-virtual`, `FlashList`)
 
@@ -124,9 +124,18 @@ const styles = StyleSheet.create((theme) => ({
 
 This is the pattern used by the settings screen: the screen background lives on a normal `View style={styles.container}`, while the scroll content container only carries layout.
 
-In practice the wrapper-`View` pattern is the one we use. Across the app, `withUnistyles` is now reserved for wrapping leaf components — mostly lucide icons (`ThemedActivityIndicator`, `ThemedChevronDown`, …) and small third-party components like `MarkdownWithStableRenderer` — so they pick up theme-reactive `color`/`tintColor` props without re-rendering their parent.
+When the content container itself needs themed behavior, wrap the component with [`withUnistyles`](https://www.unistyl.es/v3/references/with-unistyles):
 
-In principle, [`withUnistyles`](https://www.unistyl.es/v3/references/with-unistyles) can also wrap a `ScrollView` to make `contentContainerStyle` theme-reactive via its [auto-mapping behavior for `style` and `contentContainerStyle`](https://www.unistyl.es/v3/references/with-unistyles#auto-mapping-for-style-and-contentcontainerstyle-props). We previously did this on the welcome screen and hit the `> *` child-selector leak documented below; we have since moved the welcome screen to the wrapper-`View` pattern. If you find yourself reaching for `withUnistyles(ScrollView)`, treat it as a smell and check whether a wrapper view works first.
+```tsx
+import { ScrollView } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+
+const ThemedScrollView = withUnistyles(ScrollView);
+
+<ThemedScrollView style={styles.scrollView} contentContainerStyle={styles.contentContainer} />;
+```
+
+`withUnistyles` extracts dependency metadata from both `style` and `contentContainerStyle`, subscribes to the relevant theme/runtime changes, and re-renders only that wrapped component when needed. Its [auto-mapping behavior for `style` and `contentContainerStyle`](https://www.unistyl.es/v3/references/with-unistyles#auto-mapping-for-style-and-contentcontainerstyle-props) is the reason it fixes themed `ScrollView` content containers. Reach for it when wrapper-view layout would be awkward or when a third-party component needs theme-aware non-`style` props mapped through Unistyles.
 
 The smallest escape hatch is to use `useUnistyles()` and pass an inline value through React:
 
@@ -146,7 +155,7 @@ Use this sparingly. It works because React re-renders the prop, but it gives up
 
 The sharp edge: Unistyles hashes styles by value. If `withUnistyles` receives a style whose value is **identical** to a style used elsewhere in the app on a plain `View`, both usages get the same hash — and both CSS rules (the element rule and the `> *` child rule) are emitted under the same class name. The `> *` rule then leaks onto the direct children of every `View` that shares the hash.
 
-Concrete regression we hit: `welcome-screen.tsx` had `const ThemedScrollView = withUnistyles(ScrollView)` with `style={{ flex: 1, backgroundColor: theme.colors.surface0 }}`. `panels/agent-panel.tsx` had `root` and `container` styles with the exact same value. All three collided on class `unistyles_j2k2iilhfz`, so the browser stylesheet contained:
+Concrete regression we hit: `welcome-screen.tsx` had `const ThemedScrollView = withUnistyles(ScrollView)` with `style={{ flex: 1, backgroundColor: theme.colors.surface0 }}`. `agent-panel.tsx` had `root` and `container` styles with the exact same value. All three collided on class `unistyles_j2k2iilhfz`, so the browser stylesheet contained:
 
 ```css
 .unistyles_j2k2iilhfz {
@@ -222,49 +231,15 @@ If a style factory is cheap, skipping `useMemo` entirely is also fine.
 
 Do not import `theme` from `@/styles/theme` for live UI colors. That export is a dark-theme compatibility default, so using it in render code leaves icons, placeholders, or third-party props pinned to dark colors in light mode.
 
-Wrap the icon (or other leaf component) with `withUnistyles` instead, so only that node re-renders when the theme changes:
+Use `useUnistyles()` inside the component instead:
 
 ```tsx
-import { ChevronDown } from "lucide-react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+const { theme } = useUnistyles();
 
-const ThemedChevronDown = withUnistyles(ChevronDown);
-
-const styles = StyleSheet.create((theme) => ({
-  icon: { color: theme.colors.foregroundMuted },
-}));
-
-<ThemedChevronDown size={theme.iconSize.md} style={styles.icon} />;
+<ChevronDown size={theme.iconSize.md} color={theme.colors.foregroundMuted} />;
 ```
 
-This is the dominant pattern in the app today (see `sidebar-workspace-list.tsx`, `message.tsx`, the workspace screens). Reserve `useUnistyles()` for the last-resort cases described at the top of this file. Importing `baseColors`, theme-name constants, or `type Theme` is fine when the value is intentionally static or type-only.
-
-## Reanimated `Animated.View` + Dynamic Styles Crashes
-
-Do not apply `StyleSheet.create((theme) => ...)` styles to a Reanimated `Animated.View`. Unistyles wraps styled components in a `<UnistylesComponent>` and patches native view props from C++ via the ShadowRegistry. Reanimated also reaches into the same native node from its worklet runtime. When a theme change fires, both systems try to mutate the same node and the app crashes with `Unable to find node on an unmounted component.` This was a real iOS sidebar crash on theme toggle (commit `4896cfe9`).
-
-Fix: keep static positioning on the `Animated.View` in plain React Native `StyleSheet`, and pass theme-dependent values (e.g. `backgroundColor`) as inline style from `useUnistyles()` — the inline path is acceptable here because no other escape works:
-
-```tsx
-import { StyleSheet as RNStyleSheet } from "react-native";
-import Animated from "react-native-reanimated";
-import { useUnistyles } from "react-native-unistyles";
-
-const positionStyles = RNStyleSheet.create({
-  sidebar: { position: "absolute", inset: 0, width: 280 },
-});
-
-function Sidebar() {
-  const { theme } = useUnistyles();
-  return (
-    <Animated.View
-      style={[positionStyles.sidebar, animatedStyle, { backgroundColor: theme.colors.surface1 }]}
-    />
-  );
-}
-```
-
-This is one of the rare places `useUnistyles()` is the right tool: there is no `withUnistyles(Animated.View)` equivalent, the affected component is small, and the alternative is a crash.
+Importing `baseColors`, theme-name constants, or `type Theme` is fine when the value is intentionally static or type-only.
 
 ## Adaptive Themes And Persisted Settings
 

flake.nix

@@ -26,18 +26,11 @@
         let
           pkgs = pkgsFor system;
           paseo = pkgs.callPackage ./nix/package.nix { };
-          isLinux = nixpkgs.lib.elem system [
-            "x86_64-linux"
-            "aarch64-linux"
-          ];
         in
         {
           default = paseo;
           paseo = paseo;
         }
-        // nixpkgs.lib.optionalAttrs isLinux {
-          desktop = pkgs.callPackage ./nix/desktop-package.nix { inherit paseo; };
-        }
       );
 
       nixosModules.default = self.nixosModules.paseo;

lefthook.yml

@@ -3,8 +3,6 @@ pre-commit:
   jobs:
     - name: format
       glob: "*.{css,js,json,jsonc,jsx,md,ts,tsx,yaml,yml}"
-      exclude:
-        - "**/package-lock.json"
       run: npm run format:check:files -- {staged_files}
     - name: lint
       glob: "*.{js,jsx,ts,tsx}"

nix/desktop-package.nix

@@ -1,159 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildNpmPackage,
-  nodejs_22,
-  python3,
-  makeWrapper,
-  copyDesktopItems,
-  makeDesktopItem,
-  electron,
-  libuv,
-  # Reuse the daemon's prebuilt npm-deps FOD. Same lockfile, same content —
-  # without this, the desktop drv produces a separately-named store path
-  # (`paseo-desktop-<v>-npm-deps`) and refetches the entire registry. Override
-  # the upstream hash via `paseo.override { npmDepsHash = "..."; }`.
-  paseo,
-}:
-
-buildNpmPackage rec {
-  pname = "paseo-desktop";
-  version = (builtins.fromJSON (builtins.readFile ../package.json)).version;
-
-  src = lib.cleanSourceWith {
-    src = ./..;
-    filter =
-      path: type:
-      let
-        baseName = builtins.baseNameOf path;
-        relPath = lib.removePrefix (toString ./..) path;
-      in
-      # Exclude mobile-only platform code (we only need the web/electron build)
-      !(lib.hasPrefix "/packages/app/android" relPath)
-      && !(lib.hasPrefix "/packages/app/ios" relPath)
-      # Website is unrelated to the desktop app
-      && !(lib.hasPrefix "/packages/website" relPath)
-      # Test fixtures and build artifacts
-      && !(lib.hasSuffix ".test.ts" baseName)
-      && !(lib.hasSuffix ".e2e.test.ts" baseName)
-      && baseName != "node_modules"
-      && baseName != ".git"
-      && baseName != ".paseo"
-      && baseName != ".DS_Store"
-      && baseName != "release";
-  };
-
-  nodejs = nodejs_22;
-  inherit (paseo) npmDeps;
-
-  # Prevent onnxruntime-node's install script from running during automatic
-  # npm rebuild. We manually rebuild only node-pty in buildPhase.
-  npmRebuildFlags = [ "--ignore-scripts" ];
-
-  nativeBuildInputs = [
-    python3 # for node-gyp (node-pty)
-    makeWrapper
-    copyDesktopItems
-  ];
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libuv ];
-
-  dontNpmBuild = true;
-
-  env = {
-    EXPO_NO_TELEMETRY = "1";
-    # Expo's web build pulls in some pre-bundled assets; ensure it doesn't try
-    # to phone home during the build.
-    CI = "1";
-  };
-
-  buildPhase = ''
-    runHook preBuild
-
-    # Native deps (terminal emulation; libuv-linked on Linux)
-    npm rebuild node-pty
-
-    # Daemon workspaces (highlight + relay + server + cli)
-    npm run build:daemon
-
-    # App workspace deps not covered by build:daemon
-    npm run build --workspace=@getpaseo/expo-two-way-audio
-
-    # Expo web export for the Electron renderer
-    ( cd packages/app && PASEO_WEB_PLATFORM=electron npx expo export --platform web )
-
-    # Desktop main process (tsc only — NOT electron-builder)
-    npm run build:main --workspace=@getpaseo/desktop
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/paseo-desktop $out/bin
-
-    # Preserve the monorepo layout so main.js's dev-mode path resolution
-    # (`__dirname/../../app/dist`, `__dirname/../assets/icon.png`) works
-    # without patching: invoked unpackaged via `electron path/to/main.js`,
-    # `app.isPackaged` is false, so these relative paths are used.
-    #
-    # Copy the entire packages/ tree (not just built artifacts) because npm
-    # creates workspace symlinks from node_modules/@getpaseo/* into packages/*.
-    # Missing any workspace package leaves dangling symlinks and fails the
-    # noBrokenSymlinks output check. The cleanSourceWith filter above already
-    # drops the big platform-specific things (android/ios, website, tests).
-    cp package.json $out/share/paseo-desktop/
-    cp -a packages $out/share/paseo-desktop/
-    cp -a node_modules $out/share/paseo-desktop/
-
-    # Skills directory referenced at runtime by some agents
-    if [ -d skills ]; then
-      cp -a skills $out/share/paseo-desktop/
-    fi
-
-    # Hicolor icon for desktop environments
-    install -Dm644 packages/desktop/assets/icon.png \
-      $out/share/icons/hicolor/512x512/apps/paseo-desktop.png
-
-    # Launcher wraps nixpkgs electron.
-    # --no-sandbox: Chromium's setuid sandbox can't live in /nix/store
-    # (immutable, no setuid). Acceptable for v1; a follow-up can wire
-    # `security.wrappers` via a NixOS module for users who want the sandbox.
-    #
-    # EXPO_DEV_URL: We run unpackaged via `electron path/to/main.js`, so
-    # `app.isPackaged` is false. In that mode main.ts loads `DEV_SERVER_URL`
-    # (defaults to http://localhost:8081 — the Expo dev server, which doesn't
-    # exist here). Point it at the `paseo://` protocol handler instead, which
-    # serves from `__dirname/../../app/dist` (our install layout matches).
-    makeWrapper ${electron}/bin/electron $out/bin/paseo-desktop \
-      --add-flags "$out/share/paseo-desktop/packages/desktop/dist/main.js" \
-      --add-flags "--no-sandbox" \
-      --set EXPO_DEV_URL "paseo://app/"
-
-    copyDesktopItems
-
-    runHook postInstall
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "paseo-desktop";
-      desktopName = "Paseo";
-      genericName = "AI Coding Agents";
-      comment = "Self-hosted daemon for AI coding agents";
-      exec = "paseo-desktop";
-      icon = "paseo-desktop";
-      categories = [ "Development" ];
-      startupWMClass = "Paseo";
-    })
-  ];
-
-  meta = {
-    description = "Paseo desktop app (Electron wrapper)";
-    homepage = "https://github.com/getpaseo/paseo";
-    license = lib.licenses.agpl3Plus;
-    mainProgram = "paseo-desktop";
-    platforms = lib.platforms.linux;
-  };
-}

nix/module.nix

@@ -81,48 +81,7 @@ in
       enable = lib.mkOption {
         type = lib.types.bool;
         default = true;
-        description = ''
-          Whether to enable relay-based remote access. When false, the daemon
-          runs with `--no-relay` and only accepts direct (LAN/loopback)
-          connections.
-        '';
-      };
-
-      mode = lib.mkOption {
-        type = lib.types.enum [ "hosted" "remote" ];
-        default = "hosted";
-        description = ''
-          How the daemon reaches the relay when `relay.enable = true`:
-
-          - `"hosted"` (default): use the upstream `app.paseo.sh` relay.
-            Preserves the current behavior; no extra options needed.
-          - `"remote"`: connect to a self-hosted relay at
-            `relay.host:relay.port`. Sets `PASEO_RELAY_ENDPOINT` and
-            `PASEO_RELAY_USE_TLS` for the daemon.
-
-          A `"local"` mode (running a relay on the same host as a systemd
-          unit) is not yet implemented — the relay package currently only
-          ships a Cloudflare Workers adapter. Tracked separately.
-        '';
-      };
-
-      host = lib.mkOption {
-        type = lib.types.str;
-        default = "";
-        example = "relay.example.com";
-        description = "Relay hostname. Required when `relay.mode = \"remote\"`.";
-      };
-
-      port = lib.mkOption {
-        type = lib.types.port;
-        default = 443;
-        description = "Relay port. Used when `relay.mode = \"remote\"`.";
-      };
-
-      useTls = lib.mkOption {
-        type = lib.types.bool;
-        default = true;
-        description = "Whether to use TLS when connecting to the relay. Used when `relay.mode = \"remote\"`.";
+        description = "Whether to enable the relay connection for remote access via app.paseo.sh.";
       };
     };
 
@@ -135,9 +94,8 @@ in
 
         When Paseo runs as a real user (not the default system user), AI agents
         need access to the user's tools (git, ssh, etc.). This adds the user's
-        NixOS profile, home-manager profile (`~/.nix-profile/bin` and
-        `~/.local/state/nix/profile/bin`), and system paths so agents can use
-        them without manually setting PATH.
+        NixOS profile and system paths so agents can use them without manually
+        setting PATH.
 
         Enabled by default when `user` is set to a non-default value.
       '';
@@ -153,50 +111,9 @@ in
       '';
       description = "Extra environment variables for the Paseo daemon.";
     };
-
-    settings = lib.mkOption {
-      type = (pkgs.formats.json { }).type;
-      default = { };
-      example = lib.literalExpression ''
-        {
-          daemon.mcp = { enabled = true; injectIntoAgents = false; };
-          agents.providers.myAcp = {
-            extends = "acp";
-            label = "My Agent";
-            command = { path = "/run/current-system/sw/bin/my-acp"; };
-          };
-          log.file = { level = "info"; path = "/var/lib/paseo/daemon.log"; };
-        }
-      '';
-      description = ''
-        Declarative content for `$PASEO_HOME/config.json`. Rendered to JSON
-        and installed on every service start.
-
-        Runtime mutations to `config.json` (e.g. via `paseo daemon set-password`
-        or the mobile app toggling MCP injection / provider overrides) are
-        overwritten on the next restart. Pick one: manage via this option, or
-        manage via the CLI — not both.
-
-        The full schema is defined by `PersistedConfigSchema` in
-        `packages/server/src/server/persisted-config.ts`.
-      '';
-    };
   };
 
-  config = lib.mkIf cfg.enable (
-    let
-      settingsFile = (pkgs.formats.json { }).generate "paseo-config.json" cfg.settings;
-    in
-    {
-    assertions = [
-      {
-        assertion = !(cfg.relay.enable && cfg.relay.mode == "remote" && cfg.relay.host == "");
-        message = ''
-          services.paseo.relay.host must be set when relay.mode = "remote".
-        '';
-      }
-    ];
-
+  config = lib.mkIf cfg.enable {
     users.users.${cfg.user} = lib.mkIf (cfg.user == "paseo") {
       isSystemUser = true;
       group = cfg.group;
@@ -214,45 +131,24 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      preStart = lib.mkIf (cfg.settings != { }) ''
-        install -m 0600 ${settingsFile} ${cfg.dataDir}/config.json
-      '';
-
       environment = {
         NODE_ENV = "production";
         PASEO_HOME = cfg.dataDir;
         PASEO_LISTEN = "${cfg.listenAddress}:${toString cfg.port}";
-      } // lib.optionalAttrs cfg.inheritUserEnvironment (
-        let
-          # Match dataDir's convention. We can't read users.users.<name>.home
-          # because the user may be managed outside NixOS.
-          userHome = "/home/${cfg.user}";
-        in {
-          # mkForce overrides the default PATH from NixOS's systemd module (which
-          # only includes store paths for coreutils/grep/sed/systemd). When the
-          # daemon runs as a real user, also include home-manager profile paths
-          # so user-installed CLIs (claude, opencode, codex, ...) are reachable
-          # by agent processes the daemon spawns.
-          PATH = lib.mkForce (lib.concatStringsSep ":" (
-            lib.optionals (cfg.user != "paseo") [
-              "${userHome}/.nix-profile/bin"
-              "${userHome}/.local/state/nix/profile/bin"
-            ]
-            ++ [
-              "/etc/profiles/per-user/${cfg.user}/bin"
-              "/run/current-system/sw/bin"
-              "/run/wrappers/bin"
-              "/nix/var/nix/profiles/default/bin"
-            ]
-          ));
-        }
-      ) // lib.optionalAttrs (cfg.hostnames == true) {
+      } // lib.optionalAttrs cfg.inheritUserEnvironment {
+        # mkForce overrides the default PATH from NixOS's systemd module (which
+        # only includes store paths for coreutils/grep/sed/systemd). Our PATH
+        # includes /run/current-system/sw/bin which is a superset of those.
+        PATH = lib.mkForce (lib.concatStringsSep ":" [
+          "/etc/profiles/per-user/${cfg.user}/bin"
+          "/run/current-system/sw/bin"
+          "/run/wrappers/bin"
+          "/nix/var/nix/profiles/default/bin"
+        ]);
+      } // lib.optionalAttrs (cfg.hostnames == true) {
         PASEO_HOSTNAMES = "true";
       } // lib.optionalAttrs (lib.isList cfg.hostnames && cfg.hostnames != [ ]) {
         PASEO_HOSTNAMES = lib.concatStringsSep "," cfg.hostnames;
-      } // lib.optionalAttrs (cfg.relay.enable && cfg.relay.mode == "remote") {
-        PASEO_RELAY_ENDPOINT = "${cfg.relay.host}:${toString cfg.relay.port}";
-        PASEO_RELAY_USE_TLS = if cfg.relay.useTls then "true" else "false";
       } // cfg.environment;
 
       serviceConfig = {
@@ -276,6 +172,5 @@ in
     environment.systemPackages = [ cfg.package ];
 
     networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ];
-    }
-  );
+  };
 }

nix/npm-deps.hash

@@ -1 +0,0 @@
-sha256-zuTLTDFUzpnB7W+hS6Cl8UClDSKAnGArmu757S9CJww=

nix/package.nix

@@ -7,15 +7,6 @@
   makeWrapper,
   # node-pty needs libuv headers on Linux
   libuv,
-  # Exposed so downstream flakes that follow a different nixpkgs revision
-  # (where `fetchNpmDeps` may produce a different hash for the same lockfile)
-  # can override via `.override { npmDepsHash = "sha256-..."; }` without
-  # `overrideAttrs` gymnastics — `npmDepsHash` is destructured from
-  # `buildNpmPackage`'s args, so `overrideAttrs` cannot reach it.
-  #
-  # The default is read from a sidecar file so the CI auto-updater can replace
-  # the hash with a single file write instead of a sed against this source.
-  npmDepsHash ? lib.fileContents ./npm-deps.hash,
 }:
 
 buildNpmPackage rec {
@@ -49,9 +40,9 @@ buildNpmPackage rec {
 
   nodejs = nodejs_22;
 
-  # Default hash lives in nix/npm-deps.hash (see arg default above).
-  # CI auto-updates that file when package-lock.json changes (see .github/workflows/).
-  inherit npmDepsHash;
+  # To update: run `nix build` with lib.fakeHash, copy the `got:` hash.
+  # CI auto-updates this when package-lock.json changes (see .github/workflows/).
+  npmDepsHash = "sha256-mGnJDX1LOORj7fDRPcJYIFG0D+rLDyom6LktWhwZasw=";
 
   # Prevent onnxruntime-node's install script from running during automatic
   # npm rebuild (it tries to download from api.nuget.org, which fails in the sandbox).
@@ -88,25 +79,47 @@ buildNpmPackage rec {
   installPhase = ''
     runHook preInstall
 
-    # Compute the daemon's runtime closure by static module-graph tracing
-    # (@vercel/nft from supervisor-entrypoint.js, cli/dist/index.js, and the
-    # forked terminal-worker-process.js) plus an explicit list of non-JS
-    # assets read at runtime. The trace script is the single source of
-    # truth for what the daemon needs at $out — auditable in plain JS, no
-    # npm hoisting / .bin / workspace-symlink footguns.
     mkdir -p $out/lib/paseo
-    node scripts/trace-daemon.mjs > daemon-files.txt
 
-    while IFS= read -r path; do
-      [ -z "$path" ] && continue
-      mkdir -p "$out/lib/paseo/$(dirname "$path")"
-      cp -a "$path" "$out/lib/paseo/$path"
-    done < daemon-files.txt
-
-    # Root package.json lets node resolve the workspace layout when the
-    # CLI/server bin starts from $out.
+    # Copy root package metadata
     cp package.json $out/lib/paseo/
 
+    # Copy node_modules (preserving workspace symlinks)
+    cp -a node_modules $out/lib/paseo/
+
+    # Auto-detect which @getpaseo/* packages were built by build:daemon
+    # (they'll have a dist/ directory). Copy those and remove the rest.
+    for link in $out/lib/paseo/node_modules/@getpaseo/*; do
+      name=$(basename "$link")
+      if [ -d "packages/$name/dist" ]; then
+        mkdir -p "$out/lib/paseo/packages/$name"
+        cp "packages/$name/package.json" "$out/lib/paseo/packages/$name/"
+        cp -a "packages/$name/dist" "$out/lib/paseo/packages/$name/"
+        if [ -d "packages/$name/node_modules" ]; then
+          cp -a "packages/$name/node_modules" "$out/lib/paseo/packages/$name/"
+        fi
+      else
+        rm -f "$link"
+      fi
+    done
+
+    # Copy CLI bin entry
+    mkdir -p $out/lib/paseo/packages/cli/bin
+    cp packages/cli/bin/paseo $out/lib/paseo/packages/cli/bin/
+
+    # Copy extra server files referenced at runtime
+    for f in agent-prompt.md .env.example; do
+      if [ -f packages/server/$f ]; then
+        cp packages/server/$f $out/lib/paseo/packages/server/
+      fi
+    done
+
+    # Copy server scripts (including supervisor-entrypoint) needed by CLI
+    if [ -d packages/server/dist/scripts ]; then
+      mkdir -p $out/lib/paseo/packages/server/dist/scripts
+      cp -a packages/server/dist/scripts/* $out/lib/paseo/packages/server/dist/scripts/
+    fi
+
     # Create wrapper for the server entry point (for systemd / direct use)
     mkdir -p $out/bin
     makeWrapper ${nodejs}/bin/node $out/bin/paseo-server \

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.1.78",
+  "version": "0.1.69",
   "private": true,
   "description": "Paseo: voice-controlled development environment with OpenAI Realtime API",
   "keywords": [
@@ -93,7 +93,6 @@
   "devDependencies": {
     "@types/ws": "^8.5.14",
     "@typescript/native-preview": "7.0.0-dev.20260423.1",
-    "@vercel/nft": "^1.5.0",
     "concurrently": "^9.2.1",
     "cross-env": "^10.1.0",
     "get-port-cli": "^3.0.0",

packages/app/.eas/workflows/release-mobile.yml

@@ -41,7 +41,7 @@ jobs:
 
   submit_ios_for_review:
     name: Submit iOS for App Store review
-    needs: [build_ios, submit_ios]
+    needs: [submit_ios]
     environment: production
     runs_on: macos-medium
     steps:
@@ -49,7 +49,4 @@ jobs:
       - name: Install fastlane
         run: bundle install
       - name: Submit for review
-        run: |
-          export APP_VERSION="${{ needs.build_ios.outputs.app_version }}"
-          export APP_BUILD_VERSION="${{ needs.build_ios.outputs.app_build_version }}"
-          bundle exec fastlane ios submit_review
+        run: bundle exec fastlane ios submit_review

packages/app/.eas/workflows/resubmit-ios-review.yml

@@ -1,33 +0,0 @@
-name: Resubmit iOS for App Store review
-
-# Standalone re-trigger for the App Store review submission step. The iOS
-# binary is already uploaded to TestFlight via the EAS GitHub app's tag-push
-# build; this workflow just runs the fastlane submit_review lane against the
-# latest TestFlight build, without rebuilding or re-uploading.
-
-on:
-  workflow_dispatch:
-    inputs:
-      app_version:
-        type: string
-        required: false
-        description: "Marketing version to resubmit, e.g. 0.1.76. Leave empty to target the most recently uploaded iOS build."
-      app_build_version:
-        type: string
-        required: false
-        description: "CFBundleVersion to resubmit, e.g. 2. Only used when app_version is set."
-
-jobs:
-  submit_ios_for_review:
-    name: Submit iOS for App Store review
-    environment: production
-    runs_on: macos-medium
-    steps:
-      - uses: eas/checkout
-      - name: Install fastlane
-        run: bundle install
-      - name: Submit for review
-        run: |
-          export APP_VERSION="${{ inputs.app_version }}"
-          export APP_BUILD_VERSION="${{ inputs.app_build_version }}"
-          bundle exec fastlane ios submit_review

packages/app/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "fastlane", "~> 2.234"
+gem "fastlane"

packages/app/e2e/agent-stream-ui.spec.ts

@@ -6,7 +6,6 @@ import {
   expectTurnCopyButton,
   expectScrollFollowsNewContent,
 } from "./helpers/agent-stream";
-import { clickNewChat } from "./helpers/launcher";
 import { startRunningMockAgent } from "./helpers/composer";
 
 test.describe("Agent stream UI", () => {
@@ -43,23 +42,4 @@ test.describe("Agent stream UI", () => {
       await repo.cleanup();
     }
   });
-
-  test("shows elapsed timer on first app-created running turn", async ({ page, withWorkspace }) => {
-    test.setTimeout(90_000);
-    const workspace = await withWorkspace({ prefix: "stream-first-app-turn-timer-" });
-    await workspace.navigateTo();
-    await clickNewChat(page);
-    await page.getByText("Model defaults are still loading").waitFor({
-      state: "hidden",
-      timeout: 30_000,
-    });
-    const prompt = "Stream briefly for first app-created turn timer test.";
-    const composer = page.getByRole("textbox", { name: "Message agent..." }).first();
-    await composer.fill(prompt);
-    await page.getByRole("button", { name: "Send message" }).click();
-    await page.getByText(prompt, { exact: true }).first().waitFor({ state: "visible" });
-    await awaitAssistantMessage(page);
-    await expectInlineWorkingIndicator(page);
-    await page.getByTestId("turn-working-elapsed").waitFor({ state: "visible", timeout: 5_000 });
-  });
 });

packages/app/e2e/client-slash-commands.spec.ts

@@ -1,205 +0,0 @@
-import { expect, test, type Page } from "./fixtures";
-import { buildHostWorkspaceRoute } from "@/utils/host-routes";
-import { composerLocator, expectComposerVisible, submitMessage } from "./helpers/composer";
-import { connectTerminalClient, type TerminalPerfDaemonClient } from "./helpers/terminal-perf";
-import { createTempGitRepo } from "./helpers/workspace";
-import {
-  expectSessionRowArchived,
-  expectWorkspaceTabHidden,
-  expectWorkspaceTabVisible,
-  openSessions,
-} from "./helpers/archive-tab";
-
-interface SlashCommandScenario {
-  agent: { id: string };
-  client: TerminalPerfDaemonClient;
-  cwd: string;
-  title: string;
-}
-
-const REPLACEMENT_PROMPT = "Replacement prompt after slash clear.";
-
-function getServerId(): string {
-  const serverId = process.env.E2E_SERVER_ID;
-  if (!serverId) {
-    throw new Error("E2E_SERVER_ID is not set.");
-  }
-  return serverId;
-}
-
-async function withOpenReadyMockAgent(
-  page: Page,
-  input: {
-    title: string;
-    model?: string;
-    modeId?: string;
-  },
-  run: (scenario: SlashCommandScenario) => Promise<void>,
-): Promise<void> {
-  const repo = await createTempGitRepo("client-slash-command-");
-  const client = await connectTerminalClient();
-
-  try {
-    await openProject(client, repo.path);
-    const agent = await createReadyMockAgent(client, {
-      cwd: repo.path,
-      title: input.title,
-      model: input.model,
-      modeId: input.modeId,
-    });
-    await openActiveAgentTab(page, { cwd: repo.path, agentId: agent.id });
-
-    await run({ agent, client, cwd: repo.path, title: input.title });
-  } finally {
-    await client.close();
-    await repo.cleanup();
-  }
-}
-
-async function openProject(client: TerminalPerfDaemonClient, cwd: string): Promise<void> {
-  const opened = await client.openProject(cwd);
-  if (!opened.workspace) {
-    throw new Error(opened.error ?? `Failed to open project ${cwd}`);
-  }
-}
-
-async function createReadyMockAgent(
-  client: TerminalPerfDaemonClient,
-  input: {
-    cwd: string;
-    title: string;
-    model?: string;
-    modeId?: string;
-  },
-): Promise<{ id: string }> {
-  const agent = await client.createAgent({
-    provider: "mock",
-    cwd: input.cwd,
-    title: input.title,
-    modeId: input.modeId ?? "load-test",
-    model: input.model ?? "ten-second-stream",
-    initialPrompt: "Prepare a client slash command test agent.",
-  });
-  return { id: agent.id };
-}
-
-async function openActiveAgentTab(
-  page: Page,
-  input: { cwd: string; agentId: string },
-): Promise<void> {
-  const agentUrl = `${buildHostWorkspaceRoute(
-    getServerId(),
-    input.cwd,
-  )}?open=${encodeURIComponent(`agent:${input.agentId}`)}`;
-  await page.goto(agentUrl);
-  await page.waitForURL(
-    (url) => url.pathname.includes("/workspace/") && !url.searchParams.has("open"),
-    { timeout: 60_000 },
-  );
-  await expectWorkspaceTabVisible(page, input.agentId);
-  await expectComposerVisible(page);
-}
-
-async function runClientSlashCommand(page: Page, command: "/quit" | "/clear"): Promise<void> {
-  const input = composerLocator(page);
-  await expect(input).toBeEditable({ timeout: 30_000 });
-  await input.fill(command);
-  await expect(input).toHaveValue(command);
-  await input.press("Enter");
-}
-
-async function selectClientSlashCommand(page: Page, query: string, label: string): Promise<void> {
-  const input = composerLocator(page);
-  await expect(input).toBeEditable({ timeout: 30_000 });
-  await input.fill(query);
-  await expect(page.getByText(label, { exact: true }).first()).toBeVisible({ timeout: 30_000 });
-  await input.press("Enter");
-}
-
-async function expectAgentArchivedInSessions(page: Page, title: string): Promise<void> {
-  await openSessions(page);
-  await expectSessionRowArchived(page, title);
-}
-
-async function expectReplacementDraftMatchesPreviousSetup(page: Page): Promise<void> {
-  await expectComposerVisible(page);
-  await expect(
-    page.getByRole("button", { name: "Select model (Ten second stream)" }),
-  ).toBeVisible();
-  await expect(page.getByRole("button", { name: "Select agent mode (load-test)" })).toBeVisible();
-}
-
-async function createAgentFromReplacementDraft(page: Page): Promise<void> {
-  await submitMessage(page, REPLACEMENT_PROMPT);
-}
-
-async function waitForReplacementAgentId(page: Page, oldAgentId: string): Promise<string> {
-  let newAgentId: string | null = null;
-  await expect
-    .poll(
-      async () => {
-        const ids = await page
-          .locator('[data-testid^="workspace-tab-agent_"]')
-          .evaluateAll((nodes) =>
-            nodes.flatMap((node) => {
-              if (!(node instanceof HTMLElement)) {
-                return [];
-              }
-              const testId = node.getAttribute("data-testid") ?? "";
-              if (!testId.startsWith("workspace-tab-agent_")) {
-                return [];
-              }
-              if (node.offsetParent === null) {
-                return [];
-              }
-              return [testId.slice("workspace-tab-agent_".length)];
-            }),
-          );
-        newAgentId = ids.find((id) => id !== oldAgentId) ?? null;
-        return newAgentId;
-      },
-      { timeout: 30_000 },
-    )
-    .not.toBeNull();
-  if (!newAgentId) {
-    throw new Error("Replacement agent was not created.");
-  }
-  return newAgentId;
-}
-
-test.describe("Client slash commands", () => {
-  test("slash quit archives the active agent and removes its tab", async ({ page }) => {
-    await withOpenReadyMockAgent(page, { title: "Slash quit e2e" }, async ({ agent, title }) => {
-      await runClientSlashCommand(page, "/quit");
-      await expectWorkspaceTabHidden(page, agent.id);
-      await expectAgentArchivedInSessions(page, title);
-    });
-  });
-
-  test("slash quit selected from autocomplete archives immediately", async ({ page }) => {
-    await withOpenReadyMockAgent(
-      page,
-      { title: "Slash quit autocomplete e2e" },
-      async ({ agent, title }) => {
-        await selectClientSlashCommand(page, "/qu", "/quit");
-        await expectWorkspaceTabHidden(page, agent.id);
-        await expectAgentArchivedInSessions(page, title);
-      },
-    );
-  });
-
-  test("slash clear replaces the active agent with a matching draft", async ({ page }) => {
-    await withOpenReadyMockAgent(
-      page,
-      { title: "Slash clear e2e", model: "ten-second-stream", modeId: "load-test" },
-      async ({ agent, title }) => {
-        await runClientSlashCommand(page, "/clear");
-        await expectWorkspaceTabHidden(page, agent.id);
-        await expectReplacementDraftMatchesPreviousSetup(page);
-        await createAgentFromReplacementDraft(page);
-        await waitForReplacementAgentId(page, agent.id);
-        await expectAgentArchivedInSessions(page, title);
-      },
-    );
-  });
-});

packages/app/e2e/composer-attachments.spec.ts

@@ -82,7 +82,7 @@ test.describe("Composer attachments", () => {
     }
 
     const ghRepo = await createTempGithubRepo({
-      category: "attach-issue",
+      prefix: "paseo-e2e-attach-issue-",
       issues: [{ title: "fix: attach-issue-unique-alpha" }],
       prs: [{ title: "feat: attach-issue-dummy-pr", state: "open" }],
     });
@@ -114,7 +114,7 @@ test.describe("Composer attachments", () => {
     }
 
     const ghRepo = await createTempGithubRepo({
-      category: "attach-pr",
+      prefix: "paseo-e2e-attach-pr-",
       prs: [{ title: "feat: attach-pr-unique-beta", state: "open" }],
     });
     const handle = await openGithubWorkspace(page, ghRepo.prs[0].localPath);

packages/app/e2e/global-setup.ts

@@ -414,19 +414,15 @@ async function resolveDictationConfig(): Promise<DictationConfig> {
   );
   const hasDefaultLocalModelsDir =
     defaultLocalModelsDir.trim().length > 0 && existsSync(defaultLocalModelsDir);
+  const dictationProvider = openAiUsable ? "openai" : "local";
 
-  // Fork PRs run without secrets and usually without local models. Don't crash
-  // the whole Playwright run — disable dictation/voice and let tests that need
-  // them gate on PASEO_DICTATION_ENABLED.
-  if (!openAiUsable && !hasDefaultLocalModelsDir) {
-    console.warn(
-      "[e2e] Neither OPENAI_API_KEY nor local speech models found — running with dictation/voice disabled. " +
-        "Tests that require dictation should gate on PASEO_DICTATION_ENABLED.",
+  if (dictationProvider === "local" && !hasDefaultLocalModelsDir) {
+    throw new Error(
+      "OpenAI key is not usable and local speech models are unavailable at ~/.paseo/models/local-speech. " +
+        "Either provide a valid OPENAI_API_KEY or install local speech models before running app e2e tests.",
     );
-    return { openAiUsable: false, localModelsDir: null };
   }
 
-  const dictationProvider = openAiUsable ? "openai" : "local";
   const localModelsDir = dictationProvider === "local" ? defaultLocalModelsDir : null;
   console.log(
     `[e2e] Dictation STT provider: ${dictationProvider}${openAiUsable ? "" : " (OpenAI probe failed)"}`,

packages/app/e2e/helpers/github-fixtures.ts

@@ -153,19 +153,14 @@ function seedIssue(args: { spec: IssueSpec; basePath: string }): GhIssueFixture
   return { number: issueNumber, title: spec.title, url: issueUrl };
 }
 
-// Single namespace for temporary GitHub repos created by Paseo tests.
-// Bulk cleanup relies on this prefix being unmistakable — never reuse `paseo-`
-// (collides with real repos like `paseo`, `paseo-website`).
-const TEMP_GITHUB_REPO_PREFIX = "paseotmp-";
-
 export async function createTempGithubRepo(options: {
-  category: string;
+  prefix?: string;
   prs?: PrSpec[];
   issues?: IssueSpec[];
 }): Promise<GhRepoFixture> {
-  const { category, prs = [], issues = [] } = options;
+  const { prefix = "paseo-e2e-", prs = [], issues = [] } = options;
   const uniqueSuffix = `${Date.now()}-${Math.random().toString(36).slice(2, 7)}`;
-  const repoName = `${TEMP_GITHUB_REPO_PREFIX}${category}-${uniqueSuffix}`;
+  const repoName = `${prefix}${uniqueSuffix}`;
 
   // Bootstrap local git repo
   const basePath = await mkdtemp(path.join("/tmp", `${repoName}-base-`));

packages/app/e2e/helpers/new-workspace.ts

@@ -170,12 +170,9 @@ export async function openNewWorkspaceComposer(
 
 export async function clickNewWorkspaceButton(
   page: Page,
-  input: { projectKey: string; projectDisplayName: string; prompt?: string },
+  input: { projectKey: string; projectDisplayName: string },
 ): Promise<void> {
   await openNewWorkspaceComposer(page, input);
-  const composer = page.getByRole("textbox", { name: "Message agent..." });
-  await expect(composer).toBeVisible({ timeout: 30_000 });
-  await composer.fill(input.prompt ?? "Hello from e2e");
   const createButton = page
     .getByTestId("message-input-root")
     .getByRole("button", { name: "Create" });

packages/app/e2e/helpers/pr-pane.ts

@@ -1,5 +1,5 @@
 import { expect, type Page } from "@playwright/test";
-import { getStateLabel } from "@/git/pr-pane-data";
+import { getStateLabel } from "@/utils/pr-pane-data";
 
 export async function openPrPane(page: Page): Promise<void> {
   await page.getByRole("button", { name: "Open explorer" }).click();

packages/app/e2e/helpers/sidebar.ts

@@ -21,13 +21,12 @@ export async function expectWorkspaceListed(page: Page, name: string): Promise<v
 }
 
 export async function openMobileAgentSidebar(page: Page): Promise<void> {
-  await page.getByRole("button", { name: "Open menu" }).click();
+  await page.getByTestId("menu-button").click();
 }
 
+// force=true: the overlay covers the button when the mobile sidebar is open.
 export async function closeMobileAgentSidebar(page: Page): Promise<void> {
-  const closeButton = page.getByTestId("sidebar-close");
-  await expect(closeButton).toBeInViewport({ timeout: 5_000 });
-  await closeButton.click({ force: true });
+  await page.getByTestId("menu-button").click({ force: true });
 }
 
 // The mobile sidebar panel animates via translateX; toBeInViewport reflects the rendered position.

packages/app/e2e/helpers/terminal-perf.ts

@@ -29,11 +29,6 @@ export interface TerminalPerfDaemonClient {
     featureValues?: Record<string, unknown>;
     initialPrompt?: string;
   }): Promise<{ id: string; status: string }>;
-  waitForAgentUpsert(
-    agentId: string,
-    predicate: (snapshot: { status: string }) => boolean,
-    timeout?: number,
-  ): Promise<{ status: string }>;
   sendAgentMessage(agentId: string, text: string): Promise<void>;
   subscribeTerminal(
     terminalId: string,

packages/app/e2e/new-workspace.spec.ts

@@ -306,10 +306,6 @@ test.describe("New workspace flow", () => {
         projectDisplayName: openedProject.projectDisplayName,
       });
 
-      const composer = page.getByRole("textbox", { name: "Message agent..." });
-      await expect(composer).toBeVisible({ timeout: 30_000 });
-      await composer.fill("Hello from e2e");
-
       const createButton = page
         .getByTestId("message-input-root")
         .getByRole("button", { name: "Create" });

packages/app/e2e/pr-pane.spec.ts

@@ -28,7 +28,7 @@ test.describe("PR pane", () => {
     seedClient = await connectWorkspaceSetupClient();
 
     repoFixture = await createTempGithubRepo({
-      category: "pr-pane",
+      prefix: "paseo-e2e-pr-",
       prs: [
         { title: "Review selected start ref", state: "open" },
         { title: "Merged feature branch", state: "merged" },

packages/app/e2e/workspace-cwd.spec.ts

@@ -1,5 +1,5 @@
-import { expect, type Page, test } from "./fixtures";
-import { clickNewChat, clickNewTerminal } from "./helpers/launcher";
+import { test } from "./fixtures";
+import { clickNewTerminal } from "./helpers/launcher";
 import {
   expectTerminalSurfaceVisible,
   focusTerminalSurface,
@@ -8,55 +8,6 @@ import {
   waitForTerminalContent,
 } from "./helpers/terminal-perf";
 
-async function installCreateAgentRequestRecorder(page: Page): Promise<void> {
-  await page.addInitScript(() => {
-    const requests: unknown[] = [];
-    (
-      window as typeof window & {
-        __paseoE2eCreateAgentRequests?: unknown[];
-      }
-    ).__paseoE2eCreateAgentRequests = requests;
-    const originalSend = WebSocket.prototype.send;
-    WebSocket.prototype.send = function (data) {
-      if (typeof data === "string") {
-        try {
-          const parsed = JSON.parse(data) as {
-            type?: unknown;
-            message?: { type?: unknown };
-          };
-          if (parsed.type === "session" && parsed.message?.type === "create_agent_request") {
-            requests.push(parsed.message);
-          }
-        } catch {
-          // Ignore non-JSON frames.
-        }
-      }
-      return originalSend.call(this, data);
-    };
-  });
-}
-
-async function getRecordedCreateAgentCwd(page: Page, message: string): Promise<string | null> {
-  return page.evaluate((expectedMessage) => {
-    const requests =
-      (
-        window as typeof window & {
-          __paseoE2eCreateAgentRequests?: Array<{
-            initialPrompt?: string;
-            config?: { cwd?: string };
-          }>;
-        }
-      ).__paseoE2eCreateAgentRequests ?? [];
-
-    for (const request of requests) {
-      if (request.initialPrompt === expectedMessage) {
-        return request.config?.cwd ?? null;
-      }
-    }
-    return null;
-  }, message);
-}
-
 test.describe("Workspace cwd correctness", () => {
   test("main checkout workspace opens terminals in the project root", async ({
     page,
@@ -75,32 +26,6 @@ test.describe("Workspace cwd correctness", () => {
     await waitForTerminalContent(page, (text) => text.includes(workspace.repoPath), 10_000);
   });
 
-  test("draft tab creates an agent in the workspace cwd", async ({ page, withWorkspace }) => {
-    test.setTimeout(60_000);
-
-    await installCreateAgentRequestRecorder(page);
-    const workspace = await withWorkspace({ prefix: "workspace-cwd-draft-agent-" });
-    await workspace.navigateTo();
-
-    await clickNewChat(page);
-    const composer = page.getByRole("textbox", { name: "Message agent..." }).first();
-    const message = `cwd draft create ${Date.now()}`;
-    await expect(composer).toBeEditable({ timeout: 15_000 });
-    await composer.fill(message);
-    await composer.press("Enter");
-    await expect(page.getByText(message, { exact: true }).first()).toBeVisible({
-      timeout: 30_000,
-    });
-
-    await expect(page.locator('[data-testid^="workspace-tab-agent_"]').first()).toBeVisible({
-      timeout: 30_000,
-    });
-
-    await expect
-      .poll(async () => getRecordedCreateAgentCwd(page, message), { timeout: 30_000 })
-      .toBe(workspace.repoPath);
-  });
-
   test("worktree workspace opens terminals in the worktree directory", async ({
     page,
     withWorkspace,

packages/app/e2e/workspace-pane-remount.spec.ts

@@ -1,64 +0,0 @@
-import { buildHostAgentDetailRoute } from "@/utils/host-routes";
-import { expect, test } from "./fixtures";
-import {
-  archiveAgentFromDaemon,
-  connectArchiveTabDaemonClient,
-  createIdleAgent,
-} from "./helpers/archive-tab";
-import { expectComposerVisible } from "./helpers/composer";
-import { createTempGitRepo } from "./helpers/workspace";
-import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
-
-test.describe("Workspace pane mounting", () => {
-  test("opening the first split pane keeps the existing agent composer mounted", async ({
-    page,
-  }) => {
-    test.setTimeout(90_000);
-    const serverId = process.env.E2E_SERVER_ID;
-    if (!serverId) {
-      throw new Error("E2E_SERVER_ID is not set.");
-    }
-
-    const client = await connectArchiveTabDaemonClient();
-    const repo = await createTempGitRepo("pane-remount-");
-    let agentId: string | null = null;
-
-    try {
-      const agent = await createIdleAgent(client, {
-        cwd: repo.path,
-        title: `pane-remount-${Date.now()}`,
-      });
-      agentId = agent.id;
-
-      await page.goto(buildHostAgentDetailRoute(serverId, agent.id, agent.cwd));
-      await page.waitForURL(
-        (url) => url.pathname.includes("/workspace/") && !url.searchParams.has("open"),
-        { timeout: 60_000 },
-      );
-      await waitForWorkspaceTabsVisible(page);
-      await expectComposerVisible(page);
-
-      const originalComposer = await page
-        .getByTestId("message-input-root")
-        .filter({ visible: true })
-        .first()
-        .elementHandle();
-      expect(originalComposer).not.toBeNull();
-
-      await page.getByRole("button", { name: "Split pane right" }).first().click();
-      await expect(page.getByTestId("message-input-root").filter({ visible: true })).toHaveCount(
-        2,
-        { timeout: 30_000 },
-      );
-
-      const originalStillConnected = await originalComposer!.evaluate((node) => node.isConnected);
-      expect(originalStillConnected).toBe(true);
-    } finally {
-      if (agentId) {
-        await archiveAgentFromDaemon(client, agentId).catch(() => undefined);
-      }
-      await client.close().catch(() => undefined);
-      await repo.cleanup();
-    }
-  });
-});

packages/app/fastlane/Fastfile

@@ -11,6 +11,11 @@ platform :ios do
       key_filepath: ENV.fetch("ASC_KEY_P8"),
     )
 
+    build_number = latest_testflight_build_number(
+      api_key: api_key,
+      app_identifier: APP_IDENTIFIER,
+    )
+
     require "spaceship"
     Spaceship::ConnectAPI.token = Spaceship::ConnectAPI::Token.create(
       key_id: ENV.fetch("ASC_KEY_ID"),
@@ -20,81 +25,29 @@ platform :ios do
     app = Spaceship::ConnectAPI::App.find(APP_IDENTIFIER)
     UI.user_error!("Could not find app #{APP_IDENTIFIER} on App Store Connect") if app.nil?
 
-    # The release workflow forwards the marketing version and CFBundleVersion of
-    # the binary it just built. Use them to identify the exact build, since
-    # CFBundleVersion is not unique across marketing versions in this project
-    # (the production profile resets it per app_version). The resubmit workflow
-    # leaves these unset and falls back to "most recently uploaded iOS build".
-    target_version = ENV["APP_VERSION"].to_s.strip
-    target_build = ENV["APP_BUILD_VERSION"].to_s.strip
-    target_version = nil if target_version.empty?
-    target_build = nil if target_build.empty?
-
-    if target_version
-      UI.message("Targeting App Store version #{target_version}#{target_build ? " build #{target_build}" : ""} from workflow input")
-    else
-      UI.message("No APP_VERSION provided; selecting the most recently uploaded iOS build")
-    end
-
-    valid_build = nil
     deadline = Time.now + (30 * 60)
     loop do
       builds = Spaceship::ConnectAPI::Build.all(
         app_id: app.id,
-        sort: "-uploadedDate",
-        limit: 100,
-      ).select { |b| b.pre_release_version&.platform == "IOS" }
-      builds = builds.select { |b| b.pre_release_version&.version == target_version } if target_version
-      builds = builds.select { |b| b.version == target_build } if target_build
-
-      build = builds.first
-      if build.nil?
-        UI.user_error!("Timed out waiting for build to appear on App Store Connect.") if Time.now > deadline
-        UI.message("No matching iOS build visible on App Store Connect yet; waiting...")
-        sleep(30)
-        next
-      end
-
-      state = build.processing_state
-      UI.message("Build #{build.pre_release_version.version} (#{build.version}) processing state: #{state || 'unknown'}")
-      if state == "VALID"
-        valid_build = build
-        break
-      end
+        filter: { "version" => build_number.to_s },
+        includes: "preReleaseVersion",
+      )
+      build = builds.find { |b| b.pre_release_version&.platform == "IOS" }
+      state = build&.processing_state
+      UI.message("Build #{build_number} processing state: #{state || 'unknown'}")
+      break if state == "VALID"
       if state == "INVALID" || state == "FAILED"
-        UI.user_error!("Build #{build.version} failed App Store processing (state: #{state}).")
+        UI.user_error!("Build #{build_number} failed App Store processing (state: #{state}).")
       end
       if Time.now > deadline
-        UI.user_error!("Timed out waiting for build #{build.version} to finish processing on App Store Connect.")
+        UI.user_error!("Timed out waiting for build #{build_number} to finish processing on App Store Connect.")
       end
       sleep(30)
     end
 
-    app_version = valid_build.pre_release_version.version
-    build_number = valid_build.version
-    UI.message("Submitting build #{build_number} as App Store version #{app_version} for review")
-
-    # Ensure an editable App Store version exists for this marketing version.
-    # deliver requires a "Prepare for Submission" version on App Store Connect
-    # and won't auto-create one when skip_metadata + skip_screenshots are set.
-    app.ensure_version!(app_version, platform: Spaceship::ConnectAPI::Platform::IOS)
-
-    # Apple requires a non-empty "What's New" on every new App Store version
-    # before it can be submitted for review. With skip_metadata: true, deliver
-    # never sets this, so we populate it directly per-locale.
-    edit_version = app.get_edit_app_store_version(platform: Spaceship::ConnectAPI::Platform::IOS)
-    release_notes = "Bug fixes and improvements."
-    edit_version.get_app_store_version_localizations.each do |localization|
-      if localization.whats_new.to_s.strip.empty?
-        UI.message("Setting whatsNew on #{localization.locale}")
-        localization.update(attributes: { whatsNew: release_notes })
-      end
-    end
-
     deliver(
       api_key: api_key,
       app_identifier: APP_IDENTIFIER,
-      app_version: app_version,
       build_number: build_number.to_s,
       submit_for_review: true,
       automatic_release: true,

packages/app/modules/paseo-hardware-keyboard/expo-module.config.json

@@ -1,7 +0,0 @@
-{
-  "platforms": ["ios"],
-  "ios": {
-    "modules": ["PaseoHardwareKeyboardModule"],
-    "reactDelegateHandlers": ["PaseoHardwareKeyboardReactDelegateHandler"]
-  }
-}

packages/app/modules/paseo-hardware-keyboard/ios/PaseoHardwareKeyboard.podspec

@@ -1,24 +0,0 @@
-require 'json'
-
-Pod::Spec.new do |s|
-  s.name           = 'PaseoHardwareKeyboard'
-  s.version        = '0.1.0'
-  s.summary        = 'Hardware keyboard shortcuts for Paseo'
-  s.description    = 'Hardware keyboard shortcuts for Paseo'
-  s.license        = 'AGPL-3.0-or-later'
-  s.author         = 'Paseo'
-  s.homepage       = 'https://paseo.sh'
-  s.platforms      = { :ios => '13.4' }
-  s.swift_version  = '5.4'
-  s.source         = { :path => '.' }
-  s.static_framework = true
-
-  s.dependency 'ExpoModulesCore'
-
-  s.pod_target_xcconfig = {
-    'DEFINES_MODULE' => 'YES',
-    'SWIFT_COMPILATION_MODE' => 'wholemodule'
-  }
-
-  s.source_files = "**/*.{h,m,swift}"
-end

packages/app/modules/paseo-hardware-keyboard/ios/PaseoHardwareKeyboardModule.swift

@@ -1,99 +0,0 @@
-import ExpoModulesCore
-import UIKit
-
-private let hardwareSubmitEventName = "onHardwareKeyboardSubmit"
-
-private weak var activeModule: PaseoHardwareKeyboardModule?
-private var isHardwareSubmitEnabled = false
-
-@objc
-public class PaseoHardwareKeyboardReactDelegateHandler: ExpoReactDelegateHandler {
-  public override func createRootViewController() -> UIViewController? {
-    return PaseoHardwareKeyboardRootViewController()
-  }
-}
-
-public class PaseoHardwareKeyboardModule: Module {
-  public func definition() -> ModuleDefinition {
-    Name("PaseoHardwareKeyboard")
-
-    Events(hardwareSubmitEventName)
-
-    OnCreate {
-      activeModule = self
-    }
-
-    Function("setHardwareKeyboardSubmitEnabled") { (enabled: Bool) in
-      DispatchQueue.main.async {
-        isHardwareSubmitEnabled = enabled
-      }
-    }
-
-    OnDestroy {
-      if activeModule === self {
-        activeModule = nil
-      }
-      isHardwareSubmitEnabled = false
-    }
-  }
-
-  fileprivate func emitHardwareKeyboardSubmit() {
-    sendEvent(hardwareSubmitEventName, [:])
-  }
-}
-
-private final class PaseoHardwareKeyboardRootViewController: UIViewController {
-  override var keyCommands: [UIKeyCommand]? {
-    guard isHardwareSubmitEnabled && UIDevice.current.userInterfaceIdiom == .pad else {
-      return super.keyCommands
-    }
-
-    let command = UIKeyCommand(
-      input: "\r",
-      modifierFlags: [],
-      action: #selector(handleHardwareKeyboardSubmit(_:))
-    )
-    if #available(iOS 15.0, *) {
-      command.wantsPriorityOverSystemBehavior = true
-    }
-    return (super.keyCommands ?? []) + [command]
-  }
-
-  @objc
-  private func handleHardwareKeyboardSubmit(_ sender: UIKeyCommand) {
-    guard canSubmitCurrentTextInput() else {
-      return
-    }
-    activeModule?.emitHardwareKeyboardSubmit()
-  }
-
-  private func canSubmitCurrentTextInput() -> Bool {
-    guard let responder = UIResponder.paseoCurrentFirstResponder else {
-      return false
-    }
-    guard let textInput = responder as? UITextInput else {
-      return false
-    }
-    return textInput.markedTextRange == nil
-  }
-}
-
-private extension UIResponder {
-  private static weak var currentFirstResponder: UIResponder?
-
-  static var paseoCurrentFirstResponder: UIResponder? {
-    currentFirstResponder = nil
-    UIApplication.shared.sendAction(
-      #selector(captureCurrentFirstResponder(_:)),
-      to: nil,
-      from: nil,
-      for: nil
-    )
-    return currentFirstResponder
-  }
-
-  @objc
-  private func captureCurrentFirstResponder(_ sender: Any?) {
-    UIResponder.currentFirstResponder = self
-  }
-}

packages/app/modules/paseo-hardware-keyboard/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "paseo-hardware-keyboard",
-  "version": "0.1.0",
-  "private": true
-}

packages/app/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.1.78",
+  "version": "0.1.69",
   "private": true,
   "main": "index.ts",
   "scripts": {
-    "start": "cross-env APP_VARIANT=development expo start",
+    "start": "APP_VARIANT=development expo start",
     "reset-project": "node ./scripts/reset-project.js",
     "build:workspace-deps": "npm run build --workspace=@getpaseo/highlight && npm run build --workspace=@getpaseo/expo-two-way-audio",
     "eas-build-post-install": "npm run build:workspace-deps",
     "android": "npm run android:development",
-    "android:development": "cross-env APP_VARIANT=development expo prebuild --platform android --non-interactive && cross-env APP_VARIANT=development expo run:android --variant=debug",
-    "android:production": "cross-env APP_VARIANT=production expo prebuild --platform android --non-interactive && cross-env APP_VARIANT=production expo run:android --variant=release",
+    "android:development": "APP_VARIANT=development expo prebuild --platform android --non-interactive && APP_VARIANT=development expo run:android --variant=debug",
+    "android:production": "APP_VARIANT=production expo prebuild --platform android --non-interactive && APP_VARIANT=production expo run:android --variant=release",
     "android:release": "npm run android:production",
     "android:clear": "node -e \"require('node:fs').rmSync('android', { recursive: true, force: true })\"",
     "ios": "expo run:ios",
@@ -33,7 +33,7 @@
     "@floating-ui/react-native": "^0.10.7",
     "@getpaseo/expo-two-way-audio": "*",
     "@getpaseo/highlight": "*",
-    "@gorhom/bottom-sheet": "^5.2.14",
+    "@gorhom/bottom-sheet": "^5.2.6",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "2.2.0",
     "@react-native-masked-view/masked-view": "^0.3.2",
@@ -63,7 +63,6 @@
     "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",
@@ -116,7 +115,7 @@
     "playwright": "^1.56.1",
     "typescript": "~5.9.2",
     "vitest": "^3.2.4",
-    "wrangler": "^4.75.0",
+    "wrangler": "^4.59.1",
     "ws": "^8.20.0"
   }
 }

packages/app/src/app/_layout.tsx

@@ -56,10 +56,10 @@ import { useActiveWorktreeNewAction } from "@/hooks/use-active-worktree-new-acti
 import { useFaviconStatus } from "@/hooks/use-favicon-status";
 import { useKeyboardShortcuts } from "@/hooks/use-keyboard-shortcuts";
 import { useLatchedBoolean } from "@/hooks/use-latched-boolean";
-import { useCompactWebViewportZoomLock } from "@/hooks/use-compact-web-viewport-zoom-lock";
 import { useOpenProject } from "@/hooks/use-open-project";
 import { useAppSettings } from "@/hooks/use-settings";
 import { useStableEvent } from "@/hooks/use-stable-event";
+import { navigateToWorkspace } from "@/hooks/use-workspace-navigation";
 import { keyboardActionDispatcher } from "@/keyboard/keyboard-action-dispatcher";
 import { polyfillCrypto } from "@/polyfills/crypto";
 import { queryClient } from "@/query/query-client";
@@ -72,6 +72,7 @@ import {
 } from "@/runtime/host-runtime";
 import { getDaemonStartService } from "@/runtime/daemon-start-service";
 import { usePanelStore } from "@/stores/panel-store";
+import { useSessionStore } from "@/stores/session-store";
 import { THEME_TO_UNISTYLES, type ThemeName } from "@/styles/theme";
 import type { HostProfile } from "@/types/host-connection";
 import { resolveActiveHost } from "@/utils/active-host";
@@ -84,12 +85,13 @@ import {
   parseWorkspaceOpenIntent,
 } from "@/utils/host-routes";
 import { buildNotificationRoute, resolveNotificationTarget } from "@/utils/notification-routing";
-import { navigateToAgent } from "@/utils/navigate-to-agent";
 import {
   ensureOsNotificationPermission,
   WEB_NOTIFICATION_CLICK_EVENT,
   type WebNotificationClickDetail,
 } from "@/utils/os-notifications";
+import { resolveWorkspaceIdByExecutionDirectory } from "@/utils/workspace-execution";
+import { prepareWorkspaceTab } from "@/utils/workspace-navigation";
 
 polyfillCrypto();
 
@@ -116,8 +118,25 @@ function PushNotificationRouter() {
     const serverId = target.serverId;
     const agentId = target.agentId;
     if (serverId && agentId) {
-      navigateToAgent({ serverId, agentId, currentPathname: pathname, pin: true });
-      return;
+      const session = useSessionStore.getState().sessions[serverId];
+      const agent = session?.agents.get(agentId);
+      const workspaceId =
+        target.workspaceId ??
+        resolveWorkspaceIdByExecutionDirectory({
+          workspaces: session?.workspaces.values(),
+          workspaceDirectory: agent?.cwd,
+        });
+
+      if (workspaceId) {
+        prepareWorkspaceTab({
+          serverId,
+          workspaceId,
+          target: { kind: "agent", agentId },
+          pin: true,
+        });
+        navigateToWorkspace(serverId, workspaceId, { currentPathname: pathname });
+        return;
+      }
     }
 
     router.navigate(buildNotificationRoute(data));
@@ -376,8 +395,6 @@ function QueryProvider({ children }: { children: ReactNode }) {
 
 const rowStyle = { flex: 1, flexDirection: "row" } as const;
 const flexStyle = { flex: 1 } as const;
-const MOBILE_WEB_EDGE_SWIPE_WIDTH = 32;
-const MOBILE_WEB_GESTURE_TOUCH_ACTION = isWeb ? "auto" : "pan-y";
 
 interface AppContainerProps {
   children: ReactNode;
@@ -409,7 +426,6 @@ function AppContainer({
   }, [settings.theme, updateSettings]);
 
   const isCompactLayout = useIsCompactFormFactor();
-  useCompactWebViewportZoomLock(isCompactLayout);
   const chromeEnabled = chromeEnabledOverride ?? daemons.length > 0;
   const pathname = usePathname();
   const activeServerId = useMemo(
@@ -502,7 +518,6 @@ function MobileGestureWrapper({
     openGestureRef,
   } = useSidebarAnimation();
   const touchStartX = useSharedValue(0);
-  const touchStartY = useSharedValue(0);
   const openGestureEnabled = chromeEnabled && mobileView === "agent";
 
   const handleGestureOpen = useCallback(() => {
@@ -521,7 +536,6 @@ function MobileGestureWrapper({
           const touch = event.changedTouches[0];
           if (touch) {
             touchStartX.value = touch.absoluteX;
-            touchStartY.value = touch.absoluteY;
           }
         })
         .onTouchesMove((event, stateManager) => {
@@ -529,31 +543,13 @@ function MobileGestureWrapper({
           if (!touch || event.numberOfTouches !== 1) return;
 
           const deltaX = touch.absoluteX - touchStartX.value;
-          const deltaY = touch.absoluteY - touchStartY.value;
-          const absDeltaX = Math.abs(deltaX);
-          const absDeltaY = Math.abs(deltaY);
 
           if (horizontalScroll?.isAnyScrolledRight.value) {
             stateManager.fail();
             return;
           }
 
-          if (isWeb && touchStartX.value > MOBILE_WEB_EDGE_SWIPE_WIDTH) {
-            stateManager.fail();
-            return;
-          }
-
-          if (deltaX <= -10) {
-            stateManager.fail();
-            return;
-          }
-
-          if (absDeltaY > 10 && absDeltaY > absDeltaX) {
-            stateManager.fail();
-            return;
-          }
-
-          if (deltaX > 15 && absDeltaX > absDeltaY) {
+          if (deltaX > 15) {
             stateManager.activate();
           }
         })
@@ -595,12 +591,11 @@ function MobileGestureWrapper({
       openGestureRef,
       horizontalScroll?.isAnyScrolledRight,
       touchStartX,
-      touchStartY,
     ],
   );
 
   return (
-    <GestureDetector gesture={openGesture} touchAction={MOBILE_WEB_GESTURE_TOUCH_ACTION}>
+    <GestureDetector gesture={openGesture} touchAction="pan-y">
       {children}
     </GestureDetector>
   );
@@ -894,20 +889,15 @@ function RuntimeProviders({ children }: { children: ReactNode }) {
   );
 }
 
-// PortalProvider must remain the innermost global provider here.
-// `@gorhom/portal` renders portaled children at the host's location in the
-// tree, so any context a portaled sheet might consume (QueryClient, theme,
-// auth, settings, …) must wrap PortalProvider — not be wrapped by it.
-// Adding a new global provider? Put it above PortalProvider.
 function RootProviders({ children }: { children: ReactNode }) {
   return (
-    <QueryProvider>
+    <PortalProvider>
       <SafeAreaProvider>
         <KeyboardProvider>
-          <PortalProvider>{children}</PortalProvider>
+          <QueryProvider>{children}</QueryProvider>
         </KeyboardProvider>
       </SafeAreaProvider>
-    </QueryProvider>
+    </PortalProvider>
   );
 }
 

packages/app/src/app/h/[serverId]/new.tsx

@@ -2,16 +2,10 @@ import { useLocalSearchParams } from "expo-router";
 import { NewWorkspaceScreen } from "@/screens/new-workspace-screen";
 
 export default function HostNewWorkspaceRoute() {
-  const params = useLocalSearchParams<{
-    serverId?: string;
-    dir?: string;
-    name?: string;
-    projectId?: string;
-  }>();
+  const params = useLocalSearchParams<{ serverId?: string; dir?: string; name?: string }>();
   const serverId = typeof params.serverId === "string" ? params.serverId : "";
   const sourceDirectory = typeof params.dir === "string" ? params.dir : "";
   const displayName = typeof params.name === "string" ? params.name : undefined;
-  const projectId = typeof params.projectId === "string" ? params.projectId : undefined;
 
   if (!sourceDirectory) {
     return null;
@@ -22,7 +16,6 @@ export default function HostNewWorkspaceRoute() {
       serverId={serverId}
       sourceDirectory={sourceDirectory}
       displayName={displayName}
-      projectId={projectId}
     />
   );
 }

packages/app/src/assistant-file-links/index.ts

@@ -1,13 +0,0 @@
-export {
-  AssistantInlineCodePathLink,
-  AssistantInlinePathLink,
-  AssistantMarkdownCodeLink,
-  AssistantMarkdownLink,
-} from "./link";
-export {
-  classifyAssistantFileLink,
-  normalizeInlinePathTarget,
-  type InlinePathTarget,
-} from "./parse";
-export type { AssistantFileLinkSource } from "./resolver";
-export { useAssistantFileLinkResolver } from "./use-resolver";

packages/app/src/assistant-file-links/link.tsx

@@ -1,346 +0,0 @@
-import {
-  useCallback,
-  useMemo,
-  useState,
-  type CSSProperties,
-  type ReactNode,
-  type MouseEvent,
-} from "react";
-import {
-  Pressable,
-  Text,
-  View,
-  type StyleProp,
-  type TextStyle,
-  type ViewStyle,
-} from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { isNative, isWeb } from "@/constants/platform";
-import type { OpenFileDisposition } from "@/workspace/file-open";
-import { Shortcut } from "@/components/ui/shortcut";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-import { classifyAssistantFileLink, type InlinePathTarget } from "./parse";
-import type { AssistantFileLinkSource } from "./resolver";
-
-interface AssistantInlinePathLinkProps {
-  content: string;
-  parsed: InlinePathTarget;
-  onPress: (target: InlinePathTarget, disposition: OpenFileDisposition) => void;
-  workspaceRoot?: string;
-  style: StyleProp<TextStyle>;
-}
-
-export function AssistantInlinePathLink({
-  content,
-  parsed,
-  onPress,
-  workspaceRoot,
-  style,
-}: AssistantInlinePathLinkProps) {
-  const handlePress = useCallback(() => onPress(parsed, "main"), [onPress, parsed]);
-  const handleAnchorClickCapture = useCallback(
-    (event: MouseEvent<HTMLAnchorElement>) => {
-      event.preventDefault();
-      if (!isModifiedOpenEvent(event)) {
-        return;
-      }
-      event.stopPropagation();
-      onPress(parsed, "side");
-    },
-    [onPress, parsed],
-  );
-
-  if (!isNative) {
-    return (
-      <FileLinkHoverTooltip filePath={formatInlinePathTargetForTooltip(parsed, workspaceRoot)}>
-        <a
-          href={parsed.path}
-          onClickCapture={handleAnchorClickCapture}
-          onAuxClickCapture={preventAnchorNavigation}
-          style={LINK_ANCHOR_STYLE}
-        >
-          <Text onPress={handlePress} selectable={isWeb ? undefined : false} style={style}>
-            {content}
-          </Text>
-        </a>
-      </FileLinkHoverTooltip>
-    );
-  }
-
-  return (
-    <Text onPress={handlePress} selectable={isWeb ? undefined : false} style={style}>
-      {content}
-    </Text>
-  );
-}
-
-interface AssistantMarkdownLinkProps {
-  source: AssistantFileLinkSource;
-  style: StyleProp<TextStyle>;
-  onPress: (source: AssistantFileLinkSource, disposition: OpenFileDisposition) => void;
-  onPrefetch: (source: AssistantFileLinkSource) => void;
-  workspaceRoot?: string;
-  children: ReactNode;
-}
-
-export function AssistantMarkdownLink({
-  source,
-  style,
-  onPress,
-  onPrefetch,
-  workspaceRoot,
-  children,
-}: AssistantMarkdownLinkProps) {
-  const [hovered, setHovered] = useState(false);
-  const href = source.href;
-  const handlePress = useCallback(() => onPress(source, "main"), [onPress, source]);
-  const handleAnchorClickCapture = useCallback(
-    (event: MouseEvent<HTMLAnchorElement>) => {
-      event.preventDefault();
-      if (!isModifiedOpenEvent(event)) {
-        return;
-      }
-      event.stopPropagation();
-      onPress(source, "side");
-    },
-    [onPress, source],
-  );
-  const handlePrefetch = useCallback(() => onPrefetch(source), [onPrefetch, source]);
-  const handleHoverIn = useCallback(() => {
-    setHovered(true);
-    handlePrefetch();
-  }, [handlePrefetch]);
-  const handleHoverOut = useCallback(() => setHovered(false), []);
-  const hoveredTextStyle = useMemo<StyleProp<TextStyle>>(
-    () => [style, hovered && { textDecorationLine: "underline" as const }],
-    [style, hovered],
-  );
-  const tooltipFilePath = useMemo(
-    () => getMarkdownLinkTooltipFilePath(source.href, workspaceRoot),
-    [source.href, workspaceRoot],
-  );
-  if (isNative) {
-    return (
-      <Text accessibilityRole="link" onPress={handlePress} style={style}>
-        {children}
-      </Text>
-    );
-  }
-
-  const anchor = (
-    <a
-      href={href}
-      onClickCapture={handleAnchorClickCapture}
-      onAuxClickCapture={preventAnchorNavigation}
-      style={LINK_ANCHOR_STYLE}
-    >
-      <Pressable
-        accessibilityRole="link"
-        onPress={handlePress}
-        onFocus={handlePrefetch}
-        onHoverIn={handleHoverIn}
-        onHoverOut={handleHoverOut}
-      >
-        <Text style={hoveredTextStyle}>{children}</Text>
-      </Pressable>
-    </a>
-  );
-
-  if (tooltipFilePath) {
-    return <FileLinkHoverTooltip filePath={tooltipFilePath}>{anchor}</FileLinkHoverTooltip>;
-  }
-  return anchor;
-}
-
-interface AssistantMarkdownCodeLinkProps {
-  source: AssistantFileLinkSource;
-  inheritedStyles: TextStyle;
-  codeInlineStyle: TextStyle;
-  linkStyle: TextStyle;
-  onPress: (source: AssistantFileLinkSource, disposition: OpenFileDisposition) => void;
-  onPrefetch: (source: AssistantFileLinkSource) => void;
-  workspaceRoot?: string;
-  children: ReactNode;
-}
-
-export function AssistantMarkdownCodeLink({
-  source,
-  inheritedStyles,
-  codeInlineStyle,
-  linkStyle,
-  onPress,
-  onPrefetch,
-  workspaceRoot,
-  children,
-}: AssistantMarkdownCodeLinkProps) {
-  const style = useMemo(
-    () => [inheritedStyles, codeInlineStyle, linkStyle],
-    [inheritedStyles, codeInlineStyle, linkStyle],
-  );
-  return (
-    <AssistantMarkdownLink
-      source={source}
-      style={style}
-      onPress={onPress}
-      onPrefetch={onPrefetch}
-      workspaceRoot={workspaceRoot}
-    >
-      {children}
-    </AssistantMarkdownLink>
-  );
-}
-
-interface AssistantInlineCodePathLinkProps {
-  content: string;
-  inheritedStyles: TextStyle;
-  codeInlineStyle: TextStyle;
-  linkStyle: TextStyle;
-  onPress: (source: AssistantFileLinkSource, disposition: OpenFileDisposition) => void;
-  onPrefetch: (source: AssistantFileLinkSource) => void;
-  workspaceRoot?: string;
-}
-
-export function AssistantInlineCodePathLink({
-  content,
-  inheritedStyles,
-  codeInlineStyle,
-  linkStyle,
-  onPress,
-  onPrefetch,
-  workspaceRoot,
-}: AssistantInlineCodePathLinkProps) {
-  const source = useMemo<AssistantFileLinkSource>(
-    () => ({
-      href: content,
-      text: content,
-      sourceType: "inline-code",
-    }),
-    [content],
-  );
-
-  return (
-    <AssistantMarkdownCodeLink
-      source={source}
-      inheritedStyles={inheritedStyles}
-      codeInlineStyle={codeInlineStyle}
-      linkStyle={linkStyle}
-      onPress={onPress}
-      onPrefetch={onPrefetch}
-      workspaceRoot={workspaceRoot}
-    >
-      {content}
-    </AssistantMarkdownCodeLink>
-  );
-}
-
-function getMarkdownLinkTooltipFilePath(
-  href: string,
-  workspaceRoot: string | undefined,
-): string | null {
-  const classification = classifyAssistantFileLink(href, { workspaceRoot });
-  if (classification?.kind !== "directFile") {
-    return null;
-  }
-  return formatInlinePathTargetForTooltip(classification.target, workspaceRoot);
-}
-
-function formatInlinePathTargetForTooltip(
-  target: InlinePathTarget,
-  workspaceRoot: string | undefined,
-): string {
-  let result = relativizePathToWorkspace(target.path, workspaceRoot);
-  if (target.lineStart) {
-    result += `:${target.lineStart}`;
-    if (target.lineEnd && target.lineEnd !== target.lineStart) {
-      result += `-${target.lineEnd}`;
-    }
-  }
-  return result;
-}
-
-function relativizePathToWorkspace(filePath: string, workspaceRoot: string | undefined): string {
-  if (!workspaceRoot) {
-    return filePath;
-  }
-  const root = workspaceRoot.replace(/\/+$/, "");
-  if (!root) {
-    return filePath;
-  }
-  if (filePath === root) {
-    return ".";
-  }
-  const prefix = `${root}/`;
-  if (filePath.startsWith(prefix)) {
-    return filePath.slice(prefix.length);
-  }
-  return filePath;
-}
-
-const FILE_LINK_TOOLTIP_TRIGGER_STYLE: ViewStyle = {
-  // RN doesn't type "inline-flex" but RN-web honors it at runtime, which keeps
-  // the tooltip wrapper from breaking inline link flow.
-  display: "inline-flex" as ViewStyle["display"],
-};
-
-const FILE_LINK_TOOLTIP_MOD_KEYS = ["mod"];
-
-function FileLinkHoverTooltip({ filePath, children }: { filePath: string; children: ReactNode }) {
-  if (!isWeb) {
-    return children;
-  }
-  return (
-    <Tooltip delayDuration={400}>
-      <TooltipTrigger asChild>
-        <View style={FILE_LINK_TOOLTIP_TRIGGER_STYLE}>{children}</View>
-      </TooltipTrigger>
-      <TooltipContent side="top" align="start" maxWidth={520}>
-        <View style={styles.tooltipBody}>
-          <Text selectable={false} style={styles.tooltipPath}>
-            {filePath}
-          </Text>
-          <View style={styles.tooltipHintRow}>
-            <Shortcut keys={FILE_LINK_TOOLTIP_MOD_KEYS} />
-            <Text selectable={false} style={styles.tooltipHintText}>
-              click for side pane
-            </Text>
-          </View>
-        </View>
-      </TooltipContent>
-    </Tooltip>
-  );
-}
-
-const LINK_ANCHOR_STYLE: CSSProperties = {
-  display: "contents",
-  color: "inherit",
-  textDecoration: "none",
-};
-
-function preventAnchorNavigation(event: MouseEvent<HTMLAnchorElement>): void {
-  event.preventDefault();
-}
-
-function isModifiedOpenEvent(event: MouseEvent<HTMLElement>): boolean {
-  return event.metaKey || event.ctrlKey;
-}
-
-const styles = StyleSheet.create((theme) => ({
-  tooltipBody: {
-    gap: theme.spacing[1],
-  },
-  tooltipPath: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.xs,
-    fontWeight: theme.fontWeight.normal,
-  },
-  tooltipHintRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-  },
-  tooltipHintText: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.xs,
-    fontWeight: theme.fontWeight.normal,
-  },
-}));

packages/app/src/assistant-file-links/resolver.test.ts

@@ -1,604 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import {
-  createAssistantFileLinkResolver,
-  getAssistantFileLinkToken,
-  type AssistantFileLinkContext,
-  type DirectorySuggestionEntry,
-  type DirectorySuggestionResult,
-} from "./resolver";
-import type { OpenFileDisposition } from "@/workspace/file-open";
-import type { InlinePathTarget } from "./parse";
-
-const CONTEXT: AssistantFileLinkContext = {
-  serverId: "server-1",
-  workspaceRoot: "/Users/test/project",
-};
-
-function resolvedSuggestions(
-  entries: DirectorySuggestionResult["entries"],
-): DirectorySuggestionResult {
-  return { entries, error: null };
-}
-
-function createDeferred<T>() {
-  let resolve!: (value: T) => void;
-  let reject!: (error: unknown) => void;
-  const promise = new Promise<T>((promiseResolve, promiseReject) => {
-    resolve = promiseResolve;
-    reject = promiseReject;
-  });
-
-  return { promise, resolve, reject };
-}
-
-interface DirectorySearch {
-  query: string;
-  cwd: string;
-  includeFiles: true;
-  includeDirectories: false;
-  matchMode: "suffix";
-  limit: number;
-}
-
-interface OpenedFile {
-  target: InlinePathTarget;
-  disposition: OpenFileDisposition;
-}
-
-class FakeWorkspaceFiles {
-  readonly searches: DirectorySearch[] = [];
-  readonly openedFiles: OpenedFile[] = [];
-  readonly unresolvedTokens: string[] = [];
-
-  constructor(private readonly entriesByQuery: Record<string, DirectorySuggestionEntry[]>) {}
-
-  createResolver() {
-    return createAssistantFileLinkResolver({
-      getDirectorySuggestions: this.getDirectorySuggestions,
-      openWorkspaceFile: this.openWorkspaceFile,
-      openExternalUrl: async () => {},
-      onUnresolvedFileCandidate: this.onUnresolvedFileCandidate,
-    });
-  }
-
-  private getDirectorySuggestions = async (
-    search: DirectorySearch,
-  ): Promise<DirectorySuggestionResult> => {
-    this.searches.push(search);
-    return resolvedSuggestions(this.entriesByQuery[search.query] ?? []);
-  };
-
-  private openWorkspaceFile = (
-    target: InlinePathTarget,
-    disposition: OpenFileDisposition,
-  ): void => {
-    this.openedFiles.push({ target, disposition });
-  };
-
-  private onUnresolvedFileCandidate = (token: string): void => {
-    this.unresolvedTokens.push(token);
-  };
-}
-
-describe("assistant file link resolver", () => {
-  it("dedupes in-flight prefetches and serves the click from cache", async () => {
-    const suggestions = vi.fn(async () =>
-      resolvedSuggestions([{ path: "src/dumm.md", kind: "file" }]),
-    );
-    const openWorkspaceFile = vi.fn();
-    const openExternalUrl = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile,
-      openExternalUrl,
-    });
-    const source = { href: "http://dumm.md", text: "dumm.md", markup: "linkify" };
-
-    await Promise.all([
-      resolver.prefetch({ context: CONTEXT, source }),
-      resolver.prefetch({ context: CONTEXT, source }),
-    ]);
-    const result = await resolver.open({ context: CONTEXT, source, disposition: "main" });
-
-    expect(suggestions).toHaveBeenCalledTimes(1);
-    expect(suggestions).toHaveBeenCalledWith({
-      query: "dumm.md",
-      cwd: "/Users/test/project",
-      includeFiles: true,
-      includeDirectories: false,
-      matchMode: "suffix",
-      limit: 1,
-    });
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "dumm.md",
-        path: "/Users/test/project/src/dumm.md",
-        lineStart: undefined,
-        lineEnd: undefined,
-      },
-      "main",
-    );
-    expect(openExternalUrl).not.toHaveBeenCalled();
-    expect(result.opened).toBe(true);
-  });
-
-  it("click consumes an in-flight hover resolution", async () => {
-    const deferred = createDeferred<DirectorySuggestionResult>();
-    const suggestions = vi.fn(() => deferred.promise);
-    const openWorkspaceFile = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile,
-      openExternalUrl: vi.fn(),
-    });
-    const source = { href: "http://dumm.md", text: "dumm.md", sourceInfo: "auto" };
-
-    const prefetch = resolver.prefetch({ context: CONTEXT, source });
-    const opened = resolver.open({ context: CONTEXT, source, disposition: "main" });
-    deferred.resolve(resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]));
-
-    await prefetch;
-    const result = await opened;
-
-    expect(suggestions).toHaveBeenCalledTimes(1);
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "dumm.md",
-        path: "/Users/test/project/docs/dumm.md",
-        lineStart: undefined,
-        lineEnd: undefined,
-      },
-      "main",
-    );
-    expect(result.opened).toBe(true);
-  });
-
-  it("retries a click after hover prefetch fails to query suggestions", async () => {
-    const suggestions = vi
-      .fn()
-      .mockRejectedValueOnce(new Error("daemon unavailable"))
-      .mockResolvedValueOnce(resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]));
-    const openWorkspaceFile = vi.fn();
-    const openExternalUrl = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile,
-      openExternalUrl,
-    });
-    const source = { href: "http://dumm.md", text: "dumm.md", markup: "linkify" };
-
-    const prefetchResult = await resolver.prefetch({ context: CONTEXT, source });
-    const openResult = await resolver.open({ context: CONTEXT, source, disposition: "main" });
-
-    expect(prefetchResult).toEqual({
-      kind: "unresolvedFileCandidate",
-      token: "dumm.md",
-    });
-    expect(suggestions).toHaveBeenCalledTimes(2);
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "dumm.md",
-        path: "/Users/test/project/docs/dumm.md",
-        lineStart: undefined,
-        lineEnd: undefined,
-      },
-      "main",
-    );
-    expect(openExternalUrl).not.toHaveBeenCalled();
-    expect(openResult.opened).toBe(true);
-  });
-
-  it("does not cache unresolved candidates", async () => {
-    const suggestions = vi
-      .fn()
-      .mockResolvedValueOnce(resolvedSuggestions([]))
-      .mockResolvedValueOnce(resolvedSuggestions([{ path: "docs/dumm.md", kind: "file" }]));
-    const openWorkspaceFile = vi.fn();
-    const openExternalUrl = vi.fn();
-    const onUnresolvedFileCandidate = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile,
-      openExternalUrl,
-      onUnresolvedFileCandidate,
-    });
-    const source = { href: "http://dumm.md", text: "dumm.md", markup: "linkify" };
-
-    const first = await resolver.open({ context: CONTEXT, source, disposition: "main" });
-    const second = await resolver.open({ context: CONTEXT, source, disposition: "main" });
-
-    expect(first).toEqual({
-      kind: "unresolvedFileCandidate",
-      token: "dumm.md",
-      opened: false,
-    });
-    expect(second.opened).toBe(true);
-    expect(suggestions).toHaveBeenCalledTimes(2);
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "dumm.md",
-        path: "/Users/test/project/docs/dumm.md",
-        lineStart: undefined,
-        lineEnd: undefined,
-      },
-      "main",
-    );
-    expect(openExternalUrl).not.toHaveBeenCalled();
-    expect(onUnresolvedFileCandidate).toHaveBeenCalledTimes(1);
-  });
-
-  it("keys cache entries by server, workspace, and token", async () => {
-    const suggestions = vi
-      .fn()
-      .mockResolvedValueOnce(resolvedSuggestions([{ path: "one/dumm.md", kind: "file" }]))
-      .mockResolvedValueOnce(resolvedSuggestions([{ path: "two/dumm.md", kind: "file" }]));
-    const openWorkspaceFile = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile,
-      openExternalUrl: vi.fn(),
-    });
-    const source = { href: "http://dumm.md", text: "dumm.md", markup: "linkify" };
-
-    await resolver.open({ context: CONTEXT, source, disposition: "main" });
-    await resolver.open({
-      context: { serverId: "server-1", workspaceRoot: "/Users/test/other" },
-      source,
-      disposition: "main",
-    });
-
-    expect(suggestions).toHaveBeenCalledTimes(2);
-    expect(openWorkspaceFile).toHaveBeenLastCalledWith(
-      {
-        raw: "dumm.md",
-        path: "/Users/test/other/two/dumm.md",
-        lineStart: undefined,
-        lineEnd: undefined,
-      },
-      "main",
-    );
-  });
-
-  it("does not apply stale async results after the active context changes", async () => {
-    const deferred = createDeferred<DirectorySuggestionResult>();
-    let isCurrent = true;
-    const openWorkspaceFile = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: vi.fn(() => deferred.promise),
-      openWorkspaceFile,
-      openExternalUrl: vi.fn(),
-      isCurrentContext: () => isCurrent,
-    });
-
-    const opened = resolver.open({
-      context: CONTEXT,
-      source: { href: "http://dumm.md", text: "dumm.md", markup: "linkify" },
-      disposition: "main",
-    });
-    isCurrent = false;
-    deferred.resolve(resolvedSuggestions([{ path: "dumm.md", kind: "file" }]));
-    const result = await opened;
-
-    expect(openWorkspaceFile).not.toHaveBeenCalled();
-    expect(result.opened).toBe(false);
-    expect(result.kind).toBe("file");
-  });
-
-  it("opens direct workspace file links without querying suggestions", async () => {
-    const suggestions = vi.fn(async () => resolvedSuggestions([]));
-    const openWorkspaceFile = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile,
-      openExternalUrl: vi.fn(),
-    });
-
-    const result = await resolver.open({
-      context: CONTEXT,
-      source: { href: "src/components/message.tsx#L33" },
-      disposition: "main",
-    });
-
-    expect(suggestions).not.toHaveBeenCalled();
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "src/components/message.tsx#L33",
-        path: "/Users/test/project/src/components/message.tsx",
-        lineStart: 33,
-        lineEnd: undefined,
-      },
-      "main",
-    );
-    expect(result.opened).toBe(true);
-  });
-
-  it("preserves direct workspace file line ranges", async () => {
-    const openWorkspaceFile = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: vi.fn(async () => resolvedSuggestions([])),
-      openWorkspaceFile,
-      openExternalUrl: vi.fn(),
-    });
-
-    await resolver.open({
-      context: CONTEXT,
-      source: { href: "src/components/message.tsx:33-40" },
-      disposition: "main",
-    });
-
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "src/components/message.tsx:33-40",
-        path: "/Users/test/project/src/components/message.tsx",
-        lineStart: 33,
-        lineEnd: 40,
-      },
-      "main",
-    );
-  });
-
-  it("opens basename line refs when the daemon returns that exact filename", async () => {
-    const workspaceFiles = new FakeWorkspaceFiles({
-      "file.ts": [{ path: "packages/app/src/file.ts", kind: "file" }],
-    });
-    const resolver = workspaceFiles.createResolver();
-
-    const result = await resolver.open({
-      context: { ...CONTEXT, workspaceRoot: "/Users/test/project" },
-      source: {
-        href: "file.ts:12",
-        text: "file.ts:12",
-        sourceType: "inline-code",
-      },
-      disposition: "main",
-    });
-
-    expect(workspaceFiles.searches).toEqual([
-      {
-        query: "file.ts",
-        cwd: "/Users/test/project",
-        includeFiles: true,
-        includeDirectories: false,
-        matchMode: "suffix",
-        limit: 1,
-      },
-    ]);
-    expect(workspaceFiles.openedFiles).toEqual([
-      {
-        target: {
-          raw: "file.ts:12",
-          path: "/Users/test/project/packages/app/src/file.ts",
-          lineStart: 12,
-          lineEnd: undefined,
-        },
-        disposition: "main",
-      },
-    ]);
-    expect(result.opened).toBe(true);
-  });
-
-  it("reports inline-code subpaths as unresolved when suffix suggestions find no file", async () => {
-    const workspaceFiles = new FakeWorkspaceFiles({});
-    const resolver = workspaceFiles.createResolver();
-
-    const result = await resolver.open({
-      context: { ...CONTEXT, workspaceRoot: "/Users/test/project" },
-      source: {
-        href: "src/file.ts",
-        text: "src/file.ts",
-        sourceType: "inline-code",
-      },
-      disposition: "main",
-    });
-
-    expect(workspaceFiles.searches).toEqual([
-      {
-        query: "src/file.ts",
-        cwd: "/Users/test/project",
-        includeFiles: true,
-        includeDirectories: false,
-        matchMode: "suffix",
-        limit: 1,
-      },
-    ]);
-    expect(workspaceFiles.openedFiles).toEqual([]);
-    expect(workspaceFiles.unresolvedTokens).toEqual(["src/file.ts"]);
-    expect(result).toEqual({
-      kind: "unresolvedFileCandidate",
-      token: "src/file.ts",
-      opened: false,
-    });
-  });
-
-  it("passes side open disposition to workspace file links", async () => {
-    const openWorkspaceFile = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: vi.fn(async () => resolvedSuggestions([])),
-      openWorkspaceFile,
-      openExternalUrl: vi.fn(),
-    });
-
-    await resolver.open({
-      context: CONTEXT,
-      source: { href: "src/components/message.tsx#L33" },
-      disposition: "side",
-    });
-
-    expect(openWorkspaceFile).toHaveBeenCalledWith(
-      {
-        raw: "src/components/message.tsx#L33",
-        path: "/Users/test/project/src/components/message.tsx",
-        lineStart: 33,
-        lineEnd: undefined,
-      },
-      "side",
-    );
-  });
-
-  it("keeps explicit external URLs external", async () => {
-    const openExternalUrl = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: vi.fn(async () => resolvedSuggestions([])),
-      openWorkspaceFile: vi.fn(),
-      openExternalUrl,
-    });
-
-    const result = await resolver.open({
-      context: CONTEXT,
-      source: { href: "http://dumm.md", text: "dumm.md" },
-      disposition: "main",
-    });
-
-    expect(openExternalUrl).toHaveBeenCalledWith("http://dumm.md");
-    expect(result).toEqual({
-      kind: "external",
-      url: "http://dumm.md",
-      opened: true,
-    });
-  });
-
-  it("keeps auto-linkified normal domains external", async () => {
-    const suggestions = vi.fn(async () => resolvedSuggestions([]));
-    const openExternalUrl = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile: vi.fn(),
-      openExternalUrl,
-    });
-
-    const result = await resolver.open({
-      context: CONTEXT,
-      source: { href: "http://google.com", text: "google.com", markup: "linkify" },
-      disposition: "main",
-    });
-
-    expect(suggestions).not.toHaveBeenCalled();
-    expect(openExternalUrl).toHaveBeenCalledWith("http://google.com");
-    expect(result).toEqual({
-      kind: "external",
-      url: "http://google.com",
-      opened: true,
-    });
-  });
-
-  it("keeps auto-linkified normal domain paths external", async () => {
-    const suggestions = vi.fn(async () => resolvedSuggestions([]));
-    const openExternalUrl = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: suggestions,
-      openWorkspaceFile: vi.fn(),
-      openExternalUrl,
-    });
-
-    const result = await resolver.open({
-      context: CONTEXT,
-      source: { href: "http://openai.com/path", text: "openai.com/path", sourceInfo: "auto" },
-      disposition: "main",
-    });
-
-    expect(suggestions).not.toHaveBeenCalled();
-    expect(openExternalUrl).toHaveBeenCalledWith("http://openai.com/path");
-    expect(result).toEqual({
-      kind: "external",
-      url: "http://openai.com/path",
-      opened: true,
-    });
-  });
-
-  it("does not open unresolved linkified markdown filenames in the browser", async () => {
-    const openWorkspaceFile = vi.fn();
-    const openExternalUrl = vi.fn();
-    const onUnresolvedFileCandidate = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: vi.fn(async () => resolvedSuggestions([])),
-      openWorkspaceFile,
-      openExternalUrl,
-      onUnresolvedFileCandidate,
-    });
-
-    const prefetchResult = await resolver.prefetch({
-      context: CONTEXT,
-      source: { href: "http://dumm.md", text: "dumm.md", sourceInfo: "auto" },
-    });
-    const result = await resolver.open({
-      context: CONTEXT,
-      source: { href: "http://dumm.md", text: "dumm.md", sourceInfo: "auto" },
-      disposition: "main",
-    });
-
-    expect(openWorkspaceFile).not.toHaveBeenCalled();
-    expect(openExternalUrl).not.toHaveBeenCalled();
-    expect(prefetchResult).toEqual({
-      kind: "unresolvedFileCandidate",
-      token: "dumm.md",
-    });
-    expect(onUnresolvedFileCandidate).toHaveBeenCalledTimes(1);
-    expect(onUnresolvedFileCandidate).toHaveBeenCalledWith("dumm.md");
-    expect(result).toEqual({
-      kind: "unresolvedFileCandidate",
-      token: "dumm.md",
-      opened: false,
-    });
-  });
-
-  it("keeps failed ambiguous resolution out of the browser", async () => {
-    const openExternalUrl = vi.fn();
-    const onUnresolvedFileCandidate = vi.fn();
-    const resolver = createAssistantFileLinkResolver({
-      getDirectorySuggestions: vi.fn(async () => {
-        throw new Error("daemon unavailable");
-      }),
-      openWorkspaceFile: vi.fn(),
-      openExternalUrl,
-      onUnresolvedFileCandidate,
-    });
-
-    const result = await resolver.open({
-      context: CONTEXT,
-      source: { href: "http://dumm.md", text: "dumm.md", markup: "linkify" },
-      disposition: "main",
-    });
-
-    expect(openExternalUrl).not.toHaveBeenCalled();
-    expect(onUnresolvedFileCandidate).toHaveBeenCalledWith("dumm.md");
-    expect(result).toEqual({
-      kind: "unresolvedFileCandidate",
-      token: "dumm.md",
-      opened: false,
-    });
-  });
-
-  it("uses rendered text for markdown-it linkified tokens and href for explicit links", () => {
-    expect(
-      getAssistantFileLinkToken({
-        href: "http://dumm.md",
-        text: "dumm.md",
-        markup: "linkify",
-        sourceInfo: "auto",
-      }),
-    ).toBe("dumm.md");
-    expect(
-      getAssistantFileLinkToken({
-        href: "http://google.com",
-        text: "google.com",
-        markup: "linkify",
-        sourceInfo: "auto",
-      }),
-    ).toBe("http://google.com");
-    expect(
-      getAssistantFileLinkToken({
-        href: "http://dumm.md",
-        text: "dumm.md",
-        markup: "",
-        sourceInfo: "",
-      }),
-    ).toBe("http://dumm.md");
-    expect(
-      getAssistantFileLinkToken({
-        href: "workspace-git-service.ts:1553",
-        text: "workspace-git-service.ts:1553",
-        sourceType: "inline-code",
-      }),
-    ).toBe("workspace-git-service.ts:1553");
-  });
-});

packages/app/src/assistant-file-links/resolver.ts

@@ -1,307 +0,0 @@
-import {
-  classifyAssistantFileLink,
-  isFileLookingAssistantToken,
-  type AssistantFileLinkClassification,
-  type InlinePathTarget,
-} from "./parse";
-import type { OpenFileDisposition } from "@/workspace/file-open";
-
-export interface AssistantFileLinkContext {
-  serverId?: string;
-  workspaceRoot?: string;
-}
-
-export interface AssistantFileLinkSource {
-  href: string;
-  text?: string;
-  markup?: string;
-  sourceInfo?: string;
-  sourceType?: "inline-code";
-}
-
-export interface DirectorySuggestionEntry {
-  path: string;
-  kind: "file" | "directory";
-}
-
-export interface DirectorySuggestionResult {
-  entries: DirectorySuggestionEntry[];
-  error: string | null;
-}
-
-export interface AssistantFileLinkResolverDependencies {
-  getDirectorySuggestions: (input: {
-    query: string;
-    cwd: string;
-    includeFiles: true;
-    includeDirectories: false;
-    matchMode: "suffix";
-    limit: number;
-  }) => Promise<DirectorySuggestionResult>;
-  openWorkspaceFile: (target: InlinePathTarget, disposition: OpenFileDisposition) => void;
-  openExternalUrl: (url: string) => void | Promise<void>;
-  onUnresolvedFileCandidate?: (token: string) => void;
-  isCurrentContext?: (context: AssistantFileLinkContext) => boolean;
-}
-
-export interface AssistantFileLinkResolver {
-  prefetch(input: AssistantFileLinkPrefetchInput): Promise<ResolvedAssistantFileLink>;
-  open(input: AssistantFileLinkOpenInput): Promise<AssistantFileLinkOpenResult>;
-}
-
-export interface AssistantFileLinkPrefetchInput {
-  context: AssistantFileLinkContext;
-  source: AssistantFileLinkSource;
-}
-
-export interface AssistantFileLinkOpenInput extends AssistantFileLinkPrefetchInput {
-  disposition: OpenFileDisposition;
-}
-
-export type ResolvedAssistantFileLink =
-  | {
-      kind: "external";
-      url: string;
-    }
-  | {
-      kind: "file";
-      target: InlinePathTarget;
-    }
-  | {
-      kind: "unresolvedFileCandidate";
-      token: string;
-    }
-  | {
-      kind: "ignored";
-    };
-
-export type AssistantFileLinkOpenResult = ResolvedAssistantFileLink & {
-  opened: boolean;
-};
-
-type CachedAssistantFileLink = Exclude<ResolvedAssistantFileLink, { kind: "external" }>;
-
-interface ParsedAssistantFileLinkInteraction {
-  token: string;
-  classification: AssistantFileLinkClassification;
-}
-
-export function createAssistantFileLinkResolver(
-  dependencies: AssistantFileLinkResolverDependencies,
-): AssistantFileLinkResolver {
-  const cache = new Map<string, CachedAssistantFileLink>();
-  const inFlight = new Map<string, Promise<CachedAssistantFileLink>>();
-
-  async function resolve(
-    input: AssistantFileLinkPrefetchInput,
-  ): Promise<ResolvedAssistantFileLink> {
-    const parsed = parseInteraction(input);
-    if (!parsed) {
-      return { kind: "ignored" };
-    }
-
-    if (parsed.classification.kind === "external") {
-      return { kind: "external", url: parsed.classification.raw };
-    }
-
-    if (
-      parsed.classification.kind === "directFile" &&
-      !shouldResolveDirectFileThroughSuggestions({
-        context: input.context,
-        source: input.source,
-        token: parsed.token,
-        target: parsed.classification.target,
-      })
-    ) {
-      return { kind: "file", target: parsed.classification.target };
-    }
-
-    const key = getResolutionKey(input.context, parsed.token);
-    const cached = cache.get(key);
-    if (cached) {
-      return cached;
-    }
-
-    const active = inFlight.get(key);
-    if (active) {
-      return active;
-    }
-
-    const request = resolveAmbiguousCandidate({
-      context: input.context,
-      token: parsed.token,
-      target: parsed.classification.target,
-      getDirectorySuggestions: dependencies.getDirectorySuggestions,
-    })
-      .then((result) => {
-        if (result.kind === "file") {
-          cache.set(key, result);
-        }
-        inFlight.delete(key);
-        return result;
-      })
-      .catch((): CachedAssistantFileLink => {
-        inFlight.delete(key);
-        return { kind: "unresolvedFileCandidate", token: parsed.token };
-      });
-
-    inFlight.set(key, request);
-    return request;
-  }
-
-  return {
-    prefetch(input) {
-      return resolve(input);
-    },
-    async open(input) {
-      const resolved = await resolve(input);
-      if (!canApplyResult(input.context, dependencies.isCurrentContext)) {
-        return { ...resolved, opened: false };
-      }
-
-      if (resolved.kind === "file") {
-        dependencies.openWorkspaceFile(resolved.target, input.disposition);
-        return { ...resolved, opened: true };
-      }
-
-      if (resolved.kind === "external") {
-        await dependencies.openExternalUrl(resolved.url);
-        return { ...resolved, opened: true };
-      }
-
-      if (resolved.kind === "unresolvedFileCandidate") {
-        dependencies.onUnresolvedFileCandidate?.(resolved.token);
-      }
-
-      return { ...resolved, opened: false };
-    },
-  };
-}
-
-export function getAssistantFileLinkToken(source: AssistantFileLinkSource): string {
-  if (isLinkifiedSource(source) || source.sourceType === "inline-code") {
-    const text = source.text?.trim();
-    if (text && isFileLookingAssistantToken(text)) {
-      return text;
-    }
-  }
-
-  return source.href;
-}
-
-function parseInteraction(
-  input: AssistantFileLinkPrefetchInput,
-): ParsedAssistantFileLinkInteraction | null {
-  const token = getAssistantFileLinkToken(input.source).trim();
-  if (!token) {
-    return null;
-  }
-
-  const classification = classifyAssistantFileLink(token, {
-    workspaceRoot: input.context.workspaceRoot,
-  });
-  if (!classification) {
-    return null;
-  }
-
-  return { token, classification };
-}
-
-async function resolveAmbiguousCandidate(input: {
-  context: AssistantFileLinkContext;
-  token: string;
-  target: InlinePathTarget;
-  getDirectorySuggestions: AssistantFileLinkResolverDependencies["getDirectorySuggestions"];
-}): Promise<CachedAssistantFileLink> {
-  const workspaceRoot = input.context.workspaceRoot?.trim();
-  if (!workspaceRoot) {
-    return { kind: "unresolvedFileCandidate", token: input.token };
-  }
-
-  const query = getAmbiguousSuggestionQuery(input.target, workspaceRoot);
-  const suggestions = await input.getDirectorySuggestions({
-    query,
-    cwd: workspaceRoot,
-    includeFiles: true,
-    includeDirectories: false,
-    matchMode: "suffix",
-    limit: 1,
-  });
-  const match = suggestions.entries.find((entry) => entry.kind === "file");
-  if (!match || suggestions.error) {
-    return { kind: "unresolvedFileCandidate", token: input.token };
-  }
-
-  return {
-    kind: "file",
-    target: {
-      ...input.target,
-      path: joinWorkspacePath(workspaceRoot, match.path),
-    },
-  };
-}
-
-function getAmbiguousSuggestionQuery(target: InlinePathTarget, workspaceRoot: string): string {
-  const normalizedRoot = workspaceRoot.replace(/\\/g, "/").replace(/\/+$/, "");
-  const normalizedPath = target.path.replace(/\\/g, "/");
-  const prefix = `${normalizedRoot}/`;
-  if (normalizedPath.startsWith(prefix)) {
-    return normalizedPath.slice(prefix.length);
-  }
-
-  const lastSlash = normalizedPath.lastIndexOf("/");
-  return lastSlash >= 0 ? normalizedPath.slice(lastSlash + 1) : normalizedPath;
-}
-
-function shouldResolveDirectFileThroughSuggestions(input: {
-  context: AssistantFileLinkContext;
-  source: AssistantFileLinkSource;
-  token: string;
-  target: InlinePathTarget;
-}): boolean {
-  if (input.source.sourceType !== "inline-code") {
-    return false;
-  }
-
-  if (isAbsoluteInlineCodeToken(input.token)) {
-    return false;
-  }
-
-  const workspaceRoot = input.context.workspaceRoot?.trim();
-  if (!workspaceRoot) {
-    return false;
-  }
-
-  const normalizedRoot = workspaceRoot.replace(/\\/g, "/").replace(/\/+$/, "");
-  const normalizedPath = input.target.path.replace(/\\/g, "/");
-  return normalizedPath.startsWith(`${normalizedRoot}/`);
-}
-
-function isAbsoluteInlineCodeToken(token: string): boolean {
-  return (
-    token.startsWith("/") ||
-    token.toLowerCase().startsWith("file://") ||
-    /^[A-Za-z]:[\\/]/.test(token)
-  );
-}
-
-function getResolutionKey(context: AssistantFileLinkContext, token: string): string {
-  return [context.serverId ?? "", context.workspaceRoot ?? "", token].join("\0");
-}
-
-function isLinkifiedSource(source: AssistantFileLinkSource): boolean {
-  return source.markup === "linkify" || source.sourceInfo === "auto";
-}
-
-function canApplyResult(
-  context: AssistantFileLinkContext,
-  isCurrentContext: AssistantFileLinkResolverDependencies["isCurrentContext"],
-): boolean {
-  return isCurrentContext ? isCurrentContext(context) : true;
-}
-
-function joinWorkspacePath(workspaceRoot: string, relativePath: string): string {
-  const root = workspaceRoot.replace(/\\/g, "/").replace(/\/+$/, "");
-  const child = relativePath.replace(/\\/g, "/").replace(/^\/+/, "");
-  return root ? `${root}/${child}` : child;
-}

packages/app/src/assistant-file-links/use-resolver.ts

@@ -1,90 +0,0 @@
-import { useMemo, useRef } from "react";
-import type { DaemonClient } from "@server/client/daemon-client";
-import type { ToastApi } from "@/components/toast-host";
-import {
-  createAssistantFileLinkResolver,
-  type AssistantFileLinkContext,
-  type AssistantFileLinkOpenInput,
-  type AssistantFileLinkPrefetchInput,
-} from "./resolver";
-import type { InlinePathTarget } from "./parse";
-import type { OpenFileDisposition } from "@/workspace/file-open";
-import { openExternalUrl } from "@/utils/open-external-url";
-
-export interface UseAssistantFileLinkResolverOptions {
-  client?: DaemonClient | null;
-  serverId?: string;
-  workspaceRoot?: string;
-  onOpenWorkspaceFile?: (target: InlinePathTarget, disposition: OpenFileDisposition) => void;
-  toast?: ToastApi | null;
-}
-
-export interface AssistantFileLinkActions {
-  prefetch(input: Omit<AssistantFileLinkPrefetchInput, "context">): void;
-  open(input: Omit<AssistantFileLinkOpenInput, "context">): void;
-}
-
-export function useAssistantFileLinkResolver({
-  client,
-  serverId,
-  workspaceRoot,
-  onOpenWorkspaceFile,
-  toast,
-}: UseAssistantFileLinkResolverOptions): AssistantFileLinkActions {
-  const context: AssistantFileLinkContext = useMemo(
-    () => ({
-      serverId,
-      workspaceRoot,
-    }),
-    [serverId, workspaceRoot],
-  );
-  const latestContextRef = useRef(context);
-  latestContextRef.current = context;
-
-  const resolver = useMemo(
-    () =>
-      createAssistantFileLinkResolver({
-        async getDirectorySuggestions(input) {
-          if (!client) {
-            return { entries: [], error: null };
-          }
-
-          const result = await client.getDirectorySuggestions(input);
-          return {
-            entries: result.entries,
-            error: result.error,
-          };
-        },
-        openWorkspaceFile(target, disposition) {
-          onOpenWorkspaceFile?.(target, disposition);
-        },
-        openExternalUrl,
-        onUnresolvedFileCandidate(token) {
-          toast?.show(`No file found for ${token}`, {
-            variant: "error",
-            testID: "assistant-file-link-not-found-toast",
-          });
-        },
-        isCurrentContext(candidate) {
-          const current = latestContextRef.current;
-          return (
-            current.serverId === candidate.serverId &&
-            current.workspaceRoot === candidate.workspaceRoot
-          );
-        },
-      }),
-    [client, onOpenWorkspaceFile, toast],
-  );
-
-  return useMemo(
-    () => ({
-      prefetch(input) {
-        void resolver.prefetch({ ...input, context });
-      },
-      open(input) {
-        void resolver.open({ ...input, context });
-      },
-    }),
-    [context, resolver],
-  );
-}

packages/app/src/client-slash-commands/index.test.ts

@@ -1,130 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  CLIENT_SLASH_COMMANDS,
-  buildDraftAgentSetup,
-  resolveClientSlashCommand,
-} from "@/client-slash-commands";
-import type { Agent } from "@/stores/session-store";
-
-function createAgent(overrides: Partial<Agent> = {}): Agent {
-  const now = new Date("2026-05-15T00:00:00.000Z");
-  return {
-    serverId: "server-1",
-    id: "agent-1",
-    provider: "codex",
-    status: "idle",
-    createdAt: now,
-    updatedAt: now,
-    lastUserMessageAt: now,
-    lastActivityAt: now,
-    capabilities: {
-      supportsStreaming: true,
-      supportsSessionPersistence: true,
-      supportsDynamicModes: true,
-      supportsMcpServers: false,
-      supportsReasoningStream: false,
-      supportsToolInvocations: true,
-    },
-    currentModeId: "mode-current",
-    availableModes: [],
-    pendingPermissions: [],
-    persistence: null,
-    runtimeInfo: {
-      provider: "codex",
-      sessionId: "session-1",
-      model: "runtime-model",
-      modeId: "runtime-mode",
-      thinkingOptionId: "runtime-thinking",
-    },
-    title: "Agent",
-    cwd: "/repo",
-    model: "agent-model",
-    thinkingOptionId: "think-hard",
-    features: [
-      { type: "toggle", id: "web-search", label: "Web search", value: true },
-      {
-        type: "select",
-        id: "effort",
-        label: "Effort",
-        value: "high",
-        options: [{ id: "high", label: "High" }],
-      },
-    ],
-    parentAgentId: null,
-    labels: {},
-    ...overrides,
-  };
-}
-
-describe("resolveClientSlashCommand", () => {
-  it("declares the exact client commands that execute immediately", () => {
-    expect(CLIENT_SLASH_COMMANDS.map((command) => [command.name, command.execution])).toEqual([
-      ["quit", "immediate"],
-      ["exit", "immediate"],
-      ["q", "immediate"],
-      ["clear", "immediate"],
-      ["new", "immediate"],
-    ]);
-  });
-
-  it("resolves exact client commands after trimming", () => {
-    expect(resolveClientSlashCommand({ text: " /quit ", hasAttachments: false })).toMatchObject({
-      kind: "archive-agent",
-      execution: "immediate",
-    });
-    expect(resolveClientSlashCommand({ text: "/exit", hasAttachments: false })?.kind).toBe(
-      "archive-agent",
-    );
-    expect(resolveClientSlashCommand({ text: "/q", hasAttachments: false })?.kind).toBe(
-      "archive-agent",
-    );
-    expect(resolveClientSlashCommand({ text: "/clear", hasAttachments: false })?.kind).toBe(
-      "replace-agent-with-draft",
-    );
-    expect(resolveClientSlashCommand({ text: "/new", hasAttachments: false })?.kind).toBe(
-      "replace-agent-with-draft",
-    );
-  });
-
-  it("leaves provider commands, arguments, ordinary messages, and attachment submits alone", () => {
-    expect(resolveClientSlashCommand({ text: "/clear now", hasAttachments: false })).toBeNull();
-    expect(resolveClientSlashCommand({ text: "/quit now", hasAttachments: false })).toBeNull();
-    expect(
-      resolveClientSlashCommand({ text: "/provider-command", hasAttachments: false }),
-    ).toBeNull();
-    expect(resolveClientSlashCommand({ text: "hello /quit", hasAttachments: false })).toBeNull();
-    expect(resolveClientSlashCommand({ text: "/quit", hasAttachments: true })).toBeNull();
-  });
-});
-
-describe("buildDraftAgentSetup", () => {
-  it("builds draft setup from the active agent snapshot", () => {
-    expect(buildDraftAgentSetup(createAgent())).toEqual({
-      provider: "codex",
-      cwd: "/repo",
-      modeId: "mode-current",
-      model: "agent-model",
-      thinkingOptionId: "think-hard",
-      featureValues: {
-        "web-search": true,
-        effort: "high",
-      },
-    });
-  });
-
-  it("falls back to runtime model setup when top-level fields are absent", () => {
-    expect(
-      buildDraftAgentSetup(
-        createAgent({
-          currentModeId: null,
-          model: null,
-          thinkingOptionId: null,
-        }),
-      ),
-    ).toMatchObject({
-      modeId: "runtime-mode",
-      model: "runtime-model",
-      thinkingOptionId: "runtime-thinking",
-    });
-  });
-});

packages/app/src/client-slash-commands/index.ts

@@ -1,90 +0,0 @@
-import type { Agent } from "@/stores/session-store";
-import type { WorkspaceDraftTabSetup } from "@/stores/workspace-tabs-store";
-
-export type ClientSlashCommandKind = "archive-agent" | "replace-agent-with-draft";
-export type ClientSlashCommandExecution = "immediate" | "insert";
-
-export interface ClientSlashCommand {
-  name: string;
-  description: string;
-  argumentHint: string;
-  kind: ClientSlashCommandKind;
-  execution: ClientSlashCommandExecution;
-}
-
-export const CLIENT_SLASH_COMMANDS: readonly ClientSlashCommand[] = [
-  {
-    name: "quit",
-    description: "Archive the current agent",
-    argumentHint: "",
-    kind: "archive-agent",
-    execution: "immediate",
-  },
-  {
-    name: "exit",
-    description: "Archive the current agent",
-    argumentHint: "",
-    kind: "archive-agent",
-    execution: "immediate",
-  },
-  {
-    name: "q",
-    description: "Archive the current agent",
-    argumentHint: "",
-    kind: "archive-agent",
-    execution: "immediate",
-  },
-  {
-    name: "clear",
-    description: "Archive this agent and start a fresh draft",
-    argumentHint: "",
-    kind: "replace-agent-with-draft",
-    execution: "immediate",
-  },
-  {
-    name: "new",
-    description: "Archive this agent and start a fresh draft",
-    argumentHint: "",
-    kind: "replace-agent-with-draft",
-    execution: "immediate",
-  },
-];
-
-const COMMAND_BY_NAME = new Map(CLIENT_SLASH_COMMANDS.map((command) => [command.name, command]));
-
-export function resolveClientSlashCommand(input: {
-  text: string;
-  hasAttachments: boolean;
-}): ClientSlashCommand | null {
-  if (input.hasAttachments) {
-    return null;
-  }
-
-  const trimmed = input.text.trim();
-  if (!trimmed.startsWith("/")) {
-    return null;
-  }
-
-  const commandName = trimmed.slice(1);
-  if (!commandName || /\s/.test(commandName)) {
-    return null;
-  }
-
-  return COMMAND_BY_NAME.get(commandName) ?? null;
-}
-
-export function buildDraftAgentSetup(agent: Agent): WorkspaceDraftTabSetup {
-  const featureValues: Record<string, unknown> = {};
-  for (const feature of agent.features ?? []) {
-    featureValues[feature.id] = feature.value;
-  }
-
-  return {
-    provider: agent.provider,
-    cwd: agent.cwd,
-    modeId: agent.currentModeId ?? agent.runtimeInfo?.modeId ?? null,
-    model: agent.model ?? agent.runtimeInfo?.model ?? null,
-    thinkingOptionId: agent.thinkingOptionId ?? agent.runtimeInfo?.thinkingOptionId ?? null,
-    featureValues,
-  };
-}

packages/app/src/components/adaptive-modal-sheet.tsx

@@ -12,45 +12,14 @@ import {
   BottomSheetTextInput,
   type BottomSheetBackgroundProps,
 } from "@gorhom/bottom-sheet";
-import { ArrowLeft, Search, X } from "lucide-react-native";
+import { X } from "lucide-react-native";
 import { FileDropZone } from "@/components/file-drop-zone";
 import type { ImageAttachment } from "@/components/message-input";
 import {
   IsolatedBottomSheetModal,
   useIsolatedBottomSheetVisibility,
 } from "@/components/ui/isolated-bottom-sheet-modal";
-import { isNative, isWeb } from "@/constants/platform";
-
-// Horizontal indent token shared by the sheet header (title, back arrow,
-// leading icon, search input icon) and any row primitive rendered inside the
-// sheet body. Rows whose leading icon should line up with the header must
-// match this padding.
-export const SHEET_HORIZONTAL_PADDING_SCALE = 6;
-
-export interface SheetHeaderSearch {
-  value: string;
-  onChange: (value: string) => void;
-  initialValue?: string;
-  resetKey?: string | number;
-  placeholder?: string;
-  autoFocus?: boolean;
-  testID?: string;
-}
-
-export interface SheetHeaderBack {
-  onPress: () => void;
-  label?: string;
-  accessibilityLabel?: string;
-}
-
-export interface SheetHeader {
-  title: string;
-  subtitle?: ReactNode;
-  back?: SheetHeaderBack;
-  leading?: ReactNode;
-  actions?: ReactNode;
-  search?: SheetHeaderSearch;
-}
+import { isWeb } from "@/constants/platform";
 
 type EscHandler = () => void;
 const escStack: EscHandler[] = [];
@@ -103,30 +72,23 @@ const styles = StyleSheet.create((theme) => ({
     borderWidth: 1,
     borderColor: theme.colors.surface2,
   },
-  headerContainer: {
-    borderBottomWidth: 1,
-    borderBottomColor: theme.colors.surface2,
-  },
-  headerRow: {
-    paddingHorizontal: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
+  header: {
+    paddingHorizontal: theme.spacing[6],
     paddingVertical: theme.spacing[4],
     flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-  },
-  headerBackButton: {
-    borderRadius: theme.borderRadius.lg,
-  },
-  headerLeadingSlot: {
-    alignItems: "center",
-    justifyContent: "center",
+    alignItems: "flex-start",
+    justifyContent: "space-between",
+    borderBottomWidth: 1,
+    borderBottomColor: theme.colors.surface2,
+    gap: theme.spacing[3],
   },
   headerTitleGroup: {
     flex: 1,
-    gap: theme.spacing[1],
+    gap: theme.spacing[2],
     minWidth: 0,
   },
   title: {
+    flex: 1,
     fontSize: theme.fontSize.lg,
     fontWeight: theme.fontWeight.medium,
   },
@@ -134,78 +96,52 @@ const styles = StyleSheet.create((theme) => ({
     flexDirection: "row",
     alignItems: "center",
     gap: theme.spacing[2],
+    marginLeft: theme.spacing[3],
+    marginRight: theme.spacing[2],
   },
   closeButton: {
     padding: theme.spacing[2],
     borderRadius: theme.borderRadius.lg,
-  },
-  searchRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    paddingHorizontal: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
-    paddingBottom: theme.spacing[3],
-  },
-  // Inline variants for InlineHeaderView inside the desktop Combobox popover.
-  // Horizontal padding matches the model picker's row indent: the picker uses
-  // children mode (desktopChildrenScrollContent, no scroll padding), so the
-  // row content starts at item.paddingHorizontal = spacing[3].
-  inlineHeaderRow: {
-    paddingHorizontal: theme.spacing[3],
-    paddingVertical: theme.spacing[2],
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-  },
-  inlineSearchRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    paddingHorizontal: theme.spacing[3],
-    paddingVertical: theme.spacing[2],
-    borderBottomWidth: 1,
-    borderBottomColor: theme.colors.border,
-  },
-  inlineTitle: {
-    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.medium,
-    color: theme.colors.foreground,
-  },
-  searchInput: {
-    flex: 1,
-    paddingVertical: theme.spacing[2],
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.sm,
+    backgroundColor: theme.colors.surface2,
   },
   desktopScroll: {
     flexShrink: 1,
     minHeight: 0,
   },
   desktopContent: {
-    padding: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
+    padding: theme.spacing[6],
     gap: theme.spacing[4],
     flexGrow: 1,
   },
+  bottomSheetHeader: {
+    paddingHorizontal: theme.spacing[6],
+    paddingTop: theme.spacing[4],
+    paddingBottom: theme.spacing[3],
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "flex-start",
+    borderBottomWidth: 1,
+    borderBottomColor: theme.colors.surface2,
+    gap: theme.spacing[3],
+  },
   bottomSheetContent: {
-    padding: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
+    padding: theme.spacing[6],
     gap: theme.spacing[4],
   },
   bottomSheetStaticContent: {
     flex: 1,
-    padding: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
+    padding: theme.spacing[6],
     gap: theme.spacing[4],
     minHeight: 0,
   },
   desktopStaticContent: {
     flexShrink: 1,
     minHeight: 0,
-    padding: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
+    padding: theme.spacing[6],
     gap: theme.spacing[4],
   },
 }));
 
-const SEARCH_INPUT_STYLE = [styles.searchInput, isWeb && { outlineStyle: "none" }];
-
 function SheetBackground({ style }: BottomSheetBackgroundProps) {
   const { theme } = useUnistyles();
   const combinedStyle = useMemo(
@@ -222,186 +158,14 @@ function SheetBackground({ style }: BottomSheetBackgroundProps) {
   return <View style={combinedStyle} />;
 }
 
-export type AdaptiveTextInputProps = TextInputProps & {
-  initialValue?: string;
-  resetKey?: string | number;
-};
-
-// React Native controlled TextInput can replay stale JS values during fast input
-// and visibly flicker/cursor-jump. Keep the rendered text native-owned; callers
-// can seed it once with initialValue and remount with resetKey for real resets.
-// See https://github.com/facebook/react-native/issues/44157
-export const AdaptiveTextInput = forwardRef<TextInput, AdaptiveTextInputProps>(
-  function AdaptiveTextInputInner(props, ref) {
-    const isMobile = useIsCompactFormFactor();
-    const { value: _value, initialValue, resetKey, defaultValue, ...inputProps } = props;
-    const textInputProps = {
-      ...inputProps,
-      defaultValue: initialValue ?? defaultValue,
-    };
-
-    if (isMobile && isNative) {
-      return (
-        <BottomSheetTextInput
-          key={resetKey}
-          ref={ref as unknown as Ref<never>}
-          {...textInputProps}
-        />
-      );
-    }
-    return <TextInput key={resetKey} ref={ref} {...textInputProps} />;
-  },
-);
-
-export function SheetHeaderView({
-  header,
-  onClose,
-  showCloseButton = true,
-  testID,
-}: {
-  header: SheetHeader;
-  onClose: () => void;
-  showCloseButton?: boolean;
-  testID?: string;
-}) {
-  const { theme } = useUnistyles();
-  const titleStyle = useMemo(
-    () => [styles.title, { color: theme.colors.foreground }],
-    [theme.colors.foreground],
-  );
-  const back = header.back;
-  const handleBackPress = back?.onPress;
-  const search = header.search;
-  const handleSearchChange = useCallback(
-    (value: string) => {
-      search?.onChange(value);
-    },
-    [search],
-  );
-
-  return (
-    <View style={styles.headerContainer} testID={testID}>
-      <View style={styles.headerRow}>
-        {handleBackPress ? (
-          <Pressable
-            onPress={handleBackPress}
-            hitSlop={8}
-            style={styles.headerBackButton}
-            accessibilityRole="button"
-            accessibilityLabel={back?.accessibilityLabel ?? back?.label ?? "Back"}
-            testID="sheet-header-back"
-          >
-            {({ pressed }) => (
-              <ArrowLeft
-                size={18}
-                color={pressed ? theme.colors.foreground : theme.colors.foregroundMuted}
-              />
-            )}
-          </Pressable>
-        ) : null}
-        {header.leading ? <View style={styles.headerLeadingSlot}>{header.leading}</View> : null}
-        <View style={styles.headerTitleGroup}>
-          <Text style={titleStyle} numberOfLines={1}>
-            {header.title}
-          </Text>
-          {header.subtitle}
-        </View>
-        {header.actions ? <View style={styles.headerActions}>{header.actions}</View> : null}
-        {showCloseButton ? (
-          <Pressable accessibilityLabel="Close" style={styles.closeButton} onPress={onClose}>
-            {({ pressed }) => (
-              <X
-                size={16}
-                color={pressed ? theme.colors.foreground : theme.colors.foregroundMuted}
-              />
-            )}
-          </Pressable>
-        ) : null}
-      </View>
-      {search ? (
-        <View style={styles.searchRow}>
-          <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-          <AdaptiveTextInput
-            // @ts-expect-error - outlineStyle is web-only
-            style={SEARCH_INPUT_STYLE}
-            placeholder={search.placeholder ?? "Search"}
-            placeholderTextColor={theme.colors.foregroundMuted}
-            initialValue={search.initialValue}
-            resetKey={search.resetKey}
-            value={search.value}
-            onChangeText={handleSearchChange}
-            autoCapitalize="none"
-            autoCorrect={false}
-            autoFocus={search.autoFocus}
-            testID={search.testID}
-          />
-        </View>
-      ) : null}
-    </View>
-  );
-}
-
-export function InlineHeaderView({ header }: { header: SheetHeader }) {
-  const { theme } = useUnistyles();
-  const back = header.back;
-  const handleBackPress = back?.onPress;
-  const hasInlineRow = Boolean(handleBackPress || header.leading);
-  if (!hasInlineRow && !header.search) return null;
-  return (
-    <View>
-      {hasInlineRow ? (
-        <View style={styles.inlineHeaderRow}>
-          {handleBackPress ? (
-            <Pressable
-              onPress={handleBackPress}
-              hitSlop={8}
-              style={styles.headerBackButton}
-              accessibilityRole="button"
-              accessibilityLabel={back?.accessibilityLabel ?? back?.label ?? "Back"}
-              testID="sheet-header-back"
-            >
-              {({ pressed }) => (
-                <ArrowLeft
-                  size={16}
-                  color={pressed ? theme.colors.foreground : theme.colors.foregroundMuted}
-                />
-              )}
-            </Pressable>
-          ) : null}
-          {header.leading ? <View style={styles.headerLeadingSlot}>{header.leading}</View> : null}
-          <Text style={styles.inlineTitle} numberOfLines={1}>
-            {header.title}
-          </Text>
-        </View>
-      ) : null}
-      {header.search ? (
-        <View style={styles.inlineSearchRow}>
-          <Search size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
-          <AdaptiveTextInput
-            // @ts-expect-error - outlineStyle is web-only
-            style={SEARCH_INPUT_STYLE}
-            placeholder={header.search.placeholder ?? "Search"}
-            placeholderTextColor={theme.colors.foregroundMuted}
-            initialValue={header.search.initialValue}
-            resetKey={header.search.resetKey}
-            value={header.search.value}
-            onChangeText={header.search.onChange}
-            autoCapitalize="none"
-            autoCorrect={false}
-            autoFocus={header.search.autoFocus}
-            testID={header.search.testID}
-          />
-        </View>
-      ) : null}
-    </View>
-  );
-}
-
 export interface AdaptiveModalSheetProps {
-  header: SheetHeader;
+  title: string;
+  /** Optional content rendered below the title in the header area. */
+  subtitle?: ReactNode;
   visible: boolean;
   onClose: () => void;
   children: ReactNode;
+  headerActions?: ReactNode;
   snapPoints?: string[];
   testID?: string;
   /** Override the max width of the desktop card. */
@@ -412,10 +176,12 @@ export interface AdaptiveModalSheetProps {
 }
 
 export function AdaptiveModalSheet({
-  header,
+  title,
+  subtitle,
   visible,
   onClose,
   children,
+  headerActions,
   snapPoints,
   testID,
   desktopMaxWidth,
@@ -424,6 +190,7 @@ export function AdaptiveModalSheet({
 }: AdaptiveModalSheetProps) {
   const { theme } = useUnistyles();
   const isMobile = useIsCompactFormFactor();
+  const titleColor = theme.colors.foreground;
   const resolvedSnapPoints = useMemo(() => snapPoints ?? ["65%", "90%"], [snapPoints]);
   const handleIndicatorStyle = useMemo(
     () => ({ backgroundColor: theme.colors.surface2 }),
@@ -442,6 +209,7 @@ export function AdaptiveModalSheet({
     [],
   );
 
+  const titleStyle = useMemo(() => [styles.title, { color: titleColor }], [titleColor]);
   const desktopCardStyle = useMemo(
     () => [styles.desktopCard, desktopMaxWidth != null && { maxWidth: desktopMaxWidth }],
     [desktopMaxWidth],
@@ -469,7 +237,18 @@ export function AdaptiveModalSheet({
         keyboardBlurBehavior="restore"
         accessible={false}
       >
-        <SheetHeaderView header={header} onClose={onClose} testID={testID} />
+        <View style={styles.bottomSheetHeader} testID={testID}>
+          <View style={styles.headerTitleGroup}>
+            <Text key={titleColor} style={titleStyle} numberOfLines={1}>
+              {title}
+            </Text>
+            {subtitle}
+          </View>
+          {headerActions ? <View style={styles.headerActions}>{headerActions}</View> : null}
+          <Pressable accessibilityLabel="Close" style={styles.closeButton} onPress={onClose}>
+            <X size={16} color={theme.colors.foregroundMuted} />
+          </Pressable>
+        </View>
         {scrollable ? (
           <BottomSheetScrollView
             contentContainerStyle={styles.bottomSheetContent}
@@ -487,7 +266,18 @@ export function AdaptiveModalSheet({
 
   const cardInner = (
     <>
-      <SheetHeaderView header={header} onClose={onClose} />
+      <View style={styles.header}>
+        <View style={styles.headerTitleGroup}>
+          <Text key={titleColor} style={titleStyle} numberOfLines={1}>
+            {title}
+          </Text>
+          {subtitle}
+        </View>
+        {headerActions ? <View style={styles.headerActions}>{headerActions}</View> : null}
+        <Pressable accessibilityLabel="Close" style={styles.closeButton} onPress={onClose}>
+          <X size={16} color={theme.colors.foregroundMuted} />
+        </Pressable>
+      </View>
       {scrollable ? (
         <ScrollView
           style={styles.desktopScroll}
@@ -534,3 +324,19 @@ export function AdaptiveModalSheet({
     </Modal>
   );
 }
+
+/**
+ * TextInput that automatically uses BottomSheetTextInput on mobile
+ * for proper keyboard dodging in AdaptiveModalSheet.
+ */
+export const AdaptiveTextInput = forwardRef<TextInput, TextInputProps>(
+  function AdaptiveTextInput(props, ref) {
+    const isMobile = useIsCompactFormFactor();
+
+    if (isMobile) {
+      return <BottomSheetTextInput ref={ref as unknown as Ref<never>} {...props} />;
+    }
+
+    return <TextInput ref={ref} {...props} />;
+  },
+);

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

@@ -2,11 +2,9 @@ import { useCallback } from "react";
 import { Pressable, Text, View } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { QrCode, Link2, ClipboardPaste } from "lucide-react-native";
-import { AdaptiveModalSheet, type SheetHeader } from "./adaptive-modal-sheet";
+import { AdaptiveModalSheet } from "./adaptive-modal-sheet";
 import { isNative } from "@/constants/platform";
 
-const ADD_CONNECTION_HEADER: SheetHeader = { title: "Add connection" };
-
 const styles = StyleSheet.create((theme) => ({
   option: {
     flexDirection: "row",
@@ -64,7 +62,7 @@ export function AddHostMethodModal({
 
   return (
     <AdaptiveModalSheet
-      header={ADD_CONNECTION_HEADER}
+      title="Add connection"
       visible={visible}
       onClose={onClose}
       testID="add-host-method-modal"

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

@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useReducer, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 import { Alert, Pressable, Text, View } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -11,11 +11,10 @@ import {
   serializeConnectionUriForStorage,
 } from "@/utils/daemon-endpoints";
 import { DaemonConnectionTestError } from "@/utils/test-daemon-connection";
-import { AdaptiveModalSheet, AdaptiveTextInput, type SheetHeader } from "./adaptive-modal-sheet";
+import { AdaptiveModalSheet, AdaptiveTextInput } from "./adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 
 const FLEX_ONE_STYLE = { flex: 1 } as const;
-const DIRECT_CONNECTION_HEADER: SheetHeader = { title: "Direct connection" };
 
 interface DirectConnectionDraft {
   host: string;
@@ -280,7 +279,6 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
   const [isPasswordVisible, setIsPasswordVisible] = useState(false);
   const [isAdvancedOpen, setIsAdvancedOpen] = useState(false);
   const [advancedUri, setAdvancedUri] = useState("");
-  const [inputResetKey, bumpInputResetKey] = useReducer((key: number) => key + 1, 0);
 
   const clearInput = useCallback(() => {
     setHost("");
@@ -290,7 +288,6 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
     setIsPasswordVisible(false);
     setIsAdvancedOpen(false);
     setAdvancedUri("");
-    bumpInputResetKey();
   }, []);
 
   const connectIcon = useMemo(
@@ -414,7 +411,6 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
       setUseTls(next.useTls);
       setPassword(next.password);
       setErrorMessage("");
-      bumpInputResetKey();
     } catch {
       setErrorMessage("");
     }
@@ -426,7 +422,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
 
   return (
     <AdaptiveModalSheet
-      header={DIRECT_CONNECTION_HEADER}
+      title="Direct connection"
       visible={visible}
       onClose={handleClose}
       testID="add-host-modal"
@@ -440,8 +436,6 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
             testID="direct-host-input"
             nativeID="direct-host-input"
             accessibilityLabel="Host"
-            initialValue={host}
-            resetKey={`direct-host-${inputResetKey}`}
             value={host}
             onChangeText={setHost}
             placeholder="localhost"
@@ -460,8 +454,6 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
             testID="direct-port-input"
             nativeID="direct-port-input"
             accessibilityLabel="Port"
-            initialValue={port}
-            resetKey={`direct-port-${inputResetKey}`}
             value={port}
             onChangeText={setPort}
             placeholder="6767"
@@ -503,8 +495,6 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
             testID="direct-password-input"
             nativeID="direct-password-input"
             accessibilityLabel="Password"
-            initialValue={password}
-            resetKey={`direct-password-${inputResetKey}`}
             value={password}
             onChangeText={setPassword}
             placeholder="Optional"
@@ -547,8 +537,6 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
             testID="direct-host-uri-input"
             nativeID="direct-host-uri-input"
             accessibilityLabel="Connection URI"
-            initialValue={advancedUri}
-            resetKey={`direct-host-uri-${inputResetKey}`}
             value={advancedUri}
             onChangeText={setAdvancedUri}
             placeholder="tcp://localhost:6767?ssl=true"

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

@@ -1,13 +1,9 @@
-import { useCallback, useMemo, useReducer, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 import { Alert, Pressable, Text, View } from "react-native";
 import { SvgXml } from "react-native-svg";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { ExternalLink, PackagePlus, Search } from "lucide-react-native";
-import {
-  AdaptiveModalSheet,
-  AdaptiveTextInput,
-  type SheetHeader,
-} from "@/components/adaptive-modal-sheet";
+import { AdaptiveModalSheet, AdaptiveTextInput } from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import {
   buildAcpProviderConfigPatch,
@@ -30,7 +26,6 @@ type InstallState = "installed" | "available";
 const FLEX_ONE_STYLE = { flex: 1 } as const;
 const ACTION_BUTTON_STYLE = { width: 92 } as const;
 const MODAL_SNAP_POINTS = ["78%", "92%"];
-const ADD_PROVIDER_HEADER: SheetHeader = { title: "Add provider" };
 const SEARCH_ICON_SIZE = 16;
 const PROVIDER_FALLBACK_ICON_SIZE = 20;
 const PROVIDER_REMOTE_ICON_SIZE = 24;
@@ -143,15 +138,8 @@ export function AddProviderModal({ serverId, visible, onClose }: AddProviderModa
   const { entries: providerEntries, refresh } = useProvidersSnapshot(serverId);
   const { patchConfig } = useDaemonConfig(serverId);
   const [search, setSearch] = useState("");
-  const [searchResetKey, bumpSearchResetKey] = useReducer((key: number) => key + 1, 0);
   const [installingProviderId, setInstallingProviderId] = useState<string | null>(null);
 
-  const handleClose = useCallback(() => {
-    setSearch("");
-    bumpSearchResetKey();
-    onClose();
-  }, [onClose]);
-
   const installedProviderIds = useMemo(
     () => new Set(providerEntries?.map((entry) => entry.provider) ?? []),
     [providerEntries],
@@ -169,7 +157,7 @@ export function AddProviderModal({ serverId, visible, onClose }: AddProviderModa
       try {
         await patchConfig(buildAcpProviderConfigPatch(entry));
         await refresh([entry.id]);
-        handleClose();
+        onClose();
       } catch (installError) {
         Alert.alert(
           "Unable to install provider",
@@ -179,14 +167,14 @@ export function AddProviderModal({ serverId, visible, onClose }: AddProviderModa
         setInstallingProviderId((current) => (current === entry.id ? null : current));
       }
     },
-    [installingProviderId, handleClose, patchConfig, refresh],
+    [installingProviderId, onClose, patchConfig, refresh],
   );
 
   return (
     <AdaptiveModalSheet
-      header={ADD_PROVIDER_HEADER}
+      title="Add provider"
       visible={visible}
-      onClose={handleClose}
+      onClose={onClose}
       desktopMaxWidth={680}
       snapPoints={MODAL_SNAP_POINTS}
       testID="add-provider-modal"
@@ -198,8 +186,6 @@ export function AddProviderModal({ serverId, visible, onClose }: AddProviderModa
         <AdaptiveTextInput
           testID="provider-catalog-search"
           accessibilityLabel="Search providers"
-          initialValue={search}
-          resetKey={`provider-catalog-search-${searchResetKey}`}
           value={search}
           onChangeText={setSearch}
           placeholder="Search providers"
@@ -230,7 +216,7 @@ export function AddProviderModal({ serverId, visible, onClose }: AddProviderModa
       ) : null}
 
       <View style={styles.actions}>
-        <Button style={FLEX_ONE_STYLE} variant="secondary" onPress={handleClose}>
+        <Button style={FLEX_ONE_STYLE} variant="secondary" onPress={onClose}>
           Cancel
         </Button>
       </View>

packages/app/src/components/agent-list.tsx

@@ -10,6 +10,7 @@ import {
 } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useCallback, useMemo, useState, type ReactElement } from "react";
+import { router, type Href } from "expo-router";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { formatTimeAgo } from "@/utils/time";
@@ -18,7 +19,9 @@ import { type AggregatedAgent } from "@/hooks/use-aggregated-agents";
 import { useSessionStore } from "@/stores/session-store";
 import { Archive } from "lucide-react-native";
 import { getProviderIcon } from "@/components/provider-icons";
-import { navigateToAgent } from "@/utils/navigate-to-agent";
+import { buildHostAgentDetailRoute } from "@/utils/host-routes";
+import { resolveWorkspaceIdByExecutionDirectory } from "@/utils/workspace-execution";
+import { navigateToPreparedWorkspaceTab } from "@/utils/workspace-navigation";
 import type { Agent } from "@/stores/session-store";
 import { useArchiveAgent } from "@/hooks/use-archive-agent";
 
@@ -72,7 +75,6 @@ function buildHistoricalAgentDetail(agent: AggregatedAgent): Agent {
     attentionTimestamp: agent.attentionTimestamp,
     archivedAt: agent.archivedAt,
     labels: agent.labels,
-    parentAgentId: null,
   };
 }
 
@@ -309,13 +311,23 @@ export function AgentList({
 
       const serverId = agent.serverId;
       const agentId = agent.id;
+      const workspaceId = resolveWorkspaceIdByExecutionDirectory({
+        workspaces: useSessionStore.getState().sessions[serverId]?.workspaces?.values(),
+        workspaceDirectory: agent.cwd,
+      });
 
       onAgentSelect?.();
 
+      if (!workspaceId) {
+        router.navigate(buildHostAgentDetailRoute(serverId, agentId) as Href);
+        return;
+      }
+
       rememberArchivedAgentDetail(agent);
-      navigateToAgent({
+      navigateToPreparedWorkspaceTab({
         serverId,
-        agentId,
+        workspaceId,
+        target: { kind: "agent", agentId },
         pin: Boolean(agent.archivedAt),
       });
     },

packages/app/src/components/agent-status-bar.tsx

@@ -27,7 +27,6 @@ import {
   ShieldAlert,
   ShieldCheck,
   ShieldOff,
-  ShieldQuestionMark,
   Zap,
 } from "lucide-react-native";
 import { getProviderIcon } from "@/components/provider-icons";
@@ -48,7 +47,7 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
-import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
+import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import type {
   AgentFeature,
@@ -64,7 +63,7 @@ import {
   getStatusSelectorHint,
   resolveAgentModelSelection,
 } from "@/components/agent-status-bar.utils";
-import { useIsCompactFormFactor } from "@/constants/layout";
+import { isWeb as platformIsWeb } from "@/constants/platform";
 import { useToast } from "@/contexts/toast-context";
 import { toErrorMessage } from "@/utils/error-messages";
 
@@ -181,7 +180,6 @@ const MODE_ICONS = {
   ShieldCheck,
   ShieldAlert,
   ShieldOff,
-  ShieldQuestionMark,
 } as const;
 
 function alwaysTrue() {
@@ -199,16 +197,6 @@ function resolveDisplayModel(
   return findOptionLabel(modelOptions, selectedModelId, "Select model");
 }
 
-// Mobile status bar only — strip namespace prefix so providers like OpenCode
-// show "gpt-5.5" instead of "openrouter/gpt-5.5". Full label still appears in
-// the model picker.
-function shortModelLabel(label: string): string {
-  const i = label.lastIndexOf("/");
-  return i === -1 ? label : label.slice(i + 1);
-}
-
-type ActiveSheet = "thinking" | "mode" | "features" | null;
-
 function resolveHasAnyControl({
   providerOptions,
   modeOptions,
@@ -268,6 +256,18 @@ function makeBadgePressableStyle(
   ];
 }
 
+function makeSheetPressableStyle(isDisabled: boolean) {
+  return ({ pressed }: PressableStateCallbackType) => [
+    styles.sheetSelect,
+    pressed && styles.sheetSelectPressed,
+    isDisabled && styles.disabledSheetSelect,
+  ];
+}
+
+function makePrefsButtonStyle({ pressed }: PressableStateCallbackType) {
+  return [styles.prefsButton, pressed && styles.prefsButtonPressed];
+}
+
 function pickSheetModel({
   nextProviderId,
   modelId,
@@ -418,6 +418,27 @@ function buildOpenChangeHandler(
   };
 }
 
+function SheetModelTriggerView({
+  selectedModelLabel,
+  style,
+  ProviderIcon,
+}: {
+  selectedModelLabel: string;
+  style: StyleProp<ViewStyle>;
+  ProviderIcon: ReturnType<typeof getProviderIcon> | null;
+}) {
+  const { theme } = useUnistyles();
+  return (
+    <View style={style} pointerEvents="none" testID="agent-preferences-model">
+      {ProviderIcon ? (
+        <ProviderIcon size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+      ) : null}
+      <Text style={styles.sheetSelectText}>{selectedModelLabel}</Text>
+      <ChevronDown size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+    </View>
+  );
+}
+
 function getModeIconColor(
   colorTier: AgentModeColorTier | undefined,
   palette: {
@@ -469,8 +490,7 @@ function ControlledStatusBar({
   onModelSelectorOpen,
 }: ControlledAgentStatusBarProps) {
   const { theme } = useUnistyles();
-  const isCompact = useIsCompactFormFactor();
-  const [activeSheet, setActiveSheet] = useState<ActiveSheet>(null);
+  const [prefsOpen, setPrefsOpen] = useState(false);
   const [openSelector, setOpenSelector] = useState<StatusSelector | null>(null);
 
   const providerAnchorRef = useRef<View>(null);
@@ -488,6 +508,7 @@ function ControlledStatusBar({
   );
 
   const displayProvider = findOptionLabel(providerOptions, selectedProviderId, "Provider");
+  const displayMode = findOptionLabel(modeOptions, selectedModeId, "Default");
   const displayModel = resolveDisplayModel(isModelLoading, modelOptions, selectedModelId);
   const displayThinking = findOptionLabel(
     thinkingOptions,
@@ -547,18 +568,6 @@ function ControlledStatusBar({
     ),
     [provider, providerDefinitions, theme.colors.foreground],
   );
-  const renderThinkingOption = useCallback(
-    (args: { option: ComboboxOption; selected: boolean; active: boolean; onPress: () => void }) => (
-      <ThinkingComboboxOption
-        option={args.option}
-        selected={args.selected}
-        active={args.active}
-        onPress={args.onPress}
-        iconColor={theme.colors.foreground}
-      />
-    ),
-    [theme.colors.foreground],
-  );
 
   const handleOpenChange = useCallback(
     (selector: StatusSelector) =>
@@ -632,30 +641,16 @@ function ControlledStatusBar({
     [canSelectMode, disabled, openSelector],
   );
 
-  const handleOpenSheet = useCallback((sheet: Exclude<ActiveSheet, null>) => {
+  const handleOpenPrefs = useCallback(() => {
     Keyboard.dismiss();
-    setActiveSheet(sheet);
+    setPrefsOpen(true);
   }, []);
 
-  const handleCloseSheet = useCallback(() => {
-    setActiveSheet(null);
+  const handleClosePrefs = useCallback(() => {
+    setPrefsOpen(false);
   }, []);
 
-  const handleSelectThinkingAndClose = useCallback(
-    (thinkingOptionId: string) => {
-      onSelectThinkingOption?.(thinkingOptionId);
-      setActiveSheet(null);
-    },
-    [onSelectThinkingOption],
-  );
-
-  const handleSelectModeAndClose = useCallback(
-    (modeId: string) => {
-      onSelectMode?.(modeId);
-      setActiveSheet(null);
-    },
-    [onSelectMode],
-  );
+  const prefsButtonStyle = makePrefsButtonStyle;
 
   const handleSheetModelSelect = useCallback(
     (nextProviderId: string, modelId: string) => {
@@ -671,13 +666,38 @@ function ControlledStatusBar({
     [onSelectModel, onSelectProvider, onSelectProviderAndModel, provider],
   );
 
+  const sheetThinkingPressableStyle = useMemo(
+    () => makeSheetPressableStyle(disabled || !canSelectThinking),
+    [canSelectThinking, disabled],
+  );
+
+  const sheetModePressableStyle = useMemo(
+    () => makeSheetPressableStyle(disabled || !canSelectMode),
+    [canSelectMode, disabled],
+  );
+
+  const sheetSelectStyle = useMemo(
+    () => [styles.sheetSelect, modelDisabled && styles.disabledSheetSelect],
+    [modelDisabled],
+  );
+  const renderSheetModelTrigger = useCallback(
+    ({ selectedModelLabel }: { selectedModelLabel: string }) => (
+      <SheetModelTriggerView
+        selectedModelLabel={selectedModelLabel}
+        style={sheetSelectStyle}
+        ProviderIcon={ProviderIcon}
+      />
+    ),
+    [ProviderIcon, sheetSelectStyle],
+  );
+
   if (!hasAnyControl) {
     return null;
   }
 
   return (
     <View style={styles.container}>
-      {!isCompact ? (
+      {platformIsWeb ? (
         <DesktopStatusBarContent
           provider={provider}
           providerOptions={providerOptions}
@@ -732,19 +752,23 @@ function ControlledStatusBar({
           handleModeOpenChange={handleModeOpenChange}
           handleOpenChange={handleOpenChange}
           renderModeOption={renderModeOption}
-          renderThinkingOption={renderThinkingOption}
         />
       ) : (
         <SheetStatusBarContent
           provider={provider}
+          modeOptions={modeOptions}
           selectedModeId={selectedModeId}
           selectedModelId={selectedModelId}
+          thinkingOptions={thinkingOptions}
           selectedThinkingOptionId={selectedThinkingOptionId}
           features={features}
           onSetFeature={onSetFeature}
+          onSelectMode={onSelectMode}
+          onSelectThinkingOption={onSelectThinkingOption}
           onToggleFavoriteModel={onToggleFavoriteModel}
           onDropdownClose={onDropdownClose}
           onModelSelectorOpen={onModelSelectorOpen}
+          providerDefinitions={providerDefinitions}
           favoriteKeys={favoriteKeys}
           disabled={disabled}
           isModelLoading={isModelLoading}
@@ -755,21 +779,24 @@ function ControlledStatusBar({
           modelDisabled={modelDisabled}
           effectiveProviderDefinitions={effectiveProviderDefinitions}
           effectiveAllProviderModels={effectiveAllProviderModels}
-          comboboxModeOptions={comboboxModeOptions}
-          comboboxThinkingOptions={comboboxThinkingOptions}
+          displayMode={displayMode}
+          displayModel={displayModel}
+          displayThinking={displayThinking}
           ModeIconComponent={ModeIconComponent}
           modeIconColor={modeIconColor}
           openSelector={openSelector}
           ProviderIcon={ProviderIcon}
-          activeSheet={activeSheet}
-          handleOpenSheet={handleOpenSheet}
-          handleCloseSheet={handleCloseSheet}
+          prefsOpen={prefsOpen}
+          handleOpenPrefs={handleOpenPrefs}
+          handleClosePrefs={handleClosePrefs}
+          prefsButtonStyle={prefsButtonStyle}
+          sheetThinkingPressableStyle={sheetThinkingPressableStyle}
+          sheetModePressableStyle={sheetModePressableStyle}
           handleSheetModelSelect={handleSheetModelSelect}
-          handleSelectThinkingAndClose={handleSelectThinkingAndClose}
-          handleSelectModeAndClose={handleSelectModeAndClose}
+          handleThinkingOpenChange={handleThinkingOpenChange}
+          handleModeOpenChange={handleModeOpenChange}
           handleOpenChange={handleOpenChange}
-          renderModeOption={renderModeOption}
-          renderThinkingOption={renderThinkingOption}
+          renderSheetModelTrigger={renderSheetModelTrigger}
         />
       )}
     </View>
@@ -835,12 +862,6 @@ interface DesktopStatusBarContentProps {
     active: boolean;
     onPress: () => void;
   }) => ReactElement;
-  renderThinkingOption: (args: {
-    option: ComboboxOption;
-    selected: boolean;
-    active: boolean;
-    onPress: () => void;
-  }) => ReactElement;
 }
 
 const DESKTOP_SEARCH_THRESHOLD = 6;
@@ -899,7 +920,6 @@ function DesktopStatusBarContent(props: DesktopStatusBarContentProps) {
     handleModeOpenChange,
     handleOpenChange,
     renderModeOption,
-    renderThinkingOption,
   } = props;
 
   return (
@@ -995,7 +1015,6 @@ function DesktopStatusBarContent(props: DesktopStatusBarContentProps) {
             onOpenChange={handleThinkingOpenChange}
             anchorRef={thinkingAnchorRef}
             desktopPlacement="top-start"
-            renderOption={renderThinkingOption}
           />
         </>
       ) : null}
@@ -1055,14 +1074,19 @@ function DesktopStatusBarContent(props: DesktopStatusBarContentProps) {
 
 interface SheetStatusBarContentProps {
   provider: string;
+  modeOptions?: StatusOption[];
   selectedModeId?: string;
   selectedModelId?: string;
+  thinkingOptions?: StatusOption[];
   selectedThinkingOptionId?: string;
   features?: AgentFeature[];
   onSetFeature?: (featureId: string, value: unknown) => void;
+  onSelectMode?: (modeId: string) => void;
+  onSelectThinkingOption?: (thinkingOptionId: string) => void;
   onToggleFavoriteModel?: (provider: string, modelId: string) => void;
   onDropdownClose?: () => void;
   onModelSelectorOpen?: () => void;
+  providerDefinitions: AgentProviderDefinition[];
   favoriteKeys: Set<string>;
   disabled: boolean;
   isModelLoading: boolean;
@@ -1073,45 +1097,43 @@ interface SheetStatusBarContentProps {
   modelDisabled: boolean;
   effectiveProviderDefinitions: AgentProviderDefinition[];
   effectiveAllProviderModels: Map<string, AgentModelDefinition[]>;
-  comboboxModeOptions: ComboboxOption[];
-  comboboxThinkingOptions: ComboboxOption[];
+  displayMode: string;
+  displayModel: string;
+  displayThinking: string;
   ModeIconComponent: (typeof MODE_ICONS)[keyof typeof MODE_ICONS] | null;
   modeIconColor: string;
   openSelector: StatusSelector | null;
   ProviderIcon: ReturnType<typeof getProviderIcon> | null;
-  activeSheet: ActiveSheet;
-  handleOpenSheet: (sheet: Exclude<ActiveSheet, null>) => void;
-  handleCloseSheet: () => void;
+  prefsOpen: boolean;
+  handleOpenPrefs: () => void;
+  handleClosePrefs: () => void;
+  prefsButtonStyle: (state: PressableStateCallbackType) => StyleProp<ViewStyle>;
+  sheetThinkingPressableStyle: (state: PressableStateCallbackType) => StyleProp<ViewStyle>;
+  sheetModePressableStyle: (state: PressableStateCallbackType) => StyleProp<ViewStyle>;
   handleSheetModelSelect: (providerId: string, modelId: string) => void;
-  handleSelectThinkingAndClose: (thinkingOptionId: string) => void;
-  handleSelectModeAndClose: (modeId: string) => void;
+  handleThinkingOpenChange: (open: boolean) => void;
+  handleModeOpenChange: (open: boolean) => void;
   handleOpenChange: (selector: StatusSelector) => (nextOpen: boolean) => void;
-  renderModeOption: (args: {
-    option: ComboboxOption;
-    selected: boolean;
-    active: boolean;
-    onPress: () => void;
-  }) => ReactElement;
-  renderThinkingOption: (args: {
-    option: ComboboxOption;
-    selected: boolean;
-    active: boolean;
-    onPress: () => void;
-  }) => ReactElement;
+  renderSheetModelTrigger: (args: { selectedModelLabel: string }) => ReactElement;
 }
 
 function SheetStatusBarContent(props: SheetStatusBarContentProps) {
   const { theme } = useUnistyles();
   const {
     provider,
+    modeOptions,
     selectedModeId,
     selectedModelId,
+    thinkingOptions,
     selectedThinkingOptionId,
     features,
     onSetFeature,
+    onSelectMode,
+    onSelectThinkingOption,
     onToggleFavoriteModel,
     onDropdownClose,
     onModelSelectorOpen,
+    providerDefinitions,
     favoriteKeys,
     disabled,
     isModelLoading,
@@ -1122,194 +1144,133 @@ function SheetStatusBarContent(props: SheetStatusBarContentProps) {
     modelDisabled,
     effectiveProviderDefinitions,
     effectiveAllProviderModels,
-    comboboxModeOptions,
-    comboboxThinkingOptions,
+    displayMode,
+    displayModel,
+    displayThinking,
     ModeIconComponent,
     modeIconColor,
     openSelector,
     ProviderIcon,
-    activeSheet,
-    handleOpenSheet,
-    handleCloseSheet,
+    prefsOpen,
+    handleOpenPrefs,
+    handleClosePrefs,
+    prefsButtonStyle,
+    sheetThinkingPressableStyle,
+    sheetModePressableStyle,
     handleSheetModelSelect,
-    handleSelectThinkingAndClose,
-    handleSelectModeAndClose,
+    handleThinkingOpenChange,
+    handleModeOpenChange,
     handleOpenChange,
-    renderModeOption,
-    renderThinkingOption,
+    renderSheetModelTrigger,
   } = props;
 
-  const thinkingAnchorRef = useRef<View | null>(null);
-  const modeAnchorRef = useRef<View | null>(null);
-
-  const hasThinking = comboboxThinkingOptions.length > 0;
-  const hasMode = Boolean(canSelectMode && comboboxModeOptions.length > 0);
-  const hasFeatures = Boolean(features && features.length > 0);
-
-  const handleOpenThinking = useCallback(() => handleOpenSheet("thinking"), [handleOpenSheet]);
-  const handleOpenMode = useCallback(() => handleOpenSheet("mode"), [handleOpenSheet]);
-  const handleOpenFeatures = useCallback(() => handleOpenSheet("features"), [handleOpenSheet]);
-  const handleThinkingSheetOpenChange = useCallback(
-    (nextOpen: boolean) => {
-      if (nextOpen) {
-        handleOpenSheet("thinking");
-      } else {
-        handleCloseSheet();
-      }
-    },
-    [handleCloseSheet, handleOpenSheet],
-  );
-  const handleModeSheetOpenChange = useCallback(
-    (nextOpen: boolean) => {
-      if (nextOpen) {
-        handleOpenSheet("mode");
-      } else {
-        handleCloseSheet();
-      }
-    },
-    [handleCloseSheet, handleOpenSheet],
-  );
-
-  const renderModelTrigger = useCallback(
-    ({
-      selectedModelLabel,
-    }: {
-      selectedModelLabel: string;
-      onPress: () => void;
-      disabled: boolean;
-      isOpen: boolean;
-    }) => (
-      <View pointerEvents="none" style={styles.prefsButton} testID="agent-status-bar-model">
+  return (
+    <>
+      <Pressable
+        onPress={handleOpenPrefs}
+        style={prefsButtonStyle}
+        accessibilityRole="button"
+        accessibilityLabel="Agent preferences"
+        testID="agent-preferences-button"
+      >
         {ProviderIcon ? (
           <ProviderIcon size={theme.iconSize.lg} color={theme.colors.foregroundMuted} />
         ) : null}
         <Text style={styles.prefsButtonText} numberOfLines={1}>
-          {shortModelLabel(selectedModelLabel)}
+          {displayModel}
         </Text>
-      </View>
-    ),
-    [ProviderIcon, theme.iconSize.lg, theme.colors.foregroundMuted],
-  );
-
-  const thinkingButtonStyle = makeBadgePressableStyle(
-    styles.modeIconBadge,
-    styles.disabledBadge,
-    disabled || !canSelectThinking,
-    activeSheet === "thinking",
-  );
-  const modeButtonStyle = makeBadgePressableStyle(
-    styles.modeIconBadge,
-    styles.disabledBadge,
-    disabled || !canSelectMode,
-    activeSheet === "mode",
-  );
-  const featuresButtonStyle = makeBadgePressableStyle(
-    styles.modeIconBadge,
-    styles.disabledBadge,
-    disabled,
-    activeSheet === "features",
-  );
-
-  return (
-    <>
-      {canSelectModel ? (
-        <CombinedModelSelector
-          providerDefinitions={effectiveProviderDefinitions}
-          allProviderModels={effectiveAllProviderModels}
-          selectedProvider={provider}
-          selectedModel={selectedModelId ?? ""}
-          canSelectProvider={canSelectProviderInModelMenu}
-          onSelect={handleSheetModelSelect}
-          favoriteKeys={favoriteKeys}
-          onToggleFavorite={onToggleFavoriteModel}
-          isLoading={isModelLoading}
-          disabled={modelDisabled}
-          onOpen={onModelSelectorOpen}
-          onClose={onDropdownClose}
-          renderTrigger={renderModelTrigger}
-        />
-      ) : null}
-
-      {hasThinking ? (
-        <Pressable
-          ref={thinkingAnchorRef}
-          onPress={handleOpenThinking}
-          disabled={disabled || !canSelectThinking}
-          style={thinkingButtonStyle}
-          accessibilityRole="button"
-          accessibilityLabel="Select thinking option"
-          testID="agent-status-bar-thinking"
-        >
-          <Brain size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-        </Pressable>
-      ) : null}
-
-      {hasMode ? (
-        <Pressable
-          ref={modeAnchorRef}
-          onPress={handleOpenMode}
-          disabled={disabled || !canSelectMode}
-          style={modeButtonStyle}
-          accessibilityRole="button"
-          accessibilityLabel={`Select agent mode (${selectedModeId ?? ""})`}
-          testID="agent-preferences-mode"
-        >
-          {ModeIconComponent ? (
-            <ModeIconComponent size={theme.iconSize.md} color={modeIconColor} />
-          ) : (
-            <ShieldCheck size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-          )}
-        </Pressable>
-      ) : null}
-
-      {hasFeatures ? (
-        <Pressable
-          onPress={handleOpenFeatures}
-          disabled={disabled}
-          style={featuresButtonStyle}
-          accessibilityRole="button"
-          accessibilityLabel="Open agent features"
-          testID="agent-status-bar-features"
-        >
-          <Settings2 size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-        </Pressable>
-      ) : null}
-
-      {hasThinking ? (
-        <Combobox
-          options={comboboxThinkingOptions}
-          value={selectedThinkingOptionId ?? ""}
-          onSelect={handleSelectThinkingAndClose}
-          searchable={false}
-          title="Thinking"
-          open={activeSheet === "thinking"}
-          onOpenChange={handleThinkingSheetOpenChange}
-          anchorRef={thinkingAnchorRef}
-          renderOption={renderThinkingOption}
-        />
-      ) : null}
-
-      {hasMode ? (
-        <Combobox
-          options={comboboxModeOptions}
-          value={selectedModeId ?? ""}
-          onSelect={handleSelectModeAndClose}
-          searchable={false}
-          title="Mode"
-          open={activeSheet === "mode"}
-          onOpenChange={handleModeSheetOpenChange}
-          renderOption={renderModeOption}
-          anchorRef={modeAnchorRef}
-        />
-      ) : null}
+      </Pressable>
 
       <AdaptiveModalSheet
-        header={FEATURES_SHEET_HEADER}
-        visible={activeSheet === "features"}
-        onClose={handleCloseSheet}
-        testID="agent-features-sheet"
+        title="Preferences"
+        visible={prefsOpen}
+        onClose={handleClosePrefs}
+        testID="agent-preferences-sheet"
       >
-        {(features ?? []).map((feature) => (
+        {canSelectModel ? (
+          <View style={styles.sheetSection}>
+            <CombinedModelSelector
+              providerDefinitions={effectiveProviderDefinitions}
+              allProviderModels={effectiveAllProviderModels}
+              selectedProvider={provider}
+              selectedModel={selectedModelId ?? ""}
+              canSelectProvider={canSelectProviderInModelMenu}
+              onSelect={handleSheetModelSelect}
+              favoriteKeys={favoriteKeys}
+              onToggleFavorite={onToggleFavoriteModel}
+              isLoading={isModelLoading}
+              disabled={modelDisabled}
+              onOpen={onModelSelectorOpen}
+              onClose={onDropdownClose}
+              renderTrigger={renderSheetModelTrigger}
+            />
+          </View>
+        ) : null}
+
+        {thinkingOptions && thinkingOptions.length > 0 ? (
+          <View style={styles.sheetSection}>
+            <DropdownMenu
+              open={openSelector === "thinking"}
+              onOpenChange={handleThinkingOpenChange}
+            >
+              <DropdownMenuTrigger
+                disabled={disabled || !canSelectThinking}
+                style={sheetThinkingPressableStyle}
+                accessibilityRole="button"
+                accessibilityLabel="Select thinking option"
+                testID="agent-preferences-thinking"
+              >
+                <Brain size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+                <Text style={styles.sheetSelectText}>{displayThinking}</Text>
+                <ChevronDown size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+              </DropdownMenuTrigger>
+              <DropdownMenuContent side="top" align="start">
+                {thinkingOptions.map((thinking) => (
+                  <ThinkingMenuItem
+                    key={thinking.id}
+                    thinking={thinking}
+                    selected={thinking.id === selectedThinkingOptionId}
+                    onSelectThinkingOption={onSelectThinkingOption}
+                  />
+                ))}
+              </DropdownMenuContent>
+            </DropdownMenu>
+          </View>
+        ) : null}
+
+        {modeOptions && modeOptions.length > 0 ? (
+          <View style={styles.sheetSection}>
+            <DropdownMenu open={openSelector === "mode"} onOpenChange={handleModeOpenChange}>
+              <DropdownMenuTrigger
+                disabled={disabled || !canSelectMode}
+                style={sheetModePressableStyle}
+                accessibilityRole="button"
+                accessibilityLabel="Select agent mode"
+                testID="agent-preferences-mode"
+              >
+                {ModeIconComponent ? (
+                  <ModeIconComponent size={theme.iconSize.md} color={modeIconColor} />
+                ) : null}
+                <Text style={styles.sheetSelectText}>{displayMode}</Text>
+                <ChevronDown size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+              </DropdownMenuTrigger>
+              <DropdownMenuContent side="top" align="start">
+                {modeOptions.map((mode) => (
+                  <ModeMenuItem
+                    key={mode.id}
+                    mode={mode}
+                    provider={provider}
+                    providerDefinitions={providerDefinitions}
+                    selected={mode.id === selectedModeId}
+                    onSelectMode={onSelectMode}
+                  />
+                ))}
+              </DropdownMenuContent>
+            </DropdownMenu>
+          </View>
+        ) : null}
+
+        {features?.map((feature) => (
           <SheetFeatureItem
             key={`feature-${feature.id}`}
             feature={feature}
@@ -1576,28 +1537,23 @@ function FeatureOptionMenuItem({
   );
 }
 
-function ThinkingComboboxOption({
-  option,
+function ThinkingMenuItem({
+  thinking,
   selected,
-  active,
-  onPress,
-  iconColor,
+  onSelectThinkingOption,
 }: {
-  option: ComboboxOption;
+  thinking: StatusOption;
   selected: boolean;
-  active: boolean;
-  onPress: () => void;
-  iconColor: string;
+  onSelectThinkingOption?: (thinkingOptionId: string) => void;
 }) {
-  const leadingSlot = useMemo(() => <Brain size={16} color={iconColor} />, [iconColor]);
+  const handleSelect = useCallback(() => {
+    onSelectThinkingOption?.(thinking.id);
+  }, [onSelectThinkingOption, thinking.id]);
+
   return (
-    <ComboboxItem
-      label={option.label}
-      selected={selected}
-      active={active}
-      onPress={onPress}
-      leadingSlot={leadingSlot}
-    />
+    <DropdownMenuItem selected={selected} onSelect={handleSelect}>
+      {thinking.label}
+    </DropdownMenuItem>
   );
 }
 
@@ -1635,8 +1591,40 @@ function ModeComboboxOption({
   );
 }
 
+function ModeMenuItem({
+  mode,
+  provider,
+  providerDefinitions,
+  selected,
+  onSelectMode,
+}: {
+  mode: StatusOption;
+  provider: string;
+  providerDefinitions: AgentProviderDefinition[];
+  selected: boolean;
+  onSelectMode?: (modeId: string) => void;
+}) {
+  const { theme } = useUnistyles();
+  const visuals = getModeVisuals(provider, mode.id, providerDefinitions);
+  const Icon = visuals?.icon ? MODE_ICONS[visuals.icon] : ShieldCheck;
+
+  const handleSelect = useCallback(() => {
+    onSelectMode?.(mode.id);
+  }, [mode.id, onSelectMode]);
+
+  const leadingIcon = useMemo(
+    () => <Icon size={16} color={theme.colors.foreground} />,
+    [Icon, theme.colors.foreground],
+  );
+
+  return (
+    <DropdownMenuItem selected={selected} onSelect={handleSelect} leading={leadingIcon}>
+      {mode.label}
+    </DropdownMenuItem>
+  );
+}
+
 const EMPTY_MODES: AgentMode[] = [];
-const FEATURES_SHEET_HEADER: SheetHeader = { title: "Features" };
 
 export const AgentStatusBar = memo(function AgentStatusBar({
   agentId,
@@ -1885,7 +1873,6 @@ export function DraftAgentStatusBar({
   disabled = false,
 }: DraftAgentStatusBarProps) {
   const { preferences, updatePreferences } = useFormPreferences();
-  const isCompact = useIsCompactFormFactor();
 
   const mappedModeOptions = useMemo<StatusOption[]>(() => {
     if (modeOptions.length === 0) {
@@ -1933,7 +1920,7 @@ export function DraftAgentStatusBar({
     [updatePreferences],
   );
 
-  if (!isCompact) {
+  if (platformIsWeb) {
     return (
       <View style={styles.container}>
         <CombinedModelSelector
@@ -2047,6 +2034,9 @@ const styles = StyleSheet.create((theme) => ({
     paddingHorizontal: theme.spacing[2],
     borderRadius: theme.borderRadius["2xl"],
   },
+  prefsButtonPressed: {
+    backgroundColor: theme.colors.surface0,
+  },
   prefsButtonText: {
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.sm,

packages/app/src/components/agent-stream-render-model.test.ts

@@ -35,7 +35,6 @@ describe("buildAgentStreamRenderModel", () => {
     const head = [assistantMessage("live-a", 121)];
 
     const model = buildAgentStreamRenderModel({
-      agentStatus: "running",
       tail,
       head,
       platform: "web",
@@ -53,7 +52,6 @@ describe("buildAgentStreamRenderModel", () => {
     const head = [assistantMessage("live-a", 3)];
 
     const model = buildAgentStreamRenderModel({
-      agentStatus: "running",
       tail,
       head,
       platform: "web",
@@ -71,14 +69,12 @@ describe("buildAgentStreamRenderModel", () => {
     const secondHead = [assistantMessage("live-b", 4)];
 
     const first = buildAgentStreamRenderModel({
-      agentStatus: "running",
       tail,
       head: firstHead,
       platform: "native",
       isMobileBreakpoint: false,
     });
     const second = buildAgentStreamRenderModel({
-      agentStatus: "running",
       tail,
       head: secondHead,
       platform: "native",
@@ -89,73 +85,4 @@ describe("buildAgentStreamRenderModel", () => {
     expect(first.segments.historyMounted).toBe(second.segments.historyMounted);
     expect(second.segments.liveHead.map((item) => item.id)).toEqual(["live-b"]);
   });
-
-  it("derives running turn timing across committed history and live head", () => {
-    const tail = [userMessage("u1", 1)];
-    const head = [assistantMessage("live-a", 4)];
-
-    const model = buildAgentStreamRenderModel({
-      agentStatus: "running",
-      tail,
-      head,
-      platform: "web",
-      isMobileBreakpoint: false,
-    });
-
-    expect(model.turnTiming.runningStartedAt).toBe(tail[0]?.timestamp);
-    expect(model.turnTiming.byAssistantId.has("live-a")).toBe(false);
-  });
-
-  it("maps completed turn timing to assistant ids across committed history and live head", () => {
-    const tail = [userMessage("u1", 1)];
-    const head = [assistantMessage("live-a", 4)];
-
-    const model = buildAgentStreamRenderModel({
-      agentStatus: "idle",
-      tail,
-      head,
-      platform: "web",
-      isMobileBreakpoint: false,
-    });
-
-    expect(model.turnTiming.runningStartedAt).toBe(null);
-    expect(model.turnTiming.byAssistantId.get("live-a")).toEqual({
-      startedAt: tail[0]?.timestamp,
-      completedAt: head[0]?.timestamp,
-      durationMs: 3000,
-    });
-  });
-
-  it("derives the same timing for native inverted rendering", () => {
-    const tail = [userMessage("u1", 1), assistantMessage("a1", 4)];
-
-    const model = buildAgentStreamRenderModel({
-      agentStatus: "idle",
-      tail,
-      head: [],
-      platform: "native",
-      isMobileBreakpoint: false,
-    });
-
-    expect(model.segments.historyMounted.map((item) => item.id)).toEqual(["a1", "u1"]);
-    expect(model.turnTiming.byAssistantId.get("a1")).toEqual({
-      startedAt: tail[0]?.timestamp,
-      completedAt: tail[1]?.timestamp,
-      durationMs: 3000,
-    });
-  });
-
-  it("does not create completed timing for adjacent user messages", () => {
-    const tail = [userMessage("u1", 1), userMessage("u2", 4)];
-
-    const model = buildAgentStreamRenderModel({
-      agentStatus: "idle",
-      tail,
-      head: [],
-      platform: "web",
-      isMobileBreakpoint: false,
-    });
-
-    expect(model.turnTiming.byAssistantId.size).toBe(0);
-  });
 });

packages/app/src/components/agent-stream-render-model.ts

@@ -1,5 +1,4 @@
 import type { ReactNode } from "react";
-import { deriveStreamTurnTiming, type StreamTurnTiming } from "@/timeline/turn-time";
 import type { StreamItem } from "@/types/stream";
 import {
   findMountedWindowStart,
@@ -27,19 +26,17 @@ export interface StreamHistoryBoundary {
 
 export interface StreamRenderAuxiliary {
   pendingPermissions: ReactNode;
-  turnFooter: ReactNode;
+  workingIndicator: ReactNode;
 }
 
 export interface AgentStreamRenderModel {
   history: StreamItem[];
   segments: StreamRenderSegments;
-  turnTiming: StreamTurnTiming;
   boundary: StreamHistoryBoundary;
   auxiliary: StreamRenderAuxiliary;
 }
 
 export interface BuildAgentStreamRenderModelInput {
-  agentStatus: string;
   tail: StreamItem[];
   head: StreamItem[];
   platform: "web" | "native";
@@ -49,7 +46,7 @@ export interface BuildAgentStreamRenderModelInput {
 const EMPTY_STREAM_ITEMS: StreamItem[] = [];
 const EMPTY_AUXILIARY: StreamRenderAuxiliary = {
   pendingPermissions: null,
-  turnFooter: null,
+  workingIndicator: null,
 };
 
 const orderedTailCache = new WeakMap<StreamItem[], Map<string, StreamItem[]>>();
@@ -58,10 +55,6 @@ const splitHistoryCache = new WeakMap<
   StreamItem[],
   Map<string, Pick<AgentStreamRenderModel, "history" | "segments">>
 >();
-const turnTimingCache = new WeakMap<
-  StreamItem[],
-  WeakMap<StreamItem[], Map<string, StreamTurnTiming>>
->();
 
 function getOrderedItems(params: {
   cache: WeakMap<StreamItem[], Map<string, StreamItem[]>>;
@@ -134,30 +127,6 @@ function splitOrderedTail(params: {
   return split;
 }
 
-function getTurnTiming(params: {
-  agentStatus: string;
-  tail: StreamItem[];
-  head: StreamItem[];
-}): StreamTurnTiming {
-  let cachedByHead = turnTimingCache.get(params.tail);
-  if (!cachedByHead) {
-    cachedByHead = new WeakMap();
-    turnTimingCache.set(params.tail, cachedByHead);
-  }
-  let cachedByStatus = cachedByHead.get(params.head);
-  if (!cachedByStatus) {
-    cachedByStatus = new Map();
-    cachedByHead.set(params.head, cachedByStatus);
-  }
-  const cached = cachedByStatus.get(params.agentStatus);
-  if (cached) {
-    return cached;
-  }
-  const timing = deriveStreamTurnTiming(params);
-  cachedByStatus.set(params.agentStatus, timing);
-  return timing;
-}
-
 export function buildAgentStreamRenderModel(
   input: BuildAgentStreamRenderModelInput,
 ): AgentStreamRenderModel {
@@ -191,11 +160,6 @@ export function buildAgentStreamRenderModel(
     platform: input.platform,
     isMobileBreakpoint: input.isMobileBreakpoint,
   });
-  const turnTiming = getTurnTiming({
-    agentStatus: input.agentStatus,
-    tail: input.tail,
-    head: input.head,
-  });
 
   return {
     history: splitHistory.history,
@@ -203,7 +167,6 @@ export function buildAgentStreamRenderModel(
       ...splitHistory.segments,
       liveHead: orderedHead,
     },
-    turnTiming,
     boundary: {
       hasVirtualizedHistory: splitHistory.segments.historyVirtualized.length > 0,
       hasMountedHistory: splitHistory.segments.historyMounted.length > 0,

packages/app/src/components/agent-stream-turn-footer.tsx

@@ -1,222 +0,0 @@
-import React, { memo, useCallback, useMemo, type ReactNode } from "react";
-import { View } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { MAX_CONTENT_WIDTH } from "@/constants/layout";
-import type { Theme } from "@/styles/theme";
-import type { TurnTiming } from "@/timeline/turn-time";
-import type { StreamItem } from "@/types/stream";
-import {
-  collectAssistantTurnContentForStreamRenderStrategy,
-  type StreamStrategy,
-} from "./agent-stream-render-strategy";
-import { AssistantTurnFooter, LiveElapsed, STREAM_METADATA_FONT_SIZE } from "./message";
-import { SyncedLoader } from "./synced-loader";
-
-const ThemedSyncedLoader = withUnistyles(SyncedLoader);
-const workingIndicatorColorMapping = (theme: Theme) => ({
-  color:
-    theme.colorScheme === "light"
-      ? theme.colors.palette.amber[700]
-      : theme.colors.palette.amber[500],
-});
-
-export type TurnContentStrategy = StreamStrategy;
-
-export interface TurnFooterHost {
-  itemId: string;
-  items: StreamItem[];
-  timing?: TurnTiming;
-  startIndex: number;
-}
-
-export function resolveBottomTurnFooterHost(input: {
-  agentStatus: string;
-  history: StreamItem[];
-  liveHead: StreamItem[];
-  isInverted: boolean;
-  timingByAssistantId: Map<string, TurnTiming>;
-}): TurnFooterHost | null {
-  if (input.agentStatus === "running") {
-    return null;
-  }
-  const usesLiveHead = input.liveHead.length > 0;
-  const footerItems = usesLiveHead ? input.liveHead : input.history;
-  const startIndex = input.isInverted ? 0 : footerItems.length - 1;
-  const item = footerItems[startIndex];
-  if (!item || item.kind !== "assistant_message") {
-    return null;
-  }
-  return {
-    itemId: item.id,
-    items: footerItems,
-    timing: input.timingByAssistantId.get(item.id),
-    startIndex,
-  };
-}
-
-export function shouldRenderCompletedTurnFooter(input: {
-  item: StreamItem;
-  belowItem: StreamItem | undefined;
-  agentStatus: string;
-  suppressTurnFooter: boolean | undefined;
-}): boolean {
-  return (
-    input.item.kind === "assistant_message" &&
-    !input.suppressTurnFooter &&
-    (input.belowItem?.kind === "user_message" ||
-      (input.belowItem === undefined && input.agentStatus !== "running"))
-  );
-}
-
-export const TurnFooter = memo(function TurnFooter({
-  isRunning,
-  inFlightTurnStartedAt,
-  host,
-  strategy,
-}: {
-  isRunning: boolean;
-  inFlightTurnStartedAt: Date | null;
-  host: TurnFooterHost | null;
-  strategy: TurnContentStrategy;
-}) {
-  if (isRunning) {
-    return (
-      <TurnFooterRow>
-        <RunningTurnFooter inFlightTurnStartedAt={inFlightTurnStartedAt} />
-      </TurnFooterRow>
-    );
-  }
-  if (!host) {
-    return null;
-  }
-  return (
-    <CompletedTurnFooterRow
-      strategy={strategy}
-      items={host.items}
-      timing={host.timing}
-      startIndex={host.startIndex}
-    />
-  );
-});
-
-export const CompletedTurnFooterRow = memo(function CompletedTurnFooterRow({
-  strategy,
-  items,
-  timing,
-  startIndex,
-}: {
-  strategy: TurnContentStrategy;
-  items: StreamItem[];
-  timing?: TurnTiming;
-  startIndex: number;
-}) {
-  return (
-    <TurnFooterRow>
-      <CompletedTurnFooter
-        strategy={strategy}
-        items={items}
-        timing={timing}
-        startIndex={startIndex}
-      />
-    </TurnFooterRow>
-  );
-});
-
-const WorkingIndicator = memo(function WorkingIndicator({
-  inFlightTurnStartedAt = null,
-}: {
-  inFlightTurnStartedAt?: Date | null;
-}) {
-  return (
-    <View style={stylesheet.turnFooterContent}>
-      <View style={stylesheet.workingLoader}>
-        <ThemedSyncedLoader size={14} uniProps={workingIndicatorColorMapping} />
-      </View>
-      {inFlightTurnStartedAt ? (
-        <LiveElapsed
-          startedAt={inFlightTurnStartedAt}
-          style={stylesheet.workingElapsed}
-          testID="turn-working-elapsed"
-        />
-      ) : null}
-    </View>
-  );
-});
-
-function RunningTurnFooter({ inFlightTurnStartedAt }: { inFlightTurnStartedAt: Date | null }) {
-  return (
-    <View style={stylesheet.turnFooterSlot} testID="turn-working-indicator">
-      <WorkingIndicator inFlightTurnStartedAt={inFlightTurnStartedAt} />
-    </View>
-  );
-}
-
-function CompletedTurnFooter({
-  strategy,
-  items,
-  timing,
-  startIndex,
-}: {
-  strategy: TurnContentStrategy;
-  items: StreamItem[];
-  timing?: TurnTiming;
-  startIndex: number;
-}) {
-  const getContent = useCallback(
-    () =>
-      collectAssistantTurnContentForStreamRenderStrategy({
-        strategy,
-        items,
-        startIndex,
-      }),
-    [strategy, items, startIndex],
-  );
-  return (
-    <View style={stylesheet.turnFooterSlot}>
-      <AssistantTurnFooter
-        getContent={getContent}
-        completedAt={timing?.completedAt}
-        durationMs={timing?.durationMs}
-      />
-    </View>
-  );
-}
-
-function TurnFooterRow({ children }: { children: ReactNode }) {
-  const rowStyle = useMemo(() => [stylesheet.streamItemWrapper, stylesheet.turnFooterRow], []);
-  return <View style={rowStyle}>{children}</View>;
-}
-
-const stylesheet = StyleSheet.create((theme) => ({
-  streamItemWrapper: {
-    width: "100%",
-    maxWidth: MAX_CONTENT_WIDTH,
-    alignSelf: "center",
-    paddingHorizontal: theme.spacing[2],
-  },
-  turnFooterRow: {
-    marginTop: theme.spacing[4],
-  },
-  turnFooterSlot: {
-    flexDirection: "row",
-    alignItems: "center",
-    alignSelf: "flex-start",
-    minHeight: 24,
-    paddingBottom: theme.spacing[6],
-  },
-  turnFooterContent: {
-    height: 24,
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "flex-start",
-    gap: theme.spacing[3],
-  },
-  workingElapsed: {
-    color: theme.colors.foregroundMuted,
-    fontSize: STREAM_METADATA_FONT_SIZE,
-    fontVariant: ["tabular-nums"],
-  },
-  workingLoader: {
-    marginLeft: -2,
-  },
-}));

packages/app/src/components/agent-stream-view-data.test.ts

@@ -1,6 +1,20 @@
 import { describe, expect, it } from "vitest";
 import type { StreamItem } from "@/types/stream";
-import { getAssistantBlockSpacing, isSameAssistantBlockGroup } from "./agent-stream-view-data";
+import type { NeighborResolver } from "./agent-stream-view-data";
+import {
+  getAssistantBlockSpacing,
+  isSameAssistantBlockGroup,
+  resolveInlineWorkingIndicatorItemId,
+} from "./agent-stream-view-data";
+
+// Minimal forward-order resolver: "below" = next item in array.
+// Matches web strategy rendering order (chronological, top-to-bottom).
+const forwardStrategy: NeighborResolver = {
+  getNeighborItem(items, index, relation) {
+    const neighborIndex = relation === "below" ? index + 1 : index - 1;
+    return items[neighborIndex];
+  },
+};
 
 function assistantBlock(params: {
   id: string;
@@ -121,3 +135,46 @@ describe("getAssistantBlockSpacing", () => {
     ).toBe("compactTop");
   });
 });
+
+describe("resolveInlineWorkingIndicatorItemId", () => {
+  it("returns null when the agent is not running", () => {
+    const head = assistantBlock({ id: "head", blockGroupId: "group-1", blockIndex: 0 });
+    expect(resolveInlineWorkingIndicatorItemId("idle", [head], forwardStrategy)).toBeNull();
+  });
+
+  it("returns the last assistant block id when running with a single head block", () => {
+    const head = assistantBlock({ id: "group-1:head", blockGroupId: "group-1", blockIndex: 0 });
+    expect(resolveInlineWorkingIndicatorItemId("running", [head], forwardStrategy)).toBe(
+      "group-1:head",
+    );
+  });
+
+  it("returns null when live head contains only a tool call (uses auxiliary indicator instead)", () => {
+    const tc = toolCallBlock("tool-1");
+    expect(resolveInlineWorkingIndicatorItemId("running", [tc], forwardStrategy)).toBeNull();
+  });
+
+  it("returns the footer assistant block when history and streaming head coexist", () => {
+    const historyBlock = assistantBlock({
+      id: "group-1:block:0",
+      blockGroupId: "group-1",
+      blockIndex: 0,
+    });
+    const streamingBlock = assistantBlock({
+      id: "group-2:head",
+      blockGroupId: "group-2",
+      blockIndex: 0,
+    });
+    // historyBlock is in streamItems (tail), not liveHead — liveHead holds only the streaming block
+    expect(resolveInlineWorkingIndicatorItemId("running", [streamingBlock], forwardStrategy)).toBe(
+      "group-2:head",
+    );
+    expect(
+      resolveInlineWorkingIndicatorItemId(
+        "running",
+        [historyBlock, streamingBlock],
+        forwardStrategy,
+      ),
+    ).toBe("group-2:head");
+  });
+});

packages/app/src/components/agent-stream-view-data.ts

@@ -1,5 +1,4 @@
 import type { StreamItem } from "@/types/stream";
-import { SPACING } from "@/styles/theme";
 
 export function isSameAssistantBlockGroup(params: {
   item: StreamItem | null | undefined;
@@ -29,35 +28,24 @@ export function getAssistantBlockSpacing(params: {
   return "default";
 }
 
-const isUserMessageItem = (item?: StreamItem | null) => item?.kind === "user_message";
-const isToolSequenceItem = (item?: StreamItem | null) =>
-  item?.kind === "tool_call" || item?.kind === "thought" || item?.kind === "todo_list";
-
-export function getGapBetweenStreamItems(
-  item: StreamItem | null,
-  belowItem: StreamItem | null,
-): number {
-  if (!item || !belowItem) {
-    return 0;
-  }
-
-  if (isUserMessageItem(item) && isUserMessageItem(belowItem)) {
-    return SPACING[1];
-  }
-  if (isToolSequenceItem(item) && isToolSequenceItem(belowItem)) {
-    return 0;
-  }
-  if (item.kind === "user_message" && isToolSequenceItem(belowItem)) {
-    return SPACING[4];
-  }
-  if (item.kind === "assistant_message" && isToolSequenceItem(belowItem)) {
-    return SPACING[1];
-  }
-  if (isToolSequenceItem(item) && belowItem.kind === "assistant_message") {
-    return SPACING[1];
-  }
-  if (isSameAssistantBlockGroup({ item, other: belowItem })) {
-    return SPACING[3];
-  }
-  return SPACING[4];
+export interface NeighborResolver {
+  getNeighborItem(
+    items: StreamItem[],
+    index: number,
+    relation: "above" | "below",
+  ): StreamItem | undefined;
+}
+
+// null → auxiliary working indicator; non-null → inline footer on that block.
+export function resolveInlineWorkingIndicatorItemId(
+  status: string,
+  liveHeadItems: StreamItem[],
+  strategy: NeighborResolver,
+): string | null {
+  if (status !== "running") return null;
+  const footerItem = liveHeadItems.find((item, index, items) => {
+    if (item.kind !== "assistant_message") return false;
+    return strategy.getNeighborItem(items, index, "below") === undefined;
+  });
+  return footerItem?.id ?? null;
 }

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

@@ -17,13 +17,20 @@ import {
   Platform,
   ActivityIndicator,
   type PressableStateCallbackType,
-  type StyleProp,
-  type ViewStyle,
 } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { MAX_CONTENT_WIDTH, useIsCompactFormFactor } from "@/constants/layout";
+import { useIsCompactFormFactor } from "@/constants/layout";
 import { useMutation } from "@tanstack/react-query";
-import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
+import Animated, {
+  FadeIn,
+  FadeOut,
+  cancelAnimation,
+  Easing,
+  useAnimatedStyle,
+  useSharedValue,
+  withRepeat,
+  withTiming,
+} from "react-native-reanimated";
 import { Check, ChevronDown, X } from "lucide-react-native";
 import { usePanelStore } from "@/stores/panel-store";
 import {
@@ -34,6 +41,7 @@ import {
   ToolCall,
   TodoListCard,
   CompactionMarker,
+  TurnCopyButton,
   MessageOuterSpacingProvider,
   type InlinePathTarget,
 } from "./message";
@@ -55,182 +63,42 @@ import { QuestionFormCard } from "./question-form-card";
 import { ToolCallSheetProvider } from "./tool-call-sheet";
 import {
   buildAgentStreamRenderModel,
+  collectAssistantTurnContentForStreamRenderStrategy,
   getStreamNeighborItem,
   resolveStreamRenderStrategy,
   type AgentStreamRenderModel,
   type StreamSegmentRenderers,
   type StreamViewportHandle,
 } from "./agent-stream-render-strategy";
-import { getAssistantBlockSpacing, getGapBetweenStreamItems } from "./agent-stream-view-data";
 import {
-  CompletedTurnFooterRow,
-  resolveBottomTurnFooterHost,
-  shouldRenderCompletedTurnFooter,
-  TurnFooter,
-  type TurnContentStrategy,
-  type TurnFooterHost,
-} from "./agent-stream-turn-footer";
+  getAssistantBlockSpacing,
+  isSameAssistantBlockGroup,
+  resolveInlineWorkingIndicatorItemId,
+} from "./agent-stream-view-data";
 import {
   type BottomAnchorLocalRequest,
   type BottomAnchorRouteRequest,
 } from "./use-bottom-anchor-controller";
-import { normalizeInlinePathTarget } from "@/assistant-file-links";
-import {
-  createWorkspaceFileTabTarget,
-  normalizeWorkspaceFileLocation,
-  type OpenFileDisposition,
-  type WorkspaceFileOpenRequest,
-} from "@/workspace/file-open";
+import { MAX_CONTENT_WIDTH } from "@/constants/layout";
+import { normalizeInlinePathTarget } from "@/utils/inline-path";
 import { resolveWorkspaceIdByExecutionDirectory } from "@/utils/workspace-execution";
 import { navigateToPreparedWorkspaceTab } from "@/utils/workspace-navigation";
+import { useStableEvent } from "@/hooks/use-stable-event";
+import {
+  getWorkingIndicatorDotStrength,
+  WORKING_INDICATOR_CYCLE_MS,
+  WORKING_INDICATOR_OFFSETS,
+} from "@/utils/working-indicator";
 import { isWeb } from "@/constants/platform";
-import type { Theme } from "@/styles/theme";
+import { SPACING, type Theme } from "@/styles/theme";
+
+const isUserMessageItem = (item?: StreamItem) => item?.kind === "user_message";
+const isToolSequenceItem = (item?: StreamItem) =>
+  item?.kind === "tool_call" || item?.kind === "thought" || item?.kind === "todo_list";
 
 interface StreamItemBoundarySeams {
   aboveItem?: StreamItem | null;
   belowItem?: StreamItem | null;
-  suppressTurnFooter?: boolean;
-}
-
-function renderLiveAuxiliaryNode(input: {
-  pendingPermissions: ReactNode;
-  turnFooter: ReactNode;
-}): ReactNode {
-  if (!input.pendingPermissions && !input.turnFooter) {
-    return null;
-  }
-  return (
-    <>
-      {input.turnFooter}
-      {input.pendingPermissions ? (
-        <View style={stylesheet.contentWrapper}>
-          <View style={stylesheet.listHeaderContent}>{input.pendingPermissions}</View>
-        </View>
-      ) : null}
-    </>
-  );
-}
-
-function renderPendingPermissionsNode(input: {
-  pendingPermissions: PendingPermission[];
-  client: DaemonClient | null;
-}): ReactNode {
-  if (input.pendingPermissions.length === 0) {
-    return null;
-  }
-  return (
-    <View style={stylesheet.permissionsContainer}>
-      {input.pendingPermissions.map((permission) => (
-        <PermissionRequestCard key={permission.key} permission={permission} client={input.client} />
-      ))}
-    </View>
-  );
-}
-
-function renderStreamItemWithTurnFooter(input: {
-  content: ReactNode;
-  item: StreamItem;
-  nextItem: StreamItem | undefined;
-  items: StreamItem[];
-  timing: AgentStreamRenderModel["turnTiming"]["byAssistantId"];
-  index: number;
-  agentStatus: string;
-  suppressTurnFooter: boolean | undefined;
-  strategy: TurnContentStrategy;
-}): ReactNode {
-  if (!input.content) {
-    return null;
-  }
-
-  const showCompletedFooter = shouldRenderCompletedTurnFooter({
-    item: input.item,
-    belowItem: input.nextItem,
-    agentStatus: input.agentStatus,
-    suppressTurnFooter: input.suppressTurnFooter,
-  });
-  const gapBelow = showCompletedFooter
-    ? 0
-    : getGapBetweenStreamItems(input.item, input.nextItem ?? null);
-
-  return (
-    <>
-      <StreamItemWrapper gapBelow={gapBelow}>{input.content}</StreamItemWrapper>
-      {showCompletedFooter ? (
-        <CompletedTurnFooterRow
-          strategy={input.strategy}
-          items={input.items}
-          timing={input.timing.get(input.item.id)}
-          startIndex={input.index}
-        />
-      ) : null}
-    </>
-  );
-}
-
-function renderListEmptyComponent(input: {
-  renderModel: AgentStreamRenderModel;
-  emptyStateStyle: StyleProp<ViewStyle>;
-}): ReactNode {
-  if (
-    input.renderModel.boundary.hasVirtualizedHistory ||
-    input.renderModel.boundary.hasMountedHistory ||
-    input.renderModel.boundary.hasLiveHead ||
-    input.renderModel.auxiliary.pendingPermissions ||
-    input.renderModel.auxiliary.turnFooter
-  ) {
-    return null;
-  }
-
-  return (
-    <View style={input.emptyStateStyle}>
-      <Text style={stylesheet.emptyStateText}>Start chatting with this agent...</Text>
-    </View>
-  );
-}
-
-function renderHistoryStreamItem(input: {
-  item: StreamItem;
-  historyIndexById: Map<string, number>;
-  historyItems: StreamItem[];
-  lastHistoryItem: StreamItem | null;
-  firstLiveHeadItem: StreamItem | null;
-  bottomTurnFooterHost: TurnFooterHost | null;
-  renderStreamItem: (
-    item: StreamItem,
-    index: number,
-    items: StreamItem[],
-    seams?: StreamItemBoundarySeams,
-  ) => ReactNode;
-}): ReactNode {
-  const historyIndex = input.historyIndexById.get(input.item.id);
-  if (historyIndex === undefined) {
-    return null;
-  }
-  const seamBelowItem =
-    input.item.id === input.lastHistoryItem?.id ? input.firstLiveHeadItem : null;
-  return input.renderStreamItem(input.item, historyIndex, input.historyItems, {
-    belowItem: seamBelowItem,
-    suppressTurnFooter: input.item.id === input.bottomTurnFooterHost?.itemId,
-  });
-}
-
-function renderLiveHeadStreamItem(input: {
-  item: StreamItem;
-  index: number;
-  items: StreamItem[];
-  lastHistoryItem: StreamItem | null;
-  bottomTurnFooterHost: TurnFooterHost | null;
-  renderStreamItem: (
-    item: StreamItem,
-    index: number,
-    items: StreamItem[],
-    seams?: StreamItemBoundarySeams,
-  ) => ReactNode;
-}): ReactNode {
-  return input.renderStreamItem(input.item, input.index, input.items, {
-    aboveItem: input.index === 0 ? input.lastHistoryItem : null,
-    suppressTurnFooter: input.item.id === input.bottomTurnFooterHost?.itemId,
-  });
 }
 
 export interface AgentStreamViewHandle {
@@ -247,11 +115,9 @@ export interface AgentStreamViewProps {
   routeBottomAnchorRequest?: BottomAnchorRouteRequest | null;
   isAuthoritativeHistoryReady?: boolean;
   toast?: ToastApi | null;
-  onOpenWorkspaceFile?: (request: WorkspaceFileOpenRequest) => void;
+  onOpenWorkspaceFile?: (input: { filePath: string }) => void;
 }
 
-const EMPTY_STREAM_HEAD: StreamItem[] = [];
-
 const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamViewProps>(
   function AgentStreamView(
     {
@@ -307,6 +173,11 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       agentId,
       toast,
     });
+    const openWorkspaceFile = useStableEvent(function openWorkspaceFile(input: {
+      filePath: string;
+    }) {
+      onOpenWorkspaceFile?.(input);
+    });
     // Keep entry/exit animations off on Android due to RN dispatchDraw crashes
     // tracked in react-native-reanimated#8422.
     const shouldDisableEntryExitAnimations = Platform.OS === "android";
@@ -323,7 +194,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     }, [agentId]);
 
     const handleInlinePathPress = useCallback(
-      (target: InlinePathTarget, disposition: OpenFileDisposition) => {
+      (target: InlinePathTarget) => {
         if (!target.path) {
           return;
         }
@@ -334,20 +205,8 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
         }
 
         if (normalized.file) {
-          const location = normalizeWorkspaceFileLocation({
-            path: normalized.file,
-            lineStart: target.lineStart,
-            lineEnd: target.lineEnd,
-          });
-          if (!location) {
-            return;
-          }
-
           if (onOpenWorkspaceFile) {
-            onOpenWorkspaceFile({
-              location,
-              disposition,
-            });
+            openWorkspaceFile({ filePath: normalized.file });
             return;
           }
 
@@ -355,7 +214,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
             navigateToPreparedWorkspaceTab({
               serverId: resolvedServerId,
               workspaceId,
-              target: createWorkspaceFileTabTarget(location),
+              target: { kind: "file", path: normalized.file },
             });
           }
           return;
@@ -386,26 +245,35 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
         requestDirectoryListing,
         resolvedServerId,
         setExplorerTabForCheckout,
+        openWorkspaceFile,
         workspaceId,
       ],
     );
 
     const handleToolCallOpenFile = useCallback(
       (filePath: string) => {
-        handleInlinePathPress({ raw: filePath, path: filePath }, "main");
+        handleInlinePathPress({ raw: filePath, path: filePath });
       },
       [handleInlinePathPress],
     );
 
     const baseRenderModel = useMemo(() => {
       return buildAgentStreamRenderModel({
-        agentStatus: agent.status,
         tail: streamItems,
-        head: streamHead ?? EMPTY_STREAM_HEAD,
+        head: streamHead ?? [],
         platform: isWeb ? "web" : "native",
         isMobileBreakpoint: isMobile,
       });
-    }, [agent.status, isMobile, streamHead, streamItems]);
+    }, [isMobile, streamHead, streamItems]);
+    const inlineWorkingIndicatorItemId = useMemo(
+      () =>
+        resolveInlineWorkingIndicatorItemId(
+          agent.status,
+          baseRenderModel.segments.liveHead,
+          streamRenderStrategy,
+        ),
+      [agent.status, baseRenderModel.segments.liveHead, streamRenderStrategy],
+    );
     useImperativeHandle(
       ref,
       () => ({
@@ -423,6 +291,39 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       viewportRef.current?.scrollToBottom("jump-to-bottom");
     }, []);
 
+    const tightGap = SPACING[1];
+    const assistantBlockGap = SPACING[3];
+    const looseGap = SPACING[4];
+
+    const getGapBetween = useCallback(
+      (item: StreamItem | null, belowItem: StreamItem | null) => {
+        if (!item || !belowItem) {
+          return 0;
+        }
+
+        if (isUserMessageItem(item) && isUserMessageItem(belowItem)) {
+          return tightGap;
+        }
+        if (isToolSequenceItem(item) && isToolSequenceItem(belowItem)) {
+          return 0;
+        }
+        if (item.kind === "user_message" && isToolSequenceItem(belowItem)) {
+          return looseGap;
+        }
+        if (item.kind === "assistant_message" && isToolSequenceItem(belowItem)) {
+          return tightGap;
+        }
+        if (isToolSequenceItem(item) && belowItem.kind === "assistant_message") {
+          return looseGap;
+        }
+        if (isSameAssistantBlockGroup({ item, other: belowItem })) {
+          return assistantBlockGap;
+        }
+        return looseGap;
+      },
+      [assistantBlockGap, looseGap, tightGap],
+    );
+
     const setInlineDetailsExpanded = useCallback(
       (itemId: string, expanded: boolean) => {
         if (!streamRenderStrategy.shouldDisableParentScrollOnInlineDetailsExpansion()) {
@@ -517,12 +418,11 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
             workspaceRoot={workspaceRoot}
             serverId={serverId}
             client={client}
-            toast={toast}
             spacing={spacing}
           />
         );
       },
-      [handleInlinePathPress, streamRenderStrategy, workspaceRoot, serverId, client, toast],
+      [handleInlinePathPress, streamRenderStrategy, workspaceRoot, serverId, client],
     );
 
     const renderThoughtItem = useCallback(
@@ -640,13 +540,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
             return <TodoListCard items={item.items} />;
 
           case "compaction":
-            return (
-              <CompactionMarker
-                status={item.status}
-                trigger={item.trigger}
-                preTokens={item.preTokens}
-              />
-            );
+            return <CompactionMarker status={item.status} preTokens={item.preTokens} />;
 
           default:
             return null;
@@ -655,22 +549,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       [renderUserMessageItem, renderAssistantMessageItem, renderThoughtItem, renderToolCallItem],
     );
 
-    const bottomTurnFooterHost = useMemo(() => {
-      return resolveBottomTurnFooterHost({
-        agentStatus: agent.status,
-        history: baseRenderModel.history,
-        liveHead: baseRenderModel.segments.liveHead,
-        isInverted: streamRenderStrategy.getFlatListInverted(),
-        timingByAssistantId: baseRenderModel.turnTiming.byAssistantId,
-      });
-    }, [
-      agent.status,
-      baseRenderModel.history,
-      baseRenderModel.segments.liveHead,
-      baseRenderModel.turnTiming.byAssistantId,
-      streamRenderStrategy,
-    ]);
-
     const renderStreamItem = useCallback(
       (
         item: StreamItem,
@@ -679,29 +557,45 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
         seams: StreamItemBoundarySeams = {},
       ) => {
         const content = renderStreamItemContent(item, index, items, seams);
+        if (!content) {
+          return null;
+        }
+
         const nextItem = getStreamNeighborItem({
           strategy: streamRenderStrategy,
           items,
           index,
           relation: "below",
         });
-        return renderStreamItemWithTurnFooter({
-          content,
-          item,
-          nextItem,
-          items,
-          timing: baseRenderModel.turnTiming.byAssistantId,
-          index,
-          agentStatus: agent.status,
-          suppressTurnFooter: seams.suppressTurnFooter,
-          strategy: streamRenderStrategy,
-        });
+        const gapBelow = getGapBetween(item, nextItem ?? null);
+        const isEndOfAssistantTurn =
+          item.kind === "assistant_message" &&
+          (nextItem?.kind === "user_message" ||
+            (nextItem === undefined && agent.status !== "running"));
+        const isRunningAssistantTurnFooter =
+          item.kind === "assistant_message" && item.id === inlineWorkingIndicatorItemId;
+        let footer: ReactNode = null;
+        if (isRunningAssistantTurnFooter) {
+          footer = <InlineWorkingIndicatorSlot />;
+        } else if (isEndOfAssistantTurn) {
+          footer = (
+            <TurnCopyButtonSlot strategy={streamRenderStrategy} items={items} startIndex={index} />
+          );
+        }
+
+        return (
+          <StreamItemWrapper gapBelow={gapBelow}>
+            {content}
+            {footer}
+          </StreamItemWrapper>
+        );
       },
       [
-        agent.status,
-        baseRenderModel.turnTiming.byAssistantId,
+        getGapBetween,
         renderStreamItemContent,
+        agent.status,
         streamRenderStrategy,
+        inlineWorkingIndicatorItemId,
       ],
     );
 
@@ -710,56 +604,66 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       [pendingPermissions, agentId],
     );
 
-    const showRunningTurnFooter = agent.status === "running";
+    const showAuxiliaryWorkingIndicator =
+      agent.status === "running" && inlineWorkingIndicatorItemId === null;
     const pendingPermissionsNode = useMemo(
       () =>
-        renderPendingPermissionsNode({
-          pendingPermissions: pendingPermissionItems,
-          client,
-        }),
+        pendingPermissionItems.length > 0 ? (
+          <View style={stylesheet.permissionsContainer}>
+            {pendingPermissionItems.map((permission) => (
+              <PermissionRequestCard key={permission.key} permission={permission} client={client} />
+            ))}
+          </View>
+        ) : null,
       [client, pendingPermissionItems],
     );
-    const turnFooterNode = useMemo(
+    const workingIndicatorNode = useMemo(
       () =>
-        showRunningTurnFooter || bottomTurnFooterHost ? (
-          <TurnFooter
-            isRunning={showRunningTurnFooter}
-            inFlightTurnStartedAt={baseRenderModel.turnTiming.runningStartedAt}
-            host={bottomTurnFooterHost}
-            strategy={streamRenderStrategy}
-          />
+        showAuxiliaryWorkingIndicator ? (
+          <View style={stylesheet.bottomBarWrapper} testID="stream-working-indicator-auxiliary">
+            <WorkingIndicator />
+          </View>
         ) : null,
-      [
-        showRunningTurnFooter,
-        baseRenderModel.turnTiming.runningStartedAt,
-        bottomTurnFooterHost,
-        streamRenderStrategy,
-      ],
+      [showAuxiliaryWorkingIndicator],
     );
     const renderModel = useMemo<AgentStreamRenderModel>(() => {
       return {
         ...baseRenderModel,
         boundary: {
           ...baseRenderModel.boundary,
-          historyToHeadGap: getGapBetweenStreamItems(
+          historyToHeadGap: getGapBetween(
             baseRenderModel.history.at(-1) ?? null,
             baseRenderModel.segments.liveHead[0] ?? null,
           ),
         },
         auxiliary: {
           pendingPermissions: pendingPermissionsNode,
-          turnFooter: turnFooterNode,
+          workingIndicator: workingIndicatorNode,
         },
       };
-    }, [baseRenderModel, pendingPermissionsNode, turnFooterNode]);
+    }, [baseRenderModel, getGapBetween, pendingPermissionsNode, workingIndicatorNode]);
 
     const emptyStateStyle = useMemo(() => [stylesheet.emptyState, stylesheet.contentWrapper], []);
-    const listEmptyComponent = useMemo(
-      () => renderListEmptyComponent({ renderModel, emptyStateStyle }),
-      [renderModel, emptyStateStyle],
-    );
+    const listEmptyComponent = useMemo(() => {
+      if (
+        renderModel.boundary.hasVirtualizedHistory ||
+        renderModel.boundary.hasMountedHistory ||
+        renderModel.boundary.hasLiveHead ||
+        renderModel.auxiliary.pendingPermissions ||
+        renderModel.auxiliary.workingIndicator
+      ) {
+        return null;
+      }
+
+      return (
+        <View style={emptyStateStyle}>
+          <Text style={stylesheet.emptyStateText}>Start chatting with this agent...</Text>
+        </View>
+      );
+    }, [renderModel, emptyStateStyle]);
 
     const historyItems = renderModel.history;
+    const _liveHeadItems = renderModel.segments.liveHead;
     const { boundary, auxiliary } = renderModel;
     const lastHistoryItem = historyItems.at(-1) ?? null;
     const firstLiveHeadItem = renderModel.segments.liveHead[0] ?? null;
@@ -773,24 +677,17 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     }, [historyItems]);
 
     const renderHistoryRow = useCallback(
-      (item: StreamItem) =>
-        renderHistoryStreamItem({
-          item,
-          historyIndexById,
-          historyItems,
-          lastHistoryItem,
-          firstLiveHeadItem,
-          bottomTurnFooterHost,
-          renderStreamItem,
-        }),
-      [
-        bottomTurnFooterHost,
-        firstLiveHeadItem,
-        historyIndexById,
-        historyItems,
-        lastHistoryItem,
-        renderStreamItem,
-      ],
+      (item: StreamItem) => {
+        const historyIndex = historyIndexById.get(item.id);
+        if (historyIndex === undefined) {
+          return null;
+        }
+        const seamBelowItem = item.id === lastHistoryItem?.id ? firstLiveHeadItem : null;
+        return renderStreamItem(item, historyIndex, historyItems, {
+          belowItem: seamBelowItem,
+        });
+      },
+      [firstLiveHeadItem, historyIndexById, historyItems, lastHistoryItem?.id, renderStreamItem],
     );
 
     const renderHistoryVirtualizedRow = useCallback<
@@ -802,22 +699,32 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     );
     const renderLiveHeadRow = useCallback<StreamSegmentRenderers["renderLiveHeadRow"]>(
       (item, index, items) =>
-        renderLiveHeadStreamItem({
-          item,
-          index,
-          items,
-          lastHistoryItem,
-          bottomTurnFooterHost,
-          renderStreamItem,
+        renderStreamItem(item, index, items, {
+          aboveItem: index === 0 ? lastHistoryItem : null,
         }),
-      [bottomTurnFooterHost, lastHistoryItem, renderStreamItem],
+      [lastHistoryItem, renderStreamItem],
     );
+    const liveAuxiliaryHeaderStyle = useMemo(() => {
+      let headerPadding: { paddingBottom: number } | { paddingTop: number } | null;
+      if (!boundary.hasLiveHead) headerPadding = null;
+      else if (streamRenderStrategy.getFlatListInverted())
+        headerPadding = { paddingBottom: looseGap };
+      else headerPadding = { paddingTop: looseGap };
+      return [stylesheet.listHeaderContent, headerPadding];
+    }, [boundary.hasLiveHead, streamRenderStrategy, looseGap]);
     const renderLiveAuxiliary = useCallback<StreamSegmentRenderers["renderLiveAuxiliary"]>(() => {
-      return renderLiveAuxiliaryNode({
-        pendingPermissions: auxiliary.pendingPermissions,
-        turnFooter: auxiliary.turnFooter,
-      });
-    }, [auxiliary.pendingPermissions, auxiliary.turnFooter]);
+      if (!auxiliary.pendingPermissions && !auxiliary.workingIndicator) {
+        return null;
+      }
+      return (
+        <View style={stylesheet.contentWrapper}>
+          <View style={liveAuxiliaryHeaderStyle}>
+            {auxiliary.pendingPermissions}
+            {auxiliary.workingIndicator}
+          </View>
+        </View>
+      );
+    }, [auxiliary.pendingPermissions, auxiliary.workingIndicator, liveAuxiliaryHeaderStyle]);
 
     const renderers = useMemo<StreamSegmentRenderers>(
       () => ({
@@ -889,6 +796,106 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
 export const AgentStreamView = memo(AgentStreamViewComponent);
 AgentStreamView.displayName = "AgentStreamView";
 
+function WorkingIndicator({ variant = "auxiliary" }: { variant?: "auxiliary" | "inline" }) {
+  const progress = useSharedValue(0);
+
+  useEffect(() => {
+    progress.value = 0;
+    progress.value = withRepeat(
+      withTiming(1, {
+        duration: WORKING_INDICATOR_CYCLE_MS,
+        easing: Easing.linear,
+      }),
+      -1,
+      false,
+    );
+
+    return () => {
+      cancelAnimation(progress);
+      progress.value = 0;
+    };
+  }, [progress]);
+
+  const translateDistance = -2;
+  const dotOneStyle = useAnimatedStyle(() => {
+    const strength = getWorkingIndicatorDotStrength(progress.value, WORKING_INDICATOR_OFFSETS[0]);
+    return {
+      opacity: 0.3 + strength * 0.7,
+      transform: [{ translateY: strength * translateDistance }],
+    };
+  });
+
+  const dotTwoStyle = useAnimatedStyle(() => {
+    const strength = getWorkingIndicatorDotStrength(progress.value, WORKING_INDICATOR_OFFSETS[1]);
+    return {
+      opacity: 0.3 + strength * 0.7,
+      transform: [{ translateY: strength * translateDistance }],
+    };
+  });
+
+  const dotThreeStyle = useAnimatedStyle(() => {
+    const strength = getWorkingIndicatorDotStrength(progress.value, WORKING_INDICATOR_OFFSETS[2]);
+    return {
+      opacity: 0.3 + strength * 0.7,
+      transform: [{ translateY: strength * translateDistance }],
+    };
+  });
+
+  const dotOneCombinedStyle = useMemo(() => [stylesheet.workingDot, dotOneStyle], [dotOneStyle]);
+  const dotTwoCombinedStyle = useMemo(() => [stylesheet.workingDot, dotTwoStyle], [dotTwoStyle]);
+  const dotThreeCombinedStyle = useMemo(
+    () => [stylesheet.workingDot, dotThreeStyle],
+    [dotThreeStyle],
+  );
+
+  const containerStyle =
+    variant === "inline"
+      ? stylesheet.inlineWorkingIndicatorFrame
+      : stylesheet.workingIndicatorBubble;
+
+  return (
+    <View style={containerStyle}>
+      <View style={stylesheet.workingDotsRow}>
+        <Animated.View style={dotOneCombinedStyle} />
+        <Animated.View style={dotTwoCombinedStyle} />
+        <Animated.View style={dotThreeCombinedStyle} />
+      </View>
+    </View>
+  );
+}
+
+function InlineWorkingIndicatorSlot() {
+  return (
+    <View style={stylesheet.inlineTurnFooter} testID="turn-working-indicator">
+      <WorkingIndicator variant="inline" />
+    </View>
+  );
+}
+
+// Permission Request Card Component
+type TurnContentStrategy = Parameters<
+  typeof collectAssistantTurnContentForStreamRenderStrategy
+>[0]["strategy"];
+
+interface TurnCopyButtonSlotProps {
+  strategy: TurnContentStrategy;
+  items: StreamItem[];
+  startIndex: number;
+}
+
+function TurnCopyButtonSlot({ strategy, items, startIndex }: TurnCopyButtonSlotProps) {
+  const getContent = useCallback(
+    () =>
+      collectAssistantTurnContentForStreamRenderStrategy({
+        strategy,
+        items,
+        startIndex,
+      }),
+    [strategy, items, startIndex],
+  );
+  return <TurnCopyButton getContent={getContent} />;
+}
+
 interface ToolCallSlotProps extends Omit<
   ComponentProps<typeof ToolCall>,
   "onInlineDetailsExpandedChange"
@@ -1185,7 +1192,6 @@ const stylesheet = StyleSheet.create((theme) => ({
     width: "100%",
     maxWidth: MAX_CONTENT_WIDTH,
     alignSelf: "center",
-    paddingHorizontal: theme.spacing[2],
   },
   listContentContainer: {
     paddingVertical: 0,
@@ -1206,7 +1212,6 @@ const stylesheet = StyleSheet.create((theme) => ({
     width: "100%",
     maxWidth: MAX_CONTENT_WIDTH,
     alignSelf: "center",
-    paddingHorizontal: theme.spacing[2],
   },
   emptyState: {
     flex: 1,
@@ -1220,6 +1225,51 @@ const stylesheet = StyleSheet.create((theme) => ({
   listHeaderContent: {
     gap: theme.spacing[3],
   },
+  bottomBarWrapper: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "flex-start",
+    marginTop: theme.spacing[4],
+    paddingLeft: 3,
+    paddingRight: 3,
+    paddingTop: theme.spacing[3],
+    paddingBottom: theme.spacing[2],
+    gap: theme.spacing[2],
+  },
+  inlineTurnFooter: {
+    alignSelf: "flex-start",
+    marginTop: theme.spacing[2],
+    padding: theme.spacing[2],
+    paddingTop: 0,
+  },
+  inlineWorkingIndicatorFrame: {
+    height: 18,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  workingIndicatorBubble: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    paddingHorizontal: 0,
+    paddingVertical: theme.spacing[1],
+    paddingLeft: theme.spacing[2],
+    borderRadius: theme.borderRadius.full,
+    backgroundColor: "transparent",
+    borderWidth: 0,
+    alignSelf: "flex-start",
+  },
+  workingDotsRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1],
+  },
+  workingDot: {
+    width: 6,
+    height: 6,
+    borderRadius: 3,
+    backgroundColor: theme.colors.foregroundMuted,
+  },
   syncingIndicator: {
     flexDirection: "row",
     alignItems: "center",

packages/app/src/components/combined-model-selector.test.ts

@@ -3,7 +3,6 @@ import type { AgentModelDefinition } from "@server/server/agent/agent-sdk-types"
 import {
   buildModelRows,
   buildSelectedTriggerLabel,
-  filterAndRankModelRows,
   matchesSearch,
   resolveProviderLabel,
 } from "./combined-model-selector.utils";
@@ -68,50 +67,6 @@ describe("combined model selector helpers", () => {
     expect(matchesSearch(rows[1], "gpt-5.4")).toBe(true);
   });
 
-  it("matches across label, provider, and description with multi-token fuzzy search", () => {
-    const row = {
-      favoriteKey: "opencode:opencode-zen/kimi-k2.5",
-      provider: "opencode",
-      providerLabel: "OpenCode",
-      modelId: "opencode-zen/kimi-k2.5",
-      modelLabel: "Kimi K2.5",
-      description: "OpenCode Zen - kimi",
-    };
-
-    expect(matchesSearch(row, "kimi zen")).toBe(true);
-    expect(matchesSearch(row, "zen kimi")).toBe(true);
-    expect(matchesSearch(row, "k2.5 zen")).toBe(true);
-    expect(matchesSearch(row, "kimi gemini")).toBe(false);
-  });
-
-  it("ranks model search results by fuzzy match quality", () => {
-    const rows = [
-      {
-        favoriteKey: "openai:gpt-4.1",
-        provider: "openai",
-        providerLabel: "OpenAI",
-        modelId: "gpt-4.1",
-        modelLabel: "GPT-4.1",
-      },
-      {
-        favoriteKey: "openai:gpt-5.4",
-        provider: "openai",
-        providerLabel: "OpenAI",
-        modelId: "gpt-5.4",
-        modelLabel: "GPT-5.4",
-      },
-      {
-        favoriteKey: "google:gemini",
-        provider: "google",
-        providerLabel: "Google",
-        modelId: "gemini",
-        modelLabel: "Gemini",
-      },
-    ];
-
-    expect(filterAndRankModelRows(rows, "gpt54").map((row) => row.modelId)).toEqual(["gpt-5.4"]);
-  });
-
   it("keeps the selected trigger label model-only", () => {
     expect(resolveProviderLabel(providerDefinitions, "codex")).toBe("Codex");
     expect(buildSelectedTriggerLabel("GPT-5.4")).toBe("GPT-5.4");

packages/app/src/components/combined-model-selector.tsx

@@ -1,20 +1,21 @@
-import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { Ref } from "react";
 import {
   View,
   Text,
+  TextInput,
   Pressable,
   ActivityIndicator,
   type GestureResponderEvent,
   type PressableStateCallbackType,
 } from "react-native";
-import { BottomSheetFlatList } from "@gorhom/bottom-sheet";
+import { BottomSheetTextInput } from "@gorhom/bottom-sheet";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { isNative, isWeb as platformIsWeb } from "@/constants/platform";
-import { ChevronDown, ChevronRight, Search, Star } from "lucide-react-native";
+import { isWeb as platformIsWeb } from "@/constants/platform";
+import { ArrowLeft, ChevronDown, ChevronRight, Search, Star } from "lucide-react-native";
 import type { AgentModelDefinition, AgentProvider } from "@server/server/agent/agent-sdk-types";
 import type { AgentProviderDefinition } from "@server/server/agent/provider-manifest";
-import type { SheetHeader } from "@/components/adaptive-modal-sheet";
 const IS_WEB = platformIsWeb;
 
 import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
@@ -44,11 +45,19 @@ function drillDownRowStyle({
     pressed && styles.drillDownRowPressed,
   ];
 }
+
+function backButtonStyle({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) {
+  return [
+    styles.backButton,
+    Boolean(hovered) && styles.backButtonHovered,
+    pressed && styles.backButtonPressed,
+  ];
+}
 import { getProviderIcon } from "@/components/provider-icons";
 import {
   buildModelRows,
   buildSelectedTriggerLabel,
-  filterAndRankModelRows,
+  matchesSearch,
   resolveProviderLabel,
   type SelectorModelRow,
 } from "./combined-model-selector.utils";
@@ -88,6 +97,7 @@ interface SelectorContentProps {
   selectedProvider: string;
   selectedModel: string;
   searchQuery: string;
+  onSearchChange: (query: string) => void;
   favoriteKeys: Set<string>;
   onSelect: (provider: string, modelId: string) => void;
   canSelectProvider: (provider: string) => boolean;
@@ -106,6 +116,24 @@ function normalizeSearchQuery(value: string): string {
   return value.trim().toLowerCase();
 }
 
+function partitionRows(
+  rows: SelectorModelRow[],
+  favoriteKeys: Set<string>,
+): { favoriteRows: SelectorModelRow[]; regularRows: SelectorModelRow[] } {
+  const favoriteRows: SelectorModelRow[] = [];
+  const regularRows: SelectorModelRow[] = [];
+
+  for (const row of rows) {
+    if (favoriteKeys.has(row.favoriteKey)) {
+      favoriteRows.push(row);
+      continue;
+    }
+    regularRows.push(row);
+  }
+
+  return { favoriteRows, regularRows };
+}
+
 function sortFavoritesFirst(
   rows: SelectorModelRow[],
   favoriteKeys: Set<string>,
@@ -347,23 +375,55 @@ function GroupProviderButton({
 
 function GroupedProviderRows({
   groupedRows,
+  selectedProvider,
+  selectedModel,
+  favoriteKeys,
+  onSelect,
+  canSelectProvider,
+  onToggleFavorite,
   onDrillDown,
+  viewKind,
 }: {
   groupedRows: Array<{ providerId: string; providerLabel: string; rows: SelectorModelRow[] }>;
+  selectedProvider: string;
+  selectedModel: string;
+  favoriteKeys: Set<string>;
+  onSelect: (provider: string, modelId: string) => void;
+  canSelectProvider: (provider: string) => boolean;
+  onToggleFavorite?: (provider: string, modelId: string) => void;
   onDrillDown: (providerId: string, providerLabel: string) => void;
+  viewKind: SelectorView["kind"];
 }) {
   return (
     <View>
       {groupedRows.map((group, index) => {
+        const isInline = viewKind === "provider";
+
         return (
           <View key={group.providerId}>
             {index > 0 ? <View style={styles.separator} /> : null}
-            <GroupProviderButton
-              providerId={group.providerId}
-              providerLabel={group.providerLabel}
-              rowCount={group.rows.length}
-              onDrillDown={onDrillDown}
-            />
+            {isInline ? (
+              <>
+                {sortFavoritesFirst(group.rows, favoriteKeys).map((row) => (
+                  <SelectableModelRow
+                    key={row.favoriteKey}
+                    row={row}
+                    isSelected={row.provider === selectedProvider && row.modelId === selectedModel}
+                    isFavorite={favoriteKeys.has(row.favoriteKey)}
+                    disabled={!canSelectProvider(row.provider)}
+                    onSelect={onSelect}
+                    onToggleFavorite={onToggleFavorite}
+                  />
+                ))}
+              </>
+            ) : (
+              <GroupProviderButton
+                providerId={group.providerId}
+                providerLabel={group.providerLabel}
+                rowCount={group.rows.length}
+                onDrillDown={onDrillDown}
+              />
+            )}
           </View>
         );
       })}
@@ -371,65 +431,47 @@ function GroupedProviderRows({
   );
 }
 
-function ProviderModelRows({
-  rows,
-  selectedProvider,
-  selectedModel,
-  favoriteKeys,
-  onSelect,
-  canSelectProvider,
-  onToggleFavorite,
-  normalizedQuery,
+function ProviderSearchInput({
+  value,
+  onChangeText,
+  autoFocus = false,
 }: {
-  rows: SelectorModelRow[];
-  selectedProvider: string;
-  selectedModel: string;
-  favoriteKeys: Set<string>;
-  onSelect: (provider: string, modelId: string) => void;
-  canSelectProvider: (provider: string) => boolean;
-  onToggleFavorite?: (provider: string, modelId: string) => void;
-  normalizedQuery: string;
+  value: string;
+  onChangeText: (text: string) => void;
+  autoFocus?: boolean;
 }) {
+  const { theme } = useUnistyles();
+  const inputRef = useRef<TextInput>(null);
   const isMobile = useIsCompactFormFactor();
-  const useVirtualizedList = isMobile && isNative;
-  const displayRows = useMemo(
-    () => (normalizedQuery ? rows : sortFavoritesFirst(rows, favoriteKeys)),
-    [favoriteKeys, normalizedQuery, rows],
-  );
-  const renderItem = useCallback(
-    ({ item }: { item: SelectorModelRow }) => (
-      <SelectableModelRow
-        row={item}
-        isSelected={item.provider === selectedProvider && item.modelId === selectedModel}
-        isFavorite={favoriteKeys.has(item.favoriteKey)}
-        disabled={!canSelectProvider(item.provider)}
-        onSelect={onSelect}
-        onToggleFavorite={onToggleFavorite}
-      />
-    ),
-    [canSelectProvider, favoriteKeys, onSelect, onToggleFavorite, selectedModel, selectedProvider],
-  );
-  const keyExtractor = useCallback((row: SelectorModelRow) => row.favoriteKey, []);
+  const InputComponent = isMobile ? BottomSheetTextInput : TextInput;
 
-  if (useVirtualizedList) {
-    return (
-      <BottomSheetFlatList
-        data={displayRows}
-        renderItem={renderItem}
-        keyExtractor={keyExtractor}
-        style={styles.virtualizedModelList}
-        keyboardShouldPersistTaps="handled"
-        showsVerticalScrollIndicator={false}
-        contentContainerStyle={styles.virtualizedModelListContent}
-      />
-    );
-  }
+  useEffect(() => {
+    if (!autoFocus || !platformIsWeb || !inputRef.current) return () => {};
+    const timer = setTimeout(() => {
+      inputRef.current?.focus();
+    }, 50);
+    return () => clearTimeout(timer);
+  }, [autoFocus]);
+
+  const inputStyle = useMemo(
+    () => [styles.providerSearchInput, platformIsWeb && { outlineStyle: "none" }],
+    [],
+  );
 
   return (
-    <View>
-      {displayRows.map((row) => (
-        <View key={row.favoriteKey}>{renderItem({ item: row })}</View>
-      ))}
+    <View style={styles.providerSearchContainer}>
+      <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+      <InputComponent
+        ref={inputRef as unknown as Ref<never>}
+        // @ts-expect-error - outlineStyle is web-only
+        style={inputStyle}
+        placeholder="Search models..."
+        placeholderTextColor={theme.colors.foregroundMuted}
+        value={value}
+        onChangeText={onChangeText}
+        autoCapitalize="none"
+        autoCorrect={false}
+      />
     </View>
   );
 }
@@ -441,6 +483,7 @@ function SelectorContent({
   selectedProvider,
   selectedModel,
   searchQuery,
+  onSearchChange: _onSearchChange,
   favoriteKeys,
   onSelect,
   canSelectProvider,
@@ -463,64 +506,95 @@ function SelectorContent({
   const normalizedQuery = useMemo(() => normalizeSearchQuery(searchQuery), [searchQuery]);
 
   const visibleRows = useMemo(
-    () => filterAndRankModelRows(scopedRows, normalizedQuery),
+    () => scopedRows.filter((row) => matchesSearch(row, normalizedQuery)),
     [normalizedQuery, scopedRows],
   );
 
-  const favoriteRows = useMemo(
-    () => visibleRows.filter((row) => favoriteKeys.has(row.favoriteKey)),
+  const { favoriteRows, regularRows: _regularRows } = useMemo(
+    () => partitionRows(visibleRows, favoriteKeys),
     [favoriteKeys, visibleRows],
   );
 
+  // Group ALL visible rows by provider — favorites are a cross-cutting view,
+  // not a partition. A model being favorited doesn't remove it from its provider.
   const allGroupedRows = useMemo(() => groupRowsByProvider(visibleRows), [visibleRows]);
-  const hasResults = favoriteRows.length > 0 || allGroupedRows.length > 0;
-  const emptyState = (
-    <View style={styles.emptyState}>
-      <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
-      <Text style={styles.emptyStateText}>No models match your search</Text>
-    </View>
-  );
 
-  if (view.kind === "provider") {
-    if (visibleRows.length === 0) {
-      return emptyState;
+  // When searching at Level 1, filter grouped rows to only providers whose name or models match
+  const filteredGroupedRows = useMemo(() => {
+    if (view.kind === "provider" || !normalizedQuery) {
+      return allGroupedRows;
     }
-
-    return (
-      <ProviderModelRows
-        rows={visibleRows}
-        selectedProvider={selectedProvider}
-        selectedModel={selectedModel}
-        favoriteKeys={favoriteKeys}
-        onSelect={onSelect}
-        canSelectProvider={canSelectProvider}
-        onToggleFavorite={onToggleFavorite}
-        normalizedQuery={normalizedQuery}
-      />
+    return allGroupedRows.filter(
+      (group) =>
+        group.providerLabel.toLowerCase().includes(normalizedQuery) || group.rows.length > 0,
     );
-  }
+  }, [allGroupedRows, normalizedQuery, view.kind]);
+
+  const hasResults = favoriteRows.length > 0 || filteredGroupedRows.length > 0;
 
   return (
     <View>
-      <FavoritesSection
-        favoriteRows={favoriteRows}
-        selectedProvider={selectedProvider}
-        selectedModel={selectedModel}
-        favoriteKeys={favoriteKeys}
-        onSelect={onSelect}
-        canSelectProvider={canSelectProvider}
-        onToggleFavorite={onToggleFavorite}
-      />
-
-      {allGroupedRows.length > 0 ? (
-        <GroupedProviderRows groupedRows={allGroupedRows} onDrillDown={onDrillDown} />
+      {view.kind === "all" ? (
+        <FavoritesSection
+          favoriteRows={favoriteRows}
+          selectedProvider={selectedProvider}
+          selectedModel={selectedModel}
+          favoriteKeys={favoriteKeys}
+          onSelect={onSelect}
+          canSelectProvider={canSelectProvider}
+          onToggleFavorite={onToggleFavorite}
+        />
       ) : null}
 
-      {!hasResults ? emptyState : null}
+      {filteredGroupedRows.length > 0 ? (
+        <GroupedProviderRows
+          groupedRows={filteredGroupedRows}
+          selectedProvider={selectedProvider}
+          selectedModel={selectedModel}
+          favoriteKeys={favoriteKeys}
+          onSelect={onSelect}
+          canSelectProvider={canSelectProvider}
+          onToggleFavorite={onToggleFavorite}
+          onDrillDown={onDrillDown}
+          viewKind={view.kind}
+        />
+      ) : null}
+
+      {!hasResults ? (
+        <View style={styles.emptyState}>
+          <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
+          <Text style={styles.emptyStateText}>No models match your search</Text>
+        </View>
+      ) : null}
     </View>
   );
 }
 
+function ProviderBackButton({
+  providerId,
+  providerLabel,
+  onBack,
+}: {
+  providerId: string;
+  providerLabel: string;
+  onBack?: () => void;
+}) {
+  const { theme } = useUnistyles();
+  const ProviderIcon = getProviderIcon(providerId);
+
+  if (!onBack) {
+    return null;
+  }
+
+  return (
+    <Pressable onPress={onBack} style={backButtonStyle}>
+      <ArrowLeft size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
+      <ProviderIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
+      <Text style={styles.backButtonText}>{providerLabel}</Text>
+    </Pressable>
+  );
+}
+
 export function CombinedModelSelector({
   providerDefinitions,
   allProviderModels,
@@ -542,7 +616,6 @@ export function CombinedModelSelector({
   const [isContentReady, setIsContentReady] = useState(platformIsWeb);
   const [view, setView] = useState<SelectorView>({ kind: "all" });
   const [searchQuery, setSearchQuery] = useState("");
-  const [searchResetKey, bumpSearchResetKey] = useReducer((key: number) => key + 1, 0);
 
   // Single-provider mode: only one provider with models → skip Level 1 entirely
   const singleProviderView = useMemo<SelectorView | null>(() => {
@@ -573,7 +646,6 @@ export function CombinedModelSelector({
         onOpen?.();
       } else {
         setSearchQuery("");
-        bumpSearchResetKey();
         onClose?.();
       }
     },
@@ -585,7 +657,6 @@ export function CombinedModelSelector({
       onSelect(provider, modelId);
       setIsOpen(false);
       setSearchQuery("");
-      bumpSearchResetKey();
     },
     [onSelect],
   );
@@ -660,48 +731,32 @@ export function CombinedModelSelector({
   const handleBackToAll = useCallback(() => {
     setView({ kind: "all" });
     setSearchQuery("");
-    bumpSearchResetKey();
   }, []);
 
   const handleDrillDown = useCallback((providerId: string, providerLabel: string) => {
     setView({ kind: "provider", providerId, providerLabel });
   }, []);
 
-  const handleSearchQueryChange = useCallback((value: string) => {
-    setSearchQuery(value);
-  }, []);
-
-  const sheetHeader = useMemo<SheetHeader>(() => {
-    if (view.kind === "all") {
-      return { title: "Select provider" };
-    }
-    const ProviderIconForView = getProviderIcon(view.providerId);
-    return {
-      title: view.providerLabel,
-      leading: ProviderIconForView ? (
-        <ProviderIconForView size={theme.iconSize.md} color={theme.colors.foreground} />
+  const stickyHeader = useMemo(
+    () =>
+      view.kind === "provider" ? (
+        <View style={styles.level2Header}>
+          {!singleProviderView ? (
+            <ProviderBackButton
+              providerId={view.providerId}
+              providerLabel={view.providerLabel}
+              onBack={handleBackToAll}
+            />
+          ) : null}
+          <ProviderSearchInput
+            value={searchQuery}
+            onChangeText={setSearchQuery}
+            autoFocus={platformIsWeb}
+          />
+        </View>
       ) : undefined,
-      back: singleProviderView ? undefined : { onPress: handleBackToAll },
-      search: {
-        value: searchQuery,
-        onChange: handleSearchQueryChange,
-        initialValue: searchQuery,
-        resetKey: `${view.providerId}:${searchResetKey}`,
-        placeholder: "Search models...",
-        autoFocus: platformIsWeb,
-        testID: "model-search-input",
-      },
-    };
-  }, [
-    view,
-    singleProviderView,
-    handleBackToAll,
-    handleSearchQueryChange,
-    searchQuery,
-    searchResetKey,
-    theme.iconSize.md,
-    theme.colors.foreground,
-  ]);
+    [view, singleProviderView, handleBackToAll, searchQuery],
+  );
 
   return (
     <>
@@ -744,8 +799,8 @@ export function CombinedModelSelector({
         desktopPlacement="top-start"
         desktopMinWidth={360}
         desktopFixedHeight={desktopFixedHeight}
-        header={sheetHeader}
-        mobileChildrenScrollEnabled={view.kind !== "provider" || !isNative}
+        title="Select model"
+        stickyHeader={stickyHeader}
       >
         {isContentReady ? (
           <SelectorContent
@@ -755,6 +810,7 @@ export function CombinedModelSelector({
             selectedProvider={selectedProvider}
             selectedModel={selectedModel}
             searchQuery={searchQuery}
+            onSearchChange={setSearchQuery}
             favoriteKeys={favoriteKeys}
             onSelect={handleSelect}
             canSelectProvider={canSelectProvider}
@@ -857,6 +913,27 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.xs,
     color: theme.colors.foregroundMuted,
   },
+  level2Header: {},
+  backButton: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    paddingHorizontal: theme.spacing[3],
+    paddingVertical: theme.spacing[2],
+    borderBottomWidth: 1,
+    borderBottomColor: theme.colors.border,
+    ...(IS_WEB ? {} : { marginHorizontal: theme.spacing[1] }),
+  },
+  backButtonHovered: {
+    backgroundColor: theme.colors.surface2,
+  },
+  backButtonPressed: {
+    backgroundColor: theme.colors.surface2,
+  },
+  backButtonText: {
+    fontSize: theme.fontSize.xs,
+    color: theme.colors.foregroundMuted,
+  },
   emptyState: {
     paddingVertical: theme.spacing[4],
     alignItems: "center",
@@ -866,14 +943,6 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.sm,
     color: theme.colors.foregroundMuted,
   },
-  virtualizedModelList: {
-    flex: 1,
-  },
-  virtualizedModelListContent: {
-    paddingHorizontal: theme.spacing[2],
-    paddingTop: theme.spacing[1],
-    paddingBottom: theme.spacing[8],
-  },
   favoriteButton: {
     width: 24,
     height: 24,
@@ -897,4 +966,17 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.sm,
   },
+  providerSearchContainer: {
+    flexDirection: "row",
+    alignItems: "center",
+    paddingHorizontal: theme.spacing[3],
+    gap: theme.spacing[2],
+    ...(IS_WEB ? {} : { marginHorizontal: theme.spacing[1] }),
+  },
+  providerSearchInput: {
+    flex: 1,
+    paddingVertical: theme.spacing[3],
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+  },
 }));

packages/app/src/components/combined-model-selector.utils.ts

@@ -1,7 +1,6 @@
 import type { AgentModelDefinition } from "@server/server/agent/agent-sdk-types";
 import type { AgentProviderDefinition } from "@server/server/agent/provider-manifest";
 import { buildFavoriteModelKey, type FavoriteModelRow } from "@/hooks/use-form-preferences";
-import { compareMatchScores, scoreTextFields } from "@/utils/score-match";
 
 export type SelectorModelRow = FavoriteModelRow;
 
@@ -45,33 +44,11 @@ export function buildModelRows(
 }
 
 export function matchesSearch(row: SelectorModelRow, normalizedQuery: string): boolean {
-  return scoreModelRow(row, normalizedQuery) !== null;
-}
-
-function getModelRowSearchFields(row: SelectorModelRow): string[] {
-  return [row.modelLabel, row.modelId, row.providerLabel, row.description ?? ""];
-}
-
-export function scoreModelRow(row: SelectorModelRow, normalizedQuery: string) {
-  return scoreTextFields(normalizedQuery, getModelRowSearchFields(row));
-}
-
-export function filterAndRankModelRows(
-  rows: SelectorModelRow[],
-  normalizedQuery: string,
-): SelectorModelRow[] {
-  if (!normalizedQuery) return rows;
-  const scored = rows
-    .map((row) => ({ row, score: scoreModelRow(row, normalizedQuery) }))
-    .filter((entry): entry is { row: SelectorModelRow; score: NonNullable<typeof entry.score> } =>
-      Boolean(entry.score),
-    );
-
-  scored.sort((a, b) => {
-    const cmp = compareMatchScores(a.score, b.score);
-    if (cmp !== 0) return cmp;
-    return a.row.modelLabel.localeCompare(b.row.modelLabel);
-  });
-
-  return scored.map((entry) => entry.row);
+  if (!normalizedQuery) {
+    return true;
+  }
+
+  return [row.modelLabel, row.modelId, row.providerLabel].some((value) =>
+    value.toLowerCase().includes(normalizedQuery),
+  );
 }

packages/app/src/components/composer-actions.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it } from "vitest";
 import type { AgentAttachment, GitHubSearchItem } from "@server/shared/messages";
 import type {
   AttachmentMetadata,
@@ -19,7 +19,6 @@ import {
   removeComposerAttachmentAtIndex,
   sendQueuedComposerMessageNow,
   toggleGithubAttachment,
-  toggleGithubAttachmentFromPicker,
   type AgentStreamWriter,
   type AttachmentPersister,
   type ComposerCancelClient,
@@ -697,36 +696,6 @@ describe("toggleGithubAttachment", () => {
   });
 });
 
-describe("toggleGithubAttachmentFromPicker", () => {
-  it("marks an existing GitHub item as removed when picker toggle removes it", () => {
-    const markGithubAttachmentRemoved = vi.fn();
-    const attachment: UserComposerAttachment = { kind: "github_pr", item: prItem };
-
-    const next = toggleGithubAttachmentFromPicker({
-      current: [attachment],
-      item: prItem,
-      markGithubAttachmentRemoved,
-    });
-
-    expect(next).toEqual([]);
-    expect(markGithubAttachmentRemoved).toHaveBeenCalledTimes(1);
-    expect(markGithubAttachmentRemoved).toHaveBeenCalledWith(attachment);
-  });
-
-  it("does not mark a GitHub item removed when picker toggle adds it", () => {
-    const markGithubAttachmentRemoved = vi.fn();
-
-    const next = toggleGithubAttachmentFromPicker({
-      current: [],
-      item: issueItem,
-      markGithubAttachmentRemoved,
-    });
-
-    expect(next).toEqual([{ kind: "github_issue", item: issueItem }]);
-    expect(markGithubAttachmentRemoved).not.toHaveBeenCalled();
-  });
-});
-
 describe("findGithubItemByOption / isAttachmentSelectedForGithubItem", () => {
   it("locates items via their composite kind:number id", () => {
     expect(findGithubItemByOption([issueItem, prItem], "issue:101")).toBe(issueItem);

packages/app/src/components/composer-actions.ts

@@ -305,29 +305,6 @@ export function toggleGithubAttachment(
   return [...current, buildGithubAttachment(item)];
 }
 
-interface ToggleGithubAttachmentFromPickerInput {
-  current: UserComposerAttachment[];
-  item: GitHubSearchItem;
-  markGithubAttachmentRemoved: (attachment: UserComposerAttachment) => void;
-}
-
-export function toggleGithubAttachmentFromPicker({
-  current,
-  item,
-  markGithubAttachmentRemoved,
-}: ToggleGithubAttachmentFromPickerInput): UserComposerAttachment[] {
-  const existingAttachment = current.find(
-    (attachment) =>
-      attachment.kind !== "image" &&
-      attachment.item.kind === item.kind &&
-      attachment.item.number === item.number,
-  );
-  if (existingAttachment) {
-    markGithubAttachmentRemoved(existingAttachment);
-  }
-  return toggleGithubAttachment(current, item);
-}
-
 export function findGithubItemByOption(
   items: readonly GitHubSearchItem[],
   optionId: string,

packages/app/src/components/composer-height-mirror.web.ts

@@ -98,19 +98,13 @@ export function useComposerHeightMirror({
 
   useLayoutEffect(() => {
     measure();
-  }, [maxHeight, minHeight, value, measure]);
+  }, [value, measure]);
 
   useEffect(() => {
     const source = textareaRef.current;
     if (!source || !(source instanceof HTMLElement)) return;
     if (typeof ResizeObserver === "undefined") return;
-    let previousWidth = source.clientWidth;
-    const observer = new ResizeObserver(() => {
-      const nextWidth = source.clientWidth;
-      if (Math.abs(nextWidth - previousWidth) < 1) return;
-      previousWidth = nextWidth;
-      measure();
-    });
+    const observer = new ResizeObserver(() => measure());
     observer.observe(source);
     return () => observer.disconnect();
   }, [textareaRef, measure]);

packages/app/src/components/composer.tsx

@@ -21,6 +21,7 @@ import {
   Paperclip,
 } from "lucide-react-native";
 import Animated from "react-native-reanimated";
+import { useQuery } from "@tanstack/react-query";
 import { FOOTER_HEIGHT, MAX_CONTENT_WIDTH } from "@/constants/layout";
 import {
   AgentStatusBar,
@@ -52,7 +53,7 @@ import {
   queueComposerMessage,
   removeComposerAttachmentAtIndex,
   sendQueuedComposerMessageNow,
-  toggleGithubAttachmentFromPicker,
+  toggleGithubAttachment,
   type AgentStreamWriter,
   type QueueWriter,
   type QueuedComposerMessage,
@@ -96,10 +97,6 @@ import { AttachmentPill } from "@/components/attachment-pill";
 import { AttachmentLightbox } from "@/components/attachment-lightbox";
 import { openExternalUrl } from "@/utils/open-external-url";
 import { useIsDictationReady } from "@/hooks/use-is-dictation-ready";
-import { useGithubSearchQuery } from "@/git/use-github-search-query";
-import { useCheckoutStatusQuery } from "@/git/use-status-query";
-import { useComposerGithubAutoAttach } from "./use-composer-github-auto-attach";
-import { resolveClientSlashCommand, type ClientSlashCommand } from "@/client-slash-commands";
 
 type QueuedMessage = QueuedComposerMessage;
 
@@ -140,20 +137,6 @@ function resolveMessagePlaceholder(isDesktopWebBreakpoint: boolean): string {
   return isDesktopWebBreakpoint ? DESKTOP_MESSAGE_PLACEHOLDER : MOBILE_MESSAGE_PLACEHOLDER;
 }
 
-function resolveGithubSearchEnabled(
-  isGithubPickerOpen: boolean,
-  isConnected: boolean,
-  cwd: string,
-): boolean {
-  return isGithubPickerOpen && isConnected && cwd.trim().length > 0;
-}
-
-function resolveCheckoutRemoteUrl(
-  checkoutStatus: ReturnType<typeof useCheckoutStatusQuery>["status"],
-): string | null {
-  return checkoutStatus?.remoteUrl ?? null;
-}
-
 function buildCancelButtonStyle(isConnected: boolean, isCancellingAgent: boolean): object[] {
   const disabled = !isConnected || isCancellingAgent ? styles.buttonDisabled : undefined;
   return [styles.cancelButton, disabled].filter((value): value is object => Boolean(value));
@@ -181,6 +164,31 @@ function buildAgentStateSelector(serverId: string, agentId: string) {
   };
 }
 
+interface BuildGithubSearchQueryOptionsArgs {
+  serverId: string;
+  cwd: string;
+  githubSearchQueryTrimmed: string;
+  isGithubPickerOpen: boolean;
+  isConnected: boolean;
+  client: ReturnType<typeof useHostRuntimeClient>;
+}
+
+function buildGithubSearchQueryOptions(args: BuildGithubSearchQueryOptionsArgs) {
+  const { serverId, cwd, githubSearchQueryTrimmed, isGithubPickerOpen, isConnected, client } = args;
+  const hasClient = Boolean(client);
+  const cwdIsSet = cwd.trim().length > 0;
+  const enabled = isGithubPickerOpen && isConnected && hasClient && cwdIsSet;
+  return {
+    queryKey: ["composer-github-search", serverId, cwd, githubSearchQueryTrimmed],
+    queryFn: async () => {
+      if (!client) throw new Error("Host is not connected");
+      return client.searchGitHub({ cwd, query: githubSearchQueryTrimmed, limit: 20 });
+    },
+    enabled,
+    staleTime: 30_000,
+  };
+}
+
 function renderContextWindowMeterSlot(
   contextWindowMaxTokens: number | null,
   contextWindowUsedTokens: number | null,
@@ -608,7 +616,6 @@ interface ComposerProps {
   serverId: string;
   isPaneFocused: boolean;
   onSubmitMessage?: (payload: MessagePayload) => Promise<void>;
-  onClientSlashCommand?: (command: ClientSlashCommand) => Promise<void>;
   /** When true, the submit button is enabled even without text or images (e.g. external attachment selected). */
   hasExternalContent?: boolean;
   /** When true, the composer can submit even with no text or attachments. */
@@ -741,7 +748,6 @@ interface ComposerRightControlsSlotProps extends ComposerVoiceModeButtonProps {
   isAgentRunning: boolean;
   hasSendableContent: boolean;
   isProcessing: boolean;
-  isCompact: boolean;
   cancelButton: ReactElement;
 }
 
@@ -751,12 +757,10 @@ function ComposerRightControlsSlot({
   isAgentRunning,
   hasSendableContent,
   isProcessing,
-  isCompact,
   cancelButton,
   ...voiceProps
 }: ComposerRightControlsSlotProps) {
-  const hideVoiceForCompactInput = isCompact && hasSendableContent;
-  const showVoiceModeButton = !isVoiceModeForAgent && hasAgent && !hideVoiceForCompactInput;
+  const showVoiceModeButton = !isVoiceModeForAgent && hasAgent;
   const shouldShowCancelButton = isAgentRunning && !hasSendableContent && !isProcessing;
   if (!showVoiceModeButton && !shouldShowCancelButton) return null;
   return (
@@ -812,7 +816,6 @@ export function Composer({
   serverId,
   isPaneFocused,
   onSubmitMessage,
-  onClientSlashCommand,
   hasExternalContent = false,
   allowEmptySubmit = false,
   submitButtonAccessibilityLabel,
@@ -887,17 +890,6 @@ export function Composer({
     onOpenWorkspaceAttachment,
   });
   const setSelectedAttachments = onChangeAttachments;
-  const checkoutStatusQuery = useCheckoutStatusQuery({ serverId, cwd });
-  const githubAutoAttach = useComposerGithubAutoAttach({
-    text: userInput,
-    remoteUrl: resolveCheckoutRemoteUrl(checkoutStatusQuery.status),
-    attachments,
-    client,
-    isConnected,
-    serverId,
-    cwd,
-    setAttachments: setSelectedAttachments,
-  });
   const [cursorIndex, setCursorIndex] = useState(0);
   const [isProcessing, setIsProcessing] = useState(false);
   const [isCancellingAgent, setIsCancellingAgent] = useState(false);
@@ -913,41 +905,6 @@ export function Composer({
     `message-input:${serverId}:${agentId}:${Math.random().toString(36).slice(2)}`,
   );
 
-  const runClientSlashCommand = useCallback(
-    (command: ClientSlashCommand): boolean => {
-      if (command.execution !== "immediate" || !onClientSlashCommand) {
-        return false;
-      }
-
-      if (blurOnSubmit) {
-        messageInputRef.current?.blur();
-      }
-      clearDraft("sent");
-      setUserInput("");
-      setSelectedAttachments([]);
-      resetSuppression();
-      setSendError(null);
-      setIsProcessing(true);
-      void onClientSlashCommand(command)
-        .catch((error) => {
-          console.error("[Composer] Failed to run client slash command:", error);
-          setSendError(error instanceof Error ? error.message : String(error));
-        })
-        .finally(() => {
-          setIsProcessing(false);
-        });
-      return true;
-    },
-    [
-      blurOnSubmit,
-      clearDraft,
-      onClientSlashCommand,
-      resetSuppression,
-      setSelectedAttachments,
-      setUserInput,
-    ],
-  );
-
   const autocomplete = useAgentAutocomplete({
     userInput,
     cursorIndex,
@@ -955,8 +912,6 @@ export function Composer({
     serverId,
     agentId,
     draftConfig: commandDraftConfig,
-    canExecuteClientSlashCommand: buildOutgoingAttachments(attachments).length === 0,
-    onClientSlashCommand: runClientSlashCommand,
     onAutocompleteApplied: () => {
       messageInputRef.current?.focus();
     },
@@ -1152,27 +1107,16 @@ export function Composer({
 
   const handleSubmit = useCallback(
     (payload: MessagePayload) => {
-      const outgoingAttachments = buildOutgoingAttachments(attachments);
-      const clientSlashCommand = resolveClientSlashCommand({
-        text: payload.text,
-        hasAttachments: outgoingAttachments.length > 0,
-      });
-      if (clientSlashCommand && runClientSlashCommand(clientSlashCommand)) {
-        return;
-      }
-
       if (blurOnSubmit) {
         messageInputRef.current?.blur();
       }
-      void sendMessageWithContent(payload.text, outgoingAttachments, payload.forceSend);
+      void sendMessageWithContent(
+        payload.text,
+        buildOutgoingAttachments(attachments),
+        payload.forceSend,
+      );
     },
-    [
-      attachments,
-      blurOnSubmit,
-      buildOutgoingAttachments,
-      runClientSlashCommand,
-      sendMessageWithContent,
-    ],
+    [attachments, blurOnSubmit, buildOutgoingAttachments, sendMessageWithContent],
   );
 
   const handlePickImage = useCallback(async () => {
@@ -1191,7 +1135,6 @@ export function Composer({
 
   const handleRemoveAttachment = useCallback(
     (index: number) => {
-      githubAutoAttach.markGithubAttachmentRemoved(selectedAttachments[index]);
       const didRemoveWorkspaceAttachment = removeAttachment({
         selectedAttachments,
         index,
@@ -1203,7 +1146,7 @@ export function Composer({
         removeComposerAttachmentAtIndex({ attachments: prev, index, deleteAttachments }),
       );
     },
-    [githubAutoAttach, removeAttachment, selectedAttachments, setSelectedAttachments],
+    [removeAttachment, selectedAttachments, setSelectedAttachments],
   );
 
   const handleOpenAttachment = useCallback(
@@ -1334,25 +1277,18 @@ export function Composer({
 
   const handleQueue = useCallback(
     (payload: MessagePayload) => {
-      const outgoingAttachments = buildOutgoingAttachments(attachments);
-      const clientSlashCommand = resolveClientSlashCommand({
-        text: payload.text,
-        hasAttachments: outgoingAttachments.length > 0,
-      });
-      if (clientSlashCommand && runClientSlashCommand(clientSlashCommand)) {
-        return;
-      }
-      queueMessage(payload.text, outgoingAttachments);
+      queueMessage(payload.text, buildOutgoingAttachments(attachments));
     },
-    [attachments, buildOutgoingAttachments, queueMessage, runClientSlashCommand],
+    [attachments, buildOutgoingAttachments, queueMessage],
   );
 
   const hasSendableContent = userInput.trim().length > 0 || selectedAttachments.length > 0;
 
   // Handle keyboard navigation for command autocomplete.
   const handleCommandKeyPress = useCallback(
-    (event: { key: string; preventDefault: () => void }) =>
-      autocompleteOnKeyPressRef.current(event),
+    (event: { key: string; preventDefault: () => void }) => {
+      return autocompleteOnKeyPressRef.current(event);
+    },
     [],
   );
 
@@ -1404,7 +1340,6 @@ export function Composer({
         isAgentRunning={isAgentRunning}
         hasSendableContent={hasSendableContent}
         isProcessing={isProcessing}
-        isCompact={isMobile}
         buttonIconSize={buttonIconSize}
         handleToggleRealtimeVoice={handleToggleRealtimeVoice}
         isConnected={isConnected}
@@ -1422,7 +1357,6 @@ export function Composer({
       hasSendableContent,
       isAgentRunning,
       isConnected,
-      isMobile,
       isProcessing,
       isVoiceModeForAgent,
       isVoiceSwitching,
@@ -1442,13 +1376,16 @@ export function Composer({
   );
 
   const githubSearchQueryTrimmed = githubSearchQuery.trim();
-  const githubSearchResultsQuery = useGithubSearchQuery({
-    client,
-    serverId,
-    cwd,
-    query: githubSearchQueryTrimmed,
-    enabled: resolveGithubSearchEnabled(isGithubPickerOpen, isConnected, cwd),
-  });
+  const githubSearchResultsQuery = useQuery(
+    buildGithubSearchQueryOptions({
+      serverId,
+      cwd,
+      githubSearchQueryTrimmed,
+      isGithubPickerOpen,
+      isConnected,
+      client,
+    }),
+  );
 
   const githubSearchItemsRaw = githubSearchResultsQuery.data?.items;
   const githubSearchItems = useMemo(() => githubSearchItemsRaw ?? [], [githubSearchItemsRaw]);
@@ -1486,22 +1423,11 @@ export function Composer({
 
   const handleToggleGithubItem = useCallback(
     (item: GitHubSearchItem) => {
-      const nextAttachments = toggleGithubAttachmentFromPicker({
-        current: attachments,
-        item,
-        markGithubAttachmentRemoved: githubAutoAttach.markGithubAttachmentRemoved,
-      });
-      setSelectedAttachments(nextAttachments);
+      setSelectedAttachments((current) => toggleGithubAttachment(current, item));
       setIsGithubPickerOpen(false);
       setGithubSearchQuery("");
     },
-    [
-      attachments,
-      githubAutoAttach,
-      setSelectedAttachments,
-      setGithubSearchQuery,
-      setIsGithubPickerOpen,
-    ],
+    [setSelectedAttachments, setGithubSearchQuery, setIsGithubPickerOpen],
   );
 
   const leftContent = useMemo(
@@ -1615,6 +1541,7 @@ export function Composer({
 
           <View style={styles.messageInputContainer}>
             {autocompletePopover}
+            {attachmentPreviewList}
 
             {/* MessageInput handles everything: text, dictation, attachments, all buttons */}
             <StableMessageInput
@@ -1654,7 +1581,6 @@ export function Composer({
               onFocusChange={handleFocusChange}
               onHeightChange={onComposerHeightChange}
               inputWrapperStyle={inputWrapperStyle}
-              attachmentSlot={attachmentPreviewList}
             />
             <Combobox
               options={githubSearchOptions}
@@ -1695,8 +1621,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
     alignItems: "center",
     width: "100%",
     overflow: "visible",
-    paddingHorizontal: theme.spacing[4],
-    paddingBottom: theme.spacing[4],
+    padding: theme.spacing[4],
   },
   inputAreaLocked: {
     opacity: 0.6,
@@ -1759,16 +1684,16 @@ const styles = StyleSheet.create((theme: Theme) => ({
     flexWrap: "wrap",
   },
   imageThumbnail: {
-    width: 32,
-    height: 32,
+    width: 48,
+    height: 48,
   },
   imageThumbnailPlaceholder: {
-    width: 32,
-    height: 32,
+    width: 48,
+    height: 48,
     backgroundColor: theme.colors.surface2,
   },
   githubPillBody: {
-    minHeight: 32,
+    minHeight: 48,
     maxWidth: 260,
     flexDirection: "row",
     alignItems: "center",

packages/app/src/components/draggable-list.web.test.tsx

@@ -13,9 +13,6 @@ interface DndContextProps {
 }
 
 let latestDndContextProps: DndContextProps | null = null;
-const dndKitMocks = vi.hoisted(() => ({
-  useSensor: vi.fn(() => ({})),
-}));
 
 vi.mock("@dnd-kit/core", () => ({
   DndContext: ({ children, ...props }: React.PropsWithChildren<DndContextProps>) => {
@@ -25,7 +22,7 @@ vi.mock("@dnd-kit/core", () => ({
   closestCenter: vi.fn(),
   KeyboardSensor: vi.fn(),
   PointerSensor: vi.fn(),
-  useSensor: dndKitMocks.useSensor,
+  useSensor: vi.fn(() => ({})),
   useSensors: vi.fn(() => []),
 }));
 
@@ -107,7 +104,7 @@ function renderItem({ item, isActive }: { item: string; isActive: boolean }) {
   );
 }
 
-function renderList({ useDragHandle = false }: { useDragHandle?: boolean } = {}): void {
+function renderList(): void {
   act(() => {
     root?.render(
       <DraggableList
@@ -116,7 +113,6 @@ function renderList({ useDragHandle = false }: { useDragHandle?: boolean } = {})
         onDragEnd={vi.fn()}
         renderItem={renderItem}
         scrollEnabled={false}
-        useDragHandle={useDragHandle}
       />,
     );
   });
@@ -129,28 +125,6 @@ function getItemActiveState(item: string): string | null {
 }
 
 describe("DraggableList web", () => {
-  it("uses distance activation for default draggable rows", () => {
-    renderList();
-
-    expect(dndKitMocks.useSensor).toHaveBeenCalledWith(
-      expect.any(Function),
-      expect.objectContaining({
-        activationConstraint: { distance: 6 },
-      }),
-    );
-  });
-
-  it("requires a held pointer before activating handle-based drags", () => {
-    renderList({ useDragHandle: true });
-
-    expect(dndKitMocks.useSensor).toHaveBeenCalledWith(
-      expect.any(Function),
-      expect.objectContaining({
-        activationConstraint: { delay: 250, tolerance: 8 },
-      }),
-    );
-  });
-
   it("clears active drag state when a drag is cancelled", () => {
     renderList();
 

packages/app/src/components/draggable-list.web.tsx

@@ -30,8 +30,6 @@ const restrictToVerticalAxis: Modifier = ({ transform }) => ({
 });
 
 const DND_MODIFIERS = [restrictToVerticalAxis];
-const DEFAULT_POINTER_ACTIVATION_CONSTRAINT = { distance: 6 };
-const HANDLE_POINTER_ACTIVATION_CONSTRAINT = { delay: 250, tolerance: 8 };
 
 interface SortableItemProps<T> {
   id: string;
@@ -145,13 +143,12 @@ export function DraggableList<T>({
   const scrollbar = useWebScrollViewScrollbar(scrollViewRef, {
     enabled: showCustomScrollbar,
   });
-  const pointerActivationConstraint = useDragHandle
-    ? HANDLE_POINTER_ACTIVATION_CONSTRAINT
-    : DEFAULT_POINTER_ACTIVATION_CONSTRAINT;
 
   const sensors = useSensors(
     useSensor(PointerSensor, {
-      activationConstraint: pointerActivationConstraint,
+      activationConstraint: {
+        distance: 6,
+      },
     }),
     useSensor(KeyboardSensor, {
       coordinateGetter: sortableKeyboardCoordinates,