fix(search): address workspace search review feedback

Workspace suggestions now use the indexed search backend directly, so dotfiles and dot directories are included without a second ignore layer. Packaged desktop smoke covers the native search path.

.dockerignore

@@ -1,31 +1,11 @@
 .git
-.debug.conversations
-.debug
 .dev
 .playwright-mcp
-**/.playwright-mcp
 .paseo
-**/.paseo-provider-history
-.plans
 .tasks
-.valknut
-.claude/settings.local.json
-**/.claude/settings.local.json
-.claude/scheduled_tasks.lock
-.claude/worktrees
 .wrangler
 **/.wrangler
 **/.tanstack
-PLAN.md
-valknut-report.html
-valknut-report.json
-.env*
-**/.env*
-.dev.vars
-**/.dev.vars
-*.pem
-**/*.pem
-**/.secrets
 **/node_modules
 **/dist
 **/build

.github/workflows/ci.yml

@@ -76,6 +76,7 @@ jobs:
 
       - name: Install dependencies
         run: npm ci
+
       - name: Build server stack
         run: npm run build:server
 
@@ -112,6 +113,7 @@ jobs:
 
       - name: Install dependencies
         run: npm ci
+
       - name: Install agent CLIs for provider tests
         run: npm install -g @anthropic-ai/claude-code opencode-ai
 
@@ -168,6 +170,7 @@ jobs:
             }
             Start-Sleep -Seconds (20 * $attempt)
           }
+
       - name: Build server stack
         run: npm run build:server
 
@@ -199,6 +202,7 @@ jobs:
             fi
             sleep $((attempt * 20))
           done
+
       - name: Install Playwright browsers
         timeout-minutes: 10
         run: npx playwright install chromium
@@ -223,6 +227,7 @@ jobs:
 
       - name: Install dependencies
         run: npm ci
+
       - name: Build client dependencies
         run: npm run build:client
 
@@ -265,6 +270,7 @@ jobs:
             fi
             sleep $((attempt * 20))
           done
+
       - name: Install Playwright browsers
         timeout-minutes: 10
         run: npx playwright install chromium

.github/workflows/deploy-app.yml

@@ -27,6 +27,7 @@ jobs:
         run: npm ci
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build app dependencies
         run: npm run build:app-deps
 

.github/workflows/desktop-release.yml

@@ -329,6 +329,18 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Install Windows arm64 native search packages
+        shell: bash
+        run: |
+          set -euo pipefail
+          fff_version="$(node -p "require('./node_modules/@ff-labs/fff-node/package.json').optionalDependencies['@ff-labs/fff-bin-win32-arm64']")"
+          ffi_version="$(node -p "require('./node_modules/ffi-rs/package.json').optionalDependencies['@yuuang/ffi-rs-win32-arm64-msvc']")"
+          npm install --no-save --package-lock=false --ignore-scripts --no-audit --fund=false --os=win32 --cpu=arm64 \
+            "@ff-labs/fff-bin-win32-arm64@${fff_version}" \
+            "@yuuang/ffi-rs-win32-arm64-msvc@${ffi_version}"
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Set desktop package version from tag
         shell: bash
         run: |

.github/workflows/docker.yml

@@ -5,22 +5,7 @@ on:
     branches: [main]
     paths:
       - "docker/**"
-      - ".dockerignore"
       - ".github/workflows/docker.yml"
-      - "package.json"
-      - "package-lock.json"
-      - "patches/**"
-      - "scripts/**"
-      - "tsconfig.json"
-      - "tsconfig.base.json"
-      - "packages/app/**"
-      - "packages/cli/**"
-      - "packages/client/**"
-      - "packages/expo-two-way-audio/**"
-      - "packages/highlight/**"
-      - "packages/protocol/**"
-      - "packages/relay/**"
-      - "packages/server/**"
   push:
     branches: [main]
     tags:
@@ -28,7 +13,7 @@ on:
   workflow_dispatch:
     inputs:
       paseo_version:
-        description: "Expected source version to build. Required when publish is true."
+        description: "Paseo version to build. Required when publish is true."
         required: false
         default: ""
       publish:
@@ -39,6 +24,15 @@ on:
         options:
           - "false"
           - "true"
+      source_build:
+        description: "Build from the checked-out source tree instead of npm."
+        required: false
+        default: "auto"
+        type: choice
+        options:
+          - auto
+          - "false"
+          - "true"
       publish_latest:
         description: "Also publish ghcr.io/getpaseo/paseo:latest. Ignored for prereleases."
         required: false
@@ -63,6 +57,7 @@ jobs:
       image: ${{ steps.values.outputs.image }}
       install_version: ${{ steps.values.outputs.install_version }}
       publish: ${{ steps.values.outputs.publish }}
+      source_build: ${{ steps.values.outputs.source_build }}
       check_tag: ${{ steps.values.outputs.check_tag }}
       publish_tags: ${{ steps.values.outputs.publish_tags }}
     steps:
@@ -73,6 +68,7 @@ jobs:
           INPUT_PASEO_VERSION: ${{ inputs.paseo_version }}
           INPUT_PUBLISH: ${{ inputs.publish }}
           INPUT_PUBLISH_LATEST: ${{ inputs.publish_latest }}
+          INPUT_SOURCE_BUILD: ${{ inputs.source_build }}
           REPO_OWNER: ${{ github.repository_owner }}
           REF_NAME: ${{ github.ref_name }}
         run: |
@@ -80,9 +76,9 @@ jobs:
 
           owner="$(printf '%s' "${REPO_OWNER}" | tr '[:upper:]' '[:lower:]')"
           image="ghcr.io/${owner}/paseo"
-          package_version="$(node -p "require('./package.json').version")"
+          install_version="${INPUT_PASEO_VERSION:-latest}"
-          install_version="${INPUT_PASEO_VERSION:-${package_version}}"
           publish=false
+          source_build=false
           publish_latest=false
           prerelease=false
 
@@ -91,6 +87,7 @@ jobs:
             publish=true
             if [[ "${REF_NAME}" == *-* ]]; then
               prerelease=true
+              source_build=true
             else
               publish_latest=true
             fi
@@ -107,6 +104,24 @@ jobs:
               prerelease=true
             fi
 
+            case "${INPUT_SOURCE_BUILD:-auto}" in
+              true)
+                source_build=true
+                ;;
+              false)
+                source_build=false
+                ;;
+              auto)
+                if [[ "${prerelease}" == "true" ]]; then
+                  source_build=true
+                fi
+                ;;
+              *)
+                echo "::error::source_build must be auto, true, or false."
+                exit 1
+                ;;
+            esac
+
             if [[ "${INPUT_PUBLISH_LATEST:-false}" == "true" && "${prerelease}" != "true" ]]; then
               publish_latest=true
             fi
@@ -122,13 +137,14 @@ jobs:
             echo "image=${image}"
             echo "install_version=${install_version}"
             echo "publish=${publish}"
+            echo "source_build=${source_build}"
             echo "check_tag=${check_tag}"
             echo "publish_tags<<EOF"
             echo "${publish_tags}"
             echo "EOF"
           } >> "$GITHUB_OUTPUT"
 
-          echo "Resolved image=${image} install_version=${install_version} publish=${publish}"
+          echo "Resolved image=${image} install_version=${install_version} publish=${publish} source_build=${source_build}"
 
   build:
     needs: setup
@@ -144,8 +160,8 @@ jobs:
 
       - uses: docker/build-push-action@v7
         with:
-          context: .
+          context: ${{ needs.setup.outputs.source_build == 'true' && '.' || 'docker/base' }}
-          file: docker/base/Dockerfile
+          file: ${{ needs.setup.outputs.source_build == 'true' && 'docker/base/Dockerfile.source' || 'docker/base/Dockerfile' }}
           platforms: ${{ env.PLATFORMS }}
           build-args: |
             PASEO_VERSION=${{ needs.setup.outputs.install_version }}
@@ -177,8 +193,8 @@ jobs:
 
       - uses: docker/build-push-action@v7
         with:
-          context: .
+          context: ${{ needs.setup.outputs.source_build == 'true' && '.' || 'docker/base' }}
-          file: docker/base/Dockerfile
+          file: ${{ needs.setup.outputs.source_build == 'true' && 'docker/base/Dockerfile.source' || 'docker/base/Dockerfile' }}
           platforms: ${{ env.PLATFORMS }}
           build-args: |
             PASEO_VERSION=${{ needs.setup.outputs.install_version }}

.gitignore

@@ -84,7 +84,6 @@ valknut-report.json/
 .plans/
 packages/server/src/server/fixtures/dictation/dictation-debug-largest.wav
 packages/server/src/server/fixtures/dictation/dictation-debug-largest.transcript.txt
-packages/protocol/src/generated/validation/*.aot.ts
 
 /artifacts
 packages/desktop/.cache/

.oxlintrc.json

@@ -84,198 +84,6 @@
     "max-nested-callbacks": ["error", { "max": 3 }]
   },
   "overrides": [
-    {
-      "files": ["packages/app/src/**/*.{ts,tsx}"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          {
-            "paths": [
-              {
-                "name": "@tanstack/react-query",
-                "importNames": ["useQuery", "useInfiniteQuery", "useQueries"],
-                "message": "App reads must go through useReplicaQuery/useFetchQuery from @/data/query. Grandfathered files may only leave the override burn-down list."
-              },
-              {
-                "name": "react-native-unistyles",
-                "importNames": ["useUnistyles"],
-                "message": "useUnistyles is banned by docs/unistyles.md. Grandfathered files may only leave the override burn-down list."
-              }
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "files": [
-        "packages/app/src/data/**/*.{ts,tsx}",
-        "packages/app/src/**/*.test.{ts,tsx}",
-        "packages/app/src/**/*.spec.{ts,tsx}"
-      ],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          {
-            "paths": [
-              {
-                "name": "react-native-unistyles",
-                "importNames": ["useUnistyles"],
-                "message": "useUnistyles is banned by docs/unistyles.md. Grandfathered files may only leave the override burn-down list."
-              }
-            ]
-          }
-        ]
-      }
-    },
-    // Raw query burn-down: 35 files total; the 29 files below still enforce the useUnistyles ban.
-    {
-      "files": [
-        "packages/app/src/assistant-file-links/use-file-link.ts",
-        "packages/app/src/components/message.tsx",
-        "packages/app/src/components/worktree-setup-callout-source.tsx",
-        "packages/app/src/desktop/hooks/use-daemon-status.ts",
-        "packages/app/src/desktop/hooks/use-install-status.ts",
-        "packages/app/src/desktop/settings/desktop-settings.ts",
-        "packages/app/src/git/pull-request-panel/use-data.ts",
-        "packages/app/src/git/use-github-search-query.ts",
-        "packages/app/src/git/use-pr-status-query.ts",
-        "packages/app/src/git/use-status-query.ts",
-        "packages/app/src/hooks/use-archive-agent.ts",
-        "packages/app/src/hooks/use-agent-autocomplete.ts",
-        "packages/app/src/hooks/use-agent-commands-query.ts",
-        "packages/app/src/hooks/use-agent-history.ts",
-        "packages/app/src/hooks/use-branch-switcher.ts",
-        "packages/app/src/hooks/use-changes-preferences/index.ts",
-        "packages/app/src/hooks/use-draft-agent-features.ts",
-        "packages/app/src/hooks/use-form-preferences.ts",
-        "packages/app/src/hooks/use-is-local-daemon.ts",
-        "packages/app/src/hooks/use-keyboard-shortcut-overrides.ts",
-        "packages/app/src/hooks/use-preferred-editor.ts",
-        "packages/app/src/hooks/use-project-icon-query.ts",
-        "packages/app/src/hooks/use-settings/index.ts",
-        "packages/app/src/panels/terminal-panel.tsx",
-        "packages/app/src/projects/project-icons.ts",
-        "packages/app/src/provider-usage/use-provider-usage.ts",
-        "packages/app/src/screens/project-settings-screen.tsx",
-        "packages/app/src/screens/workspace/use-workspace-checkout-status.ts",
-        "packages/app/src/workspace/desktop-open-targets.ts"
-      ],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          {
-            "paths": [
-              {
-                "name": "react-native-unistyles",
-                "importNames": ["useUnistyles"],
-                "message": "useUnistyles is banned by docs/unistyles.md. Grandfathered files may only leave the override burn-down list."
-              }
-            ]
-          }
-        ]
-      }
-    },
-    // useUnistyles burn-down: 74 files total; the 68 files below still enforce the raw-query ban.
-    {
-      "files": [
-        "packages/app/src/app/_layout.tsx",
-        "packages/app/src/app/pair-scan.tsx",
-        "packages/app/src/components/adaptive-modal-sheet.tsx",
-        "packages/app/src/components/add-host-method-modal.tsx",
-        "packages/app/src/components/add-host-modal.tsx",
-        "packages/app/src/components/agent-list.tsx",
-        "packages/app/src/components/agent-status-dot.tsx",
-        "packages/app/src/components/attachment-lightbox.tsx",
-        "packages/app/src/components/browser-pane.electron.tsx",
-        "packages/app/src/components/browser-pane.tsx",
-        "packages/app/src/components/browser-pane.web.tsx",
-        "packages/app/src/components/command-center.tsx",
-        "packages/app/src/components/context-window-meter.tsx",
-        "packages/app/src/components/dictation-controls.tsx",
-        "packages/app/src/components/download-toast.tsx",
-        "packages/app/src/components/draggable-list.native.tsx",
-        "packages/app/src/components/explorer-sidebar.tsx",
-        "packages/app/src/components/headers/back-header.tsx",
-        "packages/app/src/components/headers/menu-header.tsx",
-        "packages/app/src/components/headers/screen-header.tsx",
-        "packages/app/src/components/host-status-dot.tsx",
-        "packages/app/src/components/hosts/host-picker.tsx",
-        "packages/app/src/components/icons/paseo-logo.tsx",
-        "packages/app/src/components/left-sidebar.tsx",
-        "packages/app/src/components/pair-link-modal.tsx",
-        "packages/app/src/components/plan-card.tsx",
-        "packages/app/src/components/provider-diagnostic-sheet.tsx",
-        "packages/app/src/components/question-form-card.tsx",
-        "packages/app/src/components/quitting-overlay.tsx",
-        "packages/app/src/components/realtime-voice-overlay.tsx",
-        "packages/app/src/components/resize-handle.tsx",
-        "packages/app/src/components/rewind/rewind-menu.tsx",
-        "packages/app/src/components/settings-textarea.tsx",
-        "packages/app/src/components/sidebar-callout.tsx",
-        "packages/app/src/components/split-container.tsx",
-        "packages/app/src/components/split-drop-zone.tsx",
-        "packages/app/src/components/terminal-pane.tsx",
-        "packages/app/src/components/toast-host.tsx",
-        "packages/app/src/components/tool-call-sheet.tsx",
-        "packages/app/src/components/ui/alert.tsx",
-        "packages/app/src/components/ui/autocomplete.tsx",
-        "packages/app/src/components/ui/combobox.tsx",
-        "packages/app/src/components/ui/context-menu.tsx",
-        "packages/app/src/components/ui/dropdown-menu.tsx",
-        "packages/app/src/components/ui/external-link.tsx",
-        "packages/app/src/components/volume-meter.tsx",
-        "packages/app/src/components/web-desktop-scrollbar.tsx",
-        "packages/app/src/components/welcome-screen.tsx",
-        "packages/app/src/composer/agent-controls/index.tsx",
-        "packages/app/src/composer/agent-controls/mode-control.tsx",
-        "packages/app/src/constants/layout.ts",
-        "packages/app/src/desktop/components/desktop-permission-row.tsx",
-        "packages/app/src/desktop/components/desktop-permissions-section.tsx",
-        "packages/app/src/desktop/components/desktop-updates-section.tsx",
-        "packages/app/src/desktop/components/integrations-section.tsx",
-        "packages/app/src/desktop/updates/update-callout-source.tsx",
-        "packages/app/src/git/actions-split-button.tsx",
-        "packages/app/src/hooks/use-web-scrollbar-style.web.ts",
-        "packages/app/src/hosts/host-chooser.tsx",
-        "packages/app/src/screens/open-project-screen.tsx",
-        "packages/app/src/screens/projects-screen.tsx",
-        "packages/app/src/screens/sessions-screen.tsx",
-        "packages/app/src/screens/settings-screen.tsx",
-        "packages/app/src/screens/settings/host-page.tsx",
-        "packages/app/src/screens/settings/providers-section.tsx",
-        "packages/app/src/screens/settings/settings-group.tsx",
-        "packages/app/src/screens/startup-splash-screen.tsx",
-        "packages/app/src/screens/workspace/workspace-route-state-views.tsx"
-      ],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          {
-            "paths": [
-              {
-                "name": "@tanstack/react-query",
-                "importNames": ["useQuery", "useInfiniteQuery", "useQueries"],
-                "message": "App reads must go through useReplicaQuery/useFetchQuery from @/data/query. Grandfathered files may only leave the override burn-down list."
-              }
-            ]
-          }
-        ]
-      }
-    },
-    // Both burn-downs: 6 overlapping files. They may only shrink out of this exemption.
-    {
-      "files": [
-        "packages/app/src/components/file-explorer-pane.tsx",
-        "packages/app/src/components/file-pane.tsx",
-        "packages/app/src/components/import-session-sheet.tsx",
-        "packages/app/src/components/project-picker-modal.tsx",
-        "packages/app/src/desktop/components/pair-device-section.tsx",
-        "packages/app/src/screens/new-workspace-screen.tsx"
-      ],
-      "rules": {
-        "no-restricted-imports": "off"
-      }
-    },
     {
       "files": ["**/e2e/fixtures.ts"],
       "rules": {

CHANGELOG.md

@@ -1,48 +1,5 @@
 # Changelog
 
-## 0.1.104 - 2026-07-08
-
-### Added
-
-- Agents can drive the in-app browser with page snapshots, trusted input, dialogs, and tab controls ([#1881](https://github.com/getpaseo/paseo/pull/1881))
-- Inspect, annotate, and send page elements from a browser tab to the agent ([#1708](https://github.com/getpaseo/paseo/pull/1708) by [@huiliaoning](https://github.com/huiliaoning))
-- Schedules screen to create and manage recurring agents ([#1246](https://github.com/getpaseo/paseo/pull/1246))
-- Open a project from anywhere with Cmd+O ([#1849](https://github.com/getpaseo/paseo/pull/1849))
-- Agents can rename workspaces after they understand the task ([#1876](https://github.com/getpaseo/paseo/pull/1876))
-- Claude Ultra Code is available for supported Claude models ([#1872](https://github.com/getpaseo/paseo/pull/1872))
-- ByteDance TRAE CLI available as an agent provider ([#1831](https://github.com/getpaseo/paseo/pull/1831), [#1896](https://github.com/getpaseo/paseo/pull/1896) by [@park0er](https://github.com/park0er))
-
-### Improved
-
-- Manage the built-in daemon from one place in desktop settings ([#1938](https://github.com/getpaseo/paseo/pull/1938))
-- Scheduled and loop runs each get their own workspace in the sidebar ([#1909](https://github.com/getpaseo/paseo/pull/1909), [#1934](https://github.com/getpaseo/paseo/pull/1934))
-- Large provider and model refreshes load faster in the app ([#1895](https://github.com/getpaseo/paseo/pull/1895))
-- Workspaces created by agents now get readable generated names ([#1887](https://github.com/getpaseo/paseo/pull/1887))
-- Browser tabs opened by agents stay in the background until you switch to them ([#1875](https://github.com/getpaseo/paseo/pull/1875))
-- Clearer cards when an agent asks a question ([#1643](https://github.com/getpaseo/paseo/pull/1643) by [@cleiter](https://github.com/cleiter))
-- Diagnostic reports include desktop app logs ([#1914](https://github.com/getpaseo/paseo/pull/1914))
-- Paseo's built-in tools take less context ([#1939](https://github.com/getpaseo/paseo/pull/1939))
-
-### Fixed
-
-- Renamed hosts keep their name after reconnecting ([#1940](https://github.com/getpaseo/paseo/pull/1940))
-- Desktop finds your installed CLIs even when your shell is slow to start ([#1916](https://github.com/getpaseo/paseo/pull/1916))
-- Restarting the daemon from desktop settings works reliably ([#1915](https://github.com/getpaseo/paseo/pull/1915))
-- Restarting the daemon from the bundled CLI keeps it managed by the desktop app ([#1919](https://github.com/getpaseo/paseo/pull/1919))
-- Web UI loads when the daemon is started from the bundled CLI ([#1899](https://github.com/getpaseo/paseo/pull/1899) by [@yzim](https://github.com/yzim))
-- Worktree setup scripts keep your PATH ([#1908](https://github.com/getpaseo/paseo/pull/1908))
-- Docker images keep running during provider cleanup and diagnostics ([#1877](https://github.com/getpaseo/paseo/pull/1877))
-- New Workspace drafts survive archiving a workspace ([#1838](https://github.com/getpaseo/paseo/pull/1838))
-- Composer autocomplete stays open after switching screens ([#1851](https://github.com/getpaseo/paseo/pull/1851))
-- Claude usage appears when a quota window has no scheduled reset ([#1855](https://github.com/getpaseo/paseo/pull/1855))
-- New workspace action shows for non-git projects in the sidebar ([#1857](https://github.com/getpaseo/paseo/pull/1857) by [@cleiter](https://github.com/cleiter))
-
-## 0.1.103 - 2026-07-01
-
-### Added
-
-- Claude Sonnet 5 is available in the Claude model picker ([#1850](https://github.com/getpaseo/paseo/pull/1850))
-
 ## 0.1.102 - 2026-06-30
 
 ### Added

CLAUDE.md

@@ -21,37 +21,34 @@ This is an npm workspace monorepo:
 
 At the start of non-trivial work, list `docs/` and skim anything relevant to the task. When you learn something meta worth preserving — a gotcha, a convention, a workflow, a piece of system context that will outlive the current task — update an existing doc or propose a new one. Code-level facts belong in inline comments next to the code; system, process, and gotcha-level facts belong in `docs/`.
 
-| Doc                                                                | What's in it                                                                                                                   |
+| Doc                                                            | What's in it                                                                                                                   |
-| ------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------ |
+| -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
-| [docs/product.md](docs/product.md)                                 | What Paseo is, who it's for, where it's going                                                                                  |
+| [docs/product.md](docs/product.md)                             | What Paseo is, who it's for, where it's going                                                                                  |
-| [docs/architecture.md](docs/architecture.md)                       | System design, package layering, WebSocket protocol, agent lifecycle, data flow                                                |
+| [docs/architecture.md](docs/architecture.md)                   | System design, package layering, WebSocket protocol, agent lifecycle, data flow                                                |
-| [docs/agent-lifecycle.md](docs/agent-lifecycle.md)                 | Agent states, parent/child relationships, archive semantics, tabs vs archive, subagents track                                  |
+| [docs/agent-lifecycle.md](docs/agent-lifecycle.md)             | Agent states, parent/child relationships, archive semantics, tabs vs archive, subagents track                                  |
-| [docs/data-model.md](docs/data-model.md)                           | File-based JSON persistence, Zod schemas, atomic writes, no migrations                                                         |
+| [docs/data-model.md](docs/data-model.md)                       | File-based JSON persistence, Zod schemas, atomic writes, no migrations                                                         |
-| [docs/glossary.md](docs/glossary.md)                               | Authoritative terminology — UI label wins, no synonyms                                                                         |
+| [docs/glossary.md](docs/glossary.md)                           | Authoritative terminology — UI label wins, no synonyms                                                                         |
-| [docs/coding-standards.md](docs/coding-standards.md)               | Type hygiene, error handling, state design, React patterns, file organization                                                  |
+| [docs/coding-standards.md](docs/coding-standards.md)           | Type hygiene, error handling, state design, React patterns, file organization                                                  |
-| [docs/design.md](docs/design.md)                                   | Theme tokens — colors, fonts, spacing, radii, icons                                                                            |
+| [docs/design.md](docs/design.md)                               | Theme tokens — colors, fonts, spacing, radii, icons                                                                            |
-| [docs/forms.md](docs/forms.md)                                     | Form architecture — non-React form model, form kit, load-state gating; the schedule form is the golden example                 |
+| [docs/hover.md](docs/hover.md)                                 | Hover — the canonical pattern (plain View + onPointerEnter/Leave, separate inner Pressable) and the three ways agents break it |
-| [docs/hover.md](docs/hover.md)                                     | Hover — the canonical pattern (plain View + onPointerEnter/Leave, separate inner Pressable) and the three ways agents break it |
+| [docs/unistyles.md](docs/unistyles.md)                         | Unistyles gotchas — `useUnistyles()` is forbidden, alternatives in order                                                       |
-| [docs/unistyles.md](docs/unistyles.md)                             | Unistyles gotchas — `useUnistyles()` is forbidden, alternatives in order                                                       |
+| [docs/floating-panels.md](docs/floating-panels.md)             | Anchored popovers — Portal/Modal escape for Android, lifecycle gates, keyboard-shared-value, status-bar offset, the flash      |
-| [docs/floating-panels.md](docs/floating-panels.md)                 | Anchored popovers — Portal/Modal escape for Android, lifecycle gates, keyboard-shared-value, status-bar offset, the flash      |
+| [docs/expo-router.md](docs/expo-router.md)                     | Expo Router route ownership, startup restore, and native blank-screen gotchas                                                  |
-| [docs/expo-router.md](docs/expo-router.md)                         | Expo Router route ownership, startup restore, and native blank-screen gotchas                                                  |
+| [docs/file-icons.md](docs/file-icons.md)                       | Material icon theme integration for the file explorer                                                                          |
-| [docs/file-icons.md](docs/file-icons.md)                           | Material icon theme integration for the file explorer                                                                          |
+| [docs/providers.md](docs/providers.md)                         | Adding a new agent provider end-to-end                                                                                         |
-| [docs/providers.md](docs/providers.md)                             | Adding a new agent provider end-to-end                                                                                         |
+| [docs/custom-providers.md](docs/custom-providers.md)           | Custom provider config: Z.AI, Alibaba/Qwen, ACP agents, profiles, custom binaries                                              |
-| [docs/custom-providers.md](docs/custom-providers.md)               | Custom provider config: Z.AI, Alibaba/Qwen, ACP agents, profiles, custom binaries                                              |
+| [docs/service-proxy.md](docs/service-proxy.md)                 | Service proxy: exposing workspace scripts at public URLs, DNS setup, reverse proxy config                                      |
-| [docs/service-proxy.md](docs/service-proxy.md)                     | Service proxy: exposing workspace scripts at public URLs, DNS setup, reverse proxy config                                      |
+| [docs/development.md](docs/development.md)                     | Dev server, build sync gotchas, CLI reference, agent state, Playwright MCP                                                     |
-| [docs/development.md](docs/development.md)                         | Dev server, build sync gotchas, CLI reference, agent state, Playwright MCP                                                     |
+| [docs/rpc-namespacing.md](docs/rpc-namespacing.md)             | WebSocket RPC naming convention — dotted namespaces and `.request`/`.response` pairs                                           |
-| [docs/rpc-namespacing.md](docs/rpc-namespacing.md)                 | WebSocket RPC naming convention — dotted namespaces and `.request`/`.response` pairs                                           |
+| [docs/terminal-performance.md](docs/terminal-performance.md)   | Terminal latency pipeline, coalescing/backpressure invariants, benchmark + perf spec usage                                     |
-| [docs/protocol-validation.md](docs/protocol-validation.md)         | zod-aot generated inbound WebSocket validation, patched compiler regressions, schema-purity rules                              |
+| [docs/testing.md](docs/testing.md)                             | TDD workflow, determinism, real dependencies over mocks, test organization                                                     |
-| [docs/terminal-performance.md](docs/terminal-performance.md)       | Terminal latency pipeline, coalescing/backpressure invariants, benchmark + perf spec usage                                     |
+| [docs/mobile-testing.md](docs/mobile-testing.md)               | Maestro and mobile test workflows                                                                                              |
-| [docs/testing.md](docs/testing.md)                                 | TDD workflow, determinism, real dependencies over mocks, test organization                                                     |
+| [docs/ad-hoc-daemon-testing.md](docs/ad-hoc-daemon-testing.md) | Isolated in-process daemon test harness                                                                                        |
-| [docs/mobile-testing.md](docs/mobile-testing.md)                   | Maestro and mobile test workflows                                                                                              |
+| [docs/android.md](docs/android.md)                             | App variants, local/cloud builds, EAS workflows                                                                                |
-| [docs/ad-hoc-daemon-testing.md](docs/ad-hoc-daemon-testing.md)     | Isolated in-process daemon test harness                                                                                        |
+| [docs/docker.md](docs/docker.md)                               | Running the daemon and bundled web UI in Docker, volumes, agent images, security                                               |
-| [docs/browser-capture-harness.md](docs/browser-capture-harness.md) | Real-Electron browser screenshot harness and compositor-surface gotcha                                                         |
+| [docs/release.md](docs/release.md)                             | Release playbook, draft releases, completion checklist                                                                         |
-| [docs/android.md](docs/android.md)                                 | App variants, local/cloud builds, EAS workflows                                                                                |
+| [docs/terminal-activity.md](docs/terminal-activity.md)         | Terminal activity indicators — source-agnostic tracker, agent hook reporting, adding a new hook provider                       |
-| [docs/docker.md](docs/docker.md)                                   | Running the daemon and bundled web UI in Docker, volumes, agent images, security                                               |
+| [SECURITY.md](SECURITY.md)                                     | Relay threat model, E2E encryption, DNS rebinding, agent auth                                                                  |
-| [docs/release.md](docs/release.md)                                 | Release playbook, draft releases, completion checklist                                                                         |
-| [docs/terminal-activity.md](docs/terminal-activity.md)             | Terminal activity indicators — source-agnostic tracker, agent hook reporting, adding a new hook provider                       |
-| [SECURITY.md](SECURITY.md)                                         | Relay threat model, E2E encryption, DNS rebinding, agent auth                                                                  |
 
 ## Quick start
 
@@ -94,13 +91,10 @@ See [docs/development.md](docs/development.md) for full setup, build sync requir
   - `npm run format:files -- CLAUDE.md packages/app/src/components/message.tsx`
 - **The protocol stays backward-compatible. Features don't have to.** Two separate contracts:
   - **Protocol contract (always):** schema changes must not break parsing in either direction. An old client must still parse messages from a new daemon; a new daemon must still parse messages from an old client.
-    - New fields: `.optional()` with a sensible default.
+    - New fields: `.optional()` with a sensible default or `.transform()` fallback.
     - Never flip optional → required, remove fields, or narrow types (`string` → `enum`, `nullable` → non-null).
     - Removed fields stay accepted (we stop sending them, not stop reading them).
     - Test with: "does a 6-month-old client still parse this?" and "does a 6-month-old daemon still send something this client accepts?"
-    - Wire schemas are pure structural declarations. Do not add `.transform()`, `.catch()`, or `.preprocess()` to WebSocket message schemas; put normalization in an explicit post-validation pass.
-    - Plain `z.union()` is forbidden when every branch has a shared literal tag. Use `z.discriminatedUnion()` unless generated-code regression tests prove that specific shape is miscompiled.
-    - `.default()` is acceptable on primitive leaves only. Never put defaults on item schemas for large arrays or big inbound containers.
   - **Feature contract (per-feature):** a new feature may require a new daemon capability. The client detects whether the capability is present and either runs the feature or shows "Update the host to use this." That's it.
     - **No fallback paths.** Don't write a degraded version of a new feature that runs on old daemons. Don't fan out across legacy RPCs to simulate a missing capability. The user upgrades or doesn't get the feature.
     - **No defensive branches scattered through the feature.** Capability detection happens in one place; downstream code reads a clean shape.

docker/base/Dockerfile

@@ -1,33 +1,10 @@
 # syntax=docker/dockerfile:1
 
 ARG NODE_IMAGE=node:22-bookworm-slim
-FROM --platform=$BUILDPLATFORM ${NODE_IMAGE} AS source-pack
-
-ARG PASEO_VERSION
-
-ENV ONNXRUNTIME_NODE_INSTALL=skip
-
-WORKDIR /tmp/paseo-src
-COPY . .
-
-RUN set -eux; \
-    if [ -n "${PASEO_VERSION:-}" ]; then \
-      test "$(node -p "require('./package.json').version")" = "${PASEO_VERSION}"; \
-    fi; \
-    node -e 'const fs=require("node:fs"); const pkg=JSON.parse(fs.readFileSync("package.json","utf8")); delete pkg.scripts.prepare; fs.writeFileSync("package.json", `${JSON.stringify(pkg)}\n`);'; \
-    npm ci
-
-RUN set -eux; \
-    mkdir -p /tmp/paseo-packs; \
-    npm pack --workspace=@getpaseo/highlight --pack-destination /tmp/paseo-packs; \
-    npm pack --workspace=@getpaseo/relay --pack-destination /tmp/paseo-packs; \
-    npm pack --workspace=@getpaseo/protocol --pack-destination /tmp/paseo-packs; \
-    npm pack --workspace=@getpaseo/client --pack-destination /tmp/paseo-packs; \
-    npm pack --workspace=@getpaseo/server --pack-destination /tmp/paseo-packs; \
-    npm pack --workspace=@getpaseo/cli --pack-destination /tmp/paseo-packs
-
 FROM ${NODE_IMAGE}
 
+ARG PASEO_VERSION=latest
+
 ENV HOME=/home/paseo \
     PASEO_HOME=/home/paseo/.paseo \
     PASEO_LISTEN=0.0.0.0:6767 \
@@ -52,14 +29,13 @@ RUN set -eux; \
       gosu \
       lbzip2 \
       openssh-client \
-      procps \
       tini; \
     rm -rf /var/lib/apt/lists/*
 
-COPY --from=source-pack /tmp/paseo-packs /tmp/paseo-packs
 RUN set -eux; \
-	npm install -g /tmp/paseo-packs/*.tgz; \
+    npm install -g --omit=optional \
-    rm -rf /tmp/paseo-packs; \
+      "@getpaseo/server@${PASEO_VERSION}" \
+      "@getpaseo/cli@${PASEO_VERSION}"; \
     npm cache clean --force; \
     server_entry="$(npm root -g)/@getpaseo/server/dist/scripts/supervisor-entrypoint.js"; \
     test -f "$server_entry"; \
@@ -90,7 +66,7 @@ RUN set -eux; \
       "$XDG_CACHE_HOME"; \
     chown -R paseo:paseo /home/paseo /workspace
 
-COPY docker/base/rootfs/ /
+COPY rootfs/ /
 RUN chmod +x /usr/local/bin/paseo-docker-entrypoint
 
 WORKDIR /workspace

docker/base/Dockerfile.source

@@ -0,0 +1,101 @@
+# syntax=docker/dockerfile:1
+
+ARG NODE_IMAGE=node:22-bookworm-slim
+FROM --platform=$BUILDPLATFORM ${NODE_IMAGE} AS source-pack
+
+ARG PASEO_VERSION
+
+ENV ONNXRUNTIME_NODE_INSTALL=skip
+
+WORKDIR /tmp/paseo-src
+COPY . .
+
+RUN set -eux; \
+    test "$(node -p "require('./package.json').version")" = "${PASEO_VERSION}"; \
+    node -e 'const fs=require("node:fs"); const pkg=JSON.parse(fs.readFileSync("package.json","utf8")); delete pkg.scripts.prepare; fs.writeFileSync("package.json", `${JSON.stringify(pkg)}\n`);'; \
+    npm ci
+
+RUN set -eux; \
+    mkdir -p /tmp/paseo-packs; \
+    npm pack --workspace=@getpaseo/highlight --pack-destination /tmp/paseo-packs; \
+    npm pack --workspace=@getpaseo/relay --pack-destination /tmp/paseo-packs; \
+    npm pack --workspace=@getpaseo/protocol --pack-destination /tmp/paseo-packs; \
+    npm pack --workspace=@getpaseo/client --pack-destination /tmp/paseo-packs; \
+    npm pack --workspace=@getpaseo/server --pack-destination /tmp/paseo-packs; \
+    npm pack --workspace=@getpaseo/cli --pack-destination /tmp/paseo-packs
+
+FROM ${NODE_IMAGE}
+
+ENV HOME=/home/paseo \
+    PASEO_HOME=/home/paseo/.paseo \
+    PASEO_LISTEN=0.0.0.0:6767 \
+    PASEO_WEB_UI_ENABLED=true \
+    PASEO_LOG_FORMAT=json \
+    PASEO_LOG_LEVEL=info \
+    CLAUDE_CONFIG_DIR=/home/paseo/.claude \
+    CODEX_HOME=/home/paseo/.codex \
+    XDG_CONFIG_HOME=/home/paseo/.config \
+    XDG_DATA_HOME=/home/paseo/.local/share \
+    XDG_STATE_HOME=/home/paseo/.local/state \
+    XDG_CACHE_HOME=/home/paseo/.cache \
+    ONNXRUNTIME_NODE_INSTALL=skip
+
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+      bash \
+      ca-certificates \
+      curl \
+      git \
+      gosu \
+      lbzip2 \
+      openssh-client \
+      tini; \
+    rm -rf /var/lib/apt/lists/*
+
+COPY --from=source-pack /tmp/paseo-packs /tmp/paseo-packs
+RUN set -eux; \
+    npm install -g --omit=optional /tmp/paseo-packs/*.tgz; \
+    rm -rf /tmp/paseo-packs; \
+    npm cache clean --force; \
+    server_entry="$(npm root -g)/@getpaseo/server/dist/scripts/supervisor-entrypoint.js"; \
+    test -f "$server_entry"; \
+    printf '%s\n' "$server_entry" > /etc/paseo-server-entry; \
+    node --check "$server_entry"
+
+RUN set -eux; \
+    existing_group="$(getent group 1000 | cut -d: -f1 || true)"; \
+    if [ -n "$existing_group" ] && [ "$existing_group" != "paseo" ]; then \
+      groupmod --new-name paseo "$existing_group"; \
+    elif [ -z "$existing_group" ]; then \
+      groupadd --gid 1000 paseo; \
+    fi; \
+    existing_user="$(getent passwd 1000 | cut -d: -f1 || true)"; \
+    if [ -n "$existing_user" ] && [ "$existing_user" != "paseo" ]; then \
+      usermod --login paseo --gid paseo --home /home/paseo --shell /bin/bash "$existing_user"; \
+    elif [ -z "$existing_user" ]; then \
+      useradd --uid 1000 --gid paseo --create-home --home-dir /home/paseo --shell /bin/bash paseo; \
+    fi; \
+    mkdir -p \
+      /workspace \
+      "$PASEO_HOME" \
+      "$CLAUDE_CONFIG_DIR" \
+      "$CODEX_HOME" \
+      "$XDG_CONFIG_HOME" \
+      "$XDG_DATA_HOME" \
+      "$XDG_STATE_HOME" \
+      "$XDG_CACHE_HOME"; \
+    chown -R paseo:paseo /home/paseo /workspace
+
+COPY docker/base/rootfs/ /
+RUN chmod +x /usr/local/bin/paseo-docker-entrypoint
+
+WORKDIR /workspace
+
+EXPOSE 6767
+VOLUME ["/home/paseo"]
+
+HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \
+  CMD node -e "const listen=process.env.PASEO_LISTEN||'0.0.0.0:6767'; const m=listen.match(/:(\\d+)$/); const port=m?Number(m[1]):6767; require('http').get({hostname:'127.0.0.1',port,path:'/api/health'},r=>process.exit(r.statusCode===200?0:1)).on('error',()=>process.exit(1))"
+
+ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/paseo-docker-entrypoint"]

docs/architecture.md

@@ -138,7 +138,7 @@ Electron wrapper for macOS, Linux, and Windows.
 
 > **Window-state v1 limitation:** only the _first_ window of a session restores and persists saved geometry (size/position/maximized). Windows opened via ⌘⇧N / second-instance / "Open in new window" open at the default size, OS-cascaded, and do not persist — this avoids every window stacking on the same restored bounds and fighting over the single window-state store. Lifting this needs per-window state keys.
 >
-> **In-app browser panes are not yet per-window.** Browser webviews are tracked by one process-global registry that keeps a single current `WebContents` per browser id. Human focus still records the workspace-active browser for UI state and `list_tabs` reporting, but agent automation targets only explicit browser ids returned by `browser_new_tab` or `browser_list_tabs`. The webview registration queue (`pendingBrowserWebviewIds` in `main.ts`) is still process-global. With browser panes open in two windows, a menu Reload can target the other window's webview, and near-simultaneous webview attach across windows can register under the wrong browser id. Multi-window v1 ships windows; making the browser-webview subsystem window-scoped is a follow-up.
+> **In-app browser panes are not yet per-window.** The active-browser id (`features/browser-webviews.ts`) and the webview registration queue (`pendingBrowserWebviewIds` in `main.ts`) are process-global. With browser panes open in two windows, a menu Reload can target the other window's webview, and near-simultaneous webview attach across windows can register under the wrong browser id. Multi-window v1 ships windows; making the browser-webview subsystem window-scoped is a follow-up.
 
 ### `packages/website` — Marketing site
 

docs/browser-capture-harness.md

@@ -1,69 +0,0 @@
-# Browser Capture Harness
-
-The desktop capture harness is the real-Electron verification path for browser screenshots.
-It validates the compositor behavior that unit tests cannot see:
-
-- the resident automation `<webview>` starts in the production parking state;
-- the parked guest remains paintable and has a copyable viewport frame;
-- the resident webview guest is sized to 1280x800 logical pixels;
-- multiple resident webviews are parked as an overlapping stack without per-capture
-  stacking changes;
-- a newly attached resident webview whose first useful frame is delayed can be captured
-  by retrying until the frame appears;
-- both viewport `capturePage` and full-page CDP screenshots return real pixels from
-  the permanent production parking state;
-- guest background throttling can be disabled once at attach without per-capture
-  renderer coordination.
-
-Run it with the repo Electron:
-
-```bash
-npm run capture-harness --workspace=@getpaseo/desktop
-```
-
-Run the browser automation fixture with:
-
-```bash
-PASEO_CAPTURE_HARNESS_GROUP=automation npm run capture-harness --workspace=@getpaseo/desktop
-```
-
-The automation group uses a real guest webview to verify the page-side ref contract:
-ARIA-like snapshot text includes headings, static text, and controls; refs survive
-`pushState` when the element still matches; same-URL rerenders stale old refs; and a
-file-input ref can be resolved to a CDP backend node id for upload. It also verifies
-page-context evaluation, including passing a resolved ref element as the function argument.
-
-On macOS the harness process must set `app.setActivationPolicy("accessory")` and
-hide the Dock icon before creating any window. `showInactive()` only prevents window
-focus; a normal Electron app launch can still activate the app and steal focus.
-Harness windows are then created hidden, positioned in a screen corner, skipped from
-the taskbar where Electron supports it, and revealed with `showInactive()` from
-`ready-to-show`. Do not replace this with `show()`, `focus()`, or `app.focus()`:
-the compositor only needs visible inactive windows, and harness runs must not steal
-focus from the person using the machine.
-
-The harness writes PNG evidence and `results.json` to:
-
-```text
-packages/desktop/capture-harness/out/
-```
-
-A passing run prints `PASS` lines for the production P1 attach-off parking state,
-including fresh, settled, 75-second soak, multi-tab, viewport, and full-page checks. The
-PNG sizes may be device-pixel scaled; on a Retina display the 1280x800 logical viewport
-is usually saved as 2560x1600.
-
-## Mechanism
-
-Electron captures copy from the guest web contents' compositor surface. A resident
-webview parked with `display:none`, offscreen coordinates, or `opacity:0` can lose its
-copyable surface. The production parking state keeps the host fixed at `left:0`, `top:0`,
-`width:1px`, `height:1px`, `overflow:hidden`, `opacity:1`, and `pointer-events:none`.
-The webviews inside stay full-size at 1280x800, `display:inline-flex`, and absolutely
-overlap at `left:0`, `top:0`.
-
-There is no renderer prep/restore handshake. Main disables guest background throttling
-once when the webview attaches, then screenshot capture uses the shared serialized queue,
-invalidates before each attempt, and retries known first-frame failures within the
-5-second capture budget. Viewport screenshots use `capturePage({ stayHidden:false })`;
-full-page screenshots use the existing CDP path with layout metrics and screenshot clip.

docs/data-model.md

@@ -4,10 +4,6 @@ Paseo uses **file-based JSON persistence** instead of a traditional database. Al
 
 All server-side stores live under `$PASEO_HOME` (defaults to `~/.paseo`).
 
-## Store Surface Rules
-
-Store APIs own persistence atomicity and should not make services coordinate raw reads and writes. A good store method maps cleanly to one SQL statement or one SQL transaction, even when the current implementation is JSON files. If a caller needs a queue, lock, read-merge-write loop, or uniqueness race workaround, that behavior belongs behind the store surface.
-
 ---
 
 ## Directory layout

docs/development.md

@@ -72,10 +72,6 @@ Starting the service must not create, focus, reveal, or leave behind macOS Simul
 It launches its own Electron-flavored Expo server and passes that URL to Electron.
 Override the CDP port with `PASEO_ELECTRON_REMOTE_DEBUGGING_PORT` when `9223` is busy.
 
-When running a dedicated Electron QA instance against a non-default Expo port, set
-`EXPO_DEV_URL` explicitly. Desktop main defaults to `http://localhost:8081`, so
-`PASEO_PORT=57928` alone starts Metro on 57928 but Electron still loads 8081.
-
 ### React render profiling
 
 The app has a gated React render profiler in
@@ -173,33 +169,19 @@ The supervisor rotates `daemon.log`. Persisted `log.file.rotate` settings in
 `PASEO_LOG_ROTATE_SIZE` and `PASEO_LOG_ROTATE_COUNT` env vars override the
 defaults. The default rotation is `10m` x `3` files everywhere.
 
-### Agent Tool Catalog Measurement
+### Workspace search
 
-Measure the MCP `tools/list` payload that Paseo injects into agents with:
+Workspace file and directory suggestions are backed by `@ff-labs/fff-node` in
-
+`packages/server/src/server/search/workspace-entries.ts`. Treat that backend as
-```bash
+the search and ignore boundary: do not add a separate `.gitignore`/`.rgignore`
-npm run measure:agent-tools --workspace=@getpaseo/server
+matcher in Paseo. If ignore semantics need to change, change the backend
-```
+contract and keep the packaged desktop smoke covering dot-prefixed suggestions.
-
-The command reports compact JSON bytes, estimated tokens, field totals, largest
-tools, and the browser-tools delta. It defaults to the agent-scoped catalog; use
-`-- --scope=top-level` for the unaffiliated `/mcp/agents` shape and `-- --json`
-for machine-readable output.
 
 ## paseo.json service scripts
 
 `worktree.setup` and `worktree.teardown` accept either a multiline shell script or an array
 of commands. Both run sequentially.
 
-Lifecycle commands run in the worktree through a stable script shell: `bash`
-resolved from `PATH` on macOS/Linux, and PowerShell with `-NoProfile` on
-Windows. They inherit the daemon environment plus Paseo's lifecycle variables;
-login and interactive shell startup files are not loaded, and Bash's `BASH_ENV`
-hook is unset. Daemon-run loop verify checks and ACP single-string terminal
-commands use the same non-login Bash behavior on macOS/Linux, but preserve their
-existing `cmd.exe /c` string semantics on Windows. Service scripts are separate:
-they launch in a terminal and receive the service environment described below.
-
 ```json
 {
   "worktree": {

docs/docker.md

@@ -10,7 +10,8 @@ The image source lives in [`docker/`](../docker/).
 
 The official image:
 
-- builds `@getpaseo/server` and `@getpaseo/cli` from source-built workspace tarballs
+- installs `@getpaseo/server` and `@getpaseo/cli` from npm for stable images,
+  or from source-built workspace tarballs for beta images
 - runs the daemon as the non-root `paseo` user
 - listens on `0.0.0.0:6767` inside the container
 - enables the bundled daemon web UI with `PASEO_WEB_UI_ENABLED=true`
@@ -189,17 +190,16 @@ See [SECURITY.md](../SECURITY.md) for the daemon trust model.
 ## Building Locally
 
 ```bash
-docker build -f docker/base/Dockerfile -t paseo:local .
+docker build -t paseo:local docker/base
 ```
 
-To assert the source tree version while building:
+To bake a specific published npm version:
 
 ```bash
 docker build \
   --build-arg PASEO_VERSION=0.1.102 \
   -t paseo:0.1.102 \
-  -f docker/base/Dockerfile \
+  docker/base
-  .
 ```
 
 The Docker workflow builds the image on pull requests and on `main` as a
@@ -216,12 +216,13 @@ pushing a `v*` release tag:
 gh workflow run docker.yml \
   --ref main \
   -f paseo_version=0.1.102-beta.1 \
-  -f publish=true
+  -f publish=true \
+  -f source_build=auto
 ```
 
-Manual Docker publishes require an explicit `paseo_version`. The workflow builds
+Manual Docker publishes require an explicit `paseo_version`. Prerelease
-from the checked-out source tree and publishes only the exact prerelease image
+versions build from the checked-out source tree by default and publish only the
-tag for prerelease versions.
+exact prerelease image tag.
 
 The published image is multi-arch for `linux/amd64` and `linux/arm64`.
 

docs/expo-router.md

@@ -47,27 +47,18 @@ dynamic params exist before any nested workspace leaf is selected.
 
 ## App-Wide Route Hops
 
-When app-wide routes such as `/new`, `/settings`, or `/sessions` navigate back
+When app-wide routes such as `/new` navigate back into a host workspace, use
-into a host workspace, express only the destination with `navigateToWorkspace()`.
+`navigateToHostWorkspaceRoute()` instead of calling `router.dismissTo()` with the
-Do not make the caller branch on its current route.
+leaf workspace URL.
 
 The root stack owns `h/[serverId]`; the host stack owns
 `workspace/[workspaceId]/index`. Repeated global-route hops must `POP_TO` the
-root host route and pass the nested workspace screen when a host route is
+root host route and pass the nested workspace screen, or Expo Router can append
-already mounted, or Expo Router can append extra hidden workspace deck entries.
+extra hidden workspace deck entries.
-The workspace navigation helper inspects the mounted navigation state to make
-that decision; if no host route is mounted yet, it falls back to ordinary route
-navigation.
 
 Those hidden entries are not harmless: composer floating panels can measure
 against the wrong deck and disappear offscreen.
 
-Hidden host routes may keep their local params while an app-wide route is
-foregrounded. Active-workspace observers must prefer the current pathname and
-only use local param fallback during cold mount (`/` or empty pathname), or a
-hidden workspace can overwrite the remembered workspace before Settings or
-History returns.
-
 ## Params
 
 Required dynamic params belong to the matched route.
@@ -121,7 +112,8 @@ Before landing route changes:
 
 - [ ] Did you change `packages/app/src/app`? Re-read this file.
 - [ ] Did you touch remembered workspace restore? Keep root on `/h/[serverId]`.
-- [ ] Did any route return to a workspace? Use `navigateToWorkspace()`.
+- [ ] Did an app-wide route return to a workspace? Use
+      `navigateToHostWorkspaceRoute()`.
 - [ ] Did you add a route? Register it in the layout that directly owns it.
 - [ ] Did `useLocalSearchParams()` lose a required param? Fix the route tree.
 - [ ] Did native show a blank screen without a crash? Suspect route ownership

docs/floating-panels.md

@@ -20,29 +20,6 @@ input focused while its scrollable list lives in a Portal. There is no shared
 "floating panel" primitive yet — when a fifth use case shows up we can revisit;
 until then prefer copying the closest file and trimming.
 
-## Popover width contract
-
-Combobox desktop popovers are never narrower than their trigger, and they grow
-with content up to a ceiling that is never below the trigger:
-
-```ts
-const floor = Math.max(desktopMinWidth ?? 0, referenceWidth ?? 200);
-const frameStyle = { minWidth: floor, maxWidth: Math.max(400, floor) };
-```
-
-`desktopMinWidth` is an explicit floor-raiser. It does not cap width, and the
-trigger still wins when it is wider. Changing this default requires re-verifying
-every consumer listed here.
-
-Consumers: `composer/agent-controls/mode-control.tsx`,
-`composer/agent-controls/index.tsx`, `composer/index.tsx`,
-`components/combined-model-selector.tsx`, `components/hosts/host-picker.tsx`
-(including `components/hosts/host-filter.tsx`), `components/branch-switcher.tsx`,
-`components/left-sidebar.tsx`, `components/ui/select-field.tsx` (schedule form),
-`screens/new-workspace-screen.tsx` plus `screens/new-workspace/project-picker.ts`,
-`components/import-session-sheet.tsx`, `screens/workspace/workspace-screen.tsx`,
-`screens/settings-screen.tsx`, and `screens/project-settings-screen.tsx`.
-
 ## Gotcha 1 — Android touch hit-test by parent bounds
 
 On Android, a child View whose bounds fall outside its parent's bounds renders

docs/forms.md

@@ -1,98 +0,0 @@
-# Forms
-
-The paved road for building forms in the app. The schedule form is the golden
-example; when building or fixing any form, copy its shape, not the shape of
-whatever screen you happen to be near.
-
-Golden example files:
-
-- `packages/app/src/schedules/schedule-form-model.ts` (+ `.test.ts`) — the model
-- `packages/app/src/schedules/use-schedule-form-model.ts` — model lifetime adapter
-- `packages/app/src/schedules/use-schedule-form-provider-snapshot.ts` — async input adapter
-- `packages/app/src/components/schedules/schedule-form-sheet.tsx` — render + intent dispatch
-- `packages/app/src/schedules/aggregated-schedules.ts` / `hooks/use-schedules.ts` — load-state gating
-- `packages/app/e2e/schedules-*.spec.ts` — the behavioral contract
-
-## The form model
-
-Every non-trivial form gets a **plain TypeScript model** — zero React imports:
-
-- `openXxxForm(snapshot)` **constructs** a fresh instance from declared inputs
-  (mode, the record being edited, hosts, defaults). Edit mode seeds every value
-  AND display from the snapshot — never from a previous instance.
-- **Commands** mutate (`setHost`, `setProject(value, display)`, `setModel`, …).
-  Derived state (disclosure, canSubmit, displays) is recomputed inside the
-  model on every publish.
-- `close()` destroys the instance. `subscribe`/`getState` feed one
-  `useSyncExternalStore` in the component.
-
-The component renders state and dispatches intent. That is all it does.
-
-### Lifecycle rules (each one killed a real shipped bug)
-
-1. **Fresh mount per open.** The sheet returns `null` when not visible and
-   mounts the open form with a `key` derived from mode + record identity.
-   A long-lived component instance shared across create/edit is how edit
-   contaminated create.
-2. **Construct the model ONCE per mount** — `useState(() => openXxxForm(snapshot))`.
-   NEVER `useMemo(() => open(...), [snapshot])`: the snapshot's identity depends
-   on live data (projects, hosts, preferences), and any background churn — e.g.
-   a scheduled run creating a workspace — would reconstruct the model and wipe
-   the user's in-progress input.
-3. **Late data is an explicit model input, not a reconstruction.**
-   `applyProviderSnapshot(serverId, …)`, `applyProjectTargets(…)`,
-   `applyHosts(…)`. Adapters pipe identity changes into these with mechanical
-   effects. Input plumbing is fine; orchestration effects are not — the sheet
-   itself has zero `useEffect`/`useRef`, and that is the target for every form.
-4. **Resolution is explicit model state, per host** (`idle | pending |
-complete`), keyed off the opened snapshot's serverId. Waiting for data is a
-   state you can render, not an effect race.
-5. **Displays are owned state.** The selected option's label is captured at
-   selection/seed time (`setProject(value, display)`), never re-derived from a
-   live options list — list churn must not flicker or blank a selection.
-6. **Disclosure is derived in the model** from user intent
-   (host → project → model → thinking/mode), so fields cannot pop in from
-   cache timing.
-
-## Form kit
-
-- Compose `Field` / `SelectField` / `FormTextInput` / `SegmentedControl` /
-  `Switch` from `components/ui/`. Geometry (heights, padding, radii, focus/hover
-  states) is owned by `components/ui/control-geometry.ts` — controls never
-  declare their own, and screens never nudge global component styles to align
-  a row.
-- The form declares one size for all fields: `sm` on desktop, `md` compact
-  (`useIsCompactFormFactor`).
-- Availability hierarchy: a field whose capability doesn't apply is **hidden**
-  (isolation on a non-git project — same gating as New Workspace), not rendered
-  disabled with an explanation. Disabled-with-a-reason `hint` is only for
-  transient states the user can resolve.
-- Copy is opt-in and rare. No hint/subtext unless the maintainer approved the
-  exact string; validation errors are the exception. State a fact (like the
-  timezone) once — never in a preview line AND a helper line.
-- `useUnistyles` is banned (see docs/unistyles.md); lint enforces.
-
-## Data gating
-
-Aggregate hooks return a discriminated load state:
-
-```ts
-type AggregateLoadState<T> =
-  | { status: "connecting" } // an answer may still be pending
-  | { status: "loading" }
-  | { status: "loaded"; data: T[] };
-```
-
-Empty states are only typeable inside `loaded` — a fetch that "succeeded"
-before hosts connected is `connecting`, not empty. Query keys carry real fetch
-inputs (host set, connection statuses), never synthetic version counters.
-
-## Anti-patterns (reject in review on sight)
-
-- `useEffect` choreography impersonating construct/hydrate/resolve/destroy.
-- One mounted form instance serving create and edit.
-- `useMemo`-keyed model construction on live-data identity.
-- Selected labels derived from live query lists.
-- `isLoading`/`isEmpty` boolean bags where a load-state union belongs.
-- Conditional mounting of hint/error rows that shifts layout (subtext renders
-  only when present, but the pattern for that lives in `Field`, not ad hoc).

docs/opencode-global-event-baseline.md

@@ -9,7 +9,7 @@ Replace the OpenCode provider's per-directory `/event` stream with OpenCode's `/
 ## Environment
 
 - `opencode --version`: `1.14.46`
-- `which opencode`: `opencode`
+- `which opencode`: `/Users/moboudra/.asdf/installs/nodejs/22.20.0/bin/opencode`
 - `node --version`: `v22.20.0`
 - `npm --version`: `10.9.3`
 

docs/product.md

@@ -73,7 +73,7 @@ Anyone who builds software:
 - Built-in providers: Claude Code (Agent SDK), Codex (app-server), GitHub Copilot (ACP), OpenCode, Pi, OMP
 - One-click ACP provider catalog: CodeWhale, Cursor, Hermes, Qwen Coder, Kimi Code, and others — plus custom ACP providers
 - Voice mode: dictate prompts or talk through problems hands-free
-- MCP server exposes the daemon to other agents (create_agent, send_agent_prompt, schedules, terminals, worktrees, workspace renaming)
+- MCP server exposes the daemon to other agents (create_agent, send_agent_prompt, schedules, terminals, worktrees)
 - Scheduled agents (cron-style triggers) via app, CLI, and MCP
 - Frequent releases (multiple per week)
 - Community contributions across packaging, providers, and bug fixes

docs/protocol-validation.md

@@ -1,42 +0,0 @@
-# Protocol Validation
-
-The client validates inbound WebSocket messages with a zod-aot generated validator instead of runtime Zod on the hot path. Zod remains the authoring source of truth for schemas and TypeScript types.
-
-The reason is mobile performance. A captured 353 KB provider snapshot cost about 10.9 ms and 5.9 MB allocated per message for `JSON.parse` plus Zod on Hermes. After moving provider-model normalization out of the schema so zod-aot could compile the hot subtree, the generated validator path measured about 2.5 ms and 1.2 MB allocated.
-
-## Runtime Path
-
-`packages/protocol/src/validation/ws-outbound.ts` is the shipped boundary. It calls the generated `WSOutboundMessageSchema.safeParse` and returns the validated data. It does not normalize, repair, or re-validate the generated result.
-
-Generated validators preserve unknown keys where Zod object parsing strips them. The client dispatch path uses known `type` and payload fields, so this passthrough behavior is accepted for inbound messages. The wire format is unchanged.
-
-Provider model normalization is a parser-side compatibility shim in the client consumers that need it. Newer daemons normalize at the provider registry source.
-
-## Codegen Ownership
-
-The protocol package owns generation.
-
-- `packages/protocol/codegen/ws-outbound.compile.ts` is the build-time zod-aot discovery entry.
-- `packages/protocol/scripts/generate-validation-aot.mjs` runs the exact-pinned compiler and applies the small local compiler patches before generation.
-- `packages/protocol/scripts/watch-validation-aot.mjs` reruns generation while editing protocol sources.
-- `packages/protocol/src/generated/validation/ws-outbound.aot.ts` is generated runtime code and is gitignored.
-- `packages/protocol/src/validation/ws-outbound-schema-metadata.ts` is runtime schema metadata for zod-aot fallback/default references.
-
-Generation runs from protocol-owned lifecycle hooks: `prebuild`, `pretypecheck`, `pretest`, and `watch`. Installs do not run generation: published packages consume protocol from prebuilt `dist`, and local build/typecheck/test flows generate the source file at the point it is actually needed.
-
-## Regression Tests
-
-zod-aot is exact-pinned and young enough that compiler patches are treated as part of this package. `packages/protocol/tests/validation/ws-outbound.test.ts` keeps small regression tests for the patched cases:
-
-- discriminated-union branch output must propagate `.default()` fields
-- current sequential item routing must accept `tool_call`-like status branches
-- generated runtime imports must keep `.js` extensions for packaged Node ESM
-- the generated WebSocket envelope accepts a minimal valid message and rejects a corrupted one
-
-## Schema Purity
-
-Message schemas are structural declarations. Do not put `.transform()`, `.catch()`, or `.preprocess()` on WebSocket message schemas. If parsed data needs normalization, put it in an explicit consumer or post-validation pass.
-
-Use `z.discriminatedUnion()` when every branch has a shared literal tag. Plain `z.union()` is acceptable only when there is no shared literal discriminator or when a generated-code regression test proves that specific shape is miscompiled.
-
-Defaults are allowed only on primitive leaves. Do not place `.default()` on large arrays, item schemas, or big containers in inbound message schemas.

docs/providers.md

@@ -18,8 +18,6 @@ Implement the `AgentClient` and `AgentSession` interfaces from `agent-sdk-types.
 
 Existing direct providers: `claude` (in `providers/claude/agent.ts`), `codex` (`codex-app-server-agent.ts`), `opencode` (`opencode-agent.ts`), `pi` (`providers/pi/agent.ts`), and `omp` (a Pi-compatible built-in backed by the Pi adapter). The dev-only `mock` provider (`mock-load-test-agent.ts`) is also direct.
 
-Claude first-party model metadata lives in `packages/server/src/server/agent/providers/claude/model-manifest.ts`. When adding or updating a Claude model, update that manifest only; the model picker thinking options and Claude-specific feature gates are derived from the manifest. Do not add model-specific Claude capability lists in feature code.
-
 Paseo tools are not implemented as MCP tools internally. They live in a shared tool catalog under `packages/server/src/server/agent/tools/`; MCP is only the fallback adapter. A provider that can register runtime tools directly should set `supportsNativePaseoTools: true` and consume `launchContext.paseoTools` in `createSession`/`resumeSession`. When native tools are present, `AgentManager` strips the internal Paseo MCP server from the provider launch config so the provider does not receive the same tools twice. Providers that only know MCP should keep `supportsMcpServers: true` and let the daemon inject `/mcp/agents`.
 
 Pi is a process-backed provider. Paseo requires the user to have the `pi` binary installed and talks to it through `pi --mode rpc`; the server package does not embed Pi's SDK/runtime packages.

docs/release.md

@@ -50,7 +50,7 @@ npm run release:patch
 
 This bumps the version across all workspaces, runs checks, publishes to npm, and pushes the branch + tag. The tag push triggers `Desktop Release`, `Android APK Release`, `Docker`, and `Release Notes Sync` on GitHub Actions. EAS picks up the same tag via the EAS GitHub app and starts the iOS + Android store builds in parallel (see "Mobile builds (EAS)" below) — there is no `release-mobile.yml` in this repo.
 
-The Docker workflow builds images from the checked-out source tree on pull requests and on `main` as non-publishing checks. Stable `vX.Y.Z` tag pushes publish `ghcr.io/getpaseo/paseo:X.Y.Z` and `ghcr.io/getpaseo/paseo:latest`; beta `vX.Y.Z-beta.N` tag pushes publish only `ghcr.io/getpaseo/paseo:X.Y.Z-beta.N` and never move `latest`.
+The Docker workflow builds images on pull requests and on `main` as non-publishing checks. Stable `vX.Y.Z` tag pushes publish `ghcr.io/getpaseo/paseo:X.Y.Z` and `ghcr.io/getpaseo/paseo:latest`; beta `vX.Y.Z-beta.N` tag pushes publish only `ghcr.io/getpaseo/paseo:X.Y.Z-beta.N` and never move `latest`. Beta Docker images build from the checked-out source tree so the beta flow can intentionally skip npm publishing.
 
 **Releases are always patch.** "Release paseo", "release stable", "ship stable", and similar always mean a patch bump from the previous stable. Never bump minor or major to trigger a build, ever — minor and major bumps are reserved for genuinely larger product cuts and require an explicit user instruction with the word "minor" or "major". If you find yourself reaching for `release:minor` to retrigger a failed build, you are doing the wrong thing — push a retry tag instead (see "Fixing a failed release build" below).
 
@@ -281,7 +281,8 @@ and EAS mobile release builds. Use the Docker workflow dispatch instead:
 gh workflow run docker.yml \
   --ref main \
   -f paseo_version=X.Y.Z-beta.N \
-  -f publish=true
+  -f publish=true \
+  -f source_build=auto
 ```
 
 This replaces `ghcr.io/getpaseo/paseo:X.Y.Z-beta.N` in place without touching

nix/npm-deps.hash

@@ -1 +1 @@
-sha256-G88S68t7czYE7YtBIuRdkI85+GpVKEZUMZQtcnN73BA=
+sha256-qdRCpAtiqTk5mqz+lE6xTO18PtmD1ROQuDRtqDz6reI=

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.1.104",
+  "version": "0.1.102",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.1.104",
+      "version": "0.1.102",
       "hasInstallScript": true,
       "license": "AGPL-3.0-or-later",
       "workspaces": [
@@ -6154,6 +6154,141 @@
         "excpretty": "build/cli.js"
       }
     },
+    "node_modules/@ff-labs/fff-bin-darwin-arm64": {
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/@ff-labs/fff-bin-darwin-arm64/-/fff-bin-darwin-arm64-0.9.6.tgz",
+      "integrity": "sha512-gJzvYuAbudAIvUVJAAMXjManTPxmFqqqqbJSZ0RuZTNWLK2nFMKMo0XUVCXcRVaTENY/VRoHjTTFCHjVebmolw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@ff-labs/fff-bin-darwin-x64": {
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/@ff-labs/fff-bin-darwin-x64/-/fff-bin-darwin-x64-0.9.6.tgz",
+      "integrity": "sha512-m+p7te06G785VS6fLCFEEeO0twZqmWxy3zzCxcICdwebFqDY3cQGGqDQ6Lmr264Q36bLQjLE7t2iqWIwRoI6dg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@ff-labs/fff-bin-linux-arm64-gnu": {
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/@ff-labs/fff-bin-linux-arm64-gnu/-/fff-bin-linux-arm64-gnu-0.9.6.tgz",
+      "integrity": "sha512-UjqXuvJc2z2yeQ/6RqkgL1skdbzoZyexOvsBAt1VDIjUnm5AqoUoqh/guRQ2mke0dBWktZYRtvCrdS4CHB7dfA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@ff-labs/fff-bin-linux-arm64-musl": {
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/@ff-labs/fff-bin-linux-arm64-musl/-/fff-bin-linux-arm64-musl-0.9.6.tgz",
+      "integrity": "sha512-OdERLjrCwx3Ykd0szEe2WxDZ44653ZHftIl5XV4QFnsyn6jLaxu227JV3Ap9BIG3VBrKIBtr5pUqk9Tumbrolg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@ff-labs/fff-bin-linux-x64-gnu": {
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/@ff-labs/fff-bin-linux-x64-gnu/-/fff-bin-linux-x64-gnu-0.9.6.tgz",
+      "integrity": "sha512-OdROw237Ne7qy3HbTB78eovQMusccJ0PhRNAB6AmFuo+MiAzi1AdYs9iTAPYHqEH3uwEu0fdVFo9GTZcdnm03g==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@ff-labs/fff-bin-linux-x64-musl": {
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/@ff-labs/fff-bin-linux-x64-musl/-/fff-bin-linux-x64-musl-0.9.6.tgz",
+      "integrity": "sha512-/7GJq5sw2WaNU79OKQqymYAF7lceMUm0OBw61M6tMDGi40LG1wNSF7uf8uLkD/p6GNkx8r/knmMDUuAKp208CQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@ff-labs/fff-bin-win32-arm64": {
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/@ff-labs/fff-bin-win32-arm64/-/fff-bin-win32-arm64-0.9.6.tgz",
+      "integrity": "sha512-o0e8qu0kwqWEoV8rn/0wEmlFYBY09xZwaNdmBoGU6zXWZAviP/V92fzEED/yx0iIshq+qAYsuTuQSOj7gVDbVg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@ff-labs/fff-bin-win32-x64": {
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/@ff-labs/fff-bin-win32-x64/-/fff-bin-win32-x64-0.9.6.tgz",
+      "integrity": "sha512-fkD3e6FmfR3i5Ymv14gfPT1FeJpnAXwe9Fu0r4sSDhvSE0x0ADQKEvwjMUBosb02O8XB9wWURx9cov1rCHVTnA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@ff-labs/fff-node": {
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/@ff-labs/fff-node/-/fff-node-0.9.6.tgz",
+      "integrity": "sha512-2LbHJjwW/7vOLh1lSv0ipzA9Du5+LatUGiumQFaO9IcjMT8YgpmrCp/RRMyInsG0iBIX6A0WSxgei8qOFJLlNw==",
+      "cpu": [
+        "x64",
+        "arm64"
+      ],
+      "license": "MIT",
+      "os": [
+        "darwin",
+        "linux",
+        "win32"
+      ],
+      "dependencies": {
+        "ffi-rs": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "@ff-labs/fff-bin-darwin-arm64": "0.9.6",
+        "@ff-labs/fff-bin-darwin-x64": "0.9.6",
+        "@ff-labs/fff-bin-linux-arm64-gnu": "0.9.6",
+        "@ff-labs/fff-bin-linux-arm64-musl": "0.9.6",
+        "@ff-labs/fff-bin-linux-x64-gnu": "0.9.6",
+        "@ff-labs/fff-bin-linux-x64-musl": "0.9.6",
+        "@ff-labs/fff-bin-win32-arm64": "0.9.6",
+        "@ff-labs/fff-bin-win32-x64": "0.9.6"
+      }
+    },
     "node_modules/@floating-ui/core": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz",
@@ -13761,6 +13896,183 @@
       "dev": true,
       "license": "BSD-2-Clause"
     },
+    "node_modules/@yuuang/ffi-rs-android-arm64": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@yuuang/ffi-rs-android-arm64/-/ffi-rs-android-arm64-1.3.2.tgz",
+      "integrity": "sha512-eDYLT0kVBkp7e2BwdRDmt6N1rkeDPUHDefk3ZX0/nok+GLsqfy1WBoSL3Yg7HVXN1EyW8OBVc2uK8Zq8HbmaSA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@yuuang/ffi-rs-darwin-arm64": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@yuuang/ffi-rs-darwin-arm64/-/ffi-rs-darwin-arm64-1.3.2.tgz",
+      "integrity": "sha512-kRdgPaOM6TfuC5wHUwstlatk4HNie2lwSLJWQL2LiAUIJ7+96CoiWUNVhwBcFrhdfxhnWenYS6F668CV0vit8Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@yuuang/ffi-rs-darwin-x64": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@yuuang/ffi-rs-darwin-x64/-/ffi-rs-darwin-x64-1.3.2.tgz",
+      "integrity": "sha512-O3AlVgre8FQcZRJe44Xs7A6iDLumoPXqbw40+eJCa2gyXaXyLPdHoWrS1W9rBCa1QZRRnG7zRulPVFw8C5uo8g==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@yuuang/ffi-rs-linux-arm-gnueabihf": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@yuuang/ffi-rs-linux-arm-gnueabihf/-/ffi-rs-linux-arm-gnueabihf-1.3.2.tgz",
+      "integrity": "sha512-IXiNdTbIcTCPny5eeElijFWYeKSJjQWSjt9ZyJNdLHYiB1Np+XD6K7wNZS6EOMgMelhW1kQE62T654skGkVDIA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@yuuang/ffi-rs-linux-arm64-gnu": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@yuuang/ffi-rs-linux-arm64-gnu/-/ffi-rs-linux-arm64-gnu-1.3.2.tgz",
+      "integrity": "sha512-gWFO6xufUK9lPYUqDvKa6IR243dPqdetgl9Q7HrZWaDu7wLo06QQrosw8QTzndafQnOcBKm6LoLujmGCfTgJOA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@yuuang/ffi-rs-linux-arm64-musl": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@yuuang/ffi-rs-linux-arm64-musl/-/ffi-rs-linux-arm64-musl-1.3.2.tgz",
+      "integrity": "sha512-lejvOSqypPziQH5rzfkDlJ6e92qhWbDutE9ttOO6z5I2k83zoh9iZhZWhaXSU5VqgQpcshRkrbtXb9gy1ft5dA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@yuuang/ffi-rs-linux-x64-gnu": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@yuuang/ffi-rs-linux-x64-gnu/-/ffi-rs-linux-x64-gnu-1.3.2.tgz",
+      "integrity": "sha512-s8VCFazaJKmgY2hgMTpWk4TtBY/zy5ovbaGgwyY0FvBD0YvyhcET4IrMsDJpHhFVTPCYfKZ1dN45clD/YiFp6g==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@yuuang/ffi-rs-linux-x64-musl": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@yuuang/ffi-rs-linux-x64-musl/-/ffi-rs-linux-x64-musl-1.3.2.tgz",
+      "integrity": "sha512-Ahr5chfKZKWUik20bEZRug+be57LZ2yYrtolyjSRoo7A4ZniBUHBZUNWm6TD6i0CJayqyxWeVk/XiaABD8bY0w==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@yuuang/ffi-rs-win32-arm64-msvc": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@yuuang/ffi-rs-win32-arm64-msvc/-/ffi-rs-win32-arm64-msvc-1.3.2.tgz",
+      "integrity": "sha512-yhpLcj0qel5VNlpzxPZfNmi7+rEX8444QHjUP6WWLxdRfqPllROu/Cp3OpkBpw3BLdxfcDhWkjWMD5QsJN0Pvg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@yuuang/ffi-rs-win32-ia32-msvc": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@yuuang/ffi-rs-win32-ia32-msvc/-/ffi-rs-win32-ia32-msvc-1.3.2.tgz",
+      "integrity": "sha512-BFVSbdtg/7mJBw5kQFOPKFiA+SF7z3240HpzHN81Umm4Bp4dWkyx0msYn8+Q7/BBJiLQ4F6bi3Nftk58YA9r9w==",
+      "cpu": [
+        "x64",
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@yuuang/ffi-rs-win32-x64-msvc": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@yuuang/ffi-rs-win32-x64-msvc/-/ffi-rs-win32-x64-msvc-1.3.2.tgz",
+      "integrity": "sha512-ZL5MJ76n2rjwGo26kCWW7wK6QT/cee00Rx8pfW79pz6vM6jqfhoE7zTnwFiw4aOQUes9+HUc5DeeJ3z+Vb9oLg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/7zip-bin": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz",
@@ -21209,6 +21521,25 @@
       "integrity": "sha512-YoZjBdafyLIop9lSxXVI33oLD5kN31q4Td+CasofLLYeLXRFeOsuOw0Uo+XNRi9PZlbfdlN2GmRtm4tCEQ9/KA==",
       "license": "MIT"
     },
+    "node_modules/ffi-rs": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/ffi-rs/-/ffi-rs-1.3.2.tgz",
+      "integrity": "sha512-4s8dX9VbBw/jd5NOuE3EJRqXaIVdjMyiumeeDzrOhtjQRwp6Bz2za7iksWXTnvTQKV/tTdm1s1w7mObe92zPjQ==",
+      "license": "MIT",
+      "optionalDependencies": {
+        "@yuuang/ffi-rs-android-arm64": "1.3.2",
+        "@yuuang/ffi-rs-darwin-arm64": "1.3.2",
+        "@yuuang/ffi-rs-darwin-x64": "1.3.2",
+        "@yuuang/ffi-rs-linux-arm-gnueabihf": "1.3.2",
+        "@yuuang/ffi-rs-linux-arm64-gnu": "1.3.2",
+        "@yuuang/ffi-rs-linux-arm64-musl": "1.3.2",
+        "@yuuang/ffi-rs-linux-x64-gnu": "1.3.2",
+        "@yuuang/ffi-rs-linux-x64-musl": "1.3.2",
+        "@yuuang/ffi-rs-win32-arm64-msvc": "1.3.2",
+        "@yuuang/ffi-rs-win32-ia32-msvc": "1.3.2",
+        "@yuuang/ffi-rs-win32-x64-msvc": "1.3.2"
+      }
+    },
     "node_modules/fflate": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
@@ -21797,9 +22128,9 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.14.0",
+      "version": "4.13.6",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.14.0.tgz",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.6.tgz",
-      "integrity": "sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==",
+      "integrity": "sha512-shZT/QMiSHc/YBLxxOkMtgSid5HFoauqCE3/exfsEcwg1WkeqjG+V40yBbBrsD+jW2HDXcs28xOfcbm2jI8Ddw==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -28563,9 +28894,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.5",
+      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -35069,26 +35400,6 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/zod-aot": {
-      "version": "0.20.4",
-      "resolved": "https://registry.npmjs.org/zod-aot/-/zod-aot-0.20.4.tgz",
-      "integrity": "sha512-vVuKSG4MpJw3bRQu7UEd6ziJ8+AJY3JB2rWqshnSIRJmhxWFb3FiZ9QYnYcldKYZRzO7edgid8BxJkGbZg43OA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^8.16.0",
-        "get-tsconfig": "^4.14.0",
-        "jiti": "^2.7.0",
-        "picomatch": "^4.0.4",
-        "unplugin": "^3.0.0"
-      },
-      "bin": {
-        "zod-aot": "dist/cli/index.js"
-      },
-      "peerDependencies": {
-        "zod": "^4.0.0"
-      }
-    },
     "node_modules/zod-to-json-schema": {
       "version": "3.25.1",
       "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.1.tgz",
@@ -35152,7 +35463,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.1.104",
+      "version": "0.1.102",
       "dependencies": {
         "@dnd-kit/core": "^6.3.1",
         "@dnd-kit/sortable": "^10.0.0",
@@ -36170,12 +36481,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.1.104",
+      "version": "0.1.102",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.1.104",
+        "@getpaseo/client": "0.1.102",
-        "@getpaseo/protocol": "0.1.104",
+        "@getpaseo/protocol": "0.1.102",
-        "@getpaseo/server": "0.1.104",
+        "@getpaseo/server": "0.1.102",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -36421,10 +36732,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.1.104",
+      "version": "0.1.102",
       "dependencies": {
-        "@getpaseo/protocol": "0.1.104",
+        "@getpaseo/protocol": "0.1.102",
-        "@getpaseo/relay": "0.1.104",
+        "@getpaseo/relay": "0.1.102",
         "zod": "^4.4.3"
       },
       "devDependencies": {
@@ -36435,7 +36746,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.1.104",
+      "version": "0.1.102",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -36678,7 +36989,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.1.104",
+      "version": "0.1.102",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -37574,7 +37885,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.1.104",
+      "version": "0.1.102",
       "dependencies": {
         "@codemirror/language": "^6.12.3",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -37806,20 +38117,19 @@
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.1.104",
+      "version": "0.1.102",
       "dependencies": {
         "zod": "^4.4.3"
       },
       "devDependencies": {
         "@types/node": "^20.9.0",
         "typescript": "^5.2.2",
-        "vitest": "^4.1.6",
+        "vitest": "^4.1.6"
-        "zod-aot": "0.20.4"
       }
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.1.104",
+      "version": "0.1.102",
       "dependencies": {
         "base64-js": "^1.5.1",
         "tweetnacl": "^1.0.3",
@@ -38037,15 +38347,16 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.1.104",
+      "version": "0.1.102",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "^0.3.195",
         "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.1.104",
+        "@ff-labs/fff-node": "^0.9.6",
-        "@getpaseo/highlight": "0.1.104",
+        "@getpaseo/client": "0.1.102",
-        "@getpaseo/protocol": "0.1.104",
+        "@getpaseo/highlight": "0.1.102",
-        "@getpaseo/relay": "0.1.104",
+        "@getpaseo/protocol": "0.1.102",
+        "@getpaseo/relay": "0.1.102",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "^1.20.1",
         "@opencode-ai/sdk": "1.14.46",
@@ -38582,7 +38893,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.1.104",
+      "version": "0.1.102",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.1.104",
+  "version": "0.1.102",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [
@@ -58,7 +58,7 @@
     "build:daemon-web-ui": "node scripts/build-daemon-web-ui.mjs",
     "build:app-deps": "npm run build:highlight && npm run build:client && npm run build --workspace=@getpaseo/expo-two-way-audio",
     "build:app-deps:clean": "npm run build:highlight:clean && npm run build:client:clean && npm run build --workspace=@getpaseo/expo-two-way-audio",
-    "watch:protocol": "npm run watch --workspace=@getpaseo/protocol",
+    "watch:protocol": "tsc -p packages/protocol/tsconfig.json --watch --preserveWatchOutput",
     "watch:client": "tsc -p packages/client/tsconfig.json --watch --preserveWatchOutput",
     "typecheck": "npm run typecheck --workspaces --if-present",
     "typecheck:server": "npm run typecheck --workspace=@getpaseo/relay && npm run typecheck --workspace=@getpaseo/protocol && npm run typecheck --workspace=@getpaseo/client && npm run typecheck --workspace=@getpaseo/server && npm run typecheck --workspace=@getpaseo/cli",

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

@@ -1,3 +1,5 @@
+import { mkdir, writeFile } from "node:fs/promises";
+import path from "node:path";
 import { expect, test, type Page } from "./fixtures";
 import { composerLocator, expectComposerVisible } from "./helpers/composer";
 import {
@@ -5,7 +7,7 @@ import {
   seedMockAgentWorkspace,
   type MockAgentWorkspace,
 } from "./helpers/mock-agent";
-import { expectWorkspaceTabVisible, openSessions } from "./helpers/archive-tab";
+import { expectWorkspaceTabVisible } from "./helpers/archive-tab";
 import { daemonWsRoutePattern } from "./helpers/daemon-port";
 import { getServerId } from "./helpers/server-id";
 import { switchWorkspaceViaSidebar } from "./helpers/workspace-ui";
@@ -153,13 +155,6 @@ async function openAppWideNewWorkspace(page: Page): Promise<void> {
   await page.waitForURL((url) => url.pathname === "/new", { timeout: 30_000 });
 }
 
-async function openSettingsThenBackToWorkspace(page: Page): Promise<void> {
-  await page.getByTestId("sidebar-settings").filter({ visible: true }).first().click();
-  await expect(page).toHaveURL(/\/settings\/general$/, { timeout: 30_000 });
-  await page.getByTestId("settings-back-to-workspace").click();
-  await page.waitForURL((url) => url.pathname.includes("/workspace/"), { timeout: 30_000 });
-}
-
 async function expectSingleCurrentWorkspaceDeckEntry(
   page: Page,
   input: { expectedDeckEntryCount: number; serverId: string; workspaceId: string },
@@ -216,6 +211,25 @@ async function openReadyMockAgent(
   }
 }
 
+async function seedDotPrefixedWorkspaceFiles(cwd: string): Promise<void> {
+  await writeFile(path.join(cwd, ".env.local"), "PASEO_E2E=1\n");
+  await mkdir(path.join(cwd, ".opencode"), { recursive: true });
+  await writeFile(path.join(cwd, ".opencode", "settings.json"), "{}\n");
+}
+
+async function expectFileMentionSuggestion(
+  page: Page,
+  query: string,
+  suggestion: string,
+): Promise<void> {
+  const input = composerLocator(page);
+  await input.fill(query);
+  const popover = page.getByTestId("composer-autocomplete-popover");
+  await expect(popover.getByText(suggestion, { exact: true }).first()).toBeVisible({
+    timeout: 30_000,
+  });
+}
+
 async function visiblePopoverBox(
   page: Page,
 ): Promise<{ top: number; bottom: number; height: number }> {
@@ -358,7 +372,7 @@ function expectPopoverDoesNotDisappearAfterFirstVisible(frames: PopoverFrame[]):
 }
 
 test.describe("Composer autocomplete", () => {
-  test("stays visible after returning from app-wide routes", async ({ page }) => {
+  test("stays visible after returning from the app-wide new workspace route", async ({ page }) => {
     await installListCommandsStub(page);
     const serverId = getServerId();
     const sessions: MockAgentWorkspace[] = [];
@@ -391,28 +405,10 @@ test.describe("Composer autocomplete", () => {
       await openAppWideNewWorkspace(page);
       await switchWorkspaceViaSidebar({ page, serverId, workspaceId: second.workspaceId });
       await expectComposerVisible(page, { timeout: 30_000 });
-      await expectSingleCurrentWorkspaceDeckEntry(page, {
-        expectedDeckEntryCount: 2,
-        serverId,
-        workspaceId: second.workspaceId,
-      });
 
-      await openSettingsThenBackToWorkspace(page);
+      await openAppWideNewWorkspace(page);
-      await expectComposerVisible(page, { timeout: 30_000 });
-      await expectSingleCurrentWorkspaceDeckEntry(page, {
-        expectedDeckEntryCount: 2,
-        serverId,
-        workspaceId: second.workspaceId,
-      });
-
-      await openSessions(page);
       await switchWorkspaceViaSidebar({ page, serverId, workspaceId: third.workspaceId });
       await expectComposerVisible(page, { timeout: 30_000 });
-      await expectSingleCurrentWorkspaceDeckEntry(page, {
-        expectedDeckEntryCount: sessions.length,
-        serverId,
-        workspaceId: third.workspaceId,
-      });
 
       await openAppWideNewWorkspace(page);
       await switchWorkspaceViaSidebar({ page, serverId, workspaceId: first.workspaceId });
@@ -544,6 +540,28 @@ test.describe("Composer autocomplete", () => {
     }
   });
 
+  test("suggests dot-prefixed workspace entries for file mentions", async ({ page }) => {
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "autocomplete-dot-entries-",
+      title: "Dot file mention autocomplete",
+    });
+
+    try {
+      await seedDotPrefixedWorkspaceFiles(session.cwd);
+      await openAgentRoute(page, session);
+      await expectWorkspaceTabVisible(page, session.agentId);
+      await expectComposerVisible(page);
+
+      const input = composerLocator(page);
+      await expect(input).toBeEditable({ timeout: 30_000 });
+
+      await expectFileMentionSuggestion(page, "@.env", ".env.local");
+      await expectFileMentionSuggestion(page, "@.opencode", ".opencode/settings.json");
+    } finally {
+      await session.cleanup();
+    }
+  });
+
   test("stays anchored to the composer when the desktop sidebar is open", async ({ page }) => {
     await installListCommandsStub(page);
     const agent = await openReadyMockAgent(page);

packages/app/e2e/fixtures.ts

@@ -3,8 +3,6 @@ import { getE2EDaemonPort } from "./helpers/daemon-port";
 import { buildCreateAgentPreferences, buildSeededHost } from "./helpers/daemon-registry";
 import { createWithWorkspace, type WithWorkspace } from "./helpers/with-workspace";
 
-const EXTRA_HOSTS_KEY = "@paseo:e2e-extra-hosts";
-
 // 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
@@ -59,7 +57,7 @@ const test = base.extend<{ paseoE2ESetup: void; withWorkspace: WithWorkspace }>(
       const createAgentPreferences = buildCreateAgentPreferences(testDaemon.serverId);
 
       await page.addInitScript(
-        ({ daemon, preferences, seedNonce: nonce, extraHostsKey }) => {
+        ({ 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.
@@ -75,20 +73,12 @@ const test = base.extend<{ paseoE2ESetup: void; withWorkspace: WithWorkspace }>(
           localStorage.setItem("@paseo:e2e", "1");
           localStorage.setItem("@paseo:e2e-seed-nonce", nonce);
 
-          const rawExtraHosts = localStorage.getItem(extraHostsKey);
-          const extraHosts = rawExtraHosts ? JSON.parse(rawExtraHosts) : [];
-
           // Hard-reset anything that could point to a developer's real daemon.
-          localStorage.setItem("@paseo:daemon-registry", JSON.stringify([daemon, ...extraHosts]));
+          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 },
-          daemon: testDaemon,
-          preferences: createAgentPreferences,
-          seedNonce,
-          extraHostsKey: EXTRA_HOSTS_KEY,
-        },
       );
 
       await provide();

packages/app/e2e/helpers/no-truncation.ts

@@ -1,61 +0,0 @@
-import { expect, type Locator } from "@playwright/test";
-
-interface TruncatedLabel {
-  text: string;
-  scrollWidth: number;
-  clientWidth: number;
-}
-
-export async function expectNoTruncation(locator: Locator): Promise<void> {
-  await expect(locator.first()).toBeVisible({ timeout: 30_000 });
-
-  const truncated = await locator.evaluateAll((elements): TruncatedLabel[] => {
-    function isVisible(element: HTMLElement): boolean {
-      const style = window.getComputedStyle(element);
-      const rect = element.getBoundingClientRect();
-      return (
-        style.display !== "none" &&
-        style.visibility !== "hidden" &&
-        rect.width > 0 &&
-        rect.height > 0
-      );
-    }
-
-    function directText(element: HTMLElement): string {
-      return Array.from(element.childNodes)
-        .filter((node) => node.nodeType === Node.TEXT_NODE)
-        .map((node) => node.textContent ?? "")
-        .join("")
-        .trim();
-    }
-
-    const checked = new Set<HTMLElement>();
-    const failures: TruncatedLabel[] = [];
-
-    for (const root of elements) {
-      if (!(root instanceof HTMLElement) || !isVisible(root)) continue;
-      const candidates = [root, ...Array.from(root.querySelectorAll<HTMLElement>("*"))];
-
-      for (const candidate of candidates) {
-        if (checked.has(candidate) || !isVisible(candidate) || candidate.clientWidth <= 0) {
-          continue;
-        }
-        checked.add(candidate);
-
-        const text = directText(candidate);
-        if (!text) continue;
-        if (candidate.scrollWidth <= candidate.clientWidth) continue;
-
-        failures.push({
-          text,
-          scrollWidth: candidate.scrollWidth,
-          clientWidth: candidate.clientWidth,
-        });
-      }
-    }
-
-    return failures;
-  });
-
-  expect(truncated, "option labels should not be horizontally truncated").toEqual([]);
-}

packages/app/e2e/helpers/project-settings.ts

@@ -5,29 +5,6 @@ import type { WebSocketRoute } from "@playwright/test";
 import { gotoAppShell, openSettings } from "./app";
 import { daemonWsRoutePattern } from "./daemon-port";
 
-type WebSocketMessage = string | Buffer;
-
-function parseWebSocketJson(message: WebSocketMessage): unknown {
-  const raw = typeof message === "string" ? message : message.toString("utf8");
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return null;
-  }
-}
-
-function getSessionMessage(message: WebSocketMessage): Record<string, unknown> | null {
-  const envelope = parseWebSocketJson(message);
-  if (!envelope || typeof envelope !== "object") {
-    return null;
-  }
-  const maybeEnvelope = envelope as { type?: unknown; message?: unknown };
-  if (maybeEnvelope.type !== "session" || typeof maybeEnvelope.message !== "object") {
-    return null;
-  }
-  return maybeEnvelope.message as Record<string, unknown>;
-}
-
 // --- Navigation ---
 
 export async function openProjects(page: Page): Promise<void> {
@@ -194,39 +171,33 @@ export async function unblockPaseoConfigWrites(repoPath: string): Promise<void>
 
 // --- WebSocket helpers ---
 
-// Proxies all daemon WS traffic transparently, but rejects paseo.json reads
+// Proxies all daemon WS traffic transparently until a read_project_config_request
-// until the test explicitly allows recovery. Closing the transport leaves the
+// is seen, then closes that connection (triggering readQuery.isError). Subsequent
-// client-side RPC pending across reconnects, so this injects the same correlated
+// connections pass through so the Reload action can succeed.
-// rpc_error shape the daemon emits for failed async session requests.
+export async function installReadTransportFailure(page: Page): Promise<void> {
-export async function installReadTransportFailure(
+  let armed = true;
-  page: Page,
-): Promise<{ allowRecovery: () => void }> {
-  let shouldFailReads = true;
 
   await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
     const server = ws.connectToServer();
 
     ws.onMessage((message) => {
-      const sessionMessage = getSessionMessage(message);
+      if (armed && typeof message === "string") {
-      if (shouldFailReads && sessionMessage?.type === "read_project_config_request") {
+        try {
-        const requestId = sessionMessage.requestId;
+          const envelope = JSON.parse(message) as {
-        if (typeof requestId === "string") {
+            type?: string;
-          ws.send(
+            message?: { type?: string };
-            JSON.stringify({
+          };
-              type: "session",
+          if (
-              message: {
+            envelope.type === "session" &&
-                type: "rpc_error",
+            envelope.message?.type === "read_project_config_request"
-                payload: {
+          ) {
-                  requestId,
+            armed = false;
-                  requestType: "read_project_config_request",
+            void ws.close({ code: 1001 });
-                  error: "Test read transport failure.",
+            return;
-                  code: "transport",
+          }
-                },
+        } catch {
-              },
+          // binary or malformed frame — pass through
-            }),
-          );
         }
-        return;
       }
       try {
         server.send(message);
@@ -243,12 +214,6 @@ export async function installReadTransportFailure(
       }
     });
   });
-
-  return {
-    allowRecovery() {
-      shouldFailReads = false;
-    },
-  };
 }
 
 // Installs a transparent WS proxy that can later drop all active daemon connections

packages/app/e2e/helpers/questions.ts

@@ -10,51 +10,50 @@ export async function expectCurrentQuestion(
 ): Promise<void> {
   const card = page.getByTestId("question-form-card").first();
   await expect(card.getByTestId("question-form-current-question")).toHaveText(input.question);
-  // Nav tabs only render for multi-question cards (hidden for a lone question).
+  await expect(
-  if (input.total > 1) {
+    card.getByRole("button", { name: `Question ${input.index} of ${input.total}` }),
-    await expect(questionNavTab(page, input)).toHaveAttribute("aria-selected", "true");
+  ).toHaveAttribute("aria-selected", "true");
-  }
 }
 
 export async function expectQuestionHidden(page: Page, question: string): Promise<void> {
   await expect(page.getByText(question, { exact: true })).toHaveCount(0);
 }
 
-// Options render as radios (single-select) or checkboxes (multi-select), so match
+export async function chooseQuestionOption(page: Page, option: string): Promise<void> {
-// either role by accessible name.
+  await page
-function questionOption(page: Page, option: string) {
-  const card = page.getByTestId("question-form-card").first();
-  return card.getByRole("radio", { name: option }).or(card.getByRole("checkbox", { name: option }));
-}
-
-// The multi-question nav renders as a tablist; each question is a tab.
-function questionNavTab(page: Page, input: { index: number; total: number }) {
-  return page
     .getByTestId("question-form-card")
     .first()
-    .getByRole("tab", { name: `Question ${input.index} of ${input.total}` });
+    .getByRole("button", { name: option })
-}
+    .click();
-
-export async function chooseQuestionOption(page: Page, option: string): Promise<void> {
-  await questionOption(page, option).click();
 }
 
 export async function expectQuestionOptionSelected(page: Page, option: string): Promise<void> {
-  await expect(questionOption(page, option)).toHaveAttribute("aria-checked", "true");
+  await expect(
+    page.getByTestId("question-form-card").first().getByRole("button", { name: option }),
+  ).toHaveAttribute("aria-selected", "true");
 }
 
 export async function openQuestion(
   page: Page,
   input: { index: number; total: number },
 ): Promise<void> {
-  await questionNavTab(page, input).click();
+  await page
+    .getByTestId("question-form-card")
+    .first()
+    .getByRole("button", { name: `Question ${input.index} of ${input.total}` })
+    .click();
 }
 
 export async function expectQuestionNavigationEnabled(
   page: Page,
   input: { index: number; total: number },
 ): Promise<void> {
-  await expect(questionNavTab(page, input)).toBeEnabled();
+  await expect(
+    page
+      .getByTestId("question-form-card")
+      .first()
+      .getByRole("button", { name: `Question ${input.index} of ${input.total}` }),
+  ).toBeEnabled();
 }
 
 export async function fillQuestionAnswer(

packages/app/e2e/helpers/schedule-fake-host.ts

@@ -1,284 +0,0 @@
-import { type Page } from "@playwright/test";
-import { buildSeededHost } from "./daemon-registry";
-import { wsRoutePatternForPort } from "./daemon-port";
-import { type SeededWorkspace } from "./seed-client";
-
-const REGISTRY_KEY = "@paseo:daemon-registry";
-const SEED_NONCE_KEY = "@paseo:e2e-seed-nonce";
-const EXTRA_HOSTS_KEY = "@paseo:e2e-extra-hosts";
-export const FAKE_HOST_MODEL_ID = "fake-host-model";
-export const FAKE_HOST_MODEL_LABEL = "Fake host model";
-export const FAKE_HOST_PROJECT_DISPLAY_NAME = "Fake host project";
-
-type WebSocketMessage = string | Buffer;
-type SessionRequest = Record<string, unknown> & { type?: string; requestId?: string };
-
-export interface FakeScheduleHostWorkspace {
-  serverId: string;
-  projectId: string;
-  projectDisplayName: string;
-  workspace: Record<string, unknown>;
-}
-
-interface FakeScheduleSummary {
-  id: string;
-  name: string | null;
-  prompt: string;
-  cadence: { type: "cron"; expression: string };
-  target: {
-    type: "new-agent";
-    config: {
-      provider: "mock";
-      cwd: string;
-      model: string;
-      modeId: string;
-      title?: string;
-    };
-  };
-  status: "active";
-  createdAt: string;
-  updatedAt: string;
-  nextRunAt: string | null;
-  lastRunAt: string | null;
-  pausedAt: string | null;
-  expiresAt: string | null;
-  maxRuns: number | null;
-}
-
-function parseJson(message: WebSocketMessage): unknown {
-  const raw = typeof message === "string" ? message : message.toString("utf8");
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return null;
-  }
-}
-
-function buildSessionMessage(type: string, payload: Record<string, unknown>) {
-  return JSON.stringify({
-    type: "session",
-    message: {
-      type,
-      payload,
-    },
-  });
-}
-
-function buildFakeProviderEntries(nowIso: string) {
-  return [
-    {
-      provider: "mock",
-      label: "Mock",
-      status: "ready",
-      enabled: true,
-      fetchedAt: nowIso,
-      models: [
-        {
-          provider: "mock",
-          id: FAKE_HOST_MODEL_ID,
-          label: FAKE_HOST_MODEL_LABEL,
-          isDefault: true,
-        },
-      ],
-      modes: [{ id: "load-test", label: "Load test" }],
-      defaultModeId: "load-test",
-    },
-  ];
-}
-
-function readSessionRequest(message: WebSocketMessage): SessionRequest | null {
-  const parsed = parseJson(message);
-  if (!parsed || typeof parsed !== "object") {
-    return null;
-  }
-
-  const envelope = parsed as { type?: string; message?: SessionRequest };
-  if (envelope.type !== "session" || !envelope.message) {
-    return null;
-  }
-
-  return envelope.message;
-}
-
-function getRequestId(request: SessionRequest): string {
-  return typeof request.requestId === "string" ? request.requestId : "fake-request";
-}
-
-export async function buildFakeScheduleHostWorkspace(
-  workspace: SeededWorkspace,
-): Promise<FakeScheduleHostWorkspace> {
-  const workspaceList = await workspace.client.fetchWorkspaces({
-    filter: { projectId: workspace.projectId },
-  });
-  const baseWorkspace = workspaceList.entries.find((entry) => entry.id === workspace.workspaceId);
-  if (!baseWorkspace) {
-    throw new Error(`Failed to load seeded workspace descriptor ${workspace.workspaceId}`);
-  }
-
-  const projectId = `${workspace.projectId}-fake-host`;
-  const cwd = `${workspace.repoPath}-fake-host`;
-  return {
-    serverId: "schedule-fake-host",
-    projectId,
-    projectDisplayName: FAKE_HOST_PROJECT_DISPLAY_NAME,
-    workspace: {
-      ...baseWorkspace,
-      id: `${baseWorkspace.id}-fake-host`,
-      projectId,
-      projectDisplayName: FAKE_HOST_PROJECT_DISPLAY_NAME,
-      projectRootPath: cwd,
-      workspaceDirectory: cwd,
-      name: FAKE_HOST_PROJECT_DISPLAY_NAME,
-      project: undefined,
-    },
-  };
-}
-
-export async function installFakeScheduleHost(input: {
-  page: Page;
-  port: string;
-  serverId: string;
-  workspace: Record<string, unknown>;
-  schedules?: FakeScheduleSummary[];
-}): Promise<void> {
-  await input.page.routeWebSocket(wsRoutePatternForPort(input.port), (ws) => {
-    ws.onMessage((message) => {
-      const parsed = parseJson(message);
-      if (parsed && typeof parsed === "object" && (parsed as { type?: string }).type === "hello") {
-        ws.send(
-          buildSessionMessage("status", {
-            status: "server_info",
-            serverId: input.serverId,
-            hostname: "fake-schedule-host",
-            version: "0.0.0-e2e",
-            features: {
-              providersSnapshot: true,
-              workspaceMultiplicity: true,
-              projectAdd: true,
-              projectRemove: true,
-              worktreeRestore: true,
-            },
-          }),
-        );
-        return;
-      }
-
-      if (parsed && typeof parsed === "object" && (parsed as { type?: string }).type === "ping") {
-        ws.send(JSON.stringify({ type: "pong" }));
-        return;
-      }
-
-      const request = readSessionRequest(message);
-      if (!request) {
-        return;
-      }
-
-      const requestId = getRequestId(request);
-      const now = Date.now();
-      const nowIso = new Date(now).toISOString();
-      switch (request.type) {
-        case "ping":
-          ws.send(
-            buildSessionMessage("pong", {
-              requestId,
-              clientSentAt: typeof request.clientSentAt === "number" ? request.clientSentAt : now,
-              serverReceivedAt: now,
-              serverSentAt: now,
-            }),
-          );
-          return;
-        case "fetch_workspaces_request":
-          ws.send(
-            buildSessionMessage("fetch_workspaces_response", {
-              requestId,
-              entries: [input.workspace],
-              emptyProjects: [],
-              pageInfo: { nextCursor: null, prevCursor: null, hasMore: false },
-            }),
-          );
-          return;
-        case "fetch_agents_request":
-          ws.send(
-            buildSessionMessage("fetch_agents_response", {
-              requestId,
-              entries: [],
-              pageInfo: { nextCursor: null, prevCursor: null, hasMore: false },
-            }),
-          );
-          return;
-        case "get_providers_snapshot_request":
-          ws.send(
-            buildSessionMessage("get_providers_snapshot_response", {
-              requestId,
-              entries: buildFakeProviderEntries(nowIso),
-              generatedAt: nowIso,
-            }),
-          );
-          return;
-        case "refresh_providers_snapshot_request":
-          ws.send(
-            buildSessionMessage("refresh_providers_snapshot_response", {
-              requestId,
-              acknowledged: true,
-            }),
-          );
-          return;
-        case "schedule/list":
-          ws.send(
-            buildSessionMessage("schedule/list/response", {
-              requestId,
-              schedules: input.schedules ?? [],
-              error: null,
-            }),
-          );
-          return;
-      }
-    });
-  });
-}
-
-export async function addFakeScheduleHostAndReload(input: {
-  page: Page;
-  serverId: string;
-  label: string;
-  port: string;
-}): Promise<void> {
-  const host = buildSeededHost({
-    serverId: input.serverId,
-    label: input.label,
-    endpoint: `127.0.0.1:${input.port}`,
-    nowIso: new Date().toISOString(),
-  });
-
-  await input.page.evaluate(
-    ({ seededHost, keys }) => {
-      const nonce = localStorage.getItem(keys.nonce);
-      if (!nonce) {
-        throw new Error("Expected the e2e seed nonce before overriding the host registry.");
-      }
-      const raw = localStorage.getItem(keys.registry);
-      const registry: Array<{ serverId: string }> = raw ? JSON.parse(raw) : [];
-      const nextRegistry = registry.filter((entry) => entry.serverId !== seededHost.serverId);
-      nextRegistry.push(seededHost);
-      localStorage.setItem(keys.registry, JSON.stringify(nextRegistry));
-
-      const rawExtraHosts = localStorage.getItem(keys.extraHosts);
-      const extraHosts: Array<{ serverId: string }> = rawExtraHosts
-        ? JSON.parse(rawExtraHosts)
-        : [];
-      const nextExtraHosts = extraHosts.filter((entry) => entry.serverId !== seededHost.serverId);
-      nextExtraHosts.push(seededHost);
-      localStorage.setItem(keys.extraHosts, JSON.stringify(nextExtraHosts));
-    },
-    {
-      seededHost: host,
-      keys: {
-        registry: REGISTRY_KEY,
-        nonce: SEED_NONCE_KEY,
-        extraHosts: EXTRA_HOSTS_KEY,
-      },
-    },
-  );
-
-  await input.page.reload();
-}

packages/app/e2e/helpers/settings.ts

@@ -371,7 +371,6 @@ export async function expectRetiredSidebarSectionsAbsent(page: Page): Promise<vo
   await expect(sidebar.getByRole("button", { name: "General", exact: true })).toBeVisible();
   await expect(sidebar.getByRole("button", { name: "Diagnostics", exact: true })).toBeVisible();
   await expect(sidebar.getByRole("button", { name: "About", exact: true })).toBeVisible();
-  await expect(sidebar.getByRole("button", { name: "Daemon", exact: true })).toHaveCount(0);
 
   // Host group rows are now flat top-level sections (no drill-in).
   await expect(sidebar.getByTestId("settings-host-section-connections")).toBeVisible();

packages/app/e2e/helpers/settled.ts

@@ -1,86 +0,0 @@
-import { expect, type Locator } from "@playwright/test";
-
-interface SettledOptions {
-  timeout?: number;
-  durationMs?: number;
-  intervalMs?: number;
-  heightTolerance?: number;
-}
-
-interface Sample {
-  text: string;
-  height: number;
-}
-
-const DEFAULT_DURATION_MS = 1_500;
-const DEFAULT_INTERVAL_MS = 100;
-const DEFAULT_HEIGHT_TOLERANCE = 1;
-
-async function sample(locator: Locator): Promise<Sample> {
-  const [text, box] = await Promise.all([locator.textContent(), locator.boundingBox()]);
-  if (!box) {
-    throw new Error("Expected locator to keep a bounding box while sampling settledness.");
-  }
-  return { text: text ?? "", height: box.height };
-}
-
-async function collectSamples(locator: Locator, options?: SettledOptions): Promise<Sample[]> {
-  await expect(locator).toBeVisible({ timeout: options?.timeout ?? 30_000 });
-
-  const durationMs = options?.durationMs ?? DEFAULT_DURATION_MS;
-  const intervalMs = options?.intervalMs ?? DEFAULT_INTERVAL_MS;
-  const samples: Sample[] = [];
-  const deadline = Date.now() + durationMs;
-
-  while (Date.now() <= deadline || samples.length < 2) {
-    samples.push(await sample(locator));
-    await locator.page().waitForTimeout(intervalMs);
-  }
-
-  return samples;
-}
-
-function assertStableHeight(samples: Sample[], tolerance: number): void {
-  const heights = samples.map((entry) => entry.height);
-  const minHeight = Math.min(...heights);
-  const maxHeight = Math.max(...heights);
-  expect(maxHeight - minHeight, `height changed by more than ${tolerance}px`).toBeLessThanOrEqual(
-    tolerance,
-  );
-}
-
-function assertSettledText(samples: Sample[]): void {
-  let stableText: string | null = null;
-  let previousText: string | null = null;
-
-  for (const entry of samples) {
-    if (stableText !== null && entry.text !== stableText) {
-      throw new Error(
-        `Text changed after settling. Expected ${JSON.stringify(stableText)}, received ${JSON.stringify(entry.text)}.`,
-      );
-    }
-
-    if (previousText === entry.text) {
-      stableText = entry.text;
-    }
-    previousText = entry.text;
-  }
-
-  if (stableText === null) {
-    throw new Error("Text did not reach a stable value during the settledness window.");
-  }
-}
-
-export async function expectSettled(locator: Locator, options?: SettledOptions): Promise<void> {
-  const samples = await collectSamples(locator, options);
-  assertSettledText(samples);
-  assertStableHeight(samples, options?.heightTolerance ?? DEFAULT_HEIGHT_TOLERANCE);
-}
-
-export async function expectStableHeight(
-  locator: Locator,
-  options?: SettledOptions,
-): Promise<void> {
-  const samples = await collectSamples(locator, options);
-  assertStableHeight(samples, options?.heightTolerance ?? DEFAULT_HEIGHT_TOLERANCE);
-}

packages/app/e2e/new-workspace-codex-mode-preferences.spec.ts

@@ -7,7 +7,6 @@ import {
   selectNewWorkspaceProject,
   submitNewWorkspacePrompt,
 } from "./helpers/new-workspace";
-import { expectNoTruncation } from "./helpers/no-truncation";
 import { escapeRegex } from "./helpers/regex";
 import { seedWorkspace } from "./helpers/seed-client";
 import { getServerId } from "./helpers/server-id";
@@ -92,10 +91,6 @@ async function selectMode(page: Page, label: string): Promise<void> {
   await expect(modeControl).toBeVisible({ timeout: 30_000 });
   await modeControl.click();
 
-  const popup = page.getByTestId("combobox-desktop-container").last();
-  await expect(popup).toBeVisible({ timeout: 10_000 });
-  await expectNoTruncation(popup);
-
   const searchInput = page.getByRole("textbox", { name: /search mode/i });
   await expect(searchInput).toBeVisible({ timeout: 10_000 });
   await searchInput.fill(label);
@@ -110,19 +105,6 @@ async function selectMode(page: Page, label: string): Promise<void> {
   await expect(searchInput).not.toBeVisible({ timeout: 5_000 });
 }
 
-async function expectThinkingOptionsFit(page: Page): Promise<void> {
-  const thinkingControl = page.getByTestId("agent-thinking-selector").first();
-  await expect(thinkingControl).toBeVisible({ timeout: 30_000 });
-  await thinkingControl.click();
-
-  const popup = page.getByTestId("combobox-desktop-container").last();
-  await expect(popup).toBeVisible({ timeout: 10_000 });
-  await expectNoTruncation(popup);
-
-  await page.keyboard.press("Escape");
-  await expect(page.getByTestId("combobox-desktop-container")).toHaveCount(0, { timeout: 5_000 });
-}
-
 async function recordAndBlockCreateAgentRequests(page: Page): Promise<{
   waitForCreateAgentRequest(): Promise<CreateAgentRequestMessage>;
 }> {
@@ -176,7 +158,6 @@ test.describe("New workspace Codex mode preferences", () => {
       await expect(page.getByTestId("mode-control").first()).toContainText("Default permissions", {
         timeout: 30_000,
       });
-      await expectThinkingOptionsFit(page);
       await selectMode(page, "Full access");
       await expect(page.getByTestId("mode-control").first()).toContainText("Full access");
 

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

@@ -10,15 +10,14 @@ import { getE2EDaemonPort } from "./helpers/daemon-port";
 import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
 import { seedSavedSettingsHosts } from "./helpers/settings";
 import { getServerId } from "./helpers/server-id";
-import { clickArchiveWorkspaceMenuItem, expectWorkspaceAbsentFromSidebar } from "./helpers/sidebar";
 import { waitForSidebarHydration } from "./helpers/workspace-ui";
 
-// Model B entry points into the New Workspace screen. The surviving entries are
+// Model B entry points into the New Workspace screen. The per-project
-// the global button (universal) and each project's per-row New workspace icon
+// "+ New workspace" sidebar row is gone; the surviving entries are the global
-// (preselects that project) — shown for git projects and for non-git projects on
+// button (universal) and each git project's own new-worktree icon (preselects
-// a multiplicity-capable host. These specs prove the global entry opens the
+// that project). These specs prove the global entry opens the screen, the
-// screen, the project icon preselects the right project across the reused 'new'
+// project icon preselects the right project across the reused 'new' screen, and
-// screen, and non-git projects never offer the worktree Isolation control.
+// non-git projects never offer the worktree Isolation control.
 
 function projectRow(page: import("@playwright/test").Page, projectKey: string) {
   return page.getByTestId(`sidebar-project-row-${projectKey}`);
@@ -106,54 +105,6 @@ test.describe("New workspace entry points", () => {
     }
   });
 
-  test("keeps the in-progress form when the remembered workspace is archived elsewhere", async ({
-    page,
-  }) => {
-    const otherProject: SeededWorkspace = await seedWorkspace({
-      repoPrefix: "aa-new-workspace-archive-other-",
-    });
-    const rememberedProject: SeededWorkspace = await seedWorkspace({
-      repoPrefix: "zz-new-workspace-archive-remembered-",
-    });
-    const serverId = getServerId();
-    const draftText = "keep this new workspace draft";
-
-    try {
-      await seedSavedSettingsHosts(page, [
-        {
-          serverId,
-          label: "localhost",
-          endpoint: `127.0.0.1:${getE2EDaemonPort()}`,
-        },
-      ]);
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await page
-        .getByTestId(`sidebar-workspace-row-${serverId}:${rememberedProject.workspaceId}`)
-        .click();
-      await expect(page).toHaveURL(/\/workspace\//, { timeout: 30_000 });
-
-      await page.goto(`/new?serverId=${encodeURIComponent(serverId)}`);
-      await expectNewWorkspaceProjectSelected(page, rememberedProject.projectDisplayName);
-
-      const composer = page.getByRole("textbox", { name: "Message agent..." });
-      await expect(composer).toBeEditable({ timeout: 30_000 });
-      await composer.fill(draftText);
-      await expect(composer).toHaveValue(draftText);
-
-      await clickArchiveWorkspaceMenuItem(page, rememberedProject.workspaceId);
-      await expectWorkspaceAbsentFromSidebar(page, rememberedProject.workspaceId);
-
-      await expect(page).toHaveURL(/\/new(?:\?.*)?$/, { timeout: 30_000 });
-      await expect(composer).toHaveValue(draftText);
-      await expectNewWorkspaceProjectSelected(page, rememberedProject.projectDisplayName);
-    } finally {
-      await otherProject.cleanup();
-      await rememberedProject.cleanup();
-    }
-  });
-
   test("each project's row icon preselects that project, and the reused screen resets a stale manual choice across projects", async ({
     page,
   }) => {
@@ -215,7 +166,7 @@ test.describe("New workspace entry points", () => {
       await expect(projectRow(page, nonGitProject.projectId)).toBeVisible({ timeout: 30_000 });
 
       // Open New Workspace for the non-git project via the global button, then
-      // select it in the picker (the per-row icon would preselect it too).
+      // select it in the picker (its row has no new-worktree icon).
       await openGlobalNewWorkspaceComposer(page);
       const trigger = page.getByTestId("new-workspace-project-picker-trigger");
       await expect(trigger).toBeVisible({ timeout: 30_000 });

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

@@ -10,8 +10,8 @@ import {
   openProjectViaDaemon,
   openStartingRefPicker,
   selectBranchInPicker,
+  selectWorkspaceIsolation,
 } from "./helpers/new-workspace";
-import { expectNoTruncation } from "./helpers/no-truncation";
 import { createTempGitRepo } from "./helpers/workspace";
 import { getServerId } from "./helpers/server-id";
 import { waitForSidebarHydration } from "./helpers/workspace-ui";
@@ -63,11 +63,7 @@ test.describe("New workspace isolation memory", () => {
         projectDisplayName: openedProject.projectDisplayName,
       });
       await expectWorkspaceIsolationSelected(page, "local");
-      await page.getByTestId("workspace-create-isolation-trigger").click();
+      await selectWorkspaceIsolation(page, "worktree");
-      const isolationPopup = page.getByTestId("combobox-desktop-container").last();
-      await expect(isolationPopup).toBeVisible({ timeout: 30_000 });
-      await expectNoTruncation(isolationPopup);
-      await page.getByTestId("workspace-create-isolation-worktree").click();
       await expectWorkspaceIsolationSelected(page, "worktree");
 
       await openStartingRefPicker(page);

packages/app/e2e/projects-settings.spec.ts

@@ -282,9 +282,9 @@ test.describe("Projects settings — error UX", () => {
     page,
     editableProject,
   }) => {
-    // Reject read_project_config_request calls until the user clicks Reload.
+    // Drop the WS connection the moment a read_project_config_request is sent.
-    // This keeps automatic reconnect refetches from racing past the callout.
+    // Subsequent connections are proxied transparently so Reload can succeed.
-    const transportFailure = await installReadTransportFailure(page);
+    await installReadTransportFailure(page);
 
     await openProjects(page);
     await navigateToProjectSettings(page, editableProject.name);
@@ -292,8 +292,7 @@ test.describe("Projects settings — error UX", () => {
     await expectProjectSettingsError(page, "transport");
     await expectProjectSettingsFormHidden(page);
 
-    // Retry Reload until the refetch wins any in-flight error-state rendering.
+    // The client reconnects after a ~1.5 s backoff; retry Reload until refetch succeeds.
-    transportFailure.allowRecovery();
     await expect(async () => {
       await clickReloadProjectSettings(page);
       await expectNoProjectSettingsError(page, "transport", 3_000);

packages/app/e2e/schedules-edit-model-hydration.spec.ts

@@ -1,238 +0,0 @@
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import {
-  addFakeScheduleHostAndReload,
-  buildFakeScheduleHostWorkspace,
-  FAKE_HOST_MODEL_ID,
-  FAKE_HOST_MODEL_LABEL,
-  installFakeScheduleHost,
-} from "./helpers/schedule-fake-host";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { expectSettled, expectStableHeight } from "./helpers/settled";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
-import { buildSchedulesRoute } from "../src/utils/host-routes";
-
-interface ScheduleSeedClient {
-  scheduleCreate(input: {
-    prompt: string;
-    name?: string;
-    cadence: { type: "cron"; expression: string };
-    target: {
-      type: "new-agent";
-      config: {
-        provider: "mock";
-        cwd: string;
-        model: string;
-        modeId: string;
-        title: string;
-      };
-    };
-    runOnCreate: boolean;
-  }): Promise<{ schedule: { id: string } | null; error: string | null }>;
-  scheduleDelete(input: { id: string }): Promise<{ error: string | null }>;
-}
-
-async function seedMockSchedule(workspace: SeededWorkspace, name: string): Promise<string> {
-  const client = workspace.client as unknown as ScheduleSeedClient;
-  const result = await client.scheduleCreate({
-    prompt: "Say hello from the scheduled agent.",
-    name,
-    cadence: { type: "cron", expression: "0 9 * * *" },
-    target: {
-      type: "new-agent",
-      config: {
-        provider: "mock",
-        cwd: workspace.repoPath,
-        model: "ten-second-stream",
-        modeId: "load-test",
-        title: name,
-      },
-    },
-    runOnCreate: false,
-  });
-
-  if (!result.schedule) {
-    throw new Error(result.error ?? "Failed to seed schedule");
-  }
-
-  return result.schedule.id;
-}
-
-function ignoreScheduleDeleteError(): void {}
-
-async function deleteSeededSchedule(workspace: SeededWorkspace, id: string): Promise<void> {
-  await (workspace.client as unknown as ScheduleSeedClient)
-    .scheduleDelete({ id })
-    .catch(ignoreScheduleDeleteError);
-}
-
-type FakeScheduleHostSchedule = NonNullable<
-  Parameters<typeof installFakeScheduleHost>[0]["schedules"]
->[number];
-
-function buildFakeHostSchedule(input: {
-  id: string;
-  name: string;
-  cwd: string;
-}): FakeScheduleHostSchedule {
-  const now = "2026-07-01T00:00:00.000Z";
-  return {
-    id: input.id,
-    name: input.name,
-    prompt: "Run on the secondary host.",
-    cadence: { type: "cron", expression: "0 9 * * *" },
-    target: {
-      type: "new-agent",
-      config: {
-        provider: "mock",
-        cwd: input.cwd,
-        model: FAKE_HOST_MODEL_ID,
-        modeId: "load-test",
-        title: input.name,
-      },
-    },
-    status: "active",
-    createdAt: now,
-    updatedAt: now,
-    nextRunAt: now,
-    lastRunAt: null,
-    pausedAt: null,
-    expiresAt: null,
-    maxRuns: null,
-  };
-}
-
-test.describe("Schedules", () => {
-  const cleanupTasks: Array<() => Promise<void>> = [];
-
-  test.afterEach(async () => {
-    for (const cleanup of cleanupTasks.toReversed()) {
-      await cleanup();
-    }
-    cleanupTasks.length = 0;
-  });
-
-  test("edit form hydrates the scheduled model selection", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "schedule-model-hydration-" });
-    cleanupTasks.push(() => workspace.cleanup());
-    const scheduleName = `Hydrate model ${Date.now()}`;
-    const scheduleId = await seedMockSchedule(workspace, scheduleName);
-    cleanupTasks.push(() => deleteSeededSchedule(workspace, scheduleId));
-
-    await page.goto(buildSchedulesRoute());
-    const row = page.getByTestId(`schedule-row-${scheduleId}`);
-    await expect(row).toBeVisible({ timeout: 30_000 });
-    await expect(row).toContainText(workspace.projectDisplayName, { timeout: 30_000 });
-
-    await row.click();
-    const formSheet = page.getByTestId("schedule-form-sheet");
-    await expect(formSheet).toBeVisible({ timeout: 10_000 });
-    await expectStableHeight(formSheet);
-    const hostTrigger = page.getByTestId("schedule-host-trigger");
-    const projectTrigger = page.getByTestId("schedule-project-trigger");
-    const modelTrigger = page.getByTestId("schedule-model-trigger");
-    const thinkingTrigger = page.getByTestId("schedule-thinking-trigger");
-    const modeTrigger = page.getByTestId("schedule-mode-trigger");
-    await expect(hostTrigger).toBeVisible({ timeout: 30_000 });
-    await expect(hostTrigger).toBeDisabled();
-    await expectSettled(hostTrigger);
-    await expect(projectTrigger).toContainText(workspace.projectDisplayName, { timeout: 30_000 });
-    await expectSettled(projectTrigger);
-    await expect(modelTrigger).toContainText("Ten second stream", { timeout: 30_000 });
-    await expectSettled(modelTrigger);
-    await expect(thinkingTrigger).toHaveCount(0);
-    await expect(modeTrigger).toBeVisible({ timeout: 30_000 });
-    await expectSettled(modeTrigger);
-    await expect(page.getByTestId("cadence-mode")).toHaveCount(0);
-    await expect(page.getByTestId("cadence-interval-value")).toHaveCount(0);
-    await expect(page.getByTestId("schedule-cadence-preset-trigger")).toContainText("Daily 9:00");
-    await expect(page.getByText(/Times are in/)).toHaveCount(0);
-    await expect(formSheet.getByText("Cron", { exact: true })).toHaveCount(0);
-  });
-
-  test("edit form hydrates a non-default host schedule after reload", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "schedule-host-b-hydration-" });
-    cleanupTasks.push(() => workspace.cleanup());
-    const fakeHost = await buildFakeScheduleHostWorkspace(workspace);
-    const fakePort = String(59_000 + Math.floor(Math.random() * 900));
-    const scheduleId = "fake-host-schedule";
-    const scheduleName = "Secondary host schedule";
-
-    await installFakeScheduleHost({
-      page,
-      port: fakePort,
-      serverId: fakeHost.serverId,
-      workspace: fakeHost.workspace,
-      schedules: [
-        buildFakeHostSchedule({
-          id: scheduleId,
-          name: scheduleName,
-          cwd: String(fakeHost.workspace.workspaceDirectory),
-        }),
-      ],
-    });
-
-    await gotoAppShell(page);
-    await waitForSidebarHydration(page);
-    await page.goto(buildSchedulesRoute());
-    await addFakeScheduleHostAndReload({
-      page,
-      serverId: fakeHost.serverId,
-      label: "Fake host",
-      port: fakePort,
-    });
-    await page.reload();
-
-    const row = page.getByTestId(`schedule-row-${scheduleId}`);
-    await expect(row).toBeVisible({ timeout: 30_000 });
-    await row.click();
-
-    const formSheet = page.getByTestId("schedule-form-sheet");
-    await expect(formSheet).toBeVisible({ timeout: 10_000 });
-    await expectStableHeight(formSheet);
-    const hostTrigger = page.getByTestId("schedule-host-trigger");
-    const projectTrigger = page.getByTestId("schedule-project-trigger");
-    const modelTrigger = page.getByTestId("schedule-model-trigger");
-    const modeTrigger = page.getByTestId("schedule-mode-trigger");
-
-    await expect(hostTrigger).toContainText("Fake host", { timeout: 30_000 });
-    await expect(hostTrigger).toBeDisabled();
-    await expectSettled(hostTrigger);
-    await expect(projectTrigger).toContainText(fakeHost.projectDisplayName, { timeout: 30_000 });
-    await expectSettled(projectTrigger);
-    await expect(modelTrigger).toContainText(FAKE_HOST_MODEL_LABEL, { timeout: 30_000 });
-    await expectSettled(modelTrigger);
-    await expect(modeTrigger).toContainText("Load test", { timeout: 30_000 });
-    await expectSettled(modeTrigger);
-    await expect(page.getByTestId("cadence-mode")).toHaveCount(0);
-    await expect(page.getByTestId("schedule-cadence-preset-trigger")).toContainText("Daily 9:00");
-  });
-
-  test("create opens pristine after closing an edit form", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "schedule-pristine-create-" });
-    cleanupTasks.push(() => workspace.cleanup());
-    const scheduleName = `Pristine create ${Date.now()}`;
-    const scheduleId = await seedMockSchedule(workspace, scheduleName);
-    cleanupTasks.push(() => deleteSeededSchedule(workspace, scheduleId));
-
-    await page.goto(buildSchedulesRoute());
-    const row = page.getByTestId(`schedule-row-${scheduleId}`);
-    await expect(row).toBeVisible({ timeout: 30_000 });
-    await row.click();
-    const formSheet = page.getByTestId("schedule-form-sheet");
-    await expect(formSheet).toBeVisible({ timeout: 10_000 });
-    await expectStableHeight(formSheet);
-    await page.getByRole("button", { name: "Cancel" }).click();
-    await expect(formSheet).toHaveCount(0, { timeout: 30_000 });
-
-    await page.getByTestId("schedules-new").click();
-    await expect(formSheet).toBeVisible({ timeout: 10_000 });
-    const projectTrigger = page.getByTestId("schedule-project-trigger");
-    await expect(projectTrigger).toContainText(/select project/i);
-    await expectSettled(projectTrigger);
-    await expect(page.getByTestId("schedule-model-trigger")).toHaveCount(0);
-    await expect(page.getByTestId("schedule-thinking-trigger")).toHaveCount(0);
-    await expect(page.getByTestId("schedule-mode-trigger")).toHaveCount(0);
-    await expect(page.getByTestId("cadence-interval-value")).toHaveCount(0);
-  });
-});

packages/app/e2e/schedules-project-target.spec.ts

@@ -1,415 +0,0 @@
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import {
-  addFakeScheduleHostAndReload,
-  buildFakeScheduleHostWorkspace,
-  installFakeScheduleHost,
-} from "./helpers/schedule-fake-host";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { escapeRegex } from "./helpers/regex";
-import { expectNoTruncation } from "./helpers/no-truncation";
-import { expectSettled, expectStableHeight } from "./helpers/settled";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
-import { buildSchedulesRoute } from "../src/utils/host-routes";
-
-const MOBILE_SHEET_VIEWPORT = { width: 390, height: 844 };
-
-interface ScheduleListItem {
-  id: string;
-  name: string | null;
-  cadence?: { type: "cron"; expression: string };
-  target: {
-    type: string;
-    config?: {
-      cwd?: string;
-      archiveOnFinish?: boolean;
-      isolation?: "local" | "worktree";
-    };
-  };
-}
-
-interface ScheduleSeedClient {
-  scheduleList(): Promise<{ schedules: ScheduleListItem[]; error: string | null }>;
-  scheduleDelete(input: { id: string }): Promise<{ error: string | null }>;
-}
-
-async function selectModelByLabel(page: Page, label: string): Promise<void> {
-  await page.getByRole("button", { name: /select model/i }).click();
-  const popup = page.getByTestId("combobox-desktop-container");
-  await expect(popup).toBeVisible({ timeout: 30_000 });
-  const searchInput = page.getByTestId("model-search-input").first();
-  await expect(searchInput).toBeVisible({ timeout: 30_000 });
-  await searchInput.fill(label);
-  const option = popup.getByText(new RegExp(`^${escapeRegex(label)}$`, "i")).first();
-  await expect(option).toBeVisible({ timeout: 30_000 });
-  await option.click();
-  await expect(popup).toHaveCount(0, { timeout: 30_000 });
-}
-
-async function deleteScheduleByName(workspace: SeededWorkspace, name: string): Promise<void> {
-  const client = workspace.client as unknown as ScheduleSeedClient;
-  const list = await client.scheduleList();
-  const schedule = list.schedules.find((candidate) => candidate.name === name);
-  if (schedule) {
-    await client.scheduleDelete({ id: schedule.id }).catch(() => undefined);
-  }
-}
-
-async function expectScheduleCreatedForProject(input: {
-  workspace: SeededWorkspace;
-  name: string;
-  cadenceExpression: string;
-}): Promise<void> {
-  const client = input.workspace.client as unknown as ScheduleSeedClient;
-  const list = await client.scheduleList();
-  const schedule = list.schedules.find((candidate) => candidate.name === input.name);
-  expect(schedule).toEqual(
-    expect.objectContaining({
-      name: input.name,
-      cadence: expect.objectContaining({
-        type: "cron",
-        expression: input.cadenceExpression,
-      }),
-      target: expect.objectContaining({
-        type: "new-agent",
-        config: expect.objectContaining({
-          cwd: input.workspace.repoPath,
-        }),
-      }),
-    }),
-  );
-}
-
-async function expectScheduleKnobs(input: {
-  workspace: SeededWorkspace;
-  name: string;
-  archiveOnFinish: boolean;
-  isolation: "local" | "worktree";
-}): Promise<void> {
-  const client = input.workspace.client as unknown as ScheduleSeedClient;
-  const list = await client.scheduleList();
-  const schedule = list.schedules.find((candidate) => candidate.name === input.name);
-  expect(schedule).toEqual(
-    expect.objectContaining({
-      name: input.name,
-      target: expect.objectContaining({
-        type: "new-agent",
-        config: expect.objectContaining({
-          archiveOnFinish: input.archiveOnFinish,
-          isolation: input.isolation,
-        }),
-      }),
-    }),
-  );
-}
-
-async function openNewScheduleSheet(page: Page): Promise<void> {
-  await page.getByTestId("schedules-empty-new").click();
-  const formSheet = page.getByTestId("schedule-form-sheet");
-  await expect(formSheet).toBeVisible({ timeout: 10_000 });
-  await expectStableHeight(formSheet);
-}
-
-function bottomSheetBackdrop(page: Page) {
-  return page.getByRole("button", { name: "Bottom sheet backdrop" }).first();
-}
-
-async function dismissScheduleSheetWithBackdrop(page: Page): Promise<void> {
-  const backdrop = bottomSheetBackdrop(page);
-  await expect(backdrop).toBeVisible({ timeout: 10_000 });
-  await expect(async () => {
-    const box = await backdrop.boundingBox();
-    if (box) {
-      await page.mouse.click(box.x + box.width / 2, box.y + 24);
-    }
-    await expect(backdrop).not.toBeVisible({ timeout: 1_000 });
-  }).toPass({ timeout: 15_000 });
-}
-
-async function expectScheduleSheetClosedAndStable(page: Page): Promise<void> {
-  const formSheet = page.getByTestId("schedule-form-sheet");
-  await expect(formSheet).toHaveCount(0, { timeout: 30_000 });
-  await page.waitForTimeout(500);
-  await expect(formSheet).toHaveCount(0, { timeout: 1_000 });
-}
-
-async function findScheduleIdByName(workspace: SeededWorkspace, name: string): Promise<string> {
-  const client = workspace.client as unknown as ScheduleSeedClient;
-  const list = await client.scheduleList();
-  const schedule = list.schedules.find((candidate) => candidate.name === name);
-  if (!schedule) {
-    throw new Error(`Expected schedule named ${name} to exist`);
-  }
-  return schedule.id;
-}
-
-test.describe("Schedules project target", () => {
-  const cleanupTasks: Array<() => Promise<void>> = [];
-
-  test.afterEach(async () => {
-    for (const cleanup of cleanupTasks.toReversed()) {
-      await cleanup();
-    }
-    cleanupTasks.length = 0;
-  });
-
-  test("dismisses the new schedule sheet without reopening", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "schedule-sheet-dismiss-", git: false });
-    cleanupTasks.push(() => workspace.cleanup());
-
-    await gotoAppShell(page);
-    await waitForSidebarHydration(page);
-    await page.goto(buildSchedulesRoute());
-    await page.setViewportSize(MOBILE_SHEET_VIEWPORT);
-    await expect(page.getByTestId("schedules-empty-new")).toBeVisible({ timeout: 30_000 });
-
-    await openNewScheduleSheet(page);
-    await dismissScheduleSheetWithBackdrop(page);
-    await expectScheduleSheetClosedAndStable(page);
-    await expect(page.getByTestId("schedules-empty-new")).toBeVisible({ timeout: 30_000 });
-
-    await openNewScheduleSheet(page);
-    await page.getByRole("button", { name: "Cancel" }).click();
-    await expectScheduleSheetClosedAndStable(page);
-  });
-
-  test("creates a schedule from a project picker instead of a raw CWD selector", async ({
-    page,
-  }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "schedule-project-target-", git: false });
-    cleanupTasks.push(() => workspace.cleanup());
-    const scheduleName = `Project schedule ${Date.now()}`;
-    cleanupTasks.push(() => deleteScheduleByName(workspace, scheduleName));
-
-    await gotoAppShell(page);
-    await waitForSidebarHydration(page);
-
-    await page.getByRole("button", { name: "Schedules" }).click();
-    await expect(page).toHaveURL(/\/schedules$/);
-    await expect(page).not.toHaveURL(/\/h\//);
-    await expect(page.getByTestId("schedules-empty")).toBeVisible();
-
-    await page.getByTestId("schedules-empty-new").click();
-    const formSheet = page.getByTestId("schedule-form-sheet");
-    await expect(formSheet).toBeVisible({ timeout: 10_000 });
-    await expectStableHeight(formSheet);
-    await expect(page.getByTestId("schedule-host-trigger")).toHaveCount(0);
-    await expect(page.getByTestId("schedule-project-trigger")).toBeVisible();
-    await expect(page.getByTestId("schedule-model-trigger")).toHaveCount(0);
-    await expect(page.getByTestId("schedule-thinking-trigger")).toHaveCount(0);
-    await expect(page.getByTestId("schedule-mode-trigger")).toHaveCount(0);
-    await expect(page.getByTestId("cadence-mode")).toHaveCount(0);
-    await expect(page.getByTestId("cadence-interval-value")).toHaveCount(0);
-    await expect(page.getByText(/Times are in/)).toHaveCount(0);
-    await expect(formSheet.getByText("Cron", { exact: true })).toHaveCount(0);
-
-    await page.getByRole("button", { name: /select project/i }).click();
-    await page.getByTestId(`schedule-project-option-${workspace.projectId}`).click();
-    const projectTrigger = page.getByTestId("schedule-project-trigger");
-    await expect(projectTrigger).toContainText(workspace.projectDisplayName);
-    await expectSettled(projectTrigger);
-
-    await selectModelByLabel(page, "Ten second stream");
-    const modelTrigger = page.getByTestId("schedule-model-trigger");
-    await expect(modelTrigger).toContainText("Ten second stream");
-    await expectSettled(modelTrigger);
-    await expect(page.getByTestId("schedule-thinking-trigger")).toHaveCount(0);
-    await expect(page.getByTestId("schedule-mode-trigger")).toBeVisible();
-    await expectSettled(page.getByTestId("schedule-mode-trigger"));
-    await expect(page.getByTestId("schedule-isolation-trigger")).toHaveCount(0);
-    await expect(page.getByText("Worktree isolation is available for git projects.")).toHaveCount(
-      0,
-    );
-
-    await page.getByTestId("schedule-cadence-preset-trigger").click();
-    await page.getByTestId("schedule-cadence-preset-daily-9").click();
-    await expect(page.getByTestId("schedule-cadence-preset-trigger")).toContainText("Daily 9:00");
-    await expect(page.getByTestId("cadence-cron-expression")).toHaveValue("0 9 * * *");
-
-    await page.getByLabel("Schedule name").fill(scheduleName);
-    await page.getByLabel("Prompt").fill("Summarize the project status.");
-    await page.getByRole("button", { name: "Create schedule" }).click();
-
-    await expect(page.getByTestId("schedule-form-sheet")).toHaveCount(0, { timeout: 30_000 });
-    await expectScheduleCreatedForProject({
-      workspace,
-      name: scheduleName,
-      cadenceExpression: "0 9 * * *",
-    });
-
-    const fakeHost = await buildFakeScheduleHostWorkspace(workspace);
-    const fakePort = String(59_000 + Math.floor(Math.random() * 900));
-    await installFakeScheduleHost({
-      page,
-      port: fakePort,
-      serverId: fakeHost.serverId,
-      workspace: fakeHost.workspace,
-    });
-    await addFakeScheduleHostAndReload({
-      page,
-      serverId: fakeHost.serverId,
-      label: "Fake host",
-      port: fakePort,
-    });
-
-    const hostFilterTrigger = page.getByTestId("schedules-host-filter-trigger");
-    await expect(hostFilterTrigger).toBeVisible({ timeout: 30_000 });
-    await hostFilterTrigger.click();
-    const hostFilterPopup = page.getByTestId("combobox-desktop-container").last();
-    await expect(hostFilterPopup).toBeVisible({ timeout: 30_000 });
-    await expectNoTruncation(hostFilterPopup);
-    await page.keyboard.press("Escape");
-    await expect(page.getByTestId("combobox-desktop-container")).toHaveCount(0, {
-      timeout: 5_000,
-    });
-  });
-
-  test("clears the selected project and model when the host changes", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "schedule-project-host-model-" });
-    cleanupTasks.push(() => workspace.cleanup());
-    const serverId = getServerId();
-    const fakeHost = await buildFakeScheduleHostWorkspace(workspace);
-    const fakePort = String(59_000 + Math.floor(Math.random() * 900));
-
-    await installFakeScheduleHost({
-      page,
-      port: fakePort,
-      serverId: fakeHost.serverId,
-      workspace: fakeHost.workspace,
-    });
-
-    await gotoAppShell(page);
-    await waitForSidebarHydration(page);
-    await page.goto(buildSchedulesRoute());
-    await addFakeScheduleHostAndReload({
-      page,
-      serverId: fakeHost.serverId,
-      label: "Fake host",
-      port: fakePort,
-    });
-    await expect(page.getByTestId("schedules-empty")).toBeVisible({ timeout: 30_000 });
-    await page.getByTestId("schedules-empty-new").click();
-    const formSheet = page.getByTestId("schedule-form-sheet");
-    await expect(formSheet).toBeVisible({ timeout: 10_000 });
-    await expectStableHeight(formSheet);
-
-    const hostTrigger = page.getByTestId("schedule-host-trigger");
-    const projectTrigger = page.getByTestId("schedule-project-trigger");
-    const modelTrigger = page.getByTestId("schedule-model-trigger");
-    const thinkingTrigger = page.getByTestId("schedule-thinking-trigger");
-    const modeTrigger = page.getByTestId("schedule-mode-trigger");
-    await expect(hostTrigger).toBeVisible({ timeout: 30_000 });
-    await expect(projectTrigger).toHaveCount(0);
-    await expect(modelTrigger).toHaveCount(0);
-    await expect(thinkingTrigger).toHaveCount(0);
-    await expect(modeTrigger).toHaveCount(0);
-    await hostTrigger.click();
-    await page.getByTestId(`schedule-host-option-${serverId}`).click();
-    await expect(projectTrigger).toBeVisible();
-    await expect(modelTrigger).toHaveCount(0);
-    await expect(thinkingTrigger).toHaveCount(0);
-    await expect(modeTrigger).toHaveCount(0);
-    await expectSettled(hostTrigger);
-
-    await projectTrigger.click();
-    await page.getByTestId(`schedule-project-option-${workspace.projectId}`).click();
-    await expect(projectTrigger).toContainText(workspace.projectDisplayName);
-    await expectSettled(projectTrigger);
-
-    await selectModelByLabel(page, "Ten second stream");
-    await expect(modelTrigger).toContainText("Ten second stream");
-    await expectSettled(modelTrigger);
-    await expect(thinkingTrigger).toHaveCount(0);
-    await expect(modeTrigger).toBeVisible();
-    await expectSettled(modeTrigger);
-
-    await hostTrigger.click();
-    await page.getByTestId(`schedule-host-option-${fakeHost.serverId}`).click();
-    await expect(hostTrigger).toContainText("Fake host");
-    await expect(projectTrigger).toContainText(/select project/i);
-    await expect(modelTrigger).toHaveCount(0);
-    await expect(thinkingTrigger).toHaveCount(0);
-    await expect(modeTrigger).toHaveCount(0);
-    await expectSettled(hostTrigger);
-    await expectSettled(projectTrigger);
-
-    await projectTrigger.click();
-    await expect(page.getByTestId(`schedule-project-option-${workspace.projectId}`)).toHaveCount(0);
-    await page.getByTestId(`schedule-project-option-${fakeHost.projectId}`).click();
-    await expect(projectTrigger).toContainText(fakeHost.projectDisplayName);
-    await expectSettled(projectTrigger);
-    await expect(modelTrigger).toContainText(/select model/i);
-    await expectSettled(modelTrigger);
-    await expect(thinkingTrigger).toHaveCount(0);
-    await expect(modeTrigger).toHaveCount(0);
-
-    await page.getByLabel("Schedule name").fill(`Cross host model ${Date.now()}`);
-    await page.getByLabel("Prompt").fill("Run on the fake host project.");
-    await expect(page.getByRole("button", { name: "Create schedule" })).toBeDisabled();
-  });
-
-  test("creates and edits schedule isolation and archive cleanup knobs", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "schedule-knobs-" });
-    cleanupTasks.push(() => workspace.cleanup());
-    const scheduleName = `Knob schedule ${Date.now()}`;
-    cleanupTasks.push(() => deleteScheduleByName(workspace, scheduleName));
-
-    await gotoAppShell(page);
-    await waitForSidebarHydration(page);
-    await page.goto(buildSchedulesRoute());
-    await expect(page.getByTestId("schedules-empty-new")).toBeVisible({ timeout: 30_000 });
-    await page.getByTestId("schedules-empty-new").click();
-
-    await page.getByRole("button", { name: /select project/i }).click();
-    await page.getByTestId(`schedule-project-option-${workspace.projectId}`).click();
-    await selectModelByLabel(page, "Ten second stream");
-    await expect(
-      page.getByText("Off keeps each run's workspace in the sidebar for inspection."),
-    ).toHaveCount(0);
-    await page.getByTestId("schedule-isolation-trigger").click();
-    await page.getByTestId("schedule-isolation-worktree").click();
-    await expect(page.getByTestId("schedule-isolation-trigger")).toContainText("Worktree");
-    await page.getByTestId("schedule-archive-on-finish-switch").click();
-    await page.getByLabel("Schedule name").fill(scheduleName);
-    await page.getByLabel("Prompt").fill("Run with custom workspace cleanup.");
-    await page.getByTestId("schedule-cadence-preset-trigger").click();
-    await page.getByTestId("schedule-cadence-preset-every-hour").click();
-    await page.getByRole("button", { name: "Create schedule" }).click();
-
-    await expect(page.getByTestId("schedule-form-sheet")).toHaveCount(0, { timeout: 30_000 });
-    await expectScheduleKnobs({
-      workspace,
-      name: scheduleName,
-      archiveOnFinish: false,
-      isolation: "worktree",
-    });
-
-    const scheduleId = await findScheduleIdByName(workspace, scheduleName);
-    await page.getByTestId(`schedule-row-${scheduleId}`).click();
-    const formSheet = page.getByTestId("schedule-form-sheet");
-    await expect(formSheet).toBeVisible({ timeout: 10_000 });
-    await expectStableHeight(formSheet);
-    await expect(page.getByTestId("schedule-isolation-trigger")).toContainText("Worktree");
-    await expect(page.getByTestId("schedule-archive-on-finish-switch")).toHaveAttribute(
-      "aria-checked",
-      "false",
-    );
-    await expect(
-      page.getByText("Off keeps each run's workspace in the sidebar for inspection."),
-    ).toHaveCount(0);
-
-    await page.getByTestId("schedule-isolation-trigger").click();
-    await page.getByTestId("schedule-isolation-local").click();
-    await page.getByTestId("schedule-archive-on-finish-switch").click();
-    await page.getByRole("button", { name: "Save changes" }).click();
-
-    await expect(page.getByTestId("schedule-form-sheet")).toHaveCount(0, { timeout: 30_000 });
-    await expectScheduleKnobs({
-      workspace,
-      name: scheduleName,
-      archiveOnFinish: true,
-      isolation: "local",
-    });
-  });
-});

packages/app/e2e/settings-host-page.spec.ts

@@ -64,7 +64,7 @@ test.describe("Settings host page", () => {
     await openSettingsHost(page, serverId);
 
     await openHostSection(page, serverId, "host");
-    await expectSettingsHeader(page, "Overview");
+    await expectSettingsHeader(page, "Host");
     await expectHostLabelDisplayed(page);
     await expectHostActionCards(page, serverId);
   });

packages/app/e2e/sidebar-model-b.spec.ts

@@ -38,7 +38,7 @@ async function seedSecondWorkspace(seeded: SeededWorkspace, title: string): Prom
 test.describe("Model B sidebar shape", () => {
   test.describe.configure({ timeout: 180_000 });
 
-  test("git and non-git projects both render as expandable parents, both show a per-row New workspace icon, and the global button covers both", async ({
+  test("git and non-git projects both render as expandable parents; git keeps a per-row new-worktree icon, the global button covers both", async ({
     page,
   }) => {
     const gitProject = await seedWorkspace({ repoPrefix: "model-b-git-" });
@@ -62,17 +62,14 @@ test.describe("Model B sidebar shape", () => {
       await expect(workspaceRow(page, nonGitProject.workspaceId)).toBeVisible({ timeout: 30_000 });
       await expect(workspaceRow(page, nonGitSecondId)).toBeVisible({ timeout: 30_000 });
 
-      // Both projects show a per-row New workspace icon (revealed on hover): the
+      // The per-project "+ New workspace" row is gone. The git project keeps a
-      // git project can branch off a worktree, and the non-git project can add
+      // per-row new-worktree icon (revealed on hover); the non-git project has
-      // another workspace because the host supports workspaceMultiplicity.
+      // none, since worktree creation needs a git checkout.
       await projectRow(page, gitProject.projectId).hover();
       await expect(projectNewWorktreeIcon(page, gitProject.projectId)).toBeVisible({
         timeout: 30_000,
       });
-      await projectRow(page, nonGitProject.projectId).hover();
+      await expect(projectNewWorktreeIcon(page, nonGitProject.projectId)).toHaveCount(0);
-      await expect(projectNewWorktreeIcon(page, nonGitProject.projectId)).toBeVisible({
-        timeout: 30_000,
-      });
 
       // The global new-workspace button is the universal entry — present for both
       // kinds regardless of their per-row affordance.

packages/app/e2e/workspace-navigation-regression.spec.ts

@@ -256,7 +256,9 @@ test.describe("Workspace navigation regression", () => {
       await ws.close({ code: 1008, reason: "Blocked cold offline workspace route test." });
     });
 
-    await page.goto(buildHostWorkspaceRoute(serverId, "/tmp/paseo-missing-workspace"));
+    await page.goto(
+      `/h/${encodeURIComponent(serverId)}/workspace/${encodeURIComponent("/tmp/paseo-missing-workspace")}`,
+    );
 
     await expectHostConnectingOrOffline(page);
     await expectMenuButtonVisible(page);

packages/app/package.json

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

packages/app/src/app/_layout.tsx

@@ -84,10 +84,9 @@ import { useStableEvent } from "@/hooks/use-stable-event";
 import { I18nProvider } from "@/i18n/provider";
 import { keyboardActionDispatcher } from "@/keyboard/keyboard-action-dispatcher";
 import { polyfillCrypto } from "@/polyfills/crypto";
-import { queryClient } from "@/data/query-client";
+import { queryClient } from "@/query/query-client";
 import {
   getHostRuntimeStore,
-  hasConfiguredLocalDaemonOverride,
   useHostRegistryLoaded,
   useHostMutations,
   useHostRuntimeClient,
@@ -134,13 +133,14 @@ const HostRuntimeBootstrapContext = createContext<HostRuntimeBootstrapState>({
 
 function PushNotificationRouter() {
   const router = useRouter();
+  const pathname = usePathname();
   const lastHandledIdRef = useRef<string | null>(null);
   const openNotification = useStableEvent((data: Record<string, unknown> | undefined) => {
     const target = resolveNotificationTarget(data);
     const serverId = target.serverId;
     const agentId = target.agentId;
     if (serverId && agentId) {
-      navigateToAgent({ serverId, agentId, pin: true });
+      navigateToAgent({ serverId, agentId, currentPathname: pathname, pin: true });
       return;
     }
 
@@ -313,9 +313,6 @@ async function shouldStartBuiltInDaemon(): Promise<boolean> {
   if (!shouldUseDesktopDaemon()) {
     return false;
   }
-  if (hasConfiguredLocalDaemonOverride()) {
-    return false;
-  }
   const settings = await loadDesktopSettings();
   return settings.daemon.manageBuiltInDaemon;
 }
@@ -892,7 +889,6 @@ function AppWithSidebar({ children }: { children: ReactNode }) {
     (pathname === "/open-project" ||
       pathname === "/new" ||
       pathname === "/sessions" ||
-      pathname === "/schedules" ||
       routeHasKnownHost);
 
   // Parse selectedAgentKey directly from pathname
@@ -951,7 +947,6 @@ function RootStack() {
         <Stack.Screen name="new" />
         <Stack.Screen name="open-project" />
         <Stack.Screen name="sessions" />
-        <Stack.Screen name="schedules" />
         <Stack.Screen name="pair-scan" />
       </Stack.Protected>
       <Stack.Screen name="h/[serverId]" />

packages/app/src/app/h/[serverId]/agent/[agentId].tsx

@@ -1,5 +1,5 @@
 import { useEffect, useRef } from "react";
-import { useLocalSearchParams, useRouter, type Href } from "expo-router";
+import { useLocalSearchParams, usePathname, useRouter, type Href } from "expo-router";
 import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
 import { useSessionStore } from "@/stores/session-store";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
@@ -17,6 +17,7 @@ export default function HostAgentReadyRoute() {
 
 function HostAgentReadyRouteContent() {
   const router = useRouter();
+  const pathname = usePathname();
   const params = useLocalSearchParams<{
     serverId?: string;
     agentId?: string;
@@ -52,9 +53,10 @@ function HostAgentReadyRouteContent() {
       navigateToAgent({
         serverId,
         agentId,
+        currentPathname: pathname,
       });
     }
-  }, [agentId, resolvedWorkspaceId, router, serverId]);
+  }, [agentId, pathname, resolvedWorkspaceId, router, serverId]);
 
   useEffect(() => {
     if (redirectedRef.current) {
@@ -94,6 +96,7 @@ function HostAgentReadyRouteContent() {
             serverId,
             agentId,
             workspaceId,
+            currentPathname: pathname,
           });
           return;
         }
@@ -111,7 +114,7 @@ function HostAgentReadyRouteContent() {
     return () => {
       cancelled = true;
     };
-  }, [agentId, client, isConnected, router, serverId]);
+  }, [agentId, client, isConnected, pathname, router, serverId]);
 
   return null;
 }

packages/app/src/app/schedules.tsx

@@ -1,10 +0,0 @@
-import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
-import { SchedulesScreen } from "@/screens/schedules-screen";
-
-export default function SchedulesRoute() {
-  return (
-    <HostRouteBootstrapBoundary>
-      <SchedulesScreen />
-    </HostRouteBootstrapBoundary>
-  );
-}

packages/app/src/app/settings/[section].tsx

@@ -1,38 +1,7 @@
-import { Redirect, useLocalSearchParams } from "expo-router";
+import { useLocalSearchParams } from "expo-router";
 import { useMemo } from "react";
-import { useHostRuntimeBootstrapState } from "@/app/_layout";
-import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
-import { useLocalDaemonServerIdState } from "@/hooks/use-is-local-daemon";
-import { useHosts } from "@/runtime/host-runtime";
 import SettingsScreen from "@/screens/settings-screen";
-import { StartupSplashScreen } from "@/screens/startup-splash-screen";
+import { isSettingsSectionSlug, type SettingsSectionSlug } from "@/utils/host-routes";
-import {
-  buildSettingsHostSectionRoute,
-  buildSettingsRoute,
-  isSettingsSectionSlug,
-  type SettingsSectionSlug,
-} from "@/utils/host-routes";
-
-// COMPAT(settingsDaemonRedirect): added 2026-07-08, remove after 2027-01-08.
-function SettingsDaemonRedirect() {
-  const hosts = useHosts();
-  const localDaemon = useLocalDaemonServerIdState();
-  const bootstrapState = useHostRuntimeBootstrapState();
-
-  if (localDaemon.status === "loading") {
-    return <StartupSplashScreen bootstrapState={bootstrapState} />;
-  }
-
-  if (
-    localDaemon.status === "resolved" &&
-    localDaemon.serverId !== null &&
-    hosts.some((host) => host.serverId === localDaemon.serverId)
-  ) {
-    return <Redirect href={buildSettingsHostSectionRoute(localDaemon.serverId, "host")} />;
-  }
-
-  return <Redirect href={buildSettingsRoute()} />;
-}
 
 export default function SettingsSectionRoute() {
   const params = useLocalSearchParams<{ section?: string; addHost?: string }>();
@@ -41,14 +10,5 @@ export default function SettingsSectionRoute() {
   const openAddHostIntent = typeof params.addHost === "string" ? params.addHost : null;
   const view = useMemo(() => ({ kind: "section" as const, section }), [section]);
 
-  // COMPAT(settingsDaemonRedirect): added 2026-07-08, remove after 2027-01-08.
-  if (rawSection === "daemon") {
-    return (
-      <HostRouteBootstrapBoundary>
-        <SettingsDaemonRedirect />
-      </HostRouteBootstrapBoundary>
-    );
-  }
-
   return <SettingsScreen view={view} openAddHostIntent={openAddHostIntent} />;
 }

packages/app/src/attachments/types.ts

@@ -42,14 +42,6 @@ export interface BrowserElementAttachment {
   } | null;
   parentChain: string[];
   children: string[];
-  /** Free-text review note the user wrote about this element, if any. */
-  comment?: string;
-  /**
-   * Cropped screenshot of the selected element, sent to the agent as an image
-   * alongside the textual element context. Persisted via the attachment store;
-   * referenced by id so the draft-store GC keeps it alive.
-   */
-  screenshot?: AttachmentMetadata;
   formatted: string;
 }
 

packages/app/src/browser-automation/handler.test.ts

@@ -1,611 +0,0 @@
-import { beforeEach, describe, expect, test } from "vitest";
-import type { SessionInboundMessage, SessionOutboundMessage } from "@getpaseo/protocol/messages";
-import { createJSONStorage, type StateStorage } from "zustand/middleware";
-import { mountBrowserAutomationHandler } from "./handler";
-import type { DesktopHostBridge } from "@/desktop/host";
-import { useBrowserStore } from "@/stores/browser-store";
-import {
-  buildWorkspaceTabPersistenceKey,
-  useWorkspaceLayoutStore,
-} from "@/stores/workspace-layout-store";
-
-type BrowserAutomationExecuteRequest = Extract<
-  SessionOutboundMessage,
-  { type: "browser.automation.execute.request" }
->;
-type BrowserAutomationExecuteResponse = Extract<
-  SessionInboundMessage,
-  { type: "browser.automation.execute.response" }
->;
-type BrowserAutomationResponsePayload = BrowserAutomationExecuteResponse["payload"];
-
-class FakeStateStorage implements StateStorage {
-  private readonly values = new Map<string, string>();
-
-  public getItem = (key: string): string | null => this.values.get(key) ?? null;
-
-  public setItem = (key: string, value: string): void => {
-    this.values.set(key, value);
-  };
-
-  public removeItem = (key: string): void => {
-    this.values.delete(key);
-  };
-
-  public clear(): void {
-    this.values.clear();
-  }
-}
-
-class FakeDaemonClient {
-  public readonly sentResponses: BrowserAutomationExecuteResponse[] = [];
-  private handler: ((request: BrowserAutomationExecuteRequest) => void) | null = null;
-
-  public on(
-    type: "browser.automation.execute.request",
-    handler: (request: BrowserAutomationExecuteRequest) => void,
-  ): () => void {
-    expect(type).toBe("browser.automation.execute.request");
-    this.handler = handler;
-    return () => {
-      if (this.handler === handler) {
-        this.handler = null;
-      }
-    };
-  }
-
-  public sendBrowserAutomationExecuteResponse(response: BrowserAutomationExecuteResponse): void {
-    this.sentResponses.push(response);
-  }
-
-  public receive(nextRequest: BrowserAutomationExecuteRequest): void {
-    this.handler?.(nextRequest);
-  }
-
-  public payloadAt(index: number): BrowserAutomationResponsePayload {
-    const response = this.sentResponses[index];
-    if (!response) {
-      throw new Error(`Missing browser automation response at index ${index}`);
-    }
-    return response.payload;
-  }
-}
-
-class FakeBrowserBridge {
-  public readonly executedRequests: BrowserAutomationExecuteRequest[] = [];
-  public readonly registeredWorkspaceBrowsers: Array<{ browserId: string; workspaceId: string }> =
-    [];
-  public readonly unregisteredWorkspaceBrowsers: string[] = [];
-  public readonly clearedPartitions: string[] = [];
-  public readonly activeWorkspaceBrowsers: Array<{
-    browserId: string | null;
-    workspaceId: string;
-  }> = [];
-  public response: BrowserAutomationResponsePayload | null = null;
-  public thrownError: unknown = null;
-
-  public executeAutomationCommand = async (
-    request: BrowserAutomationExecuteRequest,
-  ): Promise<BrowserAutomationResponsePayload> => {
-    this.executedRequests.push(request);
-    if (this.thrownError) {
-      throw this.thrownError;
-    }
-    return this.response ?? currentListTabsPayload(request.requestId);
-  };
-
-  public registerWorkspaceBrowser = async (input: {
-    browserId: string;
-    workspaceId: string;
-  }): Promise<void> => {
-    this.registeredWorkspaceBrowsers.push(input);
-  };
-
-  public unregisterWorkspaceBrowser = async (browserId: string): Promise<void> => {
-    this.unregisteredWorkspaceBrowsers.push(browserId);
-  };
-
-  public clearPartition = async (browserId: string): Promise<void> => {
-    this.clearedPartitions.push(browserId);
-  };
-
-  public setWorkspaceActiveBrowser = async (input: {
-    browserId: string | null;
-    workspaceId: string;
-  }): Promise<void> => {
-    this.activeWorkspaceBrowsers.push(input);
-  };
-}
-
-class FakeResidentBrowser {
-  public readonly ensuredWebviews: Array<{ browserId: string; url: string }> = [];
-
-  public ensure = (input: { browserId: string; url: string }): HTMLElement | null => {
-    this.ensuredWebviews.push(input);
-    return null;
-  };
-}
-
-class BrowserAutomationHandlerHarness {
-  public readonly client = new FakeDaemonClient();
-  public readonly browser = new FakeBrowserBridge();
-  public readonly resident = new FakeResidentBrowser();
-  private unsubscribe: (() => void) | null = null;
-
-  public mount(
-    input: {
-      serverId?: string;
-      host?: DesktopHostBridge | null;
-      registrationWaitTimeoutMs?: number;
-      registrationPollIntervalMs?: number;
-    } = {},
-  ): void {
-    this.unsubscribe = mountBrowserAutomationHandler({
-      client: this.client,
-      ...(input.serverId ? { serverId: input.serverId } : {}),
-      getHost: () => (input.host === undefined ? { browser: this.browser } : input.host),
-      ensureResidentBrowserWebview: this.resident.ensure,
-      ...(input.registrationWaitTimeoutMs !== undefined
-        ? { registrationWaitTimeoutMs: input.registrationWaitTimeoutMs }
-        : {}),
-      ...(input.registrationPollIntervalMs !== undefined
-        ? { registrationPollIntervalMs: input.registrationPollIntervalMs }
-        : {}),
-    });
-  }
-
-  public unmount(): void {
-    this.unsubscribe?.();
-    this.unsubscribe = null;
-  }
-
-  public receive(request: BrowserAutomationExecuteRequest): void {
-    this.client.receive(request);
-  }
-}
-
-function browserAutomationRequest(): BrowserAutomationExecuteRequest {
-  return {
-    type: "browser.automation.execute.request",
-    requestId: "req-1",
-    command: { command: "list_tabs", args: {} },
-  };
-}
-
-function browserNewTabRequest(): BrowserAutomationExecuteRequest {
-  return {
-    type: "browser.automation.execute.request",
-    requestId: "req-new",
-    agentId: "agent-1",
-    workspaceId: "wks_workspace_a",
-    command: {
-      command: "new_tab",
-      args: { url: "https://example.com" },
-    },
-  };
-}
-
-function browserResizeRequest(
-  browserId: string,
-  input: { workspaceId?: string } = {},
-): BrowserAutomationExecuteRequest {
-  return {
-    type: "browser.automation.execute.request",
-    requestId: "req-resize",
-    agentId: "agent-1",
-    workspaceId: input.workspaceId ?? "wks_workspace_a",
-    command: {
-      command: "resize",
-      args: { browserId, width: 1024, height: 768 },
-    },
-  };
-}
-
-function browserCloseTabRequest(browserId: string): BrowserAutomationExecuteRequest {
-  return {
-    type: "browser.automation.execute.request",
-    requestId: "req-close-tab",
-    agentId: "agent-1",
-    workspaceId: "wks_workspace_a",
-    command: {
-      command: "close_tab",
-      args: { browserId },
-    },
-  };
-}
-
-function emptyListTabsPayload(requestId = "req-new:list_tabs"): BrowserAutomationResponsePayload {
-  return {
-    requestId,
-    ok: true,
-    result: {
-      command: "list_tabs",
-      tabs: [],
-    },
-  };
-}
-
-function currentListTabsPayload(requestId = "req-new:list_tabs"): BrowserAutomationResponsePayload {
-  return {
-    requestId,
-    ok: true,
-    result: {
-      command: "list_tabs",
-      tabs: currentBrowserTabs(),
-    },
-  };
-}
-
-function currentBrowserTabs() {
-  return Object.values(useBrowserStore.getState().browsersById).map((browser) => ({
-    browserId: browser.browserId,
-    workspaceId: "wks_workspace_a",
-    url: browser.url,
-    title: browser.title,
-    isActive: true,
-    isLoading: false,
-  }));
-}
-
-function newTabResultFrom(payload: BrowserAutomationResponsePayload) {
-  expect(payload).toMatchObject({
-    requestId: "req-new",
-    ok: true,
-    result: { command: "new_tab", workspaceId: "wks_workspace_a", url: "https://example.com" },
-  });
-  if (!payload.ok || payload.result.command !== "new_tab") {
-    throw new Error("Expected browser_new_tab success payload");
-  }
-  return payload.result;
-}
-
-function workspaceBrowserTabs(workspaceKey: string, browserId: string) {
-  return useWorkspaceLayoutStore
-    .getState()
-    .getWorkspaceTabs(workspaceKey)
-    .filter((tab) => tab.target.kind === "browser" && tab.target.browserId === browserId);
-}
-
-function flushAsyncWork(): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, 0));
-}
-
-function waitForRegistrationTimeout(): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, 20));
-}
-
-const browserAutomationStorage = new FakeStateStorage();
-useBrowserStore.persist.setOptions({
-  storage: createJSONStorage(() => browserAutomationStorage),
-});
-useWorkspaceLayoutStore.persist.setOptions({
-  storage: createJSONStorage(() => browserAutomationStorage),
-});
-
-describe("mountBrowserAutomationHandler", () => {
-  beforeEach(() => {
-    browserAutomationStorage.clear();
-    useBrowserStore.setState({ browsersById: {} });
-    useWorkspaceLayoutStore.setState({ layoutByWorkspace: {} });
-  });
-
-  test("browser_new_tab creates a workspace browser tab without stealing focus", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    const workspaceKey = buildWorkspaceTabPersistenceKey({
-      serverId: "server-1",
-      workspaceId: "wks_workspace_a",
-    });
-    if (!workspaceKey) {
-      throw new Error("Expected workspace key");
-    }
-    const previousFocusedTabId = useWorkspaceLayoutStore
-      .getState()
-      .openTabFocused(workspaceKey, { kind: "draft", draftId: "human-draft" });
-    browser.mount({ serverId: "server-1" });
-
-    browser.receive(browserNewTabRequest());
-    await flushAsyncWork();
-
-    const result = newTabResultFrom(browser.client.payloadAt(0));
-    const openedTabs = workspaceBrowserTabs(workspaceKey, result.browserId);
-    const layout = useWorkspaceLayoutStore.getState().layoutByWorkspace[workspaceKey];
-    expect(openedTabs).toEqual([
-      expect.objectContaining({
-        target: { kind: "browser", browserId: result.browserId },
-      }),
-    ]);
-    expect(layout?.root).toEqual(
-      expect.objectContaining({
-        kind: "pane",
-        pane: expect.objectContaining({ focusedTabId: previousFocusedTabId }),
-      }),
-    );
-    expect(openedTabs[0]?.tabId).not.toBe(previousFocusedTabId);
-    expect(browser.browser.registeredWorkspaceBrowsers).toEqual([
-      { browserId: result.browserId, workspaceId: "wks_workspace_a" },
-    ]);
-    expect(browser.browser.activeWorkspaceBrowsers).toEqual([]);
-    expect(browser.resident.ensuredWebviews).toEqual([
-      { browserId: result.browserId, url: "https://example.com" },
-    ]);
-    expect(browser.browser.executedRequests).toEqual([
-      {
-        type: "browser.automation.execute.request",
-        requestId: "req-new:list_tabs",
-        agentId: "agent-1",
-        workspaceId: "wks_workspace_a",
-        command: { command: "list_tabs", args: {} },
-      },
-    ]);
-  });
-
-  test("browser_new_tab returns a retryable timeout when the resident webview does not register", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    browser.browser.response = emptyListTabsPayload();
-    browser.mount({
-      serverId: "server-1",
-      registrationWaitTimeoutMs: 1,
-      registrationPollIntervalMs: 1,
-    });
-
-    browser.receive(browserNewTabRequest());
-    await waitForRegistrationTimeout();
-
-    expect(browser.client.sentResponses).toEqual([
-      {
-        type: "browser.automation.execute.response",
-        payload: {
-          requestId: "req-new",
-          ok: false,
-          error: {
-            code: "browser_timeout",
-            message: expect.stringContaining("Timed out waiting for browser tab"),
-            retryable: true,
-          },
-        },
-      },
-    ]);
-    expect(browser.resident.ensuredWebviews).toEqual([
-      expect.objectContaining({ url: "https://example.com" }),
-    ]);
-  });
-
-  test("browser_new_tab wraps registration bridge errors in a response", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    browser.browser.thrownError = new Error("IPC registration check failed");
-    browser.mount({ serverId: "server-1" });
-
-    browser.receive(browserNewTabRequest());
-    await flushAsyncWork();
-
-    expect(browser.client.sentResponses).toEqual([
-      {
-        type: "browser.automation.execute.response",
-        payload: {
-          requestId: "req-new",
-          ok: false,
-          error: {
-            code: "browser_unknown_error",
-            message: "IPC registration check failed",
-            retryable: false,
-          },
-        },
-      },
-    ]);
-  });
-
-  test("browser_resize updates resident webview dimensions", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    browser.mount({ serverId: "server-1" });
-
-    browser.receive(browserNewTabRequest());
-    await flushAsyncWork();
-    const result = newTabResultFrom(browser.client.payloadAt(0));
-
-    browser.receive(browserResizeRequest(result.browserId));
-    await flushAsyncWork();
-
-    expect(browser.client.payloadAt(1)).toEqual({
-      requestId: "req-resize",
-      ok: true,
-      result: {
-        command: "resize",
-        browserId: result.browserId,
-        width: 1024,
-        height: 768,
-      },
-    });
-    expect(browser.browser.executedRequests).toHaveLength(1);
-  });
-
-  test("browser_resize returns not found for a tab outside the request workspace", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    browser.mount({ serverId: "server-1" });
-
-    browser.receive(browserNewTabRequest());
-    await flushAsyncWork();
-    const result = newTabResultFrom(browser.client.payloadAt(0));
-
-    browser.receive(browserResizeRequest(result.browserId, { workspaceId: "wks_workspace_b" }));
-    await flushAsyncWork();
-
-    expect(browser.client.payloadAt(1)).toEqual({
-      requestId: "req-resize",
-      ok: false,
-      error: {
-        code: "browser_tab_not_found",
-        message: `No browser tab found for ID: ${result.browserId}`,
-        retryable: false,
-      },
-    });
-  });
-
-  test("browser_close_tab removes the workspace tab, browser record, resident webview, registry entry, and partition", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    const workspaceKey = buildWorkspaceTabPersistenceKey({
-      serverId: "server-1",
-      workspaceId: "wks_workspace_a",
-    });
-    if (!workspaceKey) {
-      throw new Error("Expected workspace key");
-    }
-    browser.mount({ serverId: "server-1" });
-
-    browser.receive(browserNewTabRequest());
-    await flushAsyncWork();
-    const result = newTabResultFrom(browser.client.payloadAt(0));
-
-    browser.receive(browserCloseTabRequest(result.browserId));
-    await flushAsyncWork();
-
-    expect(browser.client.payloadAt(1)).toEqual({
-      requestId: "req-close-tab",
-      ok: true,
-      result: { command: "close_tab", browserId: result.browserId },
-    });
-    expect(workspaceBrowserTabs(workspaceKey, result.browserId)).toEqual([]);
-    expect(useBrowserStore.getState().browsersById[result.browserId]).toBeUndefined();
-    expect(browser.browser.unregisteredWorkspaceBrowsers).toEqual([result.browserId]);
-    expect(browser.browser.clearedPartitions).toEqual([result.browserId]);
-    expect(currentBrowserTabs()).toEqual([]);
-  });
-
-  test("browser_close_tab returns not found after the tab is gone", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    browser.mount({ serverId: "server-1" });
-
-    browser.receive(browserNewTabRequest());
-    await flushAsyncWork();
-    const result = newTabResultFrom(browser.client.payloadAt(0));
-
-    browser.receive(browserCloseTabRequest(result.browserId));
-    await flushAsyncWork();
-    browser.receive(browserCloseTabRequest(result.browserId));
-    await flushAsyncWork();
-
-    expect(browser.client.payloadAt(2)).toEqual({
-      requestId: "req-close-tab",
-      ok: false,
-      error: {
-        code: "browser_tab_not_found",
-        message: `No browser tab found for ID: ${result.browserId}`,
-        retryable: false,
-      },
-    });
-  });
-
-  test("non-new-tab requests send the desktop bridge response", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    browser.browser.response = {
-      requestId: "desktop-req",
-      ok: true,
-      result: { command: "list_tabs", tabs: [] },
-    };
-    browser.mount();
-    const request = browserAutomationRequest();
-
-    browser.receive(request);
-    await flushAsyncWork();
-
-    expect(browser.browser.executedRequests).toEqual([request]);
-    expect(browser.client.sentResponses).toEqual([
-      {
-        type: "browser.automation.execute.response",
-        payload: {
-          requestId: "req-1",
-          ok: true,
-          result: { command: "list_tabs", tabs: [] },
-        },
-      },
-    ]);
-  });
-
-  test("missing desktop bridge sends browser_unsupported", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    browser.mount({ host: null });
-
-    browser.receive(browserAutomationRequest());
-    await flushAsyncWork();
-
-    expect(browser.client.sentResponses).toEqual([
-      {
-        type: "browser.automation.execute.response",
-        payload: {
-          requestId: "req-1",
-          ok: false,
-          error: {
-            code: "browser_unsupported",
-            message: "Browser automation is not available in this app runtime.",
-            retryable: false,
-          },
-        },
-      },
-    ]);
-  });
-
-  test("typed bridge errors become failure responses", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    browser.browser.thrownError = {
-      code: "browser_tab_not_found",
-      message: "Browser tab browser-1 was not found.",
-      retryable: false,
-    };
-    browser.mount();
-
-    browser.receive(browserAutomationRequest());
-    await flushAsyncWork();
-
-    expect(browser.client.sentResponses).toEqual([
-      {
-        type: "browser.automation.execute.response",
-        payload: {
-          requestId: "req-1",
-          ok: false,
-          error: {
-            code: "browser_tab_not_found",
-            message: "Browser tab browser-1 was not found.",
-            retryable: false,
-          },
-        },
-      },
-    ]);
-  });
-
-  test("unimplemented preload IPC reports browser_unsupported", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    browser.browser.thrownError = new Error(
-      'No handler registered for "paseo:browser:execute-automation-command"',
-    );
-    browser.mount();
-
-    browser.receive(browserAutomationRequest());
-    await flushAsyncWork();
-
-    expect(browser.client.sentResponses).toEqual([
-      {
-        type: "browser.automation.execute.response",
-        payload: {
-          requestId: "req-1",
-          ok: false,
-          error: {
-            code: "browser_unsupported",
-            message: "Browser automation is not implemented by this app build yet.",
-            retryable: false,
-          },
-        },
-      },
-    ]);
-  });
-
-  test("unsubscribe stops handling browser automation requests", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    browser.mount();
-
-    browser.unmount();
-    browser.receive(browserAutomationRequest());
-    await flushAsyncWork();
-
-    expect(browser.browser.executedRequests).toEqual([]);
-    expect(browser.client.sentResponses).toEqual([]);
-  });
-});

packages/app/src/browser-automation/handler.ts

@@ -1,472 +0,0 @@
-import type { SessionInboundMessage, SessionOutboundMessage } from "@getpaseo/protocol/messages";
-import { getDesktopHost, type DesktopHostBridge } from "@/desktop/host";
-import {
-  ensureResidentBrowserWebview as ensureResidentBrowserWebviewDefault,
-  removeResidentBrowserWebview,
-  resizeResidentBrowserWebview,
-} from "@/components/browser-webview-resident";
-import { createWorkspaceBrowser, getBrowserRecord, useBrowserStore } from "@/stores/browser-store";
-import {
-  buildWorkspaceTabPersistenceKey,
-  collectAllTabs,
-  useWorkspaceLayoutStore,
-} from "@/stores/workspace-layout-store";
-
-type BrowserAutomationExecuteRequest = Extract<
-  SessionOutboundMessage,
-  { type: "browser.automation.execute.request" }
->;
-type BrowserAutomationExecuteResponse = Extract<
-  SessionInboundMessage,
-  { type: "browser.automation.execute.response" }
->;
-type BrowserAutomationResponsePayload = BrowserAutomationExecuteResponse["payload"];
-type BrowserAutomationFailurePayload = Extract<BrowserAutomationResponsePayload, { ok: false }>;
-type BrowserAutomationErrorCode = BrowserAutomationFailurePayload["error"]["code"];
-
-interface BrowserAutomationClient {
-  on(
-    type: "browser.automation.execute.request",
-    handler: (message: BrowserAutomationExecuteRequest) => void,
-  ): () => void;
-  sendBrowserAutomationExecuteResponse(response: BrowserAutomationExecuteResponse): void;
-}
-
-export interface BrowserAutomationHandlerOptions {
-  client: BrowserAutomationClient;
-  serverId?: string;
-  getHost?: () => DesktopHostBridge | null;
-  ensureResidentBrowserWebview?: typeof ensureResidentBrowserWebviewDefault;
-  registrationWaitTimeoutMs?: number;
-  registrationPollIntervalMs?: number;
-}
-
-export function mountBrowserAutomationHandler(
-  options: BrowserAutomationHandlerOptions,
-): () => void {
-  const getHost = options.getHost ?? getDesktopHost;
-  const unsubscribe = options.client.on("browser.automation.execute.request", (request) => {
-    void handleBrowserAutomationRequest({
-      client: options.client,
-      getHost,
-      request,
-      serverId: options.serverId,
-      ensureResidentBrowserWebview:
-        options.ensureResidentBrowserWebview ?? ensureResidentBrowserWebviewDefault,
-      ...(options.registrationWaitTimeoutMs !== undefined
-        ? { registrationWaitTimeoutMs: options.registrationWaitTimeoutMs }
-        : {}),
-      ...(options.registrationPollIntervalMs !== undefined
-        ? { registrationPollIntervalMs: options.registrationPollIntervalMs }
-        : {}),
-    });
-  });
-  return () => {
-    unsubscribe();
-  };
-}
-
-export function mountBrowserAutomationDaemonClientHandler(
-  client: unknown,
-  options?: { serverId?: string },
-): () => void {
-  return mountBrowserAutomationHandler({
-    client: client as BrowserAutomationClient,
-    ...(options?.serverId ? { serverId: options.serverId } : {}),
-  });
-}
-
-async function handleBrowserAutomationRequest(params: {
-  client: BrowserAutomationHandlerOptions["client"];
-  getHost: () => DesktopHostBridge | null;
-  request: BrowserAutomationExecuteRequest;
-  serverId?: string;
-  ensureResidentBrowserWebview: typeof ensureResidentBrowserWebviewDefault;
-  registrationWaitTimeoutMs?: number;
-  registrationPollIntervalMs?: number;
-}): Promise<void> {
-  const {
-    client,
-    getHost,
-    request,
-    serverId,
-    ensureResidentBrowserWebview,
-    registrationWaitTimeoutMs,
-    registrationPollIntervalMs,
-  } = params;
-  const browserHost = getHost()?.browser;
-  const executeAutomationCommand = browserHost?.executeAutomationCommand;
-
-  if (request.command.command === "new_tab") {
-    try {
-      client.sendBrowserAutomationExecuteResponse({
-        type: "browser.automation.execute.response",
-        payload: await openBrowserTabForRequest({
-          request,
-          serverId,
-          browserHost,
-          ensureResidentBrowserWebview,
-          ...(registrationWaitTimeoutMs !== undefined ? { registrationWaitTimeoutMs } : {}),
-          ...(registrationPollIntervalMs !== undefined ? { registrationPollIntervalMs } : {}),
-        }),
-      });
-    } catch (error) {
-      client.sendBrowserAutomationExecuteResponse({
-        type: "browser.automation.execute.response",
-        payload: normalizeThrownBridgeError(request.requestId, error),
-      });
-    }
-    return;
-  }
-
-  if (request.command.command === "resize") {
-    client.sendBrowserAutomationExecuteResponse({
-      type: "browser.automation.execute.response",
-      payload: resizeBrowserTabForRequest({ request, serverId }),
-    });
-    return;
-  }
-
-  if (request.command.command === "close_tab") {
-    try {
-      client.sendBrowserAutomationExecuteResponse({
-        type: "browser.automation.execute.response",
-        payload: await closeBrowserTabForRequest({
-          request,
-          serverId,
-          browserHost,
-        }),
-      });
-    } catch (error) {
-      client.sendBrowserAutomationExecuteResponse({
-        type: "browser.automation.execute.response",
-        payload: normalizeThrownBridgeError(request.requestId, error),
-      });
-    }
-    return;
-  }
-
-  if (!executeAutomationCommand) {
-    client.sendBrowserAutomationExecuteResponse({
-      type: "browser.automation.execute.response",
-      payload: browserAutomationFailure({
-        requestId: request.requestId,
-        code: "browser_unsupported",
-        message: "Browser automation is not available in this app runtime.",
-      }),
-    });
-    return;
-  }
-
-  try {
-    const payload = await executeAutomationCommand(request);
-    client.sendBrowserAutomationExecuteResponse({
-      type: "browser.automation.execute.response",
-      payload: normalizeBridgePayload(request.requestId, payload),
-    });
-  } catch (error) {
-    client.sendBrowserAutomationExecuteResponse({
-      type: "browser.automation.execute.response",
-      payload: normalizeThrownBridgeError(request.requestId, error),
-    });
-  }
-}
-
-function resizeBrowserTabForRequest(params: {
-  request: BrowserAutomationExecuteRequest;
-  serverId?: string;
-}): BrowserAutomationResponsePayload {
-  const { request, serverId } = params;
-  const command = request.command as Extract<
-    BrowserAutomationExecuteRequest["command"],
-    { command: "resize" }
-  >;
-  const browserId = command.args.browserId;
-  if (!getBrowserRecord(browserId)) {
-    return browserAutomationFailure({
-      requestId: request.requestId,
-      code: "browser_tab_not_found",
-      message: `No browser tab found for ID: ${browserId}`,
-    });
-  }
-
-  const workspaceId = request.workspaceId;
-  if (serverId && workspaceId && !findWorkspaceBrowserTab({ serverId, workspaceId, browserId })) {
-    return browserAutomationFailure({
-      requestId: request.requestId,
-      code: "browser_tab_not_found",
-      message: `No browser tab found for ID: ${browserId}`,
-    });
-  }
-
-  const dimensions = resizeResidentBrowserWebview({
-    browserId,
-    width: command.args.width,
-    height: command.args.height,
-  });
-  if (!dimensions) {
-    return browserAutomationFailure({
-      requestId: request.requestId,
-      code: "browser_tab_not_found",
-      message: `No browser tab found for ID: ${browserId}`,
-    });
-  }
-
-  return {
-    requestId: request.requestId,
-    ok: true,
-    result: {
-      command: "resize",
-      browserId,
-      width: dimensions.width,
-      height: dimensions.height,
-    },
-  };
-}
-
-async function closeBrowserTabForRequest(params: {
-  request: BrowserAutomationExecuteRequest;
-  serverId?: string;
-  browserHost: DesktopHostBridge["browser"] | undefined;
-}): Promise<BrowserAutomationResponsePayload> {
-  const { request, serverId, browserHost } = params;
-  const command = request.command as Extract<
-    BrowserAutomationExecuteRequest["command"],
-    { command: "close_tab" }
-  >;
-  const browserId = command.args.browserId;
-  const workspaceId = request.workspaceId;
-  const workspaceTab = serverId
-    ? findWorkspaceBrowserTab({ serverId, workspaceId, browserId })
-    : null;
-  if (!workspaceTab && (!serverId || !workspaceId)) {
-    return browserAutomationFailure({
-      requestId: request.requestId,
-      code: "browser_unsupported",
-      message: "Cannot close a browser tab without a workspace context.",
-    });
-  }
-  if (!workspaceTab || !getBrowserRecord(browserId)) {
-    return browserAutomationFailure({
-      requestId: request.requestId,
-      code: "browser_tab_not_found",
-      message: `No browser tab found for ID: ${browserId}`,
-    });
-  }
-
-  useWorkspaceLayoutStore.getState().closeTab(workspaceTab.workspaceKey, workspaceTab.tabId);
-  useBrowserStore.getState().removeBrowser(browserId);
-  removeResidentBrowserWebview(browserId);
-  await browserHost?.unregisterWorkspaceBrowser?.(browserId);
-  await browserHost?.clearPartition?.(browserId);
-
-  return {
-    requestId: request.requestId,
-    ok: true,
-    result: { command: "close_tab", browserId },
-  };
-}
-
-function findWorkspaceBrowserTab(input: {
-  serverId: string;
-  workspaceId: string | undefined;
-  browserId: string;
-}): { workspaceKey: string; tabId: string } | null {
-  if (!input.workspaceId) {
-    return null;
-  }
-  const workspaceKey = buildWorkspaceTabPersistenceKey({
-    serverId: input.serverId,
-    workspaceId: input.workspaceId,
-  });
-  if (!workspaceKey) {
-    return null;
-  }
-  const layout = useWorkspaceLayoutStore.getState().layoutByWorkspace[workspaceKey];
-  const tab = layout
-    ? collectAllTabs(layout.root).find((candidate) => {
-        return (
-          candidate.target.kind === "browser" && candidate.target.browserId === input.browserId
-        );
-      })
-    : null;
-  return tab ? { workspaceKey, tabId: tab.tabId } : null;
-}
-
-async function openBrowserTabForRequest(params: {
-  request: BrowserAutomationExecuteRequest;
-  serverId?: string;
-  browserHost: DesktopHostBridge["browser"] | undefined;
-  ensureResidentBrowserWebview: typeof ensureResidentBrowserWebviewDefault;
-  registrationWaitTimeoutMs?: number;
-  registrationPollIntervalMs?: number;
-}): Promise<BrowserAutomationResponsePayload> {
-  const {
-    request,
-    serverId,
-    browserHost,
-    ensureResidentBrowserWebview,
-    registrationWaitTimeoutMs,
-    registrationPollIntervalMs,
-  } = params;
-  const command = request.command as Extract<
-    BrowserAutomationExecuteRequest["command"],
-    { command: "new_tab" }
-  >;
-  const workspaceId = request.workspaceId;
-  if (!serverId || !workspaceId) {
-    return browserAutomationFailure({
-      requestId: request.requestId,
-      code: "browser_unsupported",
-      message: "Cannot create a browser tab without a workspace context.",
-    });
-  }
-
-  const url = command.args.url ?? "https://example.com";
-  const { browserId, url: normalizedUrl } = createWorkspaceBrowser({ initialUrl: url });
-  const workspaceKey = buildWorkspaceTabPersistenceKey({ serverId, workspaceId });
-  if (!workspaceKey) {
-    return browserAutomationFailure({
-      requestId: request.requestId,
-      code: "browser_unsupported",
-      message: "Cannot create a browser tab without a workspace context.",
-    });
-  }
-  useWorkspaceLayoutStore.getState().openTabInBackground(workspaceKey, {
-    kind: "browser",
-    browserId,
-  });
-
-  await browserHost?.registerWorkspaceBrowser?.({ browserId, workspaceId });
-
-  if (browserHost?.executeAutomationCommand) {
-    ensureResidentBrowserWebview({ browserId, url: normalizedUrl });
-    const registered = await waitForBrowserRegistration({
-      request,
-      browserId,
-      workspaceId,
-      executeAutomationCommand: browserHost.executeAutomationCommand,
-      ...(registrationWaitTimeoutMs !== undefined ? { timeoutMs: registrationWaitTimeoutMs } : {}),
-      ...(registrationPollIntervalMs !== undefined
-        ? { pollIntervalMs: registrationPollIntervalMs }
-        : {}),
-    });
-    if (!registered) {
-      return browserAutomationFailure({
-        requestId: request.requestId,
-        code: "browser_timeout",
-        message: `Timed out waiting for browser tab ${browserId} to register with the browser automation host. Try browser_new_tab again.`,
-        retryable: true,
-      });
-    }
-  }
-
-  return {
-    requestId: request.requestId,
-    ok: true,
-    result: { command: "new_tab", browserId, workspaceId, url: normalizedUrl },
-  };
-}
-
-async function waitForBrowserRegistration(params: {
-  request: BrowserAutomationExecuteRequest;
-  browserId: string;
-  workspaceId: string;
-  executeAutomationCommand: (
-    request: BrowserAutomationExecuteRequest,
-  ) => Promise<BrowserAutomationResponsePayload>;
-  timeoutMs?: number;
-  pollIntervalMs?: number;
-}): Promise<boolean> {
-  const deadline = Date.now() + (params.timeoutMs ?? 5_000);
-  while (Date.now() < deadline) {
-    const payload = await params.executeAutomationCommand({
-      type: "browser.automation.execute.request",
-      requestId: `${params.request.requestId}:list_tabs`,
-      agentId: params.request.agentId,
-      cwd: params.request.cwd,
-      workspaceId: params.workspaceId,
-      command: { command: "list_tabs", args: {} },
-    });
-    if (payload.ok && payload.result.command === "list_tabs") {
-      if (payload.result.tabs.some((tab) => tab.browserId === params.browserId)) {
-        return true;
-      }
-    }
-    await delay(params.pollIntervalMs ?? 100);
-  }
-  return false;
-}
-
-function delay(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-function normalizeBridgePayload(
-  requestId: string,
-  payload: BrowserAutomationResponsePayload,
-): BrowserAutomationResponsePayload {
-  return { ...payload, requestId } as BrowserAutomationResponsePayload;
-}
-
-function normalizeThrownBridgeError(
-  requestId: string,
-  error: unknown,
-): BrowserAutomationFailurePayload {
-  const typed = readTypedBrowserAutomationError(error);
-  if (typed) {
-    return browserAutomationFailure({ requestId, ...typed });
-  }
-
-  const message = error instanceof Error ? error.message : String(error);
-  if (message.includes("No handler registered")) {
-    return browserAutomationFailure({
-      requestId,
-      code: "browser_unsupported",
-      message: "Browser automation is not implemented by this app build yet.",
-    });
-  }
-
-  return browserAutomationFailure({
-    requestId,
-    code: "browser_unknown_error",
-    message: message || "Browser automation failed.",
-  });
-}
-
-function readTypedBrowserAutomationError(
-  value: unknown,
-): { code: BrowserAutomationErrorCode; message: string; retryable?: boolean } | null {
-  if (typeof value !== "object" || value === null || Array.isArray(value)) {
-    return null;
-  }
-  const record = value as Record<string, unknown>;
-  if (typeof record.code !== "string" || !record.code.startsWith("browser_")) {
-    return null;
-  }
-  if (typeof record.message !== "string" || record.message.length === 0) {
-    return null;
-  }
-  return {
-    code: record.code as BrowserAutomationErrorCode,
-    message: record.message,
-    ...(typeof record.retryable === "boolean" ? { retryable: record.retryable } : {}),
-  };
-}
-
-function browserAutomationFailure(params: {
-  requestId: string;
-  code: BrowserAutomationErrorCode;
-  message: string;
-  retryable?: boolean;
-}): BrowserAutomationFailurePayload {
-  return {
-    requestId: params.requestId,
-    ok: false,
-    error: {
-      code: params.code,
-      message: params.message,
-      retryable: params.retryable ?? false,
-    },
-  };
-}

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

@@ -1,8 +1,8 @@
-import { forwardRef, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { forwardRef, useCallback, useEffect, useMemo } from "react";
 import type { ReactNode, Ref } from "react";
 import { createPortal } from "react-dom";
 import { useTranslation } from "react-i18next";
-import { Modal, Platform, Pressable, ScrollView, Text, TextInput, View } from "react-native";
+import { Modal, Pressable, ScrollView, Text, TextInput, View } from "react-native";
 import type { TextInputProps } from "react-native";
 import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -20,9 +20,7 @@ import {
   useIsolatedBottomSheetVisibility,
 } from "@/components/ui/isolated-bottom-sheet-modal";
 import { getCompactSheetSafeAreaPadding } from "@/components/adaptive-modal-sheet-layout";
-import { createControlGeometry } from "@/components/ui/control-geometry";
 import { isNative, isWeb } from "@/constants/platform";
-import { useWebScrollViewScrollbar } from "@/components/use-web-scrollbar";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 // Horizontal indent token shared by the sheet header (title, back arrow,
@@ -180,11 +178,6 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.foreground,
     fontSize: theme.fontSize.sm,
   },
-  desktopScrollContainer: {
-    flexShrink: 1,
-    minHeight: 0,
-    position: "relative",
-  },
   desktopScroll: {
     flexShrink: 1,
     minHeight: 0,
@@ -221,7 +214,7 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[2],
   },
   adaptiveInputOutline: {
-    ...createControlGeometry(theme).controlFocusRingColor,
+    outlineColor: theme.colors.accent,
   },
   adaptiveInputText: {
     color: theme.colors.foreground,
@@ -232,7 +225,6 @@ const styles = StyleSheet.create((theme) => ({
 }));
 
 const SEARCH_INPUT_STYLE = [styles.searchInput, isWeb && { outlineStyle: "none" }];
-const WEB_EXIT_DURATION_MS = 160;
 
 function SheetBackground({ style }: BottomSheetBackgroundProps) {
   const { theme } = useUnistyles();
@@ -450,7 +442,6 @@ export interface AdaptiveModalSheetProps {
   header: SheetHeader;
   visible: boolean;
   onClose: () => void;
-  onDismiss?: () => void;
   children: ReactNode;
   /** Sticky footer rendered below the scrollable content. */
   footer?: ReactNode;
@@ -460,18 +451,12 @@ export interface AdaptiveModalSheetProps {
   desktopMaxWidth?: number;
   scrollable?: boolean;
   presentation?: "push" | "replace";
-  /**
-   * Render the themed desktop-web scrollbar over the scroll area instead of the
-   * native browser scrollbar. No-op on native and on the mobile bottom sheet.
-   */
-  webScrollbar?: boolean;
 }
 
 export function AdaptiveModalSheet({
   header,
   visible,
   onClose,
-  onDismiss,
   children,
   footer,
   snapPoints,
@@ -479,16 +464,11 @@ export function AdaptiveModalSheet({
   desktopMaxWidth,
   scrollable = true,
   presentation,
-  webScrollbar = false,
 }: AdaptiveModalSheetProps) {
   const { theme } = useUnistyles();
   const { t } = useTranslation();
   const isMobile = useIsCompactFormFactor();
   const insets = useSafeAreaInsets();
-  const desktopScrollRef = useRef<ScrollView>(null);
-  const desktopScrollbar = useWebScrollViewScrollbar(desktopScrollRef, {
-    enabled: webScrollbar && !isMobile,
-  });
   const resolvedSnapPoints = useMemo(() => snapPoints ?? ["65%", "90%"], [snapPoints]);
   const compactSafeAreaPadding = useMemo(
     () =>
@@ -537,20 +517,6 @@ export function AdaptiveModalSheet({
     isEnabled: isMobile,
     onClose,
   });
-  const [shouldRenderWeb, setShouldRenderWeb] = useState(visible);
-  const [isWebClosing, setIsWebClosing] = useState(false);
-  const nativeModalDismissNotifiedRef = useRef(!visible);
-  const handleDismiss = useCallback(() => {
-    handleSheetDismiss();
-    onDismiss?.();
-  }, [handleSheetDismiss, onDismiss]);
-  const notifyNativeModalDismiss = useCallback(() => {
-    if (nativeModalDismissNotifiedRef.current) {
-      return;
-    }
-    nativeModalDismissNotifiedRef.current = true;
-    onDismiss?.();
-  }, [onDismiss]);
 
   const renderBackdrop = useCallback(
     (props: React.ComponentProps<typeof BottomSheetBackdrop>) => (
@@ -563,53 +529,12 @@ export function AdaptiveModalSheet({
     () => [styles.desktopCard, desktopMaxWidth != null && { maxWidth: desktopMaxWidth }],
     [desktopMaxWidth],
   );
-  const desktopOverlayStyle = useMemo(
-    () => [
-      styles.desktopOverlay,
-      isWeb && {
-        opacity: isWebClosing ? 0 : 1,
-        transitionDuration: `${WEB_EXIT_DURATION_MS}ms`,
-        transitionProperty: "opacity",
-        transitionTimingFunction: "ease",
-      },
-    ],
-    [isWebClosing],
-  );
 
   useEffect(() => {
     if (!isWeb || isMobile || !visible) return;
     return pushEscHandler(onClose);
   }, [visible, isMobile, onClose]);
 
-  useEffect(() => {
-    if (visible) {
-      nativeModalDismissNotifiedRef.current = false;
-    }
-  }, [visible]);
-
-  useEffect(() => {
-    if (!isWeb || isMobile) return;
-    if (visible) {
-      setShouldRenderWeb(true);
-      setIsWebClosing(false);
-      return;
-    }
-    if (!shouldRenderWeb) return;
-    setIsWebClosing(true);
-    const timeout = window.setTimeout(() => {
-      setShouldRenderWeb(false);
-      setIsWebClosing(false);
-      onDismiss?.();
-    }, WEB_EXIT_DURATION_MS);
-    return () => window.clearTimeout(timeout);
-  }, [visible, isMobile, onDismiss, shouldRenderWeb]);
-
-  useEffect(() => {
-    if (isWeb || isMobile || visible || Platform.OS !== "android") return;
-    const timeout = setTimeout(notifyNativeModalDismiss, 0);
-    return () => clearTimeout(timeout);
-  }, [visible, isMobile, notifyNativeModalDismiss]);
-
   if (isMobile) {
     return (
       <IsolatedBottomSheetModal
@@ -618,7 +543,7 @@ export function AdaptiveModalSheet({
         index={0}
         enableDynamicSizing={false}
         onChange={handleSheetChange}
-        onDismiss={handleDismiss}
+        onDismiss={handleSheetDismiss}
         backdropComponent={renderBackdrop}
         enablePanDownToClose
         backgroundComponent={SheetBackground}
@@ -649,22 +574,13 @@ export function AdaptiveModalSheet({
     <>
       <SheetHeaderView header={header} onClose={onClose} />
       {scrollable ? (
-        <View style={styles.desktopScrollContainer}>
+        <ScrollView
-          <ScrollView
+          style={styles.desktopScroll}
-            ref={desktopScrollRef}
+          contentContainerStyle={styles.desktopContent}
-            style={styles.desktopScroll}
+          keyboardShouldPersistTaps="handled"
-            contentContainerStyle={styles.desktopContent}
+        >
-            keyboardShouldPersistTaps="handled"
+          {children}
-            onLayout={desktopScrollbar.onLayout}
+        </ScrollView>
-            onScroll={desktopScrollbar.onScroll}
-            onContentSizeChange={desktopScrollbar.onContentSizeChange}
-            scrollEventThrottle={16}
-            showsVerticalScrollIndicator={!webScrollbar}
-          >
-            {children}
-          </ScrollView>
-          {desktopScrollbar.overlay}
-        </View>
       ) : (
         <View style={styles.desktopStaticContent}>{children}</View>
       )}
@@ -673,7 +589,7 @@ export function AdaptiveModalSheet({
   );
 
   const desktopContent = (
-    <View style={desktopOverlayStyle} testID={testID}>
+    <View style={styles.desktopOverlay} testID={testID}>
       <Pressable
         accessibilityLabel={t("common.actions.dismiss")}
         style={ABSOLUTE_FILL_STYLE}
@@ -685,7 +601,7 @@ export function AdaptiveModalSheet({
 
   // On web, use portal to overlay root for consistent stacking with toasts
   if (isWeb && typeof document !== "undefined") {
-    if (!shouldRenderWeb) return null;
+    if (!visible) return null;
     return createPortal(desktopContent, getOverlayRoot());
   }
 
@@ -695,7 +611,6 @@ export function AdaptiveModalSheet({
       animationType="fade"
       visible={visible}
       onRequestClose={onClose}
-      onDismiss={notifyNativeModalDismiss}
       hardwareAccelerated
     >
       {desktopContent}

packages/app/src/components/app-diagnostic-sheet.tsx

@@ -9,6 +9,7 @@ import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-moda
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { ScrollableCodeSurface, SurfaceCard } from "@/components/ui/scrollable-code-surface";
 import { useToast } from "@/contexts/toast-context";
+import { getDesktopDaemonLogs, getDesktopDaemonStatus } from "@/desktop/daemon/desktop-daemon";
 import {
   formatAppDiagnosticHeader,
   formatDiagnosticSection,
@@ -16,7 +17,6 @@ import {
   formatServerInfoSection,
   redactAppDiagnosticReport,
 } from "@/diagnostics/app-diagnostic-report";
-import { collectDesktopDiagnosticSections } from "@/diagnostics/desktop-diagnostic-report";
 import { getHostRuntimeStore, useHosts, type HostRuntimeSnapshot } from "@/runtime/host-runtime";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 import type { HostProfile } from "@/types/host-connection";
@@ -261,6 +261,35 @@ export function AppDiagnosticSheet({
   );
 }
 
+async function collectDesktopDiagnosticSections(): Promise<DiagnosticCollectionResult> {
+  try {
+    const [status, logs] = await Promise.all([getDesktopDaemonStatus(), getDesktopDaemonLogs()]);
+    return {
+      status: "done",
+      sections: [
+        formatDiagnosticSection("Desktop", [
+          { label: "Daemon status", value: status.status },
+          { label: "Desktop managed", value: String(status.desktopManaged) },
+          { label: "Daemon PID", value: status.pid === null ? "none" : String(status.pid) },
+          { label: "Daemon version", value: status.version ?? "unknown" },
+          { label: "Daemon home", value: status.home || "unknown" },
+          { label: "Log path", value: logs.logPath || "unknown" },
+          { label: "Error", value: status.error ?? "none" },
+        ]),
+        [
+          "Desktop daemon log tail",
+          logs.contents ? indentBlock(logs.contents) : "  No log lines found",
+        ].join("\n"),
+      ],
+    };
+  } catch (error) {
+    return {
+      status: "failed",
+      sections: [formatDiagnosticSection("Desktop", [{ label: "Error", value: toMessage(error) }])],
+    };
+  }
+}
+
 async function collectHostDiagnosticSections(
   host: HostProfile,
   snapshot: HostRuntimeSnapshot | null,
@@ -309,6 +338,14 @@ async function collectHostDiagnosticSections(
   }
 }
 
+function indentBlock(value: string): string {
+  return value
+    .split("\n")
+    .filter(Boolean)
+    .map((line) => `  ${line}`)
+    .join("\n");
+}
+
 function toMessage(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }

packages/app/src/components/browser-webview-resident.browser.test.ts

@@ -1,200 +0,0 @@
-import { afterEach, describe, expect, it } from "vitest";
-import {
-  clearResidentBrowserWebviewsForTests,
-  ensureResidentBrowserWebview,
-  prepareBrowserWebview,
-  releaseResidentBrowserWebview,
-  removeResidentBrowserWebview,
-  takeResidentBrowserWebview,
-} from "./browser-webview-resident";
-
-const RESIDENT_HOST_ID = "paseo-browser-resident-webviews";
-
-function residentHost(): HTMLElement {
-  const host = document.getElementById(RESIDENT_HOST_ID);
-  if (!host) {
-    throw new Error("Expected resident browser host");
-  }
-  return host;
-}
-
-function expectPermanentHostParking(host: HTMLElement): void {
-  expect(host.style.position).toBe("fixed");
-  expect(host.style.left).toBe("0px");
-  expect(host.style.top).toBe("0px");
-  expect(host.style.width).toBe("1px");
-  expect(host.style.height).toBe("1px");
-  expect(host.style.overflow).toBe("hidden");
-  expect(host.style.opacity).toBe("1");
-  expect(host.style.pointerEvents).toBe("none");
-  expect(host.style.display).toBe("block");
-  expect(host.style.visibility).toBe("visible");
-  expect(host.style.transform).toBe("");
-}
-
-function expectResidentWebviewParking(webview: HTMLElement): void {
-  expect(webview.style.display).toBe("inline-flex");
-  expect(webview.style.flex).toBe("0 0 auto");
-  expect(webview.style.width).toBe("1280px");
-  expect(webview.style.height).toBe("800px");
-  expect(webview.style.position).toBe("absolute");
-  expect(webview.style.left).toBe("0px");
-  expect(webview.style.top).toBe("0px");
-  expect(webview.style.zIndex).toBe("0");
-}
-
-describe("resident browser webviews", () => {
-  afterEach(() => {
-    clearResidentBrowserWebviewsForTests();
-  });
-
-  it("parks a browser webview in the permanent paintable 1x1 host", () => {
-    const visibleHost = document.createElement("div");
-    const webview = document.createElement("webview");
-    visibleHost.appendChild(webview);
-    document.body.appendChild(visibleHost);
-
-    releaseResidentBrowserWebview("browser-a", webview);
-
-    const host = residentHost();
-    expect(visibleHost.children).toHaveLength(0);
-    expect(Array.from(host.children)).toEqual([webview]);
-    expect(webview.isConnected).toBe(true);
-    expectPermanentHostParking(host);
-    expectResidentWebviewParking(webview);
-  });
-
-  it("creates a resident webview for an agent-created unfocused tab", () => {
-    const webview = ensureResidentBrowserWebview({
-      browserId: "browser-agent",
-      url: "https://example.com",
-    });
-
-    expect(webview).not.toBeNull();
-    expect(webview?.isConnected).toBe(true);
-    expect(webview?.getAttribute("data-paseo-browser-id")).toBe("browser-agent");
-    expect(webview?.getAttribute("partition")).toBe("persist:paseo-browser-browser-agent");
-    expect((webview as HTMLUnknownElement & { src?: string })?.src).toContain(
-      "https://example.com",
-    );
-    expectPermanentHostParking(residentHost());
-    expectResidentWebviewParking(webview as HTMLElement);
-  });
-
-  it("normalizes an existing resident host back to permanent parking", () => {
-    const staleHost = document.createElement("div");
-    staleHost.id = RESIDENT_HOST_ID;
-    staleHost.style.left = "-20000px";
-    staleHost.style.width = "1280px";
-    staleHost.style.height = "800px";
-    staleHost.style.opacity = "0";
-    staleHost.style.display = "none";
-    document.body.appendChild(staleHost);
-
-    const webview = ensureResidentBrowserWebview({
-      browserId: "browser-stale-host",
-      url: "https://example.com",
-    });
-
-    expect(webview).not.toBeNull();
-    expectPermanentHostParking(staleHost);
-    expectResidentWebviewParking(webview as HTMLElement);
-  });
-
-  it("normalizes an existing resident webview and its stale host before reusing them", () => {
-    const staleHost = document.createElement("div");
-    staleHost.id = RESIDENT_HOST_ID;
-    staleHost.style.left = "-20000px";
-    staleHost.style.width = "1280px";
-    staleHost.style.height = "800px";
-    staleHost.style.opacity = "0";
-    staleHost.style.display = "none";
-
-    const staleWebview = document.createElement("webview");
-    prepareBrowserWebview(staleWebview, {
-      browserId: "browser-stale-child",
-      initialUrl: "https://example.com",
-    });
-    staleWebview.style.display = "none";
-    staleWebview.style.width = "1px";
-    staleWebview.style.height = "1px";
-    staleWebview.style.position = "fixed";
-    staleWebview.style.left = "-20000px";
-    staleHost.appendChild(staleWebview);
-    document.body.appendChild(staleHost);
-
-    const webview = ensureResidentBrowserWebview({
-      browserId: "browser-stale-child",
-      url: "https://example.com/agent",
-    });
-
-    expect(webview).toBe(staleWebview);
-    expect(Array.from(staleHost.children)).toEqual([staleWebview]);
-    expectPermanentHostParking(staleHost);
-    expectResidentWebviewParking(staleWebview);
-  });
-
-  it("parks resident webviews as an overlapping stack", () => {
-    const firstWebview = ensureResidentBrowserWebview({
-      browserId: "browser-first",
-      url: "https://example.com/first",
-    });
-    const secondWebview = ensureResidentBrowserWebview({
-      browserId: "browser-second",
-      url: "https://example.com/second",
-    });
-
-    const host = residentHost();
-    expect(firstWebview?.parentElement).toBe(host);
-    expect(secondWebview?.parentElement).toBe(host);
-    expectResidentWebviewParking(firstWebview as HTMLElement);
-    expectResidentWebviewParking(secondWebview as HTMLElement);
-  });
-
-  it("moves a resident webview into a visible pane without recreating the node", () => {
-    const webview = ensureResidentBrowserWebview({
-      browserId: "browser-visible",
-      url: "https://example.com",
-    });
-
-    const visibleWebview = takeResidentBrowserWebview("browser-visible");
-
-    expect(visibleWebview).toBe(webview);
-    expect(webview?.style.position).toBe("");
-    expect(webview?.style.left).toBe("");
-    expect(webview?.style.top).toBe("");
-    expect(webview?.style.zIndex).toBe("");
-    expect(takeResidentBrowserWebview("browser-visible")).toBeNull();
-  });
-
-  it("returns an existing visible pane webview instead of creating a resident duplicate", () => {
-    const visibleHost = document.createElement("div");
-    const visibleWebview = document.createElement("webview");
-    prepareBrowserWebview(visibleWebview, {
-      browserId: "browser-visible-pane",
-      initialUrl: "https://example.com",
-    });
-    visibleHost.appendChild(visibleWebview);
-    document.body.appendChild(visibleHost);
-
-    const webview = ensureResidentBrowserWebview({
-      browserId: "browser-visible-pane",
-      url: "https://example.com/agent",
-    });
-
-    expect(webview).toBe(visibleWebview);
-    expect(document.getElementById(RESIDENT_HOST_ID)).toBeNull();
-  });
-
-  it("removes a resident webview when its browser tab closes", () => {
-    const webview = ensureResidentBrowserWebview({
-      browserId: "browser-closed",
-      url: "https://example.com",
-    });
-
-    removeResidentBrowserWebview("browser-closed");
-
-    expect(webview?.isConnected).toBe(false);
-    expect(takeResidentBrowserWebview("browser-closed")).toBeNull();
-  });
-});

packages/app/src/components/browser-webview-resident.ts

@@ -1,226 +0,0 @@
-const RESIDENT_BROWSER_HOST_ID = "paseo-browser-resident-webviews";
-const BROWSER_ID_ATTRIBUTE = "data-paseo-browser-id";
-const RESIDENT_VIEWPORT_WIDTH = 1280;
-const RESIDENT_VIEWPORT_HEIGHT = 800;
-
-const residentWebviewsByBrowserId = new Map<string, HTMLElement>();
-const residentWebviewSizesByBrowserId = new Map<string, { width: number; height: number }>();
-
-interface BrowserWebviewElement extends HTMLElement {
-  src: string;
-}
-
-function trimNonEmpty(value: string | null | undefined): string | null {
-  if (typeof value !== "string") {
-    return null;
-  }
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : null;
-}
-
-function readDocument(): Document | null {
-  return typeof document === "undefined" ? null : document;
-}
-
-function applyResidentHostParkingStyle(host: HTMLElement): void {
-  // Parked browser webviews must remain paintable at all times; screenshot
-  // correctness depends on the proven states in docs/browser-capture-harness.md.
-  host.setAttribute("aria-hidden", "true");
-  host.style.position = "fixed";
-  host.style.left = "0";
-  host.style.top = "0";
-  host.style.width = "1px";
-  host.style.height = "1px";
-  host.style.overflow = "hidden";
-  host.style.opacity = "1";
-  host.style.pointerEvents = "none";
-  host.style.display = "block";
-  host.style.zIndex = "";
-  host.style.clipPath = "";
-  host.style.visibility = "visible";
-  host.style.transform = "";
-}
-
-function getResidentBrowserHost(ownerDocument: Document): HTMLElement {
-  const existing = ownerDocument.getElementById(RESIDENT_BROWSER_HOST_ID);
-  if (existing) {
-    applyResidentHostParkingStyle(existing);
-    return existing;
-  }
-
-  const host = ownerDocument.createElement("div");
-  host.id = RESIDENT_BROWSER_HOST_ID;
-  applyResidentHostParkingStyle(host);
-  ownerDocument.body.appendChild(host);
-  return host;
-}
-
-function findBrowserWebview(browserId: string, ownerDocument: Document): HTMLElement | null {
-  for (const element of ownerDocument.querySelectorAll(`[${BROWSER_ID_ATTRIBUTE}]`)) {
-    if (!(element instanceof HTMLElement)) {
-      continue;
-    }
-    if (element.getAttribute(BROWSER_ID_ATTRIBUTE) === browserId) {
-      return element;
-    }
-  }
-  return null;
-}
-
-function dimensionsForBrowser(browserId: string | null): { width: number; height: number } {
-  if (!browserId) {
-    return { width: RESIDENT_VIEWPORT_WIDTH, height: RESIDENT_VIEWPORT_HEIGHT };
-  }
-  return (
-    residentWebviewSizesByBrowserId.get(browserId) ?? {
-      width: RESIDENT_VIEWPORT_WIDTH,
-      height: RESIDENT_VIEWPORT_HEIGHT,
-    }
-  );
-}
-
-function applyResidentWebviewStyle(webview: HTMLElement, browserId: string | null): void {
-  const dimensions = dimensionsForBrowser(browserId);
-  webview.style.display = "inline-flex";
-  webview.style.flex = "0 0 auto";
-  webview.style.width = `${dimensions.width}px`;
-  webview.style.height = `${dimensions.height}px`;
-  webview.style.border = "0";
-  webview.style.background = "transparent";
-  webview.style.position = "absolute";
-  webview.style.left = "0";
-  webview.style.top = "0";
-  webview.style.marginTop = "0";
-  webview.style.zIndex = "0";
-}
-
-function clearResidentWebviewParkingStyle(webview: HTMLElement): void {
-  webview.style.position = "";
-  webview.style.left = "";
-  webview.style.top = "";
-  webview.style.marginTop = "";
-  webview.style.zIndex = "";
-}
-
-export function prepareBrowserWebview(
-  webview: HTMLElement,
-  input: { browserId: string; initialUrl?: string | null },
-): void {
-  webview.setAttribute(BROWSER_ID_ATTRIBUTE, input.browserId);
-  webview.setAttribute("partition", `persist:paseo-browser-${input.browserId}`);
-  webview.setAttribute("allowpopups", "true");
-  webview.setAttribute("spellcheck", "false");
-  webview.setAttribute("autosize", "on");
-  if (input.initialUrl) {
-    (webview as BrowserWebviewElement).src = input.initialUrl;
-  }
-}
-
-export function ensureResidentBrowserWebview(input: {
-  browserId: string;
-  url: string;
-}): HTMLElement | null {
-  const browserId = trimNonEmpty(input.browserId);
-  if (!browserId) {
-    return null;
-  }
-  const ownerDocument = readDocument();
-  if (!ownerDocument) {
-    return null;
-  }
-
-  const resident = residentWebviewsByBrowserId.get(browserId) ?? null;
-  if (resident?.isConnected) {
-    releaseResidentBrowserWebview(browserId, resident);
-    return resident;
-  }
-
-  const existing = findBrowserWebview(browserId, ownerDocument);
-  if (existing) {
-    if (existing.parentElement?.id === RESIDENT_BROWSER_HOST_ID) {
-      releaseResidentBrowserWebview(browserId, existing);
-    }
-    return existing;
-  }
-
-  const webview = ownerDocument.createElement("webview") as BrowserWebviewElement;
-  prepareBrowserWebview(webview, { browserId, initialUrl: input.url });
-  releaseResidentBrowserWebview(browserId, webview);
-  return webview;
-}
-
-export function takeResidentBrowserWebview(browserId: string): HTMLElement | null {
-  const normalizedBrowserId = trimNonEmpty(browserId);
-  if (!normalizedBrowserId) {
-    return null;
-  }
-
-  const webview = residentWebviewsByBrowserId.get(normalizedBrowserId) ?? null;
-  if (!webview) {
-    return null;
-  }
-
-  residentWebviewsByBrowserId.delete(normalizedBrowserId);
-  clearResidentWebviewParkingStyle(webview);
-  return webview;
-}
-
-export function releaseResidentBrowserWebview(browserId: string, webview: HTMLElement): void {
-  const normalizedBrowserId = trimNonEmpty(browserId);
-  if (!normalizedBrowserId) {
-    webview.remove();
-    return;
-  }
-  const ownerDocument = readDocument();
-  if (!ownerDocument) {
-    return;
-  }
-
-  residentWebviewsByBrowserId.set(normalizedBrowserId, webview);
-  applyResidentWebviewStyle(webview, normalizedBrowserId);
-  getResidentBrowserHost(ownerDocument).appendChild(webview);
-}
-
-export function resizeResidentBrowserWebview(input: {
-  browserId: string;
-  width: number;
-  height: number;
-}): { width: number; height: number } | null {
-  const normalizedBrowserId = trimNonEmpty(input.browserId);
-  if (!normalizedBrowserId) {
-    return null;
-  }
-  const width = Math.max(1, Math.round(input.width));
-  const height = Math.max(1, Math.round(input.height));
-  residentWebviewSizesByBrowserId.set(normalizedBrowserId, { width, height });
-
-  const ownerDocument = readDocument();
-  const webview = ownerDocument ? findBrowserWebview(normalizedBrowserId, ownerDocument) : null;
-  if (webview) {
-    webview.style.width = `${width}px`;
-    webview.style.height = `${height}px`;
-  }
-
-  return { width, height };
-}
-
-export function removeResidentBrowserWebview(browserId: string): void {
-  const normalizedBrowserId = trimNonEmpty(browserId);
-  if (!normalizedBrowserId) {
-    return;
-  }
-
-  const resident = residentWebviewsByBrowserId.get(normalizedBrowserId) ?? null;
-  residentWebviewsByBrowserId.delete(normalizedBrowserId);
-  residentWebviewSizesByBrowserId.delete(normalizedBrowserId);
-  resident?.remove();
-}
-
-export function clearResidentBrowserWebviewsForTests(): void {
-  for (const webview of residentWebviewsByBrowserId.values()) {
-    webview.remove();
-  }
-  residentWebviewsByBrowserId.clear();
-  residentWebviewSizesByBrowserId.clear();
-  readDocument()?.getElementById(RESIDENT_BROWSER_HOST_ID)?.remove();
-}

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

@@ -4,39 +4,24 @@ import {
   View,
   Text,
   Pressable,
+  ActivityIndicator,
   type GestureResponderEvent,
   type PressableStateCallbackType,
 } from "react-native";
 import { BottomSheetFlatList } from "@gorhom/bottom-sheet";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { isNative, isWeb as platformIsWeb } from "@/constants/platform";
 import { AlertTriangle, ChevronRight, Search, Settings, Star } from "lucide-react-native";
 import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
-import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
 import type { SheetHeader } from "@/components/adaptive-modal-sheet";
 import { useProviderSettingsStore } from "@/stores/provider-settings-store";
 import { Button } from "@/components/ui/button";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
-import {
-  Combobox,
-  ComboboxItem,
-  type ComboboxOption,
-  type ComboboxProps,
-} from "@/components/ui/combobox";
-import { getProviderIcon } from "@/components/provider-icons";
-import {
-  buildSelectedTriggerLabel,
-  filterAndRankModelRows,
-  getAllProviderModelRows,
-  getProviderModelRows,
-  resolveSelectedModelLabel,
-  type ProviderSelectionModelRow,
-  type ProviderSelectorProvider,
-} from "@/provider-selection/provider-selection";
-
 const IS_WEB = platformIsWeb;
+
+import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
+
 const EMPTY_COMBOBOX_OPTIONS: ComboboxOption[] = [];
 
 function noop() {}
@@ -62,67 +47,22 @@ function drillDownRowStyle({
     pressed && styles.drillDownRowPressed,
   ];
 }
+import { getProviderIcon } from "@/components/provider-icons";
+import {
+  buildSelectedTriggerLabel,
+  filterAndRankModelRows,
+  getAllProviderModelRows,
+  getProviderModelRows,
+  resolveSelectedModelLabel,
+  type ProviderSelectionModelRow,
+  type ProviderSelectorProvider,
+} from "@/provider-selection/provider-selection";
 
 const DESKTOP_PROVIDER_VIEW_MIN_HEIGHT = 220;
 const DESKTOP_PROVIDER_VIEW_MAX_HEIGHT = 400;
 const DESKTOP_PROVIDER_VIEW_BASE_HEIGHT = 80;
 const DESKTOP_MODEL_ROW_HEIGHT = 40;
 
-const ThemedAlertTriangle = withUnistyles(AlertTriangle);
-const ThemedChevronRight = withUnistyles(ChevronRight);
-const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
-const ThemedSearch = withUnistyles(Search);
-const ThemedSettings = withUnistyles(Settings);
-const ThemedStar = withUnistyles(Star);
-
-const foregroundMutedMapping = (theme: Theme) => ({
-  color: theme.colors.foregroundMuted,
-});
-
-const headerSettingsMapping = (disabled: boolean) => (theme: Theme) => ({
-  color: disabled ? theme.colors.border : theme.colors.foregroundMuted,
-});
-
-const favoriteStarMapping =
-  (isFavorite: boolean, hovered: boolean) =>
-  (theme: Theme): { color: string; fill: string } => {
-    const favoriteColor = theme.colors.palette.amber[500];
-    if (isFavorite) {
-      return { color: favoriteColor, fill: favoriteColor };
-    }
-    return {
-      color: hovered ? theme.colors.foregroundMuted : theme.colors.border,
-      fill: "transparent",
-    };
-  };
-
-type ProviderGlyphTone = "muted" | "foreground";
-
-function ProviderGlyph({
-  provider,
-  size,
-  tone = "muted",
-}: {
-  provider: string;
-  size: number;
-  tone?: ProviderGlyphTone;
-}) {
-  const Icon = getProviderIcon(provider);
-  const color =
-    tone === "foreground" ? styles.providerIconForeground.color : styles.providerIconMuted.color;
-  return <Icon size={size} color={color} />;
-}
-
-function HeaderSettingsIcon({ disabled }: { disabled: boolean }) {
-  const uniProps = useMemo(() => headerSettingsMapping(disabled), [disabled]);
-  return <ThemedSettings size={ICON_SIZE.sm} uniProps={uniProps} />;
-}
-
-function FavoriteStar({ isFavorite, hovered }: { isFavorite: boolean; hovered: boolean }) {
-  const uniProps = useMemo(() => favoriteStarMapping(isFavorite, hovered), [hovered, isFavorite]);
-  return <ThemedStar size={ICON_SIZE.md} uniProps={uniProps} />;
-}
-
 type SelectorView =
   | { kind: "all" }
   | { kind: "provider"; providerId: string; providerLabel: string };
@@ -140,8 +80,6 @@ interface CombinedModelSelectorProps {
     onPress: () => void;
     disabled: boolean;
     isOpen: boolean;
-    hovered: boolean;
-    pressed: boolean;
   }) => React.ReactNode;
   onOpen?: () => void;
   onClose?: () => void;
@@ -149,17 +87,6 @@ interface CombinedModelSelectorProps {
   isRetryingProvider?: boolean;
   disabled?: boolean;
   serverId?: string | null;
-  desktopPlacement?: ComboboxProps["desktopPlacement"];
-  desktopMinWidth?: number;
-  /**
-   * Render the custom trigger as a full-width form field: the outer Pressable
-   * becomes a transparent passthrough that stretches its child edge-to-edge and
-   * stops painting its own hover/pressed background and rounded corners. The
-   * trigger itself owns the field visuals and reads hovered/pressed to show its
-   * active state. Without this the trigger stays a content-width toolbar chip
-   * (the composer's layout).
-   */
-  triggerFill?: boolean;
 }
 
 interface SelectorContentProps {
@@ -211,7 +138,9 @@ function ModelRow({
   onPress: () => void;
   onToggleFavorite?: (provider: string, modelId: string) => void;
 }) {
+  const { theme } = useUnistyles();
   const { t } = useTranslation();
+  const ProviderIcon = getProviderIcon(row.provider);
 
   const handleToggleFavorite = useCallback(
     (event: GestureResponderEvent) => {
@@ -222,8 +151,8 @@ function ModelRow({
   );
 
   const leadingSlot = useMemo(
-    () => <ProviderGlyph provider={row.provider} size={ICON_SIZE.sm} />,
+    () => <ProviderIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />,
-    [row.provider],
+    [ProviderIcon, theme.iconSize.sm, theme.colors.foregroundMuted],
   );
   const trailingSlot = useMemo(
     () =>
@@ -238,10 +167,32 @@ function ModelRow({
           }
           testID={`favorite-model-${row.provider}-${row.modelId}`}
         >
-          {({ hovered }) => <FavoriteStar isFavorite={isFavorite} hovered={Boolean(hovered)} />}
+          {({ hovered }) => {
+            let starColor: string;
+            if (isFavorite) starColor = theme.colors.palette.amber[500];
+            else if (hovered) starColor = theme.colors.foregroundMuted;
+            else starColor = theme.colors.border;
+            return (
+              <Star
+                size={16}
+                color={starColor}
+                fill={isFavorite ? theme.colors.palette.amber[500] : "transparent"}
+              />
+            );
+          }}
         </Pressable>
       ) : null,
-    [onToggleFavorite, handleToggleFavorite, isFavorite, row.provider, row.modelId, t],
+    [
+      onToggleFavorite,
+      handleToggleFavorite,
+      isFavorite,
+      row.provider,
+      row.modelId,
+      theme.colors.palette.amber,
+      theme.colors.foregroundMuted,
+      theme.colors.border,
+      t,
+    ],
   );
 
   return (
@@ -343,7 +294,9 @@ function iconButtonStyle({ hovered, pressed }: PressableStateCallbackType & { ho
 }
 
 function GroupProviderButton({ provider, onDrillDown }: GroupProviderButtonProps) {
+  const { theme } = useUnistyles();
   const { t } = useTranslation();
+  const ProvIcon = getProviderIcon(provider.id);
   const selection = provider.modelSelection;
 
   const handlePress = useCallback(() => {
@@ -363,16 +316,18 @@ function GroupProviderButton({ provider, onDrillDown }: GroupProviderButtonProps
   } else if (selection.kind === "loading") {
     stateNode = (
       <View style={styles.rowStateInline}>
-        <View style={styles.rowSpinner}>
+        <ActivityIndicator
-          <ThemedLoadingSpinner size={ICON_SIZE.sm} uniProps={foregroundMutedMapping} />
+          size="small"
-        </View>
+          color={theme.colors.foregroundMuted}
+          style={styles.rowSpinner}
+        />
         <Text style={styles.drillDownCount}>{t("modelSelector.loadingShort")}</Text>
       </View>
     );
   } else {
     stateNode = (
       <View style={styles.rowStateInline}>
-        <ThemedAlertTriangle size={ICON_SIZE.sm} uniProps={foregroundMutedMapping} />
+        <AlertTriangle size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
         <Text style={styles.drillDownCount}>{t("modelSelector.error")}</Text>
       </View>
     );
@@ -380,11 +335,11 @@ function GroupProviderButton({ provider, onDrillDown }: GroupProviderButtonProps
 
   return (
     <Pressable onPress={handlePress} style={drillDownRowStyle}>
-      <ProviderGlyph provider={provider.id} size={ICON_SIZE.sm} />
+      <ProvIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
       <Text style={styles.drillDownText}>{provider.label}</Text>
       <View style={styles.drillDownTrailing}>
         {stateNode}
-        <ThemedChevronRight size={ICON_SIZE.sm} uniProps={foregroundMutedMapping} />
+        <ChevronRight size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
       </View>
     </Pressable>
   );
@@ -480,13 +435,14 @@ function ProviderErrorEmptyState({
   onRetryProvider?: (provider: AgentProvider) => void;
   isRetryingProvider: boolean;
 }) {
+  const { theme } = useUnistyles();
   const { t } = useTranslation();
   const handleRetry = useCallback(() => {
     onRetryProvider?.(providerId);
   }, [onRetryProvider, providerId]);
   return (
     <View style={styles.emptyState}>
-      <ThemedAlertTriangle size={ICON_SIZE.md} uniProps={foregroundMutedMapping} />
+      <AlertTriangle size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
       <Text style={styles.emptyStateText}>{message}</Text>
       {onRetryProvider ? (
         <Button variant="default" size="sm" onPress={handleRetry} disabled={isRetryingProvider}>
@@ -510,6 +466,7 @@ function SelectorContent({
   onRetryProvider,
   isRetryingProvider,
 }: SelectorContentProps) {
+  const { theme } = useUnistyles();
   const { t } = useTranslation();
   const normalizedQuery = useMemo(() => normalizeSearchQuery(searchQuery), [searchQuery]);
   const selectedViewProvider = useMemo(
@@ -533,7 +490,7 @@ function SelectorContent({
   const hasResults = favoriteRows.length > 0 || providers.length > 0;
   const emptyState = (
     <View style={styles.emptyState}>
-      <ThemedSearch size={ICON_SIZE.md} uniProps={foregroundMutedMapping} />
+      <Search size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
       <Text style={styles.emptyStateText}>{t("modelSelector.noMatches")}</Text>
     </View>
   );
@@ -546,9 +503,11 @@ function SelectorContent({
     if (drillSelection.kind === "loading") {
       return (
         <View style={styles.emptyState}>
-          <View style={styles.rowSpinner}>
+          <ActivityIndicator
-            <ThemedLoadingSpinner size={ICON_SIZE.sm} uniProps={foregroundMutedMapping} />
+            size="small"
-          </View>
+            color={theme.colors.foregroundMuted}
+            style={styles.rowSpinner}
+          />
           <Text style={styles.emptyStateText}>{t("modelSelector.loadingShort")}</Text>
         </View>
       );
@@ -615,10 +574,8 @@ export function CombinedModelSelector({
   isRetryingProvider = false,
   disabled = false,
   serverId = null,
-  desktopPlacement,
-  desktopMinWidth,
-  triggerFill = false,
 }: CombinedModelSelectorProps) {
+  const { theme } = useUnistyles();
   const { t } = useTranslation();
   const anchorRef = useRef<View>(null);
   const [isOpen, setIsOpen] = useState(false);
@@ -674,6 +631,7 @@ export function CombinedModelSelector({
   );
 
   const hasSelectedProvider = selectedProvider.trim().length > 0;
+  const ProviderIcon = hasSelectedProvider ? getProviderIcon(selectedProvider) : null;
 
   const selectedModelLabel = useMemo(() => {
     return resolveSelectedModelLabel({
@@ -735,26 +693,14 @@ export function CombinedModelSelector({
   }, [handleOpenChange, isOpen]);
 
   const triggerStyle = useCallback(
-    ({ pressed, hovered }: PressableStateCallbackType & { hovered?: boolean }) => {
+    ({ pressed, hovered }: PressableStateCallbackType & { hovered?: boolean }) => [
-      // Fill mode: transparent full-width passthrough. The trigger paints its own
+      styles.trigger,
-      // hover/pressed state from the args, so the wrapper must not double-paint.
+      Boolean(hovered) && styles.triggerHovered,
-      if (triggerFill) {
+      (pressed || isOpen) && styles.triggerPressed,
-        return [
+      disabled && styles.triggerDisabled,
-          styles.trigger,
+      renderTrigger ? styles.customTriggerWrapper : null,
-          styles.customTriggerWrapper,
+    ],
-          styles.triggerFill,
+    [disabled, isOpen, renderTrigger],
-          disabled && styles.triggerDisabled,
-        ];
-      }
-      return [
-        styles.trigger,
-        Boolean(hovered) && styles.triggerHovered,
-        (pressed || isOpen) && styles.triggerPressed,
-        disabled && styles.triggerDisabled,
-        renderTrigger ? styles.customTriggerWrapper : null,
-      ];
-    },
-    [disabled, isOpen, renderTrigger, triggerFill],
   );
 
   const handleBackToAll = useCallback(() => {
@@ -780,6 +726,7 @@ export function CombinedModelSelector({
     if (view.kind === "all") {
       return { title: t("modelSelector.title") };
     }
+    const ProviderIconForView = getProviderIcon(view.providerId);
     const headerActions = (
       <Pressable
         onPress={openProviderSettings}
@@ -792,12 +739,17 @@ export function CombinedModelSelector({
         })}
         testID={`selector-header-settings-${view.providerId}`}
       >
-        <HeaderSettingsIcon disabled={!serverId} />
+        <Settings
+          size={theme.iconSize.sm}
+          color={!serverId ? theme.colors.border : theme.colors.foregroundMuted}
+        />
       </Pressable>
     );
     return {
       title: view.providerLabel,
-      leading: <ProviderGlyph provider={view.providerId} size={ICON_SIZE.md} tone="foreground" />,
+      leading: ProviderIconForView ? (
+        <ProviderIconForView size={theme.iconSize.md} color={theme.colors.foreground} />
+      ) : undefined,
       back: singleProviderView ? undefined : { onPress: handleBackToAll },
       actions: headerActions,
       search: {
@@ -813,10 +765,15 @@ export function CombinedModelSelector({
     singleProviderView,
     serverId,
     openProviderSettings,
+    theme.colors.border,
+    theme.colors.foregroundMuted,
     handleBackToAll,
     handleSearchQueryChange,
     searchResetKey,
     t,
+    theme.iconSize.md,
+    theme.iconSize.sm,
+    theme.colors.foreground,
   ]);
 
   return (
@@ -832,16 +789,12 @@ export function CombinedModelSelector({
           accessibilityLabel={t("modelSelector.selectedModel", { model: selectedModelLabel })}
           testID="combined-model-selector"
         >
-          {({ pressed, hovered }: PressableStateCallbackType & { hovered?: boolean }) =>
+          {renderTrigger({
-            renderTrigger({
+            selectedModelLabel: triggerLabel,
-              selectedModelLabel: triggerLabel,
+            onPress: handleTriggerPress,
-              onPress: handleTriggerPress,
+            disabled,
-              disabled,
+            isOpen,
-              isOpen,
+          })}
-              hovered: Boolean(hovered),
-              pressed,
-            })
-          }
         </Pressable>
       ) : (
         <ComboboxTrigger
@@ -854,8 +807,8 @@ export function CombinedModelSelector({
           accessibilityLabel={t("modelSelector.selectedModel", { model: selectedModelLabel })}
           testID="combined-model-selector"
         >
-          {hasSelectedProvider ? (
+          {ProviderIcon ? (
-            <ProviderGlyph provider={selectedProvider} size={ICON_SIZE.md} />
+            <ProviderIcon size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
           ) : null}
           <Text style={styles.triggerText} numberOfLines={1} ellipsizeMode="tail">
             {triggerLabel}
@@ -869,8 +822,8 @@ export function CombinedModelSelector({
         open={isOpen}
         onOpenChange={handleOpenChange}
         anchorRef={anchorRef}
-        desktopPlacement={desktopPlacement}
+        desktopPlacement="top-start"
-        desktopMinWidth={desktopMinWidth}
+        desktopMinWidth={360}
         desktopFixedHeight={desktopFixedHeight}
         header={sheetHeader}
         mobileChildrenScrollEnabled={view.kind !== "provider" || !isNative}
@@ -891,7 +844,7 @@ export function CombinedModelSelector({
           />
         ) : (
           <View style={styles.sheetLoadingState}>
-            <ThemedLoadingSpinner size={ICON_SIZE.sm} uniProps={foregroundMutedMapping} />
+            <ActivityIndicator size="small" color={theme.colors.foregroundMuted} />
             <Text style={styles.sheetLoadingText}>{t("modelSelector.loadingSelector")}</Text>
           </View>
         )}
@@ -933,16 +886,6 @@ const styles = StyleSheet.create((theme) => ({
     paddingVertical: 0,
     height: "auto",
   },
-  // Stretch the wrapper (and, via column + stretch, its single child) to the
-  // full width of the field, with no background or rounding of its own.
-  triggerFill: {
-    alignSelf: "stretch",
-    flexShrink: 0,
-    flexDirection: "column",
-    alignItems: "stretch",
-    backgroundColor: "transparent",
-    borderRadius: 0,
-  },
   favoritesContainer: {
     backgroundColor: theme.colors.surface1,
     borderBottomWidth: 1,
@@ -1063,10 +1006,4 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.sm,
   },
-  providerIconMuted: {
-    color: theme.colors.foregroundMuted,
-  },
-  providerIconForeground: {
-    color: theme.colors.foreground,
-  },
 }));

packages/app/src/components/hosts/host-filter.tsx

@@ -1,118 +0,0 @@
-import { useCallback, useMemo, useRef, useState, type ReactElement } from "react";
-import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
-import { ChevronDown, Server } from "lucide-react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import type { HostProfile } from "@/types/host-connection";
-import type { Theme } from "@/styles/theme";
-import {
-  ALL_HOSTS_OPTION_ID,
-  getHostPickerLabel,
-  HostPicker,
-  HostStatusDotSlot,
-} from "@/components/hosts/host-picker";
-
-const ThemedServer = withUnistyles(Server);
-const ThemedChevronDown = withUnistyles(ChevronDown);
-const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-
-export interface HostFilterProps {
-  hosts: HostProfile[];
-  selectedHost: string;
-  onSelectHost: (serverId: string) => void;
-  triggerTestID?: string;
-}
-
-/**
- * The "All hosts / <host>" filter pill shared by the History and Schedules
- * screens: an anchored HostPicker with `includeAllHost`, hidden by the caller
- * when only one host exists. Copies the History layout exactly.
- */
-export function HostFilter({
-  hosts,
-  selectedHost,
-  onSelectHost,
-  triggerTestID,
-}: HostFilterProps): ReactElement {
-  const [isFilterOpen, setIsFilterOpen] = useState(false);
-  const filterAnchorRef = useRef<View>(null);
-
-  const selectedHostLabel = useMemo(
-    () => getHostPickerLabel(hosts, selectedHost, { includeAllHost: true }),
-    [hosts, selectedHost],
-  );
-
-  const handleFilterOpen = useCallback(() => setIsFilterOpen(true), []);
-
-  const filterTriggerStyle = useCallback(
-    ({ pressed, hovered = false }: PressableStateCallbackType & { hovered?: boolean }) => [
-      styles.filterTrigger,
-      Boolean(hovered) && styles.filterTriggerHovered,
-      pressed && styles.filterTriggerPressed,
-    ],
-    [],
-  );
-
-  return (
-    <HostPicker
-      hosts={hosts}
-      value={selectedHost}
-      onSelect={onSelectHost}
-      open={isFilterOpen}
-      onOpenChange={setIsFilterOpen}
-      anchorRef={filterAnchorRef}
-      includeAllHost
-      searchable={false}
-      title="Filter by host"
-      desktopPlacement="bottom-start"
-    >
-      <View ref={filterAnchorRef} collapsable={false} style={styles.filterTriggerWrap}>
-        <Pressable
-          onPress={handleFilterOpen}
-          style={filterTriggerStyle}
-          testID={triggerTestID}
-          accessibilityRole="button"
-          accessibilityLabel={`Filter: ${selectedHostLabel}`}
-        >
-          {selectedHost === ALL_HOSTS_OPTION_ID ? (
-            <ThemedServer size={14} uniProps={mutedColorMapping} />
-          ) : (
-            <HostStatusDotSlot serverId={selectedHost} />
-          )}
-          <Text style={styles.filterTriggerText} numberOfLines={1}>
-            {selectedHostLabel}
-          </Text>
-          <ThemedChevronDown size={14} uniProps={mutedColorMapping} />
-        </Pressable>
-      </View>
-    </HostPicker>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  filterTriggerWrap: {
-    alignSelf: "flex-start",
-  },
-  filterTrigger: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1.5],
-    alignSelf: "flex-start",
-    paddingVertical: theme.spacing[1.5],
-    paddingHorizontal: theme.spacing[3],
-    borderRadius: theme.borderRadius.md,
-    backgroundColor: theme.colors.surface1,
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
-  },
-  filterTriggerHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
-  filterTriggerPressed: {
-    backgroundColor: theme.colors.surface3,
-  },
-  filterTriggerText: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.medium,
-  },
-}));

packages/app/src/components/hosts/host-picker-constants.ts

@@ -1,6 +1,5 @@
 export const ADD_HOST_OPTION_ID = "__add_host__";
 export const ALL_HOSTS_OPTION_ID = "__all_hosts__";
-export const ENABLE_BUILT_IN_DAEMON_OPTION_ID = "__enable_built_in_daemon__";
 
 export function getHostPickerLabel(
   hosts: Array<{ label: string; serverId: string }>,

packages/app/src/components/hosts/host-picker.tsx

@@ -11,16 +11,10 @@ import { orderHostsLocalFirst } from "@/types/host-connection";
 import {
   ADD_HOST_OPTION_ID,
   ALL_HOSTS_OPTION_ID,
-  ENABLE_BUILT_IN_DAEMON_OPTION_ID,
   getHostPickerLabel,
 } from "./host-picker-constants";
 
-export {
+export { ADD_HOST_OPTION_ID, ALL_HOSTS_OPTION_ID, getHostPickerLabel };
-  ADD_HOST_OPTION_ID,
-  ALL_HOSTS_OPTION_ID,
-  ENABLE_BUILT_IN_DAEMON_OPTION_ID,
-  getHostPickerLabel,
-};
 
 const SEARCHABLE_THRESHOLD = 10;
 type RenderHostOption = NonNullable<ComboboxProps["renderOption"]>;
@@ -121,12 +115,6 @@ export function HostPickerOption({
   );
 }
 
-const SYSTEM_HOST_PICKER_OPTION_LABELS: Record<"add" | "all" | "enableBuiltInDaemon", string> = {
-  add: "Add host",
-  all: "All hosts",
-  enableBuiltInDaemon: "Enable built-in daemon",
-};
-
 function SystemHostPickerOption({
   active,
   selected,
@@ -137,12 +125,12 @@ function SystemHostPickerOption({
   active: boolean;
   selected?: boolean;
   onPress: () => void;
-  kind: "add" | "all" | "enableBuiltInDaemon";
+  kind: "add" | "all";
   testID?: string;
 }): ReactElement {
   const { theme } = useUnistyles();
   const Icon = kind === "add" ? Plus : Server;
-  const label = SYSTEM_HOST_PICKER_OPTION_LABELS[kind];
+  const label = kind === "add" ? "Add host" : "All hosts";
   const leadingSlot = useMemo(
     () => <Icon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />,
     [Icon, theme.colors.foregroundMuted, theme.iconSize.sm],
@@ -170,13 +158,11 @@ export interface HostPickerProps {
   includeAllHost?: boolean;
   includeAddHost?: boolean;
   onAddHost?: () => void;
-  includeEnableBuiltInDaemon?: boolean;
-  onEnableBuiltInDaemon?: () => void;
   showActiveConnection?: boolean;
   onOpenHostSettings?: (serverId: string) => void;
   searchable?: boolean;
   title?: string;
-  desktopPlacement?: ComboboxProps["desktopPlacement"];
+  desktopPlacement?: "top-start" | "bottom-start";
   desktopMinWidth?: number;
   addHostTestID?: string;
   hostOptionTestID?: (serverId: string) => string;
@@ -193,13 +179,11 @@ export function HostPicker({
   includeAllHost,
   includeAddHost,
   onAddHost,
-  includeEnableBuiltInDaemon,
-  onEnableBuiltInDaemon,
   showActiveConnection,
   onOpenHostSettings,
   searchable,
   title,
-  desktopPlacement = "bottom-start",
+  desktopPlacement = "top-start",
   desktopMinWidth,
   addHostTestID,
   hostOptionTestID,
@@ -215,13 +199,8 @@ export function HostPicker({
     const hostOptions = orderedHosts.map((host) => ({ id: host.serverId, label: host.label }));
     if (includeAllHost) hostOptions.unshift({ id: ALL_HOSTS_OPTION_ID, label: "All hosts" });
     if (includeAddHost) hostOptions.push({ id: ADD_HOST_OPTION_ID, label: "Add host" });
-    if (includeEnableBuiltInDaemon)
-      hostOptions.push({
-        id: ENABLE_BUILT_IN_DAEMON_OPTION_ID,
-        label: "Enable built-in daemon",
-      });
     return hostOptions;
-  }, [orderedHosts, includeAllHost, includeAddHost, includeEnableBuiltInDaemon]);
+  }, [orderedHosts, includeAllHost, includeAddHost]);
 
   const isSearchable = searchable === true && orderedHosts.length > SEARCHABLE_THRESHOLD;
 
@@ -229,14 +208,12 @@ export function HostPicker({
     (id: string) => {
       if (id === ADD_HOST_OPTION_ID) {
         onAddHost?.();
-      } else if (id === ENABLE_BUILT_IN_DAEMON_OPTION_ID) {
-        onEnableBuiltInDaemon?.();
       } else {
         onSelect(id);
       }
       onOpenChange(false);
     },
-    [onAddHost, onEnableBuiltInDaemon, onOpenChange, onSelect],
+    [onAddHost, onOpenChange, onSelect],
   );
 
   const handleOpenHostSettings = useCallback(
@@ -269,11 +246,6 @@ export function HostPicker({
           />
         );
       }
-      if (option.id === ENABLE_BUILT_IN_DAEMON_OPTION_ID) {
-        return (
-          <SystemHostPickerOption kind="enableBuiltInDaemon" active={active} onPress={onPress} />
-        );
-      }
       return (
         <HostPickerOption
           serverId={option.id}

packages/app/src/components/left-sidebar.tsx

@@ -1,15 +1,5 @@
 import { router, usePathname } from "expo-router";
-import {
+import { FolderPlus, History, Home, Plus, Search, Server, Settings, X } from "lucide-react-native";
-  CalendarClock,
-  FolderPlus,
-  History,
-  Home,
-  Plus,
-  Search,
-  Server,
-  Settings,
-  X,
-} from "lucide-react-native";
 import { useTranslation } from "react-i18next";
 import { memo, useCallback, useEffect, useMemo, useRef, useState, type RefObject } from "react";
 import {
@@ -66,7 +56,6 @@ import { canCloseLeftSidebarGesture } from "@/utils/sidebar-animation-state";
 import {
   buildOpenProjectRoute,
   buildNewWorkspaceRoute,
-  buildSchedulesRoute,
   buildSessionsRoute,
   buildSettingsAddHostRoute,
   buildSettingsHostSectionRoute,
@@ -116,7 +105,6 @@ interface SidebarLabels {
   switchHost: string;
   searchHosts: string;
   sessions: string;
-  schedules: string;
   closeSidebar: string;
 }
 
@@ -126,14 +114,12 @@ interface MobileSidebarProps extends SidebarSharedProps {
   isOpen: boolean;
   closeSidebar: () => void;
   handleViewMoreNavigate: () => void;
-  handleViewSchedulesNavigate: () => void;
 }
 
 interface DesktopSidebarProps extends SidebarSharedProps {
   insetsTop: number;
   isOpen: boolean;
   handleViewMore: () => void;
-  handleViewSchedules: () => void;
 }
 
 export const LeftSidebar = memo(function LeftSidebar({
@@ -235,10 +221,6 @@ export const LeftSidebar = memo(function LeftSidebar({
     router.push(buildSessionsRoute());
   }, []);
 
-  const handleViewSchedulesNavigate = useCallback(() => {
-    router.push(buildSchedulesRoute());
-  }, []);
-
   const newWorkspaceKeys = useShortcutKeys("new-workspace");
   const labels = useMemo(
     (): SidebarLabels => ({
@@ -249,7 +231,6 @@ export const LeftSidebar = memo(function LeftSidebar({
       switchHost: t("sidebar.host.switchTitle"),
       searchHosts: t("sidebar.host.searchPlaceholder"),
       sessions: t("sidebar.sections.sessions"),
-      schedules: t("sidebar.sections.schedules"),
       closeSidebar: t("sidebar.actions.closeSidebar"),
     }),
     [t],
@@ -286,7 +267,6 @@ export const LeftSidebar = memo(function LeftSidebar({
         handleAddHost={handleAddHostMobile}
         handleOpenHostSettings={handleOpenHostSettingsMobile}
         handleViewMoreNavigate={handleViewMoreNavigate}
-        handleViewSchedulesNavigate={handleViewSchedulesNavigate}
       />
     );
   }
@@ -302,7 +282,6 @@ export const LeftSidebar = memo(function LeftSidebar({
       handleAddHost={handleAddHostDesktop}
       handleOpenHostSettings={handleOpenHostSettingsDesktop}
       handleViewMore={handleViewMoreNavigate}
-      handleViewSchedules={handleViewSchedulesNavigate}
     />
   );
 });
@@ -385,7 +364,6 @@ function SidebarHostPicker({
       showActiveConnection
       onOpenHostSettings={onOpenHostSettings}
       searchable
-      desktopPlacement="top-start"
       desktopMinWidth={240}
       addHostTestID="sidebar-host-add"
       hostOptionTestID={sidebarHostOptionTestID}
@@ -579,11 +557,9 @@ function MobileSidebar({
   isOpen,
   closeSidebar,
   handleViewMoreNavigate,
-  handleViewSchedulesNavigate,
 }: MobileSidebarProps) {
   const pathname = usePathname();
   const isSessionsActive = pathname.includes("/sessions");
-  const isSchedulesActive = pathname.includes("/schedules");
   const {
     translateX,
     backdropOpacity,
@@ -611,13 +587,6 @@ function MobileSidebar({
     handleViewMoreNavigate();
   }, [backdropOpacity, closeSidebar, handleViewMoreNavigate, translateX, windowWidth]);
 
-  const handleViewSchedules = useCallback(() => {
-    translateX.value = -windowWidth;
-    backdropOpacity.value = 0;
-    closeSidebar();
-    handleViewSchedulesNavigate();
-  }, [backdropOpacity, closeSidebar, handleViewSchedulesNavigate, translateX, windowWidth]);
-
   const handleWorkspacePress = useCallback(() => {
     closeSidebar();
   }, [closeSidebar]);
@@ -778,14 +747,6 @@ function MobileSidebar({
                 testID="sidebar-sessions"
                 variant="compact"
               />
-              <SidebarHeaderRow
-                icon={CalendarClock}
-                label={labels.schedules}
-                onPress={handleViewSchedules}
-                isActive={isSchedulesActive}
-                testID="sidebar-schedules"
-                variant="compact"
-              />
             </View>
             <WorkspacesSectionHeader />
             <Pressable
@@ -866,11 +827,9 @@ function DesktopSidebar({
   insetsTop,
   isOpen,
   handleViewMore,
-  handleViewSchedules,
 }: DesktopSidebarProps) {
   const pathname = usePathname();
   const isSessionsActive = pathname.includes("/sessions");
-  const isSchedulesActive = pathname.includes("/schedules");
   const padding = useWindowControlsPadding("sidebar");
   const sidebarWidth = usePanelStore((state) => state.sidebarWidth);
   const setSidebarWidth = usePanelStore((state) => state.setSidebarWidth);
@@ -950,14 +909,6 @@ function DesktopSidebar({
               testID="sidebar-sessions"
               variant="compact"
             />
-            <SidebarHeaderRow
-              icon={CalendarClock}
-              label={labels.schedules}
-              onPress={handleViewSchedules}
-              isActive={isSchedulesActive}
-              testID="sidebar-schedules"
-              variant="compact"
-            />
           </View>
         </View>
         <WorkspacesSectionHeader />

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

@@ -18,7 +18,6 @@ describe("resolveProviderIconName", () => {
   it("returns the catalog identifier for ACP catalog provider ids that ship an icon", () => {
     expect(resolveProviderIconName("amp-acp")).toEqual({ kind: "catalog", id: "amp-acp" });
     expect(resolveProviderIconName("gemini")).toEqual({ kind: "catalog", id: "gemini" });
-    expect(resolveProviderIconName("traecli")).toEqual({ kind: "catalog", id: "traecli" });
   });
 
   it("falls back to the bot icon for unknown custom providers", () => {

packages/app/src/components/question-form-card.tsx

@@ -92,49 +92,30 @@ function QuestionOptionRow({
     () => [styles.optionDescription, { color: theme.colors.foregroundMuted }],
     [theme.colors.foregroundMuted],
   );
-  const accessibilityState = useMemo(() => ({ checked: isSelected }), [isSelected]);
+  const accessibilityState = useMemo(() => ({ selected: isSelected }), [isSelected]);
-
-  // Static left-side control: square for multi-select, circle for single-select.
-  // Always rendered so toggling only swaps fill/border — the row never reflows.
-  const controlStyle = useMemo(
-    () => [
-      styles.selectionControl,
-      multiSelect ? styles.selectionControlCheckbox : styles.selectionControlRadio,
-      {
-        borderColor: isSelected ? theme.colors.accent : theme.colors.foregroundMuted,
-        backgroundColor: isSelected && multiSelect ? theme.colors.accent : "transparent",
-      },
-    ],
-    [isSelected, multiSelect, theme.colors.accent, theme.colors.foregroundMuted],
-  );
-  const radioDotStyle = useMemo(
-    () => [styles.selectionRadioDot, { backgroundColor: theme.colors.accent }],
-    [theme.colors.accent],
-  );
 
   return (
     <Pressable
       style={pressableStyle}
       onPress={handlePress}
       disabled={isResponding}
-      accessibilityRole={multiSelect ? "checkbox" : "radio"}
+      accessibilityRole="button"
       accessibilityLabel={option.label}
       accessibilityState={accessibilityState}
-      aria-checked={isSelected}
+      aria-selected={isSelected}
     >
       <View style={styles.optionItemContent}>
-        <View style={controlStyle}>
-          {isSelected && multiSelect ? (
-            <Check size={12} color={theme.colors.accentForeground} />
-          ) : null}
-          {isSelected && !multiSelect ? <View style={radioDotStyle} /> : null}
-        </View>
         <View style={styles.optionTextBlock}>
           <Text style={optionLabelStyle}>{option.label}</Text>
           {option.description ? (
             <Text style={optionDescriptionStyle}>{option.description}</Text>
           ) : null}
         </View>
+        {isSelected ? (
+          <View style={styles.optionCheckSlot}>
+            <Check size={16} color={theme.colors.foregroundMuted} />
+          </View>
+        ) : null}
       </View>
     </Pressable>
   );
@@ -143,9 +124,7 @@ function QuestionOptionRow({
 interface QuestionNavButtonProps {
   index: number;
   total: number;
-  header: string;
   isActive: boolean;
-  isAnswered: boolean;
   isResponding: boolean;
   onSelect: (index: number) => void;
 }
@@ -153,9 +132,7 @@ interface QuestionNavButtonProps {
 function QuestionNavButton({
   index,
   total,
-  header,
   isActive,
-  isAnswered,
   isResponding,
   onSelect,
 }: QuestionNavButtonProps) {
@@ -194,7 +171,7 @@ function QuestionNavButton({
 
   return (
     <Pressable
-      accessibilityRole="tab"
+      accessibilityRole="button"
       accessibilityLabel={`Question ${index + 1} of ${total}`}
       accessibilityState={accessibilityState}
       aria-selected={isActive}
@@ -203,61 +180,11 @@ function QuestionNavButton({
       onPress={handlePress}
       disabled={isResponding}
     >
-      {isAnswered ? (
+      <Text style={textStyle}>{index + 1}</Text>
-        <Check
-          size={12}
-          color={isActive ? theme.colors.foreground : theme.colors.foregroundMuted}
-        />
-      ) : null}
-      <Text style={textStyle} numberOfLines={1}>
-        {header}
-      </Text>
     </Pressable>
   );
 }
 
-interface QuestionNavProps {
-  questions: QuestionFormQuestion[];
-  activeIndex: number;
-  isAnswered: (qIndex: number) => boolean;
-  isResponding: boolean;
-  onSelect: (index: number) => void;
-}
-
-// Titled tabs (one per question header) with a check on answered ones. Hidden for
-// a lone question — a single "1 of 1" tab carries no information.
-function QuestionNav({
-  questions,
-  activeIndex,
-  isAnswered,
-  isResponding,
-  onSelect,
-}: QuestionNavProps) {
-  if (questions.length <= 1) {
-    return null;
-  }
-  return (
-    <View
-      style={styles.questionNav}
-      testID="question-form-question-nav"
-      accessibilityRole="tablist"
-    >
-      {questions.map((question, qIndex) => (
-        <QuestionNavButton
-          key={question.header}
-          index={qIndex}
-          total={questions.length}
-          header={question.header}
-          isActive={qIndex === activeIndex}
-          isAnswered={isAnswered(qIndex)}
-          isResponding={isResponding}
-          onSelect={onSelect}
-        />
-      ))}
-    </View>
-  );
-}
-
 interface QuestionOtherInputProps {
   qIndex: number;
   accessibilityLabel: string;
@@ -428,12 +355,6 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
     setActiveQuestionIndex(index);
   }, []);
 
-  const navIsAnswered = useCallback(
-    (qIndex: number) =>
-      questions ? isQuestionAnswered(questions[qIndex], qIndex, selections, otherTexts) : false,
-    [questions, selections, otherTexts],
-  );
-
   const handlePrimaryAction = useCallback(() => {
     if (!isLastQuestion) {
       if (!activeQuestionAnswered || isResponding) return;
@@ -486,16 +407,9 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
     () => [styles.questionText, { color: theme.colors.foreground }],
     [theme.colors.foreground],
   );
-  // Single-select radios need a group; checkboxes are valid standalone.
+  const questionNavStyle = useMemo(
-  const optionsGroupAccessibility = useMemo(
+    () => [styles.questionNav, isMobile && styles.questionNavMobile],
-    () =>
+    [isMobile],
-      activeQuestion && !activeQuestion.multiSelect
-        ? ({
-            accessibilityRole: "radiogroup",
-            accessibilityLabel: activeQuestion.question,
-          } as const)
-        : {},
-    [activeQuestion],
   );
   const actionsContainerStyle = useMemo(
     () => [styles.actionsContainer, !isMobile && styles.actionsContainerDesktop],
@@ -522,23 +436,33 @@ export function QuestionFormCard({ permission, onRespond, isResponding }: Questi
 
   return (
     <View style={containerStyle} testID="question-form-card">
-      <QuestionNav
+      <View style={styles.questionTopRow}>
-        questions={questions}
+        <View style={styles.questionHeader}>
-        activeIndex={resolvedActiveQuestionIndex}
+          <Text testID="question-form-current-question" style={questionTextStyle}>
-        isAnswered={navIsAnswered}
+            {activeQuestion?.question}
-        isResponding={isResponding}
+          </Text>
-        onSelect={handleSelectQuestion}
+        </View>
-      />
+        <View style={questionNavStyle} testID="question-form-question-nav">
-      <View style={styles.questionHeader}>
+          {questions.map((question, qIndex) => {
-        <Text testID="question-form-current-question" style={questionTextStyle}>
+            const isActive = qIndex === resolvedActiveQuestionIndex;
-          {activeQuestion?.question}
+            return (
-        </Text>
+              <QuestionNavButton
+                key={question.header}
+                index={qIndex}
+                total={questions.length}
+                isActive={isActive}
+                isResponding={isResponding}
+                onSelect={handleSelectQuestion}
+              />
+            );
+          })}
+        </View>
       </View>
 
       {activeQuestion ? (
         <View key={activeQuestion.question} style={styles.questionBlock}>
           {activeQuestion.options.length > 0 ? (
-            <View style={styles.optionsWrap} {...optionsGroupAccessibility}>
+            <View style={styles.optionsWrap}>
               {activeQuestion.options.map((opt, optIndex) => (
                 <QuestionOptionRow
                   key={opt.label}
@@ -622,6 +546,12 @@ const styles = StyleSheet.create((theme) => ({
   questionBlock: {
     gap: theme.spacing[2],
   },
+  questionTopRow: {
+    flexDirection: "row",
+    alignItems: "flex-start",
+    justifyContent: "space-between",
+    gap: theme.spacing[3],
+  },
   questionHeader: {
     flexDirection: "row",
     alignItems: "center",
@@ -641,24 +571,24 @@ const styles = StyleSheet.create((theme) => ({
   },
   questionNav: {
     flexDirection: "row",
-    flexWrap: "wrap",
     alignItems: "center",
+    justifyContent: "flex-end",
     gap: theme.spacing[1],
-    paddingHorizontal: theme.spacing[3],
+  },
+  questionNavMobile: {
+    paddingRight: theme.spacing[1],
   },
   questionNavButton: {
-    flexDirection: "row",
+    minWidth: 28,
+    height: 28,
     alignItems: "center",
-    gap: theme.spacing[1],
+    justifyContent: "center",
-    minHeight: 28,
+    borderRadius: 999,
-    paddingHorizontal: theme.spacing[2],
-    paddingVertical: theme.spacing[1],
-    borderRadius: theme.borderRadius.md,
     borderWidth: theme.borderWidth[1],
   },
   questionNavText: {
-    fontSize: theme.fontSize.sm,
+    fontSize: theme.fontSize.xs,
-    fontWeight: theme.fontWeight.medium,
+    fontWeight: "700",
   },
   optionItem: {
     flexDirection: "row",
@@ -673,40 +603,25 @@ const styles = StyleSheet.create((theme) => ({
   optionItemContent: {
     flex: 1,
     flexDirection: "row",
-    alignItems: "flex-start",
+    alignItems: "center",
     gap: theme.spacing[2],
   },
   optionTextBlock: {
     flex: 1,
-    gap: theme.spacing[1],
+    gap: 2,
   },
   optionLabel: {
-    fontSize: theme.fontSize.base,
+    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.semibold,
-    lineHeight: 22,
   },
   optionDescription: {
-    fontSize: theme.fontSize.sm,
+    fontSize: theme.fontSize.xs,
-    lineHeight: 20,
+    lineHeight: 16,
   },
-  selectionControl: {
+  optionCheckSlot: {
-    width: 18,
+    width: 16,
-    height: 18,
     alignItems: "center",
     justifyContent: "center",
-    borderWidth: theme.borderWidth[1],
+    marginLeft: "auto",
-    marginTop: 2, // optical-align 18px control to the 22px label first line
-  },
-  selectionControlCheckbox: {
-    borderRadius: theme.borderRadius.base,
-  },
-  selectionControlRadio: {
-    borderRadius: 999,
-  },
-  selectionRadioDot: {
-    width: 8,
-    height: 8,
-    borderRadius: 999,
   },
   otherInput: {
     borderWidth: 1,

packages/app/src/components/schedules/cadence-editor.tsx

@@ -1,142 +0,0 @@
-import { useCallback, useMemo, useReducer, useState, type ReactNode } from "react";
-import { Text, View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import type { ScheduleCadence } from "@getpaseo/protocol/schedule/types";
-import type { FieldControlSize } from "@/components/ui/control-geometry";
-import { Field, FormTextInput } from "@/components/ui/form-field";
-import { SelectField, type SelectFieldOption } from "@/components/ui/select-field";
-import {
-  CADENCE_PRESET_OPTIONS,
-  normalizeScheduleFormCadence,
-  resolveCronPresetDisplay,
-  resolveCronPresetId,
-} from "@/schedules/schedule-cadence-options";
-import { getDeviceTimeZone } from "@/utils/device-timezone";
-import { describeCron, validateCron } from "@/utils/schedule-format";
-
-type CronCadence = Extract<ScheduleCadence, { type: "cron" }>;
-
-export interface CadenceEditorProps {
-  value: ScheduleCadence;
-  onChange: (next: ScheduleCadence) => void;
-  error?: string;
-  size?: FieldControlSize;
-}
-
-const PRESET_OPTIONS: SelectFieldOption<string>[] = CADENCE_PRESET_OPTIONS.map((option) => ({
-  id: option.id,
-  value: option.id,
-  label: option.label,
-  testID: `schedule-cadence-preset-${option.id}`,
-}));
-
-function getCronPreview(expression: string, timezone: string, error: string | null): string | null {
-  if (error || !expression) {
-    return null;
-  }
-  return describeCron({ type: "cron", expression, timezone }) ?? expression;
-}
-
-function buildCronCadence(expression: string, timezone: string): CronCadence {
-  return { type: "cron", expression, timezone };
-}
-
-export function CadenceEditor({ value, onChange, error, size = "md" }: CadenceEditorProps) {
-  const deviceTimeZone = useMemo(getDeviceTimeZone, []);
-  const normalizedValue = normalizeScheduleFormCadence(value, deviceTimeZone);
-  const [cronText, setCronText] = useState(() => normalizedValue.expression);
-  const [fieldResetKey, bumpFieldResetKey] = useReducer((key: number) => key + 1, 0);
-  const cronTimeZone = normalizedValue.timezone ?? deviceTimeZone;
-  const trimmedCron = cronText.trim();
-  const localCronError = trimmedCron ? validateCron(trimmedCron) : null;
-  const effectiveError = error ?? localCronError;
-  const preview = getCronPreview(trimmedCron, cronTimeZone, effectiveError ?? null);
-  const currentCadence = useMemo<CronCadence>(
-    () => buildCronCadence(trimmedCron, cronTimeZone),
-    [cronTimeZone, trimmedCron],
-  );
-  const selectedPresetId = resolveCronPresetId(currentCadence);
-  const selectedPresetDisplay = resolveCronPresetDisplay(currentCadence);
-
-  const handlePresetChange = useCallback(
-    (presetId: string) => {
-      const preset = CADENCE_PRESET_OPTIONS.find((option) => option.id === presetId);
-      if (!preset) {
-        return;
-      }
-      setCronText(preset.expression);
-      bumpFieldResetKey();
-      onChange(buildCronCadence(preset.expression, cronTimeZone));
-    },
-    [cronTimeZone, onChange],
-  );
-
-  const handleCronChange = useCallback(
-    (text: string) => {
-      setCronText(text);
-      onChange(buildCronCadence(text.trim(), cronTimeZone));
-    },
-    [cronTimeZone, onChange],
-  );
-
-  let feedback: ReactNode = null;
-  if (effectiveError) {
-    feedback = <Text style={styles.error}>{effectiveError}</Text>;
-  } else if (preview) {
-    feedback = <Text style={styles.preview}>{preview}</Text>;
-  }
-
-  return (
-    <Field label="Cadence">
-      <View style={styles.stack}>
-        <SelectField
-          label="Cadence"
-          value={selectedPresetId === "custom" ? null : selectedPresetId}
-          selectedDisplay={selectedPresetDisplay}
-          options={PRESET_OPTIONS}
-          onChange={handlePresetChange}
-          placeholder="Select cadence"
-          emptyText="No cadences found"
-          searchable={false}
-          title="Cadence"
-          size={size}
-          triggerTestID="schedule-cadence-preset-trigger"
-          field={false}
-        />
-
-        <FormTextInput
-          size={size}
-          testID="cadence-cron-expression"
-          accessibilityLabel="Cron expression"
-          initialValue={cronText}
-          resetKey={`cadence-cron-${fieldResetKey}`}
-          value={cronText}
-          onChangeText={handleCronChange}
-          placeholder="0 9 * * *"
-          autoCapitalize="none"
-          autoCorrect={false}
-          spellCheck={false}
-          style={styles.cronInput}
-        />
-        {feedback}
-      </View>
-    </Field>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  stack: {
-    gap: theme.spacing[3],
-  },
-  cronInput: {
-    fontFamily: theme.fontFamily.mono,
-  },
-  preview: {
-    fontSize: theme.fontSize.xs,
-    color: theme.colors.foregroundMuted,
-  },
-  error: {
-    fontSize: theme.fontSize.xs,
-    color: theme.colors.palette.red[300],
-  },
-}));

packages/app/src/components/schedules/schedule-row.tsx

@@ -1,374 +0,0 @@
-import { MoreVertical, Pause, Pencil, Play, RotateCw, Trash2 } from "lucide-react-native";
-import { useCallback, useState, type ReactElement } from "react";
-import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import { StatusBadge } from "@/components/ui/status-badge";
-import { getProviderIcon } from "@/components/provider-icons";
-import { isNative } from "@/constants/platform";
-import { useIsCompactFormFactor } from "@/constants/layout";
-import { settingsStyles } from "@/styles/settings";
-import type { Theme } from "@/styles/theme";
-import type { ScheduleDerivedState } from "@/schedules/schedule-derivation";
-import { formatCadence, formatNextRun, resolveScheduleTitle } from "@/utils/schedule-format";
-import { formatTimeAgo } from "@/utils/time";
-import type { ScheduleSummary } from "@getpaseo/protocol/schedule/types";
-
-// Themed lucide wrappers — module-scope so only the icon re-renders on theme
-// change (never call useUnistyles in render). See docs/unistyles.md.
-const ThemedPencil = withUnistyles(Pencil);
-const ThemedPause = withUnistyles(Pause);
-const ThemedPlay = withUnistyles(Play);
-const ThemedRotateCw = withUnistyles(RotateCw);
-const ThemedTrash2 = withUnistyles(Trash2);
-const ThemedKebab = withUnistyles(MoreVertical);
-
-const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-const foregroundColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
-const destructiveColorMapping = (theme: Theme) => ({ color: theme.colors.destructive });
-
-const MENU_ICON_SIZE = 14;
-const PROVIDER_ICON_SIZE = 16;
-
-// Pending flags for each action so the parent table can wire a mutation hook
-// and the row reflects in-flight state without owning the mutation itself.
-export interface ScheduleRowPending {
-  pause?: boolean;
-  resume?: boolean;
-  runNow?: boolean;
-  delete?: boolean;
-}
-
-export interface ScheduleRowActions {
-  onEdit: () => void;
-  onPause: () => void;
-  onResume: () => void;
-  onRunNow: () => void;
-  onDelete: () => void;
-}
-
-interface ScheduleRowProps extends ScheduleRowActions {
-  schedule: ScheduleSummary;
-  /** Client-derived target line (agent title / project / shortened path). */
-  targetLabel: string;
-  /** Provider glyph, resolved from the schedule config or the target agent. */
-  provider: string | null;
-  /** Client-derived state — the single source for the badge and next-run copy. */
-  state: ScheduleDerivedState;
-  /** Host name, rendered when the list spans more than one host. */
-  serverName?: string;
-  /** True when only one host exists and the host name would be redundant. */
-  singleHost?: boolean;
-  pending?: ScheduleRowPending;
-  isFirst: boolean;
-}
-
-function stateBadge(state: ScheduleDerivedState): {
-  label: string;
-  variant: "success" | "error" | "muted";
-} {
-  switch (state) {
-    case "active":
-      return { label: "Active", variant: "success" };
-    case "paused":
-      return { label: "Paused", variant: "muted" };
-    case "expired":
-      return { label: "Expired", variant: "muted" };
-    case "finished":
-      return { label: "Finished", variant: "muted" };
-    case "targetGone":
-      return { label: "Target gone", variant: "error" };
-  }
-}
-
-// Meta reads left-to-right as identity → history → future: how often, when it
-// was created, when it last ran, and (only while it can still run) when it runs
-// next. Status lives on the badge, never repeated here.
-function buildMeta(
-  schedule: ScheduleSummary,
-  state: ScheduleDerivedState,
-  serverName: string | undefined,
-  singleHost: boolean,
-): string {
-  const parts = [
-    formatCadence(schedule.cadence),
-    `Created ${formatTimeAgo(new Date(schedule.createdAt))}`,
-    schedule.lastRunAt ? `Last run ${formatTimeAgo(new Date(schedule.lastRunAt))}` : "Never run",
-  ];
-  if (state === "active") {
-    const next = formatNextRun(schedule.nextRunAt);
-    if (next) {
-      parts.push(`Next run ${next}`);
-    }
-  }
-  if (serverName && !singleHost) {
-    parts.unshift(serverName);
-  }
-  return parts.join(" · ");
-}
-
-/** Small provider glyph. Reads the icon color off a StyleSheet object so the
- * dynamic component (getProviderIcon) stays compliant without useUnistyles. */
-function ProviderGlyph({ provider }: { provider: string | null }): ReactElement | null {
-  if (!provider) {
-    return null;
-  }
-  const Icon = getProviderIcon(provider);
-  return <Icon size={PROVIDER_ICON_SIZE} color={styles.providerIcon.color} />;
-}
-
-/**
- * One schedule, rendered as a settings-style card row: provider glyph + title,
- * a muted secondary line (model · cadence · next run), a StatusBadge, and the
- * kebab menu that owns every row action. Tapping the row opens the editor.
- *
- * Hover lives on the outer plain View (docs/hover.md): the inner Pressable owns
- * press, the nested kebab Pressable never fights it, and the row background
- * highlights without reflow.
- */
-export function ScheduleRow({
-  schedule,
-  targetLabel,
-  provider,
-  state,
-  serverName,
-  singleHost,
-  pending,
-  isFirst,
-  onEdit,
-  onPause,
-  onResume,
-  onRunNow,
-  onDelete,
-}: ScheduleRowProps): ReactElement {
-  const isCompact = useIsCompactFormFactor();
-  const [isHovered, setIsHovered] = useState(false);
-  const handlePointerEnter = useCallback(() => setIsHovered(true), []);
-  const handlePointerLeave = useCallback(() => setIsHovered(false), []);
-
-  const title = resolveScheduleTitle(schedule);
-  const badge = stateBadge(state);
-  const meta = buildMeta(schedule, state, serverName, singleHost ?? false);
-  const canRun = state === "active" || state === "paused";
-
-  const rowStyle = useCallback(
-    ({ pressed }: PressableStateCallbackType) => [
-      settingsStyles.row,
-      styles.row,
-      !isFirst && settingsStyles.rowBorder,
-      isHovered && !isCompact && styles.rowHovered,
-      pressed && styles.rowPressed,
-    ],
-    [isFirst, isHovered, isCompact],
-  );
-
-  return (
-    <View
-      style={styles.rowContainer}
-      onPointerEnter={handlePointerEnter}
-      onPointerLeave={handlePointerLeave}
-    >
-      <Pressable
-        style={rowStyle}
-        onPress={onEdit}
-        accessibilityRole="button"
-        accessibilityLabel={`Edit schedule ${title}`}
-        testID={`schedule-row-${schedule.id}`}
-      >
-        <View style={styles.main}>
-          <View style={styles.leading}>
-            <ProviderGlyph provider={provider} />
-          </View>
-          <View style={styles.textGroup}>
-            <Text style={settingsStyles.rowTitle} numberOfLines={1}>
-              {title}
-            </Text>
-            <Text style={styles.target} numberOfLines={1}>
-              {targetLabel}
-            </Text>
-            <Text style={settingsStyles.rowHint} numberOfLines={1}>
-              {meta}
-            </Text>
-          </View>
-        </View>
-
-        <View style={styles.trailing}>
-          <StatusBadge label={badge.label} variant={badge.variant} />
-          <ScheduleKebabMenu
-            schedule={schedule}
-            canRun={canRun}
-            pending={pending}
-            onEdit={onEdit}
-            onPause={onPause}
-            onResume={onResume}
-            onRunNow={onRunNow}
-            onDelete={onDelete}
-          />
-        </View>
-      </Pressable>
-    </View>
-  );
-}
-
-const editLeading = <ThemedPencil size={MENU_ICON_SIZE} uniProps={mutedColorMapping} />;
-const pauseLeading = <ThemedPause size={MENU_ICON_SIZE} uniProps={mutedColorMapping} />;
-const resumeLeading = <ThemedPlay size={MENU_ICON_SIZE} uniProps={mutedColorMapping} />;
-const runLeading = <ThemedRotateCw size={MENU_ICON_SIZE} uniProps={mutedColorMapping} />;
-const deleteLeading = <ThemedTrash2 size={MENU_ICON_SIZE} uniProps={destructiveColorMapping} />;
-
-function renderKebabTriggerIcon({ hovered }: { hovered?: boolean }): ReactElement {
-  return (
-    <ThemedKebab
-      size={MENU_ICON_SIZE}
-      uniProps={hovered ? foregroundColorMapping : mutedColorMapping}
-    />
-  );
-}
-
-function ScheduleKebabMenu({
-  schedule,
-  canRun,
-  pending,
-  onEdit,
-  onPause,
-  onResume,
-  onRunNow,
-  onDelete,
-}: Pick<
-  ScheduleRowProps,
-  "schedule" | "pending" | "onEdit" | "onPause" | "onResume" | "onRunNow" | "onDelete"
-> & {
-  canRun: boolean;
-}): ReactElement {
-  return (
-    <DropdownMenu>
-      <DropdownMenuTrigger
-        hitSlop={8}
-        style={kebabTriggerStyle}
-        accessibilityRole={isNative ? "button" : undefined}
-        accessibilityLabel="Schedule actions"
-        testID={`schedule-kebab-${schedule.id}`}
-      >
-        {renderKebabTriggerIcon}
-      </DropdownMenuTrigger>
-      <DropdownMenuContent align="end" width={220}>
-        <DropdownMenuItem
-          leading={editLeading}
-          onSelect={onEdit}
-          testID={`schedule-menu-edit-${schedule.id}`}
-        >
-          Edit schedule
-        </DropdownMenuItem>
-        {schedule.status === "paused" ? (
-          <DropdownMenuItem
-            leading={resumeLeading}
-            disabled={!canRun}
-            status={pending?.resume ? "pending" : "idle"}
-            pendingLabel="Resuming..."
-            onSelect={onResume}
-            testID={`schedule-menu-resume-${schedule.id}`}
-          >
-            Resume schedule
-          </DropdownMenuItem>
-        ) : (
-          <DropdownMenuItem
-            leading={pauseLeading}
-            disabled={schedule.status === "completed" || !canRun}
-            status={pending?.pause ? "pending" : "idle"}
-            pendingLabel="Pausing..."
-            onSelect={onPause}
-            testID={`schedule-menu-pause-${schedule.id}`}
-          >
-            Pause schedule
-          </DropdownMenuItem>
-        )}
-        <DropdownMenuItem
-          leading={runLeading}
-          disabled={!canRun}
-          status={pending?.runNow ? "pending" : "idle"}
-          pendingLabel="Starting..."
-          onSelect={onRunNow}
-          testID={`schedule-menu-run-${schedule.id}`}
-        >
-          Run now
-        </DropdownMenuItem>
-        <DropdownMenuSeparator />
-        <DropdownMenuItem
-          leading={deleteLeading}
-          destructive
-          status={pending?.delete ? "pending" : "idle"}
-          pendingLabel="Deleting..."
-          onSelect={onDelete}
-          testID={`schedule-menu-delete-${schedule.id}`}
-        >
-          Delete schedule
-        </DropdownMenuItem>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-}
-
-function kebabTriggerStyle({
-  hovered = false,
-}: PressableStateCallbackType & { hovered?: boolean }) {
-  return [styles.kebabTrigger, hovered && styles.kebabTriggerHovered];
-}
-
-const styles = StyleSheet.create((theme) => ({
-  // Static color holder for the dynamic provider icon (compliant idiom).
-  providerIcon: {
-    color: theme.colors.foregroundMuted,
-  },
-  rowContainer: {
-    position: "relative",
-  },
-  row: {
-    gap: theme.spacing[3],
-  },
-  rowHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
-  rowPressed: {
-    backgroundColor: theme.colors.surface3,
-  },
-  main: {
-    flex: 1,
-    minWidth: 0,
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[3],
-  },
-  leading: {
-    width: PROVIDER_ICON_SIZE,
-    height: PROVIDER_ICON_SIZE,
-    alignItems: "center",
-    justifyContent: "center",
-  },
-  textGroup: {
-    flex: 1,
-    minWidth: 0,
-  },
-  target: {
-    marginTop: theme.spacing[1],
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  trailing: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-  },
-  kebabTrigger: {
-    padding: theme.spacing[1],
-    borderRadius: theme.borderRadius.base,
-  },
-  kebabTriggerHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
-}));

packages/app/src/components/schedules/schedules-table.tsx

@@ -1,153 +0,0 @@
-import { useCallback, useState, type ReactElement } from "react";
-import { View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { ScheduleRow, type ScheduleRowPending } from "@/components/schedules/schedule-row";
-import { useScheduleMutations } from "@/hooks/use-schedule-mutations";
-import type { AggregatedSchedule } from "@/hooks/use-schedules";
-import type { ScheduleDerivedState } from "@/schedules/schedule-derivation";
-import { settingsStyles } from "@/styles/settings";
-import { confirmDialog } from "@/utils/confirm-dialog";
-import { resolveScheduleTitle } from "@/utils/schedule-format";
-
-/** A schedule plus the client-derived fields the row renders. */
-export interface ScheduleRowView {
-  schedule: AggregatedSchedule;
-  targetLabel: string;
-  provider: string | null;
-  state: ScheduleDerivedState;
-  serverName: string;
-  /** True when only one host exists, so the host name is redundant in rows. */
-  singleHost: boolean;
-}
-
-interface SchedulesTableProps {
-  rows: ScheduleRowView[];
-  /**
-   * The form sheet is owned by the screen (it serves both create and edit and
-   * shares the screen's "New schedule" button), so the table delegates edit
-   * upward rather than mounting a second sheet here.
-   */
-  onEditSchedule: (schedule: AggregatedSchedule) => void;
-}
-
-/**
- * The schedules list: a single settings-style card of rows across every
- * connected host, in a full-width list matching the History screen. Rows own
- * their host-scoped mutations (pause/resume/run/delete via the mutations hook +
- * a destructive confirm) and delegate editing upward.
- */
-export function SchedulesTable({ rows, onEditSchedule }: SchedulesTableProps): ReactElement {
-  return (
-    <View style={styles.listContent} testID="schedules-table">
-      <View style={settingsStyles.card}>
-        {rows.map((row, index) => (
-          <SchedulesTableRow
-            key={`${row.schedule.serverId}:${row.schedule.id}`}
-            row={row}
-            isFirst={index === 0}
-            onEditSchedule={onEditSchedule}
-          />
-        ))}
-      </View>
-    </View>
-  );
-}
-
-// ---------------------------------------------------------------------------
-// Per-row wrapper owns local in-flight state and binds mutations to this
-// schedule's host. Local state keeps pending precise to the acting row even
-// when several rows are acted on at once (the mutations hook exposes only a
-// single global pending flag per action).
-// ---------------------------------------------------------------------------
-
-const NO_PENDING: ScheduleRowPending = {};
-
-function SchedulesTableRow({
-  row,
-  isFirst,
-  onEditSchedule,
-}: {
-  row: ScheduleRowView;
-  isFirst: boolean;
-  onEditSchedule: (schedule: AggregatedSchedule) => void;
-}): ReactElement {
-  const { schedule } = row;
-  const { id, serverId } = schedule;
-  const mutations = useScheduleMutations({ serverId });
-  const [pending, setPending] = useState<ScheduleRowPending>(NO_PENDING);
-
-  const runAction = useCallback(
-    async (key: keyof ScheduleRowPending, action: () => Promise<void>): Promise<void> => {
-      setPending((current) => ({ ...current, [key]: true }));
-      try {
-        await action();
-      } catch {
-        // Mutations roll back their own optimistic cache writes on error and
-        // re-fetch on settle; surfacing per-row toasts here is out of scope.
-      } finally {
-        setPending((current) => {
-          const next = { ...current };
-          delete next[key];
-          return next;
-        });
-      }
-    },
-    [],
-  );
-
-  const handleEdit = useCallback(() => {
-    onEditSchedule(schedule);
-  }, [onEditSchedule, schedule]);
-
-  const handlePause = useCallback(() => {
-    void runAction("pause", () => mutations.pauseSchedule(id));
-  }, [runAction, mutations, id]);
-
-  const handleResume = useCallback(() => {
-    void runAction("resume", () => mutations.resumeSchedule(id));
-  }, [runAction, mutations, id]);
-
-  const handleRunNow = useCallback(() => {
-    void runAction("runNow", () => mutations.runScheduleNow(id));
-  }, [runAction, mutations, id]);
-
-  const handleDelete = useCallback(() => {
-    void (async () => {
-      const confirmed = await confirmDialog({
-        title: "Delete schedule",
-        message: `Delete "${resolveScheduleTitle(schedule)}"? This cannot be undone.`,
-        confirmLabel: "Delete",
-        destructive: true,
-      });
-      if (!confirmed) {
-        return;
-      }
-      await runAction("delete", () => mutations.deleteSchedule(id));
-    })();
-  }, [runAction, mutations, id, schedule]);
-
-  return (
-    <ScheduleRow
-      schedule={schedule}
-      targetLabel={row.targetLabel}
-      provider={row.provider}
-      state={row.state}
-      serverName={row.serverName}
-      singleHost={row.singleHost}
-      isFirst={isFirst}
-      pending={pending}
-      onEdit={handleEdit}
-      onPause={handlePause}
-      onResume={handleResume}
-      onRunNow={handleRunNow}
-      onDelete={handleDelete}
-    />
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  // Full-width list padding matching the History screen.
-  listContent: {
-    paddingHorizontal: { xs: theme.spacing[3], md: theme.spacing[6] },
-  },
-}));

packages/app/src/components/sidebar-workspace-list.tsx

@@ -56,7 +56,6 @@ import { NestableScrollContainer } from "react-native-draggable-flatlist";
 import { DraggableList, type DraggableRenderItemInfo } from "./draggable-list";
 import type { DraggableListDragHandleProps } from "./draggable-list.types";
 import { getHostRuntimeStore, useHosts } from "@/runtime/host-runtime";
-import { useHostFeatureMap } from "@/runtime/host-features";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { useProjectIconDataByProjectKey } from "@/projects/project-icons";
 import {
@@ -1750,13 +1749,14 @@ function WorkspaceRowItem({
   isDragging = false,
   dragHandleProps,
 }: WorkspaceRowItemProps) {
+  const currentPathname = usePathname();
   const handlePress = useCallback(() => {
     if (!workspace.serverId) {
       return;
     }
     onWorkspacePress?.();
-    navigateToWorkspace(workspace.serverId, workspace.workspaceId);
+    navigateToWorkspace(workspace.serverId, workspace.workspaceId, { currentPathname });
-  }, [onWorkspacePress, workspace.serverId, workspace.workspaceId]);
+  }, [currentPathname, onWorkspacePress, workspace.serverId, workspace.workspaceId]);
 
   return (
     <WorkspaceRow
@@ -1882,7 +1882,6 @@ function ProjectBlock({
   activeWorkspaceSelection,
   hostLabelByServerId,
   showHostLabels,
-  supportsMultiplicityByServerId,
 }: {
   project: SidebarProjectEntry;
   collapsed: boolean;
@@ -1904,16 +1903,14 @@ function ProjectBlock({
   activeWorkspaceSelection: ActiveWorkspaceSelection | null;
   hostLabelByServerId: ReadonlyMap<string, string>;
   showHostLabels: boolean;
-  supportsMultiplicityByServerId: ReadonlyMap<string, boolean>;
 }) {
   const rowModel = useMemo(
     () =>
       buildSidebarProjectRowModel({
         project,
         collapsed,
-        supportsMultiplicityByServerId,
       }),
-    [collapsed, project, supportsMultiplicityByServerId],
+    [collapsed, project],
   );
 
   const active = isProjectSelectedByRoute({
@@ -2066,7 +2063,7 @@ function ProjectBlock({
           containerStyle={styles.workspaceListContainer}
         />
       );
-    } else if (rowModel.trailingAction.kind === "new_workspace") {
+    } else if (rowModel.trailingAction.kind === "new_worktree") {
       projectChildren = (
         <NewWorkspaceGhostRow
           project={project}
@@ -2089,7 +2086,7 @@ function ProjectBlock({
         chevron={rowModel.chevron}
         onPress={handleToggleCollapsed}
         worktreeTarget={
-          rowModel.trailingAction.kind === "new_workspace" ? rowModel.trailingAction.target : null
+          rowModel.trailingAction.kind === "new_worktree" ? rowModel.trailingAction.target : null
         }
         isProjectActive={active}
         onWorkspacePress={onWorkspacePress}
@@ -2110,7 +2107,6 @@ function ProjectBlock({
 
 type ProjectBlockProps = Parameters<typeof ProjectBlock>[0];
 
-// oxlint-disable-next-line complexity
 function areProjectBlockPropsEqual(previous: ProjectBlockProps, next: ProjectBlockProps): boolean {
   return (
     previous.project === next.project &&
@@ -2122,7 +2118,6 @@ function areProjectBlockPropsEqual(previous: ProjectBlockProps, next: ProjectBlo
     previous.shortcutIndexByWorkspaceKey === next.shortcutIndexByWorkspaceKey &&
     previous.hostLabelByServerId === next.hostLabelByServerId &&
     previous.showHostLabels === next.showHostLabels &&
-    previous.supportsMultiplicityByServerId === next.supportsMultiplicityByServerId &&
     previous.parentGestureRef === next.parentGestureRef &&
     previous.onToggleCollapsed === next.onToggleCollapsed &&
     previous.onWorkspacePress === next.onWorkspacePress &&
@@ -2189,8 +2184,6 @@ export function SidebarWorkspaceList({
     }
     return labels;
   }, [hosts]);
-  const serverIds = useMemo(() => hosts.map((host) => host.serverId), [hosts]);
-  const supportsMultiplicityByServerId = useHostFeatureMap(serverIds, "workspaceMultiplicity");
   const showHostLabels = useMemo(() => shouldShowSidebarHostLabels(projects), [projects]);
 
   const content =
@@ -2216,7 +2209,6 @@ export function SidebarWorkspaceList({
         pathname={pathname}
         hostLabelByServerId={hostLabelByServerId}
         showHostLabels={showHostLabels}
-        supportsMultiplicityByServerId={supportsMultiplicityByServerId}
       />
     );
 
@@ -2265,7 +2257,6 @@ function ProjectModeList({
   pathname,
   hostLabelByServerId,
   showHostLabels,
-  supportsMultiplicityByServerId,
 }: Omit<
   SidebarWorkspaceListProps,
   "statusWorkspacePlacements" | "projectNamesByKey" | "groupMode" | "isRefreshing" | "onRefresh"
@@ -2273,7 +2264,6 @@ function ProjectModeList({
   pathname: string;
   hostLabelByServerId: ReadonlyMap<string, string>;
   showHostLabels: boolean;
-  supportsMultiplicityByServerId: ReadonlyMap<string, boolean>;
 }) {
   const { t } = useTranslation();
   const [creatingWorkspaceIds, setCreatingWorkspaceIds] = useState<Set<string>>(() => new Set());
@@ -2462,7 +2452,6 @@ function ProjectModeList({
           activeWorkspaceSelection={activeWorkspaceSelection}
           hostLabelByServerId={hostLabelByServerId}
           showHostLabels={showHostLabels}
-          supportsMultiplicityByServerId={supportsMultiplicityByServerId}
         />
       );
     },
@@ -2473,7 +2462,6 @@ function ProjectModeList({
       handleWorkspaceReorder,
       hostLabelByServerId,
       showHostLabels,
-      supportsMultiplicityByServerId,
       onWorkspacePress,
       onToggleProjectCollapsed,
       parentGestureRef,

packages/app/src/components/sidebar/sidebar-status-list.tsx

@@ -1,4 +1,5 @@
 import { memo, useCallback, useMemo, useState } from "react";
+import { usePathname } from "expo-router";
 import { useTranslation } from "react-i18next";
 import { View, Text, Pressable, ScrollView, type PressableStateCallbackType } from "react-native";
 import { NestableScrollContainer } from "react-native-draggable-flatlist";
@@ -333,6 +334,7 @@ const StatusWorkspaceRow = memo(function StatusWorkspaceRow({
 }) {
   const workspaceEntry = useSidebarWorkspaceEntry(workspace.serverId, workspace.workspaceId);
   const activeWorkspaceSelection = useActiveWorkspaceSelection();
+  const currentPathname = usePathname();
   const selected =
     activeWorkspaceSelection?.serverId === workspace.serverId &&
     activeWorkspaceSelection?.workspaceId === workspace.workspaceId;
@@ -340,8 +342,8 @@ const StatusWorkspaceRow = memo(function StatusWorkspaceRow({
   const handlePress = useCallback(() => {
     if (!workspace.serverId) return;
     onWorkspacePress?.();
-    navigateToWorkspace(workspace.serverId, workspace.workspaceId);
+    navigateToWorkspace(workspace.serverId, workspace.workspaceId, { currentPathname });
-  }, [onWorkspacePress, workspace.serverId, workspace.workspaceId]);
+  }, [currentPathname, onWorkspacePress, workspace.serverId, workspace.workspaceId]);
 
   if (!workspaceEntry) return null;
 

packages/app/src/components/ui/button.tsx

@@ -16,16 +16,10 @@ import type {
   TextStyle,
   ViewStyle,
 } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
-import {
-  buttonIconSize,
-  createControlGeometry,
-  type ButtonControlSize,
-} from "@/components/ui/control-geometry";
-import type { Theme } from "@/styles/theme";
 
 type ButtonVariant = "default" | "secondary" | "outline" | "ghost" | "destructive";
-type ButtonSize = ButtonControlSize;
+type ButtonSize = "xs" | "sm" | "md" | "lg";
 
 type LeftIcon =
   | ReactElement
@@ -33,130 +27,85 @@ type LeftIcon =
   | ((color: string) => ReactElement)
   | null;
 
-interface ButtonIconProps {
+const ICON_SIZE: Record<ButtonSize, number> = { xs: 12, sm: 14, md: 16, lg: 20 };
-  loading: boolean;
-  leftIcon?: LeftIcon;
-  iconSize: number;
-  iconColor: string;
-}
 
-function ButtonIcon({ loading, leftIcon, iconSize, iconColor }: ButtonIconProps) {
+const styles = StyleSheet.create((theme) => ({
-  if (loading) {
+  base: {
-    return (
+    flexDirection: "row",
-      <View>
+    alignItems: "center",
-        <ActivityIndicator size="small" color={iconColor} />
+    justifyContent: "center",
-      </View>
+    gap: theme.spacing[2],
-    );
+    borderRadius: theme.borderRadius.lg,
-  }
+    borderWidth: 1,
-
+    borderColor: "transparent",
-  if (!leftIcon) return null;
+  },
-
+  md: {
-  if (typeof leftIcon === "object" && "type" in leftIcon) {
+    paddingVertical: theme.spacing[3],
-    return <View>{leftIcon}</View>;
+    paddingHorizontal: theme.spacing[4],
-  }
+  },
-
+  xs: {
-  if (
+    minHeight: 28,
-    typeof leftIcon === "function" &&
+    paddingVertical: theme.spacing[1],
-    !leftIcon.prototype?.isReactComponent &&
+    paddingHorizontal: theme.spacing[3],
-    leftIcon.length > 0
+    borderRadius: theme.borderRadius.md,
-  ) {
+  },
-    return <View>{(leftIcon as (color: string) => ReactElement)(iconColor)}</View>;
+  sm: {
-  }
+    paddingVertical: theme.spacing[2],
-
+    paddingHorizontal: theme.spacing[3],
-  const Icon = leftIcon as ComponentType<{ color: string; size: number }>;
+    borderRadius: theme.borderRadius.md,
-  return (
+  },
-    <View>
+  lg: {
-      <Icon color={iconColor} size={iconSize} />
+    paddingVertical: theme.spacing[4],
-    </View>
+    paddingHorizontal: theme.spacing[6],
-  );
+    borderRadius: theme.borderRadius.xl,
-}
+  },
-
+  default: {
-const ThemedButtonIcon = withUnistyles(ButtonIcon);
+    backgroundColor: theme.colors.accent,
-
+    borderColor: theme.colors.accent,
-const foregroundIconMapping = (theme: Theme) => ({ iconColor: theme.colors.foreground });
+  },
-const foregroundMutedIconMapping = (theme: Theme) => ({
+  secondary: {
-  iconColor: theme.colors.foregroundMuted,
+    backgroundColor: theme.colors.surface3,
-});
+    borderColor: theme.colors.surface3,
-const accentForegroundIconMapping = (theme: Theme) => ({
+  },
-  iconColor: theme.colors.accentForeground,
+  outline: {
-});
+    backgroundColor: "transparent",
-const destructiveForegroundIconMapping = (theme: Theme) => ({
+    borderColor: theme.colors.borderAccent,
-  iconColor: theme.colors.destructiveForeground,
+  },
-});
+  ghost: {
-
+    backgroundColor: "transparent",
-const styles = StyleSheet.create((theme) => {
+    borderColor: "transparent",
-  const geometry = createControlGeometry(theme);
+  },
-
+  destructive: {
-  return {
+    backgroundColor: theme.colors.destructive,
-    base: {
+    borderColor: theme.colors.destructive,
-      flexDirection: "row",
+  },
-      alignItems: "center",
+  pressed: {
-      justifyContent: "center",
+    opacity: 0.85,
-      gap: theme.spacing[2],
+  },
-      borderRadius: theme.borderRadius.lg,
+  disabled: {
-      borderWidth: 1,
+    opacity: theme.opacity[50],
-      borderColor: "transparent",
+  },
-    },
+  text: {
-    md: {
+    color: theme.colors.foreground,
-      ...geometry.buttonMd,
+    fontSize: theme.fontSize.sm,
-    },
+    fontWeight: theme.fontWeight.normal,
-    xs: {
+  },
-      ...geometry.buttonXs,
+  textXs: {
-    },
+    fontSize: theme.fontSize.xs,
-    sm: {
+  },
-      ...geometry.buttonSm,
+  textDefault: {
-    },
+    color: theme.colors.accentForeground,
-    lg: {
+  },
-      ...geometry.buttonLg,
+  textDestructive: {
-    },
+    color: theme.colors.destructiveForeground,
-    default: {
+  },
-      backgroundColor: theme.colors.accent,
+  textGhost: {
-      borderColor: theme.colors.accent,
+    color: theme.colors.foregroundMuted,
-    },
+  },
-    secondary: {
+  textGhostHovered: {
-      backgroundColor: theme.colors.surface3,
+    color: theme.colors.foreground,
-      borderColor: theme.colors.surface3,
+  },
-    },
+}));
-    outline: {
-      backgroundColor: "transparent",
-      borderColor: theme.colors.borderAccent,
-    },
-    ghost: {
-      backgroundColor: "transparent",
-      borderColor: "transparent",
-    },
-    destructive: {
-      backgroundColor: theme.colors.destructive,
-      borderColor: theme.colors.destructive,
-    },
-    pressed: {
-      opacity: 0.85,
-    },
-    disabled: {
-      opacity: theme.opacity[50],
-    },
-    text: {
-      color: theme.colors.foreground,
-      ...geometry.buttonText,
-      fontWeight: theme.fontWeight.normal,
-    },
-    textXs: {
-      ...geometry.buttonTextXs,
-    },
-    textDefault: {
-      color: theme.colors.accentForeground,
-    },
-    textDestructive: {
-      color: theme.colors.destructiveForeground,
-    },
-    textGhost: {
-      color: theme.colors.foregroundMuted,
-    },
-    textGhostHovered: {
-      color: theme.colors.foreground,
-    },
-  };
-});
 
 export function Button({
   children,
@@ -169,7 +118,6 @@ export function Button({
   disabled,
   loading = false,
   accessibilityRole,
-  accessibilityState: accessibilityStateProp,
   ...props
 }: PropsWithChildren<
   Omit<PressableProps, "style"> & {
@@ -183,6 +131,7 @@ export function Button({
   }
 >) {
   const [hovered, setHovered] = useState(false);
+  const { theme } = useUnistyles();
   const isDisabled = disabled || loading;
 
   let variantStyle: ViewStyle;
@@ -239,21 +188,55 @@ export function Button({
   );
 
   const accessibilityState = useMemo(
-    () => ({ ...accessibilityStateProp, disabled: isDisabled, busy: loading }),
+    () => ({ disabled: isDisabled, busy: loading }),
-    [accessibilityStateProp, isDisabled, loading],
+    [isDisabled, loading],
   );
 
-  function resolveIconMapping() {
+  function resolveIconColor(): string {
     if (variant === "default") {
-      return accentForegroundIconMapping;
+      return theme.colors.accentForeground;
-    }
-    if (variant === "destructive") {
-      return destructiveForegroundIconMapping;
     }
     if (variant === "ghost") {
-      return isGhostHovered ? foregroundIconMapping : foregroundMutedIconMapping;
+      return isGhostHovered ? theme.colors.foreground : theme.colors.foregroundMuted;
     }
-    return foregroundIconMapping;
+    return theme.colors.foreground;
+  }
+
+  function renderIcon() {
+    if (loading) {
+      return (
+        <View>
+          <ActivityIndicator size="small" color={resolveIconColor()} />
+        </View>
+      );
+    }
+
+    if (!leftIcon) return null;
+
+    // Pre-rendered element — pass through
+    if (typeof leftIcon === "object" && "type" in leftIcon) {
+      return <View>{leftIcon}</View>;
+    }
+
+    const color = resolveIconColor();
+    const iconSize = ICON_SIZE[size];
+
+    // Render function
+    if (
+      typeof leftIcon === "function" &&
+      !leftIcon.prototype?.isReactComponent &&
+      leftIcon.length > 0
+    ) {
+      return <View>{(leftIcon as (color: string) => ReactElement)(color)}</View>;
+    }
+
+    // Component type
+    const Icon = leftIcon as ComponentType<{ color: string; size: number }>;
+    return (
+      <View>
+        <Icon color={color} size={iconSize} />
+      </View>
+    );
   }
 
   return (
@@ -266,12 +249,7 @@ export function Button({
       onHoverOut={handleHoverOut}
       style={pressableStyle}
     >
-      <ThemedButtonIcon
+      {renderIcon()}
-        loading={loading}
-        leftIcon={leftIcon}
-        iconSize={buttonIconSize[size]}
-        uniProps={resolveIconMapping()}
-      />
       {children != null ? <Text style={resolvedTextStyle}>{children}</Text> : null}
       {trailing}
     </Pressable>

packages/app/src/components/ui/combobox-frame-style.test.ts

@@ -1,58 +0,0 @@
-import type { ViewStyle } from "react-native";
-import { describe, expect, it } from "vitest";
-
-import { buildDesktopFrameStyle } from "./combobox-frame-style";
-
-function buildWidthStyle(input: {
-  desktopMinWidth?: number;
-  referenceWidth: number | null;
-}): Pick<ViewStyle, "width" | "minWidth" | "maxWidth"> {
-  const [frameStyle] = buildDesktopFrameStyle({
-    desktopMinWidth: input.desktopMinWidth,
-    referenceWidth: input.referenceWidth,
-    desktopFixedHeight: undefined,
-    desktopPositionStyle: { left: 0, top: 0 },
-    shouldHideDesktopContent: false,
-    availableHeight: undefined,
-  }) as ViewStyle[];
-
-  return {
-    width: frameStyle.width,
-    minWidth: frameStyle.minWidth,
-    maxWidth: frameStyle.maxWidth,
-  };
-}
-
-describe("buildDesktopFrameStyle", () => {
-  it("lets a narrow trigger grow to the default desktop ceiling", () => {
-    expect(buildWidthStyle({ referenceWidth: 120 })).toEqual({
-      width: undefined,
-      minWidth: 120,
-      maxWidth: 400,
-    });
-  });
-
-  it("keeps a wide trigger from being capped below its own width", () => {
-    expect(buildWidthStyle({ referenceWidth: 470 })).toEqual({
-      width: undefined,
-      minWidth: 470,
-      maxWidth: 470,
-    });
-  });
-
-  it("uses desktopMinWidth as an explicit floor raiser", () => {
-    expect(buildWidthStyle({ desktopMinWidth: 360, referenceWidth: 120 })).toEqual({
-      width: undefined,
-      minWidth: 360,
-      maxWidth: 400,
-    });
-  });
-
-  it("keeps the trigger as the floor when it is wider than desktopMinWidth", () => {
-    expect(buildWidthStyle({ desktopMinWidth: 240, referenceWidth: 300 })).toEqual({
-      width: undefined,
-      minWidth: 300,
-      maxWidth: 400,
-    });
-  });
-});

packages/app/src/components/ui/combobox-frame-style.ts

@@ -1,42 +0,0 @@
-import type { StyleProp, ViewStyle } from "react-native";
-
-export interface DesktopFrameStyleInput {
-  desktopMinWidth: number | undefined;
-  referenceWidth: number | null;
-  desktopFixedHeight: number | undefined;
-  desktopPositionStyle: StyleProp<ViewStyle>;
-  shouldHideDesktopContent: boolean;
-  availableHeight: number | undefined;
-}
-
-export function buildDesktopFrameStyle(input: DesktopFrameStyleInput): StyleProp<ViewStyle> {
-  const {
-    desktopMinWidth,
-    referenceWidth,
-    desktopFixedHeight,
-    desktopPositionStyle,
-    shouldHideDesktopContent,
-    availableHeight,
-  } = input;
-  const fixedHeightStyle =
-    desktopFixedHeight != null
-      ? { minHeight: desktopFixedHeight, maxHeight: desktopFixedHeight }
-      : null;
-  const hiddenStyle = shouldHideDesktopContent ? { opacity: 0 } : null;
-  const availableHeightStyle =
-    typeof availableHeight === "number"
-      ? { maxHeight: Math.min(availableHeight, desktopFixedHeight ?? 400) }
-      : null;
-  const floor = Math.max(desktopMinWidth ?? 0, referenceWidth ?? 200);
-  return [
-    {
-      position: "absolute" as const,
-      minWidth: floor,
-      maxWidth: Math.max(400, floor),
-    },
-    fixedHeightStyle,
-    desktopPositionStyle,
-    hiddenStyle,
-    availableHeightStyle,
-  ];
-}

packages/app/src/components/ui/combobox-trigger.tsx

@@ -1,18 +1,9 @@
-import {
+import { forwardRef, useCallback, useMemo, type ReactElement, type ReactNode } from "react";
-  forwardRef,
-  useCallback,
-  useMemo,
-  useState,
-  type ReactElement,
-  type ReactNode,
-} from "react";
 import {
   Pressable,
   View,
-  type NativeSyntheticEvent,
   type PressableProps,
   type PressableStateCallbackType,
-  type TargetedEvent,
   type ViewStyle,
   type StyleProp,
 } from "react-native";
@@ -29,7 +20,6 @@ const chevronColorMapping = (theme: Theme) => ({
 interface TriggerState {
   pressed: boolean;
   hovered: boolean;
-  focused: boolean;
 }
 
 type TriggerStyleProp = StyleProp<ViewStyle> | ((state: TriggerState) => StyleProp<ViewStyle>);
@@ -46,45 +36,23 @@ interface ComboboxTriggerProps extends Omit<PressableProps, "style" | "children"
 }
 
 export const ComboboxTrigger = forwardRef<View, ComboboxTriggerProps>(function ComboboxTrigger(
-  { children, chevron, style, block = false, onFocus, onBlur, ...props },
+  { children, chevron, style, block = false, ...props },
   ref,
 ): ReactElement {
-  const [focused, setFocused] = useState(false);
   const pressableStyle = useCallback(
     ({ pressed, hovered = false }: PressableStateCallbackType & { hovered?: boolean }) => {
       if (typeof style === "function") {
-        return style({ pressed, hovered, focused });
+        return style({ pressed, hovered });
       }
       return style;
     },
-    [focused, style],
+    [style],
-  );
-  const handleFocus = useCallback(
-    (event: NativeSyntheticEvent<TargetedEvent>) => {
-      setFocused(true);
-      onFocus?.(event);
-    },
-    [onFocus],
-  );
-  const handleBlur = useCallback(
-    (event: NativeSyntheticEvent<TargetedEvent>) => {
-      setFocused(false);
-      onBlur?.(event);
-    },
-    [onBlur],
   );
 
   const rowStyle = useMemo(() => [styles.row, block && styles.rowBlock], [block]);
 
   return (
-    <Pressable
+    <Pressable ref={ref} collapsable={false} style={pressableStyle} {...props}>
-      ref={ref}
-      collapsable={false}
-      style={pressableStyle}
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      {...props}
-    >
       <View style={rowStyle}>
         {children}
         {chevron !== null &&

packages/app/src/components/ui/combobox.tsx

@@ -61,14 +61,10 @@ import {
 } from "@/components/adaptive-modal-sheet";
 import { FloatingSurface } from "@/components/ui/floating";
 import { useDismissKeyboardOnOpen } from "@/components/ui/keyboard-dismiss";
-import { buildDesktopFrameStyle } from "./combobox-frame-style";
-
-export { buildDesktopFrameStyle } from "./combobox-frame-style";
 
 const IS_WEB = isWeb;
 
 export type ComboboxOption = ComboboxOptionModel;
-export type ComboboxDesktopPlacement = "top-start" | "bottom-start";
 
 export interface ComboboxProps {
   options: ComboboxOption[];
@@ -103,7 +99,7 @@ export interface ComboboxProps {
   presentation?: "push" | "replace";
   open?: boolean;
   onOpenChange?: (open: boolean) => void;
-  desktopPlacement?: ComboboxDesktopPlacement;
+  desktopPlacement?: "top-start" | "bottom-start";
   /**
    * Prevents an initial frame at 0,0 by hiding desktop content until floating
    * coordinates resolve. This intentionally disables fade enter/exit animation
@@ -385,7 +381,7 @@ function OptionsList({
 interface DesktopPositionInput {
   isDesktopAboveSearch: boolean;
   isMobile: boolean;
-  desktopPlacement: ComboboxDesktopPlacement;
+  desktopPlacement: "top-start" | "bottom-start";
   referenceTop: number | null;
   referenceLeft: number | null;
   referenceAtOrigin: boolean;
@@ -660,7 +656,7 @@ interface DesktopResetSetters {
 function useDesktopPositionReset(
   isOpen: boolean,
   isMobile: boolean,
-  desktopPlacement: ComboboxDesktopPlacement,
+  desktopPlacement: "top-start" | "bottom-start",
   update: () => unknown,
   setters: DesktopResetSetters,
 ) {
@@ -854,6 +850,46 @@ function buildFloatingMiddleware(input: FloatingMiddlewareInput) {
   ];
 }
 
+interface DesktopContainerStyleInput {
+  desktopMinWidth: number | undefined;
+  referenceWidth: number | null;
+  desktopFixedHeight: number | undefined;
+  desktopPositionStyle: DesktopPositionResult["desktopPositionStyle"];
+  shouldHideDesktopContent: boolean;
+  availableHeight: number | undefined;
+}
+
+function buildDesktopFrameStyle(input: DesktopContainerStyleInput): StyleProp<ViewStyle> {
+  const {
+    desktopMinWidth,
+    referenceWidth,
+    desktopFixedHeight,
+    desktopPositionStyle,
+    shouldHideDesktopContent,
+    availableHeight,
+  } = input;
+  const fixedHeightStyle =
+    desktopFixedHeight != null
+      ? { minHeight: desktopFixedHeight, maxHeight: desktopFixedHeight }
+      : null;
+  const hiddenStyle = shouldHideDesktopContent ? { opacity: 0 } : null;
+  const availableHeightStyle =
+    typeof availableHeight === "number"
+      ? { maxHeight: Math.min(availableHeight, desktopFixedHeight ?? 400) }
+      : null;
+  return [
+    {
+      position: "absolute" as const,
+      minWidth: desktopMinWidth ?? referenceWidth ?? 200,
+      maxWidth: Math.max(400, desktopMinWidth ?? 0),
+    },
+    fixedHeightStyle,
+    desktopPositionStyle,
+    hiddenStyle,
+    availableHeightStyle,
+  ];
+}
+
 function isDesktopKey(key: string): key is DesktopKey {
   return key === "ArrowDown" || key === "ArrowUp" || key === "Enter" || key === "Escape";
 }
@@ -1219,7 +1255,7 @@ export function Combobox({
   presentation,
   open,
   onOpenChange,
-  desktopPlacement = "bottom-start",
+  desktopPlacement = "top-start",
   desktopPreventInitialFlash = true,
   desktopMinWidth,
   desktopFixedHeight,

packages/app/src/components/ui/control-geometry.test.ts

@@ -1,113 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  createControlGeometry,
-  getControlInteractionPhase,
-} from "@/components/ui/control-geometry";
-import type { Theme } from "@/styles/theme";
-
-const theme = {
-  borderRadius: {
-    md: 6,
-    lg: 8,
-    xl: 12,
-  },
-  borderWidth: {
-    1: 1,
-  },
-  colors: {
-    accent: "#20744A",
-    borderAccent: "#2F3534",
-  },
-  fontSize: {
-    xs: 12,
-    sm: 14,
-    base: 16,
-  },
-  opacity: {
-    50: 0.5,
-  },
-  spacing: {
-    0: 0,
-    3: 12,
-    4: 16,
-    6: 24,
-  },
-} as unknown as Theme;
-
-describe("control geometry", () => {
-  it("keeps resting control borders transparent while preserving border geometry", () => {
-    const geometry = createControlGeometry(theme);
-
-    expect(geometry.controlRest).toMatchObject({
-      borderWidth: 1,
-      borderColor: "transparent",
-      outlineColor: "transparent",
-      outlineWidth: 0,
-    });
-  });
-
-  it("uses the shared hover border and active focus ring values", () => {
-    const geometry = createControlGeometry(theme);
-
-    expect(geometry.controlHover).toEqual({
-      borderColor: "#2F3534",
-    });
-    expect(geometry.controlActive).toEqual({
-      borderColor: "#2F3534",
-      outlineColor: "#20744A",
-      outlineOffset: 1,
-      outlineStyle: "solid",
-      outlineWidth: 2,
-    });
-  });
-
-  it("resolves disabled, focus, open, pressed, and hover into one interaction phase", () => {
-    expect(getControlInteractionPhase({ disabled: true, focused: true })).toBe("rest");
-    expect(getControlInteractionPhase({ focused: true })).toBe("active");
-    expect(getControlInteractionPhase({ open: true })).toBe("active");
-    expect(getControlInteractionPhase({ pressed: true })).toBe("active");
-    expect(getControlInteractionPhase({ hovered: true })).toBe("hover");
-    expect(getControlInteractionPhase({})).toBe("rest");
-  });
-
-  it("keeps field text sizing tied to control size", () => {
-    const geometry = createControlGeometry(theme);
-
-    expect(geometry.fieldTextSm.fontSize).toBe(14);
-    expect(geometry.fieldTextSm.lineHeight).toBe(20);
-    expect(geometry.fieldTextMd.fontSize).toBe(16);
-    expect(geometry.fieldTextMd.lineHeight).toBe(22);
-    expect(geometry.formTextInputSm.fontSize).toBe(14);
-    expect(geometry.formTextInputSm.lineHeight).toBe(20);
-    expect(geometry.formTextInputMd.fontSize).toBe(16);
-    expect(geometry.formTextInputMd.lineHeight).toBe(22);
-  });
-
-  it("derives field padding from line height without changing the control height", () => {
-    const geometry = createControlGeometry(theme);
-
-    expect(geometry.fieldControlSm.minHeight).toBe(32);
-    expect(geometry.fieldControlSm.paddingVertical).toBe(6);
-    expect(geometry.fieldTextSm.lineHeight + geometry.fieldControlSm.paddingVertical * 2).toBe(
-      geometry.fieldControlSm.minHeight,
-    );
-
-    expect(geometry.fieldControlMd.minHeight).toBe(44);
-    expect(geometry.fieldControlMd.paddingVertical).toBe(11);
-    expect(geometry.fieldTextMd.lineHeight + geometry.fieldControlMd.paddingVertical * 2).toBe(
-      geometry.fieldControlMd.minHeight,
-    );
-
-    expect(geometry.formTextInputSm.paddingVertical).toBe(6);
-    expect(geometry.formTextInputMd.paddingVertical).toBe(11);
-  });
-
-  it("subtracts segmented control inset from the nested segment radius", () => {
-    const geometry = createControlGeometry(theme);
-
-    expect(geometry.segmentedContainerSm.borderRadius).toBe(6);
-    expect(geometry.segmentedSegmentSm.borderRadius).toBe(4);
-    expect(geometry.segmentedContainerMd.borderRadius).toBe(8);
-    expect(geometry.segmentedSegmentMd.borderRadius).toBe(5);
-  });
-});

packages/app/src/components/ui/control-geometry.ts

@@ -1,224 +0,0 @@
-import type { StyleProp, ViewStyle } from "react-native";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
-
-export type ButtonControlSize = "xs" | "sm" | "md" | "lg";
-export type FieldControlSize = "sm" | "md";
-export type SegmentedControlSize = "sm" | "md";
-export type ControlInteractionPhase = "rest" | "hover" | "active";
-
-export interface ControlInteractionState {
-  hovered?: boolean;
-  focused?: boolean;
-  pressed?: boolean;
-  open?: boolean;
-  active?: boolean;
-  disabled?: boolean;
-}
-
-export interface ControlInteractionStyleMap {
-  controlRest: StyleProp<ViewStyle>;
-  controlHover: StyleProp<ViewStyle>;
-  controlActive: StyleProp<ViewStyle>;
-  controlDisabled?: StyleProp<ViewStyle>;
-}
-
-const COMPACT_CONTROL_HEIGHT = 32;
-const FIELD_CONTROL_HEIGHT = 44;
-const SEGMENTED_COMPACT_INSET = 2;
-const SEGMENTED_FIELD_INSET = 3;
-const SWITCH_TRACK_WIDTH = 34;
-const SWITCH_TRACK_HEIGHT = 20;
-const SWITCH_THUMB_SIZE = 16;
-const CONTROL_FOCUS_RING_WIDTH = 2;
-const CONTROL_FOCUS_RING_OFFSET = 1;
-const CONTROL_CENTER_JUSTIFY_CONTENT = "center";
-const FIELD_TEXT_LINE_HEIGHT_RATIO = 1.4;
-
-const controlHeights = {
-  compact: COMPACT_CONTROL_HEIGHT,
-  field: FIELD_CONTROL_HEIGHT,
-};
-
-export const buttonIconSize: Record<ButtonControlSize, number> = {
-  xs: ICON_SIZE.xs,
-  sm: ICON_SIZE.sm,
-  md: ICON_SIZE.md,
-  lg: ICON_SIZE.lg,
-};
-
-export const segmentedIconSize: Record<SegmentedControlSize, number> = {
-  sm: ICON_SIZE.sm,
-  md: ICON_SIZE.md,
-};
-
-export const switchGeometry = {
-  trackWidth: SWITCH_TRACK_WIDTH,
-  trackHeight: SWITCH_TRACK_HEIGHT,
-  thumbSize: SWITCH_THUMB_SIZE,
-  thumbTravel: SWITCH_TRACK_WIDTH - SWITCH_THUMB_SIZE - (SWITCH_TRACK_HEIGHT - SWITCH_THUMB_SIZE),
-};
-
-function nestedRadius(containerRadius: number, inset: number): number {
-  return Math.max(0, containerRadius - inset);
-}
-
-function fieldLineHeight(fontSize: number): number {
-  return Math.round(fontSize * FIELD_TEXT_LINE_HEIGHT_RATIO);
-}
-
-function fieldVerticalPadding(controlHeight: number, lineHeight: number): number {
-  return (controlHeight - lineHeight) / 2;
-}
-
-export function getControlInteractionPhase(
-  state: ControlInteractionState,
-): ControlInteractionPhase {
-  if (state.disabled) {
-    return "rest";
-  }
-  if (state.active || state.focused || state.open || state.pressed) {
-    return "active";
-  }
-  if (state.hovered) {
-    return "hover";
-  }
-  return "rest";
-}
-
-export function resolveControlInteractionStyles(
-  styles: ControlInteractionStyleMap,
-  state: ControlInteractionState,
-): StyleProp<ViewStyle> {
-  const phase = getControlInteractionPhase(state);
-  return [
-    styles.controlRest,
-    phase === "hover" ? styles.controlHover : null,
-    phase === "active" ? styles.controlActive : null,
-    state.disabled ? styles.controlDisabled : null,
-  ];
-}
-
-export function createControlGeometry(theme: Theme) {
-  const fieldTextSmLineHeight = fieldLineHeight(theme.fontSize.sm);
-  const fieldTextMdLineHeight = fieldLineHeight(theme.fontSize.base);
-  const fieldControlSm = {
-    minHeight: controlHeights.compact,
-    paddingHorizontal: theme.spacing[3],
-    paddingVertical: fieldVerticalPadding(controlHeights.compact, fieldTextSmLineHeight),
-    borderRadius: theme.borderRadius.md,
-  };
-  const fieldControlMd = {
-    minHeight: controlHeights.field,
-    paddingHorizontal: theme.spacing[4],
-    paddingVertical: fieldVerticalPadding(controlHeights.field, fieldTextMdLineHeight),
-    borderRadius: theme.borderRadius.lg,
-  };
-  const fieldTextSm = {
-    fontSize: theme.fontSize.sm,
-    lineHeight: fieldTextSmLineHeight,
-  };
-  const fieldTextMd = {
-    fontSize: theme.fontSize.base,
-    lineHeight: fieldTextMdLineHeight,
-  };
-  const segmentedContainerSmRadius = theme.borderRadius.md;
-  const segmentedContainerMdRadius = theme.borderRadius.lg;
-  const switchControl = {
-    minHeight: controlHeights.compact,
-    justifyContent: CONTROL_CENTER_JUSTIFY_CONTENT,
-  } satisfies { minHeight: number; justifyContent: "center" };
-
-  return {
-    buttonXs: {
-      minHeight: controlHeights.compact,
-      paddingHorizontal: theme.spacing[3],
-      borderRadius: theme.borderRadius.md,
-    },
-    buttonSm: {
-      minHeight: controlHeights.compact,
-      paddingHorizontal: theme.spacing[3],
-      borderRadius: theme.borderRadius.md,
-    },
-    buttonMd: {
-      minHeight: controlHeights.field,
-      paddingHorizontal: theme.spacing[4],
-      borderRadius: theme.borderRadius.lg,
-    },
-    buttonLg: {
-      minHeight: controlHeights.field,
-      paddingHorizontal: theme.spacing[6],
-      borderRadius: theme.borderRadius.xl,
-    },
-    buttonText: {
-      fontSize: theme.fontSize.sm,
-    },
-    buttonTextXs: {
-      fontSize: theme.fontSize.xs,
-    },
-    formTextInputSm: {
-      ...fieldControlSm,
-      ...fieldTextSm,
-    },
-    formTextInputMd: {
-      ...fieldControlMd,
-      ...fieldTextMd,
-    },
-    formTextInput: {
-      ...fieldControlMd,
-      ...fieldTextMd,
-    },
-    fieldControlSm,
-    fieldControlMd,
-    fieldTextSm,
-    fieldTextMd,
-    controlRest: {
-      borderWidth: theme.borderWidth[1],
-      borderColor: "transparent",
-      outlineWidth: 0,
-      outlineColor: "transparent",
-    },
-    controlHover: {
-      borderColor: theme.colors.borderAccent,
-    },
-    controlActive: {
-      borderColor: theme.colors.borderAccent,
-      outlineColor: theme.colors.accent,
-      outlineOffset: CONTROL_FOCUS_RING_OFFSET,
-      outlineStyle: "solid" as const,
-      outlineWidth: CONTROL_FOCUS_RING_WIDTH,
-    },
-    controlFocusRingColor: {
-      outlineColor: theme.colors.accent,
-    },
-    controlDisabled: {
-      opacity: theme.opacity[50],
-    },
-    switchControl,
-    segmentedContainerSm: {
-      minHeight: controlHeights.compact,
-      padding: SEGMENTED_COMPACT_INSET,
-      borderRadius: segmentedContainerSmRadius,
-    },
-    segmentedContainerMd: {
-      minHeight: controlHeights.field,
-      padding: SEGMENTED_FIELD_INSET,
-      borderRadius: segmentedContainerMdRadius,
-    },
-    segmentedSegmentSm: {
-      minHeight: controlHeights.compact - SEGMENTED_COMPACT_INSET * 2,
-      paddingHorizontal: theme.spacing[4],
-      borderRadius: nestedRadius(segmentedContainerSmRadius, SEGMENTED_COMPACT_INSET),
-    },
-    segmentedSegmentMd: {
-      minHeight: controlHeights.field - SEGMENTED_FIELD_INSET * 2,
-      paddingHorizontal: theme.spacing[6],
-      borderRadius: nestedRadius(segmentedContainerMdRadius, SEGMENTED_FIELD_INSET),
-    },
-    segmentedLabelSm: {
-      fontSize: theme.fontSize.sm,
-    },
-    segmentedLabelMd: {
-      fontSize: theme.fontSize.base,
-    },
-  };
-}

packages/app/src/components/ui/form-field.tsx

@@ -1,30 +1,9 @@
-import {
+import { forwardRef, useMemo, type ReactNode } from "react";
-  forwardRef,
+import { Text, View, type TextInput } from "react-native";
-  useCallback,
-  useMemo,
-  useState,
-  type ForwardedRef,
-  type ReactNode,
-} from "react";
-import {
-  Pressable,
-  StyleSheet as RNStyleSheet,
-  Text,
-  View,
-  type PressableStateCallbackType,
-  type TextInput,
-  type TextStyle,
-  type ViewStyle,
-} from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { AdaptiveTextInput, type AdaptiveTextInputProps } from "@/components/adaptive-modal-sheet";
-import {
-  createControlGeometry,
-  resolveControlInteractionStyles,
-  type FieldControlSize,
-} from "@/components/ui/control-geometry";
 
-interface FieldProps {
+interface FormFieldProps {
   label: string;
   children: ReactNode;
   hint?: string;
@@ -32,20 +11,20 @@ interface FieldProps {
   testID?: string;
 }
 
-export function Field({ label, children, hint, error, testID }: FieldProps) {
+export function FormField({ label, children, hint, error, testID }: FormFieldProps) {
   const hintTestID = useMemo(() => (testID ? `${testID}-hint` : undefined), [testID]);
   const errorTestID = useMemo(() => (testID ? `${testID}-error` : undefined), [testID]);
-  const subtext = useMemo(() => {
+  const hintOrError = useMemo(() => {
     if (error) {
       return (
-        <Text numberOfLines={1} style={styles.errorText} testID={errorTestID}>
+        <Text style={styles.errorText} testID={errorTestID}>
           {error}
         </Text>
       );
     }
     if (hint) {
       return (
-        <Text numberOfLines={1} style={styles.hintText} testID={hintTestID}>
+        <Text style={styles.hintText} testID={hintTestID}>
           {hint}
         </Text>
       );
@@ -57,167 +36,17 @@ export function Field({ label, children, hint, error, testID }: FieldProps) {
     <View style={styles.container} testID={testID}>
       <Text style={styles.label}>{label}</Text>
       {children}
-      {subtext}
+      {hintOrError}
     </View>
   );
 }
 
-type FormTextInputProps = AdaptiveTextInputProps & {
+export const FormTextInput = forwardRef<TextInput, AdaptiveTextInputProps>(function FormTextInput(
-  size?: FieldControlSize;
+  { style, ...props },
-};
-
-type FlatFormTextInputStyle = ViewStyle & TextStyle;
-
-interface SplitFormTextInputStyle {
-  chromeStyle?: ViewStyle;
-  inputStyle?: TextStyle;
-}
-
-function splitFormTextInputStyle(style: AdaptiveTextInputProps["style"]): SplitFormTextInputStyle {
-  const flattened = RNStyleSheet.flatten(style) as FlatFormTextInputStyle | undefined;
-  if (!flattened) {
-    return {};
-  }
-
-  const {
-    color,
-    fontFamily,
-    fontSize,
-    fontStyle,
-    fontVariant,
-    fontWeight,
-    includeFontPadding,
-    letterSpacing,
-    lineHeight,
-    textAlign,
-    textAlignVertical,
-    textDecorationColor,
-    textDecorationLine,
-    textDecorationStyle,
-    textShadowColor,
-    textShadowOffset,
-    textShadowRadius,
-    textTransform,
-    writingDirection,
-    ...chromeStyle
-  } = flattened;
-
-  const inputStyle: TextStyle = {
-    color,
-    fontFamily,
-    fontSize,
-    fontStyle,
-    fontVariant,
-    fontWeight,
-    includeFontPadding,
-    letterSpacing,
-    lineHeight,
-    textAlign,
-    textAlignVertical,
-    textDecorationColor,
-    textDecorationLine,
-    textDecorationStyle,
-    textShadowColor,
-    textShadowOffset,
-    textShadowRadius,
-    textTransform,
-    writingDirection,
-  };
-
-  return {
-    chromeStyle: stripUnistylesMetadata(chromeStyle),
-    inputStyle: stripUnistylesMetadata(inputStyle),
-  };
-}
-
-function stripUnistylesMetadata<TStyle extends object>(style: TStyle): TStyle {
-  const cleanStyle: Record<string, unknown> = {};
-  for (const [key, value] of Object.entries(style as Record<string, unknown>)) {
-    if (key.startsWith("unistyles_") || value === undefined) {
-      continue;
-    }
-    cleanStyle[key] = value;
-  }
-  return cleanStyle as TStyle;
-}
-
-function assignTextInputRef(forwardedRef: ForwardedRef<TextInput>, node: TextInput | null): void {
-  if (typeof forwardedRef === "function") {
-    forwardedRef(node);
-    return;
-  }
-  if (forwardedRef) {
-    forwardedRef.current = node;
-  }
-}
-
-export const FormTextInput = forwardRef<TextInput, FormTextInputProps>(function FormTextInput(
-  { size = "md", style, onFocus, onBlur, editable, ...props },
   ref,
 ) {
-  const [focused, setFocused] = useState(false);
+  const inputStyle = useMemo(() => [formInputStyles.input, style], [style]);
-  const isDisabled = editable === false;
+  return <AdaptiveTextInput ref={ref} {...props} style={inputStyle} />;
-  const chromeSizeStyle = size === "sm" ? formInputStyles.chromeSm : formInputStyles.chromeMd;
-  const inputSizeStyle = size === "sm" ? formInputStyles.inputSm : formInputStyles.inputMd;
-  const splitStyle = useMemo(() => splitFormTextInputStyle(style), [style]);
-  const setInputRef = useCallback(
-    (node: TextInput | null) => {
-      assignTextInputRef(ref, node);
-    },
-    [ref],
-  );
-  const handleFocus = useCallback<NonNullable<AdaptiveTextInputProps["onFocus"]>>(
-    (event) => {
-      setFocused(true);
-      onFocus?.(event);
-    },
-    [onFocus],
-  );
-  const handleBlur = useCallback<NonNullable<AdaptiveTextInputProps["onBlur"]>>(
-    (event) => {
-      setFocused(false);
-      onBlur?.(event);
-    },
-    [onBlur],
-  );
-  const inputStyle = useMemo(
-    () => [formInputStyles.input, inputSizeStyle, splitStyle.inputStyle],
-    [inputSizeStyle, splitStyle.inputStyle],
-  ) as AdaptiveTextInputProps["style"];
-  const chromeStyle = useCallback(
-    ({ hovered = false }: PressableStateCallbackType & { hovered?: boolean }) => [
-      formInputStyles.chrome,
-      chromeSizeStyle,
-      resolveControlInteractionStyles(
-        {
-          controlRest: formInputStyles.controlRest,
-          controlHover: formInputStyles.controlHover,
-          controlActive: formInputStyles.controlActive,
-          controlDisabled: formInputStyles.controlDisabled,
-        },
-        {
-          hovered,
-          focused,
-          disabled: isDisabled,
-        },
-      ),
-      splitStyle.chromeStyle,
-    ],
-    [chromeSizeStyle, focused, isDisabled, splitStyle.chromeStyle],
-  );
-
-  return (
-    <Pressable disabled={isDisabled} style={chromeStyle}>
-      <AdaptiveTextInput
-        ref={setInputRef}
-        editable={editable}
-        {...props}
-        onBlur={handleBlur}
-        onFocus={handleFocus}
-        style={inputStyle}
-      />
-    </Pressable>
-  );
 });
 
 const styles = StyleSheet.create((theme) => ({
@@ -227,59 +56,27 @@ const styles = StyleSheet.create((theme) => ({
   label: {
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.normal,
+    fontWeight: theme.fontWeight.medium,
   },
   hintText: {
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.xs,
-    lineHeight: Math.round(theme.fontSize.xs * 1.4),
   },
   errorText: {
     color: theme.colors.palette.red[300],
     fontSize: theme.fontSize.xs,
-    lineHeight: Math.round(theme.fontSize.xs * 1.4),
   },
 }));
 
-const formInputStyles = StyleSheet.create((theme) => {
+const formInputStyles = StyleSheet.create((theme) => ({
-  const geometry = createControlGeometry(theme);
+  input: {
-
+    backgroundColor: theme.colors.surface2,
-  return {
+    borderRadius: theme.borderRadius.lg,
-    chrome: {
+    paddingHorizontal: theme.spacing[4],
-      backgroundColor: theme.colors.surface2,
+    paddingVertical: theme.spacing[3],
-    },
+    color: theme.colors.foreground,
-    chromeSm: {
+    borderWidth: 1,
-      ...geometry.fieldControlSm,
+    borderColor: theme.colors.border,
-    },
+    fontSize: theme.fontSize.base,
-    chromeMd: {
+  },
-      ...geometry.fieldControlMd,
+}));
-    },
-    controlRest: {
-      ...geometry.controlRest,
-    },
-    controlHover: {
-      ...geometry.controlHover,
-    },
-    controlActive: {
-      ...geometry.controlActive,
-    },
-    controlDisabled: {
-      ...geometry.controlDisabled,
-    },
-    input: {
-      flex: 1,
-      minWidth: 0,
-      color: theme.colors.foreground,
-      paddingHorizontal: 0,
-      paddingVertical: 0,
-      outlineColor: "transparent",
-      outlineWidth: 0,
-    },
-    inputSm: {
-      ...geometry.fieldTextSm,
-    },
-    inputMd: {
-      ...geometry.fieldTextMd,
-    },
-  };
-});

packages/app/src/components/ui/segmented-control.tsx

@@ -1,13 +1,9 @@
 import { useCallback, useMemo, type ReactNode } from "react";
 import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
 import type { StyleProp, TextStyle, ViewStyle } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
-import {
+
-  createControlGeometry,
+type SegmentedControlSize = "sm" | "md";
-  segmentedIconSize,
-  type SegmentedControlSize,
-} from "@/components/ui/control-geometry";
-import type { Theme } from "@/styles/theme";
 
 type SegmentedControlIconRenderer = (props: { color: string; size: number }) => ReactNode;
 
@@ -29,21 +25,6 @@ interface SegmentedControlProps<T extends string> {
   testID?: string;
 }
 
-interface SegmentIconProps {
-  icon: SegmentedControlIconRenderer;
-  iconSize: number;
-  iconColor: string;
-}
-
-function SegmentIcon({ icon, iconSize, iconColor }: SegmentIconProps) {
-  return <View style={styles.iconContainer}>{icon({ color: iconColor, size: iconSize })}</View>;
-}
-
-const ThemedSegmentIcon = withUnistyles(SegmentIcon);
-
-const selectedIconMapping = (theme: Theme) => ({ iconColor: theme.colors.foreground });
-const mutedIconMapping = (theme: Theme) => ({ iconColor: theme.colors.foregroundMuted });
-
 export function SegmentedControl<T extends string>({
   options,
   value,
@@ -53,10 +34,11 @@ export function SegmentedControl<T extends string>({
   style,
   testID,
 }: SegmentedControlProps<T>) {
+  const { theme } = useUnistyles();
   const containerSizeStyle = size === "sm" ? styles.containerSm : styles.containerMd;
   const segmentSizeStyle = size === "sm" ? styles.segmentSm : styles.segmentMd;
   const labelSizeStyle = size === "sm" ? styles.labelSm : styles.labelMd;
-  const iconSize = segmentedIconSize[size];
+  const iconSize = size === "sm" ? theme.iconSize.sm : theme.iconSize.md;
 
   const containerStyle = useMemo(
     () => [styles.container, containerSizeStyle, style],
@@ -67,12 +49,14 @@ export function SegmentedControl<T extends string>({
     <View style={containerStyle} testID={testID}>
       {options.map((option) => {
         const isSelected = option.value === value;
+        const iconColor = isSelected ? theme.colors.foreground : theme.colors.foregroundMuted;
 
         return (
           <SegmentItem
             key={option.value}
             option={option}
             isSelected={isSelected}
+            iconColor={iconColor}
             iconSize={iconSize}
             hideLabels={hideLabels}
             segmentSizeStyle={segmentSizeStyle}
@@ -89,6 +73,7 @@ export function SegmentedControl<T extends string>({
 function SegmentItem<T extends string>({
   option,
   isSelected,
+  iconColor,
   iconSize,
   hideLabels,
   segmentSizeStyle,
@@ -98,6 +83,7 @@ function SegmentItem<T extends string>({
 }: {
   option: SegmentedControlOption<T>;
   isSelected: boolean;
+  iconColor: string;
   iconSize: number;
   hideLabels: boolean;
   segmentSizeStyle: StyleProp<ViewStyle>;
@@ -133,18 +119,15 @@ function SegmentItem<T extends string>({
     <Pressable
       accessibilityRole="button"
       accessibilityState={accessibilityState}
-      aria-selected={isSelected}
       disabled={option.disabled}
       testID={option.testID}
       onPress={handlePress}
       style={pressableStyle}
     >
       {option.icon ? (
-        <ThemedSegmentIcon
+        <View style={styles.iconContainer}>
-          icon={option.icon}
+          {option.icon({ color: iconColor, size: iconSize })}
-          iconSize={iconSize}
+        </View>
-          uniProps={isSelected ? selectedIconMapping : mutedIconMapping}
-        />
       ) : null}
       {hideLabels ? null : (
         <Text style={labelStyle} numberOfLines={1}>
@@ -155,68 +138,68 @@ function SegmentItem<T extends string>({
   );
 }
 
-const styles = StyleSheet.create((theme) => {
+const styles = StyleSheet.create((theme) => ({
-  const geometry = createControlGeometry(theme);
+  container: {
-
+    flexDirection: "row",
-  return {
+    alignItems: "stretch",
-    container: {
+    backgroundColor: theme.colors.surface2,
-      flexDirection: "row",
+    borderRadius: theme.borderRadius.lg,
-      alignItems: "stretch",
+    gap: 2,
-      backgroundColor: theme.colors.surface2,
+  },
-      gap: 2,
+  containerSm: {
-    },
+    padding: 2,
-    containerSm: {
+  },
-      ...geometry.segmentedContainerSm,
+  containerMd: {
-    },
+    padding: 3,
-    containerMd: {
+  },
-      ...geometry.segmentedContainerMd,
+  segment: {
-    },
+    flexDirection: "row",
-    segment: {
+    alignItems: "center",
-      flexDirection: "row",
+    justifyContent: "center",
-      alignItems: "center",
+    flexShrink: 0,
-      justifyContent: "center",
+    borderRadius: theme.borderRadius.lg,
-      flexShrink: 0,
+    gap: theme.spacing[1],
-      gap: theme.spacing[1],
+  },
-    },
+  segmentSm: {
-    segmentSm: {
+    paddingVertical: theme.spacing[2],
-      ...geometry.segmentedSegmentSm,
+    paddingHorizontal: theme.spacing[4],
-    },
+  },
-    segmentMd: {
+  segmentMd: {
-      ...geometry.segmentedSegmentMd,
+    paddingVertical: theme.spacing[3],
-    },
+    paddingHorizontal: theme.spacing[6],
-    segmentSelected: {
+  },
-      backgroundColor: theme.colors.surface0,
+  segmentSelected: {
-      shadowColor: "#000",
+    backgroundColor: theme.colors.surface0,
-      shadowOffset: { width: 0, height: 1 },
+    shadowColor: "#000",
-      shadowOpacity: 0.08,
+    shadowOffset: { width: 0, height: 1 },
-      shadowRadius: 2,
+    shadowOpacity: 0.08,
-      elevation: 1,
+    shadowRadius: 2,
-    },
+    elevation: 1,
-    segmentHover: {
+  },
-      backgroundColor: theme.colors.surface1,
+  segmentHover: {
-    },
+    backgroundColor: theme.colors.surface1,
-    segmentPressed: {
+  },
-      backgroundColor: theme.colors.surface1,
+  segmentPressed: {
-    },
+    backgroundColor: theme.colors.surface1,
-    segmentDisabled: {
+  },
-      opacity: theme.opacity[50],
+  segmentDisabled: {
-    },
+    opacity: theme.opacity[50],
-    iconContainer: {
+  },
-      alignItems: "center",
+  iconContainer: {
-      justifyContent: "center",
+    alignItems: "center",
-    },
+    justifyContent: "center",
-    label: {
+  },
-      color: theme.colors.foregroundMuted,
+  label: {
-      fontWeight: theme.fontWeight.normal,
+    color: theme.colors.foregroundMuted,
-    },
+    fontWeight: theme.fontWeight.normal,
-    labelSm: {
+  },
-      ...geometry.segmentedLabelSm,
+  labelSm: {
-    },
+    fontSize: theme.fontSize.sm,
-    labelMd: {
+  },
-      ...geometry.segmentedLabelMd,
+  labelMd: {
-    },
+    fontSize: theme.fontSize.base,
-    labelSelected: {
+  },
-      color: theme.colors.foreground,
+  labelSelected: {
-    },
+    color: theme.colors.foreground,
-  };
+  },
-});
+}));

packages/app/src/components/ui/select-field.tsx

@@ -1,394 +0,0 @@
-import { useCallback, useMemo, useRef, useState, type ReactElement, type ReactNode } from "react";
-import {
-  Pressable,
-  Text,
-  View,
-  type NativeSyntheticEvent,
-  type PressableStateCallbackType,
-  type TargetedEvent,
-} from "react-native";
-import { ChevronDown } from "lucide-react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
-import {
-  createControlGeometry,
-  resolveControlInteractionStyles,
-  type FieldControlSize,
-} from "@/components/ui/control-geometry";
-import { Field } from "@/components/ui/form-field";
-import { LoadingSpinner } from "@/components/ui/loading-spinner";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
-
-export interface SelectFieldDisplay {
-  label: string;
-  description?: string;
-}
-
-export interface SelectFieldOption<TValue> {
-  id: string;
-  value: TValue;
-  label: string;
-  description?: string;
-  kind?: ComboboxOption["kind"];
-  testID?: string;
-}
-
-export interface SelectFieldRenderOptionInput<TValue> {
-  option: SelectFieldOption<TValue>;
-  selected: boolean;
-  active: boolean;
-  onPress: () => void;
-}
-
-export interface SelectFieldProps<TValue> {
-  label: string;
-  value: TValue | null;
-  selectedDisplay: SelectFieldDisplay | null;
-  options: SelectFieldOption<TValue>[];
-  onChange: (value: TValue, display: SelectFieldDisplay) => void;
-  placeholder: string;
-  emptyText: string;
-  loading?: boolean;
-  disabled?: boolean;
-  hint?: string;
-  error?: string | null;
-  searchable?: boolean;
-  searchPlaceholder?: string;
-  title?: string;
-  size?: FieldControlSize;
-  getValueKey?: (value: TValue) => string;
-  renderOption?: (input: SelectFieldRenderOptionInput<TValue>) => ReactElement;
-  triggerLeading?: ReactNode;
-  field?: boolean;
-  testID?: string;
-  triggerTestID?: string;
-}
-
-export interface SelectFieldTriggerProps {
-  display?: SelectFieldDisplay | null;
-  label?: string;
-  isPlaceholder?: boolean;
-  placeholder: string;
-  hovered?: boolean;
-  focused?: boolean;
-  active?: boolean;
-  disabled?: boolean;
-  loading?: boolean;
-  leading?: ReactNode;
-  size?: FieldControlSize;
-  testID?: string;
-}
-
-const ThemedChevronDown = withUnistyles(ChevronDown);
-const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
-
-const foregroundMutedMapping = (theme: Theme) => ({
-  color: theme.colors.foregroundMuted,
-});
-
-function getSelectedOptionId<TValue>(
-  options: readonly SelectFieldOption<TValue>[],
-  value: TValue | null,
-  getValueKey: ((value: TValue) => string) | undefined,
-): string {
-  if (value === null) {
-    return "";
-  }
-  if (getValueKey) {
-    const selectedKey = getValueKey(value);
-    return options.find((option) => getValueKey(option.value) === selectedKey)?.id ?? "";
-  }
-  return options.find((option) => Object.is(option.value, value))?.id ?? "";
-}
-
-function useVisibleSelectOptions<TValue>(
-  options: SelectFieldOption<TValue>[],
-  loading: boolean,
-): SelectFieldOption<TValue>[] {
-  const previousOptionsRef = useRef<SelectFieldOption<TValue>[]>(options);
-  if (options.length > 0 || !loading) {
-    previousOptionsRef.current = options;
-  }
-  if (loading && options.length === 0) {
-    return previousOptionsRef.current;
-  }
-  return options;
-}
-
-export function SelectFieldTrigger({
-  display,
-  label: explicitLabel,
-  isPlaceholder: explicitIsPlaceholder,
-  placeholder,
-  hovered = false,
-  focused = false,
-  active = false,
-  disabled = false,
-  loading = false,
-  leading,
-  size = "md",
-  testID,
-}: SelectFieldTriggerProps): ReactElement {
-  const sizeStyle = size === "sm" ? styles.triggerSm : styles.triggerMd;
-  const textSizeStyle = size === "sm" ? styles.triggerTextSm : styles.triggerTextMd;
-  const triggerStyle = useMemo(
-    () => [
-      styles.trigger,
-      sizeStyle,
-      resolveControlInteractionStyles(
-        {
-          controlRest: styles.controlRest,
-          controlHover: styles.controlHover,
-          controlActive: styles.controlActive,
-          controlDisabled: styles.controlDisabled,
-        },
-        { hovered, focused, active, disabled },
-      ),
-    ],
-    [active, disabled, focused, hovered, sizeStyle],
-  );
-  const label = explicitLabel ?? display?.label ?? placeholder;
-  const isPlaceholder = explicitIsPlaceholder ?? display == null;
-  const textStyle = useMemo(
-    () => [isPlaceholder ? styles.placeholderText : styles.triggerText, textSizeStyle],
-    [isPlaceholder, textSizeStyle],
-  );
-
-  return (
-    <View pointerEvents="none" style={triggerStyle} testID={testID}>
-      {leading}
-      <Text style={textStyle} numberOfLines={1}>
-        {label}
-      </Text>
-      {loading ? (
-        <View style={styles.spinnerSlot}>
-          <ThemedLoadingSpinner size={ICON_SIZE.sm} uniProps={foregroundMutedMapping} />
-        </View>
-      ) : null}
-      <ThemedChevronDown size={ICON_SIZE.md} uniProps={foregroundMutedMapping} />
-    </View>
-  );
-}
-
-export function SelectField<TValue>({
-  label,
-  value,
-  selectedDisplay,
-  options,
-  onChange,
-  placeholder,
-  emptyText,
-  loading = false,
-  disabled = false,
-  hint,
-  error,
-  searchable = false,
-  searchPlaceholder,
-  title,
-  size = "md",
-  getValueKey,
-  renderOption,
-  triggerLeading,
-  field = true,
-  testID,
-  triggerTestID,
-}: SelectFieldProps<TValue>): ReactElement {
-  const anchorRef = useRef<View>(null);
-  const [open, setOpen] = useState(false);
-  const [triggerFocused, setTriggerFocused] = useState(false);
-  const visibleOptions = useVisibleSelectOptions(options, loading);
-  const selectedOptionId = useMemo(
-    () => getSelectedOptionId(visibleOptions, value, getValueKey),
-    [getValueKey, value, visibleOptions],
-  );
-  const comboboxOptions = useMemo<ComboboxOption[]>(
-    () =>
-      visibleOptions.map((option) => ({
-        id: option.id,
-        label: option.label,
-        description: option.description,
-        kind: option.kind,
-      })),
-    [visibleOptions],
-  );
-  const optionById = useMemo(
-    () => new Map(visibleOptions.map((option) => [option.id, option])),
-    [visibleOptions],
-  );
-
-  const handleSelect = useCallback(
-    (id: string) => {
-      const option = optionById.get(id);
-      if (!option) {
-        return;
-      }
-      onChange(option.value, { label: option.label, description: option.description });
-      setOpen(false);
-    },
-    [onChange, optionById],
-  );
-
-  const handlePress = useCallback(() => {
-    if (disabled) {
-      return;
-    }
-    setOpen((current) => !current);
-  }, [disabled]);
-  const handleTriggerFocus = useCallback((_event: NativeSyntheticEvent<TargetedEvent>) => {
-    setTriggerFocused(true);
-  }, []);
-  const handleTriggerBlur = useCallback((_event: NativeSyntheticEvent<TargetedEvent>) => {
-    setTriggerFocused(false);
-  }, []);
-
-  const renderComboboxOption = useCallback(
-    ({
-      option,
-      selected,
-      active,
-      onPress,
-    }: {
-      option: ComboboxOption;
-      selected: boolean;
-      active: boolean;
-      onPress: () => void;
-    }) => {
-      const selectOption = optionById.get(option.id);
-      if (!selectOption) {
-        return (
-          <ComboboxItem
-            label={option.label}
-            description={option.description}
-            kind={option.kind}
-            selected={selected}
-            active={active}
-            onPress={onPress}
-          />
-        );
-      }
-      if (renderOption) {
-        return renderOption({ option: selectOption, selected, active, onPress });
-      }
-      return (
-        <ComboboxItem
-          testID={selectOption.testID}
-          label={selectOption.label}
-          description={selectOption.description}
-          kind={selectOption.kind}
-          selected={selected}
-          active={active}
-          onPress={onPress}
-        />
-      );
-    },
-    [optionById, renderOption],
-  );
-
-  const displayLabel = selectedDisplay?.label ?? placeholder;
-  const fieldHint = selectedDisplay?.description ?? hint;
-
-  const control = (
-    <>
-      <View ref={anchorRef} collapsable={false}>
-        <Pressable
-          onPress={handlePress}
-          onFocus={handleTriggerFocus}
-          onBlur={handleTriggerBlur}
-          disabled={disabled}
-          accessibilityRole="button"
-          accessibilityLabel={`${label} (${displayLabel})`}
-          testID={triggerTestID}
-        >
-          {({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => (
-            <SelectFieldTrigger
-              display={selectedDisplay}
-              placeholder={placeholder}
-              hovered={Boolean(hovered)}
-              focused={triggerFocused}
-              active={pressed || open}
-              disabled={disabled}
-              loading={loading}
-              leading={triggerLeading}
-              size={size}
-            />
-          )}
-        </Pressable>
-      </View>
-      <Combobox
-        options={comboboxOptions}
-        value={selectedOptionId}
-        onSelect={handleSelect}
-        searchable={searchable}
-        searchPlaceholder={searchPlaceholder}
-        emptyText={loading && visibleOptions.length === 0 ? "Loading..." : emptyText}
-        title={title ?? label}
-        open={open}
-        onOpenChange={setOpen}
-        anchorRef={anchorRef}
-        renderOption={renderComboboxOption}
-      />
-    </>
-  );
-
-  if (!field) {
-    return <View testID={testID}>{control}</View>;
-  }
-
-  return (
-    <Field label={label} hint={fieldHint} error={error} testID={testID}>
-      {control}
-    </Field>
-  );
-}
-
-const styles = StyleSheet.create((theme) => {
-  const geometry = createControlGeometry(theme);
-
-  return {
-    trigger: {
-      flexDirection: "row",
-      alignItems: "center",
-      gap: theme.spacing[2],
-      backgroundColor: theme.colors.surface2,
-    },
-    triggerSm: {
-      ...geometry.fieldControlSm,
-    },
-    triggerMd: {
-      ...geometry.fieldControlMd,
-    },
-    controlRest: {
-      ...geometry.controlRest,
-    },
-    controlHover: {
-      ...geometry.controlHover,
-    },
-    controlActive: {
-      ...geometry.controlActive,
-    },
-    controlDisabled: {
-      ...geometry.controlDisabled,
-    },
-    triggerText: {
-      flex: 1,
-      minWidth: 0,
-      color: theme.colors.foreground,
-    },
-    placeholderText: {
-      flex: 1,
-      minWidth: 0,
-      color: theme.colors.foregroundMuted,
-    },
-    triggerTextSm: {
-      ...geometry.fieldTextSm,
-    },
-    triggerTextMd: {
-      ...geometry.fieldTextMd,
-    },
-    spinnerSlot: {
-      flexShrink: 0,
-      width: ICON_SIZE.md,
-      alignItems: "center",
-    },
-  };
-});

packages/app/src/components/ui/switch.test.tsx

@@ -7,15 +7,10 @@ import { Switch } from "./switch";
 const { theme } = vi.hoisted(() => ({
   theme: {
     opacity: { 50: 0.5 },
-    spacing: { 0: 0, 3: 12, 4: 16, 6: 24 },
-    fontSize: { xs: 12, sm: 14, base: 16 },
-    borderRadius: { md: 6, lg: 8, xl: 12 },
-    borderWidth: { 1: 1 },
     colors: {
       surface3: "#333",
       accent: "#0a84ff",
       accentForeground: "#fff",
-      borderAccent: "#555",
       palette: { white: "#fff" },
     },
   },
@@ -37,9 +32,6 @@ vi.mock("react-native-reanimated", () => ({
 }));
 
 vi.mock("react-native", () => ({
-  Platform: {
-    select: (values: Record<string, unknown>) => values.web ?? values.default,
-  },
   Pressable: ({
     "aria-checked": ariaChecked,
     accessibilityLabel,
@@ -79,13 +71,7 @@ vi.mock("react-native-unistyles", () => ({
   StyleSheet: {
     create: (factory: unknown) => (typeof factory === "function" ? factory(theme) : factory),
   },
-  withUnistyles:
+  useUnistyles: () => ({ theme }),
-    (
-      Component: React.ComponentType<Record<string, unknown>>,
-      mapping?: (theme: unknown) => object,
-    ) =>
-    (props: Record<string, unknown>) =>
-      React.createElement(Component, { ...props, ...mapping?.(theme) }),
 }));
 
 describe("Switch", () => {

packages/app/src/components/ui/switch.tsx

@@ -12,9 +12,7 @@ import Animated, {
   useDerivedValue,
   withTiming,
 } from "react-native-reanimated";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
-import { createControlGeometry, switchGeometry } from "@/components/ui/control-geometry";
-import type { Theme } from "@/styles/theme";
 
 interface SwitchProps {
   value: boolean;
@@ -25,54 +23,11 @@ interface SwitchProps {
   style?: StyleProp<ViewStyle>;
 }
 
+const TRACK = { width: 34, height: 20 };
+const THUMB = 16;
+
 const TIMING = { duration: 180, easing: Easing.inOut(Easing.ease) };
 
-interface SwitchTrackProps {
-  value: boolean;
-  trackOffColor: string;
-  trackOnColor: string;
-  thumbOffColor: string;
-  thumbOnColor: string;
-}
-
-function SwitchTrack({
-  value,
-  trackOffColor,
-  trackOnColor,
-  thumbOffColor,
-  thumbOnColor,
-}: SwitchTrackProps) {
-  const progress = useDerivedValue(() => withTiming(value ? 1 : 0, TIMING));
-
-  const trackAnimatedStyle = useAnimatedStyle(() => ({
-    backgroundColor: interpolateColor(progress.value, [0, 1], [trackOffColor, trackOnColor]),
-  }));
-
-  const thumbAnimatedStyle = useAnimatedStyle(() => ({
-    backgroundColor: interpolateColor(progress.value, [0, 1], [thumbOffColor, thumbOnColor]),
-    transform: [{ translateX: progress.value * switchGeometry.thumbTravel }],
-  }));
-
-  const trackStyle = useMemo(() => [styles.switchTrack, trackAnimatedStyle], [trackAnimatedStyle]);
-  const thumbStyle = useMemo(
-    () => [styles.switchThumb, styles.thumb, thumbAnimatedStyle],
-    [thumbAnimatedStyle],
-  );
-
-  return (
-    <Animated.View style={trackStyle}>
-      <Animated.View style={thumbStyle} />
-    </Animated.View>
-  );
-}
-
-const ThemedSwitchTrack = withUnistyles(SwitchTrack, (theme: Theme) => ({
-  trackOffColor: theme.colors.surface3,
-  trackOnColor: theme.colors.accent,
-  thumbOffColor: theme.colors.palette.white,
-  thumbOnColor: theme.colors.accentForeground,
-}));
-
 export function Switch({
   value,
   onValueChange,
@@ -81,6 +36,31 @@ export function Switch({
   testID,
   style,
 }: SwitchProps) {
+  const { theme } = useUnistyles();
+  const track = TRACK;
+  const thumb = THUMB;
+  const padding = (track.height - thumb) / 2;
+  const thumbTravel = track.width - thumb - padding * 2;
+
+  const progress = useDerivedValue(() => withTiming(value ? 1 : 0, TIMING));
+
+  const trackAnimatedStyle = useAnimatedStyle(() => ({
+    backgroundColor: interpolateColor(
+      progress.value,
+      [0, 1],
+      [theme.colors.surface3, theme.colors.accent],
+    ),
+  }));
+
+  const thumbAnimatedStyle = useAnimatedStyle(() => ({
+    backgroundColor: interpolateColor(
+      progress.value,
+      [0, 1],
+      [theme.colors.palette.white, theme.colors.accentForeground],
+    ),
+    transform: [{ translateX: progress.value * thumbTravel }],
+  }));
+
   const handlePress = useCallback(
     (event: GestureResponderEvent) => {
       event.stopPropagation();
@@ -92,9 +72,30 @@ export function Switch({
 
   const accessibilityState = useMemo(() => ({ checked: value, disabled }), [value, disabled]);
   const pressableStyle = useMemo(
-    () => [styles.switchControl, disabled ? styles.disabled : null, style],
+    () => [disabled ? styles.disabled : null, style],
     [disabled, style],
   );
+  const trackStyle = useMemo(
+    () => [
+      styles.track,
+      {
+        width: track.width,
+        height: track.height,
+        borderRadius: track.height / 2,
+        padding,
+      },
+      trackAnimatedStyle,
+    ],
+    [track.width, track.height, padding, trackAnimatedStyle],
+  );
+  const thumbStyle = useMemo(
+    () => [
+      styles.thumb,
+      { width: thumb, height: thumb, borderRadius: thumb / 2 },
+      thumbAnimatedStyle,
+    ],
+    [thumb, thumbAnimatedStyle],
+  );
 
   return (
     <Pressable
@@ -108,39 +109,25 @@ export function Switch({
       testID={testID}
       style={pressableStyle}
     >
-      <ThemedSwitchTrack value={value} />
+      <Animated.View style={trackStyle}>
+        <Animated.View style={thumbStyle} />
+      </Animated.View>
     </Pressable>
   );
 }
 
-const styles = StyleSheet.create((theme) => {
+const styles = StyleSheet.create((theme) => ({
-  const geometry = createControlGeometry(theme);
+  track: {
-
+    justifyContent: "center",
-  return {
+  },
-    switchControl: {
+  thumb: {
-      ...geometry.switchControl,
+    shadowColor: "rgba(0, 0, 0, 0.25)",
-    },
+    shadowOffset: { width: 0, height: 1 },
-    switchTrack: {
+    shadowRadius: 2,
-      width: switchGeometry.trackWidth,
+    shadowOpacity: 1,
-      height: switchGeometry.trackHeight,
+    elevation: 2,
-      borderRadius: switchGeometry.trackHeight / 2,
+  },
-      padding: (switchGeometry.trackHeight - switchGeometry.thumbSize) / 2,
+  disabled: {
-      justifyContent: "center",
+    opacity: theme.opacity[50],
-    },
+  },
-    switchThumb: {
+}));
-      width: switchGeometry.thumbSize,
-      height: switchGeometry.thumbSize,
-      borderRadius: switchGeometry.thumbSize / 2,
-    },
-    thumb: {
-      shadowColor: "rgba(0, 0, 0, 0.25)",
-      shadowOffset: { width: 0, height: 1 },
-      shadowRadius: 2,
-      shadowOpacity: 1,
-      elevation: 2,
-    },
-    disabled: {
-      opacity: theme.opacity[50],
-    },
-  };
-});

packages/app/src/composer/agent-controls/index.tsx

@@ -805,8 +805,6 @@ function DesktopAgentControlsContent(props: DesktopAgentControlsContentProps) {
                 onRetryProvider={onRetryModelProvider}
                 isRetryingProvider={isRetryingModelProvider}
                 serverId={modelSelectorServerId}
-                desktopPlacement="top-start"
-                desktopMinWidth={360}
               />
             </View>
           </TooltipTrigger>
@@ -1014,8 +1012,6 @@ function SheetAgentControlsContent(props: SheetAgentControlsContentProps) {
           isRetryingProvider={isRetryingModelProvider}
           renderTrigger={renderModelTrigger}
           serverId={modelSelectorServerId}
-          desktopPlacement="top-start"
-          desktopMinWidth={360}
         />
       ) : null}
 
@@ -1688,8 +1684,6 @@ export function DraftAgentControls({
           onRetryProvider={onRetryModelProvider}
           isRetryingProvider={isRetryingModelProvider}
           serverId={modelSelectorServerId}
-          desktopPlacement="top-start"
-          desktopMinWidth={360}
         />
         {selectedProvider ? (
           <ControlledAgentControls

packages/app/src/composer/attachments/submit.ts

@@ -26,9 +26,6 @@ export function splitComposerAttachmentsForSubmit(attachments: ComposerAttachmen
     }
 
     if (isWorkspaceAttachment(attachment)) {
-      if (attachment.kind === "browser_element" && attachment.attachment.screenshot) {
-        images.push(attachment.attachment.screenshot);
-      }
       const workspaceAttachment = workspaceAttachmentToSubmitAttachment(attachment);
       if (workspaceAttachment) {
         agentAttachments.push(workspaceAttachment);

packages/app/src/composer/attachments/workspace-cleanup.ts

@@ -11,7 +11,6 @@ export function getAttachmentKey(attachment: WorkspaceComposerAttachment): strin
       tag: attachment.attachment.tag,
       text: attachment.attachment.text,
       html: attachment.attachment.outerHTML,
-      comment: attachment.attachment.comment ?? null,
     });
   }
   if (isPullRequestContextAttachment(attachment)) {

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

@@ -37,10 +37,10 @@ const CATALOG_DATA = [
     title: "Auggie CLI",
     description:
       "Augment Code's powerful software agent, backed by industry-leading context engine",
-    version: "0.32.0",
+    version: "0.31.0",
     iconId: "auggie",
     installLink: "https://www.augmentcode.com/",
-    command: ["npx", "-y", "@augmentcode/auggie@0.32.0", "--acp"],
+    command: ["npx", "-y", "@augmentcode/auggie@0.31.0", "--acp"],
     env: {
       AUGMENT_DISABLE_AUTO_UPDATE: "1",
     },
@@ -59,19 +59,19 @@ const CATALOG_DATA = [
     title: "Cline",
     description:
       "Autonomous coding agent CLI - capable of creating/editing files, running commands, using the browser, and more",
-    version: "3.0.38",
+    version: "3.0.34",
     iconId: "cline",
     installLink: "https://cline.bot/cli",
-    command: ["npx", "-y", "cline@3.0.38", "--acp"],
+    command: ["npx", "-y", "cline@3.0.34", "--acp"],
   },
   {
     id: "codebuddy-code",
     title: "Codebuddy Code",
     description: "Tencent Cloud's official intelligent coding tool",
-    version: "2.117.2",
+    version: "2.114.0",
     iconId: "codebuddy-code",
     installLink: "https://www.codebuddy.cn/cli/",
-    command: ["npx", "-y", "@tencent-ai/codebuddy-code@2.117.2", "--acp"],
+    command: ["npx", "-y", "@tencent-ai/codebuddy-code@2.114.0", "--acp"],
   },
   {
     id: "codewhale",
@@ -140,29 +140,29 @@ const CATALOG_DATA = [
     id: "dimcode",
     title: "DimCode",
     description: "A coding agent that puts leading models at your command.",
-    version: "0.2.22",
+    version: "0.2.12",
     iconId: "dimcode",
     installLink: "https://dimcode.dev/docs/acp.html",
-    command: ["npx", "-y", "dimcode@0.2.22", "acp"],
+    command: ["npx", "-y", "dimcode@0.2.12", "acp"],
   },
   {
     id: "dirac",
     title: "Dirac",
     description:
       "Reduces API costs by more than 50%, produces better and faster work. Uses Hash anchored parallel edits, AST manipulation and a whole lot of neat optimizations. Fully Open Source.",
-    version: "0.4.13",
+    version: "0.4.12",
     iconId: "dirac",
     installLink: "https://dirac.run",
-    command: ["npx", "-y", "dirac-cli@0.4.13", "--acp"],
+    command: ["npx", "-y", "dirac-cli@0.4.12", "--acp"],
   },
   {
     id: "factory-droid",
     title: "Factory Droid",
     description: "Factory Droid - AI coding agent powered by Factory AI",
-    version: "0.164.1",
+    version: "0.161.0",
     iconId: "factory-droid",
     installLink: "https://factory.ai/product/cli",
-    command: ["npx", "-y", "droid@0.164.1", "exec", "--output-format", "acp-daemon"],
+    command: ["npx", "-y", "droid@0.161.0", "exec", "--output-format", "acp-daemon"],
     env: {
       DROID_DISABLE_AUTO_UPDATE: "true",
       FACTORY_DROID_AUTO_UPDATE_ENABLED: "false",
@@ -173,10 +173,10 @@ const CATALOG_DATA = [
     id: "fast-agent",
     title: "fast-agent",
     description: "Code and build agents with comprehensive multi-provider support",
-    version: "0.9.2",
+    version: "0.8.1",
     iconId: "fast-agent",
     installLink: "https://fast-agent.ai/acp/",
-    command: ["uvx", "--from", "fast-agent-acp==0.9.2", "fast-agent-acp", "-x"],
+    command: ["uvx", "--from", "fast-agent-acp==0.8.1", "fast-agent-acp", "-x"],
   },
   {
     id: "gemini",
@@ -284,10 +284,10 @@ const CATALOG_DATA = [
     id: "nova",
     title: "Nova",
     description: "Nova by Compass AI - a fully-fledged software engineer at your command",
-    version: "1.1.25",
+    version: "1.1.22",
     iconId: "nova",
     installLink: "https://www.compassap.ai/portfolio/nova.html",
-    command: ["npx", "-y", "@compass-ai/nova@1.1.25", "acp"],
+    command: ["npx", "-y", "@compass-ai/nova@1.1.22", "acp"],
   },
   {
     id: "poolside",
@@ -302,19 +302,19 @@ const CATALOG_DATA = [
     id: "qoder",
     title: "Qoder CLI",
     description: "AI coding assistant with agentic capabilities",
-    version: "1.0.39",
+    version: "1.0.33",
     iconId: "qoder",
     installLink: "https://qoder.com",
-    command: ["npx", "-y", "@qoder-ai/qodercli@1.0.39", "--acp"],
+    command: ["npx", "-y", "@qoder-ai/qodercli@1.0.33", "--acp"],
   },
   {
     id: "qwen-code",
     title: "Qwen Code",
     description: "Alibaba's Qwen coding assistant",
-    version: "0.19.7",
+    version: "0.19.3",
     iconId: "qwen-code",
     installLink: "https://qwenlm.github.io/qwen-code-docs/en/users/overview",
-    command: ["npx", "-y", "@qwen-code/qwen-code@0.19.7", "--acp", "--experimental-skills"],
+    command: ["npx", "-y", "@qwen-code/qwen-code@0.19.3", "--acp", "--experimental-skills"],
   },
   {
     id: "sigit",
@@ -335,15 +335,6 @@ const CATALOG_DATA = [
     installLink: "https://stakpak.dev/",
     command: ["stakpak", "acp"],
   },
-  {
-    id: "traecli",
-    title: "TRAE CLI",
-    description: "ByteDance's official TRAE coding agent with native ACP support",
-    version: "manual",
-    iconId: "traecli",
-    installLink: "https://docs.trae.cn/cli_get-started-with-trae-cli",
-    command: ["traecli", "acp", "serve"],
-  },
   {
     id: "vtcode",
     title: "VT Code",

packages/app/src/data/daemon-config.ts

@@ -1,3 +0,0 @@
-export function daemonConfigQueryKey(serverId: string | null) {
-  return ["daemon-config", serverId] as const;
-}

packages/app/src/data/push-router.test.ts

@@ -1,518 +0,0 @@
-import { QueryClient, QueryObserver, skipToken } from "@tanstack/react-query";
-import { describe, expect, it } from "vitest";
-import type { MutableDaemonConfig, SessionOutboundMessage } from "@getpaseo/protocol/messages";
-import { checkoutDiffQueryKey } from "@/git/query-keys";
-import { buildTerminalsQueryKey } from "@/screens/workspace/terminals/state";
-import { daemonConfigQueryKey } from "@/data/daemon-config";
-import { providersSnapshotQueryKey } from "@/data/providers-snapshot";
-import {
-  checkoutDiffPushRoute,
-  invalidateServerDataQueriesAfterReconnect,
-  mountServerDataPushRouter,
-  workspaceTerminalsPushRoute,
-} from "@/data/push-router";
-
-type ProvidersSnapshotUpdateMessage = Extract<
-  SessionOutboundMessage,
-  { type: "providers_snapshot_update" }
->;
-type CheckoutDiffUpdateMessage = Extract<SessionOutboundMessage, { type: "checkout_diff_update" }>;
-type SubscribeCheckoutDiffResponseMessage = Extract<
-  SessionOutboundMessage,
-  { type: "subscribe_checkout_diff_response" }
->;
-type StatusMessage = Extract<SessionOutboundMessage, { type: "status" }>;
-type TerminalsChangedMessage = Extract<SessionOutboundMessage, { type: "terminals_changed" }>;
-type RouterMessage =
-  | ProvidersSnapshotUpdateMessage
-  | CheckoutDiffUpdateMessage
-  | SubscribeCheckoutDiffResponseMessage
-  | StatusMessage
-  | TerminalsChangedMessage;
-type RouterMessageType = RouterMessage["type"];
-type RouterHandler = (message: RouterMessage) => void;
-type RouterClient = Parameters<typeof mountServerDataPushRouter>[0]["client"];
-
-const daemonConfig: MutableDaemonConfig = {
-  mcp: { injectIntoAgents: true },
-  browserTools: { enabled: false },
-  providers: {},
-  metadataGeneration: { providers: [] },
-  autoArchiveAfterMerge: false,
-  enableTerminalAgentHooks: false,
-  appendSystemPrompt: "",
-};
-
-function createFakeClient(config: { rejectCheckoutDiffSubscribe?: boolean } = {}): {
-  client: RouterClient;
-  emit: <K extends RouterMessageType>(message: Extract<RouterMessage, { type: K }>) => void;
-  subscribeCheckoutDiffCalls: Array<{
-    cwd: string;
-    compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean };
-    subscriptionId: string;
-  }>;
-  unsubscribeCheckoutDiffCalls: string[];
-  subscribeTerminalCalls: Array<{ cwd: string; workspaceId?: string }>;
-  unsubscribeTerminalCalls: Array<{ cwd: string; workspaceId?: string }>;
-} {
-  const handlers: Record<RouterMessageType, RouterHandler[]> = {
-    providers_snapshot_update: [],
-    checkout_diff_update: [],
-    subscribe_checkout_diff_response: [],
-    status: [],
-    terminals_changed: [],
-  };
-  const subscribeCheckoutDiffCalls: Array<{
-    cwd: string;
-    compare: { mode: "uncommitted" | "base"; baseRef?: string; ignoreWhitespace?: boolean };
-    subscriptionId: string;
-  }> = [];
-  const unsubscribeCheckoutDiffCalls: string[] = [];
-  const subscribeTerminalCalls: Array<{ cwd: string; workspaceId?: string }> = [];
-  const unsubscribeTerminalCalls: Array<{ cwd: string; workspaceId?: string }> = [];
-
-  function on<K extends RouterMessageType>(
-    type: K,
-    handler: (message: Extract<RouterMessage, { type: K }>) => void,
-  ): () => void {
-    const routerHandler: RouterHandler = (message) => {
-      if (message.type === type) {
-        handler(message as Extract<RouterMessage, { type: K }>);
-      }
-    };
-    handlers[type].push(routerHandler);
-    return () => {
-      handlers[type] = handlers[type].filter((candidate) => candidate !== routerHandler);
-    };
-  }
-
-  function emit<K extends RouterMessageType>(message: Extract<RouterMessage, { type: K }>): void {
-    for (const handler of handlers[message.type]) {
-      handler(message);
-    }
-  }
-
-  return {
-    client: {
-      on,
-      async subscribeCheckoutDiff(cwd, compare, requestOptions) {
-        subscribeCheckoutDiffCalls.push({
-          cwd,
-          compare,
-          subscriptionId: requestOptions.subscriptionId,
-        });
-        if (config.rejectCheckoutDiffSubscribe) {
-          throw new Error("subscribe failed");
-        }
-        return {
-          subscriptionId: requestOptions.subscriptionId,
-          cwd,
-          files: [],
-          error: null,
-          requestId: requestOptions.requestId ?? "subscribe-checkout-diff",
-        };
-      },
-      unsubscribeCheckoutDiff(subscriptionId) {
-        unsubscribeCheckoutDiffCalls.push(subscriptionId);
-      },
-      subscribeTerminals(subscription) {
-        subscribeTerminalCalls.push(subscription);
-      },
-      unsubscribeTerminals(subscription) {
-        unsubscribeTerminalCalls.push(subscription);
-      },
-    },
-    emit,
-    subscribeCheckoutDiffCalls,
-    unsubscribeCheckoutDiffCalls,
-    subscribeTerminalCalls,
-    unsubscribeTerminalCalls,
-  };
-}
-
-function providerUpdate(generatedAt: string): ProvidersSnapshotUpdateMessage {
-  return {
-    type: "providers_snapshot_update",
-    payload: {
-      entries: [{ provider: "codex", status: "ready", enabled: true, models: [] }],
-      generatedAt,
-    },
-  };
-}
-
-describe("server data push router", () => {
-  it("routes provider snapshot and daemon config payloads until detached", () => {
-    const queryClient = new QueryClient();
-    const fake = createFakeClient();
-    const serverId = "server-1";
-    const unmount = mountServerDataPushRouter({ client: fake.client, queryClient, serverId });
-
-    fake.emit(providerUpdate("2026-01-01T00:00:00.000Z"));
-    fake.emit({
-      type: "status",
-      payload: { status: "daemon_config_changed", config: daemonConfig },
-    });
-
-    expect(queryClient.getQueryData(providersSnapshotQueryKey(serverId))).toEqual({
-      entries: [{ provider: "codex", status: "ready", enabled: true, models: [] }],
-      generatedAt: "2026-01-01T00:00:00.000Z",
-      requestId: "providers_snapshot_update",
-    });
-    expect(queryClient.getQueryData(daemonConfigQueryKey(serverId))).toEqual(daemonConfig);
-
-    unmount();
-    fake.emit(providerUpdate("2026-01-01T00:00:01.000Z"));
-
-    expect(queryClient.getQueryData(providersSnapshotQueryKey(serverId))).toEqual({
-      entries: [{ provider: "codex", status: "ready", enabled: true, models: [] }],
-      generatedAt: "2026-01-01T00:00:00.000Z",
-      requestId: "providers_snapshot_update",
-    });
-  });
-
-  it("subscribes active checkout diff queries and writes matching diff events", () => {
-    const queryClient = new QueryClient();
-    const fake = createFakeClient();
-    const serverId = "server-1";
-    const cwd = "/repo";
-    const queryKey = checkoutDiffQueryKey(serverId, cwd, "base", "main", true);
-    const subscriptionId = `checkoutDiff:${JSON.stringify(queryKey)}`;
-    const observer = new QueryObserver(queryClient, {
-      queryKey,
-      queryFn: skipToken,
-      enabled: true,
-      gcTime: Infinity,
-      staleTime: Infinity,
-      meta: checkoutDiffPushRoute({
-        enabled: true,
-        serverId,
-        subscriptionId,
-        cwd,
-        compare: { mode: "base", baseRef: "main", ignoreWhitespace: true },
-      }),
-    });
-    const unsubscribeObserver = observer.subscribe(() => undefined);
-    const unmount = mountServerDataPushRouter({ client: fake.client, queryClient, serverId });
-
-    expect(fake.subscribeCheckoutDiffCalls).toEqual([
-      {
-        cwd,
-        compare: { mode: "base", baseRef: "main", ignoreWhitespace: true },
-        subscriptionId,
-      },
-    ]);
-
-    fake.emit({
-      type: "subscribe_checkout_diff_response",
-      payload: { subscriptionId, cwd, files: [], error: null, requestId: "diff-1" },
-    });
-
-    expect(queryClient.getQueryData(queryKey)).toEqual({
-      cwd,
-      files: [],
-      error: null,
-      requestId: "diff-1",
-    });
-
-    fake.emit({
-      type: "checkout_diff_update",
-      payload: { subscriptionId, cwd, files: [], error: null },
-    });
-
-    expect(queryClient.getQueryData(queryKey)).toEqual({
-      cwd,
-      files: [],
-      error: null,
-      requestId: `subscription:${subscriptionId}`,
-    });
-
-    unsubscribeObserver();
-
-    expect(fake.unsubscribeCheckoutDiffCalls).toEqual([subscriptionId]);
-
-    unmount();
-  });
-
-  it("does not retry failed subscriptions on unrelated cache events", async () => {
-    const queryClient = new QueryClient();
-    const fake = createFakeClient({ rejectCheckoutDiffSubscribe: true });
-    const serverId = "server-1";
-    const cwd = "/repo";
-    const queryKey = checkoutDiffQueryKey(serverId, cwd, "base", "main", true);
-    const subscriptionId = `checkoutDiff:${JSON.stringify(queryKey)}`;
-    const observer = new QueryObserver(queryClient, {
-      queryKey,
-      queryFn: skipToken,
-      enabled: true,
-      gcTime: Infinity,
-      staleTime: Infinity,
-      meta: checkoutDiffPushRoute({
-        enabled: true,
-        serverId,
-        subscriptionId,
-        cwd,
-        compare: { mode: "base", baseRef: "main", ignoreWhitespace: true },
-      }),
-    });
-    const unsubscribeObserver = observer.subscribe(() => undefined);
-    const unmount = mountServerDataPushRouter({ client: fake.client, queryClient, serverId });
-
-    expect(fake.subscribeCheckoutDiffCalls).toHaveLength(1);
-
-    await Promise.resolve();
-    await Promise.resolve();
-
-    queryClient.setQueryData(["unrelated"], "value");
-
-    expect(fake.subscribeCheckoutDiffCalls).toHaveLength(1);
-
-    unsubscribeObserver();
-    unmount();
-  });
-
-  it("subscribes active terminal queries and filters terminal pushes by workspace", () => {
-    const queryClient = new QueryClient();
-    const fake = createFakeClient();
-    const serverId = "server-1";
-    const cwd = "/repo";
-    const workspaceId = "workspace-a";
-    const queryKey = buildTerminalsQueryKey(serverId, cwd, workspaceId);
-    const observer = new QueryObserver(queryClient, {
-      queryKey,
-      queryFn: skipToken,
-      enabled: true,
-      gcTime: Infinity,
-      staleTime: Infinity,
-      meta: workspaceTerminalsPushRoute({
-        enabled: true,
-        serverId,
-        cwd,
-        workspaceId,
-      }),
-    });
-    const unsubscribeObserver = observer.subscribe(() => undefined);
-    const unmount = mountServerDataPushRouter({ client: fake.client, queryClient, serverId });
-
-    expect(fake.subscribeTerminalCalls).toEqual([{ cwd, workspaceId }]);
-
-    fake.emit({
-      type: "terminals_changed",
-      payload: {
-        cwd,
-        terminals: [
-          { id: "terminal-a", name: "Main", workspaceId },
-          { id: "terminal-b", name: "Sibling", workspaceId: "workspace-b" },
-        ],
-      },
-    });
-
-    expect(queryClient.getQueryData(queryKey)).toEqual({
-      cwd,
-      terminals: [{ id: "terminal-a", name: "Main", workspaceId }],
-      requestId: expect.stringMatching(/^terminals-changed-/),
-    });
-
-    unsubscribeObserver();
-
-    expect(fake.unsubscribeTerminalCalls).toEqual([{ cwd, workspaceId }]);
-
-    unmount();
-  });
-
-  it("re-sends active push subscriptions after reconnect", () => {
-    const queryClient = new QueryClient();
-    const fake = createFakeClient();
-    const serverId = "server-1";
-    const cwd = "/repo";
-    const workspaceId = "workspace-a";
-    const checkoutDiffKey = checkoutDiffQueryKey(serverId, cwd, "base", "main", true);
-    const checkoutDiffSubscriptionId = `checkoutDiff:${JSON.stringify(checkoutDiffKey)}`;
-    const terminalKey = buildTerminalsQueryKey(serverId, cwd, workspaceId);
-    const checkoutDiffObserver = new QueryObserver(queryClient, {
-      queryKey: checkoutDiffKey,
-      queryFn: skipToken,
-      enabled: true,
-      gcTime: Infinity,
-      staleTime: Infinity,
-      meta: checkoutDiffPushRoute({
-        enabled: true,
-        serverId,
-        subscriptionId: checkoutDiffSubscriptionId,
-        cwd,
-        compare: { mode: "base", baseRef: "main", ignoreWhitespace: true },
-      }),
-    });
-    const terminalObserver = new QueryObserver(queryClient, {
-      queryKey: terminalKey,
-      queryFn: skipToken,
-      enabled: true,
-      gcTime: Infinity,
-      staleTime: Infinity,
-      meta: workspaceTerminalsPushRoute({
-        enabled: true,
-        serverId,
-        cwd,
-        workspaceId,
-      }),
-    });
-    const unsubscribeCheckoutDiffObserver = checkoutDiffObserver.subscribe(() => undefined);
-    const unsubscribeTerminalObserver = terminalObserver.subscribe(() => undefined);
-    const unmount = mountServerDataPushRouter({ client: fake.client, queryClient, serverId });
-    const plainCheckoutDiffObserver = new QueryObserver(queryClient, {
-      queryKey: checkoutDiffKey,
-      queryFn: skipToken,
-      enabled: true,
-      gcTime: Infinity,
-      staleTime: Infinity,
-    });
-    const plainTerminalObserver = new QueryObserver(queryClient, {
-      queryKey: terminalKey,
-      queryFn: skipToken,
-      enabled: true,
-      gcTime: Infinity,
-      staleTime: Infinity,
-    });
-    const unsubscribePlainCheckoutDiffObserver = plainCheckoutDiffObserver.subscribe(
-      () => undefined,
-    );
-    const unsubscribePlainTerminalObserver = plainTerminalObserver.subscribe(() => undefined);
-
-    invalidateServerDataQueriesAfterReconnect({ queryClient, serverId });
-
-    expect(fake.subscribeCheckoutDiffCalls).toEqual([
-      {
-        cwd,
-        compare: { mode: "base", baseRef: "main", ignoreWhitespace: true },
-        subscriptionId: checkoutDiffSubscriptionId,
-      },
-      {
-        cwd,
-        compare: { mode: "base", baseRef: "main", ignoreWhitespace: true },
-        subscriptionId: checkoutDiffSubscriptionId,
-      },
-    ]);
-    expect(fake.subscribeTerminalCalls).toEqual([
-      { cwd, workspaceId },
-      { cwd, workspaceId },
-    ]);
-
-    fake.emit({
-      type: "terminals_changed",
-      payload: {
-        cwd,
-        terminals: [
-          { id: "terminal-a", name: "Main", workspaceId },
-          { id: "terminal-b", name: "Sibling", workspaceId: "workspace-b" },
-        ],
-      },
-    });
-
-    expect(queryClient.getQueryData(terminalKey)).toEqual({
-      cwd,
-      terminals: [{ id: "terminal-a", name: "Main", workspaceId }],
-      requestId: expect.stringMatching(/^terminals-changed-/),
-    });
-
-    unsubscribePlainCheckoutDiffObserver();
-    unsubscribePlainTerminalObserver();
-    unsubscribeCheckoutDiffObserver();
-    unsubscribeTerminalObserver();
-    unmount();
-  });
-
-  it("routes terminal pushes after another observer attaches without push metadata", () => {
-    const queryClient = new QueryClient();
-    const fake = createFakeClient();
-    const serverId = "server-1";
-    const cwd = "/repo";
-    const workspaceId = "workspace-a";
-    const queryKey = buildTerminalsQueryKey(serverId, cwd, workspaceId);
-    const pushObserver = new QueryObserver(queryClient, {
-      queryKey,
-      queryFn: skipToken,
-      enabled: true,
-      gcTime: Infinity,
-      staleTime: Infinity,
-      meta: workspaceTerminalsPushRoute({
-        enabled: true,
-        serverId,
-        cwd,
-        workspaceId,
-      }),
-    });
-    const unsubscribePushObserver = pushObserver.subscribe(() => undefined);
-    const unmount = mountServerDataPushRouter({ client: fake.client, queryClient, serverId });
-    expect(fake.subscribeTerminalCalls).toEqual([{ cwd, workspaceId }]);
-
-    const plainObserver = new QueryObserver(queryClient, {
-      queryKey,
-      queryFn: skipToken,
-      enabled: true,
-      gcTime: Infinity,
-      staleTime: Infinity,
-    });
-    const unsubscribePlainObserver = plainObserver.subscribe(() => undefined);
-
-    fake.emit({
-      type: "terminals_changed",
-      payload: {
-        cwd,
-        terminals: [
-          {
-            id: "terminal-a",
-            name: "Main",
-            workspaceId,
-            activity: { state: "idle", attentionReason: "needs_input", changedAt: 1 },
-          },
-        ],
-      },
-    });
-
-    expect(queryClient.getQueryData(queryKey)).toEqual({
-      cwd,
-      terminals: [
-        {
-          id: "terminal-a",
-          name: "Main",
-          workspaceId,
-          activity: { state: "idle", attentionReason: "needs_input", changedAt: 1 },
-        },
-      ],
-      requestId: expect.stringMatching(/^terminals-changed-/),
-    });
-    expect(fake.unsubscribeTerminalCalls).toEqual([]);
-
-    unsubscribePlainObserver();
-    unsubscribePushObserver();
-    unmount();
-  });
-
-  it("invalidates only the reconnect-repair scopes for one server", () => {
-    const queryClient = new QueryClient();
-    const serverId = "server-1";
-    const otherServerId = "server-2";
-    const providerKey = providersSnapshotQueryKey(serverId);
-    const daemonConfigKey = daemonConfigQueryKey(serverId);
-    const diffKey = checkoutDiffQueryKey(serverId, "/repo", "uncommitted", undefined, false);
-    const terminalKey = buildTerminalsQueryKey(serverId, "/repo", "workspace-a");
-    const otherProviderKey = providersSnapshotQueryKey(otherServerId);
-
-    queryClient.setQueryData(providerKey, { entries: [], generatedAt: "now", requestId: "p" });
-    queryClient.setQueryData(daemonConfigKey, daemonConfig);
-    queryClient.setQueryData(diffKey, { cwd: "/repo", files: [], error: null, requestId: "d" });
-    queryClient.setQueryData(terminalKey, { cwd: "/repo", terminals: [], requestId: "t" });
-    queryClient.setQueryData(otherProviderKey, {
-      entries: [],
-      generatedAt: "now",
-      requestId: "other",
-    });
-
-    invalidateServerDataQueriesAfterReconnect({ queryClient, serverId });
-
-    expect(queryClient.getQueryState(providerKey)?.isInvalidated).toBe(true);
-    expect(queryClient.getQueryState(daemonConfigKey)?.isInvalidated).toBe(true);
-    expect(queryClient.getQueryState(diffKey)?.isInvalidated).toBe(true);
-    expect(queryClient.getQueryState(terminalKey)?.isInvalidated).toBe(true);
-    expect(queryClient.getQueryState(otherProviderKey)?.isInvalidated).toBe(false);
-  });
-});

packages/app/src/data/push-router.ts

@@ -1,754 +0,0 @@
-import type { Query, QueryCacheNotifyEvent, QueryClient, QueryKey } from "@tanstack/react-query";
-import type {
-  ListTerminalsResponse,
-  MutableDaemonConfig,
-  SessionOutboundMessage,
-} from "@getpaseo/protocol/messages";
-import { agentCommandsQueryRoot } from "@/hooks/agent-commands-query";
-import { orderCheckoutDiffFiles } from "@/git/diff-order";
-import { daemonConfigQueryKey } from "@/data/daemon-config";
-import { providersSnapshotQueryKey, providersSnapshotQueryRoot } from "@/data/providers-snapshot";
-
-type ProvidersSnapshotUpdateMessage = Extract<
-  SessionOutboundMessage,
-  { type: "providers_snapshot_update" }
->;
-type CheckoutDiffUpdateMessage = Extract<SessionOutboundMessage, { type: "checkout_diff_update" }>;
-type SubscribeCheckoutDiffResponseMessage = Extract<
-  SessionOutboundMessage,
-  { type: "subscribe_checkout_diff_response" }
->;
-type StatusMessage = Extract<SessionOutboundMessage, { type: "status" }>;
-type TerminalsChangedMessage = Extract<SessionOutboundMessage, { type: "terminals_changed" }>;
-type ServerDataEventType =
-  | "providers_snapshot_update"
-  | "checkout_diff_update"
-  | "subscribe_checkout_diff_response"
-  | "status"
-  | "terminals_changed";
-type CheckoutDiffResponsePayload = SubscribeCheckoutDiffResponseMessage["payload"];
-type CheckoutDiffCachePayload = Omit<CheckoutDiffResponsePayload, "subscriptionId">;
-type ListTerminalsPayload = ListTerminalsResponse["payload"];
-
-interface CheckoutDiffCompare {
-  mode: "uncommitted" | "base";
-  baseRef?: string;
-  ignoreWhitespace?: boolean;
-}
-
-interface CheckoutDiffRoute {
-  domain: "checkoutDiff";
-  enabled: boolean;
-  serverId: string;
-  subscriptionId: string;
-  cwd: string;
-  compare: CheckoutDiffCompare;
-}
-
-interface WorkspaceTerminalsRoute {
-  domain: "workspaceTerminals";
-  enabled: boolean;
-  serverId: string;
-  cwd: string;
-  workspaceId?: string;
-}
-
-type ServerDataRoute = CheckoutDiffRoute | WorkspaceTerminalsRoute;
-
-export interface ServerDataQueryMeta extends Record<string, unknown> {
-  serverData: ServerDataRoute;
-}
-
-export type ProvidersSnapshotUpdate = ProvidersSnapshotUpdateMessage;
-
-interface ServerDataPushClient {
-  on<TType extends ServerDataEventType>(
-    type: TType,
-    handler: (message: Extract<SessionOutboundMessage, { type: TType }>) => void,
-  ): () => void;
-  subscribeCheckoutDiff(
-    cwd: string,
-    compare: CheckoutDiffCompare,
-    options: { subscriptionId: string; requestId?: string },
-  ): Promise<CheckoutDiffResponsePayload>;
-  unsubscribeCheckoutDiff(subscriptionId: string): void;
-  subscribeTerminals(input: { cwd: string; workspaceId?: string }): void;
-  unsubscribeTerminals(input: { cwd: string; workspaceId?: string }): void;
-}
-
-interface PushRouterInput {
-  client: ServerDataPushClient;
-  queryClient: QueryClient;
-  serverId: string;
-}
-
-interface ActiveServerDataSubscriptions {
-  checkoutDiff: Map<string, CheckoutDiffRoute>;
-  workspaceTerminals: Map<string, WorkspaceTerminalsRoute>;
-}
-
-interface ReconnectRepairPolicy {
-  domain: string;
-  invalidate(input: { queryClient: QueryClient; serverId: string }): void;
-}
-
-const RECONNECT_REPAIR_POLICIES: ReconnectRepairPolicy[] = [
-  {
-    domain: "providersSnapshot",
-    invalidate: ({ queryClient, serverId }) => {
-      void queryClient.invalidateQueries({ queryKey: providersSnapshotQueryRoot(serverId) });
-    },
-  },
-  {
-    domain: "daemonConfig",
-    invalidate: ({ queryClient, serverId }) => {
-      void queryClient.invalidateQueries({ queryKey: daemonConfigQueryKey(serverId) });
-    },
-  },
-  {
-    domain: "checkoutDiff",
-    invalidate: ({ queryClient, serverId }) => {
-      void queryClient.invalidateQueries({
-        predicate: (query) => isQueryForServer(query.queryKey, "checkoutDiff", serverId),
-      });
-    },
-  },
-  {
-    domain: "workspaceTerminals",
-    invalidate: ({ queryClient, serverId }) => {
-      void queryClient.invalidateQueries({
-        predicate: (query) => isQueryForServer(query.queryKey, "terminals", serverId),
-      });
-    },
-  },
-];
-const reconnectSubscriptionRepairsByServerId = new Map<string, Set<() => void>>();
-
-export function checkoutDiffPushRoute(input: {
-  enabled: boolean;
-  serverId: string;
-  subscriptionId: string;
-  cwd: string;
-  compare: CheckoutDiffCompare;
-}): ServerDataQueryMeta {
-  return {
-    serverData: {
-      domain: "checkoutDiff",
-      enabled: input.enabled,
-      serverId: input.serverId,
-      subscriptionId: input.subscriptionId,
-      cwd: input.cwd,
-      compare: input.compare,
-    },
-  };
-}
-
-export function workspaceTerminalsPushRoute(input: {
-  enabled: boolean;
-  serverId: string;
-  cwd: string;
-  workspaceId?: string;
-}): ServerDataQueryMeta {
-  return {
-    serverData: {
-      domain: "workspaceTerminals",
-      enabled: input.enabled,
-      serverId: input.serverId,
-      cwd: input.cwd,
-      ...(input.workspaceId ? { workspaceId: input.workspaceId } : {}),
-    },
-  };
-}
-
-export function invalidateServerDataQueriesAfterReconnect(input: {
-  queryClient: QueryClient;
-  serverId: string;
-}): void {
-  for (const policy of RECONNECT_REPAIR_POLICIES) {
-    policy.invalidate(input);
-  }
-  for (const repairSubscriptions of reconnectSubscriptionRepairsByServerId.get(input.serverId) ??
-    []) {
-    repairSubscriptions();
-  }
-}
-
-export function applyProvidersSnapshotUpdate(input: {
-  serverId: string;
-  queryClient: QueryClient;
-  message: ProvidersSnapshotUpdate;
-}): void {
-  if (input.message.type !== "providers_snapshot_update") {
-    return;
-  }
-  const queryKey = providersSnapshotQueryKey(input.serverId, input.message.payload.cwd);
-  input.queryClient.setQueryData(queryKey, {
-    entries: input.message.payload.entries,
-    generatedAt: input.message.payload.generatedAt,
-    requestId: "providers_snapshot_update",
-  });
-  void input.queryClient.invalidateQueries({
-    queryKey: agentCommandsQueryRoot(input.serverId),
-    exact: false,
-  });
-}
-
-export function mountServerDataPushRouter(input: PushRouterInput): () => void {
-  const activeCheckoutDiffSubscriptions = new Map<string, CheckoutDiffRoute>();
-  const activeTerminalSubscriptions = new Map<string, WorkspaceTerminalsRoute>();
-  let disposed = false;
-
-  function reconcileSubscriptions(
-    fallbackActive: ActiveServerDataSubscriptions = {
-      checkoutDiff: activeCheckoutDiffSubscriptions,
-      workspaceTerminals: activeTerminalSubscriptions,
-    },
-  ): void {
-    if (disposed) {
-      return;
-    }
-
-    const desiredCheckoutDiffSubscriptions = new Map<string, CheckoutDiffRoute>();
-    const desiredTerminalSubscriptions = new Map<string, WorkspaceTerminalsRoute>();
-    for (const query of input.queryClient.getQueryCache().getAll()) {
-      const route = getActiveServerDataRoute(query, input.serverId, {
-        checkoutDiff: fallbackActive.checkoutDiff,
-        workspaceTerminals: fallbackActive.workspaceTerminals,
-      });
-      if (!route) {
-        continue;
-      }
-      if (route.domain === "checkoutDiff") {
-        desiredCheckoutDiffSubscriptions.set(route.subscriptionId, route);
-        continue;
-      }
-      desiredTerminalSubscriptions.set(workspaceTerminalSubscriptionKey(route), route);
-    }
-
-    reconcileCheckoutDiffSubscriptions({
-      active: activeCheckoutDiffSubscriptions,
-      client: input.client,
-      desired: desiredCheckoutDiffSubscriptions,
-      serverId: input.serverId,
-    });
-    reconcileTerminalSubscriptions({
-      active: activeTerminalSubscriptions,
-      client: input.client,
-      desired: desiredTerminalSubscriptions,
-    });
-  }
-
-  function resetSubscriptionsAfterReconnect(): void {
-    const fallbackActive = {
-      checkoutDiff: new Map(activeCheckoutDiffSubscriptions),
-      workspaceTerminals: new Map(activeTerminalSubscriptions),
-    };
-    activeCheckoutDiffSubscriptions.clear();
-    activeTerminalSubscriptions.clear();
-    reconcileSubscriptions(fallbackActive);
-  }
-
-  const unsubscribeQueryCache = input.queryClient.getQueryCache().subscribe((event) => {
-    if (
-      !shouldReconcileSubscriptionsForCacheEvent(event, input.serverId, {
-        checkoutDiff: activeCheckoutDiffSubscriptions,
-        workspaceTerminals: activeTerminalSubscriptions,
-      })
-    ) {
-      return;
-    }
-    reconcileSubscriptions();
-  });
-  const unsubscribeProviders = input.client.on("providers_snapshot_update", (message) => {
-    applyProvidersSnapshotUpdate({
-      queryClient: input.queryClient,
-      serverId: input.serverId,
-      message,
-    });
-  });
-  const unsubscribeDaemonConfig = input.client.on("status", (message) => {
-    applyDaemonConfigStatus({ queryClient: input.queryClient, serverId: input.serverId, message });
-  });
-  const unsubscribeCheckoutDiffUpdate = input.client.on("checkout_diff_update", (message) => {
-    applyCheckoutDiffUpdate({
-      activeCheckoutDiffSubscriptions,
-      queryClient: input.queryClient,
-      serverId: input.serverId,
-      message,
-    });
-  });
-  const unsubscribeCheckoutDiffResponse = input.client.on(
-    "subscribe_checkout_diff_response",
-    (message) => {
-      applyCheckoutDiffSubscribeResponse({
-        activeCheckoutDiffSubscriptions,
-        queryClient: input.queryClient,
-        serverId: input.serverId,
-        message,
-      });
-    },
-  );
-  const unsubscribeTerminalsChanged = input.client.on("terminals_changed", (message) => {
-    applyTerminalsChanged({
-      activeCheckoutDiffSubscriptions,
-      activeTerminalSubscriptions,
-      queryClient: input.queryClient,
-      serverId: input.serverId,
-      message,
-    });
-  });
-  let reconnectSubscriptionRepairs = reconnectSubscriptionRepairsByServerId.get(input.serverId);
-  if (!reconnectSubscriptionRepairs) {
-    reconnectSubscriptionRepairs = new Set();
-    reconnectSubscriptionRepairsByServerId.set(input.serverId, reconnectSubscriptionRepairs);
-  }
-  reconnectSubscriptionRepairs.add(resetSubscriptionsAfterReconnect);
-
-  reconcileSubscriptions();
-
-  return () => {
-    disposed = true;
-    reconnectSubscriptionRepairs.delete(resetSubscriptionsAfterReconnect);
-    if (reconnectSubscriptionRepairs.size === 0) {
-      reconnectSubscriptionRepairsByServerId.delete(input.serverId);
-    }
-    unsubscribeQueryCache();
-    unsubscribeProviders();
-    unsubscribeDaemonConfig();
-    unsubscribeCheckoutDiffUpdate();
-    unsubscribeCheckoutDiffResponse();
-    unsubscribeTerminalsChanged();
-    for (const subscriptionId of activeCheckoutDiffSubscriptions.keys()) {
-      unsubscribeCheckoutDiff(input.client, subscriptionId);
-    }
-    activeCheckoutDiffSubscriptions.clear();
-    for (const route of activeTerminalSubscriptions.values()) {
-      input.client.unsubscribeTerminals(workspaceTerminalSubscriptionInput(route));
-    }
-    activeTerminalSubscriptions.clear();
-  };
-}
-
-function reconcileCheckoutDiffSubscriptions(input: {
-  active: Map<string, CheckoutDiffRoute>;
-  client: ServerDataPushClient;
-  desired: Map<string, CheckoutDiffRoute>;
-  serverId: string;
-}): void {
-  for (const [subscriptionId, current] of input.active) {
-    const desired = input.desired.get(subscriptionId);
-    if (desired && areCheckoutDiffRoutesEqual(current, desired)) {
-      continue;
-    }
-    unsubscribeCheckoutDiff(input.client, subscriptionId);
-    input.active.delete(subscriptionId);
-  }
-
-  for (const [subscriptionId, desired] of input.desired) {
-    if (input.active.has(subscriptionId)) {
-      continue;
-    }
-    input.active.set(subscriptionId, desired);
-    void input.client
-      .subscribeCheckoutDiff(desired.cwd, desired.compare, {
-        subscriptionId,
-        requestId: `push-router:${input.serverId}:${subscriptionId}`,
-      })
-      .catch((error) => {
-        if (areCheckoutDiffRoutesEqual(input.active.get(subscriptionId), desired)) {
-          input.active.delete(subscriptionId);
-        }
-        console.error("[server-data] subscribeCheckoutDiff failed", {
-          serverId: input.serverId,
-          cwd: desired.cwd,
-          error,
-        });
-      });
-  }
-}
-
-function reconcileTerminalSubscriptions(input: {
-  active: Map<string, WorkspaceTerminalsRoute>;
-  client: ServerDataPushClient;
-  desired: Map<string, WorkspaceTerminalsRoute>;
-}): void {
-  for (const [key, current] of input.active) {
-    const desired = input.desired.get(key);
-    if (desired && areWorkspaceTerminalsRoutesEqual(current, desired)) {
-      continue;
-    }
-    input.client.unsubscribeTerminals(workspaceTerminalSubscriptionInput(current));
-    input.active.delete(key);
-  }
-
-  for (const [key, desired] of input.desired) {
-    if (input.active.has(key)) {
-      continue;
-    }
-    input.active.set(key, desired);
-    input.client.subscribeTerminals(workspaceTerminalSubscriptionInput(desired));
-  }
-}
-
-function applyDaemonConfigStatus(input: {
-  queryClient: QueryClient;
-  serverId: string;
-  message: StatusMessage;
-}): void {
-  const payload = input.message.payload;
-  if (!isDaemonConfigChangedPayload(payload)) {
-    return;
-  }
-  input.queryClient.setQueryData<MutableDaemonConfig>(
-    daemonConfigQueryKey(input.serverId),
-    payload.config,
-  );
-}
-
-function applyCheckoutDiffUpdate(input: {
-  activeCheckoutDiffSubscriptions: Map<string, CheckoutDiffRoute>;
-  queryClient: QueryClient;
-  serverId: string;
-  message: CheckoutDiffUpdateMessage;
-}): void {
-  setCheckoutDiffPayload({
-    activeCheckoutDiffSubscriptions: input.activeCheckoutDiffSubscriptions,
-    queryClient: input.queryClient,
-    serverId: input.serverId,
-    subscriptionId: input.message.payload.subscriptionId,
-    payload: {
-      cwd: input.message.payload.cwd,
-      files: orderCheckoutDiffFiles(input.message.payload.files),
-      error: input.message.payload.error,
-      requestId: `subscription:${input.message.payload.subscriptionId}`,
-    },
-  });
-}
-
-function applyCheckoutDiffSubscribeResponse(input: {
-  activeCheckoutDiffSubscriptions: Map<string, CheckoutDiffRoute>;
-  queryClient: QueryClient;
-  serverId: string;
-  message: SubscribeCheckoutDiffResponseMessage;
-}): void {
-  setCheckoutDiffPayload({
-    activeCheckoutDiffSubscriptions: input.activeCheckoutDiffSubscriptions,
-    queryClient: input.queryClient,
-    serverId: input.serverId,
-    subscriptionId: input.message.payload.subscriptionId,
-    payload: {
-      cwd: input.message.payload.cwd,
-      files: orderCheckoutDiffFiles(input.message.payload.files),
-      error: input.message.payload.error,
-      requestId: input.message.payload.requestId,
-    },
-  });
-}
-
-function setCheckoutDiffPayload(input: {
-  activeCheckoutDiffSubscriptions: Map<string, CheckoutDiffRoute>;
-  queryClient: QueryClient;
-  serverId: string;
-  subscriptionId: string;
-  payload: CheckoutDiffCachePayload;
-}): void {
-  for (const query of input.queryClient.getQueryCache().getAll()) {
-    const route =
-      getServerDataRoute(query) ??
-      getActiveCheckoutDiffRouteForQueryKey({
-        active: input.activeCheckoutDiffSubscriptions,
-        queryKey: query.queryKey,
-        serverId: input.serverId,
-      });
-    if (
-      !route ||
-      route.domain !== "checkoutDiff" ||
-      route.serverId !== input.serverId ||
-      route.subscriptionId !== input.subscriptionId
-    ) {
-      continue;
-    }
-    input.queryClient.setQueryData<CheckoutDiffCachePayload>(query.queryKey, input.payload);
-  }
-}
-
-function applyTerminalsChanged(input: {
-  activeCheckoutDiffSubscriptions: Map<string, CheckoutDiffRoute>;
-  activeTerminalSubscriptions: Map<string, WorkspaceTerminalsRoute>;
-  queryClient: QueryClient;
-  serverId: string;
-  message: TerminalsChangedMessage;
-}): void {
-  for (const query of input.queryClient.getQueryCache().getAll()) {
-    const route = getActiveServerDataRoute(query, input.serverId, {
-      checkoutDiff: input.activeCheckoutDiffSubscriptions,
-      workspaceTerminals: input.activeTerminalSubscriptions,
-    });
-    if (
-      !route ||
-      route.domain !== "workspaceTerminals" ||
-      route.cwd !== input.message.payload.cwd
-    ) {
-      continue;
-    }
-
-    const matchingTerminals = input.message.payload.terminals.filter(
-      (terminal) => terminal.workspaceId === route.workspaceId,
-    );
-
-    input.queryClient.setQueryData<ListTerminalsPayload>(query.queryKey, (current) => ({
-      cwd: input.message.payload.cwd,
-      terminals: matchingTerminals,
-      requestId: current?.requestId ?? `terminals-changed-${Date.now()}`,
-    }));
-  }
-}
-
-function getActiveServerDataRoute(
-  query: Query,
-  serverId: string,
-  active: ActiveServerDataSubscriptions,
-): ServerDataRoute | null {
-  if (query.getObserversCount() === 0) {
-    return null;
-  }
-  const route = getServerDataRoute(query);
-  if (route) {
-    return route.enabled && route.serverId === serverId ? route : null;
-  }
-  return getActiveRouteForQueryKey({
-    active,
-    queryKey: query.queryKey,
-    serverId,
-  });
-}
-
-function getActiveRouteForQueryKey(input: {
-  active: ActiveServerDataSubscriptions;
-  queryKey: QueryKey;
-  serverId: string;
-}): ServerDataRoute | null {
-  return (
-    getActiveTerminalRouteForQueryKey({
-      active: input.active.workspaceTerminals,
-      queryKey: input.queryKey,
-      serverId: input.serverId,
-    }) ??
-    getActiveCheckoutDiffRouteForQueryKey({
-      active: input.active.checkoutDiff,
-      queryKey: input.queryKey,
-      serverId: input.serverId,
-    })
-  );
-}
-
-function getActiveTerminalRouteForQueryKey(input: {
-  active: Map<string, WorkspaceTerminalsRoute>;
-  queryKey: QueryKey;
-  serverId: string;
-}): WorkspaceTerminalsRoute | null {
-  if (!isQueryForServer(input.queryKey, "terminals", input.serverId)) {
-    return null;
-  }
-  const cwd = input.queryKey[2];
-  const workspaceId = input.queryKey[3];
-  if (
-    typeof cwd !== "string" ||
-    (workspaceId !== undefined && workspaceId !== null && typeof workspaceId !== "string")
-  ) {
-    return null;
-  }
-  return input.active.get(`${cwd}\u0000${workspaceId ?? ""}`) ?? null;
-}
-
-function getActiveCheckoutDiffRouteForQueryKey(input: {
-  active: Map<string, CheckoutDiffRoute>;
-  queryKey: QueryKey;
-  serverId: string;
-}): CheckoutDiffRoute | null {
-  if (!isQueryForServer(input.queryKey, "checkoutDiff", input.serverId)) {
-    return null;
-  }
-  for (const route of input.active.values()) {
-    if (isCheckoutDiffQueryKeyForRoute(input.queryKey, route)) {
-      return route;
-    }
-  }
-  return null;
-}
-
-function shouldReconcileSubscriptionsForCacheEvent(
-  event: QueryCacheNotifyEvent,
-  serverId: string,
-  active: ActiveServerDataSubscriptions,
-): boolean {
-  if (!canEventChangeDesiredSubscriptions(event.type)) {
-    return false;
-  }
-  const route = getServerDataRoute(event.query);
-  if (route?.serverId === serverId) {
-    return true;
-  }
-  return (
-    getActiveRouteForQueryKey({
-      active,
-      queryKey: event.query.queryKey,
-      serverId,
-    }) !== null
-  );
-}
-
-function canEventChangeDesiredSubscriptions(type: QueryCacheNotifyEvent["type"]): boolean {
-  return (
-    type === "added" ||
-    type === "removed" ||
-    type === "observerAdded" ||
-    type === "observerRemoved" ||
-    type === "observerOptionsUpdated"
-  );
-}
-
-function getServerDataRoute(query: Query): ServerDataRoute | null {
-  const meta = query.meta;
-  if (!isRecord(meta) || !isRecord(meta.serverData)) {
-    return null;
-  }
-  return readServerDataRoute(meta.serverData);
-}
-
-function readServerDataRoute(value: Record<string, unknown>): ServerDataRoute | null {
-  const domain = value.domain;
-  const enabled = value.enabled;
-  const serverId = value.serverId;
-  const cwd = value.cwd;
-  if (typeof enabled !== "boolean" || typeof serverId !== "string" || typeof cwd !== "string") {
-    return null;
-  }
-
-  if (domain === "checkoutDiff") {
-    const subscriptionId = value.subscriptionId;
-    const compare = readCheckoutDiffCompare(value.compare);
-    if (typeof subscriptionId !== "string" || !compare) {
-      return null;
-    }
-    return {
-      domain,
-      enabled,
-      serverId,
-      subscriptionId,
-      cwd,
-      compare,
-    };
-  }
-
-  if (domain === "workspaceTerminals") {
-    const workspaceId = value.workspaceId;
-    if (workspaceId !== undefined && typeof workspaceId !== "string") {
-      return null;
-    }
-    return {
-      domain,
-      enabled,
-      serverId,
-      cwd,
-      ...(workspaceId ? { workspaceId } : {}),
-    };
-  }
-
-  return null;
-}
-
-function readCheckoutDiffCompare(value: unknown): CheckoutDiffCompare | null {
-  if (!isRecord(value)) {
-    return null;
-  }
-  const mode = value.mode;
-  const baseRef = value.baseRef;
-  const ignoreWhitespace = value.ignoreWhitespace;
-  if (mode !== "uncommitted" && mode !== "base") {
-    return null;
-  }
-  if (baseRef !== undefined && typeof baseRef !== "string") {
-    return null;
-  }
-  if (ignoreWhitespace !== undefined && typeof ignoreWhitespace !== "boolean") {
-    return null;
-  }
-  return {
-    mode,
-    ...(baseRef ? { baseRef } : {}),
-    ...(ignoreWhitespace !== undefined ? { ignoreWhitespace } : {}),
-  };
-}
-
-function areCheckoutDiffRoutesEqual(
-  left: CheckoutDiffRoute | undefined,
-  right: CheckoutDiffRoute,
-): boolean {
-  return (
-    left?.serverId === right.serverId &&
-    left.subscriptionId === right.subscriptionId &&
-    left.cwd === right.cwd &&
-    left.compare.mode === right.compare.mode &&
-    left.compare.baseRef === right.compare.baseRef &&
-    left.compare.ignoreWhitespace === right.compare.ignoreWhitespace
-  );
-}
-
-function isCheckoutDiffQueryKeyForRoute(queryKey: QueryKey, route: CheckoutDiffRoute): boolean {
-  return (
-    queryKey[0] === "checkoutDiff" &&
-    queryKey[1] === route.serverId &&
-    queryKey[2] === route.cwd &&
-    queryKey[3] === route.compare.mode &&
-    queryKey[4] === (route.compare.baseRef ?? "") &&
-    queryKey[5] === (route.compare.ignoreWhitespace === true)
-  );
-}
-
-function areWorkspaceTerminalsRoutesEqual(
-  left: WorkspaceTerminalsRoute,
-  right: WorkspaceTerminalsRoute,
-): boolean {
-  return (
-    left.serverId === right.serverId &&
-    left.cwd === right.cwd &&
-    left.workspaceId === right.workspaceId
-  );
-}
-
-function workspaceTerminalSubscriptionKey(route: WorkspaceTerminalsRoute): string {
-  return `${route.cwd}\u0000${route.workspaceId ?? ""}`;
-}
-
-function workspaceTerminalSubscriptionInput(route: WorkspaceTerminalsRoute): {
-  cwd: string;
-  workspaceId?: string;
-} {
-  return {
-    cwd: route.cwd,
-    ...(route.workspaceId ? { workspaceId: route.workspaceId } : {}),
-  };
-}
-
-function unsubscribeCheckoutDiff(client: ServerDataPushClient, subscriptionId: string): void {
-  try {
-    client.unsubscribeCheckoutDiff(subscriptionId);
-  } catch {
-    // Disconnect cleanup can race with explicit subscription teardown.
-  }
-}
-
-function isQueryForServer(queryKey: QueryKey, kind: string, serverId: string): boolean {
-  return queryKey.length >= 2 && queryKey[0] === kind && queryKey[1] === serverId;
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null;
-}
-
-function isDaemonConfigChangedPayload(
-  payload: StatusMessage["payload"],
-): payload is { status: "daemon_config_changed"; config: MutableDaemonConfig } {
-  return payload.status === "daemon_config_changed" && isRecord(payload.config);
-}

packages/app/src/data/query.ts

@@ -1,106 +0,0 @@
-import {
-  keepPreviousData,
-  skipToken,
-  useQuery,
-  type QueryKey,
-  type UseQueryOptions,
-  type UseQueryResult,
-} from "@tanstack/react-query";
-
-type QueryFnOption<TQueryFnData, TError, TData, TQueryKey extends QueryKey> = NonNullable<
-  UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>["queryFn"]
->;
-
-type ReplicaQueryInput<TQueryFnData, TError, TData, TQueryKey extends QueryKey> = Omit<
-  UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-  | "gcTime"
-  | "initialData"
-  | "refetchOnMount"
-  | "refetchOnReconnect"
-  | "refetchOnWindowFocus"
-  | "staleTime"
-> & {
-  pushEvent: string;
-};
-
-type FetchQueryInput<TQueryFnData, TError, TData, TQueryKey extends QueryKey> = Omit<
-  UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-  "initialData" | "placeholderData" | "queryFn" | "refetchOnMount" | "staleTime"
-> & {
-  dataShape: "list" | "value";
-  queryFn: QueryFnOption<TQueryFnData, TError, TData, TQueryKey>;
-  staleTimeMs: number;
-};
-
-export function useReplicaQuery<
-  TQueryFnData,
-  TError = Error,
-  TData = TQueryFnData,
-  TQueryKey extends QueryKey = QueryKey,
->(input: ReplicaQueryInput<TQueryFnData, TError, TData, TQueryKey>): UseQueryResult<TData, TError> {
-  return useQuery(replicaQueryOptions(input));
-}
-
-export function useFetchQuery<
-  TQueryFnData,
-  TError = Error,
-  TData = TQueryFnData,
-  TQueryKey extends QueryKey = QueryKey,
->(input: FetchQueryInput<TQueryFnData, TError, TData, TQueryKey>): UseQueryResult<TData, TError> {
-  return useQuery(fetchQueryOptions(input));
-}
-
-function replicaQueryOptions<
-  TQueryFnData,
-  TError = Error,
-  TData = TQueryFnData,
-  TQueryKey extends QueryKey = QueryKey,
->(
-  input: ReplicaQueryInput<TQueryFnData, TError, TData, TQueryKey>,
-): UseQueryOptions<TQueryFnData, TError, TData, TQueryKey> {
-  const { pushEvent, meta, ...options } = input;
-  return {
-    ...options,
-    gcTime: Infinity,
-    meta: {
-      ...meta,
-      serverDataPolicy: {
-        class: "replica",
-        pushEvent,
-      },
-    },
-    queryFn: options.queryFn ?? skipToken,
-    refetchOnMount: false,
-    refetchOnReconnect: false,
-    refetchOnWindowFocus: false,
-    staleTime: Infinity,
-  };
-}
-
-function fetchQueryOptions<
-  TQueryFnData,
-  TError = Error,
-  TData = TQueryFnData,
-  TQueryKey extends QueryKey = QueryKey,
->(
-  input: FetchQueryInput<TQueryFnData, TError, TData, TQueryKey>,
-): UseQueryOptions<TQueryFnData, TError, TData, TQueryKey> {
-  if (!Number.isFinite(input.staleTimeMs)) {
-    throw new Error("Fetch queries must declare a finite staleTimeMs.");
-  }
-
-  const { dataShape, meta, staleTimeMs, ...options } = input;
-  return {
-    ...options,
-    ...(dataShape === "list" ? { placeholderData: keepPreviousData } : {}),
-    meta: {
-      ...meta,
-      serverDataPolicy: {
-        class: "fetch",
-        dataShape,
-      },
-    },
-    refetchOnMount: "always",
-    staleTime: staleTimeMs,
-  };
-}

packages/app/src/desktop/daemon/desktop-daemon.ts

@@ -28,11 +28,6 @@ export interface DesktopDaemonLogs {
   contents: string;
 }
 
-export interface DesktopAppLogs {
-  logPath: string;
-  contents: string;
-}
-
 export interface DesktopPairingOffer {
   relayEnabled: boolean;
   url: string | null;
@@ -149,17 +144,6 @@ export async function getDesktopDaemonLogs(): Promise<DesktopDaemonLogs> {
   return parseDesktopDaemonLogs(await invokeDesktopCommand("desktop_daemon_logs"));
 }
 
-export async function getDesktopAppLogs(): Promise<DesktopAppLogs> {
-  const raw = await invokeDesktopCommand("desktop_app_logs");
-  if (!isRecord(raw)) {
-    throw new Error("Unexpected desktop app logs response.");
-  }
-  return {
-    logPath: toStringOrNull(raw.logPath) ?? "",
-    contents: typeof raw.contents === "string" ? raw.contents : "",
-  };
-}
-
 export async function getDesktopDaemonPairing(): Promise<DesktopPairingOffer> {
   return parseDesktopPairingOffer(await invokeDesktopCommand("desktop_daemon_pairing"));
 }

packages/app/src/desktop/hooks/use-built-in-daemon-management.ts

@@ -34,7 +34,6 @@ interface UseBuiltInDaemonManagementInput {
 interface UseBuiltInDaemonManagementResult {
   isUpdating: boolean;
   toggle: () => void;
-  enable: () => Promise<DaemonManagementToggleResult | null>;
 }
 
 export function useBuiltInDaemonManagement(
@@ -43,16 +42,12 @@ export function useBuiltInDaemonManagement(
   const { t } = useTranslation();
   const { daemonStatus, settings, updateSettings, setStatus, refreshStatus } = input;
   const reportError = useDesktopIpcErrorReporter();
-  const {
+  const { mutate: toggleDaemonManagement, isPending: isUpdating } = useMutation<
-    mutate: toggleDaemonManagement,
+    DaemonManagementToggleResult,
-    mutateAsync: toggleDaemonManagementAsync,
+    Error
-    isPending: isUpdating,
+  >({
-  } = useMutation<DaemonManagementToggleResult, Error, { forceEnable: boolean }>({
+    mutationFn: async () => {
-    mutationFn: async ({ forceEnable }) => {
+      const wasManagingDaemon = settings.manageBuiltInDaemon;
-      // forceEnable takes the enable branch regardless of the persisted
-      // setting — the recovery affordance must never reach the stop/confirm
-      // path even if manageBuiltInDaemon was left true.
-      const wasManagingDaemon = forceEnable ? false : settings.manageBuiltInDaemon;
       try {
         const result = await executeDaemonManagementToggle(wasManagingDaemon, daemonStatus, {
           confirm: () =>
@@ -114,21 +109,8 @@ export function useBuiltInDaemonManagement(
       return;
     }
 
-    toggleDaemonManagement({ forceEnable: false });
+    toggleDaemonManagement();
   }, [isUpdating, toggleDaemonManagement]);
 
-  const enable = useCallback(async () => {
+  return { isUpdating, toggle };
-    if (isUpdating) {
-      return null;
-    }
-
-    try {
-      return await toggleDaemonManagementAsync({ forceEnable: true });
-    } catch {
-      // onError has already surfaced the failure; callers only act on success.
-      return null;
-    }
-  }, [isUpdating, toggleDaemonManagementAsync]);
-
-  return { isUpdating, toggle, enable };
 }

packages/app/src/desktop/hooks/use-enable-built-in-daemon-option.ts

@@ -1,46 +0,0 @@
-import { useCallback } from "react";
-import { router } from "expo-router";
-import { getIsElectron } from "@/constants/platform";
-import { useLocalDaemonServerIdState } from "@/hooks/use-is-local-daemon";
-import { useHosts } from "@/runtime/host-runtime";
-import { useDesktopSettings } from "@/desktop/settings/desktop-settings";
-import { useDaemonStatus } from "@/desktop/hooks/use-daemon-status";
-import { useBuiltInDaemonManagement } from "@/desktop/hooks/use-built-in-daemon-management";
-import { buildSettingsHostSectionRoute } from "@/utils/host-routes";
-
-export interface EnableBuiltInDaemonOption {
-  visible: boolean;
-  onPress: () => void;
-}
-
-export function useEnableBuiltInDaemonOption(): EnableBuiltInDaemonOption {
-  const isElectron = getIsElectron();
-  const localDaemon = useLocalDaemonServerIdState();
-  const hosts = useHosts();
-  const { settings, updateSettings } = useDesktopSettings();
-  const { data, setStatus, refetch } = useDaemonStatus();
-  const { enable } = useBuiltInDaemonManagement({
-    daemonStatus: data?.status ?? null,
-    settings: settings.daemon,
-    updateSettings: (updates) => updateSettings({ daemon: updates }),
-    setStatus,
-    refreshStatus: refetch,
-  });
-
-  const isLocalhostConfigured =
-    localDaemon.status === "resolved" &&
-    localDaemon.serverId !== null &&
-    hosts.some((host) => host.serverId === localDaemon.serverId);
-  const visible = isElectron && localDaemon.status === "resolved" && !isLocalhostConfigured;
-
-  const onPress = useCallback(() => {
-    void (async () => {
-      const result = await enable();
-      if (result?.kind === "enabled") {
-        router.push(buildSettingsHostSectionRoute(result.newStatus.serverId, "host"));
-      }
-    })();
-  }, [enable]);
-
-  return { visible, onPress };
-}

packages/app/src/desktop/host.ts

@@ -1,15 +1,5 @@
 import { Platform } from "react-native";
 import { getElectronHost } from "@/desktop/electron/host";
-import type { SessionInboundMessage, SessionOutboundMessage } from "@getpaseo/protocol/messages";
-
-type BrowserAutomationExecuteRequest = Extract<
-  SessionOutboundMessage,
-  { type: "browser.automation.execute.request" }
->;
-type BrowserAutomationExecuteResponse = Extract<
-  SessionInboundMessage,
-  { type: "browser.automation.execute.response" }
->;
 
 export type DesktopNotificationPermission = "granted" | "denied" | "default";
 
@@ -127,24 +117,9 @@ export interface DesktopBrowserNewTabRequestEvent {
 }
 
 export interface DesktopBrowserBridge {
-  registerWorkspaceBrowser?: (input: { browserId: string; workspaceId: string }) => Promise<void>;
+  setWorkspaceActiveBrowser?: (browserId: string | null) => Promise<void>;
-  unregisterWorkspaceBrowser?: (browserId: string) => Promise<void>;
-  setWorkspaceActiveBrowser?: (input: {
-    workspaceId: string;
-    browserId: string | null;
-  }) => Promise<void>;
   openDevTools?: (browserId: string) => Promise<unknown>;
   clearPartition?: (browserId: string) => Promise<void>;
-  executeAutomationCommand?: (
-    request: BrowserAutomationExecuteRequest,
-  ) => Promise<BrowserAutomationExecuteResponse["payload"]>;
-  /** Capture a PNG screenshot of the guest viewport cropped to `rect`. */
-  captureElement?: (
-    browserId: string,
-    rect: { x: number; y: number; width: number; height: number },
-  ) => Promise<string | null>;
-  /** Copy element text and/or an image to the system clipboard from main. */
-  copyElement?: (payload: { text?: string; imageDataUrl?: string }) => Promise<boolean>;
 }
 
 export interface DesktopInvokeBridge {

packages/app/src/diagnostics/app-diagnostic-report.test.ts

@@ -82,7 +82,6 @@ describe("app diagnostics report", () => {
     const host = makeHost();
     const redacted = redactAppDiagnosticReport(
       [
-        "Desktop app log tail",
         "secret.example.test:6767",
         "relay.secret.test:443",
         "daemon-public-key-secret",

packages/app/src/diagnostics/desktop-diagnostic-report.test.ts

@@ -1,93 +0,0 @@
-import { describe, expect, test } from "vitest";
-import {
-  collectDesktopDiagnosticSections,
-  type DesktopDiagnosticSources,
-} from "./desktop-diagnostic-report";
-
-function makeSources(): DesktopDiagnosticSources {
-  return {
-    getStatus: async () => ({
-      serverId: "server-1",
-      status: "running",
-      listen: "127.0.0.1:6767",
-      hostname: "host",
-      pid: 4242,
-      home: "/paseo/home",
-      version: "1.2.3",
-      desktopManaged: true,
-      error: null,
-    }),
-    getDaemonLogs: async () => ({
-      logPath: "/paseo/home/daemon.log",
-      contents: "daemon line one\ndaemon line two",
-    }),
-    getAppLogs: async () => ({
-      logPath: "/logs/Paseo/main.log",
-      contents: "[login-shell-env] start\n[login-shell-env] failed",
-    }),
-  };
-}
-
-describe("desktop diagnostic report", () => {
-  test("starts desktop diagnostic requests together", async () => {
-    const calls: string[] = [];
-    let releaseAppLogs: () => void = () => {};
-    const appLogGate = new Promise<void>((resolve) => {
-      releaseAppLogs = resolve;
-    });
-    const sources: DesktopDiagnosticSources = {
-      ...makeSources(),
-      getStatus: async () => {
-        calls.push("status");
-        return makeSources().getStatus();
-      },
-      getDaemonLogs: async () => {
-        calls.push("daemonLogs");
-        return makeSources().getDaemonLogs();
-      },
-      getAppLogs: async () => {
-        calls.push("appLogs");
-        await appLogGate;
-        return makeSources().getAppLogs();
-      },
-    };
-
-    const resultPromise = collectDesktopDiagnosticSections(sources);
-
-    expect(calls).toEqual(["status", "daemonLogs", "appLogs"]);
-    releaseAppLogs();
-    await expect(resultPromise).resolves.toMatchObject({ status: "done" });
-  });
-
-  test("includes the Electron main-process log after the daemon log", async () => {
-    const result = await collectDesktopDiagnosticSections(makeSources());
-    const report = result.sections.join("\n\n");
-
-    expect(result.status).toBe("done");
-    expect(report).toContain("  Log path: /paseo/home/daemon.log");
-    expect(report).toContain("  App log path: /logs/Paseo/main.log");
-    expect(report).toContain("Desktop daemon log tail\n  daemon line one\n  daemon line two");
-    expect(report).toContain(
-      "Desktop app log tail\n  [login-shell-env] start\n  [login-shell-env] failed",
-    );
-    expect(report.indexOf("Desktop app log tail")).toBeGreaterThan(
-      report.indexOf("Desktop daemon log tail"),
-    );
-  });
-
-  test("keeps daemon diagnostics when the Electron app log fails", async () => {
-    const sources = {
-      ...makeSources(),
-      getAppLogs: async () => {
-        throw new Error("app log unavailable");
-      },
-    };
-
-    const result = await collectDesktopDiagnosticSections(sources);
-    const report = result.sections.join("\n\n");
-
-    expect(result.status).toBe("failed");
-    expect(report).toContain("Desktop daemon log tail\n  daemon line one\n  daemon line two");
-    expect(report).toContain("Desktop app log tail\n  Error: app log unavailable");
-  });
-});

packages/app/src/diagnostics/desktop-diagnostic-report.ts

@@ -1,106 +0,0 @@
-import {
-  getDesktopAppLogs,
-  getDesktopDaemonLogs,
-  getDesktopDaemonStatus,
-  type DesktopAppLogs,
-  type DesktopDaemonLogs,
-  type DesktopDaemonStatus,
-} from "@/desktop/daemon/desktop-daemon";
-import { formatDiagnosticSection } from "./app-diagnostic-report";
-
-type DesktopDiagnosticStatus = "done" | "failed";
-
-export interface DesktopDiagnosticCollectionResult {
-  sections: string[];
-  status: DesktopDiagnosticStatus;
-}
-
-export interface DesktopDiagnosticSources {
-  getStatus: () => Promise<DesktopDaemonStatus>;
-  getDaemonLogs: () => Promise<DesktopDaemonLogs>;
-  getAppLogs: () => Promise<DesktopAppLogs>;
-}
-
-const DEFAULT_DESKTOP_DIAGNOSTIC_SOURCES: DesktopDiagnosticSources = {
-  getStatus: getDesktopDaemonStatus,
-  getDaemonLogs: getDesktopDaemonLogs,
-  getAppLogs: getDesktopAppLogs,
-};
-
-export async function collectDesktopDiagnosticSections(
-  sources: DesktopDiagnosticSources = DEFAULT_DESKTOP_DIAGNOSTIC_SOURCES,
-): Promise<DesktopDiagnosticCollectionResult> {
-  const sections: string[] = [];
-  let failed = false;
-
-  const [daemonResult, appLogsResult] = await Promise.allSettled([
-    Promise.all([sources.getStatus(), sources.getDaemonLogs()]),
-    sources.getAppLogs(),
-  ]);
-
-  if (daemonResult.status === "fulfilled") {
-    const [status, daemonLogs] = daemonResult.value;
-    const appLogs = appLogsResult.status === "fulfilled" ? appLogsResult.value : null;
-    sections.unshift(...formatDesktopDaemonSections({ status, daemonLogs, appLogs }));
-  } else {
-    failed = true;
-    sections.unshift(
-      formatDiagnosticSection("Desktop", [
-        { label: "Error", value: toMessage(daemonResult.reason) },
-      ]),
-    );
-  }
-
-  if (appLogsResult.status === "fulfilled") {
-    sections.push(formatLogTailSection("Desktop app log tail", appLogsResult.value.contents));
-  } else {
-    failed = true;
-    sections.push(
-      formatDiagnosticSection("Desktop app log tail", [
-        { label: "Error", value: toMessage(appLogsResult.reason) },
-      ]),
-    );
-  }
-
-  return {
-    status: failed ? "failed" : "done",
-    sections,
-  };
-}
-
-function formatDesktopDaemonSections(input: {
-  status: DesktopDaemonStatus;
-  daemonLogs: DesktopDaemonLogs;
-  appLogs: DesktopAppLogs | null;
-}): string[] {
-  const { status, daemonLogs, appLogs } = input;
-  return [
-    formatDiagnosticSection("Desktop", [
-      { label: "Daemon status", value: status.status },
-      { label: "Desktop managed", value: String(status.desktopManaged) },
-      { label: "Daemon PID", value: status.pid === null ? "none" : String(status.pid) },
-      { label: "Daemon version", value: status.version ?? "unknown" },
-      { label: "Daemon home", value: status.home || "unknown" },
-      { label: "Log path", value: daemonLogs.logPath || "unknown" },
-      { label: "App log path", value: appLogs?.logPath || "unavailable" },
-      { label: "Error", value: status.error ?? "none" },
-    ]),
-    formatLogTailSection("Desktop daemon log tail", daemonLogs.contents),
-  ];
-}
-
-function formatLogTailSection(title: string, contents: string): string {
-  return [title, contents ? indentBlock(contents) : "  No log lines found"].join("\n");
-}
-
-function indentBlock(value: string): string {
-  return value
-    .split("\n")
-    .filter(Boolean)
-    .map((line) => `  ${line}`)
-    .join("\n");
-}
-
-function toMessage(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
-}

packages/app/src/git/actions-store.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { queryClient as appQueryClient } from "@/data/query-client";
+import { queryClient as appQueryClient } from "@/query/query-client";
 import { useSessionStore } from "@/stores/session-store";
 import type { WorkspaceDescriptor } from "@/stores/session-store";
 import {

packages/app/src/git/actions-store.ts

@@ -1,7 +1,7 @@
 import type { QueryKey } from "@tanstack/react-query";
 import type { CheckoutPrMergeMethod } from "@getpaseo/protocol/messages";
 import { create } from "zustand";
-import { queryClient as appQueryClient } from "@/data/query-client";
+import { queryClient as appQueryClient } from "@/query/query-client";
 import {
   buildWorkspaceTabPersistenceKey,
   useWorkspaceLayoutStore,