fix(paseo-agent): polish provider settings UI

Keep provider instance keys stable for credentials and model addressing while allowing display-name edits.
feat(paseo-agent): add browser OAuth start mode
2026-10-28 04:03:05 +00:00 · 2026-07-02 15:15:37 +02:00 · 2026-07-02 14:51:26 +02:00 · 2026-07-02 14:48:32 +02:00 · 2026-07-02 13:57:12 +02:00 · 2026-07-02 13:31:48 +02:00
367 changed files with 28286 additions and 33555 deletions
@@ -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
@@ -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
@@ -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

@@ -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:-${package_version}}"
+          install_version="${INPUT_PASEO_VERSION:-latest}"
          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: .
-          file: docker/base/Dockerfile
+          context: ${{ needs.setup.outputs.source_build == 'true' && '.' || 'docker/base' }}
+          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: .
-          file: docker/base/Dockerfile
+          context: ${{ needs.setup.outputs.source_build == 'true' && '.' || 'docker/base' }}
+          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 }}
@@ -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/
@@ -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": {
@@ -1,42 +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
@@ -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                                                                                                                   |
-| ------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------ |
-| [docs/product.md](docs/product.md)                                 | What Paseo is, who it's for, where it's going                                                                                  |
-| [docs/architecture.md](docs/architecture.md)                       | System design, package layering, WebSocket protocol, agent lifecycle, data flow                                                |
-| [docs/agent-lifecycle.md](docs/agent-lifecycle.md)                 | Agent states, parent/child relationships, archive semantics, tabs vs archive, subagents track                                  |
-| [docs/data-model.md](docs/data-model.md)                           | File-based JSON persistence, Zod schemas, atomic writes, no migrations                                                         |
-| [docs/glossary.md](docs/glossary.md)                               | Authoritative terminology — UI label wins, no synonyms                                                                         |
-| [docs/coding-standards.md](docs/coding-standards.md)               | Type hygiene, error handling, state design, React patterns, file organization                                                  |
-| [docs/design.md](docs/design.md)                                   | Theme tokens — colors, fonts, spacing, radii, icons                                                                            |
-| [docs/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/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/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/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/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/rpc-namespacing.md](docs/rpc-namespacing.md)                 | WebSocket RPC naming convention — dotted namespaces and `.request`/`.response` pairs                                           |
-| [docs/protocol-validation.md](docs/protocol-validation.md)         | zod-aot generated inbound WebSocket validation, patched compiler regressions, schema-purity rules                              |
-| [docs/terminal-performance.md](docs/terminal-performance.md)       | Terminal latency pipeline, coalescing/backpressure invariants, benchmark + perf spec usage                                     |
-| [docs/testing.md](docs/testing.md)                                 | TDD workflow, determinism, real dependencies over mocks, test organization                                                     |
-| [docs/mobile-testing.md](docs/mobile-testing.md)                   | Maestro and mobile test workflows                                                                                              |
-| [docs/ad-hoc-daemon-testing.md](docs/ad-hoc-daemon-testing.md)     | Isolated in-process daemon test harness                                                                                        |
-| [docs/browser-capture-harness.md](docs/browser-capture-harness.md) | Real-Electron browser screenshot harness and compositor-surface gotcha                                                         |
-| [docs/android.md](docs/android.md)                                 | App variants, local/cloud builds, EAS workflows                                                                                |
-| [docs/docker.md](docs/docker.md)                                   | Running the daemon and bundled web UI in Docker, volumes, agent images, security                                               |
-| [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                                                                  |
+| Doc                                                            | What's in it                                                                                                                   |
+| -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
+| [docs/product.md](docs/product.md)                             | What Paseo is, who it's for, where it's going                                                                                  |
+| [docs/architecture.md](docs/architecture.md)                   | System design, package layering, WebSocket protocol, agent lifecycle, data flow                                                |
+| [docs/agent-lifecycle.md](docs/agent-lifecycle.md)             | Agent states, parent/child relationships, archive semantics, tabs vs archive, subagents track                                  |
+| [docs/data-model.md](docs/data-model.md)                       | File-based JSON persistence, Zod schemas, atomic writes, no migrations                                                         |
+| [docs/glossary.md](docs/glossary.md)                           | Authoritative terminology — UI label wins, no synonyms                                                                         |
+| [docs/coding-standards.md](docs/coding-standards.md)           | Type hygiene, error handling, state design, React patterns, file organization                                                  |
+| [docs/design.md](docs/design.md)                               | Theme tokens — colors, fonts, spacing, radii, icons                                                                            |
+| [docs/hover.md](docs/hover.md)                                 | Hover — the canonical pattern (plain View + onPointerEnter/Leave, separate inner Pressable) and the three ways agents break it |
+| [docs/unistyles.md](docs/unistyles.md)                         | Unistyles gotchas — `useUnistyles()` is forbidden, alternatives in order                                                       |
+| [docs/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/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/service-proxy.md](docs/service-proxy.md)                 | Service proxy: exposing workspace scripts at public URLs, DNS setup, reverse proxy config                                      |
+| [docs/paseo-agent.md](docs/paseo-agent.md)                     | Paseo Agent provider (id `paseo`): model-provider catalog, generic config, OAuth store, CLI/app setup                          |
+| [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/terminal-performance.md](docs/terminal-performance.md)   | Terminal latency pipeline, coalescing/backpressure invariants, benchmark + perf spec usage                                     |
+| [docs/testing.md](docs/testing.md)                             | TDD workflow, determinism, real dependencies over mocks, test organization                                                     |
+| [docs/mobile-testing.md](docs/mobile-testing.md)               | Maestro and mobile test workflows                                                                                              |
+| [docs/ad-hoc-daemon-testing.md](docs/ad-hoc-daemon-testing.md) | Isolated in-process daemon test harness                                                                                        |
+| [docs/android.md](docs/android.md)                             | App variants, local/cloud builds, EAS workflows                                                                                |
+| [docs/docker.md](docs/docker.md)                               | Running the daemon and bundled web UI in Docker, volumes, agent images, security                                               |
+| [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.
@@ -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; \
-    rm -rf /tmp/paseo-packs; \
+    npm install -g --omit=optional \
+      "@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
@@ -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"]
@@ -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.** Browser webviews are tracked by one process-global registry that keeps a single current `WebContents` per browser id. Human focus and agent automation targets are intentionally separate: the workspace-active browser follows the user's focused tab, while the agent-active browser is the default target for browser MCP commands. 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.

 ### `packages/website` — Marketing site

@@ -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.
@@ -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
@@ -173,33 +173,11 @@ 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
-
-Measure the MCP `tools/list` payload that Paseo injects into agents with:
-
-```bash
-npm run measure:agent-tools --workspace=@getpaseo/server
-```
-
-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": {
@@ -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
-from the checked-out source tree and publishes only the exact prerelease image
-tag for prerelease versions.
+Manual Docker publishes require an explicit `paseo_version`. Prerelease
+versions build from the checked-out source tree by default and publish only the
+exact prerelease image tag.

 The published image is multi-arch for `linux/amd64` and `linux/arm64`.

@@ -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
@@ -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).
@@ -6,7 +6,7 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Workspace** — One concrete `cwd` on one daemon, with git state; belongs to exactly one project. Its `id` is opaque workspace identity; its `cwd` is the filesystem directory. UI: "Workspace". Code: `WorkspaceDescriptorPayload` (`packages/protocol/src/messages.ts:2178`). Don't confuse with: Branch (one branch can back many workspaces via worktrees). Forbidden: "Folder", "Directory" as UI label.
 - **Workspace kind** — `"directory" | "local_checkout" | "worktree"`. The git-derived, persisted property of a workspace, used across its lifetime (archive safety, sidebar, grouping). Derived from the cwd's git reality (`deriveWorkspaceKind`, `packages/server/src/server/workspace-registry-model.ts:158`), not stored from a user choice. Code: `PersistedWorkspaceKind` (`packages/server/src/server/workspace-registry-model.ts:8`). Don't confuse with **Isolation** (the create-time intent).
 - **Isolation** — Create-time choice for a new workspace: reuse the existing checkout (**Local**) or cut a dedicated git worktree (**New worktree**). A transient setup input, also remembered as a create-form preference; it is not a workspace property. UI: "Isolation" control on the New Workspace screen. Code: `isolation` (`"local" | "worktree"`), `useWorkspaceIsolation` (`packages/app/src/screens/new-workspace-screen.tsx`); persisted as `FormPreferences.isolation` (`packages/app/src/create-agent-preferences/preferences.ts`). Distinct from **Workspace kind**, which is the git-derived property the intent produces (Local → `local_checkout` or `directory` by git-ness; New worktree → `worktree`). On the wire it is the create request's `source.kind` (`directory | worktree`, `packages/protocol/src/messages.ts:1693`).
- **Agent** — See **Agent session**. UI still says "Agent" / "New Agent" in places, but moving toward **Agent session** as the canonical term. Code: `AgentSnapshotPayload` (`packages/protocol/src/messages.ts:608`). Forbidden: "Task", "Job", "Run".
+- **Agent** — A runnable identity the user picks to start work: today that is an **Agent provider** (Claude Code, Codex, Paseo Agent); direction: also a named **Agent definition** (`reviewer`) that pins provider, model, prompt, and tools. One CLI namespace: `paseo run --agent <id>` resolves agent provider ids first, then agent definition ids. The running instance is an **Agent session** — "New Agent" starts a new agent session. Forbidden: "Task", "Job", "Run".
 - **Daemon** — Local Paseo server process; identified by `serverId`. UI: "Daemon" (system contexts only). Code: `serverId` in `ServerInfoStatusPayloadSchema` (`packages/protocol/src/messages.ts:1936`), `DaemonClient` (`packages/client/src/daemon-client.ts`).
 - **Host** — Client-side connection profile pointing at a daemon; bundles one or more `HostConnection`s. UI: "Host" / "Add host" / "Switch host". Code: `HostProfile` (`packages/app/src/types/host-connection.ts:37`). Forbidden: "Connection" (means `HostConnection`, not host).
 - **Project host entry** — One row in a project for a single (project, daemon) pair, aggregating that daemon's workspaces in the project. Internal. Code: `ProjectHostEntry` (`packages/app/src/utils/projects.ts:11`). Don't introduce "Checkout" as a synonym.
@@ -17,11 +17,13 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Directory-backed surface** — A right-sidebar surface whose content is determined by the workspace's `cwd`, so two workspaces on the same directory see identical content: git diff/status, GitHub PR info, file preview/explorer contents. Keyed by `(serverId, cwd)`, never `workspaceId`. See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
 - **Workspace-owned state** — Per-workspace state that never leaks to a same-`cwd` sibling: tabs, agents, terminals, panes, title, plus review drafts, diff-mode overrides, composer attachments, and file-explorer open/expand state. Keyed by `workspaceId` (`cwd` only as a fallback for old payloads). See [architecture.md](architecture.md#right-sidebar-boundary-directory-backed-vs-workspace-owned).
 - **Workspace status bucket** — Aggregate activity signal for a workspace row. Same-`cwd` workspaces intentionally share agent and terminal status buckets, while tab, agent, and terminal visibility remains scoped by `workspaceId`.
- **Agent session** — One running instance of an agent inside a workspace (one provider, one model, one cwd, one timeline). The conceptual unit; in the UI this opens as a tab. Moving toward this as the canonical term over "Agent". Code: `AgentSnapshotPayload` (`packages/protocol/src/messages.ts:608`).
+- **Agent session** — One running instance of an agent inside a workspace (one agent provider, one model, one cwd, one timeline). The conceptual unit; in the UI this opens as a tab. Canonical term for the running instance (bare "Agent" is the identity being run, see **Agent**). Code: `AgentSnapshotPayload` (`packages/protocol/src/messages.ts:608`).
+- **Agent definition** — A Paseo-owned markdown persona in `$PASEO_HOME/agents/*.md`: frontmatter `name`, `prompt`, `model`, `tools`, `permissions`; body is the prompt. Selected via `agents.paseo.defaultAgent` (`defaultProfile` is a legacy alias). Direction: definitions join the `--agent` namespace (`paseo run --agent reviewer`), so a definition id must not shadow an agent provider id. Code: `loadAgentDefinition` (`packages/server/src/server/agent/providers/paseo-agent/prompt-profiles.ts:62`), config keys (`packages/server/src/server/agent/providers/paseo-agent/config.ts:174`). Forbidden: "Profile", "Prompt profile" as synonyms.
 - **Session** — Two senses: (a) per-client connection to a daemon, internal; (b) user-facing agent session, see **Agent session**. Code: `Session` (`packages/server/src/server/session.ts`) for (a). Don't confuse with: provider-side agent session log.
 - **Profile** — Internal name for the persisted shape of a host. Code: `HostProfile` (`packages/app/src/types/host-connection.ts:37`). Never user-facing.
- **Provider** — Agent backend (Claude Code, Codex, Copilot, OpenCode, Pi, OMP). UI: "Provider". Code: `ProviderSnapshotEntry` (`packages/protocol/src/messages.ts:198`).
- **Model** — A specific LLM offered by a provider. UI: "Model" / "Select model". Code: `AgentModelDefinition` (`packages/protocol/src/messages.ts:187`).
+- **Agent provider** — The harness/backend that runs agents (Claude Code, Codex, Copilot, OpenCode, Pi, OMP, Paseo Agent with id `paseo`). UI: "Agent provider" (target label; surfaces still saying bare "Provider" migrate as touched). Wire and config keep `provider` — labels move, the protocol does not. Code: `AgentProvider` (`packages/protocol/src/agent-types.ts:3`), `ProviderSnapshotEntrySchema` (`packages/protocol/src/messages.ts:262`). Don't confuse with: **Model provider**. Forbidden: bare "Provider" as a new UI label — always qualify which layer.
+- **Model provider** — A model API attached to the Paseo Agent provider: a type (`openrouter`, `openai`, `anthropic`, `openai-codex`, …) plus key/OAuth and models, keyed by instance name (`openrouter-main`, `chatgpt`). UI: "Model providers" (Paseo Agent settings). CLI: `paseo provider add` — the CLI `provider` noun means model provider. Config: `agents.paseo.providers` (`packages/server/src/server/agent/providers/paseo-agent/config.ts:169`); wire: `PaseoAgentProviderTypeSchema` (`packages/protocol/src/messages.ts:1924`). Don't confuse with: **Agent provider**. Forbidden: "Inference provider" (old docs term), bare "Provider" as a new UI label.
+- **Model** — A specific LLM offered by a provider; for the Paseo Agent provider, addressed as `<modelProviderName>/<modelId>`. UI: "Model" / "Select model". Code: `AgentModelDefinition` (`packages/protocol/src/messages.ts:187`).
 - **Tab** — UI surface representing one session inside a workspace. Not a conceptual unit; use **Agent session** when talking about the model. Code: `WorkspaceTabDescriptor` (`packages/app/src/screens/workspace/workspace-tabs-types.ts`).
 - **Terminal** — Workspace-scoped PTY shell streamed over the binary mux channel. UI: "Terminal". Code: `TerminalStreamFrame` (`packages/protocol/src/terminal-stream-protocol.ts`).
 - **Schedule** — Cron-style trigger that creates new agents. UI: CLI/MCP (`paseo schedule`, `create_schedule`). Don't confuse with: Heartbeat (cron prompt back into the same agent) or Loop (iterative re-execution of one agent).
@@ -39,5 +41,8 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here

 ## Inconsistencies (documented, not papered over)

+- Bare "Provider" survives as a UI label in the provider picker and settings; target is "Agent provider" / "Model providers" per the entries above. Migrate labels as surfaces are touched — no big-bang rename.
+- CLI `paseo provider` describes itself as "Manage agent providers" (`packages/cli/src/commands/provider/index.ts:11`) but manages **model providers**. Fix the description; keep the noun.
+- CLI `paseo run --provider <id>` selects an agent provider. Direction: add `--agent <id>` as the canonical flag resolving one namespace (agent provider ids, then agent definition ids), keep `--provider` as a COMPAT alias.
 - CLI `--host <host>` description `"Daemon host target"` (`packages/cli/src/utils/command-options.ts:5`) blurs daemon/host; the app keeps them distinct.
 - `WorkspaceDescriptorPayloadSchema.workspaceKind` accepts legacy `"checkout"` on the wire (`packages/protocol/src/messages.ts:2187`) while `PersistedWorkspaceKind` does not (`packages/server/src/server/workspace-registry-model.ts:8`).
@@ -0,0 +1,351 @@
+# Paseo Agent provider
+
+Paseo Agent is the built-in agent provider that runs Pi's coding-agent harness **in
+process** (no `pi` CLI, no `~/.pi` discovery). Its provider id is **`paseo`** and its
+model backends are configured under `agents.paseo` in `$PASEO_HOME/config.json`.
+
+Use it like any other agent provider:
+
+```bash
+paseo run --provider paseo --model <providerInstance>/<modelId> "Reply with pong"
+```
+
+Example: `--model openrouter/openai/gpt-4o-mini` selects the `openrouter` provider
+instance and the `openai/gpt-4o-mini` model exposed by that instance.
+
+> Smoke note: the daemon supervisor runs from `packages/server/dist`. After changing
+> provider/config code, run `npm run build:server` (or run a source/dev daemon) before
+> smoking, otherwise stale `dist` may reject or omit `agents.paseo` behavior. Always pass
+> `--host <addr>` to CLI smoke commands so they hit your isolated daemon, not the real
+> daemon on `:6767`.
+
+## Timeline and persistence
+
+Paseo Agent does not write or resume Pi CLI session files such as
+`~/.pi/agent/sessions/*`; it runs Pi's harness in process and currently reports no
+provider-owned session persistence. App refreshes and daemon-side agent reloads therefore
+depend on Paseo's own timeline rows, not on a Pi history replay. Submitted prompts must be
+emitted as `user_message` timeline rows when the turn starts; assistant text, reasoning,
+and tool calls arrive later from Pi events and are mapped into the same Paseo timeline.
+
+## Provider catalog
+
+Paseo Agent model providers are catalog-driven, but Paseo does not copy Pi's provider
+registry. `catalog.ts` is only the curated Paseo surface: catalog id, Pi provider id,
+label, icon, default-model policy, and auth hints Pi cannot infer. Pi supplies the wire
+API, base URL, headers, model ids, context windows, token limits, costs, reasoning flags,
+thinking maps, and OAuth registry data at runtime.
+
+The current catalog contains four entries:
+
+| id            | Pi provider    | default models | auth source                                   |
+| ------------- | -------------- | -------------- | --------------------------------------------- |
+| `openrouter`  | `openrouter`   | none           | Paseo hint `OPENROUTER_API_KEY`               |
+| `chatgpt`     | `openai-codex` | Pi full list   | Pi OAuth registry (`openai-codex`)            |
+| `kimi`        | `kimi-coding`  | Pi full list   | Paseo hint `KIMI_API_KEY` (Pi has no env key) |
+| `opencode-go` | `opencode-go`  | Pi full list   | Paseo hint `OPENCODE_API_KEY`                 |
+
+OpenRouter intentionally has no default model because Pi's OpenRouter registry is large.
+Users can store the OpenRouter credential first, but they must choose explicit model ids
+before running Paseo Agent through that provider. The other catalog entries expose Pi's
+bundled model list unless an instance sets `options.models`.
+
+## Config shape
+
+`agents.paseo.providers` is structurally generic. Provider instance names are free-form
+keys; provider types are catalog ids. Use the catalog id as the default instance name,
+or create several instances of the same type with different models, keys, or endpoint
+overrides.
+
+```jsonc
+{
+  "agents": {
+    "paseo": {
+      "defaultAgent": "orchestrator",
+      "defaultModel": "openrouter-main/openai/gpt-4o-mini",
+      "providers": {
+        "openrouter-main": {
+          "type": "openrouter",
+          "options": {
+            "apiKey": "$OPENROUTER_API_KEY",
+            "models": [
+              { "id": "openai/gpt-4o-mini", "label": "GPT-4o mini" },
+              { "id": "anthropic/claude-3.7-sonnet", "reasoning": true },
+            ],
+          },
+        },
+        "chatgpt": {
+          "type": "chatgpt",
+        },
+        "kimi": {
+          "type": "kimi",
+          "options": {
+            "apiKey": "$KIMI_API_KEY",
+            "models": [{ "id": "k2p7" }],
+          },
+        },
+      },
+    },
+  },
+}
+```
+
+Most options are overrides over Pi-derived provider data:
+
+- `apiKey` may be omitted for API-key providers. Omitted means "use the derived or hinted
+  env var", such as `OPENROUTER_API_KEY` or `KIMI_API_KEY`.
+- `apiKey` may also be a literal key, `$ENV`, `${ENV}`, or `!command` expression. Paseo
+  mirrors Pi's config-value semantics: literals and commands count as configured; env
+  references count only when every referenced env var is set in the daemon environment.
+- `baseUrl`, `api`, `headers`, and `authHeader` override or extend the Pi-derived request
+  config.
+- `models[]` is an instance override. Omit it to use that entry's default policy, which
+  can be an empty list for catalog entries such as OpenRouter. A model may override `api`
+  when a single backend serves mixed protocols or when Pi has no data for a custom id.
+- `refreshToken` is an advanced OAuth seed path. Prefer the OAuth store described below.
+
+Env references make config portable: `config.json` can be copied between machines while
+the secret stays in that machine's daemon environment or keychain command.
+
+`defaultModel` is optional and uses the same `<providerInstance>/<modelId>` form. An
+explicit session model wins, then the selected agent definition's model, then
+`agents.paseo.defaultModel`, then Pi's first available model.
+
+`defaultProfile` is still accepted as a legacy alias for `defaultAgent`.
+
+## Authentication
+
+API-key providers use the catalog auth metadata plus the configured `apiKey` expression.
+Redacted provider responses include an optional `auth` state:
+
+- `Connected` means the key or credential expression resolves locally. It does not make a
+  network call, so a fake literal key still reports connected until a real session uses it.
+- `Needs attention` means the instance exists but the auth expression does not currently
+  resolve, the OAuth store binding does not match, or another auth precondition is missing.
+- `not configured` is used by older/no-auth responses.
+
+The redacted provider `available` flag mirrors local credential availability. The Paseo
+Agent runtime still needs at least one exposed model before it can start a session.
+
+Secrets are not returned in catalog responses, redacted provider responses, or CLI table
+output.
+
+### OAuth store
+
+OAuth credentials live in Paseo's store, not in another tool's auth file:
+
+```text
+$PASEO_HOME/paseo-agent/auth.json
+```
+
+The store is created through Pi's `AuthStorage`. The parent directory is private and the
+file is written mode `0600`; Pi also re-chmods on write. During a Paseo Agent session,
+Pi reads the credential, refreshes expired access tokens, and persists refresh-token
+rotation back into the same Paseo-owned file.
+
+Stored OAuth credentials are bound to the provider instance's `{ flow, baseUrl }`. If the
+catalog flow or configured base URL changes, the old credential is left on disk but the
+provider reports `Needs attention` until it is authorized again. This prevents a token
+for one OAuth target from silently being used against another.
+
+The OAuth implementation uses Pi's OAuth registry. Catalog OAuth entries are limited to
+flows that registry knows about: `openai-codex`, `anthropic`, and `github-copilot`.
+The current catalog only uses `openai-codex` for `chatgpt`.
+
+## CLI setup
+
+The provider CLI talks to the selected daemon. Always pass `--host` when smoking an
+isolated daemon.
+
+Commands:
+
+- `paseo provider add [id]` configures a catalog provider. Omit `id` to choose from the
+  daemon catalog. Use `--name`, repeated/comma-separated `--model`, `--api-key-stdin`,
+  `--device-code`, `--json`, and `--host` as needed.
+- `paseo provider ls` lists configured instances and redacted auth state.
+- `paseo provider rm <name>` removes one provider instance and clears `defaultModel` if
+  it pointed at that instance.
+
+Examples:
+
+```bash
+printf '%s\n' "$OPENROUTER_API_KEY" |
+  paseo provider add \
+    openrouter \
+    --api-key-stdin \
+    --model openai/gpt-4o-mini \
+    --host 127.0.0.1:7911
+```
+
+```bash
+paseo provider add kimi \
+  --model k2p7 \
+  --host 127.0.0.1:7911
+# Press Enter at the API-key prompt to store "$KIMI_API_KEY".
+```
+
+```bash
+paseo provider add chatgpt --device-code --host 127.0.0.1:7911
+```
+
+Without an `[id]`, `provider add` prints the catalog and prompts for a selection. For
+API-key providers it writes the configured key expression into `config.json`. For OAuth
+providers it first writes the provider config, then stores the OAuth credential in the
+daemon's Paseo-owned auth store.
+
+`provider add` is idempotent for the same instance name: running it again updates the
+existing entry instead of creating a duplicate. `provider rm <name>` removes only that
+provider instance and clears `defaultModel` if it pointed at the removed instance.
+
+## App setup
+
+The app uses the same catalog and config RPCs as the CLI. In Settings, open the host
+settings, then the Paseo Agent provider section. The app fetches the catalog from the
+connected daemon, shows catalog entries in the picker, and renders either an API-key
+form or an OAuth sign-in flow from the entry's `auth.kind`. OAuth providers offer two
+daemon-run starts: browser redirect for the local fast path and device code for
+remote-safe authorization. Relay connections present device code first; direct TCP does
+not prove same-machine by itself, so both options remain available.
+
+Configured rows show the redacted provider state from the daemon: label, provider type,
+models, availability, and auth state. The app gates this UI on
+`server_info.features.paseoAgentCatalog`; older daemons show an update-host affordance
+instead of trying to synthesize the feature through older RPCs.
+
+## Wire surface
+
+The catalog surface is gated by:
+
+```text
+server_info.features.paseoAgentCatalog
+```
+
+RPC names use dotted namespaces:
+
+| request                                             | response                                             |
+| --------------------------------------------------- | ---------------------------------------------------- |
+| `config.paseo_agent.get_catalog.request`            | `config.paseo_agent.get_catalog.response`            |
+| `config.paseo_agent.get_providers.request`          | `config.paseo_agent.get_providers.response`          |
+| `config.paseo_agent.set_provider.request`           | `config.paseo_agent.set_provider.response`           |
+| `config.paseo_agent.remove_provider.request`        | `config.paseo_agent.remove_provider.response`        |
+| `config.paseo_agent.oauth.start.request`            | `config.paseo_agent.oauth.start.response`            |
+| `config.paseo_agent.oauth.complete.request`         | `config.paseo_agent.oauth.complete.response`         |
+| `config.paseo_agent.oauth.store_credential.request` | `config.paseo_agent.oauth.store_credential.response` |
+
+`oauth.start` accepts `mode?: string`; the daemon currently supports `"browser"` and
+`"device_code"`, defaulting to `"browser"` because the common app/daemon desktop path can
+complete the localhost redirect on the daemon host. Browser mode returns
+`authorization: { kind: "auth_url", url, instructions? }` as soon as the daemon callback
+listener is ready. `oauth.complete` then waits for the pending redirect flow to resolve,
+stores the credential, and returns the redacted `auth` state. Device-code mode returns
+`authorization: { kind: "device_code", userCode?, verificationUri?, intervalSeconds?,
+expiresInSeconds?, instructions? }` and uses the same `oauth.complete` response after the
+provider authorizes.
+
+Protocol strings are intentionally open. Provider ids, auth kinds, OAuth flow names,
+OAuth start modes, and wire API names are strings, not closed enums. Old clients can parse
+new catalog entries, and new clients can show "update host" only when the daemon lacks the
+catalog feature.
+
+## Adding a catalog entry
+
+Adding a new model-provider type should be a data change:
+
+1. Add one entry to `PASEO_AGENT_PROVIDER_CATALOG` in
+   `packages/server/src/server/agent/providers/paseo-agent/catalog.ts`.
+2. Set `id`, `piProvider`, `label`, and `defaultModels: false` only when the Pi provider
+   should not expose its full model list by default.
+3. Add `auth` only when Pi cannot infer the auth source or when an explicit flow hint keeps
+   resolution simple.
+4. Add or update focused tests around catalog assembly, provider resolution, auth state,
+   and CLI/app rendering if the new entry exercises a new shape.
+
+Do not add provider-specific branches in the runtime, CLI, or app. The catalog entry is
+what unlocks CLI setup, app setup, redacted provider state, config persistence, and model
+addressing.
+
+## MCP tools
+
+Paseo Agent bridges `AgentSessionConfig.mcpServers` into Pi custom tools, so the
+daemon-injected `paseo` MCP server (and any other configured MCP server) is available to
+the model. On session start the provider connects to each server, lists its tools, and
+registers them as Pi tools named `<serverName>__<toolName>`; tool input schemas (JSON
+Schema) are converted to TypeBox, calls are proxied to the MCP server, and results map
+back to the model. Connections are torn down on session close. Servers that fail to
+connect or list are logged and skipped rather than failing the session.
+
+Transports: HTTP (streamable) is the primary path (the injected `paseo` server is HTTP);
+SSE and stdio transports are also wired via the MCP SDK. No extra config is needed: MCP
+servers come from Paseo's normal injection/config, not from `agents.paseo`.
+
+The internal `paseo` MCP server is required for Paseo Agent sessions and is injected even
+when the global `mcp.injectIntoAgents` setting is disabled for other providers.
+
+## Agent definitions
+
+Paseo Agent can load a Paseo-owned agent definition from `$PASEO_HOME/agents/*.md`.
+Configure the default agent in `agents.paseo.defaultAgent`; `orchestrator` resolves
+to `$PASEO_HOME/agents/orchestrator.md`. Only top-level markdown files are selectable
+agents. Reusable partials can live anywhere under `$PASEO_HOME/agents`.
+
+```jsonc
+{
+  "agents": {
+    "paseo": {
+      "defaultAgent": "orchestrator",
+      "defaultModel": "openrouter-main/openai/gpt-4o-mini",
+      "providers": {},
+    },
+  },
+}
+```
+
+Example `$PASEO_HOME/agents/orchestrator.md`:
+
+```markdown
+---
+name: Orchestrator
+description: Coordinates work through Paseo-managed agents
+prompt: extend
+mcp: [paseo]
+model: openrouter-main/openai/gpt-4o-mini
+tools: [read, grep, paseo__list_agents, paseo__create_agent]
+permissions:
+  - tool: paseo__archive_*
+    action: deny
+---
+
+!{{./partials/collaboration.md}}
+
+Use the Paseo MCP tools to inspect active agents, create focused helper agents, and
+summarize handoffs clearly.
+
+!{{./partials/review-rules.md}}
+```
+
+`prompt: extend` keeps Pi's default base prompt and prepends the composed agent body to
+the append list. `prompt: override` uses the agent body as the custom base prompt, so
+Pi's default base prompt is skipped. In both prompt modes, per-session `systemPrompt` is
+appended after the agent, and the daemon-level append prompt is appended last.
+
+Frontmatter supports `name`, `description`, `prompt`, `mcp`, `model`, `tools`,
+`permissions`, and `projectContext`. `projectContext` is parsed for a future explicit
+project-context model, but it does not activate implicit `AGENTS.md`/`CLAUDE.md`
+discovery; Paseo Agent still keeps Pi context discovery off. `model` is an agent default:
+an explicit session model wins, then the selected agent model, then
+`agents.paseo.defaultModel`, then Pi's first available model.
+
+Partials use bang braces and expand exactly where they appear: `!{{./partials/base.md}}`.
+Paths are relative to the file containing the directive and are confined to
+`$PASEO_HOME/agents`: absolute paths, directory escapes, cycles, overly deep partial
+chains, oversized definitions, and frontmatter inside partials are rejected.
+
+`tools` is the Pi tool allowlist for the agent: it controls what the model sees and can
+call. Omit it to use Pi's default built-in tools plus bridged MCP tools. `permissions` is
+an ordered first-match policy for active tool calls. The first matching `tool` pattern
+wins; unmatched tools are allowed. Denied calls are blocked before execution through Pi's
+tool preflight hook, so the policy applies to built-in, custom, and bridged MCP tools.
+
+`mcp: [paseo]` is an expectation check, not a new injection mechanism. The normal daemon
+MCP injection still supplies the actual server; if an agent declares an MCP server that
+is not present in the session's `mcpServers`, Paseo Agent logs a warning and continues.
@@ -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
@@ -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.
@@ -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.
@@ -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
@@ -45,6 +45,7 @@ buildNpmPackage rec {

  nodejs = nodejs_22;
  inherit (paseo) npmDeps;
+  npmDepsFetcherVersion = 2;

  # Prevent onnxruntime-node's install script from running during automatic
  # npm rebuild. We manually rebuild only node-pty in buildPhase.
@@ -1 +1 @@
-sha256-G88S68t7czYE7YtBIuRdkI85+GpVKEZUMZQtcnN73BA=
+sha256-RBD8SQx4szE41qGDIYcaKWVhzfC1kVUBC7M5OOQBQQY=
@@ -52,6 +52,7 @@ buildNpmPackage rec {
  # Default hash lives in nix/npm-deps.hash (see arg default above).
  # CI auto-updates that file when package-lock.json changes (see .github/workflows/).
  inherit npmDepsHash;
+  npmDepsFetcherVersion = 2;

  # Prevent onnxruntime-node's install script from running during automatic
  # npm rebuild (it tries to download from api.nuget.org, which fails in the sandbox).
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.1.104",
+  "version": "0.1.103",
  "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",
@@ -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,
-          extraHostsKey: EXTRA_HOSTS_KEY,
-        },
+        { daemon: testDaemon, preferences: createAgentPreferences, seedNonce },
      );

      await provide();
@@ -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([]);
-}
@@ -0,0 +1,130 @@
+import type { DaemonClient as InternalDaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type { Page } from "@playwright/test";
+import { expect } from "@playwright/test";
+import { gotoAppShell, openSettings } from "./app";
+import { connectDaemonClient } from "./daemon-client-loader";
+import { getServerId } from "./server-id";
+import { openSettingsHostSection } from "./settings";
+
+type PaseoAgentDaemonClient = Pick<
+  InternalDaemonClient,
+  | "close"
+  | "connect"
+  | "removePaseoAgentProvider"
+  | "setPaseoAgentProvider"
+  | "storePaseoAgentOAuthCredential"
+>;
+
+interface ApiKeyProviderInput {
+  catalogId: string;
+  apiKey: string;
+}
+
+interface OAuthProviderInput {
+  catalogId: string;
+}
+
+interface ExpectedProvider {
+  name: string;
+  providerLabel: string;
+  auth: "Connected" | "Needs attention";
+  modelCount: number;
+}
+
+async function connectPaseoAgentClient(): Promise<PaseoAgentDaemonClient> {
+  return connectDaemonClient<PaseoAgentDaemonClient>({ clientIdPrefix: "paseo-agent-e2e" });
+}
+
+export async function openPaseoAgentSettings(page: Page): Promise<void> {
+  await gotoAppShell(page);
+  await openSettings(page);
+  await openSettingsHostSection(page, getServerId(), "providers");
+  await page.getByRole("button", { name: "Paseo Agent provider details", exact: true }).click();
+  const sheet = page.getByTestId("paseo-agent-settings-sheet");
+  await expect(sheet).toBeVisible();
+  await expect(sheet.getByText("Paseo Agent", { exact: true })).toBeVisible();
+}
+
+export async function addApiKeyProvider(page: Page, provider: ApiKeyProviderInput): Promise<void> {
+  await page.getByRole("button", { name: "Add model provider", exact: true }).click();
+  await expect(page.getByTestId("paseo-agent-provider-picker")).toBeVisible();
+  await page.getByTestId(`paseo-agent-catalog-select-${provider.catalogId}`).click();
+  await expect(page.getByTestId("paseo-agent-provider-form")).toBeVisible();
+
+  await expect(page.getByLabel("Provider name")).toHaveCount(0);
+  await expect(page.getByLabel("Models")).toHaveCount(0);
+  await page.getByLabel("API key").fill(provider.apiKey);
+  await page.getByRole("button", { name: "Save provider", exact: true }).click();
+
+  await expect(page.getByTestId("paseo-agent-provider-form")).toHaveCount(0);
+  await expect(page.getByText(provider.apiKey, { exact: true })).toHaveCount(0);
+}
+
+export async function startOAuthProviderSignIn(
+  page: Page,
+  provider: OAuthProviderInput,
+): Promise<void> {
+  await page.getByRole("button", { name: "Add model provider", exact: true }).click();
+  await expect(page.getByTestId("paseo-agent-provider-picker")).toBeVisible();
+  await page.getByTestId(`paseo-agent-catalog-select-${provider.catalogId}`).click();
+
+  await expect(page.getByTestId("paseo-agent-provider-form")).toHaveCount(0);
+  await expect(page.getByTestId("paseo-agent-oauth-sign-in")).toBeVisible();
+  await expect(page.getByLabel("Provider name")).toHaveCount(0);
+  await expect(
+    page.getByRole("button", { name: "Sign in with browser", exact: true }),
+  ).toBeVisible();
+  await page.getByRole("button", { name: "Use a code instead", exact: true }).click();
+  await expect(page.getByTestId("paseo-agent-oauth-user-code")).toBeVisible();
+  await expect(page.getByTestId("paseo-agent-oauth-verification-link")).toBeVisible();
+}
+
+export async function expectModelProviderListed(
+  page: Page,
+  expected: ExpectedProvider,
+): Promise<void> {
+  const modelLabel = expected.modelCount === 1 ? "1 model" : `${expected.modelCount} models`;
+  await expect(
+    page.getByRole("listitem", {
+      name: new RegExp(
+        `${expected.name}.*${expected.providerLabel}.*${modelLabel}.*${expected.auth}`,
+      ),
+    }),
+  ).toBeVisible();
+}
+
+export async function seedChatGptProvider(providerName: string): Promise<void> {
+  const client = await connectPaseoAgentClient();
+  try {
+    await client.setPaseoAgentProvider({
+      name: providerName,
+      providerType: "chatgpt",
+      options: {
+        models: [{ id: "gpt-5.4-mini", reasoning: true }],
+      },
+    });
+    await client.storePaseoAgentOAuthCredential({
+      name: providerName,
+      credential: {
+        type: "oauth",
+        access: "fake-access-token",
+        refresh: "fake-refresh-token",
+        expires: 4_102_444_800,
+        futureField: { passthrough: true },
+      },
+    });
+  } finally {
+    await client.close().catch(() => undefined);
+  }
+}
+
+export async function cleanupPaseoAgentProviders(providerNames: Iterable<string>): Promise<void> {
+  const client = await connectPaseoAgentClient();
+  try {
+    for (const name of providerNames) {
+      await client.removePaseoAgentProvider(name);
+    }
+  } finally {
+    await client.close().catch(() => undefined);
+  }
+}
@@ -5,10 +5,10 @@ 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";
+const DISABLE_DEFAULT_SEED_ONCE_KEY = "@paseo:e2e-disable-default-seed-once";
+const FAKE_HOST_MODEL_ID = "fake-host-model";
+const FAKE_HOST_MODEL_LABEL = "Fake host model";
+const FAKE_HOST_PROJECT_DISPLAY_NAME = "Fake host project";

 type WebSocketMessage = string | Buffer;
 type SessionRequest = Record<string, unknown> & { type?: string; requestId?: string };
@@ -20,31 +20,6 @@ export interface FakeScheduleHostWorkspace {
  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 {
@@ -139,7 +114,6 @@ export async function installFakeScheduleHost(input: {
  port: string;
  serverId: string;
  workspace: Record<string, unknown>;
-  schedules?: FakeScheduleSummary[];
 }): Promise<void> {
  await input.page.routeWebSocket(wsRoutePatternForPort(input.port), (ws) => {
    ws.onMessage((message) => {
@@ -227,7 +201,7 @@ export async function installFakeScheduleHost(input: {
          ws.send(
            buildSessionMessage("schedule/list/response", {
              requestId,
-              schedules: input.schedules ?? [],
+              schedules: [],
              error: null,
            }),
          );
@@ -258,24 +232,15 @@ export async function addFakeScheduleHostAndReload(input: {
      }
      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));
+      localStorage.setItem(keys.registry, JSON.stringify([...registry, seededHost]));
+      localStorage.setItem(keys.disableSeedOnce, nonce);
    },
    {
      seededHost: host,
      keys: {
        registry: REGISTRY_KEY,
        nonce: SEED_NONCE_KEY,
-        extraHosts: EXTRA_HOSTS_KEY,
+        disableSeedOnce: DISABLE_DEFAULT_SEED_ONCE_KEY,
      },
    },
  );
@@ -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();
@@ -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);
-}
@@ -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");

@@ -13,12 +13,12 @@ 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
-// the global button (universal) and each project's per-row New workspace icon
-// (preselects that project) — shown for git projects and for non-git projects on
-// a multiplicity-capable host. These specs prove the global entry opens the
-// screen, the project icon preselects the right project across the reused 'new'
-// screen, and non-git projects never offer the worktree Isolation control.
+// Model B entry points into the New Workspace screen. The per-project
+// "+ New workspace" sidebar row is gone; the surviving entries are the global
+// button (universal) and each git project's own new-worktree icon (preselects
+// that project). These specs prove the global entry opens the screen, the
+// project icon preselects the right project across the reused 'new' screen, and
+// 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}`);
@@ -215,7 +215,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 });
@@ -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();
-      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 selectWorkspaceIsolation(page, "worktree");
      await expectWorkspaceIsolationSelected(page, "worktree");

      await openStartingRefPicker(page);
@@ -0,0 +1,153 @@
+import { expect } from "@playwright/test";
+import { test } from "./fixtures";
+import {
+  addApiKeyProvider,
+  cleanupPaseoAgentProviders,
+  expectModelProviderListed,
+  openPaseoAgentSettings,
+  seedChatGptProvider,
+  startOAuthProviderSignIn,
+} from "./helpers/paseo-agent";
+
+const CHATGPT_PROVIDER = "phase-e-chatgpt-ui";
+const CLOSE_PROVIDER = "phase-e-close-ui";
+const DEFAULT_OPENROUTER_PROVIDER = "OpenRouter";
+const DEFAULT_CHATGPT_PROVIDER = "ChatGPT";
+const RENAME_PROVIDER = "phase-e-rename-ui";
+
+test.describe("Paseo Agent provider configuration", () => {
+  const providerNamesToCleanup = new Set<string>();
+
+  test.afterEach(async () => {
+    await cleanupPaseoAgentProviders(providerNamesToCleanup);
+    providerNamesToCleanup.clear();
+  });
+
+  test("adds an OpenRouter model provider from Settings", async ({ page }) => {
+    providerNamesToCleanup.add(DEFAULT_OPENROUTER_PROVIDER);
+
+    await openPaseoAgentSettings(page);
+    await addApiKeyProvider(page, {
+      catalogId: "openrouter",
+      apiKey: "sk-or-phase-e-write-only",
+    });
+
+    await expectModelProviderListed(page, {
+      name: DEFAULT_OPENROUTER_PROVIDER,
+      providerLabel: "OpenRouter",
+      modelCount: 0,
+      auth: "Connected",
+    });
+  });
+
+  test("adds an API-key provider without prompting for a provider name", async ({ page }) => {
+    providerNamesToCleanup.add(DEFAULT_OPENROUTER_PROVIDER);
+
+    await openPaseoAgentSettings(page);
+    await page.getByRole("button", { name: "Add model provider", exact: true }).click();
+    await page.getByTestId("paseo-agent-catalog-select-openrouter").click();
+
+    await expect(page.getByTestId("paseo-agent-provider-form")).toBeVisible();
+    await expect(page.getByLabel("Provider name")).toHaveCount(0);
+    await expect(page.getByLabel("Models")).toHaveCount(0);
+    await page.getByLabel("API key").fill("sk-or-default-name");
+    await page.getByRole("button", { name: "Save provider", exact: true }).click();
+
+    await expectModelProviderListed(page, {
+      name: DEFAULT_OPENROUTER_PROVIDER,
+      providerLabel: "OpenRouter",
+      modelCount: 0,
+      auth: "Connected",
+    });
+  });
+
+  test("starts a ChatGPT sign-in from Settings", async ({ page }) => {
+    providerNamesToCleanup.add(DEFAULT_CHATGPT_PROVIDER);
+
+    await openPaseoAgentSettings(page);
+    await startOAuthProviderSignIn(page, {
+      catalogId: "chatgpt",
+    });
+  });
+
+  test("starts OAuth sign-in without prompting for a provider name", async ({ page }) => {
+    providerNamesToCleanup.add(DEFAULT_CHATGPT_PROVIDER);
+
+    await openPaseoAgentSettings(page);
+    await page.getByRole("button", { name: "Add model provider", exact: true }).click();
+    await page.getByTestId("paseo-agent-catalog-select-chatgpt").click();
+
+    await expect(page.getByTestId("paseo-agent-provider-form")).toHaveCount(0);
+    await expect(page.getByLabel("Provider name")).toHaveCount(0);
+  });
+
+  test("shows user-facing provider picker rows", async ({ page }) => {
+    await openPaseoAgentSettings(page);
+    await page.getByRole("button", { name: "Add model provider", exact: true }).click();
+
+    const picker = page.getByTestId("paseo-agent-provider-picker");
+    await expect(
+      page
+        .getByTestId("paseo-agent-catalog-entry-openrouter")
+        .getByText("API key", { exact: true }),
+    ).toBeVisible();
+    await expect(page.getByTestId("paseo-agent-catalog-icon-openrouter")).toBeVisible();
+    await expect(
+      page.getByTestId("paseo-agent-catalog-entry-chatgpt").getByText("Sign in", { exact: true }),
+    ).toBeVisible();
+    await expect(page.getByTestId("paseo-agent-catalog-icon-chatgpt")).toBeVisible();
+    await expect(picker.getByText("openai-codex-responses")).toHaveCount(0);
+    await expect(picker.getByText(/\b\d+ models?\b/)).toHaveCount(0);
+  });
+
+  test("shows a stored ChatGPT login as a read-only model provider row", async ({ page }) => {
+    providerNamesToCleanup.add(CHATGPT_PROVIDER);
+
+    await seedChatGptProvider(CHATGPT_PROVIDER);
+    await openPaseoAgentSettings(page);
+
+    await expectModelProviderListed(page, {
+      name: CHATGPT_PROVIDER,
+      providerLabel: "ChatGPT",
+      modelCount: 1,
+      auth: "Connected",
+    });
+  });
+
+  test("renames a configured provider row without changing its stored credential key", async ({
+    page,
+  }) => {
+    providerNamesToCleanup.add(RENAME_PROVIDER);
+
+    await seedChatGptProvider(RENAME_PROVIDER);
+    await openPaseoAgentSettings(page);
+    await page.getByTestId(`paseo-agent-provider-rename-${RENAME_PROVIDER}`).click();
+    await expect(page.getByTestId("paseo-agent-provider-rename-form")).toBeVisible();
+    await page.getByLabel("Provider name").fill("Work account");
+    await page.getByRole("button", { name: "Save", exact: true }).click();
+
+    await expectModelProviderListed(page, {
+      name: "Work account",
+      providerLabel: "ChatGPT",
+      modelCount: 1,
+      auth: "Connected",
+    });
+  });
+
+  test("closes the Paseo Agent settings sheet after providers load", async ({ page }) => {
+    providerNamesToCleanup.add(CLOSE_PROVIDER);
+
+    await seedChatGptProvider(CLOSE_PROVIDER);
+    await openPaseoAgentSettings(page);
+    await expectModelProviderListed(page, {
+      name: CLOSE_PROVIDER,
+      providerLabel: "ChatGPT",
+      modelCount: 1,
+      auth: "Connected",
+    });
+
+    await page.getByLabel("Close", { exact: true }).click();
+
+    await expect(page.getByTestId("paseo-agent-settings-sheet")).toHaveCount(0);
+  });
+});
@@ -1,15 +1,5 @@
 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 {
@@ -66,42 +56,6 @@ async function deleteSeededSchedule(workspace: SeededWorkspace, id: string): Pro
    .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>> = [];

@@ -122,117 +76,17 @@ test.describe("Schedules", () => {
    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 expect(row).toContainText("ten-second-stream");

    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 expect(page.getByTestId("schedule-form-sheet")).toBeVisible({ timeout: 10_000 });
+    await expect(page.getByTestId("schedule-cwd-trigger")).toHaveCount(0);
+    await expect(page.getByTestId("schedule-project-trigger")).toContainText(
+      workspace.projectDisplayName,
+      { timeout: 30_000 },
+    );
+    await expect(page.getByTestId("schedule-model-trigger")).toContainText("Ten second stream", {
+      timeout: 30_000,
    });
-
-    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);
  });
 });
@@ -5,28 +5,15 @@ import {
  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 { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
 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";
-    };
-  };
+  target: { type: string; config?: { cwd?: string } };
 }

 interface ScheduleSeedClient {
@@ -38,12 +25,7 @@ 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 popup.getByText(label, { exact: true }).click();
  await expect(popup).toHaveCount(0, { timeout: 30_000 });
 }

@@ -59,7 +41,6 @@ async function deleteScheduleByName(workspace: SeededWorkspace, name: string): P
 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();
@@ -67,10 +48,6 @@ async function expectScheduleCreatedForProject(input: {
  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({
@@ -81,69 +58,6 @@ async function expectScheduleCreatedForProject(input: {
  );
 }

-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>> = [];

@@ -154,30 +68,10 @@ test.describe("Schedules project target", () => {
    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 });
+    const workspace = await seedWorkspace({ repoPrefix: "schedule-project-target-" });
    cleanupTasks.push(() => workspace.cleanup());
    const scheduleName = `Project schedule ${Date.now()}`;
    cleanupTasks.push(() => deleteScheduleByName(workspace, scheduleName));
@@ -188,87 +82,32 @@ test.describe("Schedules project target", () => {
    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 expect(page.getByTestId(`schedules-section-${getServerId()}`)).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: "New schedule" }).click();
+    await expect(page.getByTestId("schedule-form-sheet")).toBeVisible({ timeout: 10_000 });
+    await expect(page.getByTestId("schedule-cwd-trigger")).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 expect(page.getByRole("button", { name: /select project/i })).toContainText(
+      workspace.projectDisplayName,
    );

-    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: "Cron" }).click();
    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,
-    });
+    await expectScheduleCreatedForProject({ workspace, name: scheduleName });
  });

