chore(release): cut 0.1.92

Provider listing now returns picker rows only. Importing a selected provider session hydrates its timeline before the daemon publishes the Paseo agent.

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -6,6 +6,8 @@ body:
   - type: markdown
     attributes:
       value: |
+        I'm a solo maintainer and don't always keep up with GitHub Issues daily. If something is urgent or blocking you, [Discord](https://discord.gg/jz8T2uahpH) is the fastest place to reach me.
+
         Before opening, please:
 
         - search existing issues for the same symptom

.github/ISSUE_TEMPLATE/config.yml

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

.github/workflows/ci.yml

@@ -20,6 +20,10 @@ env:
 jobs:
   format:
     runs-on: ubuntu-latest
+    env:
+      # This job never executes Electron. Skipping the hosted binary avoids
+      # unrelated npm ci failures when Electron's CDN returns 504.
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -36,6 +40,8 @@ jobs:
 
   lint:
     runs-on: ubuntu-latest
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -58,6 +64,8 @@ jobs:
 
   typecheck:
     runs-on: ubuntu-latest
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -88,6 +96,8 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     name: server-tests (${{ matrix.os }})
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -131,8 +141,35 @@ jobs:
           node-version: "22"
           cache: "npm"
 
-      - name: Install dependencies
-        run: npm ci
+      - name: Install dependencies with Electron retry
+        if: runner.os != 'Windows'
+        run: |
+          for attempt in 1 2 3; do
+            if npm ci; then
+              exit 0
+            else
+              exit_code=$?
+            fi
+            if [ "$attempt" -eq 3 ]; then
+              exit $exit_code
+            fi
+            sleep $((attempt * 20))
+          done
+
+      - name: Install dependencies with Electron retry
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          for ($attempt = 1; $attempt -le 3; $attempt++) {
+            npm ci
+            if ($LASTEXITCODE -eq 0) {
+              exit 0
+            }
+            if ($attempt -eq 3) {
+              exit $LASTEXITCODE
+            }
+            Start-Sleep -Seconds (20 * $attempt)
+          }
 
       - name: Build server stack
         run: npm run build:server
@@ -142,6 +179,8 @@ jobs:
 
   app-tests:
     runs-on: ubuntu-latest
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -164,6 +203,8 @@ jobs:
 
   sdk-tests:
     runs-on: ubuntu-latest
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -189,6 +230,8 @@ jobs:
 
   playwright:
     runs-on: ubuntu-latest
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -229,6 +272,8 @@ jobs:
 
   relay-tests:
     runs-on: ubuntu-latest
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -253,6 +298,8 @@ jobs:
         shard: [1, 2, 3]
     runs-on: ubuntu-latest
     name: cli-tests (shard ${{ matrix.shard }}/3)
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
     steps:
       - uses: actions/checkout@v4
 

.gitignore

@@ -64,6 +64,7 @@ CLAUDE.local.md
 
 .debug.conversations/
 .debug/
+.dev/
 .paseo/
 .wrangler/
 **/.wrangler/

.oxlintrc.json

@@ -3,6 +3,7 @@
   "options": {
     "typeAware": false
   },
+  "ignorePatterns": [".dev/**"],
   "plugins": ["react", "react-perf", "unicorn", "typescript", "oxc", "import", "promise"],
   "categories": {
     "correctness": "error",

CHANGELOG.md

@@ -1,5 +1,74 @@
 # Changelog
 
+## 0.1.92 - 2026-06-10
+
+### Added
+
+- **Skills autocomplete inside prompts**
+
+### Improved
+
+- Provider catalog is inline in Host settings ([#1423](https://github.com/getpaseo/paseo/pull/1423))
+- Manual update checks skip staged rollout delays
+- CodeWhale replaces DeepSeek TUI in the provider catalog
+- ACP provider catalog entries are updated for Cline, Codebuddy Code, DimCode, Factory Droid, Gemini, Nova, and Qoder
+- OMP has its own icon and website page
+- Model selector descriptions are clearer
+- ACP provider errors show the provider's real failure message
+
+### Fixed
+
+- New Paseo worktree branches can push their first commits
+- Imported sessions no longer open blank or in the wrong workspace
+- Windows Explorer opens the selected workspace instead of Documents ([#1412](https://github.com/getpaseo/paseo/pull/1412) by [@bjspi](https://github.com/bjspi))
+- Windows editor shortcuts installed as command shims launch correctly ([#1387](https://github.com/getpaseo/paseo/pull/1387) by [@Peter7896](https://github.com/Peter7896))
+- ACP providers that cannot use MCP servers can start correctly
+- Removed hosts no longer leave host pages stuck connecting
+- File preview links open in your external browser
+- Chat stays pinned to the latest message while output streams
+- The mobile composer send button no longer shifts while typing
+
+## 0.1.91 - 2026-06-08
+
+### Added
+
+- **Open multiple desktop windows** ([#1355](https://github.com/getpaseo/paseo/pull/1355) by [@arieel-ost](https://github.com/arieel-ost))
+- **Open browser pop-ups and links inside workspace tabs** ([#1375](https://github.com/getpaseo/paseo/pull/1375))
+- **Use the command center from mobile**
+- **Add OMP as a provider** ([#1388](https://github.com/getpaseo/paseo/pull/1388))
+
+### Improved
+
+- New workspaces remember your last provider, mode, and thinking choices
+- Git controls now default ready branches to pull requests and hide unavailable pull or push actions
+- Desktop-managed hosts recover more reliably after stale daemon state
+- Daemon status now explains authentication failures
+- Project search skips Python virtual environments ([#1356](https://github.com/getpaseo/paseo/pull/1356))
+- Config files can include `$schema` for editor help
+- Claude MCP servers preserve always-load tool settings ([#1333](https://github.com/getpaseo/paseo/pull/1333) by [@nodomain](https://github.com/nodomain))
+- Claude profiles keep their configured models ([#1311](https://github.com/getpaseo/paseo/pull/1311) by [@ilteoood](https://github.com/ilteoood))
+- Provider loading can wait longer on slow machines ([#1346](https://github.com/getpaseo/paseo/pull/1346) by [@nodomain](https://github.com/nodomain))
+- The Kimi catalog entry now points to Kimi Code CLI ([#1403](https://github.com/getpaseo/paseo/pull/1403) by [@wbxl2000](https://github.com/wbxl2000))
+- ACP provider catalog entries are updated for Auggie, Claude Agent, Cline, Codebuddy Code, DimCode, Factory Droid, fast-agent, Gemini, GitHub Copilot, and Nova
+- Local dictation crash reports show more useful details ([#1379](https://github.com/getpaseo/paseo/pull/1379))
+- Daemon logs show why managed workers exit
+
+### Fixed
+
+- Pi compaction slash commands run correctly ([#1338](https://github.com/getpaseo/paseo/pull/1338) by [@chyendongnhanh338](https://github.com/chyendongnhanh338))
+- Auto-archiving still works after a merged PR branch is deleted ([#1378](https://github.com/getpaseo/paseo/pull/1378))
+- Worktrees can check out existing branch refs correctly ([#1358](https://github.com/getpaseo/paseo/pull/1358) by [@dixonl90](https://github.com/dixonl90))
+- File downloads work when daemon password protection is enabled ([#1351](https://github.com/getpaseo/paseo/pull/1351) by [@nodomain](https://github.com/nodomain))
+- iOS markdown links are tappable again ([#1334](https://github.com/getpaseo/paseo/pull/1334) by [@kaspesi](https://github.com/kaspesi))
+- iOS markdown images render correctly
+- Windows workspaces load their providers correctly ([#1329](https://github.com/getpaseo/paseo/pull/1329))
+- Removing a localhost host stops its local daemon ([#1297](https://github.com/getpaseo/paseo/pull/1297) by [@mcowger](https://github.com/mcowger))
+- Provider settings sheets stack correctly
+- The new workspace screen no longer opens behind the mobile sidebar
+- Global agent listing works again ([#1420](https://github.com/getpaseo/paseo/pull/1420))
+- OpenCode compaction summaries stay out of chat
+- OpenCode agents sharing a workspace keep their own Paseo tools
+
 ## 0.1.90 - 2026-06-04
 
 ### Added

CLAUDE.md

@@ -49,7 +49,9 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 ## Quick start
 
 ```bash
-npm run dev                          # Start daemon + Expo in Tmux
+npm run dev                          # Start the dev daemon
+npm run dev:app                      # Start Expo against the dev daemon
+npm run dev:desktop                  # Start Electron desktop dev
 npm run cli -- ls -a -g              # List all agents
 npm run cli -- daemon status         # Check daemon status
 npm run typecheck                    # Always run after changes
@@ -58,6 +60,8 @@ npm run format                       # Auto-format with Biome
 npm run format:check                 # Check formatting without writing
 ```
 
+Repo dev commands use checkout-local state by default. In this checkout, `PASEO_HOME` resolves to `.dev/paseo-home`, and `npm run cli -- ...` targets that same dev home automatically. The packaged desktop app and production-style daemon keep using `~/.paseo` on port `6767`.
+
 See [docs/development.md](docs/development.md) for full setup, build sync requirements, and debugging.
 
 ## Critical rules

README.md

@@ -32,6 +32,10 @@
   <img src="https://paseo.sh/mobile-mockup.png" alt="Paseo mobile app" width="100%">
 </p>
 
+> [!NOTE]
+> I'm a solo maintainer and don't always keep up with GitHub Issues daily.
+> If something is urgent or blocking you, [Discord](https://discord.gg/jz8T2uahpH) is the fastest place to reach me.
+
 ---
 
 Run agents in parallel on your own machines. Ship from your phone or your desk.

docs/architecture.md

@@ -132,6 +132,12 @@ Electron wrapper for macOS, Linux, and Windows.
 - Native file access for workspace integration
 - Same WebSocket client as mobile app
 
+**Multi-window (hybrid land-on model).** `createWindow()` in `main.ts` is reusable: `⌘⇧N`/File→New Window, relaunching the app (`second-instance`), and the sidebar "Open in new window" action each open a fresh `BrowserWindow`. Every window shows the full sidebar — there is no per-window project ownership or filtering. "Land on a project" is delivered by a per-`webContents` `PendingOpenProjectStore`: each window pulls its own pending project path on mount (`paseo:get-pending-open-project`) and runs the normal open-project flow, identical to a CLI `paseo <path>` launch.
+
+> **Window-state v1 limitation:** only the _first_ window of a session restores and persists saved geometry (size/position/maximized). Windows opened via ⌘⇧N / second-instance / "Open in new window" open at the default size, OS-cascaded, and do not persist — this avoids every window stacking on the same restored bounds and fighting over the single window-state store. Lifting this needs per-window state keys.
+>
+> **In-app browser panes are not yet per-window.** The active-browser id (`features/browser-webviews.ts`) and the webview registration queue (`pendingBrowserWebviewIds` in `main.ts`) are process-global. With browser panes open in two windows, a menu Reload can target the other window's webview, and near-simultaneous webview attach across windows can register under the wrong browser id. Multi-window v1 ships windows; making the browser-webview subsystem window-scoped is a follow-up.
+
 ### `packages/website` — Marketing site
 
 TanStack Router + Cloudflare Workers. Serves paseo.sh.
@@ -232,7 +238,7 @@ initializing → idle ⇄ running
 
 Each provider implements the `AgentClient` interface in `agent/agent-sdk-types.ts`. Provider implementations live in `agent/providers/`.
 
-The built-in, user-facing providers are Claude Code, Codex, Copilot, OpenCode, and Pi. Additional adapters exist in the same directory for ACP-compatible agents and internal use:
+The built-in, user-facing providers are Claude Code, Codex, Copilot, OpenCode, Pi, and OMP. Additional adapters exist in the same directory for ACP-compatible agents and internal use:
 
 | Provider           | Wraps                                | Session format                                     |
 | ------------------ | ------------------------------------ | -------------------------------------------------- |

docs/custom-providers.md

@@ -35,7 +35,7 @@ Provider IDs must be lowercase alphanumeric with hyphens (`/^[a-z][a-z0-9-]*$/`)
 
 ## Extending a built-in provider
 
-Use `extends` to create a new provider entry that inherits from a built-in provider (claude, codex, copilot, opencode, pi). The new provider gets its own entry in the provider list, with its own label, environment, and model definitions.
+Use `extends` to create a new provider entry that inherits from a built-in provider (claude, codex, copilot, opencode, pi, omp). The new provider gets its own entry in the provider list, with its own label, environment, and model definitions.
 
 ```json
 {
@@ -347,6 +347,41 @@ Override the command used to launch any provider with the `command` field. This
 
 The `command` array completely replaces the default command for that provider. The binary must exist on the system — Paseo checks for its availability and will mark the provider as unavailable if not found.
 
+### Pi-compatible forks with their own session directory
+
+OMP already ships as a built-in provider option. It is disabled by default; enable it with:
+
+```json
+{
+  "agents": {
+    "providers": {
+      "omp": { "enabled": true }
+    }
+  }
+}
+```
+
+For other providers that keep Pi's `--mode rpc` API but write sessions somewhere else, extend `pi`, replace the command, and provide the JSONL session directory:
+
+```json
+{
+  "agents": {
+    "providers": {
+      "my-pi-fork": {
+        "extends": "pi",
+        "label": "My Pi Fork",
+        "command": ["my-pi-fork"],
+        "params": {
+          "sessionDir": "~/.my-pi-fork/sessions"
+        }
+      }
+    }
+  }
+}
+```
+
+The session directory is used only for importing sessions that were started outside Paseo. Launching and resuming still go through the configured command, so this example resumes with `my-pi-fork --mode rpc --session <session-file>`.
+
 ---
 
 ## Disabling a provider
@@ -364,7 +399,7 @@ Set `enabled: false` to hide a provider from the provider list. The provider wil
 }
 ```
 
-This works for both built-in and custom providers. To re-enable, set `enabled: true` or remove the `enabled` field entirely (providers are enabled by default).
+This works for both built-in and custom providers. To re-enable, set `enabled: true` or remove the `enabled` field entirely. Most providers are enabled by default; OMP is intentionally disabled by default and requires `enabled: true`.
 
 ---
 
@@ -374,7 +409,7 @@ The [Agent Client Protocol (ACP)](https://agentclientprotocol.com) is an open st
 
 ACP agents communicate over JSON-RPC 2.0 on stdio. Paseo spawns the agent process and talks to it through stdin/stdout.
 
-Paseo also ships an in-app ACP provider catalog for common agents, including Cursor, DeepAgents, DeepSeek TUI, DimCode, Gemini CLI, Hermes, Qwen Code, and Kimi Code. Catalog entries create the same `extends: "acp"` provider config shown below.
+Paseo also ships an in-app ACP provider catalog for common agents, including CodeWhale, Cursor, DeepAgents, DimCode, Gemini CLI, Hermes, Qwen Code, and Kimi Code. Catalog entries create the same `extends: "acp"` provider config shown below.
 
 ### Adding a generic ACP provider
 
@@ -403,6 +438,25 @@ Required fields for ACP providers:
 - `label`
 - `command` — the command to spawn the agent process (must support ACP over stdio)
 
+By default, Paseo injects its internal MCP server into ACP providers so agents can use Paseo tools such as subagent creation. Some ACP adapters cannot create sessions when `mcpServers` is non-empty. Disable injected MCP for those providers with `params.supportsMcpServers: false`:
+
+```json
+{
+  "agents": {
+    "providers": {
+      "my-agent": {
+        "extends": "acp",
+        "label": "My Agent",
+        "command": ["my-agent", "acp"],
+        "params": {
+          "supportsMcpServers": false
+        }
+      }
+    }
+  }
+}
+```
+
 ### Generic ACP diagnostics
 
 Paseo diagnostics for `extends: "acp"` providers report the configured command, resolved launcher binary, version output, ACP `initialize`, ACP `session/new`, model count, modes, and final status.
@@ -539,18 +593,19 @@ When an `additionalModels` entry has the same `id` as a discovered model, it upd
 
 Every entry under `agents.providers` accepts these fields:
 
-| Field              | Type                     | Required          | Description                                                        |
-| ------------------ | ------------------------ | ----------------- | ------------------------------------------------------------------ |
-| `extends`          | `string`                 | Yes (custom only) | Built-in provider ID to inherit from, or `"acp"`                   |
-| `label`            | `string`                 | Yes (custom only) | Display name in the UI                                             |
-| `description`      | `string`                 | No                | Short description shown in the UI                                  |
-| `command`          | `string[]`               | Yes (ACP only)    | Command to spawn the agent process                                 |
-| `env`              | `Record<string, string>` | No                | Environment variables to set for the agent process                 |
-| `models`           | `ProviderProfileModel[]` | No                | Static model list (overrides runtime discovery)                    |
-| `additionalModels` | `ProviderProfileModel[]` | No                | Static model additions (merged with runtime discovery or `models`) |
-| `disallowedTools`  | `string[]`               | No                | Tool names to disable for this provider (e.g. `["WebSearch"]`)     |
-| `enabled`          | `boolean`                | No                | Set to `false` to hide the provider (default: `true`)              |
-| `order`            | `number`                 | No                | Sort order in the provider list                                    |
+| Field              | Type                      | Required          | Description                                                        |
+| ------------------ | ------------------------- | ----------------- | ------------------------------------------------------------------ |
+| `extends`          | `string`                  | Yes (custom only) | Built-in provider ID to inherit from, or `"acp"`                   |
+| `label`            | `string`                  | Yes (custom only) | Display name in the UI                                             |
+| `description`      | `string`                  | No                | Short description shown in the UI                                  |
+| `command`          | `string[]`                | Yes (ACP only)    | Command to spawn the agent process                                 |
+| `env`              | `Record<string, string>`  | No                | Environment variables to set for the agent process                 |
+| `params`           | `Record<string, unknown>` | No                | Provider-specific options such as `supportsMcpServers: false`      |
+| `models`           | `ProviderProfileModel[]`  | No                | Static model list (overrides runtime discovery)                    |
+| `additionalModels` | `ProviderProfileModel[]`  | No                | Static model additions (merged with runtime discovery or `models`) |
+| `disallowedTools`  | `string[]`                | No                | Tool names to disable for this provider (e.g. `["WebSearch"]`)     |
+| `enabled`          | `boolean`                 | No                | Set to `false` to hide the provider (default: `true`)              |
+| `order`            | `number`                  | No                | Sort order in the provider list                                    |
 
 ### Model definition
 
@@ -577,7 +632,7 @@ Each entry in the `models` array:
 
 The built-in `claude` provider appends concrete model IDs from `~/.claude/settings.json` to its first-party Claude model list. Paseo reads the top-level `model` field and these `env` keys: `ANTHROPIC_MODEL`, `ANTHROPIC_SMALL_FAST_MODEL`, `ANTHROPIC_DEFAULT_OPUS_MODEL`, `ANTHROPIC_DEFAULT_SONNET_MODEL`, and `ANTHROPIC_DEFAULT_HAIKU_MODEL`.
 
-This lets users who already configured Claude Code for Bedrock, OpenRouter, ollama, Z.AI, or another Anthropic-compatible gateway select the exact model ID in Paseo. `agents.providers.claude.models` is still supported and is additive for the built-in Claude provider; duplicate IDs are de-duplicated.
+This lets users who already configured Claude Code for Bedrock, OpenRouter, ollama, Z.AI, or another Anthropic-compatible gateway select the exact model ID in Paseo. When `agents.providers.claude.models` is set it **replaces** both the hardcoded first-party Claude list and any settings.json-discovered entries; use `agents.providers.claude.additionalModels` to keep the first-party list and append curated entries on top.
 
 ### Gotcha: `extends: "claude"` with third-party endpoints
 
@@ -604,7 +659,7 @@ Use `disallowedTools` to disable unsupported tools:
 
 ### Valid `extends` values
 
-Built-in providers: `claude`, `codex`, `copilot`, `opencode`, `pi`
+Built-in providers: `claude`, `codex`, `copilot`, `opencode`, `pi`, `omp`
 
 Special value: `acp` — creates a generic ACP provider (requires `command`)
 

docs/development.md

@@ -8,18 +8,27 @@
 ## Running the dev server
 
 ```bash
-npm run dev
+npm run dev:server
+npm run dev:app
+npm run dev:desktop
 ```
 
-`scripts/dev.sh` runs the daemon and Expo together via `concurrently`, fronted by [`portless`](https://www.npmjs.com/package/portless) so each service is reachable at a stable name like `https://daemon.localhost` / `https://app.localhost` instead of a fixed port. The underlying TCP ports are ephemeral — never hardcode them. (Windows uses `scripts/dev.ps1`, which still binds the daemon to `localhost:6767` directly.)
+Root checkout dev is intentionally split across terminals:
+
+- `npm run dev:server` runs the daemon on `127.0.0.1:6768`.
+- `npm run dev:app` runs Expo on `http://localhost:8081` and connects to the dev daemon.
+- `npm run dev:desktop` runs its own Electron-flavored Expo server on the first free port from `8082` through `8089`. It never claims port `8081`.
+
+`npm run dev` is only a shorthand for `npm run dev:server`. Keep `127.0.0.1:6767` for the packaged app and production-style `~/.paseo` state.
 
 ### PASEO_HOME
 
-`PASEO_HOME` is the directory that holds runtime state (agents, sockets, daemon log). Resolution rules:
+`PASEO_HOME` is the directory that holds runtime state (agents, worktrees, workspace config, sockets, daemon log). Resolution rules:
 
 - The **server itself** (e.g. when launched by the desktop app or `npm run start`) defaults to `~/.paseo` (see `packages/server/src/server/paseo-home.ts`).
-- **`npm run dev` from a git worktree** derives a stable home like `~/.paseo-<worktree-name>` and, on first run, seeds it from `~/.paseo` by copying agent/project JSON metadata and `config.json`. Checkout/worktree directories are not copied.
-- **`npm run dev` from the main checkout** (not a worktree) uses a fresh `mktemp` directory under `$TMPDIR` and removes it on exit. Set `PASEO_HOME` explicitly to keep state across runs.
+- **Repo dev scripts** default to `$ROOT/.dev/paseo-home`, where `$ROOT` is the current checkout or worktree root. This keeps all dev state scoped to the checkout instead of the packaged desktop app.
+- **`npm run cli -- ...`** runs through the same dev-home wrapper as the dev scripts, so the in-repo CLI automatically targets the current checkout's `.dev/paseo-home` and configured dev daemon endpoint.
+- **Paseo-created worktrees** seed `$PASEO_WORKTREE_PATH/.dev/paseo-home` from `$PASEO_SOURCE_CHECKOUT_PATH/.dev/paseo-home` by copying durable JSON metadata. Runtime files like pid files, sockets, and logs are not copied.
 
 Override knobs:
 
@@ -32,16 +41,19 @@ PASEO_DEV_RESET_HOME=1 npm run dev            # clear and reseed the derived wor
 ### Daemon endpoints
 
 - Stable daemon launched by the desktop app: `localhost:6767`.
-- `npm run dev` (macOS/Linux): portless URLs only — read them from the `dev.sh` banner or `portless get daemon` / `portless get app`.
+- Root checkout dev daemon: `localhost:6768`.
+- Root checkout Expo: `http://localhost:8081`.
+- Root checkout desktop dev Expo: first free port from `8082` through `8089`.
 - `npm run dev` (Windows): `localhost:6767` for the daemon.
 
-In any worktree-style or portless setup, never assume default ports.
+In Paseo-managed worktree services, use the injected service environment rather than hardcoded root checkout ports.
 
 ### Desktop renderer profiling
 
 `npm run dev:desktop` starts Electron with Chromium remote debugging enabled on
 `http://127.0.0.1:9223` so renderer CPU profiles can be captured through CDP.
-Override the port with `PASEO_ELECTRON_REMOTE_DEBUGGING_PORT` when `9223` is busy.
+It launches its own Electron-flavored Expo server and passes that URL to Electron.
+Override the CDP port with `PASEO_ELECTRON_REMOTE_DEBUGGING_PORT` when `9223` is busy.
 
 ### React render profiling
 
@@ -185,7 +197,7 @@ Service proxy hostnames use the double-dash shape: `web--feature-auth--project.l
 
 Package imports resolve through package exports to compiled `dist/` output, not sibling `src/` files. This is true in local dev and in published packages: the app, daemon, CLI, and SDK consumers should all exercise the same runtime paths.
 
-`npm run dev`, `npm run dev:server`, and `npm run dev:app` build the workspace packages they need once, then keep `@getpaseo/protocol` and `@getpaseo/client` fresh with TypeScript watch builds while the daemon or Expo runs. If you change protocol schemas or client code outside those watch workflows, rebuild the producer before trusting runtime behavior.
+`npm run dev:server` builds the server-side workspace packages once, then keeps `@getpaseo/protocol` and `@getpaseo/client` fresh with TypeScript watch builds while the daemon runs. If you change protocol schemas or client code outside that watch workflow, rebuild the producer before trusting runtime behavior.
 
 Use the named root build targets instead of remembering workspace dependency chains:
 
@@ -223,7 +235,7 @@ install.
 
 ## CLI reference
 
-Use `npm run cli` to run the in-repo CLI from source (`npx tsx packages/cli/src/index.ts`). The globally installed `paseo` binary on macOS is a symlink into the installed Paseo desktop app, not this checkout — use it to drive the desktop's built-in daemon, but use `npm run cli` when you want to talk to the CLI you are editing.
+Use `npm run cli` to run the in-repo CLI from source (`npx tsx packages/cli/src/index.ts`). The script wraps the CLI with `scripts/dev-home.sh`, so it automatically uses this checkout's `.dev/paseo-home` and dev daemon endpoint unless you pass an explicit override. The globally installed `paseo` binary on macOS is a symlink into the installed Paseo desktop app, not this checkout — use it to drive the desktop's built-in daemon, but use `npm run cli` when you want to talk to the CLI you are editing.
 
 ```bash
 npm run cli -- ls -a -g              # List all agents globally
@@ -277,7 +289,7 @@ Get the session ID from the agent JSON (`persistence.sessionId`), then:
 
 ## Testing with Playwright MCP
 
-Point Playwright MCP at the running Expo web target. Under `npm run dev` (macOS/Linux) that is the portless URL printed in the dev banner — typically `https://app.localhost`. If you start Expo directly with `expo start --web` (no portless), Metro defaults to `http://localhost:8081`.
+Point Playwright MCP at the running Expo web target. For root checkout dev, `npm run dev:app` reserves `http://localhost:8081`. For Paseo-managed worktree app services, use the service URL or port shown by Paseo for that worktree.
 
 Do NOT use browser history (back/forward). Always navigate by clicking UI elements or using `browser_navigate` with the full URL — the app uses client-side routing and browser history breaks state.
 

docs/floating-panels.md

@@ -169,6 +169,11 @@ on that attach races Gorhom's dismiss path and leaves the modal unable to reopen
 Track an explicit phase (`closed` / `presenting` / `presented` / `dismissing`) and
 ignore ref churn while dismissing.
 
+Do not treat `onChange(-1)` as a close by itself. In a stacked
+`BottomSheetModal`, `-1` can also mean the sheet is temporarily hidden under
+another pushed sheet. Close React state from `onDismiss`; use `onChange` only to
+track phase.
+
 ## Recipe for a new anchored panel
 
 Before you write a new one, ask:

docs/glossary.md

@@ -15,7 +15,7 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Repository / Remote** — Internal git inputs (`remoteUrl`, `mainRepoRoot`) used to derive `projectKey`. No UI label.
 - **Session** — Per-client connection to a daemon. Internal. Code: `Session` (`packages/server/src/server/session.ts`). Don't confuse with: provider-side agent session log.
 - **Profile** — Internal name for the persisted shape of a host. Code: `HostProfile` (`packages/app/src/types/host-connection.ts:37`). Never user-facing.
-- **Provider** — Agent backend (Claude Code, Codex, Copilot, OpenCode, Pi). UI: "Provider". Code: `ProviderSnapshotEntry` (`packages/protocol/src/messages.ts:198`).
+- **Provider** — Agent backend (Claude Code, Codex, Copilot, OpenCode, Pi, OMP). UI: "Provider". Code: `ProviderSnapshotEntry` (`packages/protocol/src/messages.ts:198`).
 - **Model** — A specific LLM offered by a provider. UI: "Model" / "Select model". Code: `AgentModelDefinition` (`packages/protocol/src/messages.ts:187`).
 - **Terminal** — Workspace-scoped PTY shell streamed over the binary mux channel. UI: "Terminal". Code: `TerminalStreamFrame` (`packages/protocol/src/terminal-stream-protocol.ts`).
 - **Schedule** — Cron-style trigger that creates new agents. UI: CLI/MCP (`paseo schedule`, `create_schedule`). Don't confuse with: Heartbeat (cron prompt back into the same agent) or Loop (iterative re-execution of one agent).

docs/product.md

@@ -70,8 +70,8 @@ Anyone who builds software:
 ## Current state (May 2026)
 
 - Desktop (Electron), mobile (iOS/Android), web, CLI
-- Built-in providers: Claude Code (Agent SDK), Codex (app-server), GitHub Copilot (ACP), OpenCode, Pi
-- One-click ACP provider catalog: Cursor, DeepSeek TUI, Hermes, Qwen Coder, Kimi Code, and others — plus custom ACP providers
+- Built-in providers: Claude Code (Agent SDK), Codex (app-server), GitHub Copilot (ACP), OpenCode, Pi, OMP
+- One-click ACP provider catalog: CodeWhale, Cursor, Hermes, Qwen Coder, Kimi Code, and others — plus custom ACP providers
 - Voice mode: dictate prompts or talk through problems hands-free
 - MCP server exposes the daemon to other agents (create_agent, send_agent_prompt, schedules, terminals, worktrees)
 - Scheduled agents (cron-style triggers) via app, CLI, and MCP

docs/providers.md

@@ -14,7 +14,7 @@ The only built-in ACP provider today is `copilot` (`copilot-acp-agent.ts`). `Gen
 
 Implement the `AgentClient` and `AgentSession` interfaces from `agent-sdk-types.ts` yourself. This gives full control but requires you to handle process management, streaming, permissions, and session persistence from scratch.
 
-Existing direct providers: `claude` (in `providers/claude/agent.ts`), `codex` (`codex-app-server-agent.ts`), `opencode` (`opencode-agent.ts`), `pi` (`providers/pi/agent.ts`). The dev-only `mock` provider (`mock-load-test-agent.ts`) is also direct.
+Existing direct providers: `claude` (in `providers/claude/agent.ts`), `codex` (`codex-app-server-agent.ts`), `opencode` (`opencode-agent.ts`), `pi` (`providers/pi/agent.ts`), and `omp` (a Pi-compatible built-in backed by the Pi adapter). The dev-only `mock` provider (`mock-load-test-agent.ts`) is also direct.
 
 Pi is a process-backed provider. Paseo requires the user to have the `pi` binary installed and talks to it through `pi --mode rpc`; the server package does not embed Pi's SDK/runtime packages.
 
@@ -24,6 +24,8 @@ Pi MCP support depends on the open-source `pi-mcp-adapter` extension being loade
 
 Pi import discovery reads Pi's persisted JSONL session files because Pi RPC does not expose a recent-session listing command. Resume and full history hydration still go through `pi --mode rpc` using the session file as `nativeHandle`.
 
+OMP is a built-in Pi-compatible provider, disabled by default. It uses the `omp` command and imports terminal-started sessions from `~/.omp/agent/sessions` when enabled. Other Pi-compatible forks can still be custom providers that extend `pi`, override `command`, and set `params.sessionDir` to their JSONL session directory.
+
 Pi RPC extension UI dialog requests (`select`, `input`, `editor`, `confirm`) are bridged into Paseo question permissions and answered with `extension_ui_response`. Pi extensions such as `ask_user` may chain dialogs: for example, a `select` can be followed by an optional-comment `input`. When an `ask_user` tool call declares `allowComment: true`, Paseo presents the selection and optional comment as one question permission, answers Pi's initial `select` immediately, then auto-answers the follow-up optional `input` with the comment the user already supplied (or an empty string). Preserve placeholders and optional/skip semantics for standalone optional inputs so the app can still distinguish "skip this optional input" from "cancel the whole dialog." Fire-and-forget extension UI requests such as notifications are intentionally ignored by the provider adapter unless Paseo grows first-class UI for them.
 
 OpenCode MCP injection is dynamic and session-scoped. Call OpenCode's `mcp.add` endpoint with the MCP server config and do not follow it with `mcp.connect`; `connect` only toggles MCP servers already present in OpenCode's own config. New OpenCode versions return `McpServerNotFoundError`/404 for `connect` after a dynamic add because the server is not config-backed, while older versions silently swallowed the same missing-config path.
@@ -34,6 +36,8 @@ Every provider adapter owns its canonical user-message timeline rows. When a for
 
 Draft metadata lookups should avoid creating provider sessions when the upstream provider has top-level APIs for that metadata. Prefer `AgentClient.listModels`, `listModes`, `listCommands`, or `listFeatures` over creating a scratch `AgentSession`; scratch sessions can show up as empty native sessions in provider import/history UIs.
 
+Provider session import has its own contract. The picker calls `listImportableSessions` and receives rows only: provider handle, cwd, title, prompt previews, and last activity. Import calls `importSession({ providerHandleId, cwd })` for the selected row and must not call listing again. The provider returns the resumed session, storage config, persistence handle, and hydrated timeline for that one native session; `AgentManager.importProviderSession` seeds the daemon timeline and publishes the Paseo agent only after it is ready.
+
 ---
 
 ## Provider Snapshot Refresh Contract
@@ -262,7 +266,7 @@ case "my-provider":
   );
 ```
 
-Add to the `allProviders` array (current built-ins are `claude`, `codex`, `copilot`, `opencode`, `pi`):
+Add to the `allProviders` array (current built-ins are `claude`, `codex`, `copilot`, `opencode`, `pi`, `omp`):
 
 ```ts
 export const allProviders: AgentProvider[] = [
@@ -313,7 +317,13 @@ interface AgentClient {
   isAvailable(): Promise<boolean>;
   // Optional:
   listModes?(options: ListModesOptions): Promise<AgentMode[]>;
-  listPersistedAgents?(options?: ListPersistedAgentsOptions): Promise<PersistedAgentDescriptor[]>;
+  listImportableSessions?(
+    options?: ListImportableSessionsOptions,
+  ): Promise<ImportableProviderSession[]>;
+  importSession?(
+    input: ImportProviderSessionInput,
+    context: ImportProviderSessionContext,
+  ): Promise<ImportedProviderSession>;
   getDiagnostic?(): Promise<{ diagnostic: string }>;
 }
 ```

docs/release.md

@@ -89,7 +89,7 @@ Use the beta path when you need to:
 
 ## Staged rollout (stable channel)
 
-Stable desktop releases go out via a linear time-based rollout: 0% admitted when the updater manifests appear, 100% admitted 36 hours later, linear ramp in between. Beta releases bypass the rollout entirely — beta users always receive updates immediately.
+Stable desktop releases go out via a linear time-based rollout for automatic update checks: 0% admitted when the updater manifests appear, 100% admitted 36 hours later, linear ramp in between. Manual checks bypass the rollout so a user can install immediately when they click **Check**. Beta releases bypass the rollout entirely — beta users always receive updates immediately.
 
 The rollout is driven by a `rolloutHours` field stamped into the GitHub Release manifests (`latest-mac.yml`, `latest-linux.yml`, `latest.yml`) by the `finalize-rollout` job in `desktop-release.yml`.
 
@@ -173,7 +173,7 @@ If N+1 is a hotfix for a bug in N, dispatch `desktop-rollout.yml -f tag=v0.1.<N+
 - **No pause / kill switch.** Once a stable user is admitted, they will install the update on next quit (`autoInstallOnAppQuit = true`). To stop new admissions, ship a superseding release. To "recall" already-admitted users, ship a hotfix `+1` patch.
 - **No rollback.** `allowDowngrade = false`. Bad release = ship a hotfix.
 - **Bootstrap caveat.** Clients running a build older than the rollout feature ignore `rolloutHours` and admit immediately. Rollout protection only applies to clients running the rollout-aware version or later.
-- **Up to ~30 min admission latency.** Renderer polls every 30 minutes, so a stable user may take up to that long to be evaluated against the rollout window.
+- **Up to ~30 min automatic admission latency.** Renderer polls every 30 minutes, so a stable user may take up to that long to be evaluated against the rollout window. Clicking **Check** is manual and bypasses rollout admission.
 
 ## Mobile builds (EAS)
 

nix/npm-deps.hash

@@ -1 +1 @@
-sha256-MEG/ywKGhzW6D2iw9KIodi6wKpClWYxy++Mba+79Kt8=
+sha256-1kkx6pimIhhqk/zSaUWknTL9NC1PZA271zmhktH4Sq4=

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.1.90",
+  "version": "0.1.92",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.1.90",
+      "version": "0.1.92",
       "hasInstallScript": true,
       "license": "AGPL-3.0-or-later",
       "workspaces": [
@@ -36953,7 +36953,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.1.90",
+      "version": "0.1.92",
       "dependencies": {
         "@dnd-kit/core": "^6.3.1",
         "@dnd-kit/sortable": "^10.0.0",
@@ -37178,12 +37178,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.1.90",
+      "version": "0.1.92",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.1.90",
-        "@getpaseo/protocol": "0.1.90",
-        "@getpaseo/server": "0.1.90",
+        "@getpaseo/client": "0.1.92",
+        "@getpaseo/protocol": "0.1.92",
+        "@getpaseo/server": "0.1.92",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -37429,10 +37429,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.1.90",
+      "version": "0.1.92",
       "dependencies": {
-        "@getpaseo/protocol": "0.1.90",
-        "@getpaseo/relay": "0.1.90",
+        "@getpaseo/protocol": "0.1.92",
+        "@getpaseo/relay": "0.1.92",
         "zod": "^3.23.8"
       },
       "devDependencies": {
@@ -37452,7 +37452,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.1.90",
+      "version": "0.1.92",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -37704,7 +37704,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.1.90",
+      "version": "0.1.92",
       "license": "MIT",
       "devDependencies": {
         "@types/react": "^18.0.25",
@@ -37740,7 +37740,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.1.90",
+      "version": "0.1.92",
       "dependencies": {
         "@codemirror/language": "^6.12.3",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -37971,7 +37971,7 @@
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.1.90",
+      "version": "0.1.92",
       "dependencies": {
         "zod": "^3.23.8"
       },
@@ -37992,7 +37992,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.1.90",
+      "version": "0.1.92",
       "dependencies": {
         "base64-js": "^1.5.1",
         "tweetnacl": "^1.0.3",
@@ -38210,14 +38210,14 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.1.90",
+      "version": "0.1.92",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "^0.2.133",
-        "@getpaseo/client": "0.1.90",
-        "@getpaseo/highlight": "0.1.90",
-        "@getpaseo/protocol": "0.1.90",
-        "@getpaseo/relay": "0.1.90",
+        "@getpaseo/client": "0.1.92",
+        "@getpaseo/highlight": "0.1.92",
+        "@getpaseo/protocol": "0.1.92",
+        "@getpaseo/relay": "0.1.92",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "^1.20.1",
         "@opencode-ai/sdk": "1.14.46",
@@ -38989,7 +38989,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.1.90",
+      "version": "0.1.92",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.1.90",
+  "version": "0.1.92",
   "private": true,
   "description": "Paseo: voice-controlled development environment with OpenAI Realtime API",
   "keywords": [
@@ -34,12 +34,12 @@
     "packages/cli"
   ],
   "scripts": {
-    "dev": "./scripts/dev.sh",
+    "dev": "npm run dev:server",
     "dev:win": "powershell ./scripts/dev.ps1",
-    "dev:server": "npm run build:server-deps && npm run dev:server:watch",
+    "dev:server": "cross-env PASEO_LISTEN=127.0.0.1:6768 ./scripts/dev-daemon.sh",
     "dev:server:watch": "concurrently --kill-others --names protocol,client,server --prefix-colors yellow,blue,cyan \"npm run watch:protocol\" \"npm run watch:client\" \"npm run dev:server:raw\"",
     "dev:server:raw": "npm run dev --workspace=@getpaseo/server",
-    "dev:app": "npm run start --workspace=@getpaseo/app",
+    "dev:app": "cross-env PASEO_LISTEN=127.0.0.1:6768 EXPO_PORT=8081 ./scripts/dev-app.sh",
     "dev:website": "npm run dev --workspace=@getpaseo/website",
     "postinstall": "node scripts/postinstall-patches.mjs",
     "prepare": "lefthook install --force",
@@ -82,11 +82,11 @@
     "android:clean": "npm run android:clean --workspace=@getpaseo/app",
     "ios": "npm run ios --workspace=@getpaseo/app",
     "web": "npm run web --workspace=@getpaseo/app",
-    "dev:desktop": "npm run dev --workspace=@getpaseo/desktop",
+    "dev:desktop": "cross-env PASEO_LISTEN=127.0.0.1:6768 npm run dev --workspace=@getpaseo/desktop",
     "dev:win:desktop": "npm run dev:win --workspace=@getpaseo/desktop",
     "build:desktop": "npm run build:app-deps:clean && cd packages/app && cross-env PASEO_WEB_PLATFORM=electron npx expo export --platform web && cd ../.. && npm run build --workspace=@getpaseo/desktop --",
     "db:query": "npm run db:query --workspace=@getpaseo/server --",
-    "cli": "npx tsx packages/cli/src/index.js",
+    "cli": "./scripts/dev-home.sh npx tsx packages/cli/src/index.js",
     "version": "npm run version:sync-internal && npm run release:prepare && git add -A",
     "version:sync-internal": "node scripts/sync-workspace-versions.mjs",
     "release:prepare": "npm install --workspaces --include-workspace-root",

packages/app/Gemfile

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

packages/app/e2e/acp-provider-catalog.spec.ts

@@ -4,7 +4,7 @@ import { getServerId } from "./helpers/server-id";
 import {
   expectProviderInstalledInSettings,
   installAcpCatalogProvider,
-  openAddProviderModal,
+  openAddProviderArea,
   openSettingsHost,
   openSettingsHostSection,
 } from "./helpers/settings";
@@ -21,7 +21,7 @@ test.describe("ACP provider catalog", () => {
     await openSettingsHost(page, getServerId());
     // Providers moved to their own host section; add-provider lives there now.
     await openSettingsHostSection(page, getServerId(), "providers");
-    await openAddProviderModal(page);
+    await openAddProviderArea(page);
 
     await installAcpCatalogProvider(page, ACP_PROVIDER.name);
     await expectProviderInstalledInSettings(page, ACP_PROVIDER.name);

packages/app/e2e/global-setup.ts

@@ -1,4 +1,5 @@
-import { spawn, type ChildProcess, execFileSync, execSync } from "node:child_process";
+import { randomUUID } from "node:crypto";
+import { spawn, type ChildProcess, execSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { chmod, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
@@ -6,6 +7,8 @@ import path from "node:path";
 import net from "node:net";
 import { Buffer } from "node:buffer";
 import dotenv from "dotenv";
+import { loadDaemonClientConstructor } from "./helpers/daemon-client-loader";
+import { createNodeWebSocketFactory, type NodeWebSocketFactory } from "./helpers/node-ws-factory";
 import { forkPaseoHomeMetadata, resolvePaseoHomePath } from "./helpers/paseo-home-fork";
 
 interface WaitForServerOptions {
@@ -188,7 +191,7 @@ async function isOpenAiApiKeyUsable(apiKey: string | undefined): Promise<boolean
 let daemonProcess: ChildProcess | null = null;
 let metroProcess: ChildProcess | null = null;
 let paseoHome: string | null = null;
-let fakeToolBinDir: string | null = null;
+let fakeEditorBinDir: string | null = null;
 let relayProcess: ChildProcess | null = null;
 
 function resolveOptionalPaseoHomeEnv(value: string | undefined): string | null {
@@ -209,81 +212,24 @@ interface OfferPayload {
   relay: { endpoint: string };
 }
 
-async function createFakeToolBin(): Promise<string> {
-  const binDir = await mkdtemp(path.join(tmpdir(), "paseo-e2e-tool-bin-"));
-  const ghPath = path.join(binDir, "gh");
-  await writeFile(
-    ghPath,
-    `#!/usr/bin/env node
-const { spawnSync } = require("child_process");
-const fs = require("fs");
-const path = require("path");
-const args = process.argv.slice(2);
-
-function findRealGh() {
-  const fakeBinDir = __dirname;
-  for (const dir of (process.env.PATH || "").split(path.delimiter)) {
-    if (dir === fakeBinDir) continue;
-    const candidate = path.join(dir, "gh");
-    try { fs.accessSync(candidate, fs.constants.X_OK); return candidate; } catch {}
-  }
-  return null;
+interface DaemonClientConfig {
+  url: string;
+  clientId: string;
+  clientType: "cli";
+  webSocketFactory: NodeWebSocketFactory;
 }
 
-function forwardToRealGh() {
-  const realGh = findRealGh();
-  if (!realGh) { console.error("[fake-gh] real gh not found in PATH"); process.exit(1); }
-  const result = spawnSync(realGh, process.argv.slice(2), { stdio: "inherit", env: process.env });
-  process.exit(result.status ?? 1);
+interface PairingDaemonClient {
+  connect(): Promise<void>;
+  close(): Promise<void>;
+  getDaemonPairingOffer(): Promise<{
+    relayEnabled: boolean;
+    url: string;
+  }>;
 }
 
-if (args[0] === "auth" && args[1] === "status") {
-  process.exit(0);
-}
-
-if (args[0] === "pr" && args[1] === "list") {
-  console.log(JSON.stringify([
-    {
-      number: 515,
-      title: "Review selected start ref",
-      url: "https://github.com/getpaseo/paseo/pull/515",
-      state: "OPEN",
-      body: "Fixture pull request for app e2e.",
-      labels: [],
-      baseRefName: "main",
-      headRefName: "feature/start-from-pr"
-    }
-  ]));
-  process.exit(0);
-}
-
-if (args[0] === "pr" && args[1] === "view" && args[2] === "--json" && args[3]) {
-  const fixture = path.join(process.cwd(), ".paseo-e2e-pr.json");
-  if (fs.existsSync(fixture)) {
-    console.log(fs.readFileSync(fixture, "utf8"));
-    process.exit(0);
-  }
-  forwardToRealGh();
-}
-
-if (args[0] === "api" && args[1] === "graphql") {
-  const fixture = path.join(process.cwd(), ".paseo-e2e-timeline.json");
-  if (fs.existsSync(fixture)) {
-    console.log(fs.readFileSync(fixture, "utf8"));
-    process.exit(0);
-  }
-  forwardToRealGh();
-}
-
-if (args[0] === "issue" && args[1] === "list") {
-  console.log("[]");
-  process.exit(0);
-}
-
-forwardToRealGh();
-`,
-  );
-  await chmod(ghPath, 0o755);
+async function createFakeEditorBin(): Promise<string> {
+  const binDir = await mkdtemp(path.join(tmpdir(), "paseo-e2e-editor-bin-"));
 
   const fakeEditorSource = `#!/usr/bin/env node
 const fs = require("fs");
@@ -343,29 +289,29 @@ function decodeOfferFromFragmentUrl(url: string): OfferPayload {
   return offer as OfferPayload;
 }
 
-function loadPairingOfferFromCli(repoRoot: string, paseoHomePath: string): OfferPayload {
-  const stdout = execFileSync(
-    process.execPath,
-    ["--import", "tsx", "packages/cli/src/index.ts", "daemon", "pair", "--json"],
-    {
-      cwd: repoRoot,
-      env: {
-        ...process.env,
-        PASEO_HOME: paseoHomePath,
-      },
-      encoding: "utf8",
-    },
-  );
-  const payload = JSON.parse(stdout) as { relayEnabled?: boolean; url?: string | null };
-  if (payload.relayEnabled !== true || typeof payload.url !== "string") {
-    throw new Error(`Unexpected daemon pair response: ${stdout}`);
+async function loadPairingOfferFromDaemon(port: number): Promise<OfferPayload> {
+  const DaemonClient = await loadDaemonClientConstructor<DaemonClientConfig, PairingDaemonClient>();
+  const client = new DaemonClient({
+    url: `ws://127.0.0.1:${port}/ws`,
+    clientId: `playwright-global-setup-${randomUUID()}`,
+    clientType: "cli",
+    webSocketFactory: createNodeWebSocketFactory(),
+  });
+
+  await client.connect();
+  try {
+    const pairing = await client.getDaemonPairingOffer();
+    if (!pairing.relayEnabled || !pairing.url) {
+      throw new Error("Daemon returned a disabled pairing offer");
+    }
+    return decodeOfferFromFragmentUrl(pairing.url);
+  } finally {
+    await client.close().catch(() => {});
   }
-  return decodeOfferFromFragmentUrl(payload.url);
 }
 
-async function waitForPairingOfferFromCli(args: {
-  repoRoot: string;
-  paseoHome: string;
+async function waitForPairingOfferFromDaemon(args: {
+  port: number;
   timeoutMs?: number;
 }): Promise<OfferPayload> {
   const timeoutMs = args.timeoutMs ?? 15000;
@@ -374,7 +320,7 @@ async function waitForPairingOfferFromCli(args: {
 
   while (Date.now() - start < timeoutMs) {
     try {
-      return loadPairingOfferFromCli(args.repoRoot, args.paseoHome);
+      return await loadPairingOfferFromDaemon(args.port);
     } catch (error) {
       lastError = error;
       await sleep(100);
@@ -382,7 +328,7 @@ async function waitForPairingOfferFromCli(args: {
   }
 
   throw new Error(
-    `Timed out waiting for \`paseo daemon pair --json\` to produce a pairing offer: ${
+    `Timed out waiting for daemon pairing offer: ${
       lastError instanceof Error ? lastError.message : String(lastError)
     }`,
   );
@@ -629,7 +575,7 @@ interface DaemonSpawnArgs {
   relayPort: number;
   metroPort: number;
   paseoHome: string;
-  fakeToolBinDir: string;
+  fakeEditorBinDir: string;
   editorRecordPath: string;
   dictation: DictationConfig;
   buffer: ReturnType<typeof createLineBuffer>;
@@ -644,7 +590,7 @@ function startDaemon(args: DaemonSpawnArgs): ChildProcess {
     cwd: serverDir,
     env: {
       ...process.env,
-      PATH: `${args.fakeToolBinDir}${path.delimiter}${process.env.PATH ?? ""}`,
+      PATH: `${args.fakeEditorBinDir}${path.delimiter}${process.env.PATH ?? ""}`,
       PASEO_HOME: args.paseoHome,
       PASEO_E2E_EDITOR_RECORD_PATH: args.editorRecordPath,
       PASEO_SERVER_ID: "srv_e2e_test_daemon",
@@ -710,9 +656,9 @@ async function performCleanup(shouldRemovePaseoHome: boolean): Promise<void> {
   } else if (paseoHome) {
     console.log(`[e2e] Preserving PASEO_HOME: ${paseoHome}`);
   }
-  if (fakeToolBinDir) {
-    await rm(fakeToolBinDir, { recursive: true, force: true });
-    fakeToolBinDir = null;
+  if (fakeEditorBinDir) {
+    await rm(fakeEditorBinDir, { recursive: true, force: true });
+    fakeEditorBinDir = null;
   }
 }
 
@@ -727,7 +673,7 @@ export default async function globalSetup() {
   const shouldRemovePaseoHome = !requestedPaseoHome && process.env.E2E_KEEP_PASEO_HOME !== "1";
   paseoHome = requestedPaseoHome ?? (await mkdtemp(path.join(tmpdir(), "paseo-e2e-home-")));
   const editorRecordPath = path.join(paseoHome, "editor-open-records.jsonl");
-  fakeToolBinDir = await createFakeToolBin();
+  fakeEditorBinDir = await createFakeEditorBin();
   const metroLineBuffer = createLineBuffer();
   const daemonLineBuffer = createLineBuffer();
 
@@ -745,7 +691,7 @@ export default async function globalSetup() {
       relayPort,
       metroPort,
       paseoHome,
-      fakeToolBinDir,
+      fakeEditorBinDir,
       editorRecordPath,
       dictation,
       buffer: daemonLineBuffer,
@@ -765,9 +711,8 @@ export default async function globalSetup() {
       }),
     ]);
 
-    const offer = await waitForPairingOfferFromCli({
-      repoRoot,
-      paseoHome,
+    const offer = await waitForPairingOfferFromDaemon({
+      port,
     });
 
     process.env.E2E_DAEMON_PORT = String(port);

packages/app/e2e/helpers/desktop-updates.ts

@@ -124,7 +124,7 @@ export async function injectDesktopBridge(page: Page, config: DesktopBridgeConfi
       return {
         serverId: cfg.serverId,
         status: daemonRunning ? "running" : "stopped",
-        listen: null,
+        listen: "127.0.0.1:6767",
         hostname: null,
         pid: currentPid,
         home: "",

packages/app/e2e/helpers/seed-client.ts

@@ -43,6 +43,18 @@ export interface SeedDaemonClient {
   fetchAgents(options?: { scope?: "active" }): Promise<{
     entries: Array<{ agent: { id: string; cwd: string; title?: string | null } }>;
   }>;
+  fetchRecentProviderSessions(options: {
+    cwd: string;
+    providers: string[];
+    limit: number;
+  }): Promise<{
+    entries: Array<{
+      providerId: string;
+      providerHandleId: string;
+      cwd: string;
+      firstPromptPreview?: string | null;
+    }>;
+  }>;
   updateAgent(agentId: string, updates: { name?: string }): Promise<void>;
   waitForAgentUpsert(
     agentId: string,

packages/app/e2e/helpers/settings.ts

@@ -180,6 +180,18 @@ export async function goBackInSettings(page: Page): Promise<void> {
   await page.getByRole("button", { name: "Back", exact: true }).click();
 }
 
+export async function closeCompactSettings(page: Page): Promise<void> {
+  await goBackInSettings(page);
+  await expect(page).not.toHaveURL(/\/settings(\/|$)/);
+}
+
+export async function removeCurrentHostFromSettings(page: Page): Promise<void> {
+  await page.getByTestId("host-page-remove-host-button").click();
+  await expect(page.getByTestId("remove-host-confirm-modal")).toBeVisible();
+  await page.getByTestId("remove-host-confirm").click();
+  await expect(page).toHaveURL(/\/settings$/);
+}
+
 export async function expectSettingsBackButton(page: Page): Promise<void> {
   await expect(page.getByRole("button", { name: "Back", exact: true })).toBeVisible();
 }
@@ -319,8 +331,8 @@ export async function serveJson(page: Page, url: string, body: unknown): Promise
   });
 }
 
-export async function openAddProviderModal(page: Page): Promise<void> {
-  await page.getByRole("button", { name: "Add provider", exact: true }).click();
+export async function openAddProviderArea(page: Page): Promise<void> {
+  await page.getByTestId("host-page-add-provider-card").scrollIntoViewIfNeeded();
   await expect(page.getByRole("textbox", { name: "Search providers" })).toBeVisible();
 }
 
@@ -332,7 +344,6 @@ export async function findAcpCatalogProvider(page: Page, providerName: string):
 export async function installAcpCatalogProvider(page: Page, providerName: string): Promise<void> {
   await findAcpCatalogProvider(page, providerName);
   await page.getByRole("button", { name: "Add", exact: true }).click();
-  await expect(page.getByRole("textbox", { name: "Search providers" })).toHaveCount(0);
 }
 
 export async function expectProviderInstalledInSettings(

packages/app/e2e/import-session.opencode.real.spec.ts

@@ -0,0 +1,230 @@
+import { randomUUID } from "node:crypto";
+import path from "node:path";
+import { spawn } from "node:child_process";
+import { buildHostWorkspaceRoute } from "@/utils/host-routes";
+import { expect, test, type Page } from "./fixtures";
+import { connectSeedClient, type SeededWorkspace } from "./helpers/seed-client";
+import { getServerId } from "./helpers/server-id";
+import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
+
+const OPENCODE_REAL_MODEL = "openrouter/google/gemini-2.5-flash-lite";
+const OPENCODE_SEED_TIMEOUT_MS = 45_000;
+const PASEO_REPO_PATH = path.resolve(__dirname, "../../..");
+
+interface OpenCodeSeedResult {
+  stdout: string;
+  stderr: string;
+  code: number | null;
+  signal: NodeJS.Signals | null;
+  timedOut: boolean;
+}
+
+interface ImportableOpenCodeSession {
+  providerHandleId: string;
+}
+
+interface OpenCodeImportScenario {
+  workspace: SeededWorkspace;
+  prompt: string;
+  promptPreview: string;
+  response: string;
+}
+
+let workspace: SeededWorkspace | null = null;
+
+test.setTimeout(150_000);
+
+test.afterEach(async () => {
+  await workspace?.cleanup().catch(() => undefined);
+  workspace = null;
+});
+
+test("imports a real OpenCode session from the workspace import sheet", async ({ page }) => {
+  const scenario = await seedPaseoWorkspaceWithOpenCodeSession();
+  workspace = scenario.workspace;
+  const importableSession = await waitForImportableOpenCodeSession(scenario);
+  await openWorkspace(page, scenario.workspace);
+
+  await importOpenCodeSession(page, importableSession);
+
+  await expectImportSheetClosed(page);
+  await expectImportedSessionOpen(page, scenario);
+});
+
+async function seedPaseoWorkspaceWithOpenCodeSession(): Promise<OpenCodeImportScenario> {
+  const response = `PASEO_OPENCODE_IMPORT_E2E_OK_${randomUUID().slice(0, 8)}`;
+  const prompt = `Do not use tools. Reply with exactly: ${response}`;
+  const promptPreview = JSON.stringify(prompt);
+  await launchOpenCodeSessionInWorkspace(PASEO_REPO_PATH, prompt);
+  const client = await connectSeedClient();
+  try {
+    const opened = await client.openProject(PASEO_REPO_PATH);
+    if (!opened.workspace) {
+      throw new Error(opened.error ?? `Failed to open project ${PASEO_REPO_PATH}`);
+    }
+    return {
+      prompt,
+      promptPreview,
+      response,
+      workspace: {
+        client,
+        repoPath: PASEO_REPO_PATH,
+        workspaceId: opened.workspace.id,
+        workspaceName: opened.workspace.name,
+        workspaceDirectory: opened.workspace.workspaceDirectory,
+        projectId: opened.workspace.projectId,
+        projectDisplayName: opened.workspace.projectDisplayName,
+        cleanup: async () => {
+          await client.close().catch(() => undefined);
+        },
+      },
+    };
+  } catch (error) {
+    await client.close().catch(() => undefined);
+    throw error;
+  }
+}
+
+async function launchOpenCodeSessionInWorkspace(repoPath: string, prompt: string): Promise<void> {
+  const result = await runOpenCodeSeed(repoPath, prompt);
+  if (result.code !== 0 || result.timedOut) {
+    throw new Error(formatOpenCodeLaunchError(result, prompt));
+  }
+}
+
+function openCodeSeedArgs(repoPath: string, prompt: string): string[] {
+  return [
+    "run",
+    "--print-logs",
+    "--log-level",
+    "INFO",
+    "--dir",
+    repoPath,
+    "--model",
+    OPENCODE_REAL_MODEL,
+    "--format",
+    "json",
+    prompt,
+  ];
+}
+
+function runOpenCodeSeed(repoPath: string, prompt: string): Promise<OpenCodeSeedResult> {
+  return new Promise((resolve, reject) => {
+    const child = spawn("opencode", openCodeSeedArgs(repoPath, prompt), {
+      cwd: repoPath,
+      env: process.env,
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+    let stdout = "";
+    let stderr = "";
+    let timedOut = false;
+    const timeout = setTimeout(() => {
+      timedOut = true;
+      child.kill("SIGTERM");
+    }, OPENCODE_SEED_TIMEOUT_MS);
+
+    child.stdout.on("data", (chunk) => {
+      stdout += String(chunk);
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += String(chunk);
+    });
+    child.on("error", (error) => {
+      clearTimeout(timeout);
+      reject(error);
+    });
+    child.on("close", (code, signal) => {
+      clearTimeout(timeout);
+      resolve({ stdout, stderr, code, signal, timedOut });
+    });
+  });
+}
+
+function formatOpenCodeLaunchError(result: OpenCodeSeedResult, prompt: string): string {
+  return [
+    "OpenCode launch failed",
+    `command: ${["opencode", ...openCodeSeedArgs(PASEO_REPO_PATH, prompt)].join(" ")}`,
+    `exit: ${result.code ?? "null"}`,
+    result.signal ? `signal: ${result.signal}` : null,
+    result.timedOut ? `timed out after ${OPENCODE_SEED_TIMEOUT_MS}ms` : null,
+    result.stdout.trim() ? `stdout:\n${result.stdout.trim()}` : null,
+    result.stderr.trim() ? `stderr:\n${result.stderr.trim()}` : null,
+  ]
+    .filter((part): part is string => part !== null)
+    .join("\n\n");
+}
+
+async function openWorkspace(page: Page, seed: SeededWorkspace): Promise<void> {
+  await page.setViewportSize({ width: 1440, height: 900 });
+  await page.goto(buildHostWorkspaceRoute(getServerId(), seed.workspaceId));
+  await waitForWorkspaceTabsVisible(page);
+}
+
+async function waitForImportableOpenCodeSession(
+  scenario: OpenCodeImportScenario,
+): Promise<ImportableOpenCodeSession> {
+  let importableSession: ImportableOpenCodeSession | null = null;
+  await expect
+    .poll(
+      async () => {
+        importableSession = await findImportableOpenCodeSession(scenario);
+        return importableSession?.providerHandleId ?? "";
+      },
+      {
+        timeout: 15_000,
+        intervals: [500, 1_000],
+      },
+    )
+    .not.toBe("");
+  return importableSession!;
+}
+
+async function findImportableOpenCodeSession(
+  scenario: OpenCodeImportScenario,
+): Promise<ImportableOpenCodeSession | null> {
+  const sessions = await scenario.workspace.client.fetchRecentProviderSessions({
+    cwd: scenario.workspace.repoPath,
+    providers: ["opencode"],
+    limit: 5,
+  });
+  const entry = sessions.entries.find(
+    (session) =>
+      session.providerId === "opencode" && session.firstPromptPreview === scenario.promptPreview,
+  );
+  if (!entry) {
+    return null;
+  }
+  return { providerHandleId: entry.providerHandleId };
+}
+
+async function importOpenCodeSession(
+  page: Page,
+  session: ImportableOpenCodeSession,
+): Promise<void> {
+  await page.getByRole("button", { name: "Workspace actions" }).click();
+  await page.getByTestId("workspace-header-import-agent").click();
+  await expect(page.getByTestId("import-session-sheet")).toBeVisible({ timeout: 15_000 });
+
+  const importSheet = page.getByTestId("import-session-sheet");
+  const sessionRow = importSheet.getByTestId(
+    `import-session-session-opencode-${session.providerHandleId}`,
+  );
+  await expect(sessionRow).toBeVisible({ timeout: 60_000 });
+  await sessionRow.click();
+}
+
+async function expectImportSheetClosed(page: Page): Promise<void> {
+  await expect(page.getByTestId("import-session-sheet")).toHaveCount(0, { timeout: 15_000 });
+}
+
+async function expectImportedSessionOpen(
+  page: Page,
+  scenario: OpenCodeImportScenario,
+): Promise<void> {
+  await expect(
+    page.locator('[data-testid="user-message"]', { hasText: scenario.promptPreview }),
+  ).toBeVisible({ timeout: 30_000 });
+  await expect(
+    page.locator('[data-testid="assistant-message"]', { hasText: scenario.response }),
+  ).toBeVisible({ timeout: 30_000 });
+}

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

@@ -28,6 +28,7 @@ import {
   submitNewWorkspacePrompt,
 } from "./helpers/new-workspace";
 import { createTempGitRepo, readWorktreeBranchInfo } from "./helpers/workspace";
+import { createTempGithubRepo, hasGithubAuth } from "./helpers/github-fixtures";
 import { getServerId } from "./helpers/server-id";
 import {
   expectSidebarWorkspaceSelected,
@@ -707,10 +708,16 @@ test.describe("New workspace flow", () => {
   });
 
   test("selected GitHub PR shows PR context in the trigger and composer", async ({ page }) => {
-    const tempRepo = await createTempGitRepo("new-workspace-pr-ref-");
+    test.skip(!hasGithubAuth(), "Requires GitHub authentication (gh auth login)");
+
+    const ghRepo = await createTempGithubRepo({
+      category: "new-workspace-pr-ref",
+      prs: [{ title: "Review selected start ref", state: "open" }],
+    });
+    const pr = ghRepo.prs[0]!;
 
     try {
-      const openedProject = await openProjectViaDaemon(client, tempRepo.path);
+      const openedProject = await openProjectViaDaemon(client, pr.localPath);
       localWorkspaceIds.add(openedProject.workspaceId);
 
       await gotoAppShell(page);
@@ -720,19 +727,19 @@ test.describe("New workspace flow", () => {
         projectDisplayName: openedProject.projectDisplayName,
       });
       await openStartingRefPicker(page);
-      await selectGitHubPrInPicker(page, 515);
+      await selectGitHubPrInPicker(page, pr.number);
 
       await expectStartingRefPickerTriggerPr(page, {
-        number: 515,
-        title: "Review selected start ref",
-        headRef: "feature/start-from-pr",
+        number: pr.number,
+        title: pr.title,
+        headRef: pr.branch,
       });
       await expectComposerGithubAttachmentPill(page, {
-        number: 515,
-        title: "Review selected start ref",
+        number: pr.number,
+        title: pr.title,
       });
     } finally {
-      await tempRepo.cleanup();
+      await ghRepo.cleanup();
     }
   });
 });

packages/app/e2e/provider-settings-refresh.spec.ts

@@ -0,0 +1,109 @@
+import { expect, test, type Page } from "./fixtures";
+import { expectComposerVisible } from "./helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+
+const MOBILE_VIEWPORT = { width: 390, height: 844 };
+
+async function openMockAgentAtMobileBreakpoint(page: Page) {
+  await page.setViewportSize(MOBILE_VIEWPORT);
+  const session = await seedMockAgentWorkspace({
+    repoPrefix: "provider-sheet-stack-",
+    title: "Provider sheet stack e2e",
+    initialPrompt: "Prepare provider sheet stack test agent.",
+  });
+  await openAgentRoute(page, session);
+  await expectComposerVisible(page);
+  await expect(page.getByRole("button", { name: /Select model/ })).toBeVisible({
+    timeout: 30_000,
+  });
+  return session;
+}
+
+async function openProviderSettingsFromModelSelector(page: Page) {
+  await page.getByRole("button", { name: /Select model/ }).click();
+  await expect(page.getByLabel("Bottom Sheet", { exact: true })).toBeVisible({ timeout: 10_000 });
+
+  const openCodeRow = page.getByText("OpenCode", { exact: true }).first();
+  if (await openCodeRow.isVisible().catch(() => false)) {
+    await openCodeRow.click();
+  }
+
+  await page.getByRole("button", { name: /Open .* settings/ }).click();
+  await expect(page.getByTestId("provider-settings-sheet")).toBeVisible({ timeout: 10_000 });
+}
+
+async function expectModelSelectorVisible(page: Page) {
+  await expect(page.getByRole("button", { name: /Open .* settings/ })).toBeVisible({
+    timeout: 10_000,
+  });
+}
+
+async function closeTopSheet(page: Page) {
+  const closeTarget = page.getByLabel("Close", { exact: true }).last();
+  if (await closeTarget.isVisible().catch(() => false)) {
+    await closeTarget.click({ force: true });
+    return;
+  }
+
+  const handle = page.getByRole("slider", { name: "Bottom sheet handle" }).last();
+  const handleBox = await handle.boundingBox();
+  if (!handleBox) {
+    throw new Error("Bottom sheet handle was not measurable");
+  }
+  const startX = handleBox.x + handleBox.width / 2;
+  const startY = handleBox.y + handleBox.height / 2;
+  await page.mouse.move(startX, startY);
+  await page.mouse.down();
+  await page.mouse.move(startX, startY + 400, { steps: 8 });
+  await page.mouse.up();
+}
+
+async function expectProviderSettingsVisible(page: Page) {
+  await expect(page.getByTestId("provider-settings-sheet")).toBeVisible({ timeout: 10_000 });
+  await expect(page.getByRole("button", { name: "Add model" })).toBeVisible();
+  await expect(page.getByRole("button", { name: "Diagnostic", exact: true })).toBeVisible();
+}
+
+async function exerciseProviderSettingsStack(page: Page) {
+  await expectProviderSettingsVisible(page);
+
+  await page.getByRole("button", { name: "Add model" }).click();
+  await expect(page.getByTestId("add-custom-model-sheet")).toBeVisible({ timeout: 10_000 });
+  await closeTopSheet(page);
+  await expectProviderSettingsVisible(page);
+
+  await page.getByRole("button", { name: "Diagnostic", exact: true }).click();
+  await expect(page.getByTestId("provider-diagnostic-sheet")).toBeVisible({ timeout: 10_000 });
+  await page.getByRole("button", { name: /Refresh diagnostic/ }).click();
+  await expect(page.getByTestId("provider-diagnostic-sheet")).toBeVisible({ timeout: 10_000 });
+  await closeTopSheet(page);
+  await expectProviderSettingsVisible(page);
+
+  await page.getByRole("button", { name: "Refresh", exact: true }).click();
+  await expectProviderSettingsVisible(page);
+}
+
+test.describe("provider settings bottom-sheet stack", () => {
+  test("provider settings and children close back through the model selector stack", async ({
+    page,
+  }) => {
+    const session = await openMockAgentAtMobileBreakpoint(page);
+
+    try {
+      await openProviderSettingsFromModelSelector(page);
+      await exerciseProviderSettingsStack(page);
+      await closeTopSheet(page);
+
+      await expectModelSelectorVisible(page);
+      await page.getByRole("button", { name: /Open .* settings/ }).click();
+      await expect(page.getByTestId("provider-settings-sheet")).toBeVisible({ timeout: 10_000 });
+      await exerciseProviderSettingsStack(page);
+      await closeTopSheet(page);
+
+      await expectModelSelectorVisible(page);
+      await closeTopSheet(page);
+    } finally {
+      await session.cleanup();
+    }
+  });
+});

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

@@ -1,7 +1,9 @@
 import { test, expect } from "./fixtures";
+import { buildHostWorkspaceRoute } from "@/utils/host-routes";
 import { gotoAppShell, openSettings } from "./helpers/app";
 import { getE2EDaemonPort } from "./helpers/daemon-port";
 import {
+  closeCompactSettings,
   openSettingsSection,
   expectSettingsHeader,
   openAddHostFlow,
@@ -31,9 +33,18 @@ import {
   selectSettingsHost,
   expectSettingsHostPickerLabel,
   openSettingsHostSection,
+  removeCurrentHostFromSettings,
 } from "./helpers/settings";
 import { getServerId } from "./helpers/server-id";
 
+async function openWorkspace(
+  page: import("@playwright/test").Page,
+  workspace: { workspaceId: string },
+) {
+  await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.workspaceId));
+  await expect(page.getByTestId("menu-button")).toBeVisible();
+}
+
 test.describe("Settings sidebar navigation", () => {
   test("clicking a sidebar section updates the URL and renders the section", async ({ page }) => {
     await gotoAppShell(page);
@@ -187,4 +198,20 @@ test.describe("Settings — compact master-detail", () => {
 
     await openSettingsHostSection(page, secondaryServerId, "connections");
   });
+
+  test("removing the last active host returns to welcome after settings closes", async ({
+    page,
+    withWorkspace,
+  }) => {
+    const workspace = await withWorkspace({ prefix: "remove-host-compact-" });
+
+    await openWorkspace(page, workspace);
+    await openCompactSettings(page);
+    await openSettingsHostSection(page, getServerId(), "host");
+    await removeCurrentHostFromSettings(page);
+    await closeCompactSettings(page);
+
+    await expect(page).toHaveURL(/\/welcome$/);
+    await expect(page.getByTestId("welcome-direct-connection")).toBeVisible();
+  });
 });

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.1.90",
+  "version": "0.1.92",
   "private": true,
   "main": "index.ts",
   "scripts": {
@@ -22,7 +22,7 @@
     "test": "vitest run",
     "test:browser": "vitest run --project browser",
     "test:e2e": "playwright test --project='Desktop Chrome'",
-    "test:e2e:real": "playwright test --project=real-provider",
+    "test:e2e:real": "cross-env E2E_FORK_PASEO_HOME_FROM=../../.dev/paseo-home playwright test --project=real-provider",
     "test:e2e:ui": "playwright test --ui",
     "build": "npm run build:web",
     "build:web": "npm --prefix ../.. run build:app-deps && expo export --platform web",

packages/app/playwright.config.ts

@@ -22,7 +22,7 @@ export default defineConfig({
     baseURL,
     trace: "retain-on-failure",
     screenshot: "only-on-failure",
-    video: "retain-on-failure",
+    video: process.env.E2E_RECORD_VIDEO === "1" ? "on" : "retain-on-failure",
   },
   projects: [
     {

packages/app/src/agent-stream/bottom-anchor-controller.test.ts

@@ -560,6 +560,95 @@ describe("bottom anchor controller driver", () => {
 
     expect(harness.driver.getSnapshot().mode).toBe("detached");
   });
+
+  it("keeps initial native content growth anchored before layout scroll events arrive", () => {
+    const harness = createDriverHarness({
+      transportBehavior: {
+        verificationDelayFrames: 2,
+        verificationRetryMode: "recheck",
+      },
+      measurementState: createMeasurementState({
+        containerKey: "native-virtualized",
+        viewportWidth: 0,
+        viewportHeight: 0,
+        contentHeight: 0,
+        offsetY: 0,
+        viewportMeasuredForKey: null,
+        contentMeasuredForKey: null,
+      }),
+    });
+    harness.scrollToBottom.mockImplementation(() => {
+      harness.context.measurementState.offsetY = 0;
+    });
+
+    harness.context.measurementState.contentHeight = 1348;
+    harness.context.measurementState.contentMeasuredForKey = "native-virtualized";
+    harness.driver.handleContentSizeChange({
+      previousContentHeight: 0,
+      contentHeight: 1348,
+    });
+
+    expect(harness.scrollToBottom).toHaveBeenCalledTimes(1);
+    expect(harness.driver.getSnapshot()).toMatchObject({
+      mode: "sticky-bottom",
+      pendingVerification: {
+        requestId: null,
+      },
+    });
+
+    harness.context.measurementState.viewportWidth = 390;
+    harness.context.measurementState.viewportHeight = 546;
+    harness.context.measurementState.viewportMeasuredForKey = "native-virtualized";
+    harness.context.measurementState.offsetY = 50;
+    harness.context.nearBottom = false;
+    harness.driver.handleScrollNearBottomChange({
+      nextIsNearBottom: false,
+      scrollDelta: 50,
+    });
+
+    expect(harness.driver.getSnapshot().mode).toBe("sticky-bottom");
+  });
+
+  it("keeps native sticky content changes anchored when measured height is unchanged", () => {
+    const harness = createDriverHarness({
+      transportBehavior: {
+        verificationDelayFrames: 2,
+        verificationRetryMode: "recheck",
+      },
+      measurementState: createMeasurementState({
+        containerKey: "native-virtualized",
+        viewportWidth: 390,
+        viewportHeight: 546,
+        contentHeight: 546,
+        offsetY: 0,
+        viewportMeasuredForKey: "native-virtualized",
+        contentMeasuredForKey: "native-virtualized",
+      }),
+    });
+    harness.scrollToBottom.mockImplementation(() => {
+      harness.context.measurementState.offsetY = 0;
+      harness.context.nearBottom = true;
+    });
+
+    harness.driver.prepareForStickyContentChange();
+
+    expect(harness.scrollToBottom).toHaveBeenCalledTimes(1);
+    expect(harness.driver.getSnapshot()).toMatchObject({
+      mode: "sticky-bottom",
+      pendingVerification: {
+        requestId: null,
+      },
+    });
+
+    harness.context.measurementState.offsetY = 50;
+    harness.context.nearBottom = false;
+    harness.driver.handleScrollNearBottomChange({
+      nextIsNearBottom: false,
+      scrollDelta: 50,
+    });
+
+    expect(harness.driver.getSnapshot().mode).toBe("sticky-bottom");
+  });
 });
 
 describe("controller helper predicates", () => {

packages/app/src/agent-stream/bottom-anchor-controller.ts

@@ -244,29 +244,6 @@ function createBottomAnchorControllerDriver(
   let stickyMeasurementRevision = 0;
   let lastVerifiedStickyMeasurementRevision = 0;
 
-  const _getLogContext = (extra?: Record<string, unknown>) => {
-    const measurementState = input.getMeasurementState();
-    const distanceFromBottom = Math.max(
-      0,
-      measurementState.contentHeight - (measurementState.offsetY + measurementState.viewportHeight),
-    );
-    return {
-      agentId: input.getAgentId(),
-      requestReason: pendingRequest?.reason ?? null,
-      authoritativeHistoryReady: input.getIsAuthoritativeHistoryReady(),
-      contentHeight: measurementState.contentHeight,
-      viewportHeight: measurementState.viewportHeight,
-      offset: measurementState.offsetY,
-      distanceFromBottom,
-      renderStrategy: input.getRenderStrategy(),
-      blockedReason,
-      mode,
-      containerKey: measurementState.containerKey,
-      transportBehavior: input.getTransportBehavior(),
-      ...extra,
-    };
-  };
-
   const setBlockedReason = (nextBlockedReason: BottomAnchorBlockedReason | null) => {
     if (blockedReason === nextBlockedReason) {
       return;
@@ -327,7 +304,6 @@ function createBottomAnchorControllerDriver(
     });
 
   const scheduleVerification = (attemptContext: AttemptContext, delayFramesOverride?: number) => {
-    const _scheduledMeasurementState = input.getMeasurementState();
     if (verificationHandle) {
       input.cancelFrame(verificationHandle);
     }
@@ -560,6 +536,12 @@ function createBottomAnchorControllerDriver(
       });
       if (shouldRestick && !pendingRequest) {
         pendingVerification = { requestId: null, retries: 0 };
+        if (attemptHandle) {
+          input.cancelFrame(attemptHandle);
+          attemptHandle = null;
+        }
+        runAttempt(false);
+        return;
       }
       if (shouldRestick || pendingRequest) {
         evaluate(false, "content_size_change");
@@ -576,6 +558,16 @@ function createBottomAnchorControllerDriver(
         return;
       }
       markStickyMeasurementChanged();
+      if (!pendingRequest) {
+        pendingVerification = { requestId: null, retries: 0 };
+        if (attemptHandle) {
+          input.cancelFrame(attemptHandle);
+          attemptHandle = null;
+        }
+        runAttempt(false);
+        return;
+      }
+      evaluate(false, "content_size_change");
     },
     handleScrollNearBottomChange(params) {
       const { nextIsNearBottom, scrollDelta } = params;
@@ -656,11 +648,7 @@ export const __private__ = {
     previousContentHeight: number;
     contentHeight: number;
   }): boolean {
-    return (
-      input.mode === "sticky-bottom" &&
-      input.previousContentHeight > 0 &&
-      input.contentHeight > input.previousContentHeight
-    );
+    return input.mode === "sticky-bottom" && input.contentHeight > input.previousContentHeight;
   },
   shouldDetachFromScrollAway(input: {
     mode: BottomAnchorMode;

packages/app/src/app/_layout.tsx

@@ -1,4 +1,5 @@
 import "@/styles/unistyles";
+import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
 import { PortalProvider } from "@gorhom/portal";
 import { QueryClientProvider } from "@tanstack/react-query";
 import * as Linking from "expo-linking";
@@ -83,7 +84,6 @@ import { resolveActiveHost } from "@/utils/active-host";
 import { toggleDesktopSidebarsWithCheckoutIntent } from "@/utils/desktop-sidebar-toggle";
 import {
   buildHostRootRoute,
-  mapPathnameToServer,
   parseHostAgentRouteFromPathname,
   parseServerIdFromPathname,
   parseWorkspaceOpenIntent,
@@ -810,7 +810,6 @@ function OpenProjectListener() {
 }
 
 function AppWithSidebar({ children }: { children: ReactNode }) {
-  const router = useRouter();
   const pathname = usePathname();
   const params = useGlobalSearchParams<{ open?: string | string[] }>();
   const hosts = useHosts();
@@ -819,16 +818,6 @@ function AppWithSidebar({ children }: { children: ReactNode }) {
   const shouldShowAppChrome =
     storeReady && activeServerId !== null && hosts.some((host) => host.serverId === activeServerId);
 
-  useEffect(() => {
-    if (!activeServerId || hosts.length === 0) {
-      return;
-    }
-    if (hosts.some((host) => host.serverId === activeServerId)) {
-      return;
-    }
-    router.replace(mapPathnameToServer(pathname, hosts[0].serverId));
-  }, [activeServerId, hosts, pathname, router]);
-
   // Parse selectedAgentKey directly from pathname
   // useLocalSearchParams doesn't update when navigating between same-pattern routes
   const selectedAgentKey = useMemo(() => {
@@ -931,17 +920,20 @@ function RuntimeProviders({ children }: { children: ReactNode }) {
   );
 }
 
-// PortalProvider must remain the innermost global provider here.
+// 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.
-// Adding a new global provider? Put it above PortalProvider.
+// 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 (
     <QueryProvider>
       <SafeAreaProvider>
         <KeyboardProvider>
-          <PortalProvider>{children}</PortalProvider>
+          <PortalProvider>
+            <BottomSheetModalProvider>{children}</BottomSheetModalProvider>
+          </PortalProvider>
         </KeyboardProvider>
       </SafeAreaProvider>
     </QueryProvider>

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

@@ -0,0 +1,25 @@
+import { Redirect, Slot, useLocalSearchParams } from "expo-router";
+import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
+import { useHosts } from "@/runtime/host-runtime";
+import { resolveKnownHostRoute } from "@/utils/host-routes";
+
+export default function HostRouteLayout() {
+  return (
+    <HostRouteBootstrapBoundary>
+      <KnownHostRoute />
+    </HostRouteBootstrapBoundary>
+  );
+}
+
+function KnownHostRoute() {
+  const params = useLocalSearchParams<{ serverId?: string | string[] }>();
+  const hosts = useHosts();
+  const routeServerId = typeof params.serverId === "string" ? params.serverId : null;
+  const resolution = resolveKnownHostRoute({ routeServerId, hosts });
+
+  if (resolution.kind === "redirect") {
+    return <Redirect href={resolution.href} />;
+  }
+
+  return <Slot />;
+}

packages/app/src/assets/acp-provider-icons.ts

@@ -27,7 +27,7 @@ export const ACP_PROVIDER_ICON_SVGS = {
     '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 466.73 532.09">\n  <path fill="currentColor" d="M457.43,125.94L244.42,2.96c-6.84-3.95-15.28-3.95-22.12,0L9.3,125.94c-5.75,3.32-9.3,9.46-9.3,16.11v247.99c0,6.65,3.55,12.79,9.3,16.11l213.01,122.98c6.84,3.95,15.28,3.95,22.12,0l213.01-122.98c5.75-3.32,9.3-9.46,9.3-16.11v-247.99c0-6.65-3.55-12.79-9.3-16.11h-.01ZM444.05,151.99l-205.63,356.16c-1.39,2.4-5.06,1.42-5.06-1.36v-233.21c0-4.66-2.49-8.97-6.53-11.31L24.87,145.67c-2.4-1.39-1.42-5.06,1.36-5.06h411.26c5.84,0,9.49,6.33,6.57,11.39h-.01Z"/>\n</svg>\n',
   deepagents:
     '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 128 128">\n  <path fill="currentColor" d="M40.1024 85.0722C47.6207 77.5537 51.8469 67.3453 51.8469 56.7136C51.8469 46.0818 47.617 35.8734 40.1024 28.355L11.7446 0C4.22995 7.5185 0 17.7269 0 28.3586C0 38.9903 4.22995 49.1987 11.7446 56.7172L40.0987 85.0722H40.1024Z"/>\n  <path fill="currentColor" d="M99.4385 87.698C91.9239 80.1832 81.7121 75.9531 71.0844 75.9531C60.4566 75.9531 50.2448 80.1832 42.7266 87.698L71.0844 116.057C78.599 123.571 88.8107 127.802 99.4421 127.802C110.074 127.802 120.282 123.571 127.8 116.057L99.4421 87.698H99.4385Z"/>\n  <path fill="currentColor" d="M11.8146 115.987C19.3329 123.502 29.541 127.732 40.1724 127.732V87.6289H0.0664062C0.0700559 98.2606 4.29635 108.469 11.8146 115.987Z"/>\n  <path fill="currentColor" d="M110.387 45.7684C102.869 38.2535 92.6608 34.0198 82.0258 34.0234C71.3943 34.0234 61.1863 38.2535 53.668 45.772L82.0258 74.1306L110.387 45.7684Z"/>\n</svg>\n',
-  "deepseek-tui":
+  codewhale:
     '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 32 32">\n  <rect width="32" height="32" fill="currentColor" opacity="0.18"/>\n  <text x="50%" y="55%" text-anchor="middle" dominant-baseline="middle" font-family="\'Noto Serif SC\', serif" font-weight="700" font-size="20" fill="currentColor">深</text>\n  <rect x="0" y="29" width="32" height="3" fill="currentColor"/>\n</svg>\n',
   dimcode:
     '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M3.12109 11.0078H1.99902V5.49316H3.12109V11.0078ZM3.7041 5.49316C4.91979 5.49316 5.31142 5.57449 5.80762 5.7373C6.50208 5.97365 6.85299 6.40958 6.86133 7.04492V9.45605C6.86125 10.207 6.37767 10.6797 5.41016 10.874C4.95546 10.9633 4.69632 11.0078 3.7041 11.0078V10.6064C4.72131 10.6064 4.95994 10.5507 5.34863 10.4404C5.91072 10.2671 6.19576 9.93907 6.2041 9.45605V7.04492C6.20402 6.4883 5.83211 6.13886 5.08789 5.99707C4.74057 5.93405 4.58897 5.89978 3.7041 5.89453V5.49316ZM9.16797 5.49316V11.0078H8.0459V5.49316H9.16797ZM14 6.79297V11.0078H12.8779V8.0791L13.8877 6.79297H14ZM14 5.49316V5.7373L11.3594 8.97852H10.7852L9.74219 6.94531V6.07812H9.86719L11.0723 8.33203L13.4258 5.49316H14Z" fill="currentColor"/>\n</svg>\n',

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

@@ -3,6 +3,7 @@ export {
   AssistantMarkdownCodeLink,
   AssistantMarkdownLink,
 } from "./link";
+export { type AssistantLinkPress, useAssistantLinkPress } from "./link-press-context";
 export {
   classifyAssistantFileLink,
   normalizeInlinePathTarget,

packages/app/src/assistant-file-links/link-press-context.ts

@@ -0,0 +1,24 @@
+import { createContext, useContext } from "react";
+import type { TextProps } from "react-native";
+
+// Carries a link's press handler down to the leaf text spans that render its
+// label. On iOS an assistant link is a nested UITextView span, and
+// react-native-uitextview only attaches onPress to the *string* children it
+// converts into RNUITextViewChild nodes (src/Text.tsx) — element children (the
+// MarkdownInheritedText spans markdown produces for link text) pass through
+// untouched, so an onPress placed on the wrapping span never reaches a tappable
+// native node. Threading the handler through context lets each leaf span hand
+// onPress to its own string children, where the native tap recognizer can find
+// it. Provided only on iOS (Android/web links tap fine via their own paths).
+export interface AssistantLinkPress {
+  onPress: () => void;
+  accessibilityRole?: TextProps["accessibilityRole"];
+}
+
+const AssistantLinkPressContext = createContext<AssistantLinkPress | null>(null);
+
+export const AssistantLinkPressProvider = AssistantLinkPressContext.Provider;
+
+export function useAssistantLinkPress(): AssistantLinkPress | null {
+  return useContext(AssistantLinkPressContext);
+}

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

@@ -1,5 +1,6 @@
 import { useMemo, useState, type CSSProperties, type MouseEvent, type ReactNode } from "react";
 import {
+  Platform,
   Pressable,
   Text,
   View,
@@ -10,6 +11,7 @@ import {
 import { StyleSheet } from "react-native-unistyles";
 import { isNative, isWeb } from "@/constants/platform";
 import { MarkdownTextSpan } from "@/components/markdown-text";
+import { AssistantLinkPressProvider, type AssistantLinkPress } from "./link-press-context";
 import { Shortcut } from "@/components/ui/shortcut";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useStableEvent } from "@/hooks/use-stable-event";
@@ -56,23 +58,42 @@ export function AssistantMarkdownLink({
     () => [style, hovered && { textDecorationLine: "underline" as const }],
     [style, hovered],
   );
+  const linkPress = useMemo<AssistantLinkPress>(
+    () => ({ onPress, accessibilityRole: "link" }),
+    [onPress],
+  );
 
   if (isNative) {
     // Must be a MarkdownTextSpan, not a plain <Text>: on iOS the link renders
     // inside the paragraph's native UITextView, and a plain <Text> nested there
     // is not hoisted into a UITextViewChild, so its text is silently dropped
-    // (the link disappears). The span composes correctly and stays selectable;
-    // onPress is forwarded (reliable tap-to-open on iOS is tracked by #21).
+    // (the link disappears). The span composes correctly and stays selectable.
+    //
+    // Tap-to-open: react-native-uitextview only wires onPress onto the *string*
+    // children it turns into RNUITextViewChild nodes — the element children that
+    // markdown emits for link text pass through untouched, so an onPress placed
+    // here never reaches a tappable native node. We thread it down through
+    // AssistantLinkPressProvider so each leaf text span re-attaches it to its
+    // own string children, where the native tap recognizer can find it. iOS
+    // only: Android forwards onPress through nested <Text> already, and web uses
+    // the <a> path below.
+    const span = (
+      <MarkdownTextSpan
+        accessibilityRole="link"
+        monoSurface={monoSurface}
+        onPress={onPress}
+        style={style}
+      >
+        {children}
+      </MarkdownTextSpan>
+    );
     return (
       <FileLinkHoverTooltip filePath={tooltipPath}>
-        <MarkdownTextSpan
-          accessibilityRole="link"
-          monoSurface={monoSurface}
-          onPress={onPress}
-          style={style}
-        >
-          {children}
-        </MarkdownTextSpan>
+        {Platform.OS === "ios" ? (
+          <AssistantLinkPressProvider value={linkPress}>{span}</AssistantLinkPressProvider>
+        ) : (
+          span
+        )}
       </FileLinkHoverTooltip>
     );
   }

packages/app/src/browser/new-tab-requests/index.test.ts

@@ -0,0 +1,54 @@
+import { describe, expect, it } from "vitest";
+import type { WorkspaceLayout } from "@/stores/workspace-layout-store";
+import { createDefaultLayout } from "@/stores/workspace-layout-store";
+import { openTabInLayoutFocused } from "@/stores/workspace-layout-actions";
+import { resolveBrowserNewTabRequest, type BrowserNewTabRequest } from ".";
+
+function createLayoutWithBrowser(browserId: string): WorkspaceLayout {
+  return openTabInLayoutFocused({
+    layout: createDefaultLayout(),
+    target: { kind: "browser", browserId },
+    now: 1,
+  }).layout;
+}
+
+describe("browser new-tab requests", () => {
+  it("accepts desktop requests from browser tabs in the current workspace", () => {
+    const request = resolveBrowserNewTabRequest({
+      payload: {
+        sourceBrowserId: "browser-1",
+        url: "https://example.com/target",
+      },
+      workspaceLayout: createLayoutWithBrowser("browser-1"),
+    });
+
+    expect(request).toEqual<BrowserNewTabRequest>({
+      sourceBrowserId: "browser-1",
+      url: "https://example.com/target",
+    });
+  });
+
+  it("ignores desktop requests from another workspace", () => {
+    const request = resolveBrowserNewTabRequest({
+      payload: {
+        sourceBrowserId: "browser-from-other-workspace",
+        url: "https://example.com/target",
+      },
+      workspaceLayout: createLayoutWithBrowser("browser-1"),
+    });
+
+    expect(request).toBeNull();
+  });
+
+  it("rejects unsupported desktop request URLs", () => {
+    const request = resolveBrowserNewTabRequest({
+      payload: {
+        sourceBrowserId: "browser-1",
+        url: "file:///etc/passwd",
+      },
+      workspaceLayout: createLayoutWithBrowser("browser-1"),
+    });
+
+    expect(request).toBeNull();
+  });
+});

packages/app/src/browser/new-tab-requests/index.ts

@@ -0,0 +1,99 @@
+import { useEffect } from "react";
+import { getDesktopHost, type DesktopBrowserNewTabRequestEvent } from "@/desktop/host";
+import { collectAllTabs, type WorkspaceLayout } from "@/stores/workspace-layout-store";
+import { getIsElectron } from "@/constants/platform";
+import { useStableEvent } from "@/hooks/use-stable-event";
+
+export type BrowserNewTabRequest = DesktopBrowserNewTabRequestEvent;
+
+function isAllowedBrowserNewTabUrl(value: string): boolean {
+  try {
+    const parsed = new URL(value);
+    return (
+      parsed.protocol === "http:" || parsed.protocol === "https:" || parsed.href === "about:blank"
+    );
+  } catch {
+    return false;
+  }
+}
+
+function readDesktopBrowserNewTabRequest(payload: unknown): BrowserNewTabRequest | null {
+  if (!payload || typeof payload !== "object") {
+    return null;
+  }
+  const candidate = payload as Partial<BrowserNewTabRequest>;
+  if (typeof candidate.sourceBrowserId !== "string" || !candidate.sourceBrowserId.trim()) {
+    return null;
+  }
+  if (typeof candidate.url !== "string" || !isAllowedBrowserNewTabUrl(candidate.url)) {
+    return null;
+  }
+  return {
+    sourceBrowserId: candidate.sourceBrowserId,
+    url: candidate.url,
+  };
+}
+
+function workspaceContainsBrowser(input: {
+  workspaceLayout: WorkspaceLayout | null | undefined;
+  browserId: string;
+}): boolean {
+  if (!input.workspaceLayout) {
+    return false;
+  }
+  return collectAllTabs(input.workspaceLayout.root).some((tab) => {
+    return tab.target.kind === "browser" && tab.target.browserId === input.browserId;
+  });
+}
+
+export function resolveBrowserNewTabRequest(input: {
+  payload: unknown;
+  workspaceLayout: WorkspaceLayout | null | undefined;
+}): BrowserNewTabRequest | null {
+  const request = readDesktopBrowserNewTabRequest(input.payload);
+  if (!request) {
+    return null;
+  }
+  if (
+    !workspaceContainsBrowser({
+      workspaceLayout: input.workspaceLayout,
+      browserId: request.sourceBrowserId,
+    })
+  ) {
+    return null;
+  }
+  return request;
+}
+
+export function useDesktopBrowserNewTabRequests(input: {
+  enabled: boolean;
+  workspaceLayout: WorkspaceLayout | null | undefined;
+  openUrl: (url: string) => void;
+}): void {
+  const handleNewTabRequest = useStableEvent((payload: unknown) => {
+    const request = resolveBrowserNewTabRequest({
+      payload,
+      workspaceLayout: input.workspaceLayout,
+    });
+    if (!request) {
+      return;
+    }
+    input.openUrl(request.url);
+  });
+
+  useEffect(() => {
+    if (!input.enabled || !getIsElectron()) {
+      return;
+    }
+    const unsubscribe = getDesktopHost()?.events?.on?.(
+      "browser-new-tab-request",
+      handleNewTabRequest,
+    );
+    if (typeof unsubscribe === "function") {
+      return unsubscribe;
+    }
+    return () => {
+      void unsubscribe?.then((dispose) => dispose());
+    };
+  }, [handleNewTabRequest, input.enabled]);
+}

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

@@ -12,6 +12,7 @@ import {
   BottomSheetTextInput,
   type BottomSheetBackgroundProps,
 } from "@gorhom/bottom-sheet";
+import Animated from "react-native-reanimated";
 import { ArrowLeft, Search, X } from "lucide-react-native";
 import { FileDropZone } from "@/components/file-drop-zone";
 import type { ImageAttachment } from "@/composer/types";
@@ -232,14 +233,14 @@ function SheetBackground({ style }: BottomSheetBackgroundProps) {
     () => [
       style,
       {
-        backgroundColor: theme.colors.surface1,
-        borderTopLeftRadius: theme.borderRadius.xl,
-        borderTopRightRadius: theme.borderRadius.xl,
+        backgroundColor: theme.colors.surface0,
+        borderTopLeftRadius: theme.borderRadius["2xl"],
+        borderTopRightRadius: theme.borderRadius["2xl"],
       },
     ],
-    [style, theme.colors.surface1, theme.borderRadius.xl],
+    [style, theme.colors.surface0, theme.borderRadius],
   );
-  return <View style={combinedStyle} />;
+  return <Animated.View pointerEvents="none" style={combinedStyle} />;
 }
 
 export type AdaptiveTextInputProps = TextInputProps & {
@@ -444,6 +445,7 @@ export interface AdaptiveModalSheetProps {
   /** When provided, wraps the card content in a FileDropZone. */
   onFilesDropped?: (files: ImageAttachment[]) => void;
   scrollable?: boolean;
+  presentation?: "push" | "replace";
 }
 
 export function AdaptiveModalSheet({
@@ -457,6 +459,7 @@ export function AdaptiveModalSheet({
   desktopMaxWidth,
   onFilesDropped,
   scrollable = true,
+  presentation,
 }: AdaptiveModalSheetProps) {
   const { theme } = useUnistyles();
   const isMobile = useIsCompactFormFactor();
@@ -501,8 +504,8 @@ export function AdaptiveModalSheet({
     [compactSafeAreaPadding.footerPaddingBottom],
   );
   const handleIndicatorStyle = useMemo(
-    () => ({ backgroundColor: theme.colors.surface2 }),
-    [theme.colors.surface2],
+    () => ({ backgroundColor: theme.colors.palette.zinc[600] }),
+    [theme.colors.palette.zinc],
   );
   const { sheetRef, handleSheetChange, handleSheetDismiss } = useIsolatedBottomSheetVisibility({
     visible,
@@ -543,6 +546,7 @@ export function AdaptiveModalSheet({
         keyboardBehavior="extend"
         keyboardBlurBehavior="restore"
         accessible={false}
+        presentation={presentation}
       >
         <SheetHeaderView header={header} onClose={onClose} testID={testID} />
         {scrollable ? (

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

@@ -63,8 +63,6 @@ import {
   type ProviderSelectorProvider,
 } from "@/provider-selection/provider-selection";
 
-// TODO: this should be configured per provider in the provider manifest
-const PROVIDERS_WITH_MODEL_DESCRIPTIONS = new Set(["opencode", "pi"]);
 const DESKTOP_PROVIDER_VIEW_MIN_HEIGHT = 220;
 const DESKTOP_PROVIDER_VIEW_MAX_HEIGHT = 400;
 const DESKTOP_PROVIDER_VIEW_BASE_HEIGHT = 80;
@@ -198,12 +196,10 @@ function ModelRow({
     ],
   );
 
-  const showDescription = row.description && PROVIDERS_WITH_MODEL_DESCRIPTIONS.has(row.provider);
-
   return (
     <ComboboxItem
       label={row.modelLabel}
-      description={showDescription ? row.description : undefined}
+      description={row.description}
       selected={isSelected}
       elevated={elevated}
       onPress={onPress}
@@ -685,10 +681,6 @@ export function CombinedModelSelector({
     handleOpenChange(!isOpen);
   }, [handleOpenChange, isOpen]);
 
-  const handleClose = useCallback(() => {
-    handleOpenChange(false);
-  }, [handleOpenChange]);
-
   const triggerStyle = useCallback(
     ({ pressed, hovered }: PressableStateCallbackType & { hovered?: boolean }) => [
       styles.trigger,
@@ -714,11 +706,10 @@ export function CombinedModelSelector({
     setSearchQuery(value);
   }, []);
 
-  const openHeaderProviderSettings = useCallback(() => {
+  const openProviderSettings = useCallback(() => {
     if (!serverId || view.kind !== "provider") return;
     useProviderSettingsStore.getState().open({ serverId, provider: view.providerId });
-    handleClose();
-  }, [serverId, view, handleClose]);
+  }, [serverId, view]);
 
   const sheetHeader = useMemo<SheetHeader>(() => {
     if (view.kind === "all") {
@@ -727,7 +718,7 @@ export function CombinedModelSelector({
     const ProviderIconForView = getProviderIcon(view.providerId);
     const headerActions = (
       <Pressable
-        onPress={openHeaderProviderSettings}
+        onPress={openProviderSettings}
         disabled={!serverId}
         hitSlop={8}
         style={iconButtonStyle}
@@ -760,7 +751,7 @@ export function CombinedModelSelector({
     view,
     singleProviderView,
     serverId,
-    openHeaderProviderSettings,
+    openProviderSettings,
     theme.colors.border,
     theme.colors.foregroundMuted,
     handleBackToAll,

packages/app/src/components/command-center.tsx

@@ -9,24 +9,39 @@ import {
 } from "react-native";
 import { memo, useCallback, useEffect, useMemo, useRef, type ReactNode } from "react";
 import { Home, Plus, Settings } from "lucide-react-native";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
 import { useCommandCenter } from "@/hooks/use-command-center";
 import type { AggregatedAgent } from "@/hooks/use-aggregated-agents";
 import { formatTimeAgo } from "@/utils/time";
 import { shortenPath } from "@/utils/shorten-path";
 import { AgentStatusDot } from "@/components/agent-status-dot";
 import { Shortcut } from "@/components/ui/shortcut";
-import { isNative } from "@/constants/platform";
+import { isNative, isWeb } from "@/constants/platform";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import {
+  IsolatedBottomSheetModal,
+  useIsolatedBottomSheetVisibility,
+} from "@/components/ui/isolated-bottom-sheet-modal";
+import {
+  BottomSheetBackdrop,
+  BottomSheetScrollView,
+  BottomSheetTextInput,
+} from "@gorhom/bottom-sheet";
 
 function agentKey(agent: Pick<AggregatedAgent, "serverId" | "id">): string {
   return `${agent.serverId}:${agent.id}`;
 }
 
+const ThemedBottomSheetTextInput = withUnistyles(BottomSheetTextInput, (theme) => ({
+  placeholderTextColor: theme.colors.foregroundMuted,
+}));
+
 interface CommandCenterRowProps {
   active: boolean;
   children: ReactNode;
   onPress: () => void;
   registerRow: (el: View | null) => void;
+  onLayout?: (event: { nativeEvent: { layout: { y: number; height: number } } }) => void;
 }
 
 const CommandCenterRow = memo(function CommandCenterRow({
@@ -34,6 +49,7 @@ const CommandCenterRow = memo(function CommandCenterRow({
   children,
   onPress,
   registerRow,
+  onLayout,
 }: CommandCenterRowProps) {
   const { theme } = useUnistyles();
 
@@ -48,7 +64,7 @@ const CommandCenterRow = memo(function CommandCenterRow({
   );
 
   return (
-    <Pressable ref={registerRow} style={pressableStyle} onPress={onPress}>
+    <Pressable ref={registerRow} style={pressableStyle} onPress={onPress} onLayout={onLayout}>
       {children}
     </Pressable>
   );
@@ -59,6 +75,7 @@ interface CommandCenterRowContainerProps {
   active: boolean;
   rowRefs: React.MutableRefObject<Map<number, View>>;
   onPress: () => void;
+  onLayout?: (event: { nativeEvent: { layout: { y: number; height: number } } }) => void;
   children: ReactNode;
 }
 
@@ -67,6 +84,7 @@ function CommandCenterRowContainer({
   active,
   rowRefs,
   onPress,
+  onLayout,
   children,
 }: CommandCenterRowContainerProps) {
   const registerRow = useCallback(
@@ -77,7 +95,12 @@ function CommandCenterRowContainer({
     [rowRefs, rowIndex],
   );
   return (
-    <CommandCenterRow active={active} registerRow={registerRow} onPress={onPress}>
+    <CommandCenterRow
+      active={active}
+      registerRow={registerRow}
+      onPress={onPress}
+      onLayout={onLayout}
+    >
       {children}
     </CommandCenterRow>
   );
@@ -88,6 +111,7 @@ interface CommandCenterActionRowProps {
   rowIndex: number;
   active: boolean;
   rowRefs: React.MutableRefObject<Map<number, View>>;
+  onLayout?: (event: { nativeEvent: { layout: { y: number; height: number } } }) => void;
   onSelect: (item: ReturnType<typeof useCommandCenter>["items"][number]) => void;
 }
 
@@ -96,6 +120,7 @@ function CommandCenterActionRow({
   rowIndex,
   active,
   rowRefs,
+  onLayout,
   onSelect,
 }: CommandCenterActionRowProps) {
   const { theme } = useUnistyles();
@@ -119,6 +144,7 @@ function CommandCenterActionRow({
       active={active}
       rowRefs={rowRefs}
       onPress={handlePress}
+      onLayout={onLayout}
     >
       <View style={styles.rowContent}>
         <View style={styles.rowMain}>
@@ -142,6 +168,7 @@ interface CommandCenterAgentRowProps {
   rowIndex: number;
   active: boolean;
   rowRefs: React.MutableRefObject<Map<number, View>>;
+  onLayout?: (event: { nativeEvent: { layout: { y: number; height: number } } }) => void;
   onSelect: (item: ReturnType<typeof useCommandCenter>["items"][number]) => void;
   children: ReactNode;
 }
@@ -150,6 +177,7 @@ function CommandCenterAgentRow({
   rowIndex,
   active,
   rowRefs,
+  onLayout,
   onSelect,
   item,
   children,
@@ -161,6 +189,7 @@ function CommandCenterAgentRow({
       active={active}
       rowRefs={rowRefs}
       onPress={handlePress}
+      onLayout={onLayout}
     >
       {children}
     </CommandCenterRowContainer>
@@ -209,6 +238,9 @@ interface AgentItemsSectionProps {
   actionItemsLength: number;
   activeIndex: number;
   rowRefs: React.MutableRefObject<Map<number, View>>;
+  onRowLayout: (
+    rowIndex: number,
+  ) => (event: { nativeEvent: { layout: { y: number; height: number } } }) => void;
   onSelect: (item: ReturnType<typeof useCommandCenter>["items"][number]) => void;
   sectionDividerStyle: React.ComponentProps<typeof View>["style"];
   sectionLabelStyle: React.ComponentProps<typeof Text>["style"];
@@ -219,6 +251,7 @@ function AgentItemsSection({
   actionItemsLength,
   activeIndex,
   rowRefs,
+  onRowLayout,
   onSelect,
   sectionDividerStyle,
   sectionLabelStyle,
@@ -237,6 +270,7 @@ function AgentItemsSection({
             rowIndex={rowIndex}
             active={rowIndex === activeIndex}
             rowRefs={rowRefs}
+            onLayout={onRowLayout(rowIndex)}
             onSelect={onSelect}
           >
             <CommandCenterAgentRowContent agent={agent} />
@@ -249,50 +283,119 @@ function AgentItemsSection({
 
 export function CommandCenter() {
   const { theme } = useUnistyles();
-  const { open, inputRef, query, setQuery, activeIndex, items, handleClose, handleSelectItem } =
-    useCommandCenter();
+  const {
+    open,
+    inputRef,
+    query,
+    setQuery,
+    activeIndex,
+    items,
+    handleClose,
+    handleSelectItem,
+    handleKeyEvent,
+  } = useCommandCenter();
+
+  const isCompact = useIsCompactFormFactor();
+  const showBottomSheet = isCompact && isNative;
 
   const rowRefs = useRef<Map<number, View>>(new Map());
+  const rowLayouts = useRef<Map<number, { y: number; height: number }>>(new Map());
   const resultsRef = useRef<ScrollView>(null);
+  const nativeScrollY = useRef(0);
+  const nativeViewHeight = useRef(0);
+  // BottomSheetTextInput wraps a different TextInput type (from react-native-gesture-handler).
+  // Use a loose ref to avoid the type mismatch — same pattern as AdaptiveTextInput.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const bottomSheetInputRef = useRef<any>(null);
 
+  const { sheetRef, handleSheetChange, handleSheetDismiss } = useIsolatedBottomSheetVisibility({
+    visible: open,
+    isEnabled: showBottomSheet,
+    onClose: handleClose,
+  });
+
+  // Focus the bottom sheet input when the sheet opens on mobile
   useEffect(() => {
-    if (!open) {
-      return;
+    if (showBottomSheet && open) {
+      const id = setTimeout(() => bottomSheetInputRef.current?.focus(), 300);
+      return () => clearTimeout(id);
     }
-    const row = rowRefs.current.get(activeIndex);
-    if (!row || typeof document === "undefined") {
-      return;
-    }
-    const scrollNode =
-      (
-        resultsRef.current as
-          | (ScrollView & {
-              getScrollableNode?: () => HTMLElement | null;
-            })
-          | null
-      )?.getScrollableNode?.() ?? null;
-    const rowEl = row as unknown as HTMLElement;
+  }, [showBottomSheet, open]);
 
-    if (!scrollNode) {
-      rowEl.scrollIntoView?.({ block: "nearest" });
+  const renderBackdrop = useCallback(
+    (props: React.ComponentProps<typeof BottomSheetBackdrop>) => (
+      <BottomSheetBackdrop {...props} disappearsOnIndex={-1} appearsOnIndex={0} opacity={0.45} />
+    ),
+    [],
+  );
+
+  // Scroll active row into view
+  useEffect(() => {
+    if (!open) return;
+
+    if (isWeb) {
+      const row = rowRefs.current.get(activeIndex);
+      if (!row || typeof document === "undefined") return;
+      const scrollNode =
+        (
+          resultsRef.current as
+            | (ScrollView & {
+                getScrollableNode?: () => HTMLElement | null;
+              })
+            | null
+        )?.getScrollableNode?.() ?? null;
+      const rowEl = row as unknown as HTMLElement;
+
+      if (!scrollNode) {
+        rowEl.scrollIntoView?.({ block: "nearest" });
+        return;
+      }
+
+      const rowTop = rowEl.offsetTop;
+      const rowBottom = rowTop + rowEl.offsetHeight;
+      const visibleTop = scrollNode.scrollTop;
+      const visibleBottom = visibleTop + scrollNode.clientHeight;
+
+      if (rowTop < visibleTop) {
+        scrollNode.scrollTop = rowTop;
+        return;
+      }
+
+      if (rowBottom > visibleBottom) {
+        scrollNode.scrollTop = rowBottom - scrollNode.clientHeight;
+      }
       return;
     }
 
-    const rowTop = rowEl.offsetTop;
-    const rowBottom = rowTop + rowEl.offsetHeight;
-    const visibleTop = scrollNode.scrollTop;
-    const visibleBottom = visibleTop + scrollNode.clientHeight;
+    // Native: use onLayout-measured positions
+    const layout = rowLayouts.current.get(activeIndex);
+    if (!layout || !resultsRef.current) return;
+
+    const rowTop = layout.y;
+    const rowBottom = rowTop + layout.height;
+    const visibleTop = nativeScrollY.current;
+    const visibleBottom = visibleTop + nativeViewHeight.current;
 
     if (rowTop < visibleTop) {
-      scrollNode.scrollTop = rowTop;
-      return;
-    }
-
-    if (rowBottom > visibleBottom) {
-      scrollNode.scrollTop = rowBottom - scrollNode.clientHeight;
+      resultsRef.current.scrollTo?.({ y: rowTop, animated: true });
+    } else if (rowBottom > visibleBottom) {
+      resultsRef.current.scrollTo?.({
+        y: rowBottom - nativeViewHeight.current,
+        animated: true,
+      });
     }
   }, [activeIndex, open]);
 
+  const handleRowLayout = useCallback(
+    (rowIndex: number) => (event: { nativeEvent: { layout: { y: number; height: number } } }) => {
+      rowLayouts.current.set(rowIndex, {
+        y: event.nativeEvent.layout.y,
+        height: event.nativeEvent.layout.height,
+      });
+    },
+    [],
+  );
+
   const actionItems = useMemo(() => items.filter((item) => item.kind === "action"), [items]);
   const agentItems = useMemo(() => items.filter((item) => item.kind === "agent"), [items]);
 
@@ -324,8 +427,101 @@ export function CommandCenter() {
     [theme.colors.border],
   );
 
-  if (isNative || !open) return null;
+  const handleKeyPress = useCallback(
+    ({ nativeEvent: { key } }: { nativeEvent: { key: string } }) => {
+      handleKeyEvent(key);
+    },
+    [handleKeyEvent],
+  );
 
+  const handleSubmitEditing = useCallback(() => {
+    handleKeyEvent("Enter");
+  }, [handleKeyEvent]);
+
+  const snapPoints = useMemo(() => ["60%", "90%"], []);
+
+  const resultList =
+    items.length === 0 ? (
+      <Text style={emptyTextStyle}>No matches</Text>
+    ) : (
+      <>
+        {actionItems.length > 0 ? (
+          <>
+            <Text style={sectionLabelStyle}>Actions</Text>
+            {actionItems.map((item, index) => (
+              <CommandCenterActionRow
+                key={`action:${item.action.id}`}
+                item={item}
+                rowIndex={index}
+                active={index === activeIndex}
+                rowRefs={rowRefs}
+                onLayout={handleRowLayout(index)}
+                onSelect={handleSelectItem}
+              />
+            ))}
+          </>
+        ) : null}
+
+        {agentItems.length > 0 ? (
+          <AgentItemsSection
+            agentItems={agentItems}
+            actionItemsLength={actionItems.length}
+            activeIndex={activeIndex}
+            rowRefs={rowRefs}
+            onRowLayout={handleRowLayout}
+            onSelect={handleSelectItem}
+            sectionDividerStyle={sectionDividerStyle}
+            sectionLabelStyle={sectionLabelStyle}
+          />
+        ) : null}
+      </>
+    );
+
+  // Mobile: bottom sheet
+  if (showBottomSheet) {
+    return (
+      <IsolatedBottomSheetModal
+        ref={sheetRef}
+        snapPoints={snapPoints}
+        index={0}
+        enableDynamicSizing={false}
+        onChange={handleSheetChange}
+        onDismiss={handleSheetDismiss}
+        backdropComponent={renderBackdrop}
+        enablePanDownToClose
+        keyboardBehavior="extend"
+        keyboardBlurBehavior="restore"
+        accessible={false}
+      >
+        <View style={styles.bottomSheetHeader}>
+          <ThemedBottomSheetTextInput
+            testID="command-center-input"
+            ref={bottomSheetInputRef as unknown as React.Ref<never>}
+            value={query}
+            onChangeText={setQuery}
+            onKeyPress={handleKeyPress}
+            onSubmitEditing={handleSubmitEditing}
+            placeholder="Type a command or search agents..."
+            style={inputStyle}
+            autoCapitalize="none"
+            autoCorrect={false}
+            autoFocus
+          />
+        </View>
+        <BottomSheetScrollView
+          contentContainerStyle={styles.resultsContent}
+          keyboardShouldPersistTaps="always"
+          showsVerticalScrollIndicator={false}
+        >
+          {resultList}
+        </BottomSheetScrollView>
+      </IsolatedBottomSheetModal>
+    );
+  }
+
+  if (!open) return null;
+
+  // Desktop web: centered overlay panel
   return (
     <Modal visible={open} transparent animationType="fade" onRequestClose={handleClose}>
       <View style={styles.overlay}>
@@ -354,39 +550,7 @@ export function CommandCenter() {
             keyboardShouldPersistTaps="always"
             showsVerticalScrollIndicator={false}
           >
-            {items.length === 0 ? (
-              <Text style={emptyTextStyle}>No matches</Text>
-            ) : (
-              <>
-                {actionItems.length > 0 ? (
-                  <>
-                    <Text style={sectionLabelStyle}>Actions</Text>
-                    {actionItems.map((item, index) => (
-                      <CommandCenterActionRow
-                        key={`action:${item.action.id}`}
-                        item={item}
-                        rowIndex={index}
-                        active={index === activeIndex}
-                        rowRefs={rowRefs}
-                        onSelect={handleSelectItem}
-                      />
-                    ))}
-                  </>
-                ) : null}
-
-                {agentItems.length > 0 ? (
-                  <AgentItemsSection
-                    agentItems={agentItems}
-                    actionItemsLength={actionItems.length}
-                    activeIndex={activeIndex}
-                    rowRefs={rowRefs}
-                    onSelect={handleSelectItem}
-                    sectionDividerStyle={sectionDividerStyle}
-                    sectionLabelStyle={sectionLabelStyle}
-                  />
-                ) : null}
-              </>
-            )}
+            {resultList}
           </ScrollView>
         </View>
       </View>
@@ -395,6 +559,12 @@ export function CommandCenter() {
 }
 
 const styles = StyleSheet.create((theme) => ({
+  bottomSheetHeader: {
+    paddingHorizontal: theme.spacing[4],
+    paddingVertical: theme.spacing[3],
+    borderBottomWidth: 1,
+    borderBottomColor: theme.colors.border,
+  },
   overlay: {
     flex: 1,
     justifyContent: "flex-start",

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

@@ -9,7 +9,6 @@ import Markdown, {
 import {
   ActivityIndicator,
   Image as RNImage,
-  Linking,
   ScrollView as RNScrollView,
   Text,
   type TextProps,
@@ -25,6 +24,7 @@ import { useIsCompactFormFactor } from "@/constants/layout";
 import { useSessionStore, type ExplorerFile } from "@/stores/session-store";
 import { useWebScrollViewScrollbar } from "@/components/use-web-scrollbar";
 import { useWebScrollbarStyle } from "@/hooks/use-web-scrollbar-style";
+import { openExternalUrl } from "@/utils/open-external-url";
 import { highlightCode, type HighlightToken } from "@getpaseo/highlight";
 import { syntaxTokenStyleFor } from "@/styles/syntax-token-styles";
 import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
@@ -34,6 +34,7 @@ import { isRenderedMarkdownFile } from "@/components/file-pane-render-mode";
 import { isWeb } from "@/constants/platform";
 import { createMarkdownStyles } from "@/styles/markdown-styles";
 import { getMarkdownListMarker, getMarkdownListSpacing } from "@/utils/markdown-list";
+import { markdownNodeContainsType } from "@/utils/markdown-ast";
 import type { AttachmentMetadata } from "@/attachments/types";
 import { useAttachmentPreviewUrl } from "@/attachments/use-attachment-preview-url";
 import { persistAttachmentFromBytes } from "@/attachments/service";
@@ -207,7 +208,7 @@ function FilePreviewMarkdownLink({
   const handlePress = useCallback(() => {
     if (!href) return;
     if (onLinkPress?.(href) === false) return;
-    void Linking.openURL(href);
+    void openExternalUrl(href);
   }, [href, onLinkPress]);
 
   return (
@@ -395,7 +396,11 @@ function createFilePreviewMarkdownRules(): RenderRules {
       _parent: ASTNode[],
       styles: MarkdownStyles,
     ) => (
-      <MarkdownParagraphView key={node.key} paragraphStyle={styles.paragraph}>
+      <MarkdownParagraphView
+        key={node.key}
+        paragraphStyle={styles.paragraph}
+        containsImage={markdownNodeContainsType(node, "image")}
+      >
         {children}
       </MarkdownParagraphView>
     ),

packages/app/src/components/icons/omp-icon.tsx

@@ -0,0 +1,14 @@
+import Svg, { Path } from "react-native-svg";
+
+interface OmpIconProps {
+  size?: number;
+  color?: string;
+}
+
+export function OmpIcon({ size = 16, color = "currentColor" }: OmpIconProps) {
+  return (
+    <Svg width={size} height={size} viewBox="0 0 64 64" fill={color}>
+      <Path d="M10 14h44v9H43v33h-9V23h-9v22h-9V23H10z" fill={color} />
+    </Svg>
+  );
+}

packages/app/src/components/import-session-sheet-view-model.test.ts

@@ -51,20 +51,20 @@ describe("resolveProvidersToFetch", () => {
     expect(resolveProvidersToFetch(true, undefined)).toBeNull();
   });
 
-  it("returns only enabled importable providers", () => {
+  it("returns enabled providers", () => {
     const providers = resolveProvidersToFetch(true, [
       { provider: "claude" },
       { provider: "codex" },
       { provider: "opencode", enabled: false },
       { provider: "z-ai" },
     ]);
-    expect(providers).toEqual(["claude", "codex"]);
+    expect(providers).toEqual(["claude", "codex", "z-ai"]);
   });
 
-  it("returns an empty array when snapshot has no enabled importable providers", () => {
+  it("returns an empty array when snapshot has no enabled providers", () => {
     const providers = resolveProvidersToFetch(true, [
       { provider: "claude", enabled: false },
-      { provider: "z-ai" },
+      { provider: "z-ai", enabled: false },
     ]);
     expect(providers).toEqual([]);
   });

packages/app/src/components/import-session-sheet-view-model.ts

@@ -1,8 +1,6 @@
 import type { FetchRecentProviderSessionEntry } from "@getpaseo/client/internal/daemon-client";
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
-import { IMPORTABLE_PROVIDERS } from "@getpaseo/protocol/importable-providers";
 
-export const IMPORTABLE_PROVIDER_IDS: Set<string> = new Set(IMPORTABLE_PROVIDERS);
 export const PER_PROVIDER_LIMIT = 15;
 export const ALL_FILTER_VALUE = "__all__";
 
@@ -28,9 +26,7 @@ export function resolveProvidersToFetch(
   // when the supported daemon floor is >= v0.1.48 (target: 2026-10-05).
   if (!supportsSnapshot) return null;
   if (!snapshotEntries) return null;
-  return snapshotEntries
-    .filter((entry) => IMPORTABLE_PROVIDER_IDS.has(entry.provider) && entry.enabled !== false)
-    .map((entry) => entry.provider);
+  return snapshotEntries.filter((entry) => entry.enabled !== false).map((entry) => entry.provider);
 }
 
 export function buildProviderLabelMap(

packages/app/src/components/import-session-sheet.test.tsx

@@ -71,7 +71,9 @@ vi.mock("lucide-react-native", () => {
     return Icon;
   };
   return {
+    ChevronDown: icon("ChevronDown"),
     Inbox: icon("Inbox"),
+    Layers: icon("Layers"),
     RotateCw: icon("RotateCw"),
   };
 });
@@ -81,35 +83,38 @@ vi.mock("@/components/ui/loading-spinner", () => ({
     React.createElement("span", { "data-testid": "import-session-loading-spinner" }),
 }));
 
-vi.mock("@/components/ui/segmented-control", () => ({
-  SegmentedControl: ({
+vi.mock("@/components/ui/combobox", () => ({
+  Combobox: ({
     options,
     value,
-    onValueChange,
-    testID,
+    onSelect,
+    open,
   }: {
-    options: ReadonlyArray<{ value: string; label: string; testID?: string }>;
+    options: ReadonlyArray<{ id: string; label: string }>;
     value: string;
-    onValueChange: (value: string) => void;
-    testID?: string;
-  }) =>
-    React.createElement(
+    onSelect: (id: string) => void;
+    open?: boolean;
+  }) => {
+    if (!open) return null;
+    return React.createElement(
       "div",
-      { "data-testid": testID },
+      { "data-testid": "import-session-combobox" },
       options.map((option) =>
         React.createElement(
           "button",
           {
-            key: option.value,
+            key: option.id,
             type: "button",
-            "data-testid": option.testID,
-            "data-selected": value === option.value,
-            onClick: () => onValueChange(option.value),
+            "data-testid": `import-session-filter-${option.id === "__all__" ? "all" : option.id}`,
+            "data-selected": value === option.id,
+            onClick: () => onSelect(option.id),
           },
           option.label,
         ),
       ),
-    ),
+    );
+  },
+  ComboboxItem: ({ label }: { label: string }) => React.createElement("span", null, label),
 }));
 
 vi.mock("@/components/adaptive-modal-sheet", () => ({
@@ -475,7 +480,13 @@ describe("ImportSessionSheet", () => {
   it("imports a selected session by provider handle and reports the imported agent", async () => {
     const fetchRecentProviderSessions = vi.fn(async () => ({
       requestId: "recent-provider-sessions",
-      entries: [createProviderSessionEntry({ providerId: "claude", providerLabel: "Claude Code" })],
+      entries: [
+        createProviderSessionEntry({
+          providerId: "claude",
+          providerLabel: "Claude Code",
+          cwd: "/repo/paseo-realpath",
+        }),
+      ],
     }));
     const importAgent = vi.fn(async () => createImportedAgentSnapshot("agent-imported"));
     const onClose = vi.fn();
@@ -499,7 +510,7 @@ describe("ImportSessionSheet", () => {
       expect(importAgent).toHaveBeenCalledWith({
         providerId: "claude",
         providerHandleId: "provider-thread-1",
-        cwd: "/repo/paseo",
+        cwd: "/repo/paseo-realpath",
       });
     });
     expect(onImportedAgent).toHaveBeenCalledWith("agent-imported");
@@ -541,7 +552,7 @@ describe("ImportSessionSheet", () => {
     expect(onClose).not.toHaveBeenCalled();
   });
 
-  it("fans out one request per enabled importable provider when snapshot is supported", async () => {
+  it("fans out one request per enabled provider when snapshot is supported", async () => {
     const fetchRecentProviderSessions = vi.fn(
       async (options: { providers?: string[] } | undefined) => ({
         requestId: `recent-${options?.providers?.[0] ?? "all"}`,
@@ -591,12 +602,15 @@ describe("ImportSessionSheet", () => {
     expect(fetchRecentProviderSessions).not.toHaveBeenCalledWith(
       expect.objectContaining({ providers: ["opencode"] }),
     );
-    expect(fetchRecentProviderSessions).not.toHaveBeenCalledWith(
-      expect.objectContaining({ providers: ["z-ai"] }),
-    );
+    expect(fetchRecentProviderSessions).toHaveBeenCalledWith({
+      cwd: "/repo/paseo",
+      providers: ["z-ai"],
+      limit: 15,
+    });
 
     await screen.findByText("Session claude");
     await screen.findByText("Session codex");
+    await screen.findByText("Session z-ai");
   });
 
   it("shows partial-failure note when one provider request fails but others succeed", async () => {
@@ -675,11 +689,13 @@ describe("ImportSessionSheet", () => {
     await screen.findByText("Session claude");
     await screen.findByText("Session codex");
 
+    fireEvent.click(screen.getByTestId("import-session-filter-trigger"));
     fireEvent.click(screen.getByTestId("import-session-filter-codex"));
 
     screen.getByText("Session codex");
     expect(screen.queryByText("Session claude")).toBeNull();
 
+    fireEvent.click(screen.getByTestId("import-session-filter-trigger"));
     fireEvent.click(screen.getByTestId("import-session-filter-all"));
 
     screen.getByText("Session claude");
@@ -716,7 +732,7 @@ describe("ImportSessionSheet", () => {
     expect(screen.queryByTestId("import-session-filter-all")).toBeNull();
   });
 
-  it("shows a no-importable-providers message when snapshot has no enabled importable providers", async () => {
+  it("shows a no-importable-providers message when snapshot has no enabled providers", async () => {
     const fetchRecentProviderSessions = vi.fn();
     const importAgent = vi.fn();
 
@@ -732,7 +748,7 @@ describe("ImportSessionSheet", () => {
             createSnapshotEntry("claude", { enabled: false }),
             createSnapshotEntry("codex", { enabled: false }),
             createSnapshotEntry("opencode", { enabled: false }),
-            createSnapshotEntry("z-ai"),
+            createSnapshotEntry("z-ai", { enabled: false }),
           ],
         },
       },

packages/app/src/components/import-session-sheet.tsx

@@ -1,16 +1,16 @@
-import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { Pressable, type PressableStateCallbackType, ScrollView, Text, View } from "react-native";
+import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { Pressable, type PressableStateCallbackType, Text, View } from "react-native";
 import { useMutation, useQueries, useQueryClient } from "@tanstack/react-query";
 import type {
   DaemonClient,
   FetchRecentProviderSessionEntry,
 } from "@getpaseo/client/internal/daemon-client";
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
-import { Inbox, RotateCw } from "lucide-react-native";
+import { ChevronDown, Inbox, Layers, RotateCw } from "lucide-react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
-import { SegmentedControl, type SegmentedControlOption } from "@/components/ui/segmented-control";
+import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
 import { getProviderIcon } from "@/components/provider-icons";
 import { formatTimeAgo } from "@/utils/time";
 import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
@@ -88,6 +88,7 @@ interface SheetStatusMessagesProps {
   isSnapshotUnsupported: boolean;
   hasNoImportableProviders: boolean;
   isLoadingSessions: boolean;
+  hasRows: boolean;
   allQueriesErrored: boolean;
   erroredProviderLabels: ReadonlyArray<string>;
   importErrored: boolean;
@@ -98,6 +99,7 @@ function SheetStatusMessages({
   isSnapshotUnsupported,
   hasNoImportableProviders,
   isLoadingSessions,
+  hasRows,
   allQueriesErrored,
   erroredProviderLabels,
   importErrored,
@@ -114,7 +116,7 @@ function SheetStatusMessages({
       {hasNoImportableProviders ? (
         <Text style={styles.statusText}>No importable providers are enabled.</Text>
       ) : null}
-      {isLoadingSessions ? (
+      {isLoadingSessions && !hasRows ? (
         <View style={styles.statusRow}>
           <LoadingSpinner color={theme.colors.foregroundMuted} />
           <Text style={styles.statusText}>Loading recent sessions...</Text>
@@ -176,25 +178,6 @@ function SheetEmptyState({ title }: { title: string }) {
   );
 }
 
-function buildProviderFilterOptions(
-  providers: ReadonlyArray<string>,
-  providerLabelById: ReadonlyMap<string, string>,
-): SegmentedControlOption<string>[] {
-  const options: SegmentedControlOption<string>[] = [
-    { value: ALL_FILTER_VALUE, label: "All", testID: "import-session-filter-all" },
-  ];
-  for (const provider of providers) {
-    const ProviderIcon = getProviderIcon(provider);
-    options.push({
-      value: provider,
-      label: providerLabelById.get(provider) ?? provider,
-      testID: `import-session-filter-${provider}`,
-      icon: ({ color, size }) => <ProviderIcon color={color} size={size} />,
-    });
-  }
-  return options;
-}
-
 function ImportSessionSheetRow({
   entry,
   disabled,
@@ -271,6 +254,7 @@ export function ImportSessionSheet({
   onImported,
 }: ImportSessionSheetProps) {
   const queryClient = useQueryClient();
+  const { theme } = useUnistyles();
 
   const { entries: snapshotEntries, supportsSnapshot } = useProvidersSnapshot(serverId, {
     cwd,
@@ -315,6 +299,8 @@ export function ImportSessionSheet({
   const filterProviders = useMemo(() => [...(providersToFetch ?? [])].sort(), [providersToFetch]);
 
   const [selectedProvider, setSelectedProvider] = useState<string>(ALL_FILTER_VALUE);
+  const [isFilterOpen, setIsFilterOpen] = useState(false);
+  const filterAnchorRef = useRef<View>(null);
 
   useEffect(() => {
     if (
@@ -330,24 +316,84 @@ export function ImportSessionSheet({
     return aggregatedEntries.filter((entry) => entry.providerId === selectedProvider);
   }, [aggregatedEntries, selectedProvider]);
 
-  const filterOptions = useMemo(
-    () => buildProviderFilterOptions(filterProviders, providerLabelById),
+  const filterComboboxOptions = useMemo<ComboboxOption[]>(
+    () => [
+      { id: ALL_FILTER_VALUE, label: "All providers" },
+      ...filterProviders.map((provider) => ({
+        id: provider,
+        label: providerLabelById.get(provider) ?? provider,
+      })),
+    ],
     [filterProviders, providerLabelById],
   );
 
+  const selectedProviderLabel = useMemo(
+    () =>
+      filterComboboxOptions.find((opt) => opt.id === selectedProvider)?.label ?? "All providers",
+    [filterComboboxOptions, selectedProvider],
+  );
+
+  const handleFilterOpen = useCallback(() => setIsFilterOpen(true), []);
+
+  const filterTriggerStyle = useCallback(
+    ({ pressed, hovered = false }: PressableStateCallbackType & { hovered?: boolean }) => [
+      styles.filterTrigger,
+      Boolean(hovered) && styles.filterTriggerHovered,
+      pressed && styles.filterTriggerPressed,
+    ],
+    [],
+  );
+
+  const handleFilterSelect = useCallback((id: string) => {
+    setSelectedProvider(id);
+    setIsFilterOpen(false);
+  }, []);
+
+  const filterOptionIcons = useMemo(() => {
+    const map = new Map<string, React.ReactNode>();
+    map.set(ALL_FILTER_VALUE, <Layers size={14} color={theme.colors.foregroundMuted} />);
+    for (const provider of filterProviders) {
+      const ProviderIcon = getProviderIcon(provider);
+      map.set(provider, <ProviderIcon size={14} color={theme.colors.foregroundMuted} />);
+    }
+    return map;
+  }, [filterProviders, theme.colors.foregroundMuted]);
+
+  const renderFilterOption = useCallback(
+    ({
+      option,
+      selected,
+      active,
+      onPress,
+    }: {
+      option: ComboboxOption;
+      selected: boolean;
+      active: boolean;
+      onPress: () => void;
+    }) => (
+      <ComboboxItem
+        label={option.label}
+        selected={selected}
+        active={active}
+        onPress={onPress}
+        leadingSlot={filterOptionIcons.get(option.id)}
+      />
+    ),
+    [filterOptionIcons],
+  );
+
   const importMutation = useMutation({
     mutationFn: async (entry: FetchRecentProviderSessionEntry) => {
       if (!client) {
         throw new Error("Host is not connected");
       }
-      const effectiveCwd = cwd ?? entry.cwd;
-      if (!effectiveCwd) {
+      if (!entry.cwd) {
         throw new Error("Session is missing a working directory");
       }
       const agent = await client.importAgent({
         providerId: entry.providerId,
         providerHandleId: entry.providerHandleId,
-        cwd: effectiveCwd,
+        cwd: entry.cwd,
       });
       return agent;
     },
@@ -423,25 +469,48 @@ export function ImportSessionSheet({
       snapPoints={IMPORT_SHEET_SNAP_POINTS}
     >
       {showFilter ? (
-        <ScrollView
-          horizontal
-          showsHorizontalScrollIndicator={false}
-          contentContainerStyle={styles.filterRow}
-        >
-          <SegmentedControl
-            testID="import-session-filters"
-            size="sm"
-            options={filterOptions}
+        <View ref={filterAnchorRef} collapsable={false} style={styles.filterTriggerWrap}>
+          <Pressable
+            onPress={handleFilterOpen}
+            style={filterTriggerStyle}
+            testID="import-session-filter-trigger"
+            accessibilityRole="button"
+            accessibilityLabel={`Filter: ${selectedProviderLabel}`}
+          >
+            {selectedProvider === ALL_FILTER_VALUE ? (
+              <Layers size={14} color={theme.colors.foregroundMuted} />
+            ) : (
+              (() => {
+                const ProviderIcon = getProviderIcon(selectedProvider);
+                return <ProviderIcon size={14} color={theme.colors.foregroundMuted} />;
+              })()
+            )}
+            <Text style={styles.filterTriggerText} numberOfLines={1}>
+              {selectedProviderLabel}
+            </Text>
+            <ChevronDown size={14} color={theme.colors.foregroundMuted} />
+          </Pressable>
+          <Combobox
+            options={filterComboboxOptions}
             value={selectedProvider}
-            onValueChange={setSelectedProvider}
+            onSelect={handleFilterSelect}
+            renderOption={renderFilterOption}
+            searchable={false}
+            title="Filter by provider"
+            open={isFilterOpen}
+            onOpenChange={setIsFilterOpen}
+            anchorRef={filterAnchorRef}
+            desktopPlacement="bottom-start"
+            desktopPreventInitialFlash
           />
-        </ScrollView>
+        </View>
       ) : null}
       <SheetStatusMessages
         isClientReady={Boolean(client)}
         isSnapshotUnsupported={isSnapshotUnsupported}
         hasNoImportableProviders={hasNoImportableProviders}
         isLoadingSessions={isLoadingSessions}
+        hasRows={visibleEntries.length > 0}
         allQueriesErrored={allQueriesErrored}
         erroredProviderLabels={erroredProviderLabels}
         importErrored={importMutation.isError}
@@ -466,10 +535,32 @@ export function ImportSessionSheet({
 }
 
 const styles = StyleSheet.create((theme) => ({
-  filterRow: {
-    flexDirection: "row",
+  filterTriggerWrap: {
     paddingBottom: theme.spacing[2],
   },
+  filterTrigger: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1.5],
+    alignSelf: "flex-start",
+    paddingVertical: theme.spacing[1.5],
+    paddingHorizontal: theme.spacing[3],
+    borderRadius: theme.borderRadius.md,
+    backgroundColor: theme.colors.surface1,
+    borderWidth: theme.borderWidth[1],
+    borderColor: theme.colors.border,
+  },
+  filterTriggerHovered: {
+    backgroundColor: theme.colors.surface2,
+  },
+  filterTriggerPressed: {
+    backgroundColor: theme.colors.surface3,
+  },
+  filterTriggerText: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.medium,
+  },
   list: {
     gap: theme.spacing[1],
   },

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

@@ -103,6 +103,7 @@ interface SidebarSharedProps {
   toggleProjectCollapsed: SidebarShortcutModel["toggleProjectCollapsed"];
   handleRefresh: () => void;
   handleHostSelect: (nextServerId: string) => void;
+  handleNewWorkspaceNavigate: () => void;
   handleOpenProject: () => void;
   handleHome: () => void;
   handleSettings: () => void;
@@ -118,7 +119,7 @@ interface MobileSidebarProps extends SidebarSharedProps {
   insetsTop: number;
   insetsBottom: number;
   isOpen: boolean;
-  closeToAgent: () => void;
+  closeSidebar: () => void;
   handleViewMoreNavigate: () => void;
 }
 
@@ -229,6 +230,11 @@ export const LeftSidebar = memo(function LeftSidebar({
     void openProjectPicker();
   }, [openProjectPicker]);
 
+  const handleNewWorkspaceNavigate = useCallback(() => {
+    if (!activeServerId) return;
+    router.push(buildHostNewWorkspaceRoute(activeServerId));
+  }, [activeServerId]);
+
   const handleSettingsMobile = useCallback(() => {
     showMobileAgent();
     router.push(buildSettingsRoute());
@@ -297,7 +303,8 @@ export const LeftSidebar = memo(function LeftSidebar({
         insetsTop={insets.top}
         insetsBottom={insets.bottom}
         isOpen={isOpen}
-        closeToAgent={showMobileAgent}
+        closeSidebar={showMobileAgent}
+        handleNewWorkspaceNavigate={handleNewWorkspaceNavigate}
         handleOpenProject={handleOpenProjectMobile}
         handleHome={handleHomeMobile}
         handleSettings={handleSettingsMobile}
@@ -311,6 +318,7 @@ export const LeftSidebar = memo(function LeftSidebar({
       {...sharedProps}
       insetsTop={insets.top}
       isOpen={isOpen}
+      handleNewWorkspaceNavigate={handleNewWorkspaceNavigate}
       handleOpenProject={handleOpenProjectDesktop}
       handleHome={handleHomeDesktop}
       handleSettings={handleSettingsDesktop}
@@ -554,13 +562,14 @@ function MobileSidebar({
   handleRefresh,
   handleHostSelect,
   renderHostOption,
+  handleNewWorkspaceNavigate,
   handleOpenProject,
   handleHome,
   handleSettings,
   insetsTop,
   insetsBottom,
   isOpen,
-  closeToAgent,
+  closeSidebar,
   handleViewMoreNavigate,
 }: MobileSidebarProps) {
   const pathname = usePathname();
@@ -581,8 +590,8 @@ function MobileSidebar({
 
   const handleCloseFromGesture = useCallback(() => {
     gestureAnimatingRef.current = true;
-    closeToAgent();
-  }, [closeToAgent, gestureAnimatingRef]);
+    closeSidebar();
+  }, [closeSidebar, gestureAnimatingRef]);
 
   const handleViewMore = useCallback(() => {
     if (!activeServerId) {
@@ -590,20 +599,25 @@ function MobileSidebar({
     }
     translateX.value = -windowWidth;
     backdropOpacity.value = 0;
-    closeToAgent();
+    closeSidebar();
     handleViewMoreNavigate();
   }, [
     activeServerId,
     backdropOpacity,
-    closeToAgent,
+    closeSidebar,
     handleViewMoreNavigate,
     translateX,
     windowWidth,
   ]);
 
   const handleWorkspacePress = useCallback(() => {
-    closeToAgent();
-  }, [closeToAgent]);
+    closeSidebar();
+  }, [closeSidebar]);
+
+  const handleNewWorkspace = useCallback(() => {
+    closeSidebar();
+    handleNewWorkspaceNavigate();
+  }, [closeSidebar, handleNewWorkspaceNavigate]);
 
   const closeGesture = useMemo(
     () =>
@@ -745,10 +759,13 @@ function MobileSidebar({
                 testID="sidebar-sessions"
               />
             </View>
-            <WorkspacesSectionHeader serverId={activeServerId} />
+            <WorkspacesSectionHeader
+              serverId={activeServerId}
+              onNewWorkspacePress={handleNewWorkspace}
+            />
             <Pressable
               style={styles.mobileCloseButton}
-              onPress={closeToAgent}
+              onPress={closeSidebar}
               testID="sidebar-close"
               nativeID="sidebar-close"
               accessible
@@ -826,6 +843,7 @@ function DesktopSidebar({
   handleRefresh,
   handleHostSelect,
   renderHostOption,
+  handleNewWorkspaceNavigate,
   handleOpenProject,
   handleHome,
   handleSettings,
@@ -913,7 +931,10 @@ function DesktopSidebar({
             />
           </View>
         </View>
-        <WorkspacesSectionHeader serverId={activeServerId} />
+        <WorkspacesSectionHeader
+          serverId={activeServerId}
+          onNewWorkspacePress={handleNewWorkspaceNavigate}
+        />
 
         {isInitialLoad ? (
           <SidebarAgentListSkeleton />
@@ -958,17 +979,17 @@ function DesktopSidebar({
   );
 }
 
-function WorkspacesSectionHeader({ serverId }: { serverId: string | null }) {
+function WorkspacesSectionHeader({
+  serverId,
+  onNewWorkspacePress,
+}: {
+  serverId: string | null;
+  onNewWorkspacePress: () => void;
+}) {
   const { theme } = useUnistyles();
   const setCommandCenterOpen = useKeyboardShortcutsStore((state) => state.setCommandCenterOpen);
   const commandCenterKeys = useShortcutKeys("toggle-command-center");
   const handleSearchPress = useCallback(() => setCommandCenterOpen(true), [setCommandCenterOpen]);
-  const handleNewWorkspacePress = useCallback(() => {
-    if (!serverId) {
-      return;
-    }
-    router.push(buildHostNewWorkspaceRoute(serverId));
-  }, [serverId]);
   const searchButtonStyle = useCallback(
     ({ hovered = false, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
       styles.workspacesHeaderIconButton,
@@ -988,7 +1009,7 @@ function WorkspacesSectionHeader({ serverId }: { serverId: string | null }) {
               accessibilityLabel="New workspace"
               testID="sidebar-new-workspace"
               style={searchButtonStyle}
-              onPress={handleNewWorkspacePress}
+              onPress={onNewWorkspacePress}
             >
               {({ hovered, pressed }) => (
                 <Plus

packages/app/src/components/markdown-text-style.test.ts

@@ -0,0 +1,32 @@
+import { describe, expect, it } from "vitest";
+import { StyleSheet, type TextStyle } from "react-native";
+import { resolvePlainMarkdownTextStyle } from "@/components/markdown-text-style";
+
+function unistylesStyle(id: string, style: Record<string, unknown>) {
+  return {
+    ...style,
+    [`unistyles_${id}`]: { id },
+  };
+}
+
+function uiTextViewFlatten(rootStyle: TextStyle, style: TextStyle): Record<string, unknown> {
+  // react-native-uitextview/src/util.ts:8 flattens [rootStyle, style]
+  // before passing the result to its native View-backed components.
+  return { ...(StyleSheet.flatten([rootStyle, style]) as Record<string, unknown>) };
+}
+
+function unistylesMetadataKeys(style: Record<string, unknown>) {
+  return Object.keys(style).filter((key) => key.startsWith("unistyles_"));
+}
+
+describe("resolvePlainMarkdownTextStyle", () => {
+  it("keeps UITextView from collapsing parent and child Unistyles styles into one native View style object", () => {
+    const merged = uiTextViewFlatten(
+      resolvePlainMarkdownTextStyle(unistylesStyle("paragraph", { color: "#111" })),
+      resolvePlainMarkdownTextStyle(unistylesStyle("text", { fontWeight: "600" })),
+    );
+
+    expect(unistylesMetadataKeys(merged)).toHaveLength(0);
+    expect(merged).toMatchObject({ color: "#111", fontWeight: "600" });
+  });
+});

packages/app/src/components/markdown-text-style.ts

@@ -0,0 +1,25 @@
+import { StyleSheet, type StyleProp, type TextStyle } from "react-native";
+
+export function resolvePlainMarkdownTextStyle(style: StyleProp<TextStyle>): TextStyle {
+  return stripUnistylesMetadata(StyleSheet.flatten(style) ?? {});
+}
+
+function stripUnistylesMetadata(style: TextStyle): TextStyle {
+  // iOS markdown text goes through react-native-uitextview. That library
+  // inherits text styles by flattening [parentStyle, childStyle] before handing
+  // the result to native View-backed components. If both entries are Unistyles
+  // styles, flattening preserves both `unistyles_*` metadata keys in one object,
+  // and Unistyles correctly warns that the style should have stayed array-shaped.
+  //
+  // `UITextView` is a third-party boundary, not a Unistyles-tracked component in
+  // our ownership model. Resolve the concrete style values before crossing that
+  // boundary and drop only Unistyles' private tracking metadata. This preserves
+  // iOS paragraph/spanning text selection while avoiding the metadata merge.
+  const plainStyle: Record<string, unknown> = { ...style };
+  for (const key of Object.keys(plainStyle)) {
+    if (key.startsWith("unistyles_")) {
+      delete plainStyle[key];
+    }
+  }
+  return plainStyle as TextStyle;
+}

packages/app/src/components/markdown-text.android.tsx

@@ -35,6 +35,7 @@ export function MarkdownTextSpan({
 
 interface MarkdownParagraphViewProps {
   paragraphStyle: ViewStyle;
+  containsImage?: boolean;
   children: ReactNode;
 }
 

packages/app/src/components/markdown-text.ios.tsx

@@ -1,6 +1,7 @@
 import { useMemo, type ReactNode } from "react";
-import type { StyleProp, TextProps, TextStyle, ViewStyle } from "react-native";
+import { View, type StyleProp, type TextProps, type TextStyle, type ViewStyle } from "react-native";
 import { UITextView } from "react-native-uitextview";
+import { resolvePlainMarkdownTextStyle } from "@/components/markdown-text-style";
 
 interface MarkdownTextSpanProps {
   style?: StyleProp<TextStyle>;
@@ -8,10 +9,11 @@ interface MarkdownTextSpanProps {
   children: ReactNode;
   // Links route through this span too (see assistant-file-links/link.tsx). A
   // plain <Text> nested in the paragraph UITextView is dropped, so the link
-  // must be a UITextView span to be visible. onPress is forwarded best-effort:
-  // react-native-uitextview nulls onPress on the root native view, so reliable
-  // tap-to-open is still tracked by #21 — but visible+selectable text beats an
-  // invisible link.
+  // must be a UITextView span to be visible. onPress is wired onto the leaf
+  // string children here: react-native-uitextview attaches it to the
+  // RNUITextViewChild nodes it builds from string content, which the native tap
+  // recognizer dispatches to. The link's handler reaches these leaf spans via
+  // AssistantLinkPressProvider (see assistant-file-links/link-press-context).
   onPress?: TextProps["onPress"];
   accessibilityRole?: TextProps["accessibilityRole"];
 }
@@ -26,11 +28,13 @@ export function MarkdownTextSpan({
   onPress,
   accessibilityRole,
 }: MarkdownTextSpanProps) {
+  const plainStyle = useMemo(() => resolvePlainMarkdownTextStyle(style), [style]);
+
   return (
     <UITextView
       uiTextView
       selectable
-      style={style}
+      style={plainStyle}
       onPress={onPress}
       accessibilityRole={accessibilityRole}
     >
@@ -41,6 +45,7 @@ export function MarkdownTextSpan({
 
 interface MarkdownParagraphViewProps {
   paragraphStyle: ViewStyle;
+  containsImage?: boolean;
   children: ReactNode;
 }
 
@@ -52,13 +57,27 @@ const MARKDOWN_PARAGRAPH_RESET: ViewStyle = { marginBottom: 0 };
 // ViewStyle is structurally compatible with the layout props paragraphs use
 // (margin, padding, alignment); the cast lets the existing paragraphStyle
 // flow through unchanged.
-export function MarkdownParagraphView({ paragraphStyle, children }: MarkdownParagraphViewProps) {
-  const style = useMemo(
-    () => [paragraphStyle, MARKDOWN_PARAGRAPH_RESET] as StyleProp<TextStyle>,
+export function MarkdownParagraphView({
+  paragraphStyle,
+  containsImage = false,
+  children,
+}: MarkdownParagraphViewProps) {
+  const textStyle = useMemo(
+    () =>
+      resolvePlainMarkdownTextStyle([
+        paragraphStyle,
+        MARKDOWN_PARAGRAPH_RESET,
+      ] as StyleProp<TextStyle>),
     [paragraphStyle],
   );
+  const viewStyle = useMemo(() => [paragraphStyle, MARKDOWN_PARAGRAPH_RESET], [paragraphStyle]);
+
+  if (containsImage) {
+    return <View style={viewStyle}>{children}</View>;
+  }
+
   return (
-    <UITextView uiTextView selectable style={style}>
+    <UITextView uiTextView selectable style={textStyle}>
       {children}
     </UITextView>
   );

packages/app/src/components/markdown-text.web.tsx

@@ -46,6 +46,7 @@ export function MarkdownTextSpan({
 
 interface MarkdownParagraphViewProps {
   paragraphStyle: ViewStyle;
+  containsImage?: boolean;
   children: ReactNode;
 }
 

packages/app/src/components/message.tsx

@@ -70,6 +70,7 @@ import type { ToolCallDetail } from "@getpaseo/protocol/agent-types";
 import { buildToolCallPresentation } from "@/tool-calls/presentation";
 import { resolveToolCallIcon } from "@/utils/tool-call-icon";
 import { getMarkdownListMarker, getMarkdownListSpacing } from "@/utils/markdown-list";
+import { markdownNodeContainsType } from "@/utils/markdown-ast";
 import { useStableEvent } from "@/hooks/use-stable-event";
 import { HighlightedCodeBlock } from "@/components/highlighted-code-block";
 import { splitMarkdownBlocks } from "@/utils/split-markdown-blocks";
@@ -99,6 +100,7 @@ import {
   AssistantMarkdownLink,
   type InlinePathTarget,
   useAssistantFileLinkActions,
+  useAssistantLinkPress,
 } from "@/assistant-file-links";
 import { getCompactionMarkerLabel } from "./message-compaction-label";
 import { useAttachmentPreviewUrl } from "@/attachments/use-attachment-preview-url";
@@ -1531,8 +1533,19 @@ function MarkdownInheritedText({
     () => [inheritedStyles, textStyle, overrideStyle],
     [inheritedStyles, textStyle, overrideStyle],
   );
+  // When this span renders link label text on iOS, pick up the link's press
+  // handler from context and hand it to MarkdownTextSpan, which forwards it to
+  // the leaf string children react-native-uitextview makes tappable. Null
+  // outside a link (and on every other platform, where no provider mounts), so
+  // ordinary text is unaffected. See assistant-file-links/link-press-context.
+  const linkPress = useAssistantLinkPress();
   return (
-    <MarkdownTextSpan monoSurface={monoSurface} style={style}>
+    <MarkdownTextSpan
+      monoSurface={monoSurface}
+      style={style}
+      onPress={linkPress?.onPress}
+      accessibilityRole={linkPress?.accessibilityRole}
+    >
       {children}
     </MarkdownTextSpan>
   );
@@ -1825,7 +1838,11 @@ export const AssistantMessage = memo(function AssistantMessage({
         _parent: ASTNode[],
         styles: MarkdownStyles,
       ) => (
-        <MarkdownParagraphView key={node.key} paragraphStyle={styles.paragraph}>
+        <MarkdownParagraphView
+          key={node.key}
+          paragraphStyle={styles.paragraph}
+          containsImage={markdownNodeContainsType(node, "image")}
+        >
           {children}
         </MarkdownParagraphView>
       ),

packages/app/src/components/provider-catalog-list.tsx

@@ -1,36 +1,24 @@
-import { useCallback, useMemo, useReducer, useState } from "react";
-import { Alert, Pressable, Text, View } from "react-native";
+import { useCallback, useMemo, useState } from "react";
+import { Pressable, Text, View } from "react-native";
 import { SvgXml } from "react-native-svg";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { ExternalLink, PackagePlus, Search } from "lucide-react-native";
-import {
-  AdaptiveModalSheet,
-  AdaptiveTextInput,
-  type SheetHeader,
-} from "@/components/adaptive-modal-sheet";
+import { AdaptiveTextInput } from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import {
-  buildAcpProviderConfigPatch,
   useAcpProviderCatalog,
   type AcpProviderCatalogItem,
 } from "@/hooks/use-acp-provider-catalog";
-import { useDaemonConfig } from "@/hooks/use-daemon-config";
 import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import type { Theme } from "@/styles/theme";
 import { openExternalUrl } from "@/utils/open-external-url";
 
-interface AddProviderModalProps {
+interface ProviderCatalogListProps {
   serverId: string;
-  visible: boolean;
-  onClose: () => void;
+  installingProviderId: string | null;
+  onInstall: (entry: AcpProviderCatalogItem) => Promise<void> | void;
 }
 
-type InstallState = "installed" | "available";
-
-const FLEX_ONE_STYLE = { flex: 1 } as const;
-const ACTION_BUTTON_STYLE = { width: 92 } as const;
-const MODAL_SNAP_POINTS = ["78%", "92%"];
-const ADD_PROVIDER_HEADER: SheetHeader = { title: "Add provider" };
 const SEARCH_ICON_SIZE = 16;
 const PROVIDER_FALLBACK_ICON_SIZE = 20;
 const PROVIDER_REMOTE_ICON_SIZE = 24;
@@ -45,14 +33,6 @@ const foregroundMutedColorMapping = (theme: Theme) => ({
   color: theme.colors.foregroundMuted,
 });
 
-function getInstallState(
-  entry: AcpProviderCatalogItem,
-  installedProviderIds: Set<string>,
-): InstallState {
-  if (installedProviderIds.has(entry.id)) return "installed";
-  return "available";
-}
-
 function matchesSearch(entry: AcpProviderCatalogItem, query: string): boolean {
   const normalized = query.trim().toLowerCase();
   if (!normalized) return true;
@@ -61,22 +41,13 @@ function matchesSearch(entry: AcpProviderCatalogItem, query: string): boolean {
   );
 }
 
-interface ProviderCatalogRowProps {
+interface CatalogRowProps {
   entry: AcpProviderCatalogItem;
-  state: InstallState;
   installing: boolean;
   onInstall: (entry: AcpProviderCatalogItem) => void;
 }
 
-function ProviderCatalogRow({ entry, state, installing, onInstall }: ProviderCatalogRowProps) {
-  const isAvailable = state === "available";
-  let actionLabel = "Add";
-  if (installing) {
-    actionLabel = "Adding";
-  } else if (state === "installed") {
-    actionLabel = "Installed";
-  }
-
+function CatalogRow({ entry, installing, onInstall }: CatalogRowProps) {
   const handleInstall = useCallback(() => {
     onInstall(entry);
   }, [entry, onInstall]);
@@ -125,72 +96,43 @@ function ProviderCatalogRow({ entry, state, installing, onInstall }: ProviderCat
       </View>
       <Button
         size="sm"
-        variant={isAvailable ? "default" : "secondary"}
-        disabled={!isAvailable || installing}
+        variant="default"
+        disabled={installing}
         loading={installing}
         onPress={handleInstall}
-        style={ACTION_BUTTON_STYLE}
+        style={styles.actionButton}
         testID={`install-provider-${entry.id}`}
       >
-        {actionLabel}
+        {installing ? "Adding" : "Add"}
       </Button>
     </View>
   );
 }
 
-export function AddProviderModal({ serverId, visible, onClose }: AddProviderModalProps) {
-  const { entries } = useAcpProviderCatalog();
-  const { entries: providerEntries, refresh } = useProvidersSnapshot(serverId);
-  const { patchConfig } = useDaemonConfig(serverId);
+export function ProviderCatalogList({
+  serverId,
+  installingProviderId,
+  onInstall,
+}: ProviderCatalogListProps) {
+  const { entries: catalogEntries } = useAcpProviderCatalog();
+  const { entries: providerEntries } = useProvidersSnapshot(serverId);
   const [search, setSearch] = useState("");
-  const [searchResetKey, bumpSearchResetKey] = useReducer((key: number) => key + 1, 0);
-  const [installingProviderId, setInstallingProviderId] = useState<string | null>(null);
 
-  const handleClose = useCallback(() => {
-    setSearch("");
-    bumpSearchResetKey();
-    onClose();
-  }, [onClose]);
-
-  const installedProviderIds = useMemo(
+  const installedIds = useMemo(
     () => new Set(providerEntries?.map((entry) => entry.provider) ?? []),
     [providerEntries],
   );
-  const filteredEntries = useMemo(
-    () => entries.filter((entry) => matchesSearch(entry, search)),
-    [entries, search],
-  );
 
-  const handleInstall = useCallback(
-    async (entry: AcpProviderCatalogItem) => {
-      if (installingProviderId) return;
-
-      setInstallingProviderId(entry.id);
-      try {
-        await patchConfig(buildAcpProviderConfigPatch(entry));
-        await refresh([entry.id]);
-        handleClose();
-      } catch (installError) {
-        Alert.alert(
-          "Unable to install provider",
-          installError instanceof Error ? installError.message : String(installError),
-        );
-      } finally {
-        setInstallingProviderId((current) => (current === entry.id ? null : current));
-      }
-    },
-    [installingProviderId, handleClose, patchConfig, refresh],
+  const availableEntries = useMemo(
+    () =>
+      catalogEntries
+        .filter((entry) => !installedIds.has(entry.id))
+        .filter((entry) => matchesSearch(entry, search)),
+    [catalogEntries, installedIds, search],
   );
 
   return (
-    <AdaptiveModalSheet
-      header={ADD_PROVIDER_HEADER}
-      visible={visible}
-      onClose={handleClose}
-      desktopMaxWidth={680}
-      snapPoints={MODAL_SNAP_POINTS}
-      testID="add-provider-modal"
-    >
+    <View>
       <View style={styles.searchField}>
         <View style={styles.searchIcon}>
           <ThemedSearch size={SEARCH_ICON_SIZE} uniProps={foregroundMutedColorMapping} />
@@ -198,8 +140,6 @@ export function AddProviderModal({ serverId, visible, onClose }: AddProviderModa
         <AdaptiveTextInput
           testID="provider-catalog-search"
           accessibilityLabel="Search providers"
-          initialValue={search}
-          resetKey={`provider-catalog-search-${searchResetKey}`}
           value={search}
           onChangeText={setSearch}
           placeholder="Search providers"
@@ -209,32 +149,25 @@ export function AddProviderModal({ serverId, visible, onClose }: AddProviderModa
         />
       </View>
 
-      {filteredEntries.length === 0 ? (
+      {availableEntries.length === 0 ? (
         <View style={styles.stateBox}>
-          <Text style={styles.stateText}>No providers found</Text>
+          <Text style={styles.stateText}>
+            {search.trim().length > 0 ? "No providers found" : "All providers are installed"}
+          </Text>
         </View>
-      ) : null}
-
-      {filteredEntries.length > 0 ? (
+      ) : (
         <View style={styles.list}>
-          {filteredEntries.map((entry) => (
-            <ProviderCatalogRow
+          {availableEntries.map((entry) => (
+            <CatalogRow
               key={entry.id}
               entry={entry}
-              state={getInstallState(entry, installedProviderIds)}
               installing={installingProviderId === entry.id}
-              onInstall={handleInstall}
+              onInstall={onInstall}
             />
           ))}
         </View>
-      ) : null}
-
-      <View style={styles.actions}>
-        <Button style={FLEX_ONE_STYLE} variant="secondary" onPress={handleClose}>
-          Cancel
-        </Button>
-      </View>
-    </AdaptiveModalSheet>
+      )}
+    </View>
   );
 }
 
@@ -248,6 +181,7 @@ const styles = StyleSheet.create((theme) => ({
     borderWidth: 1,
     borderColor: theme.colors.border,
     paddingHorizontal: theme.spacing[3],
+    marginBottom: theme.spacing[3],
   },
   searchIcon: {
     width: 18,
@@ -320,6 +254,10 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.xs,
   },
+  actionButton: {
+    width: 92,
+    flexShrink: 0,
+  },
   stateBox: {
     minHeight: 96,
     borderRadius: theme.borderRadius.lg,
@@ -335,7 +273,4 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.sm,
   },
-  actions: {
-    flexDirection: "row",
-  },
 }));

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

@@ -196,6 +196,7 @@ function AddCustomModelSubSheet({
       onClose={onClose}
       desktopMaxWidth={420}
       snapPoints={ADD_SNAP_POINTS}
+      testID="add-custom-model-sheet"
     >
       <View style={sheetStyles.formGroup}>
         <Text style={sheetStyles.formLabel}>Model ID</Text>
@@ -339,6 +340,7 @@ function DiagnosticSubSheet({
       onClose={onClose}
       snapPoints={DIAGNOSTIC_SNAP_POINTS}
       scrollable={false}
+      testID="provider-diagnostic-sheet"
     >
       <View style={DIAGNOSTIC_CARD_STYLE}>{body}</View>
     </AdaptiveModalSheet>
@@ -616,6 +618,7 @@ export function ProviderDiagnosticSheet({
         header={sheetHeader}
         visible={visible}
         onClose={onClose}
+        testID="provider-settings-sheet"
         footer={renderProviderSheetFooter({
           fetchedAtLabel,
           isCompact,

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

@@ -5,6 +5,7 @@ describe("resolveProviderIconName", () => {
   it("returns the built-in identifier for known provider ids", () => {
     expect(resolveProviderIconName("kiro")).toEqual({ kind: "builtin", id: "kiro" });
     expect(resolveProviderIconName("claude")).toEqual({ kind: "builtin", id: "claude" });
+    expect(resolveProviderIconName("omp")).toEqual({ kind: "builtin", id: "omp" });
   });
 
   it("returns the catalog identifier for ACP catalog provider ids that ship an icon", () => {

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

@@ -1,6 +1,13 @@
 import { ACP_PROVIDER_CATALOG } from "@/data/acp-provider-catalog";
 
-export type BuiltinProviderIconName = "claude" | "codex" | "copilot" | "kiro" | "opencode" | "pi";
+export type BuiltinProviderIconName =
+  | "claude"
+  | "codex"
+  | "copilot"
+  | "kiro"
+  | "omp"
+  | "opencode"
+  | "pi";
 
 export type ProviderIconName =
   | { kind: "builtin"; id: BuiltinProviderIconName }
@@ -12,6 +19,7 @@ const BUILTIN_PROVIDER_IDS: ReadonlySet<BuiltinProviderIconName> = new Set([
   "codex",
   "copilot",
   "kiro",
+  "omp",
   "opencode",
   "pi",
 ]);

packages/app/src/components/provider-icons.ts

@@ -5,6 +5,7 @@ import { ClaudeIcon } from "@/components/icons/claude-icon";
 import { CodexIcon } from "@/components/icons/codex-icon";
 import { CopilotIcon } from "@/components/icons/copilot-icon";
 import { OpenCodeIcon } from "@/components/icons/opencode-icon";
+import { OmpIcon } from "@/components/icons/omp-icon";
 import { PiIcon } from "@/components/icons/pi-icon";
 import { ACP_PROVIDER_CATALOG } from "@/data/acp-provider-catalog";
 import {
@@ -24,6 +25,7 @@ const BUILTIN_PROVIDER_ICONS: Record<BuiltinProviderIconName, ProviderIconCompon
   codex: CodexIcon as unknown as ProviderIconComponent,
   copilot: CopilotIcon as unknown as ProviderIconComponent,
   kiro: PackagePlus,
+  omp: OmpIcon as unknown as ProviderIconComponent,
   opencode: OpenCodeIcon as unknown as ProviderIconComponent,
   pi: PiIcon as unknown as ProviderIconComponent,
 };

packages/app/src/components/provider-settings-host.tsx

@@ -5,6 +5,7 @@ import { useProviderSettingsStore } from "@/stores/provider-settings-store";
 export function ProviderSettingsHost() {
   const serverId = useProviderSettingsStore((state) => state.serverId);
   const provider = useProviderSettingsStore((state) => state.provider);
+  const visible = useProviderSettingsStore((state) => state.visible);
   const close = useProviderSettingsStore((state) => state.close);
 
   const handleClose = useCallback(() => {
@@ -19,7 +20,7 @@ export function ProviderSettingsHost() {
     <ProviderDiagnosticSheet
       provider={provider}
       serverId={serverId}
-      visible
+      visible={visible}
       onClose={handleClose}
     />
   );

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

@@ -117,7 +117,6 @@ import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
 import { useClearWorkspaceAttention } from "@/hooks/use-clear-workspace-attention";
 import type { PrHint } from "@/git/use-pr-status-query";
 import { buildSidebarProjectRowModel } from "@/utils/sidebar-project-row-model";
-import { useSessionStore } from "@/stores/session-store";
 import { redirectIfArchivingActiveWorkspace } from "@/utils/sidebar-workspace-archive-redirect";
 import { openExternalUrl } from "@/utils/open-external-url";
 import {
@@ -129,7 +128,12 @@ import {
   archiveWorkspaceOptimistically,
   archiveWorkspacesOptimistically,
 } from "@/workspace/workspace-archive";
-import { isWeb as platformIsWeb, isNative as platformIsNative } from "@/constants/platform";
+import {
+  isWeb as platformIsWeb,
+  isNative as platformIsNative,
+  getIsElectron,
+} from "@/constants/platform";
+import { getDesktopHost } from "@/desktop/host";
 
 const workspaceKeyExtractor = (workspace: SidebarWorkspaceEntry) => workspace.workspaceKey;
 
@@ -154,14 +158,24 @@ const ThemedCopy = withUnistyles(Copy);
 const ThemedArchive = withUnistyles(Archive);
 const ThemedPencil = withUnistyles(Pencil);
 
-const foregroundColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
+const foregroundColorMapping = (theme: Theme) => ({
+  color: theme.colors.foreground,
+});
 const foregroundMutedColorMapping = (theme: Theme) => ({
   color: theme.colors.foregroundMuted,
 });
-const redColorMapping = (theme: Theme) => ({ color: theme.colors.palette.red[500] });
-const amberColorMapping = (theme: Theme) => ({ color: theme.colors.palette.amber[500] });
-const greenColorMapping = (theme: Theme) => ({ color: theme.colors.palette.green[500] });
-const purpleColorMapping = (theme: Theme) => ({ color: theme.colors.palette.purple[500] });
+const redColorMapping = (theme: Theme) => ({
+  color: theme.colors.palette.red[500],
+});
+const amberColorMapping = (theme: Theme) => ({
+  color: theme.colors.palette.amber[500],
+});
+const greenColorMapping = (theme: Theme) => ({
+  color: theme.colors.palette.green[500],
+});
+const purpleColorMapping = (theme: Theme) => ({
+  color: theme.colors.palette.purple[500],
+});
 const syncedLoaderColorMapping = (theme: Theme) => ({
   color:
     theme.colorScheme === "light"
@@ -516,6 +530,7 @@ function ProjectRowTrailingActions({
         >
           <ProjectKebabMenu
             projectKey={project.projectKey}
+            projectPath={project.iconWorkingDir}
             onRemoveProject={onRemoveProject}
             removeProjectStatus={removeProjectStatus}
           />
@@ -533,6 +548,9 @@ const markAsReadLeadingIcon = (
 );
 const archiveLeadingIcon = <ThemedArchive size={14} uniProps={foregroundMutedColorMapping} />;
 const renameLeadingIcon = <ThemedPencil size={14} uniProps={foregroundMutedColorMapping} />;
+const openInNewWindowLeadingIcon = (
+  <ThemedExternalLink size={14} uniProps={foregroundMutedColorMapping} />
+);
 
 function renderKebabTriggerIcon({ hovered }: { hovered?: boolean }) {
   return (
@@ -545,18 +563,35 @@ function renderKebabTriggerIcon({ hovered }: { hovered?: boolean }) {
 
 function ProjectKebabMenu({
   projectKey,
+  projectPath,
   onRemoveProject,
   removeProjectStatus,
 }: {
   projectKey: string;
+  projectPath: string;
   onRemoveProject: () => void;
   removeProjectStatus: "idle" | "pending" | "success";
 }) {
+  const toast = useToast();
   const handleOpenProjectSettings = useCallback(() => {
     if (projectKey.trim().length === 0) return;
     router.navigate(buildProjectSettingsRoute(projectKey));
   }, [projectKey]);
   const canOpenProjectSettings = projectKey.trim().length > 0;
+  // Desktop-only: open a second window that lands on this project via the same
+  // open-project flow as a CLI launch. The project stays visible here too — no
+  // ownership, no move.
+  const canOpenInNewWindow = getIsElectron() && projectPath.trim().length > 0;
+  const handleOpenInNewWindow = useCallback(() => {
+    const trimmedPath = projectPath.trim();
+    if (trimmedPath.length === 0) return;
+    void getDesktopHost()
+      ?.window?.openNew?.({ pendingOpenProjectPath: trimmedPath })
+      ?.catch((error) => {
+        console.warn("[sidebar] openNew failed", error);
+        toast.error("Couldn't open a new window");
+      });
+  }, [projectPath, toast]);
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
@@ -578,6 +613,15 @@ function ProjectKebabMenu({
             Open project settings
           </DropdownMenuItem>
         ) : null}
+        {canOpenInNewWindow ? (
+          <DropdownMenuItem
+            testID={`sidebar-project-menu-open-new-window-${projectKey}`}
+            leading={openInNewWindowLeadingIcon}
+            onSelect={handleOpenInNewWindow}
+          >
+            Open in new window
+          </DropdownMenuItem>
+        ) : null}
         <DropdownMenuItem
           testID={`sidebar-project-menu-remove-${projectKey}`}
           leading={trash2LeadingIcon}
@@ -1172,17 +1216,14 @@ function ProjectHeaderRow({
     if (!serverId) {
       return;
     }
+    onWorkspacePress?.();
     router.navigate(
       buildHostNewWorkspaceRoute(serverId, project.iconWorkingDir, {
         displayName,
         projectId: project.projectKey,
       }) as Href,
     );
-    onWorkspacePress?.();
   }, [displayName, onWorkspacePress, project.iconWorkingDir, project.projectKey, serverId]);
-  const _mergeWorkspaces = useSessionStore((state) => state.mergeWorkspaces);
-  const _toast = useToast();
-
   const interaction = useLongPressDragInteraction({
     drag,
     menuController,
@@ -2402,7 +2443,10 @@ function SidebarStatusModeWrapper({
   shortcutIndexByWorkspaceKey: Map<string, number>;
   onWorkspacePress?: () => void;
 }) {
-  const hydratedWorkspaces = useStatusModeWorkspaceEntries({ serverId, projects });
+  const hydratedWorkspaces = useStatusModeWorkspaceEntries({
+    serverId,
+    projects,
+  });
   const projectNamesByKey = useProjectNamesMap(serverId);
   const showShortcutBadges = useShowShortcutBadges();
 
@@ -2463,7 +2507,10 @@ function ProjectModeList({
     [parentGestureRef],
   );
 
-  const projectIconByProjectKey = useProjectIconDataByProjectKey({ serverId, projects });
+  const projectIconByProjectKey = useProjectIconDataByProjectKey({
+    serverId,
+    projects,
+  });
 
   useEffect(() => {
     const timeouts = creatingWorkspaceTimeoutsRef.current;

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

@@ -95,6 +95,7 @@ export interface ComboboxProps {
    */
   header?: SheetHeader;
   mobileChildrenScrollEnabled?: boolean;
+  presentation?: "push" | "replace";
   open?: boolean;
   onOpenChange?: (open: boolean) => void;
   desktopPlacement?: "top-start" | "bottom-start";
@@ -965,6 +966,7 @@ interface MobileBodyProps {
   searchable: boolean;
   hasChildren: boolean;
   mobileChildrenScrollEnabled: boolean;
+  presentation?: "push" | "replace";
   searchResetKey: number;
   searchPlaceholder: string;
   searchQuery: string;
@@ -1024,6 +1026,7 @@ function MobileComboboxBody(props: MobileBodyProps): ReactElement {
       handleIndicatorStyle={props.handleIndicatorStyle}
       keyboardBehavior="extend"
       keyboardBlurBehavior="none"
+      presentation={props.presentation}
     >
       {props.header ? (
         <SheetHeaderView header={props.header} onClose={props.onClose} />
@@ -1248,6 +1251,7 @@ export function Combobox({
   title = "Select",
   header,
   mobileChildrenScrollEnabled = true,
+  presentation,
   open,
   onOpenChange,
   desktopPlacement = "top-start",
@@ -1534,6 +1538,7 @@ export function Combobox({
         searchable={searchable}
         hasChildren={hasChildren}
         mobileChildrenScrollEnabled={mobileChildrenScrollEnabled}
+        presentation={presentation}
         searchResetKey={searchResetKey}
         searchPlaceholder={effectiveSearchPlaceholder}
         searchQuery={searchQuery}

packages/app/src/components/ui/isolated-bottom-sheet-modal/index.test.tsx

@@ -0,0 +1,76 @@
+/**
+ * @vitest-environment jsdom
+ */
+import React, { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+vi.mock("@gorhom/portal", () => ({
+  Portal: ({ children, hostName }: { children?: React.ReactNode; hostName?: string }) =>
+    React.createElement("div", { "data-portal-host": hostName }, children),
+  PortalHost: ({ name }: { name?: string }) => React.createElement("div", { "data-host": name }),
+}));
+
+vi.mock("@gorhom/bottom-sheet", () => ({
+  BottomSheetModalProvider: ({ children }: { children?: React.ReactNode }) =>
+    React.createElement("div", { "data-bottom-sheet-provider": true }, children),
+  BottomSheetModal: React.forwardRef(
+    (
+      {
+        children,
+        stackBehavior,
+      }: {
+        children?: React.ReactNode;
+        stackBehavior?: string;
+      },
+      _ref,
+    ) => React.createElement("div", { "data-stack-behavior": stackBehavior }, children),
+  ),
+}));
+
+import { IsolatedBottomSheetModal } from ".";
+
+describe("IsolatedBottomSheetModal presentation", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(() => {
+    act(() => root.unmount());
+    container.remove();
+  });
+
+  it("defaults sibling top-level sheets to push instead of replacing by React ancestry", () => {
+    act(() => {
+      root.render(
+        <>
+          <IsolatedBottomSheetModal>Settings</IsolatedBottomSheetModal>
+          <IsolatedBottomSheetModal>Diagnostic</IsolatedBottomSheetModal>
+        </>,
+      );
+    });
+
+    expect(
+      Array.from(container.querySelectorAll("[data-stack-behavior]")).map((node) =>
+        node.getAttribute("data-stack-behavior"),
+      ),
+    ).toEqual(["push", "push"]);
+  });
+
+  it("only replaces when the callsite asks for replacement", () => {
+    act(() => {
+      root.render(
+        <IsolatedBottomSheetModal presentation="replace">Selector</IsolatedBottomSheetModal>,
+      );
+    });
+
+    expect(
+      container.querySelector("[data-stack-behavior]")?.getAttribute("data-stack-behavior"),
+    ).toBe("replace");
+  });
+});

packages/app/src/components/ui/isolated-bottom-sheet-modal/index.tsx

@@ -1,10 +1,8 @@
 import {
   BottomSheetModal as GorhomBottomSheetModal,
-  BottomSheetModalProvider,
   type BottomSheetModalProps,
 } from "@gorhom/bottom-sheet";
-import { Portal } from "@gorhom/portal";
-import React, { createContext, useContext } from "react";
+import React from "react";
 import { forwardRef, useCallback, useEffect, useMemo, useRef } from "react";
 import type { ElementRef } from "react";
 import {
@@ -17,50 +15,29 @@ type GorhomBottomSheetModalMethods = ElementRef<typeof GorhomBottomSheetModal>;
 type IsolatedBottomSheetModalProps = Omit<
   BottomSheetModalProps,
   "enableDismissOnClose" | "stackBehavior"
->;
+> & {
+  presentation?: "push" | "replace";
+};
 
 export type IsolatedBottomSheetModalRef = GorhomBottomSheetModalMethods;
 
-const IsolatedBottomSheetScopeContext = createContext(false);
-
 export const IsolatedBottomSheetModal = forwardRef<
   IsolatedBottomSheetModalRef,
   IsolatedBottomSheetModalProps
 >(function IsolatedBottomSheetModal(props, ref) {
-  const isNestedSheet = useContext(IsolatedBottomSheetScopeContext);
-  const { children, ...bottomSheetProps } = props;
-  const scopedChildren =
-    typeof children === "function" ? (
-      (input: { data?: unknown }) => (
-        <IsolatedBottomSheetScopeContext.Provider value={true}>
-          {children(input) as React.ReactNode}
-        </IsolatedBottomSheetScopeContext.Provider>
-      )
-    ) : (
-      <IsolatedBottomSheetScopeContext.Provider value={true}>
-        {children}
-      </IsolatedBottomSheetScopeContext.Provider>
-    );
+  const { children, presentation = "push", ...bottomSheetProps } = props;
   const modal = (
     <GorhomBottomSheetModal
       {...bottomSheetProps}
       ref={ref}
       enableDismissOnClose
-      stackBehavior={isNestedSheet ? "push" : "replace"}
+      stackBehavior={presentation}
     >
-      {scopedChildren}
+      {children}
     </GorhomBottomSheetModal>
   );
 
-  if (isNestedSheet) {
-    return modal;
-  }
-
-  return (
-    <Portal hostName="root">
-      <BottomSheetModalProvider>{modal}</BottomSheetModalProvider>
-    </Portal>
-  );
+  return modal;
 });
 
 export function useIsolatedBottomSheetVisibility({

packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.test.ts

@@ -70,17 +70,17 @@ describe("bottom sheet visibility tracker", () => {
     expect(sheet.events).toEqual([]);
   });
 
-  it("only reports a user close when the sheet was visible", () => {
+  it("does not treat index -1 as a close because stacked sheets can be hidden without dismissing", () => {
     const { sheet, tracker, closeCount } = setup();
     tracker.attachController(sheet);
     tracker.syncDesired({ visible: true });
 
     tracker.handleSheetIndexChange(-1);
-    expect(closeCount()).toBe(1);
+    expect(closeCount()).toBe(0);
 
     tracker.syncDesired({ visible: false });
     tracker.handleSheetIndexChange(-1);
-    expect(closeCount()).toBe(1);
+    expect(closeCount()).toBe(0);
   });
 
   it("reports a dismiss while visible as a close request", () => {
@@ -93,7 +93,7 @@ describe("bottom sheet visibility tracker", () => {
     expect(closeCount()).toBe(1);
   });
 
-  it("deduplicates close notifications from change and dismiss callbacks", () => {
+  it("reports close once when a hidden sheet is actually dismissed", () => {
     const { sheet, tracker, closeCount } = setup();
     tracker.attachController(sheet);
     tracker.syncDesired({ visible: true });
@@ -110,12 +110,14 @@ describe("bottom sheet visibility tracker", () => {
     tracker.syncDesired({ visible: true });
 
     tracker.handleSheetIndexChange(-1);
+    tracker.handleSheetDismiss();
     expect(closeCount()).toBe(1);
 
     tracker.syncDesired({ visible: false });
     tracker.syncDesired({ visible: true });
 
     tracker.handleSheetIndexChange(-1);
+    tracker.handleSheetDismiss();
     expect(closeCount()).toBe(2);
   });
 
@@ -128,7 +130,7 @@ describe("bottom sheet visibility tracker", () => {
     tracker.attachController(null);
     tracker.attachController(sheet);
 
-    expect(closeCount()).toBe(1);
+    expect(closeCount()).toBe(0);
     expect(sheet.events).toEqual([{ type: "present" }]);
   });
 

packages/app/src/components/ui/isolated-bottom-sheet-modal/visibility-tracker.ts

@@ -69,7 +69,7 @@ export function createBottomSheetVisibilityTracker(opts: {
     },
     handleSheetIndexChange(index) {
       if (index !== -1) {
-        if (phase === "presenting") {
+        if (phase === "presenting" || phase === "dismissing") {
           phase = "presented";
         }
         return;
@@ -77,9 +77,6 @@ export function createBottomSheetVisibilityTracker(opts: {
       if (phase === "presenting" || phase === "presented") {
         phase = "dismissing";
       }
-      if (visible) {
-        notifyClose();
-      }
     },
     handleSheetDismiss() {
       if (visible) {

packages/app/src/composer/draft/create-flow.ts

@@ -84,7 +84,7 @@ interface UseDraftAgentCreateFlowOptions<TDraftAgent, TCreateResult> {
   initialAttempt?: CreateAttempt | null;
   allowEmptyText?: boolean;
   validateBeforeSubmit?: (ctx: SubmitContext) => string | null;
-  onBeforeSubmit?: (ctx: CreateRequestContext) => void;
+  onBeforeSubmit?: (ctx: CreateRequestContext) => Promise<void> | void;
   onCreateStart?: () => void;
   createRequest: (ctx: CreateRequestContext) => Promise<CreateRequestResult<TCreateResult>>;
   buildDraftAgent: (attempt: CreateAttempt) => TDraftAgent;
@@ -168,7 +168,7 @@ export function useDraftAgentCreateFlow<TDraftAgent, TCreateResult>({
         throw error;
       }
 
-      onBeforeSubmit?.({
+      await onBeforeSubmit?.({
         attempt,
         text: attempt.text,
         images: attempt.images,

packages/app/src/composer/draft/workspace-tab.test.ts

@@ -3,8 +3,8 @@ import { describe, expect, test } from "vitest";
 import { validateDraftSubmission } from "./workspace-tab-core";
 
 const baseComposerState = {
-  providerDefinitions: [{ id: "deepseek-tui" }],
-  selectedProvider: "deepseek-tui",
+  providerDefinitions: [{ id: "codewhale" }],
+  selectedProvider: "codewhale",
   isModelLoading: false,
   effectiveModelId: "",
   availableModels: [],

packages/app/src/composer/draft/workspace-tab.tsx

@@ -441,8 +441,8 @@ export function WorkspaceDraftAgentTab({
         workspaceDirectory: draftWorkingDirectory,
         hasClient: Boolean(client),
       }),
-    onBeforeSubmit: () => {
-      void composerState.persistFormPreferences();
+    onBeforeSubmit: async () => {
+      await composerState.persistFormPreferences();
       if (isWeb) {
         (document.activeElement as HTMLElement | null)?.blur?.();
       }

packages/app/src/composer/index.tsx

@@ -170,10 +170,12 @@ function buildCancelButtonStyle(isConnected: boolean, isCancellingAgent: boolean
 function buildRealtimeVoiceButtonStyle(
   hovered: boolean | undefined,
   voiceButtonDisabled: boolean,
+  reserveLeadingSpace: boolean,
 ): object[] {
   const hoveredStyle = hovered ? styles.iconButtonHovered : undefined;
   const disabledStyle = voiceButtonDisabled ? styles.buttonDisabled : undefined;
-  return [styles.realtimeVoiceButton, hoveredStyle, disabledStyle].filter(
+  const reserveStyle = reserveLeadingSpace ? styles.realtimeVoiceButtonCompactReserve : undefined;
+  return [styles.realtimeVoiceButton, reserveStyle, hoveredStyle, disabledStyle].filter(
     (value): value is object => Boolean(value),
   );
 }
@@ -1415,8 +1417,8 @@ export function Composer({
   const voiceButtonDisabled = !isConnected || isVoiceSwitching;
   const realtimeVoiceButtonStyle = useCallback(
     (state: PressableStateCallbackType & { hovered?: boolean }) =>
-      buildRealtimeVoiceButtonStyle(state.hovered, voiceButtonDisabled),
-    [voiceButtonDisabled],
+      buildRealtimeVoiceButtonStyle(state.hovered, voiceButtonDisabled, isCompactLayout),
+    [isCompactLayout, voiceButtonDisabled],
   );
 
   const cancelButton = useMemo(
@@ -1851,6 +1853,9 @@ const styles = StyleSheet.create((theme: Theme) => ({
     alignItems: "center",
     justifyContent: "center",
   },
+  realtimeVoiceButtonCompactReserve: {
+    marginLeft: theme.spacing[1],
+  },
   realtimeVoiceButtonActive: {
     backgroundColor: theme.colors.palette.green[600],
     borderColor: theme.colors.palette.green[800],

packages/app/src/create-agent-preferences/preferences.test.ts

@@ -0,0 +1,87 @@
+import { describe, expect, it } from "vitest";
+import { CreateAgentPreferencesService } from "./service";
+import {
+  mergeCreateAgentSelectionPreferences,
+  mergeProviderPreferences,
+  parseFormPreferences,
+} from "./preferences";
+import { FakeCreateAgentPreferenceStorage } from "./test-utils/fake-preference-storage";
+
+describe("create agent preferences", () => {
+  it("keeps the selected mode after saving model and thinking", async () => {
+    const storage = new FakeCreateAgentPreferenceStorage();
+    const preferences = new CreateAgentPreferencesService(storage);
+
+    const modelWrite = preferences.update((current) =>
+      mergeProviderPreferences({
+        preferences: current,
+        provider: "codex",
+        updates: { model: "gpt-5.5", thinkingByModel: { "gpt-5.5": "high" } },
+      }),
+    );
+    await storage.nextWrite();
+
+    const modeWrite = preferences.update((current) =>
+      mergeProviderPreferences({
+        preferences: current,
+        provider: "codex",
+        updates: { mode: "full-access" },
+      }),
+    );
+
+    expect(storage.pendingWriteCount()).toBe(1);
+    storage.finishOldestWrite();
+    await modelWrite;
+
+    await storage.nextWrite();
+    storage.finishOldestWrite();
+    await modeWrite;
+
+    expect(storage.savedPreferences()).toEqual({
+      provider: "codex",
+      providerPreferences: {
+        codex: {
+          model: "gpt-5.5",
+          thinkingByModel: { "gpt-5.5": "high" },
+          mode: "full-access",
+        },
+      },
+    });
+  });
+
+  it("flushes the full create-agent selection into provider preferences", async () => {
+    const storage = new FakeCreateAgentPreferenceStorage();
+    const preferences = new CreateAgentPreferencesService(storage);
+
+    const saveSelection = preferences.update((current) =>
+      mergeCreateAgentSelectionPreferences({
+        preferences: current,
+        provider: "codex",
+        modelId: "gpt-5.5",
+        modeId: "full-access",
+        thinkingOptionId: "high",
+        featureValues: { fast_mode: true },
+      }),
+    );
+
+    await storage.nextWrite();
+    storage.finishOldestWrite();
+    await saveSelection;
+
+    expect(storage.savedPreferences()).toEqual({
+      provider: "codex",
+      providerPreferences: {
+        codex: {
+          model: "gpt-5.5",
+          mode: "full-access",
+          thinkingByModel: { "gpt-5.5": "high" },
+          featureValues: { fast_mode: true },
+        },
+      },
+    });
+  });
+
+  it("loads invalid stored preferences as empty preferences", () => {
+    expect(parseFormPreferences({ providerPreferences: { codex: { mode: 42 } } })).toEqual({});
+  });
+});

packages/app/src/create-agent-preferences/preferences.ts

@@ -0,0 +1,147 @@
+import { z } from "zod";
+import type { AgentProvider } from "@getpaseo/protocol/agent-types";
+
+export interface FavoriteModelPreference {
+  provider: string;
+  modelId: string;
+}
+
+export interface FavoriteModelRow {
+  favoriteKey: string;
+  provider: string;
+  providerLabel: string;
+  modelId: string;
+  modelLabel: string;
+  description?: string;
+}
+
+const providerPreferencesSchema = z.object({
+  model: z.string().optional(),
+  mode: z.string().optional(),
+  thinkingByModel: z.record(z.string()).optional(),
+  featureValues: z.record(z.unknown()).optional(),
+});
+
+const formPreferencesSchema = z.object({
+  provider: z.string().optional(),
+  providerPreferences: z.record(providerPreferencesSchema).optional(),
+  favoriteModels: z
+    .array(
+      z.object({
+        provider: z.string(),
+        modelId: z.string(),
+      }),
+    )
+    .optional(),
+});
+
+export type ProviderPreferences = z.infer<typeof providerPreferencesSchema>;
+export type FormPreferences = z.infer<typeof formPreferencesSchema>;
+
+export const DEFAULT_FORM_PREFERENCES: FormPreferences = {};
+
+export function parseFormPreferences(value: unknown): FormPreferences {
+  const result = formPreferencesSchema.safeParse(value);
+  return result.success ? result.data : DEFAULT_FORM_PREFERENCES;
+}
+
+export function mergeProviderPreferences(args: {
+  preferences: FormPreferences;
+  provider: AgentProvider;
+  updates: Partial<ProviderPreferences>;
+}): FormPreferences {
+  const { preferences, provider, updates } = args;
+  const existingProviderPreferences = preferences.providerPreferences ?? {};
+  const existing = existingProviderPreferences[provider] ?? {};
+  const nextThinkingByModel =
+    updates.thinkingByModel === undefined
+      ? existing.thinkingByModel
+      : {
+          ...existing.thinkingByModel,
+          ...updates.thinkingByModel,
+        };
+  const nextFeatureValues =
+    updates.featureValues === undefined
+      ? existing.featureValues
+      : {
+          ...existing.featureValues,
+          ...updates.featureValues,
+        };
+
+  return {
+    ...preferences,
+    provider,
+    providerPreferences: {
+      ...existingProviderPreferences,
+      [provider]: {
+        ...existing,
+        ...updates,
+        ...(nextThinkingByModel ? { thinkingByModel: nextThinkingByModel } : {}),
+        ...(nextFeatureValues ? { featureValues: nextFeatureValues } : {}),
+      },
+    },
+  };
+}
+
+export function mergeCreateAgentSelectionPreferences(args: {
+  preferences: FormPreferences;
+  provider: AgentProvider | null;
+  modelId?: string | null;
+  modeId?: string | null;
+  thinkingOptionId?: string | null;
+  featureValues?: Record<string, unknown>;
+}): FormPreferences {
+  if (!args.provider) {
+    return args.preferences;
+  }
+
+  const modelId = args.modelId?.trim() ?? "";
+  const modeId = args.modeId?.trim() ?? "";
+  const thinkingOptionId = args.thinkingOptionId?.trim() ?? "";
+
+  return mergeProviderPreferences({
+    preferences: args.preferences,
+    provider: args.provider,
+    updates: {
+      model: modelId || undefined,
+      mode: modeId || undefined,
+      ...(modelId && thinkingOptionId ? { thinkingByModel: { [modelId]: thinkingOptionId } } : {}),
+      ...(args.featureValues ? { featureValues: args.featureValues } : {}),
+    },
+  });
+}
+
+export function buildFavoriteModelKey(input: FavoriteModelPreference): string {
+  return `${input.provider}:${input.modelId}`;
+}
+
+export function isFavoriteModel(args: {
+  preferences: FormPreferences;
+  provider: string;
+  modelId: string;
+}): boolean {
+  const favoriteKey = buildFavoriteModelKey({ provider: args.provider, modelId: args.modelId });
+  return (args.preferences.favoriteModels ?? []).some(
+    (favorite) => buildFavoriteModelKey(favorite) === favoriteKey,
+  );
+}
+
+export function toggleFavoriteModel(args: {
+  preferences: FormPreferences;
+  provider: string;
+  modelId: string;
+}): FormPreferences {
+  const favorite = { provider: args.provider, modelId: args.modelId };
+  const favoriteKey = buildFavoriteModelKey(favorite);
+  const existingFavorites = args.preferences.favoriteModels ?? [];
+  const hasFavorite = existingFavorites.some(
+    (entry) => buildFavoriteModelKey(entry) === favoriteKey,
+  );
+
+  return {
+    ...args.preferences,
+    favoriteModels: hasFavorite
+      ? existingFavorites.filter((entry) => buildFavoriteModelKey(entry) !== favoriteKey)
+      : [...existingFavorites, favorite],
+  };
+}

packages/app/src/create-agent-preferences/service.ts

@@ -0,0 +1,62 @@
+import { AsyncStorageCreateAgentPreferenceStorage } from "./storage";
+import {
+  DEFAULT_FORM_PREFERENCES,
+  parseFormPreferences,
+  type FormPreferences,
+} from "./preferences";
+import type { CreateAgentPreferenceStorage } from "./storage";
+
+export type FormPreferenceUpdate =
+  | Partial<FormPreferences>
+  | ((current: FormPreferences) => FormPreferences);
+
+export class CreateAgentPreferencesService {
+  private preferences: FormPreferences = DEFAULT_FORM_PREFERENCES;
+  private isLoaded = false;
+  private loadPromise: Promise<FormPreferences> | null = null;
+  private writeQueue: Promise<void> = Promise.resolve();
+
+  constructor(private readonly storage: CreateAgentPreferenceStorage) {}
+
+  async load(): Promise<FormPreferences> {
+    if (this.isLoaded) {
+      return this.preferences;
+    }
+    if (!this.loadPromise) {
+      this.loadPromise = this.storage.read().then((stored) => {
+        this.preferences = parseFormPreferences(stored);
+        this.isLoaded = true;
+        return this.preferences;
+      });
+    }
+    return this.loadPromise;
+  }
+
+  async update(update: FormPreferenceUpdate): Promise<FormPreferences> {
+    const previousWrite = this.writeQueue;
+    const operation = this.applyQueuedUpdate(previousWrite, update);
+
+    this.writeQueue = operation.then(
+      () => undefined,
+      () => undefined,
+    );
+    return operation;
+  }
+
+  private async applyQueuedUpdate(
+    previousWrite: Promise<void>,
+    update: FormPreferenceUpdate,
+  ): Promise<FormPreferences> {
+    await previousWrite;
+    const current = await this.load();
+    const next = typeof update === "function" ? update(current) : { ...current, ...update };
+    this.preferences = parseFormPreferences(next);
+    this.isLoaded = true;
+    await this.storage.write(this.preferences);
+    return this.preferences;
+  }
+}
+
+export const createAgentPreferencesService = new CreateAgentPreferencesService(
+  new AsyncStorageCreateAgentPreferenceStorage(),
+);

packages/app/src/create-agent-preferences/storage.ts

@@ -0,0 +1,28 @@
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import type { FormPreferences } from "./preferences";
+
+export const CREATE_AGENT_PREFERENCES_STORAGE_KEY = "@paseo:create-agent-preferences";
+
+export interface CreateAgentPreferenceStorage {
+  read(): Promise<unknown>;
+  write(preferences: FormPreferences): Promise<void>;
+}
+
+export class AsyncStorageCreateAgentPreferenceStorage implements CreateAgentPreferenceStorage {
+  async read(): Promise<unknown> {
+    const stored = await AsyncStorage.getItem(CREATE_AGENT_PREFERENCES_STORAGE_KEY);
+    if (!stored) {
+      return null;
+    }
+
+    try {
+      return JSON.parse(stored);
+    } catch {
+      return null;
+    }
+  }
+
+  async write(preferences: FormPreferences): Promise<void> {
+    await AsyncStorage.setItem(CREATE_AGENT_PREFERENCES_STORAGE_KEY, JSON.stringify(preferences));
+  }
+}

packages/app/src/create-agent-preferences/test-utils/fake-preference-storage.ts

@@ -0,0 +1,65 @@
+import type { FormPreferences } from "../preferences";
+import type { CreateAgentPreferenceStorage } from "../storage";
+
+interface PendingWrite {
+  preferences: FormPreferences;
+  finish: () => void;
+}
+
+export class FakeCreateAgentPreferenceStorage implements CreateAgentPreferenceStorage {
+  private stored: unknown;
+  private readonly pendingWrites: PendingWrite[] = [];
+  private readonly pendingWriteWaiters: Array<(write: PendingWrite) => void> = [];
+
+  constructor(input: { stored?: unknown } = {}) {
+    this.stored = input.stored ?? null;
+  }
+
+  async read(): Promise<unknown> {
+    return this.stored;
+  }
+
+  write(preferences: FormPreferences): Promise<void> {
+    return new Promise((resolve) => {
+      const write = {
+        preferences,
+        finish: () => {
+          this.stored = clone(preferences);
+          resolve();
+        },
+      };
+      this.pendingWrites.push(write);
+      this.pendingWriteWaiters.shift()?.(write);
+    });
+  }
+
+  nextWrite(): Promise<PendingWrite> {
+    const next = this.pendingWrites[0];
+    if (next) {
+      return Promise.resolve(next);
+    }
+    return new Promise((resolve) => {
+      this.pendingWriteWaiters.push(resolve);
+    });
+  }
+
+  pendingWriteCount(): number {
+    return this.pendingWrites.length;
+  }
+
+  finishOldestWrite(): void {
+    const write = this.pendingWrites.shift();
+    if (!write) {
+      throw new Error("No pending create-agent preference write");
+    }
+    write.finish();
+  }
+
+  savedPreferences(): unknown {
+    return this.stored;
+  }
+}
+
+function clone<T>(value: T): T {
+  return JSON.parse(JSON.stringify(value)) as T;
+}

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

@@ -9,6 +9,7 @@ export interface AcpProviderCatalogEntry {
   installLink: string;
   command: readonly [string, ...string[]];
   env?: Readonly<Record<string, string>>;
+  params?: Readonly<Record<string, unknown>>;
 }
 
 const CATALOG_DATA = [
@@ -36,10 +37,10 @@ const CATALOG_DATA = [
     title: "Auggie CLI",
     description:
       "Augment Code's powerful software agent, backed by industry-leading context engine",
-    version: "0.28.0",
+    version: "0.29.0",
     iconId: "auggie",
     installLink: "https://www.augmentcode.com/",
-    command: ["npx", "-y", "@augmentcode/auggie@0.28.0", "--acp"],
+    command: ["npx", "-y", "@augmentcode/auggie@0.29.0", "--acp"],
     env: {
       AUGMENT_DISABLE_AUTO_UPDATE: "1",
     },
@@ -53,42 +54,33 @@ const CATALOG_DATA = [
     installLink: "https://www.autohand.ai/cli/",
     command: ["npx", "-y", "@autohandai/autohand-acp@0.2.1"],
   },
-  {
-    id: "claude-acp",
-    title: "Claude Agent",
-    description: "ACP wrapper for Anthropic's Claude",
-    version: "0.41.0",
-    iconId: "claude-acp",
-    installLink: "https://github.com/agentclientprotocol/claude-agent-acp",
-    command: ["npx", "-y", "@agentclientprotocol/claude-agent-acp@0.41.0"],
-  },
   {
     id: "cline",
     title: "Cline",
     description:
       "Autonomous coding agent CLI - capable of creating/editing files, running commands, using the browser, and more",
-    version: "3.0.17",
+    version: "3.0.23",
     iconId: "cline",
     installLink: "https://cline.bot/cli",
-    command: ["npx", "-y", "cline@3.0.17", "--acp"],
+    command: ["npx", "-y", "cline@3.0.23", "--acp"],
   },
   {
     id: "codebuddy-code",
     title: "Codebuddy Code",
     description: "Tencent Cloud's official intelligent coding tool",
-    version: "2.103.0",
+    version: "2.105.0",
     iconId: "codebuddy-code",
     installLink: "https://www.codebuddy.cn/cli/",
-    command: ["npx", "-y", "@tencent-ai/codebuddy-code@2.103.0", "--acp"],
+    command: ["npx", "-y", "@tencent-ai/codebuddy-code@2.105.0", "--acp"],
   },
   {
-    id: "codex-acp",
-    title: "Codex CLI",
-    description: "ACP adapter for OpenAI's coding assistant",
-    version: "0.13.0",
-    iconId: "codex-acp",
-    installLink: "https://github.com/zed-industries/codex-acp",
-    command: ["codex-acp"],
+    id: "codewhale",
+    title: "CodeWhale",
+    description: "Terminal coding agent for DeepSeek V4 and open models",
+    version: "0.8.55",
+    iconId: "codewhale",
+    installLink: "https://codewhale.net/",
+    command: ["codewhale", "serve", "--acp"],
   },
   {
     id: "cortex-code",
@@ -135,15 +127,6 @@ const CATALOG_DATA = [
     installLink: "https://docs.langchain.com/oss/javascript/deepagents/overview",
     command: ["npx", "-y", "deepagents-acp@0.1.12"],
   },
-  {
-    id: "deepseek-tui",
-    title: "DeepSeek TUI",
-    description: "Terminal coding agent for DeepSeek V4",
-    version: "0.8.39",
-    iconId: "deepseek-tui",
-    installLink: "https://github.com/Hmbown/DeepSeek-TUI",
-    command: ["deepseek", "serve", "--acp"],
-  },
   {
     id: "devin",
     title: "Devin CLI",
@@ -157,10 +140,10 @@ const CATALOG_DATA = [
     id: "dimcode",
     title: "DimCode",
     description: "A coding agent that puts leading models at your command.",
-    version: "0.0.77",
+    version: "0.1.5",
     iconId: "dimcode",
     installLink: "https://dimcode.dev/docs/acp.html",
-    command: ["npx", "-y", "dimcode@0.0.77", "acp"],
+    command: ["npx", "-y", "dimcode@0.1.5", "acp"],
   },
   {
     id: "dirac",
@@ -176,41 +159,33 @@ const CATALOG_DATA = [
     id: "factory-droid",
     title: "Factory Droid",
     description: "Factory Droid - AI coding agent powered by Factory AI",
-    version: "0.140.0",
+    version: "0.144.0",
     iconId: "factory-droid",
     installLink: "https://factory.ai/product/cli",
-    command: ["npx", "-y", "droid@0.140.0", "exec", "--output-format", "acp-daemon"],
+    command: ["npx", "-y", "droid@0.144.0", "exec", "--output-format", "acp-daemon"],
     env: {
       DROID_DISABLE_AUTO_UPDATE: "true",
       FACTORY_DROID_AUTO_UPDATE_ENABLED: "false",
     },
+    params: { supportsMcpServers: false },
   },
   {
     id: "fast-agent",
     title: "fast-agent",
     description: "Code and build agents with comprehensive multi-provider support",
-    version: "0.7.15",
+    version: "0.7.16",
     iconId: "fast-agent",
     installLink: "https://fast-agent.ai/acp/",
-    command: ["uvx", "--from", "fast-agent-acp==0.7.15", "fast-agent-acp", "-x"],
+    command: ["uvx", "--from", "fast-agent-acp==0.7.16", "fast-agent-acp", "-x"],
   },
   {
     id: "gemini",
     title: "Gemini CLI",
     description: "Google's official CLI for Gemini",
-    version: "0.45.0",
+    version: "0.46.0",
     iconId: "gemini",
     installLink: "https://geminicli.com",
-    command: ["npx", "-y", "@google/gemini-cli@0.45.0", "--acp"],
-  },
-  {
-    id: "github-copilot-cli",
-    title: "GitHub Copilot",
-    description: "GitHub's AI pair programmer",
-    version: "1.0.59",
-    iconId: "github-copilot-cli",
-    installLink: "https://github.com/features/copilot/cli/",
-    command: ["npx", "-y", "@github/copilot@1.0.59", "--acp"],
+    command: ["npx", "-y", "@google/gemini-cli@0.46.0", "--acp"],
   },
   {
     id: "glm-acp-agent",
@@ -279,11 +254,11 @@ const CATALOG_DATA = [
   },
   {
     id: "kimi",
-    title: "Kimi CLI",
-    description: "Moonshot AI's coding assistant",
-    version: "1.41.0",
+    title: "Kimi Code CLI",
+    description: "Moonshot AI's open-source terminal coding agent",
+    version: "0.11.0",
     iconId: "kimi",
-    installLink: "https://github.com/MoonshotAI/kimi-cli",
+    installLink: "https://github.com/MoonshotAI/kimi-code",
     command: ["kimi", "acp"],
   },
   {
@@ -309,28 +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.14",
+    version: "1.1.16",
     iconId: "nova",
     installLink: "https://www.compassap.ai/portfolio/nova.html",
-    command: ["npx", "-y", "@compass-ai/nova@1.1.14", "acp"],
-  },
-  {
-    id: "opencode",
-    title: "OpenCode",
-    description: "The open source coding agent",
-    version: "1.14.39",
-    iconId: "opencode",
-    installLink: "https://opencode.ai/docs/acp/",
-    command: ["opencode", "acp"],
-  },
-  {
-    id: "pi-acp",
-    title: "pi ACP",
-    description: "ACP adapter for pi coding agent",
-    version: "0.0.27",
-    iconId: "pi-acp",
-    installLink: "https://github.com/svkozak/pi-acp",
-    command: ["npx", "-y", "pi-acp@0.0.27"],
+    command: ["npx", "-y", "@compass-ai/nova@1.1.16", "acp"],
   },
   {
     id: "poolside",
@@ -345,10 +302,10 @@ const CATALOG_DATA = [
     id: "qoder",
     title: "Qoder CLI",
     description: "AI coding assistant with agentic capabilities",
-    version: "1.0.14",
+    version: "1.0.16",
     iconId: "qoder",
     installLink: "https://qoder.com",
-    command: ["npx", "-y", "@qoder-ai/qodercli@1.0.14", "--acp"],
+    command: ["npx", "-y", "@qoder-ai/qodercli@1.0.16", "--acp"],
   },
   {
     id: "qwen-code",
@@ -402,5 +359,6 @@ export const ACP_PROVIDER_CATALOG: AcpProviderCatalogEntry[] = CATALOG_DATA.map(
   installLink: entry.installLink,
   command: entry.command,
   env: "env" in entry ? entry.env : undefined,
+  params: "params" in entry ? entry.params : undefined,
   iconSvg: entry.iconId ? (ACP_PROVIDER_ICON_SVGS[entry.iconId] ?? null) : null,
 }));

packages/app/src/desktop/daemon/daemon-management-error.test.ts

@@ -0,0 +1,51 @@
+import { describe, expect, it } from "vitest";
+import {
+  DaemonConnectionRegistrationError,
+  DaemonManagementOperationError,
+  getDaemonManagementErrorPresentation,
+} from "./daemon-management-error";
+
+describe("getDaemonManagementErrorPresentation", () => {
+  it("refreshes status when the daemon started but localhost registration failed", () => {
+    const presentation = getDaemonManagementErrorPresentation(
+      new DaemonConnectionRegistrationError("Desktop daemon did not return a listen address."),
+      false,
+    );
+
+    expect(presentation).toEqual({
+      message:
+        "Built-in daemon started, but Paseo could not save the localhost connection. Toggle daemon management off and on again, or add localhost manually.",
+      refreshStatus: true,
+    });
+  });
+
+  it("does not refresh status for daemon stop failures", () => {
+    const presentation = getDaemonManagementErrorPresentation(new Error("stop failed"), true);
+
+    expect(presentation).toEqual({
+      message: "Built-in daemon management was paused, but Paseo could not stop the daemon.",
+      refreshStatus: false,
+    });
+  });
+
+  it("uses the pre-mutation daemon management state for operation failures", () => {
+    const presentation = getDaemonManagementErrorPresentation(
+      new DaemonManagementOperationError(new Error("stop failed"), true),
+      false,
+    );
+
+    expect(presentation).toEqual({
+      message: "Built-in daemon management was paused, but Paseo could not stop the daemon.",
+      refreshStatus: false,
+    });
+  });
+
+  it("does not refresh status for generic update failures", () => {
+    const presentation = getDaemonManagementErrorPresentation(new Error("settings failed"), false);
+
+    expect(presentation).toEqual({
+      message: "Unable to update built-in daemon management.",
+      refreshStatus: false,
+    });
+  });
+});

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

@@ -0,0 +1,52 @@
+export class DaemonConnectionRegistrationError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "DaemonConnectionRegistrationError";
+  }
+}
+
+export class DaemonManagementOperationError extends Error {
+  readonly originalError: Error;
+  readonly wasManagingDaemon: boolean;
+
+  constructor(error: Error, wasManagingDaemon: boolean) {
+    super(error.message);
+    this.name = error.name;
+    this.cause = error;
+    this.originalError = error;
+    this.wasManagingDaemon = wasManagingDaemon;
+  }
+}
+
+export interface DaemonManagementErrorPresentation {
+  message: string;
+  refreshStatus: boolean;
+}
+
+export function getDaemonManagementErrorPresentation(
+  error: Error,
+  isManagingDaemon: boolean,
+): DaemonManagementErrorPresentation {
+  const presentationError =
+    error instanceof DaemonManagementOperationError ? error.originalError : error;
+  const wasManagingDaemon =
+    error instanceof DaemonManagementOperationError ? error.wasManagingDaemon : isManagingDaemon;
+
+  if (presentationError instanceof DaemonConnectionRegistrationError) {
+    return {
+      message:
+        "Built-in daemon started, but Paseo could not save the localhost connection. Toggle daemon management off and on again, or add localhost manually.",
+      refreshStatus: true,
+    };
+  }
+  if (wasManagingDaemon) {
+    return {
+      message: "Built-in daemon management was paused, but Paseo could not stop the daemon.",
+      refreshStatus: false,
+    };
+  }
+  return {
+    message: "Unable to update built-in daemon management.",
+    refreshStatus: false,
+  };
+}

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

@@ -9,8 +9,15 @@ import {
   executeDaemonManagementToggle,
   type DaemonManagementToggleResult,
 } from "@/desktop/daemon/daemon-management-toggle";
+import {
+  DaemonConnectionRegistrationError,
+  DaemonManagementOperationError,
+  getDaemonManagementErrorPresentation,
+} from "@/desktop/daemon/daemon-management-error";
 import { useDesktopIpcErrorReporter } from "@/desktop/hooks/desktop-ipc-error";
 import type { DesktopSettings } from "@/desktop/settings/desktop-settings";
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
+import { upsertDesktopDaemonConnection } from "@/runtime/daemon-start-service";
 import { confirmDialog } from "@/utils/confirm-dialog";
 
 type DesktopDaemonSettings = DesktopSettings["daemon"];
@@ -37,27 +44,51 @@ export function useBuiltInDaemonManagement(
     DaemonManagementToggleResult,
     Error
   >({
-    mutationFn: () =>
-      executeDaemonManagementToggle(settings.manageBuiltInDaemon, daemonStatus, {
-        confirm: () =>
-          confirmDialog({
-            title: "Pause built-in daemon",
-            message:
-              "This will stop the built-in daemon immediately. Running agents and terminals connected to the built-in daemon will be stopped.",
-            confirmLabel: "Pause and stop",
-            cancelLabel: "Cancel",
-            destructive: true,
-          }),
-        persistSettings: (next) => updateSettings(next) as Promise<void>,
-        startDaemon: startDesktopDaemon,
-        stopDaemon: stopDesktopDaemon,
-      }),
+    mutationFn: async () => {
+      const wasManagingDaemon = settings.manageBuiltInDaemon;
+      try {
+        const result = await executeDaemonManagementToggle(wasManagingDaemon, daemonStatus, {
+          confirm: () =>
+            confirmDialog({
+              title: "Pause built-in daemon",
+              message:
+                "This will stop the built-in daemon immediately. Running agents and terminals connected to the built-in daemon will be stopped.",
+              confirmLabel: "Pause and stop",
+              cancelLabel: "Cancel",
+              destructive: true,
+            }),
+          persistSettings: (next) => updateSettings(next) as Promise<void>,
+          startDaemon: startDesktopDaemon,
+          stopDaemon: stopDesktopDaemon,
+        });
+        if (result.kind === "enabled") {
+          const upsertResult = await upsertDesktopDaemonConnection(
+            getHostRuntimeStore(),
+            result.newStatus,
+          );
+          if (!upsertResult.ok) {
+            throw new DaemonConnectionRegistrationError(upsertResult.error);
+          }
+        }
+        return result;
+      } catch (error) {
+        throw new DaemonManagementOperationError(
+          error instanceof Error ? error : new Error(String(error)),
+          wasManagingDaemon,
+        );
+      }
+    },
     onError: (error) => {
+      const presentation = getDaemonManagementErrorPresentation(
+        error,
+        settings.manageBuiltInDaemon,
+      );
+      if (presentation.refreshStatus) {
+        refreshStatus();
+      }
       reportError({
         error,
-        message: settings.manageBuiltInDaemon
-          ? "Built-in daemon management was paused, but Paseo could not stop the daemon."
-          : "Unable to update built-in daemon management.",
+        message: presentation.message,
         logLabel: "[Settings] Failed to update built-in daemon management",
       });
     },

packages/app/src/desktop/host.ts

@@ -98,6 +98,7 @@ export interface DesktopWindowBridge {
 }
 
 export interface DesktopWindowModuleBridge {
+  openNew?: (options?: { pendingOpenProjectPath?: string | null }) => Promise<void>;
   getCurrentWindow?: () => DesktopWindowBridge;
 }
 
@@ -110,6 +111,11 @@ export interface DesktopBrowserShortcutEvent {
   action: "focus-url";
 }
 
+export interface DesktopBrowserNewTabRequestEvent {
+  sourceBrowserId: string;
+  url: string;
+}
+
 export interface DesktopBrowserBridge {
   setWorkspaceActiveBrowser?: (browserId: string | null) => Promise<void>;
   openDevTools?: (browserId: string) => Promise<unknown>;

packages/app/src/desktop/updates/desktop-app-updater.test.ts

@@ -38,13 +38,22 @@ function createUpdater(
 }
 
 describe("desktop app updater — check", () => {
-  it("forwards the requested release channel to the port", async () => {
+  it("forwards manual check intent and the requested release channel to the port", async () => {
     const { updater, port } = createUpdater();
     port.nextCheckResult(buildFakeCheckResult());
 
     await updater.checkForUpdates({ releaseChannel: "beta" });
 
-    expect(port.recordedChecks).toEqual([{ releaseChannel: "beta" }]);
+    expect(port.recordedChecks).toEqual([{ releaseChannel: "beta", intent: "manual" }]);
+  });
+
+  it("forwards automatic check intent independently from silent UI state", async () => {
+    const { updater, port } = createUpdater();
+    port.nextCheckResult(buildFakeCheckResult());
+
+    await updater.checkForUpdates({ releaseChannel: "stable", intent: "automatic", silent: true });
+
+    expect(port.recordedChecks).toEqual([{ releaseChannel: "stable", intent: "automatic" }]);
   });
 
   it("moves to 'checking' during a non-silent check", async () => {
@@ -66,7 +75,11 @@ describe("desktop app updater — check", () => {
     expect(updater.getSnapshot().status).toBe("available");
 
     const deferred = port.deferNextCheck();
-    const pending = updater.checkForUpdates({ releaseChannel: "stable", silent: true });
+    const pending = updater.checkForUpdates({
+      releaseChannel: "stable",
+      intent: "automatic",
+      silent: true,
+    });
     expect(updater.getSnapshot().status).toBe("available");
 
     deferred.resolve(buildFakeCheckResult({ hasUpdate: true, readyToInstall: true }));
@@ -128,7 +141,7 @@ describe("desktop app updater — check", () => {
     const statusBeforeSilent = updater.getSnapshot().status;
 
     port.failNextCheck(new Error("boom"));
-    await updater.checkForUpdates({ releaseChannel: "stable", silent: true });
+    await updater.checkForUpdates({ releaseChannel: "stable", intent: "automatic", silent: true });
 
     expect(updater.getSnapshot().status).toBe(statusBeforeSilent);
   });
@@ -226,6 +239,20 @@ describe("desktop app updater — subscribe", () => {
 describe("formatStatusText", () => {
   const formatVersion = (version: string | null | undefined) =>
     version ? `v${version.replace(/^v/i, "")}` : "\u2014";
+  const formatLastCheckedAt = (timestamp: number) => `time-${timestamp}`;
+
+  it("shows when an up-to-date check completed", () => {
+    expect(
+      formatStatusText({
+        status: "up-to-date",
+        availableUpdate: null,
+        installMessage: null,
+        lastCheckedAt: 42,
+        formatVersion,
+        formatLastCheckedAt,
+      }),
+    ).toBe("Up to date. Last checked at time-42.");
+  });
 
   it("uses the latest version in the 'available' message when present", () => {
     expect(
@@ -233,7 +260,9 @@ describe("formatStatusText", () => {
         status: "available",
         availableUpdate: buildFakeCheckResult({ latestVersion: "1.2.3" }),
         installMessage: null,
+        lastCheckedAt: null,
         formatVersion,
+        formatLastCheckedAt,
       }),
     ).toBe("Update ready: v1.2.3");
   });
@@ -244,7 +273,9 @@ describe("formatStatusText", () => {
         status: "available",
         availableUpdate: null,
         installMessage: null,
+        lastCheckedAt: null,
         formatVersion,
+        formatLastCheckedAt,
       }),
     ).toBe("An app update is ready to install.");
   });
@@ -255,7 +286,9 @@ describe("formatStatusText", () => {
         status: "installed",
         availableUpdate: null,
         installMessage: "Restart now",
+        lastCheckedAt: null,
         formatVersion,
+        formatLastCheckedAt,
       }),
     ).toBe("Restart now");
   });

packages/app/src/desktop/updates/desktop-app-updater.ts

@@ -1,5 +1,6 @@
 import type {
   DesktopAppUpdateCheckResult,
+  DesktopAppUpdateCheckIntent,
   DesktopAppUpdateInstallResult,
   DesktopReleaseChannel,
 } from "@/desktop/updates/desktop-updates";
@@ -29,6 +30,7 @@ export interface DesktopAppUpdaterSnapshot {
 export interface DesktopAppUpdaterPort {
   checkDesktopAppUpdate(input: {
     releaseChannel: DesktopReleaseChannel;
+    intent: DesktopAppUpdateCheckIntent;
   }): Promise<DesktopAppUpdateCheckResult>;
   installDesktopAppUpdate(input: {
     releaseChannel: DesktopReleaseChannel;
@@ -52,6 +54,7 @@ export interface DesktopAppUpdater {
   subscribe(listener: () => void): () => void;
   checkForUpdates(options?: {
     releaseChannel: DesktopReleaseChannel;
+    intent?: DesktopAppUpdateCheckIntent;
     silent?: boolean;
   }): Promise<DesktopAppUpdateCheckResult | null>;
   installUpdate(options: {
@@ -102,9 +105,18 @@ export function formatStatusText(input: {
   status: DesktopAppUpdateStatus;
   availableUpdate: DesktopAppUpdateCheckResult | null;
   installMessage: string | null;
+  lastCheckedAt: number | null;
   formatVersion: (version: string | null | undefined) => string;
+  formatLastCheckedAt: (timestamp: number) => string;
 }): string {
-  const { status, availableUpdate, installMessage, formatVersion } = input;
+  const {
+    status,
+    availableUpdate,
+    installMessage,
+    lastCheckedAt,
+    formatVersion,
+    formatLastCheckedAt,
+  } = input;
 
   if (status === "checking") {
     return "Checking for app updates...";
@@ -115,7 +127,10 @@ export function formatStatusText(input: {
   }
 
   if (status === "up-to-date") {
-    return "App is up to date.";
+    if (lastCheckedAt != null) {
+      return `Up to date. Last checked at ${formatLastCheckedAt(lastCheckedAt)}.`;
+    }
+    return "Up to date.";
   }
 
   if (status === "pending") {
@@ -155,12 +170,13 @@ export function createDesktopAppUpdater(deps: DesktopAppUpdaterDeps): DesktopApp
 
   async function checkForUpdates(options?: {
     releaseChannel: DesktopReleaseChannel;
+    intent?: DesktopAppUpdateCheckIntent;
     silent?: boolean;
   }): Promise<DesktopAppUpdateCheckResult | null> {
     if (!options) {
       return null;
     }
-    const { releaseChannel, silent = false } = options;
+    const { releaseChannel, intent = "manual", silent = false } = options;
     const requestVersion = state.requestVersion + 1;
 
     commit({
@@ -171,7 +187,7 @@ export function createDesktopAppUpdater(deps: DesktopAppUpdaterDeps): DesktopApp
     });
 
     try {
-      const result = await deps.port.checkDesktopAppUpdate({ releaseChannel });
+      const result = await deps.port.checkDesktopAppUpdate({ releaseChannel, intent });
       if (requestVersion !== state.requestVersion) {
         return result;
       }

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

@@ -23,6 +23,7 @@ export interface DesktopRuntimeInfo {
 }
 
 export type DesktopReleaseChannel = "stable" | "beta";
+export type DesktopAppUpdateCheckIntent = "automatic" | "manual";
 
 export interface LocalDaemonUpdateResult {
   exitCode: number;
@@ -99,10 +100,15 @@ export async function getDesktopRuntimeInfo(): Promise<DesktopRuntimeInfo> {
 
 export async function checkDesktopAppUpdate({
   releaseChannel,
+  intent,
 }: {
   releaseChannel: DesktopReleaseChannel;
+  intent: DesktopAppUpdateCheckIntent;
 }): Promise<DesktopAppUpdateCheckResult> {
-  const result = await invokeDesktopCommand<unknown>("check_app_update", { releaseChannel });
+  const result = await invokeDesktopCommand<unknown>("check_app_update", {
+    releaseChannel,
+    intent,
+  });
   if (!isRecord(result)) {
     throw new Error("Unexpected response while checking desktop updates.");
   }

packages/app/src/desktop/updates/test-utils/fake-desktop-app-updater-port.ts

@@ -1,12 +1,16 @@
 import type {
   DesktopAppUpdateCheckResult,
+  DesktopAppUpdateCheckIntent,
   DesktopAppUpdateInstallResult,
   DesktopReleaseChannel,
 } from "@/desktop/updates/desktop-updates";
 import type { DesktopAppUpdaterPort } from "@/desktop/updates/desktop-app-updater";
 
 export interface FakeDesktopAppUpdaterPort extends DesktopAppUpdaterPort {
-  readonly recordedChecks: Array<{ releaseChannel: DesktopReleaseChannel }>;
+  readonly recordedChecks: Array<{
+    releaseChannel: DesktopReleaseChannel;
+    intent: DesktopAppUpdateCheckIntent;
+  }>;
   readonly recordedInstalls: Array<{ releaseChannel: DesktopReleaseChannel }>;
   nextCheckResult(result: DesktopAppUpdateCheckResult): void;
   deferNextCheck(): {
@@ -53,7 +57,10 @@ function buildInstallResult(
 }
 
 export function createFakeDesktopAppUpdaterPort(): FakeDesktopAppUpdaterPort {
-  const recordedChecks: Array<{ releaseChannel: DesktopReleaseChannel }> = [];
+  const recordedChecks: Array<{
+    releaseChannel: DesktopReleaseChannel;
+    intent: DesktopAppUpdateCheckIntent;
+  }> = [];
   const recordedInstalls: Array<{ releaseChannel: DesktopReleaseChannel }> = [];
   const checkOutcomes: CheckOutcome[] = [];
   const installOutcomes: InstallOutcome[] = [];

packages/app/src/desktop/updates/update-callout-source.tsx

@@ -62,10 +62,10 @@ export function UpdateCalloutSource() {
   useEffect(() => {
     if (!isDesktopApp) return;
 
-    void checkForUpdates({ silent: true });
+    void checkForUpdates({ intent: "automatic", silent: true });
 
     intervalRef.current = setInterval(() => {
-      void checkForUpdates({ silent: true });
+      void checkForUpdates({ intent: "automatic", silent: true });
     }, CHECK_INTERVAL_MS);
 
     return () => {

packages/app/src/desktop/updates/use-desktop-app-updater.ts

@@ -5,6 +5,7 @@ import {
   installDesktopAppUpdate,
   shouldShowDesktopUpdateSection,
   type DesktopAppUpdateCheckResult,
+  type DesktopAppUpdateCheckIntent,
   type DesktopAppUpdateInstallResult,
 } from "@/desktop/updates/desktop-updates";
 import { useDesktopSettings } from "@/desktop/settings/desktop-settings";
@@ -15,6 +16,7 @@ import {
   formatStatusText,
   type DesktopAppUpdateStatus,
 } from "@/desktop/updates/desktop-app-updater";
+import { formatMessageTimestamp } from "@/utils/time";
 
 export type { DesktopAppUpdateStatus };
 
@@ -27,7 +29,10 @@ export interface UseDesktopAppUpdaterReturn {
   lastCheckedAt: number | null;
   isChecking: boolean;
   isInstalling: boolean;
-  checkForUpdates: (options?: { silent?: boolean }) => Promise<DesktopAppUpdateCheckResult | null>;
+  checkForUpdates: (options?: {
+    intent?: DesktopAppUpdateCheckIntent;
+    silent?: boolean;
+  }) => Promise<DesktopAppUpdateCheckResult | null>;
   installUpdate: () => Promise<DesktopAppUpdateInstallResult | null>;
 }
 
@@ -57,11 +62,15 @@ export function useDesktopAppUpdater(): UseDesktopAppUpdaterReturn {
   );
 
   const checkForUpdates = useCallback(
-    async (options: { silent?: boolean } = {}) => {
+    async (options: { intent?: DesktopAppUpdateCheckIntent; silent?: boolean } = {}) => {
       if (!isDesktopApp) {
         return null;
       }
-      return updater.checkForUpdates({ releaseChannel, silent: options.silent });
+      return updater.checkForUpdates({
+        releaseChannel,
+        intent: options.intent ?? "manual",
+        silent: options.silent,
+      });
     },
     [isDesktopApp, releaseChannel, updater],
   );
@@ -77,7 +86,7 @@ export function useDesktopAppUpdater(): UseDesktopAppUpdaterReturn {
     if (!isDesktopApp) {
       return;
     }
-    void checkForUpdates({ silent: true });
+    void checkForUpdates({ intent: "automatic", silent: true });
   }, [checkForUpdates, isDesktopApp]);
 
   useEffect(() => {
@@ -86,7 +95,7 @@ export function useDesktopAppUpdater(): UseDesktopAppUpdaterReturn {
     }
 
     const intervalId = setInterval(() => {
-      void checkForUpdates({ silent: true });
+      void checkForUpdates({ intent: "automatic", silent: true });
     }, PENDING_RECHECK_MS);
 
     return () => {
@@ -101,7 +110,9 @@ export function useDesktopAppUpdater(): UseDesktopAppUpdaterReturn {
       status: snapshot.status,
       availableUpdate: snapshot.availableUpdate,
       installMessage: snapshot.installMessage,
+      lastCheckedAt: snapshot.lastCheckedAt,
       formatVersion: formatVersionWithPrefix,
+      formatLastCheckedAt: (timestamp) => formatMessageTimestamp(new Date(timestamp)),
     }),
     availableUpdate: snapshot.availableUpdate,
     errorMessage: snapshot.errorMessage,

packages/app/src/git/policy.test.ts

@@ -49,7 +49,7 @@ function createInput(overrides: Partial<BuildGitActionsInput> = {}): BuildGitAct
     aheadOfOrigin: 0,
     behindOfOrigin: 0,
     shouldPromoteArchive: false,
-    shipDefault: "merge",
+    shipDefault: "pr",
     runtime: {
       commit: {
         disabled: false,
@@ -166,6 +166,25 @@ describe("git-actions-policy", () => {
     });
   });
 
+  it("keeps push available for a no-upstream Paseo worktree with local commits", () => {
+    const actions = buildGitActions(
+      createInput({
+        hasRemote: true,
+        isPaseoOwnedWorktree: true,
+        isOnBaseBranch: false,
+        aheadCount: 1,
+        aheadOfOrigin: null,
+        behindOfOrigin: null,
+      }),
+    );
+    const pushAction = actions.secondary.find((action) => action.id === "push");
+
+    expect(pushAction).toMatchObject({
+      disabled: false,
+      unavailableMessage: undefined,
+    });
+  });
+
   it("shows update-from-base only on feature branches that are behind the base branch", () => {
     const actions = buildGitActions(
       createInput({
@@ -252,6 +271,38 @@ describe("git-actions-policy", () => {
     });
   });
 
+  it("keeps pull-and-push unavailable when the branch only has outgoing commits", () => {
+    const actions = buildGitActions(
+      createInput({
+        hasRemote: true,
+        aheadOfOrigin: 2,
+        behindOfOrigin: 0,
+      }),
+    );
+    const action = actions.secondary.find((entry) => entry.id === "pull-and-push");
+
+    expect(action).toMatchObject({
+      label: "Pull and push",
+      unavailableMessage: expect.any(String),
+    });
+  });
+
+  it("keeps pull-and-push unavailable when the branch only has incoming commits", () => {
+    const actions = buildGitActions(
+      createInput({
+        hasRemote: true,
+        aheadOfOrigin: 0,
+        behindOfOrigin: 2,
+      }),
+    );
+    const action = actions.secondary.find((entry) => entry.id === "pull-and-push");
+
+    expect(action).toMatchObject({
+      label: "Pull and push",
+      unavailableMessage: expect.any(String),
+    });
+  });
+
   it("explains why pull-and-push is unavailable when the branch is in sync", () => {
     const actions = buildGitActions(createInput({ hasRemote: true }));
     const action = actions.secondary.find((entry) => entry.id === "pull-and-push");
@@ -387,13 +438,31 @@ describe("git-actions-policy", () => {
     });
   });
 
-  it("promotes local merge over update-from-base", () => {
+  it("promotes Create PR over push and local merge when PR is the ship default", () => {
+    const actions = buildGitActions(
+      createInput({
+        hasRemote: true,
+        isOnBaseBranch: false,
+        aheadCount: 2,
+        aheadOfOrigin: 2,
+        behindBaseCount: 3,
+      }),
+    );
+
+    expect(actions.primary).toMatchObject({
+      id: "pr",
+      label: "Create PR",
+    });
+  });
+
+  it("uses local merge when merge is the stored ship default", () => {
     const actions = buildGitActions(
       createInput({
         hasRemote: true,
         isOnBaseBranch: false,
         aheadCount: 2,
         behindBaseCount: 3,
+        shipDefault: "merge",
       }),
     );
 
@@ -665,7 +734,7 @@ describe("git-actions-policy", () => {
       }),
     );
 
-    expect(actions.primary).toMatchObject({ id: "merge-branch", label: "Merge locally" });
+    expect(actions.primary).toMatchObject({ id: "pr", label: "View PR" });
     expect(actions.secondary.some((action) => action.id.startsWith("enable-pr-auto-merge"))).toBe(
       false,
     );
@@ -766,7 +835,7 @@ describe("git-actions-policy", () => {
       }),
     );
 
-    expect(actions.primary).toMatchObject({ id: "merge-branch", label: "Merge locally" });
+    expect(actions.primary).toMatchObject({ id: "pr", label: "View PR" });
     expect(
       actions.secondary.some((action) =>
         ["merge-pr-squash", "merge-pr-merge", "merge-pr-rebase"].includes(action.id),

packages/app/src/git/policy.ts

@@ -70,8 +70,8 @@ export interface BuildGitActionsInput {
   baseRefLabel: string;
   aheadCount: number;
   behindBaseCount: number;
-  aheadOfOrigin: number;
-  behindOfOrigin: number;
+  aheadOfOrigin: number | null;
+  behindOfOrigin: number | null;
   shouldPromoteArchive: boolean;
   shipDefault: "merge" | "pr";
   runtime: Record<GitActionId, GitActionRuntimeState>;
@@ -333,9 +333,6 @@ function getPrimaryActionId(input: BuildGitActionsInput): GitActionId | null {
   if (canPull(input)) {
     return "pull";
   }
-  if (canPush(input)) {
-    return "push";
-  }
   if (canMergePr(input)) {
     return getDefaultDirectPullRequestMergeActionId(input);
   }
@@ -345,6 +342,12 @@ function getPrimaryActionId(input: BuildGitActionsInput): GitActionId | null {
   if (hasEnabledPrAutoMerge(input)) {
     return "pr";
   }
+  if (input.shipDefault === "pr" && canUsePullRequestActionAsShipDefault(input)) {
+    return "pr";
+  }
+  if (canPush(input)) {
+    return "push";
+  }
   if (!input.isOnBaseBranch && input.aheadCount > 0) {
     return "merge-branch";
   }
@@ -486,11 +489,20 @@ function buildDisablePullRequestAutoMergeAction(input: BuildGitActionsInput): Gi
 }
 
 function canPull(input: BuildGitActionsInput): boolean {
-  return input.hasRemote && !input.hasUncommittedChanges && input.behindOfOrigin > 0;
+  return input.hasRemote && !input.hasUncommittedChanges && (input.behindOfOrigin ?? 0) > 0;
 }
 
 function canPush(input: BuildGitActionsInput): boolean {
-  return input.hasRemote && input.aheadOfOrigin > 0 && input.behindOfOrigin === 0;
+  return input.hasRemote && hasPushableCommits(input) && (input.behindOfOrigin ?? 0) === 0;
+}
+
+function hasPushableCommits(input: BuildGitActionsInput): boolean {
+  if ((input.aheadOfOrigin ?? 0) > 0) {
+    return true;
+  }
+  // No-upstream Paseo worktrees are first-pushable: the daemon push sets upstream with `git push -u`.
+  // Do not fold this into aheadOfOrigin; null also covers deleted/pruned upstream branches.
+  return input.isPaseoOwnedWorktree && input.aheadOfOrigin === null && input.aheadCount > 0;
 }
 
 function canMergeFromBase(input: BuildGitActionsInput): boolean {
@@ -502,6 +514,16 @@ function canMergeFromBase(input: BuildGitActionsInput): boolean {
   );
 }
 
+function canUsePullRequestActionAsShipDefault(input: BuildGitActionsInput): boolean {
+  if (input.isOnBaseBranch || !input.githubFeaturesEnabled) {
+    return false;
+  }
+  if (input.hasPullRequest) {
+    return input.pullRequestUrl !== null;
+  }
+  return input.aheadCount > 0;
+}
+
 function canMergePr(input: BuildGitActionsInput): boolean {
   const github = input.pullRequestGithub;
   const canMergeFromPullRequestStatus =
@@ -574,6 +596,9 @@ function getPullUnavailableMessage(input: BuildGitActionsInput): string | undefi
   if (input.hasUncommittedChanges) {
     return "Pull isn't available while you have local changes so commit or stash them first";
   }
+  if (input.behindOfOrigin === null) {
+    return "Pull isn't available here because this branch is not connected to a remote yet";
+  }
   if (input.behindOfOrigin === 0) {
     return "Pull isn't available because this branch is already up to date";
   }
@@ -584,10 +609,10 @@ function getPushUnavailableMessage(input: BuildGitActionsInput): string | undefi
   if (!input.hasRemote) {
     return "Push isn't available here because this branch is not connected to a remote yet";
   }
-  if (input.behindOfOrigin > 0) {
+  if ((input.behindOfOrigin ?? 0) > 0) {
     return "Push isn't available yet because there are newer changes to bring in first";
   }
-  if (input.aheadOfOrigin === 0) {
+  if (!hasPushableCommits(input)) {
     return "Push isn't available because there is nothing new to send";
   }
   return undefined;
@@ -600,9 +625,18 @@ function getPullAndPushUnavailableMessage(input: BuildGitActionsInput): string |
   if (input.hasUncommittedChanges) {
     return "Pull and push isn't available while you have local changes so commit or stash them first";
   }
+  if (input.behindOfOrigin === null) {
+    return "Pull and push isn't available because there are no incoming changes to pull first";
+  }
   if (input.behindOfOrigin === 0 && input.aheadOfOrigin === 0) {
     return "Pull and push isn't available because this branch is already in sync";
   }
+  if (input.behindOfOrigin === 0) {
+    return "Pull and push isn't available because there are no incoming changes to pull first";
+  }
+  if ((input.aheadOfOrigin ?? 0) === 0) {
+    return "Pull and push isn't available because there is nothing new to send after pulling";
+  }
   return undefined;
 }
 

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

@@ -59,8 +59,8 @@ interface DerivedGitActionsState {
   actionsDisabled: boolean;
   aheadCount: number;
   behindBaseCount: number;
-  aheadOfOrigin: number;
-  behindOfOrigin: number;
+  aheadOfOrigin: number | null;
+  behindOfOrigin: number | null;
   hasPullRequest: boolean;
   hasRemote: boolean;
   isPaseoOwnedWorktree: boolean;
@@ -71,16 +71,16 @@ interface DerivedGitActionsState {
 interface GitCommitCounts {
   aheadCount: number;
   behindBaseCount: number;
-  aheadOfOrigin: number;
-  behindOfOrigin: number;
+  aheadOfOrigin: number | null;
+  behindOfOrigin: number | null;
 }
 
 function extractGitCommitCounts(gitStatus: CheckoutStatusPayload | null): GitCommitCounts {
   return {
     aheadCount: gitStatus?.aheadBehind?.ahead ?? 0,
     behindBaseCount: gitStatus?.aheadBehind?.behind ?? 0,
-    aheadOfOrigin: gitStatus?.aheadOfOrigin ?? 0,
-    behindOfOrigin: gitStatus?.behindOfOrigin ?? 0,
+    aheadOfOrigin: gitStatus?.aheadOfOrigin ?? null,
+    behindOfOrigin: gitStatus?.behindOfOrigin ?? null,
   };
 }
 
@@ -155,7 +155,7 @@ interface UseGitActionsResult {
 export function useGitActions({ serverId, cwd, icons }: UseGitActionsInput): UseGitActionsResult {
   const toast = useToast();
   const [postShipArchiveSuggested, setPostShipArchiveSuggested] = useState(false);
-  const [shipDefault, setShipDefault] = useState<"merge" | "pr">("merge");
+  const [shipDefault, setShipDefault] = useState<"merge" | "pr">("pr");
 
   const { status, isLoading: isStatusLoading } = useCheckoutStatusQuery({ serverId, cwd });
   const gitStatus = status && status.isGit ? status : null;
@@ -186,15 +186,19 @@ export function useGitActions({ serverId, cwd, icons }: UseGitActionsInput): Use
 
   useEffect(() => {
     if (!shipDefaultStorageKey) {
+      setShipDefault("pr");
       return;
     }
     let isActive = true;
+    setShipDefault("pr");
     AsyncStorage.getItem(shipDefaultStorageKey)
       .then((value) => {
         if (!isActive) return;
         if (value === "pr" || value === "merge") {
           setShipDefault(value);
+          return;
         }
+        setShipDefault("pr");
         return;
       })
       .catch(() => undefined);
@@ -210,7 +214,7 @@ export function useGitActions({ serverId, cwd, icons }: UseGitActionsInput): Use
       try {
         await AsyncStorage.setItem(shipDefaultStorageKey, next);
       } catch {
-        // Ignore persistence failures; default will reset to "merge".
+        // Ignore persistence failures; default will reset to "pr".
       }
     },
     [shipDefaultStorageKey],

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

@@ -39,4 +39,13 @@ describe("providers snapshot query scope", () => {
       providers: ["codex"],
     });
   });
+
+  it("uses one query scope for Windows cwd values with either separator", () => {
+    expect(normalizeProvidersSnapshotCwd("C:\\Users\\Ezekiel Bulver\\project")).toBe(
+      "C:/Users/Ezekiel Bulver/project",
+    );
+    expect(providersSnapshotQueryKey("server-1", "C:\\Users\\Ezekiel Bulver\\project")).toEqual(
+      providersSnapshotQueryKey("server-1", "C:/Users/Ezekiel Bulver/project"),
+    );
+  });
 });

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

@@ -1,10 +1,10 @@
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
+import { normalizeWorkspacePath } from "@/utils/workspace-identity";
 
 export const PROVIDERS_SNAPSHOT_QUERY_ROOT = "providersSnapshot";
 
 export function normalizeProvidersSnapshotCwd(cwd?: string | null): string | null {
-  const trimmed = cwd?.trim();
-  return trimmed ? trimmed : null;
+  return normalizeWorkspacePath(cwd);
 }
 
 export function providersSnapshotQueryRoot(serverId: string | null) {

packages/app/src/hooks/use-acp-provider-catalog.test.ts

@@ -37,7 +37,7 @@ describe("ACP provider catalog", () => {
   it("uses PATH commands for entries that were binary distributions upstream", () => {
     expect(findProvider("amp-acp").command).toEqual(["amp-acp"]);
     expect(findProvider("cursor").command).toEqual(["cursor-agent", "acp"]);
-    expect(findProvider("deepseek-tui").command).toEqual(["deepseek", "serve", "--acp"]);
+    expect(findProvider("codewhale").command).toEqual(["codewhale", "serve", "--acp"]);
     expect(findProvider("devin").command).toEqual(["devin", "acp"]);
     expect(findProvider("goose").command).toEqual(["goose", "acp"]);
     expect(findProvider("junie").command).toEqual(["junie", "--acp", "true"]);
@@ -66,4 +66,12 @@ describe("ACP provider catalog", () => {
       AUGMENT_DISABLE_AUTO_UPDATE: "1",
     });
   });
+
+  it("preserves provider params in the daemon config patch", () => {
+    const droidPatch = buildAcpProviderConfigPatch(findProvider("factory-droid"));
+
+    expect(droidPatch.providers?.["factory-droid"]?.params).toEqual({
+      supportsMcpServers: false,
+    });
+  });
 });

packages/app/src/hooks/use-acp-provider-catalog.ts

@@ -19,6 +19,7 @@ export function buildAcpProviderConfigPatch(
         description: entry.description,
         command: [...entry.command],
         env: entry.env ? { ...entry.env } : {},
+        ...(entry.params ? { params: { ...entry.params } } : {}),
       },
     },
   };

packages/app/src/hooks/use-agent-autocomplete.ts

@@ -11,7 +11,13 @@ import { useAutocomplete } from "./use-autocomplete";
 import { useSessionStore } from "@/stores/session-store";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { CLIENT_SLASH_COMMANDS, type ClientSlashCommand } from "@/client-slash-commands";
-import { filterAndRankCommandAutocompleteEntries } from "@/utils/agent-command-autocomplete";
+import {
+  applySlashCommandReplacement,
+  filterAndRankCommandAutocompleteEntries,
+  filterInlineSkillCommandEntries,
+  findActiveSlashCommand,
+  type SlashCommandRange,
+} from "@/utils/agent-command-autocomplete";
 import {
   applyFileMentionReplacement,
   findActiveFileMention,
@@ -133,6 +139,63 @@ function mapCommandToOption(entry: AvailableCommand): AgentAutocompleteOption {
 
 type AutocompleteMode = "command" | "file" | null;
 
+interface BuildAutocompleteOptionsInput {
+  isVisible: boolean;
+  mode: AutocompleteMode;
+  commands: AgentSlashCommand[];
+  isDraftContext: boolean;
+  commandFilterQuery: string;
+  activeSlashCommand: SlashCommandRange | null;
+  activeFileMention: FileMentionRange | null;
+  fileSuggestions: DirectorySuggestionEntry[];
+}
+
+function buildCommandAutocompleteOptions(input: BuildAutocompleteOptionsInput) {
+  if (!input.isVisible) {
+    return [];
+  }
+
+  if (input.mode === "command") {
+    const providerCommands = input.commands.map(
+      (command): AvailableCommand => ({ source: "provider", command }),
+    );
+    const clientCommandNames = new Set(CLIENT_SLASH_COMMANDS.map((command) => command.name));
+    const rootCommands: AvailableCommand[] = input.isDraftContext
+      ? providerCommands
+      : [
+          ...CLIENT_SLASH_COMMANDS.map(
+            (command): AvailableCommand => ({ source: "client", command }),
+          ),
+          ...providerCommands.filter((entry) => !clientCommandNames.has(entry.command.name)),
+        ];
+    const availableCommands =
+      input.activeSlashCommand?.position === "inline"
+        ? filterInlineSkillCommandEntries(providerCommands)
+        : rootCommands;
+    const matches = filterAndRankCommandAutocompleteEntries(
+      availableCommands,
+      input.commandFilterQuery,
+    );
+    const orderedMatches = orderAutocompleteOptions(matches);
+    return orderedMatches.map(mapCommandToOption);
+  }
+
+  const activeFileMention = input.activeFileMention;
+  if (input.mode === "file" && activeFileMention) {
+    const orderedEntries = orderAutocompleteOptions(input.fileSuggestions);
+    return orderedEntries.map((entry) => ({
+      type: "workspace_entry" as const,
+      id: `${entry.kind}:${entry.path}`,
+      label: entry.path,
+      kind: entry.kind,
+      entryPath: entry.path,
+      mention: activeFileMention,
+    }));
+  }
+
+  return [];
+}
+
 function resolveAutocompleteMode(args: {
   showFileAutocomplete: boolean;
   showCommandAutocomplete: boolean;
@@ -161,6 +224,17 @@ function resolveAutocompleteIsVisible(args: {
   return false;
 }
 
+function resolveCanLoadCommands(args: {
+  serverId: string;
+  agentId: string;
+  isDraftContext: boolean;
+}): boolean {
+  if (!args.serverId) {
+    return false;
+  }
+  return Boolean(args.agentId) || args.isDraftContext;
+}
+
 function resolveAutocompleteIsLoading(args: {
   mode: AutocompleteMode;
   isCommandsLoading: boolean;
@@ -209,8 +283,16 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
     canExecuteClientSlashCommand,
   } = input;
 
-  const showCommandAutocomplete = userInput.startsWith("/") && !userInput.includes(" ");
-  const commandFilterQuery = showCommandAutocomplete ? userInput.slice(1) : "";
+  const activeSlashCommand = useMemo(
+    () =>
+      findActiveSlashCommand({
+        text: userInput,
+        cursorIndex,
+      }),
+    [cursorIndex, userInput],
+  );
+  const showCommandAutocomplete = activeSlashCommand !== null;
+  const commandFilterQuery = activeSlashCommand?.query ?? "";
 
   const activeFileMention = useMemo(
     () =>
@@ -235,8 +317,8 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
   );
 
   const isDraftContext = normalizedDraftConfig !== undefined;
-  const queryDraftConfig = isDraftContext ? normalizedDraftConfig : undefined;
-  const canLoadCommands = Boolean(serverId) && (Boolean(agentId) || isDraftContext);
+  const queryDraftConfig = normalizedDraftConfig;
+  const canLoadCommands = resolveCanLoadCommands({ serverId, agentId, isDraftContext });
 
   const agentCwd = useSessionStore(
     (state) => state.sessions[serverId]?.agents?.get(agentId)?.cwd ?? "",
@@ -309,54 +391,29 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
     placeholderData: keepPreviousData,
   });
 
-  const options = useMemo<AgentAutocompleteOption[]>(() => {
-    if (!isVisible) {
-      return [];
-    }
-
-    if (mode === "command") {
-      const providerCommands = commands.map(
-        (command): AvailableCommand => ({ source: "provider", command }),
-      );
-      const clientCommandNames = new Set(CLIENT_SLASH_COMMANDS.map((command) => command.name));
-      const availableCommands: AvailableCommand[] = isDraftContext
-        ? providerCommands
-        : [
-            ...CLIENT_SLASH_COMMANDS.map(
-              (command): AvailableCommand => ({ source: "client", command }),
-            ),
-            ...providerCommands.filter((entry) => !clientCommandNames.has(entry.command.name)),
-          ];
-      const matches = filterAndRankCommandAutocompleteEntries(
-        availableCommands,
+  const options = useMemo<AgentAutocompleteOption[]>(
+    () =>
+      buildCommandAutocompleteOptions({
+        activeFileMention,
         commandFilterQuery,
-      );
-      const orderedMatches = orderAutocompleteOptions(matches);
-      return orderedMatches.map(mapCommandToOption);
-    }
-
-    if (mode === "file" && activeFileMention) {
-      const orderedEntries = orderAutocompleteOptions(fileSuggestionsQuery.data ?? []);
-      return orderedEntries.map((entry) => ({
-        type: "workspace_entry" as const,
-        id: `${entry.kind}:${entry.path}`,
-        label: entry.path,
-        kind: entry.kind,
-        entryPath: entry.path,
-        mention: activeFileMention,
-      }));
-    }
-
-    return [];
-  }, [
-    activeFileMention,
-    commandFilterQuery,
-    commands,
-    fileSuggestionsQuery.data,
-    isDraftContext,
-    isVisible,
-    mode,
-  ]);
+        commands,
+        activeSlashCommand,
+        fileSuggestions: fileSuggestionsQuery.data ?? [],
+        isDraftContext,
+        isVisible,
+        mode,
+      }),
+    [
+      activeFileMention,
+      activeSlashCommand,
+      commandFilterQuery,
+      commands,
+      fileSuggestionsQuery.data,
+      isDraftContext,
+      isVisible,
+      mode,
+    ],
+  );
 
   const onSelectOption = useCallback(
     (option: AutocompleteOption) => {
@@ -372,7 +429,20 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
       }
 
       if (selected.type === "client_command" || selected.type === "provider_command") {
-        setUserInput(`/${selected.id} `);
+        if (!activeSlashCommand) {
+          setUserInput(`/${selected.id} `);
+          onAutocompleteApplied?.();
+          return;
+        }
+
+        const nextInput = applySlashCommandReplacement({
+          text: userInput,
+          command: activeSlashCommand,
+          commandName: selected.id,
+        });
+        const shouldAppendSpace =
+          activeSlashCommand.position === "start" && activeSlashCommand.end === userInput.length;
+        setUserInput(shouldAppendSpace ? `${nextInput} ` : nextInput);
         onAutocompleteApplied?.();
         return;
       }
@@ -391,6 +461,7 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
       onClientSlashCommand,
       setUserInput,
       userInput,
+      activeSlashCommand,
     ],
   );
 
@@ -399,7 +470,10 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
     options,
     query: mode === "command" ? commandFilterQuery : fileFilterQuery,
     onSelectOption,
-    onEscape: mode === "command" ? () => setUserInput("") : undefined,
+    onEscape:
+      mode === "command" && activeSlashCommand?.position === "start"
+        ? () => setUserInput("")
+        : undefined,
   });
 
   const isLoading = resolveAutocompleteIsLoading({

packages/app/src/hooks/use-agent-commands-query.ts

@@ -9,6 +9,7 @@ export interface AgentSlashCommand {
   name: string;
   description: string;
   argumentHint: string;
+  kind?: string;
 }
 
 export interface DraftCommandConfig {

packages/app/src/hooks/use-command-center.ts

@@ -20,6 +20,7 @@ import { getIsElectronRuntime } from "@/constants/layout";
 import { navigateToAgent } from "@/utils/navigate-to-agent";
 import { focusWithRetries } from "@/utils/web-focus";
 import { useActiveServerId } from "@/hooks/use-active-server-id";
+import { isWeb } from "@/constants/platform";
 
 const EMPTY_AGENTS: AggregatedAgent[] = [];
 const EMPTY_ACTION_ITEMS: CommandCenterActionItem[] = [];
@@ -319,33 +320,25 @@ export function useCommandCenter() {
     }
   }, [activeIndex, items.length, open]);
 
-  useEffect(() => {
-    if (!open) return;
-
-    const handler = (event: KeyboardEvent) => {
+  const handleKeyEvent = useCallback(
+    (key: string): boolean => {
+      if (!open) return false;
       const currentItems = itemsRef.current;
-      const key = event.key;
-      if (key !== "ArrowDown" && key !== "ArrowUp" && key !== "Enter" && key !== "Escape") {
-        return;
-      }
 
       if (key === "Escape") {
-        event.preventDefault();
         handleCloseRef.current();
-        return;
+        return true;
       }
 
       if (key === "Enter") {
-        if (currentItems.length === 0) return;
-        event.preventDefault();
+        if (currentItems.length === 0) return false;
         const index = Math.max(0, Math.min(activeIndexRef.current, currentItems.length - 1));
         handleSelectItemRef.current(currentItems[index]);
-        return;
+        return true;
       }
 
       if (key === "ArrowDown" || key === "ArrowUp") {
-        if (currentItems.length === 0) return;
-        event.preventDefault();
+        if (currentItems.length === 0) return false;
         setActiveIndex((current) => {
           const delta = key === "ArrowDown" ? 1 : -1;
           const next = current + delta;
@@ -353,13 +346,35 @@ export function useCommandCenter() {
           if (next >= currentItems.length) return 0;
           return next;
         });
+        return true;
+      }
+
+      return false;
+    },
+    [open],
+  );
+
+  useEffect(() => {
+    if (!open || !isWeb) return;
+
+    const handler = (event: KeyboardEvent) => {
+      if (
+        event.key !== "ArrowDown" &&
+        event.key !== "ArrowUp" &&
+        event.key !== "Enter" &&
+        event.key !== "Escape"
+      ) {
+        return;
+      }
+      if (handleKeyEvent(event.key)) {
+        event.preventDefault();
       }
     };
 
     // react-native-web can stop propagation on key events, so listen in capture phase.
     window.addEventListener("keydown", handler, true);
     return () => window.removeEventListener("keydown", handler, true);
-  }, [open]);
+  }, [open, handleKeyEvent]);
 
   return {
     open,
@@ -371,5 +386,6 @@ export function useCommandCenter() {
     items,
     handleClose,
     handleSelectItem,
+    handleKeyEvent,
   };
 }