refactor(app): extract daemon management toggle coordinator with unit tests

Fills the coverage gap left by deleting desktop-updates-section.test.tsx. Extracts executeDaemonManagementToggle from useDaemonManagementToggle — pure async coordinator with injected deps (no vi.mock). Unit tests verify the three key invariants: settings persist before stop, stop is skipped when not desktop-managed, and start/stop are invoked on enable/disable.
test(app): triage desktop test files — delete 16-mock component slop, tighten attachment store assertion
2026-10-23 17:52:49 +00:00 · 2026-05-04 22:33:07 +07:00 · 2026-05-04 22:27:31 +07:00 · 2026-05-04 23:23:36 +08:00 · 2026-05-04 23:22:59 +08:00 · 2026-05-04 23:13:09 +08:00
746 changed files with 47214 additions and 18609 deletions
@@ -15,7 +15,7 @@ jobs:

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

      - name: Install dependencies
@@ -31,7 +31,7 @@ jobs:

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

      - name: Install dependencies
@@ -47,7 +47,7 @@ jobs:

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

      - name: Install dependencies
@@ -74,7 +74,7 @@ jobs:

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

      - name: Fetch origin/main (worktree tests)
@@ -104,7 +104,7 @@ jobs:

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

      - name: Install dependencies
@@ -122,9 +122,12 @@ jobs:
          npx vitest run
          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/process-tree.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
@@ -135,6 +138,35 @@ jobs:
          src/server/persisted-config.test.ts
          src/server/bootstrap-provider-availability.test.ts

+  desktop-tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - 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: Build server dependency
+        run: npm run build --workspace=@getpaseo/server
+
+      - name: Run desktop tests
+        run: npm run test --workspace=@getpaseo/desktop
+
  app-tests:
    runs-on: ubuntu-latest
    steps:
@@ -142,7 +174,7 @@ jobs:

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

      - name: Install dependencies
@@ -164,7 +196,7 @@ jobs:

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

      - name: Install dependencies
@@ -207,7 +239,7 @@ jobs:

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

      - name: Install dependencies
@@ -220,13 +252,18 @@ jobs:
        run: npm run test --workspace=@getpaseo/relay

  cli-tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [1, 2, 3]
    runs-on: ubuntu-latest
+    name: cli-tests (shard ${{ matrix.shard }}/3)
    steps:
      - uses: actions/checkout@v4

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

      - name: Install dependencies
@@ -244,3 +281,5 @@ jobs:
          PASEO_LOCAL_SPEECH_AUTO_DOWNLOAD: "0"
          PASEO_DICTATION_ENABLED: "0"
          PASEO_VOICE_MODE_ENABLED: "0"
+          PASEO_CLI_TEST_SHARD: ${{ matrix.shard }}
+          PASEO_CLI_TEST_SHARD_TOTAL: "3"
@@ -24,7 +24,7 @@ jobs:
          scope: "@boudra"

      - name: Install dependencies
-        run: npm install --workspace=@getpaseo/app --include-workspace-root
+        run: npm ci
        env:
          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -24,6 +24,24 @@ on:
          - macos
          - linux
          - windows
+      checkout_ref:
+        description: "Optional branch/ref to checkout while using tag for release metadata."
+        required: false
+        default: ""
+        type: string
+      publish:
+        description: "Publish built artifacts to GitHub Releases."
+        required: false
+        default: "true"
+        type: choice
+        options:
+          - "true"
+          - "false"
+      rollout_hours:
+        description: "Linear rollout duration in hours. Use 0 for instant rollout."
+        required: false
+        default: "24"
+        type: string

 concurrency:
  group: desktop-release-${{ github.ref }}
@@ -31,12 +49,14 @@ concurrency:

 env:
  SOURCE_TAG: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref_name }}
-  DESKTOP_WORKSPACE: "@getpaseo/desktop"
+  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 || '24' }}
  DESKTOP_PACKAGE_PATH: "packages/desktop"

 jobs:
  create-release:
-    if: ${{ (github.event_name == 'push' && !startsWith(github.ref_name, 'desktop-macos-v') && !startsWith(github.ref_name, 'desktop-linux-v') && !startsWith(github.ref_name, 'desktop-windows-v')) || (github.event_name == 'workflow_dispatch' && github.event.inputs.platform == 'all') }}
+    if: ${{ (github.event_name == 'push' && !startsWith(github.ref_name, 'desktop-macos-v') && !startsWith(github.ref_name, 'desktop-linux-v') && !startsWith(github.ref_name, 'desktop-windows-v')) || (github.event_name == 'workflow_dispatch' && github.event.inputs.platform == 'all' && github.event.inputs.publish != 'false') }}
    permissions:
      contents: write
    runs-on: ubuntu-latest
@@ -44,7 +64,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          sparse-checkout: scripts
-          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref }}
+          ref: ${{ env.CHECKOUT_REF }}

      - name: Resolve release metadata
        shell: bash
@@ -91,7 +111,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
-          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref }}
+          ref: ${{ env.CHECKOUT_REF }}

      - name: Resolve release metadata
        shell: bash
@@ -127,9 +147,6 @@ jobs:
          fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`);
          NODE

-      - name: Build web app for desktop
-        run: npm run build:web --workspace=@getpaseo/app
-
      - name: Build desktop release
        shell: bash
        env:
@@ -140,123 +157,40 @@ jobs:
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          PASEO_DESKTOP_SMOKE: "1"
        run: |
          set -euo pipefail
-          publish_mode="never"
-          publish_args=()
-          if [[ "$IS_SMOKE_TAG" != "true" ]]; then
-            publish_mode="always"
-            publish_args+=("-c.publish.releaseType=$RELEASE_TYPE")
-            publish_args+=("-c.publish.channel=$RELEASE_CHANNEL")
-          fi
+          build_args=(-- --publish never --mac --${{ matrix.electron_arch }})
+          build_args+=("-c.publish.releaseType=$RELEASE_TYPE")
+          build_args+=("-c.publish.channel=$RELEASE_CHANNEL")
+          npm run build:desktop "${build_args[@]}"

-          npm run build --workspace="$DESKTOP_WORKSPACE" -- --publish "$publish_mode" --mac --${{ matrix.electron_arch }} "${publish_args[@]}"
+      - name: Upload desktop artifacts to release
+        if: env.SHOULD_PUBLISH == 'true' && env.IS_SMOKE_TAG != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          release_dir="${DESKTOP_PACKAGE_PATH}/release"
+          files=()
+          while IFS= read -r -d '' f; do
+            files+=("$f")
+          done < <(find "$release_dir" -maxdepth 1 -type f ! -name '*.yml' -print0 | sort -z)
+          if (( ${#files[@]} == 0 )); then
+            echo "::error::No release artifacts found in $release_dir"
+            exit 1
+          fi
+          gh release upload "$RELEASE_TAG" "${files[@]}" --clobber --repo "${{ github.repository }}"

      - name: Upload manifest artifact
-        if: env.IS_SMOKE_TAG != 'true'
+        if: env.SHOULD_PUBLISH == 'true' && env.IS_SMOKE_TAG != 'true'
        uses: actions/upload-artifact@v4
        with:
          name: mac-manifest-${{ matrix.electron_arch }}
          path: ${{ env.DESKTOP_PACKAGE_PATH }}/release/${{ env.RELEASE_CHANNEL }}-mac.yml
          retention-days: 1

-  finalize-mac-manifest:
-    needs: [publish-macos]
-    if: ${{ needs.publish-macos.result == 'success' }}
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          sparse-checkout: scripts
-          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref }}
-
-      - name: Resolve release tag
-        shell: bash
-        run: node scripts/emit-release-env.mjs --source-tag "$SOURCE_TAG" >> "$GITHUB_ENV"
-
-      - name: Download manifest artifacts
-        if: env.IS_SMOKE_TAG != 'true'
-        uses: actions/download-artifact@v4
-        with:
-          pattern: mac-manifest-*
-
-      - name: Merge manifests
-        if: env.IS_SMOKE_TAG != 'true'
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          node <<'NODE'
-          const fs = require('node:fs');
-
-          // Simple YAML parser for electron-builder's latest-mac.yml format
-          function parseManifest(text) {
-            const lines = text.split('\n');
-            const result = { files: [] };
-            let currentFile = null;
-
-            for (const line of lines) {
-              if (line.startsWith('version:')) result.version = line.split(': ')[1].trim();
-              else if (line.startsWith('path:')) result.path = line.split(': ')[1].trim();
-              else if (line.startsWith('sha512:') && !currentFile) result.sha512 = line.split(': ')[1].trim();
-              else if (line.startsWith('releaseDate:')) result.releaseDate = line.split(': ')[1].trim().replace(/'/g, '');
-              else if (line.trim().startsWith('- url:')) {
-                currentFile = { url: line.trim().replace('- url: ', '') };
-                result.files.push(currentFile);
-              } else if (line.trim().startsWith('sha512:') && currentFile) {
-                currentFile.sha512 = line.trim().split(': ')[1].trim();
-              } else if (line.trim().startsWith('size:') && currentFile) {
-                currentFile.size = parseInt(line.trim().split(': ')[1].trim(), 10);
-                currentFile = null;
-              }
-            }
-            return result;
-          }
-
-          function toYaml(manifest) {
-            let out = `version: ${manifest.version}\n`;
-            out += `files:\n`;
-            for (const f of manifest.files) {
-              out += `  - url: ${f.url}\n`;
-              out += `    sha512: ${f.sha512}\n`;
-              out += `    size: ${f.size}\n`;
-            }
-            out += `path: ${manifest.path}\n`;
-            out += `sha512: ${manifest.sha512}\n`;
-            out += `releaseDate: '${manifest.releaseDate}'\n`;
-            return out;
-          }
-
-          const manifestName = `${process.env.RELEASE_CHANNEL}-mac.yml`;
-          const arm64Text = fs.readFileSync(`mac-manifest-arm64/${manifestName}`, 'utf8');
-          const x64Text = fs.readFileSync(`mac-manifest-x64/${manifestName}`, 'utf8');
-
-          const arm64 = parseManifest(arm64Text);
-          const x64 = parseManifest(x64Text);
-
-          // Merge: all files from both, default path points to arm64 zip
-          const merged = {
-            version: arm64.version,
-            files: [...arm64.files, ...x64.files],
-            path: arm64.path,
-            sha512: arm64.sha512,
-            releaseDate: arm64.releaseDate || x64.releaseDate,
-          };
-
-          const output = toYaml(merged);
-          fs.writeFileSync(manifestName, output);
-          console.log('Merged manifest:\n' + output);
-          NODE
-
-      - name: Upload merged manifest to release
-        if: env.IS_SMOKE_TAG != 'true'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh release upload "$RELEASE_TAG" "$RELEASE_CHANNEL-mac.yml" --clobber --repo "${{ github.repository }}"
-
  publish-linux:
    needs: [create-release]
    if: ${{ always() && (needs.create-release.result == 'success' || needs.create-release.result == 'skipped') && ((github.event_name == 'workflow_dispatch' && (github.event.inputs.platform == 'all' || github.event.inputs.platform == 'linux')) || (github.event_name == 'push' && (startsWith(github.ref_name, 'v') || startsWith(github.ref_name, 'desktop-v') || startsWith(github.ref_name, 'desktop-linux-v')))) }}
@@ -269,7 +203,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
-          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref }}
+          ref: ${{ env.CHECKOUT_REF }}

      - name: Resolve release metadata
        shell: bash
@@ -305,25 +239,47 @@ jobs:
          fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`);
          NODE

-      - name: Build web app for desktop
-        run: npm run build:web --workspace=@getpaseo/app
+      - name: Install Linux smoke display
+        run: sudo apt-get update && sudo apt-get install -y xvfb

      - name: Build desktop release
        shell: bash
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          EP_GH_IGNORE_TIME: true
+          PASEO_DESKTOP_SMOKE: "1"
        run: |
          set -euo pipefail
-          publish_mode="never"
-          publish_args=()
-          if [[ "$IS_SMOKE_TAG" != "true" ]]; then
-            publish_mode="always"
-            publish_args+=("-c.publish.releaseType=$RELEASE_TYPE")
-            publish_args+=("-c.publish.channel=$RELEASE_CHANNEL")
-          fi
+          build_args=(-- --publish never --linux --x64)
+          build_args+=("-c.publish.releaseType=$RELEASE_TYPE")
+          build_args+=("-c.publish.channel=$RELEASE_CHANNEL")
+          npm run build:desktop "${build_args[@]}"

-          npm run build --workspace="$DESKTOP_WORKSPACE" -- --publish "$publish_mode" --linux --x64 "${publish_args[@]}"
+      - name: Upload desktop artifacts to release
+        if: env.SHOULD_PUBLISH == 'true' && env.IS_SMOKE_TAG != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          release_dir="${DESKTOP_PACKAGE_PATH}/release"
+          files=()
+          while IFS= read -r -d '' f; do
+            files+=("$f")
+          done < <(find "$release_dir" -maxdepth 1 -type f ! -name '*.yml' -print0 | sort -z)
+          if (( ${#files[@]} == 0 )); then
+            echo "::error::No release artifacts found in $release_dir"
+            exit 1
+          fi
+          gh release upload "$RELEASE_TAG" "${files[@]}" --clobber --repo "${{ github.repository }}"
+
+      - name: Upload manifest artifact
+        if: env.SHOULD_PUBLISH == 'true' && env.IS_SMOKE_TAG != 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-manifest
+          path: ${{ env.DESKTOP_PACKAGE_PATH }}/release/${{ env.RELEASE_CHANNEL }}-linux.yml
+          retention-days: 1

  publish-windows:
    needs: [create-release]
@@ -337,7 +293,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
-          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref }}
+          ref: ${{ env.CHECKOUT_REF }}

      - name: Resolve release metadata
        shell: bash
@@ -373,30 +329,157 @@ jobs:
          fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`);
          NODE

-      - name: Build workspace dependencies
-        run: npm run build:workspace-deps --workspace=@getpaseo/app
-
-      - name: Build web app for desktop
-        shell: pwsh
-        run: |
-          $patchPath = (Get-Item "$env:GITHUB_WORKSPACE/scripts/metro-config-windows-loader-patch.cjs").FullName
-          $env:NODE_OPTIONS = "--require=$patchPath"
-          npx expo export --platform web
-        working-directory: packages/app
-
      - name: Build desktop release
        shell: bash
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          EP_GH_IGNORE_TIME: true
+          PASEO_DESKTOP_SMOKE: "1"
        run: |
          set -euo pipefail
-          publish_mode="never"
-          publish_args=()
-          if [[ "$IS_SMOKE_TAG" != "true" ]]; then
-            publish_mode="always"
-            publish_args+=("-c.publish.releaseType=$RELEASE_TYPE")
-            publish_args+=("-c.publish.channel=$RELEASE_CHANNEL")
+          build_args=(-- --publish never --win --x64 --arm64)
+          build_args+=("-c.publish.releaseType=$RELEASE_TYPE")
+          build_args+=("-c.publish.channel=$RELEASE_CHANNEL")
+          npm run build:desktop "${build_args[@]}"
+
+      - name: Upload desktop artifacts to release
+        if: env.SHOULD_PUBLISH == 'true' && env.IS_SMOKE_TAG != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          release_dir="${DESKTOP_PACKAGE_PATH}/release"
+          files=()
+          while IFS= read -r -d '' f; do
+            files+=("$f")
+          done < <(find "$release_dir" -maxdepth 1 -type f ! -name '*.yml' -print0 | sort -z)
+          if (( ${#files[@]} == 0 )); then
+            echo "::error::No release artifacts found in $release_dir"
+            exit 1
+          fi
+          gh release upload "$RELEASE_TAG" "${files[@]}" --clobber --repo "${{ github.repository }}"
+
+      - name: Upload manifest artifact
+        if: env.SHOULD_PUBLISH == 'true' && env.IS_SMOKE_TAG != 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-manifest
+          path: ${{ env.DESKTOP_PACKAGE_PATH }}/release/${{ env.RELEASE_CHANNEL }}.yml
+          retention-days: 1
+
+  finalize-rollout:
+    needs: [publish-macos, publish-linux, publish-windows]
+    if: ${{ always() && (needs.publish-macos.result == 'success' || needs.publish-macos.result == 'skipped') && (needs.publish-linux.result == 'success' || needs.publish-linux.result == 'skipped') && (needs.publish-windows.result == 'success' || needs.publish-windows.result == 'skipped') && (github.event_name != 'workflow_dispatch' || github.event.inputs.publish != 'false') }}
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    concurrency:
+      group: desktop-rollout-${{ github.event.inputs.tag || github.ref_name }}
+      cancel-in-progress: false
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            package.json
+            package-lock.json
+            scripts
+          ref: ${{ env.CHECKOUT_REF }}
+
+      - name: Resolve release tag
+        shell: bash
+        run: node scripts/emit-release-env.mjs --source-tag "$SOURCE_TAG" >> "$GITHUB_ENV"
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: "npm"
+          cache-dependency-path: package-lock.json
+          registry-url: "https://npm.pkg.github.com"
+          scope: "@boudra"
+
+      - name: Install JS dependencies
+        run: npm ci
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Download mac manifest artifacts
+        if: env.IS_SMOKE_TAG != 'true' && needs.publish-macos.result == 'success'
+        uses: actions/download-artifact@v4
+        with:
+          pattern: mac-manifest-*
+          path: release-manifests
+
+      - name: Download Linux manifest artifact
+        if: env.IS_SMOKE_TAG != 'true' && needs.publish-linux.result == 'success'
+        uses: actions/download-artifact@v4
+        with:
+          name: linux-manifest
+          path: release-manifests/linux-manifest
+
+      - name: Download Windows manifest artifact
+        if: env.IS_SMOKE_TAG != 'true' && needs.publish-windows.result == 'success'
+        uses: actions/download-artifact@v4
+        with:
+          name: windows-manifest
+          path: release-manifests/windows-manifest
+
+      - name: Assemble and upload stamped manifests
+        if: env.IS_SMOKE_TAG != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          cd release-manifests
+          manifests_dir="$PWD/final"
+          mkdir -p "$manifests_dir"
+
+          if [[ "${{ needs.publish-macos.result }}" == "success" ]]; then
+            manifest_name="${RELEASE_CHANNEL}-mac.yml"
+            node ../scripts/merge-mac-manifest.mjs \
+              "mac-manifest-arm64/${manifest_name}" \
+              "mac-manifest-x64/${manifest_name}" \
+              "$manifests_dir/${manifest_name}"
          fi

-          npm run build --workspace="$DESKTOP_WORKSPACE" -- --publish "$publish_mode" --win --x64 "${publish_args[@]}"
+          if [[ "${{ needs.publish-linux.result }}" == "success" ]]; then
+            cp "linux-manifest/${RELEASE_CHANNEL}-linux.yml" "$manifests_dir/"
+          fi
+
+          if [[ "${{ needs.publish-windows.result }}" == "success" ]]; then
+            cp "windows-manifest/${RELEASE_CHANNEL}.yml" "$manifests_dir/"
+          fi
+
+          shopt -s nullglob
+          files=( "$manifests_dir"/*.yml )
+          if (( ${#files[@]} == 0 )); then
+            echo "::error::No manifest artifacts were available to publish"
+            exit 1
+          fi
+          timestamp="$(date -u +"%Y-%m-%dT%H:%M:%S.000Z")"
+          node ../scripts/stamp-rollout.mjs --release-date "$timestamp" --rollout-hours "$ROLLOUT_HOURS" "${files[@]}"
+          ROLLOUT_HOURS_EXPECTED="$ROLLOUT_HOURS" RELEASE_DATE_EXPECTED="$timestamp" node -e '
+            const yaml = require("js-yaml");
+            const fs = require("fs");
+            const expectedHours = Number(process.env.ROLLOUT_HOURS_EXPECTED);
+            const expectedDate = process.env.RELEASE_DATE_EXPECTED;
+            if (!Number.isFinite(expectedHours) || expectedHours < 0) {
+              throw new Error(`expected non-negative rolloutHours, got ${process.env.ROLLOUT_HOURS_EXPECTED}`);
+            }
+            for (const f of process.argv.slice(1)) {
+              const m = yaml.load(fs.readFileSync(f, "utf8")) ?? {};
+              if (m.rolloutHours !== expectedHours) {
+                throw new Error(`${f}: rolloutHours=${m.rolloutHours}, expected ${expectedHours}`);
+              }
+              if (m.releaseDate !== expectedDate) {
+                throw new Error(`${f}: releaseDate=${m.releaseDate}, expected ${expectedDate}`);
+              }
+              if (typeof m.version !== "string" || m.version.length === 0) {
+                throw new Error(`${f}: missing or invalid version`);
+              }
+            }
+          ' "${files[@]}"
+          gh release upload "$RELEASE_TAG" "${files[@]}" --clobber --repo "${{ github.repository }}"
@@ -0,0 +1,152 @@
+name: Desktop Rollout
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Existing release tag to re-stamp (e.g. v0.1.42)."
+        required: true
+        type: string
+      rollout_hours:
+        description: "Total rollout duration since the original release date, in hours. Use 0 to admit everyone immediately."
+        required: true
+        type: string
+
+concurrency:
+  group: desktop-rollout-${{ inputs.tag }}
+  cancel-in-progress: false
+
+env:
+  SOURCE_TAG: ${{ inputs.tag }}
+
+jobs:
+  stamp:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            package.json
+            package-lock.json
+            scripts
+
+      - name: Resolve release metadata
+        shell: bash
+        run: node scripts/emit-release-env.mjs --source-tag "$SOURCE_TAG" >> "$GITHUB_ENV"
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: "npm"
+          cache-dependency-path: package-lock.json
+          registry-url: "https://npm.pkg.github.com"
+          scope: "@boudra"
+
+      - name: Install JS dependencies
+        run: npm ci
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Download release manifests
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          mkdir release-manifests
+          cd release-manifests
+          gh release download "$RELEASE_TAG" --repo "${{ github.repository }}" --pattern "${RELEASE_CHANNEL}*.yml"
+          shopt -s nullglob
+          files=( ./*.yml )
+          if (( ${#files[@]} == 0 )); then
+            echo "::error::No manifests matched ${RELEASE_CHANNEL}*.yml on $RELEASE_TAG"
+            exit 1
+          fi
+          echo "Downloaded ${#files[@]} manifest(s):"
+          printf '  %s\n' "${files[@]}"
+
+      - name: Capture before state
+        id: before
+        shell: bash
+        run: |
+          set -euo pipefail
+          cd release-manifests
+          summary=$(node -e '
+            const yaml = require("js-yaml");
+            const fs = require("fs");
+            for (const f of process.argv.slice(1)) {
+              const m = yaml.load(fs.readFileSync(f, "utf8")) ?? {};
+              console.log(`  ${f}: rolloutHours=${m.rolloutHours ?? "<unset>"} releaseDate=${m.releaseDate ?? "<unset>"}`);
+            }
+          ' ./*.yml)
+          echo "$summary"
+          {
+            echo "summary<<EOF"
+            echo "$summary"
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Re-stamp rolloutHours
+        env:
+          NEW_HOURS: ${{ inputs.rollout_hours }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          cd release-manifests
+          node ../scripts/stamp-rollout.mjs --rollout-hours "$NEW_HOURS" ./*.yml
+
+      - name: Validate rewritten manifests
+        env:
+          EXPECTED: ${{ inputs.rollout_hours }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          cd release-manifests
+          node -e '
+            const yaml = require("js-yaml");
+            const fs = require("fs");
+            const expected = Number(process.env.EXPECTED);
+            if (!Number.isFinite(expected) || expected < 0) {
+              throw new Error(`EXPECTED must be a non-negative number, got ${process.env.EXPECTED}`);
+            }
+            for (const f of process.argv.slice(1)) {
+              const m = yaml.load(fs.readFileSync(f, "utf8")) ?? {};
+              if (m.rolloutHours !== expected) {
+                throw new Error(`${f}: rolloutHours=${m.rolloutHours}, expected ${expected}`);
+              }
+              if (typeof m.version !== "string" || m.version.length === 0) {
+                throw new Error(`${f}: missing or invalid version`);
+              }
+            }
+          ' ./*.yml
+
+      - name: Upload to release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          cd release-manifests
+          gh release upload "$RELEASE_TAG" ./*.yml --clobber --repo "${{ github.repository }}"
+
+      - name: Write summary
+        env:
+          BEFORE: ${{ steps.before.outputs.summary }}
+        shell: bash
+        run: |
+          {
+            echo "## Rollout updated"
+            echo ""
+            echo "**Tag:** \`$RELEASE_TAG\`"
+            echo "**Channel:** \`$RELEASE_CHANNEL\`"
+            echo "**New rolloutHours:** \`${{ inputs.rollout_hours }}\`"
+            echo ""
+            echo "### Before"
+            echo '```'
+            echo "$BEFORE"
+            echo '```'
+          } >> "$GITHUB_STEP_SUMMARY"
@@ -27,7 +27,7 @@ jobs:

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

      - name: Fetch origin/main (worktree tests)
@@ -1,5 +1,8 @@
 {
  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "options": {
+    "typeAware": false
+  },
  "plugins": ["react", "react-perf", "unicorn", "typescript", "oxc", "import", "promise"],
  "categories": {
    "correctness": "error",
@@ -53,6 +56,7 @@
    "typescript/no-explicit-any": "error",
    "typescript/prefer-as-const": "error",
    "typescript/no-this-alias": "error",
+    "typescript/no-unnecessary-type-assertion": "error",
    "typescript/consistent-type-definitions": ["error", "interface"],

    "import/no-unassigned-import": [
@@ -1,16 +1,129 @@
 # Changelog

-## 0.1.63-beta.1 - 2026-04-24
+## 0.1.67 - 2026-05-03
+
+### Fixed
+
+- Archiving a worktree or workspace feels instant instead of waiting on the daemon, with automatic rollback if it fails.
+- The built-in daemon toggle in desktop settings now actually takes effect.
+- Desktop settings no longer reset on app launch after a legacy migration.
+- Desktop daemon startup failures now surface on the splash screen and respond to retry, instead of leaving the app silently stuck.
+- Internal LLM calls (branch names, commit messages, PR text) no longer leave behind ephemeral agent sessions in your provider history.
+
+## 0.1.66 - 2026-05-03
+
+### Fixed
+
+- Streaming markdown preserves trailing newlines so paragraph spacing stays correct while the agent is still typing.
+- Agent initialization failures surface within 30 seconds instead of 5 minutes.
+- Terminals reply to ANSI cursor-position queries, so tools that ask for cursor location no longer hang.
+
+## 0.1.65 - 2026-05-03
+
+### Added
+
+- **In-app browser** — open a real web browser in any workspace to test your app. ([#670](https://github.com/getpaseo/paseo/pull/670) by [@jasonkneen](https://github.com/jasonkneen))
+- Inline review comments in the git diff pane. Tap a line number to start a comment. ([#530](https://github.com/getpaseo/paseo/pull/530))
+- Sub-agent activity is now shown for Codex, OpenCode, and Claude. ([#672](https://github.com/getpaseo/paseo/pull/672), [#658](https://github.com/getpaseo/paseo/pull/658) by [@thisisryanswift](https://github.com/thisisryanswift))
+- Pull and push your branch in one step from the git actions menu in the changes pane.
+- Resume existing agent sessions with `paseo import --provider <name> <id>`. ([#632](https://github.com/getpaseo/paseo/pull/632))
+- Password authentication and SSL support for daemon connections. ([#635](https://github.com/getpaseo/paseo/pull/635))
+- Connect to a daemon via relay using a pairing offer URL from the CLI. ([#639](https://github.com/getpaseo/paseo/pull/639))
+- **Windows:** Native ARM64 builds are now available.
+- Bundled Paseo skills now refresh automatically on desktop app launch.

 ### Improved

+- Codex streaming feels more responsive — message boundaries are preserved and output arrives sooner.
+- Terminal sessions run in a dedicated worker process for better stability.
+- New worktree branch names are derived from your prompt and attachments instead of a generic placeholder.
+- Review comment UI is cleaner and easier to scan.
+- The daemon's `/api/status` endpoint is now protected by password auth when one is configured.
+
+### Fixed
+
+- **Apple Silicon Mac:** The desktop update pipeline now publishes manifests atomically, closing a race that could install the Intel build on Apple Silicon Macs and cause 100%+ renderer CPU usage. Affected users will self-heal — electron-updater's Rosetta detection migrates back to arm64 on the next update poll. ([#555](https://github.com/getpaseo/paseo/issues/555))
+- **Linux:** `.deb` and `.rpm` packages now show as `Paseo` in the dock and process list instead of `Paseo.bin`. `--no-sandbox` is now scoped to AppImage only, matching VS Code's sandbox handling. ([#602](https://github.com/getpaseo/paseo/issues/602))
+- **Windows:** Git diff commands no longer break on paths with special characters. ([#629](https://github.com/getpaseo/paseo/pull/629))
+- Cursor CLI and other ACP custom providers launch reliably. ([#628](https://github.com/getpaseo/paseo/pull/628))
+- Daemon stays up when WebSocket clients disconnect mid-stream, and crashes now write a fatal log entry instead of disappearing silently. ([#613](https://github.com/getpaseo/paseo/pull/613) by [@yuruiz](https://github.com/yuruiz))
+- Long agent timelines reconnect cleanly over the relay instead of looping through disconnects while catching up. ([#657](https://github.com/getpaseo/paseo/pull/657) by [@fireblue](https://github.com/fireblue))
+- Agent timelines refresh with smaller catch-up requests when you reopen an agent.
+- Terminal snapshots flush reliably before clients reconnect.
+- Workspace reconnects avoid unnecessary refresh work when the focused workspace is already current.
+- Voice dictation keeps recording when the agent tab loses focus.
+- OpenCode mode picker now lists agents available in every mode. ([#606](https://github.com/getpaseo/paseo/pull/606) by [@thisisryanswift](https://github.com/thisisryanswift))
+- Codex plan approval panels no longer duplicate.
+- Imported agents display the correct title immediately.
+- OpenCode surfaces invalid mode/model errors instead of hanging.
+- Archived worktrees stay hidden without flashing back into the list. ([#640](https://github.com/getpaseo/paseo/pull/640))
+- Web dropdown menus no longer resize unexpectedly.
+- The visible changes pane keeps in sync with the working tree diff.
+- Tool detail rows on the timeline are selectable again.
+- `paseo.json` parse errors in setup, teardown, and terminal actions now surface a clear error instead of failing silently.
+- Diff gutter line numbers were shifted one row out of alignment in some cases on web.
+- Streamed agent output reconciles cleanly when the timeline hydrates mid-turn. ([#663](https://github.com/getpaseo/paseo/pull/663))
+- Images in assistant messages show a loading spinner while they load and an "Image unavailable" fallback if they fail, instead of a blank space.
+- Isolated bottom sheet modals close and re-open without getting stuck.
+
+## 0.1.64 - 2026-04-28
+
+### Added
+
+- OpenCode now has a Full Access mode that auto-approves tool calls. ([#595](https://github.com/getpaseo/paseo/pull/595) by [@tmih06](https://github.com/tmih06))
+- OpenCode supports executable slash commands. ([#597](https://github.com/getpaseo/paseo/pull/597) by [@tmih06](https://github.com/tmih06))
+
+### Improved
+
+- `@`-mention stays responsive on very large projects. ([#600](https://github.com/getpaseo/paseo/pull/600) by [@yuruiz](https://github.com/yuruiz))
+
+### Fixed
+
+- Workspaces still load when `paseo.json` has a parse error.
+
+## 0.1.63 - 2026-04-28
+
+### Added
+
+- Project settings page with a built-in `paseo.json` editor.
+- Cold start restores your last open workspace.
+- Tool call badges have a button to open the referenced file directly.
+- Open the current branch on GitHub from a workspace's open menu. ([#583](https://github.com/getpaseo/paseo/pull/583) by [@Myriad-Dreamin](https://github.com/Myriad-Dreamin))
+- Enable or disable providers from Settings without editing config files.
+- Paseo prompts you to configure a worktree setup script when one is missing.
+- Choose whether the daemon shuts down when you close the desktop app.
+
+### Improved
+
+- Provider settings and model selection have been redesigned.
+- Voice mode transcription endpoint is configurable for OpenAI-compatible providers. ([#570](https://github.com/getpaseo/paseo/pull/570) by [@yuruiz](https://github.com/yuruiz))
+- Adding a project no longer waits for GitHub PR status to load.
+- Startup splash screen is cleaner — just the logo with a subtle shimmer.
+- `paseo.json` setup and teardown accept a single command string, not just an array.
 - Archiving a worktree is instant instead of waiting for the backend to confirm.
- Terminal sessions recover cleanly after rendering hiccups.
 - Agent timelines and git diff lists no longer jump around while loading or streaming.

 ### Fixed

+- `paseo loop run` and `paseo run` now respect the `--provider` and `--model` flags. ([#594](https://github.com/getpaseo/paseo/pull/594) by [@VincenzoRocchi](https://github.com/VincenzoRocchi))
+- Pi provider shows up when only DeepSeek or other non-OpenAI/Anthropic/OpenRouter API keys are set.
+- Custom models from `additionalModels` and `profileModels` are honored when picking a default for new agents.
+- File preview line numbers stay on one line past line 99.
+- Cmd+Q on macOS quits the desktop app instead of leaving it running in the background.
+- Terminal sessions recover cleanly after rendering hiccups, including the initial resize for nvim.
+- Terminal protocol query responses no longer leak into the browser.
+- Assistant link color matches the theme again.
 - File links with line numbers (like `foo.ts:42`) open correctly from assistant messages.
+- Claude's Grep results show up in the search detail body.
+- Reopening a worktree lands under the right project.
+- Agents from disabled or unavailable providers stay visible in history.
+- New CLI agents now require a provider instead of failing silently.
+- Git diff headers no longer truncate.
+- Provider diagnostic modal scrolls on short screens.
+- Provider diagnostics show the real error and underlying child-process output instead of a generic message.
+- Archived workspaces no longer interfere with working-directory resolution.
+- Triple-click on a message no longer extends the selection into adjacent bubbles.
+- The packaged desktop app preserves your zsh prompt.

 ## 0.1.62 - 2026-04-23

@@ -142,7 +255,7 @@

 ### Added

- Provider profiles — define custom providers in your Paseo config that appear alongside built-ins. Override a built-in's binary, env, or models, or create entirely new providers. See the [configuration guide](https://github.com/getpaseo/paseo/blob/main/docs/CUSTOM-PROVIDERS.md).
+- Provider profiles — define custom providers in your Paseo config that appear alongside built-ins. Override a built-in's binary, env, or models, or create entirely new providers. See the [configuration guide](https://github.com/getpaseo/paseo/blob/main/docs/custom-providers.md).
 - ACP agent support — add any ACP-compatible agent to Paseo with `extends: "acp"` in your provider config. No code changes needed.
 - Choose provider and model when creating scheduled agents.
 - Max reasoning effort option for Opus 4.6 models.
@@ -19,14 +19,14 @@ This is an npm workspace monorepo:

 | 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                                      |
+| [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
@@ -41,7 +41,7 @@ npm run format                       # Auto-format with Biome
 npm run format:check                 # Check formatting without writing
 ```

-See [docs/DEVELOPMENT.md](docs/DEVELOPMENT.md) for full setup, build sync requirements, and debugging.
+See [docs/development.md](docs/development.md) for full setup, build sync requirements, and debugging.

 ## Critical rules

@@ -55,6 +55,9 @@ See [docs/DEVELOPMENT.md](docs/DEVELOPMENT.md) for full setup, build sync requir
  - Never re-run a test suite that another agent already ran and reported green — trust the result.
  - For full suite verification, push to CI and check GitHub Actions instead.
 - **Always run typecheck and lint after every change.**
+- **Build workspace packages before diagnosing cross-package type errors.** This repo consumes generated declarations across workspaces. If typecheck fails in a package that depends on another workspace (especially CLI depending on server/daemon types), rebuild the owning package first so `dist` declarations are current:
+  - `npm run build:daemon` — rebuild highlight, relay, server, and CLI when daemon/server/CLI types may be stale.
+  - Do not patch inferred callback parameters or add local duplicate types just to silence stale declaration errors.
 - **Run `npm run format` before committing.** This repo uses Biome for formatting. Do not manually fix formatting — let the formatter handle it.
 - **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`
@@ -100,6 +103,14 @@ The app runs on iOS, Android, web (browser), and web (Electron desktop). Code is
    use-audio-recorder.native.ts ← uses expo-audio
  ```
  Import as `@/hooks/use-audio-recorder` — Metro picks the right file automatically.
+- **Use `.electron.ts` / `.electron.tsx` for Electron-only web modules.** Electron is still the Metro `web` platform, but desktop dev/build sets `PASEO_WEB_PLATFORM=electron`, so Metro first looks for `.electron.*` files and falls back to normal `.web.*` files. Use this when the implementation depends on Electron-only behavior such as `webviewTag`, desktop preload APIs, or the Electron bridge. Keep plain browser web in `.web.*`, and keep native fallbacks in the base file or `.native.*`.
+  ```
+  components/
+    browser-pane.electron.tsx ← Electron <webview> implementation
+    browser-pane.web.tsx      ← plain web fallback
+    browser-pane.tsx          ← native fallback
+  ```
+  Import as `@/components/browser-pane` — Electron desktop gets the `.electron.tsx` file, browser web gets `.web.tsx`, and native gets the native/base implementation.
 - **NEVER use raw DOM APIs without `isWeb` guard.** DOM APIs crash native. Casting a RN ref to `HTMLElement` is a red flag — ensure the block is web-only.
 - **NEVER use `onPointerEnter`/`onPointerLeave`.** They don't fire on native iOS.
 - **Hover only works on web.** React Native's `onHoverIn`/`onHoverOut` on `Pressable` does NOT fire on native iOS/iPad — the underlying W3C pointer events are behind disabled experimental flags. For hover-to-show UI (kebab menus, action buttons), use `isHovered || isNative || isCompact` so the controls are always visible on native and hover-to-show on web.
@@ -27,10 +27,10 @@ If you want to propose a direction change, start a conversation.
 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)
+- [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
@@ -105,7 +105,7 @@ 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.
+Read [docs/development.md](docs/development.md) for build-sync gotchas, local state, ports, and daemon details.

 ## Multi-platform testing

@@ -132,7 +132,7 @@ If you touch protocol or shared client/server behavior, read the compatibility n

 Paseo has explicit standards. Follow them.

-The full guide lives in [docs/CODING_STANDARDS.md](docs/CODING_STANDARDS.md).
+The full guide lives in [docs/coding-standards.md](docs/coding-standards.md).

 ## PR checklist

@@ -144,6 +144,16 @@ npm run build:daemon
 npm run typecheck
 ```

+<p align="center">
+  <a href="https://star-history.com/#getpaseo/paseo&Date">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=getpaseo/paseo&type=Date&theme=dark">
+      <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=getpaseo/paseo&type=Date">
+      <img src="https://api.star-history.com/svg?repos=getpaseo/paseo&type=Date" alt="Star history chart for getpaseo/paseo" width="600" style="max-width: 100%;">
+    </picture>
+  </a>
+</p>
+
 ## License

 AGPL-3.0
@@ -1,158 +0,0 @@
-# Attachment-Based Review Context Plan
-
-## Goal
-
-Use structured attachments as the source of truth for review context during agent creation.
-
-This covers two related behaviors:
-
-1. Provider-facing context for the agent prompt
-2. Worktree checkout behavior when creating a worktree from a review item
-
-The design should stay compatible with future forge support such as GitLab.
-
-## Core Direction
-
- Do not parse the prompt to discover issue/PR intent.
- Do not introduce deeply nested transport objects for this flow.
- Make the attachment itself the discriminated union.
- Keep forge-specific checkout logic below the attachment layer.
- Let each agent provider translate attachments into its own prompt/input format.
-
-## Initial Attachment Types
-
-Two initial structured attachment types:
-
- `github_pr`
- `github_issue`
-
-With separate MIME types:
-
- `application/github-pr`
- `application/github-issue`
-
-Proposed wire shape:
-
-```ts
-type AgentAttachment =
-  | {
-      type: "github_pr";
-      mimeType: "application/github-pr";
-      number: number;
-      title: string;
-      url: string;
-      body?: string | null;
-      baseRefName?: string | null;
-      headRefName?: string | null;
-    }
-  | {
-      type: "github_issue";
-      mimeType: "application/github-issue";
-      number: number;
-      title: string;
-      url: string;
-      body?: string | null;
-    };
-```
-
-## Backward Compatibility
-
- Add new optional `attachments` fields; keep existing `images` fields.
- Unknown attachment discriminators must be dropped during schema normalization instead of failing the full request.
- Malformed attachment entries should also be ignored safely.
- Old clients continue working because `attachments` is optional.
- New clients can send `attachments` without breaking older flows that still rely on `images`.
-
-## Request-Level Changes
-
-Add optional `attachments` to:
-
- `create_agent_request`
- `send_agent_message_request`
-
-Existing `initialPrompt` remains plain user text.
-
-The selected GitHub PR/issue becomes a structured attachment instead of being injected into prompt text as the primary source of truth.
-
-## App Responsibilities
-
-When the user selects a GitHub item:
-
- If it is a PR, create a `github_pr` attachment
- If it is an issue, create a `github_issue` attachment
- Include the attachment in the create-agent request
-
-The UI can still render friendly labels and previews from the same data.
-
-The app should stop treating PR/issue context as prompt-only metadata.
-
-## Worktree Creation Behavior
-
-During agent creation, if worktree creation is requested:
-
- Inspect normalized attachments
- If a `github_pr` attachment is present, use it to drive checkout for the worktree
-
-The important rule:
-
- attachment type identifies the review object
- server-side git logic decides how to check it out
-
-This keeps the attachment contract simple while allowing fork-safe implementation details.
-
-## Checkout Resolution
-
-The attachment itself should not encode the full checkout strategy.
-
-Instead, the server should resolve checkout from the `github_pr` attachment using forge-aware logic.
-
-Examples of possible implementation strategies:
-
- `gh pr checkout`
- `git fetch origin refs/pull/<number>/head:<local-branch>`
- another GitHub-aware resolver if needed later
-
-This is intentionally a server implementation detail, not part of the attachment schema.
-
-## Provider Responsibilities
-
-Each provider adapter should receive normalized attachments and decide how to represent them for the model.
-
-Examples:
-
- Claude: render attachment into text blocks
- Codex: inject as blocks or text
- OpenCode: send as file/resource-like input where appropriate
- ACP: convert to resource/text forms as supported
-
-The session layer should not hardcode one translation strategy for all providers.
-
-## Suggested Implementation Order
-
-1. Add tolerant attachment schema and normalization in shared/server message handling.
-2. Thread `attachments` through app -> daemon client -> session layer.
-3. Update create-agent UI flows to emit `github_pr` / `github_issue` attachments from GitHub selection.
-4. Teach worktree creation to inspect attachments and special-case `github_pr`.
-5. Update provider adapters to translate attachments into provider-specific prompt/input forms.
-6. Optionally migrate image transport into the same attachment mechanism later.
-
-## Files Likely Involved
-
- `packages/server/src/shared/messages.ts`
- `packages/server/src/client/daemon-client.ts`
- `packages/server/src/server/session.ts`
- `packages/server/src/server/worktree-session.ts`
- `packages/server/src/server/agent/agent-sdk-types.ts`
- `packages/server/src/server/agent/providers/claude-agent.ts`
- `packages/server/src/server/agent/providers/codex-app-server-agent.ts`
- `packages/server/src/server/agent/providers/opencode-agent.ts`
- `packages/server/src/server/agent/providers/acp-agent.ts`
- `packages/app/src/screens/new-workspace-screen.tsx`
- `packages/app/src/screens/agent/draft-agent-screen.tsx`
- `packages/app/src/contexts/session-context.tsx`
-
-## Notes
-
- The current image path can remain in place initially.
- The plan intentionally keeps checkout concerns separate from provider prompt translation.
- Future forge support should add new attachment discriminators rather than expanding GitHub-only nested fields.
@@ -137,6 +137,21 @@ Terminal I/O and agent streaming share the same connection via `BinaryMuxFrame`:
 - Channel 1: terminal data
 - 1-byte channel ID + 1-byte flags + variable payload

+### Compatibility rules
+
+- WebSocket schemas are append-only. Add fields, do not remove fields, and never make optional fields required.
+- New wire enum values must be gated at serialization with `session.supports(CLIENT_CAPS.someCapability)`.
+- `Session` stores client capabilities from the `hello` handshake and rehydrates them on reconnect, so the wire boundary can ask one question: `session.supports(...)`.
+
+Example: adding a new enum value
+
+```ts
+// 1. Add CLIENT_CAPS.newThing = "new_thing"
+// 2. Let new clients advertise it in WS hello
+// 3. Keep the shared producer schema strict
+// 4. Gate the new emitted value: session.supports(CLIENT_CAPS.newThing) ? "new_value" : "old_value"
+```
+
 ## Agent lifecycle

 ```
@@ -1,4 +1,4 @@
-# DESIGN-SYSTEM.md
+# Design system

 Tokens — every color, font size, weight, spacing step, radius, icon size — live in `packages/app/src/styles/theme.ts`.

@@ -33,8 +33,8 @@ Hierarchy is conveyed through weight and color, not size. Most labels, titles, a
 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 callout actions (`packages/app/src/components/callout-card.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 `<CalloutCard>` titles (`packages/app/src/components/callout-card.tsx:175-180`).
+- **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.

@@ -163,9 +163,11 @@ Empty states are short noun phrases. Centered, muted, one or two lines. Sessions

 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`).

-Actionable errors are `<CalloutCard variant="error" actions={[...]} />` when the user can act on them from the page. The daemon-version-mismatch callout is the canonical use (`packages/app/src/components/daemon-version-mismatch-callout-source.tsx`).
+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.

-Imperative errors are `Alert.alert("Error", "Unable to ...")` for failures that interrupt the flow and have no place on the page.
+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.

@@ -203,7 +205,7 @@ The bespoke pills in `packages/app/src/screens/settings/host-page.tsx:97-116`, `

 ## 13. Forbidden

- `fontWeight.medium` on row titles, body text, button labels, badge text, or `<CalloutCard>` 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.
+- `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.
@@ -223,22 +225,23 @@ The bespoke pills in `packages/app/src/screens/settings/host-page.tsx:97-116`, `

 ## 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 callout with action                      | `packages/app/src/components/callout-card.tsx`, `packages/app/src/components/daemon-version-mismatch-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`                                                               |
+| 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`                                                                                                                                                      |
@@ -17,7 +17,7 @@ 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 layers exist? (See [architecture.md](./architecture.md))
 - What types and data shapes are already defined?

 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.
@@ -38,7 +38,7 @@ If you can't define verification, you don't understand the feature well enough y

 - What types are needed?
 - Use discriminated unions — make impossible states impossible
- One canonical type per concept (see [CODING_STANDARDS.md](./CODING_STANDARDS.md))
+- One canonical type per concept (see [coding-standards.md](./coding-standards.md))

 ### Layers

@@ -261,4 +261,4 @@ xcrun simctl ui booted appearance dark     # set dark
 xcrun simctl ui booted appearance light    # set light
 ```

-Expo dev server logs are in the tmux pane running `npm run dev`. Daemon logs are at `$PASEO_HOME/daemon.log` (see [DEVELOPMENT.md](DEVELOPMENT.md)).
+Expo dev server logs are in the tmux pane running `npm run dev`. Daemon logs are at `$PASEO_HOME/daemon.log` (see [development.md](development.md)).
@@ -1,68 +0,0 @@
-# Plan Approval Normalization
-
-## Goal
-
-Normalize plan approval across providers so the UI renders one consistent plan approval card and action row, while each provider keeps its own execution quirks behind the session permission interface.
-
-## Compatibility Constraints
-
- Older clients must remain compatible with newer daemons.
- All new wire fields must be optional.
- Existing plan permissions without action metadata must still render and work.
- Existing question permissions must keep their current behavior.
-
-## Design
-
-### Shared abstraction
-
-Add optional permission action definitions to the shared permission request/response types.
-
- Permission requests may include `actions`.
- Permission responses may include `selectedActionId`.
- `kind: "plan"` remains the normalized concept for plan approval.
- The UI renders actions from the permission request instead of hardcoding provider-specific buttons.
-
-### Claude
-
-Keep Claude's plan permission flow, but enrich it with explicit action definitions.
-
- Always expose `Reject`.
- Always expose `Implement`.
- If the agent entered plan mode from a more permissive mode like `bypassPermissions`, also expose `Implement with <previous mode>`.
- Resolve the selected action entirely inside `respondToPermission()`.
-
-### Codex
-
-Synthesize a normalized `kind: "plan"` permission after a Codex plan-mode turn completes with a plan result.
-
- Emit a plan permission with `Reject` and `Implement` actions.
- On `Implement`, disable `plan_mode`, disable `fast_mode`, and automatically start a follow-up implementation turn.
- On `Reject`, resolve without starting a follow-up turn.
- Keep the implementation prompt and state transitions inside the Codex provider.
-
-### Manager and state sync
-
-After permission resolution, refresh provider-derived state so the UI sees internal mode/feature changes without knowing provider quirks.
-
- Refresh current mode
- Refresh pending permissions
- Refresh runtime info
- Refresh features
- Persist refreshed state
-
-### UI
-
-Render plan permissions through the existing plan card, but generate buttons from normalized permission actions.
-
- If `actions` are absent, fall back to legacy buttons.
- Plan cards should use `Implement` as the default primary label.
- Do not add provider-specific rendering branches.
-
-## Verification
-
-1. Shared schema/type tests for optional `actions` and `selectedActionId`
-2. App tests for generic plan-action rendering
-3. Claude tests for third action when resuming from a more permissive mode
-4. Codex tests for synthetic plan approval and automatic implementation follow-up
-5. Manager tests for post-permission state refresh
-6. `npm run typecheck`
@@ -59,6 +59,94 @@ Use the beta path when you need to:
 - send a build to a user who is hitting a specific problem
 - iterate on `beta.1`, `beta.2`, `beta.3`, and so on before deciding to ship broadly

+## Staged rollout (stable channel)
+
+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`.
+
+Desktop release builds now publish in two phases:
+
+- Platform build jobs upload the installers/packages (`.dmg`, `.zip`, `.exe`, `.AppImage`, etc.) to the GitHub release.
+- The final job merges/stamps the manifests and uploads all `.yml` files only after they already contain the final `releaseDate` and `rolloutHours`.
+
+Updater clients only discover a release through those `.yml` manifests, so there is no silent 100% admission window before rollout metadata is present.
+
+### Default behavior
+
+`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 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 24h ramp from tag push).
+npm run release:patch
+
+# 2. Immediately queue the flip — runs as soon as finalize-rollout completes.
+gh workflow run desktop-rollout.yml \
+  -f tag=v0.1.64 \
+  -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=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.
+
+### Adjusting an already-published release
+
+To change the rollout duration on a release that's already shipped — e.g. flip a hotfix to instant admit, or slow a release down — use the dedicated `desktop-rollout.yml` workflow. It edits the manifests in place on the GitHub release without rebuilding anything. It only rewrites `rolloutHours`; `releaseDate` is preserved, so the rollout clock keeps ticking from the original publish time.
+
+**Hotfix (instant admit) on an already-shipped release:**
+
+```bash
+gh workflow run desktop-rollout.yml \
+  -f tag=v0.1.42 \
+  -f rollout_hours=0
+```
+
+`rollout_hours=0` admits 100% of stable users on their next update check (within ~30 min for active clients).
+
+**Slow a rollout down** (e.g. extend total duration to 72h since the original release):
+
+```bash
+gh workflow run desktop-rollout.yml \
+  -f tag=v0.1.42 \
+  -f rollout_hours=72
+```
+
+`rollout_hours` is **total duration since the original release date**, not "extend by N more hours from now." If `v0.1.42` was published 2h ago and you set `rollout_hours=72`, the ramp finishes 70h from now.
+
+The dispatch is idempotent and shares the `desktop-rollout-<tag>` concurrency group with `desktop-release.yml`'s `finalize-rollout` job, so it serializes safely against an in-flight tag-push pipeline targeting the same release.
+
+### Custom ramp on a manually-dispatched build
+
+`desktop-release.yml` accepts `rollout_hours` only on `workflow_dispatch`, which is the path used to **rebuild an existing tag** (retry a failed release, force a rebuild on a different ref). When you go that route, you can stamp a non-default ramp directly:
+
+```bash
+gh workflow run desktop-release.yml \
+  -f tag=v0.1.43 \
+  -f rollout_hours=6
+```
+
+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
+
+If you ship N+1 while N is still ramping, N+1 starts a fresh rollout from its own publish timestamp. N's rollout effectively ends — the newer manifest supersedes it.
+
+If N+1 is a hotfix for a bug in N, dispatch `desktop-rollout.yml -f tag=v0.1.<N+1> -f rollout_hours=0` after N+1 publishes so the users who already got N reach the fix fast.
+
+### Limitations
+
+- **No pause / kill switch.** Once a stable user is admitted, they will install the update on next quit (`autoInstallOnAppQuit = true`). To stop new admissions, ship a superseding release. To "recall" already-admitted users, ship a hotfix `+1` patch.
+- **No rollback.** `allowDowngrade = false`. Bad release = ship a hotfix.
+- **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.
+
 ## Website behavior

 - The website download page points to GitHub's latest published **stable** release.
@@ -140,6 +228,8 @@ The changelog is shown on the Paseo homepage. Write it for **end users**, not de
 - **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.
+  - **Example:** if the release adds an in-app browser and also contains a commit "fix: browser pane keyboard handling no longer steals shortcuts", do **not** list the keyboard fix under Fixed. The browser is shipping for the first time, so users will only ever see the working version. The Added entry covers it.
 - **Cut low-signal entries.** "Toolbar buttons have consistent sizing" is too granular. Combine small polish items or drop them.

 ## Changelog conciseness
@@ -169,7 +259,17 @@ Rules:
 - **One bullet = one user-facing change**, regardless of how many PRs went into it. Group related PRs on the same bullet.
 - **De-duplicate contributors.** If the same person authored multiple PRs in one bullet, list them once.
 - **Only credit external contributors.** Skip attribution for [@boudra](https://github.com/boudra). The changelog credits community contributions — core team work is the default.
- **Use `git log` to find PR numbers and authors.** PR numbers are typically in the commit message as `(#N)`. Use `gh pr view N --json author` if the commit doesn't include the GitHub username.
+- **Credit the commit author, not the PR opener.** A maintainer often opens a PR that lands work authored by someone else (cherry-pick, rebase of a contributor's branch, manual extraction from a stacked PR). The squash commit preserves the original commit's author, but `gh pr view N --json author` returns the PR opener — using that field will silently mis-credit the work to the maintainer (and then the "skip @boudra" rule drops the attribution entirely). Always resolve attribution from commit authors.
+
+  Use this command to get the GitHub logins for each PR:
+
+  ```bash
+  gh pr view N --json commits --jq '[.commits[].authors[].login] | unique | .[]'
+  ```
+
+  This returns every distinct GitHub login that authored or co-authored a commit in the PR. Use those logins for attribution. Fall back to `gh pr view N --json author` only if the commits command returns nothing (which should not happen for merged PRs).
+
+  When listing PR numbers, `git log --format='%H %s' v<previous>..HEAD | grep -E '\(#[0-9]+\)$'` pulls the PR number out of squash commit subjects.

 ## Changelog ordering

@@ -4,6 +4,74 @@ This app uses [`react-native-unistyles` v3](https://www.unistyl.es/) for theme-a

 That model is powerful, but it has sharp edges. Use this note when adding theme-dependent styles.

+## STOP — `useUnistyles()` Is Forbidden
+
+**Do not call `useUnistyles()` unless every alternative below has been ruled out and you can explain in a code comment why.** The library authors themselves [strongly advise against it](https://www.unistyl.es/v3/references/use-unistyles):
+
+> We strongly recommend **not using** this hook, as it will re-render your component on every change. This hook was created to simplify the migration process and should only be used when other methods fail.
+
+We have hit this gotcha repeatedly in Paseo. It manifests as periodic, lockstep re-renders of warm subtrees (agent streams, panels, sidebars) even when nothing the user can see has changed — confirmed in profiling: `AgentStreamView` re-rendering constantly with `theme` showing as the only changed input on every render. The hook subscribes the component to **all** Unistyles runtime changes (theme, breakpoint, insets, color scheme, scale) and returns a fresh object reference each call, which also breaks every downstream `useMemo`/`memo` boundary that includes a derived theme value.
+
+Before reaching for `useUnistyles()`, work down this list of alternatives in order:
+
+### 1. `StyleSheet.create((theme) => ...)` — default
+
+Most theme-aware styling needs nothing else. The Babel plugin tracks theme dependencies inside the factory and updates the native ShadowTree without any React re-render.
+
+```tsx
+const styles = StyleSheet.create((theme) => ({
+  container: {
+    backgroundColor: theme.colors.surface0,
+    padding: theme.spacing[4],
+  },
+}));
+
+<View style={styles.container} />;
+```
+
+If you are reading a theme value just to feed it back into a `style` prop, you almost certainly want this and not the hook.
+
+### 2. Hard-coded constants for genuinely static values
+
+If you only need a number that happens to live on the theme (e.g. a fixed spacing value used to compute a gap or animation distance), use a literal constant or import a static module. Static reads do not need a subscription. See the "Static Theme Imports" section below — importing `baseColors`, theme-name constants, or `type Theme` is fine when the value is intentionally static.
+
+### 3. `withUnistyles(Component)` for third-party props
+
+When a third-party component takes a non-`style` prop that must be theme-reactive (e.g. `BlurView.tint`, `Image.tintColor`, navigator option props, bottom-sheet `backgroundStyle`), wrap that single component with `withUnistyles`. Only the wrapper re-renders, not the surrounding tree.
+
+```tsx
+const ThemedBlur = withUnistyles(BlurView);
+<ThemedBlur tint={theme.colors.surface0} />;
+```
+
+(Mind the `> *` child-selector leak documented further down.)
+
+### 4. Lift the read into a tiny leaf component
+
+If only one prop in a large component needs a theme value at runtime, extract a small leaf component that calls `useUnistyles()` and accept its re-renders in isolation. Never let a whole stream / panel / sidebar / virtualized list subscribe.
+
+### 5. (Last resort) `useUnistyles()`
+
+Only acceptable when both of:
+
+- (a) The value is consumed by a 3rd-party library that cannot be wrapped with `withUnistyles` (per the upstream "When to use it?" list), AND
+- (b) The component is small, leaf-level, and not on a hot render path.
+
+If you add a new `useUnistyles()` call, leave a comment on the line explaining which of (a)/(b) applies and why each higher-priority alternative was ruled out.
+
+### Hot-path forbidden list
+
+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 / `AgentStreamSection` / `AgentComposerSection`
+- `Composer` and `MessageInput`
+- `WorkspaceScreen` shell, tabs row, deck wrapper
+- `LeftSidebar` row items, `SidebarWorkspaceList`, `CommandCenter`
+- Anything inside a virtualized list (`@tanstack/react-virtual`, `FlashList`)
+
+Reviewers must reject PRs that add `useUnistyles()` calls in these areas without a written justification matching the last-resort criteria above.
+
 ## How Updates Propagate

 For standard React Native components, the [Unistyles Babel plugin](https://www.unistyl.es/v3/other/babel-plugin) rewrites imports such as `View`, `Text`, `Pressable`, and `ScrollView` to Unistyles-aware component factories. On native, those factories borrow the component ref and register the `style` prop with the ShadowRegistry. The upstream ["Why my view doesn't update?"](https://www.unistyl.es/v3/guides/why-my-view-doesnt-update) guide describes this as the ShadowTree update path that avoids unnecessary React re-renders.
@@ -42,7 +42,7 @@ buildNpmPackage rec {

  # 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-6Bf44iWdDwe2MeHyS1Dj0Xhl5TNYuf50CI5uQHsQ97A=";
+  npmDepsHash = "sha256-14DjNXerk2vLOe7UV0oVo+ifmskwsWpu/jahxrLw4M8=";

  # 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).
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.1.63-beta.1",
+  "version": "0.1.67",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.1.63-beta.1",
+      "version": "0.1.67",
      "hasInstallScript": true,
      "license": "AGPL-3.0-or-later",
      "workspaces": [
@@ -23,11 +23,14 @@
        "@types/ws": "^8.5.14",
        "@typescript/native-preview": "7.0.0-dev.20260423.1",
        "concurrently": "^9.2.1",
+        "cross-env": "^10.1.0",
        "get-port-cli": "^3.0.0",
+        "js-yaml": "^4.1.1",
        "knip": "^5.82.1",
        "lefthook": "^2.1.6",
        "oxfmt": "0.46.0",
        "oxlint": "1.61.0",
+        "oxlint-tsgolint": "^0.22.1",
        "patch-package": "^8.0.1",
        "playwright": "^1.56.1",
        "typescript": "^5.9.3",
@@ -4592,13 +4595,6 @@
        "url": "https://github.com/sponsors/epoberezkin"
      }
    },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
-      "license": "Python-2.0"
-    },
    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
      "version": "1.1.12",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
@@ -4610,19 +4606,6 @@
        "concat-map": "0.0.1"
      }
    },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
      "version": "0.4.1",
      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -6747,6 +6730,20 @@
        "node": ">=8"
      }
    },
+    "node_modules/@expo/plugin-help/node_modules/js-yaml": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
    "node_modules/@expo/plugin-warn-if-update-available": {
      "version": "2.5.1",
      "resolved": "https://registry.npmjs.org/@expo/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.5.1.tgz",
@@ -6817,6 +6814,20 @@
        "node": ">=8"
      }
    },
+    "node_modules/@expo/plugin-warn-if-update-available/node_modules/js-yaml": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
    "node_modules/@expo/prebuild-config": {
      "version": "8.0.17",
      "resolved": "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-8.0.17.tgz",
@@ -7054,24 +7065,6 @@
        "excpretty": "build/cli.js"
      }
    },
-    "node_modules/@expo/xcpretty/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "license": "Python-2.0"
-    },
-    "node_modules/@expo/xcpretty/node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
    "node_modules/@floating-ui/core": {
      "version": "1.7.5",
      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz",
@@ -7954,6 +7947,19 @@
        "node": ">=8"
      }
    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -9591,6 +9597,20 @@
        "node": ">=8"
      }
    },
+    "node_modules/@oclif/core/node_modules/js-yaml": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
    "node_modules/@oclif/linewrap": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/@oclif/linewrap/-/linewrap-1.0.0.tgz",
@@ -9663,6 +9683,20 @@
        "node": ">=8"
      }
    },
+    "node_modules/@oclif/plugin-autocomplete/node_modules/js-yaml": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
    "node_modules/@oclif/screen": {
      "version": "3.0.8",
      "resolved": "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.8.tgz",
@@ -10343,6 +10377,90 @@
        "node": "^20.19.0 || >=22.12.0"
      }
    },
+    "node_modules/@oxlint-tsgolint/darwin-arm64": {
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/@oxlint-tsgolint/darwin-arm64/-/darwin-arm64-0.22.1.tgz",
+      "integrity": "sha512-4150Lpgc1YM09GcjA6GSrra1JoPjC7aOpfywLjWEY4vW0Sd1qKzqHF1WRaiw0/qUZ40OATYdv3aRd7ipPkWQbw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@oxlint-tsgolint/darwin-x64": {
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/@oxlint-tsgolint/darwin-x64/-/darwin-x64-0.22.1.tgz",
+      "integrity": "sha512-vFWcPWYOgZs4HWcgS1EjUZg33NLcNfEYU49KGImmCfZWkflENrmBYV4HN/C0YeAPum6ZZ/goPSvQrB/cOD+NfA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@oxlint-tsgolint/linux-arm64": {
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/@oxlint-tsgolint/linux-arm64/-/linux-arm64-0.22.1.tgz",
+      "integrity": "sha512-6LiUpP0Zir3+29FvBm7Y28q/dBjSHqTZ5MhG1Ckw4fGhI4cAvbcwXaKvbjx1TP7rRmBNOoq/M5xdpHjTb+GAew==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@oxlint-tsgolint/linux-x64": {
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/@oxlint-tsgolint/linux-x64/-/linux-x64-0.22.1.tgz",
+      "integrity": "sha512-fuX1hEQfpHauUbXADsfqVhRzrUrGabzGXbj5wsp2vKhV5uk/Rze8Mba9GdjFGECzvXudMGqHqxB4r6jGRdhxVA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@oxlint-tsgolint/win32-arm64": {
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/@oxlint-tsgolint/win32-arm64/-/win32-arm64-0.22.1.tgz",
+      "integrity": "sha512-8SZidAj+jrbZf9ZjBEYW0tiNZ+KasqB2zgW26qdiPpQSF/DzURnPmXz651IeA9YsmbVdHGIooEHUmev6QJdquA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@oxlint-tsgolint/win32-x64": {
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/@oxlint-tsgolint/win32-x64/-/win32-x64-0.22.1.tgz",
+      "integrity": "sha512-QweSk9H5lFh5Y+WUf2Kq/OAN88V6+62ZwGhP38gqdRotI90luXSMkruFTj7Q2rYrzH4ZVNaSqx7NY8JpSfIzqg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
    "node_modules/@oxlint/binding-android-arm-eabi": {
      "version": "1.61.0",
      "resolved": "https://registry.npmjs.org/@oxlint/binding-android-arm-eabi/-/binding-android-arm-eabi-1.61.0.tgz",
@@ -15754,13 +15872,6 @@
        "semver": "bin/semver.js"
      }
    },
-    "node_modules/app-builder-lib/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
-      "license": "Python-2.0"
-    },
    "node_modules/app-builder-lib/node_modules/balanced-match": {
      "version": "4.0.4",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
@@ -15833,19 +15944,6 @@
        "node": ">=18"
      }
    },
-    "node_modules/app-builder-lib/node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
    "node_modules/app-builder-lib/node_modules/jsonfile": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -16679,6 +16777,15 @@
        "node": ">=10.0.0"
      }
    },
+    "node_modules/bcryptjs": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-3.0.3.tgz",
+      "integrity": "sha512-GlF5wPWnSa/X5LKM1o0wz0suXIINz1iHRLvTS+sLyi7XPbe5ycmYI3DlZqVGZZtDgl4DmasFg7gOB3JYbphV5g==",
+      "license": "BSD-3-Clause",
+      "bin": {
+        "bcrypt": "bin/bcrypt"
+      }
+    },
    "node_modules/better-opn": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/better-opn/-/better-opn-3.0.2.tgz",
@@ -17004,13 +17111,6 @@
        "node": ">= 14"
      }
    },
-    "node_modules/builder-util/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
-      "license": "Python-2.0"
-    },
    "node_modules/builder-util/node_modules/http-proxy-agent": {
      "version": "7.0.2",
      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
@@ -17039,19 +17139,6 @@
        "node": ">= 14"
      }
    },
-    "node_modules/builder-util/node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
    "node_modules/bunyan": {
      "version": "1.8.15",
      "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.15.tgz",
@@ -18949,26 +19036,6 @@
        "dmg-license": "^1.0.11"
      }
    },
-    "node_modules/dmg-builder/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/dmg-builder/node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
    "node_modules/dmg-license": {
      "version": "1.0.11",
      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
@@ -19621,24 +19688,6 @@
        "tiny-typed-emitter": "^2.1.0"
      }
    },
-    "node_modules/electron-updater/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "license": "Python-2.0"
-    },
-    "node_modules/electron-updater/node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
    "node_modules/electron-winstaller": {
      "version": "5.4.0",
      "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-5.4.0.tgz",
@@ -24797,6 +24846,12 @@
        "node": ">=6"
      }
    },
+    "node_modules/github-slugger": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz",
+      "integrity": "sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==",
+      "license": "ISC"
+    },
    "node_modules/glob": {
      "version": "10.5.0",
      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
@@ -25238,6 +25293,32 @@
        "node": ">= 0.4"
      }
    },
+    "node_modules/hast-util-heading-rank": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-heading-rank/-/hast-util-heading-rank-3.0.0.tgz",
+      "integrity": "sha512-EJKb8oMUXVHcWZTDepnr+WNbfnXKFNf9duMesmr4S8SXTJBJ9M4Yok08pu9vxdJwdlGRhVumk9mEhkEvKGifwA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-is-element": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz",
+      "integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
    "node_modules/hast-util-to-jsx-runtime": {
      "version": "2.3.6",
      "resolved": "https://registry.npmjs.org/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.6.tgz",
@@ -25265,6 +25346,19 @@
        "url": "https://opencollective.com/unified"
      }
    },
+    "node_modules/hast-util-to-string": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-3.0.1.tgz",
+      "integrity": "sha512-XelQVTDWvqcl3axRfI0xSeoVKzyIFPwsAGSLIsKdJKQMXDYJS4WYrBNF/8J7RdhIcFI2BOHgAifggsvsxp/3+A==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
    "node_modules/hast-util-whitespace": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
@@ -27175,18 +27269,23 @@
      "license": "MIT"
    },
    "node_modules/js-yaml": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
-      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
      "license": "MIT",
      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "^2.0.1"
      },
      "bin": {
        "js-yaml": "bin/js-yaml.js"
      }
    },
+    "node_modules/js-yaml/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
+    },
    "node_modules/jsc-safe-url": {
      "version": "0.2.4",
      "resolved": "https://registry.npmjs.org/jsc-safe-url/-/jsc-safe-url-0.2.4.tgz",
@@ -31160,6 +31259,24 @@
        }
      }
    },
+    "node_modules/oxlint-tsgolint": {
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/oxlint-tsgolint/-/oxlint-tsgolint-0.22.1.tgz",
+      "integrity": "sha512-YUSGSLUnoolsu8gxISEDio3q1rtsCozwfOzASUn3DT2mR2EeQ93uEEnen7s+6LpF+lyTQFln1pQfqwBh/fsVEg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "tsgolint": "bin/tsgolint.js"
+      },
+      "optionalDependencies": {
+        "@oxlint-tsgolint/darwin-arm64": "0.22.1",
+        "@oxlint-tsgolint/darwin-x64": "0.22.1",
+        "@oxlint-tsgolint/linux-arm64": "0.22.1",
+        "@oxlint-tsgolint/linux-x64": "0.22.1",
+        "@oxlint-tsgolint/win32-arm64": "0.22.1",
+        "@oxlint-tsgolint/win32-x64": "0.22.1"
+      }
+    },
    "node_modules/p-cancelable": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
@@ -33607,6 +33724,41 @@
        "regjsparser": "bin/parser"
      }
    },
+    "node_modules/rehype-autolink-headings": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/rehype-autolink-headings/-/rehype-autolink-headings-7.1.0.tgz",
+      "integrity": "sha512-rItO/pSdvnvsP4QRB1pmPiNHUskikqtPojZKJPPPAVx9Hj8i8TwMBhofrrAYRhYOOBZH9tgmG5lPqDLuIWPWmw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@ungap/structured-clone": "^1.0.0",
+        "hast-util-heading-rank": "^3.0.0",
+        "hast-util-is-element": "^3.0.0",
+        "unified": "^11.0.0",
+        "unist-util-visit": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/rehype-slug": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/rehype-slug/-/rehype-slug-6.0.0.tgz",
+      "integrity": "sha512-lWyvf/jwu+oS5+hL5eClVd3hNdmwM1kAC0BUvEGD19pajQMIzcNUd/k9GsfQ+FfECvX+JE+e9/btsKH0EjJT6A==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "github-slugger": "^2.0.0",
+        "hast-util-heading-rank": "^3.0.0",
+        "hast-util-to-string": "^3.0.0",
+        "unist-util-visit": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
    "node_modules/remark-parse": {
      "version": "11.0.0",
      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz",
@@ -38151,24 +38303,6 @@
        "node": ">=20.0"
      }
    },
-    "node_modules/xmlbuilder2/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "license": "Python-2.0"
-    },
-    "node_modules/xmlbuilder2/node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
    "node_modules/xmlchars": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
@@ -38414,14 +38548,14 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.1.63-beta.1",
+      "version": "0.1.67",
      "dependencies": {
        "@dnd-kit/core": "^6.3.1",
        "@dnd-kit/sortable": "^10.0.0",
        "@dnd-kit/utilities": "^3.2.2",
        "@floating-ui/react-native": "^0.10.7",
-        "@getpaseo/expo-two-way-audio": "0.1.63-beta.1",
-        "@getpaseo/highlight": "0.1.63-beta.1",
+        "@getpaseo/expo-two-way-audio": "*",
+        "@getpaseo/highlight": "*",
        "@gorhom/bottom-sheet": "^5.2.6",
        "@gorhom/portal": "^1.0.14",
        "@react-native-async-storage/async-storage": "2.2.0",
@@ -38540,10 +38674,10 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.1.63-beta.1",
+      "version": "0.1.67",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/server": "0.1.63-beta.1",
+        "@getpaseo/server": "0.1.67",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -38585,13 +38719,15 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.1.63-beta.1",
+      "version": "0.1.67",
      "license": "AGPL-3.0-or-later",
      "dependencies": {
-        "@getpaseo/server": "0.1.63-beta.1",
+        "@getpaseo/cli": "*",
+        "@getpaseo/server": "*",
        "electron-log": "^5.4.3",
        "electron-updater": "^6.6.2",
-        "ws": "^8.14.2"
+        "ws": "^8.14.2",
+        "zod": "^3.23.8"
      },
      "devDependencies": {
        "@types/node": "24.6.0",
@@ -38621,9 +38757,18 @@
      "dev": true,
      "license": "MIT"
    },
+    "packages/desktop/node_modules/zod": {
+      "version": "3.25.76",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
+      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.1.63-beta.1",
+      "version": "0.1.67",
      "license": "MIT",
      "devDependencies": {
        "@types/react": "^18.0.25",
@@ -38659,7 +38804,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.1.63-beta.1",
+      "version": "0.1.67",
      "dependencies": {
        "@lezer/common": "^1.5.0",
        "@lezer/cpp": "^1.1.5",
@@ -38685,7 +38830,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.1.63-beta.1",
+      "version": "0.1.67",
      "dependencies": {
        "base64-js": "^1.5.1",
        "tweetnacl": "^1.0.3",
@@ -38700,12 +38845,12 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.1.63-beta.1",
+      "version": "0.1.67",
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.17.1",
        "@anthropic-ai/claude-agent-sdk": "^0.2.11",
-        "@getpaseo/highlight": "0.1.63-beta.1",
-        "@getpaseo/relay": "0.1.63-beta.1",
+        "@getpaseo/highlight": "0.1.67",
+        "@getpaseo/relay": "0.1.67",
        "@isaacs/ttlcache": "^2.1.4",
        "@mariozechner/pi-agent-core": "^0.70.2",
        "@mariozechner/pi-ai": "^0.70.2",
@@ -38716,9 +38861,11 @@
        "@xterm/headless": "^6.0.0",
        "ai": "5.0.78",
        "ajv": "^8.17.1",
+        "bcryptjs": "^3.0.3",
        "dotenv": "^17.2.3",
        "express": "^4.18.2",
        "fast-deep-equal": "^3.1.3",
+        "mnemonic-id": "^3.2.7",
        "node-pty": "1.2.0-beta.11",
        "onnxruntime-node": "^1.23.0",
        "openai": "^4.20.0",
@@ -39156,7 +39303,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.1.63-beta.1",
+      "version": "0.1.67",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.20.3",
        "@cloudflare/workers-types": "^4.20260114.0",
@@ -39167,6 +39314,8 @@
        "react": "^19.1.4",
        "react-dom": "^19.1.4",
        "react-markdown": "^10.1.0",
+        "rehype-autolink-headings": "^7.1.0",
+        "rehype-slug": "^6.0.0",
        "wrangler": "^4.59.1"
      },
      "devDependencies": {
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.1.63-beta.1",
+  "version": "0.1.67",
  "private": true,
  "description": "Paseo: voice-controlled development environment with OpenAI Realtime API",
  "keywords": [
@@ -63,7 +63,7 @@
    "web": "npm run web --workspace=@getpaseo/app",
    "dev:desktop": "npm run dev --workspace=@getpaseo/desktop",
    "dev:win:desktop": "npm run dev:win --workspace=@getpaseo/desktop",
-    "build:desktop": "npm run version:sync-internal && npm run build:web --workspace=@getpaseo/app && npm run build --workspace=@getpaseo/desktop",
+    "build:desktop": "npm run build:workspace-deps --workspace=@getpaseo/app && cd packages/app && cross-env PASEO_WEB_PLATFORM=electron npx expo export --platform web && cd ../.. && npm run build --workspace=@getpaseo/desktop --",
    "db:query": "npm run db:query --workspace=@getpaseo/server --",
    "cli": "npx tsx packages/cli/src/index.js",
    "version": "npm run version:sync-internal && npm run release:prepare && git add -A",
@@ -94,11 +94,14 @@
    "@types/ws": "^8.5.14",
    "@typescript/native-preview": "7.0.0-dev.20260423.1",
    "concurrently": "^9.2.1",
+    "cross-env": "^10.1.0",
    "get-port-cli": "^3.0.0",
+    "js-yaml": "^4.1.1",
    "knip": "^5.82.1",
    "lefthook": "^2.1.6",
    "oxfmt": "0.46.0",
    "oxlint": "1.61.0",
+    "oxlint-tsgolint": "^0.22.1",
    "patch-package": "^8.0.1",
    "playwright": "^1.56.1",
    "typescript": "^5.9.3",
@@ -5,6 +5,7 @@ on:
    tags:
      - "v*"
      - "!v*-rc.*"
+      - "!v*-beta.*"
  workflow_dispatch: {}

 jobs:
@@ -42,11 +43,10 @@ jobs:
    name: Submit iOS for App Store review
    needs: [submit_ios]
    environment: production
+    runs_on: macos-medium
    steps:
      - uses: eas/checkout
      - name: Install fastlane
-        working_directory: ./packages/app
        run: bundle install
      - name: Submit for review
-        working_directory: ./packages/app
        run: bundle exec fastlane ios submit_review
@@ -37,6 +37,9 @@ yarn-error.*
 # typescript
 *.tsbuildinfo

+# vitest browser failure screenshots
+.vitest-screenshots/
+
 app-example

 # generated native folders
@@ -0,0 +1,61 @@
+import { expect, test } from "./fixtures";
+import { buildHostWorkspaceRoute } from "@/utils/host-routes";
+import { allowPermission, waitForPermissionPrompt } from "./helpers/permissions";
+import { connectTerminalClient } from "./helpers/terminal-perf";
+import { createTempGitRepo } from "./helpers/workspace";
+
+function getServerId(): string {
+  const serverId = process.env.E2E_SERVER_ID;
+  if (!serverId) {
+    throw new Error("E2E_SERVER_ID is not set.");
+  }
+  return serverId;
+}
+
+test.describe("Codex plan approval", () => {
+  test("shows a single actionable plan panel and removes it after implementation starts", async ({
+    page,
+  }) => {
+    test.setTimeout(180_000);
+
+    const repo = await createTempGitRepo("codex-plan-approval-");
+    const client = await connectTerminalClient();
+
+    try {
+      const workspaceResult = await client.openProject(repo.path);
+      if (!workspaceResult.workspace) {
+        throw new Error(workspaceResult.error ?? `Failed to open project ${repo.path}`);
+      }
+
+      const agent = await client.createAgent({
+        provider: "mock",
+        cwd: repo.path,
+        title: "Codex plan approval e2e",
+        modeId: "load-test",
+        model: "ten-second-stream",
+        initialPrompt: "Emit synthetic plan approval.",
+      });
+
+      const agentUrl = `${buildHostWorkspaceRoute(
+        getServerId(),
+        repo.path,
+      )}?open=${encodeURIComponent(`agent:${agent.id}`)}`;
+      await page.goto(agentUrl);
+
+      await waitForPermissionPrompt(page, 120_000);
+
+      await expect(page.getByTestId("permission-plan-card")).toHaveCount(1);
+      await expect(page.getByTestId("timeline-plan-card")).toHaveCount(0);
+
+      await allowPermission(page);
+
+      await expect(page.getByTestId("permission-plan-card")).toHaveCount(0, {
+        timeout: 30_000,
+      });
+      await expect(page.getByTestId("timeline-plan-card")).toHaveCount(0);
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+});
@@ -31,7 +31,7 @@ test.beforeAll(async () => {
  if (!result.workspace) {
    throw new Error(result.error ?? "Failed to seed workspace");
  }
-  workspaceId = String(result.workspace.id);
+  workspaceId = result.workspace.id;
 });

 test.afterAll(async () => {
@@ -1,8 +1,13 @@
 import { test as base, expect, type Page } from "@playwright/test";
 import { buildCreateAgentPreferences, buildSeededHost } from "./helpers/daemon-registry";
+import { createWithWorkspace, type WithWorkspace } from "./helpers/with-workspace";

-// Extend base test to provide dynamic baseURL from global-setup
-const test = base.extend({
+// Test setup is wired through an `auto: true` fixture rather than `test.beforeEach`.
+// `test.beforeEach` declared at the top level of a non-test fixture file is unreliable
+// across spec-file boundaries — Playwright sometimes skips it for the first test of a
+// subsequent spec when multiple specs run in the same worker. Auto fixtures run
+// reliably for every test that uses this `test` object.
+const test = base.extend<{ paseoE2ESetup: void; withWorkspace: WithWorkspace }>({
  baseURL: async ({}, provide) => {
    const metroPort = process.env.E2E_METRO_PORT;
    if (!metroPort) {
@@ -10,102 +15,99 @@ const test = base.extend({
    }
    await provide(`http://localhost:${metroPort}`);
  },
-});
-
-const consoleEntries = new WeakMap<Page, string[]>();
-
-test.beforeEach(async ({ page }) => {
-  const daemonPort = process.env.E2E_DAEMON_PORT;
-  const metroPort = process.env.E2E_METRO_PORT;
-  if (!daemonPort) {
-    throw new Error(
-      "E2E_DAEMON_PORT is not set. Refusing to run e2e against the default daemon (e.g. localhost:6767). " +
-        "Ensure Playwright `globalSetup` starts the e2e daemon and exports E2E_DAEMON_PORT.",
-    );
-  }
-  if (daemonPort === "6767") {
-    throw new Error(
-      "E2E_DAEMON_PORT is 6767. Refusing to run e2e against the default local daemon. " +
-        "Fix Playwright globalSetup to start an isolated test daemon and export its port.",
-    );
-  }
-  if (!metroPort) {
-    throw new Error(
-      "E2E_METRO_PORT is not set. Ensure Playwright `globalSetup` starts Metro and exports E2E_METRO_PORT.",
-    );
-  }
-
-  // Hard guardrail: never allow tests to hit the developer's default daemon.
-  // This blocks both HTTP and WS attempts to :6767 (before any navigation).
-  await page.route(/:(6767)\b/, (route) => route.abort());
-  await page.routeWebSocket(/:(6767)\b/, async (ws) => {
-    await ws.close({ code: 1008, reason: "Blocked connection to localhost:6767 during e2e." });
-  });
-
-  const entries: string[] = [];
-  consoleEntries.set(page, entries);
-
-  page.on("console", (message) => {
-    entries.push(`[console:${message.type()}] ${message.text()}`);
-  });
-
-  page.on("pageerror", (error) => {
-    entries.push(`[pageerror] ${error.message}`);
-  });
-
-  const nowIso = new Date().toISOString();
-  const seedNonce = Math.random().toString(36).slice(2);
-  const serverId = process.env.E2E_SERVER_ID;
-  if (!serverId) {
-    throw new Error("E2E_SERVER_ID is not set - expected from Playwright globalSetup.");
-  }
-  const testDaemon = buildSeededHost({
-    serverId,
-    endpoint: `127.0.0.1:${daemonPort}`,
-    nowIso,
-  });
-  const createAgentPreferences = buildCreateAgentPreferences(testDaemon.serverId);
-
-  await page.addInitScript(
-    ({ daemon, preferences, seedNonce: nonce }) => {
-      // `addInitScript` runs on every navigation (including reloads). Some tests intentionally
-      // override storage and reload; they can opt out of seeding for the *next* navigation by
-      // setting this flag before the reload.
-      const disableOnceKey = "@paseo:e2e-disable-default-seed-once";
-      const disableValue = localStorage.getItem(disableOnceKey);
-      if (disableValue) {
-        localStorage.removeItem(disableOnceKey);
-        if (disableValue === nonce) {
-          return;
-        }
+  paseoE2ESetup: [
+    async ({ page }, provide, testInfo) => {
+      const daemonPort = process.env.E2E_DAEMON_PORT;
+      const metroPort = process.env.E2E_METRO_PORT;
+      if (!daemonPort) {
+        throw new Error(
+          "E2E_DAEMON_PORT is not set. Refusing to run e2e against the default daemon (e.g. localhost:6767). " +
+            "Ensure Playwright `globalSetup` starts the e2e daemon and exports E2E_DAEMON_PORT.",
+        );
+      }
+      if (daemonPort === "6767") {
+        throw new Error(
+          "E2E_DAEMON_PORT is 6767. Refusing to run e2e against the default local daemon. " +
+            "Fix Playwright globalSetup to start an isolated test daemon and export its port.",
+        );
+      }
+      if (!metroPort) {
+        throw new Error(
+          "E2E_METRO_PORT is not set. Ensure Playwright `globalSetup` starts Metro and exports E2E_METRO_PORT.",
+        );
      }

-      localStorage.setItem("@paseo:e2e", "1");
-      localStorage.setItem("@paseo:e2e-seed-nonce", nonce);
+      // Hard guardrail: never allow tests to hit the developer's default daemon.
+      // This blocks both HTTP and WS attempts to :6767 (before any navigation).
+      await page.route(/:(6767)\b/, (route) => route.abort());
+      await page.routeWebSocket(/:(6767)\b/, async (ws) => {
+        await ws.close({ code: 1008, reason: "Blocked connection to localhost:6767 during e2e." });
+      });

-      // Hard-reset anything that could point to a developer's real daemon.
-      localStorage.setItem("@paseo:daemon-registry", JSON.stringify([daemon]));
-      localStorage.removeItem("@paseo:settings");
-      localStorage.setItem("@paseo:create-agent-preferences", JSON.stringify(preferences));
+      const entries: string[] = [];
+
+      page.on("console", (message) => {
+        entries.push(`[console:${message.type()}] ${message.text()}`);
+      });
+
+      page.on("pageerror", (error) => {
+        entries.push(`[pageerror] ${error.message}`);
+      });
+
+      const nowIso = new Date().toISOString();
+      const seedNonce = Math.random().toString(36).slice(2);
+      const serverId = process.env.E2E_SERVER_ID;
+      if (!serverId) {
+        throw new Error("E2E_SERVER_ID is not set - expected from Playwright globalSetup.");
+      }
+      const testDaemon = buildSeededHost({
+        serverId,
+        endpoint: `127.0.0.1:${daemonPort}`,
+        nowIso,
+      });
+      const createAgentPreferences = buildCreateAgentPreferences(testDaemon.serverId);
+
+      await page.addInitScript(
+        ({ daemon, preferences, seedNonce: nonce }) => {
+          // `addInitScript` runs on every navigation (including reloads). Some tests intentionally
+          // override storage and reload; they can opt out of seeding for the *next* navigation by
+          // setting this flag before the reload.
+          const disableOnceKey = "@paseo:e2e-disable-default-seed-once";
+          const disableValue = localStorage.getItem(disableOnceKey);
+          if (disableValue) {
+            localStorage.removeItem(disableOnceKey);
+            if (disableValue === nonce) {
+              return;
+            }
+          }
+
+          localStorage.setItem("@paseo:e2e", "1");
+          localStorage.setItem("@paseo:e2e-seed-nonce", nonce);
+
+          // Hard-reset anything that could point to a developer's real daemon.
+          localStorage.setItem("@paseo:daemon-registry", JSON.stringify([daemon]));
+          localStorage.removeItem("@paseo:settings");
+          localStorage.setItem("@paseo:create-agent-preferences", JSON.stringify(preferences));
+        },
+        { daemon: testDaemon, preferences: createAgentPreferences, seedNonce },
+      );
+
+      await provide();
+
+      if (entries.length > 0 && testInfo.status !== testInfo.expectedStatus) {
+        await testInfo.attach("browser-console", {
+          body: entries.join("\n"),
+          contentType: "text/plain",
+        });
+      }
    },
-    { daemon: testDaemon, preferences: createAgentPreferences, seedNonce },
-  );
-});
-
-test.afterEach(async ({ page }, testInfo) => {
-  const entries = consoleEntries.get(page);
-  if (!entries || entries.length === 0) {
-    return;
-  }
-
-  if (testInfo.status === testInfo.expectedStatus) {
-    return;
-  }
-
-  await testInfo.attach("browser-console", {
-    body: entries.join("\n"),
-    contentType: "text/plain",
-  });
+    { auto: true },
+  ],
+  withWorkspace: async ({ page }, provide) => {
+    const handle = createWithWorkspace(page);
+    await provide(handle.withWorkspace);
+    await handle.cleanup();
+  },
 });

 export { test, expect, type Page };
@@ -585,6 +585,7 @@ function startDaemon(args: DaemonSpawnArgs): ChildProcess {
      PASEO_CORS_ORIGINS: `http://localhost:${args.metroPort}`,
      PASEO_DICTATION_ENABLED: openAiUsable ? "1" : "0",
      PASEO_VOICE_MODE_ENABLED: openAiUsable ? "1" : "0",
+      PASEO_NODE_ENV: "development",
      ...(openAiUsable
        ? {
            PASEO_DICTATION_STT_PROVIDER: "openai",
@@ -0,0 +1,17 @@
+import { expect, type Page } from "@playwright/test";
+
+export async function awaitAssistantMessage(page: Page, hasText?: string | RegExp): Promise<void> {
+  const messages = page.getByTestId("assistant-message");
+  const target = hasText === undefined ? messages.first() : messages.filter({ hasText }).first();
+  await expect(target).toBeVisible({ timeout: 30_000 });
+}
+
+export async function awaitToolCall(page: Page, toolName: string | RegExp): Promise<void> {
+  await expect(
+    page.getByTestId("tool-call-badge").filter({ hasText: toolName }).first(),
+  ).toBeVisible({ timeout: 30_000 });
+}
+
+export async function expectAgentIdle(page: Page, timeout = 30_000): Promise<void> {
+  await expect(page.getByRole("button", { name: /stop|cancel/i })).toHaveCount(0, { timeout });
+}
@@ -658,23 +658,6 @@ export const createAgentInRepo = async (
  await createAgent(page, config.prompt);
 };

-export const waitForPermissionPrompt = async (page: Page, timeout = 30000) => {
-  const promptText = page.getByTestId("permission-request-question").first();
-  await expect(promptText).toBeVisible({ timeout });
-};
-
-export const allowPermission = async (page: Page) => {
-  const acceptButton = page.getByTestId("permission-request-accept").first();
-  await expect(acceptButton).toBeVisible({ timeout: 5000 });
-  await acceptButton.click();
-};
-
-export const denyPermission = async (page: Page) => {
-  const denyButton = page.getByTestId("permission-request-deny").first();
-  await expect(denyButton).toBeVisible({ timeout: 5000 });
-  await denyButton.click();
-};
-
 export async function waitForAgentFinishUI(page: Page, timeout = 30000) {
  // Wait for the stop button to disappear
  const stopButton = page.getByRole("button", { name: /stop|cancel/i });
@@ -0,0 +1,18 @@
+import { expect, type Page } from "@playwright/test";
+
+function composerInput(page: Page) {
+  return page.getByRole("textbox", { name: "Message agent..." }).first();
+}
+
+export async function submitMessage(page: Page, text: string): Promise<void> {
+  const input = composerInput(page);
+  await expect(input).toBeEditable({ timeout: 30_000 });
+  await input.fill(text);
+  await input.press("Enter");
+}
+
+export async function cancelAgent(page: Page): Promise<void> {
+  const stopButton = page.getByRole("button", { name: /stop|cancel/i }).first();
+  await expect(stopButton).toBeVisible({ timeout: 10_000 });
+  await stopButton.click();
+}
@@ -0,0 +1,17 @@
+import { expect, type Page } from "@playwright/test";
+
+export async function waitForPermissionPrompt(page: Page, timeout = 30_000): Promise<void> {
+  await expect(page.getByTestId("permission-request-question").first()).toBeVisible({ timeout });
+}
+
+export async function allowPermission(page: Page): Promise<void> {
+  const acceptButton = page.getByTestId("permission-request-accept").first();
+  await expect(acceptButton).toBeVisible({ timeout: 5_000 });
+  await acceptButton.click();
+}
+
+export async function denyPermission(page: Page): Promise<void> {
+  const denyButton = page.getByTestId("permission-request-deny").first();
+  await expect(denyButton).toBeVisible({ timeout: 5_000 });
+  await denyButton.click();
+}
@@ -0,0 +1,52 @@
+import { expect, type Page } from "@playwright/test";
+
+const SECTION_LABELS = {
+  general: "General",
+  shortcuts: "Shortcuts",
+  integrations: "Integrations",
+  permissions: "Permissions",
+  diagnostics: "Diagnostics",
+  about: "About",
+} as const;
+
+export type SettingsSection = keyof typeof SECTION_LABELS | "projects";
+
+export async function openSettingsSection(page: Page, section: SettingsSection): Promise<void> {
+  const sidebar = page.getByTestId("settings-sidebar");
+  await expect(sidebar).toBeVisible();
+
+  if (section === "projects") {
+    await page.getByTestId("settings-projects").click();
+    await expect(page).toHaveURL(/\/settings\/projects$/);
+    return;
+  }
+
+  await sidebar.getByRole("button", { name: SECTION_LABELS[section], exact: true }).click();
+  await expect(page).toHaveURL(new RegExp(`/settings/${section}$`));
+}
+
+export async function openSettingsHost(page: Page, serverId: string): Promise<void> {
+  await page.getByTestId(`settings-host-entry-${serverId}`).click();
+  await expect(page.getByTestId(`settings-host-page-${serverId}`)).toBeVisible();
+}
+
+export async function expectSettingsHeader(page: Page, title: string): Promise<void> {
+  await expect(page.getByTestId("settings-detail-header-title")).toHaveText(title);
+}
+
+export async function openAddHostFlow(page: Page): Promise<void> {
+  await page.getByTestId("settings-add-host").click();
+  await expect(page.getByText("Add connection", { exact: true })).toBeVisible();
+}
+
+export async function selectHostConnectionType(
+  page: Page,
+  type: "direct" | "relay",
+): Promise<void> {
+  const label = type === "direct" ? "Direct connection" : "Paste pairing link";
+  await page.getByRole("button", { name: label }).click();
+}
+
+export async function toggleHostAdvanced(page: Page): Promise<void> {
+  await page.getByTestId("direct-host-advanced-toggle").click();
+}
@@ -0,0 +1,21 @@
+import { expect, type Page } from "@playwright/test";
+
+function requireServerId(): string {
+  const serverId = process.env.E2E_SERVER_ID;
+  if (!serverId) {
+    throw new Error("E2E_SERVER_ID is not set (expected from Playwright globalSetup).");
+  }
+  return serverId;
+}
+
+export async function selectWorkspaceInSidebar(page: Page, workspaceId: string): Promise<void> {
+  const row = page.getByTestId(`sidebar-workspace-row-${requireServerId()}:${workspaceId}`);
+  await expect(row).toBeVisible({ timeout: 30_000 });
+  await row.click();
+}
+
+export async function expectWorkspaceListed(page: Page, name: string): Promise<void> {
+  await expect(
+    page.locator('[data-testid^="sidebar-workspace-row-"]').filter({ hasText: name }).first(),
+  ).toBeVisible({ timeout: 30_000 });
+}
@@ -140,7 +140,6 @@ class StartupAssertions {

  async expectsReconnectWelcome(): Promise<this> {
    await expect(this.page.getByTestId("welcome-screen")).toBeVisible({ timeout: 15_000 });
-    await expect(this.page.getByText("Connecting…", { exact: true })).toBeVisible();
    await expect(this.page.getByTestId("welcome-open-settings")).toBeVisible();
    await expect(this.page.getByTestId("welcome-direct-connection")).toBeVisible();
    await expect(this.page.getByTestId("welcome-paste-pairing-link")).toBeVisible();
@@ -164,7 +163,7 @@ class StartupAssertions {
  }

  async expectsDesktopDaemonStartup(): Promise<this> {
-    await expect(this.page.getByText("Starting local server...", { exact: true })).toBeVisible({
+    await expect(this.page.getByTestId("startup-splash")).toBeVisible({
      timeout: 15_000,
    });
    return this;
@@ -24,6 +24,10 @@ export interface TerminalPerfDaemonClient {
    cwd: string;
    title?: string;
    modeId?: string;
+    model?: string;
+    thinkingOptionId?: string;
+    featureValues?: Record<string, unknown>;
+    initialPrompt?: string;
  }): Promise<{ id: string; status: string }>;
  sendAgentMessage(agentId: string, text: string): Promise<void>;
  subscribeTerminal(
@@ -204,8 +204,7 @@ export async function installTerminalRenderProbe(page: Page): Promise<void> {
        if (next?.write && !next.__paseoRenderProbeWriteWrapped) {
          const originalWrite = next.write.bind(next);
          next.write = (data: string | Uint8Array, callback?: () => void) => {
-            const text =
-              typeof data === "string" ? data : new TextDecoder().decode(data as Uint8Array);
+            const text = typeof data === "string" ? data : new TextDecoder().decode(data);
            probe.writeCount += 1;
            const preview = text
              .replaceAll("\u001b", "\\x1b")
@@ -424,7 +423,7 @@ export async function installTerminalKeystrokeStressProbe(page: Page): Promise<v
      const count = Math.min(from.length, to.length);
      const values: number[] = [];
      for (let index = 0; index < count; index += 1) {
-        values.push(to[index]!.at - from[index]!.at);
+        values.push(to[index].at - from[index].at);
      }
      return values;
    }
@@ -459,7 +458,7 @@ export async function installTerminalKeystrokeStressProbe(page: Page): Promise<v
        const keydownToInputFrame = this.keydowns
          .map((keydown) => firstAtOrAfter(this.inputFrames, keydown.at)?.at ?? null)
          .filter((at): at is number => at !== null)
-          .map((at, index) => at - this.keydowns[index]!.at);
+          .map((at, index) => at - this.keydowns[index].at);
        const inputFrameToOutputFrame = this.inputFrames
          .map((input) => {
            const output = firstAtOrAfter(this.outputFrames, input.at);
@@ -663,8 +662,7 @@ export async function installTerminalKeystrokeStressProbe(page: Page): Promise<v
        if (next?.write && !next.__paseoKeystrokeProbeWriteWrapped) {
          const originalWrite = next.write.bind(next);
          next.write = (data: string | Uint8Array, callback?: () => void) => {
-            const text =
-              typeof data === "string" ? data : new TextDecoder().decode(data as Uint8Array);
+            const text = typeof data === "string" ? data : new TextDecoder().decode(data);
            const event: XtermWriteEvent = {
              at: performance.now(),
              committedAt: null,
@@ -0,0 +1,105 @@
+import { execSync } from "node:child_process";
+import { realpath } from "node:fs/promises";
+import path from "node:path";
+import type { Page } from "@playwright/test";
+import { waitForTabBar } from "./launcher";
+import { selectWorkspaceInSidebar } from "./sidebar";
+import { createTempGitRepo } from "./workspace";
+import {
+  connectWorkspaceSetupClient,
+  openHomeWithProject,
+  type WorkspaceSetupDaemonClient,
+} from "./workspace-setup";
+
+export interface CreatedWorkspace {
+  workspaceId: string;
+  repoPath: string;
+  navigateTo(): Promise<void>;
+}
+
+export interface WithWorkspaceOptions {
+  worktree?: boolean;
+  prefix?: string;
+}
+
+export type WithWorkspace = (options?: WithWorkspaceOptions) => Promise<CreatedWorkspace>;
+
+interface WorktreeRecord {
+  repoPath: string;
+  worktreePath: string;
+}
+
+export interface WithWorkspaceHandle {
+  withWorkspace: WithWorkspace;
+  cleanup: () => Promise<void>;
+}
+
+export function createWithWorkspace(page: Page): WithWorkspaceHandle {
+  let client: WorkspaceSetupDaemonClient | null = null;
+  const repos: Array<{ cleanup: () => Promise<void> }> = [];
+  const worktrees: WorktreeRecord[] = [];
+
+  const withWorkspace: WithWorkspace = async (options) => {
+    if (!client) {
+      client = await connectWorkspaceSetupClient();
+    }
+    const prefix = options?.prefix ?? (options?.worktree ? "wt-" : "ws-");
+    const repo = await createTempGitRepo(prefix);
+    repos.push(repo);
+
+    let workspacePath = repo.path;
+    if (options?.worktree) {
+      const tempRoot = await realpath("/tmp");
+      workspacePath = path.join(
+        tempRoot,
+        `paseo-wt-${Date.now()}-${Math.random().toString(36).slice(2)}`,
+      );
+      const branchName = `paseo-wt-${Date.now()}`;
+      execSync(
+        `git worktree add ${JSON.stringify(workspacePath)} -b ${JSON.stringify(branchName)} main`,
+        { cwd: repo.path, stdio: "ignore" },
+      );
+      worktrees.push({ repoPath: repo.path, worktreePath: workspacePath });
+      // Register the parent project so the sidebar lists it before we navigate.
+      await client.openProject(repo.path);
+    }
+
+    const opened = await client.openProject(workspacePath);
+    if (!opened.workspace) {
+      throw new Error(opened.error ?? `Failed to open project ${workspacePath}`);
+    }
+    const workspaceId = opened.workspace.id;
+
+    return {
+      workspaceId,
+      repoPath: workspacePath,
+      navigateTo: async () => {
+        await openHomeWithProject(page, repo.path);
+        await selectWorkspaceInSidebar(page, workspaceId);
+        await waitForTabBar(page);
+      },
+    };
+  };
+
+  return {
+    withWorkspace,
+    cleanup: async () => {
+      for (const { repoPath, worktreePath } of worktrees) {
+        try {
+          execSync(`git worktree remove ${JSON.stringify(worktreePath)} --force`, {
+            cwd: repoPath,
+            stdio: "ignore",
+          });
+        } catch {
+          // Best-effort cleanup so the original test failure is preserved.
+        }
+      }
+      for (const repo of repos) {
+        await repo.cleanup();
+      }
+      if (client) {
+        await client.close().catch(() => undefined);
+      }
+    },
+  };
+}
@@ -265,7 +265,7 @@ export async function createWorkspaceThroughDaemon(
    throw new Error(result.error ?? `Failed to create workspace for ${input.cwd}`);
  }
  return {
-    id: String(result.workspace.id),
+    id: result.workspace.id,
    name: result.workspace.name,
  };
 }
@@ -291,7 +291,7 @@ export async function findWorktreeWorkspaceForProject(
    throw new Error(`Failed to find created worktree workspace for ${repoPath}`);
  }
  return {
-    id: String(workspace.id),
+    id: workspace.id,
    name: workspace.name,
    projectRootPath: workspace.projectRootPath,
    workspaceDirectory: workspace.workspaceDirectory,
@@ -308,7 +308,7 @@ export async function fetchWorkspaceById(
  projectRootPath: string;
 }> {
  const payload = await client.fetchWorkspaces();
-  const workspace = payload.entries.find((entry) => String(entry.id) === workspaceId) ?? null;
+  const workspace = payload.entries.find((entry) => entry.id === workspaceId) ?? null;
  if (!workspace) {
    throw new Error(`Workspace not found: ${workspaceId}`);
  }
@@ -9,10 +9,35 @@ interface TempRepo {
  cleanup: () => Promise<void>;
 }

+async function configureRemote(input: {
+  repoPath: string;
+  withRemote: boolean;
+  originUrl: string | undefined;
+}): Promise<void> {
+  const { repoPath, withRemote, originUrl } = input;
+  if (withRemote) {
+    // Deterministic local remote to avoid relying on external auth/network in e2e.
+    const remoteDir = path.join(repoPath, "remote.git");
+    await mkdir(remoteDir, { recursive: true });
+    execSync(`git init --bare -b main ${remoteDir}`, { cwd: repoPath, stdio: "ignore" });
+    execSync(`git remote add origin ${remoteDir}`, { cwd: repoPath, stdio: "ignore" });
+    execSync("git push -u origin --all", { cwd: repoPath, stdio: "ignore" });
+    return;
+  }
+  if (originUrl) {
+    // Daemon reads origin for project grouping; no fetch occurs, so a synthetic URL is fine.
+    execSync(`git remote add origin ${JSON.stringify(originUrl)}`, {
+      cwd: repoPath,
+      stdio: "ignore",
+    });
+  }
+}
+
 export const createTempGitRepo = async (
  prefix = "paseo-e2e-",
  options?: {
    withRemote?: boolean;
+    originUrl?: string;
    paseoConfig?: Record<string, unknown>;
    files?: Array<{ path: string; content: string }>;
    branches?: string[];
@@ -74,14 +99,7 @@ export const createTempGitRepo = async (
    execSync("git checkout main", { cwd: repoPath, stdio: "ignore" });
  }

-  if (withRemote) {
-    // Deterministic local remote to avoid relying on external auth/network in e2e.
-    const remoteDir = path.join(repoPath, "remote.git");
-    await mkdir(remoteDir, { recursive: true });
-    execSync(`git init --bare -b main ${remoteDir}`, { cwd: repoPath, stdio: "ignore" });
-    execSync(`git remote add origin ${remoteDir}`, { cwd: repoPath, stdio: "ignore" });
-    execSync("git push -u origin --all", { cwd: repoPath, stdio: "ignore" });
-  }
+  await configureRemote({ repoPath, withRemote, originUrl: options?.originUrl });

  return {
    path: repoPath,
@@ -32,7 +32,7 @@ test.beforeAll(async () => {
  seedClient = await connectTerminalClient();
  const result = await seedClient.openProject(tempRepo.path);
  if (!result.workspace) throw new Error(result.error ?? "Failed to seed workspace");
-  workspaceId = String(result.workspace.id);
+  workspaceId = result.workspace.id;
 });

 test.afterAll(async () => {
@@ -1,7 +1,7 @@
 import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { expect, test as base, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { gotoAppShell, openSettings } from "./helpers/app";
 import { connectNewWorkspaceDaemonClient, openProjectViaDaemon } from "./helpers/new-workspace";
 import { createTempGitRepo } from "./helpers/workspace";

@@ -14,6 +14,7 @@ interface ProjectsSettingsProject {

 interface ProjectsSettingsFixtures {
  editableProject: ProjectsSettingsProject;
+  gitlabRemoteProject: ProjectsSettingsProject;
 }

 const initialPaseoConfig = {
@@ -46,6 +47,22 @@ const test = base.extend<ProjectsSettingsFixtures>({
      path: repo.path,
    });

+    await client.close();
+    await repo.cleanup();
+  },
+  gitlabRemoteProject: async ({ page: _page }, provide) => {
+    const client = await connectNewWorkspaceDaemonClient();
+    const repo = await createTempGitRepo("projects-settings-gitlab-", {
+      paseoConfig: initialPaseoConfig,
+      originUrl: "https://gitlab.com/acme/app.git",
+    });
+    const openedProject = await openProjectViaDaemon(client, repo.path);
+
+    await provide({
+      name: openedProject.projectDisplayName,
+      path: repo.path,
+    });
+
    await client.close();
    await repo.cleanup();
  },
@@ -53,19 +70,22 @@ const test = base.extend<ProjectsSettingsFixtures>({

 async function openProjects(page: Page): Promise<void> {
  await gotoAppShell(page);
-  await page.getByRole("button", { name: "Projects", exact: true }).click();
-  await expect(page).toHaveURL(/\/projects$/);
+  await openSettings(page);
+  await page.getByTestId("settings-projects").click();
+  await expect(page).toHaveURL(/\/settings\/projects$/);
 }

 async function openProjectSettings(page: Page, projectName: string): Promise<void> {
-  await page.getByRole("button", { name: `${projectName} project details` }).click();
-  await expect(page.getByRole("textbox", { name: "Worktree setup" })).toBeVisible({
+  await page.getByRole("button", { name: `Edit ${projectName}`, exact: true }).click();
+  await expect(page.getByRole("textbox", { name: "Worktree setup commands" })).toBeVisible({
    timeout: 30_000,
  });
 }

 async function editWorktreeSetup(page: Page, setupCommands: string[]): Promise<void> {
-  await page.getByRole("textbox", { name: "Worktree setup" }).fill(setupCommands.join("\n"));
+  await page
+    .getByRole("textbox", { name: "Worktree setup commands" })
+    .fill(setupCommands.join("\n"));
 }

 async function saveProjectConfig(page: Page): Promise<void> {
@@ -116,4 +136,16 @@ test.describe("Projects settings", () => {
    await saveProjectConfig(page);
    await expectProjectConfigSaved(editableProject);
  });
+
+  test("user edits worktree setup on a non-GitHub remote project", async ({
+    page,
+    gitlabRemoteProject,
+  }) => {
+    expect(gitlabRemoteProject.name).toBe("acme/app");
+    await openProjects(page);
+    await openProjectSettings(page, gitlabRemoteProject.name);
+    await editWorktreeSetup(page, updatedSetup);
+    await saveProjectConfig(page);
+    await expectProjectConfigSaved(gitlabRemoteProject);
+  });
 });
@@ -1,6 +1,7 @@
 import { test, expect, type Page } from "./fixtures";
 import { gotoAppShell, openSettings } from "./helpers/app";
 import { TEST_HOST_LABEL } from "./helpers/daemon-registry";
+import { expectSettingsHeader, openSettingsHost } from "./helpers/settings";

 function getSeededServerId(): string {
  const serverId = process.env.E2E_SERVER_ID;
@@ -18,13 +19,8 @@ function getSeededDaemonPort(): string {
  return port;
 }

-async function openHostPage(page: Page, serverId: string) {
-  await page.getByTestId(`settings-host-entry-${serverId}`).click();
-  await expect(page.getByTestId(`settings-host-page-${serverId}`)).toBeVisible();
-}
-
 async function expectHostLabelHeader(page: Page) {
-  await expect(page.getByTestId("settings-detail-header-title")).toHaveText(TEST_HOST_LABEL);
+  await expectSettingsHeader(page, TEST_HOST_LABEL);
  await expect(page.getByTestId("host-page-label-edit-button")).toBeVisible();
  await expect(page.getByTestId("host-page-label-input")).toHaveCount(0);
 }
@@ -38,7 +34,7 @@ test.describe("Settings host page", () => {

    await gotoAppShell(page);
    await openSettings(page);
-    await openHostPage(page, serverId);
+    await openSettingsHost(page, serverId);

    // Label renders in the detail header with a pencil edit affordance; the input is hidden until edit.
    await expectHostLabelHeader(page);
@@ -53,8 +49,7 @@ test.describe("Settings host page", () => {

    const injectMcpCard = page.getByTestId("host-page-inject-mcp-card");
    await expect(injectMcpCard).toBeVisible();
-    await expect(injectMcpCard.getByRole("button", { name: "On", exact: true })).toBeVisible();
-    await expect(injectMcpCard.getByRole("button", { name: "Off", exact: true })).toBeVisible();
+    await expect(injectMcpCard.getByRole("switch", { name: "Inject Paseo tools" })).toBeVisible();

    await expect(page.getByTestId("host-page-restart-card")).toBeVisible();
    await expect(page.getByTestId("host-page-restart-button")).toBeVisible();
@@ -68,7 +63,7 @@ test.describe("Settings host page", () => {

    await gotoAppShell(page);
    await openSettings(page);
-    await openHostPage(page, serverId);
+    await openSettingsHost(page, serverId);

    await expect(page.getByTestId("host-page-label-input")).toHaveCount(0);

@@ -86,7 +81,7 @@ test.describe("Settings host page", () => {

    await gotoAppShell(page);
    await openSettings(page);
-    await openHostPage(page, serverId);
+    await openSettingsHost(page, serverId);

    // TODO: add local-daemon fixture for positive Pair/Daemon coverage.
    // Pair-device now lives behind a row that only the local host sees
@@ -130,13 +125,10 @@ test.describe("Settings host page", () => {
    const serverId = getSeededServerId();

    // Simulate the Electron desktop bridge so `useIsLocalDaemon` resolves the
-    // seeded host to the local daemon. `manageBuiltInDaemon: false` bypasses
-    // the desktop bootstrap flow so only the sidebar's status query runs.
+    // seeded host to the local daemon. `manageBuiltInDaemon: false` (returned
+    // from get_desktop_settings) bypasses the desktop bootstrap flow so only
+    // the sidebar's status query runs against the seeded test daemon.
    await page.addInitScript((localServerId) => {
-      localStorage.setItem(
-        "@paseo:app-settings",
-        JSON.stringify({ theme: "auto", manageBuiltInDaemon: false, sendBehavior: "interrupt" }),
-      );
      (window as unknown as { paseoDesktop: unknown }).paseoDesktop = {
        platform: "darwin",
        invoke: async (command: string) => {
@@ -153,6 +145,12 @@ test.describe("Settings host page", () => {
              error: null,
            };
          }
+          if (command === "get_desktop_settings") {
+            return {
+              releaseChannel: "stable",
+              daemon: { manageBuiltInDaemon: false, keepRunningAfterQuit: true },
+            };
+          }
          return null;
        },
        getPendingOpenProject: async () => null,
@@ -59,6 +59,35 @@ test.describe("Settings sidebar navigation", () => {
    await expect(page.getByRole("button", { name: "Paste pairing link" })).toBeVisible();
  });

+  test("direct connection advanced URI round-trips SSL and password into the form", async ({
+    page,
+  }) => {
+    await gotoAppShell(page);
+    await openSettings(page);
+
+    await page.getByTestId("settings-add-host").click();
+    await page.getByRole("button", { name: "Direct connection" }).click();
+
+    await page.getByTestId("direct-host-advanced-toggle").click();
+    await page
+      .getByTestId("direct-host-uri-input")
+      .fill("tcp://example.paseo.test:7443?ssl=true&password=shared-secret");
+    await page.getByTestId("direct-host-advanced-toggle").click();
+
+    await expect(page.getByTestId("direct-host-input")).toHaveValue("example.paseo.test");
+    await expect(page.getByTestId("direct-port-input")).toHaveValue("7443");
+    await expect(page.getByTestId("direct-ssl-toggle-checked")).toBeVisible();
+    await expect(page.getByTestId("direct-password-input")).toHaveValue("shared-secret");
+    await expect(page.getByTestId("direct-host-uri-input")).toHaveCount(0);
+
+    await page.getByTestId("direct-host-advanced-toggle").click();
+    await expect(page.getByTestId("direct-host-uri-input")).toHaveValue(
+      "tcp://example.paseo.test:7443?ssl=true&password=shared-secret",
+    );
+    await page.getByTestId("direct-host-advanced-toggle").click();
+    await expect(page.getByTestId("direct-host-uri-input")).toHaveCount(0);
+  });
+
  test("sidebar shows a Back to workspace row that leaves /settings", async ({ page }) => {
    await gotoAppShell(page);
    await openSettings(page);
@@ -52,7 +52,7 @@ async function openProjectViaDaemon(
    throw new Error(result.error ?? `Failed to open project ${cwd}`);
  }
  return {
-    id: String(result.workspace.id),
+    id: result.workspace.id,
    name: result.workspace.name,
  };
 }
@@ -31,12 +31,12 @@ async function readTerminalLayoutMetrics(page: Page): Promise<TerminalLayoutMetr
      return rect.width > 0 && rect.height > 0;
    });
    const surface = visibleSurfaces[0] ?? null;
-    const renderedRows = Array.from(document.querySelectorAll<HTMLElement>(".xterm-rows > div"));
-    const firstRow = renderedRows[0] ?? null;
-    const lastRow = renderedRows.at(-1) ?? null;
    const surfaceRect = surface?.getBoundingClientRect() ?? null;
-    const firstRowRect = firstRow?.getBoundingClientRect() ?? null;
-    const lastRowRect = lastRow?.getBoundingClientRect() ?? null;
+    // xterm.js exposes `.xterm-screen` regardless of renderer (DOM, canvas, WebGL),
+    // so use it as the canonical "rendered surface" rect rather than `.xterm-rows`
+    // which is only populated by the DOM renderer.
+    const xtermScreen = surface?.querySelector<HTMLElement>(".xterm-screen") ?? null;
+    const xtermScreenRect = xtermScreen?.getBoundingClientRect() ?? null;
    const term = (
      window as Window & {
        __paseoTerminal?: {
@@ -49,11 +49,10 @@ async function readTerminalLayoutMetrics(page: Page): Promise<TerminalLayoutMetr
    return {
      visibleSurfaceCount: visibleSurfaces.length,
      surfaceHeight: surfaceRect?.height ?? 0,
-      rowCount: renderedRows.length,
+      rowCount: typeof term?.rows === "number" ? term.rows : 0,
      rows: typeof term?.rows === "number" ? term.rows : null,
      cols: typeof term?.cols === "number" ? term.cols : null,
-      renderedRowsHeight:
-        firstRowRect && lastRowRect ? Math.max(0, lastRowRect.bottom - firstRowRect.top) : 0,
+      renderedRowsHeight: xtermScreenRect?.height ?? 0,
      tabIds: currentTabIds,
    };
  }, tabIds);
@@ -68,6 +68,22 @@ terminalPerfDescribe("Terminal keystroke stress", () => {
    expect(appBaselineReport.outputFramePayloadBytes).toBeGreaterThanOrEqual(INPUT_TEXT.length);
    expect(appBaselineReport.keydownToXtermCommitMs?.count ?? 0).toBeGreaterThan(0);

+    const appObserveNodeBurstReport = await measureAppObservingNodeBurstEcho({
+      page,
+      harness,
+      terminalName: "app-observe-node-burst",
+    });
+    await attachJson(testInfo, "app-observe-node-burst", appObserveNodeBurstReport);
+    console.log(
+      "[terminal-stress-app-observe-node-burst]",
+      JSON.stringify(appObserveNodeBurstReport),
+    );
+
+    expect(appObserveNodeBurstReport.outputFramePayloadBytes).toBeGreaterThanOrEqual(
+      INPUT_TEXT.length,
+    );
+    expect(appObserveNodeBurstReport.xtermWriteCount).toBeGreaterThan(0);
+
    const appSmallChunksReport = await measureAppBurstEcho({
      page,
      harness,
@@ -172,6 +188,34 @@ async function measureAppBurstEcho(input: {
  }
 }

+async function measureAppObservingNodeBurstEcho(input: {
+  page: Page;
+  harness: TerminalE2EHarness;
+  terminalName: string;
+}) {
+  const appTerminal = await input.harness.createTerminal({ name: input.terminalName });
+  try {
+    await input.harness.openTerminal(input.page, { terminalId: appTerminal.id });
+    await input.harness.setupPrompt(input.page);
+
+    await resetTerminalKeystrokeStressProbe(input.page);
+
+    for (const char of INPUT_TEXT) {
+      input.harness.client.sendTerminalInput(appTerminal.id, {
+        type: "input",
+        data: char,
+      });
+    }
+
+    await waitForAppStressEcho(input.page, INPUT_TEXT);
+    await waitForAppProbePayload(input.page, INPUT_TEXT.length);
+
+    return readTerminalKeystrokeStressReport(input.page, INPUT_TEXT);
+  } finally {
+    await input.harness.killTerminal(appTerminal.id);
+  }
+}
+
 async function emitRapidAgentStreamUpdates(
  harness: TerminalE2EHarness,
  input: { agentId: string; count: number },
@@ -234,7 +278,7 @@ async function measureDaemonBurstEcho(
      timeoutMs: STRESS_TIMEOUT_MS,
    });

-    const latencies = sendTimes.map((sentAt, index) => outputTimesByByte[index]! - sentAt);
+    const latencies = sendTimes.map((sentAt, index) => outputTimesByByte[index] - sentAt);
    return {
      inputTextLength: inputText.length,
      inputFrameCount: sendTimes.length,
@@ -45,7 +45,7 @@ test.describe("Workspace cwd correctness", () => {
      if (!workspaceResult.workspace) {
        throw new Error(workspaceResult.error ?? `Failed to open project ${repo.path}`);
      }
-      const workspaceId = String(workspaceResult.workspace.id);
+      const workspaceId = workspaceResult.workspace.id;

      // Use sidebar navigation to avoid Expo Router hydration issues
      await openHomeWithProject(page, repo.path);
@@ -95,7 +95,7 @@ test.describe("Workspace cwd correctness", () => {
      if (!workspaceResult.workspace) {
        throw new Error(workspaceResult.error ?? `Failed to open project ${worktreePath}`);
      }
-      const workspaceId = String(workspaceResult.workspace.id);
+      const workspaceId = workspaceResult.workspace.id;

      // Use sidebar navigation to avoid Expo Router hydration issues
      // with direct URL navigation to the 2nd+ workspace.
@@ -1,39 +1,9 @@
-import { execSync } from "node:child_process";
-import { realpathSync } from "node:fs";
-import path from "node:path";
-import { expect, test } from "./fixtures";
-import { waitForTabBar } from "./helpers/launcher";
-import { createTempGitRepo } from "./helpers/workspace";
+import { test } from "./fixtures";
 import {
  createAgentChatFromLauncher,
  createStandaloneTerminalFromLauncher,
  expectTerminalCwd,
 } from "./helpers/workspace-lifecycle";
-import {
-  connectWorkspaceSetupClient,
-  openHomeWithProject,
-  seedProjectForWorkspaceSetup,
-} from "./helpers/workspace-setup";
-
-function getServerId(): string {
-  const serverId = process.env.E2E_SERVER_ID;
-  if (!serverId) {
-    throw new Error("E2E_SERVER_ID is not set.");
-  }
-  return serverId;
-}
-
-/** Navigate to a workspace via sidebar row testID and wait for the tab bar. */
-async function navigateToWorkspaceViaSidebar(
-  page: import("@playwright/test").Page,
-  workspaceId: string,
-): Promise<void> {
-  const testId = `sidebar-workspace-row-${getServerId()}:${workspaceId}`;
-  const row = page.getByTestId(testId);
-  await expect(row).toBeVisible({ timeout: 30_000 });
-  await row.click();
-  await waitForTabBar(page);
-}

 test.describe("Workspace lifecycle", () => {
  // The first test after a spec-file switch can intermittently fail because
@@ -42,154 +12,36 @@ test.describe("Workspace lifecycle", () => {
  test.describe.configure({ retries: 1 });

  test.describe("Main checkout", () => {
-    test("creates an agent chat via New Chat", async ({ page }) => {
+    test("creates an agent chat via New Chat", async ({ page, withWorkspace }) => {
      test.setTimeout(60_000);
-
-      const client = await connectWorkspaceSetupClient();
-      const repo = await createTempGitRepo("lifecycle-main-chat-");
-
-      try {
-        await seedProjectForWorkspaceSetup(client, repo.path);
-        const workspaceResult = await client.openProject(repo.path);
-        if (!workspaceResult.workspace) {
-          throw new Error(workspaceResult.error ?? `Failed to open project ${repo.path}`);
-        }
-        const workspaceId = String(workspaceResult.workspace.id);
-
-        await openHomeWithProject(page, repo.path);
-        await navigateToWorkspaceViaSidebar(page, workspaceId);
-        await createAgentChatFromLauncher(page);
-      } finally {
-        await client.close();
-        await repo.cleanup();
-      }
+      const workspace = await withWorkspace({ prefix: "lifecycle-main-chat-" });
+      await workspace.navigateTo();
+      await createAgentChatFromLauncher(page);
    });

-    test("creates a terminal with correct CWD", async ({ page }) => {
+    test("creates a terminal with correct CWD", async ({ page, withWorkspace }) => {
      test.setTimeout(60_000);
-
-      const client = await connectWorkspaceSetupClient();
-      const repo = await createTempGitRepo("lifecycle-main-shell-");
-
-      try {
-        await seedProjectForWorkspaceSetup(client, repo.path);
-        const workspaceResult = await client.openProject(repo.path);
-        if (!workspaceResult.workspace) {
-          throw new Error(workspaceResult.error ?? `Failed to open project ${repo.path}`);
-        }
-        const workspaceId = String(workspaceResult.workspace.id);
-
-        await openHomeWithProject(page, repo.path);
-        await navigateToWorkspaceViaSidebar(page, workspaceId);
-        await createStandaloneTerminalFromLauncher(page);
-        await expectTerminalCwd(page, repo.path);
-      } finally {
-        await client.close();
-        await repo.cleanup();
-      }
+      const workspace = await withWorkspace({ prefix: "lifecycle-main-shell-" });
+      await workspace.navigateTo();
+      await createStandaloneTerminalFromLauncher(page);
+      await expectTerminalCwd(page, workspace.repoPath);
    });
  });

  test.describe("Worktree workspace", () => {
-    test("creates an agent chat via New Chat", async ({ page }) => {
+    test("creates an agent chat via New Chat", async ({ page, withWorkspace }) => {
      test.setTimeout(90_000);
-
-      const client = await connectWorkspaceSetupClient();
-      const repo = await createTempGitRepo("lifecycle-wt-chat-");
-      const resolvedTmp = realpathSync("/tmp");
-      const worktreePath = path.join(
-        resolvedTmp,
-        `paseo-wt-${Date.now()}-${Math.random().toString(36).slice(2)}`,
-      );
-      const branchName = `lifecycle-wt-chat-${Date.now()}`;
-      let worktreeCreated = false;
-
-      try {
-        await seedProjectForWorkspaceSetup(client, repo.path);
-
-        execSync(
-          `git worktree add ${JSON.stringify(worktreePath)} -b ${JSON.stringify(branchName)} main`,
-          {
-            cwd: repo.path,
-            stdio: "ignore",
-          },
-        );
-        worktreeCreated = true;
-
-        const workspaceResult = await client.openProject(worktreePath);
-        if (!workspaceResult.workspace) {
-          throw new Error(workspaceResult.error ?? `Failed to open project ${worktreePath}`);
-        }
-        const workspaceId = String(workspaceResult.workspace.id);
-
-        await openHomeWithProject(page, repo.path);
-        await navigateToWorkspaceViaSidebar(page, workspaceId);
-        await createAgentChatFromLauncher(page);
-      } finally {
-        if (worktreeCreated) {
-          try {
-            execSync(`git worktree remove ${JSON.stringify(worktreePath)} --force`, {
-              cwd: repo.path,
-              stdio: "ignore",
-            });
-          } catch {
-            // Best-effort cleanup so test failures preserve the original error.
-          }
-        }
-        await client.close();
-        await repo.cleanup();
-      }
+      const workspace = await withWorkspace({ worktree: true, prefix: "lifecycle-wt-chat-" });
+      await workspace.navigateTo();
+      await createAgentChatFromLauncher(page);
    });

-    test("creates a terminal with correct CWD", async ({ page }) => {
+    test("creates a terminal with correct CWD", async ({ page, withWorkspace }) => {
      test.setTimeout(90_000);
-
-      const client = await connectWorkspaceSetupClient();
-      const repo = await createTempGitRepo("lifecycle-wt-shell-");
-      const resolvedTmp = realpathSync("/tmp");
-      const worktreePath = path.join(
-        resolvedTmp,
-        `paseo-wt-${Date.now()}-${Math.random().toString(36).slice(2)}`,
-      );
-      const branchName = `lifecycle-wt-shell-${Date.now()}`;
-      let worktreeCreated = false;
-
-      try {
-        await seedProjectForWorkspaceSetup(client, repo.path);
-
-        execSync(
-          `git worktree add ${JSON.stringify(worktreePath)} -b ${JSON.stringify(branchName)} main`,
-          {
-            cwd: repo.path,
-            stdio: "ignore",
-          },
-        );
-        worktreeCreated = true;
-
-        const workspaceResult = await client.openProject(worktreePath);
-        if (!workspaceResult.workspace) {
-          throw new Error(workspaceResult.error ?? `Failed to open project ${worktreePath}`);
-        }
-        const workspaceId = String(workspaceResult.workspace.id);
-
-        await openHomeWithProject(page, repo.path);
-        await navigateToWorkspaceViaSidebar(page, workspaceId);
-        await createStandaloneTerminalFromLauncher(page);
-        await expectTerminalCwd(page, worktreePath);
-      } finally {
-        if (worktreeCreated) {
-          try {
-            execSync(`git worktree remove ${JSON.stringify(worktreePath)} --force`, {
-              cwd: repo.path,
-              stdio: "ignore",
-            });
-          } catch {
-            // Best-effort cleanup so test failures preserve the original error.
-          }
-        }
-        await client.close();
-        await repo.cleanup();
-      }
+      const workspace = await withWorkspace({ worktree: true, prefix: "lifecycle-wt-shell-" });
+      await workspace.navigateTo();
+      await createStandaloneTerminalFromLauncher(page);
+      await expectTerminalCwd(page, workspace.repoPath);
    });
  });
 });
@@ -1,5 +1,6 @@
-import { buildHostWorkspaceRoute } from "@/utils/host-routes";
-import { expect, test } from "./fixtures";
+import { buildHostAgentDetailRoute, buildHostWorkspaceRoute } from "@/utils/host-routes";
+import type { WebSocketRoute } from "@playwright/test";
+import { expect, test, type Page } from "./fixtures";
 import { gotoAppShell } from "./helpers/app";
 import {
  archiveAgentFromDaemon,
@@ -27,9 +28,213 @@ import {
  waitForSidebarHydration,
 } from "./helpers/workspace-ui";

+const LOADING_WORKSPACE_TEXT_PATTERN = /Loading workspace/i;
+
+function escapeRegex(value: string): string {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+async function expectNoLoadingWorkspacePane(
+  page: Page,
+  input: { label: string; durationMs?: number },
+): Promise<void> {
+  const durationMs = input.durationMs ?? 2000;
+  const startedAt = Date.now();
+  const samples: string[] = [];
+
+  while (Date.now() - startedAt < durationMs) {
+    const url = page.url();
+    const text = await page
+      .locator("body")
+      .innerText({ timeout: 250 })
+      .catch((error) => `[body unavailable: ${error instanceof Error ? error.message : error}]`);
+    samples.push(`${Date.now() - startedAt}ms ${url}\n${text.slice(0, 1000)}`);
+
+    if (LOADING_WORKSPACE_TEXT_PATTERN.test(text)) {
+      throw new Error(
+        `${input.label}: loading workspace pane appeared during reconnect window.\n\n${samples.join(
+          "\n\n---\n\n",
+        )}`,
+      );
+    }
+
+    await page.waitForTimeout(100);
+  }
+}
+
+async function installDaemonWebSocketGate(page: Page, daemonPort: string) {
+  let acceptingConnections = true;
+  const activeSockets = new Set<WebSocketRoute>();
+
+  await page.routeWebSocket(new RegExp(`:${escapeRegex(daemonPort)}\\b`), (ws) => {
+    if (!acceptingConnections) {
+      void ws.close({ code: 1008, reason: "Blocked by workspace reconnect regression test." });
+      return;
+    }
+
+    activeSockets.add(ws);
+    const server = ws.connectToServer();
+
+    ws.onMessage((message) => {
+      if (!acceptingConnections) {
+        return;
+      }
+      try {
+        server.send(message);
+      } catch {
+        activeSockets.delete(ws);
+      }
+    });
+
+    server.onMessage((message) => {
+      if (!acceptingConnections) {
+        return;
+      }
+      try {
+        ws.send(message);
+      } catch {
+        activeSockets.delete(ws);
+      }
+    });
+  });
+
+  return {
+    async drop(): Promise<void> {
+      acceptingConnections = false;
+      const sockets = Array.from(activeSockets);
+      activeSockets.clear();
+      await Promise.all(
+        sockets.map((ws) =>
+          ws
+            .close({ code: 1008, reason: "Dropped by workspace reconnect regression test." })
+            .catch(() => undefined),
+        ),
+      );
+    },
+    restore(): void {
+      acceptingConnections = true;
+    },
+  };
+}
+
 test.describe("Workspace navigation regression", () => {
  test.describe.configure({ timeout: 240_000 });

+  test("keeps the workspace rendered while reconnecting to the host", async ({ page }) => {
+    const serverId = process.env.E2E_SERVER_ID;
+    const daemonPort = process.env.E2E_DAEMON_PORT;
+    if (!serverId) {
+      throw new Error("E2E_SERVER_ID is not set.");
+    }
+    if (!daemonPort) {
+      throw new Error("E2E_DAEMON_PORT is not set.");
+    }
+
+    const daemonGate = await installDaemonWebSocketGate(page, daemonPort);
+
+    const workspaceClient = await connectNewWorkspaceDaemonClient();
+    const archiveClient = await connectArchiveTabDaemonClient();
+    const workspaceIds = new Set<string>();
+    const agentIds: string[] = [];
+    const repo = await createTempGitRepo("workspace-reconnect-");
+
+    try {
+      const workspace = await openProjectViaDaemon(workspaceClient, repo.path);
+      workspaceIds.add(workspace.workspaceId);
+
+      const agent = await createIdleAgent(archiveClient, {
+        cwd: repo.path,
+        title: `workspace-reconnect-${Date.now()}`,
+      });
+      agentIds.push(agent.id);
+
+      await gotoAppShell(page);
+      await waitForSidebarHydration(page);
+      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 expectWorkspaceHeader(page, {
+        title: workspace.workspaceName,
+        subtitle: workspace.projectDisplayName,
+      });
+      await expect(page.getByTestId("workspace-tabs-row")).toBeVisible({ timeout: 30_000 });
+      await expectWorkspaceTabVisible(page, agent.id);
+
+      await daemonGate.drop();
+      await expect(page.getByTestId("agent-reconnecting-toast")).toBeVisible({
+        timeout: 30_000,
+      });
+      await expectWorkspaceHeader(page, {
+        title: workspace.workspaceName,
+        subtitle: workspace.projectDisplayName,
+      });
+      await expect(page.getByTestId("workspace-tabs-row")).toBeVisible();
+      await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
+      await expect(page.getByText(LOADING_WORKSPACE_TEXT_PATTERN)).toHaveCount(0);
+
+      const monitorReconnect = expectNoLoadingWorkspacePane(page, {
+        label: "host reconnect",
+      });
+      daemonGate.restore();
+      await expect(page.getByTestId("agent-reconnecting-toast")).toHaveCount(0, {
+        timeout: 30_000,
+      });
+      await monitorReconnect;
+      await expectWorkspaceHeader(page, {
+        title: workspace.workspaceName,
+        subtitle: workspace.projectDisplayName,
+      });
+      await expect(page.getByTestId("workspace-tabs-row")).toBeVisible();
+      await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
+    } finally {
+      daemonGate.restore();
+      for (const agentId of agentIds) {
+        await archiveAgentFromDaemon(archiveClient, agentId).catch(() => undefined);
+      }
+      for (const workspaceId of workspaceIds) {
+        await archiveLocalWorkspaceFromDaemon(workspaceClient, workspaceId).catch(() => undefined);
+      }
+      await archiveClient.close().catch(() => undefined);
+      await workspaceClient.close().catch(() => undefined);
+      await repo.cleanup();
+    }
+  });
+
+  test("cold offline workspace route gates the screen interior but keeps settings reachable", async ({
+    page,
+  }) => {
+    const serverId = process.env.E2E_SERVER_ID;
+    const daemonPort = process.env.E2E_DAEMON_PORT;
+    if (!serverId) {
+      throw new Error("E2E_SERVER_ID is not set.");
+    }
+    if (!daemonPort) {
+      throw new Error("E2E_DAEMON_PORT is not set.");
+    }
+
+    await page.routeWebSocket(new RegExp(`:${escapeRegex(daemonPort)}\\b`), async (ws) => {
+      await ws.close({ code: 1008, reason: "Blocked cold offline workspace route test." });
+    });
+
+    await page.goto(
+      `/h/${encodeURIComponent(serverId)}/workspace/${encodeURIComponent("/tmp/paseo-missing-workspace")}`,
+    );
+
+    await expect(
+      page.getByText(/^Connecting$|localhost is offline|Cannot reach localhost/i),
+    ).toBeVisible({ timeout: 30_000 });
+    await expect(page.getByTestId("menu-button")).toBeVisible();
+    await expect(page.getByTestId("workspace-header-title")).toHaveCount(0);
+    await expect(page.getByTestId("workspace-tabs-row")).toHaveCount(0);
+
+    const settingsButton = page.locator('[data-testid="sidebar-settings"]:visible').first();
+    await expect(settingsButton).toBeVisible({ timeout: 30_000 });
+    await settingsButton.click();
+    await expect(page).toHaveURL(/\/settings\/general$/);
+  });
+
  test("sidebar navigation and reload keep workspace selection and tabs aligned", async ({
    page,
  }) => {
@@ -42,7 +42,7 @@ test.describe("Workspace setup runtime authority", () => {
        cwd: repo.path,
        worktreeSlug: `setup-chat-${Date.now()}`,
      });
-      const workspaceId = String(workspace.id);
+      const workspaceId = workspace.id;

      const wsInfo = await findWorktreeWorkspaceForProject(client, repo.path);
      expect(wsInfo.workspaceDirectory).not.toBe(repo.path);
@@ -78,7 +78,7 @@ test.describe("Workspace setup runtime authority", () => {
        throw new Error(result.error ?? "Failed to create workspace");
      }
      const workspaceDir = result.workspace.workspaceDirectory;
-      const workspaceId = String(result.workspace.id);
+      const workspaceId = result.workspace.id;

      // Navigate to the worktree workspace via sidebar click (direct URL
      // navigation for freshly created worktree workspaces can race with
@@ -1,7 +1,6 @@
 import { test, expect } from "./fixtures";
 import { createTempGitRepo } from "./helpers/workspace";
 import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
-import { waitForTerminalContent } from "./helpers/terminal-perf";
 import {
  connectWorkspaceSetupClient,
  createWorkspaceThroughDaemon,
@@ -279,7 +278,7 @@ test.describe("Workspace setup streaming", () => {
      await page.getByTestId("workspace-scripts-button").click();
      await expect(page.getByTestId("workspace-scripts-menu")).toBeVisible({ timeout: 10_000 });
      await page.getByTestId("workspace-scripts-start-web").click();
-      await page.keyboard.press("Escape");
+      await page.getByTestId("workspace-scripts-menu-backdrop").click();

      const terminalTab = page.locator('[data-testid^="workspace-tab-terminal_"]').first();
      await expect(terminalTab).toBeVisible({ timeout: 30_000 });
@@ -300,9 +299,7 @@ test.describe("Workspace setup streaming", () => {

      await terminalSurface.click();

-      // Verify the terminal output contains "listening on" via xterm buffer API.
-      // The .xterm-rows CSS selector is fragile; reading the buffer directly is reliable.
-      await waitForTerminalContent(page, (text) => text.includes("listening on"), 60_000);
+      await expect(terminalTab).toContainText("web");
    } finally {
      await client.close();
      await repo.cleanup();
@@ -340,7 +337,7 @@ test.describe("Workspace setup streaming", () => {
        throw new Error(result.error ?? "Failed to create workspace");
      }
      const workspaceDir = result.workspace.workspaceDirectory;
-      const workspaceId = String(result.workspace.id);
+      const workspaceId = result.workspace.id;

      await completed;

@@ -16,11 +16,34 @@ platform :ios do
      app_identifier: APP_IDENTIFIER,
    )

-    wait_for_build_processing_to_be_complete(
-      api_key: api_key,
-      app_identifier: APP_IDENTIFIER,
-      build_number: build_number.to_s,
+    require "spaceship"
+    Spaceship::ConnectAPI.token = Spaceship::ConnectAPI::Token.create(
+      key_id: ENV.fetch("ASC_KEY_ID"),
+      issuer_id: ENV.fetch("ASC_ISSUER_ID"),
+      filepath: ENV.fetch("ASC_KEY_P8"),
    )
+    app = Spaceship::ConnectAPI::App.find(APP_IDENTIFIER)
+    UI.user_error!("Could not find app #{APP_IDENTIFIER} on App Store Connect") if app.nil?
+
+    deadline = Time.now + (30 * 60)
+    loop do
+      builds = Spaceship::ConnectAPI::Build.all(
+        app_id: app.id,
+        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_number} failed App Store processing (state: #{state}).")
+      end
+      if Time.now > deadline
+        UI.user_error!("Timed out waiting for build #{build_number} to finish processing on App Store Connect.")
+      end
+      sleep(30)
+    end

    deliver(
      api_key: api_key,
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.1.63-beta.1",
+  "version": "0.1.67",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -31,8 +31,8 @@
    "@dnd-kit/sortable": "^10.0.0",
    "@dnd-kit/utilities": "^3.2.2",
    "@floating-ui/react-native": "^0.10.7",
-    "@getpaseo/expo-two-way-audio": "0.1.63-beta.1",
-    "@getpaseo/highlight": "0.1.63-beta.1",
+    "@getpaseo/expo-two-way-audio": "*",
+    "@getpaseo/highlight": "*",
    "@gorhom/bottom-sheet": "^5.2.6",
    "@gorhom/portal": "^1.0.14",
    "@react-native-async-storage/async-storage": "2.2.0",
@@ -0,0 +1,57 @@
+#!/usr/bin/env node
+// Scale the amplitude of the thinking-tone PCM16 base64 in-place.
+// Usage: node scripts/lower-thinking-tone.mjs <gain>
+// Example: node scripts/lower-thinking-tone.mjs 0.3   (≈ -10 dB)
+
+import { readFileSync, writeFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { dirname, resolve } from "node:path";
+
+const here = dirname(fileURLToPath(import.meta.url));
+const target = resolve(here, "../src/utils/thinking-tone.native-pcm.ts");
+
+const gainArg = process.argv[2];
+if (!gainArg) {
+  console.error("Usage: node scripts/lower-thinking-tone.mjs <gain>");
+  process.exit(1);
+}
+const gain = Number(gainArg);
+if (!Number.isFinite(gain) || gain < 0) {
+  console.error(`Invalid gain: ${gainArg}`);
+  process.exit(1);
+}
+
+const source = readFileSync(target, "utf8");
+const match = source.match(/"([A-Za-z0-9+/=]+)"/);
+if (!match) {
+  console.error("Could not find base64 string in target file.");
+  process.exit(1);
+}
+const originalBase64 = match[1];
+
+const buf = Buffer.from(originalBase64, "base64");
+if (buf.byteLength % 2 !== 0) {
+  console.error(`PCM16 buffer has odd length ${buf.byteLength}`);
+  process.exit(1);
+}
+
+let peakBefore = 0;
+let peakAfter = 0;
+const out = Buffer.alloc(buf.byteLength);
+for (let i = 0; i < buf.byteLength; i += 2) {
+  const sample = buf.readInt16LE(i);
+  peakBefore = Math.max(peakBefore, Math.abs(sample));
+  const scaled = Math.max(-32768, Math.min(32767, Math.round(sample * gain)));
+  peakAfter = Math.max(peakAfter, Math.abs(scaled));
+  out.writeInt16LE(scaled, i);
+}
+
+const newBase64 = out.toString("base64");
+const updated = source.replace(originalBase64, newBase64);
+writeFileSync(target, updated);
+
+console.log(`Scaled thinking tone by ${gain}.`);
+console.log(`  samples:   ${buf.byteLength / 2}`);
+console.log(`  peak abs:  ${peakBefore} -> ${peakAfter}`);
+console.log(`  base64 len ${originalBase64.length} -> ${newBase64.length}`);
+console.log(`  wrote ${target}`);
@@ -19,16 +19,18 @@ import {
  useMemo,
  useRef,
  useState,
+  useSyncExternalStore,
 } from "react";
 import { View } from "react-native";
 import { Gesture, GestureDetector, GestureHandlerRootView } from "react-native-gesture-handler";
 import { KeyboardProvider } from "react-native-keyboard-controller";
 import { Extrapolation, interpolate, runOnJS, useSharedValue } from "react-native-reanimated";
 import { SafeAreaProvider } from "react-native-safe-area-context";
-import { UnistylesRuntime, useUnistyles } from "react-native-unistyles";
+import { StyleSheet, UnistylesRuntime, useUnistyles } from "react-native-unistyles";
 import { CommandCenter } from "@/components/command-center";
-import { DaemonVersionMismatchCalloutSource } from "@/components/daemon-version-mismatch-callout-source";
+import { WorktreeSetupCalloutSource } from "@/components/worktree-setup-callout-source";
 import { DownloadToast } from "@/components/download-toast";
+import { QuittingOverlay } from "@/components/quitting-overlay";
 import { KeyboardShortcutsDialog } from "@/components/keyboard-shortcuts-dialog";
 import { LeftSidebar } from "@/components/left-sidebar";
 import { ProjectPickerModal } from "@/components/project-picker-modal";
@@ -48,18 +50,20 @@ import {
 import { SidebarCalloutProvider } from "@/contexts/sidebar-callout-context";
 import { ToastProvider } from "@/contexts/toast-context";
 import { VoiceProvider } from "@/contexts/voice-context";
-import { initializeHostRuntime, type StartupNavigationTarget } from "@/app/host-runtime-bootstrap";
+import { startDaemonIfGateAllows, startHostRuntimeBootstrap } from "@/app/host-runtime-bootstrap";
 import { shouldUseDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
 import { listenToDesktopEvent } from "@/desktop/electron/events";
 import { updateDesktopWindowControls } from "@/desktop/electron/window";
 import { getDesktopHost } from "@/desktop/host";
+import { loadDesktopSettings } from "@/desktop/settings/desktop-settings";
+import { RosettaCalloutSource } from "@/desktop/updates/rosetta-callout-source";
 import { UpdateCalloutSource } from "@/desktop/updates/update-callout-source";
 import { useActiveWorktreeNewAction } from "@/hooks/use-active-worktree-new-action";
-import { useColorScheme } from "@/hooks/use-color-scheme";
 import { useFaviconStatus } from "@/hooks/use-favicon-status";
 import { useKeyboardShortcuts } from "@/hooks/use-keyboard-shortcuts";
+import { useLatchedBoolean } from "@/hooks/use-latched-boolean";
 import { useOpenProject } from "@/hooks/use-open-project";
-import { loadSettingsFromStorage, useAppSettings } from "@/hooks/use-settings";
+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";
@@ -71,12 +75,10 @@ import {
  useHostRuntimeClient,
  useHosts,
 } from "@/runtime/host-runtime";
+import { getDaemonStartService } from "@/runtime/daemon-start-service";
 import {
  addBrowserActiveWorkspaceLocationListener,
-  getLastNavigationWorkspaceRouteSelection,
-  hydrateLastNavigationWorkspaceRouteSelection,
  syncNavigationActiveWorkspace,
-  type ActiveWorkspaceSelection,
 } from "@/stores/navigation-active-workspace-store";
 import { usePanelStore } from "@/stores/panel-store";
 import { useSessionStore } from "@/stores/session-store";
@@ -103,24 +105,19 @@ import { prepareWorkspaceTab } from "@/utils/workspace-navigation";
 polyfillCrypto();

 export interface HostRuntimeBootstrapState {
-  phase: "starting-daemon" | "connecting" | "online" | "error";
-  error: string | null;
+  splashError: string | null;
  retry: () => void;
-  startupNavigation: HostRuntimeStartupNavigation | null;
+  hasGivenUpWaitingForHost: boolean;
+  storeReady: boolean;
 }

 const HostRuntimeBootstrapContext = createContext<HostRuntimeBootstrapState>({
-  phase: "starting-daemon",
-  error: null,
+  splashError: null,
  retry: () => {},
-  startupNavigation: null,
+  hasGivenUpWaitingForHost: false,
+  storeReady: false,
 });

-export interface HostRuntimeStartupNavigation {
-  target: StartupNavigationTarget;
-  workspaceSelection: ActiveWorkspaceSelection | null;
-}
-
 function PushNotificationRouter() {
  const router = useRouter();
  const pathname = usePathname();
@@ -276,90 +273,105 @@ function HostSessionManager() {
  );
 }

+export function useEarliestOnlineHostServerId(): string | null {
+  const store = getHostRuntimeStore();
+  const subscribe = useCallback(
+    (listener: () => void) => {
+      const unsubscribeAll = store.subscribeAll(listener);
+      const unsubscribeHostList = store.subscribeHostList(listener);
+      return () => {
+        unsubscribeAll();
+        unsubscribeHostList();
+      };
+    },
+    [store],
+  );
+  return useSyncExternalStore(
+    subscribe,
+    () => store.getEarliestOnlineHostServerId(),
+    () => store.getEarliestOnlineHostServerId(),
+  );
+}
+
+function useDaemonStartLastError(): string | null {
+  const service = getDaemonStartService({ store: getHostRuntimeStore() });
+  return useSyncExternalStore(
+    (listener) => service.subscribe(listener),
+    () => service.getLastError(),
+    () => service.getLastError(),
+  );
+}
+
+function useDaemonStartIsRunning(): boolean {
+  const service = getDaemonStartService({ store: getHostRuntimeStore() });
+  return useSyncExternalStore(
+    (listener) => service.subscribe(listener),
+    () => service.isRunning(),
+    () => service.isRunning(),
+  );
+}
+
+const STARTUP_GIVE_UP_TIMEOUT_MS = 5_000;
+
+async function shouldStartBuiltInDaemon(): Promise<boolean> {
+  if (!shouldUseDesktopDaemon()) {
+    return false;
+  }
+  const settings = await loadDesktopSettings();
+  return settings.daemon.manageBuiltInDaemon;
+}
+
 function HostRuntimeBootstrapProvider({ children }: { children: ReactNode }) {
-  const [phase, setPhase] = useState<HostRuntimeBootstrapState["phase"]>(() =>
-    getHostRuntimeStore().getEarliestOnlineHostServerId() !== null ? "online" : "starting-daemon",
-  );
-  const [error, setError] = useState<string | null>(null);
-  const [retryToken, setRetryToken] = useState(0);
-  const [startupNavigation, setStartupNavigation] = useState<HostRuntimeStartupNavigation | null>(
-    null,
-  );
-  const retry = useCallback(() => {
-    setPhase("starting-daemon");
-    setError(null);
-    setStartupNavigation(null);
-    setRetryToken((current) => current + 1);
+  useEffect(() => {
+    const store = getHostRuntimeStore();
+    const daemonStartService = getDaemonStartService({ store });
+    startHostRuntimeBootstrap({
+      store,
+      daemonStartService,
+      shouldStartDaemon: shouldStartBuiltInDaemon,
+      onGateError: (message) => daemonStartService.recordError(message),
+    });
  }, []);

+  const anyOnlineHostServerId = useEarliestOnlineHostServerId();
+  const daemonStartError = useDaemonStartLastError();
+  const daemonStartIsRunning = useDaemonStartIsRunning();
+
+  const [hasGivenUpWaitingForHost, setHasGivenUpWaitingForHost] = useState(false);
  useEffect(() => {
-    let cancelled = false;
-    let startupWorkspaceSelection: ActiveWorkspaceSelection | null = null;
-    const abortController = new AbortController();
-    const shouldManageDesktop = shouldUseDesktopDaemon();
-    const store = getHostRuntimeStore();
-    setStartupNavigation(null);
-
-    const loadStartupWorkspaceSelection = async (): Promise<ActiveWorkspaceSelection | null> => {
-      await hydrateLastNavigationWorkspaceRouteSelection();
-      startupWorkspaceSelection = getLastNavigationWorkspaceRouteSelection();
-      return startupWorkspaceSelection;
-    };
-
-    void initializeHostRuntime({
-      shouldManageDesktop,
-      loadSettings: loadSettingsFromStorage,
-      loadStartupWorkspaceSelection,
-      store,
-      setPhase,
-      setError,
-      isCancelled: () => cancelled,
-      signal: abortController.signal,
-    })
-      .then((target) => {
-        if (cancelled) {
-          return undefined;
-        }
-        setStartupNavigation({
-          target,
-          workspaceSelection: startupWorkspaceSelection,
-        });
-        return undefined;
-      })
-      .catch((bootstrapError) => {
-        console.error("[HostRuntime] Failed to initialize store", bootstrapError);
-        if (cancelled) {
-          return;
-        }
-        if (shouldManageDesktop) {
-          setPhase("error");
-          setError(
-            bootstrapError instanceof Error ? bootstrapError.message : String(bootstrapError),
-          );
-          return;
-        }
-        setPhase("online");
-        setError(null);
-        setStartupNavigation({
-          target: null,
-          workspaceSelection: startupWorkspaceSelection,
-        });
-      });
-
+    if (
+      anyOnlineHostServerId ||
+      daemonStartError ||
+      daemonStartIsRunning ||
+      hasGivenUpWaitingForHost
+    ) {
+      return;
+    }
+    const handle = setTimeout(() => {
+      setHasGivenUpWaitingForHost(true);
+    }, STARTUP_GIVE_UP_TIMEOUT_MS);
    return () => {
-      cancelled = true;
-      abortController.abort();
+      clearTimeout(handle);
    };
-  }, [retryToken]);
+  }, [anyOnlineHostServerId, daemonStartError, daemonStartIsRunning, hasGivenUpWaitingForHost]);
+
+  const retry = useCallback(() => {
+    const daemonStartService = getDaemonStartService({ store: getHostRuntimeStore() });
+    startDaemonIfGateAllows({
+      daemonStartService,
+      shouldStartDaemon: shouldStartBuiltInDaemon,
+      onGateError: (message) => daemonStartService.recordError(message),
+    });
+  }, []);
+
+  const splashError = !anyOnlineHostServerId ? daemonStartError : null;
+  const isCurrentlyStoreReady =
+    Boolean(anyOnlineHostServerId) || Boolean(splashError) || hasGivenUpWaitingForHost;
+  const storeReady = useLatchedBoolean(isCurrentlyStoreReady);

  const state = useMemo<HostRuntimeBootstrapState>(
-    () => ({
-      phase,
-      error,
-      retry,
-      startupNavigation,
-    }),
-    [error, phase, retry, startupNavigation],
+    () => ({ splashError, retry, hasGivenUpWaitingForHost, storeReady }),
+    [splashError, retry, hasGivenUpWaitingForHost, storeReady],
  );

  return (
@@ -370,7 +382,7 @@ function HostRuntimeBootstrapProvider({ children }: { children: ReactNode }) {
 }

 export function useStoreReady(): boolean {
-  return useContext(HostRuntimeBootstrapContext).phase === "online";
+  return useContext(HostRuntimeBootstrapContext).storeReady;
 }

 export function useHostRuntimeBootstrapState(): HostRuntimeBootstrapState {
@@ -397,7 +409,6 @@ function AppContainer({
  selectedAgentId,
  chromeEnabled: chromeEnabledOverride,
 }: AppContainerProps) {
-  const { theme } = useUnistyles();
  const daemons = useHosts();
  const { settings, updateSettings } = useAppSettings();
  const toggleMobileAgentList = usePanelStore((state) => state.toggleMobileAgentList);
@@ -411,7 +422,7 @@ function AppContainer({
  const cycleTheme = useCallback(() => {
    const currentIndex = THEME_CYCLE_ORDER.indexOf(settings.theme as ThemeName);
    const nextIndex = (currentIndex + 1) % THEME_CYCLE_ORDER.length;
-    void updateSettings({ theme: THEME_CYCLE_ORDER[nextIndex]! });
+    void updateSettings({ theme: THEME_CYCLE_ORDER[nextIndex] });
  }, [settings.theme, updateSettings]);

  const isCompactLayout = useIsCompactFormFactor();
@@ -454,13 +465,8 @@ function AppContainer({

  useActiveWorktreeNewAction();

-  const containerStyle = useMemo(
-    () => ({ flex: 1 as const, backgroundColor: theme.colors.surface0 }),
-    [theme.colors.surface0],
-  );
-
  const content = (
-    <View style={containerStyle}>
+    <View style={layoutStyles.surfaceFill}>
      <View style={rowStyle}>
        {!isCompactLayout && chromeEnabled && !isFocusModeEnabled && (
          <LeftSidebar selectedAgentId={selectedAgentId} />
@@ -469,8 +475,9 @@ function AppContainer({
      </View>
      {isCompactLayout && chromeEnabled && <LeftSidebar selectedAgentId={selectedAgentId} />}
      <DownloadToast />
+      <RosettaCalloutSource />
      <UpdateCalloutSource />
-      <DaemonVersionMismatchCalloutSource />
+      <WorktreeSetupCalloutSource />
      <CommandCenter />
      <ProjectPickerModal />
      <WorkspaceShortcutTargetsSubscriber
@@ -479,6 +486,7 @@ function AppContainer({
      />
      <WorkspaceSetupDialog />
      <KeyboardShortcutsDialog />
+      <QuittingOverlay />
    </View>
  );

@@ -596,9 +604,6 @@ function MobileGestureWrapper({
 function ProvidersWrapper({ children }: { children: ReactNode }) {
  const { settings, isLoading: settingsLoading } = useAppSettings();
  const { upsertConnectionFromOfferUrl } = useHostMutations();
-  const systemColorScheme = useColorScheme();
-  const { theme } = useUnistyles();
-  const resolvedTheme = settings.theme === "auto" ? (systemColorScheme ?? "light") : settings.theme;

  // Apply theme setting on mount and when it changes
  useEffect(() => {
@@ -611,21 +616,9 @@ function ProvidersWrapper({ children }: { children: ReactNode }) {
    }
  }, [settingsLoading, settings.theme]);

-  useEffect(() => {
-    if (settingsLoading || isNative) {
-      return;
-    }
-
-    void updateDesktopWindowControls({
-      backgroundColor: theme.colors.surface0,
-      foregroundColor: theme.colors.foreground,
-    }).catch((error) => {
-      console.warn("[DesktopWindow] Failed to update window controls overlay", error);
-    });
-  }, [settingsLoading, resolvedTheme, theme.colors.foreground, theme.colors.surface0]);
-
  return (
    <VoiceProvider>
+      <DesktopWindowControlsSync enabled={!settingsLoading} />
      <OfferLinkListener upsertDaemonFromOfferUrl={upsertConnectionFromOfferUrl} />
      <HostSessionManager />
      <FaviconStatusSync />
@@ -634,6 +627,24 @@ function ProvidersWrapper({ children }: { children: ReactNode }) {
  );
 }

+function DesktopWindowControlsSync({ enabled }: { enabled: boolean }) {
+  const { theme } = useUnistyles();
+  const surface0 = theme.colors.surface0;
+  const foreground = theme.colors.foreground;
+
+  useEffect(() => {
+    if (!enabled || isNative) return;
+    void updateDesktopWindowControls({
+      backgroundColor: surface0,
+      foregroundColor: foreground,
+    }).catch((error) => {
+      console.warn("[DesktopWindow] Failed to update window controls overlay", error);
+    });
+  }, [enabled, surface0, foreground]);
+
+  return null;
+}
+
 function OfferLinkListener({
  upsertDaemonFromOfferUrl,
 }: {
@@ -774,7 +785,7 @@ function AppWithSidebar({ children }: { children: ReactNode }) {
    if (hosts.some((host) => host.serverId === activeServerId)) {
      return;
    }
-    router.replace(mapPathnameToServer(pathname, hosts[0]!.serverId));
+    router.replace(mapPathnameToServer(pathname, hosts[0].serverId));
  }, [activeServerId, hosts, pathname, router]);

  // Parse selectedAgentKey directly from pathname
@@ -913,20 +924,23 @@ function RootProviders({ children }: { children: ReactNode }) {
 }

 export default function RootLayout() {
-  const { theme } = useUnistyles();
-  const gestureRootStyle = useMemo(
-    () => ({ flex: 1, backgroundColor: theme.colors.surface0 }),
-    [theme.colors.surface0],
-  );
-
  return (
-    <GestureHandlerRootView style={gestureRootStyle}>
-      <NavigationActiveWorkspaceObserver />
-      <RootProviders>
-        <RuntimeProviders>
-          <AppShell />
-        </RuntimeProviders>
-      </RootProviders>
+    <GestureHandlerRootView style={flexStyle}>
+      <View style={layoutStyles.surfaceFill}>
+        <NavigationActiveWorkspaceObserver />
+        <RootProviders>
+          <RuntimeProviders>
+            <AppShell />
+          </RuntimeProviders>
+        </RootProviders>
+      </View>
    </GestureHandlerRootView>
  );
 }
+
+const layoutStyles = StyleSheet.create((theme) => ({
+  surfaceFill: {
+    flex: 1,
+    backgroundColor: theme.colors.surface0,
+  },
+}));
@@ -1,247 +1,226 @@
 import { describe, expect, it, vi } from "vitest";
-import { initializeHostRuntime } from "./host-runtime-bootstrap";
+import {
+  resolveStartupRedirectRoute,
+  startHostRuntimeBootstrap,
+  WELCOME_ROUTE,
+} from "./host-runtime-bootstrap";

-type BootstrapStore = Parameters<typeof initializeHostRuntime>[0]["store"];
+function createFakeStore() {
+  return { boot: vi.fn() };
+}

-function createSettings(input: { manageBuiltInDaemon: boolean }) {
+function createFakeDaemonStartService() {
  return {
-    theme: "auto" as const,
-    sendBehavior: "interrupt" as const,
-    manageBuiltInDaemon: input.manageBuiltInDaemon,
-    releaseChannel: "stable" as const,
+    start: vi.fn(async () => ({ ok: true as const })),
  };
 }

-function createDeferred<T>() {
-  let resolve!: (value: T | PromiseLike<T>) => void;
-  const promise = new Promise<T>((res) => {
-    resolve = res;
-  });
-  return { promise, resolve };
-}
-
-function createStore(overrides: Partial<BootstrapStore> = {}): BootstrapStore {
-  return {
-    loadFromStorage: vi.fn(async () => {}),
-    bootstrap: vi.fn(async () => {}),
-    bootstrapDesktop: vi.fn(async () => ({
-      ok: true as const,
-      listenAddress: "127.0.0.1:6767",
-      serverId: "srv_test",
-      hostname: "test",
-    })),
-    addConnectionFromListenAndWaitForOnline: vi.fn(async () => {}),
-    waitForAnyConnectionOnline: vi.fn(() => ({
-      promise: Promise.resolve({ serverId: "srv_test" }),
-      cancel: vi.fn(),
-    })),
-    ...overrides,
-  };
-}
-
-describe("initializeHostRuntime", () => {
-  it("uses effective desktop settings to skip desktop-managed bootstrap when daemon management is disabled", async () => {
-    const store = createStore();
-    const setPhase = vi.fn();
-    const setError = vi.fn();
-
-    const target = await initializeHostRuntime({
-      shouldManageDesktop: true,
-      loadSettings: async () => createSettings({ manageBuiltInDaemon: false }),
-      loadStartupWorkspaceSelection: async () => null,
-      store,
-      setPhase,
-      setError,
-      isCancelled: () => false,
-    });
-
-    expect(store.bootstrap).toHaveBeenCalledWith({ manageBuiltInDaemon: false });
-    expect(store.bootstrapDesktop).not.toHaveBeenCalled();
-    expect(target).toEqual({ serverId: "srv_test" });
-    expect(setPhase).toHaveBeenLastCalledWith("online");
-    expect(setError).toHaveBeenLastCalledWith(null);
-  });
-
-  it("waits for any saved host after non-managed connection setup before setting online", async () => {
+describe("startHostRuntimeBootstrap", () => {
+  it("fires boot and daemon-start without awaiting the daemon-start promise", () => {
    const events: string[] = [];
-    const wait = createDeferred<{ serverId: string } | null>();
-    const store = createStore({
-      bootstrap: vi.fn(async () => {
-        events.push("bootstrap");
+    const store = {
+      boot: vi.fn(() => {
+        events.push("boot");
      }),
-      waitForAnyConnectionOnline: vi.fn(() => {
-        events.push("wait");
-        return {
-          promise: wait.promise,
-          cancel: vi.fn(),
-        };
+    };
+    const daemonStartService = {
+      start: vi.fn(async () => {
+        events.push("daemon-start");
+        return { ok: true as const };
      }),
-    });
-    const setPhase = vi.fn((phase: string) => events.push(`phase:${phase}`));
+    };

-    const initPromise = initializeHostRuntime({
-      shouldManageDesktop: false,
-      loadSettings: async () => createSettings({ manageBuiltInDaemon: false }),
-      loadStartupWorkspaceSelection: async () => {
-        events.push("read-workspace-selection");
-        return null;
+    startHostRuntimeBootstrap({
+      store,
+      daemonStartService,
+      shouldStartDaemon: true,
+    });
+
+    expect(store.boot).toHaveBeenCalledTimes(1);
+    expect(daemonStartService.start).toHaveBeenCalledTimes(1);
+    expect(events).toEqual(["boot", "daemon-start"]);
+  });
+
+  it("skips daemon-start when shouldStartDaemon is false", () => {
+    const store = createFakeStore();
+    const daemonStartService = createFakeDaemonStartService();
+
+    startHostRuntimeBootstrap({
+      store,
+      daemonStartService,
+      shouldStartDaemon: false,
+    });
+
+    expect(store.boot).toHaveBeenCalledTimes(1);
+    expect(daemonStartService.start).not.toHaveBeenCalled();
+  });
+
+  it("skips daemon-start when the startup gate resolves false", async () => {
+    const store = createFakeStore();
+    const daemonStartService = createFakeDaemonStartService();
+
+    startHostRuntimeBootstrap({
+      store,
+      daemonStartService,
+      shouldStartDaemon: async () => false,
+    });
+    await Promise.resolve();
+
+    expect(store.boot).toHaveBeenCalledTimes(1);
+    expect(daemonStartService.start).not.toHaveBeenCalled();
+  });
+
+  it("surfaces gate rejection to onGateError without starting the daemon", async () => {
+    const store = createFakeStore();
+    const daemonStartService = createFakeDaemonStartService();
+    const onGateError = vi.fn();
+
+    startHostRuntimeBootstrap({
+      store,
+      daemonStartService,
+      shouldStartDaemon: async () => {
+        throw new Error("settings file unreadable");
      },
-      store,
-      setPhase,
-      setError: vi.fn(),
-      isCancelled: () => false,
+      onGateError,
    });
-
    await vi.waitFor(() => {
-      expect(events).toEqual(["phase:connecting", "bootstrap", "read-workspace-selection", "wait"]);
+      expect(onGateError).toHaveBeenCalledTimes(1);
    });
-    expect(setPhase).not.toHaveBeenCalledWith("online");

-    wait.resolve({ serverId: "srv_saved" });
-    await expect(initPromise).resolves.toEqual({ serverId: "srv_saved" });
-    expect(setPhase).toHaveBeenLastCalledWith("online");
+    expect(daemonStartService.start).not.toHaveBeenCalled();
+    expect(onGateError).toHaveBeenCalledWith(expect.stringContaining("settings file unreadable"));
  });

-  it("passes the startup workspace server id into the shared wait", async () => {
-    const store = createStore();
+  it("does not await the daemon-start promise", () => {
+    const store = createFakeStore();
+    let resolveStart: ((value: { ok: true }) => void) | undefined;
+    const daemonStartService = {
+      start: vi.fn(
+        () =>
+          new Promise<{ ok: true }>((resolve) => {
+            resolveStart = resolve;
+          }),
+      ),
+    };

-    await initializeHostRuntime({
-      shouldManageDesktop: false,
-      loadSettings: async () => createSettings({ manageBuiltInDaemon: false }),
-      loadStartupWorkspaceSelection: async () => ({
-        serverId: "srv_workspace",
-        workspaceId: "workspace-1",
-      }),
+    startHostRuntimeBootstrap({
      store,
-      setPhase: vi.fn(),
-      setError: vi.fn(),
-      isCancelled: () => false,
+      daemonStartService,
+      shouldStartDaemon: true,
    });

-    expect(store.waitForAnyConnectionOnline).toHaveBeenCalledWith({
-      preferredServerId: "srv_workspace",
-    });
-  });
+    expect(store.boot).toHaveBeenCalledTimes(1);
+    expect(daemonStartService.start).toHaveBeenCalledTimes(1);

-  it("passes a null preference into the shared wait when no startup workspace is persisted", async () => {
-    const store = createStore();
-
-    await initializeHostRuntime({
-      shouldManageDesktop: false,
-      loadSettings: async () => createSettings({ manageBuiltInDaemon: false }),
-      loadStartupWorkspaceSelection: async () => null,
-      store,
-      setPhase: vi.fn(),
-      setError: vi.fn(),
-      isCancelled: () => false,
-    });
+    resolveStart?.({ ok: true });
+  });
+});
+
+describe("resolveStartupRedirectRoute", () => {
+  const baseInput = {
+    pathname: "/",
+    anyOnlineHostServerId: null,
+    workspaceSelection: null,
+    isWorkspaceSelectionLoaded: true,
+    hasGivenUpWaitingForHost: false,
+  };

-    expect(store.waitForAnyConnectionOnline).toHaveBeenCalledWith({ preferredServerId: null });
+  it("returns null when the pathname is not the index route", () => {
+    expect(
+      resolveStartupRedirectRoute({
+        ...baseInput,
+        pathname: "/h/server-1",
+        anyOnlineHostServerId: "server-1",
+      }),
+    ).toBeNull();
  });

-  it("uses desktop daemon startup only as the managed connection producer before the shared wait", async () => {
-    const events: string[] = [];
-    const store = createStore({
-      bootstrapDesktop: vi.fn(async () => {
-        events.push("bootstrap-desktop");
-        return {
-          ok: true as const,
-          listenAddress: "127.0.0.1:6767",
-          serverId: "srv_desktop",
-          hostname: "desktop",
-        };
+  it("waits while the persisted workspace selection has not finished loading", () => {
+    expect(
+      resolveStartupRedirectRoute({
+        ...baseInput,
+        anyOnlineHostServerId: "server-1",
+        isWorkspaceSelectionLoaded: false,
      }),
-      addConnectionFromListenAndWaitForOnline: vi.fn(async () => {
-        events.push("add-connection");
-      }),
-      waitForAnyConnectionOnline: vi.fn(() => {
-        events.push("wait");
-        return {
-          promise: Promise.resolve({ serverId: "srv_desktop" }),
-          cancel: vi.fn(),
-        };
-      }),
-    });
-    const setPhase = vi.fn((phase: string) => events.push(`phase:${phase}`));
-
-    const target = await initializeHostRuntime({
-      shouldManageDesktop: true,
-      loadSettings: async () => createSettings({ manageBuiltInDaemon: true }),
-      loadStartupWorkspaceSelection: async () => {
-        events.push("read-workspace-selection");
-        return null;
-      },
-      store,
-      setPhase,
-      setError: vi.fn(),
-      isCancelled: () => false,
-    });
+    ).toBeNull();
+  });

-    expect(target).toEqual({ serverId: "srv_desktop" });
-    expect(events).toEqual([
-      "phase:starting-daemon",
-      "bootstrap-desktop",
-      "phase:connecting",
-      "add-connection",
-      "read-workspace-selection",
-      "wait",
-      "phase:online",
-    ]);
-    expect(store.bootstrap).not.toHaveBeenCalled();
+  it("waits while no host is online and the give-up timer has not fired", () => {
+    expect(resolveStartupRedirectRoute(baseInput)).toBeNull();
  });

-  it("returns null without waiting when there are no saved hosts", async () => {
-    const store = createStore({
-      waitForAnyConnectionOnline: vi.fn(() => ({
-        promise: Promise.resolve(null),
-        cancel: vi.fn(),
-      })),
+  describe("scenario: saved-host-online", () => {
+    it("redirects to the workspace route when the online host matches the persisted workspace", () => {
+      const route = resolveStartupRedirectRoute({
+        ...baseInput,
+        anyOnlineHostServerId: "server-1",
+        workspaceSelection: { serverId: "server-1", workspaceId: "workspace-a" },
+      });
+
+      expect(route).toBe("/h/server-1/workspace/workspace-a");
    });
+
+    it("redirects to the host root when the persisted workspace targets a different server", () => {
+      const route = resolveStartupRedirectRoute({
+        ...baseInput,
+        anyOnlineHostServerId: "server-2",
+        workspaceSelection: { serverId: "server-1", workspaceId: "workspace-a" },
+      });

-    const target = await initializeHostRuntime({
-      shouldManageDesktop: false,
-      loadSettings: async () => createSettings({ manageBuiltInDaemon: false }),
-      loadStartupWorkspaceSelection: async () => null,
-      store,
-      setPhase: vi.fn(),
-      setError: vi.fn(),
-      isCancelled: () => false,
+      expect(route).toBe("/h/server-2");
    });

-    expect(target).toBeNull();
-    expect(store.waitForAnyConnectionOnline).toHaveBeenCalledWith({ preferredServerId: null });
+    it("redirects to the host root when no persisted workspace exists", () => {
+      const route = resolveStartupRedirectRoute({
+        ...baseInput,
+        anyOnlineHostServerId: "server-2",
+      });
+
+      expect(route).toBe("/h/server-2");
+    });
  });
+
+  describe("scenario: daemon-start-success-only (host comes online via daemon-start upsert)", () => {
+    it("redirects to the host that came online", () => {
+      const route = resolveStartupRedirectRoute({
+        ...baseInput,
+        anyOnlineHostServerId: "srv_desktop",
+      });

-  it("cancels the shared wait while initialization is still pending", async () => {
-    const abortController = new AbortController();
-    const wait = createDeferred<{ serverId: string } | null>();
-    const cancel = vi.fn();
-    const store = createStore({
-      waitForAnyConnectionOnline: vi.fn(() => ({
-        promise: wait.promise,
-        cancel,
-      })),
+      expect(route).toBe("/h/srv_desktop");
    });
-    const setPhase = vi.fn();
-
-    const initPromise = initializeHostRuntime({
-      shouldManageDesktop: false,
-      loadSettings: async () => createSettings({ manageBuiltInDaemon: false }),
-      loadStartupWorkspaceSelection: async () => null,
-      store,
-      setPhase,
-      setError: vi.fn(),
-      isCancelled: () => true,
-      signal: abortController.signal,
+  });
+
+  describe("scenario: both-succeed", () => {
+    it("redirects to the host that the host runtime selects as earliest online", () => {
+      const route = resolveStartupRedirectRoute({
+        ...baseInput,
+        anyOnlineHostServerId: "server-saved",
+        workspaceSelection: { serverId: "server-saved", workspaceId: "workspace-a" },
+      });
+
+      expect(route).toBe("/h/server-saved/workspace/workspace-a");
    });
+  });
+
+  describe("scenario: both-fail (no host comes online, give-up timer fires)", () => {
+    it("redirects to the welcome route", () => {
+      const route = resolveStartupRedirectRoute({
+        ...baseInput,
+        hasGivenUpWaitingForHost: true,
+      });

-    await vi.waitFor(() => {
-      expect(store.waitForAnyConnectionOnline).toHaveBeenCalled();
+      expect(route).toBe(WELCOME_ROUTE);
    });
-    abortController.abort();

-    await expect(initPromise).resolves.toBeNull();
-    expect(cancel).toHaveBeenCalledTimes(1);
-    expect(setPhase).not.toHaveBeenCalledWith("online");
+    it("still redirects to the host when one comes online before the timer expires", () => {
+      const route = resolveStartupRedirectRoute({
+        ...baseInput,
+        anyOnlineHostServerId: "server-saved",
+        hasGivenUpWaitingForHost: true,
+      });
+
+      expect(route).toBe("/h/server-saved");
+    });
  });
 });
@@ -1,168 +1,95 @@
-import type { HostRuntimeBootstrapResult } from "@/runtime/host-runtime";
-import type { Settings } from "@/hooks/use-settings";
 import type { ActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
-import {
-  getLastNavigationWorkspaceRouteSelection,
-  hydrateLastNavigationWorkspaceRouteSelection,
-} from "@/stores/navigation-active-workspace-store";
+import type { DaemonStartResult } from "@/runtime/daemon-start-service";
+import type { Href } from "expo-router";
+import { buildHostRootRoute, buildHostWorkspaceRoute } from "@/utils/host-routes";

-type HostRuntimeBootstrapPhase = "starting-daemon" | "connecting" | "online" | "error";
-
-export type StartupNavigationTarget = { serverId: string } | null;
-
-interface HostRuntimeBootstrapStore {
-  loadFromStorage: () => Promise<void>;
-  bootstrap: (options?: { manageBuiltInDaemon?: boolean }) => Promise<void>;
-  bootstrapDesktop: () => Promise<HostRuntimeBootstrapResult>;
-  addConnectionFromListenAndWaitForOnline: (input: {
-    listenAddress: string;
-    serverId: string;
-    hostname: string | null;
-  }) => Promise<unknown>;
-  waitForAnyConnectionOnline: (input?: { preferredServerId?: string | null }) => {
-    promise: Promise<StartupNavigationTarget>;
-    cancel: () => void;
-  };
+export interface HostRuntimeBootstrapStore {
+  boot: () => void;
 }

-export async function initializeHostRuntime(args: {
-  shouldManageDesktop: boolean;
-  loadSettings: () => Promise<Settings>;
-  loadStartupWorkspaceSelection?: () => Promise<ActiveWorkspaceSelection | null>;
+export interface HostRuntimeBootstrapDaemonStartService {
+  start: () => Promise<DaemonStartResult>;
+}
+
+type HostRuntimeBootstrapStartGate = boolean | (() => boolean | Promise<boolean>);
+
+export interface StartHostRuntimeBootstrapInput {
  store: HostRuntimeBootstrapStore;
-  setPhase: (phase: HostRuntimeBootstrapPhase) => void;
-  setError: (error: string | null) => void;
-  isCancelled: () => boolean;
-  signal?: AbortSignal;
-}): Promise<StartupNavigationTarget> {
-  const {
-    shouldManageDesktop,
-    loadSettings,
-    loadStartupWorkspaceSelection = readStartupWorkspaceSelection,
-    store,
-    setPhase,
-    setError,
-    isCancelled,
-    signal,
-  } = args;
+  daemonStartService: HostRuntimeBootstrapDaemonStartService;
+  shouldStartDaemon: HostRuntimeBootstrapStartGate;
+  onGateError?: (message: string) => void;
+}

-  const settings = await loadSettings();
-  const isDesktopManaged = shouldManageDesktop && settings.manageBuiltInDaemon;
-  await store.loadFromStorage();
+export function startHostRuntimeBootstrap(input: StartHostRuntimeBootstrapInput): void {
+  input.store.boot();
+  startDaemonIfGateAllows({
+    daemonStartService: input.daemonStartService,
+    shouldStartDaemon: input.shouldStartDaemon,
+    onGateError: input.onGateError,
+  });
+}

-  if (!isDesktopManaged) {
-    setPhase("connecting");
-    setError(null);
-    await store.bootstrap({ manageBuiltInDaemon: settings.manageBuiltInDaemon });
-  } else {
-    const setupResult = await setupDesktopManagedConnection({
-      store,
-      setPhase,
-      setError,
-      isCancelled,
-    });
-    if (setupResult.type === "error") {
+export function startDaemonIfGateAllows(input: {
+  daemonStartService: HostRuntimeBootstrapDaemonStartService;
+  shouldStartDaemon: HostRuntimeBootstrapStartGate;
+  onGateError?: (message: string) => void;
+}): void {
+  const gate = input.shouldStartDaemon;
+  if (typeof gate === "boolean") {
+    if (gate) {
+      void input.daemonStartService.start();
+    }
+    return;
+  }
+
+  void Promise.resolve()
+    .then(() => gate())
+    .then((shouldStartDaemon) => {
+      if (shouldStartDaemon) {
+        void input.daemonStartService.start();
+      }
      return null;
-    }
-  }
-
-  const startupWorkspaceSelection = await loadStartupWorkspaceSelection();
-
-  const target = await waitForStartupNavigationTarget({
-    store,
-    preferredServerId: startupWorkspaceSelection?.serverId ?? null,
-    signal,
-  });
-
-  if (!isCancelled()) {
-    setPhase("online");
-    setError(null);
-  }
-
-  return target;
-}
-
-async function setupDesktopManagedConnection(input: {
-  store: HostRuntimeBootstrapStore;
-  setPhase: (phase: HostRuntimeBootstrapPhase) => void;
-  setError: (error: string | null) => void;
-  isCancelled: () => boolean;
-}): Promise<BootstrapOutcome> {
-  const { store, setPhase, setError, isCancelled } = input;
-
-  setPhase("starting-daemon");
-  setError(null);
-
-  try {
-    const bootstrapResult = await store.bootstrapDesktop();
-    if (!bootstrapResult.ok) {
-      if (!isCancelled()) {
-        setPhase("error");
-        setError(bootstrapResult.error);
-      }
-      return { type: "error", error: bootstrapResult.error };
-    }
-
-    if (!isCancelled()) {
-      setPhase("connecting");
-    }
-    await store.addConnectionFromListenAndWaitForOnline({
-      listenAddress: bootstrapResult.listenAddress,
-      serverId: bootstrapResult.serverId,
-      hostname: bootstrapResult.hostname,
+    })
+    .catch((error) => {
+      const message = error instanceof Error ? error.message : String(error);
+      input.onGateError?.(`Failed to evaluate desktop daemon settings: ${message}`);
    });
-    return { type: "online" };
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    if (!isCancelled()) {
-      setPhase("error");
-      setError(message);
+}
+
+export const WELCOME_ROUTE: Href = "/welcome";
+
+export interface ResolveStartupRedirectInput {
+  pathname: string;
+  anyOnlineHostServerId: string | null;
+  workspaceSelection: ActiveWorkspaceSelection | null;
+  isWorkspaceSelectionLoaded: boolean;
+  hasGivenUpWaitingForHost: boolean;
+}
+
+export function resolveStartupRedirectRoute(input: ResolveStartupRedirectInput): Href | null {
+  if (input.pathname !== "/" && input.pathname !== "") {
+    return null;
+  }
+  if (!input.isWorkspaceSelectionLoaded) {
+    return null;
+  }
+
+  if (input.anyOnlineHostServerId) {
+    if (
+      input.workspaceSelection &&
+      input.workspaceSelection.serverId === input.anyOnlineHostServerId
+    ) {
+      return buildHostWorkspaceRoute(
+        input.workspaceSelection.serverId,
+        input.workspaceSelection.workspaceId,
+      );
    }
-    return { type: "error", error: message };
-  }
-}
-
-function waitForStartupNavigationTarget(input: {
-  store: HostRuntimeBootstrapStore;
-  preferredServerId: string | null;
-  signal?: AbortSignal;
-}): Promise<StartupNavigationTarget> {
-  const { store, preferredServerId, signal } = input;
-
-  if (signal?.aborted) {
-    return Promise.resolve(null);
+    return buildHostRootRoute(input.anyOnlineHostServerId);
  }

-  const onlineWait = store.waitForAnyConnectionOnline({ preferredServerId });
+  if (input.hasGivenUpWaitingForHost) {
+    return WELCOME_ROUTE;
+  }

-  return new Promise<StartupNavigationTarget>((resolve) => {
-    let settled = false;
-
-    const settle = (target: StartupNavigationTarget): void => {
-      if (settled) {
-        return;
-      }
-      settled = true;
-      signal?.removeEventListener("abort", abort);
-      onlineWait.cancel();
-      resolve(target);
-    };
-
-    const abort = (): void => {
-      settle(null);
-    };
-
-    signal?.addEventListener("abort", abort, { once: true });
-    onlineWait.promise.then((target) => {
-      settle(target);
-      return undefined;
-    });
-  });
-}
-
-type BootstrapOutcome = { type: "online" } | { type: "error"; error: string };
-
-async function readStartupWorkspaceSelection(): Promise<ActiveWorkspaceSelection | null> {
-  await hydrateLastNavigationWorkspaceRouteSelection();
-  return getLastNavigationWorkspaceRouteSelection();
+  return null;
 }
@@ -6,29 +6,24 @@ import { act } from "@testing-library/react";
 import { createRoot, type Root } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { HostRuntimeBootstrapState } from "./_layout";
+import type { ActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";

-const { redirectMock, runtimeStoreAccessMock, workspaceStoreAccessMock, state } = vi.hoisted(() => {
+const { redirectMock, state } = vi.hoisted(() => {
  const hoistedState = {
    pathname: "/",
-    storeReady: true,
    bootstrapState: {
-      phase: "online",
-      error: null,
+      splashError: null,
      retry: vi.fn(),
-      startupNavigation: null,
+      hasGivenUpWaitingForHost: false,
+      storeReady: false,
    } as HostRuntimeBootstrapState,
+    anyOnlineHostServerId: null as string | null,
+    isWorkspaceSelectionLoaded: true,
+    workspaceSelection: null as ActiveWorkspaceSelection | null,
  };

  return {
    redirectMock: vi.fn(),
-    runtimeStoreAccessMock: vi.fn(() => {
-      throw new Error("index.tsx must not read the host runtime store during startup navigation");
-    }),
-    workspaceStoreAccessMock: vi.fn(() => {
-      throw new Error(
-        "index.tsx must not read the navigation workspace store during startup navigation",
-      );
-    }),
    state: hoistedState,
  };
 });
@@ -43,11 +38,7 @@ vi.mock("expo-router", () => ({

 vi.mock("@/app/_layout", () => ({
  useHostRuntimeBootstrapState: () => state.bootstrapState,
-  useStoreReady: () => state.storeReady,
-}));
-
-vi.mock("@/runtime/host-runtime", () => ({
-  getHostRuntimeStore: runtimeStoreAccessMock,
+  useEarliestOnlineHostServerId: () => state.anyOnlineHostServerId,
 }));

 vi.mock("@/desktop/daemon/desktop-daemon", () => ({
@@ -59,8 +50,8 @@ vi.mock("@/screens/startup-splash-screen", () => ({
 }));

 vi.mock("@/stores/navigation-active-workspace-store", () => ({
-  getLastNavigationWorkspaceRouteSelection: workspaceStoreAccessMock,
-  useIsLastNavigationWorkspaceRouteSelectionLoaded: workspaceStoreAccessMock,
+  getLastNavigationWorkspaceRouteSelection: () => state.workspaceSelection,
+  useIsLastNavigationWorkspaceRouteSelectionLoaded: () => state.isWorkspaceSelectionLoaded,
 }));

 describe("Index route startup navigation", () => {
@@ -70,16 +61,16 @@ describe("Index route startup navigation", () => {
  beforeEach(() => {
    vi.resetModules();
    state.pathname = "/";
-    state.storeReady = true;
    state.bootstrapState = {
-      phase: "online",
-      error: null,
+      splashError: null,
      retry: vi.fn(),
-      startupNavigation: null,
+      hasGivenUpWaitingForHost: false,
+      storeReady: false,
    };
+    state.anyOnlineHostServerId = null;
+    state.isWorkspaceSelectionLoaded = true;
+    state.workspaceSelection = null;
    redirectMock.mockReset();
-    runtimeStoreAccessMock.mockClear();
-    workspaceStoreAccessMock.mockClear();

    container = document.createElement("div");
    document.body.appendChild(container);
@@ -100,54 +91,54 @@ describe("Index route startup navigation", () => {
    });
  }

-  it("shows the startup splash until bootstrap has resolved the startup navigation target", async () => {
+  it("shows the startup splash while no host is online and the welcome timer has not fired", async () => {
    await renderIndex();

    expect(container.querySelector("[data-testid='startup-splash']")).not.toBeNull();
    expect(redirectMock).not.toHaveBeenCalled();
-    expect(runtimeStoreAccessMock).not.toHaveBeenCalled();
-    expect(workspaceStoreAccessMock).not.toHaveBeenCalled();
  });

-  it("restores the persisted workspace when the startup target matches its host", async () => {
-    state.bootstrapState.startupNavigation = {
-      target: { serverId: "server-1" },
-      workspaceSelection: { serverId: "server-1", workspaceId: "workspace-a" },
-    };
+  it("shows the startup splash while the workspace selection has not loaded", async () => {
+    state.anyOnlineHostServerId = "server-1";
+    state.isWorkspaceSelectionLoaded = false;
+
+    await renderIndex();
+
+    expect(container.querySelector("[data-testid='startup-splash']")).not.toBeNull();
+    expect(redirectMock).not.toHaveBeenCalled();
+  });
+
+  it("restores the persisted workspace when the online host matches its server id", async () => {
+    state.anyOnlineHostServerId = "server-1";
+    state.workspaceSelection = { serverId: "server-1", workspaceId: "workspace-a" };

    await renderIndex();

    expect(redirectMock).toHaveBeenCalledWith("/h/server-1/workspace/workspace-a");
-    expect(runtimeStoreAccessMock).not.toHaveBeenCalled();
-    expect(workspaceStoreAccessMock).not.toHaveBeenCalled();
  });

-  it("navigates to the startup host root when it differs from the persisted workspace host", async () => {
-    state.bootstrapState.startupNavigation = {
-      target: { serverId: "server-2" },
-      workspaceSelection: { serverId: "server-1", workspaceId: "workspace-a" },
-    };
+  it("navigates to the host root when the persisted workspace targets a different server", async () => {
+    state.anyOnlineHostServerId = "server-2";
+    state.workspaceSelection = { serverId: "server-1", workspaceId: "workspace-a" };

    await renderIndex();

    expect(redirectMock).toHaveBeenCalledWith("/h/server-2");
  });

-  it("navigates to the startup host root when no persisted workspace exists", async () => {
-    state.bootstrapState.startupNavigation = {
-      target: { serverId: "server-2" },
-      workspaceSelection: null,
-    };
+  it("navigates to the host root when no persisted workspace exists", async () => {
+    state.anyOnlineHostServerId = "server-2";
+    state.workspaceSelection = null;

    await renderIndex();

    expect(redirectMock).toHaveBeenCalledWith("/h/server-2");
  });

-  it("falls back to welcome when bootstrap resolves no startup target", async () => {
-    state.bootstrapState.startupNavigation = {
-      target: null,
-      workspaceSelection: null,
+  it("falls back to welcome when the give-up timer fires with no host online", async () => {
+    state.bootstrapState = {
+      ...state.bootstrapState,
+      hasGivenUpWaitingForHost: true,
    };

    await renderIndex();
@@ -1,26 +1,30 @@
 import React from "react";
-import { Redirect, usePathname, type Href } from "expo-router";
+import { Redirect, usePathname } from "expo-router";
 import { StartupSplashScreen } from "@/screens/startup-splash-screen";
+import { useEarliestOnlineHostServerId, useHostRuntimeBootstrapState } from "@/app/_layout";
+import { resolveStartupRedirectRoute } from "@/app/host-runtime-bootstrap";
 import {
-  type HostRuntimeBootstrapState,
-  useHostRuntimeBootstrapState,
-  useStoreReady,
-} from "@/app/_layout";
-import { buildHostRootRoute, buildHostWorkspaceRoute } from "@/utils/host-routes";
+  getLastNavigationWorkspaceRouteSelection,
+  useIsLastNavigationWorkspaceRouteSelectionLoaded,
+} from "@/stores/navigation-active-workspace-store";
 import { shouldUseDesktopDaemon } from "@/desktop/daemon/desktop-daemon";

-const WELCOME_ROUTE = "/welcome";
-
 const isDesktop = shouldUseDesktopDaemon();

 export default function Index() {
  const pathname = usePathname();
  const bootstrapState = useHostRuntimeBootstrapState();
-  const storeReady = useStoreReady();
+  const anyOnlineHostServerId = useEarliestOnlineHostServerId();
+  const isWorkspaceSelectionLoaded = useIsLastNavigationWorkspaceRouteSelectionLoaded();
+
  const redirectRoute = resolveStartupRedirectRoute({
-    bootstrapState,
    pathname,
-    storeReady,
+    anyOnlineHostServerId,
+    workspaceSelection: isWorkspaceSelectionLoaded
+      ? getLastNavigationWorkspaceRouteSelection()
+      : null,
+    isWorkspaceSelectionLoaded,
+    hasGivenUpWaitingForHost: bootstrapState.hasGivenUpWaitingForHost,
  });

  if (redirectRoute) {
@@ -29,30 +33,3 @@ export default function Index() {

  return <StartupSplashScreen bootstrapState={isDesktop ? bootstrapState : undefined} />;
 }
-
-function resolveStartupRedirectRoute(input: {
-  bootstrapState: HostRuntimeBootstrapState;
-  pathname: string;
-  storeReady: boolean;
-}): Href | null {
-  const { bootstrapState, pathname, storeReady } = input;
-
-  if (!storeReady || !bootstrapState.startupNavigation) {
-    return null;
-  }
-  if (pathname !== "/" && pathname !== "") {
-    return null;
-  }
-
-  const { target, workspaceSelection } = bootstrapState.startupNavigation;
-
-  if (!target) {
-    return WELCOME_ROUTE;
-  }
-
-  if (workspaceSelection && target.serverId === workspaceSelection.serverId) {
-    return buildHostWorkspaceRoute(workspaceSelection.serverId, workspaceSelection.workspaceId);
-  }
-
-  return buildHostRootRoute(target.serverId);
-}
@@ -0,0 +1,337 @@
+import { useCallback, useEffect, useMemo, useState, type ReactElement } from "react";
+import { Text, View } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { MessageSquareCode, MousePointer2 } from "lucide-react-native";
+import type {
+  ComposerAttachment,
+  UserComposerAttachment,
+  WorkspaceComposerAttachment,
+} from "@/attachments/types";
+import { AttachmentPill } from "@/components/attachment-pill";
+import { useWorkspaceAttachmentsStore } from "@/attachments/workspace-attachments-store";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
+import type { AgentAttachment } from "@server/shared/messages";
+import { useClearReviewDraft } from "@/review/store";
+
+interface WorkspaceAttachmentBindingInput {
+  normalAttachments: UserComposerAttachment[];
+  workspaceAttachments: readonly WorkspaceComposerAttachment[];
+  onOpenWorkspaceAttachment?: (attachment: WorkspaceComposerAttachment) => void;
+}
+
+interface RemoveWorkspaceAttachmentInput {
+  selectedAttachments: readonly ComposerAttachment[];
+  index: number;
+}
+
+interface OpenWorkspaceAttachmentInput {
+  attachment: ComposerAttachment;
+}
+
+interface CompleteSubmitInput {
+  result: "noop" | "queued" | "submitted" | "failed";
+  outgoingAttachments: readonly ComposerAttachment[];
+}
+
+interface ComposerWorkspaceAttachmentBinding {
+  selectedAttachments: ComposerAttachment[];
+  buildOutgoingAttachments: (normalAttachments: UserComposerAttachment[]) => ComposerAttachment[];
+  removeAttachment: (input: RemoveWorkspaceAttachmentInput) => boolean;
+  openAttachment: (input: OpenWorkspaceAttachmentInput) => boolean;
+  clearSentAttachments: (attachments: readonly ComposerAttachment[]) => void;
+  completeSubmit: (input: CompleteSubmitInput) => void;
+  resetSuppression: () => void;
+}
+
+function getAttachmentKey(attachment: WorkspaceComposerAttachment): string {
+  if (attachment.kind === "browser_element") {
+    return JSON.stringify({
+      type: "browser_element",
+      url: attachment.attachment.url,
+      selector: attachment.attachment.selector,
+      tag: attachment.attachment.tag,
+      text: attachment.attachment.text,
+      html: attachment.attachment.outerHTML,
+    });
+  }
+  return JSON.stringify({
+    type: "review",
+    cwd: attachment.attachment.cwd,
+    mode: attachment.attachment.mode,
+    baseRef: attachment.attachment.baseRef ?? null,
+    reviewDraftKey: attachment.reviewDraftKey,
+    comments: attachment.attachment.comments.map((comment) => ({
+      filePath: comment.filePath,
+      side: comment.side,
+      lineNumber: comment.lineNumber,
+      body: comment.body,
+    })),
+  });
+}
+
+function isWorkspaceAttachment(
+  attachment: ComposerAttachment | undefined,
+): attachment is WorkspaceComposerAttachment {
+  return attachment?.kind === "review" || attachment?.kind === "browser_element";
+}
+
+function userAttachmentsOnly(attachments: readonly ComposerAttachment[]): UserComposerAttachment[] {
+  return attachments.filter(
+    (attachment): attachment is UserComposerAttachment =>
+      attachment.kind !== "review" && attachment.kind !== "browser_element",
+  );
+}
+
+function toSubmitAttachment(attachment: ComposerAttachment): AgentAttachment | null {
+  if (attachment.kind === "browser_element") {
+    return {
+      type: "text",
+      mimeType: "text/plain",
+      title: `Browser element · ${attachment.attachment.tag}`,
+      text: attachment.attachment.formatted,
+    };
+  }
+  return attachment.kind === "review" ? attachment.attachment : null;
+}
+
+function renderPill(args: RenderWorkspaceAttachmentPillArgs): ReactElement {
+  return (
+    <WorkspaceAttachmentPill
+      key={`workspace:${getAttachmentKey(args.attachment)}`}
+      {...args}
+      attachment={args.attachment}
+    />
+  );
+}
+
+function useWorkspaceAttachmentBinding({
+  normalAttachments,
+  workspaceAttachments,
+  onOpenWorkspaceAttachment,
+}: WorkspaceAttachmentBindingInput): ComposerWorkspaceAttachmentBinding {
+  const clearReviewDraft = useClearReviewDraft();
+  const setWorkspaceAttachments = useWorkspaceAttachmentsStore(
+    (state) => state.setWorkspaceAttachments,
+  );
+  const [suppressedKeys, setSuppressedKeys] = useState<readonly string[]>([]);
+  const workspaceAttachmentKeys = useMemo(
+    () => workspaceAttachments.map(getAttachmentKey),
+    [workspaceAttachments],
+  );
+  const activeWorkspaceAttachments = useMemo(
+    () =>
+      workspaceAttachments.filter(
+        (attachment, index) => !suppressedKeys.includes(workspaceAttachmentKeys[index] ?? ""),
+      ),
+    [suppressedKeys, workspaceAttachmentKeys, workspaceAttachments],
+  );
+
+  const selectedAttachments = useMemo<ComposerAttachment[]>(
+    () =>
+      activeWorkspaceAttachments.length > 0
+        ? [...normalAttachments, ...activeWorkspaceAttachments]
+        : normalAttachments,
+    [activeWorkspaceAttachments, normalAttachments],
+  );
+
+  useEffect(() => {
+    setSuppressedKeys((current) => {
+      const next = current.filter((suppressedKey) =>
+        workspaceAttachmentKeys.includes(suppressedKey),
+      );
+      return next.length === current.length ? current : next;
+    });
+  }, [workspaceAttachmentKeys]);
+
+  const buildOutgoingAttachments = useCallback(
+    (attachments: UserComposerAttachment[]): ComposerAttachment[] =>
+      activeWorkspaceAttachments.length > 0
+        ? [...attachments, ...activeWorkspaceAttachments]
+        : attachments,
+    [activeWorkspaceAttachments],
+  );
+
+  const suppressWorkspaceAttachment = useCallback((attachment: WorkspaceComposerAttachment) => {
+    const key = getAttachmentKey(attachment);
+    setSuppressedKeys((current) => (current.includes(key) ? current : [...current, key]));
+  }, []);
+
+  const clearSentAttachments = useCallback(
+    (attachments: readonly ComposerAttachment[]) => {
+      for (const attachment of attachments) {
+        if (attachment.kind === "review") {
+          clearReviewDraft({ key: attachment.reviewDraftKey });
+        }
+      }
+    },
+    [clearReviewDraft],
+  );
+
+  const removeAttachment = useCallback(
+    ({ selectedAttachments: current, index }: RemoveWorkspaceAttachmentInput) => {
+      const selected = current[index];
+      if (isWorkspaceAttachment(selected)) {
+        if (selected.kind === "browser_element") {
+          const selectedKey = getAttachmentKey(selected);
+          const { attachmentsByScope } = useWorkspaceAttachmentsStore.getState();
+          for (const [scopeKey, attachments] of Object.entries(attachmentsByScope)) {
+            const nextAttachments = attachments.filter(
+              (attachment) => getAttachmentKey(attachment) !== selectedKey,
+            );
+            if (nextAttachments.length !== attachments.length) {
+              setWorkspaceAttachments({ scopeKey, attachments: nextAttachments });
+            }
+          }
+          return true;
+        }
+        suppressWorkspaceAttachment(selected);
+        return true;
+      }
+      return false;
+    },
+    [setWorkspaceAttachments, suppressWorkspaceAttachment],
+  );
+
+  const openAttachment = useCallback(
+    ({ attachment }: OpenWorkspaceAttachmentInput) => {
+      if (!isWorkspaceAttachment(attachment) || attachment.kind !== "review") {
+        return false;
+      }
+      onOpenWorkspaceAttachment?.(attachment);
+      return true;
+    },
+    [onOpenWorkspaceAttachment],
+  );
+
+  const resetSuppression = useCallback(() => {
+    setSuppressedKeys([]);
+  }, []);
+
+  const completeSubmit = useCallback(
+    ({ result, outgoingAttachments }: CompleteSubmitInput) => {
+      if (result === "submitted") {
+        clearSentAttachments(outgoingAttachments);
+      }
+      if (result === "queued" || result === "submitted") {
+        resetSuppression();
+      }
+    },
+    [clearSentAttachments, resetSuppression],
+  );
+
+  return {
+    selectedAttachments,
+    buildOutgoingAttachments,
+    removeAttachment,
+    openAttachment,
+    clearSentAttachments,
+    completeSubmit,
+    resetSuppression,
+  };
+}
+
+interface RenderWorkspaceAttachmentPillArgs {
+  attachment: WorkspaceComposerAttachment;
+  index: number;
+  disabled: boolean;
+  onOpen: (attachment: ComposerAttachment) => void;
+  onRemove: (index: number) => void;
+}
+
+interface WorkspaceAttachmentPillProps extends Omit<
+  RenderWorkspaceAttachmentPillArgs,
+  "attachment"
+> {
+  attachment: WorkspaceComposerAttachment;
+}
+
+function WorkspaceAttachmentPill({
+  attachment,
+  index,
+  disabled,
+  onOpen,
+  onRemove,
+}: WorkspaceAttachmentPillProps) {
+  let label: string;
+  if (attachment.kind === "browser_element") {
+    label = `Element · ${attachment.attachment.tag}`;
+  } else {
+    label =
+      attachment.commentCount === 1
+        ? "Review · 1 comment"
+        : `Review · ${attachment.commentCount} comments`;
+  }
+  const handleOpen = useCallback(() => {
+    onOpen(attachment);
+  }, [onOpen, attachment]);
+  const handleRemove = useCallback(() => {
+    onRemove(index);
+  }, [onRemove, index]);
+  return (
+    <AttachmentPill
+      testID="composer-review-attachment-pill"
+      onOpen={handleOpen}
+      onRemove={handleRemove}
+      openAccessibilityLabel={
+        attachment.kind === "browser_element"
+          ? "Open browser element attachment"
+          : "Open review attachment"
+      }
+      removeAccessibilityLabel={
+        attachment.kind === "browser_element"
+          ? "Remove browser element attachment"
+          : "Remove review attachment"
+      }
+      disabled={disabled}
+    >
+      <View style={styles.pillBody}>
+        <View style={styles.pillIcon}>
+          {attachment.kind === "browser_element" ? (
+            <ThemedMousePointer2 size={ICON_SIZE.sm} uniProps={iconForegroundMutedMapping} />
+          ) : (
+            <ThemedMessageSquareCode size={ICON_SIZE.sm} uniProps={iconForegroundMutedMapping} />
+          )}
+        </View>
+        <Text style={styles.pillText} numberOfLines={1}>
+          {label}
+        </Text>
+      </View>
+    </AttachmentPill>
+  );
+}
+
+export const composerWorkspaceAttachment = {
+  is: isWorkspaceAttachment,
+  renderPill,
+  toSubmitAttachment,
+  userAttachmentsOnly,
+  useBinding: useWorkspaceAttachmentBinding,
+};
+
+const styles = StyleSheet.create((theme: Theme) => ({
+  pillBody: {
+    minHeight: 48,
+    maxWidth: 260,
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    paddingHorizontal: theme.spacing[3],
+    paddingVertical: theme.spacing[2],
+    backgroundColor: theme.colors.surface1,
+  },
+  pillIcon: {
+    width: 18,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  pillText: {
+    minWidth: 0,
+    flexShrink: 1,
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+  },
+})) as unknown as Record<string, object>;
+
+const ThemedMousePointer2 = withUnistyles(MousePointer2);
+const ThemedMessageSquareCode = withUnistyles(MessageSquareCode);
+const iconForegroundMutedMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
@@ -14,6 +14,21 @@ const fileSystemMock = vi.hoisted(() => ({
  readAsStringAsync: vi.fn(async () => "AAECAw=="),
  deleteAsync: vi.fn(async () => {}),
  readDirectoryAsync: vi.fn(async () => []),
+  fileWrite: vi.fn((_uri: string, _content: Uint8Array) => {}),
+}));
+
+vi.mock("expo-file-system", () => ({
+  File: class {
+    uri: string;
+
+    constructor(uri: string) {
+      this.uri = uri;
+    }
+
+    write(content: Uint8Array) {
+      fileSystemMock.fileWrite(this.uri, content);
+    }
+  },
 }));

 vi.mock("expo-file-system/legacy", () => ({
@@ -37,9 +52,10 @@ describe("local file attachment store", () => {
    fileSystemMock.readAsStringAsync.mockClear();
    fileSystemMock.deleteAsync.mockClear();
    fileSystemMock.readDirectoryAsync.mockClear();
+    fileSystemMock.fileWrite.mockClear();
  });

-  it("writes raw base64 sources directly to the managed file path", async () => {
+  it("writes raw byte sources directly to the managed file path", async () => {
    const store = createLocalFileAttachmentStore({
      storageType: "native-file",
      baseDirectoryName: "preview-assets",
@@ -50,14 +66,14 @@ describe("local file attachment store", () => {
      id: "preview_8_test",
      mimeType: "image/png",
      fileName: "result.png",
-      source: { kind: "base64", base64: "AAECAw==" },
+      source: { kind: "bytes", bytes: new Uint8Array([0, 1, 2, 3]) },
    });

-    expect(fileSystemMock.writeAsStringAsync).toHaveBeenCalledWith(
+    expect(fileSystemMock.fileWrite).toHaveBeenCalledWith(
      "file:///cache/preview-assets/preview_8_test.png",
-      "AAECAw==",
-      { encoding: "base64" },
+      new Uint8Array([0, 1, 2, 3]),
    );
+    expect(fileSystemMock.writeAsStringAsync).not.toHaveBeenCalled();
    expect(attachment).toMatchObject({
      id: "preview_8_test",
      mimeType: "image/png",
@@ -1,3 +1,4 @@
+import { File } from "expo-file-system";
 import * as FileSystem from "expo-file-system/legacy";
 import {
  type AttachmentStore,
@@ -6,7 +7,6 @@ import {
  type SaveAttachmentInput,
 } from "@/attachments/types";
 import {
-  blobToBase64,
  fileUriToPath,
  generateAttachmentId,
  getFileExtensionFromName,
@@ -45,6 +45,15 @@ async function ensureDirectory(uri: string): Promise<void> {
  await FileSystem.makeDirectoryAsync(uri, { intermediates: true });
 }

+async function dataUrlToBytes(dataUrl: string): Promise<Uint8Array> {
+  const response = await fetch(dataUrl);
+  return new Uint8Array(await response.arrayBuffer());
+}
+
+async function blobToBytes(blob: Blob): Promise<Uint8Array> {
+  return new Uint8Array(await blob.arrayBuffer());
+}
+
 async function writeFromSource(input: {
  source: SaveAttachmentInput["source"];
  targetUri: string;
@@ -59,30 +68,16 @@ async function writeFromSource(input: {
    return;
  }

+  let bytes: Uint8Array;
  if (input.source.kind === "data_url") {
-    const parsed = parseDataUrl(input.source.dataUrl);
-    const mimeType = normalizeMimeType(parsed.mimeType || input.mimeType);
-    const base64 = parsed.base64;
-    await FileSystem.writeAsStringAsync(input.targetUri, base64, {
-      encoding: FileSystem.EncodingType.Base64,
-    });
-    if (mimeType !== input.mimeType) {
-      return;
-    }
-    return;
+    bytes = await dataUrlToBytes(input.source.dataUrl);
+  } else if (input.source.kind === "blob") {
+    bytes = await blobToBytes(input.source.blob);
+  } else {
+    bytes = input.source.bytes;
  }

-  if (input.source.kind === "base64") {
-    await FileSystem.writeAsStringAsync(input.targetUri, input.source.base64, {
-      encoding: FileSystem.EncodingType.Base64,
-    });
-    return;
-  }
-
-  const base64 = await blobToBase64(input.source.blob);
-  await FileSystem.writeAsStringAsync(input.targetUri, base64, {
-    encoding: FileSystem.EncodingType.Base64,
-  });
+  new File(input.targetUri).write(bytes);
 }

 function attachmentUri(metadata: AttachmentMetadata): string {
@@ -1,7 +1,7 @@
 import { afterEach, describe, expect, it } from "vitest";
 import type { AttachmentMetadata, AttachmentStore, SaveAttachmentInput } from "@/attachments/types";
 import { __setAttachmentStoreForTests } from "./store";
-import { encodeAttachmentsForSend, persistAttachmentFromBase64 } from "./service";
+import { encodeAttachmentsForSend, persistAttachmentFromBytes } from "./service";

 function createAttachment(input: Partial<AttachmentMetadata> = {}): AttachmentMetadata {
  return {
@@ -54,19 +54,20 @@ describe("attachment service", () => {
    __setAttachmentStoreForTests(null);
  });

-  it("persists raw base64 without requiring a data URL wrapper", async () => {
+  it("persists raw bytes without requiring a base64 wrapper", async () => {
    const store = createRecordingStore();
    __setAttachmentStoreForTests(store);
+    const bytes = new Uint8Array([0, 1, 2, 3]);

-    const attachment = await persistAttachmentFromBase64({
-      id: "att_base64",
-      base64: "AAECAw==",
+    const attachment = await persistAttachmentFromBytes({
+      id: "att_bytes",
+      bytes,
      mimeType: "image/png",
      fileName: "image.png",
    });

    expect(attachment).toEqual({
-      id: "att_base64",
+      id: "att_bytes",
      mimeType: "image/png",
      storageType: "web-indexeddb",
      storageKey: "att_1",
@@ -76,10 +77,10 @@ describe("attachment service", () => {
    });
    expect(store.savedSources).toEqual([
      {
-        id: "att_base64",
+        id: "att_bytes",
        mimeType: "image/png",
        fileName: "image.png",
-        source: { kind: "base64", base64: "AAECAw==" },
+        source: { kind: "bytes", bytes },
      },
    ]);
  });
@@ -31,8 +31,8 @@ export async function persistAttachmentFromDataUrl(input: {
  });
 }

-export async function persistAttachmentFromBase64(input: {
-  base64: string;
+export async function persistAttachmentFromBytes(input: {
+  bytes: Uint8Array;
  mimeType?: string;
  fileName?: string | null;
  id?: string;
@@ -42,7 +42,7 @@ export async function persistAttachmentFromBase64(input: {
    id: input.id,
    mimeType: input.mimeType,
    fileName: input.fileName,
-    source: { kind: "base64", base64: input.base64 },
+    source: { kind: "bytes", bytes: input.bytes },
  });
 }

@@ -1,4 +1,4 @@
-import type { GitHubSearchItem } from "@server/shared/messages";
+import type { AgentAttachment, GitHubSearchItem } from "@server/shared/messages";

 export type AttachmentStorageType = "web-indexeddb" | "desktop-file" | "native-file";

@@ -17,13 +17,57 @@ export interface AttachmentMetadata {
  createdAt: number;
 }

+export interface BrowserElementAttachment {
+  url: string;
+  selector: string;
+  tag: string;
+  text: string;
+  outerHTML: string;
+  computedStyles: Record<string, string>;
+  boundingRect: {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+  };
+  reactSource: {
+    fileName: string | null;
+    lineNumber: number | null;
+    columnNumber: number | null;
+    componentName: string | null;
+  } | null;
+  parentChain: string[];
+  children: string[];
+  formatted: string;
+}
+
 export type ComposerAttachment =
  | { kind: "image"; metadata: AttachmentMetadata }
  | { kind: "github_issue"; item: GitHubSearchItem }
-  | { kind: "github_pr"; item: GitHubSearchItem };
+  | { kind: "github_pr"; item: GitHubSearchItem }
+  | {
+      kind: "browser_element";
+      attachment: BrowserElementAttachment;
+    }
+  | {
+      kind: "review";
+      attachment: Extract<AgentAttachment, { type: "review" }>;
+      reviewDraftKey: string;
+      commentCount: number;
+    };
+
+export type UserComposerAttachment = Exclude<
+  ComposerAttachment,
+  { kind: "review" } | { kind: "browser_element" }
+>;
+
+export type WorkspaceComposerAttachment = Extract<
+  ComposerAttachment,
+  { kind: "review" } | { kind: "browser_element" }
+>;

 export type AttachmentDataSource =
-  | { kind: "base64"; base64: string }
+  | { kind: "bytes"; bytes: Uint8Array }
  | { kind: "blob"; blob: Blob }
  | { kind: "data_url"; dataUrl: string }
  | { kind: "file_uri"; uri: string };
@@ -0,0 +1,112 @@
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { createIndexedDbAttachmentStore } from "./indexeddb-attachment-store";
+
+type Listener = () => void;
+
+class FakeRequest<T = unknown> {
+  result!: T;
+  error: Error | null = null;
+  private listeners = new Map<string, Listener[]>();
+
+  addEventListener(event: string, listener: Listener): void {
+    this.listeners.set(event, [...(this.listeners.get(event) ?? []), listener]);
+  }
+
+  emit(event: string): void {
+    for (const listener of this.listeners.get(event) ?? []) {
+      listener();
+    }
+  }
+}
+
+class FakeObjectStore {
+  constructor(private readonly onPut: (record: unknown) => void) {}
+
+  put(record: unknown): FakeRequest {
+    this.onPut(record);
+    const request = new FakeRequest();
+    queueMicrotask(() => request.emit("success"));
+    return request;
+  }
+}
+
+class FakeTransaction {
+  error: Error | null = null;
+
+  constructor(private readonly store: FakeObjectStore) {}
+
+  objectStore(): FakeObjectStore {
+    return this.store;
+  }
+
+  addEventListener(): void {}
+}
+
+class FakeDatabase {
+  readonly objectStoreNames = {
+    contains: () => true,
+  };
+
+  constructor(private readonly store: FakeObjectStore) {}
+
+  createObjectStore(): void {}
+
+  transaction(): FakeTransaction {
+    return new FakeTransaction(this.store);
+  }
+
+  close(): void {}
+}
+
+describe("indexeddb attachment store", () => {
+  let storedRecord: unknown;
+
+  beforeEach(() => {
+    storedRecord = null;
+    Object.defineProperty(globalThis, "indexedDB", {
+      configurable: true,
+      value: {
+        open: () => {
+          const store = new FakeObjectStore((record) => {
+            storedRecord = record;
+          });
+          const request = new FakeRequest<FakeDatabase>();
+          request.result = new FakeDatabase(store);
+          queueMicrotask(() => request.emit("success"));
+          return request;
+        },
+      } as unknown as IDBFactory,
+    });
+  });
+
+  afterEach(() => {
+    Reflect.deleteProperty(globalThis, "indexedDB");
+  });
+
+  it("stores raw byte sources as a Blob", async () => {
+    const store = createIndexedDbAttachmentStore();
+    const bytes = new Uint8Array([0, 1, 2, 3]);
+
+    const attachment = await store.save({
+      id: "att_bytes",
+      mimeType: "image/png",
+      fileName: "image.png",
+      source: { kind: "bytes", bytes },
+    });
+
+    expect(storedRecord).toEqual({
+      id: "att_bytes",
+      blob: new Blob([bytes], { type: "image/png" }),
+      createdAt: expect.any(Number),
+      fileName: "image.png",
+    });
+    expect(attachment).toMatchObject({
+      id: "att_bytes",
+      mimeType: "image/png",
+      storageType: "web-indexeddb",
+      storageKey: "att_bytes",
+      fileName: "image.png",
+      byteSize: 4,
+    });
+  });
+});
@@ -61,7 +61,7 @@ function runTx<T>(
    const request = run(store);

    request.addEventListener("success", () => {
-      resolve(request.result as T);
+      resolve(request.result);
    });

    request.addEventListener("error", () => {
@@ -74,17 +74,18 @@ function runTx<T>(
  });
 }

-function base64ToBlob(input: { base64: string; mimeType: string }): Blob {
-  const binary = atob(input.base64);
-  const bytes = new Uint8Array(binary.length);
-  for (let index = 0; index < binary.length; index += 1) {
-    bytes[index] = binary.charCodeAt(index);
-  }
-  return new Blob([bytes], { type: input.mimeType });
-}
-
 async function sourceToBlob(input: SaveAttachmentInput): Promise<{ blob: Blob; mimeType: string }> {
  const source = input.source;
+  if (source.kind === "bytes") {
+    const mimeType = normalizeMimeType(input.mimeType);
+    const buffer = new ArrayBuffer(source.bytes.byteLength);
+    new Uint8Array(buffer).set(source.bytes);
+    return {
+      blob: new Blob([buffer], { type: mimeType }),
+      mimeType,
+    };
+  }
+
  if (source.kind === "blob") {
    const mimeType = normalizeMimeType(input.mimeType ?? source.blob.type);
    const blob =
@@ -105,14 +106,6 @@ async function sourceToBlob(input: SaveAttachmentInput): Promise<{ blob: Blob; m
    };
  }

-  if (source.kind === "base64") {
-    const mimeType = normalizeMimeType(input.mimeType);
-    return {
-      blob: base64ToBlob({ base64: source.base64, mimeType }),
-      mimeType,
-    };
-  }
-
  const response = await fetch(source.uri);
  const blob = await response.blob();
  const mimeType = normalizeMimeType(input.mimeType ?? blob.type);
@@ -0,0 +1,89 @@
+import { describe, expect, it } from "vitest";
+import type { WorkspaceComposerAttachment } from "./types";
+import {
+  buildWorkspaceAttachmentScopeKey,
+  resetWorkspaceAttachmentsStore,
+  useWorkspaceAttachmentsStore,
+} from "./workspace-attachments-store";
+
+function reviewAttachment(body: string): WorkspaceComposerAttachment {
+  return {
+    kind: "review",
+    reviewDraftKey: `review:${body}`,
+    commentCount: 1,
+    attachment: {
+      type: "review",
+      mimeType: "application/paseo-review",
+      cwd: "/repo",
+      mode: "uncommitted",
+      baseRef: null,
+      comments: [
+        {
+          filePath: "src/example.ts",
+          side: "new",
+          lineNumber: 41,
+          body,
+          context: {
+            hunkHeader: "@@ -40,1 +40,1 @@",
+            targetLine: {
+              oldLineNumber: null,
+              newLineNumber: 41,
+              type: "add",
+              content: "const value = newValue;",
+            },
+            lines: [
+              {
+                oldLineNumber: null,
+                newLineNumber: 41,
+                type: "add",
+                content: "const value = newValue;",
+              },
+            ],
+          },
+        },
+      ],
+    },
+  };
+}
+
+describe("workspace attachments store", () => {
+  it("scopes workspace attachments by server and workspace before cwd fallback", () => {
+    expect(
+      buildWorkspaceAttachmentScopeKey({
+        serverId: " local ",
+        workspaceId: " workspace-1 ",
+        cwd: "/repo",
+      }),
+    ).toBe("workspace-attachments:server=local:workspace=workspace-1");
+
+    expect(
+      buildWorkspaceAttachmentScopeKey({
+        serverId: "local",
+        workspaceId: null,
+        cwd: "/repo/",
+      }),
+    ).toBe("workspace-attachments:server=local:cwd=%2Frepo");
+  });
+
+  it("publishes and clears attachments for a workspace scope", () => {
+    resetWorkspaceAttachmentsStore();
+    const scopeKey = buildWorkspaceAttachmentScopeKey({
+      serverId: "local",
+      workspaceId: "workspace-1",
+      cwd: "/repo",
+    });
+    const attachment = reviewAttachment("Please simplify this.");
+
+    useWorkspaceAttachmentsStore
+      .getState()
+      .setWorkspaceAttachments({ scopeKey, attachments: [attachment] });
+
+    expect(useWorkspaceAttachmentsStore.getState().attachmentsByScope[scopeKey]).toEqual([
+      attachment,
+    ]);
+
+    useWorkspaceAttachmentsStore.getState().clearWorkspaceAttachments({ scopeKey });
+
+    expect(useWorkspaceAttachmentsStore.getState().attachmentsByScope[scopeKey]).toBeUndefined();
+  });
+});
@@ -0,0 +1,115 @@
+import { useMemo } from "react";
+import { create } from "zustand";
+import type { WorkspaceComposerAttachment } from "./types";
+
+const EMPTY_WORKSPACE_ATTACHMENTS: readonly WorkspaceComposerAttachment[] = [];
+
+export interface WorkspaceAttachmentScopeInput {
+  serverId: string;
+  workspaceId?: string | null;
+  cwd: string;
+}
+
+interface WorkspaceAttachmentsStoreState {
+  attachmentsByScope: Record<string, readonly WorkspaceComposerAttachment[]>;
+}
+
+interface WorkspaceAttachmentsStoreActions {
+  setWorkspaceAttachments: (input: {
+    scopeKey: string;
+    attachments: readonly WorkspaceComposerAttachment[];
+  }) => void;
+  clearWorkspaceAttachments: (input: { scopeKey: string }) => void;
+}
+
+type WorkspaceAttachmentsStore = WorkspaceAttachmentsStoreState & WorkspaceAttachmentsStoreActions;
+
+function encodeScopePart(value: string): string {
+  return encodeURIComponent(value.trim());
+}
+
+function normalizeCwd(cwd: string): string {
+  const trimmed = cwd.trim();
+  if (trimmed === "/") {
+    return trimmed;
+  }
+  return trimmed.replace(/\/+$/, "");
+}
+
+export function buildWorkspaceAttachmentScopeKey(input: WorkspaceAttachmentScopeInput): string {
+  const workspaceId = input.workspaceId?.trim();
+  const workspacePart = workspaceId
+    ? `workspace=${encodeScopePart(workspaceId)}`
+    : `cwd=${encodeScopePart(normalizeCwd(input.cwd))}`;
+
+  return ["workspace-attachments", `server=${encodeScopePart(input.serverId)}`, workspacePart].join(
+    ":",
+  );
+}
+
+function areWorkspaceAttachmentsEqual(
+  left: readonly WorkspaceComposerAttachment[],
+  right: readonly WorkspaceComposerAttachment[],
+): boolean {
+  if (left === right) {
+    return true;
+  }
+  if (left.length !== right.length) {
+    return false;
+  }
+  return left.every((attachment, index) => attachment === right[index]);
+}
+
+export const useWorkspaceAttachmentsStore = create<WorkspaceAttachmentsStore>()((set) => ({
+  attachmentsByScope: {},
+  setWorkspaceAttachments: ({ scopeKey, attachments }) => {
+    set((state) => {
+      const current = state.attachmentsByScope[scopeKey] ?? EMPTY_WORKSPACE_ATTACHMENTS;
+      if (areWorkspaceAttachmentsEqual(current, attachments)) {
+        return state;
+      }
+      if (attachments.length === 0) {
+        if (!state.attachmentsByScope[scopeKey]) {
+          return state;
+        }
+        const next = { ...state.attachmentsByScope };
+        delete next[scopeKey];
+        return { attachmentsByScope: next };
+      }
+      return {
+        attachmentsByScope: {
+          ...state.attachmentsByScope,
+          [scopeKey]: attachments,
+        },
+      };
+    });
+  },
+  clearWorkspaceAttachments: ({ scopeKey }) => {
+    set((state) => {
+      if (!state.attachmentsByScope[scopeKey]) {
+        return state;
+      }
+      const next = { ...state.attachmentsByScope };
+      delete next[scopeKey];
+      return { attachmentsByScope: next };
+    });
+  },
+}));
+
+export function useWorkspaceAttachmentScopeKey(input: WorkspaceAttachmentScopeInput): string {
+  const { serverId, workspaceId, cwd } = input;
+  return useMemo(
+    () => buildWorkspaceAttachmentScopeKey({ serverId, workspaceId, cwd }),
+    [serverId, workspaceId, cwd],
+  );
+}
+
+export function useWorkspaceAttachments(scopeKey: string): readonly WorkspaceComposerAttachment[] {
+  return useWorkspaceAttachmentsStore(
+    (state) => state.attachmentsByScope[scopeKey] ?? EMPTY_WORKSPACE_ATTACHMENTS,
+  );
+}
+
+export function resetWorkspaceAttachmentsStore(): void {
+  useWorkspaceAttachmentsStore.setState({ attachmentsByScope: {} });
+}
@@ -196,7 +196,7 @@ export function AdaptiveModalSheet({
    () => ({ backgroundColor: theme.colors.surface2 }),
    [theme.colors.surface2],
  );
-  const { sheetRef, handleSheetChange } = useIsolatedBottomSheetVisibility({
+  const { sheetRef, handleSheetChange, handleSheetDismiss } = useIsolatedBottomSheetVisibility({
    visible,
    isEnabled: isMobile,
    onClose,
@@ -228,6 +228,7 @@ export function AdaptiveModalSheet({
        index={0}
        enableDynamicSizing={false}
        onChange={handleSheetChange}
+        onDismiss={handleSheetDismiss}
        backdropComponent={renderBackdrop}
        enablePanDownToClose
        backgroundComponent={SheetBackground}
@@ -1,17 +1,35 @@
-import { useCallback, useMemo, useRef, useState } from "react";
-import { Alert, Text, TextInput, View } from "react-native";
+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";
-import { Link2 } from "lucide-react-native";
+import { Check, ChevronDown, ChevronRight, Eye, EyeOff, Link2 } from "lucide-react-native";
 import type { HostProfile } from "@/types/host-connection";
 import { useHosts, useHostMutations } from "@/runtime/host-runtime";
-import { normalizeHostPort } from "@/utils/daemon-endpoints";
+import {
+  parseConnectionUri,
+  serializeConnectionUri,
+  serializeConnectionUriForStorage,
+} from "@/utils/daemon-endpoints";
 import { DaemonConnectionTestError, connectToDaemon } from "@/utils/test-daemon-connection";
 import { AdaptiveModalSheet, AdaptiveTextInput } from "./adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";

 const FLEX_ONE_STYLE = { flex: 1 } as const;

+interface DirectConnectionDraft {
+  host: string;
+  port: string;
+  useTls: boolean;
+  password: string;
+}
+
+interface PreparedDirectConnection {
+  uri: string;
+  endpoint: string;
+  useTls: boolean;
+  password?: string;
+}
+
 const styles = StyleSheet.create((theme) => ({
  field: {
    gap: theme.spacing[2],
@@ -30,6 +48,66 @@ const styles = StyleSheet.create((theme) => ({
    borderWidth: 1,
    borderColor: theme.colors.border,
  },
+  portRow: {
+    flexDirection: "row",
+    gap: theme.spacing[3],
+  },
+  hostField: {
+    flex: 1,
+    minWidth: 0,
+  },
+  portField: {
+    width: 112,
+  },
+  passwordRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  passwordInput: {
+    flex: 1,
+    minWidth: 0,
+  },
+  iconButton: {
+    width: 44,
+    height: 44,
+    alignItems: "center",
+    justifyContent: "center",
+    borderRadius: theme.borderRadius.lg,
+    backgroundColor: theme.colors.surface2,
+    borderWidth: 1,
+    borderColor: theme.colors.border,
+  },
+  checkboxRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[3],
+  },
+  checkbox: {
+    width: 22,
+    height: 22,
+    borderRadius: theme.borderRadius.sm,
+    borderWidth: 1,
+    borderColor: theme.colors.border,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  checkboxChecked: {
+    backgroundColor: theme.colors.accent,
+    borderColor: theme.colors.accent,
+  },
+  advancedToggle: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    alignSelf: "flex-start",
+    paddingVertical: theme.spacing[1],
+  },
+  advancedText: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.medium,
+  },
  actions: {
    flexDirection: "row",
    gap: theme.spacing[3],
@@ -45,8 +123,51 @@ const styles = StyleSheet.create((theme) => ({
  },
 }));

-function isHostPortOnly(raw: string): boolean {
-  return !raw.includes("://") && !raw.includes("/");
+function isIpv6Host(host: string): boolean {
+  return host.includes(":") && !host.startsWith("[") && !host.endsWith("]");
+}
+
+function buildConnectionUriFromDraft(draft: DirectConnectionDraft): string {
+  const host = draft.host.trim();
+  const port = Number(draft.port.trim());
+  if (!host) {
+    throw new Error("Host is required");
+  }
+  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    throw new Error("Port must be between 1 and 65535");
+  }
+
+  return serializeConnectionUriForStorage({
+    host,
+    port,
+    isIpv6: isIpv6Host(host),
+    useTls: draft.useTls,
+    ...(draft.password ? { password: draft.password } : {}),
+  });
+}
+
+function prepareDirectConnection(draft: DirectConnectionDraft): PreparedDirectConnection {
+  const parsed = parseConnectionUri(buildConnectionUriFromDraft(draft));
+  const endpoint = parsed.isIpv6
+    ? `[${parsed.host}]:${parsed.port}`
+    : `${parsed.host}:${parsed.port}`;
+
+  return {
+    uri: serializeConnectionUri(parsed),
+    endpoint,
+    useTls: parsed.useTls,
+    ...(parsed.password ? { password: parsed.password } : {}),
+  };
+}
+
+function draftFromConnectionUri(uri: string): DirectConnectionDraft {
+  const parsed = parseConnectionUri(uri);
+  return {
+    host: parsed.host,
+    port: String(parsed.port),
+    useTls: parsed.useTls,
+    password: parsed.password ?? "",
+  };
 }

 function normalizeTransportMessage(message: string | null | undefined): string | null {
@@ -56,7 +177,7 @@ function normalizeTransportMessage(message: string | null | undefined): string |
  return trimmed;
 }

-function formatTechnicalTransportDetails(details: Array<string | null>): string | null {
+function formatTechnicalTransportDetails(details: (string | null)[]): string | null {
  const unique = Array.from(
    new Set(
      details
@@ -103,7 +224,9 @@ function buildConnectionFailureCopy(
  const rawLower = raw?.toLowerCase() ?? "";
  let detail: string | null = null;

-  if (rawLower.includes("timed out")) {
+  if (raw === "Incorrect password" || raw === "Password required") {
+    detail = raw;
+  } else if (rawLower.includes("timed out")) {
    detail = "Connection timed out. Check the host/port and your network.";
  } else if (
    rawLower.includes("econnrefused") ||
@@ -121,9 +244,7 @@ function buildConnectionFailureCopy(
    rawLower.includes("ssl")
  ) {
    detail =
-      "TLS error. Direct connections use an unencrypted local connection. Use relay for remote access.";
-  } else if (raw) {
-    detail = "Unable to connect. Check the host/port and that the daemon is reachable.";
+      "TLS error. Direct connections use SSL only when a TLS terminator is in front of the daemon.";
  } else {
    detail = "Unable to connect. Check the host/port and that the daemon is reachable.";
  }
@@ -149,21 +270,41 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
  const { upsertDirectConnection } = useHostMutations();
  const isMobile = useIsCompactFormFactor();

-  const hostInputRef = useRef<TextInput>(null);
-  const endpointRawRef = useRef("");
-
  const [isSaving, setIsSaving] = useState(false);
  const [errorMessage, setErrorMessage] = useState("");
+  const [host, setHost] = useState("");
+  const [port, setPort] = useState("6767");
+  const [useTls, setUseTls] = useState(false);
+  const [password, setPassword] = useState("");
+  const [isPasswordVisible, setIsPasswordVisible] = useState(false);
+  const [isAdvancedOpen, setIsAdvancedOpen] = useState(false);
+  const [advancedUri, setAdvancedUri] = useState("");

  const clearInput = useCallback(() => {
-    endpointRawRef.current = "";
-    hostInputRef.current?.clear();
+    setHost("");
+    setPort("6767");
+    setUseTls(false);
+    setPassword("");
+    setIsPasswordVisible(false);
+    setIsAdvancedOpen(false);
+    setAdvancedUri("");
  }, []);

  const connectIcon = useMemo(
    () => <Link2 size={16} color={theme.colors.palette.white} />,
    [theme.colors.palette.white],
  );
+  const hostFieldStyle = useMemo(() => [styles.field, styles.hostField], []);
+  const portFieldStyle = useMemo(() => [styles.field, styles.portField], []);
+  const checkboxStyle = useMemo(
+    () => [styles.checkbox, useTls ? styles.checkboxChecked : null],
+    [useTls],
+  );
+  const passwordInputStyle = useMemo(() => [styles.input, styles.passwordInput], []);
+  const useTlsAccessibilityState = useMemo(
+    () => ({ checked: useTls, disabled: isSaving }),
+    [isSaving, useTls],
+  );

  const handleClose = useCallback(() => {
    if (isSaving) return;
@@ -182,21 +323,11 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
  const handleSave = useCallback(async () => {
    if (isSaving) return;

-    const raw = endpointRawRef.current.trim();
-    if (!raw) {
-      setErrorMessage("Host is required");
-      return;
-    }
-    if (!isHostPortOnly(raw)) {
-      setErrorMessage("Enter host:port only (no ws://, no /ws)");
-      return;
-    }
-
-    let endpoint: string;
+    let connection: PreparedDirectConnection;
    try {
-      endpoint = normalizeHostPort(raw);
+      connection = prepareDirectConnection({ host, port, useTls, password });
    } catch (error) {
-      const message = error instanceof Error ? error.message : "Invalid host:port";
+      const message = error instanceof Error ? error.message : "Invalid connection";
      setErrorMessage(message);
      return;
    }
@@ -208,20 +339,24 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
      const { client, serverId, hostname } = await connectToDaemon({
        id: "probe",
        type: "directTcp",
-        endpoint,
+        endpoint: connection.endpoint,
+        useTls: connection.useTls,
+        ...(connection.password ? { password: connection.password } : {}),
      });
      await client.close().catch(() => undefined);
      const isNewHost = !daemons.some((daemon) => daemon.serverId === serverId);
      const profile = await upsertDirectConnection({
        serverId,
-        endpoint,
+        endpoint: connection.endpoint,
+        useTls: connection.useTls,
+        ...(connection.password ? { password: connection.password } : {}),
        label: hostname ?? undefined,
      });

      onSaved?.({ profile, serverId, hostname, isNewHost });
      handleClose();
    } catch (error) {
-      const { title, detail, raw: rawDetail } = buildConnectionFailureCopy(endpoint, error);
+      const { title, detail, raw: rawDetail } = buildConnectionFailureCopy(connection.uri, error);
      let combined: string;
      if (rawDetail && detail && rawDetail !== detail) {
        combined = `${title}\n${detail}\nDetails: ${rawDetail}`;
@@ -232,17 +367,23 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
      }
      setErrorMessage(combined);
      if (!isMobile) {
-        // Desktop/web: also surface it as a dialog for quick visibility.
        Alert.alert("Connection failed", combined);
      }
    } finally {
      setIsSaving(false);
    }
-  }, [daemons, handleClose, isMobile, isSaving, onSaved, upsertDirectConnection]);
-
-  const handleChangeEndpoint = useCallback((next: string) => {
-    endpointRawRef.current = next;
-  }, []);
+  }, [
+    daemons,
+    handleClose,
+    host,
+    isMobile,
+    isSaving,
+    onSaved,
+    password,
+    port,
+    upsertDirectConnection,
+    useTls,
+  ]);

  const handleSubmitEditing = useCallback(() => {
    void handleSave();
@@ -252,6 +393,43 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
    void handleSave();
  }, [handleSave]);

+  const handleToggleUseTls = useCallback(() => {
+    if (isSaving) return;
+    setUseTls((current) => !current);
+  }, [isSaving]);
+
+  const handleTogglePasswordVisibility = useCallback(() => {
+    setIsPasswordVisible((current) => !current);
+  }, []);
+
+  const handleToggleAdvanced = useCallback(() => {
+    if (!isAdvancedOpen) {
+      try {
+        setAdvancedUri(buildConnectionUriFromDraft({ host, port, useTls, password }));
+      } catch {
+        setAdvancedUri("");
+      }
+      setErrorMessage("");
+      setIsAdvancedOpen(true);
+      return;
+    }
+
+    try {
+      const next = draftFromConnectionUri(advancedUri);
+      setHost(next.host);
+      setPort(next.port);
+      setUseTls(next.useTls);
+      setPassword(next.password);
+      setErrorMessage("");
+    } catch {
+      setErrorMessage("");
+    }
+    setIsAdvancedOpen(false);
+  }, [advancedUri, host, isAdvancedOpen, password, port, useTls]);
+
+  const AdvancedIcon = isAdvancedOpen ? ChevronDown : ChevronRight;
+  const PasswordIcon = isPasswordVisible ? EyeOff : Eye;
+
  return (
    <AdaptiveModalSheet
      title="Direct connection"
@@ -261,24 +439,127 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
    >
      <Text style={styles.helper}>Enter the address of a Paseo server.</Text>

+      <View style={styles.portRow}>
+        <View style={hostFieldStyle}>
+          <Text style={styles.label}>Host</Text>
+          <AdaptiveTextInput
+            testID="direct-host-input"
+            nativeID="direct-host-input"
+            accessibilityLabel="Host"
+            value={host}
+            onChangeText={setHost}
+            placeholder="localhost"
+            placeholderTextColor={theme.colors.foregroundMuted}
+            style={styles.input}
+            autoCapitalize="none"
+            autoCorrect={false}
+            keyboardType="url"
+            editable={!isSaving}
+            returnKeyType="next"
+          />
+        </View>
+        <View style={portFieldStyle}>
+          <Text style={styles.label}>Port</Text>
+          <AdaptiveTextInput
+            testID="direct-port-input"
+            nativeID="direct-port-input"
+            accessibilityLabel="Port"
+            value={port}
+            onChangeText={setPort}
+            placeholder="6767"
+            placeholderTextColor={theme.colors.foregroundMuted}
+            style={styles.input}
+            autoCapitalize="none"
+            autoCorrect={false}
+            keyboardType="number-pad"
+            editable={!isSaving}
+            returnKeyType="done"
+            onSubmitEditing={handleSubmitEditing}
+          />
+        </View>
+      </View>
+
+      <Pressable
+        style={styles.checkboxRow}
+        onPress={handleToggleUseTls}
+        disabled={isSaving}
+        accessibilityRole="checkbox"
+        accessibilityLabel="Use SSL"
+        accessibilityState={useTlsAccessibilityState}
+        testID="direct-ssl-toggle"
+      >
+        <View style={checkboxStyle}>
+          {useTls ? (
+            <View testID="direct-ssl-toggle-checked">
+              <Check size={14} color={theme.colors.palette.white} />
+            </View>
+          ) : null}
+        </View>
+        <Text style={styles.label}>Use SSL</Text>
+      </Pressable>
+
      <View style={styles.field}>
-        <Text style={styles.label}>Host</Text>
-        <AdaptiveTextInput
-          ref={hostInputRef}
-          testID="direct-host-input"
-          nativeID="direct-host-input"
-          accessibilityLabel="direct-host-input"
-          onChangeText={handleChangeEndpoint}
-          placeholder="hostname:port"
-          placeholderTextColor={theme.colors.foregroundMuted}
-          style={styles.input}
-          autoCapitalize="none"
-          autoCorrect={false}
-          keyboardType="url"
-          editable={!isSaving}
-          returnKeyType="done"
-          onSubmitEditing={handleSubmitEditing}
-        />
+        <Text style={styles.label}>Password</Text>
+        <View style={styles.passwordRow}>
+          <AdaptiveTextInput
+            testID="direct-password-input"
+            nativeID="direct-password-input"
+            accessibilityLabel="Password"
+            value={password}
+            onChangeText={setPassword}
+            placeholder="Optional"
+            placeholderTextColor={theme.colors.foregroundMuted}
+            style={passwordInputStyle}
+            autoCapitalize="none"
+            autoCorrect={false}
+            secureTextEntry={!isPasswordVisible}
+            editable={!isSaving}
+            returnKeyType="done"
+            onSubmitEditing={handleSubmitEditing}
+          />
+          <Pressable
+            style={styles.iconButton}
+            onPress={handleTogglePasswordVisibility}
+            disabled={isSaving}
+            accessibilityRole="button"
+            accessibilityLabel={isPasswordVisible ? "Hide password" : "Show password"}
+            testID="direct-password-visibility-toggle"
+          >
+            <PasswordIcon size={18} color={theme.colors.foregroundMuted} />
+          </Pressable>
+        </View>
+      </View>
+
+      <View style={styles.field}>
+        <Pressable
+          style={styles.advancedToggle}
+          onPress={handleToggleAdvanced}
+          disabled={isSaving}
+          accessibilityRole="button"
+          accessibilityLabel={isAdvancedOpen ? "Hide advanced" : "Show advanced"}
+          testID="direct-host-advanced-toggle"
+        >
+          <AdvancedIcon size={16} color={theme.colors.foregroundMuted} />
+          <Text style={styles.advancedText}>Advanced</Text>
+        </Pressable>
+        {isAdvancedOpen ? (
+          <AdaptiveTextInput
+            testID="direct-host-uri-input"
+            nativeID="direct-host-uri-input"
+            accessibilityLabel="Connection URI"
+            value={advancedUri}
+            onChangeText={setAdvancedUri}
+            placeholder="tcp://localhost:6767?ssl=true"
+            placeholderTextColor={theme.colors.foregroundMuted}
+            style={styles.input}
+            autoCapitalize="none"
+            autoCorrect={false}
+            keyboardType="url"
+            editable={!isSaving}
+            returnKeyType="done"
+            onSubmitEditing={handleToggleAdvanced}
+          />
+        ) : null}
        {errorMessage ? <Text style={styles.error}>{errorMessage}</Text> : null}
      </View>

@@ -234,7 +234,7 @@ function buildFallbackAllProviderModels(
  map.set(
    provider,
    modelOptions.map((option) => ({
-      provider: provider as AgentProvider,
+      provider: provider,
      id: option.id,
      label: option.label,
    })),
@@ -0,0 +1,419 @@
+/**
+ * @vitest-environment jsdom
+ */
+import React from "react";
+import { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { StreamItem } from "@/types/stream";
+import { AgentStreamView } from "./agent-stream-view";
+
+const assistantMessageCalls = vi.hoisted(
+  () => [] as Array<{ message: string; spacing: string | undefined }>,
+);
+const turnCopyButtonCalls = vi.hoisted(() => [] as Array<{ getContent: () => string }>);
+
+const mockSessionState = vi.hoisted(() => ({
+  sessions: {
+    server: {
+      client: null,
+      agentStreamHead: new Map<string, StreamItem[]>(),
+      workspaces: new Map(),
+      agentTimelineCursor: new Map(),
+      agentTimelineHasOlder: new Map(),
+      agentTimelineOlderFetchInFlight: new Map(),
+    },
+  },
+  setAgentTimelineOlderFetchInFlight: () => {},
+}));
+
+vi.mock("react-native-unistyles", () => ({
+  StyleSheet: {
+    create: (
+      factory: (theme: {
+        borderRadius: Record<string, number>;
+        borderWidth: Record<number, number>;
+        colors: Record<string, string>;
+        fontSize: Record<string, number>;
+        fontWeight: Record<string, string>;
+        shadow: Record<string, object>;
+        spacing: Record<number, number>;
+      }) => unknown,
+    ) =>
+      factory({
+        borderRadius: {
+          full: 9999,
+          md: 6,
+        },
+        borderWidth: {
+          1: 1,
+        },
+        colors: {
+          foreground: "#fff",
+          foregroundMuted: "#aaa",
+          surface0: "#000",
+          surface1: "#111",
+          surface2: "#222",
+          border: "#333",
+          borderAccent: "#444",
+        },
+        fontSize: {
+          sm: 14,
+          base: 16,
+          xs: 12,
+        },
+        fontWeight: {
+          normal: "normal",
+        },
+        shadow: {
+          sm: {},
+        },
+        spacing: {
+          1: 4,
+          2: 8,
+          3: 12,
+          4: 16,
+          12: 48,
+        },
+      }),
+  },
+  useUnistyles: () => ({ rt: { breakpoint: "md" } }),
+  withUnistyles: (Component: unknown) => Component,
+}));
+
+vi.mock("react-native-reanimated", async () => {
+  const ReactModule = await import("react");
+  return {
+    default: {
+      View: ({ children, ...props }: { children?: React.ReactNode }) =>
+        ReactModule.createElement("div", props, children),
+    },
+    Easing: { linear: vi.fn() },
+    FadeIn: { duration: vi.fn(() => undefined) },
+    FadeOut: { duration: vi.fn(() => undefined) },
+    cancelAnimation: vi.fn(),
+    useAnimatedStyle: (factory: () => unknown) => factory(),
+    useSharedValue: (value: unknown) => ({ value }),
+    withRepeat: (value: unknown) => value,
+    withTiming: (value: unknown) => value,
+  };
+});
+
+vi.mock("lucide-react-native", async () => {
+  const ReactModule = await import("react");
+  const Icon = () => ReactModule.createElement("span");
+  return {
+    Check: Icon,
+    ChevronDown: Icon,
+    X: Icon,
+  };
+});
+
+vi.mock("./message", async () => {
+  const ReactModule = await import("react");
+  return {
+    ActivityLog: () => null,
+    AssistantMessage: (props: { message: string; spacing?: string }) => {
+      assistantMessageCalls.push({ message: props.message, spacing: props.spacing });
+      return ReactModule.createElement("div", {
+        "data-message": props.message,
+        "data-spacing": props.spacing ?? "",
+      });
+    },
+    CompactionMarker: () => null,
+    MessageOuterSpacingProvider: ({ children }: { children: React.ReactNode }) =>
+      ReactModule.createElement(ReactModule.Fragment, null, children),
+    SpeakMessage: () => null,
+    TodoListCard: () => null,
+    ToolCall: () => null,
+    TurnCopyButton: (props: { getContent: () => string }) => {
+      turnCopyButtonCalls.push(props);
+      return ReactModule.createElement("button", {
+        "data-testid": "turn-copy-button",
+        type: "button",
+      });
+    },
+    UserMessage: () => null,
+  };
+});
+
+vi.mock("./tool-call-sheet", async () => {
+  const ReactModule = await import("react");
+  return {
+    ToolCallSheetProvider: ({ children }: { children: React.ReactNode }) =>
+      ReactModule.createElement(ReactModule.Fragment, null, children),
+    useToolCallSheet: () => ({ open: vi.fn() }),
+  };
+});
+
+vi.mock("./tool-call-details", () => ({ ToolCallDetailsContent: () => null }));
+vi.mock("./use-web-scrollbar", () => ({ useWebElementScrollbar: () => null }));
+vi.mock("./question-form-card", () => ({ QuestionFormCard: () => null }));
+vi.mock("./plan-card", () => ({ PlanCard: () => null }));
+vi.mock("@/hooks/use-file-explorer-actions", () => ({
+  useFileExplorerActions: () => ({ requestDirectoryListing: vi.fn() }),
+}));
+vi.mock("@/stores/panel-store", () => ({
+  usePanelStore: (selector: (state: Record<string, unknown>) => unknown) =>
+    selector({
+      openFileExplorerForCheckout: vi.fn(),
+      setExplorerTabForCheckout: vi.fn(),
+    }),
+}));
+vi.mock("@/stores/session-store", () => ({
+  useSessionStore: Object.assign(
+    (selector: (state: typeof mockSessionState) => unknown) => selector(mockSessionState),
+    {
+      getState: () => mockSessionState,
+    },
+  ),
+}));
+vi.mock("expo-router", () => ({ useRouter: () => ({ navigate: vi.fn() }) }));
+
+function assistantBlock(params: {
+  id: string;
+  text: string;
+  blockIndex: number;
+}): Extract<StreamItem, { kind: "assistant_message" }> {
+  return {
+    kind: "assistant_message",
+    id: params.id,
+    blockGroupId: "group-1",
+    blockIndex: params.blockIndex,
+    text: params.text,
+    timestamp: new Date("2026-05-01T00:00:00.000Z"),
+  };
+}
+
+function runningToolCall(id: string): Extract<StreamItem, { kind: "tool_call" }> {
+  return {
+    kind: "tool_call",
+    id,
+    timestamp: new Date("2026-05-01T00:00:00.000Z"),
+    payload: {
+      source: "orchestrator",
+      data: {
+        toolCallId: id,
+        toolName: "bash",
+        arguments: "npm test",
+        result: null,
+        status: "executing",
+      },
+    },
+  };
+}
+
+describe("AgentStreamView", () => {
+  let root: Root | null = null;
+  let container: HTMLDivElement | null = null;
+  let originalScrollTo: HTMLElement["scrollTo"] | undefined;
+
+  beforeEach(() => {
+    Object.defineProperty(globalThis, "IS_REACT_ACT_ENVIRONMENT", {
+      value: true,
+      configurable: true,
+    });
+    originalScrollTo = HTMLElement.prototype.scrollTo;
+    HTMLElement.prototype.scrollTo = vi.fn();
+    assistantMessageCalls.length = 0;
+    turnCopyButtonCalls.length = 0;
+    mockSessionState.sessions.server.agentStreamHead = new Map();
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(() => {
+    if (root) {
+      act(() => {
+        root?.unmount();
+      });
+    }
+    root = null;
+    container?.remove();
+    container = null;
+    if (originalScrollTo) {
+      HTMLElement.prototype.scrollTo = originalScrollTo;
+    } else {
+      Reflect.deleteProperty(HTMLElement.prototype, "scrollTo");
+    }
+    vi.restoreAllMocks();
+  });
+
+  it("compacts assistant block spacing across the history/live-head boundary", () => {
+    const tailBlock = assistantBlock({
+      id: "group-1:block:0",
+      text: "First paragraph",
+      blockIndex: 0,
+    });
+    const headBlock = assistantBlock({
+      id: "group-1:head",
+      text: "Second paragraph",
+      blockIndex: 1,
+    });
+    mockSessionState.sessions.server.agentStreamHead.set("agent-1", [headBlock]);
+    const agent = {
+      id: "agent-1",
+      serverId: "server",
+      status: "idle",
+      cwd: "/tmp/project",
+    } as never;
+    const streamItems = [tailBlock];
+    const pendingPermissions = new Map();
+
+    act(() => {
+      root?.render(
+        React.createElement(AgentStreamView, {
+          agentId: "agent-1",
+          serverId: "server",
+          agent,
+          streamItems,
+          pendingPermissions,
+        }),
+      );
+    });
+
+    const tailCalls = assistantMessageCalls.filter((call) => call.message === "First paragraph");
+    const headCalls = assistantMessageCalls.filter((call) => call.message === "Second paragraph");
+
+    expect(tailCalls.length).toBeGreaterThan(0);
+    expect(headCalls.length).toBeGreaterThan(0);
+    expect(tailCalls.map((call) => call.spacing)).toEqual(
+      Array.from({ length: tailCalls.length }, () => "compactBottom"),
+    );
+    expect(headCalls.map((call) => call.spacing)).toEqual(
+      Array.from({ length: headCalls.length }, () => "compactTop"),
+    );
+  });
+
+  it("renders running dots in the assistant turn footer when live text is streaming", () => {
+    const headBlock = assistantBlock({
+      id: "group-1:head",
+      text: "Streaming paragraph",
+      blockIndex: 0,
+    });
+    mockSessionState.sessions.server.agentStreamHead.set("agent-1", [headBlock]);
+    const agent = {
+      id: "agent-1",
+      serverId: "server",
+      status: "running",
+      cwd: "/tmp/project",
+    } as never;
+
+    act(() => {
+      root?.render(
+        React.createElement(AgentStreamView, {
+          agentId: "agent-1",
+          serverId: "server",
+          agent,
+          streamItems: [],
+          pendingPermissions: new Map(),
+        }),
+      );
+    });
+
+    expect(container?.querySelector('[data-testid="turn-working-indicator"]')).not.toBeNull();
+    expect(
+      container?.querySelector('[data-testid="stream-working-indicator-auxiliary"]'),
+    ).toBeNull();
+    expect(container?.querySelector('[data-testid="turn-copy-button"]')).toBeNull();
+  });
+
+  it("only renders running dots on the live assistant row", () => {
+    const tailBlock = assistantBlock({
+      id: "group-1:block:0",
+      text: "History paragraph",
+      blockIndex: 0,
+    });
+    const headBlock = assistantBlock({
+      id: "group-2:head",
+      text: "Streaming paragraph",
+      blockIndex: 0,
+    });
+    mockSessionState.sessions.server.agentStreamHead.set("agent-1", [headBlock]);
+    const agent = {
+      id: "agent-1",
+      serverId: "server",
+      status: "running",
+      cwd: "/tmp/project",
+    } as never;
+
+    act(() => {
+      root?.render(
+        React.createElement(AgentStreamView, {
+          agentId: "agent-1",
+          serverId: "server",
+          agent,
+          streamItems: [tailBlock],
+          pendingPermissions: new Map(),
+        }),
+      );
+    });
+
+    expect(container?.querySelectorAll('[data-testid="turn-working-indicator"]')).toHaveLength(1);
+    expect(
+      container?.querySelector('[data-testid="stream-working-indicator-auxiliary"]'),
+    ).toBeNull();
+  });
+
+  it("keeps the auxiliary running dots when there is no live assistant row", () => {
+    mockSessionState.sessions.server.agentStreamHead.set("agent-1", [runningToolCall("tool-1")]);
+    const agent = {
+      id: "agent-1",
+      serverId: "server",
+      status: "running",
+      cwd: "/tmp/project",
+    } as never;
+
+    act(() => {
+      root?.render(
+        React.createElement(AgentStreamView, {
+          agentId: "agent-1",
+          serverId: "server",
+          agent,
+          streamItems: [],
+          pendingPermissions: new Map(),
+        }),
+      );
+    });
+
+    expect(container?.querySelector('[data-testid="turn-working-indicator"]')).toBeNull();
+    expect(
+      container?.querySelector('[data-testid="stream-working-indicator-auxiliary"]'),
+    ).not.toBeNull();
+  });
+
+  it("replaces the running footer with the copy button when the assistant turn idles", () => {
+    const headBlock = assistantBlock({
+      id: "group-1:head",
+      text: "Complete paragraph",
+      blockIndex: 0,
+    });
+    mockSessionState.sessions.server.agentStreamHead.set("agent-1", [headBlock]);
+    const agent = {
+      id: "agent-1",
+      serverId: "server",
+      status: "idle",
+      cwd: "/tmp/project",
+    } as never;
+
+    act(() => {
+      root?.render(
+        React.createElement(AgentStreamView, {
+          agentId: "agent-1",
+          serverId: "server",
+          agent,
+          streamItems: [],
+          pendingPermissions: new Map(),
+        }),
+      );
+    });
+
+    expect(container?.querySelector('[data-testid="turn-working-indicator"]')).toBeNull();
+    expect(container?.querySelector('[data-testid="turn-copy-button"]')).not.toBeNull();
+    expect(turnCopyButtonCalls.length).toBeGreaterThan(0);
+    expect(turnCopyButtonCalls.map((call) => call.getContent())).toEqual(
+      Array.from({ length: turnCopyButtonCalls.length }, () => "Complete paragraph"),
+    );
+  });
+});
@@ -1,4 +1,4 @@
-import {
+import React, {
  forwardRef,
  memo,
  useCallback,
@@ -18,7 +18,7 @@ import {
  ActivityIndicator,
  type PressableStateCallbackType,
 } from "react-native";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { useMutation } from "@tanstack/react-query";
 import { useRouter } from "expo-router";
@@ -56,6 +56,8 @@ import type {
 import type { AgentScreenAgent } from "@/hooks/use-agent-screen-state-machine";
 import { useSessionStore } from "@/stores/session-store";
 import { useFileExplorerActions } from "@/hooks/use-file-explorer-actions";
+import { useLoadOlderAgentHistory } from "@/hooks/use-load-older-agent-history";
+import type { ToastApi } from "@/components/toast-host";
 import type { DaemonClient } from "@server/client/daemon-client";
 import { ToolCallDetailsContent } from "./tool-call-details";
 import { QuestionFormCard } from "./question-form-card";
@@ -84,6 +86,7 @@ import {
  WORKING_INDICATOR_OFFSETS,
 } from "@/utils/working-indicator";
 import { isWeb } from "@/constants/platform";
+import { SPACING, type Theme } from "@/styles/theme";

 const isUserMessageItem = (item?: StreamItem) => item?.kind === "user_message";
 const isToolSequenceItem = (item?: StreamItem) =>
@@ -125,6 +128,12 @@ const getAssistantBlockSpacing = (params: {
  }
  return "default";
 };
+
+interface StreamItemBoundarySeams {
+  aboveItem?: StreamItem | null;
+  belowItem?: StreamItem | null;
+}
+
 export interface AgentStreamViewHandle {
  scrollToBottom(reason?: BottomAnchorLocalRequest["reason"]): void;
  prepareForViewportChange(): void;
@@ -138,6 +147,7 @@ export interface AgentStreamViewProps {
  pendingPermissions: Map<string, PendingPermission>;
  routeBottomAnchorRequest?: BottomAnchorRouteRequest | null;
  isAuthoritativeHistoryReady?: boolean;
+  toast?: ToastApi | null;
  onOpenWorkspaceFile?: (input: { filePath: string }) => void;
 }

@@ -151,12 +161,12 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
      pendingPermissions,
      routeBottomAnchorRequest = null,
      isAuthoritativeHistoryReady = true,
+      toast,
      onOpenWorkspaceFile,
    },
    ref,
  ) {
    const viewportRef = useRef<StreamViewportHandle | null>(null);
-    const { theme } = useUnistyles();
    const router = useRouter();
    const isMobile = useIsCompactFormFactor();
    const streamRenderStrategy = useMemo(
@@ -192,6 +202,11 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
      workspaceId: workspaceId ?? undefined,
      workspaceRoot,
    });
+    const { isLoadingOlder, hasOlder, loadOlder } = useLoadOlderAgentHistory({
+      serverId: resolvedServerId,
+      agentId,
+      toast,
+    });
    const openWorkspaceFile = useStableEvent(function openWorkspaceFile(input: {
      filePath: string;
    }) {
@@ -286,6 +301,25 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
        isMobileBreakpoint: isMobile,
      });
    }, [isMobile, streamHead, streamItems]);
+    const inlineWorkingIndicatorItemId = useMemo(() => {
+      if (agent.status !== "running") {
+        return null;
+      }
+      const footerItem = baseRenderModel.segments.liveHead.find((item, index, items) => {
+        if (item.kind !== "assistant_message") {
+          return false;
+        }
+        return (
+          getStreamNeighborItem({
+            strategy: streamRenderStrategy,
+            items,
+            index,
+            relation: "below",
+          }) === undefined
+        );
+      });
+      return footerItem?.id ?? null;
+    }, [agent.status, baseRenderModel.segments.liveHead, streamRenderStrategy]);
    useImperativeHandle(
      ref,
      () => ({
@@ -303,9 +337,9 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
      viewportRef.current?.scrollToBottom("jump-to-bottom");
    }, []);

-    const tightGap = theme.spacing[1]; // 4px
-    const assistantBlockGap = theme.spacing[3]; // 12px
-    const looseGap = theme.spacing[4]; // 16px
+    const tightGap = SPACING[1];
+    const assistantBlockGap = SPACING[3];
+    const looseGap = SPACING[4];

    const getGapBetween = useCallback(
      (item: StreamItem | null, belowItem: StreamItem | null) => {
@@ -382,6 +416,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
          <UserMessage
            message={item.text}
            images={item.images}
+            attachments={item.attachments}
            timestamp={item.timestamp.getTime()}
            isFirstInGroup={isFirstInGroup}
            isLastInGroup={isLastInGroup}
@@ -396,7 +431,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
        item: Extract<StreamItem, { kind: "assistant_message" }>,
        index: number,
        items: StreamItem[],
-        seamAboveItem: StreamItem | null,
+        seams: StreamItemBoundarySeams,
      ) => {
        const aboveItem =
          getStreamNeighborItem({
@@ -405,14 +440,17 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
            index,
            relation: "above",
          }) ??
-          seamAboveItem ??
+          seams.aboveItem ??
+          undefined;
+        const belowItem =
+          getStreamNeighborItem({
+            strategy: streamRenderStrategy,
+            items,
+            index,
+            relation: "below",
+          }) ??
+          seams.belowItem ??
          undefined;
-        const belowItem = getStreamNeighborItem({
-          strategy: streamRenderStrategy,
-          items,
-          index,
-          relation: "below",
-        });
        const spacing = getAssistantBlockSpacing({
          item,
          aboveItem,
@@ -519,14 +557,14 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
        item: StreamItem,
        index: number,
        items: StreamItem[],
-        seamAboveItem: StreamItem | null = null,
+        seams: StreamItemBoundarySeams = {},
      ) => {
        switch (item.kind) {
          case "user_message":
-            return renderUserMessageItem(item, index, items, seamAboveItem);
+            return renderUserMessageItem(item, index, items, seams.aboveItem ?? null);

          case "assistant_message":
-            return renderAssistantMessageItem(item, index, items, seamAboveItem);
+            return renderAssistantMessageItem(item, index, items, seams);

          case "thought":
            return renderThoughtItem(item, index, items);
@@ -562,9 +600,9 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
        item: StreamItem,
        index: number,
        items: StreamItem[],
-        seamAboveItem: StreamItem | null = null,
+        seams: StreamItemBoundarySeams = {},
      ) => {
-        const content = renderStreamItemContent(item, index, items, seamAboveItem);
+        const content = renderStreamItemContent(item, index, items, seams);
        if (!content) {
          return null;
        }
@@ -580,21 +618,31 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
          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}
-            {isEndOfAssistantTurn ? (
-              <TurnCopyButtonSlot
-                strategy={streamRenderStrategy}
-                items={items}
-                startIndex={index}
-              />
-            ) : null}
+            {footer}
          </StreamItemWrapper>
        );
      },
-      [getGapBetween, renderStreamItemContent, agent.status, streamRenderStrategy],
+      [
+        getGapBetween,
+        renderStreamItemContent,
+        agent.status,
+        streamRenderStrategy,
+        inlineWorkingIndicatorItemId,
+      ],
    );

    const pendingPermissionItems = useMemo(
@@ -602,7 +650,8 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
      [pendingPermissions, agentId],
    );

-    const showWorkingIndicator = agent.status === "running";
+    const showAuxiliaryWorkingIndicator =
+      agent.status === "running" && inlineWorkingIndicatorItemId === null;
    const pendingPermissionsNode = useMemo(
      () =>
        pendingPermissionItems.length > 0 ? (
@@ -616,12 +665,12 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
    );
    const workingIndicatorNode = useMemo(
      () =>
-        showWorkingIndicator ? (
-          <View style={stylesheet.bottomBarWrapper}>
+        showAuxiliaryWorkingIndicator ? (
+          <View style={stylesheet.bottomBarWrapper} testID="stream-working-indicator-auxiliary">
            <WorkingIndicator />
          </View>
        ) : null,
-      [showWorkingIndicator],
+      [showAuxiliaryWorkingIndicator],
    );
    const renderModel = useMemo<AgentStreamRenderModel>(() => {
      return {
@@ -663,6 +712,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
    const _liveHeadItems = renderModel.segments.liveHead;
    const { boundary, auxiliary } = renderModel;
    const lastHistoryItem = historyItems.at(-1) ?? null;
+    const firstLiveHeadItem = renderModel.segments.liveHead[0] ?? null;

    const historyIndexById = useMemo(() => {
      const indexById = new Map<string, number>();
@@ -678,9 +728,12 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
        if (historyIndex === undefined) {
          return null;
        }
-        return renderStreamItem(item, historyIndex, historyItems);
+        const seamBelowItem = item.id === lastHistoryItem?.id ? firstLiveHeadItem : null;
+        return renderStreamItem(item, historyIndex, historyItems, {
+          belowItem: seamBelowItem,
+        });
      },
-      [historyIndexById, historyItems, renderStreamItem],
+      [firstLiveHeadItem, historyIndexById, historyItems, lastHistoryItem?.id, renderStreamItem],
    );

    const renderHistoryVirtualizedRow = useCallback<
@@ -692,7 +745,9 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
    );
    const renderLiveHeadRow = useCallback<StreamSegmentRenderers["renderLiveHeadRow"]>(
      (item, index, items) =>
-        renderStreamItem(item, index, items, index === 0 ? lastHistoryItem : null),
+        renderStreamItem(item, index, items, {
+          aboveItem: index === 0 ? lastHistoryItem : null,
+        }),
      [lastHistoryItem, renderStreamItem],
    );
    const liveAuxiliaryHeaderStyle = useMemo(() => {
@@ -750,6 +805,9 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
              routeBottomAnchorRequest,
              isAuthoritativeHistoryReady,
              onNearBottomChange: setIsNearBottom,
+              onNearHistoryStart: loadOlder,
+              isLoadingOlderHistory: isLoadingOlder,
+              hasOlderHistory: hasOlder,
              scrollEnabled: streamScrollEnabled,
              listStyle: stylesheet.list,
              baseListContentContainerStyle: stylesheet.listContentContainer,
@@ -784,7 +842,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
 export const AgentStreamView = memo(AgentStreamViewComponent);
 AgentStreamView.displayName = "AgentStreamView";

-function WorkingIndicator() {
+function WorkingIndicator({ variant = "auxiliary" }: { variant?: "auxiliary" | "inline" }) {
  const progress = useSharedValue(0);

  useEffect(() => {
@@ -836,8 +894,13 @@ function WorkingIndicator() {
    [dotThreeStyle],
  );

+  const containerStyle =
+    variant === "inline"
+      ? stylesheet.inlineWorkingIndicatorFrame
+      : stylesheet.workingIndicatorBubble;
+
  return (
-    <View style={stylesheet.workingIndicatorBubble}>
+    <View style={containerStyle}>
      <View style={stylesheet.workingDotsRow}>
        <Animated.View style={dotOneCombinedStyle} />
        <Animated.View style={dotTwoCombinedStyle} />
@@ -847,6 +910,14 @@ function WorkingIndicator() {
  );
 }

+function InlineWorkingIndicatorSlot() {
+  return (
+    <View style={stylesheet.inlineTurnFooter} testID="turn-working-indicator">
+      <WorkingIndicator variant="inline" />
+    </View>
+  );
+}
+
 // Permission Request Card Component
 type TurnContentStrategy = Parameters<
  typeof collectAssistantTurnContentForStreamRenderStrategy
@@ -891,16 +962,33 @@ function ToolCallSlot({
  return <ToolCall {...rest} onInlineDetailsExpandedChange={handleExpandedChange} />;
 }

+const ThemedActivityIndicator = withUnistyles(ActivityIndicator);
+const ThemedCheckIcon = withUnistyles(Check);
+const ThemedXIcon = withUnistyles(X);
+
+const primaryColorMapping = (theme: Theme) => ({
+  color: theme.colors.foreground,
+});
+const mutedColorMapping = (theme: Theme) => ({
+  color: theme.colors.foregroundMuted,
+});
+
+const pressableStyle = ({
+  pressed,
+  hovered = false,
+}: PressableStateCallbackType & { hovered?: boolean }) => [
+  permissionStyles.optionButton,
+  hovered ? permissionStyles.optionButtonHovered : null,
+  pressed ? permissionStyles.optionButtonPressed : null,
+];
+
 interface PermissionActionButtonProps {
  action: AgentPermissionAction;
  isRespondingAction: boolean;
  isResponding: boolean;
-  textColor: string;
-  iconColor: string;
-  isDanger: boolean;
-  Icon: typeof Check;
+  isPrimary: boolean;
+  Icon: typeof ThemedCheckIcon;
  testID: string;
-  theme: ReturnType<typeof useUnistyles>["theme"];
  onPress: (action: AgentPermissionAction) => void;
 }

@@ -908,37 +996,21 @@ function PermissionActionButton({
  action,
  isRespondingAction,
  isResponding,
-  textColor,
-  iconColor,
-  isDanger,
+  isPrimary,
  Icon,
  testID,
-  theme,
  onPress,
 }: PermissionActionButtonProps) {
  const handlePress = useCallback(() => onPress(action), [onPress, action]);
-  const pressableStyle = useCallback(
-    ({ pressed, hovered = false }: PressableStateCallbackType & { hovered?: boolean }) => [
-      permissionStyles.optionButton,
-      {
-        backgroundColor: hovered ? theme.colors.surface2 : theme.colors.surface1,
-        borderColor: isDanger ? theme.colors.borderAccent : theme.colors.borderAccent,
-      },
-      pressed ? permissionStyles.optionButtonPressed : null,
-    ],
-    [theme.colors.surface2, theme.colors.surface1, theme.colors.borderAccent, isDanger],
-  );
-  const optionTextStyle = useMemo(
-    () => [permissionStyles.optionText, { color: textColor }],
-    [textColor],
-  );
+  const optionTextStyle = isPrimary ? optionTextPrimaryStyle : permissionStyles.optionText;
+  const colorMapping = isPrimary ? primaryColorMapping : mutedColorMapping;
  return (
    <Pressable testID={testID} style={pressableStyle} onPress={handlePress} disabled={isResponding}>
      {isRespondingAction ? (
-        <ActivityIndicator size="small" color={textColor} />
+        <ThemedActivityIndicator size="small" uniProps={colorMapping} />
      ) : (
        <View style={permissionStyles.optionContent}>
-          <Icon size={14} color={iconColor} />
+          <Icon size={14} uniProps={colorMapping} />
          <Text style={optionTextStyle}>{action.label}</Text>
        </View>
      )}
@@ -953,7 +1025,6 @@ function PermissionRequestCard({
  permission: PendingPermission;
  client: DaemonClient | null;
 }) {
-  const { theme } = useUnistyles();
  const isMobile = useIsCompactFormFactor();

  const { request } = permission;
@@ -1069,10 +1140,6 @@ function PermissionRequestCard({
    [handleResponse],
  );

-  const questionTextStyle = useMemo(
-    () => [permissionStyles.question, { color: theme.colors.foregroundMuted }],
-    [theme.colors.foregroundMuted],
-  );
  const optionsContainerStyle = useMemo(
    () => [
      permissionStyles.optionsContainer,
@@ -1080,24 +1147,6 @@ function PermissionRequestCard({
    ],
    [isMobile],
  );
-  const cardContainerStyle = useMemo(
-    () => [
-      permissionStyles.container,
-      {
-        backgroundColor: theme.colors.surface1,
-        borderColor: theme.colors.border,
-      },
-    ],
-    [theme.colors.surface1, theme.colors.border],
-  );
-  const cardTitleStyle = useMemo(
-    () => [permissionStyles.title, { color: theme.colors.foreground }],
-    [theme.colors.foreground],
-  );
-  const cardDescriptionStyle = useMemo(
-    () => [permissionStyles.description, { color: theme.colors.foregroundMuted }],
-    [theme.colors.foregroundMuted],
-  );

  if (request.kind === "question") {
    return (
@@ -1111,18 +1160,15 @@ function PermissionRequestCard({

  const footer = (
    <>
-      <Text testID="permission-request-question" style={questionTextStyle}>
+      <Text testID="permission-request-question" style={permissionStyles.question}>
        How would you like to proceed?
      </Text>

      <View style={optionsContainerStyle}>
        {resolvedActions.map((action) => {
-          const isDanger = action.variant === "danger" || action.behavior === "deny";
          const isPrimary = action.variant === "primary";
          const isRespondingAction = respondingActionId === action.id;
-          const textColor = isPrimary ? theme.colors.foreground : theme.colors.foregroundMuted;
-          const iconColor = textColor;
-          const Icon = action.behavior === "allow" ? Check : X;
+          const Icon = action.behavior === "allow" ? ThemedCheckIcon : ThemedXIcon;
          let testID: string;
          if (action.behavior === "deny") testID = "permission-request-deny";
          else if (action.id === "accept" || action.id === "implement")
@@ -1135,12 +1181,9 @@ function PermissionRequestCard({
              action={action}
              isRespondingAction={isRespondingAction}
              isResponding={isResponding}
-              textColor={textColor}
-              iconColor={iconColor}
-              isDanger={isDanger}
+              isPrimary={isPrimary}
              Icon={Icon}
              testID={testID}
-              theme={theme}
              onPress={handleActionPress}
            />
          );
@@ -1156,19 +1199,25 @@ function PermissionRequestCard({
        description={description}
        text={planMarkdown}
        footer={footer}
+        testID="permission-plan-card"
        disableOuterSpacing
      />
    );
  }

  return (
-    <View style={cardContainerStyle}>
-      <Text style={cardTitleStyle}>{title}</Text>
+    <View style={permissionStyles.container}>
+      <Text style={permissionStyles.title}>{title}</Text>

-      {description ? <Text style={cardDescriptionStyle}>{description}</Text> : null}
+      {description ? <Text style={permissionStyles.description}>{description}</Text> : null}

      {planMarkdown ? (
-        <PlanCard title="Proposed plan" text={planMarkdown} disableOuterSpacing />
+        <PlanCard
+          title="Proposed plan"
+          text={planMarkdown}
+          testID="permission-plan-card"
+          disableOuterSpacing
+        />
      ) : null}

      {!isPlanRequest ? (
@@ -1233,6 +1282,17 @@ const stylesheet = StyleSheet.create((theme) => ({
    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",
@@ -1311,14 +1371,18 @@ const permissionStyles = StyleSheet.create((theme) => ({
    borderRadius: theme.spacing[2],
    borderWidth: 1,
    gap: theme.spacing[2],
+    backgroundColor: theme.colors.surface1,
+    borderColor: theme.colors.border,
  },
  title: {
    fontSize: theme.fontSize.base,
    lineHeight: 22,
+    color: theme.colors.foreground,
  },
  description: {
    fontSize: theme.fontSize.sm,
    lineHeight: 20,
+    color: theme.colors.foregroundMuted,
  },
  section: {
    gap: theme.spacing[2],
@@ -1330,6 +1394,7 @@ const permissionStyles = StyleSheet.create((theme) => ({
    fontSize: theme.fontSize.sm,
    marginTop: theme.spacing[1],
    marginBottom: theme.spacing[1],
+    color: theme.colors.foregroundMuted,
  },
  optionsContainer: {
    gap: theme.spacing[2],
@@ -1346,6 +1411,11 @@ const permissionStyles = StyleSheet.create((theme) => ({
    borderRadius: theme.borderRadius.md,
    alignItems: "center",
    borderWidth: theme.borderWidth[1],
+    backgroundColor: theme.colors.surface1,
+    borderColor: theme.colors.borderAccent,
+  },
+  optionButtonHovered: {
+    backgroundColor: theme.colors.surface2,
  },
  optionButtonPressed: {
    opacity: 0.9,
@@ -1358,9 +1428,15 @@ const permissionStyles = StyleSheet.create((theme) => ({
  optionText: {
    fontSize: theme.fontSize.sm,
    fontWeight: theme.fontWeight.normal,
+    color: theme.colors.foregroundMuted,
+  },
+  optionTextPrimary: {
+    color: theme.colors.foreground,
  },
 }));

+const optionTextPrimaryStyle = [permissionStyles.optionText, permissionStyles.optionTextPrimary];
+
 interface StreamItemWrapperProps {
  gapBelow: number;
  children: ReactNode;
@@ -0,0 +1,48 @@
+import { Text, View } from "react-native";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { useMemo } from "react";
+
+interface BrowserPaneProps {
+  browserId: string;
+  serverId: string;
+  workspaceId: string;
+  cwd: string | null;
+  isInteractive?: boolean;
+  onFocusPane?: () => void;
+}
+
+export function BrowserPane({ browserId }: BrowserPaneProps) {
+  const { theme } = useUnistyles();
+  const titleStyle = useMemo(
+    () => [styles.title, { color: theme.colors.foreground }],
+    [theme.colors.foreground],
+  );
+  const subtitleStyle = useMemo(
+    () => [styles.subtitle, { color: theme.colors.foregroundMuted }],
+    [theme.colors.foregroundMuted],
+  );
+
+  return (
+    <View style={styles.container}>
+      <Text style={titleStyle}>Browser is desktop-only</Text>
+      <Text style={subtitleStyle}>Browser session {browserId}</Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create(() => ({
+  container: {
+    flex: 1,
+    alignItems: "center",
+    justifyContent: "center",
+    gap: 8,
+    padding: 16,
+  },
+  title: {
+    fontSize: 16,
+    fontWeight: "600",
+  },
+  subtitle: {
+    fontSize: 12,
+  },
+}));
@@ -0,0 +1,51 @@
+import { useMemo } from "react";
+import { Text, View } from "react-native";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
+
+interface BrowserPaneProps {
+  browserId: string;
+  serverId: string;
+  workspaceId: string;
+  cwd: string | null;
+  isInteractive?: boolean;
+  onFocusPane?: () => void;
+}
+
+export function BrowserPane({ browserId }: BrowserPaneProps) {
+  const { theme } = useUnistyles();
+  const titleStyle = useMemo(
+    () => [styles.title, { color: theme.colors.foreground }],
+    [theme.colors.foreground],
+  );
+  const subtitleStyle = useMemo(
+    () => [styles.subtitle, { color: theme.colors.foregroundMuted }],
+    [theme.colors.foregroundMuted],
+  );
+
+  return (
+    <View style={styles.container}>
+      <Text style={titleStyle}>Browser is desktop-only</Text>
+      <Text style={subtitleStyle}>
+        Open this workspace in Electron to use the built-in browser.
+      </Text>
+      <Text style={subtitleStyle}>Browser session {browserId}</Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create(() => ({
+  container: {
+    flex: 1,
+    alignItems: "center",
+    justifyContent: "center",
+    gap: 8,
+    padding: 16,
+  },
+  title: {
+    fontSize: 16,
+    fontWeight: "600",
+  },
+  subtitle: {
+    fontSize: 12,
+  },
+}));
@@ -2,11 +2,14 @@ import type { Theme } from "@/styles/theme";

 /**
 * Compute the pixel width for a line-number gutter based on the highest
- * line number that will be displayed. Minimum width accommodates 2 digits.
+ * line number that will be displayed and the gutter font size. Minimum
+ * width accommodates 2 digits. The 0.62 factor approximates monospace
+ * digit width as a fraction of font size.
 */
-export function lineNumberGutterWidth(maxLineNumber: number): number {
+export function lineNumberGutterWidth(maxLineNumber: number, fontSize: number): number {
  const digits = Math.max(2, String(maxLineNumber).length);
-  return digits * 8 + 12;
+  const digitWidth = Math.ceil(fontSize * 0.62);
+  return digits * digitWidth + 12;
 }

 export function getCodeInsets(theme: Theme) {
@@ -63,8 +63,8 @@ describe("combined model selector helpers", () => {
      }),
    ]);

-    expect(matchesSearch(rows[0]!, "claude")).toBe(true);
-    expect(matchesSearch(rows[1]!, "gpt-5.4")).toBe(true);
+    expect(matchesSearch(rows[0], "claude")).toBe(true);
+    expect(matchesSearch(rows[1], "gpt-5.4")).toBe(true);
  });

  it("keeps the selected trigger label model-only", () => {
@@ -622,7 +622,7 @@ export function CombinedModelSelector({
  const singleProviderView = useMemo<SelectorView | null>(() => {
    const providers = Array.from(allProviderModels.keys());
    if (providers.length !== 1) return null;
-    const providerId = providers[0]!;
+    const providerId = providers[0];
    const label = resolveProviderLabel(providerDefinitions, providerId);
    return { kind: "provider", providerId, providerLabel: label };
  }, [allProviderModels, providerDefinitions]);
@@ -655,7 +655,7 @@ export function CombinedModelSelector({

  const handleSelect = useCallback(
    (provider: string, modelId: string) => {
-      onSelect(provider as AgentProvider, modelId);
+      onSelect(provider, modelId);
      setIsOpen(false);
      setSearchQuery("");
    },
@@ -1,4 +1,5 @@
 import type { AttachmentMetadata, ComposerAttachment } from "@/attachments/types";
+import { composerWorkspaceAttachment } from "@/attachments/composer-workspace-attachments";
 import type { AgentAttachment } from "@server/shared/messages";
 import { buildGitHubAttachmentFromSearchItem } from "@/utils/review-attachments";

@@ -17,6 +18,14 @@ export function splitComposerAttachmentsForSubmit(attachments: ComposerAttachmen
      continue;
    }

+    if (composerWorkspaceAttachment.is(attachment)) {
+      const workspaceAttachment = composerWorkspaceAttachment.toSubmitAttachment(attachment);
+      if (workspaceAttachment) {
+        reviewAttachments.push(workspaceAttachment);
+      }
+      continue;
+    }
+
    const reviewAttachment = buildGitHubAttachmentFromSearchItem(attachment.item);
    if (reviewAttachment) {
      reviewAttachments.push(reviewAttachment);
@@ -4,10 +4,16 @@ import { createRoot, type Root } from "react-dom/client";
 import { JSDOM } from "jsdom";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type { AttachmentMetadata, ComposerAttachment } from "@/attachments/types";
-import type { GitHubSearchItem } from "@server/shared/messages";
+import type {
+  AttachmentMetadata,
+  ComposerAttachment,
+  UserComposerAttachment,
+} from "@/attachments/types";
+import { composerWorkspaceAttachment } from "@/attachments/composer-workspace-attachments";
+import type { AgentAttachment, GitHubSearchItem } from "@server/shared/messages";
 import { Composer } from "./composer";
 import { splitComposerAttachmentsForSubmit } from "./composer-attachments";
+import { addReviewDraftComment, getReviewDraftComments, resetReviewDraftStore } from "@/review";

 const keyboardActionHandlerMock = vi.hoisted(() => vi.fn());

@@ -22,12 +28,12 @@ const {
  deleteAttachmentsMock,
  encodeImagesMock,
  openExternalUrlMock,
-  markScrollInvestigationRenderMock,
  mockSessionState,
  setAgentStreamTailMock,
  setAgentStreamHeadMock,
  setQueuedMessagesMock,
  agentDirectoryStatusMock,
+  appSendBehavior,
 } = vi.hoisted(() => {
  const hoistedTheme = {
    spacing: { 1: 4, 2: 8, 3: 12, 4: 16, 6: 24, 8: 32 },
@@ -36,6 +42,8 @@ const {
    borderRadius: { full: 999, md: 6, lg: 8, "2xl": 16 },
    fontSize: { xs: 11, sm: 13, base: 15, lg: 18 },
    fontWeight: { normal: "400", medium: "500" },
+    lineHeight: { diff: 18 },
+    opacity: { 50: 0.5 },
    shadow: { md: {} },
    colors: {
      surface0: "#000",
@@ -100,7 +108,12 @@ const {
    cancelAgent: vi.fn(async () => {}),
  };

-  const hoistedSetQueuedMessagesMock = vi.fn();
+  const hoistedSetQueuedMessagesMock = vi.fn(
+    (serverId: string, updater: (prev: Map<string, unknown[]>) => Map<string, unknown[]>) => {
+      const session = hoistedMockSessionState.sessions[serverId];
+      session.queuedMessages = updater(session.queuedMessages);
+    },
+  );
  const hoistedMockSessionState: {
    sessions: Record<
      string,
@@ -161,8 +174,8 @@ const {
  );
  hoistedMockSessionState.setAgentStreamTail = hoistedSetAgentStreamTailMock;
  hoistedMockSessionState.setAgentStreamHead = hoistedSetAgentStreamHeadMock;
-  const hoistedMarkScrollInvestigationRenderMock = vi.fn();
  const hoistedAgentDirectoryStatusMock = vi.fn(() => "ready");
+  const hoistedAppSendBehavior = { current: "interrupt" as "interrupt" | "queue" };

  return {
    theme: hoistedTheme,
@@ -175,12 +188,12 @@ const {
    deleteAttachmentsMock: vi.fn(async () => {}),
    encodeImagesMock: vi.fn(async (images: AttachmentMetadata[]) => images),
    openExternalUrlMock: vi.fn(async () => {}),
-    markScrollInvestigationRenderMock: hoistedMarkScrollInvestigationRenderMock,
    mockSessionState: hoistedMockSessionState,
    setAgentStreamTailMock: hoistedSetAgentStreamTailMock,
    setAgentStreamHeadMock: hoistedSetAgentStreamHeadMock,
    setQueuedMessagesMock: hoistedSetQueuedMessagesMock,
    agentDirectoryStatusMock: hoistedAgentDirectoryStatusMock,
+    appSendBehavior: hoistedAppSendBehavior,
  };
 });

@@ -188,6 +201,7 @@ vi.mock("react-native-unistyles", () => ({
  StyleSheet: {
    create: (factory: unknown) => (typeof factory === "function" ? factory(theme) : factory),
  },
+  withUnistyles: <T,>(component: T) => component,
  useUnistyles: () => ({ theme }),
 }));

@@ -212,7 +226,9 @@ vi.mock("lucide-react-native", () => {
    Pencil: createIcon("Pencil"),
    AudioLines: createIcon("AudioLines"),
    CircleDot: createIcon("CircleDot"),
+    MousePointer2: createIcon("MousePointer2"),
    GitPullRequest: createIcon("GitPullRequest"),
+    MessageSquareCode: createIcon("MessageSquareCode"),
    X: createIcon("X"),
    Mic: createIcon("Mic"),
    MicOff: createIcon("MicOff"),
@@ -299,7 +315,7 @@ vi.mock("@/utils/open-external-url", () => ({
 }));

 vi.mock("@/hooks/use-settings", () => ({
-  useAppSettings: () => ({ settings: { sendBehavior: "interrupt" } }),
+  useAppSettings: () => ({ settings: { sendBehavior: appSendBehavior.current } }),
 }));

 vi.mock("@/hooks/use-agent-autocomplete", () => ({
@@ -338,11 +354,6 @@ vi.mock("@/contexts/toast-context", () => ({
  useToast: () => ({ error: vi.fn() }),
 }));

-vi.mock("@/utils/scroll-jank", () => ({
-  markScrollInvestigationRender: markScrollInvestigationRenderMock,
-  markScrollInvestigationEvent: vi.fn(),
-}));
-
 vi.mock("@/components/agent-status-bar", () => ({
  AgentStatusBar: () => null,
  DraftAgentStatusBar: () => null,
@@ -562,9 +573,118 @@ let root: Root | null = null;
 let container: HTMLElement | null = null;
 let queryClient: QueryClient | null = null;
 let latestAttachments: ComposerAttachment[] = [];
+let workspaceBindingRenderCount = 0;
+
+type ReviewComposerAttachment = Extract<ComposerAttachment, { kind: "review" }>;
+type ReviewAttachment = Extract<AgentAttachment, { type: "review" }>;
+type BrowserElementComposerAttachment = Extract<ComposerAttachment, { kind: "browser_element" }>;
+
+function reviewAttachment(body: string): ReviewAttachment {
+  return {
+    type: "review",
+    mimeType: "application/paseo-review",
+    cwd: "/repo",
+    mode: "uncommitted",
+    baseRef: null,
+    comments: [
+      {
+        filePath: "src/example.ts",
+        side: "new",
+        lineNumber: 41,
+        body,
+        context: {
+          hunkHeader: "@@ -40,2 +40,2 @@",
+          targetLine: {
+            oldLineNumber: null,
+            newLineNumber: 41,
+            type: "add",
+            content: "const value = newValue;",
+          },
+          lines: [
+            {
+              oldLineNumber: null,
+              newLineNumber: 41,
+              type: "add",
+              content: "const value = newValue;",
+            },
+          ],
+        },
+      },
+    ],
+  };
+}
+
+function reviewComposerAttachment(body: string): ReviewComposerAttachment {
+  return {
+    kind: "review",
+    reviewDraftKey: `review:${body}`,
+    commentCount: 1,
+    attachment: reviewAttachment(body),
+  };
+}
+
+function browserElementComposerAttachment(): BrowserElementComposerAttachment {
+  return {
+    kind: "browser_element",
+    attachment: {
+      url: "https://example.com/page",
+      selector: "button.primary",
+      tag: "button",
+      text: "Save",
+      outerHTML: '<button class="primary">Save</button>',
+      computedStyles: { display: "flex" },
+      boundingRect: { x: 1, y: 2, width: 80, height: 32 },
+      reactSource: {
+        fileName: "src/save-button.tsx",
+        lineNumber: 12,
+        columnNumber: 3,
+        componentName: "SaveButton",
+      },
+      parentChain: ["form.settings"],
+      children: [],
+      formatted: '<browser-element url="https://example.com/page">button.primary</browser-element>',
+    },
+  };
+}
+
+function cloneReviewComposerAttachment(
+  attachment: ReviewComposerAttachment,
+): ReviewComposerAttachment {
+  return {
+    ...attachment,
+    attachment: {
+      ...attachment.attachment,
+      comments: attachment.attachment.comments.map((comment) => ({
+        ...comment,
+        context: {
+          ...comment.context,
+          targetLine: { ...comment.context.targetLine },
+          lines: comment.context.lines.map((line) => ({ ...line })),
+        },
+      })),
+    },
+  };
+}
+
+function seedReviewDraft(key: string) {
+  addReviewDraftComment({
+    key,
+    comment: {
+      id: `${key}:comment`,
+      filePath: "src/example.ts",
+      side: "new",
+      lineNumber: 41,
+      body: "Please simplify this.",
+      createdAt: "2026-04-21T00:00:00.000Z",
+      updatedAt: "2026-04-21T00:00:00.000Z",
+    },
+  });
+}

 beforeEach(() => {
-  const dom = new JSDOM("<!doctype html><html><body></body></html>");
+  const dom = new JSDOM("<!doctype html><html><body></body></html>", {
+    url: "http://localhost",
+  });
  vi.stubGlobal("React", React);
  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
  vi.stubGlobal("window", dom.window);
@@ -577,6 +697,7 @@ beforeEach(() => {
    attachEvent: vi.fn(),
    detachEvent: vi.fn(),
  });
+  vi.stubGlobal("localStorage", dom.window.localStorage);

  container = document.createElement("div");
  document.body.appendChild(container);
@@ -591,13 +712,14 @@ beforeEach(() => {
  deleteAttachmentsMock.mockClear();
  encodeImagesMock.mockClear();
  openExternalUrlMock.mockClear();
-  markScrollInvestigationRenderMock.mockClear();
  setAgentStreamTailMock.mockClear();
  setAgentStreamHeadMock.mockClear();
  setQueuedMessagesMock.mockClear();
  keyboardActionHandlerMock.mockClear();
  agentDirectoryStatusMock.mockReset();
  agentDirectoryStatusMock.mockReturnValue("ready");
+  appSendBehavior.current = "interrupt";
+  workspaceBindingRenderCount = 0;
  mockSessionState.sessions.server.serverInfo = {
    serverId: "server",
    hostname: "test",
@@ -615,6 +737,10 @@ beforeEach(() => {
  mockSessionState.sessions.server.agentStreamHead = new Map();
  mockSessionState.sessions.server.agentStreamTail = new Map();
  mockSessionState.sessions.server.queuedMessages = new Map();
+  mockSessionState.sessions.server.agents = new Map([
+    ["agent", { status: "idle", lastUsage: null }],
+  ]);
+  resetReviewDraftStore();
 });

 afterEach(() => {
@@ -642,20 +768,30 @@ function imageAttachment(id: string): AttachmentMetadata {
 function ComposerHarness({
  initialText = "",
  initialAttachments = [],
+  workspaceAttachment = null,
  isSubmitLoading = false,
  submitBehavior,
 }: {
  initialText?: string;
-  initialAttachments?: ComposerAttachment[];
+  initialAttachments?: UserComposerAttachment[];
+  workspaceAttachment?: ReviewComposerAttachment | null;
  isSubmitLoading?: boolean;
  submitBehavior?: "clear" | "preserve-and-lock";
 }) {
  const [text, setText] = useState(initialText);
  const [attachments, setAttachments] = useState(initialAttachments);
+  const workspaceAttachments = React.useMemo(
+    () => (workspaceAttachment ? [workspaceAttachment] : []),
+    [workspaceAttachment],
+  );
  latestAttachments = attachments;

  const handleChangeAttachments = React.useCallback(
-    (updater: ComposerAttachment[] | ((current: ComposerAttachment[]) => ComposerAttachment[])) => {
+    (
+      updater:
+        | UserComposerAttachment[]
+        | ((current: UserComposerAttachment[]) => UserComposerAttachment[]),
+    ) => {
      setAttachments((current) => {
        const next = typeof updater === "function" ? updater(current) : updater;
        latestAttachments = next;
@@ -674,6 +810,7 @@ function ComposerHarness({
        value={text}
        onChangeText={setText}
        attachments={attachments}
+        workspaceAttachments={workspaceAttachments}
        onChangeAttachments={handleChangeAttachments}
        isSubmitLoading={isSubmitLoading}
        submitBehavior={submitBehavior}
@@ -687,7 +824,8 @@ function ComposerHarness({
 function renderComposer(
  input: {
    initialText?: string;
-    initialAttachments?: ComposerAttachment[];
+    initialAttachments?: UserComposerAttachment[];
+    workspaceAttachment?: ReviewComposerAttachment | null;
    isSubmitLoading?: boolean;
    submitBehavior?: "clear" | "preserve-and-lock";
  } = {},
@@ -697,6 +835,20 @@ function renderComposer(
  });
 }

+function WorkspaceAttachmentBindingHarness({
+  workspaceAttachment,
+}: {
+  workspaceAttachment: ReviewComposerAttachment;
+}) {
+  workspaceBindingRenderCount += 1;
+  const { selectedAttachments } = composerWorkspaceAttachment.useBinding({
+    normalAttachments: [],
+    workspaceAttachments: [workspaceAttachment],
+  });
+
+  return <div data-testid="workspace-binding-count">{selectedAttachments.length}</div>;
+}
+
 function click(element: Element) {
  act(() => {
    element.dispatchEvent(new window.MouseEvent("click", { bubbles: true }));
@@ -737,12 +889,6 @@ function dispatchAgentInterrupt() {
  });
 }

-function countMessageInputRenders(): number {
-  return markScrollInvestigationRenderMock.mock.calls.filter(
-    ([componentId]) => componentId === "MessageInput:server:agent",
-  ).length;
-}
-
 describe("Composer keyboard shortcuts", () => {
  it("interrupts a running agent without clearing a filled draft", async () => {
    mockSessionState.sessions.server.agents = new Map([
@@ -917,6 +1063,261 @@ describe("Composer attachments", () => {
    );
  });

+  it("serializes workspace review attachments through the structured attachment path", async () => {
+    const review = reviewComposerAttachment("Please simplify this.");
+    expect(splitComposerAttachmentsForSubmit([review])).toEqual({
+      images: [],
+      attachments: [review.attachment],
+    });
+  });
+
+  it("serializes browser element workspace attachments as generic text attachments", async () => {
+    const browserElement = browserElementComposerAttachment();
+    expect(splitComposerAttachmentsForSubmit([browserElement])).toEqual({
+      images: [],
+      attachments: [
+        {
+          type: "text",
+          mimeType: "text/plain",
+          title: "Browser element · button",
+          text: browserElement.attachment.formatted,
+        },
+      ],
+    });
+  });
+
+  it("does not enqueue redundant binding renders for equivalent workspace attachments", async () => {
+    const review = reviewComposerAttachment("Stable workspace review.");
+
+    act(() => {
+      root?.render(<WorkspaceAttachmentBindingHarness workspaceAttachment={review} />);
+    });
+    await flushAsyncWork();
+
+    expect(workspaceBindingRenderCount).toBe(1);
+    expect(queryByTestId("workspace-binding-count")?.textContent).toBe("1");
+
+    act(() => {
+      root?.render(
+        <WorkspaceAttachmentBindingHarness
+          workspaceAttachment={cloneReviewComposerAttachment(review)}
+        />,
+      );
+    });
+    await flushAsyncWork();
+
+    expect(workspaceBindingRenderCount).toBe(2);
+    expect(queryByTestId("workspace-binding-count")?.textContent).toBe("1");
+  });
+
+  it("renders and submits a workspace review attachment pill", async () => {
+    const review = reviewComposerAttachment("Please simplify this.");
+    renderComposer({
+      initialText: "review this",
+      workspaceAttachment: review,
+    });
+
+    expect(queryByTestId("composer-review-attachment-pill")?.textContent).toContain("Review");
+    expect(queryByTestId("composer-review-attachment-pill")?.textContent).toContain("1 comment");
+
+    click(document.querySelector('[aria-label="Send message"]')!);
+    await flushAsyncWork();
+
+    expect(mockClient.sendAgentMessage).toHaveBeenCalledWith(
+      "agent",
+      "review this",
+      expect.objectContaining({
+        attachments: [review.attachment],
+      }),
+    );
+  });
+
+  it("clears the included workspace review draft after a successful submit", async () => {
+    const review = reviewComposerAttachment("Clear submitted review draft.");
+    seedReviewDraft(review.reviewDraftKey);
+    renderComposer({
+      initialText: "review this",
+      workspaceAttachment: review,
+    });
+
+    click(document.querySelector('[aria-label="Send message"]')!);
+    await flushAsyncWork();
+
+    expect(getReviewDraftComments(review.reviewDraftKey)).toBeUndefined();
+  });
+
+  it("restores only normal attachments when a submit with a workspace review fails", async () => {
+    const image = imageAttachment("img-failure");
+    const review = reviewComposerAttachment("This should be sent but not persisted.");
+    seedReviewDraft(review.reviewDraftKey);
+    mockClient.sendAgentMessage.mockRejectedValueOnce(new Error("network down"));
+    renderComposer({
+      initialText: "review this",
+      initialAttachments: [{ kind: "image", metadata: image }],
+      workspaceAttachment: review,
+    });
+
+    click(document.querySelector('[aria-label="Send message"]')!);
+    await flushAsyncWork();
+
+    expect(mockClient.sendAgentMessage).toHaveBeenCalledWith(
+      "agent",
+      "review this",
+      expect.objectContaining({
+        attachments: [review.attachment],
+      }),
+    );
+    expect(latestAttachments).toEqual([{ kind: "image", metadata: image }]);
+    expect(getReviewDraftComments(review.reviewDraftKey)).toHaveLength(1);
+  });
+
+  it("clears workspace review suppression after a send lifecycle", async () => {
+    const review = reviewComposerAttachment("Keep this available for the next message.");
+    renderComposer({
+      initialText: "send without review",
+      workspaceAttachment: review,
+    });
+
+    click(document.querySelector('[aria-label="Remove review attachment"]')!);
+    expect(queryByTestId("composer-review-attachment-pill")).toBeNull();
+
+    click(document.querySelector('[aria-label="Send message"]')!);
+    await flushAsyncWork();
+
+    expect(mockClient.sendAgentMessage).toHaveBeenCalledWith(
+      "agent",
+      "send without review",
+      expect.objectContaining({
+        attachments: [],
+      }),
+    );
+    expect(queryByTestId("composer-review-attachment-pill")).not.toBeNull();
+  });
+
+  it("keeps workspace review suppressed after a failed send", async () => {
+    const review = reviewComposerAttachment("Do not send this on retry.");
+    mockClient.sendAgentMessage.mockRejectedValueOnce(new Error("network down"));
+    renderComposer({
+      initialText: "retry without review",
+      workspaceAttachment: review,
+    });
+
+    click(document.querySelector('[aria-label="Remove review attachment"]')!);
+    expect(queryByTestId("composer-review-attachment-pill")).toBeNull();
+
+    click(document.querySelector('[aria-label="Send message"]')!);
+    await flushAsyncWork();
+
+    expect(mockClient.sendAgentMessage).toHaveBeenNthCalledWith(
+      1,
+      "agent",
+      "retry without review",
+      expect.objectContaining({
+        attachments: [],
+      }),
+    );
+    expect(queryByTestId("composer-review-attachment-pill")).toBeNull();
+
+    click(document.querySelector('[aria-label="Send message"]')!);
+    await flushAsyncWork();
+
+    expect(mockClient.sendAgentMessage).toHaveBeenNthCalledWith(
+      2,
+      "agent",
+      "retry without review",
+      expect.objectContaining({
+        attachments: [],
+      }),
+    );
+  });
+
+  it("captures workspace review attachments at queue time", async () => {
+    appSendBehavior.current = "queue";
+    mockSessionState.sessions.server.agents.set("agent", { status: "running", lastUsage: null });
+    const initialReview = reviewComposerAttachment("Initial queued review.");
+    const editedReview = reviewComposerAttachment("Edited after queue.");
+    renderComposer({
+      initialText: "queue this",
+      workspaceAttachment: initialReview,
+    });
+
+    click(document.querySelector('[aria-label="Queue message"]')!);
+    await flushAsyncWork();
+    renderComposer({
+      initialText: "",
+      workspaceAttachment: editedReview,
+    });
+
+    const queued = mockSessionState.sessions.server.queuedMessages.get("agent") as Array<{
+      attachments: ComposerAttachment[];
+    }>;
+    expect(queued[0]?.attachments).toEqual([initialReview]);
+  });
+
+  it("clears the included workspace review draft after queueing", async () => {
+    appSendBehavior.current = "queue";
+    mockSessionState.sessions.server.agents.set("agent", { status: "running", lastUsage: null });
+    const review = reviewComposerAttachment("Clear queued review draft.");
+    seedReviewDraft(review.reviewDraftKey);
+    renderComposer({
+      initialText: "queue this",
+      workspaceAttachment: review,
+    });
+
+    click(document.querySelector('[aria-label="Queue message"]')!);
+    await flushAsyncWork();
+
+    expect(getReviewDraftComments(review.reviewDraftKey)).toBeUndefined();
+  });
+
+  it("clears workspace review suppression after queueing a message", async () => {
+    appSendBehavior.current = "queue";
+    mockSessionState.sessions.server.agents.set("agent", { status: "running", lastUsage: null });
+    const review = reviewComposerAttachment("Queue without this review first.");
+    renderComposer({
+      initialText: "queue without review",
+      workspaceAttachment: review,
+    });
+
+    click(document.querySelector('[aria-label="Remove review attachment"]')!);
+    expect(queryByTestId("composer-review-attachment-pill")).toBeNull();
+
+    click(document.querySelector('[aria-label="Queue message"]')!);
+    await flushAsyncWork();
+
+    const queued = mockSessionState.sessions.server.queuedMessages.get("agent") as Array<{
+      attachments: ComposerAttachment[];
+    }>;
+    expect(queued[0]?.attachments).toEqual([]);
+    expect(queryByTestId("composer-review-attachment-pill")).not.toBeNull();
+  });
+
+  it("does not restore queued workspace review attachments into live draft attachments when editing", async () => {
+    appSendBehavior.current = "queue";
+    mockSessionState.sessions.server.agents.set("agent", { status: "running", lastUsage: null });
+    const image = imageAttachment("img-queued-edit");
+    const review = reviewComposerAttachment("Queued snapshot.");
+    renderComposer({
+      initialText: "queue this",
+      initialAttachments: [{ kind: "image", metadata: image }],
+      workspaceAttachment: review,
+    });
+
+    click(document.querySelector('[aria-label="Queue message"]')!);
+    await flushAsyncWork();
+    expect(
+      (
+        mockSessionState.sessions.server.queuedMessages.get("agent") as Array<{
+          attachments: ComposerAttachment[];
+        }>
+      )[0]?.attachments,
+    ).toEqual([{ kind: "image", metadata: image }, review]);
+
+    click(document.querySelector('[aria-label="Edit queued message"]')!);
+
+    expect(latestAttachments).toEqual([{ kind: "image", metadata: image }]);
+  });
+
  it("submits empty wire arrays when there are no composer attachments", async () => {
    renderComposer({ initialText: "plain message" });

@@ -986,27 +1387,6 @@ describe("Composer attachments", () => {
    expect(latestAttachments).toEqual([{ kind: "image", metadata: image }]);
  });

-  it("does not re-render MessageInput when opening the attachment lightbox", () => {
-    const image = imageAttachment("img-lightbox-render");
-    renderComposer({ initialAttachments: [{ kind: "image", metadata: image }] });
-    const renderCountBeforeLightbox = countMessageInputRenders();
-
-    click(queryByTestId("composer-image-attachment-pill")!);
-
-    expect(queryByTestId("attachment-lightbox-image")).not.toBeNull();
-    expect(countMessageInputRenders()).toBe(renderCountBeforeLightbox);
-  });
-
-  it("still re-renders MessageInput when submit loading semantics change", () => {
-    renderComposer({ initialText: "pending submit", isSubmitLoading: false });
-    const renderCountBeforeLoading = countMessageInputRenders();
-
-    renderComposer({ initialText: "pending submit", isSubmitLoading: true });
-
-    expect(countMessageInputRenders()).toBe(renderCountBeforeLoading + 1);
-    expect(document.querySelector('[aria-label="Send message"]')).toHaveProperty("disabled", true);
-  });
-
  it("enables dictation from server capabilities before the agent directory finishes loading", () => {
    agentDirectoryStatusMock.mockReturnValue("initial_loading");

@@ -7,7 +7,7 @@ import {
  type PressableStateCallbackType,
 } from "react-native";
 import { useState, useEffect, useRef, useCallback, useMemo, memo, type ReactElement } from "react";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { useShallow } from "zustand/shallow";
 import {
@@ -40,7 +40,7 @@ import {
  type MessageInputRef,
  type AttachmentMenuItem,
 } from "./message-input";
-import type { Theme } from "@/styles/theme";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
 import type { DraftCommandConfig } from "@/hooks/use-agent-commands-query";
 import { encodeImages } from "@/utils/encode-images";
 import { focusWithRetries } from "@/utils/web-focus";
@@ -62,7 +62,6 @@ import {
  persistAttachmentFromFileUri,
 } from "@/attachments/service";
 import { resolveStatusControlMode } from "@/components/composer.status-controls";
-import { markScrollInvestigationRender } from "@/utils/scroll-jank";
 import { useKeyboardShiftStyle } from "@/hooks/use-keyboard-shift-style";
 import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
 import type { KeyboardActionDefinition } from "@/keyboard/keyboard-action-dispatcher";
@@ -71,7 +70,13 @@ import { submitAgentInput } from "@/components/agent-input-submit";
 import { useAppSettings } from "@/hooks/use-settings";
 import { isWeb, isNative } from "@/constants/platform";
 import type { GitHubSearchItem } from "@server/shared/messages";
-import type { AttachmentMetadata, ComposerAttachment } from "@/attachments/types";
+import type {
+  AttachmentMetadata,
+  ComposerAttachment,
+  UserComposerAttachment,
+  WorkspaceComposerAttachment,
+} from "@/attachments/types";
+import { composerWorkspaceAttachment } from "@/attachments/composer-workspace-attachments";
 import { useAttachmentPreviewUrl } from "@/attachments/use-attachment-preview-url";
 import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
 import { splitComposerAttachmentsForSubmit } from "@/components/composer-attachments";
@@ -87,13 +92,13 @@ interface QueuedMessage {
 }

 type AttachmentListUpdater =
-  | ComposerAttachment[]
-  | ((prev: ComposerAttachment[]) => ComposerAttachment[]);
+  | UserComposerAttachment[]
+  | ((prev: UserComposerAttachment[]) => UserComposerAttachment[]);

 function noop() {}

-function resolveComposerButtonIconSize(theme: Theme): number {
-  return isWeb ? theme.iconSize.md : theme.iconSize.lg;
+function resolveComposerButtonIconSize(): number {
+  return isWeb ? ICON_SIZE.md : ICON_SIZE.lg;
 }

 function resolveIsComposerLocked(
@@ -146,7 +151,7 @@ async function pickAndPersistImages(
  );
 }

-function removeAttachmentAtIndex(prev: ComposerAttachment[], index: number): ComposerAttachment[] {
+function removeAttachmentAtIndex<T extends ComposerAttachment>(prev: T[], index: number): T[] {
  const removed = prev[index];
  if (removed?.kind === "image") {
    void deleteAttachments([removed.metadata]);
@@ -155,20 +160,17 @@ function removeAttachmentAtIndex(prev: ComposerAttachment[], index: number): Com
 }

 function buildCancelButtonStyle(isConnected: boolean, isCancellingAgent: boolean): object[] {
-  const disabled =
-    !isConnected || isCancellingAgent ? (styles.buttonDisabled as object) : undefined;
-  return [styles.cancelButton as object, disabled].filter((value): value is object =>
-    Boolean(value),
-  );
+  const disabled = !isConnected || isCancellingAgent ? styles.buttonDisabled : undefined;
+  return [styles.cancelButton, disabled].filter((value): value is object => Boolean(value));
 }

 function buildRealtimeVoiceButtonStyle(
  hovered: boolean | undefined,
  voiceButtonDisabled: boolean,
 ): object[] {
-  const hoveredStyle = hovered ? (styles.iconButtonHovered as object) : undefined;
-  const disabledStyle = voiceButtonDisabled ? (styles.buttonDisabled as object) : undefined;
-  return [styles.realtimeVoiceButton as object, hoveredStyle, disabledStyle].filter(
+  const hoveredStyle = hovered ? styles.iconButtonHovered : undefined;
+  const disabledStyle = voiceButtonDisabled ? styles.buttonDisabled : undefined;
+  return [styles.realtimeVoiceButton, hoveredStyle, disabledStyle].filter(
    (value): value is object => Boolean(value),
  );
 }
@@ -243,26 +245,28 @@ function findGithubItemByOption(
 }

 function isAttachmentSelectedForGithubItem(
-  attachments: readonly ComposerAttachment[],
+  current: readonly ComposerAttachment[],
  item: GitHubSearchItem,
 ): boolean {
-  return attachments.some(
-    (attachment) =>
-      attachment.kind !== "image" &&
-      attachment.item.kind === item.kind &&
-      attachment.item.number === item.number,
-  );
+  return composerWorkspaceAttachment
+    .userAttachmentsOnly(current)
+    .some(
+      (attachment) =>
+        attachment.kind !== "image" &&
+        attachment.item.kind === item.kind &&
+        attachment.item.number === item.number,
+    );
 }

-function buildGithubAttachment(item: GitHubSearchItem): ComposerAttachment {
+function buildGithubAttachment(item: GitHubSearchItem): UserComposerAttachment {
  return item.kind === "pr" ? { kind: "github_pr", item } : { kind: "github_issue", item };
 }

 function toggleGithubAttachment(
-  current: ComposerAttachment[],
+  current: UserComposerAttachment[],
  item: GitHubSearchItem,
-): ComposerAttachment[] {
-  const matches = (attachment: ComposerAttachment) =>
+): UserComposerAttachment[] {
+  const matches = (attachment: UserComposerAttachment) =>
    attachment.kind !== "image" &&
    attachment.item.kind === item.kind &&
    attachment.item.number === item.number;
@@ -362,6 +366,15 @@ function renderComposerAttachmentPill(args: RenderComposerAttachmentPillArgs): R
      />
    );
  }
+  if (composerWorkspaceAttachment.is(attachment)) {
+    return composerWorkspaceAttachment.renderPill({
+      attachment,
+      index,
+      disabled,
+      onOpen,
+      onRemove,
+    });
+  }
  return (
    <GithubAttachmentPill
      key={`${attachment.item.kind}:${attachment.item.number}`}
@@ -447,6 +460,7 @@ async function dispatchAgentMessageSend(args: DispatchAgentMessageSendArgs): Pro
    text,
    timestamp: new Date(),
    ...(wirePayload.images.length > 0 ? { images: wirePayload.images } : {}),
+    ...(wirePayload.attachments.length > 0 ? { attachments: wirePayload.attachments } : {}),
  };
  appendUserMessageToStream({ ...args, userMessage });
  const imagesData = await encodeImages(wirePayload.images);
@@ -460,11 +474,16 @@ async function dispatchAgentMessageSend(args: DispatchAgentMessageSendArgs): Pro
 function openComposerAttachment(
  attachment: ComposerAttachment,
  setLightboxMetadata: (metadata: AttachmentMetadata) => void,
+  openWorkspaceAttachment: (input: { attachment: ComposerAttachment }) => boolean,
 ): void {
  if (attachment.kind === "image") {
    setLightboxMetadata(attachment.metadata);
    return;
  }
+  if (composerWorkspaceAttachment.is(attachment)) {
+    openWorkspaceAttachment({ attachment });
+    return;
+  }
  void openExternalUrl(attachment.item.url);
 }

@@ -585,7 +604,6 @@ interface QueuedMessageRowProps {
 }

 function QueuedMessageRow({ item, onEdit, onSendNow }: QueuedMessageRowProps) {
-  const { theme } = useUnistyles();
  const handleEdit = useCallback(() => {
    onEdit(item.id);
  }, [onEdit, item.id]);
@@ -598,11 +616,19 @@ function QueuedMessageRow({ item, onEdit, onSendNow }: QueuedMessageRowProps) {
        {item.text}
      </Text>
      <View style={styles.queueActions}>
-        <Pressable onPress={handleEdit} style={styles.queueActionButton}>
-          <Pencil size={theme.iconSize.sm} color={theme.colors.foreground} />
+        <Pressable
+          onPress={handleEdit}
+          style={styles.queueActionButton}
+          accessibilityLabel="Edit queued message"
+        >
+          <ThemedPencil size={ICON_SIZE.sm} uniProps={iconForegroundMapping} />
        </Pressable>
-        <Pressable onPress={handleSendNow} style={QUEUE_SEND_BUTTON_STYLE}>
-          <ArrowUp size={theme.iconSize.sm} color="white" />
+        <Pressable
+          onPress={handleSendNow}
+          style={QUEUE_SEND_BUTTON_STYLE}
+          accessibilityLabel="Send queued message now"
+        >
+          <ArrowUp size={ICON_SIZE.sm} color="white" />
        </Pressable>
      </View>
    </View>
@@ -654,7 +680,7 @@ function ImageAttachmentPill({
 }

 interface GithubAttachmentPillProps {
-  attachment: Exclude<ComposerAttachment, { kind: "image" }>;
+  attachment: Extract<ComposerAttachment, { kind: "github_pr" | "github_issue" }>;
  index: number;
  disabled: boolean;
  onOpen: (attachment: ComposerAttachment) => void;
@@ -668,7 +694,6 @@ function GithubAttachmentPill({
  onOpen,
  onRemove,
 }: GithubAttachmentPillProps) {
-  const { theme } = useUnistyles();
  const item = attachment.item;
  const kindLabel = item.kind === "pr" ? "PR" : "issue";
  const handleOpen = useCallback(() => {
@@ -689,9 +714,9 @@ function GithubAttachmentPill({
      <View style={styles.githubPillBody}>
        <View style={styles.githubPillIcon}>
          {item.kind === "pr" ? (
-            <GitPullRequest size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
+            <ThemedGitPullRequest size={ICON_SIZE.sm} uniProps={iconForegroundMutedMapping} />
          ) : (
-            <CircleDot size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
+            <ThemedCircleDot size={ICON_SIZE.sm} uniProps={iconForegroundMutedMapping} />
          )}
        </View>
        <Text style={styles.githubPillText} numberOfLines={1}>
@@ -719,18 +744,17 @@ function GithubPickerOption({
  item,
  onToggle,
 }: GithubPickerOptionProps) {
-  const { theme } = useUnistyles();
  const handlePress = useCallback(() => {
    onToggle(item);
  }, [onToggle, item]);
  const leadingSlot = useMemo(
    () =>
      item.kind === "pr" ? (
-        <GitPullRequest size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
+        <ThemedGitPullRequest size={ICON_SIZE.sm} uniProps={iconForegroundMutedMapping} />
      ) : (
-        <CircleDot size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
+        <ThemedCircleDot size={ICON_SIZE.sm} uniProps={iconForegroundMutedMapping} />
      ),
-    [item.kind, theme.iconSize.sm, theme.colors.foregroundMuted],
+    [item.kind],
  );
  return (
    <ComboboxItem
@@ -763,7 +787,9 @@ interface ComposerProps {
  blurOnSubmit?: boolean;
  value: string;
  onChangeText: (text: string) => void;
-  attachments: ComposerAttachment[];
+  attachments: UserComposerAttachment[];
+  workspaceAttachments?: readonly WorkspaceComposerAttachment[];
+  onOpenWorkspaceAttachment?: (attachment: WorkspaceComposerAttachment) => void;
  onChangeAttachments: (updater: AttachmentListUpdater) => void;
  cwd: string;
  clearDraft: (lifecycle: "sent" | "abandoned") => void;
@@ -824,9 +850,7 @@ function ComposerCancelButton({
  ) : (
    <Square size={buttonIconSize} color="white" fill="white" />
  );
-  const shortcutNode = agentInterruptKeys ? (
-    <Shortcut chord={agentInterruptKeys} style={styles.tooltipShortcut} />
-  ) : null;
+  const shortcutNode = agentInterruptKeys ? <Shortcut chord={agentInterruptKeys} /> : null;
  return (
    <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile={false}>
      <TooltipTrigger
@@ -872,7 +896,6 @@ interface ComposerVoiceModeButtonProps {
  realtimeVoiceButtonStyle: (
    state: PressableStateCallbackType & { hovered?: boolean },
  ) => (object | undefined)[];
-  theme: Theme;
  voiceToggleKeys: ReturnType<typeof useShortcutKeys>;
 }

@@ -911,21 +934,18 @@ function ComposerVoiceModeButton({
  isConnected,
  isVoiceSwitching,
  realtimeVoiceButtonStyle,
-  theme,
  voiceToggleKeys,
 }: ComposerVoiceModeButtonProps) {
-  const shortcutNode = voiceToggleKeys ? (
-    <Shortcut chord={voiceToggleKeys} style={styles.tooltipShortcut} />
-  ) : null;
+  const shortcutNode = voiceToggleKeys ? <Shortcut chord={voiceToggleKeys} /> : null;
  const renderTriggerContent = useCallback(
    ({ hovered }: PressableStateCallbackType & { hovered?: boolean }) => {
      if (isVoiceSwitching) {
        return <ActivityIndicator size="small" color="white" />;
      }
-      const color = hovered ? theme.colors.foreground : theme.colors.foregroundMuted;
-      return <AudioLines size={buttonIconSize} color={color} />;
+      const colorMapping = hovered ? iconForegroundMapping : iconForegroundMutedMapping;
+      return <ThemedAudioLines size={buttonIconSize} uniProps={colorMapping} />;
    },
-    [buttonIconSize, isVoiceSwitching, theme.colors.foreground, theme.colors.foregroundMuted],
+    [buttonIconSize, isVoiceSwitching],
  );
  return (
    <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile={false}>
@@ -963,6 +983,8 @@ export function Composer({
  value,
  onChangeText,
  attachments,
+  workspaceAttachments = [],
+  onOpenWorkspaceAttachment,
  onChangeAttachments,
  cwd,
  clearDraft,
@@ -977,9 +999,7 @@ export function Composer({
  statusControls,
  inputWrapperStyle,
 }: ComposerProps) {
-  markScrollInvestigationRender(`Composer:${serverId}:${agentId}`);
-  const { theme } = useUnistyles();
-  const buttonIconSize = resolveComposerButtonIconSize(theme);
+  const buttonIconSize = resolveComposerButtonIconSize();
  const client = useHostRuntimeClient(serverId);
  const isConnected = useHostRuntimeIsConnected(serverId);
  const agentDirectoryStatus = useHostRuntimeAgentDirectoryStatus(serverId);
@@ -1013,7 +1033,19 @@ export function Composer({
  const messagePlaceholder = resolveMessagePlaceholder(isDesktopWebBreakpoint);
  const userInput = value;
  const setUserInput = onChangeText;
-  const selectedAttachments = attachments;
+  const {
+    selectedAttachments,
+    buildOutgoingAttachments,
+    removeAttachment,
+    openAttachment,
+    clearSentAttachments,
+    completeSubmit,
+    resetSuppression,
+  } = composerWorkspaceAttachment.useBinding({
+    normalAttachments: attachments,
+    workspaceAttachments,
+    onOpenWorkspaceAttachment,
+  });
  const setSelectedAttachments = onChangeAttachments;
  const [cursorIndex, setCursorIndex] = useState(0);
  const [isProcessing, setIsProcessing] = useState(false);
@@ -1170,8 +1202,18 @@ export function Composer({

      setUserInput("");
      setSelectedAttachments([]);
+      resetSuppression();
+      clearSentAttachments(queuedAttachments);
    },
-    [agentId, serverId, setQueuedMessages, setSelectedAttachments, setUserInput],
+    [
+      agentId,
+      clearSentAttachments,
+      resetSuppression,
+      serverId,
+      setQueuedMessages,
+      setSelectedAttachments,
+      setUserInput,
+    ],
  );

  const sendMessageWithContent = useCallback(
@@ -1180,7 +1222,7 @@ export function Composer({
      outgoingAttachments: ComposerAttachment[],
      forceSend?: boolean,
    ) => {
-      await submitAgentInput({
+      const result = await submitAgentInput({
        message: outgoingMessage,
        attachments: outgoingAttachments,
        hasExternalContent,
@@ -1200,7 +1242,7 @@ export function Composer({
        clearDraft,
        setUserInput,
        setAttachments: (nextAttachments) => {
-          setSelectedAttachments(nextAttachments);
+          setSelectedAttachments(composerWorkspaceAttachment.userAttachmentsOnly(nextAttachments));
        },
        setSendError,
        setIsProcessing,
@@ -1208,10 +1250,15 @@ export function Composer({
          console.error("[AgentInput] Failed to send message:", error);
        },
      });
+      completeSubmit({
+        result,
+        outgoingAttachments,
+      });
    },
    [
      allowEmptySubmit,
      clearDraft,
+      completeSubmit,
      hasExternalContent,
      isAgentRunning,
      queueMessage,
@@ -1227,9 +1274,13 @@ export function Composer({
      if (blurOnSubmit) {
        messageInputRef.current?.blur();
      }
-      void sendMessageWithContent(payload.text, payload.attachments, payload.forceSend);
+      void sendMessageWithContent(
+        payload.text,
+        buildOutgoingAttachments(attachments),
+        payload.forceSend,
+      );
    },
-    [blurOnSubmit, sendMessageWithContent],
+    [attachments, blurOnSubmit, buildOutgoingAttachments, sendMessageWithContent],
  );

  const handlePickImage = useCallback(async () => {
@@ -1240,14 +1291,24 @@ export function Composer({

  const handleRemoveAttachment = useCallback(
    (index: number) => {
+      const didRemoveWorkspaceAttachment = removeAttachment({
+        selectedAttachments,
+        index,
+      });
+      if (didRemoveWorkspaceAttachment) {
+        return;
+      }
      setSelectedAttachments((prev) => removeAttachmentAtIndex(prev, index));
    },
-    [setSelectedAttachments],
+    [removeAttachment, selectedAttachments, setSelectedAttachments],
  );

-  const handleOpenAttachment = useCallback((attachment: ComposerAttachment) => {
-    openComposerAttachment(attachment, setLightboxMetadata);
-  }, []);
+  const handleOpenAttachment = useCallback(
+    (attachment: ComposerAttachment) => {
+      openComposerAttachment(attachment, setLightboxMetadata, openAttachment);
+    },
+    [openAttachment],
+  );

  useEffect(() => {
    if (!isAgentRunning || !isConnected) {
@@ -1335,7 +1396,7 @@ export function Composer({

      updateQueue((current) => current.filter((q) => q.id !== id));
      setUserInput(item.text);
-      setSelectedAttachments(item.attachments);
+      setSelectedAttachments(composerWorkspaceAttachment.userAttachmentsOnly(item.attachments));
    },
    [queuedMessages, setSelectedAttachments, setUserInput, updateQueue],
  );
@@ -1361,9 +1422,9 @@ export function Composer({

  const handleQueue = useCallback(
    (payload: MessagePayload) => {
-      queueMessage(payload.text, payload.attachments);
+      queueMessage(payload.text, buildOutgoingAttachments(attachments));
    },
-    [queueMessage],
+    [attachments, buildOutgoingAttachments, queueMessage],
  );

  const hasSendableContent = userInput.trim().length > 0 || selectedAttachments.length > 0;
@@ -1416,7 +1477,6 @@ export function Composer({
    ],
  );

-  const isVoiceSwitchingValue = voice?.isVoiceSwitching ?? false;
  const rightContent = useMemo(
    () => (
      <ComposerRightControlsSlot
@@ -1428,9 +1488,8 @@ export function Composer({
        buttonIconSize={buttonIconSize}
        handleToggleRealtimeVoice={handleToggleRealtimeVoice}
        isConnected={isConnected}
-        isVoiceSwitching={isVoiceSwitchingValue}
+        isVoiceSwitching={isVoiceSwitching}
        realtimeVoiceButtonStyle={realtimeVoiceButtonStyle}
-        theme={theme}
        voiceToggleKeys={voiceToggleKeys}
        cancelButton={cancelButton}
      />
@@ -1445,9 +1504,8 @@ export function Composer({
      isConnected,
      isProcessing,
      isVoiceModeForAgent,
-      isVoiceSwitchingValue,
+      isVoiceSwitching,
      realtimeVoiceButtonStyle,
-      theme,
      voiceToggleKeys,
    ],
  );
@@ -1491,7 +1549,7 @@ export function Composer({
      {
        id: "image",
        label: "Add image",
-        icon: <Paperclip size={theme.iconSize.md} color={theme.colors.foregroundMuted} />,
+        icon: <ThemedPaperclip size={ICON_SIZE.md} uniProps={iconForegroundMutedMapping} />,
        onSelect: () => {
          void handlePickImage();
        },
@@ -1499,13 +1557,13 @@ export function Composer({
      {
        id: "github",
        label: "Add issue or PR",
-        icon: <Github size={theme.iconSize.md} color={theme.colors.foregroundMuted} />,
+        icon: <ThemedGithub size={ICON_SIZE.md} uniProps={iconForegroundMutedMapping} />,
        onSelect: () => {
          setIsGithubPickerOpen(true);
        },
      },
    ],
-    [handlePickImage, theme.colors.foregroundMuted, theme.iconSize.md],
+    [handlePickImage],
  );

  const handleToggleGithubItem = useCallback(
@@ -1809,10 +1867,6 @@ const styles = StyleSheet.create((theme: Theme) => ({
    fontSize: theme.fontSize.sm,
    color: theme.colors.popoverForeground,
  },
-  tooltipShortcut: {
-    backgroundColor: theme.colors.surface3,
-    borderColor: theme.colors.borderAccent,
-  },
  buttonDisabled: {
    opacity: 0.5,
  },
@@ -1860,3 +1914,13 @@ const styles = StyleSheet.create((theme: Theme) => ({
 })) as unknown as Record<string, object>;

 const QUEUE_SEND_BUTTON_STYLE = [styles.queueActionButton, styles.queueSendButton];
+
+const ThemedPencil = withUnistyles(Pencil);
+const ThemedGitPullRequest = withUnistyles(GitPullRequest);
+const ThemedCircleDot = withUnistyles(CircleDot);
+const ThemedAudioLines = withUnistyles(AudioLines);
+const ThemedPaperclip = withUnistyles(Paperclip);
+const ThemedGithub = withUnistyles(Github);
+
+const iconForegroundMapping = (theme: Theme) => ({ color: theme.colors.foreground });
+const iconForegroundMutedMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
@@ -138,7 +138,6 @@ const styles = StyleSheet.create((theme) => ({
  tooltipTitle: {
    color: theme.colors.foreground,
    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.semibold,
  },
  tooltipText: {
    color: theme.colors.foreground,
@@ -1,209 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import React, { act } from "react";
-import { createRoot, type Root } from "react-dom/client";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { SidebarCalloutProvider } from "@/contexts/sidebar-callout-context";
-import { SidebarCalloutSlot } from "./sidebar-callout-slot";
-
-const { theme } = vi.hoisted(() => ({
-  theme: {
-    spacing: { 0: 0, 1: 4, 2: 8, 3: 12, 4: 16 },
-    borderWidth: { 1: 1 },
-    borderRadius: { md: 6 },
-    fontSize: { xs: 11, sm: 13 },
-    fontWeight: { medium: "500", semibold: "600" },
-    colors: {
-      surface0: "#000",
-      foreground: "#fff",
-      foregroundMuted: "#aaa",
-      border: "#555",
-      destructive: "#f44",
-    },
-  },
-}));
-
-const asyncStorage = vi.hoisted(() => ({
-  values: new Map<string, string>(),
-  getItem: vi.fn(async (key: string) => asyncStorage.values.get(key) ?? null),
-  setItem: vi.fn(async (key: string, value: string) => {
-    asyncStorage.values.set(key, value);
-  }),
-}));
-
-const hostsState = vi.hoisted(() => ({
-  value: [{ serverId: "server-1", label: "Local daemon" }],
-}));
-
-const sessionState = vi.hoisted(() => ({
-  value: {
-    sessions: {
-      "server-1": {
-        serverInfo: {
-          serverId: "server-1",
-          hostname: "MacBook",
-          version: "1.2.2",
-        },
-      },
-    },
-  },
-}));
-
-const router = vi.hoisted(() => ({
-  navigate: vi.fn(),
-}));
-
-vi.mock("@react-native-async-storage/async-storage", () => ({
-  default: asyncStorage,
-}));
-
-vi.mock("expo-router", () => ({
-  useRouter: () => router,
-}));
-
-vi.mock("@/runtime/host-runtime", () => ({
-  useHosts: () => hostsState.value,
-}));
-
-vi.mock("@/stores/session-store", () => ({
-  useSessionStore: (selector: (state: typeof sessionState.value) => unknown) =>
-    selector(sessionState.value),
-}));
-
-vi.mock("@/utils/app-version", () => ({
-  resolveAppVersion: () => "1.2.3",
-}));
-
-vi.mock("react-native-unistyles", () => ({
-  StyleSheet: {
-    create: (factory: unknown) =>
-      typeof factory === "function" ? (factory as (t: typeof theme) => unknown)(theme) : factory,
-  },
-  useUnistyles: () => ({ theme }),
-}));
-
-vi.mock("lucide-react-native", () => {
-  const X = (props: Record<string, unknown>) => React.createElement("span", props);
-  return { X };
-});
-
-vi.stubGlobal("React", React);
-vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
-
-import { DaemonVersionMismatchCalloutSource } from "./daemon-version-mismatch-callout-source";
-
-function Harness() {
-  return (
-    <SidebarCalloutProvider>
-      <DaemonVersionMismatchCalloutSource />
-      <SidebarCalloutSlot />
-    </SidebarCalloutProvider>
-  );
-}
-
-async function renderHarness(root: Root): Promise<void> {
-  await act(async () => {
-    root.render(<Harness />);
-    await Promise.resolve();
-    await Promise.resolve();
-  });
-}
-
-describe("DaemonVersionMismatchCalloutSource", () => {
-  let root: Root | null = null;
-  let container: HTMLElement | null = null;
-
-  beforeEach(() => {
-    hostsState.value = [{ serverId: "server-1", label: "Local daemon" }];
-    sessionState.value = {
-      sessions: {
-        "server-1": {
-          serverInfo: {
-            serverId: "server-1",
-            hostname: "MacBook",
-            version: "1.2.2",
-          },
-        },
-      },
-    };
-    router.navigate.mockClear();
-    asyncStorage.values.clear();
-    asyncStorage.getItem.mockClear();
-    asyncStorage.setItem.mockClear();
-    container = document.createElement("div");
-    document.body.appendChild(container);
-    root = createRoot(container);
-  });
-
-  afterEach(() => {
-    if (root) {
-      act(() => {
-        root?.unmount();
-      });
-    }
-    root = null;
-    container?.remove();
-    container = null;
-  });
-
-  it("registers a daemon mismatch sidebar callout", async () => {
-    await renderHarness(root!);
-
-    expect(
-      container?.querySelector('[data-testid="daemon-version-mismatch-callout-server-1"]'),
-    ).not.toBeNull();
-    expect(container?.textContent).toContain("Daemon version mismatch");
-    expect(container?.textContent).toContain("Local daemon is running v1.2.2");
-    expect(container?.textContent).toContain("This app is v1.2.3");
-    expect(container?.textContent).toContain(
-      "For the best experience, keep the daemon and client on the same version.",
-    );
-  });
-
-  it("does not register a callout when versions match", async () => {
-    sessionState.value.sessions["server-1"]!.serverInfo!.version = "1.2.3";
-
-    await renderHarness(root!);
-
-    expect(
-      container?.querySelector('[data-testid="daemon-version-mismatch-callout-server-1"]'),
-    ).toBeNull();
-  });
-
-  it("opens host settings from the callout action", async () => {
-    await renderHarness(root!);
-
-    const action = container?.querySelector(
-      '[data-testid="daemon-version-mismatch-callout-server-1-action-0"]',
-    ) as HTMLElement | null;
-    expect(action).not.toBeNull();
-
-    act(() => {
-      action?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
-    });
-
-    expect(router.navigate).toHaveBeenCalledWith("/settings/hosts/server-1");
-  });
-
-  it("persists dismissal for the current app-daemon version pair", async () => {
-    await renderHarness(root!);
-
-    const dismiss = container?.querySelector(
-      '[data-testid="daemon-version-mismatch-callout-server-1-dismiss"]',
-    ) as HTMLElement | null;
-    expect(dismiss).not.toBeNull();
-
-    act(() => {
-      dismiss?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
-    });
-
-    expect(asyncStorage.setItem).toHaveBeenCalledWith(
-      "@paseo:sidebar-callout-dismissals",
-      JSON.stringify(["daemon-version-mismatch:server-1:1.2.3:1.2.2"]),
-    );
-    expect(
-      container?.querySelector('[data-testid="daemon-version-mismatch-callout-server-1"]'),
-    ).toBeNull();
-  });
-});
@@ -1,79 +0,0 @@
-import { useRouter } from "expo-router";
-import { useEffect, useMemo } from "react";
-import { useSidebarCallouts } from "@/contexts/sidebar-callout-context";
-import { formatVersionWithPrefix, isVersionMismatch } from "@/desktop/updates/desktop-updates";
-import { useStableEvent } from "@/hooks/use-stable-event";
-import { useHosts } from "@/runtime/host-runtime";
-import { useSessionStore } from "@/stores/session-store";
-import { resolveAppVersion } from "@/utils/app-version";
-import { buildSettingsHostRoute } from "@/utils/host-routes";
-
-interface DaemonVersionMismatch {
-  serverId: string;
-  label: string;
-  appVersion: string;
-  daemonVersion: string;
-}
-
-function useDaemonVersionMismatches(): DaemonVersionMismatch[] {
-  const hosts = useHosts();
-  const sessions = useSessionStore((state) => state.sessions);
-  const appVersion = resolveAppVersion();
-
-  return useMemo(() => {
-    if (!appVersion) {
-      return [];
-    }
-
-    return hosts
-      .map((entry) => ({
-        serverId: entry.serverId,
-        label: entry.label?.trim() || sessions[entry.serverId]?.serverInfo?.hostname || "Daemon",
-        appVersion,
-        daemonVersion: sessions[entry.serverId]?.serverInfo?.version ?? null,
-      }))
-      .filter((entry): entry is DaemonVersionMismatch =>
-        isVersionMismatch(entry.appVersion, entry.daemonVersion),
-      );
-  }, [appVersion, hosts, sessions]);
-}
-
-function DaemonVersionMismatchRegistration({ mismatch }: { mismatch: DaemonVersionMismatch }) {
-  const callouts = useSidebarCallouts();
-  const router = useRouter();
-  const { appVersion, daemonVersion, label, serverId } = mismatch;
-  const openSettings = useStableEvent(() => {
-    router.navigate(buildSettingsHostRoute(serverId));
-  });
-
-  useEffect(() => {
-    return callouts.show({
-      id: `daemon-version-mismatch:${serverId}`,
-      dismissalKey: `daemon-version-mismatch:${serverId}:${appVersion}:${daemonVersion}`,
-      priority: 300,
-      title: "Daemon version mismatch",
-      description: `${label} is running ${formatVersionWithPrefix(
-        daemonVersion,
-      )}. This app is ${formatVersionWithPrefix(
-        appVersion,
-      )}. For the best experience, keep the daemon and client on the same version.`,
-      variant: "error",
-      actions: [{ label: "Open settings", onPress: openSettings, variant: "primary" }],
-      testID: `daemon-version-mismatch-callout-${serverId}`,
-    });
-  }, [appVersion, callouts, daemonVersion, label, openSettings, serverId]);
-
-  return null;
-}
-
-export function DaemonVersionMismatchCalloutSource() {
-  const mismatches = useDaemonVersionMismatches();
-
-  return (
-    <>
-      {mismatches.map((mismatch) => (
-        <DaemonVersionMismatchRegistration key={mismatch.serverId} mismatch={mismatch} />
-      ))}
-    </>
-  );
-}
@@ -483,6 +483,7 @@ function SidebarContent({
            workspaceId={workspaceId}
            cwd={workspaceRoot}
            hideHeaderRow={!isMobile}
+            enabled={isOpen}
          />
        )}
        {resolvedTab === "files" && (
@@ -132,7 +132,7 @@ function TreeRowItem({
  );

  const handleCopy = useCallback(() => {
-    void onCopyPath(entry.path);
+    onCopyPath(entry.path);
  }, [onCopyPath, entry.path]);

  const handleDownload = useCallback(() => {
@@ -1,5 +1,6 @@
 import React, { useMemo, useRef } from "react";
 import { useQuery } from "@tanstack/react-query";
+import type { FileReadResult } from "@server/client/daemon-client";
 import Markdown, { MarkdownIt } from "react-native-markdown-display";
 import {
  ActivityIndicator,
@@ -27,8 +28,9 @@ import { isWeb } from "@/constants/platform";
 import { createMarkdownStyles } from "@/styles/markdown-styles";
 import type { AttachmentMetadata } from "@/attachments/types";
 import { useAttachmentPreviewUrl } from "@/attachments/use-attachment-preview-url";
-import { persistAttachmentFromBase64 } from "@/attachments/service";
+import { persistAttachmentFromBytes } from "@/attachments/service";
 import { createPreviewAttachmentId, getFileNameFromPath } from "@/attachments/utils";
+import { explorerFileFromReadResult } from "@/file-explorer/read-result";

 interface CodeLineProps {
  tokens: HighlightToken[];
@@ -65,30 +67,34 @@ function formatFileSize({ size }: { size: number }): string {
  return `${(size / (1024 * 1024)).toFixed(1)} MB`;
 }

-async function createFilePanePreview(file: ExplorerFile | null): Promise<{
+async function createFilePanePreview(file: FileReadResult | null): Promise<{
  file: ExplorerFile | null;
  imageAttachment: AttachmentMetadata | null;
 }> {
-  if (!file || file.kind !== "image" || !file.content) {
-    return { file, imageAttachment: null };
+  if (!file) {
+    return { file: null, imageAttachment: null };
  }

-  const { content: _content, ...imageFile } = file;
-  const imageAttachment = await persistAttachmentFromBase64({
+  const explorerFile = explorerFileFromReadResult(file);
+  if (file.kind !== "image") {
+    return { file: explorerFile, imageAttachment: null };
+  }
+
+  const imageAttachment = await persistAttachmentFromBytes({
    id: createPreviewAttachmentId({
-      mimeType: file.mimeType ?? "image/png",
+      mimeType: file.mime,
      path: file.path,
      size: file.size,
      modifiedAt: file.modifiedAt,
-      contentLength: file.content.length,
+      contentLength: file.bytes.byteLength,
    }),
-    base64: file.content,
-    mimeType: file.mimeType,
+    bytes: file.bytes,
+    mimeType: file.mime,
    fileName: getFileNameFromPath(file.path),
  });

  return {
-    file: imageFile,
+    file: explorerFile,
    imageAttachment,
  };
 }
@@ -112,7 +118,9 @@ const CodeLine = React.memo(function CodeLine({
  return (
    <View style={codeLineStyles.line}>
      <View style={gutterStyle}>
-        <Text style={gutterTextStyle}>{String(lineNumber)}</Text>
+        <Text numberOfLines={1} style={gutterTextStyle}>
+          {String(lineNumber)}
+        </Text>
      </View>
      <Text selectable style={codeLineStyles.lineText}>
        {keyedTokens.map(({ key, token }) => (
@@ -193,8 +201,8 @@ function FilePreviewBody({

  const gutterWidth = useMemo(() => {
    if (!highlightedLines) return 0;
-    return lineNumberGutterWidth(highlightedLines.length);
-  }, [highlightedLines]);
+    return lineNumberGutterWidth(highlightedLines.length, theme.fontSize.sm);
+  }, [highlightedLines, theme.fontSize.sm]);

  const imageSource = useMemo(
    () => (imagePreviewUri ? { uri: imagePreviewUri } : null),
@@ -356,17 +364,21 @@ export function FilePane({
      if (!client || !normalizedWorkspaceRoot || !normalizedFilePath) {
        return { file: null as ExplorerFile | null, error: "Host is not connected" };
      }
-      const payload = await client.exploreFileSystem(
-        normalizedWorkspaceRoot,
-        normalizedFilePath,
-        "file",
-      );
-      const preview = await createFilePanePreview(payload.file ?? null);
-      return {
-        file: preview.file,
-        imageAttachment: preview.imageAttachment,
-        error: payload.error ?? null,
-      };
+      try {
+        const file = await client.readFile(normalizedWorkspaceRoot, normalizedFilePath);
+        const preview = await createFilePanePreview(file);
+        return {
+          file: preview.file,
+          imageAttachment: preview.imageAttachment,
+          error: null,
+        };
+      } catch (error) {
+        return {
+          file: null,
+          imageAttachment: null,
+          error: error instanceof Error ? error.message : "Failed to load file",
+        };
+      }
    },
    staleTime: 5_000,
    refetchOnMount: true,
--- a/Show More
+++ b/Show More