-  test("clears the selected project and model when the host changes", async ({ page }) => {
+  test("clears the selected model when the chosen project moves to another host", 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));

@@ -288,128 +127,30 @@ test.describe("Schedules project target", () => {
      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);
+    await expect(page.getByTestId(`schedules-section-${fakeHost.serverId}`)).toBeVisible({
+      timeout: 30_000,
+    });
+    await page.getByRole("button", { name: "New schedule" }).click();
+    await expect(page.getByTestId("schedule-form-sheet")).toBeVisible({ timeout: 10_000 });

-    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.getByRole("button", { name: /select project/i }).click();
    await page.getByTestId(`schedule-project-option-${workspace.projectId}`).click();
-    await expect(projectTrigger).toContainText(workspace.projectDisplayName);
-    await expectSettled(projectTrigger);
+    await expect(page.getByRole("button", { name: /select project/i })).toContainText(
+      workspace.projectDisplayName,
+    );

    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 expect(page.getByRole("button", { name: /ten second stream/i })).toBeVisible();

-    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.getByRole("button", { name: /select project/i }).click();
    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 expect(page.getByRole("button", { name: /select project/i })).toContainText(
+      fakeHost.projectDisplayName,
+    );
+    await expect(page.getByRole("button", { name: /select model/i })).toBeVisible();

    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",
-    });
-  });
 });
