fix(cli): clarify daemon executable status label

Desktop management now follows the daemon runtime path, so daemons started through the bundled CLI remain eligible for desktop upgrade restarts. New locks record executablePath; the old desktopManaged lock bit is accepted only for compatibility with existing locks.

.oxlintrc.json

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

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.1.104 - 2026-07-08
+## 0.1.104-beta.4 - 2026-07-06
 
 ### Added
 
@@ -10,27 +10,17 @@
 - 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))
+- ByteDance TRAE CLI available as an agent provider ([#1831](https://github.com/getpaseo/paseo/pull/1831) 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.md

@@ -30,7 +30,6 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [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/data-model.md

@@ -4,10 +4,6 @@ Paseo uses **file-based JSON persistence** instead of a traditional database. Al
 
 All server-side stores live under `$PASEO_HOME` (defaults to `~/.paseo`).
 
-## Store Surface Rules
-
-Store APIs own persistence atomicity and should not make services coordinate raw reads and writes. A good store method maps cleanly to one SQL statement or one SQL transaction, even when the current implementation is JSON files. If a caller needs a queue, lock, read-merge-write loop, or uniqueness race workaround, that behavior belongs behind the store surface.
-
 ---
 
 ## Directory layout
@@ -41,6 +37,30 @@ The `agents/{sanitized-cwd}/` directory name is derived from the agent's `cwd` b
 
 ---
 
+## Runtime PID Lock
+
+**Path:** `$PASEO_HOME/paseo.pid`
+
+The daemon writes this file when it starts and removes it when it exits cleanly.
+It is a runtime lock, not a durable settings file.
+
+| Field            | Type                  | Description                                                                                                  |
+| ---------------- | --------------------- | ------------------------------------------------------------------------------------------------------------ |
+| `pid`            | `number`              | Owner process PID for stop/status operations                                                                 |
+| `startedAt`      | `string` (ISO 8601)   | Lock creation timestamp                                                                                      |
+| `hostname`       | `string`              | Host that created the lock                                                                                   |
+| `uid`            | `number`              | User id that created the lock, or `0` where unavailable                                                      |
+| `listen`         | `string \| null`      | Daemon listen target at lock creation; updated when the server binds                                         |
+| `executablePath` | `string?`             | `process.execPath` for the daemon runtime. Desktop uses this to derive whether the daemon is desktop-managed |
+| `desktopManaged` | `boolean?` _(legacy)_ | Legacy spawn-origin flag accepted for old locks only; new locks derive desktop management from executable    |
+
+Desktop-managed is a read-time classification by the desktop app: the daemon
+executable must be the desktop app executable or live inside the same desktop
+install. The CLI reports the raw `executablePath` but does not try to classify
+it because an npm-installed CLI has no authoritative desktop install root.
+
+---
+
 ## 1. Agent Record
 
 **Path:** `$PASEO_HOME/agents/{project-dir}/{agentId}.json`

docs/development.md

@@ -173,19 +173,6 @@ 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
@@ -303,8 +290,6 @@ npm run build:app-deps     # highlight -> protocol -> client -> expo-two-way-aud
 
 Use `npm run build:server` whenever you have changed any daemon/server-facing package and need clean cross-package types or runtime behavior.
 
-The app Metro config disables Watchman and uses Metro's node crawler for exports. Keep that invariant unless you have verified production app exports on machines with and without Watchman installed; distro Watchman builds can differ in capabilities and change Metro's crawl behavior.
-
 For tighter loops, you can rebuild a single workspace:
 
 - Changed `packages/protocol/src/*` or `packages/client/src/*`: `npm run build:client`.

docs/floating-panels.md

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

docs/forms.md

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

docs/mobile-testing.md

@@ -198,19 +198,6 @@ for i in $(seq 1 "$ITERATIONS"); do
 done
 ```
 
-### Android audio focus interruptions
-
-Voice mode uses the custom `expo-two-way-audio` Android module, so incoming calls and other system audio owners must be tested with emulator/system commands, not a JS-only test. To verify that voice resume handles denied audio focus without crashing:
-
-```bash
-adb shell am start -n sh.paseo/.MainActivity
-# Start voice mode in an existing composer, then background Paseo with Home.
-adb emu gsm call 5551234
-# Foreground Paseo while the call is still ringing.
-```
-
-Expected result: Paseo does not throw `RuntimeException: Audio focus request failed`; native audio reports an interruption and voice mode stops or pauses coherently.
-
 ## Unistyles + Reanimated
 
 ### The crash

nix/npm-deps.hash

@@ -1 +1 @@
-sha256-RtZABQl17BlUyvFiFw9W5g2E/dpNlrOWpuCdV8wZk5o=
+sha256-s4AXc/WKI2p5CdIJJMBmXiLoO4cNcT71GKfn8z9iknI=

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.1.104",
+  "version": "0.1.104-beta.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.1.104",
+      "version": "0.1.104-beta.4",
       "hasInstallScript": true,
       "license": "AGPL-3.0-or-later",
       "workspaces": [
@@ -35152,7 +35152,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.1.104",
+      "version": "0.1.104-beta.4",
       "dependencies": {
         "@dnd-kit/core": "^6.3.1",
         "@dnd-kit/sortable": "^10.0.0",
@@ -36170,12 +36170,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.1.104",
+      "version": "0.1.104-beta.4",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.1.104",
-        "@getpaseo/protocol": "0.1.104",
-        "@getpaseo/server": "0.1.104",
+        "@getpaseo/client": "0.1.104-beta.4",
+        "@getpaseo/protocol": "0.1.104-beta.4",
+        "@getpaseo/server": "0.1.104-beta.4",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -36421,10 +36421,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.1.104",
+      "version": "0.1.104-beta.4",
       "dependencies": {
-        "@getpaseo/protocol": "0.1.104",
-        "@getpaseo/relay": "0.1.104",
+        "@getpaseo/protocol": "0.1.104-beta.4",
+        "@getpaseo/relay": "0.1.104-beta.4",
         "zod": "^4.4.3"
       },
       "devDependencies": {
@@ -36435,7 +36435,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.1.104",
+      "version": "0.1.104-beta.4",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -36678,7 +36678,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.1.104",
+      "version": "0.1.104-beta.4",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -37574,7 +37574,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.1.104",
+      "version": "0.1.104-beta.4",
       "dependencies": {
         "@codemirror/language": "^6.12.3",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -37806,7 +37806,7 @@
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.1.104",
+      "version": "0.1.104-beta.4",
       "dependencies": {
         "zod": "^4.4.3"
       },
@@ -37819,7 +37819,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.1.104",
+      "version": "0.1.104-beta.4",
       "dependencies": {
         "base64-js": "^1.5.1",
         "tweetnacl": "^1.0.3",
@@ -38037,15 +38037,15 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.1.104",
+      "version": "0.1.104-beta.4",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "^0.3.195",
         "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.1.104",
-        "@getpaseo/highlight": "0.1.104",
-        "@getpaseo/protocol": "0.1.104",
-        "@getpaseo/relay": "0.1.104",
+        "@getpaseo/client": "0.1.104-beta.4",
+        "@getpaseo/highlight": "0.1.104-beta.4",
+        "@getpaseo/protocol": "0.1.104-beta.4",
+        "@getpaseo/relay": "0.1.104-beta.4",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "^1.20.1",
         "@opencode-ai/sdk": "1.14.46",
@@ -38582,7 +38582,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.1.104",
+      "version": "0.1.104-beta.4",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.1.104",
+  "version": "0.1.104-beta.4",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [

packages/app/e2e/diff-row-alignment.spec.ts

@@ -218,38 +218,6 @@ test("changes diff keeps code rows aligned with the gutter", async ({ page }) =>
   });
 });
 
-test("changes diff switches between flat and tree file lists", async ({ page }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-
-  await expectFlatFileList(page);
-  await expect(page.getByTestId("changes-toggle-layout")).toBeVisible();
-  await expect(page.getByTestId("changes-layout-unified")).toHaveCount(0);
-  await expect(page.getByTestId("changes-layout-split")).toHaveCount(0);
-
-  await page.getByTestId("changes-options-menu").click();
-  await expect(page.getByTestId("changes-options-menu-content")).toBeVisible();
-  await expect(page.getByTestId("changes-toggle-whitespace")).toContainText("Hide whitespace");
-  await expect(page.getByTestId("changes-toggle-wrap-lines")).toContainText("Wrap long lines");
-  await expect(page.getByTestId("changes-refresh")).toContainText("Refresh");
-  await page.getByTestId("changes-toggle-whitespace").click();
-  await page.getByTestId("changes-options-menu").click();
-  await expect(page.getByTestId("changes-toggle-whitespace")).toContainText("Show whitespace");
-  await page.keyboard.press("Escape");
-
-  await scrollToLowerUnwrappedDiffRows(page);
-  await page.getByTestId("changes-toggle-view-mode").click();
-  await expect(page.getByTestId("diff-folder-src")).toBeVisible();
-  await expect(page.getByTestId("diff-file-0")).toBeVisible();
-
-  await page.getByTestId("diff-folder-src-toggle").click();
-  await expect(page.getByTestId("diff-file-0")).toHaveCount(0);
-
-  await page.getByTestId("changes-toggle-view-mode").click();
-  await expectFlatFileList(page);
-});
-
 test("changes diff keeps unwrapped gutter and code rows aligned after code size changes", async ({
   page,
 }) => {
@@ -298,24 +266,13 @@ async function useUnwrappedDiffLines(page: Page): Promise<void> {
     ({ preferencesKey }) => {
       localStorage.setItem(
         preferencesKey,
-        JSON.stringify({
-          layout: "unified",
-          viewMode: "flat",
-          wrapLines: false,
-          hideWhitespace: false,
-        }),
+        JSON.stringify({ layout: "unified", wrapLines: false, hideWhitespace: false }),
       );
     },
     { preferencesKey: CHANGES_PREFERENCES_KEY },
   );
 }
 
-async function expectFlatFileList(page: Page): Promise<void> {
-  await expect(page.locator('[data-testid^="diff-folder-"]')).toHaveCount(0);
-  await expect(page.getByTestId("diff-file-0")).toContainText("use-mounted-tab-set.ts");
-  await expect(page.getByTestId("diff-file-0")).toContainText("src");
-}
-
 async function expectDiffCodeFontSize(page: Page, fontSize: number): Promise<void> {
   await expect
     .poll(async () => {

packages/app/e2e/fixtures.ts

@@ -3,8 +3,6 @@ import { getE2EDaemonPort } from "./helpers/daemon-port";
 import { buildCreateAgentPreferences, buildSeededHost } from "./helpers/daemon-registry";
 import { createWithWorkspace, type WithWorkspace } from "./helpers/with-workspace";
 
-const EXTRA_HOSTS_KEY = "@paseo:e2e-extra-hosts";
-
 // Test setup is wired through an `auto: true` fixture rather than `test.beforeEach`.
 // `test.beforeEach` declared at the top level of a non-test fixture file is unreliable
 // across spec-file boundaries — Playwright sometimes skips it for the first test of a
@@ -59,7 +57,7 @@ const test = base.extend<{ paseoE2ESetup: void; withWorkspace: WithWorkspace }>(
       const createAgentPreferences = buildCreateAgentPreferences(testDaemon.serverId);
 
       await page.addInitScript(
-        ({ daemon, preferences, seedNonce: nonce, extraHostsKey }) => {
+        ({ daemon, preferences, seedNonce: nonce }) => {
           // `addInitScript` runs on every navigation (including reloads). Some tests intentionally
           // override storage and reload; they can opt out of seeding for the *next* navigation by
           // setting this flag before the reload.
@@ -75,20 +73,12 @@ const test = base.extend<{ paseoE2ESetup: void; withWorkspace: WithWorkspace }>(
           localStorage.setItem("@paseo:e2e", "1");
           localStorage.setItem("@paseo:e2e-seed-nonce", nonce);
 
-          const rawExtraHosts = localStorage.getItem(extraHostsKey);
-          const extraHosts = rawExtraHosts ? JSON.parse(rawExtraHosts) : [];
-
           // Hard-reset anything that could point to a developer's real daemon.
-          localStorage.setItem("@paseo:daemon-registry", JSON.stringify([daemon, ...extraHosts]));
+          localStorage.setItem("@paseo:daemon-registry", JSON.stringify([daemon]));
           localStorage.removeItem("@paseo:settings");
           localStorage.setItem("@paseo:create-agent-preferences", JSON.stringify(preferences));
         },
-        {
-          daemon: testDaemon,
-          preferences: createAgentPreferences,
-          seedNonce,
-          extraHostsKey: EXTRA_HOSTS_KEY,
-        },
+        { daemon: testDaemon, preferences: createAgentPreferences, seedNonce },
       );
 
       await provide();

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

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

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

@@ -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,
       },
     },
   );

packages/app/e2e/helpers/settings.ts

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

packages/app/e2e/helpers/settled.ts

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

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

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

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

@@ -10,8 +10,8 @@ import {
   openProjectViaDaemon,
   openStartingRefPicker,
   selectBranchInPicker,
+  selectWorkspaceIsolation,
 } from "./helpers/new-workspace";
-import { expectNoTruncation } from "./helpers/no-truncation";
 import { createTempGitRepo } from "./helpers/workspace";
 import { getServerId } from "./helpers/server-id";
 import { waitForSidebarHydration } from "./helpers/workspace-ui";
@@ -63,11 +63,7 @@ test.describe("New workspace isolation memory", () => {
         projectDisplayName: openedProject.projectDisplayName,
       });
       await expectWorkspaceIsolationSelected(page, "local");
-      await page.getByTestId("workspace-create-isolation-trigger").click();
-      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);

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

@@ -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>> = [];
 
@@ -125,114 +79,14 @@ test.describe("Schedules", () => {
     await expect(row).toContainText(workspace.projectDisplayName, { timeout: 30_000 });
 
     await row.click();
-    const formSheet = page.getByTestId("schedule-form-sheet");
-    await expect(formSheet).toBeVisible({ timeout: 10_000 });
-    await expectStableHeight(formSheet);
-    const hostTrigger = page.getByTestId("schedule-host-trigger");
-    const projectTrigger = page.getByTestId("schedule-project-trigger");
-    const modelTrigger = page.getByTestId("schedule-model-trigger");
-    const thinkingTrigger = page.getByTestId("schedule-thinking-trigger");
-    const modeTrigger = page.getByTestId("schedule-mode-trigger");
-    await expect(hostTrigger).toBeVisible({ timeout: 30_000 });
-    await expect(hostTrigger).toBeDisabled();
-    await expectSettled(hostTrigger);
-    await expect(projectTrigger).toContainText(workspace.projectDisplayName, { timeout: 30_000 });
-    await expectSettled(projectTrigger);
-    await expect(modelTrigger).toContainText("Ten second stream", { timeout: 30_000 });
-    await expectSettled(modelTrigger);
-    await expect(thinkingTrigger).toHaveCount(0);
-    await expect(modeTrigger).toBeVisible({ timeout: 30_000 });
-    await expectSettled(modeTrigger);
-    await expect(page.getByTestId("cadence-mode")).toHaveCount(0);
-    await expect(page.getByTestId("cadence-interval-value")).toHaveCount(0);
-    await expect(page.getByTestId("schedule-cadence-preset-trigger")).toContainText("Daily 9:00");
-    await expect(page.getByText(/Times are in/)).toHaveCount(0);
-    await expect(formSheet.getByText("Cron", { exact: true })).toHaveCount(0);
-  });
-
-  test("edit form hydrates a non-default host schedule after reload", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "schedule-host-b-hydration-" });
-    cleanupTasks.push(() => workspace.cleanup());
-    const fakeHost = await buildFakeScheduleHostWorkspace(workspace);
-    const fakePort = String(59_000 + Math.floor(Math.random() * 900));
-    const scheduleId = "fake-host-schedule";
-    const scheduleName = "Secondary host schedule";
-
-    await installFakeScheduleHost({
-      page,
-      port: fakePort,
-      serverId: fakeHost.serverId,
-      workspace: fakeHost.workspace,
-      schedules: [
-        buildFakeHostSchedule({
-          id: scheduleId,
-          name: scheduleName,
-          cwd: String(fakeHost.workspace.workspaceDirectory),
-        }),
-      ],
+    await 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);
   });
 });

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

@@ -6,27 +6,13 @@ import {
   installFakeScheduleHost,
 } from "./helpers/schedule-fake-host";
 import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { escapeRegex } from "./helpers/regex";
-import { expectNoTruncation } from "./helpers/no-truncation";
-import { expectSettled, expectStableHeight } from "./helpers/settled";
 import { waitForSidebarHydration } from "./helpers/workspace-ui";
 import { buildSchedulesRoute } from "../src/utils/host-routes";
 
-const MOBILE_SHEET_VIEWPORT = { width: 390, height: 844 };
-
 interface ScheduleListItem {
   id: string;
   name: string | null;
-  cadence?: { type: "cron"; expression: string };
-  target: {
-    type: string;
-    config?: {
-      cwd?: string;
-      archiveOnFinish?: boolean;
-      isolation?: "local" | "worktree";
-    };
-  };
+  target: { type: string; config?: { cwd?: string } };
 }
 
 interface ScheduleSeedClient {
@@ -38,12 +24,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 +40,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 +47,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 +57,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 +67,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));
@@ -191,84 +84,29 @@ test.describe("Schedules project target", () => {
     await expect(page.getByTestId("schedules-empty")).toBeVisible();
 
     await page.getByTestId("schedules-empty-new").click();
-    const formSheet = page.getByTestId("schedule-form-sheet");
-    await expect(formSheet).toBeVisible({ timeout: 10_000 });
-    await expectStableHeight(formSheet);
-    await expect(page.getByTestId("schedule-host-trigger")).toHaveCount(0);
-    await expect(page.getByTestId("schedule-project-trigger")).toBeVisible();
-    await expect(page.getByTestId("schedule-model-trigger")).toHaveCount(0);
-    await expect(page.getByTestId("schedule-thinking-trigger")).toHaveCount(0);
-    await expect(page.getByTestId("schedule-mode-trigger")).toHaveCount(0);
-    await expect(page.getByTestId("cadence-mode")).toHaveCount(0);
-    await expect(page.getByTestId("cadence-interval-value")).toHaveCount(0);
-    await expect(page.getByText(/Times are in/)).toHaveCount(0);
-    await expect(formSheet.getByText("Cron", { exact: true })).toHaveCount(0);
+    await 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));
 
@@ -290,126 +128,26 @@ test.describe("Schedules project target", () => {
     });
     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("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",
-    });
-  });
 });

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

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

packages/app/metro.config.cjs

@@ -14,12 +14,6 @@ const customWebPlatform = (process.env.PASEO_WEB_PLATFORM ?? "")
 
 const config = getDefaultConfig(projectRoot);
 const defaultResolveRequest = config.resolver.resolveRequest ?? resolve;
-
-// Keep app exports deterministic across dev machines and CI. Metro's Watchman
-// crawler behavior depends on the host Watchman build/capabilities, while the
-// node crawler is the path used when Watchman is absent.
-config.resolver.useWatchman = false;
-
 const escapedAppSrcRoot = appSrcRoot
   .split(path.sep)
   .map((segment) => segment.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&"))

packages/app/package.json

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

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

@@ -52,7 +52,6 @@ import type { AgentScreenAgent } from "@/hooks/use-agent-screen-state-machine";
 import { useSessionStore } from "@/stores/session-store";
 import { useFileExplorerActions } from "@/hooks/use-file-explorer-actions";
 import { useLoadOlderAgentHistory } from "@/hooks/use-load-older-agent-history";
-import { useSettings } from "@/hooks/use-settings";
 import type { ToastApi } from "@/components/toast-host";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { ToolCallDetailsContent } from "@/components/tool-call-details";
@@ -319,7 +318,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
   ) {
     const { t } = useTranslation();
     const router = useRouter();
-    const autoExpandReasoning = useSettings((settings) => settings.autoExpandReasoning);
     const viewportRef = useRef<StreamViewportHandle | null>(null);
     const isMobile = useIsCompactFormFactor();
     const streamRenderStrategy = useMemo(
@@ -635,12 +633,10 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
             args={item.text}
             status={item.status === "ready" ? "completed" : "executing"}
             isLastInSequence={layoutItem.isLastInToolSequence}
-            defaultExpanded={autoExpandReasoning}
-            forceInline={autoExpandReasoning}
           />
         );
       },
-      [autoExpandReasoning, setInlineDetailsExpanded],
+      [setInlineDetailsExpanded],
     );
 
     const renderToolCallItem = useCallback(

packages/app/src/app/_layout.tsx

@@ -37,7 +37,6 @@ import { LeftSidebar } from "@/components/left-sidebar";
 import { CompactExplorerSidebarHost } from "@/components/compact-explorer-sidebar-host";
 import { ProjectPickerModal } from "@/components/project-picker-modal";
 import { ProviderSettingsHost } from "@/components/provider-settings-host";
-import { RootErrorBoundary } from "@/components/root-error-boundary";
 import { WorkspaceSetupDialog } from "@/components/workspace-setup-dialog";
 import { WorkspaceShortcutTargetsSubscriber } from "@/components/workspace-shortcut-targets-subscriber";
 import { FloatingPanelPortalHost } from "@/components/ui/floating-panel-portal";
@@ -85,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,
@@ -999,27 +998,31 @@ function RuntimeProviders({ children }: { children: ReactNode }) {
   );
 }
 
-// PortalProvider must stay inside normal app-wide context providers.
+// PortalProvider must stay inside normal app-wide context providers here.
 // `@gorhom/portal` renders portaled children at the host's location in the
 // tree, so any context a portaled sheet might consume (QueryClient, theme,
-// auth, settings, ...) must wrap PortalProvider, not be wrapped by it.
+// auth, settings, …) must wrap PortalProvider — not be wrapped by it.
 // BottomSheetModalProvider is the exception: Gorhom modals consume portal
 // context and need one shared provider for sibling sheets to stack.
 function RootProviders({ children }: { children: ReactNode }) {
   return (
-    <SafeAreaProvider>
-      <KeyboardProvider>
-        <KeyboardShiftProvider>
-          <PortalProvider>
-            <BottomSheetModalProvider>{children}</BottomSheetModalProvider>
-          </PortalProvider>
-        </KeyboardShiftProvider>
-      </KeyboardProvider>
-    </SafeAreaProvider>
+    <QueryProvider>
+      <I18nProvider>
+        <SafeAreaProvider>
+          <KeyboardProvider>
+            <KeyboardShiftProvider>
+              <PortalProvider>
+                <BottomSheetModalProvider>{children}</BottomSheetModalProvider>
+              </PortalProvider>
+            </KeyboardShiftProvider>
+          </KeyboardProvider>
+        </SafeAreaProvider>
+      </I18nProvider>
+    </QueryProvider>
   );
 }
 
-function RootAppTree() {
+export default function RootLayout() {
   return (
     <GestureHandlerRootView style={flexStyle}>
       <View style={layoutStyles.surfaceFill}>
@@ -1033,18 +1036,6 @@ function RootAppTree() {
   );
 }
 
-export default function RootLayout() {
-  return (
-    <QueryProvider>
-      <I18nProvider>
-        <RootErrorBoundary>
-          <RootAppTree />
-        </RootErrorBoundary>
-      </I18nProvider>
-    </QueryProvider>
-  );
-}
-
 const layoutStyles = StyleSheet.create((theme) => ({
   surfaceFill: {
     flex: 1,

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

@@ -1,38 +1,7 @@
-import { Redirect, useLocalSearchParams } from "expo-router";
+import { useLocalSearchParams } from "expo-router";
 import { useMemo } from "react";
-import { useHostRuntimeBootstrapState } from "@/app/_layout";
-import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
-import { useLocalDaemonServerIdState } from "@/hooks/use-is-local-daemon";
-import { useHosts } from "@/runtime/host-runtime";
 import SettingsScreen from "@/screens/settings-screen";
-import { StartupSplashScreen } from "@/screens/startup-splash-screen";
-import {
-  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} />;
 }

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

@@ -1,8 +1,8 @@
-import { forwardRef, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { forwardRef, useCallback, useEffect, useMemo, 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}

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

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

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

@@ -4,39 +4,24 @@ import {
   View,
   Text,
   Pressable,
+  ActivityIndicator,
   type GestureResponderEvent,
   type PressableStateCallbackType,
 } from "react-native";
 import { BottomSheetFlatList } from "@gorhom/bottom-sheet";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { isNative, isWeb as platformIsWeb } from "@/constants/platform";
 import { AlertTriangle, ChevronRight, Search, Settings, Star } from "lucide-react-native";
 import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
-import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
 import type { SheetHeader } from "@/components/adaptive-modal-sheet";
 import { useProviderSettingsStore } from "@/stores/provider-settings-store";
 import { Button } from "@/components/ui/button";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
-import {
-  Combobox,
-  ComboboxItem,
-  type ComboboxOption,
-  type ComboboxProps,
-} from "@/components/ui/combobox";
-import { getProviderIcon } from "@/components/provider-icons";
-import {
-  buildSelectedTriggerLabel,
-  filterAndRankModelRows,
-  getAllProviderModelRows,
-  getProviderModelRows,
-  resolveSelectedModelLabel,
-  type ProviderSelectionModelRow,
-  type ProviderSelectorProvider,
-} from "@/provider-selection/provider-selection";
-
 const IS_WEB = platformIsWeb;
+
+import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
+
 const EMPTY_COMBOBOX_OPTIONS: ComboboxOption[] = [];
 
 function noop() {}
@@ -62,67 +47,22 @@ function drillDownRowStyle({
     pressed && styles.drillDownRowPressed,
   ];
 }
+import { getProviderIcon } from "@/components/provider-icons";
+import {
+  buildSelectedTriggerLabel,
+  filterAndRankModelRows,
+  getAllProviderModelRows,
+  getProviderModelRows,
+  resolveSelectedModelLabel,
+  type ProviderSelectionModelRow,
+  type ProviderSelectorProvider,
+} from "@/provider-selection/provider-selection";
 
 const DESKTOP_PROVIDER_VIEW_MIN_HEIGHT = 220;
 const DESKTOP_PROVIDER_VIEW_MAX_HEIGHT = 400;
 const DESKTOP_PROVIDER_VIEW_BASE_HEIGHT = 80;
 const DESKTOP_MODEL_ROW_HEIGHT = 40;
 
-const ThemedAlertTriangle = withUnistyles(AlertTriangle);
-const ThemedChevronRight = withUnistyles(ChevronRight);
-const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
-const ThemedSearch = withUnistyles(Search);
-const ThemedSettings = withUnistyles(Settings);
-const ThemedStar = withUnistyles(Star);
-
-const foregroundMutedMapping = (theme: Theme) => ({
-  color: theme.colors.foregroundMuted,
-});
-
-const headerSettingsMapping = (disabled: boolean) => (theme: Theme) => ({
-  color: disabled ? theme.colors.border : theme.colors.foregroundMuted,
-});
-
-const favoriteStarMapping =
-  (isFavorite: boolean, hovered: boolean) =>
-  (theme: Theme): { color: string; fill: string } => {
-    const favoriteColor = theme.colors.palette.amber[500];
-    if (isFavorite) {
-      return { color: favoriteColor, fill: favoriteColor };
-    }
-    return {
-      color: hovered ? theme.colors.foregroundMuted : theme.colors.border,
-      fill: "transparent",
-    };
-  };
-
-type ProviderGlyphTone = "muted" | "foreground";
-
-function ProviderGlyph({
-  provider,
-  size,
-  tone = "muted",
-}: {
-  provider: string;
-  size: number;
-  tone?: ProviderGlyphTone;
-}) {
-  const Icon = getProviderIcon(provider);
-  const color =
-    tone === "foreground" ? styles.providerIconForeground.color : styles.providerIconMuted.color;
-  return <Icon size={size} color={color} />;
-}
-
-function HeaderSettingsIcon({ disabled }: { disabled: boolean }) {
-  const uniProps = useMemo(() => headerSettingsMapping(disabled), [disabled]);
-  return <ThemedSettings size={ICON_SIZE.sm} uniProps={uniProps} />;
-}
-
-function FavoriteStar({ isFavorite, hovered }: { isFavorite: boolean; hovered: boolean }) {
-  const uniProps = useMemo(() => favoriteStarMapping(isFavorite, hovered), [hovered, isFavorite]);
-  return <ThemedStar size={ICON_SIZE.md} uniProps={uniProps} />;
-}
-
 type SelectorView =
   | { kind: "all" }
   | { kind: "provider"; providerId: string; providerLabel: string };
@@ -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,
-  },
 }));

packages/app/src/components/context-window-meter.tsx

@@ -117,7 +117,7 @@ export function ContextWindowMeter({
     (nextOpen: boolean) => {
       setIsTooltipOpen(nextOpen);
       if (nextOpen) {
-        void refreshProviderUsage().catch(() => {});
+        void refreshProviderUsage();
       }
     },
     [refreshProviderUsage],

packages/app/src/components/file-explorer-pane.tsx

@@ -19,6 +19,7 @@ import * as Clipboard from "expo-clipboard";
 import { SvgXml } from "react-native-svg";
 import {
   ChevronDown,
+  ChevronRight,
   Copy,
   Download,
   Eye,
@@ -27,7 +28,6 @@ import {
   RotateCw,
 } from "lucide-react-native";
 import { getFileIconSvg } from "@/components/material-file-icons";
-import { TreeChevron, TreeIndentGuides, TREE_INDENT_PER_LEVEL } from "@/components/tree-primitives";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import type { AgentFileExplorerState, ExplorerEntry } from "@/stores/session-store";
 import { useHosts } from "@/runtime/host-runtime";
@@ -55,6 +55,8 @@ const SORT_OPTIONS: { value: SortOption }[] = [
   { value: "size" },
 ];
 
+const INDENT_PER_LEVEL = 16;
+
 function formatFileSize({ size }: { size: number }): string {
   if (size < 1024) {
     return `${size} B`;
@@ -127,7 +129,7 @@ function TreeRowItem({
   const pressableStyle = useCallback(
     ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
       styles.entryRow,
-      { paddingLeft: theme.spacing[2] + depth * TREE_INDENT_PER_LEVEL },
+      { paddingLeft: theme.spacing[2] + depth * INDENT_PER_LEVEL },
       (Boolean(hovered) || pressed || isSelected) && styles.entryRowActive,
     ],
     [depth, isSelected, theme.spacing],
@@ -141,6 +143,11 @@ function TreeRowItem({
     onDownloadEntry(entry);
   }, [onDownloadEntry, entry]);
 
+  const chevronStyle = useMemo(
+    () => [styles.chevron, isExpanded && styles.chevronExpanded],
+    [isExpanded],
+  );
+
   const copyLeading = useMemo(
     () => <Copy size={14} color={theme.colors.foregroundMuted} />,
     [theme.colors.foregroundMuted],
@@ -152,7 +159,7 @@ function TreeRowItem({
 
   return (
     <Pressable onPress={handlePress} style={pressableStyle}>
-      <TreeIndentGuides depth={depth} />
+      {depth > 0 && Array.from({ length: depth }, (_, i) => <IndentGuide key={i} index={i} />)}
       <View style={styles.entryInfo}>
         <View style={styles.entryIcon}>
           {(() => {
@@ -160,7 +167,11 @@ function TreeRowItem({
               return <SvgXml xml={getFileIconSvg(entry.name)} width={16} height={16} />;
             }
             if (loading) return <ActivityIndicator size="small" />;
-            return <TreeChevron expanded={isExpanded} />;
+            return (
+              <View style={chevronStyle}>
+                <ChevronRight size={16} color={theme.colors.foregroundMuted} />
+              </View>
+            );
           })()}
         </View>
         <Text style={styles.entryName} numberOfLines={1}>
@@ -1138,6 +1149,13 @@ const styles = StyleSheet.create((theme) => ({
   entryRowActive: {
     backgroundColor: theme.colors.surfaceSidebarHover,
   },
+  indentGuide: {
+    position: "absolute",
+    top: 0,
+    bottom: 0,
+    width: 1,
+    backgroundColor: theme.colors.surface2,
+  },
   entryInfo: {
     flex: 1,
     flexDirection: "row",
@@ -1145,6 +1163,16 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[2],
     minWidth: 0,
   },
+  chevron: {
+    width: 16,
+    height: 16,
+    alignItems: "center",
+    justifyContent: "center",
+    flexShrink: 0,
+  },
+  chevronExpanded: {
+    transform: [{ rotate: "90deg" }],
+  },
   entryIcon: {
     flexShrink: 0,
   },
@@ -1274,3 +1302,16 @@ const styles = StyleSheet.create((theme) => ({
 }));
 
 const TREE_PANE_CONTAINER_STYLE = [styles.treePane, styles.treePaneFill];
+
+interface IndentGuideProps {
+  index: number;
+}
+
+function IndentGuide({ index }: IndentGuideProps) {
+  const { theme } = useUnistyles();
+  const guideStyle = useMemo(
+    () => [styles.indentGuide, { left: theme.spacing[3] + index * INDENT_PER_LEVEL + 4 }],
+    [index, theme.spacing],
+  );
+  return <View style={guideStyle} />;
+}

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

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

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

@@ -11,16 +11,10 @@ import { orderHostsLocalFirst } from "@/types/host-connection";
 import {
   ADD_HOST_OPTION_ID,
   ALL_HOSTS_OPTION_ID,
-  ENABLE_BUILT_IN_DAEMON_OPTION_ID,
   getHostPickerLabel,
 } from "./host-picker-constants";
 
-export {
-  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}

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

@@ -385,7 +385,6 @@ function SidebarHostPicker({
       showActiveConnection
       onOpenHostSettings={onOpenHostSettings}
       searchable
-      desktopPlacement="top-start"
       desktopMinWidth={240}
       addHostTestID="sidebar-host-add"
       hostOptionTestID={sidebarHostOptionTestID}

packages/app/src/components/message.tsx

@@ -3038,8 +3038,6 @@ interface ToolCallProps {
   onInlineDetailsHoverChange?: (hovered: boolean) => void;
   onInlineDetailsExpandedChange?: (expanded: boolean) => void;
   onOpenFilePath?: (filePath: string) => void;
-  defaultExpanded?: boolean;
-  forceInline?: boolean;
 }
 
 export const ToolCall = memo(function ToolCall({
@@ -3056,14 +3054,11 @@ export const ToolCall = memo(function ToolCall({
   onInlineDetailsHoverChange,
   onInlineDetailsExpandedChange,
   onOpenFilePath,
-  defaultExpanded,
-  forceInline = false,
 }: ToolCallProps) {
   const { openToolCall } = useToolCallSheet();
-  const [isExpanded, setIsExpanded] = useState(defaultExpanded ?? false);
+  const [isExpanded, setIsExpanded] = useState(false);
 
   const isMobile = useIsCompactFormFactor();
-  const shouldRenderInline = !isMobile || forceInline;
 
   const effectiveDetail = useMemo<ToolCallDetail | undefined>(() => {
     if (detail) {
@@ -3101,7 +3096,7 @@ export const ToolCall = memo(function ToolCall({
   }, [presentation.openFilePath, onOpenFilePath]);
 
   const handleToggle = useCallback(() => {
-    if (!shouldRenderInline) {
+    if (isMobile) {
       openToolCall({
         displayName: presentation.displayName,
         summary: presentation.summary,
@@ -3114,7 +3109,7 @@ export const ToolCall = memo(function ToolCall({
       setIsExpanded((prev) => !prev);
     }
   }, [
-    shouldRenderInline,
+    isMobile,
     openToolCall,
     presentation.displayName,
     presentation.summary,
@@ -3125,22 +3120,22 @@ export const ToolCall = memo(function ToolCall({
   ]);
 
   useEffect(() => {
-    if (!onInlineDetailsHoverChange || !shouldRenderInline || isExpanded) {
+    if (!onInlineDetailsHoverChange || isMobile || isExpanded) {
       return;
     }
     onInlineDetailsHoverChange(false);
-  }, [isExpanded, shouldRenderInline, onInlineDetailsHoverChange]);
+  }, [isExpanded, isMobile, onInlineDetailsHoverChange]);
 
   useEffect(() => {
     if (!onInlineDetailsExpandedChange) {
       return;
     }
-    if (!shouldRenderInline) {
+    if (isMobile) {
       onInlineDetailsExpandedChange(false);
       return;
     }
     onInlineDetailsExpandedChange(isExpanded);
-  }, [isExpanded, shouldRenderInline, onInlineDetailsExpandedChange]);
+  }, [isExpanded, isMobile, onInlineDetailsExpandedChange]);
 
   useEffect(() => {
     if (!onInlineDetailsExpandedChange) {
@@ -3153,7 +3148,7 @@ export const ToolCall = memo(function ToolCall({
 
   // Render inline details for desktop
   const renderDetails = useCallback(() => {
-    if (!shouldRenderInline) return null;
+    if (isMobile) return null;
     return (
       <ToolCallDetailsContent
         detail={effectiveDetail}
@@ -3162,7 +3157,7 @@ export const ToolCall = memo(function ToolCall({
         showLoadingSkeleton={presentation.isLoadingDetails}
       />
     );
-  }, [shouldRenderInline, effectiveDetail, presentation.errorText, presentation.isLoadingDetails]);
+  }, [isMobile, effectiveDetail, presentation.errorText, presentation.isLoadingDetails]);
 
   if (presentation.isPlan && effectiveDetail?.type === "plan") {
     return (
@@ -3180,10 +3175,10 @@ export const ToolCall = memo(function ToolCall({
       label={presentation.displayName}
       secondaryLabel={presentation.summary}
       icon={presentation.icon}
-      isExpanded={shouldRenderInline && isExpanded}
+      isExpanded={!isMobile && isExpanded}
       onToggle={presentation.canOpenDetails ? handleToggle : undefined}
       onOpenFile={handleOpenFile}
-      renderDetails={presentation.canOpenDetails && shouldRenderInline ? renderDetails : undefined}
+      renderDetails={presentation.canOpenDetails && !isMobile ? renderDetails : undefined}
       isLoading={status === "running" || status === "executing"}
       isError={status === "failed"}
       isLastInSequence={isLastInSequence}
@@ -3205,7 +3200,5 @@ function areToolCallPropsEqual(previous: ToolCallProps, next: ToolCallProps) {
   if (previous.isLastInSequence !== next.isLastInSequence) return false;
   if (previous.disableOuterSpacing !== next.disableOuterSpacing) return false;
   if (previous.onOpenFilePath !== next.onOpenFilePath) return false;
-  if (previous.defaultExpanded !== next.defaultExpanded) return false;
-  if (previous.forceInline !== next.forceInline) return false;
   return true;
 }

packages/app/src/components/root-error-boundary.tsx

@@ -1,157 +0,0 @@
-import React, { Component, Fragment, type ErrorInfo, type ReactNode } from "react";
-import { Pressable, ScrollView, Text, View } from "react-native";
-import type { PressableStateCallbackType, StyleProp, ViewStyle } from "react-native";
-import { useTranslation } from "react-i18next";
-import { StyleSheet } from "react-native-unistyles";
-import { formatCaughtValue } from "./root-error-details";
-
-interface RootErrorBoundaryProps {
-  children: ReactNode;
-}
-
-interface RootErrorBoundaryState {
-  error: string | null;
-  resetKey: number;
-}
-
-export class RootErrorBoundary extends Component<RootErrorBoundaryProps, RootErrorBoundaryState> {
-  state: RootErrorBoundaryState = {
-    error: null,
-    resetKey: 0,
-  };
-
-  static getDerivedStateFromError(error: unknown): Partial<RootErrorBoundaryState> {
-    return { error: formatCaughtValue(error) };
-  }
-
-  componentDidCatch(error: unknown, errorInfo: ErrorInfo) {
-    console.error("[RootErrorBoundary] Unhandled render error", {
-      error: formatCaughtValue(error),
-      componentStack: errorInfo.componentStack,
-    });
-  }
-
-  retry = () => {
-    this.setState(({ resetKey }) => ({
-      error: null,
-      resetKey: resetKey + 1,
-    }));
-  };
-
-  render() {
-    const { error, resetKey } = this.state;
-    if (error !== null) {
-      return <RootErrorFallback error={error} onRetry={this.retry} />;
-    }
-
-    return <Fragment key={resetKey}>{this.props.children}</Fragment>;
-  }
-}
-
-interface RootErrorFallbackProps {
-  error: string;
-  onRetry: () => void;
-}
-
-function RootErrorFallback({ error, onRetry }: RootErrorFallbackProps) {
-  const { t } = useTranslation();
-
-  return (
-    <ScrollView
-      style={styles.container}
-      contentContainerStyle={styles.contentContainer}
-      testID="root-error-boundary"
-    >
-      <View style={styles.content}>
-        <Text style={styles.kicker}>{t("rootError.kicker")}</Text>
-        <Text style={styles.title}>{t("rootError.title")}</Text>
-        <Text style={styles.body}>{t("rootError.body")}</Text>
-        <View style={styles.messageBox}>
-          <Text style={styles.messageLabel}>{t("rootError.details")}</Text>
-          <Text style={styles.message}>{error}</Text>
-        </View>
-        <Pressable
-          accessibilityRole="button"
-          onPress={onRetry}
-          style={retryButtonStyle}
-          testID="root-error-boundary-retry"
-        >
-          <Text style={styles.retryButtonText}>{t("common.actions.retry")}</Text>
-        </Pressable>
-      </View>
-    </ScrollView>
-  );
-}
-
-function retryButtonStyle({ pressed }: PressableStateCallbackType): StyleProp<ViewStyle> {
-  return [styles.retryButton, pressed ? styles.retryButtonPressed : null];
-}
-
-const styles = StyleSheet.create((theme) => ({
-  container: {
-    flex: 1,
-    backgroundColor: theme.colors.surface0,
-  },
-  contentContainer: {
-    flexGrow: 1,
-    justifyContent: "center",
-    paddingHorizontal: theme.spacing[6],
-    paddingVertical: theme.spacing[8],
-  },
-  content: {
-    alignSelf: "center",
-    width: "100%",
-    maxWidth: 520,
-    gap: theme.spacing[4],
-  },
-  kicker: {
-    color: theme.colors.destructive,
-    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.semibold,
-  },
-  title: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.xl,
-    fontWeight: theme.fontWeight.semibold,
-  },
-  body: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
-    lineHeight: 22,
-  },
-  messageBox: {
-    gap: theme.spacing[2],
-    borderWidth: 1,
-    borderColor: theme.colors.borderAccent,
-    borderRadius: theme.borderRadius.lg,
-    backgroundColor: theme.colors.surface1,
-    padding: theme.spacing[4],
-  },
-  messageLabel: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.xs,
-    fontWeight: theme.fontWeight.semibold,
-  },
-  message: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.sm,
-    lineHeight: 20,
-  },
-  retryButton: {
-    alignSelf: "flex-start",
-    minHeight: 40,
-    justifyContent: "center",
-    borderRadius: theme.borderRadius.md,
-    backgroundColor: theme.colors.accent,
-    paddingHorizontal: theme.spacing[4],
-    paddingVertical: theme.spacing[2],
-  },
-  retryButtonPressed: {
-    opacity: 0.85,
-  },
-  retryButtonText: {
-    color: theme.colors.accentForeground,
-    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.semibold,
-  },
-}));

packages/app/src/components/root-error-details.test.ts

@@ -1,109 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { formatCaughtValue } from "./root-error-details";
-
-describe("formatCaughtValue", () => {
-  it("preserves details for Error values", () => {
-    class RouteRenderError extends Error {
-      code = "E_ROUTE_RENDER";
-      cause = "workspace route";
-
-      constructor() {
-        super("route render exploded");
-        this.name = "RouteRenderError";
-        this.stack = "RouteRenderError: route render exploded\n    at WorkspaceRoute";
-      }
-    }
-
-    const details = formatCaughtValue(new RouteRenderError());
-
-    expect(details).toContain("Name: RouteRenderError");
-    expect(details).toContain("Message: route render exploded");
-    expect(details).toContain("Stack:");
-    expect(details).toContain("RouteRenderError: route render exploded");
-    expect(details).toContain("Cause:");
-    expect(details).toContain("workspace route");
-    expect(details).toContain("E_ROUTE_RENDER");
-  });
-
-  it("does not duplicate aggregate errors as custom fields", () => {
-    const error = new AggregateError([new Error("first failure")], "multiple failures");
-    const details = formatCaughtValue(error);
-
-    expect(details).toContain("Errors:");
-    expect(details).toContain("first failure");
-    expect(details).not.toContain("Fields:");
-  });
-
-  it("preserves null aggregate error values", () => {
-    class ErrorWithNullableErrors extends Error {
-      errors = null;
-    }
-
-    const details = formatCaughtValue(new ErrorWithNullableErrors("nullable errors"));
-
-    expect(details).toContain("Errors:\nnull");
-    expect(details).not.toContain("Fields:");
-  });
-
-  it("does not throw for malformed Error text fields", () => {
-    const error = new Error("fallback");
-    Object.defineProperties(error, {
-      name: { configurable: true, value: null },
-      message: { configurable: true, value: 42 },
-      stack: { configurable: true, value: { frame: "bad stack" } },
-    });
-
-    const details = formatCaughtValue(error);
-
-    expect(details).toContain("Name: null");
-    expect(details).toContain("Message: 42");
-    expect(details).toContain('"frame": "bad stack"');
-  });
-
-  it("marks recursive Error causes", () => {
-    const error = new Error("self cause");
-    Object.defineProperty(error, "cause", { configurable: true, value: error });
-
-    const details = formatCaughtValue(error);
-
-    expect(details).toContain("Cause:\n[Circular Error]");
-  });
-
-  it("returns fallback details when Error properties throw", () => {
-    const error = new Error("fallback");
-    Object.defineProperty(error, "message", {
-      configurable: true,
-      get() {
-        throw new Error("bad message getter");
-      },
-    });
-
-    const details = formatCaughtValue(error);
-
-    expect(details).toContain("[Unserializable value]");
-    expect(details).toContain("Details unavailable:");
-    expect(details).toContain("Error: bad message getter");
-  });
-
-  it("renders string thrown values as the string", () => {
-    expect(formatCaughtValue("plain failure")).toBe("plain failure");
-  });
-
-  it("preserves empty string thrown values", () => {
-    expect(formatCaughtValue("")).toBe("");
-  });
-
-  it("renders numeric thrown values without extra category text", () => {
-    const details = formatCaughtValue(42);
-
-    expect(details).toBe("42");
-    expect(details).not.toContain("non-Error");
-  });
-
-  it("renders circular objects as JSON with circular markers", () => {
-    const value: { label: string; self?: unknown } = { label: "loop" };
-    value.self = value;
-
-    expect(formatCaughtValue(value)).toBe('{\n  "label": "loop",\n  "self": "[Circular]"\n}');
-  });
-});

packages/app/src/components/root-error-details.ts

@@ -1,155 +0,0 @@
-export function formatCaughtValue(value: unknown): string {
-  try {
-    return formatCaughtValueWithSeenErrors(value, new WeakSet<Error>());
-  } catch (formattingError) {
-    return formatFormattingFailure(value, formattingError);
-  }
-}
-
-function formatCaughtValueWithSeenErrors(value: unknown, seenErrors: WeakSet<Error>): string {
-  if (value instanceof Error) {
-    return formatError(value, seenErrors);
-  }
-
-  if (typeof value === "string") {
-    return value;
-  }
-
-  if (value === null || value === undefined) {
-    return safeString(value);
-  }
-
-  if (typeof value !== "object" && typeof value !== "function") {
-    return safeString(value);
-  }
-
-  return stringifyJson(value, seenErrors) ?? safeString(value);
-}
-
-function formatError(error: Error, seenErrors: WeakSet<Error>): string {
-  if (seenErrors.has(error)) {
-    return "[Circular Error]";
-  }
-
-  seenErrors.add(error);
-  const sections: string[] = [];
-  const name = formatErrorTextProperty(Reflect.get(error, "name"), seenErrors);
-  const message = formatErrorTextProperty(Reflect.get(error, "message"), seenErrors);
-  const stack = formatErrorTextProperty(Reflect.get(error, "stack"), seenErrors);
-
-  if (name) {
-    sections.push(`Name: ${name}`);
-  }
-  if (message) {
-    sections.push(`Message: ${message}`);
-  }
-  if (stack) {
-    sections.push(`Stack:\n${stack}`);
-  }
-
-  const errorCause = getErrorCause(error);
-  if (errorCause.hasCause) {
-    sections.push(`Cause:\n${formatCaughtValueWithSeenErrors(errorCause.value, seenErrors)}`);
-  }
-
-  const aggregateErrors = getAggregateErrors(error);
-  if (aggregateErrors.hasErrors) {
-    sections.push(`Errors:\n${formatCaughtValueWithSeenErrors(aggregateErrors.value, seenErrors)}`);
-  }
-
-  const fields = getErrorFields(error);
-  if (fields !== null) {
-    sections.push(`Fields:\n${stringifyJson(fields, seenErrors) ?? safeString(fields)}`);
-  }
-
-  seenErrors.delete(error);
-  return sections.join("\n\n") || safeString(error);
-}
-
-function formatErrorTextProperty(value: unknown, seenErrors: WeakSet<Error>): string | null {
-  if (typeof value === "string") {
-    const trimmed = value.trim();
-    return trimmed || null;
-  }
-  if (value === undefined) {
-    return null;
-  }
-  return stringifyJson(value, seenErrors) ?? safeString(value);
-}
-
-function getErrorCause(error: Error): { hasCause: boolean; value: unknown } {
-  if (!Reflect.has(error, "cause")) {
-    return { hasCause: false, value: null };
-  }
-  return { hasCause: true, value: Reflect.get(error, "cause") };
-}
-
-function getAggregateErrors(error: Error): { hasErrors: boolean; value: unknown } {
-  if (!Reflect.has(error, "errors")) {
-    return { hasErrors: false, value: null };
-  }
-  return { hasErrors: true, value: Reflect.get(error, "errors") };
-}
-
-function getErrorFields(error: Error): Record<string, unknown> | null {
-  const fields: Record<string, unknown> = {};
-  for (const key of Object.keys(error)) {
-    if (
-      key === "name" ||
-      key === "message" ||
-      key === "stack" ||
-      key === "cause" ||
-      key === "errors"
-    ) {
-      continue;
-    }
-    fields[key] = Reflect.get(error, key);
-  }
-
-  return Object.keys(fields).length > 0 ? fields : null;
-}
-
-function stringifyJson(value: unknown, seenErrors: WeakSet<Error>): string | null {
-  const seen = new WeakSet<object>();
-  try {
-    const serialized = JSON.stringify(
-      value,
-      (_key, nestedValue: unknown) => {
-        if (nestedValue instanceof Error) {
-          return formatError(nestedValue, seenErrors);
-        }
-        if (typeof nestedValue === "bigint") {
-          return String(nestedValue);
-        }
-        if (nestedValue !== null && typeof nestedValue === "object") {
-          if (seen.has(nestedValue)) {
-            return "[Circular]";
-          }
-          seen.add(nestedValue);
-        }
-        return nestedValue;
-      },
-      2,
-    );
-    return typeof serialized === "string" ? serialized : null;
-  } catch {
-    return null;
-  }
-}
-
-function safeString(value: unknown): string {
-  try {
-    return String(value);
-  } catch {
-    return "[Unserializable value]";
-  }
-}
-
-function formatFormattingFailure(value: unknown, formattingError: unknown): string {
-  const valueText = safeString(value);
-  const formattingErrorText = safeString(formattingError);
-  if (formattingErrorText === "[Unserializable value]") {
-    return valueText;
-  }
-  return `${valueText}\n\nDetails unavailable:\n${formattingErrorText}`;
-}

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

@@ -1,140 +1,366 @@
-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 {
-  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}
+              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 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,
+  },
+  // The mode toggle hugs its options at the left rather than stretching to a
+  // full-width track; the interval row then reads as input + toggle.
+  modeControl: {
+    alignSelf: "flex-start",
+  },
+  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,
+  },
+  // Selected preset reads as a chosen surface, not a second accent fill
+  // competing with the sheet's primary CTA.
+  chipSelected: {
+    backgroundColor: theme.colors.surface3,
+    borderColor: theme.colors.borderAccent,
+  },
+  chipLabel: {
+    fontSize: theme.fontSize.xs,
+    fontWeight: theme.fontWeight.medium,
+    color: theme.colors.foregroundMuted,
+  },
+  chipLabelSelected: {
+    color: theme.colors.foreground,
+  },
   cronInput: {
+    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: theme.fontFamily.mono,
   },
   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],

packages/app/src/components/tree-primitives.tsx

@@ -1,82 +0,0 @@
-import { useMemo } from "react";
-import { View } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { ChevronRight } from "lucide-react-native";
-import { SPACING, type Theme } from "@/styles/theme";
-import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
-
-// Shared presentation primitives for the app's directory trees. Both the Files
-// explorer (server-loaded listings) and the Changes view (client-built from diff
-// paths) render different data, but their ROWS should look identical — same
-// indentation, guide lines, and chevron. Keep those here so the two trees can't
-// drift apart.
-export const TREE_INDENT_PER_LEVEL = 16;
-
-/** Left padding for a tree row at `depth`. Shared by folder rows and file headers
- * in the Changes tree so their indentation can't drift apart. */
-export function treeRowPaddingLeft(depth: number): number {
-  return SPACING[3] + depth * TREE_INDENT_PER_LEVEL;
-}
-
-const foregroundMutedIconColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-
-const ThemedChevronRight = withUnistyles(ChevronRight);
-
-/**
- * Vertical guide lines connecting nested rows to their ancestors — one line per
- * ancestor depth level, positioned absolutely within the (relative) row. Renders
- * nothing at depth 0.
- */
-export function TreeIndentGuides({ depth }: { depth: number }) {
-  const guides = useMemo(
-    () =>
-      Array.from({ length: depth }, (_, index) => ({
-        key: index,
-        style: [
-          styles.indentGuide,
-          inlineUnistylesStyle({ left: SPACING[3] + index * TREE_INDENT_PER_LEVEL + 4 }),
-        ],
-      })),
-    [depth],
-  );
-  return (
-    <>
-      {guides.map((guide) => (
-        <View key={guide.key} style={guide.style} pointerEvents="none" />
-      ))}
-    </>
-  );
-}
-
-/** Rotating disclosure chevron for a directory row (points right; rotates down when expanded). */
-export function TreeChevron({ expanded }: { expanded: boolean }) {
-  return (
-    <View style={expanded ? CHEVRON_EXPANDED_STYLE : styles.chevron}>
-      <ThemedChevronRight size={16} uniProps={foregroundMutedIconColorMapping} />
-    </View>
-  );
-}
-
-const styles = StyleSheet.create((theme: Theme) => ({
-  indentGuide: {
-    position: "absolute",
-    top: 0,
-    bottom: 0,
-    width: 1,
-    backgroundColor: theme.colors.surface2,
-  },
-  chevron: {
-    width: 16,
-    height: 16,
-    alignItems: "center",
-    justifyContent: "center",
-    flexShrink: 0,
-  },
-  chevronExpanded: {
-    transform: [{ rotate: "90deg" }],
-  },
-}));
-
-// Stable module-level style ref so TreeChevron passes a constant array, not one created
-// per render — satisfies react-perf (no inline-array prop) without a per-render useMemo.
-const CHEVRON_EXPANDED_STYLE = [styles.chevron, styles.chevronExpanded];

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

@@ -16,16 +16,10 @@ import type {
   TextStyle,
   ViewStyle,
 } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import {
-  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[1.5],
+    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>

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

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

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

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

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

@@ -1,18 +1,9 @@
-import {
-  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 &&

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

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

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

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

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

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

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

@@ -1,30 +1,9 @@
-import {
-  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,
+  },
+}));

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

@@ -1,13 +1,9 @@
 import { useCallback, useMemo, type ReactNode } from "react";
 import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
 import type { StyleProp, TextStyle, ViewStyle } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import {
-  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[1.5],
+    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,
+  },
+}));

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

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

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

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

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

@@ -12,9 +12,7 @@ import Animated, {
   useDerivedValue,
   withTiming,
 } from "react-native-reanimated";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { 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],
+  },
+}));

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

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

packages/app/src/contexts/voice-context.tsx

@@ -125,11 +125,6 @@ export function VoiceProvider({ children }: VoiceProviderProps) {
       onVolumeLevel: (level) => {
         runtime?.handleCaptureVolume(level);
       },
-      onInterruption: () => {
-        void runtime?.stopVoice().catch((error) => {
-          console.error("[VoiceEngine] Failed to stop after audio interruption:", error);
-        });
-      },
       onError: (error) => {
         console.error("[VoiceEngine] Capture error:", error);
       },

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

@@ -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.37",
     iconId: "cline",
     installLink: "https://cline.bot/cli",
-    command: ["npx", "-y", "cline@3.0.38", "--acp"],
+    command: ["npx", "-y", "cline@3.0.37", "--acp"],
   },
   {
     id: "codebuddy-code",
     title: "Codebuddy Code",
     description: "Tencent Cloud's official intelligent coding tool",
-    version: "2.117.2",
+    version: "2.116.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.116.0", "--acp"],
   },
   {
     id: "codewhale",
@@ -140,10 +140,10 @@ 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.19",
     iconId: "dimcode",
     installLink: "https://dimcode.dev/docs/acp.html",
-    command: ["npx", "-y", "dimcode@0.2.22", "acp"],
+    command: ["npx", "-y", "dimcode@0.2.19", "acp"],
   },
   {
     id: "dirac",
@@ -159,10 +159,10 @@ const CATALOG_DATA = [
     id: "factory-droid",
     title: "Factory Droid",
     description: "Factory Droid - AI coding agent powered by Factory AI",
-    version: "0.164.1",
+    version: "0.164.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.164.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.3",
     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.3", "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.24",
     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.24", "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.37",
     iconId: "qoder",
     installLink: "https://qoder.com",
-    command: ["npx", "-y", "@qoder-ai/qodercli@1.0.39", "--acp"],
+    command: ["npx", "-y", "@qoder-ai/qodercli@1.0.37", "--acp"],
   },
   {
     id: "qwen-code",
     title: "Qwen Code",
     description: "Alibaba's Qwen coding assistant",
-    version: "0.19.7",
+    version: "0.19.6",
     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.6", "--acp", "--experimental-skills"],
   },
   {
     id: "sigit",

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

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

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

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

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

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

packages/app/src/data/query.ts

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

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

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

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

@@ -34,7 +34,6 @@ interface UseBuiltInDaemonManagementInput {
 interface UseBuiltInDaemonManagementResult {
   isUpdating: boolean;
   toggle: () => void;
-  enable: () => Promise<DaemonManagementToggleResult | null>;
 }
 
 export function useBuiltInDaemonManagement(
@@ -43,16 +42,12 @@ export function useBuiltInDaemonManagement(
   const { t } = useTranslation();
   const { daemonStatus, settings, updateSettings, setStatus, refreshStatus } = input;
   const reportError = useDesktopIpcErrorReporter();
-  const {
-    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 };
 }

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

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

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

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

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

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

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

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

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

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

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

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

packages/app/src/git/diff-flat-items.test.ts

@@ -1,134 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { buildDiffFlatItems, sumHeightsBefore, type DiffFlatItem } from "./diff-flat-items";
-import type { ParsedDiffFile } from "@/git/use-diff-query";
-
-function createFile(path: string, additions = 1, deletions = 0): ParsedDiffFile {
-  return { path, isNew: false, isDeleted: false, additions, deletions, hunks: [] };
-}
-
-function summarize(items: DiffFlatItem[]): string[] {
-  return items.map((item) => {
-    if (item.type === "folder") {
-      return `${"  ".repeat(item.depth)}[${item.displayName}]${item.collapsed ? " (collapsed)" : ""}`;
-    }
-    const base = item.file.path.split("/").pop();
-    return `${"  ".repeat(item.depth)}${item.type === "body" ? "body:" : ""}${base}`;
-  });
-}
-
-describe("buildDiffFlatItems", () => {
-  const files = [createFile("src/app/a.ts"), createFile("src/app/nested/b.ts")];
-
-  it("emits a body and a sticky index for each expanded file", () => {
-    const { items, stickyHeaderIndices } = buildDiffFlatItems({
-      files: [createFile("a.ts"), createFile("b.ts")],
-      viewMode: "tree",
-      collapsedFolders: new Set(),
-      expandedPaths: new Set(["a.ts"]),
-    });
-    // Root-level files (no folder): header, body (for expanded a.ts), header
-    expect(summarize(items)).toEqual(["a.ts", "body:a.ts", "b.ts"]);
-    // sticky points at the header (index 0), not the body
-    expect(stickyHeaderIndices).toEqual([0]);
-    expect(items[0].type).toBe("header");
-  });
-
-  it("emits the old flat list without folder rows or indentation", () => {
-    const { items, stickyHeaderIndices } = buildDiffFlatItems({
-      files,
-      viewMode: "flat",
-      collapsedFolders: new Set(),
-      expandedPaths: new Set(["src/app/a.ts"]),
-    });
-
-    expect(summarize(items)).toEqual(["a.ts", "body:a.ts", "b.ts"]);
-    expect(stickyHeaderIndices).toEqual([0]);
-    expect(items.every((item) => item.type !== "folder")).toBe(true);
-  });
-
-  it("groups files under compressed folder rows, all expanded by default", () => {
-    const { items } = buildDiffFlatItems({
-      files,
-      viewMode: "tree",
-      collapsedFolders: new Set(),
-      expandedPaths: new Set(),
-    });
-    // dirs sort before files within a level: [nested] precedes a.ts
-    expect(summarize(items)).toEqual(["[src/app]", "  [nested]", "    b.ts", "  a.ts"]);
-  });
-
-  it("collapsing a folder hides its descendants but keeps the row", () => {
-    const { items } = buildDiffFlatItems({
-      files,
-      viewMode: "tree",
-      collapsedFolders: new Set(["src/app/nested"]),
-      expandedPaths: new Set(),
-    });
-    expect(summarize(items)).toEqual(["[src/app]", "  [nested] (collapsed)", "  a.ts"]);
-  });
-
-  it("collapsing an ancestor hides everything below it", () => {
-    const { items } = buildDiffFlatItems({
-      files,
-      viewMode: "tree",
-      collapsedFolders: new Set(["src/app"]),
-      expandedPaths: new Set(),
-    });
-    expect(summarize(items)).toEqual(["[src/app] (collapsed)"]);
-  });
-
-  it("derives sticky indices file-headers-only from the post-collapse list", () => {
-    // dirs-first: [src/app], [nested], b.ts, a.ts. Expanding a.ts puts its
-    // header at index 3, with the body right after.
-    const { items, stickyHeaderIndices } = buildDiffFlatItems({
-      files,
-      viewMode: "tree",
-      collapsedFolders: new Set(),
-      expandedPaths: new Set(["src/app/a.ts"]),
-    });
-    expect(summarize(items)).toEqual([
-      "[src/app]",
-      "  [nested]",
-      "    b.ts",
-      "  a.ts",
-      "  body:a.ts",
-    ]);
-    expect(stickyHeaderIndices).toEqual([3]);
-    for (const idx of stickyHeaderIndices) {
-      expect(items[idx].type).toBe("header");
-    }
-  });
-
-  it("maps tree file rows back to their original files array index", () => {
-    const { items } = buildDiffFlatItems({
-      files,
-      viewMode: "tree",
-      collapsedFolders: new Set(),
-      expandedPaths: new Set(),
-    });
-    // Tree order is b.ts (fileIndex 1) then a.ts (fileIndex 0)
-    const headers = items.filter((i) => i.type === "header");
-    expect(headers.map((h) => (h.type === "header" ? h.fileIndex : -1))).toEqual([1, 0]);
-  });
-});
-
-describe("sumHeightsBefore", () => {
-  const items = buildDiffFlatItems({
-    files: [createFile("src/a.ts"), createFile("src/b.ts")],
-    viewMode: "tree",
-    collapsedFolders: new Set(),
-    expandedPaths: new Set(),
-  }).items; // [folder, a.ts, b.ts]
-
-  const heightFor = (item: DiffFlatItem) => (item.type === "folder" ? 10 : 20);
-
-  it("sums the heights of items before the index, counting folder rows", () => {
-    expect(sumHeightsBefore(items, 0, heightFor)).toBe(0);
-    expect(sumHeightsBefore(items, 1, heightFor)).toBe(10); // folder above a.ts
-    expect(sumHeightsBefore(items, 2, heightFor)).toBe(30); // folder + a.ts above b.ts
-  });
-
-  it("clamps an out-of-range index to the list length", () => {
-    expect(sumHeightsBefore(items, 999, heightFor)).toBe(50);
-  });
-});

packages/app/src/git/diff-flat-items.ts

@@ -1,121 +0,0 @@
-import type { ParsedDiffFile } from "@/git/use-diff-query";
-import {
-  buildDiffTree,
-  compressSingleChildChains,
-  flattenDiffTree,
-  type DiffTreeDirNode,
-} from "@/git/diff-tree";
-
-// The row model for the Changes FlatList. `fileIndex` is the file's index within
-// the (path-sorted) `files` array — a stable identity for testIDs/keys that is
-// independent of folder rows and collapse state. `depth` drives indentation.
-export type DiffFlatItem =
-  | {
-      type: "folder";
-      dirPath: string;
-      displayName: string;
-      depth: number;
-      collapsed: boolean;
-      additions: number;
-      deletions: number;
-    }
-  | { type: "header"; file: ParsedDiffFile; fileIndex: number; isExpanded: boolean; depth: number }
-  | { type: "body"; file: ParsedDiffFile; fileIndex: number; depth: number };
-
-export interface DiffFlatItemsResult {
-  items: DiffFlatItem[];
-  /** Indices into `items` of expanded file headers — folder rows are never sticky. */
-  stickyHeaderIndices: number[];
-}
-
-export interface BuildDiffFlatItemsInput {
-  files: ParsedDiffFile[];
-  viewMode: "flat" | "tree";
-  /** Full uncompressed directory paths that are collapsed (empty = all expanded). */
-  collapsedFolders: ReadonlySet<string>;
-  /** File paths whose diff body is expanded. */
-  expandedPaths: ReadonlySet<string>;
-  /**
-   * Pre-built compressed tree (from the same `files`). Pass it to avoid rebuilding
-   * the tree on every collapse toggle; omitted callers (tests) build it internally.
-   */
-  tree?: DiffTreeDirNode;
-}
-
-/**
- * Build the FlatList item model plus its sticky-header indices: files grouped
- * under directory rows, single-child chains compressed, descendants of collapsed
- * folders omitted.
- *
- * Sticky indices are derived from the FINAL (post-collapse) item list and only
- * ever point at expanded FILE headers, so folder rows can't stack or collide in
- * the sticky header stack.
- */
-export function buildDiffFlatItems({
-  files,
-  viewMode,
-  collapsedFolders,
-  expandedPaths,
-  tree,
-}: BuildDiffFlatItemsInput): DiffFlatItemsResult {
-  const items: DiffFlatItem[] = [];
-  const stickyHeaderIndices: number[] = [];
-
-  const pushFile = (file: ParsedDiffFile, fileIndex: number, depth: number): void => {
-    const isExpanded = expandedPaths.has(file.path);
-    items.push({ type: "header", file, fileIndex, isExpanded, depth });
-    if (isExpanded) {
-      stickyHeaderIndices.push(items.length - 1);
-      items.push({ type: "body", file, fileIndex, depth });
-    }
-  };
-
-  if (viewMode === "flat") {
-    for (const [fileIndex, file] of files.entries()) {
-      pushFile(file, fileIndex, 0);
-    }
-    return { items, stickyHeaderIndices };
-  }
-
-  const indexByPath = new Map(files.map((file, index) => [file.path, index]));
-  const compressedTree = tree ?? compressSingleChildChains(buildDiffTree(files));
-  const rows = flattenDiffTree(compressedTree, collapsedFolders);
-
-  for (const row of rows) {
-    if (row.kind === "folder") {
-      items.push({
-        type: "folder",
-        dirPath: row.dirPath,
-        displayName: row.displayName,
-        depth: row.depth,
-        collapsed: collapsedFolders.has(row.dirPath),
-        additions: row.additions,
-        deletions: row.deletions,
-      });
-      continue;
-    }
-    const fileIndex = indexByPath.get(row.file.path);
-    if (fileIndex === undefined) {
-      // Should never happen: the tree is built from the same `files` array.
-      continue;
-    }
-    pushFile(row.file, fileIndex, row.depth);
-  }
-
-  return { items, stickyHeaderIndices };
-}
-
-/** Cumulative height of every item before `index`. Single source of truth for
- * FlatList's getItemLayout AND the collapse scroll-anchor math. */
-export function sumHeightsBefore(
-  items: DiffFlatItem[],
-  index: number,
-  heightFor: (item: DiffFlatItem) => number,
-): number {
-  let offset = 0;
-  const end = Math.min(index, items.length);
-  for (let i = 0; i < end; i++) {
-    offset += heightFor(items[i]);
-  }
-  return Math.max(0, offset);
-}

packages/app/src/git/diff-folder-row.tsx

@@ -1,124 +0,0 @@
-import { useCallback, useMemo } from "react";
-import {
-  View,
-  Text,
-  Pressable,
-  type LayoutChangeEvent,
-  type PressableStateCallbackType,
-} from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { DiffStat } from "@/components/diff-stat";
-import { TreeChevron, TreeIndentGuides, treeRowPaddingLeft } from "@/components/tree-primitives";
-import { type Theme } from "@/styles/theme";
-import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
-
-interface DiffFolderRowProps {
-  /** full uncompressed directory path — the collapse identity */
-  dirPath: string;
-  displayName: string;
-  depth: number;
-  collapsed: boolean;
-  additions: number;
-  deletions: number;
-  onToggle: (dirPath: string) => void;
-  onHeightChange?: (height: number) => void;
-  testID?: string;
-}
-
-function folderRowPressableStyle({
-  hovered,
-  pressed,
-}: PressableStateCallbackType & { hovered?: boolean }) {
-  // Subtle background highlight on hover/press, matching the Files explorer rows
-  // (entryRowActive) — no opacity darken.
-  return [styles.folderRow, (Boolean(hovered) || pressed) && styles.folderRowActive];
-}
-
-export function DiffFolderRow({
-  dirPath,
-  displayName,
-  depth,
-  collapsed,
-  additions,
-  deletions,
-  onToggle,
-  onHeightChange,
-  testID,
-}: DiffFolderRowProps) {
-  const handlePress = useCallback(() => {
-    onToggle(dirPath);
-  }, [dirPath, onToggle]);
-
-  const handleLayout = useCallback(
-    (event: LayoutChangeEvent) => {
-      onHeightChange?.(event.nativeEvent.layout.height);
-    },
-    [onHeightChange],
-  );
-
-  const leftStyle = useMemo(
-    () => [styles.left, inlineUnistylesStyle({ paddingLeft: treeRowPaddingLeft(depth) })],
-    [depth],
-  );
-
-  const accessibilityState = useMemo(() => ({ expanded: !collapsed }), [collapsed]);
-
-  return (
-    <View style={styles.container} onLayout={handleLayout} testID={testID}>
-      <TreeIndentGuides depth={depth} />
-      <Pressable
-        onPress={handlePress}
-        style={folderRowPressableStyle}
-        accessibilityRole="button"
-        accessibilityState={accessibilityState}
-        testID={testID ? `${testID}-toggle` : undefined}
-      >
-        <View style={leftStyle}>
-          <TreeChevron expanded={!collapsed} />
-          <Text style={styles.folderName} numberOfLines={1}>
-            {displayName}
-          </Text>
-        </View>
-        <View style={styles.right}>
-          <DiffStat additions={additions} deletions={deletions} />
-        </View>
-      </Pressable>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create((theme: Theme) => ({
-  container: {
-    overflow: "hidden",
-  },
-  folderRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    paddingRight: theme.spacing[2],
-    paddingVertical: theme.spacing[2],
-    gap: theme.spacing[1],
-    minWidth: 0,
-  },
-  folderRowActive: {
-    backgroundColor: theme.colors.surfaceSidebarHover,
-  },
-  left: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-    flex: 1,
-    minWidth: 0,
-  },
-  right: {
-    flexDirection: "row",
-    alignItems: "center",
-    flexShrink: 0,
-  },
-  folderName: {
-    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.normal,
-    color: theme.colors.foreground,
-    flexShrink: 1,
-    minWidth: 0,
-  },
-}));

packages/app/src/git/diff-pane.tsx

@@ -36,10 +36,8 @@ import {
   ChevronDown,
   Columns2,
   Download,
-  FolderTree,
   GitCommitHorizontal,
   GitMerge,
-  List,
   ListChevronsDownUp,
   ListChevronsUpDown,
   Pilcrow,
@@ -54,12 +52,6 @@ import {
   type DiffLine,
   type HighlightToken,
 } from "@/git/use-diff-query";
-import { buildDiffFlatItems, sumHeightsBefore, type DiffFlatItem } from "@/git/diff-flat-items";
-import { buildDiffTree, collectDirPaths, compressSingleChildChains } from "@/git/diff-tree";
-import { DiffFolderRow } from "@/git/diff-folder-row";
-import { TreeIndentGuides, treeRowPaddingLeft } from "@/components/tree-primitives";
-import { SvgXml } from "react-native-svg";
-import { getFileIconSvg } from "@/components/material-file-icons";
 import { useCheckoutStatusQuery } from "@/git/use-status-query";
 import { useCheckoutPrStatusQuery } from "@/git/use-pr-status-query";
 import { useChangesPreferences } from "@/hooks/use-changes-preferences";
@@ -199,10 +191,6 @@ function HighlightedText({
 interface DiffFileSectionProps {
   file: ParsedDiffFile;
   isExpanded: boolean;
-  /** Tree indentation level (0 on the flat/mobile path). */
-  depth?: number;
-  /** Show the muted directory suffix (flat list); false inside the folder tree. */
-  showDir?: boolean;
   onToggle: (path: string) => void;
   onHeaderHeightChange?: (path: string, height: number) => void;
   testID?: string;
@@ -901,8 +889,6 @@ function SplitDiffColumn({
 const DiffFileHeader = memo(function DiffFileHeader({
   file,
   isExpanded,
-  depth = 0,
-  showDir = true,
   onToggle,
   onHeaderHeightChange,
   testID,
@@ -954,27 +940,13 @@ const DiffFileHeader = memo(function DiffFileHeader({
     [isExpanded],
   );
 
-  const headerPressableStyle = useCallback(
-    (state: PressableStateCallbackType) =>
-      depth > 0
-        ? [
-            fileHeaderPressableStyle(state),
-            inlineUnistylesStyle({ paddingLeft: treeRowPaddingLeft(depth) }),
-          ]
-        : fileHeaderPressableStyle(state),
-    [depth],
-  );
-
-  const fileName = file.path.split("/").pop() ?? file.path;
-
   return (
     <View style={containerStyle} onLayout={handleLayout} testID={testID}>
-      <TreeIndentGuides depth={depth} />
       <Tooltip delayDuration={300} enabledOnDesktop enabledOnMobile={false}>
         <TooltipTrigger asChild>
           <Pressable
             testID={testID ? `${testID}-toggle` : undefined}
-            style={headerPressableStyle}
+            style={fileHeaderPressableStyle}
             // Android: prevent parent pan/scroll gestures from canceling the tap release.
             cancelable={false}
             onPressIn={handlePressIn}
@@ -982,25 +954,14 @@ const DiffFileHeader = memo(function DiffFileHeader({
             onPress={toggleExpanded}
           >
             <View style={styles.fileHeaderLeft}>
-              {showDir ? null : (
-                <View style={styles.fileIcon}>
-                  <SvgXml xml={getFileIconSvg(fileName)} width={16} height={16} />
-                </View>
-              )}
               <Text style={styles.fileName} numberOfLines={1}>
-                {fileName}
+                {file.path.split("/").pop()}
+              </Text>
+              <Text style={styles.fileDir} numberOfLines={1}>
+                {file.path.includes("/")
+                  ? ` ${file.path.slice(0, file.path.lastIndexOf("/"))}`
+                  : ""}
               </Text>
-              {showDir ? (
-                <Text style={styles.fileDir} numberOfLines={1}>
-                  {file.path.includes("/")
-                    ? ` ${file.path.slice(0, file.path.lastIndexOf("/"))}`
-                    : ""}
-                </Text>
-              ) : (
-                // Flex spacer in tree mode (no dir suffix) so the New/Deleted badge
-                // stays right-aligned next to the diff stats, as in the flat list.
-                <View style={styles.fileDirSpacer} />
-              )}
               {file.isNew && (
                 <View style={styles.newBadge}>
                   <Text style={styles.newBadgeText}>{t("workspace.git.diff.newFile")}</Text>
@@ -1220,6 +1181,7 @@ type PressableStyleFn = (
   state: PressableStateCallbackType & { hovered?: boolean; open?: boolean },
 ) => StyleProp<ViewStyle>;
 
+const foregroundIconColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
 const foregroundMutedIconColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 
 const ThemedActivityIndicator = withUnistyles(ActivityIndicator);
@@ -1229,8 +1191,6 @@ const ThemedPilcrow = withUnistyles(Pilcrow);
 const ThemedWrapText = withUnistyles(WrapText);
 const ThemedListChevronsDownUp = withUnistyles(ListChevronsDownUp);
 const ThemedListChevronsUpDown = withUnistyles(ListChevronsUpDown);
-const ThemedFolderTree = withUnistyles(FolderTree);
-const ThemedList = withUnistyles(List);
 const ThemedGitCommitHorizontal = withUnistyles(GitCommitHorizontal);
 const ThemedDownload = withUnistyles(Download);
 const ThemedUpload = withUnistyles(Upload);
@@ -1241,89 +1201,101 @@ const ThemedRefreshCcw = withUnistyles(RefreshCcw);
 const ThemedArchive = withUnistyles(Archive);
 const ThemedChevronDown = withUnistyles(ChevronDown);
 
-const DIFF_OPTIONS_WHITESPACE_ICON = (
-  <ThemedPilcrow size={14} uniProps={foregroundMutedIconColorMapping} />
-);
-const DIFF_OPTIONS_WRAP_ICON = (
-  <ThemedWrapText size={14} uniProps={foregroundMutedIconColorMapping} />
-);
-
-interface DiffLayoutToggleProps {
+interface DiffLayoutToggleGroupProps {
   layout: "unified" | "split";
-  isMobile: boolean;
-  toggleStyle: PressableStyleFn;
-  onToggle: () => void;
+  unifiedToggleStyle: PressableStyleFn;
+  splitToggleStyle: PressableStyleFn;
+  onUnified: () => void;
+  onSplit: () => void;
 }
 
-function DiffLayoutToggle({ layout, isMobile, toggleStyle, onToggle }: DiffLayoutToggleProps) {
+function DiffLayoutToggleGroup({
+  layout,
+  unifiedToggleStyle,
+  splitToggleStyle,
+  onUnified,
+  onSplit,
+}: DiffLayoutToggleGroupProps) {
   const { t } = useTranslation();
-  const label =
-    layout === "unified"
-      ? t("workspace.git.diff.switchToSplit")
-      : t("workspace.git.diff.switchToUnified");
+  const unifiedLabel = t("workspace.git.diff.unified");
+  const splitLabel = t("workspace.git.diff.split");
   return (
-    <Tooltip delayDuration={300}>
-      <TooltipTrigger asChild>
-        <Pressable
-          accessibilityRole="button"
-          accessibilityLabel={label}
-          testID="changes-toggle-layout"
-          onPress={onToggle}
-          style={toggleStyle}
-        >
-          {layout === "unified" ? (
-            <ThemedColumns2 size={isMobile ? 18 : 14} uniProps={foregroundMutedIconColorMapping} />
-          ) : (
+    <View style={styles.toggleButtonGroup}>
+      <Tooltip delayDuration={300}>
+        <TooltipTrigger asChild>
+          <Pressable
+            accessibilityRole="button"
+            accessibilityLabel={unifiedLabel}
+            testID="changes-layout-unified"
+            onPress={onUnified}
+            style={unifiedToggleStyle}
+          >
             <ThemedAlignJustify
-              size={isMobile ? 18 : 14}
-              uniProps={foregroundMutedIconColorMapping}
+              size={14}
+              uniProps={
+                layout === "unified" ? foregroundIconColorMapping : foregroundMutedIconColorMapping
+              }
             />
-          )}
-        </Pressable>
-      </TooltipTrigger>
-      <TooltipContent side="bottom">
-        <Text style={styles.tooltipText}>{label}</Text>
-      </TooltipContent>
-    </Tooltip>
+          </Pressable>
+        </TooltipTrigger>
+        <TooltipContent side="bottom">
+          <Text style={styles.tooltipText}>{unifiedLabel}</Text>
+        </TooltipContent>
+      </Tooltip>
+      <Tooltip delayDuration={300}>
+        <TooltipTrigger asChild>
+          <Pressable
+            accessibilityRole="button"
+            accessibilityLabel={splitLabel}
+            testID="changes-layout-split"
+            onPress={onSplit}
+            style={splitToggleStyle}
+          >
+            <ThemedColumns2
+              size={14}
+              uniProps={
+                layout === "split" ? foregroundIconColorMapping : foregroundMutedIconColorMapping
+              }
+            />
+          </Pressable>
+        </TooltipTrigger>
+        <TooltipContent side="bottom">
+          <Text style={styles.tooltipText}>{splitLabel}</Text>
+        </TooltipContent>
+      </Tooltip>
+    </View>
   );
 }
 
-interface DiffViewModeToggleProps {
-  viewMode: "flat" | "tree";
+interface DiffWhitespaceToggleProps {
+  hideWhitespace: boolean;
   isMobile: boolean;
   toggleStyle: PressableStyleFn;
   onToggle: () => void;
 }
 
-function DiffViewModeToggle({
-  viewMode,
+function DiffWhitespaceToggle({
+  hideWhitespace,
   isMobile,
   toggleStyle,
   onToggle,
-}: DiffViewModeToggleProps) {
+}: DiffWhitespaceToggleProps) {
   const { t } = useTranslation();
-  const label =
-    viewMode === "flat"
-      ? t("workspace.git.diff.showTreeView")
-      : t("workspace.git.diff.showFlatView");
+  const label = t("workspace.git.diff.hideWhitespace");
   return (
     <Tooltip delayDuration={300}>
       <TooltipTrigger asChild>
         <Pressable
           accessibilityRole="button"
           accessibilityLabel={label}
-          testID="changes-toggle-view-mode"
+          testID="changes-toggle-whitespace"
           style={toggleStyle}
           onPress={onToggle}
         >
-          {viewMode === "flat" ? (
-            <ThemedFolderTree
-              size={isMobile ? 18 : 14}
-              uniProps={foregroundMutedIconColorMapping}
-            />
-          ) : (
-            <ThemedList size={isMobile ? 18 : 14} uniProps={foregroundMutedIconColorMapping} />
-          )}
+          <ThemedPilcrow
+            size={isMobile ? 18 : 14}
+            uniProps={hideWhitespace ? foregroundIconColorMapping : foregroundMutedIconColorMapping}
+          />
         </Pressable>
       </TooltipTrigger>
       <TooltipContent side="bottom">
@@ -1334,33 +1306,50 @@ function DiffViewModeToggle({
 }
 
 interface DiffFilesToolbarProps {
-  allFileDiffsExpanded: boolean;
+  wrapLines: boolean;
+  allExpanded: boolean;
   isMobile: boolean;
+  wrapLinesToggleStyle: PressableStyleFn;
   expandAllToggleStyle: PressableStyleFn;
+  onToggleWrapLines: () => void;
   onToggleExpandAll: () => void;
 }
 
 function DiffFilesToolbar({
-  allFileDiffsExpanded,
+  wrapLines,
+  allExpanded,
   isMobile,
+  wrapLinesToggleStyle,
   expandAllToggleStyle,
+  onToggleWrapLines,
   onToggleExpandAll,
 }: DiffFilesToolbarProps) {
   const { t } = useTranslation();
-  const expandAllLabel = allFileDiffsExpanded
+  const wrapLinesLabel = wrapLines
+    ? t("workspace.git.diff.scrollLongLines")
+    : t("workspace.git.diff.wrapLongLines");
+  const expandAllLabel = allExpanded
     ? t("workspace.git.diff.collapseAll")
     : t("workspace.git.diff.expandAll");
   return (
     <View style={styles.diffStatusButtons}>
       <Tooltip delayDuration={300}>
         <TooltipTrigger asChild>
-          <Pressable
-            accessibilityRole="button"
-            accessibilityLabel={expandAllLabel}
-            style={expandAllToggleStyle}
-            onPress={onToggleExpandAll}
-          >
-            {allFileDiffsExpanded ? (
+          <Pressable style={wrapLinesToggleStyle} onPress={onToggleWrapLines}>
+            <ThemedWrapText
+              size={isMobile ? 18 : 14}
+              uniProps={wrapLines ? foregroundIconColorMapping : foregroundMutedIconColorMapping}
+            />
+          </Pressable>
+        </TooltipTrigger>
+        <TooltipContent side="bottom">
+          <Text style={styles.tooltipText}>{wrapLinesLabel}</Text>
+        </TooltipContent>
+      </Tooltip>
+      <Tooltip delayDuration={300}>
+        <TooltipTrigger asChild>
+          <Pressable style={expandAllToggleStyle} onPress={onToggleExpandAll}>
+            {allExpanded ? (
               <ThemedListChevronsDownUp
                 size={isMobile ? 18 : 14}
                 uniProps={foregroundMutedIconColorMapping}
@@ -1381,105 +1370,53 @@ function DiffFilesToolbar({
   );
 }
 
-interface DiffOptionsMenuProps {
-  hideWhitespace: boolean;
-  isMobile: boolean;
+interface DiffRefreshButtonProps {
   isRefreshing: boolean;
-  overflowToggleStyle: PressableStyleFn;
-  refreshSupported: boolean;
-  wrapLines: boolean;
-  onRefresh: () => void;
-  onToggleHideWhitespace: () => void;
-  onToggleWrapLines: () => void;
-}
-
-function DiffOptionsMenu({
-  hideWhitespace,
-  isMobile,
-  isRefreshing,
-  overflowToggleStyle,
-  refreshSupported,
-  wrapLines,
-  onRefresh,
-  onToggleHideWhitespace,
-  onToggleWrapLines,
-}: DiffOptionsMenuProps) {
-  const { t } = useTranslation();
-  const whitespaceLabel = hideWhitespace
-    ? t("workspace.git.diff.showWhitespace")
-    : t("workspace.git.diff.hideWhitespace");
-  const wrapLinesLabel = wrapLines
-    ? t("workspace.git.diff.scrollLongLines")
-    : t("workspace.git.diff.wrapLongLines");
-  const optionsLabel = t("workspace.git.diff.options");
-  const refreshIcon = useMemo(
-    () =>
-      isRefreshing ? (
-        <ThemedLoadingSpinner size={ICON_SIZE.sm} uniProps={foregroundMutedIconColorMapping} />
-      ) : (
-        <ThemedRotateCw size={ICON_SIZE.sm} uniProps={foregroundMutedIconColorMapping} />
-      ),
-    [isRefreshing],
-  );
-
-  return (
-    <DropdownMenu>
-      <Tooltip delayDuration={300}>
-        <TooltipTrigger asChild>
-          <DropdownMenuTrigger
-            accessibilityRole="button"
-            accessibilityLabel={optionsLabel}
-            testID="changes-options-menu"
-            style={overflowToggleStyle}
-          >
-            <ThemedChevronDown
-              size={isMobile ? 18 : 14}
-              uniProps={foregroundMutedIconColorMapping}
-            />
-          </DropdownMenuTrigger>
-        </TooltipTrigger>
-        <TooltipContent side="bottom">
-          <Text style={styles.tooltipText}>{optionsLabel}</Text>
-        </TooltipContent>
-      </Tooltip>
-      <DropdownMenuContent align="end" width={240} testID="changes-options-menu-content">
-        <DropdownMenuItem
-          leading={DIFF_OPTIONS_WHITESPACE_ICON}
-          selected={hideWhitespace}
-          testID="changes-toggle-whitespace"
-          onSelect={onToggleHideWhitespace}
-        >
-          {whitespaceLabel}
-        </DropdownMenuItem>
-        <DropdownMenuItem
-          leading={DIFF_OPTIONS_WRAP_ICON}
-          selected={wrapLines}
-          testID="changes-toggle-wrap-lines"
-          onSelect={onToggleWrapLines}
-        >
-          {wrapLinesLabel}
-        </DropdownMenuItem>
-        {refreshSupported ? (
-          <>
-            <DropdownMenuSeparator />
-            <DropdownMenuItem
-              leading={refreshIcon}
-              disabled={isRefreshing}
-              testID="changes-refresh"
-              onSelect={onRefresh}
-            >
-              {isRefreshing ? t("workspace.git.diff.refreshing") : t("workspace.git.diff.refresh")}
-            </DropdownMenuItem>
-          </>
-        ) : null}
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
+  toggleStyle: PressableStyleFn;
+  onPress: () => void;
 }
 
 const ThemedRotateCw = withUnistyles(RotateCw);
 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
 
+function DiffRefreshButton({ isRefreshing, toggleStyle, onPress }: DiffRefreshButtonProps) {
+  const { t } = useTranslation();
+  const refreshLabel = t("workspace.git.diff.refresh");
+  return (
+    <Tooltip delayDuration={300}>
+      <TooltipTrigger asChild>
+        <Pressable
+          accessibilityRole="button"
+          accessibilityLabel={
+            isRefreshing ? t("workspace.git.diff.refreshing") : t("workspace.git.diff.refreshState")
+          }
+          testID="changes-refresh"
+          style={toggleStyle}
+          onPress={onPress}
+          disabled={isRefreshing}
+        >
+          <View style={styles.refreshIcon}>
+            {isRefreshing ? (
+              <ThemedLoadingSpinner
+                size={ICON_SIZE.sm}
+                uniProps={foregroundMutedIconColorMapping}
+              />
+            ) : (
+              <ThemedRotateCw size={ICON_SIZE.sm} uniProps={foregroundMutedIconColorMapping} />
+            )}
+          </View>
+        </Pressable>
+      </TooltipTrigger>
+      <TooltipContent side="bottom">
+        <Text style={styles.tooltipText}>{refreshLabel}</Text>
+      </TooltipContent>
+    </Tooltip>
+  );
+}
+
+type DiffFlatItem =
+  | { type: "header"; file: ParsedDiffFile; fileIndex: number; isExpanded: boolean }
+  | { type: "body"; file: ParsedDiffFile; fileIndex: number };
 type DiffFlatItemLayoutGetter = NonNullable<FlatListProps<DiffFlatItem>["getItemLayout"]>;
 
 function getUnifiedDiffLineCount(file: ParsedDiffFile): number {
@@ -1742,22 +1679,30 @@ export function GitDiffPane({ serverId, workspaceId, cwd, enabled }: GitDiffPane
   const { preferences: changesPreferences, updatePreferences: updateChangesPreferences } =
     useChangesPreferences();
   const wrapLines = changesPreferences.wrapLines;
-  const viewMode = changesPreferences.viewMode;
   const effectiveLayout = canUseSplitLayout ? changesPreferences.layout : "unified";
 
   const handleToggleWrapLines = useCallback(() => {
     void updateChangesPreferences({ wrapLines: !wrapLines });
   }, [updateChangesPreferences, wrapLines]);
 
+  const handleLayoutChange = useCallback(
+    (nextLayout: "unified" | "split") => {
+      void updateChangesPreferences({ layout: nextLayout });
+    },
+    [updateChangesPreferences],
+  );
+
   const handleToggleHideWhitespace = useCallback(() => {
     void updateChangesPreferences({ hideWhitespace: !changesPreferences.hideWhitespace });
   }, [changesPreferences.hideWhitespace, updateChangesPreferences]);
 
-  const handleToggleLayout = useCallback(() => {
-    void updateChangesPreferences({
-      layout: changesPreferences.layout === "unified" ? "split" : "unified",
-    });
-  }, [changesPreferences.layout, updateChangesPreferences]);
+  const handleLayoutUnified = useCallback(() => {
+    handleLayoutChange("unified");
+  }, [handleLayoutChange]);
+
+  const handleLayoutSplit = useCallback(() => {
+    handleLayoutChange("split");
+  }, [handleLayoutChange]);
 
   const codeFontSize = appSettings.codeFontSize;
   const diffBodyLineHeight = Math.round(codeFontSize * 1.5);
@@ -1774,19 +1719,37 @@ export function GitDiffPane({ serverId, workspaceId, cwd, enabled }: GitDiffPane
   }, [appSettings.monoFontFamily, codeFontSize, diffBodyLineHeight]);
   const diffModeTriggerStyle = useMemo(() => buildDiffModeTriggerStyle(), []);
 
-  const layoutToggleStyle = useMemo(
-    () => buildToggleButtonStyle(false, styles.expandAllButton),
-    [],
+  const unifiedToggleStyle = useMemo(
+    () =>
+      buildToggleButtonStyle(changesPreferences.layout === "unified", [
+        styles.toggleButton,
+        styles.toggleButtonGroupStart,
+      ]),
+    [changesPreferences.layout],
   );
 
-  const viewModeToggleStyle = useMemo(
-    () => buildToggleButtonStyle(viewMode === "tree", styles.expandAllButton),
-    [viewMode],
+  const splitToggleStyle = useMemo(
+    () =>
+      buildToggleButtonStyle(changesPreferences.layout === "split", [
+        styles.toggleButton,
+        styles.toggleButtonGroupEnd,
+      ]),
+    [changesPreferences.layout],
+  );
+
+  const hideWhitespaceToggleStyle = useMemo(
+    () => buildToggleButtonStyle(changesPreferences.hideWhitespace, styles.expandAllButton),
+    [changesPreferences.hideWhitespace],
+  );
+
+  const wrapLinesToggleStyle = useMemo(
+    () => buildToggleButtonStyle(wrapLines, styles.expandAllButton),
+    [wrapLines],
   );
 
   const expandAllToggleStyle = useMemo(() => buildExpandAllButtonStyle(), []);
 
-  const overflowToggleStyle = useMemo(() => buildExpandAllButtonStyle(), []);
+  const refreshToggleStyle = useMemo(() => buildExpandAllButtonStyle(), []);
 
   const toast = useToast();
   const refreshSupported = useSessionStore(
@@ -1929,40 +1892,7 @@ export function GitDiffPane({ serverId, workspaceId, cwd, enabled }: GitDiffPane
     (state) => state.setDiffExpandedPathsForWorkspace,
   );
   const expandedPaths = useMemo(() => new Set(expandedPathsArray ?? []), [expandedPathsArray]);
-  // The Changes view groups files into a directory tree on every form factor,
-  // consistent with the Files explorer (which is also a tree on mobile).
-  const collapsedFoldersArray = usePanelStore((state) =>
-    workspaceStateKey ? state.diffCollapsedFoldersByWorkspace[workspaceStateKey] : undefined,
-  );
-  const setDiffCollapsedFoldersForWorkspace = usePanelStore(
-    (state) => state.setDiffCollapsedFoldersForWorkspace,
-  );
-  // Build the directory tree once per files-change; collapse/expand toggles only
-  // re-flatten it (they don't change tree shape).
-  const compressedTree = useMemo(() => compressSingleChildChains(buildDiffTree(files)), [files]);
-  // Every directory path currently in the tree — used by "collapse all folders" and to
-  // filter stale collapse state.
-  const allFolderPaths = useMemo(() => collectDirPaths(compressedTree), [compressedTree]);
-  const allFolderPathSet = useMemo(() => new Set(allFolderPaths), [allFolderPaths]);
-  // Effective collapsed set: intersect the persisted paths with the folders actually
-  // present, purely at render (no store-syncing effect). A folder that left the diff and
-  // reappears defaults to expanded; toggles write back this pruned set, so the stored
-  // array stays bounded. (empty = all folders expanded, the default)
-  const collapsedFolders = useMemo(
-    () => new Set((collapsedFoldersArray ?? []).filter((path) => allFolderPathSet.has(path))),
-    [collapsedFoldersArray, allFolderPathSet],
-  );
   const diffListRef = useRef<FlatList<DiffFlatItem>>(null);
-  const handleToggleViewMode = useCallback(() => {
-    const nextViewMode = viewMode === "flat" ? "tree" : "flat";
-    if (nextViewMode === "tree") {
-      diffListRef.current?.scrollToOffset({ offset: 0, animated: false });
-      if (workspaceStateKey) {
-        setDiffCollapsedFoldersForWorkspace(workspaceStateKey, []);
-      }
-    }
-    void updateChangesPreferences({ viewMode: nextViewMode });
-  }, [setDiffCollapsedFoldersForWorkspace, updateChangesPreferences, viewMode, workspaceStateKey]);
   const scrollbar = useWebScrollViewScrollbar(diffListRef, {
     enabled: showDesktopWebScrollbar,
   });
@@ -1970,23 +1900,26 @@ export function GitDiffPane({ serverId, workspaceId, cwd, enabled }: GitDiffPane
   const diffListViewportHeightRef = useRef(0);
   const headerHeightByPathRef = useRef<Record<string, number>>({});
   const bodyHeightByKeyRef = useRef<Record<string, number>>({});
-  // Folder rows are a distinct kind; keep their height out of headerHeightByPathRef
-  // (Codex item 6) so file/folder heights can't collide by path.
-  const folderRowHeightRef = useRef<number>(0);
   const defaultHeaderHeightRef = useRef<number>(44);
   const [heightVersion, setHeightVersion] = useState(0);
   const diffBodyChromeHeight = BORDER_WIDTH[1] * 2;
   const statusBodyHeightEstimate = diffBodyChromeHeight + SPACING[4] * 2 + diffBodyLineHeight;
   const { flatItems, stickyHeaderIndices } = useMemo(() => {
-    const { items, stickyHeaderIndices: stickyIndices } = buildDiffFlatItems({
-      files,
-      viewMode,
-      tree: compressedTree,
-      collapsedFolders,
-      expandedPaths,
-    });
+    const items: DiffFlatItem[] = [];
+    const stickyIndices: number[] = [];
+    for (let i = 0; i < files.length; i++) {
+      const file = files[i];
+      const isExpanded = expandedPaths.has(file.path);
+      items.push({ type: "header", file, fileIndex: i, isExpanded });
+      if (isExpanded) {
+        stickyIndices.push(items.length - 1);
+      }
+      if (isExpanded) {
+        items.push({ type: "body", file, fileIndex: i });
+      }
+    }
     return { flatItems: items, stickyHeaderIndices: stickyIndices };
-  }, [compressedTree, collapsedFolders, expandedPaths, files, viewMode]);
+  }, [expandedPaths, files]);
 
   const getBodyHeightKey = useCallback(
     (file: ParsedDiffFile): string => {
@@ -2025,35 +1958,6 @@ export function GitDiffPane({ serverId, workspaceId, cwd, enabled }: GitDiffPane
     [diffBodyChromeHeight, diffBodyLineHeight, effectiveLayout, statusBodyHeightEstimate],
   );
 
-  // Single height source of truth for both getItemLayout and the collapse
-  // scroll-anchor math. Folder rows use their own measured height (Codex item 6),
-  // falling back to the default header height before first measurement.
-  const getFlatItemHeight = useCallback(
-    (item: DiffFlatItem): number => {
-      if (item.type === "folder") {
-        return folderRowHeightRef.current || defaultHeaderHeightRef.current;
-      }
-      if (item.type === "header") {
-        return headerHeightByPathRef.current[item.file.path] ?? defaultHeaderHeightRef.current;
-      }
-      const bodyHeightKey = getBodyHeightKey(item.file);
-      return bodyHeightByKeyRef.current[bodyHeightKey] ?? estimateBodyHeight(item.file);
-    },
-    [estimateBodyHeight, getBodyHeightKey],
-  );
-
-  const handleFolderRowHeightChange = useCallback((height: number) => {
-    if (!Number.isFinite(height) || height <= 0) {
-      return;
-    }
-    const previousHeight = folderRowHeightRef.current;
-    if (previousHeight > 0 && Math.abs(previousHeight - height) <= DIFF_HEIGHT_CHANGE_EPSILON) {
-      return;
-    }
-    folderRowHeightRef.current = height;
-    setHeightVersion((version) => version + 1);
-  }, []);
-
   const handleHeaderHeightChange = useCallback((path: string, height: number) => {
     if (!Number.isFinite(height) || height <= 0) {
       return;
@@ -2109,24 +2013,23 @@ export function GitDiffPane({ serverId, workspaceId, cwd, enabled }: GitDiffPane
     [scrollbar],
   );
 
-  // Offset of the first item matching `predicate`, walking the SAME flatItems
-  // list getFlatItemLayout uses so folder rows are counted (single source of
-  // truth — Codex item 5 / finding 2).
-  const computeItemOffset = useCallback(
-    (predicate: (item: DiffFlatItem) => boolean): number | null => {
-      const index = flatItems.findIndex(predicate);
-      if (index < 0) {
-        return null;
-      }
-      return sumHeightsBefore(flatItems, index, getFlatItemHeight);
-    },
-    [flatItems, getFlatItemHeight],
-  );
-
   const computeHeaderOffset = useCallback(
-    (path: string): number =>
-      computeItemOffset((item) => item.type === "header" && item.file.path === path) ?? 0,
-    [computeItemOffset],
+    (path: string): number => {
+      const defaultHeaderHeight = defaultHeaderHeightRef.current;
+      let offset = 0;
+      for (const file of files) {
+        if (file.path === path) {
+          break;
+        }
+        offset += headerHeightByPathRef.current[file.path] ?? defaultHeaderHeight;
+        if (expandedPaths.has(file.path)) {
+          const bodyHeightKey = getBodyHeightKey(file);
+          offset += bodyHeightByKeyRef.current[bodyHeightKey] ?? estimateBodyHeight(file);
+        }
+      }
+      return Math.max(0, offset);
+    },
+    [estimateBodyHeight, expandedPaths, files, getBodyHeightKey],
   );
 
   const handleToggleExpanded = useCallback(
@@ -2164,41 +2067,7 @@ export function GitDiffPane({ serverId, workspaceId, cwd, enabled }: GitDiffPane
     [computeHeaderOffset, expandedPaths, setDiffExpandedPathsForWorkspace, workspaceStateKey],
   );
 
-  const handleToggleFolder = useCallback(
-    (dirPath: string) => {
-      if (!workspaceStateKey) {
-        return;
-      }
-      const isCurrentlyCollapsed = collapsedFolders.has(dirPath);
-      // Collapsing hides the subtree below this row; anchor to the folder row
-      // first so the viewport doesn't jump to a dead offset (Codex item 5).
-      if (!isCurrentlyCollapsed) {
-        const targetOffset = computeItemOffset(
-          (item) => item.type === "folder" && item.dirPath === dirPath,
-        );
-        const folderHeight = folderRowHeightRef.current || defaultHeaderHeightRef.current;
-        if (
-          targetOffset !== null &&
-          shouldAnchorHeaderBeforeCollapse({
-            headerOffset: targetOffset,
-            headerHeight: folderHeight,
-            viewportOffset: diffListScrollOffsetRef.current,
-            viewportHeight: diffListViewportHeightRef.current,
-          })
-        ) {
-          diffListRef.current?.scrollToOffset({ offset: targetOffset, animated: false });
-        }
-      }
-
-      const nextCollapsed = isCurrentlyCollapsed
-        ? Array.from(collapsedFolders).filter((path) => path !== dirPath)
-        : [...collapsedFolders, dirPath];
-      setDiffCollapsedFoldersForWorkspace(workspaceStateKey, nextCollapsed);
-    },
-    [collapsedFolders, computeItemOffset, setDiffCollapsedFoldersForWorkspace, workspaceStateKey],
-  );
-
-  const allFileDiffsExpanded = useMemo(() => {
+  const allExpanded = useMemo(() => {
     if (files.length === 0) return false;
     return files.every((file) => expandedPaths.has(file.path));
   }, [expandedPaths, files]);
@@ -2207,7 +2076,7 @@ export function GitDiffPane({ serverId, workspaceId, cwd, enabled }: GitDiffPane
     if (!workspaceStateKey) {
       return;
     }
-    if (allFileDiffsExpanded) {
+    if (allExpanded) {
       setDiffExpandedPathsForWorkspace(workspaceStateKey, []);
     } else {
       setDiffExpandedPathsForWorkspace(
@@ -2215,32 +2084,15 @@ export function GitDiffPane({ serverId, workspaceId, cwd, enabled }: GitDiffPane
         files.map((file) => file.path),
       );
     }
-  }, [allFileDiffsExpanded, files, setDiffExpandedPathsForWorkspace, workspaceStateKey]);
+  }, [allExpanded, files, setDiffExpandedPathsForWorkspace, workspaceStateKey]);
 
   const renderFlatItem = useCallback(
     ({ item }: { item: DiffFlatItem }) => {
-      if (item.type === "folder") {
-        return (
-          <DiffFolderRow
-            dirPath={item.dirPath}
-            displayName={item.displayName}
-            depth={item.depth}
-            collapsed={item.collapsed}
-            additions={item.additions}
-            deletions={item.deletions}
-            onToggle={handleToggleFolder}
-            onHeightChange={handleFolderRowHeightChange}
-            testID={`diff-folder-${item.dirPath}`}
-          />
-        );
-      }
       if (item.type === "header") {
         return (
           <DiffFileHeader
             file={item.file}
             isExpanded={item.isExpanded}
-            depth={item.depth}
-            showDir={viewMode === "flat"}
             onToggle={handleToggleExpanded}
             onHeaderHeightChange={handleHeaderHeightChange}
             testID={`diff-file-${item.fileIndex}`}
@@ -2265,25 +2117,40 @@ export function GitDiffPane({ serverId, workspaceId, cwd, enabled }: GitDiffPane
       diffTextMetricsStyle,
       effectiveLayout,
       handleBodyHeightChange,
-      handleFolderRowHeightChange,
       handleHeaderHeightChange,
       handleToggleExpanded,
-      handleToggleFolder,
       reviewActions,
-      viewMode,
       wrapLines,
     ],
   );
 
   const flatKeyExtractor = useCallback(
-    (item: DiffFlatItem) =>
-      item.type === "folder" ? `folder-${item.dirPath}` : `${item.type}-${item.file.path}`,
+    (item: DiffFlatItem) => `${item.type}-${item.file.path}`,
     [],
   );
 
+  const getFlatItemHeight = useCallback(
+    (item: DiffFlatItem): number => {
+      if (item.type === "header") {
+        return headerHeightByPathRef.current[item.file.path] ?? defaultHeaderHeightRef.current;
+      }
+
+      const bodyHeightKey = getBodyHeightKey(item.file);
+      return bodyHeightByKeyRef.current[bodyHeightKey] ?? estimateBodyHeight(item.file);
+    },
+    [estimateBodyHeight, getBodyHeightKey],
+  );
+
   const getFlatItemLayout = useCallback<DiffFlatItemLayoutGetter>(
     (_data, index) => {
-      const offset = sumHeightsBefore(flatItems, index, getFlatItemHeight);
+      let offset = 0;
+      for (let itemIndex = 0; itemIndex < index; itemIndex += 1) {
+        const item = flatItems[itemIndex];
+        if (item) {
+          offset += getFlatItemHeight(item);
+        }
+      }
+
       const item = flatItems[index];
       const length = item ? getFlatItemHeight(item) : 0;
       return { length, offset, index };
@@ -2294,21 +2161,17 @@ export function GitDiffPane({ serverId, workspaceId, cwd, enabled }: GitDiffPane
   const flatExtraData = useMemo(
     () => ({
       expandedPathsArray,
-      collapsedFoldersArray,
       effectiveLayout,
       diffBodyTypographyKey,
       heightVersion,
-      viewMode,
       wrapLines,
       reviewActions,
     }),
     [
       expandedPathsArray,
-      collapsedFoldersArray,
       effectiveLayout,
       diffBodyTypographyKey,
       heightVersion,
-      viewMode,
       wrapLines,
       reviewActions,
     ],
@@ -2438,40 +2301,38 @@ export function GitDiffPane({ serverId, workspaceId, cwd, enabled }: GitDiffPane
             </DropdownMenu>
             <View style={styles.diffStatusButtons}>
               {canUseSplitLayout ? (
-                <DiffLayoutToggle
+                <DiffLayoutToggleGroup
                   layout={changesPreferences.layout}
-                  isMobile={isMobile}
-                  toggleStyle={layoutToggleStyle}
-                  onToggle={handleToggleLayout}
-                />
-              ) : null}
-              {files.length > 0 ? (
-                <DiffViewModeToggle
-                  viewMode={viewMode}
-                  isMobile={isMobile}
-                  toggleStyle={viewModeToggleStyle}
-                  onToggle={handleToggleViewMode}
+                  unifiedToggleStyle={unifiedToggleStyle}
+                  splitToggleStyle={splitToggleStyle}
+                  onUnified={handleLayoutUnified}
+                  onSplit={handleLayoutSplit}
                 />
               ) : null}
+              <DiffWhitespaceToggle
+                hideWhitespace={changesPreferences.hideWhitespace}
+                isMobile={isMobile}
+                toggleStyle={hideWhitespaceToggleStyle}
+                onToggle={handleToggleHideWhitespace}
+              />
               {files.length > 0 ? (
                 <DiffFilesToolbar
-                  allFileDiffsExpanded={allFileDiffsExpanded}
+                  wrapLines={wrapLines}
+                  allExpanded={allExpanded}
                   isMobile={isMobile}
+                  wrapLinesToggleStyle={wrapLinesToggleStyle}
                   expandAllToggleStyle={expandAllToggleStyle}
+                  onToggleWrapLines={handleToggleWrapLines}
                   onToggleExpandAll={handleToggleExpandAll}
                 />
               ) : null}
-              <DiffOptionsMenu
-                hideWhitespace={changesPreferences.hideWhitespace}
-                isMobile={isMobile}
-                isRefreshing={isRefreshing}
-                overflowToggleStyle={overflowToggleStyle}
-                refreshSupported={refreshSupported}
-                wrapLines={wrapLines}
-                onRefresh={handleRefresh}
-                onToggleHideWhitespace={handleToggleHideWhitespace}
-                onToggleWrapLines={handleToggleWrapLines}
-              />
+              {refreshSupported ? (
+                <DiffRefreshButton
+                  isRefreshing={isRefreshing}
+                  toggleStyle={refreshToggleStyle}
+                  onPress={handleRefresh}
+                />
+              ) : null}
             </View>
           </View>
         </View>
@@ -2553,9 +2414,46 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[1],
     flexWrap: "wrap",
   },
+  toggleButtonGroup: {
+    flexDirection: "row",
+    alignItems: "center",
+  },
+  toggleButton: {
+    alignItems: "center",
+    justifyContent: "center",
+    minWidth: {
+      xs: 32,
+      sm: 32,
+      md: 24,
+    },
+    height: {
+      xs: 32,
+      sm: 32,
+      md: 24,
+    },
+    paddingHorizontal: {
+      xs: theme.spacing[2],
+      sm: theme.spacing[2],
+      md: theme.spacing[1],
+    },
+  },
+  toggleButtonGroupStart: {
+    borderTopLeftRadius: theme.borderRadius.base,
+    borderBottomLeftRadius: theme.borderRadius.base,
+  },
+  toggleButtonGroupEnd: {
+    borderTopRightRadius: theme.borderRadius.base,
+    borderBottomRightRadius: theme.borderRadius.base,
+  },
   toggleButtonSelected: {
     backgroundColor: theme.colors.surface2,
   },
+  refreshIcon: {
+    width: ICON_SIZE.md,
+    height: ICON_SIZE.md,
+    alignItems: "center",
+    justifyContent: "center",
+  },
   expandAllButton: {
     flexDirection: "row",
     alignItems: "center",
@@ -2676,11 +2574,6 @@ const styles = StyleSheet.create((theme) => ({
     gap: theme.spacing[1],
     flexShrink: 0,
   },
-  fileIcon: {
-    flexShrink: 0,
-    alignItems: "center",
-    justifyContent: "center",
-  },
   fileName: {
     fontSize: theme.fontSize.sm,
     fontWeight: theme.fontWeight.normal,
@@ -2695,10 +2588,6 @@ const styles = StyleSheet.create((theme) => ({
     flex: 1,
     minWidth: 0,
   },
-  fileDirSpacer: {
-    flex: 1,
-    minWidth: 0,
-  },
   newBadge: {
     backgroundColor: "rgba(46, 160, 67, 0.2)",
     paddingHorizontal: theme.spacing[2],

packages/app/src/git/diff-tree.test.ts

@@ -1,149 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  buildDiffTree,
-  collectDirPaths,
-  compressSingleChildChains,
-  flattenDiffTree,
-  type DiffTreeRow,
-} from "./diff-tree";
-import type { ParsedDiffFile } from "@/git/use-diff-query";
-
-function createFile(path: string, additions = 1, deletions = 0): ParsedDiffFile {
-  return {
-    path,
-    isNew: false,
-    isDeleted: false,
-    additions,
-    deletions,
-    hunks: [],
-  };
-}
-
-// The Changes tree is fed the already-path-sorted diff files; build against that.
-function tree(paths: Array<string | ParsedDiffFile>) {
-  return buildDiffTree(paths.map((p) => (typeof p === "string" ? createFile(p) : p)));
-}
-
-function compressed(paths: Array<string | ParsedDiffFile>) {
-  return compressSingleChildChains(tree(paths));
-}
-
-function rowLabels(rows: DiffTreeRow[]): string[] {
-  return rows.map((row) =>
-    row.kind === "folder"
-      ? `${"  ".repeat(row.depth)}[${row.displayName}]`
-      : `${"  ".repeat(row.depth)}${row.file.path.split("/").pop()}`,
-  );
-}
-
-describe("buildDiffTree", () => {
-  it("returns an empty root for no files", () => {
-    const root = tree([]);
-    expect(root.dirPath).toBe("");
-    expect(root.children).toEqual([]);
-  });
-
-  it("places root-level files directly under the root with no folder", () => {
-    const root = tree(["README.md", "package.json"]);
-    expect(root.children.every((c) => c.kind === "file")).toBe(true);
-    expect(root.children.map((c) => (c.kind === "file" ? c.name : c.dirPath))).toEqual([
-      "README.md",
-      "package.json",
-    ]);
-  });
-
-  it("nests files under their directory, keyed by full path", () => {
-    const root = tree(["src/a.ts", "src/nested/b.ts"]);
-    expect(root.children).toHaveLength(1);
-    const src = root.children[0];
-    expect(src.kind).toBe("dir");
-    if (src.kind !== "dir") return;
-    expect(src.dirPath).toBe("src");
-    const nested = src.children.find((c) => c.kind === "dir");
-    expect(nested?.kind === "dir" && nested.dirPath).toBe("src/nested");
-  });
-
-  it("orders directories before files within a level, each alphabetically", () => {
-    // Input alpha-by-full-path puts the file 'src/a.ts' before dir 'src/z/...',
-    // but rendering wants dirs first.
-    const root = tree(["src/a.ts", "src/z/deep.ts", "src/m/mid.ts"]);
-    const src = root.children[0];
-    if (src.kind !== "dir") throw new Error("expected dir");
-    expect(
-      src.children.map((c) => (c.kind === "dir" ? `dir:${c.name}` : `file:${c.name}`)),
-    ).toEqual(["dir:m", "dir:z", "file:a.ts"]);
-  });
-});
-
-describe("compressSingleChildChains", () => {
-  it("collapses a single-child chain into one row keyed by the deepest dir", () => {
-    const rows = flattenDiffTree(compressed(["packages/app/src/git/diff-pane.tsx"]), new Set());
-    expect(rowLabels(rows)).toEqual(["[packages/app/src/git]", "  diff-pane.tsx"]);
-    const folder = rows[0];
-    expect(folder.kind === "folder" && folder.dirPath).toBe("packages/app/src/git");
-  });
-
-  it("stops compressing where a directory has multiple children", () => {
-    const rows = flattenDiffTree(
-      compressed(["packages/app/a.ts", "packages/server/b.ts"]),
-      new Set(),
-    );
-    // "packages" has two dir children, so it stays its own row.
-    expect(rowLabels(rows)).toEqual([
-      "[packages]",
-      "  [app]",
-      "    a.ts",
-      "  [server]",
-      "    b.ts",
-    ]);
-  });
-
-  it("compresses a chain that ends in a file-bearing directory", () => {
-    const rows = flattenDiffTree(compressed(["a/b/c/one.ts", "a/b/c/two.ts"]), new Set());
-    expect(rowLabels(rows)).toEqual(["[a/b/c]", "  one.ts", "  two.ts"]);
-  });
-
-  it("does not merge the virtual root with a single top-level dir's siblings", () => {
-    const rows = flattenDiffTree(compressed(["only/deep/file.ts"]), new Set());
-    expect(rows[0].kind === "folder" && rows[0].displayName).toBe("only/deep");
-  });
-});
-
-describe("flattenDiffTree", () => {
-  it("expands everything when the collapsed set is empty", () => {
-    const rows = flattenDiffTree(compressed(["src/a.ts", "src/b.ts"]), new Set());
-    expect(rowLabels(rows)).toEqual(["[src]", "  a.ts", "  b.ts"]);
-  });
-
-  it("omits descendants of a collapsed directory but keeps the folder row", () => {
-    const root = compressed(["src/a.ts", "src/b.ts"]);
-    const rows = flattenDiffTree(root, new Set(["src"]));
-    expect(rowLabels(rows)).toEqual(["[src]"]);
-  });
-
-  it("collapsing a parent hides nested folders and files", () => {
-    const root = compressed(["src/deep/a.ts", "src/top.ts"]);
-    const rows = flattenDiffTree(root, new Set(["src"]));
-    expect(rowLabels(rows)).toEqual(["[src]"]);
-  });
-
-  it("sums descendant additions/deletions onto the folder row", () => {
-    const root = compressed([createFile("src/a.ts", 3, 1), createFile("src/nested/b.ts", 5, 2)]);
-    const rows = flattenDiffTree(root, new Set());
-    const srcFolder = rows.find((r) => r.kind === "folder" && r.dirPath === "src");
-    expect(srcFolder).toMatchObject({ additions: 8, deletions: 3 });
-  });
-
-  it("reports full aggregate stats even when the folder is collapsed", () => {
-    const root = compressed([createFile("src/a.ts", 3, 1), createFile("src/b.ts", 4, 0)]);
-    const rows = flattenDiffTree(root, new Set(["src"]));
-    expect(rows[0]).toMatchObject({ kind: "folder", additions: 7, deletions: 1 });
-  });
-});
-
-describe("collectDirPaths", () => {
-  it("returns every logical directory path in the compressed tree", () => {
-    const root = compressed(["packages/app/a.ts", "packages/server/b.ts"]);
-    expect(collectDirPaths(root).sort()).toEqual(["packages", "packages/app", "packages/server"]);
-  });
-});

packages/app/src/git/diff-tree.ts

@@ -1,207 +0,0 @@
-import type { ParsedDiffFile } from "@/git/use-diff-query";
-
-// Builds a directory hierarchy from the flat, path-sorted `ParsedDiffFile[]` the
-// Changes view renders. The tree renders on every form factor, consistent with
-// the Files explorer.
-//
-// Directory nodes are keyed by their FULL uncompressed path (e.g. "packages/app/src").
-// That path is the stable identity used to persist folder-collapse state, so the
-// state survives path-compression changes as the diff mutates: if a compressed
-// row later splits because a sibling appears, the logical directories keep the
-// same keys.
-
-export interface DiffTreeFileNode {
-  kind: "file";
-  file: ParsedDiffFile;
-  /** basename, e.g. "diff-pane.tsx" */
-  name: string;
-}
-
-export interface DiffTreeDirNode {
-  kind: "dir";
-  /** full uncompressed directory path, e.g. "packages/app/src"; "" for the virtual root */
-  dirPath: string;
-  /** display label; a compressed chain joins segments, e.g. "packages/app/src" */
-  name: string;
-  children: DiffTreeNode[];
-}
-
-export type DiffTreeNode = DiffTreeFileNode | DiffTreeDirNode;
-
-export interface DiffTreeFolderRow {
-  kind: "folder";
-  /** full uncompressed path of the DEEPEST directory this row represents */
-  dirPath: string;
-  /** compressed display label, e.g. "packages/app/src" */
-  displayName: string;
-  depth: number;
-  additions: number;
-  deletions: number;
-}
-
-export interface DiffTreeFileRow {
-  kind: "file";
-  file: ParsedDiffFile;
-  depth: number;
-}
-
-export type DiffTreeRow = DiffTreeFolderRow | DiffTreeFileRow;
-
-function sortTree(node: DiffTreeDirNode): void {
-  node.children.sort((a, b) => {
-    if (a.kind !== b.kind) {
-      // directories before files within a level
-      return a.kind === "dir" ? -1 : 1;
-    }
-    // Plain ASCII comparison, matching compareCheckoutDiffPaths (diff-order.ts)
-    // so the tree order is consistent with the rest of the Changes view.
-    if (a.name === b.name) return 0;
-    return a.name < b.name ? -1 : 1;
-  });
-  for (const child of node.children) {
-    if (child.kind === "dir") {
-      sortTree(child);
-    }
-  }
-}
-
-/** Build the (uncompressed) directory tree. Returns the virtual root (dirPath ""). */
-export function buildDiffTree(files: ParsedDiffFile[]): DiffTreeDirNode {
-  const root: DiffTreeDirNode = { kind: "dir", dirPath: "", name: "", children: [] };
-  const dirByPath = new Map<string, DiffTreeDirNode>([["", root]]);
-
-  function ensureDir(dirPath: string): DiffTreeDirNode {
-    const existing = dirByPath.get(dirPath);
-    if (existing) {
-      return existing;
-    }
-    const parts = dirPath.split("/");
-    const name = parts[parts.length - 1];
-    const parentPath = parts.slice(0, -1).join("/");
-    const parent = ensureDir(parentPath);
-    const node: DiffTreeDirNode = { kind: "dir", dirPath, name, children: [] };
-    parent.children.push(node);
-    dirByPath.set(dirPath, node);
-    return node;
-  }
-
-  for (const file of files) {
-    const parts = file.path.split("/");
-    const name = parts[parts.length - 1];
-    const dirPath = parts.slice(0, -1).join("/");
-    ensureDir(dirPath).children.push({ kind: "file", file, name });
-  }
-
-  sortTree(root);
-  return root;
-}
-
-// Collapse runs of single-child directories into one row, like VS Code / GitHub:
-// a directory whose only child is another directory absorbs it. The merged row
-// displays the joined segments ("packages/app/src") but keeps the DEEPEST
-// directory's full path as its identity.
-function compressNode(node: DiffTreeDirNode): DiffTreeDirNode {
-  let name = node.name;
-  let dirPath = node.dirPath;
-  let children = node.children.map((child) => (child.kind === "dir" ? compressNode(child) : child));
-  while (children.length === 1 && children[0].kind === "dir") {
-    const only = children[0];
-    name = name ? `${name}/${only.name}` : only.name;
-    dirPath = only.dirPath;
-    children = only.children;
-  }
-  return { kind: "dir", dirPath, name, children };
-}
-
-/**
- * Compress single-child directory chains. The virtual root is never merged
- * (it isn't rendered); only its subtrees are compressed.
- */
-export function compressSingleChildChains(root: DiffTreeDirNode): DiffTreeDirNode {
-  return {
-    ...root,
-    children: root.children.map((child) => (child.kind === "dir" ? compressNode(child) : child)),
-  };
-}
-
-interface DirStats {
-  additions: number;
-  deletions: number;
-}
-
-const EMPTY_DIR_STATS: DirStats = { additions: 0, deletions: 0 };
-
-// Single post-order pass computing every directory node's aggregate stats from
-// its already-summed children — O(n), vs. re-walking each subtree per folder row.
-function computeDirStats(root: DiffTreeDirNode): Map<DiffTreeDirNode, DirStats> {
-  const statsByNode = new Map<DiffTreeDirNode, DirStats>();
-  function visit(node: DiffTreeDirNode): DirStats {
-    const stats: DirStats = { additions: 0, deletions: 0 };
-    for (const child of node.children) {
-      if (child.kind === "file") {
-        stats.additions += child.file.additions;
-        stats.deletions += child.file.deletions;
-      } else {
-        const childStats = visit(child);
-        stats.additions += childStats.additions;
-        stats.deletions += childStats.deletions;
-      }
-    }
-    statsByNode.set(node, stats);
-    return stats;
-  }
-  visit(root);
-  return statsByNode;
-}
-
-/**
- * Flatten the (compressed) tree into depth-tagged rows for the list. Descendants
- * of any directory whose `dirPath` is in `collapsed` are omitted; folder rows
- * always carry the FULL aggregate stats of their subtree, collapsed or not.
- */
-export function flattenDiffTree(
-  root: DiffTreeDirNode,
-  collapsed: ReadonlySet<string>,
-): DiffTreeRow[] {
-  const statsByNode = computeDirStats(root);
-  const rows: DiffTreeRow[] = [];
-
-  function walk(node: DiffTreeDirNode, depth: number): void {
-    for (const child of node.children) {
-      if (child.kind === "file") {
-        rows.push({ kind: "file", file: child.file, depth });
-        continue;
-      }
-      const stats = statsByNode.get(child) ?? EMPTY_DIR_STATS;
-      rows.push({
-        kind: "folder",
-        dirPath: child.dirPath,
-        displayName: child.name,
-        depth,
-        additions: stats.additions,
-        deletions: stats.deletions,
-      });
-      if (!collapsed.has(child.dirPath)) {
-        walk(child, depth + 1);
-      }
-    }
-  }
-
-  walk(root, 0);
-  return rows;
-}
-
-/** Every directory path in the (compressed) tree — used for "collapse all folders". */
-export function collectDirPaths(root: DiffTreeDirNode): string[] {
-  const paths: string[] = [];
-  function walk(node: DiffTreeDirNode): void {
-    for (const child of node.children) {
-      if (child.kind === "dir") {
-        paths.push(child.dirPath);
-        walk(child);
-      }
-    }
-  }
-  walk(root);
-  return paths;
-}

packages/app/src/git/use-diff-query.ts

@@ -1,8 +1,8 @@
-import { useMemo } from "react";
-import { useReplicaQuery } from "@/data/query";
-import { checkoutDiffPushRoute } from "@/data/push-router";
-import { useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import { skipToken, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useEffect, useId, useMemo } from "react";
+import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import type { SubscribeCheckoutDiffResponse } from "@getpaseo/protocol/messages";
+import { orderCheckoutDiffFiles } from "@/git/diff-order";
 import { checkoutDiffQueryKey } from "@/git/query-keys";
 
 interface UseCheckoutDiffQueryOptions {
@@ -44,7 +44,10 @@ export function useCheckoutDiffQuery({
   ignoreWhitespace,
   enabled = true,
 }: UseCheckoutDiffQueryOptions) {
+  const queryClient = useQueryClient();
+  const client = useHostRuntimeClient(serverId);
   const isConnected = useHostRuntimeIsConnected(serverId);
+  const hookInstanceId = useId();
   const normalizedCompare = useMemo(
     () => normalizeCheckoutDiffCompare({ mode, baseRef, ignoreWhitespace }),
     [mode, baseRef, ignoreWhitespace],
@@ -56,26 +59,112 @@ export function useCheckoutDiffQuery({
     () => checkoutDiffQueryKey(serverId, cwd, mode, baseRef, compareIgnoreWhitespace),
     [serverId, cwd, mode, baseRef, compareIgnoreWhitespace],
   );
-  const subscriptionId = useMemo(() => `checkoutDiff:${JSON.stringify(queryKey)}`, [queryKey]);
-  const routeEnabled = Boolean(enabled && isConnected && cwd);
 
-  const query = useReplicaQuery<CheckoutDiffQueryPayload>({
+  const query = useQuery<CheckoutDiffQueryPayload>({
     queryKey,
-    enabled: routeEnabled,
-    pushEvent: "checkout_diff_update",
-    meta: checkoutDiffPushRoute({
-      enabled: routeEnabled,
-      serverId,
-      subscriptionId,
-      cwd,
-      compare: {
-        mode: compareMode,
-        ...(compareBaseRef ? { baseRef: compareBaseRef } : {}),
-        ignoreWhitespace: compareIgnoreWhitespace,
-      },
-    }),
+    queryFn: skipToken,
+    staleTime: Infinity,
   });
 
+  useEffect(() => {
+    if (!client || !isConnected || !cwd || !enabled) {
+      return;
+    }
+
+    const subscriptionId = [
+      "checkoutDiff",
+      hookInstanceId,
+      serverId,
+      cwd,
+      compareMode,
+      compareBaseRef ?? "",
+      compareIgnoreWhitespace ? "ignore-ws" : "keep-ws",
+    ].join(":");
+    let cancelled = false;
+
+    const unsubscribeUpdate = client.on("checkout_diff_update", (message) => {
+      if (message.payload.subscriptionId !== subscriptionId) {
+        return;
+      }
+      queryClient.setQueryData<CheckoutDiffQueryPayload>(queryKey, {
+        cwd: message.payload.cwd,
+        files: orderCheckoutDiffFiles(message.payload.files),
+        error: message.payload.error,
+        requestId: `subscription:${subscriptionId}`,
+      });
+    });
+    const unsubscribeSubscribeResponse = client.on(
+      "subscribe_checkout_diff_response",
+      (message) => {
+        if (message.payload.subscriptionId !== subscriptionId) {
+          return;
+        }
+        queryClient.setQueryData<CheckoutDiffQueryPayload>(queryKey, {
+          cwd: message.payload.cwd,
+          files: orderCheckoutDiffFiles(message.payload.files),
+          error: message.payload.error,
+          requestId: message.payload.requestId,
+        });
+      },
+    );
+
+    void client
+      .subscribeCheckoutDiff(
+        cwd,
+        {
+          mode: compareMode,
+          baseRef: compareBaseRef,
+          ignoreWhitespace: compareIgnoreWhitespace,
+        },
+        { subscriptionId },
+      )
+      .then((payload) => {
+        if (cancelled) {
+          return;
+        }
+        queryClient.setQueryData<CheckoutDiffQueryPayload>(queryKey, {
+          cwd: payload.cwd,
+          files: orderCheckoutDiffFiles(payload.files),
+          error: payload.error,
+          requestId: payload.requestId,
+        });
+        return;
+      })
+      .catch((error) => {
+        if (cancelled) {
+          return;
+        }
+        console.error("[useCheckoutDiffQuery] subscribeCheckoutDiff failed", {
+          serverId,
+          cwd,
+          error,
+        });
+      });
+
+    return () => {
+      cancelled = true;
+      unsubscribeUpdate();
+      unsubscribeSubscribeResponse();
+      try {
+        client.unsubscribeCheckoutDiff(subscriptionId);
+      } catch {
+        // Ignore disconnect race during effect cleanup.
+      }
+    };
+  }, [
+    client,
+    isConnected,
+    cwd,
+    enabled,
+    hookInstanceId,
+    serverId,
+    compareMode,
+    compareBaseRef,
+    compareIgnoreWhitespace,
+    queryKey,
+    queryClient,
+  ]);
+
   const payload = query.data ?? null;
   const payloadError = payload?.error ?? null;
 

packages/app/src/hooks/providers-snapshot-query.test.ts

@@ -5,7 +5,7 @@ import {
   providersSnapshotQueryKey,
   providersSnapshotQueryRoot,
   providersSnapshotRequestOptions,
-} from "@/data/providers-snapshot";
+} from "./providers-snapshot-query";
 
 describe("providers snapshot query scope", () => {
   it("normalizes blank cwd values to the home scope", () => {

packages/app/src/hooks/use-agent-form-state.ts

@@ -27,13 +27,11 @@ import {
   combineInitialValues,
   buildProviderDefinitionMap,
   buildProviderDefinitionMapForStatuses,
-  INITIAL_AGENT_FORM_RESOLUTION,
   INITIAL_USER_MODIFIED,
   RESOLVABLE_PROVIDER_STATUSES,
   SELECTABLE_PROVIDER_STATUSES,
   type FormInitialValues,
   type FormState,
-  type ProviderModelsByProvider,
 } from "@/provider-selection/resolve-agent-form";
 
 export type { FormInitialValues } from "@/provider-selection/resolve-agent-form";
@@ -87,6 +85,7 @@ function shouldAutoSelectServerId(input: {
   isVisible: boolean;
   isCreateFlow: boolean;
   isPreferencesLoading: boolean;
+  hasResolved: boolean;
   userModifiedServerId: boolean;
   initialServerId: string | null | undefined;
   currentServerId: string | null;
@@ -95,47 +94,20 @@ function shouldAutoSelectServerId(input: {
     isVisible,
     isCreateFlow,
     isPreferencesLoading,
+    hasResolved,
     userModifiedServerId,
     initialServerId,
     currentServerId,
   } = input;
   if (!isVisible || !isCreateFlow) return false;
   if (isPreferencesLoading) return false;
+  if (!hasResolved) return false;
   if (userModifiedServerId) return false;
   if (initialServerId !== undefined) return false;
   if (currentServerId) return false;
   return true;
 }
 
-function resolutionIntentKeyPart(value: string | null | undefined): string {
-  if (value === undefined) return "undefined";
-  if (value === null) return "null";
-  return value;
-}
-
-function buildResolutionIntentKey(initialValues: FormInitialValues | undefined): string {
-  if (!initialValues) return "none";
-  // workingDir seeds the open request, but locked cwd updates must not re-run
-  // provider/model/mode resolution after the form has settled.
-  return [
-    resolutionIntentKeyPart(initialValues.serverId),
-    resolutionIntentKeyPart(initialValues.provider),
-    resolutionIntentKeyPart(initialValues.modeId),
-    resolutionIntentKeyPart(initialValues.model),
-    resolutionIntentKeyPart(initialValues.thinkingOptionId),
-  ].join("\n");
-}
-
-function hasSnapshotDataForResolution(input: {
-  serverId: string | null;
-  snapshotEntries: ProviderSnapshotEntry[] | undefined;
-}): boolean {
-  if (!input.serverId) {
-    return false;
-  }
-  return input.snapshotEntries !== undefined;
-}
-
 function resolveSelectedProviderModes(input: {
   selectedEntry: ProviderSnapshotEntry | null;
   provider: AgentProvider | null;
@@ -161,16 +133,6 @@ function buildAllProviderModels(
   return map;
 }
 
-function buildProviderModelsByProvider(
-  snapshotEntries: ProviderSnapshotEntry[] | undefined,
-): ProviderModelsByProvider {
-  const map: ProviderModelsByProvider = new Map();
-  for (const entry of snapshotEntries ?? []) {
-    map.set(entry.provider, entry.models ?? null);
-  }
-  return map;
-}
-
 async function persistProviderPreferences(input: {
   provider: AgentProvider;
   formState: FormState;
@@ -213,7 +175,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
 
   const validServerIds = useMemo(() => new Set(daemons.map((d) => d.serverId)), [daemons]);
 
-  const [{ form: formState, userModified, resolution }, dispatch] = useReducer(
+  const [{ form: formState, userModified }, dispatch] = useReducer(
     resolveAgentForm,
     initialServerId,
     (serverId) => ({
@@ -226,7 +188,6 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
         workingDir: "",
       },
       userModified: INITIAL_USER_MODIFIED,
-      resolution: INITIAL_AGENT_FORM_RESOLUTION,
     }),
   );
 
@@ -235,9 +196,14 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
     reducerStateRef.current = { form: formState, userModified };
   }, [formState, userModified]);
 
+  const hasResolvedRef = useRef(false);
+  const hydrationPreferencesRef = useRef<FormPreferences | null>(null);
+
   useEffect(() => {
     if (!isVisible) {
       dispatch({ type: "RESET" });
+      hasResolvedRef.current = false;
+      hydrationPreferencesRef.current = null;
     }
   }, [isVisible]);
 
@@ -279,10 +245,6 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
     () => buildAllProviderModels(snapshotEntries),
     [snapshotEntries],
   );
-  const snapshotProviderModelsByProvider = useMemo(
-    () => buildProviderModelsByProvider(snapshotEntries),
-    [snapshotEntries],
-  );
   const snapshotModelSelectorProviders = useMemo(
     () => buildSelectableProviderSelectorProviders(snapshotEntries),
     [snapshotEntries],
@@ -314,52 +276,37 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
     () => combineInitialValues(initialValues, initialServerId),
     [initialValues, initialServerId],
   );
-  const resolutionIntentKey = useMemo(
-    () => buildResolutionIntentKey(combinedInitialValues),
-    [combinedInitialValues],
-  );
 
   useEffect(() => {
     if (!isVisible || !isCreateFlow) {
       return;
     }
 
-    dispatch({ type: "REQUEST_RESOLUTION" });
-  }, [isVisible, isCreateFlow, resolutionIntentKey]);
+    if (isPreferencesLoading && !hasResolvedRef.current) {
+      return;
+    }
 
-  useEffect(() => {
-    if (!isVisible || !isCreateFlow || resolution.status !== "pending") {
-      return;
-    }
-    if (isPreferencesLoading) {
-      return;
-    }
-    if (
-      !hasSnapshotDataForResolution({
-        serverId: formState.serverId,
-        snapshotEntries,
-      })
-    ) {
-      return;
+    if (!hasResolvedRef.current) {
+      hydrationPreferencesRef.current = preferences;
     }
+    const hydrationPreferences = hydrationPreferencesRef.current ?? preferences;
 
     dispatch({
-      type: "COMPLETE_RESOLUTION",
+      type: "RESOLVE",
       initialValues: combinedInitialValues,
-      preferences,
-      providerModelsByProvider: snapshotProviderModelsByProvider,
+      preferences: hydrationPreferences,
+      availableModels,
       allowedProviderMap: snapshotResolvableProviderDefinitionMap,
     });
+
+    hasResolvedRef.current = true;
   }, [
-    combinedInitialValues,
-    formState.serverId,
+    isVisible,
     isCreateFlow,
     isPreferencesLoading,
-    isVisible,
+    combinedInitialValues,
     preferences,
-    resolution.status,
-    snapshotEntries,
-    snapshotProviderModelsByProvider,
+    availableModels,
     snapshotResolvableProviderDefinitionMap,
   ]);
 
@@ -369,9 +316,10 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
       isVisible,
       isCreateFlow,
       isPreferencesLoading,
+      hasResolved: hasResolvedRef.current,
       userModifiedServerId: userModified.serverId,
       initialServerId: combinedInitialValues?.serverId,
-      currentServerId: formState.serverId,
+      currentServerId: reducerStateRef.current.form.serverId,
     });
     if (!canAutoSelectServerId) return;
 
@@ -386,7 +334,6 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
     isVisible,
     onlineServerIds,
     onlineServerIdsKey,
-    formState.serverId,
     userModified.serverId,
     validServerIds,
   ]);
@@ -562,6 +509,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
     ? providerDefinitionMap.get(formState.provider)
     : undefined;
   const effectiveModel = resolveEffectiveModel(availableModels, formState.model);
+  const resolvedModelId = effectiveModel?.id ?? formState.model;
   const availableThinkingOptionsRaw = effectiveModel?.thinkingOptions;
   const availableThinkingOptions = useMemo(
     () => availableThinkingOptionsRaw ?? [],
@@ -581,7 +529,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
       setProviderFromUser,
       selectedMode: formState.modeId,
       setModeFromUser,
-      selectedModel: formState.model,
+      selectedModel: resolvedModelId,
       setModelFromUser,
       selectedThinkingOptionId: formState.thinkingOptionId,
       setThinkingOptionFromUser,
@@ -612,7 +560,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
       formState.serverId,
       formState.provider,
       formState.modeId,
-      formState.model,
+      resolvedModelId,
       formState.thinkingOptionId,
       formState.workingDir,
       setSelectedServerId,

packages/app/src/hooks/use-changes-preferences/storage.test.ts

@@ -28,7 +28,6 @@ describe("loadChangesPreferencesFromStorage", () => {
 
     expect(result).toEqual({
       layout: "unified",
-      viewMode: "flat",
       wrapLines: true,
       hideWhitespace: false,
     });
@@ -38,7 +37,6 @@ describe("loadChangesPreferencesFromStorage", () => {
   it("loads persisted layout and whitespace preferences without rewriting storage", async () => {
     const persisted = JSON.stringify({
       layout: "split",
-      viewMode: "tree",
       hideWhitespace: true,
       wrapLines: false,
     });
@@ -50,7 +48,6 @@ describe("loadChangesPreferencesFromStorage", () => {
 
     expect(result).toEqual({
       layout: "split",
-      viewMode: "tree",
       hideWhitespace: true,
       wrapLines: false,
     });
@@ -67,16 +64,11 @@ describe("saveChangesPreferences", () => {
 
     await saveChangesPreferences({
       queryClient,
-      updates: { layout: "split", viewMode: "tree", hideWhitespace: true },
+      updates: { layout: "split", hideWhitespace: true },
       storage,
     });
 
-    const expected = {
-      ...DEFAULT_CHANGES_PREFERENCES,
-      layout: "split",
-      viewMode: "tree",
-      hideWhitespace: true,
-    };
+    const expected = { ...DEFAULT_CHANGES_PREFERENCES, layout: "split", hideWhitespace: true };
     expect(queryClient.getQueryData(CHANGES_PREFERENCES_QUERY_KEY)).toEqual(expected);
     expect(storage.entries.get(CHANGES_PREFERENCES_STORAGE_KEY)).toBe(JSON.stringify(expected));
   });

packages/app/src/hooks/use-changes-preferences/storage.ts

@@ -7,21 +7,18 @@ export const CHANGES_PREFERENCES_QUERY_KEY = ["changes-preferences"];
 
 const changesPreferencesSchema = z.object({
   layout: z.enum(["unified", "split"]).optional(),
-  viewMode: z.enum(["flat", "tree"]).optional(),
   wrapLines: z.boolean().optional(),
   hideWhitespace: z.boolean().optional(),
 });
 
 export interface ChangesPreferences {
   layout: "unified" | "split";
-  viewMode: "flat" | "tree";
   wrapLines: boolean;
   hideWhitespace: boolean;
 }
 
 export const DEFAULT_CHANGES_PREFERENCES: ChangesPreferences = {
   layout: "unified",
-  viewMode: "flat",
   wrapLines: false,
   hideWhitespace: false,
 };

packages/app/src/hooks/use-daemon-config.ts

@@ -1,11 +1,13 @@
-import { useCallback, useMemo } from "react";
-import { useQueryClient } from "@tanstack/react-query";
+import { useCallback, useEffect, useMemo } from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
 import type { MutableDaemonConfig, MutableDaemonConfigPatch } from "@getpaseo/protocol/messages";
-import { useReplicaQuery } from "@/data/query";
-import { daemonConfigQueryKey } from "@/data/daemon-config";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 
+export function daemonConfigQueryKey(serverId: string | null) {
+  return ["daemon-config", serverId] as const;
+}
+
 interface UseDaemonConfigResult {
   config: MutableDaemonConfig | null;
   isLoading: boolean;
@@ -19,10 +21,10 @@ export function useDaemonConfig(serverId: string | null): UseDaemonConfigResult
   const isConnected = useHostRuntimeIsConnected(serverId ?? "");
   const queryKey = useMemo(() => daemonConfigQueryKey(serverId), [serverId]);
 
-  const configQuery = useReplicaQuery({
+  const configQuery = useQuery({
     queryKey,
     enabled: Boolean(serverId && client && isConnected),
-    pushEvent: "status:daemon_config_changed",
+    staleTime: Infinity,
     queryFn: async () => {
       if (!client) {
         throw new Error(t("workspace.terminal.hostDisconnected"));
@@ -32,6 +34,22 @@ export function useDaemonConfig(serverId: string | null): UseDaemonConfigResult
     },
   });
 
+  useEffect(() => {
+    if (!client || !isConnected || !serverId) {
+      return;
+    }
+
+    return client.on("status", (message) => {
+      if (message.type !== "status") {
+        return;
+      }
+      if (message.payload.status !== "daemon_config_changed") {
+        return;
+      }
+      queryClient.setQueryData(queryKey, message.payload.config as MutableDaemonConfig);
+    });
+  }, [client, isConnected, queryClient, queryKey, serverId]);
+
   const patchConfig = useCallback(
     async (patch: MutableDaemonConfigPatch) => {
       if (!client) {

packages/app/src/hooks/use-dictation-audio-source.native.ts

@@ -12,7 +12,6 @@ import type {
 export function useDictationAudioSource(config: DictationAudioSourceConfig): DictationAudioSource {
   const onPcmSegmentRef = useRef(config.onPcmSegment);
   const onErrorRef = useRef(config.onError);
-  const onInterruptionRef = useRef(config.onInterruption);
   const [volume, setVolume] = useState(0);
   const engineRef = useRef<ReturnType<typeof createAudioEngine> | null>(null);
 
@@ -31,9 +30,6 @@ export function useDictationAudioSource(config: DictationAudioSourceConfig): Dic
       onError: (error) => {
         onErrorRef.current?.(error);
       },
-      onInterruption: () => {
-        onInterruptionRef.current?.();
-      },
     });
     return engineRef.current;
   }, []);
@@ -41,8 +37,7 @@ export function useDictationAudioSource(config: DictationAudioSourceConfig): Dic
   useEffect(() => {
     onPcmSegmentRef.current = config.onPcmSegment;
     onErrorRef.current = config.onError;
-    onInterruptionRef.current = config.onInterruption;
-  }, [config.onPcmSegment, config.onError, config.onInterruption]);
+  }, [config.onPcmSegment, config.onError]);
 
   const start = useCallback(async () => {
     const engine = getOrCreateEngine();

packages/app/src/hooks/use-dictation-audio-source.types.ts

@@ -1,7 +1,6 @@
 export interface DictationAudioSourceConfig {
   onPcmSegment: (pcm16Base64: string) => void;
   onError?: (error: Error) => void;
-  onInterruption?: () => void;
 }
 
 export interface DictationAudioSource {

packages/app/src/hooks/use-dictation.ts

@@ -184,6 +184,19 @@ export function useDictation(options: UseDictationOptions): UseDictationResult {
     });
   }, [client]);
 
+  const audio = useDictationAudioSource({
+    onPcmSegment: (audioData) => {
+      senderRef.current?.enqueueSegment(audioData);
+    },
+    onError: (err) => {
+      onErrorRef.current?.(err);
+    },
+  });
+  const audioStopRef = useRef(audio.stop);
+  useEffect(() => {
+    audioStopRef.current = audio.stop;
+  }, [audio.stop]);
+
   const handleStreamingTranscriptionSuccess = useCallback(
     (text: string, requestId: string) => {
       setIsProcessing(false);
@@ -207,7 +220,6 @@ export function useDictation(options: UseDictationOptions): UseDictationResult {
     (failure: unknown) => {
       const normalized = toError(failure);
       const failureId = generateMessageId();
-      stopDurationTracking();
       setIsProcessing(false);
       isProcessingRef.current = false;
       isRecordingRef.current = false;
@@ -222,30 +234,9 @@ export function useDictation(options: UseDictationOptions): UseDictationResult {
 
       reportError(normalized, "Failed to complete dictation");
     },
-    [reportError, stopDurationTracking],
+    [reportError],
   );
 
-  const audio = useDictationAudioSource({
-    onPcmSegment: (audioData) => {
-      senderRef.current?.enqueueSegment(audioData);
-    },
-    onError: (err) => {
-      onErrorRef.current?.(err);
-    },
-    onInterruption: () => {
-      try {
-        senderRef.current?.cancel();
-      } catch {
-        // no-op
-      }
-      handleDictationFailure(new Error("Dictation was interrupted by another audio source."));
-    },
-  });
-  const audioStopRef = useRef(audio.stop);
-  useEffect(() => {
-    audioStopRef.current = audio.stop;
-  }, [audio.stop]);
-
   const startDictation = useCallback(async () => {
     if (
       actionGateRef.current.starting ||

packages/app/src/hooks/use-is-local-daemon.ts

@@ -15,10 +15,10 @@ async function loadDesktopDaemonServerId(): Promise<DesktopDaemonServerIdResult>
   };
 }
 
-function useLocalDaemonServerIdQuery() {
+export function useLocalDaemonServerId(): string | null {
   const isDesktopApp = shouldUseDesktopDaemon();
 
-  return useQuery({
+  const query = useQuery({
     queryKey: DESKTOP_DAEMON_SERVER_ID_QUERY_KEY,
     queryFn: loadDesktopDaemonServerId,
     enabled: isDesktopApp,
@@ -30,11 +30,6 @@ function useLocalDaemonServerIdQuery() {
     refetchOnWindowFocus: false,
     retry: false,
   });
-}
-
-export function useLocalDaemonServerId(): string | null {
-  const isDesktopApp = shouldUseDesktopDaemon();
-  const query = useLocalDaemonServerIdQuery();
 
   if (!isDesktopApp) {
     return null;
@@ -43,27 +38,6 @@ export function useLocalDaemonServerId(): string | null {
   return query.data?.serverId ?? null;
 }
 
-export type LocalDaemonServerIdState =
-  | { status: "loading" }
-  | { status: "error" }
-  | { status: "resolved"; serverId: string | null };
-
-export function useLocalDaemonServerIdState(): LocalDaemonServerIdState {
-  const isDesktopApp = shouldUseDesktopDaemon();
-  const query = useLocalDaemonServerIdQuery();
-
-  if (!isDesktopApp) {
-    return { status: "resolved", serverId: null };
-  }
-  if (query.isError) {
-    return { status: "error" };
-  }
-  if (query.isSuccess) {
-    return { status: "resolved", serverId: query.data.serverId };
-  }
-  return { status: "loading" };
-}
-
 export function useIsLocalDaemon(serverId: string): boolean {
   const normalizedServerId = serverId.trim();
   const localServerId = useLocalDaemonServerId();

packages/app/src/hooks/use-open-project.ts

@@ -1,5 +1,7 @@
 import { useCallback } from "react";
+import { useQueryClient } from "@tanstack/react-query";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import { projectsQueryKey } from "@/hooks/use-projects";
 import { useSessionStore } from "@/stores/session-store";
 import { openProjectDirectly, type OpenProjectResult } from "@/hooks/open-project";
 
@@ -9,6 +11,7 @@ export function useOpenProject(
   const normalizedServerId = serverId?.trim() ?? "";
   const client = useHostRuntimeClient(normalizedServerId);
   const isConnected = useHostRuntimeIsConnected(normalizedServerId);
+  const queryClient = useQueryClient();
   const canAddProject = useSessionStore((state) =>
     normalizedServerId
       ? state.sessions[normalizedServerId]?.serverInfo?.features?.projectAdd === true
@@ -28,6 +31,13 @@ export function useOpenProject(
         addEmptyProject,
         setHasHydratedWorkspaces,
       });
+      // The aggregated projects query derives the project list from a fetch
+      // that now includes empty projects; refetch so a freshly-added project
+      // (no workspace yet) is immediately editable instead of only after a
+      // restart.
+      if (result.ok) {
+        void queryClient.invalidateQueries({ queryKey: projectsQueryKey });
+      }
       return result;
     },
     [
@@ -36,6 +46,7 @@ export function useOpenProject(
       client,
       isConnected,
       normalizedServerId,
+      queryClient,
       setHasHydratedWorkspaces,
     ],
   );

packages/app/src/hooks/use-projects.test.ts

@@ -1,48 +1,92 @@
 import { describe, expect, it } from "vitest";
-import type { EmptyProjectDescriptor, WorkspaceDescriptor } from "@/stores/session-store";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type { WorkspaceDescriptorPayload } from "@getpaseo/protocol/messages";
 import {
-  deriveProjectsFromReplica,
-  type ProjectHostReplica,
-  type ProjectHostRuntimeState,
-} from "@/hooks/use-projects";
+  fetchAggregatedProjects,
+  type ProjectsHostInput,
+  type ProjectsRuntime,
+  type ProjectsRuntimeSnapshot,
+} from "@/projects/aggregated-projects";
 
-function runtimeState(input: {
+type FetchWorkspaces = DaemonClient["fetchWorkspaces"];
+type FetchWorkspacesResult = Awaited<ReturnType<FetchWorkspaces>>;
+
+interface HostFixture {
   serverId: string;
-  isOnline: boolean;
-  isLoading?: boolean;
-  isFetching?: boolean;
-  error?: string | null;
-}): ProjectHostRuntimeState {
+  serverName: string;
+  status: "online" | "offline" | "missing-snapshot";
+  workspaces?: WorkspaceDescriptorPayload[] | Error;
+}
+
+interface RuntimeAdapter extends ProjectsRuntime {
+  fetchCalls: Map<string, number>;
+}
+
+function createRuntime(hosts: HostFixture[]): RuntimeAdapter {
+  const snapshots = new Map<string, ProjectsRuntimeSnapshot | null>();
+  const clients = new Map<string, Pick<DaemonClient, "fetchWorkspaces"> | null>();
+  const fetchCalls = new Map<string, number>();
+
+  for (const host of hosts) {
+    if (host.status === "missing-snapshot") {
+      snapshots.set(host.serverId, null);
+    } else {
+      snapshots.set(host.serverId, { connectionStatus: host.status });
+    }
+
+    if (host.workspaces === undefined) {
+      clients.set(host.serverId, null);
+      continue;
+    }
+
+    const workspaces = host.workspaces;
+    const fetchWorkspaces: FetchWorkspaces = async () => {
+      fetchCalls.set(host.serverId, (fetchCalls.get(host.serverId) ?? 0) + 1);
+      if (workspaces instanceof Error) {
+        throw workspaces;
+      }
+      return {
+        requestId: `req-${host.serverId}`,
+        entries: workspaces,
+        emptyProjects: [],
+        pageInfo: { nextCursor: null, prevCursor: null, hasMore: false },
+      } satisfies FetchWorkspacesResult;
+    };
+
+    clients.set(host.serverId, { fetchWorkspaces });
+  }
+
   return {
-    serverId: input.serverId,
-    isOnline: input.isOnline,
-    isLoading: input.isLoading ?? false,
-    isFetching: input.isFetching ?? false,
-    error: input.error ?? null,
+    getClient: (serverId) => clients.get(serverId) ?? null,
+    getSnapshot: (serverId) => snapshots.get(serverId),
+    fetchCalls,
   };
 }
 
+function hostInputs(hosts: HostFixture[]): ProjectsHostInput[] {
+  return hosts.map((host) => ({ serverId: host.serverId, serverName: host.serverName }));
+}
+
 function workspace(input: {
   id: string;
   projectKey: string;
   projectName: string;
   cwd: string;
   remoteUrl: string | null;
-}): WorkspaceDescriptor {
+}): WorkspaceDescriptorPayload {
   return {
     id: input.id,
     projectId: input.projectKey,
     projectDisplayName: input.projectName,
-    projectCustomName: null,
     projectRootPath: input.cwd,
     workspaceDirectory: input.cwd,
     projectKind: "git",
     workspaceKind: "local_checkout",
     name: input.id,
-    title: null,
     archivingAt: null,
     status: "done",
     statusEnteredAt: null,
+    activityAt: null,
     diffStat: null,
     scripts: [],
     gitRuntime: {
@@ -71,26 +115,13 @@ function workspace(input: {
   };
 }
 
-function emptyProject(input: {
-  projectKey: string;
-  projectName: string;
-  cwd: string;
-}): EmptyProjectDescriptor {
-  return {
-    projectId: input.projectKey,
-    projectDisplayName: input.projectName,
-    projectCustomName: null,
-    projectRootPath: input.cwd,
-    projectKind: "git",
-  };
-}
-
-describe("deriveProjectsFromReplica", () => {
-  it("aggregates store workspaces and empty projects sorted by display name", () => {
-    const replicas: ProjectHostReplica[] = [
+describe("fetchAggregatedProjects", () => {
+  it("calls every online host's client and aggregates projects sorted by display name", async () => {
+    const hosts: HostFixture[] = [
       {
         serverId: "local",
         serverName: "Local",
+        status: "online",
         workspaces: [
           workspace({
             id: "z-main",
@@ -100,50 +131,41 @@ describe("deriveProjectsFromReplica", () => {
             remoteUrl: "https://github.com/acme/zeta.git",
           }),
         ],
-        emptyProjects: [],
       },
       {
         serverId: "laptop",
         serverName: "Laptop",
-        workspaces: [],
-        emptyProjects: [
-          emptyProject({
+        status: "online",
+        workspaces: [
+          workspace({
+            id: "a-main",
             projectKey: "remote:github.com/acme/alpha",
             projectName: "acme/alpha",
             cwd: "/repo/alpha",
+            remoteUrl: "https://github.com/acme/alpha.git",
           }),
         ],
       },
     ];
+    const runtime = createRuntime(hosts);
 
-    const result = deriveProjectsFromReplica({
-      replicas,
-      runtimeStates: [
-        runtimeState({ serverId: "local", isOnline: true }),
-        runtimeState({ serverId: "laptop", isOnline: false }),
-      ],
-    });
+    const result = await fetchAggregatedProjects({ hosts: hostInputs(hosts), runtime });
 
+    expect(runtime.fetchCalls.get("local")).toBe(1);
+    expect(runtime.fetchCalls.get("laptop")).toBe(1);
     expect(result.projects.map((project) => project.projectName)).toEqual([
       "acme/alpha",
       "acme/zeta",
     ]);
-    expect(result.projects[0]?.hosts).toEqual([
-      expect.objectContaining({
-        serverId: "laptop",
-        isOnline: false,
-        repoRoot: "/repo/alpha",
-        workspaceCount: 0,
-      }),
-    ]);
     expect(result.hostErrors).toEqual([]);
   });
 
-  it("maps runtime directory status into loading and host errors", () => {
-    const replicas: ProjectHostReplica[] = [
+  it("surfaces per-host fetch failures without dropping successful hosts", async () => {
+    const hosts: HostFixture[] = [
       {
         serverId: "local",
         serverName: "Local",
+        status: "online",
         workspaces: [
           workspace({
             id: "main",
@@ -153,28 +175,17 @@ describe("deriveProjectsFromReplica", () => {
             remoteUrl: "https://github.com/acme/app.git",
           }),
         ],
-        emptyProjects: [],
       },
       {
         serverId: "laptop",
         serverName: "Laptop",
-        workspaces: [],
-        emptyProjects: [],
+        status: "online",
+        workspaces: new Error("laptop unavailable"),
       },
     ];
+    const runtime = createRuntime(hosts);
 
-    const result = deriveProjectsFromReplica({
-      replicas,
-      runtimeStates: [
-        runtimeState({ serverId: "local", isOnline: true, isFetching: true }),
-        runtimeState({
-          serverId: "laptop",
-          isOnline: true,
-          isLoading: true,
-          error: "laptop unavailable",
-        }),
-      ],
-    });
+    const result = await fetchAggregatedProjects({ hosts: hostInputs(hosts), runtime });
 
     expect(result.projects).toEqual([
       expect.objectContaining({ projectKey: "remote:github.com/acme/app" }),
@@ -186,30 +197,61 @@ describe("deriveProjectsFromReplica", () => {
         message: "laptop unavailable",
       },
     ]);
-    expect(result.isLoading).toBe(true);
-    expect(result.isFetching).toBe(true);
   });
 
-  it("returns only the stable public project and host entry shapes", () => {
-    const result = deriveProjectsFromReplica({
-      replicas: [
-        {
-          serverId: "local",
-          serverName: "Local",
-          workspaces: [
-            workspace({
-              id: "main",
-              projectKey: "remote:github.com/acme/app",
-              projectName: "acme/app",
-              cwd: "/repo/app",
-              remoteUrl: "https://github.com/acme/app.git",
-            }),
-          ],
-          emptyProjects: [],
-        },
-      ],
-      runtimeStates: [runtimeState({ serverId: "local", isOnline: true })],
-    });
+  it("skips disconnected hosts silently without surfacing them as failures", async () => {
+    const hosts: HostFixture[] = [
+      {
+        serverId: "local",
+        serverName: "Local",
+        status: "online",
+        workspaces: [
+          workspace({
+            id: "main",
+            projectKey: "remote:github.com/acme/app",
+            projectName: "acme/app",
+            cwd: "/repo/app",
+            remoteUrl: "https://github.com/acme/app.git",
+          }),
+        ],
+      },
+      {
+        serverId: "laptop",
+        serverName: "Laptop",
+        status: "offline",
+      },
+    ];
+    const runtime = createRuntime(hosts);
+
+    const result = await fetchAggregatedProjects({ hosts: hostInputs(hosts), runtime });
+
+    expect(result.hostErrors).toEqual([]);
+    expect(result.projects).toEqual([
+      expect.objectContaining({ projectKey: "remote:github.com/acme/app" }),
+    ]);
+    expect(runtime.fetchCalls.get("laptop")).toBeUndefined();
+  });
+
+  it("returns only the stable public project and host entry shapes", async () => {
+    const hosts: HostFixture[] = [
+      {
+        serverId: "local",
+        serverName: "Local",
+        status: "online",
+        workspaces: [
+          workspace({
+            id: "main",
+            projectKey: "remote:github.com/acme/app",
+            projectName: "acme/app",
+            cwd: "/repo/app",
+            remoteUrl: "https://github.com/acme/app.git",
+          }),
+        ],
+      },
+    ];
+    const runtime = createRuntime(hosts);
+
+    const result = await fetchAggregatedProjects({ hosts: hostInputs(hosts), runtime });
 
     expect(Object.keys(result.projects[0] ?? {}).sort()).toEqual([
       "githubUrl",

packages/app/src/hooks/use-projects.ts

@@ -1,45 +1,23 @@
-import { useCallback, useMemo, useRef, useSyncExternalStore } from "react";
-import equal from "fast-deep-equal";
-import { useStoreWithEqualityFn } from "zustand/traditional";
+import { useMemo, useSyncExternalStore } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { getHostRuntimeStore, useHosts } from "@/runtime/host-runtime";
+import type { ProjectSummary } from "@/utils/projects";
 import {
-  getHostRuntimeStore,
-  isHostRuntimeDirectoryLoading,
-  useHosts,
-  type HostRuntimeSnapshot,
-} from "@/runtime/host-runtime";
-import {
-  useSessionStore,
-  type EmptyProjectDescriptor,
-  type WorkspaceDescriptor,
-} from "@/stores/session-store";
-import { buildProjects, type ProjectHost, type ProjectSummary } from "@/utils/projects";
+  fetchAggregatedProjects,
+  type ProjectHostError,
+  type ProjectsHostInput,
+} from "@/projects/aggregated-projects";
 
-export interface ProjectHostError {
-  serverId: string;
-  serverName: string;
-  message: string;
-}
+export type {
+  ProjectHostError,
+  ProjectsHostInput,
+  ProjectsRuntime,
+} from "@/projects/aggregated-projects";
 
-export interface ProjectHostReplica {
-  serverId: string;
-  serverName: string;
-  workspaces: WorkspaceDescriptor[];
-  emptyProjects: EmptyProjectDescriptor[];
-}
+export const projectsQueryKey = ["projects"] as const;
 
-export interface ProjectHostRuntimeState {
-  serverId: string;
-  isOnline: boolean;
-  isLoading: boolean;
-  isFetching: boolean;
-  error: string | null;
-}
-
-export interface DerivedProjectsResult {
-  projects: ProjectSummary[];
-  hostErrors: ProjectHostError[];
-  isLoading: boolean;
-  isFetching: boolean;
+function projectsQueryRuntimeKey(hosts: readonly ProjectsHostInput[]) {
+  return hosts.map((host) => host.serverId).join("|");
 }
 
 export interface UseProjectsResult {
@@ -50,112 +28,36 @@ export interface UseProjectsResult {
   refetch: () => void;
 }
 
-function toProjectHostRuntimeState(
-  serverId: string,
-  snapshot: HostRuntimeSnapshot | null,
-): ProjectHostRuntimeState {
-  const isFetching =
-    snapshot?.agentDirectoryStatus === "initial_loading" ||
-    snapshot?.agentDirectoryStatus === "revalidating";
-  return {
-    serverId,
-    isOnline: snapshot?.connectionStatus === "online",
-    isLoading: isHostRuntimeDirectoryLoading(snapshot),
-    isFetching,
-    error: snapshot?.agentDirectoryError ?? null,
-  };
-}
-
-function selectProjectHostReplicas(
-  hosts: readonly { serverId: string; label: string }[],
-): (state: ReturnType<typeof useSessionStore.getState>) => ProjectHostReplica[] {
-  return (state) =>
-    hosts.map((host) => {
-      const session = state.sessions[host.serverId];
-      return {
-        serverId: host.serverId,
-        serverName: host.label,
-        workspaces: Array.from(session?.workspaces.values() ?? []),
-        emptyProjects: Array.from(session?.emptyProjects.values() ?? []),
-      };
-    });
-}
-
-export function deriveProjectsFromReplica(input: {
-  replicas: readonly ProjectHostReplica[];
-  runtimeStates: readonly ProjectHostRuntimeState[];
-}): DerivedProjectsResult {
-  const runtimeByServerId = new Map(
-    input.runtimeStates.map((state) => [state.serverId, state] as const),
-  );
-  const hosts: ProjectHost[] = input.replicas.map((replica) => {
-    const runtimeState = runtimeByServerId.get(replica.serverId);
-    return {
-      serverId: replica.serverId,
-      serverName: replica.serverName,
-      isOnline: runtimeState?.isOnline ?? false,
-      workspaces: replica.workspaces,
-      emptyProjects: replica.emptyProjects,
-    };
-  });
-  const hostErrors = input.replicas.flatMap((replica) => {
-    const message = runtimeByServerId.get(replica.serverId)?.error;
-    return message
-      ? [
-          {
-            serverId: replica.serverId,
-            serverName: replica.serverName,
-            message,
-          },
-        ]
-      : [];
-  });
-
-  return {
-    ...buildProjects({ hosts }),
-    hostErrors,
-    isLoading: input.runtimeStates.some((state) => state.isLoading),
-    isFetching: input.runtimeStates.some((state) => state.isFetching),
-  };
-}
-
-function useProjectHostRuntimeStates(serverIds: readonly string[]): ProjectHostRuntimeState[] {
+export function useProjects(): UseProjectsResult {
+  const hosts = useHosts();
   const runtime = getHostRuntimeStore();
-  const previousStatesRef = useRef<ProjectHostRuntimeState[]>([]);
-  const runtimeSnapshotTick = useSyncExternalStore(
+  const runtimeVersion = useSyncExternalStore(
     (onStoreChange) => runtime.subscribeAll(onStoreChange),
     () => runtime.getVersion(),
     () => runtime.getVersion(),
   );
-  return useMemo(() => {
-    void runtimeSnapshotTick;
-    const nextStates = serverIds.map((serverId) =>
-      toProjectHostRuntimeState(serverId, runtime.getSnapshot(serverId)),
-    );
-    if (equal(previousStatesRef.current, nextStates)) {
-      return previousStatesRef.current;
-    }
-    previousStatesRef.current = nextStates;
-    return nextStates;
-  }, [runtime, runtimeSnapshotTick, serverIds]);
-}
-
-export function useProjects(): UseProjectsResult {
-  const hosts = useHosts();
-  const runtime = getHostRuntimeStore();
-  const serverIds = useMemo(() => hosts.map((host) => host.serverId), [hosts]);
-  const replicas = useStoreWithEqualityFn(useSessionStore, selectProjectHostReplicas(hosts), equal);
-  const runtimeStates = useProjectHostRuntimeStates(serverIds);
-  const derived = useMemo(
-    () => deriveProjectsFromReplica({ replicas, runtimeStates }),
-    [replicas, runtimeStates],
+  const hostInputs = useMemo<ProjectsHostInput[]>(
+    () =>
+      hosts.map((host) => ({
+        serverId: host.serverId,
+        serverName: host.label,
+      })),
+    [hosts],
   );
-  const refetch = useCallback(() => {
-    runtime.refreshAllAgentDirectories({ serverIds });
-  }, [runtime, serverIds]);
+
+  const projectsQuery = useQuery({
+    queryKey: [...projectsQueryKey, projectsQueryRuntimeKey(hostInputs), runtimeVersion] as const,
+    queryFn: () => fetchAggregatedProjects({ hosts: hostInputs, runtime }),
+    staleTime: 5_000,
+  });
 
   return {
-    ...derived,
-    refetch,
+    projects: projectsQuery.data?.projects ?? [],
+    hostErrors: projectsQuery.data?.hostErrors ?? [],
+    isLoading: projectsQuery.isLoading,
+    isFetching: projectsQuery.isFetching,
+    refetch: () => {
+      void projectsQuery.refetch();
+    },
   };
 }

packages/app/src/hooks/use-providers-snapshot.test.ts

@@ -4,13 +4,14 @@ import { beforeEach, describe, expect, it } from "vitest";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
 import { draftAgentCommandsQueryKey } from "@/hooks/agent-commands-query";
-import { applyProvidersSnapshotUpdate, type ProvidersSnapshotUpdate } from "@/data/push-router";
 import {
+  applyProvidersSnapshotUpdate,
   fetchProvidersSnapshot,
   providersSnapshotQueryKey,
   refreshAndApplyProvidersSnapshot,
   selectorOpenRefetchDecision,
   type ProvidersSnapshotClient,
+  type ProvidersSnapshotUpdateMessage,
 } from "./use-providers-snapshot";
 
 type GetProvidersSnapshotResult = Awaited<ReturnType<DaemonClient["getProvidersSnapshot"]>>;
@@ -222,7 +223,10 @@ describe("applyProvidersSnapshotUpdate", () => {
     queryClient = new QueryClient();
   });
 
-  function updateMessage(entries: ProviderSnapshotEntry[], cwd?: string): ProvidersSnapshotUpdate {
+  function updateMessage(
+    entries: ProviderSnapshotEntry[],
+    cwd?: string,
+  ): ProvidersSnapshotUpdateMessage {
     return {
       type: "providers_snapshot_update",
       payload: {

packages/app/src/hooks/use-providers-snapshot.ts

@@ -1,12 +1,11 @@
-import { useCallback, useMemo } from "react";
-import { useMutation, useQueryClient, type QueryClient } from "@tanstack/react-query";
+import { useCallback, useEffect, useMemo } from "react";
+import { useMutation, useQuery, useQueryClient, type QueryClient } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
 import type { AgentProvider, ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { useSessionStore } from "@/stores/session-store";
-import { useReplicaQuery } from "@/data/query";
-import { queryClient as singletonQueryClient } from "@/data/query-client";
+import { queryClient as singletonQueryClient } from "@/query/query-client";
 import { agentCommandsQueryRoot } from "@/hooks/agent-commands-query";
 import {
   isProvidersSnapshotHomeScope,
@@ -14,7 +13,7 @@ import {
   providersSnapshotQueryKey,
   providersSnapshotQueryRoot,
   providersSnapshotRequestOptions,
-} from "@/data/providers-snapshot";
+} from "@/hooks/providers-snapshot-query";
 
 type GetProvidersSnapshotResult = Awaited<ReturnType<DaemonClient["getProvidersSnapshot"]>>;
 type RefreshProvidersSnapshotResult = Awaited<ReturnType<DaemonClient["refreshProvidersSnapshot"]>>;
@@ -26,6 +25,15 @@ export type ProvidersSnapshotClient = Pick<
   "getProvidersSnapshot" | "refreshProvidersSnapshot"
 >;
 
+export interface ProvidersSnapshotUpdateMessage {
+  type: "providers_snapshot_update";
+  payload: {
+    cwd?: string;
+    entries: ProviderSnapshotEntry[];
+    generatedAt: string;
+  };
+}
+
 export async function fetchProvidersSnapshot(input: {
   client: ProvidersSnapshotClient;
   cwd: string | null;
@@ -58,6 +66,26 @@ export async function refreshAndApplyProvidersSnapshot(input: {
   return refreshResult;
 }
 
+export function applyProvidersSnapshotUpdate(input: {
+  serverId: string;
+  queryClient: QueryClient;
+  message: ProvidersSnapshotUpdateMessage;
+}): 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 type SelectorOpenRefetchDecision = "refetch-stale" | "refetch-always";
 
 export function selectorOpenRefetchDecision(input: {
@@ -106,10 +134,10 @@ export function useProvidersSnapshot(
 
   const queryKey = useMemo(() => providersSnapshotQueryKey(serverId, cwd), [cwd, serverId]);
 
-  const snapshotQuery = useReplicaQuery({
+  const snapshotQuery = useQuery({
     queryKey,
     enabled: Boolean(enabled && supportsSnapshot && serverId && client && isConnected),
-    pushEvent: "providers_snapshot_update",
+    staleTime: 60_000,
     queryFn: async () => {
       if (!client) {
         throw new Error(t("workspace.terminal.hostDisconnected"));
@@ -134,6 +162,19 @@ export function useProvidersSnapshot(
   });
   const { mutateAsync: refreshSnapshot, isPending: isRefreshing } = refreshMutation;
 
+  useEffect(() => {
+    if (!enabled || !supportsSnapshot || !client || !isConnected || !serverId) {
+      return;
+    }
+
+    return client.on("providers_snapshot_update", (message) => {
+      if (message.type !== "providers_snapshot_update") {
+        return;
+      }
+      applyProvidersSnapshotUpdate({ serverId, queryClient, message });
+    });
+  }, [client, enabled, isConnected, queryClient, serverId, supportsSnapshot]);
+
   const refresh = useCallback(
     async (providers?: AgentProvider[]) => {
       await refreshSnapshot(providers);
@@ -177,7 +218,7 @@ export function prefetchProvidersSnapshot(
   const queryKey = providersSnapshotQueryKey(serverId, cwd);
   void singletonQueryClient.prefetchQuery({
     queryKey,
-    staleTime: Infinity,
+    staleTime: 60_000,
     queryFn: () => fetchProvidersSnapshot({ client, cwd }),
   });
 }

packages/app/src/hooks/use-schedule-mutations.test.ts

@@ -1,91 +0,0 @@
-import { QueryClient } from "@tanstack/react-query";
-import type { ScheduleSummary } from "@getpaseo/protocol/schedule/types";
-import { describe, expect, it } from "vitest";
-import type {
-  AggregatedSchedule,
-  FetchAggregatedSchedulesResult,
-  FetchAggregatedSchedulesState,
-} from "@/schedules/aggregated-schedules";
-import { schedulesQueryBaseKey } from "@/schedules/aggregated-schedules";
-import { updateAggregatedSchedulesData } from "./use-schedule-mutations";
-
-function schedule(overrides: Partial<AggregatedSchedule> = {}): AggregatedSchedule {
-  const base: ScheduleSummary = {
-    id: "schedule-1",
-    name: "Nightly",
-    prompt: "Run the task",
-    cadence: { type: "every", everyMs: 60_000 },
-    target: { type: "new-agent", config: { provider: "codex", cwd: "/tmp/project" } },
-    status: "active",
-    createdAt: "2026-07-01T00:00:00.000Z",
-    updatedAt: "2026-07-01T00:00:00.000Z",
-    nextRunAt: "2026-07-02T01:00:00.000Z",
-    lastRunAt: null,
-    pausedAt: null,
-    expiresAt: null,
-    maxRuns: null,
-  };
-  return { ...base, serverId: "host-a", serverName: "Host A", ...overrides };
-}
-
-function pauseSchedules(schedules: AggregatedSchedule[]): AggregatedSchedule[] {
-  return schedules.map((entry) => ({ ...entry, status: "paused" }));
-}
-
-function pauseAggregatedSchedules(
-  current: FetchAggregatedSchedulesState | undefined,
-): FetchAggregatedSchedulesState | undefined {
-  return updateAggregatedSchedulesData(current, pauseSchedules);
-}
-
-describe("schedule mutation cache updates", () => {
-  it("updates the canonical loaded data field", () => {
-    const current: FetchAggregatedSchedulesResult = {
-      status: "loaded",
-      data: [schedule()],
-      hostErrors: [],
-    };
-
-    const result = updateAggregatedSchedulesData(current, pauseSchedules);
-
-    expect(result).toEqual({
-      status: "loaded",
-      data: [schedule({ status: "paused" })],
-      hostErrors: [],
-    });
-  });
-
-  it("leaves an empty cache entry empty", () => {
-    const result = updateAggregatedSchedulesData(undefined, () => [schedule()]);
-
-    expect(result).toBeUndefined();
-  });
-
-  it("leaves connecting cache entries untouched while updating loaded entries", () => {
-    const queryClient = new QueryClient();
-    const connectingKey = [...schedulesQueryBaseKey, "connecting"];
-    const loadedKey = [...schedulesQueryBaseKey, "loaded"];
-    const connecting = { status: "connecting" } as const;
-    const loaded: FetchAggregatedSchedulesResult = {
-      status: "loaded",
-      data: [schedule()],
-      hostErrors: [],
-    };
-    queryClient.setQueryData(connectingKey, connecting);
-    queryClient.setQueryData(loadedKey, loaded);
-
-    expect(() => {
-      queryClient.setQueriesData<FetchAggregatedSchedulesState>(
-        { queryKey: schedulesQueryBaseKey },
-        pauseAggregatedSchedules,
-      );
-    }).not.toThrow();
-
-    expect(queryClient.getQueryData(connectingKey)).toEqual(connecting);
-    expect(queryClient.getQueryData(loadedKey)).toEqual({
-      status: "loaded",
-      data: [schedule({ status: "paused" })],
-      hostErrors: [],
-    });
-  });
-});

packages/app/src/hooks/use-schedule-mutations.ts

@@ -12,11 +12,11 @@ import type {
   UpdateScheduleOptions,
 } from "@getpaseo/client/internal/daemon-client";
 import type { ScheduleSummary } from "@getpaseo/protocol/schedule/types";
+import { schedulesQueryBaseKey } from "@/hooks/use-schedules";
 import type {
   AggregatedSchedule,
-  FetchAggregatedSchedulesState,
+  FetchAggregatedSchedulesResult,
 } from "@/schedules/aggregated-schedules";
-import { schedulesQueryBaseKey } from "@/schedules/aggregated-schedules";
 import { useSessionStore } from "@/stores/session-store";
 
 export type CreateScheduleInput = Omit<CreateScheduleOptions, "requestId">;
@@ -38,17 +38,7 @@ export interface UseScheduleMutationsResult {
 }
 
 interface ScheduleListSnapshot {
-  previous: Array<[QueryKey, FetchAggregatedSchedulesState | undefined]>;
-}
-
-export function updateAggregatedSchedulesData(
-  current: FetchAggregatedSchedulesState | undefined,
-  updateSchedules: (schedules: AggregatedSchedule[]) => AggregatedSchedule[],
-): FetchAggregatedSchedulesState | undefined {
-  if (!current || current.status !== "loaded") {
-    return current;
-  }
-  return { ...current, data: updateSchedules(current.data) };
+  previous: Array<[QueryKey, FetchAggregatedSchedulesResult | undefined]>;
 }
 
 function requireClient(serverId: string, unavailableMessage: string): DaemonClient {
@@ -61,7 +51,7 @@ function requireClient(serverId: string, unavailableMessage: string): DaemonClie
 
 function snapshotSchedules(queryClient: QueryClient): ScheduleListSnapshot {
   return {
-    previous: queryClient.getQueriesData<FetchAggregatedSchedulesState>({
+    previous: queryClient.getQueriesData<FetchAggregatedSchedulesResult>({
       queryKey: schedulesQueryBaseKey,
     }),
   };
@@ -77,9 +67,14 @@ function updateSchedulesData(
   queryClient: QueryClient,
   updateSchedules: (schedules: AggregatedSchedule[]) => AggregatedSchedule[],
 ): void {
-  queryClient.setQueriesData<FetchAggregatedSchedulesState>(
+  queryClient.setQueriesData<FetchAggregatedSchedulesResult>(
     { queryKey: schedulesQueryBaseKey },
-    (current) => updateAggregatedSchedulesData(current, updateSchedules),
+    (current) => {
+      if (!current) {
+        return current;
+      }
+      return { ...current, schedules: updateSchedules(current.schedules) };
+    },
   );
 }
 

packages/app/src/hooks/use-schedules.test.ts

@@ -1,9 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { schedulesQueryKey } from "@/hooks/use-schedules";
-
-describe("schedulesQueryKey", () => {
-  it("uses only the sorted host identity", () => {
-    expect(schedulesQueryKey(["laptop", "local"])).toEqual(["schedules", "laptop|local"]);
-    expect(schedulesQueryKey(["local", "laptop"])).toEqual(["schedules", "laptop|local"]);
-  });
-});

packages/app/src/hooks/use-schedules.ts

@@ -1,32 +1,30 @@
-import { useMemo } from "react";
-import { useFetchQuery } from "@/data/query";
-import {
-  getHostRuntimeStore,
-  useHostRuntimeConnectionStatuses,
-  useHosts,
-} from "@/runtime/host-runtime";
+import { useMemo, useSyncExternalStore } from "react";
+import { keepPreviousData, useQuery } from "@tanstack/react-query";
+import { getHostRuntimeStore, useHosts } from "@/runtime/host-runtime";
 import {
   fetchAggregatedSchedules,
-  schedulesQueryBaseKey,
-  type AggregateLoadState,
   type AggregatedSchedule,
   type ScheduleHostError,
   type ScheduleHostInput,
 } from "@/schedules/aggregated-schedules";
 
-export type {
-  AggregateLoadState,
-  AggregatedSchedule,
-  ScheduleHostError,
-} from "@/schedules/aggregated-schedules";
+export type { AggregatedSchedule, ScheduleHostError } from "@/schedules/aggregated-schedules";
 
+export const schedulesQueryBaseKey = ["schedules"] as const;
+
+// Cache identity for the host set. The query also carries the runtime version
+// (below) so it retries as connectivity changes and reliably fetches once a host
+// comes online — even on a cold deep-link. The full-screen spinner flash that
+// keying on the version used to cause is prevented by keepPreviousData plus the
+// isInitialLoad(data === undefined) gate, not by dropping the version.
 export function schedulesQueryKey(serverIds: readonly string[]) {
   return [...schedulesQueryBaseKey, [...serverIds].sort().join("|")] as const;
 }
 
 export interface UseSchedulesResult {
-  loadState: AggregateLoadState<AggregatedSchedule>;
+  schedules: AggregatedSchedule[];
   hostErrors: ScheduleHostError[];
+  isInitialLoad: boolean;
   isError: boolean;
   error: Error | null;
   refetch: () => void;
@@ -36,36 +34,27 @@ export interface UseSchedulesResult {
 export function useSchedules(): UseSchedulesResult {
   const hosts = useHosts();
   const runtime = getHostRuntimeStore();
+  const runtimeVersion = useSyncExternalStore(
+    (onStoreChange) => runtime.subscribeAll(onStoreChange),
+    () => runtime.getVersion(),
+    () => runtime.getVersion(),
+  );
   const hostInputs = useMemo<ScheduleHostInput[]>(
     () => hosts.map((host) => ({ serverId: host.serverId, serverName: host.label })),
     [hosts],
   );
-  const serverIds = useMemo(() => hostInputs.map((host) => host.serverId), [hostInputs]);
-  const connectionStatuses = useHostRuntimeConnectionStatuses(serverIds);
-  const connectionStatusKey = useMemo(
-    () => serverIds.map((serverId) => connectionStatuses.get(serverId) ?? "connecting").join("|"),
-    [connectionStatuses, serverIds],
-  );
 
-  const query = useFetchQuery({
-    queryKey: [...schedulesQueryKey(serverIds), connectionStatusKey],
+  const query = useQuery({
+    queryKey: [...schedulesQueryKey(hostInputs.map((host) => host.serverId)), runtimeVersion],
     queryFn: () => fetchAggregatedSchedules({ hosts: hostInputs, runtime }),
-    dataShape: "list",
-    staleTimeMs: 5_000,
+    staleTime: 5_000,
+    placeholderData: keepPreviousData,
   });
 
-  let loadState: AggregateLoadState<AggregatedSchedule>;
-  if (query.data?.status === "connecting") {
-    loadState = { status: "connecting" };
-  } else if (query.data?.status === "loaded") {
-    loadState = { status: "loaded", data: query.data.data };
-  } else {
-    loadState = { status: "loading" };
-  }
-
   return {
-    loadState,
-    hostErrors: query.data?.status === "loaded" ? query.data.hostErrors : [],
+    schedules: query.data?.schedules ?? [],
+    hostErrors: query.data?.hostErrors ?? [],
+    isInitialLoad: query.isLoading && query.data === undefined,
     isError: query.isError,
     error: query.error,
     refetch: () => {

packages/app/src/hooks/use-settings/index.ts

@@ -1,7 +1,7 @@
 import { useCallback } from "react";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { useQuery, useQueryClient, type QueryClient } from "@tanstack/react-query";
-import { queryClient as appQueryClient } from "@/data/query-client";
+import { queryClient as appQueryClient } from "@/query/query-client";
 import type { AppLanguage } from "@/i18n/locales";
 import {
   DEFAULT_DESKTOP_SETTINGS,
@@ -96,8 +96,6 @@ export interface UseSettingsReturn {
   resetSettings: () => Promise<void>;
 }
 
-type SettingsSelector<TSelected> = (settings: Settings) => TSelected;
-
 export function useAppSettings(): UseAppSettingsReturn {
   const queryClient = useQueryClient();
   const { data, isPending, error } = useQuery({
@@ -139,11 +137,7 @@ export function useAppSettings(): UseAppSettingsReturn {
   };
 }
 
-export function useSettings(): UseSettingsReturn;
-export function useSettings<TSelected>(selector: SettingsSelector<TSelected>): TSelected;
-export function useSettings<TSelected>(
-  selector?: SettingsSelector<TSelected>,
-): UseSettingsReturn | TSelected {
+export function useSettings(): UseSettingsReturn {
   const appSettings = useAppSettings();
   const desktopSettings = useDesktopSettings();
 
@@ -183,9 +177,6 @@ export function useSettings<TSelected>(
       if (updates.workspaceTitleSource !== undefined) {
         appUpdates.workspaceTitleSource = updates.workspaceTitleSource;
       }
-      if (updates.autoExpandReasoning !== undefined) {
-        appUpdates.autoExpandReasoning = updates.autoExpandReasoning;
-      }
       const promises: Promise<void>[] = [];
       if (Object.keys(appUpdates).length > 0) {
         promises.push(appSettings.updateSettings(appUpdates));
@@ -219,19 +210,13 @@ export function useSettings<TSelected>(
     await Promise.all(resets);
   }, [appSettings, desktopSettings]);
 
-  const settings = {
-    ...DEFAULT_APP_SETTINGS,
-    ...appSettings.settings,
-    manageBuiltInDaemon: desktopSettings.settings.daemon.manageBuiltInDaemon,
-    releaseChannel: desktopSettings.settings.releaseChannel,
-  };
-
-  if (selector) {
-    return selector(settings);
-  }
-
   return {
-    settings,
+    settings: {
+      ...DEFAULT_APP_SETTINGS,
+      ...appSettings.settings,
+      manageBuiltInDaemon: desktopSettings.settings.daemon.manageBuiltInDaemon,
+      releaseChannel: desktopSettings.settings.releaseChannel,
+    },
     isLoading: appSettings.isLoading || desktopSettings.isLoading,
     error: appSettings.error ?? desktopSettings.error,
     updateSettings,

packages/app/src/hooks/use-settings/storage.ts

@@ -39,7 +39,6 @@ export interface AppSettings {
   codeFontSize: number; // clamped px, default 12
   syntaxTheme: SyntaxThemeId; // default "one"
   workspaceTitleSource: WorkspaceTitleSource;
-  autoExpandReasoning: boolean;
 }
 
 export interface Settings extends AppSettings {
@@ -59,7 +58,6 @@ export const DEFAULT_CLIENT_SETTINGS: AppSettings = {
   codeFontSize: DEFAULT_CODE_FONT_SIZE,
   syntaxTheme: "one",
   workspaceTitleSource: "title",
-  autoExpandReasoning: false,
 };
 
 export const DEFAULT_APP_SETTINGS: Settings = {
@@ -206,9 +204,6 @@ function pickAppSettings(stored: Partial<AppSettings>): Partial<AppSettings> {
   ) {
     result.workspaceTitleSource = stored.workspaceTitleSource;
   }
-  if (typeof stored.autoExpandReasoning === "boolean") {
-    result.autoExpandReasoning = stored.autoExpandReasoning;
-  }
   return result;
 }
 

packages/app/src/i18n/resources/ar.ts

@@ -707,19 +707,11 @@ export const ar: TranslationResources = {
         tooLarge: "الفرق كبير جدًا بحيث لا يمكن عرضه",
         unified: "الفرق الموحدة",
         split: "فرق جنبًا إلى جنب",
-        switchToUnified: "التبديل إلى الفرق الموحد",
-        switchToSplit: "التبديل إلى الفرق جنبًا إلى جنب",
-        showTreeView: "إظهار شجرة المجلدات",
-        showFlatView: "إظهار قائمة الملفات المسطحة",
-        options: "خيارات الفرق",
         hideWhitespace: "إخفاء المسافة البيضاء",
-        showWhitespace: "إظهار المسافة البيضاء",
         scrollLongLines: "قم بتمرير الخطوط الطويلة",
         wrapLongLines: "لف الخطوط الطويلة",
         collapseAll: "طي كافة الملفات",
         expandAll: "قم بتوسيع كافة الملفات",
-        collapseAllFolders: "طي كافة المجلدات",
-        expandAllFolders: "توسيع كافة المجلدات",
         refreshing: "منعش",
         refresh: "ينعش",
         refreshState: "تحديث بوابة وحالة GitHub",
@@ -1056,12 +1048,6 @@ export const ar: TranslationResources = {
       },
     },
   },
-  rootError: {
-    kicker: "حدث خطأ",
-    title: "واجه Paseo مشكلة.",
-    body: "جرّب مرة أخرى لإعادة تحميل التطبيق. إذا استمر حدوث ذلك، فأرفق التفاصيل أدناه عند الإبلاغ عنه.",
-    details: "التفاصيل",
-  },
   startup: {
     errorTitle: "حدث خطأ ما",
     errorDescription:
@@ -1418,7 +1404,6 @@ export const ar: TranslationResources = {
     },
     backToWorkspace: "خلف",
     addHost: "أضف مضيفًا",
-    enableBuiltInDaemon: "تفعيل البرنامج الخفي المدمج",
     projects: "المشاريع",
     projectList: {
       hostLoadFailed: "تعذر تحميل المشاريع من المضيف{{hostName}}:{{message}}",
@@ -1427,6 +1412,7 @@ export const ar: TranslationResources = {
     groupInfo: "حول{{title}}",
     sections: {
       general: "عام",
+      daemon: "Daemon",
       appearance: "مظهر",
       shortcuts: "الاختصارات",
       integrations: "التكامل",
@@ -1441,7 +1427,7 @@ export const ar: TranslationResources = {
       providers: "مقدمي الخدمات",
       usage: "الاستخدام",
       terminals: "Terminals",
-      host: "نظرة عامة",
+      host: "Host",
     },
     general: {
       title: "عام",
@@ -1471,10 +1457,6 @@ export const ar: TranslationResources = {
         description: "يتم الاحتفاظ بالخطوط في المخزن المؤقت الطرفي المدمج",
         accessibilityLabel: "خطوط التمرير Terminal",
       },
-      autoExpandReasoning: {
-        label: "عرض التفكير دائماً",
-        description: "إظهار تفكير الوكيل وخطوات الاستدلال بشكل كامل بشكل افتراضي",
-      },
       language: {
         label: "لغة",
         description: "لغة التطبيق",
@@ -1556,9 +1538,6 @@ export const ar: TranslationResources = {
           auto: "نظام",
         },
       },
-      detailLevel: {
-        title: "مستوى التفاصيل",
-      },
       fonts: {
         title: "الخطوط",
         systemDefault: "الافتراضي للنظام",

packages/app/src/i18n/resources/en.ts

@@ -714,19 +714,11 @@ export const en = {
         tooLarge: "Diff too large to display",
         unified: "Unified diff",
         split: "Side-by-side diff",
-        switchToUnified: "Switch to unified diff",
-        switchToSplit: "Switch to side-by-side diff",
-        showTreeView: "Show folder tree",
-        showFlatView: "Show flat file list",
-        options: "Diff options",
         hideWhitespace: "Hide whitespace",
-        showWhitespace: "Show whitespace",
         scrollLongLines: "Scroll long lines",
         wrapLongLines: "Wrap long lines",
         collapseAll: "Collapse all files",
         expandAll: "Expand all files",
-        collapseAllFolders: "Collapse all folders",
-        expandAllFolders: "Expand all folders",
         refreshing: "Refreshing",
         refresh: "Refresh",
         refreshState: "Refresh git and GitHub state",
@@ -1063,12 +1055,6 @@ export const en = {
       },
     },
   },
-  rootError: {
-    kicker: "Something went wrong",
-    title: "Paseo ran into a problem.",
-    body: "Try again to reload the app. If this keeps happening, include the details below when you report it.",
-    details: "Details",
-  },
   startup: {
     errorTitle: "Something went wrong",
     errorDescription:
@@ -1426,7 +1412,6 @@ export const en = {
     },
     backToWorkspace: "Back",
     addHost: "Add host",
-    enableBuiltInDaemon: "Enable built-in daemon",
     projects: "Projects",
     projectList: {
       hostLoadFailed: "Couldn't load projects from host {{hostName}}: {{message}}",
@@ -1435,6 +1420,7 @@ export const en = {
     groupInfo: "About {{title}}",
     sections: {
       general: "General",
+      daemon: "Daemon",
       appearance: "Appearance",
       shortcuts: "Shortcuts",
       integrations: "Integrations",
@@ -1449,7 +1435,7 @@ export const en = {
       providers: "Providers",
       usage: "Usage",
       terminals: "Terminals",
-      host: "Overview",
+      host: "Host",
     },
     general: {
       title: "General",
@@ -1478,10 +1464,6 @@ export const en = {
         description: "Lines kept in the built-in terminal buffer",
         accessibilityLabel: "Terminal scrollback lines",
       },
-      autoExpandReasoning: {
-        label: "Always expand reasoning",
-        description: "Show agent thinking and chain-of-thought blocks fully expanded by default",
-      },
       language: {
         label: "Language",
         description: "App language",
@@ -1563,9 +1545,6 @@ export const en = {
           auto: "System",
         },
       },
-      detailLevel: {
-        title: "Detail level",
-      },
       fonts: {
         title: "Fonts",
         systemDefault: "System default",

packages/app/src/i18n/resources/es.ts

@@ -734,19 +734,11 @@ export const es: TranslationResources = {
         tooLarge: "La diferencia es demasiado grande para mostrarse",
         unified: "Diferencia unificada",
         split: "Diferencia de lado a lado",
-        switchToUnified: "Cambiar a diferencia unificada",
-        switchToSplit: "Cambiar a diferencia lado a lado",
-        showTreeView: "Mostrar árbol de carpetas",
-        showFlatView: "Mostrar lista plana de archivos",
-        options: "Opciones de diferencia",
         hideWhitespace: "Ocultar espacios en blanco",
-        showWhitespace: "Mostrar espacios en blanco",
         scrollLongLines: "Desplazarse por largas filas",
         wrapLongLines: "Envolver largas filas",
         collapseAll: "Contraer todos los archivos",
         expandAll: "Expandir todos los archivos",
-        collapseAllFolders: "Contraer todas las carpetas",
-        expandAllFolders: "Expandir todas las carpetas",
         refreshing: "Refrescante",
         refresh: "Refrescar",
         refreshState: "Actualizar el estado de git yGitHub",
@@ -1092,12 +1084,6 @@ export const es: TranslationResources = {
       },
     },
   },
-  rootError: {
-    kicker: "Algo salió mal",
-    title: "Paseo tuvo un problema.",
-    body: "Vuelve a intentarlo para recargar la app. Si sigue ocurriendo, incluye los detalles de abajo al reportarlo.",
-    details: "Detalles",
-  },
   startup: {
     errorTitle: "algo salió mal",
     errorDescription:
@@ -1457,7 +1443,6 @@ export const es: TranslationResources = {
     },
     backToWorkspace: "Atrás",
     addHost: "Agregar anfitrión",
-    enableBuiltInDaemon: "Activar el demonio integrado",
     projects: "Proyectos",
     projectList: {
       hostLoadFailed: "No se pudieron cargar proyectos desde el host{{hostName}}:{{message}}",
@@ -1466,6 +1451,7 @@ export const es: TranslationResources = {
     groupInfo: "Acerca de{{title}}",
     sections: {
       general: "General",
+      daemon: "Daemon",
       appearance: "Apariencia",
       shortcuts: "Atajos",
       integrations: "Integraciones",
@@ -1480,7 +1466,7 @@ export const es: TranslationResources = {
       providers: "Proveedores",
       usage: "Uso",
       terminals: "Terminals",
-      host: "Resumen",
+      host: "Host",
     },
     general: {
       title: "General",
@@ -1511,11 +1497,6 @@ export const es: TranslationResources = {
         description: "Líneas mantenidas en el búfer de terminal incorporado",
         accessibilityLabel: "Líneas del historial de terminal",
       },
-      autoExpandReasoning: {
-        label: "Siempre expandir razonamiento",
-        description:
-          "Mostrar los bloques de pensamiento y razonamiento del agente totalmente expandidos de forma predeterminada",
-      },
       language: {
         label: "Idioma",
         description: "Idioma de la aplicación",
@@ -1597,9 +1578,6 @@ export const es: TranslationResources = {
           auto: "Sistema",
         },
       },
-      detailLevel: {
-        title: "Nivel de detalle",
-      },
       fonts: {
         title: "Fuentes",
         systemDefault: "Valor predeterminado del sistema",