@@ -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);
  });
@@ -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
-      // git project can branch off a worktree, and the non-git project can add
-      // another workspace because the host supports workspaceMultiplicity.
+      // The per-project "+ New workspace" row is gone. The git project keeps a
+      // per-row new-worktree icon (revealed on hover); the non-git project has
+      // 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)).toBeVisible({
-        timeout: 30_000,
-      });
+      await expect(projectNewWorktreeIcon(page, nonGitProject.projectId)).toHaveCount(0);

      // The global new-workspace button is the universal entry — present for both
      // kinds regardless of their per-row affordance.
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.1.104",
+  "version": "0.1.103",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -84,7 +84,7 @@ 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,
@@ -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 {
-  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()} />;
-}
+import { isSettingsSectionSlug, type SettingsSectionSlug } from "@/utils/host-routes";

 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} />;
 }
@@ -9,7 +9,7 @@ import {
 } from "lucide-react-native";
 import { withUnistyles } from "react-native-unistyles";
 import type { AgentAttachment } from "@getpaseo/protocol/messages";
-import type { WorkspaceComposerAttachment } from "@/attachments/types";
+import type { BrowserAnnotationIntent, WorkspaceComposerAttachment } from "@/attachments/types";
 import { getFileTypeLabel } from "@/attachments/file-types";
 import { isPullRequestContextAttachment } from "@/attachments/workspace-attachment-utils";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
@@ -36,6 +36,13 @@ function getPullRequestContextSubtitle(attachment: WorkspaceComposerAttachment):
  return "Review";
 }

+const BROWSER_INTENT_LABEL_KEYS: Record<BrowserAnnotationIntent, string> = {
+  fix: "workspace.browser.annotate.intents.fix",
+  change: "workspace.browser.annotate.intents.change",
+  question: "workspace.browser.annotate.intents.question",
+  approve: "workspace.browser.annotate.intents.approve",
+};
+
 function getTextAttachmentSubtitle(
  attachment: Extract<AgentAttachment, { type: "text" }>,
  t: TFunction,
@@ -89,10 +96,11 @@ export function getWorkspaceAttachmentPillContent(
  t: TFunction,
 ): AttachmentPillContent {
  if (attachment.kind === "browser_element") {
+    const intent = attachment.attachment.intent;
    return {
      icon: attachmentBrowserIcon,
      title: attachment.attachment.tag,
-      subtitle: t("composer.attachments.element"),
+      subtitle: intent ? t(BROWSER_INTENT_LABEL_KEYS[intent]) : t("composer.attachments.element"),
    };
  }
  if (isPullRequestContextAttachment(attachment)) {
@@ -21,6 +21,12 @@ export interface AttachmentMetadata {
  createdAt: number;
 }

+/**
+ * The kind of review feedback the user is attaching to a selected browser
+ * element, sent to the agent alongside the element context.
+ */
+export type BrowserAnnotationIntent = "fix" | "change" | "question" | "approve";
+
 export interface BrowserElementAttachment {
  url: string;
  selector: string;
@@ -44,6 +50,8 @@ export interface BrowserElementAttachment {
  children: string[];
  /** Free-text review note the user wrote about this element, if any. */
  comment?: string;
+  /** What the user wants the agent to do with this element, if annotated. */
+  intent?: BrowserAnnotationIntent;
  /**
   * Cropped screenshot of the selected element, sent to the agent as an image
   * alongside the textual element context. Persisted via the attachment store;
@@ -1,6 +1,5 @@
-import { beforeEach, describe, expect, test } from "vitest";
+import { beforeEach, describe, expect, test, vi } 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";
@@ -9,6 +8,20 @@ import {
  useWorkspaceLayoutStore,
 } from "@/stores/workspace-layout-store";

+vi.mock("expo-router", () => ({
+  router: {
+    navigate: vi.fn(),
+  },
+}));
+
+vi.mock("@react-native-async-storage/async-storage", () => ({
+  default: {
+    getItem: vi.fn(async () => null),
+    setItem: vi.fn(async () => undefined),
+    removeItem: vi.fn(async () => undefined),
+  },
+}));
+
 type BrowserAutomationExecuteRequest = Extract<
  SessionOutboundMessage,
  { type: "browser.automation.execute.request" }
@@ -17,28 +30,9 @@ 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[] = [];
+  public sentResponses: BrowserAutomationExecuteResponse[] = [];
  private handler: ((request: BrowserAutomationExecuteRequest) => void) | null = null;

  public on(
@@ -61,107 +55,6 @@ class FakeDaemonClient {
  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 {
@@ -177,69 +70,45 @@ function browserNewTabRequest(): BrowserAutomationExecuteRequest {
    type: "browser.automation.execute.request",
    requestId: "req-new",
    agentId: "agent-1",
-    workspaceId: "wks_workspace_a",
-    command: {
-      command: "new_tab",
-      args: { url: "https://example.com" },
-    },
+    workspaceId: "/repo",
+    command: { command: "new_tab", args: { workspaceId: "/repo", 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 {
+function emptyListTabsPayload(requestId = "req-new:list_tabs") {
  return {
    requestId,
-    ok: true,
+    ok: true as const,
    result: {
-      command: "list_tabs",
+      command: "list_tabs" as const,
      tabs: [],
    },
  };
 }

-function currentListTabsPayload(requestId = "req-new:list_tabs"): BrowserAutomationResponsePayload {
+function currentListTabsPayload(requestId = "req-new:list_tabs") {
  return {
    requestId,
-    ok: true,
+    ok: true as const,
    result: {
-      command: "list_tabs",
+      command: "list_tabs" as const,
      tabs: currentBrowserTabs(),
    },
  };
 }

+function flushPromises(): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, 0));
+}
+
+function waitForAsyncWork(): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, 20));
+}
+
 function currentBrowserTabs() {
  return Object.values(useBrowserStore.getState().browsersById).map((browser) => ({
    browserId: browser.browserId,
-    workspaceId: "wks_workspace_a",
+    workspaceId: "/repo",
    url: browser.url,
    title: browser.title,
    isActive: true,
@@ -247,268 +116,151 @@ function currentBrowserTabs() {
  }));
 }

-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();
+  test("creates an unfocused workspace browser tab for browser_new_tab", async () => {
+    const client = new FakeDaemonClient();
+    const setWorkspaceActiveBrowser = vi.fn(async () => undefined);
+    const setAgentActiveBrowser = vi.fn(async () => undefined);
+    const registerWorkspaceBrowser = vi.fn(async () => undefined);
+    const ensureResidentBrowserWebview = vi.fn();
+    const executeAutomationCommand = vi.fn(async () => currentListTabsPayload());
    const workspaceKey = buildWorkspaceTabPersistenceKey({
      serverId: "server-1",
-      workspaceId: "wks_workspace_a",
+      workspaceId: "/repo",
    });
-    if (!workspaceKey) {
-      throw new Error("Expected workspace key");
-    }
-    const previousFocusedTabId = useWorkspaceLayoutStore
+    if (!workspaceKey) throw new Error("expected workspace key");
+    const focusedTabId = useWorkspaceLayoutStore
      .getState()
      .openTabFocused(workspaceKey, { kind: "draft", draftId: "human-draft" });
-    browser.mount({ serverId: "server-1" });
+    if (!focusedTabId) throw new Error("expected focused tab");
+    mountBrowserAutomationHandler({
+      client,
+      serverId: "server-1",
+      getHost: () =>
+        ({
+          browser: {
+            executeAutomationCommand,
+            registerWorkspaceBrowser,
+            setWorkspaceActiveBrowser,
+            setAgentActiveBrowser,
+          },
+        }) satisfies DesktopHostBridge,
+      ensureResidentBrowserWebview,
+    });

-    browser.receive(browserNewTabRequest());
-    await flushAsyncWork();
+    client.receive(browserNewTabRequest());
+    await flushPromises();

-    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 }),
-      }),
+    const payload = client.sentResponses[0]?.payload;
+    expect(payload?.ok).toBe(true);
+    if (!payload?.ok) throw new Error("expected success");
+    expect(payload.result.command).toBe("new_tab");
+    if (payload.result.command !== "new_tab") throw new Error("expected new_tab result");
+    expect(payload.result.url).toBe("https://example.com");
+    expect(useWorkspaceLayoutStore.getState().getWorkspaceTabs(workspaceKey)).toContainEqual(
+      expect.objectContaining({ target: { kind: "browser", browserId: payload.result.browserId } }),
    );
-    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: {} },
-      },
-    ]);
+    const layout = useWorkspaceLayoutStore.getState().layoutByWorkspace[workspaceKey];
+    expect(layout?.root.kind).toBe("pane");
+    if (layout?.root.kind !== "pane") throw new Error("expected root pane");
+    expect(layout.root.pane.focusedTabId).toBe(focusedTabId);
+    expect(registerWorkspaceBrowser).toHaveBeenCalledWith({
+      browserId: payload.result.browserId,
+      workspaceId: "/repo",
+    });
+    expect(setAgentActiveBrowser).toHaveBeenCalledWith({
+      agentId: "agent-1",
+      browserId: payload.result.browserId,
+    });
+    expect(setWorkspaceActiveBrowser).not.toHaveBeenCalled();
+    expect(ensureResidentBrowserWebview).toHaveBeenCalledWith({
+      browserId: payload.result.browserId,
+      url: "https://example.com",
+    });
+    expect(executeAutomationCommand).toHaveBeenCalledTimes(1);
  });

-  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({
+  test("returns browser_timeout when the resident webview does not register", async () => {
+    const client = new FakeDaemonClient();
+    const ensureResidentBrowserWebview = vi.fn();
+    const executeAutomationCommand = vi.fn(async () => emptyListTabsPayload());
+    mountBrowserAutomationHandler({
+      client,
      serverId: "server-1",
+      getHost: () => ({ browser: { executeAutomationCommand } }) satisfies DesktopHostBridge,
+      ensureResidentBrowserWebview,
      registrationWaitTimeoutMs: 1,
      registrationPollIntervalMs: 1,
    });

-    browser.receive(browserNewTabRequest());
-    await waitForRegistrationTimeout();
+    client.receive(browserNewTabRequest());
+    await waitForAsyncWork();

-    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(client.sentResponses[0]?.payload).toMatchObject({
+      requestId: "req-new",
+      ok: false,
+      error: {
+        code: "browser_timeout",
+        retryable: true,
      },
-    ]);
-    expect(browser.resident.ensuredWebviews).toEqual([
+    });
+    expect(ensureResidentBrowserWebview).toHaveBeenCalledWith(
      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",
+    );
+    expect(client.sentResponses[0]?.payload).not.toMatchObject({
      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,
-      },
+      result: { command: "new_tab" },
    });
  });

-  test("browser_close_tab removes the workspace tab, browser record, resident webview, registry entry, and partition", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    const workspaceKey = buildWorkspaceTabPersistenceKey({
+  test("wraps browser_new_tab registration bridge errors in a response", async () => {
+    const client = new FakeDaemonClient();
+    const executeAutomationCommand = vi.fn(async () => {
+      throw new Error("IPC registration check failed");
+    });
+    mountBrowserAutomationHandler({
+      client,
      serverId: "server-1",
-      workspaceId: "wks_workspace_a",
+      getHost: () => ({ browser: { executeAutomationCommand } }) satisfies DesktopHostBridge,
    });
-    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));
+    client.receive(browserNewTabRequest());
+    await flushPromises();

-    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",
+    expect(client.sentResponses[0]?.payload).toEqual({
+      requestId: "req-new",
      ok: false,
      error: {
-        code: "browser_tab_not_found",
-        message: `No browser tab found for ID: ${result.browserId}`,
+        code: "browser_unknown_error",
+        message: "IPC registration check failed",
        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();
+  test("sends a success response from the desktop bridge", async () => {
+    const client = new FakeDaemonClient();
+    const executeAutomationCommand = vi.fn(async () => ({
+      requestId: "req-1",
+      ok: true as const,
+      result: { command: "list_tabs" as const, tabs: [] },
+    }));

-    browser.receive(request);
-    await flushAsyncWork();
+    mountBrowserAutomationHandler({
+      client,
+      getHost: () => ({ browser: { executeAutomationCommand } }) satisfies DesktopHostBridge,
+    });

-    expect(browser.browser.executedRequests).toEqual([request]);
-    expect(browser.client.sentResponses).toEqual([
+    client.receive(browserAutomationRequest());
+    await flushPromises();
+
+    expect(executeAutomationCommand).toHaveBeenCalledWith(browserAutomationRequest());
+    expect(client.sentResponses).toEqual([
      {
        type: "browser.automation.execute.response",
        payload: {
@@ -520,14 +272,14 @@ describe("mountBrowserAutomationHandler", () => {
    ]);
  });

-  test("missing desktop bridge sends browser_unsupported", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    browser.mount({ host: null });
+  test("missing bridge sends browser_unsupported", async () => {
+    const client = new FakeDaemonClient();
+    mountBrowserAutomationHandler({ client, getHost: () => null });

-    browser.receive(browserAutomationRequest());
-    await flushAsyncWork();
+    client.receive(browserAutomationRequest());
+    await flushPromises();

-    expect(browser.client.sentResponses).toEqual([
+    expect(client.sentResponses).toEqual([
      {
        type: "browser.automation.execute.response",
        payload: {
@@ -535,7 +287,7 @@ describe("mountBrowserAutomationHandler", () => {
          ok: false,
          error: {
            code: "browser_unsupported",
-            message: "Browser automation is not available in this app runtime.",
+            message: "Desktop browser automation is not available in this app runtime.",
            retryable: false,
          },
        },
@@ -544,68 +296,80 @@ describe("mountBrowserAutomationHandler", () => {
  });

  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,
+    const client = new FakeDaemonClient();
+    mountBrowserAutomationHandler({
+      client,
+      getHost: () => ({
+        browser: {
+          executeAutomationCommand: async () => {
+            throw {
+              code: "browser_tab_not_found",
+              message: "Browser tab browser-1 was not found.",
+              retryable: false,
+            };
          },
        },
+      }),
+    });
+
+    client.receive(browserAutomationRequest());
+    await flushPromises();
+
+    expect(client.sentResponses[0]?.payload).toEqual({
+      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,
+    const client = new FakeDaemonClient();
+    mountBrowserAutomationHandler({
+      client,
+      getHost: () => ({
+        browser: {
+          executeAutomationCommand: async () => {
+            throw new Error('No handler registered for "paseo:browser:execute-automation-command"');
          },
        },
+      }),
+    });
+
+    client.receive(browserAutomationRequest());
+    await flushPromises();
+
+    expect(client.sentResponses[0]?.payload).toEqual({
+      requestId: "req-1",
+      ok: false,
+      error: {
+        code: "browser_unsupported",
+        message: "Desktop browser automation is not implemented by this desktop build yet.",
+        retryable: false,
      },
-    ]);
+    });
  });

-  test("unsubscribe stops handling browser automation requests", async () => {
-    const browser = new BrowserAutomationHandlerHarness();
-    browser.mount();
+  test("unsubscribe stops handling requests", async () => {
+    const client = new FakeDaemonClient();
+    const executeAutomationCommand = vi.fn(async () => ({
+      requestId: "req-1",
+      ok: true as const,
+      result: { command: "list_tabs" as const, tabs: [] },
+    }));
+    const unsubscribe = mountBrowserAutomationHandler({
+      client,
+      getHost: () => ({ browser: { executeAutomationCommand } }),
+    });

-    browser.unmount();
-    browser.receive(browserAutomationRequest());
-    await flushAsyncWork();
+    unsubscribe();
+    client.receive(browserAutomationRequest());
+    await flushPromises();

-    expect(browser.browser.executedRequests).toEqual([]);
-    expect(browser.client.sentResponses).toEqual([]);
+    expect(executeAutomationCommand).not.toHaveBeenCalled();
+    expect(client.sentResponses).toEqual([]);
  });
 });
@@ -1,14 +1,9 @@
 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 { ensureResidentBrowserWebview as ensureResidentBrowserWebviewDefault } from "@/components/browser-webview-resident";
+import { createWorkspaceBrowser } from "@/stores/browser-store";
 import {
  buildWorkspaceTabPersistenceKey,
-  collectAllTabs,
  useWorkspaceLayoutStore,
 } from "@/stores/workspace-layout-store";

@@ -45,7 +40,7 @@ export function mountBrowserAutomationHandler(
  options: BrowserAutomationHandlerOptions,
 ): () => void {
  const getHost = options.getHost ?? getDesktopHost;
-  const unsubscribe = options.client.on("browser.automation.execute.request", (request) => {
+  return options.client.on("browser.automation.execute.request", (request) => {
    void handleBrowserAutomationRequest({
      client: options.client,
      getHost,
@@ -61,9 +56,6 @@ export function mountBrowserAutomationHandler(
        : {}),
    });
  });
-  return () => {
-    unsubscribe();
-  };
 }

 export function mountBrowserAutomationDaemonClientHandler(
@@ -119,32 +111,7 @@ async function handleBrowserAutomationRequest(params: {
    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;
-  }
+  await rememberAgentBrowserTarget({ request, browserHost });

  if (!executeAutomationCommand) {
    client.sendBrowserAutomationExecuteResponse({
@@ -152,7 +119,7 @@ async function handleBrowserAutomationRequest(params: {
      payload: browserAutomationFailure({
        requestId: request.requestId,
        code: "browser_unsupported",
-        message: "Browser automation is not available in this app runtime.",
+        message: "Desktop browser automation is not available in this app runtime.",
      }),
    });
    return;
@@ -172,127 +139,6 @@ async function handleBrowserAutomationRequest(params: {
  }
 }

-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;
@@ -313,11 +159,11 @@ async function openBrowserTabForRequest(params: {
    BrowserAutomationExecuteRequest["command"],
    { command: "new_tab" }
  >;
-  const workspaceId = request.workspaceId;
+  const workspaceId = request.workspaceId ?? command.args.workspaceId;
  if (!serverId || !workspaceId) {
    return browserAutomationFailure({
      requestId: request.requestId,
-      code: "browser_unsupported",
+      code: "browser_no_tab",
      message: "Cannot create a browser tab without a workspace context.",
    });
  }
@@ -328,7 +174,7 @@ async function openBrowserTabForRequest(params: {
  if (!workspaceKey) {
    return browserAutomationFailure({
      requestId: request.requestId,
-      code: "browser_unsupported",
+      code: "browser_no_tab",
      message: "Cannot create a browser tab without a workspace context.",
    });
  }
@@ -338,6 +184,9 @@ async function openBrowserTabForRequest(params: {
  });

  await browserHost?.registerWorkspaceBrowser?.({ browserId, workspaceId });
+  if (request.agentId) {
+    await browserHost?.setAgentActiveBrowser?.({ agentId: request.agentId, browserId });
+  }

  if (browserHost?.executeAutomationCommand) {
    ensureResidentBrowserWebview({ browserId, url: normalizedUrl });
@@ -355,7 +204,7 @@ async function openBrowserTabForRequest(params: {
      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.`,
+        message: `Timed out waiting for browser tab ${browserId} to register with desktop automation. Try browser_new_tab again.`,
        retryable: true,
      });
    }
@@ -386,7 +235,7 @@ async function waitForBrowserRegistration(params: {
      agentId: params.request.agentId,
      cwd: params.request.cwd,
      workspaceId: params.workspaceId,
-      command: { command: "list_tabs", args: {} },
+      command: { command: "list_tabs", args: { workspaceId: params.workspaceId } },
    });
    if (payload.ok && payload.result.command === "list_tabs") {
      if (payload.result.tabs.some((tab) => tab.browserId === params.browserId)) {
@@ -402,6 +251,28 @@ function delay(ms: number): Promise<void> {
  return new Promise((resolve) => setTimeout(resolve, ms));
 }

+async function rememberAgentBrowserTarget(input: {
+  request: BrowserAutomationExecuteRequest;
+  browserHost: DesktopHostBridge["browser"] | undefined;
+}): Promise<void> {
+  if (!input.request.agentId) {
+    return;
+  }
+  const browserId = readRequestBrowserId(input.request);
+  if (!browserId) {
+    return;
+  }
+  await input.browserHost?.setAgentActiveBrowser?.({ agentId: input.request.agentId, browserId });
+}
+
+function readRequestBrowserId(request: BrowserAutomationExecuteRequest): string | null {
+  if (request.browserId) {
+    return request.browserId;
+  }
+  const args = request.command.args as { browserId?: unknown };
+  return typeof args.browserId === "string" && args.browserId.length > 0 ? args.browserId : null;
+}
+
 function normalizeBridgePayload(
  requestId: string,
  payload: BrowserAutomationResponsePayload,
@@ -423,14 +294,14 @@ function normalizeThrownBridgeError(
    return browserAutomationFailure({
      requestId,
      code: "browser_unsupported",
-      message: "Browser automation is not implemented by this app build yet.",
+      message: "Desktop browser automation is not implemented by this desktop build yet.",
    });
  }

  return browserAutomationFailure({
    requestId,
    code: "browser_unknown_error",
-    message: message || "Browser automation failed.",
+    message: message || "Desktop browser automation failed.",
  });
 }

@@ -1,8 +1,8 @@
-import { forwardRef, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { forwardRef, useCallback, useEffect, useMemo, useRef } 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,7 +20,6 @@ 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";
@@ -221,7 +220,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 +231,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 +448,6 @@ export interface AdaptiveModalSheetProps {
  header: SheetHeader;
  visible: boolean;
  onClose: () => void;
-  onDismiss?: () => void;
  children: ReactNode;
  /** Sticky footer rendered below the scrollable content. */
  footer?: ReactNode;
@@ -471,7 +468,6 @@ export function AdaptiveModalSheet({
  header,
  visible,
  onClose,
-  onDismiss,
  children,
  footer,
  snapPoints,
@@ -537,20 +533,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 +545,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 +559,7 @@ export function AdaptiveModalSheet({
        index={0}
        enableDynamicSizing={false}
        onChange={handleSheetChange}
-        onDismiss={handleDismiss}
+        onDismiss={handleSheetDismiss}
        backdropComponent={renderBackdrop}
        enablePanDownToClose
        backgroundComponent={SheetBackground}
@@ -673,7 +614,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 +626,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 +636,6 @@ export function AdaptiveModalSheet({
      animationType="fade"
      visible={visible}
      onRequestClose={onClose}
-      onDismiss={notifyNativeModalDismiss}
      hardwareAccelerated
    >
      {desktopContent}
@@ -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);
 }
@@ -12,22 +12,21 @@ import { Pressable, Text, TextInput, View, type StyleProp, type ViewStyle } from
 import {
  ArrowLeft,
  ArrowRight,
-  Camera,
  ChevronDown,
+  Copy,
  Maximize,
  Monitor,
  MousePointer2,
+  PencilRuler,
  RotateCw,
  Smartphone,
  Tablet,
-  Wrench,
  X,
  type LucideIcon,
 } from "lucide-react-native";
 import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
 import * as Clipboard from "expo-clipboard";
-import { Button } from "@/components/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useToast } from "@/contexts/toast-context";
 import {
@@ -41,7 +40,11 @@ import {
  useWorkspaceAttachments,
  useWorkspaceAttachmentsStore,
 } from "@/attachments/workspace-attachments-store";
-import type { AttachmentMetadata, BrowserElementAttachment } from "@/attachments/types";
+import type {
+  AttachmentMetadata,
+  BrowserAnnotationIntent,
+  BrowserElementAttachment,
+} from "@/attachments/types";
 import { persistAttachmentFromDataUrl } from "@/attachments/service";
 import { WORKSPACE_SECONDARY_HEADER_HEIGHT } from "@/constants/layout";
 import {
@@ -49,6 +52,7 @@ import {
  isElectronRuntime,
  type DesktopBrowserShortcutEvent,
 } from "@/desktop/host";
+import { isDev } from "@/constants/platform";
 import { useBrowserStore, normalizeWorkspaceBrowserUrl } from "@/stores/browser-store";
 import {
  prepareBrowserWebview,
@@ -75,14 +79,25 @@ type WebTextInput = TextInput & {
  getNativeRef?: () => unknown;
 };

-type BrowserElementSelection = Omit<BrowserElementAttachment, "formatted" | "comment"> & {
+type BrowserElementSelection = Omit<
+  BrowserElementAttachment,
+  "formatted" | "comment" | "intent"
+> & {
  attributes?: Record<string, string>;
 };

 interface BrowserElementAnnotation {
  comment: string;
+  intent: BrowserAnnotationIntent;
 }

+const BROWSER_ANNOTATION_INTENTS: readonly BrowserAnnotationIntent[] = [
+  "fix",
+  "change",
+  "question",
+  "approve",
+];
+
 type DeviceSizeId =
  | "responsive"
  | "iphone-se"
@@ -208,6 +223,10 @@ function formatElementAttachment(
  const html = truncateText(selection.outerHTML.trim(), 800);
  const parts: string[] = [];

+  if (annotation) {
+    parts.push(`intent: ${annotation.intent}`);
+  }
+
  if (selection.reactSource?.fileName) {
    const loc = [
      selection.reactSource.fileName,
@@ -270,6 +289,7 @@ function buildBrowserElementAttachment(
    parentChain: selection.parentChain,
    children: selection.children,
    ...(comment ? { comment } : {}),
+    ...(annotation ? { intent: annotation.intent } : {}),
    ...(screenshot ? { screenshot } : {}),
    formatted: formatElementAttachment(selection, annotation),
  };
@@ -621,11 +641,10 @@ export function BrowserPane({
  const pendingNavigationUrlRef = useRef<string | null>(null);
  const domReadyRef = useRef(false);
  const annotationMarkersRef = useRef<BrowserAnnotationMarker[]>([]);
-  const [selectorMode, setSelectorMode] = useState<"annotate" | "screenshot" | null>(null);
-  const selectorActive = selectorMode !== null;
+  const [selectorActive, setSelectorActive] = useState(false);
  // Which action the active selector performs on click: open the annotation card
-  // ("annotate") or copy a screenshot of the element to the clipboard ("screenshot").
-  const selectorModeRef = useRef<"annotate" | "screenshot">("annotate");
+  // ("annotate") or copy the element to the clipboard ("grab").
+  const selectorModeRef = useRef<"annotate" | "grab">("annotate");
  const toast = useToast();
  const toastRef = useRef(toast);
  toastRef.current = toast;
@@ -1055,7 +1074,7 @@ export function BrowserPane({
    [],
  );

-  const screenshotElementToClipboard = useCallback(
+  const grabElementToClipboard = useCallback(
    async (selection: BrowserElementSelection) => {
      const text = formatElementAttachment(selection);
      const copyElement = getDesktopHost()?.browser?.copyElement;
@@ -1068,23 +1087,19 @@ export function BrowserPane({
          const dataUrl = await captureElement(browserIdRef.current, { x, y, width, height });
          imageDataUrl = dataUrl ?? undefined;
        } catch (error) {
-          console.warn("[browser-pane] capture element for screenshot failed", error);
+          console.warn("[browser-pane] capture element for grab failed", error);
        }
      }

-      const copiedMessage = imageDataUrl
-        ? t("workspace.browser.controls.screenshotCopied")
-        : t("workspace.browser.controls.elementCopied");
-
      // Copy via the main process; the renderer's navigator.clipboard rejects
      // with NotAllowedError because focus is inside the guest <webview>.
      if (typeof copyElement === "function") {
        try {
          const ok = await copyElement({ text, imageDataUrl });
          if (ok) {
-            toastRef.current?.show(copiedMessage, { variant: "success" });
+            toastRef.current?.copied(t("workspace.browser.controls.grabElementLabel"));
          } else {
-            toastRef.current?.error(t("workspace.browser.controls.screenshotFailed"));
+            toastRef.current?.error(t("workspace.browser.controls.grabFailed"));
          }
          return;
        } catch (error) {
@@ -1095,12 +1110,10 @@ export function BrowserPane({
      // Fallback to expo-clipboard (text only) when the bridge is unavailable.
      try {
        await Clipboard.setStringAsync(text);
-        toastRef.current?.show(t("workspace.browser.controls.elementCopied"), {
-          variant: "success",
-        });
+        toastRef.current?.copied(t("workspace.browser.controls.grabElementLabel"));
      } catch (error) {
        console.warn("[browser-pane] clipboard fallback failed", error);
-        toastRef.current?.error(t("workspace.browser.controls.screenshotFailed"));
+        toastRef.current?.error(t("workspace.browser.controls.grabFailed"));
      }
    },
    [t],
@@ -1108,8 +1121,8 @@ export function BrowserPane({

  const handleSelectorResult = useCallback(
    (selection: BrowserElementSelection) => {
-      if (selectorModeRef.current === "screenshot") {
-        void screenshotElementToClipboard(selection);
+      if (selectorModeRef.current === "grab") {
+        void grabElementToClipboard(selection);
        return;
      }
      pendingScreenshotRef.current = undefined;
@@ -1119,7 +1132,7 @@ export function BrowserPane({
        return undefined;
      });
    },
-    [captureElementScreenshot, screenshotElementToClipboard],
+    [captureElementScreenshot, grabElementToClipboard],
  );

  const submitAnnotation = useCallback(
@@ -1142,15 +1155,15 @@ export function BrowserPane({
  }, []);

  const startElementSelector = useCallback(
-    (mode: "annotate" | "screenshot") => {
+    (mode: "annotate" | "grab") => {
      const webview = webviewRef.current;
      if (!webview || !domReadyRef.current) return;
-      // Annotate needs a workspace scope to attach to; screenshot only copies.
+      // Annotate needs a workspace scope to attach to; grab only copies.
      if (mode === "annotate" && !workspaceAttachmentScopeKey) return;
      selectorModeRef.current = mode;
      pendingScreenshotRef.current = undefined;
      setPendingSelection(null);
-      setSelectorMode(mode);
+      setSelectorActive(true);

      const js = `
      (function() {
@@ -1376,11 +1389,11 @@ export function BrowserPane({
            const poll = startSelectorResultPolling({
              webview,
              onSelection: handleSelectorResult,
-              onDone: () => setSelectorMode(null),
+              onDone: () => setSelectorActive(false),
            });
            window.setTimeout(() => {
              window.clearInterval(poll);
-              setSelectorMode(null);
+              setSelectorActive(false);
              if (webviewRef.current !== webview || !domReadyRef.current) {
                return;
              }
@@ -1389,10 +1402,10 @@ export function BrowserPane({
            return undefined;
          })
          .catch(() => {
-            setSelectorMode(null);
+            setSelectorActive(false);
          });
      } catch {
-        setSelectorMode(null);
+        setSelectorActive(false);
      }
    },
    [handleSelectorResult, workspaceAttachmentScopeKey],
@@ -1400,7 +1413,7 @@ export function BrowserPane({

  const cancelElementSelector = useCallback(() => {
    const webview = webviewRef.current;
-    setSelectorMode(null);
+    setSelectorActive(false);
    if (webview && domReadyRef.current) {
      try {
        clearWebviewSelector(webview);
@@ -1457,12 +1470,12 @@ export function BrowserPane({
    startElementSelector("annotate");
  }, [cancelElementSelector, selectorActive, startElementSelector]);

-  const handleToggleScreenshot = useCallback(() => {
+  const handleToggleGrab = useCallback(() => {
    if (selectorActive) {
      cancelElementSelector();
      return;
    }
-    startElementSelector("screenshot");
+    startElementSelector("grab");
  }, [cancelElementSelector, selectorActive, startElementSelector]);

  const handleOpenDevTools = useCallback(() => {
@@ -1508,21 +1521,13 @@ export function BrowserPane({
    ],
    [browser?.canGoForward],
  );
-  const annotateIconButtonStyle = useCallback(
+  const selectorIconButtonStyle = useCallback(
    ({ hovered, pressed }: { hovered?: boolean; pressed?: boolean }) => [
      styles.iconButton,
-      selectorMode === "annotate" && styles.selectorActiveButton,
+      selectorActive && styles.selectorActiveButton,
      (hovered || pressed) && styles.iconButtonHovered,
    ],
-    [selectorMode],
-  );
-  const screenshotIconButtonStyle = useCallback(
-    ({ hovered, pressed }: { hovered?: boolean; pressed?: boolean }) => [
-      styles.iconButton,
-      selectorMode === "screenshot" && styles.selectorActiveButton,
-      (hovered || pressed) && styles.iconButtonHovered,
-    ],
-    [selectorMode],
+    [selectorActive],
  );

  const devicePreset = useMemo(
@@ -1628,46 +1633,36 @@ export function BrowserPane({
            onSelect={setDeviceSizeId}
            triggerStyle={baseIconButtonStyle}
          />
-          <ToolbarButton
-            label={t("workspace.browser.controls.openDevTools")}
-            onPress={handleOpenDevTools}
-            style={baseIconButtonStyle}
-          >
-            <Wrench size={16} color={theme.colors.foregroundMuted} />
-          </ToolbarButton>
+          {isDev ? (
+            <ToolbarButton
+              label={t("workspace.browser.controls.openDevTools")}
+              onPress={handleOpenDevTools}
+              style={baseIconButtonStyle}
+            >
+              <PencilRuler size={16} color={theme.colors.foregroundMuted} />
+            </ToolbarButton>
+          ) : null}
          <ToolbarButton
            label={
-              selectorMode === "annotate"
+              selectorActive
                ? t("workspace.browser.controls.cancelSelector")
-                : t("workspace.browser.controls.annotateElement")
+                : t("workspace.browser.controls.selectElement")
            }
-            active={selectorMode === "annotate"}
+            active={selectorActive}
            onPress={handleToggleElementSelector}
-            style={annotateIconButtonStyle}
+            style={selectorIconButtonStyle}
          >
            <MousePointer2
              size={16}
-              color={
-                selectorMode === "annotate" ? theme.colors.accent : theme.colors.foregroundMuted
-              }
+              color={selectorActive ? theme.colors.accent : theme.colors.foregroundMuted}
            />
          </ToolbarButton>
          <ToolbarButton
-            label={
-              selectorMode === "screenshot"
-                ? t("workspace.browser.controls.cancelSelector")
-                : t("workspace.browser.controls.screenshotElement")
-            }
-            active={selectorMode === "screenshot"}
-            onPress={handleToggleScreenshot}
-            style={screenshotIconButtonStyle}
+            label={t("workspace.browser.controls.grabElement")}
+            onPress={handleToggleGrab}
+            style={baseIconButtonStyle}
          >
-            <Camera
-              size={16}
-              color={
-                selectorMode === "screenshot" ? theme.colors.accent : theme.colors.foregroundMuted
-              }
-            />
+            <Copy size={16} color={theme.colors.foregroundMuted} />
          </ToolbarButton>
        </View>
      </View>
@@ -1695,6 +1690,45 @@ export function BrowserPane({
  );
 }

+const INTENT_LABEL_KEYS: Record<BrowserAnnotationIntent, string> = {
+  fix: "workspace.browser.annotate.intents.fix",
+  change: "workspace.browser.annotate.intents.change",
+  question: "workspace.browser.annotate.intents.question",
+  approve: "workspace.browser.annotate.intents.approve",
+};
+
+function IntentChip({
+  active,
+  intent,
+  label,
+  onSelect,
+}: {
+  active: boolean;
+  intent: BrowserAnnotationIntent;
+  label: string;
+  onSelect: (intent: BrowserAnnotationIntent) => void;
+}) {
+  const handlePress = useCallback(() => {
+    onSelect(intent);
+  }, [intent, onSelect]);
+  const chipStyle = useMemo(() => [styles.intentChip, active && styles.intentChipActive], [active]);
+  const textStyle = useMemo(
+    () => [styles.intentChipText, active && styles.intentChipTextActive],
+    [active],
+  );
+  const accessibilityState = useMemo(() => ({ selected: active }), [active]);
+  return (
+    <Pressable
+      accessibilityRole="button"
+      accessibilityState={accessibilityState}
+      onPress={handlePress}
+      style={chipStyle}
+    >
+      <Text style={textStyle}>{label}</Text>
+    </Pressable>
+  );
+}
+
 function BrowserElementAnnotationCard({
  selection,
  onSubmit,
@@ -1706,11 +1740,14 @@ function BrowserElementAnnotationCard({
 }) {
  const { t } = useTranslation();
  const [comment, setComment] = useState("");
+  const [intent, setIntent] = useState<BrowserAnnotationIntent>("fix");
  const commentRef = useRef(comment);
  commentRef.current = comment;
+  const intentRef = useRef(intent);
+  intentRef.current = intent;

  const handleSubmit = useCallback(() => {
-    onSubmit({ comment: commentRef.current });
+    onSubmit({ comment: commentRef.current, intent: intentRef.current });
  }, [onSubmit]);

  useEffect(() => {
@@ -1755,6 +1792,17 @@ function BrowserElementAnnotationCard({
        <Text numberOfLines={1} style={styles.annotationElement}>
          {elementLabel}
        </Text>
+        <View style={styles.annotationIntents}>
+          {BROWSER_ANNOTATION_INTENTS.map((option) => (
+            <IntentChip
+              key={option}
+              active={option === intent}
+              intent={option}
+              label={t(INTENT_LABEL_KEYS[option])}
+              onSelect={setIntent}
+            />
+          ))}
+        </View>
        <ThemedAnnotationInput
          accessibilityLabel={t("workspace.browser.annotate.placeholder")}
          autoFocus
@@ -1766,12 +1814,24 @@ function BrowserElementAnnotationCard({
          value={comment}
        />
        <View style={styles.annotationActions}>
-          <Button variant="ghost" size="sm" onPress={onCancel}>
-            {t("workspace.browser.annotate.cancel")}
-          </Button>
-          <Button variant="default" size="sm" onPress={handleSubmit}>
-            {t("workspace.browser.annotate.submit")}
-          </Button>
+          <Pressable
+            accessibilityRole="button"
+            onPress={onCancel}
+            style={styles.annotationSecondaryButton}
+          >
+            <Text style={styles.annotationSecondaryText}>
+              {t("workspace.browser.annotate.cancel")}
+            </Text>
+          </Pressable>
+          <Pressable
+            accessibilityRole="button"
+            onPress={handleSubmit}
+            style={styles.annotationPrimaryButton}
+          >
+            <Text style={styles.annotationPrimaryText}>
+              {t("workspace.browser.annotate.submit")}
+            </Text>
+          </Pressable>
        </View>
      </View>
    </View>
@@ -1926,7 +1986,31 @@ const styles = StyleSheet.create((theme) => ({
  annotationElement: {
    fontSize: theme.fontSize.xs,
    color: theme.colors.foregroundMuted,
-    marginBottom: theme.spacing[2],
+  },
+  annotationIntents: {
+    flexDirection: "row",
+    flexWrap: "wrap",
+    gap: theme.spacing[1],
+  },
+  intentChip: {
+    paddingHorizontal: theme.spacing[2],
+    paddingVertical: theme.spacing[1],
+    borderRadius: theme.borderRadius.md,
+    borderWidth: 1,
+    borderColor: theme.colors.border,
+    backgroundColor: theme.colors.surface1,
+  },
+  intentChipActive: {
+    borderColor: theme.colors.accent,
+    backgroundColor: `${String(theme.colors.accent)}20`,
+  },
+  intentChipText: {
+    fontSize: theme.fontSize.xs,
+    fontWeight: "500",
+    color: theme.colors.foregroundMuted,
+  },
+  intentChipTextActive: {
+    color: theme.colors.accent,
  },
  annotationInput: {
    minHeight: 64,
@@ -1945,6 +2029,27 @@ const styles = StyleSheet.create((theme) => ({
    justifyContent: "flex-end",
    gap: theme.spacing[2],
  },
+  annotationSecondaryButton: {
+    paddingHorizontal: theme.spacing[3],
+    paddingVertical: theme.spacing[2],
+    borderRadius: theme.borderRadius.md,
+  },
+  annotationSecondaryText: {
+    fontSize: theme.fontSize.sm,
+    fontWeight: "500",
+    color: theme.colors.foregroundMuted,
+  },
+  annotationPrimaryButton: {
+    paddingHorizontal: theme.spacing[3],
+    paddingVertical: theme.spacing[2],
+    borderRadius: theme.borderRadius.md,
+    backgroundColor: theme.colors.accent,
+  },
+  annotationPrimaryText: {
+    fontSize: theme.fontSize.sm,
+    fontWeight: "600",
+    color: theme.colors.accentForeground ?? "#ffffff",
+  },
  unavailableState: {
    flex: 1,
    alignItems: "center",
@@ -2,66 +2,33 @@ 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");
+  it("keeps a browser webview mounted offscreen and reuses the same node", () => {
+    const host = document.createElement("div");
    const webview = document.createElement("webview");
-    visibleHost.appendChild(webview);
-    document.body.appendChild(visibleHost);
+    host.appendChild(webview);
+    document.body.appendChild(host);

    releaseResidentBrowserWebview("browser-a", webview);

-    const host = residentHost();
-    expect(visibleHost.children).toHaveLength(0);
-    expect(Array.from(host.children)).toEqual([webview]);
+    expect(host.children).toHaveLength(0);
    expect(webview.isConnected).toBe(true);
-    expectPermanentHostParking(host);
-    expectResidentWebviewParking(webview);
+    expect(webview.style.width).toBe("1280px");
+    expect(webview.style.height).toBe("800px");
+
+    const reused = takeResidentBrowserWebview("browser-a");
+
+    expect(reused).toBe(webview);
+    expect(takeResidentBrowserWebview("browser-a")).toBeNull();
  });

  it("creates a resident webview for an agent-created unfocused tab", () => {
@@ -77,113 +44,6 @@ describe("resident browser webviews", () => {
    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", () => {
@@ -4,7 +4,6 @@ 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;
@@ -22,84 +21,42 @@ 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);
+  host.setAttribute("aria-hidden", "true");
+  host.style.position = "fixed";
+  host.style.left = "-20000px";
+  host.style.top = "0";
+  host.style.width = `${RESIDENT_VIEWPORT_WIDTH}px`;
+  host.style.height = `${RESIDENT_VIEWPORT_HEIGHT}px`;
+  host.style.overflow = "hidden";
+  host.style.opacity = "0";
+  host.style.pointerEvents = "none";
  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 element as HTMLElement;
    }
  }
  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`;
+function applyResidentWebviewStyle(webview: HTMLElement): void {
+  webview.style.display = "block";
+  webview.style.width = `${RESIDENT_VIEWPORT_WIDTH}px`;
+  webview.style.height = `${RESIDENT_VIEWPORT_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(
@@ -131,15 +88,11 @@ export function ensureResidentBrowserWebview(input: {

  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;
  }

@@ -161,7 +114,6 @@ export function takeResidentBrowserWebview(browserId: string): HTMLElement | nul
  }

  residentWebviewsByBrowserId.delete(normalizedBrowserId);
-  clearResidentWebviewParkingStyle(webview);
  return webview;
 }

@@ -177,33 +129,10 @@ export function releaseResidentBrowserWebview(browserId: string, webview: HTMLEl
  }

  residentWebviewsByBrowserId.set(normalizedBrowserId, webview);
-  applyResidentWebviewStyle(webview, normalizedBrowserId);
+  applyResidentWebviewStyle(webview);
  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) {
@@ -212,7 +141,6 @@ export function removeResidentBrowserWebview(browserId: string): void {

  const resident = residentWebviewsByBrowserId.get(normalizedBrowserId) ?? null;
  residentWebviewsByBrowserId.delete(normalizedBrowserId);
-  residentWebviewSizesByBrowserId.delete(normalizedBrowserId);
  resident?.remove();
 }

@@ -221,6 +149,5 @@ export function clearResidentBrowserWebviewsForTests(): void {
    webview.remove();
  }
  residentWebviewsByBrowserId.clear();
-  residentWebviewSizesByBrowserId.clear();
  readDocument()?.getElementById(RESIDENT_BROWSER_HOST_ID)?.remove();
 }
@@ -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 };
@@ -149,8 +89,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
@@ -211,7 +149,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 +162,8 @@ function ModelRow({
  );

  const leadingSlot = useMemo(
-    () => <ProviderGlyph provider={row.provider} size={ICON_SIZE.sm} />,
-    [row.provider],
+    () => <ProviderIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />,
+    [ProviderIcon, theme.iconSize.sm, theme.colors.foregroundMuted],
  );
  const trailingSlot = useMemo(
    () =>
@@ -238,10 +178,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 +305,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 +327,18 @@ function GroupProviderButton({ provider, onDrillDown }: GroupProviderButtonProps
  } else if (selection.kind === "loading") {
    stateNode = (
      <View style={styles.rowStateInline}>
-        <View style={styles.rowSpinner}>
-          <ThemedLoadingSpinner size={ICON_SIZE.sm} uniProps={foregroundMutedMapping} />
-        </View>
+        <ActivityIndicator
+          size="small"
+          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 +346,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 +446,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 +477,7 @@ function SelectorContent({
  onRetryProvider,
  isRetryingProvider,
 }: SelectorContentProps) {
+  const { theme } = useUnistyles();
  const { t } = useTranslation();
  const normalizedQuery = useMemo(() => normalizeSearchQuery(searchQuery), [searchQuery]);
  const selectedViewProvider = useMemo(
@@ -533,7 +501,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 +514,11 @@ function SelectorContent({
    if (drillSelection.kind === "loading") {
      return (
        <View style={styles.emptyState}>
-          <View style={styles.rowSpinner}>
-            <ThemedLoadingSpinner size={ICON_SIZE.sm} uniProps={foregroundMutedMapping} />
-          </View>
+          <ActivityIndicator
+            size="small"
+            color={theme.colors.foregroundMuted}
+            style={styles.rowSpinner}
+          />
          <Text style={styles.emptyStateText}>{t("modelSelector.loadingShort")}</Text>
        </View>
      );
@@ -615,10 +585,9 @@ 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 +643,7 @@ export function CombinedModelSelector({
  );

  const hasSelectedProvider = selectedProvider.trim().length > 0;
+  const ProviderIcon = hasSelectedProvider ? getProviderIcon(selectedProvider) : null;

  const selectedModelLabel = useMemo(() => {
    return resolveSelectedModelLabel({
@@ -780,6 +750,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 +763,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 +789,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 (
@@ -854,8 +835,8 @@ export function CombinedModelSelector({
          accessibilityLabel={t("modelSelector.selectedModel", { model: selectedModelLabel })}
          testID="combined-model-selector"
        >
-          {hasSelectedProvider ? (
-            <ProviderGlyph provider={selectedProvider} size={ICON_SIZE.md} />
+          {ProviderIcon ? (
+            <ProviderIcon size={theme.iconSize.md} color={theme.colors.foregroundMuted} />
          ) : null}
          <Text style={styles.triggerText} numberOfLines={1} ellipsizeMode="tail">
            {triggerLabel}
@@ -869,8 +850,8 @@ export function CombinedModelSelector({
        open={isOpen}
        onOpenChange={handleOpenChange}
        anchorRef={anchorRef}
-        desktopPlacement={desktopPlacement}
-        desktopMinWidth={desktopMinWidth}
+        desktopPlacement="top-start"
+        desktopMinWidth={360}
        desktopFixedHeight={desktopFixedHeight}
        header={sheetHeader}
        mobileChildrenScrollEnabled={view.kind !== "provider" || !isNative}
@@ -891,7 +872,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>
        )}
@@ -1063,10 +1044,4 @@ const styles = StyleSheet.create((theme) => ({
    color: theme.colors.foregroundMuted,
    fontSize: theme.fontSize.sm,
  },
-  providerIconMuted: {
-    color: theme.colors.foregroundMuted,
-  },
-  providerIconForeground: {
-    color: theme.colors.foreground,
-  },
 }));
@@ -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,
-  },
-}));
@@ -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 }>,
@@ -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 {
-  ADD_HOST_OPTION_ID,
-  ALL_HOSTS_OPTION_ID,
-  ENABLE_BUILT_IN_DAEMON_OPTION_ID,
-  getHostPickerLabel,
-};
+export { ADD_HOST_OPTION_ID, ALL_HOSTS_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}
@@ -0,0 +1,20 @@
+import Svg, { Path } from "react-native-svg";
+
+interface OpenRouterIconProps {
+  size?: number;
+  color?: string;
+}
+
+export function OpenRouterIcon({ size = 16, color = "currentColor" }: OpenRouterIconProps) {
+  return (
+    <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
+      <Path
+        d="M3 7H15.5L21 12L15.5 17H3M10 3V21M15 7V17"
+        stroke={color}
+        strokeWidth={2}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </Svg>
+  );
+}
@@ -385,7 +385,6 @@ function SidebarHostPicker({
      showActiveConnection
      onOpenHostSettings={onOpenHostSettings}
      searchable
-      desktopPlacement="top-start"
      desktopMinWidth={240}
      addHostTestID="sidebar-host-add"
      hostOptionTestID={sidebarHostOptionTestID}
@@ -0,0 +1,212 @@
+import { describe, expect, it } from "vitest";
+import type {
+  PaseoAgentCatalogEntry,
+  RedactedPaseoAgentProviderConfig,
+} from "@getpaseo/protocol/messages";
+
+import {
+  createPaseoAgentProviderInput,
+  getPaseoAgentApiKeyAuth,
+  getPaseoAgentOAuthAuth,
+  isPaseoAgentCatalogEntrySupported,
+  nextPaseoAgentProviderName,
+  parsePaseoAgentModelIds,
+  paseoAgentAuthBadge,
+  paseoAgentProviderLabel,
+  preferredPaseoAgentOAuthMode,
+} from "./paseo-agent-settings-sheet-model";
+
+function catalogEntry(overrides: Partial<PaseoAgentCatalogEntry>): PaseoAgentCatalogEntry {
+  return {
+    id: "catalog-alpha",
+    label: "Catalog Alpha",
+    api: "responses",
+    baseUrl: "https://alpha.example.test",
+    auth: { kind: "api_key", envVar: "ALPHA_API_KEY" },
+    models: [{ id: "alpha-fast", label: "Alpha Fast", reasoning: true }],
+    ...overrides,
+  };
+}
+
+function providerConfig(
+  overrides: Partial<RedactedPaseoAgentProviderConfig>,
+): RedactedPaseoAgentProviderConfig {
+  return {
+    name: "catalog-alpha",
+    providerType: "catalog-alpha",
+    models: [{ id: "alpha-fast" }],
+    available: true,
+    ...overrides,
+  };
+}
+
+describe("paseo-agent-settings-sheet-model", () => {
+  it("recognizes supported catalog auth manifests", () => {
+    const apiKeyEntry = catalogEntry({
+      auth: {
+        kind: "api_key",
+        envVar: "ALPHA_API_KEY",
+        keyUrl: "https://alpha.example.test/key",
+        placeholder: "alpha-key",
+        hint: "Paste the key from Alpha",
+      },
+    });
+    const oauthEntry = catalogEntry({
+      auth: { kind: "oauth", flow: "alpha-oauth" },
+    });
+
+    expect(getPaseoAgentApiKeyAuth(apiKeyEntry)).toEqual({
+      kind: "api_key",
+      envVar: "ALPHA_API_KEY",
+      keyUrl: "https://alpha.example.test/key",
+      placeholder: "alpha-key",
+      hint: "Paste the key from Alpha",
+    });
+    expect(getPaseoAgentOAuthAuth(oauthEntry)).toEqual({
+      kind: "oauth",
+      flow: "alpha-oauth",
+    });
+    expect(isPaseoAgentCatalogEntrySupported(apiKeyEntry)).toBe(true);
+    expect(isPaseoAgentCatalogEntrySupported(oauthEntry)).toBe(true);
+  });
+
+  it("keeps unknown catalog auth kinds visible but unsupported", () => {
+    const entry = catalogEntry({ auth: { kind: "future_auth", prompt: "later" } });
+
+    expect(getPaseoAgentApiKeyAuth(entry)).toBeNull();
+    expect(getPaseoAgentOAuthAuth(entry)).toBeNull();
+    expect(isPaseoAgentCatalogEntrySupported(entry)).toBe(false);
+  });
+
+  it("prefers device-code OAuth only for a relay connection", () => {
+    expect(preferredPaseoAgentOAuthMode({ type: "relay" })).toBe("device_code");
+    expect(preferredPaseoAgentOAuthMode({ type: "directSocket" })).toBe("browser");
+    expect(preferredPaseoAgentOAuthMode({ type: "directPipe" })).toBe("browser");
+    expect(preferredPaseoAgentOAuthMode({ type: "directTcp" })).toBe("browser");
+    expect(preferredPaseoAgentOAuthMode(null)).toBe("browser");
+  });
+
+  it("parses model ids from comma and newline separated input", () => {
+    expect(
+      parsePaseoAgentModelIds(`
+        alpha/fast, beta/steady
+        alpha/fast
+        gamma/deep
+      `),
+    ).toEqual(["alpha/fast", "beta/steady", "gamma/deep"]);
+  });
+
+  it("uses the catalog label for the first provider instance", () => {
+    expect(nextPaseoAgentProviderName(catalogEntry({ label: "Acme Cloud" }), [])).toBe(
+      "Acme Cloud",
+    );
+  });
+
+  it("numbers later provider instances from the catalog label", () => {
+    expect(
+      nextPaseoAgentProviderName(catalogEntry({ label: "Acme Cloud" }), [
+        providerConfig({ name: "Acme Cloud" }),
+        providerConfig({ name: "Acme Cloud (1)" }),
+      ]),
+    ).toBe("Acme Cloud (2)");
+  });
+
+  it("builds a generic provider payload with a trimmed explicit key", () => {
+    expect(
+      createPaseoAgentProviderInput({
+        entry: catalogEntry({ id: "catalog-beta" }),
+        name: " beta-main ",
+        apiKey: " beta-secret ",
+      }),
+    ).toEqual({
+      name: "beta-main",
+      providerType: "catalog-beta",
+      options: {
+        apiKey: "beta-secret",
+        models: [{ id: "alpha-fast", label: "Alpha Fast", reasoning: true }],
+      },
+    });
+  });
+
+  it("builds a generic provider payload with custom model ids", () => {
+    expect(
+      createPaseoAgentProviderInput({
+        entry: catalogEntry({ models: [] }),
+        name: "alpha-main",
+        apiKey: "alpha-secret",
+        modelIds: ["alpha/fast", "beta/steady"],
+      }),
+    ).toEqual({
+      name: "alpha-main",
+      providerType: "catalog-alpha",
+      options: {
+        apiKey: "alpha-secret",
+        models: [{ id: "alpha/fast" }, { id: "beta/steady" }],
+      },
+    });
+  });
+
+  it("omits model overrides when the catalog has no defaults", () => {
+    expect(
+      createPaseoAgentProviderInput({
+        entry: catalogEntry({ models: [] }),
+        name: "alpha-main",
+        apiKey: "alpha-secret",
+      }),
+    ).toEqual({
+      name: "alpha-main",
+      providerType: "catalog-alpha",
+      options: {
+        apiKey: "alpha-secret",
+      },
+    });
+  });
+
+  it("builds a generic provider payload with an env reference for an empty key", () => {
+    expect(
+      createPaseoAgentProviderInput({
+        entry: catalogEntry({ auth: { kind: "api_key", envVar: "BETA_API_KEY" } }),
+        name: "beta-main",
+        apiKey: "  ",
+      }),
+    ).toEqual({
+      name: "beta-main",
+      providerType: "catalog-alpha",
+      options: {
+        apiKey: "$BETA_API_KEY",
+        models: [{ id: "alpha-fast", label: "Alpha Fast", reasoning: true }],
+      },
+    });
+  });
+
+  it("builds an oauth provider payload without key material", () => {
+    expect(
+      createPaseoAgentProviderInput({
+        entry: catalogEntry({ auth: { kind: "oauth", flow: "alpha-oauth" } }),
+        name: "alpha-login",
+      }),
+    ).toEqual({
+      name: "alpha-login",
+      providerType: "catalog-alpha",
+      options: {
+        models: [{ id: "alpha-fast", label: "Alpha Fast", reasoning: true }],
+      },
+    });
+  });
+
+  it("uses catalog labels and generic auth badges for instance rows", () => {
+    expect(paseoAgentProviderLabel(providerConfig({}), catalogEntry({}))).toBe("Catalog Alpha");
+    expect(
+      paseoAgentProviderLabel(providerConfig({ providerType: "custom-alpha" }), undefined),
+    ).toBe("custom-alpha");
+    expect(paseoAgentAuthBadge({ kind: "api_key", configured: true })).toEqual({
+      label: "Connected",
+      variant: "success",
+    });
+    expect(paseoAgentAuthBadge({ kind: "oauth", configured: false })).toEqual({
+      label: "Needs attention",
+      variant: "error",
+    });
+    expect(paseoAgentAuthBadge(undefined)).toBeNull();
+  });
+});
@@ -0,0 +1,139 @@
+import type {
+  PaseoAgentCatalogEntry,
+  RedactedPaseoAgentProviderConfig,
+} from "@getpaseo/protocol/messages";
+import type { PaseoAgentSetProviderInput } from "@/hooks/use-paseo-agent-providers";
+
+export interface PaseoAgentApiKeyAuthManifest {
+  kind: "api_key";
+  envVar: string;
+  keyUrl?: string;
+  placeholder?: string;
+  hint?: string;
+}
+
+export interface PaseoAgentOAuthAuthManifest {
+  kind: "oauth";
+  flow: string;
+}
+
+export interface PaseoAgentAuthBadge {
+  label: string;
+  variant: "success" | "error" | "muted";
+}
+
+export type PaseoAgentOAuthMode = "browser" | "device_code";
+
+export interface PaseoAgentOAuthConnectionSignal {
+  type: string;
+}
+
+export function preferredPaseoAgentOAuthMode(
+  activeConnection: PaseoAgentOAuthConnectionSignal | null,
+): PaseoAgentOAuthMode {
+  return activeConnection?.type === "relay" ? "device_code" : "browser";
+}
+
+export function getPaseoAgentApiKeyAuth(
+  entry: PaseoAgentCatalogEntry,
+): PaseoAgentApiKeyAuthManifest | null {
+  if (entry.auth.kind !== "api_key" || typeof entry.auth.envVar !== "string") {
+    return null;
+  }
+  return {
+    kind: "api_key",
+    envVar: entry.auth.envVar,
+    ...(typeof entry.auth.keyUrl === "string" ? { keyUrl: entry.auth.keyUrl } : {}),
+    ...(typeof entry.auth.placeholder === "string" ? { placeholder: entry.auth.placeholder } : {}),
+    ...(typeof entry.auth.hint === "string" ? { hint: entry.auth.hint } : {}),
+  };
+}
+
+export function getPaseoAgentOAuthAuth(
+  entry: PaseoAgentCatalogEntry,
+): PaseoAgentOAuthAuthManifest | null {
+  if (entry.auth.kind !== "oauth" || typeof entry.auth.flow !== "string") {
+    return null;
+  }
+  return { kind: "oauth", flow: entry.auth.flow };
+}
+
+export function isPaseoAgentCatalogEntrySupported(entry: PaseoAgentCatalogEntry): boolean {
+  return getPaseoAgentApiKeyAuth(entry) !== null || getPaseoAgentOAuthAuth(entry) !== null;
+}
+
+export function paseoAgentProviderLabel(
+  provider: RedactedPaseoAgentProviderConfig,
+  catalogEntry: PaseoAgentCatalogEntry | undefined,
+): string {
+  return catalogEntry?.label ?? provider.providerType;
+}
+
+export function paseoAgentAuthBadge(
+  auth: RedactedPaseoAgentProviderConfig["auth"],
+): PaseoAgentAuthBadge | null {
+  if (!auth || auth.kind === "none") {
+    return null;
+  }
+  return auth.configured
+    ? { label: "Connected", variant: "success" }
+    : { label: "Needs attention", variant: "error" };
+}
+
+export function parsePaseoAgentModelIds(raw: string): string[] {
+  const seen = new Set<string>();
+  const ids: string[] = [];
+  for (const part of raw.split(/[\n,]/)) {
+    const id = part.trim();
+    if (id.length > 0 && !seen.has(id)) {
+      seen.add(id);
+      ids.push(id);
+    }
+  }
+  return ids;
+}
+
+export function nextPaseoAgentProviderName(
+  entry: PaseoAgentCatalogEntry,
+  providers: RedactedPaseoAgentProviderConfig[],
+): string {
+  const baseName = entry.label.trim() || entry.id;
+  const existingNames = new Set(providers.map((provider) => provider.name));
+  if (!existingNames.has(baseName)) {
+    return baseName;
+  }
+
+  for (let index = 1; ; index += 1) {
+    const candidate = `${baseName} (${index})`;
+    if (!existingNames.has(candidate)) {
+      return candidate;
+    }
+  }
+}
+
+export function createPaseoAgentProviderInput(input: {
+  entry: PaseoAgentCatalogEntry;
+  name: string;
+  apiKey?: string;
+  modelIds?: string[];
+}): PaseoAgentSetProviderInput {
+  const apiKeyAuth = getPaseoAgentApiKeyAuth(input.entry);
+  const trimmedKey = input.apiKey?.trim() ?? "";
+  let apiKey: string | undefined;
+  if (apiKeyAuth) {
+    apiKey = trimmedKey.length > 0 ? trimmedKey : `$${apiKeyAuth.envVar}`;
+  }
+  const models =
+    input.modelIds && input.modelIds.length > 0
+      ? input.modelIds.map((id) => ({ id }))
+      : input.entry.models.map((model) => ({ ...model }));
+
+  return {
+    name: input.name.trim(),
+    providerType: input.entry.id,
+    options: {
+      ...(models.length > 0 ? { models } : {}),
+      ...(apiKey ? { apiKey } : {}),
+    },
+  };
+}
@@ -0,0 +1,571 @@
+/**
+ * @vitest-environment jsdom
+ */
+import React, { type ReactNode } from "react";
+import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type {
+  PaseoAgentCatalogEntry,
+  RedactedPaseoAgentProviderConfig,
+} from "@getpaseo/protocol/messages";
+import type {
+  PaseoAgentOAuthCompleteResult,
+  PaseoAgentOAuthStartResult,
+  PaseoAgentSetProviderInput,
+} from "@/hooks/use-paseo-agent-providers";
+
+interface PaseoAgentProvidersHookMock {
+  supported: boolean;
+  catalogSupported: boolean;
+  providers: RedactedPaseoAgentProviderConfig[];
+  catalog: PaseoAgentCatalogEntry[];
+  defaultModel: string | null;
+  isLoading: boolean;
+  isCatalogLoading: boolean;
+  error: string | null;
+  catalogError: string | null;
+  refresh: () => Promise<void>;
+  setProvider: (
+    input: PaseoAgentSetProviderInput,
+  ) => Promise<RedactedPaseoAgentProviderConfig | null>;
+  startOAuth: (name: string, mode?: string) => Promise<PaseoAgentOAuthStartResult>;
+  completeOAuth: (name: string) => Promise<PaseoAgentOAuthCompleteResult>;
+}
+
+const { hookState, hostRuntimeSnapshot, openExternalUrls, theme } = vi.hoisted(() => {
+  const initialHookState: { current: PaseoAgentProvidersHookMock } = {
+    current: {
+      supported: true,
+      catalogSupported: true,
+      providers: [] as RedactedPaseoAgentProviderConfig[],
+      catalog: [] as PaseoAgentCatalogEntry[],
+      defaultModel: null as string | null,
+      isLoading: false,
+      isCatalogLoading: false,
+      error: null as string | null,
+      catalogError: null as string | null,
+      refresh: vi.fn(async () => undefined),
+      setProvider: vi.fn(async () => null as RedactedPaseoAgentProviderConfig | null),
+      startOAuth: vi.fn(
+        async (): Promise<PaseoAgentOAuthStartResult> => ({
+          requestId: "oauth-start",
+          success: true,
+          name: "catalog-login",
+          authorization: null,
+          error: null,
+        }),
+      ),
+      completeOAuth: vi.fn(
+        async (): Promise<PaseoAgentOAuthCompleteResult> => ({
+          requestId: "oauth-complete",
+          success: true,
+          name: "catalog-login",
+          auth: { kind: "oauth", configured: true },
+          error: null,
+        }),
+      ),
+    },
+  };
+
+  return {
+    hookState: initialHookState,
+    hostRuntimeSnapshot: {
+      current: {
+        activeConnection: { type: "directSocket", endpoint: "socket", display: "socket" },
+      } as {
+        activeConnection: { type: string; endpoint: string; display: string } | null;
+      } | null,
+    },
+    openExternalUrls: [] as string[],
+    theme: {
+      spacing: { 1: 4, 2: 8, 3: 12, 4: 16 },
+      borderRadius: { md: 6, lg: 8 },
+      fontSize: { xs: 11, sm: 13, base: 15 },
+      fontWeight: { normal: "400", medium: "500" },
+      opacity: { 50: 0.5 },
+      colors: {
+        foreground: "#fff",
+        foregroundMuted: "#aaa",
+        surface1: "#111",
+        surface2: "#222",
+        border: "#444",
+        destructive: "#f00",
+        statusSuccess: "#0f0",
+      },
+    },
+  };
+});
+
+vi.mock("react-native", () => ({
+  View: ({
+    children,
+    testID,
+    role,
+    accessibilityRole,
+    accessibilityLabel,
+  }: {
+    children?: ReactNode;
+    testID?: string;
+    role?: string;
+    accessibilityRole?: string;
+    accessibilityLabel?: string;
+  }) =>
+    React.createElement(
+      "div",
+      {
+        "data-testid": testID,
+        role: role ?? accessibilityRole,
+        "aria-label": accessibilityLabel,
+      },
+      children,
+    ),
+  Text: ({ children, testID }: { children?: ReactNode; testID?: string; numberOfLines?: number }) =>
+    React.createElement("span", { "data-testid": testID }, children),
+}));
+
+vi.mock("react-native-unistyles", () => ({
+  StyleSheet: {
+    create: (factory: unknown) =>
+      typeof factory === "function" ? (factory as (t: typeof theme) => unknown)(theme) : factory,
+  },
+  withUnistyles:
+    (Component: React.ComponentType<Record<string, unknown>>) =>
+    ({
+      uniProps,
+      ...rest
+    }: {
+      uniProps?: (theme: unknown) => Record<string, unknown>;
+    } & Record<string, unknown>) => {
+      const themed = uniProps ? uniProps(theme) : {};
+      return React.createElement(Component, { ...rest, ...themed });
+    },
+}));
+
+vi.mock("lucide-react-native", () => {
+  const icon = (name: string) => {
+    const Icon = () => React.createElement("span", { "data-icon": name });
+    Icon.displayName = name;
+    return Icon;
+  };
+  return {
+    Bot: icon("Bot"),
+    Plus: icon("Plus"),
+  };
+});
+
+vi.mock("@/components/adaptive-modal-sheet", () => ({
+  AdaptiveModalSheet: ({
+    visible,
+    header,
+    children,
+    footer,
+    testID,
+  }: {
+    visible: boolean;
+    header?: { title: string; back?: { label?: string; onPress: () => void } };
+    children: ReactNode;
+    footer?: ReactNode;
+    testID?: string;
+  }) =>
+    visible ? (
+      <section data-testid={testID}>
+        <h1>{header?.title}</h1>
+        {header?.back ? (
+          <button type="button" onClick={header.back.onPress}>
+            {header.back.label ?? "Back"}
+          </button>
+        ) : null}
+        {children}
+        {footer ? <footer>{footer}</footer> : null}
+      </section>
+    ) : null,
+  AdaptiveTextInput: ({
+    value,
+    onChangeText,
+    accessibilityLabel,
+    testID,
+    placeholder,
+    secureTextEntry,
+    editable = true,
+    multiline,
+  }: {
+    value?: string;
+    onChangeText?: (value: string) => void;
+    accessibilityLabel?: string;
+    testID?: string;
+    placeholder?: string;
+    secureTextEntry?: boolean;
+    editable?: boolean;
+    multiline?: boolean;
+  }) => {
+    function handleChange(event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>): void {
+      onChangeText?.(event.currentTarget.value);
+    }
+
+    const inputProps = {
+      "aria-label": accessibilityLabel,
+      "data-testid": testID,
+      disabled: !editable,
+      onChange: handleChange,
+      placeholder,
+      value: value ?? "",
+    };
+
+    if (multiline) {
+      return React.createElement("textarea", inputProps);
+    }
+
+    return React.createElement("input", {
+      ...inputProps,
+      type: secureTextEntry ? "password" : "text",
+    });
+  },
+}));
+
+vi.mock("@/components/provider-icons", () => ({
+  getProviderIcon: (provider: string) => () =>
+    React.createElement("span", { "data-icon": `provider-${provider}` }),
+}));
+
+vi.mock("@/components/provider-icon-name", () => ({
+  resolveProviderIconName: (provider: string) =>
+    provider === "known-icon" ? { kind: "builtin", id: provider } : { kind: "bot" },
+}));
+
+vi.mock("@/components/ui/external-link", () => ({
+  ExternalLink: ({
+    href,
+    label,
+    testID,
+    accessibilityLabel,
+  }: {
+    href: string;
+    label: string;
+    testID?: string;
+    accessibilityLabel?: string;
+  }) => (
+    <a href={href} data-testid={testID} aria-label={accessibilityLabel ?? label}>
+      {label}
+    </a>
+  ),
+}));
+
+vi.mock("@/components/ui/button", () => ({
+  Button: ({
+    children,
+    disabled,
+    onPress,
+    testID,
+  }: {
+    children?: ReactNode;
+    disabled?: boolean;
+    onPress?: () => void;
+    testID?: string;
+  }) => (
+    <button type="button" disabled={disabled} data-testid={testID} onClick={onPress}>
+      {children}
+    </button>
+  ),
+}));
+
+vi.mock("@/components/ui/status-badge", () => ({
+  StatusBadge: ({ label }: { label: string }) => <span>{label}</span>,
+}));
+
+vi.mock("@/hooks/use-paseo-agent-providers", () => ({
+  usePaseoAgentProviders: () => hookState.current,
+}));
+
+vi.mock("@/runtime/host-runtime", () => ({
+  useHostRuntimeSnapshot: () => hostRuntimeSnapshot.current,
+}));
+
+vi.mock("@/utils/open-external-url", () => ({
+  openExternalUrl: async (url: string) => {
+    openExternalUrls.push(url);
+  },
+}));
+
+import { PaseoAgentSettingsSheet } from "./paseo-agent-settings-sheet";
+
+function catalogEntry(overrides: Partial<PaseoAgentCatalogEntry>): PaseoAgentCatalogEntry {
+  return {
+    id: "catalog-alpha",
+    label: "Catalog Alpha",
+    iconName: "known-icon",
+    docsUrl: "https://alpha.example.test/docs",
+    api: "responses",
+    baseUrl: "https://alpha.example.test",
+    auth: { kind: "api_key", envVar: "ALPHA_API_KEY", keyUrl: "https://alpha.example.test/key" },
+    models: [{ id: "alpha-fast", label: "Alpha Fast" }],
+    ...overrides,
+  };
+}
+
+function providerConfig(
+  overrides: Partial<RedactedPaseoAgentProviderConfig>,
+): RedactedPaseoAgentProviderConfig {
+  return {
+    name: "catalog-alpha",
+    providerType: "catalog-alpha",
+    models: [{ id: "alpha-fast" }],
+    auth: { kind: "api_key", configured: true },
+    available: true,
+    ...overrides,
+  };
+}
+
+function renderSheet() {
+  return render(<PaseoAgentSettingsSheet serverId="server-1" visible onClose={vi.fn()} />);
+}
+
+function resetHookState() {
+  hookState.current.supported = true;
+  hookState.current.catalogSupported = true;
+  hookState.current.providers = [];
+  hookState.current.catalog = [];
+  hookState.current.defaultModel = null;
+  hookState.current.isLoading = false;
+  hookState.current.isCatalogLoading = false;
+  hookState.current.error = null;
+  hookState.current.catalogError = null;
+  hookState.current.refresh = vi.fn(async () => undefined);
+  hookState.current.setProvider = vi.fn(async () => providerConfig({}));
+  hookState.current.startOAuth = vi.fn(async () => ({
+    requestId: "oauth-start",
+    success: true,
+    name: "catalog-login",
+    authorization: null,
+    error: null,
+  }));
+  hookState.current.completeOAuth = vi.fn(async () => ({
+    requestId: "oauth-complete",
+    success: true,
+    name: "catalog-login",
+    auth: { kind: "oauth", configured: true },
+    error: null,
+  }));
+  hostRuntimeSnapshot.current = {
+    activeConnection: { type: "directSocket", endpoint: "socket", display: "socket" },
+  };
+  openExternalUrls.splice(0);
+}
+
+describe("PaseoAgentSettingsSheet", () => {
+  beforeEach(() => {
+    resetHookState();
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  it("shows the catalog feature-gate message exactly once", () => {
+    hookState.current.catalogSupported = false;
+
+    renderSheet();
+
+    expect(screen.getAllByText("Update the Paseo daemon to use this.")).toHaveLength(1);
+    expect(screen.queryByRole("button", { name: "Add model provider" })).toBeNull();
+  });
+
+  it("lists catalog entries in the provider picker and disables unknown auth kinds", () => {
+    hookState.current.catalog = [
+      catalogEntry({ label: "Alpha Provider" }),
+      catalogEntry({
+        id: "catalog-future",
+        label: "Future Provider",
+        auth: { kind: "future_auth", prompt: "not yet" },
+      }),
+    ];
+
+    renderSheet();
+    fireEvent.click(screen.getByRole("button", { name: "Add model provider" }));
+
+    expect(screen.getByText("Alpha Provider")).toBeTruthy();
+    expect(screen.getByText("Future Provider")).toBeTruthy();
+    expect(screen.getByTestId("paseo-agent-catalog-docs-catalog-alpha").getAttribute("href")).toBe(
+      "https://alpha.example.test/docs",
+    );
+    expect(screen.getByText("Update the app to use this provider")).toBeTruthy();
+    expect(
+      (screen.getByTestId("paseo-agent-catalog-select-catalog-future") as HTMLButtonElement)
+        .disabled,
+    ).toBe(true);
+  });
+
+  it("submits an api-key provider with an explicit key", async () => {
+    hookState.current.catalog = [catalogEntry({ models: [] })];
+
+    renderSheet();
+    fireEvent.click(screen.getByRole("button", { name: "Add model provider" }));
+    fireEvent.click(screen.getByTestId("paseo-agent-catalog-select-catalog-alpha"));
+    expect(screen.queryByLabelText("Provider name")).toBeNull();
+    expect(screen.queryByLabelText("Models")).toBeNull();
+    fireEvent.change(screen.getByLabelText("API key"), {
+      target: { value: " alpha-secret " },
+    });
+    fireEvent.click(screen.getByRole("button", { name: "Save provider" }));
+
+    await waitFor(() => {
+      expect(hookState.current.setProvider).toHaveBeenCalledWith({
+        name: "Catalog Alpha",
+        providerType: "catalog-alpha",
+        options: {
+          apiKey: "alpha-secret",
+        },
+      } satisfies PaseoAgentSetProviderInput);
+    });
+  });
+
+  it("submits an empty api-key field as a host env reference", async () => {
+    hookState.current.catalog = [catalogEntry({})];
+
+    renderSheet();
+    fireEvent.click(screen.getByRole("button", { name: "Add model provider" }));
+    fireEvent.click(screen.getByTestId("paseo-agent-catalog-select-catalog-alpha"));
+    fireEvent.click(screen.getByRole("button", { name: "Save provider" }));
+
+    await waitFor(() => {
+      expect(hookState.current.setProvider).toHaveBeenCalledWith({
+        name: "Catalog Alpha",
+        providerType: "catalog-alpha",
+        options: {
+          apiKey: "$ALPHA_API_KEY",
+          models: [{ id: "alpha-fast", label: "Alpha Fast" }],
+        },
+      } satisfies PaseoAgentSetProviderInput);
+    });
+  });
+
+  it("starts browser oauth, opens the returned auth URL, and renders it by authorization kind", async () => {
+    hookState.current.catalog = [
+      catalogEntry({
+        id: "catalog-login",
+        label: "Catalog Login",
+        auth: { kind: "oauth", flow: "login-flow" },
+      }),
+    ];
+    hookState.current.startOAuth = vi.fn(async () => ({
+      requestId: "oauth-start",
+      success: true,
+      name: "catalog-login",
+      authorization: {
+        kind: "auth_url",
+        url: "https://login.example.test/oauth/authorize?state=abc",
+        instructions: "Open the sign-in page",
+      },
+      error: null,
+    }));
+
+    renderSheet();
+    fireEvent.click(screen.getByRole("button", { name: "Add model provider" }));
+    fireEvent.click(screen.getByTestId("paseo-agent-catalog-select-catalog-login"));
+    fireEvent.click(screen.getByRole("button", { name: "Sign in with browser" }));
+
+    await waitFor(() => {
+      expect(openExternalUrls).toEqual(["https://login.example.test/oauth/authorize?state=abc"]);
+      expect(hookState.current.startOAuth).toHaveBeenCalledWith("Catalog Login", "browser");
+    });
+    expect(screen.getByText("https://login.example.test/oauth/authorize?state=abc")).toBeTruthy();
+    expect(screen.getByTestId("paseo-agent-oauth-url").getAttribute("href")).toBe(
+      "https://login.example.test/oauth/authorize?state=abc",
+    );
+  });
+
+  it("renders a device-code oauth authorization and completes it", async () => {
+    hookState.current.catalog = [
+      catalogEntry({
+        id: "catalog-login",
+        label: "Catalog Login",
+        auth: { kind: "oauth", flow: "login-flow" },
+      }),
+    ];
+    hookState.current.startOAuth = vi.fn(async () => ({
+      requestId: "oauth-start",
+      success: true,
+      name: "catalog-login",
+      authorization: {
+        kind: "device_code",
+        userCode: "CODE-123",
+        verificationUri: "https://login.example.test/device",
+        intervalSeconds: 5,
+        expiresInSeconds: 600,
+        instructions: "Enter the code",
+      },
+      error: null,
+    }));
+
+    renderSheet();
+    fireEvent.click(screen.getByRole("button", { name: "Add model provider" }));
+    fireEvent.click(screen.getByTestId("paseo-agent-catalog-select-catalog-login"));
+    fireEvent.click(screen.getByRole("button", { name: "Use a code instead" }));
+
+    expect((await screen.findByTestId("paseo-agent-oauth-user-code")).textContent).toBe("CODE-123");
+    expect(screen.getByText("https://login.example.test/device")).toBeTruthy();
+    fireEvent.click(screen.getByRole("button", { name: "Complete sign in" }));
+
+    await waitFor(() => {
+      expect(hookState.current.setProvider).toHaveBeenCalledWith({
+        name: "Catalog Login",
+        providerType: "catalog-login",
+        options: {
+          models: [{ id: "alpha-fast", label: "Alpha Fast" }],
+        },
+      } satisfies PaseoAgentSetProviderInput);
+      expect(hookState.current.startOAuth).toHaveBeenCalledWith("Catalog Login", "device_code");
+      expect(hookState.current.completeOAuth).toHaveBeenCalledWith("Catalog Login");
+    });
+  });
+
+  it("offers device-code first over relay while keeping browser available", () => {
+    hostRuntimeSnapshot.current = {
+      activeConnection: { type: "relay", endpoint: "relay.example.test:443", display: "relay" },
+    };
+    hookState.current.catalog = [
+      catalogEntry({
+        id: "catalog-login",
+        label: "Catalog Login",
+        auth: { kind: "oauth", flow: "login-flow" },
+      }),
+    ];
+
+    renderSheet();
+    fireEvent.click(screen.getByRole("button", { name: "Add model provider" }));
+    fireEvent.click(screen.getByTestId("paseo-agent-catalog-select-catalog-login"));
+
+    const actionButtons = screen
+      .getByTestId("paseo-agent-oauth-sign-in")
+      .querySelectorAll("button");
+    expect(Array.from(actionButtons).map((button) => button.textContent)).toEqual([
+      "Providers",
+      "Cancel",
+      "Use a code instead",
+      "Sign in with browser",
+    ]);
+  });
+
+  it("shows auth-state badges from configured instances", () => {
+    hookState.current.catalog = [
+      catalogEntry({ id: "catalog-alpha", label: "Catalog Alpha" }),
+      catalogEntry({ id: "catalog-beta", label: "Catalog Beta" }),
+    ];
+    hookState.current.providers = [
+      providerConfig({ name: "alpha", providerType: "catalog-alpha" }),
+      providerConfig({
+        name: "beta",
+        providerType: "catalog-beta",
+        auth: { kind: "api_key", configured: false },
+      }),
+      providerConfig({ name: "legacy", providerType: "legacy-provider", auth: undefined }),
+    ];
+
+    renderSheet();
+
+    expect(screen.getByText("Catalog Alpha · 1 model")).toBeTruthy();
+    expect(screen.getByText("Catalog Beta · 1 model")).toBeTruthy();
+    expect(screen.getByText("legacy-provider · 1 model")).toBeTruthy();
+    expect(screen.getByText("Connected")).toBeTruthy();
+    expect(screen.getByText("Needs attention")).toBeTruthy();
+  });
+});
@@ -13,6 +13,17 @@ describe("resolveProviderIconName", () => {
    expect(resolveProviderIconName("claude")).toEqual({ kind: "builtin", id: "claude" });
    expect(resolveProviderIconName("omp")).toEqual({ kind: "builtin", id: "omp" });
    expect(resolveProviderIconName("minimax")).toEqual({ kind: "builtin", id: "minimax" });
+    expect(resolveProviderIconName("paseo")).toEqual({ kind: "builtin", id: "paseo" });
+  });
+
+  it("resolves Paseo Agent model-provider catalog icon names", () => {
+    expect(resolveProviderIconName("openai")).toEqual({ kind: "builtin", id: "openai" });
+    expect(resolveProviderIconName("openrouter")).toEqual({
+      kind: "builtin",
+      id: "openrouter",
+    });
+    expect(resolveProviderIconName("kimi")).toEqual({ kind: "catalog", id: "kimi" });
+    expect(resolveProviderIconName("opencode")).toEqual({ kind: "builtin", id: "opencode" });
  });

  it("returns the catalog identifier for ACP catalog provider ids that ship an icon", () => {
@@ -6,7 +6,9 @@ import { CodexIcon } from "@/components/icons/codex-icon";
 import { CopilotIcon } from "@/components/icons/copilot-icon";
 import { MiniMaxIcon } from "@/components/icons/minimax-icon";
 import { OpenCodeIcon } from "@/components/icons/opencode-icon";
+import { OpenRouterIcon } from "@/components/icons/openrouter-icon";
 import { OmpIcon } from "@/components/icons/omp-icon";
+import { PaseoLogo } from "@/components/icons/paseo-logo";
 import { PiIcon } from "@/components/icons/pi-icon";
 import { ACP_PROVIDER_CATALOG } from "@/data/acp-provider-catalog";
 import { resolveProviderIconName } from "@/components/provider-icon-name";
@@ -25,7 +27,10 @@ const BUILTIN_PROVIDER_ICONS: Record<string, ProviderIconComponent> = {
  kiro: PackagePlus,
  minimax: MiniMaxIcon as unknown as ProviderIconComponent,
  omp: OmpIcon as unknown as ProviderIconComponent,
+  openai: CodexIcon as unknown as ProviderIconComponent,
  opencode: OpenCodeIcon as unknown as ProviderIconComponent,
+  openrouter: OpenRouterIcon as unknown as ProviderIconComponent,
+  paseo: PaseoLogo as unknown as ProviderIconComponent,
  pi: PiIcon as unknown as ProviderIconComponent,
 };

@@ -1,7 +1,10 @@
 import { useCallback } from "react";
+import { PaseoAgentSettingsSheet } from "@/components/paseo-agent-settings-sheet";
 import { ProviderDiagnosticSheet } from "@/components/provider-diagnostic-sheet";
 import { useProviderSettingsStore } from "@/stores/provider-settings-store";

+const PASEO_AGENT_PROVIDER = "paseo";
+
 export function ProviderSettingsHost() {
  const serverId = useProviderSettingsStore((state) => state.serverId);
  const provider = useProviderSettingsStore((state) => state.provider);
@@ -16,6 +19,10 @@ export function ProviderSettingsHost() {
    return null;
  }

+  if (provider === PASEO_AGENT_PROVIDER) {
+    return <PaseoAgentSettingsSheet serverId={serverId} visible={visible} onClose={handleClose} />;
+  }
+
  return (
    <ProviderDiagnosticSheet
      key={`${serverId}:${provider}`}
@@ -1,142 +1,375 @@
-import { useCallback, useMemo, useReducer, useState, type ReactNode } from "react";
-import { Text, View } from "react-native";
+import { type ReactNode, useCallback, useMemo, useReducer, useRef, useState } from "react";
+import { Pressable, Text, View } from "react-native";
+import type { PressableStateCallbackType } 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 { AdaptiveTextInput } from "@/components/adaptive-modal-sheet";
+import { SegmentedControl } from "@/components/ui/segmented-control";
+import { isWeb } from "@/constants/platform";
 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";
+  describeCron,
+  everyMsToParts,
+  type IntervalUnit,
+  partsToEveryMs,
+  validateCron,
+} from "@/utils/schedule-format";
+import type { ScheduleCadence } from "@getpaseo/protocol/schedule/types";

-type CronCadence = Extract<ScheduleCadence, { type: "cron" }>;
+type CadenceMode = ScheduleCadence["type"];
+
+interface CronPreset {
+  label: string;
+  expression: string;
+}
+
+// 5-field expressions evaluated in UTC by the daemon. Each one round-trips
+// through describeCron() so the chip and the live preview agree.
+const CRON_PRESETS: CronPreset[] = [
+  { label: "Every hour", expression: "0 * * * *" },
+  { label: "Daily 9:00", expression: "0 9 * * *" },
+  { label: "Weekdays 9:00", expression: "0 9 * * 1-5" },
+  { label: "Mondays 9:00", expression: "0 9 * * 1" },
+];
+
+const MODE_OPTIONS = [
+  { value: "every" as const, label: "Interval" },
+  { value: "cron" as const, label: "Cron" },
+];
+
+const UNIT_OPTIONS = [
+  { value: "minutes" as const, label: "Minutes" },
+  { value: "hours" as const, label: "Hours" },
+  { value: "days" as const, label: "Days" },
+];
+
+const DEFAULT_INTERVAL_MS = partsToEveryMs(1, "hours");
+const DEFAULT_CRON_EXPRESSION = "0 9 * * *";
+
+const UNIT_NOUN: Record<IntervalUnit, string> = {
+  minutes: "minute",
+  hours: "hour",
+  days: "day",
+};
+
+function describeInterval(value: number, unit: IntervalUnit): string {
+  const noun = UNIT_NOUN[unit];
+  if (value === 1) {
+    return `Runs every ${noun}`;
+  }
+  return `Runs every ${value} ${noun}s`;
+}

 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}`,
-}));
+export function CadenceEditor({ value, onChange, error }: CadenceEditorProps) {
+  const mode = value.type;

-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],
+  // The numeric/text fields are native-owned (AdaptiveTextInput). We seed them
+  // once from the incoming cadence via lazy state initializers and bump
+  // resetKey only when we change the content ourselves (mode switch, preset
+  // chip) — never on every keystroke.
+  const [intervalValueText, setIntervalValueText] = useState(() =>
+    String(everyMsToParts(value.type === "every" ? value.everyMs : DEFAULT_INTERVAL_MS).value),
  );
-  const selectedPresetId = resolveCronPresetId(currentCadence);
-  const selectedPresetDisplay = resolveCronPresetDisplay(currentCadence);
+  const [intervalUnit, setIntervalUnit] = useState<IntervalUnit>(
+    () => everyMsToParts(value.type === "every" ? value.everyMs : DEFAULT_INTERVAL_MS).unit,
+  );
+  const [cronText, setCronText] = useState(() =>
+    value.type === "cron" ? value.expression : DEFAULT_CRON_EXPRESSION,
+  );
+  const [fieldResetKey, bumpFieldResetKey] = useReducer((key: number) => key + 1, 0);

-  const handlePresetChange = useCallback(
-    (presetId: string) => {
-      const preset = CADENCE_PRESET_OPTIONS.find((option) => option.id === presetId);
-      if (!preset) {
+  // Remember the cron expression the user had so toggling Interval -> Cron and
+  // back does not discard a blanked-out field. Interval mode rebuilds straight
+  // from the live numeric value + unit, so it needs no equivalent ref.
+  const lastCronExpression = useRef(
+    value.type === "cron" ? value.expression : DEFAULT_CRON_EXPRESSION,
+  );
+
+  const parsedIntervalValue = useMemo(() => {
+    const parsed = Number.parseInt(intervalValueText, 10);
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : 1;
+  }, [intervalValueText]);
+
+  const emitInterval = useCallback(
+    (rawValue: number, unit: IntervalUnit) => {
+      onChange({ type: "every", everyMs: partsToEveryMs(rawValue, unit) });
+    },
+    [onChange],
+  );
+
+  const emitCron = useCallback(
+    (expression: string) => {
+      lastCronExpression.current = expression;
+      onChange({ type: "cron", expression });
+    },
+    [onChange],
+  );
+
+  const handleModeChange = useCallback(
+    (nextMode: CadenceMode) => {
+      if (nextMode === mode) {
        return;
      }
-      setCronText(preset.expression);
-      bumpFieldResetKey();
-      onChange(buildCronCadence(preset.expression, cronTimeZone));
+      if (nextMode === "every") {
+        emitInterval(parsedIntervalValue, intervalUnit);
+      } else {
+        emitCron(cronText.trim() || lastCronExpression.current);
+      }
    },
-    [cronTimeZone, onChange],
+    [mode, parsedIntervalValue, intervalUnit, cronText, emitInterval, emitCron],
+  );
+
+  const handleIntervalValueChange = useCallback(
+    (text: string) => {
+      // Keep only digits so the cadence stays a positive integer count.
+      const digits = text.replace(/[^0-9]/g, "");
+      setIntervalValueText(digits);
+      const parsed = Number.parseInt(digits, 10);
+      emitInterval(Number.isFinite(parsed) && parsed > 0 ? parsed : 1, intervalUnit);
+    },
+    [emitInterval, intervalUnit],
+  );
+
+  const handleUnitChange = useCallback(
+    (unit: IntervalUnit) => {
+      setIntervalUnit(unit);
+      emitInterval(parsedIntervalValue, unit);
+    },
+    [emitInterval, parsedIntervalValue],
  );

  const handleCronChange = useCallback(
    (text: string) => {
      setCronText(text);
-      onChange(buildCronCadence(text.trim(), cronTimeZone));
+      emitCron(text.trim());
    },
-    [cronTimeZone, onChange],
+    [emitCron],
  );

-  let feedback: ReactNode = null;
-  if (effectiveError) {
-    feedback = <Text style={styles.error}>{effectiveError}</Text>;
-  } else if (preview) {
-    feedback = <Text style={styles.preview}>{preview}</Text>;
+  const handlePresetPress = useCallback(
+    (expression: string) => {
+      setCronText(expression);
+      bumpFieldResetKey();
+      emitCron(expression);
+    },
+    [emitCron],
+  );
+
+  const intervalPreview = describeInterval(parsedIntervalValue, intervalUnit);
+  const trimmedCron = cronText.trim();
+  const cronError = trimmedCron ? validateCron(trimmedCron) : null;
+  const cronPreview = cronError ? null : (describeCron(trimmedCron) ?? trimmedCron);
+
+  let cronFeedback: ReactNode = null;
+  if (cronError) {
+    cronFeedback = <Text style={styles.error}>{cronError}</Text>;
+  } else if (cronPreview) {
+    cronFeedback = <Text style={styles.preview}>{cronPreview}</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}
-        />
+    <View style={styles.container}>
+      <SegmentedControl
+        size="sm"
+        value={mode}
+        onValueChange={handleModeChange}
+        options={MODE_OPTIONS}
+        style={styles.modeControl}
+        testID="cadence-mode"
+      />

-        <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>
+      {mode === "every" ? (
+        <View style={styles.section}>
+          <View style={styles.intervalRow}>
+            <AdaptiveTextInput
+              testID="cadence-interval-value"
+              accessibilityLabel="Interval value"
+              initialValue={intervalValueText}
+              resetKey={`cadence-interval-${fieldResetKey}`}
+              value={intervalValueText}
+              onChangeText={handleIntervalValueChange}
+              keyboardType="number-pad"
+              style={styles.intervalInput}
+            />
+            <SegmentedControl
+              size="sm"
+              value={intervalUnit}
+              onValueChange={handleUnitChange}
+              options={UNIT_OPTIONS}
+              style={styles.unitControl}
+              testID="cadence-interval-unit"
+            />
+          </View>
+          <Text style={styles.preview}>{intervalPreview}</Text>
+        </View>
+      ) : (
+        <View style={styles.section}>
+          <View style={styles.presetRow}>
+            {CRON_PRESETS.map((preset) => (
+              <CronPresetChip
+                key={preset.expression}
+                label={preset.label}
+                expression={preset.expression}
+                isSelected={trimmedCron === preset.expression}
+                onSelect={handlePresetPress}
+              />
+            ))}
+          </View>
+          <AdaptiveTextInput
+            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}
+          />
+          {cronFeedback}
+          <Text style={styles.hint}>Times are in UTC</Text>
+        </View>
+      )}
+
+      {error ? <Text style={styles.error}>{error}</Text> : null}
+    </View>
  );
 }

+function CronPresetChip({
+  label,
+  expression,
+  isSelected,
+  onSelect,
+}: {
+  label: string;
+  expression: string;
+  isSelected: boolean;
+  onSelect: (expression: string) => void;
+}) {
+  const handlePress = useCallback(() => {
+    onSelect(expression);
+  }, [onSelect, expression]);
+  const chipStyle = useCallback(
+    ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
+      styles.chip,
+      isSelected && styles.chipSelected,
+      !isSelected && (Boolean(hovered) || pressed) && styles.chipHover,
+    ],
+    [isSelected],
+  );
+  const labelStyle = useMemo(
+    () => [styles.chipLabel, isSelected && styles.chipLabelSelected],
+    [isSelected],
+  );
+  const accessibilityState = useMemo(() => ({ selected: isSelected }), [isSelected]);
+  return (
+    <Pressable
+      accessibilityRole="button"
+      accessibilityState={accessibilityState}
+      onPress={handlePress}
+      style={chipStyle}
+    >
+      <Text style={labelStyle} numberOfLines={1}>
+        {label}
+      </Text>
+    </Pressable>
+  );
+}
+
+const MONOSPACE_FONT = isWeb ? "ui-monospace, SFMono-Regular, Menlo, monospace" : "Menlo";
+
 const styles = StyleSheet.create((theme) => ({
-  stack: {
+  container: {
    gap: theme.spacing[3],
  },
+  section: {
+    gap: theme.spacing[3],
+  },
+  intervalRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[3],
+  },
+  intervalInput: {
+    width: 88,
+    minHeight: 44,
+    backgroundColor: theme.colors.surface2,
+    borderRadius: theme.borderRadius.lg,
+    paddingHorizontal: theme.spacing[4],
+    paddingVertical: theme.spacing[3],
+    borderWidth: 1,
+    borderColor: theme.colors.border,
+    fontSize: theme.fontSize.base,
+  },
+  // Both cadence segmented controls hug their options and stand at the form's
+  // field height, so the interval row reads as input + toggle rather than a
+  // full-width track with the controls floating inside it.
+  modeControl: {
+    alignSelf: "flex-start",
+    height: 44,
+  },
+  unitControl: {
+    height: 44,
+  },
+  presetRow: {
+    flexDirection: "row",
+    flexWrap: "wrap",
+    gap: theme.spacing[2],
+  },
+  chip: {
+    minHeight: 32,
+    alignItems: "center",
+    justifyContent: "center",
+    paddingHorizontal: theme.spacing[3],
+    paddingVertical: theme.spacing[2],
+    borderRadius: theme.borderRadius.lg,
+    borderWidth: 1,
+    borderColor: theme.colors.border,
+    backgroundColor: theme.colors.surface2,
+  },
+  chipHover: {
+    backgroundColor: theme.colors.surface3,
+  },
+  chipSelected: {
+    backgroundColor: theme.colors.accent,
+    borderColor: theme.colors.accent,
+  },
+  chipLabel: {
+    fontSize: theme.fontSize.xs,
+    fontWeight: theme.fontWeight.medium,
+    color: theme.colors.foregroundMuted,
+  },
+  chipLabelSelected: {
+    color: theme.colors.accentForeground,
+  },
  cronInput: {
-    fontFamily: theme.fontFamily.mono,
+    minHeight: 44,
+    backgroundColor: theme.colors.surface2,
+    borderRadius: theme.borderRadius.lg,
+    paddingHorizontal: theme.spacing[4],
+    paddingVertical: theme.spacing[3],
+    borderWidth: 1,
+    borderColor: theme.colors.border,
+    fontSize: theme.fontSize.sm,
+    fontFamily: MONOSPACE_FONT,
  },
  preview: {
    fontSize: theme.fontSize.xs,
    color: theme.colors.foregroundMuted,
  },
+  hint: {
+    fontSize: theme.fontSize.xs,
+    color: theme.colors.foregroundMuted,
+  },
  error: {
    fontSize: theme.fontSize.xs,
-    color: theme.colors.palette.red[300],
+    color: theme.colors.destructive,
  },
 }));
@@ -15,9 +15,7 @@ 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
@@ -55,62 +53,43 @@ export interface ScheduleRowActions {

 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" };
-  }
+function resolveProvider(schedule: ScheduleSummary): string | null {
+  return schedule.target.type === "new-agent" ? schedule.target.config.provider : null;
 }

-// 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}`);
-    }
+function resolveModelLabel(schedule: ScheduleSummary): string {
+  if (schedule.target.type === "new-agent" && schedule.target.config.model) {
+    return schedule.target.config.model;
  }
-  if (serverName && !singleHost) {
-    parts.unshift(serverName);
+  return "Default model";
+}
+
+function statusVariant(status: ScheduleSummary["status"]): "success" | "muted" {
+  return status === "active" ? "success" : "muted";
+}
+
+function statusLabel(status: ScheduleSummary["status"]): string {
+  if (status === "active") {
+    return "Active";
  }
-  return parts.join(" · ");
+  if (status === "paused") {
+    return "Paused";
+  }
+  return "Completed";
+}
+
+function nextRunLabel(schedule: ScheduleSummary): string {
+  if (schedule.status === "paused") {
+    return "Paused";
+  }
+  if (schedule.status === "completed") {
+    return "Completed";
+  }
+  return formatNextRun(schedule.nextRunAt) || "—";
 }

 /** Small provider glyph. Reads the icon color off a StyleSheet object so the
@@ -134,11 +113,6 @@ function ProviderGlyph({ provider }: { provider: string | null }): ReactElement
 */
 export function ScheduleRow({
  schedule,
-  targetLabel,
-  provider,
-  state,
-  serverName,
-  singleHost,
  pending,
  isFirst,
  onEdit,
@@ -152,10 +126,15 @@ export function ScheduleRow({
  const handlePointerEnter = useCallback(() => setIsHovered(true), []);
  const handlePointerLeave = useCallback(() => setIsHovered(false), []);

+  const provider = resolveProvider(schedule);
  const title = resolveScheduleTitle(schedule);
-  const badge = stateBadge(state);
-  const meta = buildMeta(schedule, state, serverName, singleHost ?? false);
-  const canRun = state === "active" || state === "paused";
+  const meta = [
+    resolveModelLabel(schedule),
+    formatCadence(schedule.cadence),
+    nextRunLabel(schedule),
+  ]
+    .filter(Boolean)
+    .join("  ·  ");

  const rowStyle = useCallback(
    ({ pressed }: PressableStateCallbackType) => [
@@ -189,9 +168,6 @@ export function ScheduleRow({
            <Text style={settingsStyles.rowTitle} numberOfLines={1}>
              {title}
            </Text>
-            <Text style={styles.target} numberOfLines={1}>
-              {targetLabel}
-            </Text>
            <Text style={settingsStyles.rowHint} numberOfLines={1}>
              {meta}
            </Text>
@@ -199,10 +175,12 @@ export function ScheduleRow({
        </View>

        <View style={styles.trailing}>
-          <StatusBadge label={badge.label} variant={badge.variant} />
+          <StatusBadge
+            label={statusLabel(schedule.status)}
+            variant={statusVariant(schedule.status)}
+          />
          <ScheduleKebabMenu
            schedule={schedule}
-            canRun={canRun}
            pending={pending}
            onEdit={onEdit}
            onPause={onPause}
@@ -233,19 +211,13 @@ function renderKebabTriggerIcon({ hovered }: { hovered?: boolean }): ReactElemen

 function ScheduleKebabMenu({
  schedule,
-  canRun,
  pending,
  onEdit,
  onPause,
  onResume,
  onRunNow,
  onDelete,
-}: Pick<
-  ScheduleRowProps,
-  "schedule" | "pending" | "onEdit" | "onPause" | "onResume" | "onRunNow" | "onDelete"
-> & {
-  canRun: boolean;
-}): ReactElement {
+}: Omit<ScheduleRowProps, "isFirst">): ReactElement {
  return (
    <DropdownMenu>
      <DropdownMenuTrigger
@@ -268,7 +240,6 @@ function ScheduleKebabMenu({
        {schedule.status === "paused" ? (
          <DropdownMenuItem
            leading={resumeLeading}
-            disabled={!canRun}
            status={pending?.resume ? "pending" : "idle"}
            pendingLabel="Resuming..."
            onSelect={onResume}
@@ -279,7 +250,7 @@ function ScheduleKebabMenu({
        ) : (
          <DropdownMenuItem
            leading={pauseLeading}
-            disabled={schedule.status === "completed" || !canRun}
+            disabled={schedule.status === "completed"}
            status={pending?.pause ? "pending" : "idle"}
            pendingLabel="Pausing..."
            onSelect={onPause}
@@ -290,7 +261,6 @@ function ScheduleKebabMenu({
        )}
        <DropdownMenuItem
          leading={runLeading}
-          disabled={!canRun}
          status={pending?.runNow ? "pending" : "idle"}
          pendingLabel="Starting..."
          onSelect={onRunNow}
@@ -354,11 +324,6 @@ const styles = StyleSheet.create((theme) => ({
    flex: 1,
    minWidth: 0,
  },
-  target: {
-    marginTop: theme.spacing[1],
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
  trailing: {
    flexDirection: "row",
    alignItems: "center",
@@ -3,48 +3,44 @@ 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;
-}
+import type { ScheduleSummary } from "@getpaseo/protocol/schedule/types";

 interface SchedulesTableProps {
-  rows: ScheduleRowView[];
+  serverId: string;
+  schedules: ScheduleSummary[];
  /**
   * 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
+   * shares the header's "New schedule" button), so the table delegates edit
   * upward rather than mounting a second sheet here.
   */
-  onEditSchedule: (schedule: AggregatedSchedule) => void;
+  onEditSchedule: (schedule: ScheduleSummary) => 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.
+ * The schedules list: a single settings-style card of rows in a centered,
+ * width-constrained reading column, matching the projects list. Owns row-level
+ * actions (pause/resume/run/delete via the mutations hook + a destructive
+ * confirm for delete) and delegates editing to the parent.
 */
-export function SchedulesTable({ rows, onEditSchedule }: SchedulesTableProps): ReactElement {
+export function SchedulesTable({
+  serverId,
+  schedules,
+  onEditSchedule,
+}: SchedulesTableProps): ReactElement {
+  const mutations = useScheduleMutations({ serverId });
+
  return (
    <View style={styles.listContent} testID="schedules-table">
      <View style={settingsStyles.card}>
-        {rows.map((row, index) => (
+        {schedules.map((schedule, index) => (
          <SchedulesTableRow
-            key={`${row.schedule.serverId}:${row.schedule.id}`}
-            row={row}
+            key={schedule.id}
+            schedule={schedule}
            isFirst={index === 0}
+            mutations={mutations}
            onEditSchedule={onEditSchedule}
          />
        ))}
@@ -54,26 +50,28 @@ export function SchedulesTable({ rows, onEditSchedule }: SchedulesTableProps): R
 }

 // ---------------------------------------------------------------------------
-// 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).
+// Per-row wrapper owns local in-flight state and binds the table's mutation
+// callbacks to this schedule. 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).
 // ---------------------------------------------------------------------------

+type ScheduleMutations = ReturnType<typeof useScheduleMutations>;
+
 const NO_PENDING: ScheduleRowPending = {};

 function SchedulesTableRow({
-  row,
+  schedule,
  isFirst,
+  mutations,
  onEditSchedule,
 }: {
-  row: ScheduleRowView;
+  schedule: ScheduleSummary;
  isFirst: boolean;
-  onEditSchedule: (schedule: AggregatedSchedule) => void;
+  mutations: ScheduleMutations;
+  onEditSchedule: (schedule: ScheduleSummary) => void;
 }): ReactElement {
-  const { schedule } = row;
-  const { id, serverId } = schedule;
-  const mutations = useScheduleMutations({ serverId });
+  const { id } = schedule;
  const [pending, setPending] = useState<ScheduleRowPending>(NO_PENDING);

  const runAction = useCallback(
@@ -129,11 +127,6 @@ function SchedulesTableRow({
  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}
@@ -145,9 +138,14 @@ function SchedulesTableRow({
  );
 }

+const CONTENT_MAX_WIDTH = 720;
+
 const styles = StyleSheet.create((theme) => ({
-  // Full-width list padding matching the History screen.
+  // Center the card in a readable column, matching settings and projects.
  listContent: {
-    paddingHorizontal: { xs: theme.spacing[3], md: theme.spacing[6] },
+    width: "100%",
+    maxWidth: CONTENT_MAX_WIDTH,
+    alignSelf: "center",
+    paddingHorizontal: theme.spacing[4],
  },
 }));
@@ -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 {
@@ -1882,7 +1881,6 @@ function ProjectBlock({
  activeWorkspaceSelection,
  hostLabelByServerId,
  showHostLabels,
-  supportsMultiplicityByServerId,
 }: {
  project: SidebarProjectEntry;
  collapsed: boolean;
@@ -1904,16 +1902,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 +2062,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 +2085,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 +2106,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 +2117,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 +2183,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 +2208,6 @@ export function SidebarWorkspaceList({
        pathname={pathname}
        hostLabelByServerId={hostLabelByServerId}
        showHostLabels={showHostLabels}
-        supportsMultiplicityByServerId={supportsMultiplicityByServerId}
      />
    );

@@ -2265,7 +2256,6 @@ function ProjectModeList({
  pathname,
  hostLabelByServerId,
  showHostLabels,
-  supportsMultiplicityByServerId,
 }: Omit<
  SidebarWorkspaceListProps,
  "statusWorkspacePlacements" | "projectNamesByKey" | "groupMode" | "isRefreshing" | "onRefresh"
@@ -2273,7 +2263,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 +2451,6 @@ function ProjectModeList({
          activeWorkspaceSelection={activeWorkspaceSelection}
          hostLabelByServerId={hostLabelByServerId}
          showHostLabels={showHostLabels}
-          supportsMultiplicityByServerId={supportsMultiplicityByServerId}
        />
      );
    },
@@ -2473,7 +2461,6 @@ function ProjectModeList({
      handleWorkspaceReorder,
      hostLabelByServerId,
      showHostLabels,
-      supportsMultiplicityByServerId,
      onWorkspacePress,
      onToggleProjectCollapsed,
      parentGestureRef,
@@ -16,16 +16,10 @@ import type {
  TextStyle,
  ViewStyle,
 } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import {
-  buttonIconSize,
-  createControlGeometry,
-  type ButtonControlSize,
-} from "@/components/ui/control-geometry";
-import type { Theme } from "@/styles/theme";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";

 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 {
-  loading: boolean;
-  leftIcon?: LeftIcon;
-  iconSize: number;
-  iconColor: string;
-}
+const ICON_SIZE: Record<ButtonSize, number> = { xs: 12, sm: 14, md: 16, lg: 20 };

-function ButtonIcon({ loading, leftIcon, iconSize, iconColor }: ButtonIconProps) {
-  if (loading) {
-    return (
-      <View>
-        <ActivityIndicator size="small" color={iconColor} />
-      </View>
-    );
-  }
-
-  if (!leftIcon) return null;
-
-  if (typeof leftIcon === "object" && "type" in leftIcon) {
-    return <View>{leftIcon}</View>;
-  }
-
-  if (
-    typeof leftIcon === "function" &&
-    !leftIcon.prototype?.isReactComponent &&
-    leftIcon.length > 0
-  ) {
-    return <View>{(leftIcon as (color: string) => ReactElement)(iconColor)}</View>;
-  }
-
-  const Icon = leftIcon as ComponentType<{ color: string; size: number }>;
-  return (
-    <View>
-      <Icon color={iconColor} size={iconSize} />
-    </View>
-  );
-}
-
-const ThemedButtonIcon = withUnistyles(ButtonIcon);
-
-const foregroundIconMapping = (theme: Theme) => ({ iconColor: theme.colors.foreground });
-const foregroundMutedIconMapping = (theme: Theme) => ({
-  iconColor: theme.colors.foregroundMuted,
-});
-const accentForegroundIconMapping = (theme: Theme) => ({
-  iconColor: theme.colors.accentForeground,
-});
-const destructiveForegroundIconMapping = (theme: Theme) => ({
-  iconColor: theme.colors.destructiveForeground,
-});
-
-const styles = StyleSheet.create((theme) => {
-  const geometry = createControlGeometry(theme);
-
-  return {
-    base: {
-      flexDirection: "row",
-      alignItems: "center",
-      justifyContent: "center",
-      gap: theme.spacing[2],
-      borderRadius: theme.borderRadius.lg,
-      borderWidth: 1,
-      borderColor: "transparent",
-    },
-    md: {
-      ...geometry.buttonMd,
-    },
-    xs: {
-      ...geometry.buttonXs,
-    },
-    sm: {
-      ...geometry.buttonSm,
-    },
-    lg: {
-      ...geometry.buttonLg,
-    },
-    default: {
-      backgroundColor: theme.colors.accent,
-      borderColor: theme.colors.accent,
-    },
-    secondary: {
-      backgroundColor: theme.colors.surface3,
-      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,
-    },
-  };
-});
+const styles = StyleSheet.create((theme) => ({
+  base: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "center",
+    gap: theme.spacing[2],
+    borderRadius: theme.borderRadius.lg,
+    borderWidth: 1,
+    borderColor: "transparent",
+  },
+  md: {
+    paddingVertical: theme.spacing[3],
+    paddingHorizontal: theme.spacing[4],
+  },
+  xs: {
+    minHeight: 28,
+    paddingVertical: theme.spacing[1],
+    paddingHorizontal: theme.spacing[3],
+    borderRadius: theme.borderRadius.md,
+  },
+  sm: {
+    paddingVertical: theme.spacing[2],
+    paddingHorizontal: theme.spacing[3],
+    borderRadius: theme.borderRadius.md,
+  },
+  lg: {
+    paddingVertical: theme.spacing[4],
+    paddingHorizontal: theme.spacing[6],
+    borderRadius: theme.borderRadius.xl,
+  },
+  default: {
+    backgroundColor: theme.colors.accent,
+    borderColor: theme.colors.accent,
+  },
+  secondary: {
+    backgroundColor: theme.colors.surface3,
+    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,
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.normal,
+  },
+  textXs: {
+    fontSize: theme.fontSize.xs,
+  },
+  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 }),
-    [accessibilityStateProp, isDisabled, loading],
+    () => ({ disabled: isDisabled, busy: loading }),
+    [isDisabled, loading],
  );

-  function resolveIconMapping() {
+  function resolveIconColor(): string {
    if (variant === "default") {
-      return accentForegroundIconMapping;
-    }
-    if (variant === "destructive") {
-      return destructiveForegroundIconMapping;
+      return theme.colors.accentForeground;
    }
    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
-        loading={loading}
-        leftIcon={leftIcon}
-        iconSize={buttonIconSize[size]}
-        uniProps={resolveIconMapping()}
-      />
+      {renderIcon()}
      {children != null ? <Text style={resolvedTextStyle}>{children}</Text> : null}
      {trailing}
    </Pressable>
@@ -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,
-    });
-  });
-});
@@ -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,
-  ];
-}
@@ -1,18 +1,9 @@
-import {
-  forwardRef,
-  useCallback,
-  useMemo,
-  useState,
-  type ReactElement,
-  type ReactNode,
-} from "react";
+import { forwardRef, useCallback, useMemo, 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],
-  );
-  const handleFocus = useCallback(
-    (event: NativeSyntheticEvent<TargetedEvent>) => {
-      setFocused(true);
-      onFocus?.(event);
-    },
-    [onFocus],
-  );
-  const handleBlur = useCallback(
-    (event: NativeSyntheticEvent<TargetedEvent>) => {
-      setFocused(false);
-      onBlur?.(event);
-    },
-    [onBlur],
+    [style],
  );

  const rowStyle = useMemo(() => [styles.row, block && styles.rowBlock], [block]);

  return (
-    <Pressable
-      ref={ref}
-      collapsable={false}
-      style={pressableStyle}
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      {...props}
-    >
+    <Pressable ref={ref} collapsable={false} style={pressableStyle} {...props}>
      <View style={rowStyle}>
        {children}
        {chevron !== null &&
@@ -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,
@@ -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);
-  });
-});
@@ -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,
-    },
-  };
-}
@@ -1,30 +1,9 @@
-import {
-  forwardRef,
-  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 { forwardRef, useMemo, type ReactNode } from "react";
+import { Text, View, type TextInput } 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 & {
-  size?: FieldControlSize;
-};
-
-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 },
+export const FormTextInput = forwardRef<TextInput, AdaptiveTextInputProps>(function FormTextInput(
+  { style, ...props },
  ref,
 ) {
-  const [focused, setFocused] = useState(false);
-  const isDisabled = editable === false;
-  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 inputStyle = useMemo(() => [formInputStyles.input, style], [style]);
+  return <AdaptiveTextInput ref={ref} {...props} style={inputStyle} />;
 });

 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 geometry = createControlGeometry(theme);
-
-  return {
-    chrome: {
-      backgroundColor: theme.colors.surface2,
-    },
-    chromeSm: {
-      ...geometry.fieldControlSm,
-    },
-    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,
-    },
-  };
-});
+const formInputStyles = StyleSheet.create((theme) => ({
+  input: {
+    backgroundColor: theme.colors.surface2,
+    borderRadius: theme.borderRadius.lg,
+    paddingHorizontal: theme.spacing[4],
+    paddingVertical: theme.spacing[3],
+    color: theme.colors.foreground,
+    borderWidth: 1,
+    borderColor: theme.colors.border,
+    fontSize: theme.fontSize.base,
+  },
+}));
@@ -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 {
-  createControlGeometry,
-  segmentedIconSize,
-  type SegmentedControlSize,
-} from "@/components/ui/control-geometry";
-import type { Theme } from "@/styles/theme";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
+
+type SegmentedControlSize = "sm" | "md";

 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
-          icon={option.icon}
-          iconSize={iconSize}
-          uniProps={isSelected ? selectedIconMapping : mutedIconMapping}
-        />
+        <View style={styles.iconContainer}>
+          {option.icon({ color: iconColor, size: iconSize })}
+        </View>
      ) : null}
      {hideLabels ? null : (
        <Text style={labelStyle} numberOfLines={1}>
@@ -155,68 +138,68 @@ function SegmentItem<T extends string>({
  );
 }

-const styles = StyleSheet.create((theme) => {
-  const geometry = createControlGeometry(theme);
-
-  return {
-    container: {
-      flexDirection: "row",
-      alignItems: "stretch",
-      backgroundColor: theme.colors.surface2,
-      gap: 2,
-    },
-    containerSm: {
-      ...geometry.segmentedContainerSm,
-    },
-    containerMd: {
-      ...geometry.segmentedContainerMd,
-    },
-    segment: {
-      flexDirection: "row",
-      alignItems: "center",
-      justifyContent: "center",
-      flexShrink: 0,
-      gap: theme.spacing[1],
-    },
-    segmentSm: {
-      ...geometry.segmentedSegmentSm,
-    },
-    segmentMd: {
-      ...geometry.segmentedSegmentMd,
-    },
-    segmentSelected: {
-      backgroundColor: theme.colors.surface0,
-      shadowColor: "#000",
-      shadowOffset: { width: 0, height: 1 },
-      shadowOpacity: 0.08,
-      shadowRadius: 2,
-      elevation: 1,
-    },
-    segmentHover: {
-      backgroundColor: theme.colors.surface1,
-    },
-    segmentPressed: {
-      backgroundColor: theme.colors.surface1,
-    },
-    segmentDisabled: {
-      opacity: theme.opacity[50],
-    },
-    iconContainer: {
-      alignItems: "center",
-      justifyContent: "center",
-    },
-    label: {
-      color: theme.colors.foregroundMuted,
-      fontWeight: theme.fontWeight.normal,
-    },
-    labelSm: {
-      ...geometry.segmentedLabelSm,
-    },
-    labelMd: {
-      ...geometry.segmentedLabelMd,
-    },
-    labelSelected: {
-      color: theme.colors.foreground,
-    },
-  };
-});
+const styles = StyleSheet.create((theme) => ({
+  container: {
+    flexDirection: "row",
+    alignItems: "stretch",
+    backgroundColor: theme.colors.surface2,
+    borderRadius: theme.borderRadius.lg,
+    gap: 2,
+  },
+  containerSm: {
+    padding: 2,
+  },
+  containerMd: {
+    padding: 3,
+  },
+  segment: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "center",
+    flexShrink: 0,
+    borderRadius: theme.borderRadius.lg,
+    gap: theme.spacing[1],
+  },
+  segmentSm: {
+    paddingVertical: theme.spacing[2],
+    paddingHorizontal: theme.spacing[4],
+  },
+  segmentMd: {
+    paddingVertical: theme.spacing[3],
+    paddingHorizontal: theme.spacing[6],
+  },
+  segmentSelected: {
+    backgroundColor: theme.colors.surface0,
+    shadowColor: "#000",
+    shadowOffset: { width: 0, height: 1 },
+    shadowOpacity: 0.08,
+    shadowRadius: 2,
+    elevation: 1,
+  },
+  segmentHover: {
+    backgroundColor: theme.colors.surface1,
+  },
+  segmentPressed: {
+    backgroundColor: theme.colors.surface1,
+  },
+  segmentDisabled: {
+    opacity: theme.opacity[50],
+  },
+  iconContainer: {
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  label: {
+    color: theme.colors.foregroundMuted,
+    fontWeight: theme.fontWeight.normal,
+  },
+  labelSm: {
+    fontSize: theme.fontSize.sm,
+  },
+  labelMd: {
+    fontSize: theme.fontSize.base,
+  },
+  labelSelected: {
+    color: theme.colors.foreground,
+  },
+}));
@@ -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",
-    },
-  };
-});
@@ -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:
-    (
-      Component: React.ComponentType<Record<string, unknown>>,
-      mapping?: (theme: unknown) => object,
-    ) =>
-    (props: Record<string, unknown>) =>
-      React.createElement(Component, { ...props, ...mapping?.(theme) }),
+  useUnistyles: () => ({ theme }),
 }));

 describe("Switch", () => {
@@ -12,9 +12,7 @@ import Animated, {
  useDerivedValue,
  withTiming,
 } from "react-native-reanimated";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { createControlGeometry, switchGeometry } from "@/components/ui/control-geometry";
-import type { Theme } from "@/styles/theme";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";

 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 geometry = createControlGeometry(theme);
-
-  return {
-    switchControl: {
-      ...geometry.switchControl,
-    },
-    switchTrack: {
-      width: switchGeometry.trackWidth,
-      height: switchGeometry.trackHeight,
-      borderRadius: switchGeometry.trackHeight / 2,
-      padding: (switchGeometry.trackHeight - switchGeometry.thumbSize) / 2,
-      justifyContent: "center",
-    },
-    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],
-    },
-  };
-});
+const styles = StyleSheet.create((theme) => ({
+  track: {
+    justifyContent: "center",
+  },
+  thumb: {
+    shadowColor: "rgba(0, 0, 0, 0.25)",
+    shadowOffset: { width: 0, height: 1 },
+    shadowRadius: 2,
+    shadowOpacity: 1,
+    elevation: 2,
+  },
+  disabled: {
+    opacity: theme.opacity[50],
+  },
+}));
@@ -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
@@ -11,6 +11,7 @@ export function getAttachmentKey(attachment: WorkspaceComposerAttachment): strin
      tag: attachment.attachment.tag,
      text: attachment.attachment.text,
      html: attachment.attachment.outerHTML,
+      intent: attachment.attachment.intent ?? null,
      comment: attachment.attachment.comment ?? null,
    });
  }
@@ -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",
@@ -341,7 +341,7 @@ const CATALOG_DATA = [
    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",
+    installLink: "https://docs.trae.cn/cli",
    command: ["traecli", "acp", "serve"],
  },
  {
@@ -1,3 +0,0 @@
-export function daemonConfigQueryKey(serverId: string | null) {
-  return ["daemon-config", serverId] as const;
-}
@@ -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);
-  });
-});
@@ -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);
-}
@@ -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,
-  };
-}
@@ -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"));
 }
@@ -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 {
-    mutate: toggleDaemonManagement,
-    mutateAsync: toggleDaemonManagementAsync,
-    isPending: isUpdating,
-  } = useMutation<DaemonManagementToggleResult, Error, { forceEnable: boolean }>({
-    mutationFn: async ({ forceEnable }) => {
-      // 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;
+  const { mutate: toggleDaemonManagement, isPending: isUpdating } = useMutation<
+    DaemonManagementToggleResult,
+    Error
+  >({
+    mutationFn: async () => {
+      const wasManagingDaemon = 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 () => {
-    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 };
+  return { isUpdating, toggle };
 }
@@ -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 };
-}
@@ -128,11 +128,11 @@ export interface DesktopBrowserNewTabRequestEvent {

 export interface DesktopBrowserBridge {
  registerWorkspaceBrowser?: (input: { browserId: string; workspaceId: string }) => Promise<void>;
-  unregisterWorkspaceBrowser?: (browserId: string) => Promise<void>;
  setWorkspaceActiveBrowser?: (input: {
    workspaceId: string;
    browserId: string | null;
  }) => Promise<void>;
+  setAgentActiveBrowser?: (input: { agentId: string; browserId: string | null }) => Promise<void>;
  openDevTools?: (browserId: string) => Promise<unknown>;
  clearPartition?: (browserId: string) => Promise<void>;
  executeAutomationCommand?: (
@@ -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",
@@ -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");
-  });
-});
@@ -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);
-}
@@ -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 {
@@ -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,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mohamed Boudra	7cc47701ad	fix(paseo-agent): polish provider settings UI Keep provider instance keys stable for credentials and model addressing while allowing display-name edits.	2026-07-02 15:15:37 +02:00
Mohamed Boudra	6a2b5ea5ea	feat(paseo-agent): add browser OAuth start mode Default daemon-run OAuth to browser mode while keeping device-code explicit for remote-safe setup.	2026-07-02 14:51:26 +02:00
Mohamed Boudra	269aa53c27	fix(paseo-agent): retain prompts and required tools Emit submitted prompts into the daemon timeline so refresh and reload can replay the full Paseo Agent conversation. Keep nonpersistent providers from getting synthetic resume handles, and gate Paseo tool injection through provider capabilities.	2026-07-02 14:48:32 +02:00
Mohamed Boudra	03b45f8e11	fix(paseo-agent): make catalog auth deterministic Catalog auth derivation used an environment probe, so missing local keys could make provider listing throw. Catalog hints are now static and CLI tests scrub provider-key env vars.	2026-07-02 13:57:12 +02:00
Mohamed Boudra	02ec891fe4	fix(cli): wait for daemon feature flags Provider and pairing gates now wait for the daemon's server_info message instead of reading the cache immediately after connect. This removes a startup race where slower CLI cold starts could treat a supported daemon as missing the feature.	2026-07-02 13:31:48 +02:00
Mohamed Boudra	5d67032ef6	fix(paseo-agent): support empty model-provider setup Allow catalog provider setup to persist credentials before explicit model overrides exist, while keeping unrelated provider snapshots warmable after Paseo Agent config changes.	2026-07-02 13:12:23 +02:00
Mohamed Boudra	d6e4e5f3ce	refactor(paseo-agent): derive catalog from Pi Keep Paseo catalog entries as curated provider refs while deriving model metadata, endpoints, and auth defaults from Pi at runtime.	2026-07-02 12:40:21 +02:00
Mohamed Boudra	2ba7562dff	fix(paseo-agent): use working OAuth catalog model Live proof showed the previous OAuth catalog default was rejected at session start. Switch the catalog, docs, fixtures, and regenerated schema to the working default while keeping provider config generic.	2026-07-02 12:06:02 +02:00
Mohamed Boudra	363e76858f	feat(app): add Paseo Agent provider catalog UI	2026-07-02 11:38:11 +02:00
Mohamed Boudra	27e713671d	feat(cli): add catalog-driven provider setup	2026-07-02 11:26:56 +02:00
Mohamed Boudra	4e5737169f	feat: wire paseo agent provider catalog	2026-07-02 11:07:49 +02:00
Mohamed Boudra	fce3d14a83	feat(paseo-agent): add model provider catalog Keep persisted provider config structurally open and resolve catalog semantics at runtime.	2026-07-02 10:38:17 +02:00
Mohamed Boudra	343dd2d10d	Regenerate lockfile after rebase onto 0.1.103	2026-07-02 08:40:26 +02:00
Mohamed Boudra	a410617d4a	Open the model provider type wire schema A closed z.enum inside the strict get_providers payload meant any provider type added daemon-side failed the entire WS envelope parse on older clients, silently dropping the response and timing out the settings sheet. Make providerType an open string on the wire; the daemon's config schema keeps the closed set and setProvider rejects unknown types with a clear error. Also correct the paseoAgentConfig COMPAT version, the provider CLI descriptions, and the stale no-app-UI doc claim.	2026-07-02 08:39:06 +02:00
Mohamed Boudra	4a8a841f72	Report context window usage for Paseo Agent toAgentUsage dropped SessionStats.contextUsage, leaving the context-window indicator blank on every Paseo Agent session. Mirror the Pi provider's mapping into contextWindowMaxTokens/contextWindowUsedTokens.	2026-07-02 08:39:06 +02:00
Mohamed Boudra	7a6d2d86d7	Name the layers: agent providers and model providers Record the naming decision in the glossary: bare "provider" splits into agent provider (the harness: Claude Code, Codex, Paseo Agent) and model provider (a model API attached to Paseo Agent). Bare "Agent" is the runnable identity — an agent provider today, a named agent definition tomorrow — resolved through one CLI namespace (--agent). Agent session stays the running instance. Retire "inference provider" across docs, UI strings, and identifiers (PaseoAgentModelProvider, paseoAgentModelProviders). Labels and internal names only — wire and config keys are untouched.	2026-07-02 08:39:06 +02:00
Mohamed Boudra	341af162b0	Adapt Paseo Agent to rebased main Main replaced AgentClient.listModels/listModes with a single required fetchCatalog(); migrate PaseoAgentClient to it. Regenerate the lockfile so the @earendil-works/pi-* deps are present (rebase conflicts took main's lockfile at each step).	2026-07-02 08:39:06 +02:00
Mohamed Boudra	96067da1d3	Open Paseo Agent E2E provider settings	2026-07-02 08:38:58 +02:00
Mohamed Boudra	888f28990b	Move OAuth file mode checks to POSIX tests	2026-07-02 08:38:58 +02:00
Mohamed Boudra	b1abec4512	Resolve Paseo Agent credentials asynchronously	2026-07-02 08:38:58 +02:00
Mohamed Boudra	1a084eb8b0	Align desktop Nix npm deps fetcher	2026-07-02 08:38:58 +02:00
Mohamed Boudra	42ab7927f2	Fix PR CI follow-up failures	2026-07-02 08:38:58 +02:00
Mohamed Boudra	56d908c6dc	Use Nix npm fetcher v2	2026-07-02 08:38:46 +02:00
Mohamed Boudra	2cfb29f1f0	Expose Pi TUI dependency to Nix	2026-07-02 08:38:46 +02:00
Mohamed Boudra	c3827466eb	Share Paseo Agent env reference helpers	2026-07-02 08:38:27 +02:00
Mohamed Boudra	c52482368b	Precompile Paseo Agent permission matchers	2026-07-02 08:38:27 +02:00
Mohamed Boudra	8089c802f0	Fix Paseo Agent PR review issues	2026-07-02 08:38:27 +02:00
Mohamed Boudra	3e535aa2d7	Fix Paseo Agent Zod 4 record schemas	2026-07-02 08:38:27 +02:00
Mohamed Boudra	4063671e3f	Add first-class Paseo Agent definitions	2026-07-02 08:38:27 +02:00
Mohamed Boudra	9665ba07a3	Fix Paseo Agent ChatGPT auth home lookup	2026-07-02 08:38:27 +02:00
Mohamed Boudra	4086f65096	Add Paseo Agent prompt profiles	2026-07-02 08:38:27 +02:00
Mohamed Boudra	44afecc366	Add remote Paseo Agent configuration	2026-07-02 08:38:27 +02:00
Mohamed Boudra	c9cd414571	Add Paseo Agent provider	2026-07-02 08:38:27 +02:00