chore(release): cut 0.1.94

Prepare 0.1.94 release
Fix composer send shortcut conflicts
2026-07-29 12:01:31 +00:00 · 2026-06-12 13:38:52 +07:00 · 2026-06-12 13:37:43 +07:00 · 2026-06-12 13:29:51 +07:00 · 2026-06-12 13:18:01 +07:00 · 2026-06-12 12:56:18 +07:00
695 changed files with 53844 additions and 9578 deletions
--- a/.agents/skills/release-beta/SKILL.md
+++ b/.agents/skills/release-beta/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: release-beta
-description: Cut a beta release of Paseo. Use when the user says "release beta", "cut a beta", "ship a beta", "beta release", or "/release-beta". Betas are silent release candidates — no changelog, no website move.
+description: Cut a beta release of Paseo. Use when the user says "release beta", "cut a beta", "ship a beta", "beta release", or "/release-beta". Betas are silent release candidates — no changelog, no website move, npm only on the beta dist-tag.
 user-invocable: true
 ---

@@ -8,4 +8,4 @@ user-invocable: true

 Read `docs/release.md` in the Paseo repo and follow the **Beta flow** section end-to-end. Run the **Beta release** completion checklist at the bottom of that doc.

-Key rule the doc enforces — betas don't touch `CHANGELOG.md`. Don't draft release notes.
+Key rules the doc enforces — betas don't touch `CHANGELOG.md`, don't draft release notes, and publish npm only with the explicit `beta` dist-tag.
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.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
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.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.
--- a/.github/workflows/ci.yml
+++ b/.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

--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,7 @@ CLAUDE.local.md

 .debug.conversations/
 .debug/
+.dev/
 .paseo/
 .wrangler/
 **/.wrangler/
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -3,6 +3,7 @@
  "options": {
    "typeAware": false
  },
+  "ignorePatterns": [".dev/**"],
  "plugins": ["react", "react-perf", "unicorn", "typescript", "oxc", "import", "promise"],
  "categories": {
    "correctness": "error",
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,139 @@
 # Changelog

+## 0.1.94 - 2026-06-12
+
+### Added
+
+- **Attach pull request comments, reviews, threads, and failed check logs to chat from the PR panel** ([#1400](https://github.com/getpaseo/paseo/pull/1400))
+- **Use Paseo in Arabic, Chinese, English, French, Russian, and Spanish** ([#1478](https://github.com/getpaseo/paseo/pull/1478) by [@dwyanewang](https://github.com/dwyanewang))
+- **Create reusable terminal profiles from Host settings**
+- **Open workspaces in Antigravity** ([#1424](https://github.com/getpaseo/paseo/pull/1424) by [@krumpyzoid](https://github.com/krumpyzoid))
+
+### Improved
+
+- Claude skills appear in prompt autocomplete as you type ([#1464](https://github.com/getpaseo/paseo/pull/1464))
+- Copy file paths directly from file preview tab menus ([#1473](https://github.com/getpaseo/paseo/pull/1473))
+- PR status stays current after an agent merges a branch ([#1455](https://github.com/getpaseo/paseo/pull/1455))
+- Workspace tabs stay fast by retaining only the active workspace screens ([#1472](https://github.com/getpaseo/paseo/pull/1472))
+- iOS simulator previews can be launched from worktrees
+
+### Fixed
+
+- Composer send shortcuts no longer conflict with other keyboard shortcuts
+- Multi-question prompts advance one answer at a time ([#1462](https://github.com/getpaseo/paseo/pull/1462))
+- Imported Pi sessions keep their original model and thinking settings ([#1441](https://github.com/getpaseo/paseo/pull/1441) by [@thomasaull](https://github.com/thomasaull))
+- Reconnecting to a desktop host keeps the saved shell and workspace route
+- Worktree terminals no longer appear in parent workspaces
+- Mobile reconnects show the welcome screen correctly
+
+## 0.1.93 - 2026-06-10
+
+### Added
+
+- **Claude Fable 5 is available in the Claude model picker** ([#1443](https://github.com/getpaseo/paseo/pull/1443) by [@0-Captain](https://github.com/0-Captain))
+
+## 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
+
+- **Group the sidebar by status so workspaces waiting on you, ready to review, working, and done are visible at a glance** ([#1317](https://github.com/getpaseo/paseo/pull/1317))
+- **Start a new workspace from the global sidebar button without choosing a project first** ([#1324](https://github.com/getpaseo/paseo/pull/1324))
+- **Open the active file directly in your editor, file manager, or GitHub instead of only opening the workspace root** ([#1285](https://github.com/getpaseo/paseo/pull/1285) by [@aaronzhongg](https://github.com/aaronzhongg))
+- **Automatically archive clean PR workspaces after the PR is merged from host settings** ([#1313](https://github.com/getpaseo/paseo/pull/1313))
+- **Desktop-managed Paseo skills stay current after installing a newer desktop build** ([#1309](https://github.com/getpaseo/paseo/pull/1309))
+- **Dart files and Dart code blocks are now syntax-highlighted** ([#1326](https://github.com/getpaseo/paseo/pull/1326))
+
+### Improved
+
+- Sidebar workspaces can be marked as read when they are ready to review or failed ([#1317](https://github.com/getpaseo/paseo/pull/1317))
+- Child agents keep unattended permissions when delegated across providers ([#1315](https://github.com/getpaseo/paseo/pull/1315))
+- Scheduled agents open with the real prompt and title instead of looking empty ([#1316](https://github.com/getpaseo/paseo/pull/1316))
+- Git controls prioritize the action that gets a ready branch shipped ([#1316](https://github.com/getpaseo/paseo/pull/1316))
+- Multiple agent questions are shown one at a time
+- OpenCode questions with free-write answers show the typed response in Paseo
+- Delegated agent activity is visible on the parent workspace
+- Sessions are ordered by latest activity
+- ACP provider catalog entries are updated for Claude Agent, Cline, Codebuddy Code, Factory Droid, and Qoder
+
+### Fixed
+
+- Timeline catch-up no longer leaves older messages unloaded
+- Markdown code in file previews renders correctly
+- Long dictation retries no longer stall new audio
+- Settings host picker navigation works from host settings pages
+- Diff gutter rows stay aligned with changed code
+- Mobile sidebar gestures stay responsive under load
+- Compact sheets keep their footer and bottom spacing visible
+
 ## 0.1.89 - 2026-06-02

 ### Added
--- a/CLAUDE.md
+++ b/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
--- a/README.md
+++ b/README.md
@@ -4,6 +4,11 @@

 <h1 align="center">Paseo</h1>

+<p align="center">
+  <a href="README.md">English</a> ·
+  <a href="README.zh-CN.md">简体中文</a>
+</p>
+
 <p align="center">
  <a href="https://github.com/getpaseo/paseo/stargazers">
    <img src="https://img.shields.io/github/stars/getpaseo/paseo?style=flat&logo=github" alt="GitHub stars">
@@ -32,6 +37,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.
@@ -145,52 +154,6 @@ npm run typecheck

 - [paseo-relay](https://github.com/zenghongtu/paseo-relay) — self-hosted relay in Go

-### Self-hosted relay TLS
-
-Self-hosted relays use `ws://` unless TLS is opted in. For a relay behind nginx on 443, start the daemon with:
-
-```bash
-PASEO_RELAY_ENDPOINT=127.0.0.1:8080 \
-PASEO_RELAY_PUBLIC_ENDPOINT=relay.example.com:443 \
-PASEO_RELAY_USE_TLS=true \
-paseo daemon start
-```
-
-Equivalent config:
-
-```json
-{
-  "daemon": {
-    "relay": {
-      "enabled": true,
-      "endpoint": "127.0.0.1:8080",
-      "publicEndpoint": "relay.example.com:443",
-      "useTls": true
-    }
-  }
-}
-```
-
-Minimal nginx WebSocket proxy:
-
-```nginx
-server {
-  listen 443 ssl;
-  server_name relay.example.com;
-
-  ssl_certificate /etc/letsencrypt/live/relay.example.com/fullchain.pem;
-  ssl_certificate_key /etc/letsencrypt/live/relay.example.com/privkey.pem;
-
-  location /ws {
-    proxy_pass http://127.0.0.1:8080;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $host;
-  }
-}
-```
-
 ---

 <p align="center">
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -0,0 +1,217 @@
+<p align="center">
+  <img src="packages/website/public/logo.svg" width="64" height="64" alt="Paseo logo">
+</p>
+
+<h1 align="center">Paseo</h1>
+
+<p align="center">
+  <a href="README.md">English</a> ·
+  <a href="README.zh-CN.md">简体中文</a>
+</p>
+
+<p align="center">
+  <a href="https://github.com/getpaseo/paseo/stargazers">
+    <img src="https://img.shields.io/github/stars/getpaseo/paseo?style=flat&logo=github" alt="GitHub stars">
+  </a>
+  <a href="https://github.com/getpaseo/paseo/releases">
+    <img src="https://img.shields.io/github/v/release/getpaseo/paseo?style=flat&logo=github" alt="GitHub release">
+  </a>
+  <a href="https://x.com/moboudra">
+    <img src="https://img.shields.io/badge/%40moboudra-555?logo=x" alt="X">
+  </a>
+  <a href="https://discord.gg/jz8T2uahpH">
+    <img src="https://img.shields.io/badge/Discord-555?logo=discord" alt="Discord">
+  </a>
+  <a href="https://www.reddit.com/r/PaseoAI/">
+    <img src="https://img.shields.io/badge/Reddit-555?logo=reddit" alt="Reddit">
+  </a>
+</p>
+
+<p align="center">Claude Code、Codex、Copilot、OpenCode 和 Pi agents 的统一界面。</p>
+
+<p align="center">
+  <img src="https://paseo.sh/hero-mockup.png" alt="Paseo app screenshot" width="100%">
+</p>
+
+<p align="center">
+  <img src="https://paseo.sh/mobile-mockup.png" alt="Paseo mobile app" width="100%">
+</p>
+
+> [!NOTE]
+> 我是独立维护者，不一定每天都能及时处理 GitHub Issues。
+> 如果问题很紧急或阻塞了你，[Discord](https://discord.gg/jz8T2uahpH) 是最快联系到我的地方。
+
+---
+
+在你自己的机器上并行运行 agents。无论在手机上还是桌前，都能推进交付。
+
+- **自托管：** Agents 在你的机器上运行，使用完整的本地开发环境、工具、配置和技能。
+- **多提供商：** 通过同一个界面使用 Claude Code、Codex、Copilot、OpenCode 和 Pi。为每个任务选择合适的模型。
+- **语音控制：** 在语音模式下口述任务或讨论问题。需要免手操作时很方便。
+- **跨设备：** 支持 iOS、Android、桌面端、Web 和 CLI。在桌前开始工作，用手机查看进度，也可以从终端脚本化操作。
+- **隐私优先：** Paseo 没有遥测、追踪，也不会强制登录。
+
+## 快速开始
+
+Paseo 会运行一个名为 daemon 的本地服务，用来管理你的 coding agents。桌面 app、移动 app、Web app 和 CLI 等客户端都会连接到它。
+
+### 前置条件
+
+你至少需要安装一个 agent CLI，并用你的凭据完成配置：
+
+- [Claude Code](https://docs.anthropic.com/en/docs/claude-code)
+- [Codex](https://github.com/openai/codex)
+- [GitHub Copilot](https://github.com/features/copilot/cli/)
+- [OpenCode](https://github.com/anomalyco/opencode)
+- [Pi](https://pi.dev)
+
+### 桌面 app（推荐）
+
+从 [paseo.sh/download](https://paseo.sh/download) 或 [GitHub releases 页面](https://github.com/getpaseo/paseo/releases)下载。打开 app 后 daemon 会自动启动，不需要再安装其他东西。
+
+如果要从手机连接，在 Settings 中扫描显示的二维码。
+
+### CLI / 无头模式
+
+安装 CLI 并启动 Paseo：
+
+```bash
+npm install -g @getpaseo/cli
+paseo
+```
+
+终端中会显示一个二维码。你可以从任意客户端连接。这个方式适合服务器和远程机器。
+
+完整安装和配置见：
+
+- [文档](https://paseo.sh/docs)
+- [配置参考](https://paseo.sh/docs/configuration)
+
+## CLI
+
+你能在 app 中完成的事情，也都可以在终端中完成。
+
+```bash
+paseo run --provider claude/opus-4.6 "implement user authentication"
+paseo run --provider codex/gpt-5.4 --worktree feature-x "implement feature X"
+
+paseo ls                           # 列出正在运行的 agents
+paseo attach abc123                # 实时流式查看输出
+paseo send abc123 "also add tests" # 发送后续任务
+
+# 在远程 daemon 上运行
+paseo --host workstation.local:6767 run "run the full test suite"
+```
+
+更多内容见[完整 CLI 参考](https://paseo.sh/docs/cli)。
+
+## Skills
+
+Skills 会教你的 agent 使用 Paseo 来编排其他 agents。
+
+```bash
+npx skills add getpaseo/paseo
+```
+
+然后在任意 agent 对话中使用：
+
+- `/paseo-handoff` — 在 agents 之间交接工作。我会用它先和 Claude 规划，再交给 Codex 实现。
+- `/paseo-loop` — 让 agent 按明确验收标准循环工作（也叫 Ralph loops），也可以加 verifier。
+- `/paseo-advisor` — 启动单个 agent 作为 advisor，提供第二意见，但不把工作委托出去。
+- `/paseo-committee` — 组建两个风格互补的 agents，让它们后退一步做根因分析并产出计划。
+
+## 开发
+
+Monorepo 包结构速览：
+
+- `packages/server`：Paseo daemon（agent 进程编排、WebSocket API、MCP server）
+- `packages/app`：Expo 客户端（iOS、Android、Web）
+- `packages/cli`：用于 daemon 和 agent 工作流的 `paseo` CLI
+- `packages/desktop`：Electron 桌面 app
+- `packages/relay`：用于远程连接的 relay 包
+- `packages/website`：营销站点和文档（`paseo.sh`）
+
+常用命令：
+
+```bash
+# 运行所有本地开发服务
+npm run dev
+
+# 单独运行某个界面
+npm run dev:server
+npm run dev:app
+npm run dev:desktop
+npm run dev:website
+
+# 构建 server stack
+npm run build:server
+
+# 全仓库检查
+npm run typecheck
+```
+
+## 社区
+
+- [paseo-relay](https://github.com/zenghongtu/paseo-relay) — Go 实现的自托管 relay
+
+### 自托管 relay TLS
+
+自托管 relay 默认使用 `ws://`，除非显式启用 TLS。对于 nginx 后面、监听 443 的 relay，可以这样启动 daemon：
+
+```bash
+PASEO_RELAY_ENDPOINT=127.0.0.1:8080 \
+PASEO_RELAY_PUBLIC_ENDPOINT=relay.example.com:443 \
+PASEO_RELAY_USE_TLS=true \
+paseo daemon start
+```
+
+等价配置：
+
+```json
+{
+  "daemon": {
+    "relay": {
+      "enabled": true,
+      "endpoint": "127.0.0.1:8080",
+      "publicEndpoint": "relay.example.com:443",
+      "useTls": true
+    }
+  }
+}
+```
+
+最小 nginx WebSocket 代理配置：
+
+```nginx
+server {
+  listen 443 ssl;
+  server_name relay.example.com;
+
+  ssl_certificate /etc/letsencrypt/live/relay.example.com/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/relay.example.com/privkey.pem;
+
+  location /ws {
+    proxy_pass http://127.0.0.1:8080;
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $host;
+  }
+}
+```
+
+---
+
+<p align="center">
+  <a href="https://star-history.com/#getpaseo/paseo&Date">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=getpaseo/paseo&type=Date&theme=dark">
+      <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=getpaseo/paseo&type=Date">
+      <img src="https://api.star-history.com/svg?repos=getpaseo/paseo&type=Date" alt="Star history chart for getpaseo/paseo" width="600" style="max-width: 100%;">
+    </picture>
+  </a>
+</p>
+
+## License
+
+AGPL-3.0
--- a/docs/agent-lifecycle.md
+++ b/docs/agent-lifecycle.md
@@ -54,6 +54,12 @@ Closing a tab on a **subagent** (any agent with `parentAgentId`) is **layout-onl

 The asymmetry is intentional: a subagent's home is the parent's track, not the tab. Tabs are ephemeral viewing slots; the track is the persistent record of the parent's children.

+## Workspace activity
+
+Agent lifecycle status stays literal: a parent agent is `idle` when its own turn is idle, even if a child is running.
+
+Workspace status is an aggregate activity signal. Root agents contribute their normal state bucket to their own workspace. Running subagents contribute `running` to their root parent's workspace, not to the subagent's current `cwd` or worktree. Non-running subagent attention, permission, and error states stay in the parent's subagents track and do not escalate the workspace bucket.
+
 ## The subagents track

 The collapsible track above the composer in an agent's pane (`packages/app/src/subagents/track.tsx`). Membership rule (`packages/app/src/subagents/select.ts`):
--- a/docs/architecture.md
+++ b/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                                     |
 | ------------------ | ------------------------------------ | -------------------------------------------------- |
--- a/docs/custom-providers.md
+++ b/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`)

--- a/docs/data-model.md
+++ b/docs/data-model.md
@@ -30,7 +30,7 @@ $PASEO_HOME/
 └── push-tokens.json                     # Expo push notification tokens
 ```

-The `agents/{sanitized-cwd}/` directory name is derived from the agent's `cwd` by stripping the filesystem root and replacing path separators with `-` (Windows drive letters become a `C-` style prefix). Atomic writes (temp file + rename): agent records, chat, project/workspace registries, push tokens. Non-atomic (plain `writeFile`): `config.json`, `schedules/*.json`, `loops/loops.json`, `server-id`, `daemon-keypair.json`.
+The `agents/{sanitized-cwd}/` directory name is derived from the agent's `cwd` by stripping the filesystem root and replacing path separators with `-` (Windows drive letters become a `C-` style prefix). Persistent server stores write atomically by writing a temp file in the target directory and then renaming it into place.

 ---

@@ -187,7 +187,7 @@ Local speech model ids are intentionally narrow: STT uses `parakeet-tdt-0.6b-v2-

 **Path:** `$PASEO_HOME/schedules/{id}.json`

-One file per schedule. ID is 8 hex characters. Writes are direct (not atomic).
+One file per schedule. ID is 8 hex characters.

 | Field       | Type                                  | Description                      |
 | ----------- | ------------------------------------- | -------------------------------- |
--- a/docs/design.md
+++ b/docs/design.md
@@ -94,6 +94,8 @@ Five primitives. The pick is determined by option count, the need to search, and

 `<AdaptiveModalSheet>` is for a focused task. Multi-field forms (`packages/app/src/components/add-host-modal.tsx`, `packages/app/src/components/pair-link-modal.tsx`, `packages/app/src/components/project-picker-modal.tsx`), confirmations with detail, anything that earns a backdrop. Bottom sheet on compact, centered card on desktop. Raw `Modal` is wrong for any of these.

+`<AdaptiveModalSheet>` owns compact bottom safe-area padding inside the sheet so the sheet background still reaches the screen bottom. If a sheet's first snap point is shorter than its header, content, and safe-area clearance, raise that snap point rather than moving the sheet container.
+
 `confirmDialog` is for destructive yes/no and imperative confirmation. Promise-based: `await confirmDialog({ destructive: true, ... })`. Anything where a wrong click loses work.

 Three themes is `DropdownMenu`. Thirty hosts is `Combobox`. A label and a value is `AdaptiveModalSheet`. "Are you sure?" is `confirmDialog`.
--- a/docs/development.md
+++ b/docs/development.md
@@ -8,18 +8,28 @@
 ## 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.
+- **This repo's worktree setup** also best-effort seeds `packages/app/ios` and the newest `.dev/ios-build` entry from the source checkout so iOS simulator services can reuse native project and Xcode cache state when it is safe enough to do so.

 Override knobs:

@@ -32,16 +42,29 @@ 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.
+
+### iOS simulator preview service
+
+Paseo worktrees expose the native iOS dev app through the `ios-simulator` service in `paseo.json`. The service URL serves the simulator preview at `/.sim`, so the preview link is `${PASEO_URL}/.sim`.
+
+The service is designed for concurrent worktrees: it derives a deterministic simulator identity from the worktree path, uses the worktree's assigned `PASEO_PORT`, pins `serve-sim` to that simulator UDID, and only tears down that worktree's helper/simulator state. It must not rely on the globally booted simulator or any fixed Metro port.
+
+Worktree setup best-effort seeds the generated iOS project and newest native build cache from the source checkout before the service runs. The service still validates the native project by running Expo prebuild and Xcode; the seed only avoids paying all setup/build cost from a cold worktree every time.
+
+Starting the service must not create, focus, reveal, or leave behind macOS Simulator.app windows. The browser preview is the user-visible simulator surface.

 ### 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 +208,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:

@@ -204,9 +227,26 @@ For tighter loops, you can rebuild a single workspace:
 - Changed `packages/server/src/*`, `packages/cli/src/*`, `packages/relay/src/*`, or `packages/highlight/src/*`: `npm run build:server`.
 - Changed app build dependencies: `npm run build:app-deps`.

+## ACP provider catalog versions
+
+The in-app ACP provider catalog pins package-runner entries (`npx`, `npm exec`,
+and `uvx`) to exact package versions. Run the drift checker regularly — and
+before releases — so catalog installs do not sit on stale agent versions:
+
+```bash
+npm run acp:version-drift        # report stale/non-exact package pins
+npm run acp:version-drift:check  # same, exits non-zero on drift
+npm run acp:version-drift:update # rewrite catalog pins to latest exact versions
+```
+
+The checker updates only package-runner catalog entries. Providers that use a
+preinstalled binary such as `opencode acp`, `cursor-agent acp`, or `goose acp`
+are reported as skipped because their versions are owned by the user's local
+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
@@ -260,7 +300,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.

--- a/docs/diagnostics/git-snapshot-startup-reshaping-2026-05-27.md
+++ b/docs/diagnostics/git-snapshot-startup-reshaping-2026-05-27.md
@@ -1,211 +0,0 @@
-# Git Snapshot Startup Reshaping - 2026-05-27
-
-## What changed
-
-The sidebar PR badge no longer has a special per-row fetch path. It is derived from the workspace snapshot, the same way the sidebar already gets branch/diff metadata.
-
-```text
-daemon startup / workspace subscription
-  -> WorkspaceGitService.refreshSnapshot(cwd)
-    -> getCheckoutSnapshotFacts(cwd)
-    -> getCheckoutStatus(cwd, { facts })
-    -> getCheckoutShortstat(cwd, { facts })
-    -> getPullRequestStatus(cwd, github, ..., { facts })
-    -> WorkspaceGitRuntimeSnapshot
-  -> session workspace descriptor githubRuntime.pullRequest
-  -> app useSidebarWorkspacesList()
-  -> SidebarWorkspaceEntry.prHint
-  -> Sidebar row badge + hover card checks
-```
-
-The remaining `checkout_pr_status_request` path is still present for explicit PR surfaces and compatibility, but the sidebar row badge no longer calls `useWorkspacePrHint()` and therefore no longer generates ad hoc checkout PR status requests per visible row.
-
-## Shared Git Facts
-
-`getCheckoutSnapshotFacts()` is now the first git read in the workspace snapshot builder. It gathers facts that were previously rediscovered by separate functions:
-
- worktree root: `rev-parse --show-toplevel`
- current branch: `rev-parse --abbrev-ref HEAD`
- origin remote URL
- Paseo worktree ownership and stored base ref
- resolved base ref and best comparison base
- main repo root
- branch remote/merge config
- tracked origin branch
- pull request lookup target for fork/PR worktrees
-
-Those facts are then passed through `CheckoutContext` so status, shortstat, and PR status reuse the same answers instead of independently re-reading them.
-
-## Current Data Flow
-
-```text
-Workspace subscription / fetch_workspaces
-  -> session workspace registry
-  -> workspaceGitService.getSnapshot(cwd, includeGitHub)
-     -> refresh queue/throttle/dedupe per normalized cwd
-     -> refreshGitSnapshot()
-        -> getCheckoutSnapshotFacts()
-        -> getCheckoutStatus({ facts })
-        -> getCheckoutShortstat({ facts })
-     -> refreshGitHubSnapshot()
-        -> getPullRequestStatus({ facts })
-     -> cached WorkspaceGitRuntimeSnapshot
-  -> WorkspaceDescriptorPayload.gitRuntime
-  -> WorkspaceDescriptorPayload.githubRuntime
-  -> app session store
-  -> useSidebarWorkspacesList()
-     -> diffStat from descriptor
-     -> prHint from descriptor.githubRuntime.pullRequest
-```
-
-## Startup Benchmark
-
-Added deterministic real-home benchmark:
-
-`packages/server/scripts/benchmark-startup-git-real-home.ts`
-
-The script freezes the current Paseo home using the same metadata-copy shape as `scripts/dev-home.sh`: JSON under `agents`, JSON under `projects`, and `config.json`. It then starts an isolated in-process daemon against that frozen home, subscribes to workspaces/agents, records git invocations through `runGitCommand`, and reports elapsed time, git count, max concurrency, CPU, and memory deltas.
-
-The frozen home used for the comparison contained 22 workspaces.
-
-### Before/After
-
-| run         | code shape                 | client shape                              | git commands | failures | elapsed |
-| ----------- | -------------------------- | ----------------------------------------- | -----------: | -------: | ------: |
-| baseline    | before change              | legacy sidebar PR fanout                  |          529 |       20 | 39039ms |
-| split check | after change               | legacy sidebar PR fanout                  |          375 |       15 | 39039ms |
-| after       | after change               | snapshot-only sidebar, no PR badge fanout |          372 |       15 | 31273ms |
-| after 2     | after service fact sharing | snapshot-only sidebar, no PR badge fanout |          308 |       15 | 31334ms |
-
-The server-side fact reuse accounts for nearly all measured git command reduction: `529 -> 375` (`-154`, `-29.1%`) even when the old PR fanout is still forced. Removing the sidebar fanout removes the ad hoc request path, but in this run it only changed command count by `3` because the refreshed workspace snapshots already carried the PR data by the time the fanout ran.
-
-The second pass shares checkout facts between workspace observation setup and snapshot refresh. That removes another `64` git commands from the same frozen-home run: `372 -> 308` (`-17.2%` from the previous after, `-41.8%` from baseline).
-
-### Baseline: before change + legacy PR fanout
-
-```json
-{
-  "scenario": "legacyPrFanout",
-  "workspaceCount": 22,
-  "elapsedMs": 39039,
-  "git": {
-    "total": 529,
-    "failed": 20,
-    "maxConcurrent": 8,
-    "byCommand": [
-      { "key": "show-ref --verify --quiet refs/heads/main", "count": 66 },
-      { "key": "rev-parse --git-common-dir", "count": 58 },
-      { "key": "rev-parse --abbrev-ref HEAD", "count": 50 },
-      { "key": "rev-parse --git-dir", "count": 36 },
-      { "key": "show-ref --verify --quiet refs/remotes/origin/main", "count": 35 },
-      { "key": "symbolic-ref --quiet refs/remotes/origin/HEAD", "count": 35 },
-      { "key": "config --get remote.origin.url", "count": 32 },
-      { "key": "ls-files --others --exclude-standard", "count": 18 },
-      { "key": "rev-parse --absolute-git-dir", "count": 18 },
-      { "key": "merge-base HEAD origin/main", "count": 17 },
-      { "key": "rev-parse --show-toplevel", "count": 14 },
-      { "key": "status --porcelain", "count": 14 }
-    ]
-  },
-  "process": {
-    "cpuUserMs": 2009,
-    "cpuSystemMs": 2428,
-    "rssDeltaMb": -1.5,
-    "heapUsedDeltaMb": 16.9
-  }
-}
-```
-
-### After: after change + snapshot-only sidebar
-
-```json
-{
-  "scenario": "snapshotOnly",
-  "workspaceCount": 22,
-  "elapsedMs": 31273,
-  "git": {
-    "total": 372,
-    "failed": 15,
-    "maxConcurrent": 8,
-    "byCommand": [
-      { "key": "config --get remote.origin.url", "count": 35 },
-      { "key": "show-ref --verify --quiet refs/heads/main", "count": 34 },
-      { "key": "rev-parse --git-common-dir", "count": 31 },
-      { "key": "show-ref --verify --quiet refs/remotes/origin/main", "count": 22 },
-      { "key": "status --porcelain", "count": 22 },
-      { "key": "ls-files --others --exclude-standard", "count": 18 },
-      { "key": "rev-parse --absolute-git-dir", "count": 18 },
-      { "key": "merge-base HEAD origin/main", "count": 17 },
-      { "key": "rev-parse --abbrev-ref HEAD", "count": 17 },
-      { "key": "rev-parse --show-toplevel", "count": 17 },
-      { "key": "symbolic-ref --quiet refs/remotes/origin/HEAD", "count": 17 },
-      { "key": "rev-list --count main..origin/main", "count": 7 }
-    ]
-  },
-  "process": {
-    "cpuUserMs": 1871,
-    "cpuSystemMs": 2152,
-    "rssDeltaMb": 4.4,
-    "heapUsedDeltaMb": 8.8
-  }
-}
-```
-
-### After 2: shared service-level facts
-
-```json
-{
-  "scenario": "snapshotOnly",
-  "workspaceCount": 22,
-  "elapsedMs": 31334,
-  "git": {
-    "total": 308,
-    "failed": 15,
-    "maxConcurrent": 8,
-    "byCommand": [
-      { "key": "show-ref --verify --quiet refs/heads/main", "count": 31 },
-      { "key": "rev-parse --git-common-dir", "count": 26 },
-      { "key": "show-ref --verify --quiet refs/remotes/origin/main", "count": 22 },
-      { "key": "ls-files --others --exclude-standard", "count": 18 },
-      { "key": "status --porcelain", "count": 18 },
-      { "key": "merge-base HEAD origin/main", "count": 17 },
-      { "key": "config --get remote.origin.url", "count": 13 },
-      { "key": "rev-parse --abbrev-ref HEAD", "count": 13 },
-      { "key": "rev-parse --absolute-git-dir", "count": 13 },
-      { "key": "rev-parse --show-toplevel", "count": 13 },
-      { "key": "symbolic-ref --quiet refs/remotes/origin/HEAD", "count": 13 },
-      { "key": "fetch origin --prune", "count": 5 }
-    ]
-  },
-  "process": {
-    "cpuUserMs": 1817,
-    "cpuSystemMs": 1869,
-    "rssDeltaMb": 16.7,
-    "heapUsedDeltaMb": 10.4
-  }
-}
-```
-
-## Snapshot Equivalence Guard
-
-Added a focused utility test proving that status, shortstat, and PR status return the same data when run from shared snapshot facts. The same test records git calls and asserts the facts-backed path does not re-run:
-
- `rev-parse --show-toplevel`
- `rev-parse --abbrev-ref HEAD`
-
-Test:
-
-`packages/server/src/utils/checkout-git.test.ts` -> `reuses checkout snapshot facts across status, shortstat, and PR status reads`
-
-## Remaining Waste Visible In Baseline
-
-This pass reshaped the data flow and removed the sidebar PR badge special path. It did not try to optimize every command.
-
-The benchmark still shows repeated per-workspace reads that are candidates for the next pass:
-
- base ref existence checks still repeat as `show-ref` probes.
- default branch resolution still repeats `symbolic-ref refs/remotes/origin/HEAD`.
- repo common-dir lookup is lower, but still above the apparent git workspace count.
- shortstat still runs its own merge-base/diff/untracked scan per workspace.
-
-The important invariant now is clearer: sidebar-visible git data should flow from `WorkspaceGitService` snapshots, and snapshot builders should receive reusable git facts through `CheckoutContext`.
--- a/docs/diagnostics/opencode-provider-snapshot-timeout-2026-05-27.md
+++ b/docs/diagnostics/opencode-provider-snapshot-timeout-2026-05-27.md
@@ -1,389 +0,0 @@
-# OpenCode Provider Snapshot Startup Timeout Diagnosis - 2026-05-27
-
-## Answer
-
-The startup timeout is real OpenCode provider snapshot work, not an agent resume path.
-
-In the dev-style copied-home reproduction, the OpenCode snapshot misses the 30s budget because several expensive things stack:
-
-1. Paseo starts from a copied `PASEO_HOME` containing 4,851 agent records.
-2. Clients ask for provider snapshots for three cwd scopes at almost the same time:
-   - `/Users/moboudra`
-   - `/Users/moboudra/dev/paseo`
-   - `/Users/moboudra/dev/blankpage/editor`
-3. Each OpenCode snapshot runs two OpenCode SDK calls:
-   - `GET /provider?directory=...` through `client.provider.list()`
-   - `GET /agent?directory=...` through `client.app.agents()`
-4. One cold `opencode serve` process is shared by the three cwd scopes. It took 8.562s to become ready.
-5. After OpenCode was listening, Paseo issued six OpenCode HTTP calls concurrently.
-6. The OpenCode `/provider` responses are large: about 3,549,620 decompressed bytes per cwd.
-7. During the same window, the daemon was still doing heavy startup workspace git work. In the exact 18:14:19-18:14:43 window, the daemon log has 292 git spawn/close events.
-8. The `/provider` calls eventually succeeded, but too late: they completed about 32.2s-32.5s after the snapshot fetch started, while the snapshot timeout is 30s.
-
-So the root cause is:
-
-```text
-Cold OpenCode server startup + three concurrent cwd snapshots + large OpenCode /provider responses + daemon startup git contention causes client.provider.list() to complete after Paseo's 30s snapshot budget.
-```
-
-More precise wording: the contention is machine-level process/CPU/filesystem contention created by daemon startup work, especially git work. It is not proven to be an OpenCode internal lock or a Paseo-only event-loop issue. A daemon-free repro with only OpenCode plus an external git storm slowed the same six OpenCode calls from about 1s to about 30s total.
-
-Manual settings refresh works because it runs after startup contention is gone and uses `force: true`, which creates fresh OpenCode runtime/server state. The same OpenCode provider refreshes then complete in about 1.7s-2.2s.
-
-The daemon does not auto-retry error snapshots. A failed provider snapshot is cached as `status: "error"` until an explicit refresh resets it to loading.
-
-## Follow-up: Normal Copied-Home Startup Check
-
-I later reran a normal dev-daemon startup against a fresh copy of the same Paseo home metadata and drove the app startup request path:
-
-```text
-fetchWorkspaces
-fetchAgents
-getProvidersSnapshot(home scope)
-getProvidersSnapshot(first workspace scope)
-```
-
-That run did not reproduce the 30s OpenCode timeout.
-
-```text
-home scope:
-  OpenCode ready at ~8s
-  availability: 1.6s
-  fetch total: 5.2s
-
-first workspace scope:
-  OpenCode ready at ~26s
-  availability: 2.0s
-  fetch total: 15.4s
-```
-
-The slowest OpenCode operation in that successful run was the workspace-scoped `/provider` response body read: `13.6s`. The daemon log had no `Timed out refreshing OpenCode` entry and no OpenCode provider snapshot failure.
-
-This means the timeout is reproducible under the heavier multi-scope startup contention captured below, but it is not guaranteed on every copied-home dev startup.
-
-## Reproduction Used
-
-The user's correction was right: the useful reproduction is not a random isolated home. It must match `dev.sh` worktree behavior.
-
-Relevant scripts:
-
- `scripts/dev.sh`
- `scripts/dev-daemon.sh`
- `scripts/dev-home.sh`
-
-`dev-home.sh` only seeds this metadata into the dev home:
-
-```text
-agents/**/*.json
-projects/**/*.json
-config.json
-```
-
-It does not copy `chat`, `loops`, `schedules`, sockets, pid files, logs, or worktree contents.
-
-I ran a separate daemon, not the main daemon:
-
-```text
-PASEO_HOME=/var/folders/xl/kkk9drfd3ms_t8x7rmy4z6900000gn/T/paseo-devseed.Wms6pi
-PASEO_LISTEN=127.0.0.1:51116
-PASEO_LOG_LEVEL=trace
-```
-
-Startup facts:
-
-```text
-18:13:39.552 Agent storage initialized: 712ms
-18:13:39.559 Workspace registries bootstrapped: 719ms
-18:13:39.961 Agent registry loaded: 4851 records
-18:13:39.972 Server listening: http://127.0.0.1:51116
-```
-
-The probe then connected four client sessions and requested:
-
- workspaces
- active agents
- provider snapshots for home, paseo, and blankpage/editor
-
-Client-visible result:
-
-```text
-18:14:30.263 /Users/moboudra/dev/blankpage/editor opencode error:
-  OpenCode app.agents timed out after 10s
-
-18:14:41.687 /Users/moboudra/dev/paseo opencode error:
-  Timed out refreshing OpenCode after 30000ms
-
-18:14:41.688 /Users/moboudra opencode error:
-  Timed out refreshing OpenCode after 30000ms
-```
-
-## Exact OpenCode Timeline
-
-OpenCode snapshot requests began at `18:14:10`.
-
-Availability checks:
-
-```text
-18:14:10.780 opencode availability start for /Users/moboudra
-18:14:10.787 opencode availability start for /Users/moboudra/dev/paseo
-18:14:10.800 opencode availability start for /Users/moboudra/dev/blankpage/editor
-
-18:14:11.363 paseo availability complete: 576ms
-18:14:11.376 home availability complete: 597ms
-18:14:11.391 blankpage availability complete: 591ms
-```
-
-OpenCode server acquisition:
-
-```text
-18:14:11.364 OpenCode server spawn start: opencode serve --port 56376
-18:14:19.926 OpenCode server listening after 8562ms
-```
-
-Six SDK calls were then issued:
-
-```text
-18:14:19.931 GET /provider directory=/Users/moboudra/dev/paseo
-18:14:19.931 GET /agent    directory=/Users/moboudra/dev/paseo
-18:14:19.931 GET /provider directory=/Users/moboudra
-18:14:19.931 GET /agent    directory=/Users/moboudra
-18:14:19.931 GET /provider directory=/Users/moboudra/dev/blankpage/editor
-18:14:19.936 GET /agent    directory=/Users/moboudra/dev/blankpage/editor
-```
-
-Why six:
-
-| Cwd                                    | Why that scope exists                                      | Model call                              | Mode call                         |
-| -------------------------------------- | ---------------------------------------------------------- | --------------------------------------- | --------------------------------- |
-| `/Users/moboudra`                      | home/settings provider snapshot                            | `client.provider.list()` -> `/provider` | `client.app.agents()` -> `/agent` |
-| `/Users/moboudra/dev/paseo`            | workspace-scoped provider snapshot for the Paseo workspace | `client.provider.list()` -> `/provider` | `client.app.agents()` -> `/agent` |
-| `/Users/moboudra/dev/blankpage/editor` | workspace/agent cwd snapshot for blankpage/editor          | `client.provider.list()` -> `/provider` | `client.app.agents()` -> `/agent` |
-
-Multiple clients can request the same snapshot scope during startup, but non-forced provider loads are deduped by `(cwd, provider)`. Different cwd scopes are separate loads. Three cwd scopes times two OpenCode SDK calls each is the six OpenCode calls in this repro.
-
-Headers arrived before the 30s timeout:
-
-| Call        | Cwd                             | Headers after request |
-| ----------- | ------------------------------- | --------------------- |
-| `/provider` | `/Users/moboudra`               | 6.462s                |
-| `/agent`    | `/Users/moboudra`               | 6.681s                |
-| `/agent`    | `/Users/moboudra/dev/paseo`     | 6.681s                |
-| `/provider` | `/Users/moboudra/dev/paseo`     | 8.192s                |
-| `/provider` | `/Users/moboudra/dev/blankpage` | 8.654s                |
-| `/agent`    | `/Users/moboudra/dev/blankpage` | 8.649s                |
-
-But body consumption and completion lagged:
-
-```text
-18:14:29.380 /agent home complete, total app.agents duration 9450ms
-18:14:29.813 /agent paseo complete, total app.agents duration 9883ms
-18:14:30.263 /agent blankpage timed out at 10s
-18:14:31.332 /agent blankpage body finally finished, after the 10s app.agents timeout
-
-18:14:41.687 paseo snapshot outer 30s timeout fires
-18:14:41.688 home snapshot outer 30s timeout fires
-
-18:14:43.593 /provider home completes, provider.list duration 23664ms, total listModels 32218ms
-18:14:43.798 /provider blankpage completes, provider.list duration 23868ms, total listModels 32411ms
-18:14:43.839 /provider paseo completes, provider.list duration 23911ms, total listModels 32476ms
-```
-
-The useful `/provider` results arrived about 1.9s-2.2s after the snapshot manager had already marked home and paseo as failed.
-
-## Why Settings Refresh Works
-
-After the daemon settled, I ran the same refresh path through the daemon on port `51116`, using `refreshProvidersSnapshot({ providers: ["opencode"] })`.
-
-Results:
-
-```text
-home refresh:
-  total: 2165ms
-  status: ready
-  models: 409
-  modes: 5
-
-/Users/moboudra/dev/paseo refresh:
-  total: 1675ms
-  status: ready
-  models: 409
-  modes: 5
-
-/Users/moboudra/dev/blankpage/editor refresh:
-  total: 1794ms
-  status: ready
-  models: 409
-  modes: 5
-```
-
-Trace details for the manual-style refresh:
-
-```text
-OpenCode server acquisition: 708ms-1291ms
-/agent completion: 433ms-592ms after request start
-/provider completion: 524ms-618ms after request start
-```
-
-That proves the startup failure is not bad credentials, not a permanently wedged OpenCode install, and not OpenCode generally taking more than 30s. It is startup timing and contention.
-
-## Minimal OpenCode-Only Repros
-
-### OpenCode Only, No Daemon, No Artificial Load
-
-I started a fresh `opencode serve`, waited for stdout `listening on`, then issued the same six HTTP calls concurrently:
-
-```text
-GET /provider?directory=/Users/moboudra
-GET /agent?directory=/Users/moboudra
-GET /provider?directory=/Users/moboudra/dev/paseo
-GET /agent?directory=/Users/moboudra/dev/paseo
-GET /provider?directory=/Users/moboudra/dev/blankpage/editor
-GET /agent?directory=/Users/moboudra/dev/blankpage/editor
-```
-
-Three runs:
-
-| Run | `opencode serve` ready | All six calls complete |
-| --- | ---------------------- | ---------------------- |
-| 1   | 1376ms                 | 1295ms                 |
-| 2   | 906ms                  | 1050ms                 |
-| 3   | 939ms                  | 898ms                  |
-
-Slowest individual call in those runs:
-
-```text
-/provider /Users/moboudra/dev/paseo: 1270ms total
-/agent /Users/moboudra/dev/blankpage/editor: 1251ms total
-```
-
-So six concurrent OpenCode calls alone are not the bug.
-
-### OpenCode Only Plus External Git Storm, No Daemon
-
-I then ran the same OpenCode-only six-call test while an external shell spawned repeated git commands across the same real workspaces/worktrees. This did not use the Paseo daemon.
-
-Result:
-
-```text
-opencode serve ready: 15479ms
-all six OpenCode calls complete: 15176ms after server ready
-combined cold-start + calls: about 30655ms
-```
-
-Individual calls under the external git storm:
-
-| Call        | Cwd                                    |   Total |
-| ----------- | -------------------------------------- | ------: |
-| `/provider` | `/Users/moboudra`                      | 10684ms |
-| `/agent`    | `/Users/moboudra`                      | 10767ms |
-| `/provider` | `/Users/moboudra/dev/paseo`            | 13220ms |
-| `/agent`    | `/Users/moboudra/dev/paseo`            | 13147ms |
-| `/provider` | `/Users/moboudra/dev/blankpage/editor` | 14675ms |
-| `/agent`    | `/Users/moboudra/dev/blankpage/editor` | 15038ms |
-
-This is the daemon-free minimal evidence that process/filesystem contention can push the same OpenCode cold-start + six-call workload to the same 30s boundary.
-
-## Why It Does Not Retry
-
-`ProviderSnapshotManager.getSnapshot()` only starts background warmup for:
-
- no existing snapshot
- missing providers
- entries still in `loading` with no active load
-
-When refresh fails, `refreshProvider()` stores:
-
-```text
-status: "error"
-error: "Timed out refreshing OpenCode after 30000ms"
-```
-
-An `error` entry is not treated as stale/loading by `getSnapshot()`, so normal reads keep returning the cached error.
-
-Settings refresh calls `refresh_providers_snapshot_request`, which routes to:
-
-```text
-refreshSettingsSnapshot()
-clearCachedProviders()
-resetSnapshotToLoading()
-refreshProviders(... force: true)
-```
-
-That is why you have to force a manual refresh.
-
-## Git Work During The Repro
-
-This is not the final optimization report, but it matters for the timeout because it overlaps exactly with OpenCode response handling.
-
-Total git commands in the dev-style copied-home daemon log:
-
-```text
-632 spawned
-632 closed
-```
-
-Top cwd counts:
-
-| Count | Cwd                                                                                   |
-| ----: | ------------------------------------------------------------------------------------- |
-|    44 | `/Users/moboudra/.paseo/worktrees/1luy0po7/merry-ladybug`                             |
-|    44 | `/Users/moboudra/.paseo/worktrees/1luy0po7/hopeful-eel`                               |
-|    44 | `/Users/moboudra/.paseo/worktrees/1luy0po7/fix-compaction-cancel-loading`             |
-|    44 | `/Users/moboudra/.paseo/worktrees/1luy0po7/fix-archive-worktree-session-history`      |
-|    44 | `/Users/moboudra/.paseo/worktrees/0vpo9h4b/breezy-toad`                               |
-|    36 | `/Users/moboudra/.paseo/worktrees/steering-policy-refactor-detached`                  |
-|    36 | `/Users/moboudra/.paseo/worktrees/1luy0po7/integration-session-mcp-command-stack`     |
-|    36 | `/Users/moboudra/.paseo/worktrees/1luy0po7/fix-provider-diagnostic-binary-resolution` |
-|    36 | `/Users/moboudra/.paseo/worktrees/1luy0po7/feat-voice-runtime-on-demand`              |
-|    36 | `/Users/moboudra/.paseo/worktrees/1luy0po7/feat-find-in-pane`                         |
-|    36 | `/Users/moboudra/.paseo/worktrees/1luy0po7/epic-paseo-client-sdk`                     |
-|    24 | `/Users/moboudra/dev/paseo`                                                           |
-|    24 | `/Users/moboudra/dev/blankpage/editor`                                                |
-|    24 | `/Users/moboudra/dev/faro/main`                                                       |
-|    24 | `/Users/moboudra/dev/konbert/web`                                                     |
-|    24 | `/Users/moboudra/dev/paseo-cloud`                                                     |
-
-In the exact OpenCode pressure window, `18:14:19` through `18:14:43`, there were:
-
-```text
-142 git command spawns
-150 git command closes
-```
-
-The main repeated command shapes were:
-
-```text
-76  git rev-parse --show-toplevel
-72  git status --porcelain
-72  git show-ref --verify --quiet refs/remotes/origin/main
-72  git show-ref --verify --quiet refs/heads/main
-16  git config --get branch.main.remote
-16  git config --get branch.main.merge
-16  git rev-list --count main..origin/main
-16  git rev-list --count origin/main..main
-```
-
-## Original `log.txt` Alignment
-
-The original startup showed the same home and paseo outer timeout shape:
-
-```text
-16:04:22.466 /Users/moboudra/dev/paseo:
-  Timed out refreshing OpenCode after 30000ms
-
-16:04:22.482 /Users/moboudra:
-  Timed out refreshing OpenCode after 30000ms
-```
-
-The original logs did not include SDK fetch/header/body timing, so they could only show the wrapper-level timeout. The dev-style copied-home reproduction with instrumentation now shows the missing link: the `/provider` calls completed just after the 30s snapshot budget.
-
-## Files Instrumented For Diagnosis
-
-Temporary trace instrumentation was added to:
-
- `packages/server/src/server/agent/provider-snapshot-manager.ts`
- `packages/server/src/server/agent/providers/opencode-agent.ts`
- `packages/server/src/server/agent/providers/opencode/runtime.ts`
- `packages/server/src/server/agent/providers/opencode/server-manager.ts`
-
-The instrumentation is behavior-neutral and only emits trace logs.
--- a/docs/diagnostics/startup-sequence-analysis-2026-05-27.md
+++ b/docs/diagnostics/startup-sequence-analysis-2026-05-27.md
@@ -1,381 +0,0 @@
-# Daemon Startup Sequence Analysis - 2026-05-27
-
-Source log: `log.txt` at repository root.
-
-Scope: current sliced startup log, starting at daemon worker startup and ending after workspace registry reconciliation and the first OpenCode heartbeat.
-
-This report is descriptive only. It does not propose optimizations.
-
-## Executive Summary
-
-The daemon becomes ready quickly, then does a heavy post-listen startup pass driven by reconnecting clients and workspace/app hydration.
-
- Worker start: `16:03:46.678`, line 1.
- Server listening: `16:03:48.285`, line 47, elapsed `602ms`.
- First client hello: `16:03:50.285`, line 66.
- Workspace registries reconciled: `16:04:33.666`, line 1777, elapsed `45983ms`.
-
-The startup shape is therefore:
-
- Daemon listen readiness: about `0.6s`.
- Client reconnect plus workspace/app/provider hydration: about `45s`.
- No git commands after workspace registry reconciliation in this slice.
-
-## Method
-
-I parsed structured trace lines from `log.txt`, especially:
-
- `Git command closed`
- `agent.session.inbound`
- `agent.session.outbound`
- `ws_slow_request`
- provider snapshot warnings
- provider resume events
-
-Important limitation: git command logs do not carry a websocket request id, so per-request attribution is inferred from timing and server code paths. Per-workspace git counts, command shapes, durations, and failures are exact for this log.
-
-Relevant code paths checked:
-
- `packages/server/src/server/session.ts`
-  - `fetch_workspaces_request` calls `syncWorkspaceGitObservers(payload.entries)`.
-  - `checkout_status_request` calls `workspaceGitService.getSnapshot(resolvedCwd)`.
-  - `checkout_pr_status_request` calls `workspaceGitService.getSnapshot(cwd)`.
- `packages/server/src/server/workspace-git-service.ts`
-  - checkout snapshot/root resolution uses `git rev-parse --show-toplevel`.
-  - snapshot refresh collects dirty state, upstream/ahead/behind, ref existence, and base divergence.
- `packages/app/src/contexts/session-context.tsx`
-  - initial workspace hydration calls `client.fetchWorkspaces({ sort: activity_at desc, subscribe, page limit 200 })`.
- `packages/app/src/hooks/use-sidebar-workspaces-list.ts`
-  - sidebar workspace refresh also calls `client.fetchWorkspaces({ sort: activity_at desc, page limit 200 })`.
-
-## Startup Timeline
-
-| time           | line | event                                                              |
-| -------------- | ---: | ------------------------------------------------------------------ |
-| `16:03:46.678` |    1 | `DaemonRunner` starts daemon worker                                |
-| `16:03:47.683` |    4 | worker spawned                                                     |
-| `16:03:47.684` |    6 | daemon keypair loaded                                              |
-| `16:03:48.281` |   44 | bootstrap complete, ready to listen                                |
-| `16:03:48.285` |   47 | server listening on `0.0.0.0:6767`                                 |
-| `16:03:50.274` |   60 | first websocket awaiting hello                                     |
-| `16:03:50.285` |   66 | first client connected via hello                                   |
-| `16:04:22.466` |  987 | OpenCode provider snapshot timeout for `/Users/moboudra/dev/paseo` |
-| `16:04:22.482` | 1002 | OpenCode provider snapshot timeout for `/Users/moboudra`           |
-| `16:04:24.183` | 1201 | OpenCode provider subscribe starts                                 |
-| `16:04:24.183` | 1202 | OpenCode provider subscribe ready                                  |
-| `16:04:24.306` | 1214 | OpenCode server connected event                                    |
-| `16:04:25.933` | 1321 | OpenCode agent resumed from persistence                            |
-| `16:04:33.666` | 1777 | workspace registries reconciled                                    |
-| `16:04:34.197` | 1783 | OpenCode heartbeat                                                 |
-| `16:04:44.200` | 1789 | OpenCode heartbeat                                                 |
-
-## Git Command Totals
-
-Total git commands in the sliced startup: `444`.
-
-| phase                           | commands | failures | summed process time |
-| ------------------------------- | -------: | -------: | ------------------: |
-| daemon bootstrap before listen  |       13 |        4 |               445ms |
-| post-listen before first client |        1 |        0 |              2020ms |
-| client reconnect + reconcile    |      430 |       71 |            120813ms |
-| after reconcile                 |        0 |        0 |                 0ms |
-| total                           |      444 |       75 |            123278ms |
-
-Summed process time is not wall-clock time. Many commands overlap.
-
-## Git Command Categories
-
-| category                                             | commands | failures | summed process time | max duration |
-| ---------------------------------------------------- | -------: | -------: | ------------------: | -----------: |
-| ahead/behind: `rev-list --count ...`                 |      115 |       30 |             35815ms |       1557ms |
-| refs: `show-ref --verify --quiet ...`                |       86 |        2 |             14680ms |       1303ms |
-| upstream config: `config --get branch.*`             |       85 |       13 |             26437ms |       1624ms |
-| root detection: `rev-parse --show-toplevel`          |       80 |       30 |             24164ms |       1426ms |
-| dirty status: `status --porcelain`                   |       50 |        0 |             12670ms |       2020ms |
-| base divergence: `rev-list --left-right --count ...` |       28 |        0 |              9512ms |       1085ms |
-
-What those categories mean in the app:
-
- Root detection: determine whether a cwd is inside a git repo and find its checkout root.
- Dirty status: show dirty/clean workspace state.
- Upstream config and ahead/behind: show branch tracking and sync state.
- Ref existence and base divergence: compare checkout branch against candidate base refs for checkout/PR status.
-
-## Per-Workspace Git Work
-
-Columns:
-
- `phase`: `pre/warm/reconnect/after`
- `cats`: `root/dirty/upstream/ahead/refs/base/other`
- `total_ms`: summed process time for that workspace
-
-| workspace                                                               | cmds | fail | phase      | cats              | total_ms | max_ms | window                      | failing command shapes                                                                                                                                                                                                                                                                        |
-| ----------------------------------------------------------------------- | ---: | ---: | ---------- | ----------------- | -------: | -----: | --------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `~/.paseo/worktrees/1luy0po7/fix-compaction-cancel-loading`             |   33 |    9 | `0/0/33/0` | `3/3/3/9/12/3/0`  |     8255 |   1460 | `16:03:52.908-16:04:24.019` | `3x config --get branch.fix-compaction-cancel-loading.remote`; `3x rev-list --count fix-compaction-cancel-loading..origin/fix-compaction-cancel-loading`; `3x rev-list --count origin/fix-compaction-cancel-loading..fix-compaction-cancel-loading`                                           |
-| `~/.paseo/worktrees/1luy0po7/hopeful-eel`                               |   33 |    9 | `0/0/33/0` | `3/3/3/9/12/3/0`  |     8468 |   1544 | `16:03:53.245-16:04:27.334` | `3x config --get branch.feat/markdown-annotations.remote`; `3x rev-list --count feat/markdown-annotations..origin/feat/markdown-annotations`; `3x rev-list --count origin/feat/markdown-annotations..feat/markdown-annotations`                                                               |
-| `~/.paseo/worktrees/1luy0po7/merry-ladybug`                             |   33 |    9 | `0/0/33/0` | `3/3/3/9/12/3/0`  |     7154 |   1099 | `16:03:53.696-16:04:29.644` | `3x config --get branch.feat/mcp-configuration.remote`; `3x rev-list --count feat/mcp-configuration..origin/feat/mcp-configuration`; `3x rev-list --count origin/feat/mcp-configuration..feat/mcp-configuration`                                                                              |
-| `~/dev/paseo`                                                           |   30 |    0 | `2/0/28/0` | `5/5/10/10/0/0/0` |     7457 |   1624 | `16:03:48.171-16:04:27.284` |                                                                                                                                                                                                                                                                                               |
-| `~/.paseo/worktrees/0vpo9h4b/dazzling-duck`                             |   27 |    0 | `0/0/27/0` | `3/3/6/6/6/3/0`   |     7617 |   1269 | `16:03:51.918-16:04:23.971` |                                                                                                                                                                                                                                                                                               |
-| `~/.paseo/worktrees/1luy0po7/epic-paseo-client-sdk`                     |   27 |    0 | `0/0/27/0` | `3/3/6/6/6/3/0`   |     7428 |   1426 | `16:03:52.445-16:04:23.991` |                                                                                                                                                                                                                                                                                               |
-| `~/.paseo/worktrees/1luy0po7/fix-provider-diagnostic-binary-resolution` |   27 |    0 | `0/0/27/0` | `3/3/6/6/6/3/0`   |     7764 |   1091 | `16:03:52.681-16:04:23.971` |                                                                                                                                                                                                                                                                                               |
-| `~/dev/emdash`                                                          |   22 |    6 | `0/0/22/0` | `2/2/2/6/8/2/0`   |     3031 |    453 | `16:04:27.351-16:04:29.583` | `2x config --get branch.heads/main.remote`; `2x rev-list --count heads/main..origin/heads/main`; `2x rev-list --count origin/heads/main..heads/main`                                                                                                                                          |
-| `~/dev/opencode`                                                        |   22 |    4 | `0/0/22/0` | `2/2/2/6/8/2/0`   |     2279 |    313 | `16:04:24.058-16:04:24.970` | `2x rev-list --count ecosystem-paseo..origin/ecosystem-paseo`; `2x rev-list --count origin/ecosystem-paseo..ecosystem-paseo`                                                                                                                                                                  |
-| `~/.paseo/worktrees/1luy0po7/integration-session-mcp-command-stack`     |   18 |    0 | `0/0/18/0` | `3/3/6/6/0/0/0`   |     7467 |   1242 | `16:03:53.781-16:04:23.971` |                                                                                                                                                                                                                                                                                               |
-| `~/dev/blankpage/editor`                                                |   18 |    0 | `2/0/16/0` | `3/3/6/6/0/0/0`   |     2418 |    520 | `16:03:48.174-16:04:26.411` |                                                                                                                                                                                                                                                                                               |
-| `~/dev/konbert/web`                                                     |   18 |    0 | `1/1/16/0` | `3/3/6/6/0/0/0`   |     7324 |   2020 | `16:03:48.190-16:04:23.685` |                                                                                                                                                                                                                                                                                               |
-| `~/dev/openchamber`                                                     |   12 |    0 | `0/0/12/0` | `2/2/4/4/0/0/0`   |     1554 |    336 | `16:04:27.399-16:04:29.616` |                                                                                                                                                                                                                                                                                               |
-| `~/dev/superset`                                                        |   12 |    0 | `0/0/12/0` | `2/2/4/4/0/0/0`   |     1019 |    215 | `16:04:27.341-16:04:29.617` |                                                                                                                                                                                                                                                                                               |
-| `~/dev/t3code`                                                          |   12 |    0 | `0/0/12/0` | `2/2/4/4/0/0/0`   |     2761 |    588 | `16:04:27.356-16:04:29.603` |                                                                                                                                                                                                                                                                                               |
-| `~/.paseo/worktrees/0vpo9h4b/breezy-toad`                               |   11 |    5 | `0/0/11/0` | `1/1/1/3/4/1/0`   |     6465 |   1290 | `16:03:51.307-16:04:18.112` | `1x config --get branch.fix/user-delete-dark-mode.remote`; `1x rev-list --count fix/user-delete-dark-mode..origin/fix/user-delete-dark-mode`; `1x rev-list --count origin/fix/user-delete-dark-mode..fix/user-delete-dark-mode`; `2x show-ref --verify --quiet refs/remotes/origin/my-branch` |
-| `~/.paseo/worktrees/1luy0po7/fix-archive-worktree-session-history`      |   11 |    3 | `0/0/11/0` | `1/1/1/3/4/1/0`   |     4303 |    757 | `16:03:52.539-16:04:19.011` | `1x config --get branch.fix-archive-worktree-session-history.remote`; `1x rev-list --count fix-archive-worktree-session-history..origin/fix-archive-worktree-session-history`; `1x rev-list --count origin/fix-archive-worktree-session-history..fix-archive-worktree-session-history`        |
-| `~/.paseo/worktrees/0vpo9h4b/codex-github-mention-implement-db-garbage` |    9 |    0 | `0/0/9/0`  | `1/1/2/2/2/1/0`   |     4986 |   1005 | `16:03:51.261-16:04:16.878` |                                                                                                                                                                                                                                                                                               |
-| `~/.paseo/worktrees/1luy0po7/feat-find-in-pane`                         |    9 |    0 | `0/0/9/0`  | `1/1/2/2/2/1/0`   |     5273 |   1130 | `16:03:52.391-16:04:17.682` |                                                                                                                                                                                                                                                                                               |
-| `~/.paseo/worktrees/1luy0po7/feat-voice-runtime-on-demand`              |    9 |    0 | `0/0/9/0`  | `1/1/2/2/2/1/0`   |     5176 |    839 | `16:03:52.110-16:04:18.254` |                                                                                                                                                                                                                                                                                               |
-| `~/.paseo/worktrees/steering-policy-refactor-detached`                  |    9 |    0 | `0/0/9/0`  | `1/1/2/2/2/1/0`   |     5993 |   1243 | `16:03:53.984-16:04:17.673` |                                                                                                                                                                                                                                                                                               |
-| `~/dev/faro/main`                                                       |    6 |    0 | `2/0/4/0`  | `1/1/2/2/0/0/0`   |     4964 |   1603 | `16:03:48.168-16:04:03.748` |                                                                                                                                                                                                                                                                                               |
-| `~/dev/paseo-cloud`                                                     |    6 |    0 | `2/0/4/0`  | `1/1/2/2/0/0/0`   |     2123 |   1154 | `16:03:48.159-16:03:56.377` |                                                                                                                                                                                                                                                                                               |
-| `~/dev/assistant`                                                       |    3 |    3 | `1/0/2/0`  | `3/0/0/0/0/0/0`   |       85 |     29 | `16:03:48.165-16:04:24.048` | `3x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `~/dev/benchmark/dashboard-2026-05-25/review`                           |    3 |    3 | `1/0/2/0`  | `3/0/0/0/0/0/0`   |      224 |    105 | `16:03:48.197-16:04:26.560` | `3x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `~/dev/research/orchestrator-worker`                                    |    3 |    3 | `1/0/2/0`  | `3/0/0/0/0/0/0`   |      285 |    144 | `16:03:48.194-16:04:26.575` | `3x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `/tmp`                                                                  |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |      113 |     77 | `16:04:27.388-16:04:27.471` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `~/dev`                                                                 |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |       86 |     58 | `16:04:27.384-16:04:27.457` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `~/dev/benchmark/dashboard-2026-05-25/01-claude-opus`                   |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |      216 |    185 | `16:04:26.525-16:04:26.543` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `~/dev/benchmark/dashboard-2026-05-25/02-codex-gpt55`                   |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |       98 |     68 | `16:04:26.353-16:04:26.554` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `~/dev/benchmark/dashboard-2026-05-25/03-opencode-zai-glm51`            |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |      209 |    158 | `16:04:26.512-16:04:26.576` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `~/dev/benchmark/dashboard-2026-05-25/04-opencode-zen-minimax27`        |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |      148 |    101 | `16:04:26.431-16:04:26.549` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `~/dev/benchmark/dashboard-2026-05-25/05-opencode-zen-kimi26`           |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |      231 |    172 | `16:04:26.517-16:04:26.577` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `~/dev/benchmark/dashboard-2026-05-25/06-opencode-or-deepseek4pro`      |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |       93 |     73 | `16:04:27.365-16:04:27.380` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `~/dev/benchmark/dashboard-2026-05-25/07-opencode-zen-gemini35flash`    |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |       78 |     66 | `16:04:27.363-16:04:27.375` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `~/dev/benchmark/dashboard-2026-05-25/08-opencode-zen-gpt55`            |    2 |    2 | `0/0/2/0`  | `2/0/0/0/0/0/0`   |      120 |     65 | `16:04:27.359-16:04:27.430` | `2x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-| `~/dev/assistant/game`                                                  |    1 |    1 | `1/0/0/0`  | `1/0/0/0/0/0/0`   |       13 |     13 | `16:03:48.155-16:03:48.155` | `1x rev-parse --show-toplevel`                                                                                                                                                                                                                                                                |
-
-## Git Failure Shape
-
-There were 75 nonzero git exits.
-
-Most failures were not timeouts. They were expected probe failures:
-
- Non-repo checks: `rev-parse --show-toplevel` fails for paths that are not git repositories.
- Missing upstream config: `config --get branch.<branch>.remote` fails for branches without configured upstream.
- Missing remote branch graph: `rev-list --count <branch>..origin/<branch>` fails when the remote branch/ref does not exist.
- Missing ref checks: `show-ref --verify --quiet refs/remotes/origin/my-branch` fails when a candidate ref does not exist.
-
-The `~/dev/opencode` git failures are branch graph probes for `ecosystem-paseo` versus `origin/ecosystem-paseo`, not OpenCode provider startup failures.
-
-## Inbound Client Work
-
-Inbound session messages during the startup window:
-
-| request                           | count |
-| --------------------------------- | ----: |
-| `client_heartbeat`                |    19 |
-| `checkout_pr_status_request`      |    18 |
-| `fetch_agents_request`            |    11 |
-| `fetch_workspaces_request`        |     9 |
-| `get_providers_snapshot_request`  |     9 |
-| `project_icon_request`            |     9 |
-| `fetch_agent_timeline_request`    |     7 |
-| `clear_agent_attention`           |     6 |
-| `list_terminals_request`          |     5 |
-| `subscribe_terminals_request`     |     5 |
-| `list_available_editors_request`  |     2 |
-| `subscribe_checkout_diff_request` |     2 |
-| `checkout_status_request`         |     1 |
-| `fetch_agent_request`             |     1 |
-| `file_explorer_request`           |     1 |
-| `read_project_config_request`     |     1 |
-| `workspace_setup_status_request`  |     1 |
-
-Inbound by client:
-
-| client                                                      | count | top work                                                                                                                                                                                                           |
-| ----------------------------------------------------------- | ----: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Electron `cid_d555...`, origin `http://localhost:8082`      |    68 | `checkout_pr_status_request:18`, `project_icon_request:9`, `clear_agent_attention:6`, `fetch_agent_timeline_request:4`, `fetch_workspaces_request:3`, `fetch_agents_request:3`, `get_providers_snapshot_request:3` |
-| HeadlessChrome `cid_d39...`, origin `http://localhost:8081` |    13 | `client_heartbeat:4`, `fetch_workspaces_request:2`, `fetch_agents_request:2`, `get_providers_snapshot_request:2`                                                                                                   |
-| local web `cid_a2b...`, origin `http://localhost:6767`      |    13 | `client_heartbeat:4`, `fetch_workspaces_request:2`, `fetch_agents_request:2`, `get_providers_snapshot_request:2`                                                                                                   |
-| Android `cid_24c...`, origin `http://10.0.2.2:6767`         |    11 | `client_heartbeat:2`, `fetch_workspaces_request:2`, `fetch_agents_request:2`, `get_providers_snapshot_request:2`                                                                                                   |
-| `cid_70d...`, host `0.0.0.0:6767`                           |     2 | `fetch_agents_request:2`                                                                                                                                                                                           |
-
-## Outbound Client Work
-
-Outbound session messages during the startup window:
-
-| message                            | count |
-| ---------------------------------- | ----: |
-| `providers_snapshot_update`        |   129 |
-| `workspace_update`                 |    81 |
-| `checkout_status_update`           |    76 |
-| `agent_update`                     |    47 |
-| `checkout_pr_status_response`      |    18 |
-| `fetch_agents_response`            |    11 |
-| `fetch_workspaces_response`        |     9 |
-| `get_providers_snapshot_response`  |     9 |
-| `project_icon_response`            |     9 |
-| `fetch_agent_timeline_response`    |     7 |
-| `list_terminals_response`          |     5 |
-| `terminals_changed`                |     5 |
-| `list_available_editors_response`  |     2 |
-| `subscribe_checkout_diff_response` |     2 |
-| `checkout_status_response`         |     1 |
-| `fetch_agent_response`             |     1 |
-| `file_explorer_response`           |     1 |
-| `read_project_config_response`     |     1 |
-| `workspace_setup_status_response`  |     1 |
-
-Provider snapshot updates were large and repeated:
-
- Around lines 982-986: five `providers_snapshot_update` messages, each `215932` bytes.
- Around lines 997-1001: five `providers_snapshot_update` messages, each `215898` bytes.
- Around lines 1250-1254: five `providers_snapshot_update` messages, each `414735` bytes.
-
-## Slow Requests
-
-Slow requests logged during startup:
-
-| time           |                           request | duration | client                | line |
-| -------------- | --------------------------------: | -------: | --------------------- | ---: |
-| `16:04:29.702` |    `fetch_agent_timeline_request` |  39372ms | HeadlessChrome        | 1767 |
-| `16:04:29.702` |    `fetch_agent_timeline_request` |  39212ms | Electron              | 1768 |
-| `16:04:29.702` |    `fetch_agent_timeline_request` |  38914ms | local web             | 1769 |
-| `16:04:33.665` |      `checkout_pr_status_request` |  20181ms | Electron              | 1776 |
-| `16:04:08.109` | `subscribe_checkout_diff_request` |  17618ms | Electron              |  565 |
-| `16:04:29.702` |    `fetch_agent_timeline_request` |  16216ms | Electron              | 1770 |
-| `16:04:06.624` |    `fetch_agent_timeline_request` |  16134ms | Electron              |  524 |
-| `16:04:29.396` |      `checkout_pr_status_request` |  15911ms | Electron              | 1671 |
-| `16:04:29.256` |      `checkout_pr_status_request` |  15772ms | Electron              | 1651 |
-| `16:04:29.149` |      `checkout_pr_status_request` |  15665ms | Electron              | 1638 |
-| `16:04:29.054` |      `checkout_pr_status_request` |  15569ms | Electron              | 1628 |
-| `16:04:28.932` |      `checkout_pr_status_request` |  15448ms | Electron              | 1611 |
-| `16:04:28.809` |      `checkout_pr_status_request` |  15324ms | Electron              | 1601 |
-| `16:04:28.672` |      `checkout_pr_status_request` |  15188ms | Electron              | 1582 |
-| `16:04:28.555` |      `checkout_pr_status_request` |  15071ms | Electron              | 1567 |
-| `16:04:28.421` |      `checkout_pr_status_request` |  14936ms | Electron              | 1556 |
-| `16:04:28.323` |      `checkout_pr_status_request` |  14839ms | Electron              | 1549 |
-| `16:04:28.324` |         `checkout_status_request` |  14839ms | Electron              | 1550 |
-| `16:04:28.189` |      `checkout_pr_status_request` |  14705ms | Electron              | 1536 |
-| `16:04:29.634` |            `fetch_agents_request` |  14590ms | `0.0.0.0:6767` client | 1759 |
-| `16:04:28.006` |      `checkout_pr_status_request` |  14522ms | Electron              | 1526 |
-| `16:04:27.628` |      `checkout_pr_status_request` |  14143ms | Electron              | 1496 |
-| `16:04:27.061` |      `checkout_pr_status_request` |  13576ms | Electron              | 1405 |
-| `16:04:29.645` |            `fetch_agents_request` |  13384ms | `0.0.0.0:6767` client | 1762 |
-| `16:04:02.812` |    `fetch_agent_timeline_request` |  12321ms | Electron              |  440 |
-| `16:04:25.740` |      `checkout_pr_status_request` |  12256ms | Electron              | 1309 |
-| `16:04:25.352` |      `checkout_pr_status_request` |  11867ms | Electron              | 1296 |
-| `16:04:04.217` |    `fetch_agent_timeline_request` |  11751ms | Android               |  462 |
-| `16:04:25.155` |      `checkout_pr_status_request` |  11671ms | Electron              | 1284 |
-| `16:04:23.196` |             `fetch_agent_request` |   9711ms | Electron              | 1070 |
-| `16:04:17.563` |            `project_icon_request` |   4079ms | Electron              |  877 |
-| `16:03:53.022` |  `list_available_editors_request` |   2533ms | Electron              |  254 |
-| `16:04:15.703` |            `project_icon_request` |   2218ms | Electron              |  824 |
-| `16:04:15.696` |            `project_icon_request` |   2211ms | Electron              |  822 |
-| `16:04:15.694` |            `project_icon_request` |   2209ms | Electron              |  820 |
-| `16:04:15.103` |           `file_explorer_request` |   1618ms | Electron              |  806 |
-| `16:04:14.107` |          `list_terminals_request` |    621ms | Electron              |  764 |
-| `16:03:50.945` |          `list_terminals_request` |    614ms | HeadlessChrome        |  156 |
-
-The checkout PR requests are especially clustered: 18 Electron `checkout_pr_status_request` messages arrive together at `16:04:13.484`, lines 699-716. Their slow-request completions drain over the next ~20s, with `inflightRequests` dropping from 20 to 0.
-
-## Provider Findings
-
-### OpenCode
-
-OpenCode provider snapshot refresh had two timeouts:
-
-| time           | line | cwd                         | error                                         |
-| -------------- | ---: | --------------------------- | --------------------------------------------- |
-| `16:04:22.466` |  987 | `/Users/moboudra/dev/paseo` | `Timed out refreshing OpenCode after 30000ms` |
-| `16:04:22.482` | 1002 | `/Users/moboudra`           | `Timed out refreshing OpenCode after 30000ms` |
-
-These are provider snapshot failures, not OpenCode agent resume failures.
-
-The persisted OpenCode agent did resume:
-
-| time           | line | event                                                 |
-| -------------- | ---: | ----------------------------------------------------- |
-| `16:04:24.183` | 1201 | `provider.opencode.subscribe.start`                   |
-| `16:04:24.183` | 1202 | `provider.opencode.subscribe.ready`                   |
-| `16:04:24.306` | 1214 | raw event `server.connected`                          |
-| `16:04:25.933` | 1321 | `Agent resumed from persistence`, provider `opencode` |
-| `16:04:34.197` | 1783 | raw event `server.heartbeat`                          |
-| `16:04:44.200` | 1789 | raw event `server.heartbeat`                          |
-
-There are no `provider.opencode.subscribe.error` or OpenCode agent fatal errors in this slice.
-
-OpenCode-related git:
-
- `~/dev/opencode` had 22 git commands.
- Four failed.
- The failed commands were branch graph probes for `ecosystem-paseo` versus `origin/ecosystem-paseo`.
- Those failures are git state/probe failures, not OpenCode provider process failures.
-
-### Codex
-
-Codex provider startup observations:
-
- `provider.codex.spawn` appears multiple times for provider snapshot/config discovery.
- A persisted Codex agent resumes successfully at `16:04:06.357`, line 518.
- Debug logs show failed reads of Codex saved config defaults, but these are debug-level and do not become provider startup warnings/errors in this slice.
- There are unhandled Codex trace event types such as remote-control/status and thread/goal status, but no Codex timeout or fatal provider startup failure in this slice.
-
-### Claude
-
-Claude agents resume successfully:
-
-| time           | line | client   | agent                                  |
-| -------------- | ---: | -------- | -------------------------------------- |
-| `16:04:02.540` |  434 | Electron | `f884552a-1383-4dba-8583-7ae0b6a62353` |
-| `16:04:03.772` |  456 | Android  | `0c89a057-05f2-4e23-9895-84c8e1952310` |
-
-## What Work The App Asked For
-
-The startup work visible in the app/server protocol is:
-
- Workspace list/sidebar hydration:
-  - `fetch_workspaces_request`, 9 total.
-  - This asks for the workspace list sorted by `activity_at desc`, usually page limit 200.
-  - On the server this triggers workspace git observer sync and workspace update flushing.
-
- Agent list and agent detail hydration:
-  - `fetch_agents_request`, 11 total.
-  - `fetch_agent_request`, 1 total.
-  - `fetch_agent_timeline_request`, 7 total.
-  - Timeline requests are among the slowest requests in this slice.
-
- Checkout/PR status UI:
-  - `checkout_pr_status_request`, 18 total, all Electron.
-  - `checkout_status_request`, 1 total.
-  - `subscribe_checkout_diff_request`, 2 total.
-  - These correspond to git snapshot consumers and are clustered during Electron reconnect.
-
- Provider/model/mode UI:
-  - `get_providers_snapshot_request`, 9 total.
-  - `providers_snapshot_update`, 129 outbound updates.
-  - OpenCode provider snapshot refresh times out twice during this flow.
-
- Workspace chrome:
-  - `project_icon_request`, 9 total.
-  - `file_explorer_request`, 1 total.
-
- Terminal panel:
-  - `list_terminals_request`, 5 total.
-  - `subscribe_terminals_request`, 5 total.
-  - `terminals_changed`, 5 outbound updates.
-
- Attention state:
-  - `clear_agent_attention`, 6 total.
-  - Some failures appear while clearing attention for persisted agents, but these are not provider startup failures.
-
-## Concrete Waste-Looking Work, Without Optimizing Yet
-
-The log shows repeated work in these exact forms:
-
- 444 git commands total, but only 14 complete before the first client hello. The rest are post-listen startup/client hydration work.
- Several workspaces get repeated full checkout snapshot patterns:
-  - three 33-command worktrees each get `3` root checks, `3` dirty checks, `3` upstream config probes, `9` ahead/behind probes, `12` ref checks, and `3` base divergence checks.
-  - three 27-command worktrees each get `3` root checks, `3` dirty checks, `6` upstream config probes, `6` ahead/behind probes, `6` ref checks, and `3` base divergence checks.
-  - `~/dev/paseo` gets `5` root checks, `5` dirty checks, `10` upstream config probes, and `10` ahead/behind probes.
- Electron sends 18 `checkout_pr_status_request` messages at the same timestamp, then they drain slowly over ~20s.
- Provider snapshot updates are broadcast very frequently: 129 outbound `providers_snapshot_update` messages, including large repeated payloads around 216KB and 415KB.
- OpenCode snapshot refresh times out twice after 30s, but the actual OpenCode agent connection/resume succeeds.
-
-Again, this section names repeated work observed in the startup. It does not claim which repetition should be removed.
--- a/docs/floating-panels.md
+++ b/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:
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -5,7 +5,7 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Project** — Logical grouping of workspaces sharing a git remote (or main repo root). UI: "Project" / "Add project". Code: `ProjectSummary` (`packages/app/src/utils/projects.ts:22`), `projectKey` (`packages/server/src/server/workspace-registry-model.ts:16`). Forbidden: "Repo", "Repository" as UI label.
 - **Workspace** — One concrete `cwd` on one daemon, with git state; belongs to exactly one project. UI: "Workspace". Code: `WorkspaceDescriptorPayload` (`packages/protocol/src/messages.ts:2178`). Don't confuse with: Branch (one branch can back many workspaces via worktrees). Forbidden: "Folder", "Directory" as UI label.
 - **Workspace kind** — `"directory" | "local_checkout" | "worktree"`. Code: `PersistedWorkspaceKind` (`packages/server/src/server/workspace-registry-model.ts:8`).
- **Agent** — One AI coding agent run on a daemon (one provider, one model, one cwd, one timeline). UI: "Agent" / "New Agent". Code: `AgentSnapshotPayload` (`packages/protocol/src/messages.ts:608`). Forbidden: "Task", "Job", "Run".
+- **Agent** — See **Agent session**. UI still says "Agent" / "New Agent" in places, but moving toward **Agent session** as the canonical term. Code: `AgentSnapshotPayload` (`packages/protocol/src/messages.ts:608`). Forbidden: "Task", "Job", "Run".
 - **Daemon** — Local Paseo server process; identified by `serverId`. UI: "Daemon" (system contexts only). Code: `serverId` in `ServerInfoStatusPayloadSchema` (`packages/protocol/src/messages.ts:1936`), `DaemonClient` (`packages/client/src/daemon-client.ts`).
 - **Host** — Client-side connection profile pointing at a daemon; bundles one or more `HostConnection`s. UI: "Host" / "Add host" / "Switch host". Code: `HostProfile` (`packages/app/src/types/host-connection.ts:37`). Forbidden: "Connection" (means `HostConnection`, not host).
 - **Project host entry** — One row in a project for a single (project, daemon) pair, aggregating that daemon's workspaces in the project. Internal. Code: `ProjectHostEntry` (`packages/app/src/utils/projects.ts:11`). Don't introduce "Checkout" as a synonym.
@@ -13,10 +13,12 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
 - **Branch** — Plain git branch. UI: "Switch branch". Code: `currentBranch` in `WorkspaceGitRuntimePayloadSchema` (`packages/protocol/src/messages.ts:2136`); `BranchSwitcher` (`packages/app/src/components/branch-switcher.tsx`).
 - **Worktree** — Paseo-managed git worktree (`~/.paseo/worktrees/{name}`); also a `workspaceKind` value. UI: CLI + `paseo.json` keys (`worktree.setup`, `worktree.teardown`) only. Code: `ProjectCheckoutLiteGitPaseoPayload` (`packages/protocol/src/messages.ts:2092`); CLI `paseo worktree` (`packages/cli/src/commands/worktree/index.ts:8`). Forbidden: "Checkout" as a synonym.
 - **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.
+- **Agent session** — One running instance of an agent inside a workspace (one provider, one model, one cwd, one timeline). The conceptual unit; in the UI this opens as a tab. Moving toward this as the canonical term over "Agent". Code: `AgentSnapshotPayload` (`packages/protocol/src/messages.ts:608`).
+- **Session** — Two senses: (a) per-client connection to a daemon, internal; (b) user-facing agent session, see **Agent session**. Code: `Session` (`packages/server/src/server/session.ts`) for (a). Don't confuse with: provider-side agent session log.
 - **Profile** — Internal name for the persisted shape of a host. Code: `HostProfile` (`packages/app/src/types/host-connection.ts:37`). Never user-facing.
- **Provider** — Agent backend (Claude Code, Codex, Copilot, OpenCode, Pi). 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`).
+- **Tab** — UI surface representing one session inside a workspace. Not a conceptual unit; use **Agent session** when talking about the model. Code: `WorkspaceTabDescriptor` (`packages/app/src/screens/workspace/workspace-tabs-types.ts`).
 - **Terminal** — Workspace-scoped PTY shell streamed over the binary mux channel. UI: "Terminal". Code: `TerminalStreamFrame` (`packages/protocol/src/terminal-stream-protocol.ts`).
 - **Schedule** — Cron-style trigger that creates new agents. UI: CLI/MCP (`paseo schedule`, `create_schedule`). Don't confuse with: Heartbeat (cron prompt back into the same agent) or Loop (iterative re-execution of one agent).
 - **Heartbeat** — Cron-style prompt sent back into the same agent/conversation. MCP: `create_heartbeat`. Use for reminders and babysitting where the status should return inline.
--- a/docs/i18n.md
+++ b/docs/i18n.md
@@ -0,0 +1,79 @@
+# I18n
+
+Paseo client UI translations live in `packages/app/src/i18n`.
+
+## Supported Locales
+
+- `en`
+- `ar`
+- `es`
+- `fr`
+- `ru`
+- `zh-CN`
+
+The persisted app language setting is `"system" | "ar" | "en" | "es" | "fr" | "ru" | "zh-CN"`. `"system"` follows the device or browser locale when it maps to a supported locale; unsupported system locales fall back to English.
+
+## Translation Scope
+
+Translate client-owned UI copy: labels, buttons, empty states, confirmation text, and local status/error wrappers.
+
+Do not translate agent output, daemon output, terminal contents, file paths, provider names, model names, command names, user-authored text, code blocks, logs, or raw protocol/server error text.
+
+## Adding Copy
+
+English source strings live in `packages/app/src/i18n/resources/en.ts`. Simplified Chinese strings live in `packages/app/src/i18n/resources/zh-CN.ts`.
+
+For migrated screens and components, use `useTranslation()` and pass translated text into UI primitives. Low-level primitives such as `<Button>` do not import translation state unless they own the text they render.
+
+Keep resource keys grouped by product surface, not component mechanics.
+
+Run:
+
+```bash
+npx vitest run packages/app/src/i18n/resources.test.ts --bail=1
+```
+
+The parity test catches missing keys between English and Simplified Chinese resources.
+
+## Migration Order
+
+Client UI translation is staged so each pass can migrate complete local copy clusters and keep reviews focused.
+
+1. App shell and shared UI chrome: common actions, headers, sheets, command center, and client-owned toast status.
+2. Composer and agent workflow: composer input, agent controls, permission prompts, plan approval, and agent panel wrapper states.
+3. Settings expansion: Appearance, Shortcuts, Integrations, Permissions, Diagnostics, About, Project settings, Host settings, and provider diagnostics.
+4. Workspace and panels: setup/file/browser/terminal wrapper copy, file explorer local states, import-session flows, and remaining local toast/error wrapper text.
+
+Within a migrated surface, do not leave mixed-language neighboring labels when those labels are owned by the client. Move the whole local copy cluster together.
+
+### Progress
+
+- Batch 2 migrated Composer and agent workflow chrome: Composer input and attachments, agent controls, stream permission prompts, agent panel wrapper states, and draft panel descriptors. Provider/model names, provider-defined option labels, agent output, and protocol/server diagnostics remain untranslated.
+- Batch 3A migrated Settings Diagnostics/About, Appearance, Shortcuts, Integrations, and Desktop Permissions chrome. Host settings and Project settings remain for Batch 3B; raw runtime status/error details remain untranslated.
+- Batch 3B migrated Host settings, Provider diagnostics, and Project settings chrome. Provider/model names, project/host labels, script commands, diagnostic output, file paths, and raw runtime/server error details remain untranslated.
+- Batch 4A migrated workspace wrapper chrome for import sessions, file explorer, setup, browser, terminal, and file panels. File paths, URLs, commands, logs, terminal output, provider labels, and raw runtime/server errors remain untranslated.
+- Batch 4B migrated workspace tab shell, workspace scripts, Git actions/diff/PR chrome, worktree archive warnings, Open-in-editor controls, and inline review controls. Branch names, PR titles/bodies, check names, workflow names, file paths, diff contents, commands, terminal output, provider labels, and raw runtime/server errors remain untranslated.
+- Batch 4C migrated Sidebar project/workspace menus, hide/remove/archive confirmations, workspace rename chrome, New workspace ref picker/create flow, and Open project home tiles. Workspace/project names, branch names, PR titles, paths, provider labels, daemon output, and raw runtime/server errors remain untranslated.
+- Batch 4D migrated provider/model selector chrome, provider catalog install modal, add-connection method modal, and paste-pairing-link modal. Provider/model/catalog names, provider descriptions, pairing URLs, protocol parser errors, daemon connection details, and raw runtime/server errors remain untranslated.
+- Batch 4E migrated onboarding welcome chrome, direct-connection modal fields/actions/local failure guidance, QR scan permission/unavailable states, and desktop pair-device card. Pairing URLs, host/port placeholders, endpoint values, transport details, protocol parser errors, and raw runtime/server errors remain untranslated.
+- Batch 4F migrated realtime voice overlay accessibility labels, rewind menu chrome and fallback toast, DiffViewer default empty state, and service URL chooser copy. Shortcut key names, raw daemon errors, diff contents, URLs, and caller-provided override labels remain untranslated.
+- Batch 4G migrated the keyboard shortcuts help dialog to render section titles, row labels, and row notes through translation keys. Shortcut key names, shortcut combos, binding IDs, action IDs, and fallback registry labels remain untranslated.
+- Batch 4H migrated Sessions screen chrome and AgentList local UI copy: date section headers, local status labels, fallback session titles, badges, load-more/empty states, and the archive action sheet. Agent titles, project paths, provider icons/labels, host labels, relative timestamps, and raw runtime data remain untranslated.
+- Batch 4I migrated message utility chrome: image lightbox labels/errors, code and turn copy accessibility labels, dictation controls, question form fallback placeholders/actions, PlanCard fallback title, assistant image fallback errors, and todo list labels. Message bodies, plan text, todo item text, attachment labels, runtime dictation errors, and agent/tool output remain untranslated.
+- Batch 4J migrated workspace tab toast/empty chrome: copy failure messages, copied labels, resume-command availability errors, reload-agent local status, host-disconnected wrapper reuse, and split-pane empty state. Agent IDs, generated resume commands, workspace paths, branch names, and raw reload errors remain untranslated.
+- Batch 4K migrated sidebar/project list chrome: host picker fallback/search/title, footer actions and tooltips, Sessions row labels, mobile close label, New workspace tooltip/accessibility label, project-list empty states, and project settings host-load wrapper text. Host names, project names, workspace names, paths, branch names, and raw host errors remain untranslated.
+- Batch 4L migrated picker/file/detail utility chrome: project picker states, branch switcher labels/placeholders, file pane loading/empty/fallback errors, tool-call details section/empty labels, and open-file accessibility. Directory paths, branch names, file contents, file sizes, tool details, and raw file-load errors remain untranslated.
+- Batch 4M migrated hook/modal utility chrome: image attachment permissions/dialog/errors, copied toast wrappers, rename modal local validation/fallback errors, branch switcher stash/switch prompts and fallback toasts, and workspace setup local fallback errors. Copied labels supplied by callers, branch names, selected paths, raw dialog/API errors, and raw server errors remain untranslated.
+- Batch 4N migrated pure view-model/policy utility chrome: import-session fallback titles/previews/empty states and the worktree setup callout. Provider labels and IDs remain runtime values interpolated into translated wrappers.
+- Batch 4O migrated remaining small utility chrome: workspace route gate states/actions, compaction markers, archived-agent callout, web browser fallback, desktop quitting overlay, and image drop overlay. Host names, host status values, browser IDs, token counts, and raw route errors remain runtime values.
+- Batch 4P migrated provider-selection pure view-model utility copy to direct `i18n.t(...)` calls and removed the local labels parameter path. Provider/model labels, provider IDs, and provider snapshot error messages remain runtime values.
+- Batch 4Q migrated desktop update utility chrome: app update status text, update callout titles/actions, generic update errors, and install-error wrappers. Version labels, installer messages, raw update errors, release-channel data, and logs remain runtime values.
+- Batch 4R migrated desktop permission utility chrome: permission status details, permission request fallback errors, empty permission statuses, and desktop notification test wrappers. Browser permission states, exception names, and raw browser API error messages remain runtime values.
+- Batch 4S migrated desktop daemon settings chrome: built-in daemon status rows, daemon lifecycle toggles, logs/status modals, clipboard alerts, daemon management confirmations/errors, daemon status load errors, and desktop CLI/skills install wrapper errors. PIDs, log paths, log contents, CLI status output, version values, and raw IPC errors remain runtime values.
+- Batch 4T migrated remaining attachment/autocomplete utility chrome: user and composer review attachment labels, workspace hover-card accessibility, branch stash restore prompts/toasts, agent autocomplete loading/empty/fallback error text, older-history fallback toast, draft panel labels, and agent-control fallback labels. PR/issue numbers, browser element tags, branch names, provider labels, model labels, agent prompts, command/file names, and raw server errors remain runtime values.
+- Batch 4U migrated shared default utility chrome: Combobox and Autocomplete default placeholders/empty/loading labels, drag-overlay and subagent-track loading labels, sub-agent activity fallback headers, and file-preview fallback errors. Caller-provided labels, tab titles, subagent descriptions, file paths, and raw file-load errors remain runtime values.
+- Batch 4V migrated Git policy action chrome to direct `i18n.t(...)` calls: commit/pull/push/sync/PR/merge/auto-merge/archive action labels, pending/success labels, and unavailable reasons. Branch/base refs, PR URLs, GitHub merge-state enum values, runtime statuses, and raw Git/GitHub errors remain runtime values.
+- Batch 4W migrated remaining local wrapper states: workspace copy unavailable toasts, startup daemon-log loading/empty/load-failed text, and file-explorer workspace/host unavailable fallbacks. Workspace paths, branch names, daemon log contents/paths, checkout query details, and raw file/daemon errors remain runtime values.
+- Batch 4X migrated descriptor and command chrome: Pair-device modal header, workspace setup sheet title, terminal panel fallback labels, command-center action titles, and file-pane host-disconnected fallback. Provider/catalog names, command-center search keywords, terminal runtime titles, file paths, and raw read errors remain runtime values.
+- Batch 4Y tightened the translation boundary so React components and custom hooks use `useTranslation()` while pure helpers keep direct `i18n.t(...)` fallbacks, and migrated remaining small UI/accessibility fallbacks across message details, menu backdrops, startup errors, sidebar PR badges, settings/project accessibility labels, composer send/create/download fallbacks, client slash-command descriptions, terminal subscribe errors, and desktop update completion text. Provider catalog metadata, shortcut registry fallbacks, agent/daemon/protocol reasons, terminal contents, raw runtime errors, and user/project/workspace names remain untranslated.
+- Batch 4Z expanded the supported locale set to the six UN official languages: Arabic, Chinese, English, French, Russian, and Spanish. Arabic, French, Russian, and Spanish now have full client-owned UI resource coverage, with key parity, fallback-ratio, and interpolation-placeholder tests guarding the generated translations. Arabic does not enable RTL layout direction in this batch.
--- a/docs/product.md
+++ b/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
--- a/docs/providers.md
+++ b/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,14 +24,20 @@ 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.

 OpenCode owns user message IDs. Do not pass Paseo-generated IDs to OpenCode prompt APIs; let OpenCode create `msg*` IDs and record the user timeline item from the `message.updated` event.

+Every provider adapter owns its canonical user-message timeline rows. When a foreground prompt is accepted, the adapter must emit exactly one `user_message` timeline item for that submitted prompt, using the same message ID it gives to or receives from the provider runtime. Optimistic client messages are UI-only and provider transcript echoes are optional; neither is allowed to be the only source of truth. If the provider later echoes the same submitted user message, dedupe by provider-visible message ID, not by text.
+
 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
@@ -260,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[] = [
@@ -311,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 }>;
 }
 ```
--- a/docs/release.md
+++ b/docs/release.md
@@ -9,6 +9,9 @@ A release has exactly two steps. The agent does the first, the user authorizes t
 **Preparation** (local, reversible — agent does this):

 - format, lint, typecheck all green
+- ACP provider catalog drift checked with `npm run acp:version-drift:check`;
+  if stale package-runner pins are intentional, say so explicitly, otherwise run
+  `npm run acp:version-drift:update` and commit the updated catalog
 - draft the changelog, show it to the user, wait for review
 - run the pre-release sanity check, surface findings to the user
 - confirm CI is green
@@ -30,7 +33,7 @@ Rules that apply to both steps:
 There are two supported ways to ship from `main`:

 1. **Direct stable release**: you are ready to ship the current `main` commit to everyone immediately.
-2. **Beta flow**: silent release candidates. Betas don't touch the changelog, don't move the website, and don't publish npm or production mobile builds.
+2. **Beta flow**: silent release candidates. Betas don't touch the changelog, don't move the website, and publish npm only on the explicit `beta` dist-tag.

 ## Standard release (patch)

@@ -63,14 +66,15 @@ npm run release:push         # Push HEAD + tag (triggers CI workflows)
 ## Beta flow

 ```bash
-npm run release:beta:patch       # Bump to X.Y.Z-beta.1, push commit + tag
+npm run release:beta:patch       # Bump to X.Y.Z-beta.1, publish npm beta, push commit + tag
 # ... test desktop and APK prerelease assets from GitHub Releases ...
 npm run release:beta:next        # Optional: cut X.Y.Z-beta.2, beta.3, ...
 npm run release:promote          # Promote X.Y.Z-beta.N to stable X.Y.Z
 ```

 - Beta tags are published GitHub prereleases like `v0.1.41-beta.1`
- Betas publish desktop assets and APKs for testing, but they do not publish npm packages and do not trigger the production web/mobile release flows
+- Betas publish npm packages with `--tag beta`, so `npm install @getpaseo/cli@beta` opts in while plain `npm install @getpaseo/cli` stays on `latest`
+- Betas publish desktop assets and APKs for testing, but they do not trigger the production web/mobile release flows
 - `release:promote` creates a fresh stable tag like `v0.1.41`; the final release never reuses the beta tag
 - Desktop assets now come from the Electron package at `packages/desktop`
 - Beta releases use Electron's `beta` update channel. Users on the stable channel only receive stable releases; users on the beta channel receive beta releases and the final stable release when it is published.
@@ -85,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`.

@@ -169,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)

@@ -300,6 +304,7 @@ This ensures the checkout ref matches the actual code on `main` with the fix inc
 - `release:prepare` refreshes workspace `node_modules` links to prevent stale types
 - `npm run dev:desktop` and `npm run build:desktop` target the Electron desktop package in `packages/desktop`
 - If `release:publish` partially fails, re-run it — npm skips already-published versions
+- If `release:publish:beta` partially fails, re-run it — npm skips already-published versions and keeps prereleases off `latest` because every publish uses `--tag beta`
 - The website uses GitHub's latest published release API for download links, so published beta prereleases do not replace the stable download target.

 ## Changelog format
@@ -420,6 +425,7 @@ The changelog covers **stable-to-stable**. Betas are not represented. When you p

 - [ ] Working tree is clean and the intended commit is on `main`
 - [ ] `npm run release:beta:patch` (or `:next`) completes successfully
+- [ ] npm shows the version under the `beta` dist-tag, not `latest`
 - [ ] GitHub `Desktop Release` workflow for the `v*-beta.N` tag is green
 - [ ] GitHub `Android APK Release` workflow for the same tag is green

--- a/docs/unistyles.md
+++ b/docs/unistyles.md
@@ -88,6 +88,8 @@ Do not split a component into plain and Unistyles variants just to handle one hi

 When a reusable component has a prop whose whole job is dynamic geometry, make that prop the seam. For example, `FloatingSurface.frameStyle` and `FloatingScrollView.style` own their own escape hatch so menu, tooltip, hover-card, and combobox callers can stay declarative instead of knowing about Unistyles internals.

+Do not flatten a caller-provided style array and pass the flattened object back to a React Native component. Unistyles style entries carry `unistyles_*` metadata; flattening two entries produces one object with multiple metadata keys and triggers the runtime warning: "use array syntax instead of object syntax." Preserve caller styles as arrays, and only flatten the dynamic geometry value you explicitly own. If that owned value was flattened from a mixed style prop, strip `unistyles_*` metadata before sending it through `inlineUnistylesStyle`.
+
 ## Main Gotcha: `contentContainerStyle`

 `ScrollView.contentContainerStyle` is the canonical trap. It looks like a style prop, but it is not the same prop that Unistyles' remapped native component registers by default. The upstream tutorial calls this out directly in its [ScrollView Background Issue](https://www.unistyl.es/v3/tutorial/settings-screen#scrollview-background-issue) section.
@@ -333,7 +335,7 @@ For paint-layer bugs, use high-contrast probes:
 3. Screenshot the simulator and sample pixels to see which color fills the area.
 4. Remove the probes before committing.

-The welcome-screen investigation used this approach to prove the white layer was the `ScrollView` content container. Deep-dive evidence is in [welcome-theme-split-research.md](/Users/moboudra/.paseo/notes/welcome-theme-split-research.md).
+The welcome-screen investigation used this approach to prove the white layer was the `ScrollView` content container.

 ## References

@@ -347,4 +349,3 @@ The welcome-screen investigation used this approach to prove the white layer was
 - [GitHub issue #550: ScrollView sticky-header theme updates](https://github.com/jpudysz/react-native-unistyles/issues/550)
 - [GitHub issue #817: `UnistylesRuntime.themeName` does not re-render](https://github.com/jpudysz/react-native-unistyles/issues/817)
 - [GitHub issue #1030: `Image.tintColor` and native style update edge case](https://github.com/jpudysz/react-native-unistyles/issues/1030)
- [Local research note: welcome theme split](/Users/moboudra/.paseo/notes/welcome-theme-split-research.md)
--- a/nix/npm-deps.hash
+++ b/nix/npm-deps.hash
@@ -1 +1 @@
-sha256-R2EUXh8wV0bjdeDNWMhFzd3iDV/dpkLUikbX7nzoMXQ=
+sha256-62dqunclpCgWCsIyRV5DMjGdwUhPP4rbjEjSO9dJ7no=
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.1.89",
+  "version": "0.1.94",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.1.89",
+      "version": "0.1.94",
      "hasInstallScript": true,
      "license": "AGPL-3.0-or-later",
      "workspaces": [
@@ -2567,9 +2567,9 @@
      }
    },
    "node_modules/@babel/runtime": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz",
-      "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz",
+      "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==",
      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
@@ -20529,6 +20529,19 @@
        "react-native": "*"
      }
    },
+    "node_modules/expo-localization": {
+      "version": "17.0.9",
+      "resolved": "https://registry.npmjs.org/expo-localization/-/expo-localization-17.0.9.tgz",
+      "integrity": "sha512-k5eYHr7iLMob3M8cHH6bgDrDRmqnZG8xKGLhpx8ST+LsFXmSgYpJ/t0VwWm0gz64C/K669XhObdG3D6QwCGqhw==",
+      "license": "MIT",
+      "dependencies": {
+        "rtl-detect": "^1.0.2"
+      },
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*"
+      }
+    },
    "node_modules/expo-manifests": {
      "version": "1.0.10",
      "resolved": "https://registry.npmjs.org/expo-manifests/-/expo-manifests-1.0.10.tgz",
@@ -23838,6 +23851,15 @@
        "node": ">=12"
      }
    },
+    "node_modules/html-parse-stringify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
+      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "license": "MIT",
+      "dependencies": {
+        "void-elements": "3.1.0"
+      }
+    },
    "node_modules/html-url-attributes": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/html-url-attributes/-/html-url-attributes-3.0.1.tgz",
@@ -24016,6 +24038,34 @@
      "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==",
      "license": "BSD-3-Clause"
    },
+    "node_modules/i18next": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.3.0.tgz",
+      "integrity": "sha512-gHSgGpUXVmuqE2El1W61DmxeyeTlFfZgdJRWMo9jScAn5pu7TuTuiccb1zh3E2J9hEBVGJ23+96x0ieBhfuIHA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://www.locize.com/i18next"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.locize.com"
+        }
+      ],
+      "license": "MIT",
+      "peerDependencies": {
+        "typescript": "^5 || ^6"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/iconv-corefoundation": {
      "version": "1.1.7",
      "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz",
@@ -24193,6 +24243,19 @@
        "css-in-js-utils": "^3.1.0"
      }
    },
+    "node_modules/inspect-webkit": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/inspect-webkit/-/inspect-webkit-0.0.5.tgz",
+      "integrity": "sha512-584wP/2nJO1LX74nqHP2j0tQzlK9ZTi+D0Z9qeLQjtUR/LCMXQHGX8M0vrsqBwTeGakF7q5GMFpg81nxUYlCvw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "inspect-webkit": "dist/cli.js"
+      },
+      "peerDependencies": {
+        "typescript": "^5"
+      }
+    },
    "node_modules/internal-slot": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
@@ -31257,6 +31320,33 @@
        "react": ">=17.0.0"
      }
    },
+    "node_modules/react-i18next": {
+      "version": "17.0.8",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-17.0.8.tgz",
+      "integrity": "sha512-0ooKbGLU8JXhe1zwpQUWIeXSgLPOfwJmgheWRIUpcoA0CpyabpGhayjdG+/eA5esC1AQ8h2jWpXjJfzQzeDOCw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.29.2",
+        "html-parse-stringify": "^3.0.1",
+        "use-sync-external-store": "^1.6.0"
+      },
+      "peerDependencies": {
+        "i18next": ">= 26.2.0",
+        "react": ">= 16.8.0",
+        "typescript": "^5 || ^6"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        },
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/react-is": {
      "version": "19.2.4",
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.4.tgz",
@@ -32637,6 +32727,12 @@
        "url": "https://opencollective.com/express"
      }
    },
+    "node_modules/rtl-detect": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/rtl-detect/-/rtl-detect-1.1.2.tgz",
+      "integrity": "sha512-PGMBq03+TTG/p/cRB7HCLKJ1MgDIi07+QU1faSjiYRfmY5UsAttV9Hs08jDAHVwcOwmVLcSJkpwyfXszVjWfIQ==",
+      "license": "BSD-3-Clause"
+    },
    "node_modules/run-parallel": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -32923,6 +33019,22 @@
        "seroval": "^1.0"
      }
    },
+    "node_modules/serve-sim": {
+      "version": "0.1.40",
+      "resolved": "https://registry.npmjs.org/serve-sim/-/serve-sim-0.1.40.tgz",
+      "integrity": "sha512-32JSUriN/EnNR3zx6fmiOKjuFrbA8VHWR2J3dX8T51Z/xkSmrSLOwaz/3W9lPiCIaF2O3LT4qpAhLkp0f1kVaw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "inspect-webkit": "^0.0.5"
+      },
+      "bin": {
+        "serve-sim": "dist/serve-sim.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
    "node_modules/serve-static": {
      "version": "1.16.3",
      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz",
@@ -35204,7 +35316,7 @@
      "version": "5.9.3",
      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true,
+      "devOptional": true,
      "license": "Apache-2.0",
      "bin": {
        "tsc": "bin/tsc",
@@ -36089,6 +36201,15 @@
      "integrity": "sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w==",
      "license": "MIT"
    },
+    "node_modules/void-elements": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/w3c-keyname": {
      "version": "2.2.8",
      "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
@@ -36953,7 +37074,7 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.1.89",
+      "version": "0.1.94",
      "dependencies": {
        "@dnd-kit/core": "^6.3.1",
        "@dnd-kit/sortable": "^10.0.0",
@@ -36997,6 +37118,7 @@
        "expo-image-picker": "^17.0.8",
        "expo-keep-awake": "^15.0.7",
        "expo-linking": "~8.0.8",
+        "expo-localization": "~17.0.9",
        "expo-notifications": "^0.32.16",
        "expo-router": "~6.0.13",
        "expo-sharing": "^14.0.8",
@@ -37004,12 +37126,15 @@
        "expo-system-ui": "~6.0.7",
        "expo-updates": "~29.0.12",
        "fast-deep-equal": "^3.1.3",
+        "htmlparser2": "^12.0.0",
+        "i18next": "^26.3.0",
        "lucide-react-native": "^0.546.0",
        "markdown-it": "^10.0.0",
        "mnemonic-id": "^3.2.7",
        "qrcode": "^1.5.4",
        "react": "19.1.0",
        "react-dom": "19.1.0",
+        "react-i18next": "^17.0.8",
        "react-native": "0.81.5",
        "react-native-draggable-flatlist": "^4.0.3",
        "react-native-edge-to-edge": "^1.7.0",
@@ -37049,6 +37174,7 @@
        "jsdom": "^20.0.3",
        "material-icon-theme": "^5.32.0",
        "playwright": "^1.56.1",
+        "serve-sim": "^0.1.40",
        "typescript": "~5.9.2",
        "vitest": "^4.1.6",
        "wrangler": "^4.75.0",
@@ -37156,6 +37282,85 @@
        "addons/*"
      ]
    },
+    "packages/app/node_modules/dom-serializer": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-3.1.1.tgz",
+      "integrity": "sha512-4MEa38/QexBob6gFNwu+EGdWvhJ1OKuNwdYY3Y3NyeWDQfnGeDYQUDfIRzWu5B5gsv03so2Uxd28YC6zrsx3Lw==",
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^3.0.0",
+        "domhandler": "^6.0.0",
+        "entities": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "packages/app/node_modules/domelementtype": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-3.0.0.tgz",
+      "integrity": "sha512-umCQid3jKbDmVjx8jGaW7uUykm4DEUeyV21hPxNMo2nV955DhUThwqyOIDtreepP31hl84X7G5U9ZfsWvIB3Pg==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=20.19.0"
+      }
+    },
+    "packages/app/node_modules/domhandler": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-6.0.1.tgz",
+      "integrity": "sha512-gYzvtM72ZtxQO0T048kd6HWSbbGCNOUwcnfQ01cqIJ4X2IYKFFHZ5mKvrQETcFXxsRObZulDaKmy//R7TPtsBg==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "domelementtype": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "packages/app/node_modules/domutils": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-4.0.2.tgz",
+      "integrity": "sha512-qI4JLRKnSzqFqr7hAlS5xQDusBCjKSEG4t4+7aNrIQMHBcsC2TGEhuyABJdYkgSewL57PNLYEiibY2iPKhKpaA==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "dom-serializer": "^3.0.0",
+        "domelementtype": "^3.0.0",
+        "domhandler": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "packages/app/node_modules/entities": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-8.0.0.tgz",
+      "integrity": "sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
    "packages/app/node_modules/expo-clipboard": {
      "version": "8.0.7",
      "resolved": "https://registry.npmjs.org/expo-clipboard/-/expo-clipboard-8.0.7.tgz",
@@ -37167,6 +37372,28 @@
        "react-native": "*"
      }
    },
+    "packages/app/node_modules/htmlparser2": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-12.0.0.tgz",
+      "integrity": "sha512-Tz7u1i95/g2x2jz81+x0FBVhBhY5aRTvD3tXXdFaljuNdzDLJ8UGNRrTcj2cgQvAg3iW/h77Fz15nLW0L0CrZw==",
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^3.0.0",
+        "domhandler": "^6.0.0",
+        "domutils": "^4.0.2",
+        "entities": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=20.19.0"
+      }
+    },
    "packages/app/node_modules/zod": {
      "version": "3.25.76",
      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
@@ -37178,12 +37405,12 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.1.89",
+      "version": "0.1.94",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.1.89",
-        "@getpaseo/protocol": "0.1.89",
-        "@getpaseo/server": "0.1.89",
+        "@getpaseo/client": "0.1.94",
+        "@getpaseo/protocol": "0.1.94",
+        "@getpaseo/server": "0.1.94",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -37429,10 +37656,10 @@
    },
    "packages/client": {
      "name": "@getpaseo/client",
-      "version": "0.1.89",
+      "version": "0.1.94",
      "dependencies": {
-        "@getpaseo/protocol": "0.1.89",
-        "@getpaseo/relay": "0.1.89",
+        "@getpaseo/protocol": "0.1.94",
+        "@getpaseo/relay": "0.1.94",
        "zod": "^3.23.8"
      },
      "devDependencies": {
@@ -37452,7 +37679,7 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.1.89",
+      "version": "0.1.94",
      "license": "AGPL-3.0-or-later",
      "dependencies": {
        "@getpaseo/cli": "*",
@@ -37704,7 +37931,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.1.89",
+      "version": "0.1.94",
      "license": "MIT",
      "devDependencies": {
        "@types/react": "^18.0.25",
@@ -37740,7 +37967,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.1.89",
+      "version": "0.1.94",
      "dependencies": {
        "@codemirror/language": "^6.12.3",
        "@codemirror/legacy-modes": "^6.5.3",
@@ -37971,7 +38198,7 @@
    },
    "packages/protocol": {
      "name": "@getpaseo/protocol",
-      "version": "0.1.89",
+      "version": "0.1.94",
      "dependencies": {
        "zod": "^3.23.8"
      },
@@ -37992,7 +38219,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.1.89",
+      "version": "0.1.94",
      "dependencies": {
        "base64-js": "^1.5.1",
        "tweetnacl": "^1.0.3",
@@ -38210,14 +38437,14 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.1.89",
+      "version": "0.1.94",
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.17.1",
        "@anthropic-ai/claude-agent-sdk": "^0.2.133",
-        "@getpaseo/client": "0.1.89",
-        "@getpaseo/highlight": "0.1.89",
-        "@getpaseo/protocol": "0.1.89",
-        "@getpaseo/relay": "0.1.89",
+        "@getpaseo/client": "0.1.94",
+        "@getpaseo/highlight": "0.1.94",
+        "@getpaseo/protocol": "0.1.94",
+        "@getpaseo/relay": "0.1.94",
        "@isaacs/ttlcache": "^2.1.4",
        "@modelcontextprotocol/sdk": "^1.20.1",
        "@opencode-ai/sdk": "1.14.46",
@@ -38989,7 +39216,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.1.89",
+      "version": "0.1.94",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.29.1",
        "@cloudflare/workers-types": "^4.20260317.1",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.1.89",
+  "version": "0.1.94",
  "private": true,
  "description": "Paseo: voice-controlled development environment with OpenAI Realtime API",
  "keywords": [
@@ -34,22 +34,30 @@
    "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 && 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": "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",
    "build": "npm run build --workspaces --if-present",
    "build:highlight": "npm run build --workspace=@getpaseo/highlight",
+    "build:highlight:clean": "npm run build:clean --workspace=@getpaseo/highlight",
    "build:relay": "npm run build --workspace=@getpaseo/relay",
+    "build:relay:clean": "npm run build:clean --workspace=@getpaseo/relay",
    "build:protocol": "npm run build --workspace=@getpaseo/protocol",
+    "build:protocol:clean": "npm run build:clean --workspace=@getpaseo/protocol",
    "build:client": "npm run build:protocol && npm run build --workspace=@getpaseo/client",
+    "build:client:clean": "npm run build:protocol:clean && npm run build:clean --workspace=@getpaseo/client",
    "build:server-deps": "npm run build:highlight && npm run build:relay && npm run build:client",
+    "build:server-deps:clean": "npm run build:highlight:clean && npm run build:relay:clean && npm run build:client:clean",
    "build:server": "npm run build:server-deps && npm run build --workspace=@getpaseo/server && npm run build --workspace=@getpaseo/cli",
+    "build:server:clean": "npm run build:server-deps:clean && npm run build:clean --workspace=@getpaseo/server && npm run build:clean --workspace=@getpaseo/cli",
    "build:app-deps": "npm run build:highlight && npm run build:client && npm run build --workspace=@getpaseo/expo-two-way-audio",
+    "build:app-deps:clean": "npm run build:highlight:clean && npm run build:client:clean && npm run build --workspace=@getpaseo/expo-two-way-audio",
    "watch:protocol": "tsc -p packages/protocol/tsconfig.json --watch --preserveWatchOutput",
    "watch:client": "tsc -p packages/client/tsconfig.json --watch --preserveWatchOutput",
    "typecheck": "npm run typecheck --workspaces --if-present",
@@ -62,6 +70,9 @@
    "lint": "oxlint",
    "lint:fix": "oxlint --fix",
    "knip": "knip",
+    "acp:version-drift": "node scripts/check-acp-catalog-version-drift.mjs",
+    "acp:version-drift:check": "node scripts/check-acp-catalog-version-drift.mjs --fail-on-drift",
+    "acp:version-drift:update": "node scripts/check-acp-catalog-version-drift.mjs --update",
    "start": "npm run start --workspace=@getpaseo/server",
    "android": "npm run android --workspace=@getpaseo/app",
    "android:development": "npm run android:development --workspace=@getpaseo/app",
@@ -71,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 && npm run build:server-deps && npm run build --workspace=@getpaseo/server && cd packages/app && cross-env PASEO_WEB_PLATFORM=electron npx expo export --platform web && cd ../.. && npm run build --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",
@@ -87,14 +98,16 @@
    "version:all:beta:major": "node scripts/set-release-version.mjs --mode beta-major",
    "version:all:beta:next": "node scripts/set-release-version.mjs --mode beta-next",
    "version:all:promote": "node scripts/set-release-version.mjs --mode promote",
-    "release:check": "npm run release:prepare && npm run typecheck --workspace=@getpaseo/highlight && npm run typecheck --workspace=@getpaseo/relay && npm run typecheck --workspace=@getpaseo/protocol && npm run build:client && npm run typecheck --workspace=@getpaseo/client && npm run build:server && npm run typecheck --workspace=@getpaseo/server && npm run typecheck --workspace=@getpaseo/cli && npm pack --dry-run --workspace=@getpaseo/highlight && npm pack --dry-run --workspace=@getpaseo/relay && npm pack --dry-run --workspace=@getpaseo/protocol && npm pack --dry-run --workspace=@getpaseo/client && npm pack --dry-run --workspace=@getpaseo/server && npm pack --dry-run --workspace=@getpaseo/cli",
+    "release:check": "npm run release:prepare && npm run typecheck --workspace=@getpaseo/highlight && npm run typecheck --workspace=@getpaseo/relay && npm run typecheck --workspace=@getpaseo/protocol && npm run build:client:clean && npm run typecheck --workspace=@getpaseo/client && npm run build:server:clean && npm run typecheck --workspace=@getpaseo/server && npm run typecheck --workspace=@getpaseo/cli && npm pack --dry-run --workspace=@getpaseo/highlight && npm pack --dry-run --workspace=@getpaseo/relay && npm pack --dry-run --workspace=@getpaseo/protocol && npm pack --dry-run --workspace=@getpaseo/client && npm pack --dry-run --workspace=@getpaseo/server && npm pack --dry-run --workspace=@getpaseo/cli",
    "release:publish:dry-run": "npm publish --dry-run --workspace=@getpaseo/highlight --access public && npm publish --dry-run --workspace=@getpaseo/relay --access public && npm publish --dry-run --workspace=@getpaseo/protocol --access public && npm publish --dry-run --workspace=@getpaseo/client --access public && npm publish --dry-run --workspace=@getpaseo/server --access public && npm publish --dry-run --workspace=@getpaseo/cli --access public",
+    "release:publish:beta:dry-run": "npm publish --dry-run --workspace=@getpaseo/highlight --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/relay --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/protocol --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/client --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/server --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/cli --access public --tag beta",
    "release:publish": "npm publish --workspace=@getpaseo/highlight --access public && npm publish --workspace=@getpaseo/relay --access public && npm publish --workspace=@getpaseo/protocol --access public && npm publish --workspace=@getpaseo/client --access public && npm publish --workspace=@getpaseo/server --access public && npm publish --workspace=@getpaseo/cli --access public",
+    "release:publish:beta": "npm publish --workspace=@getpaseo/highlight --access public --tag beta && npm publish --workspace=@getpaseo/relay --access public --tag beta && npm publish --workspace=@getpaseo/protocol --access public --tag beta && npm publish --workspace=@getpaseo/client --access public --tag beta && npm publish --workspace=@getpaseo/server --access public --tag beta && npm publish --workspace=@getpaseo/cli --access public --tag beta",
    "release:push": "node scripts/push-current-release-tag.mjs",
-    "release:beta:patch": "npm run release:check && npm run version:all:beta:patch && npm run release:push",
-    "release:beta:minor": "npm run release:check && npm run version:all:beta:minor && npm run release:push",
-    "release:beta:major": "npm run release:check && npm run version:all:beta:major && npm run release:push",
-    "release:beta:next": "npm run release:check && npm run version:all:beta:next && npm run release:push",
+    "release:beta:patch": "npm run release:check && npm run version:all:beta:patch && npm run release:publish:beta && npm run release:push",
+    "release:beta:minor": "npm run release:check && npm run version:all:beta:minor && npm run release:publish:beta && npm run release:push",
+    "release:beta:major": "npm run release:check && npm run version:all:beta:major && npm run release:publish:beta && npm run release:push",
+    "release:beta:next": "npm run release:check && npm run version:all:beta:next && npm run release:publish:beta && npm run release:push",
    "release:promote": "npm run release:check && npm run version:all:promote && npm run release:publish && npm run release:push",
    "release:patch": "npm run release:check && npm run version:all:patch && npm run release:publish && npm run release:push",
    "release:minor": "npm run release:check && npm run version:all:minor && npm run release:publish && npm run release:push",
--- a/packages/app/Gemfile
+++ b/packages/app/Gemfile
@@ -1,3 +1,4 @@
 source "https://rubygems.org"

 gem "fastlane", "~> 2.234"
+gem "multi_json"
--- a/packages/app/assets/images/editor-apps/antigravity.png
+++ b/packages/app/assets/images/editor-apps/antigravity.png
--- a/packages/app/e2e/acp-provider-catalog.spec.ts
+++ b/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);
--- a/packages/app/e2e/agent-timeline-pagination.spec.ts
+++ b/packages/app/e2e/agent-timeline-pagination.spec.ts
@@ -0,0 +1,28 @@
+import { test } from "./fixtures";
+import {
+  expectTimelinePromptNotMounted,
+  expectTimelinePromptVisible,
+  openAgentTimeline,
+  scrollTimelineUntilOlderHistoryIsReachable,
+  seedLongMockAgentTimeline,
+} from "./helpers/timeline-pagination";
+
+test.describe("Agent timeline pagination", () => {
+  test("loads older history when the user scrolls to the top of a long agent timeline", async ({
+    page,
+  }) => {
+    test.setTimeout(120_000);
+    const agent = await seedLongMockAgentTimeline({ turns: 80 });
+    try {
+      await openAgentTimeline(page, agent);
+      await expectTimelinePromptVisible(page, agent.newestPrompt);
+      await expectTimelinePromptNotMounted(page, agent.oldestPrompt);
+
+      await scrollTimelineUntilOlderHistoryIsReachable(page);
+
+      await expectTimelinePromptVisible(page, agent.oldestPrompt);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+});
--- a/packages/app/e2e/diff-row-alignment.spec.ts
+++ b/packages/app/e2e/diff-row-alignment.spec.ts
@@ -0,0 +1,505 @@
+import { writeFile } from "node:fs/promises";
+import path from "node:path";
+import { type Page } from "@playwright/test";
+import { buildHostWorkspaceRoute, buildSettingsSectionRoute } from "../src/utils/host-routes";
+import { test, expect } from "./fixtures";
+import { getServerId } from "./helpers/server-id";
+import { connectSeedClient } from "./helpers/seed-client";
+import { createTempGitRepo } from "./helpers/workspace";
+import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
+
+interface DirtyWorkspace {
+  id: string;
+}
+
+interface CleanupTask {
+  run: () => Promise<void>;
+}
+
+const cleanupTasks: CleanupTask[] = [];
+const APP_SETTINGS_KEY = "@paseo:app-settings";
+const CHANGES_PREFERENCES_KEY = "@paseo:changes-preferences";
+
+const BEFORE = `import { useLayoutEffect, useMemo, useRef, useState } from "react";
+
+interface UseMountedTabSetInput {
+  activeTabId: string | null;
+  allTabIds: string[];
+  cap: number;
+}
+
+interface UseMountedTabSetResult {
+  mountedTabIds: Set<string>;
+}
+
+function createInitialMountedTabIds(input: UseMountedTabSetInput): Set<string> {
+  if (!input.activeTabId || !input.allTabIds.includes(input.activeTabId)) {
+    return new Set<string>();
+  }
+  return new Set<string>([input.activeTabId]);
+}
+
+function setsEqual(left: Set<string>, right: Set<string>): boolean {
+  if (left.size !== right.size) {
+    return false;
+  }
+  for (const value of left) {
+    if (!right.has(value)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+export function useMountedTabSet(input: UseMountedTabSetInput): UseMountedTabSetResult {
+  const { activeTabId, allTabIds, cap } = input;
+  const allTabIdsKey = allTabIds.join("\\u0000");
+  const availableTabIds = useMemo(() => {
+    void allTabIdsKey;
+    return new Set(allTabIds);
+  }, [allTabIds, allTabIdsKey]);
+  const [mountedTabIds, setMountedTabIds] = useState(() => createInitialMountedTabIds(input));
+  const lruRef = useRef(activeTabId && allTabIds.includes(activeTabId) ? [activeTabId] : []);
+
+  useLayoutEffect(() => {
+    const nextLru = lruRef.current.filter((tabId) => availableTabIds.has(tabId));
+    if (activeTabId && availableTabIds.has(activeTabId)) {
+      const existingIndex = nextLru.indexOf(activeTabId);
+      if (existingIndex >= 0) {
+        nextLru.splice(existingIndex, 1);
+      }
+      nextLru.unshift(activeTabId);
+    }
+    if (nextLru.length > cap) {
+      nextLru.length = cap;
+    }
+
+    lruRef.current = nextLru;
+    setMountedTabIds((previousMountedTabIds) => {
+      const nextMountedTabIds = new Set(nextLru);
+      return setsEqual(previousMountedTabIds, nextMountedTabIds)
+        ? previousMountedTabIds
+        : nextMountedTabIds;
+    });
+  }, [activeTabId, availableTabIds, cap]);
+
+  return { mountedTabIds };
+}
+`;
+
+const AFTER = `import { useLayoutEffect, useMemo, useRef, useState } from "react";
+
+interface UseMountedTabSetInput {
+  activeTabId: string | null;
+  allTabIds: string[];
+  cap: number;
+}
+
+interface UseMountedTabSetResult {
+  mountedTabIds: Set<string>;
+}
+
+interface DeriveRenderMountedTabIdsInput {
+  activeTabId: string | null;
+  availableTabIds: Set<string>;
+  cap: number;
+  mountedTabIds: Set<string>;
+}
+
+function createInitialMountedTabIds(input: UseMountedTabSetInput): Set<string> {
+  if (!input.activeTabId || !input.allTabIds.includes(input.activeTabId)) {
+    return new Set<string>();
+  }
+  return new Set<string>([input.activeTabId]);
+}
+
+function setsEqual(left: Set<string>, right: Set<string>): boolean {
+  if (left.size !== right.size) {
+    return false;
+  }
+  for (const value of left) {
+    if (!right.has(value)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function deriveRenderMountedTabIds(input: DeriveRenderMountedTabIdsInput): Set<string> {
+  const { activeTabId, availableTabIds, cap, mountedTabIds } = input;
+  if (!activeTabId || !availableTabIds.has(activeTabId) || mountedTabIds.has(activeTabId)) {
+    return mountedTabIds;
+  }
+
+  const next = new Set<string>([activeTabId]);
+  const maxSize = Math.max(1, cap);
+  for (const tabId of mountedTabIds) {
+    if (next.size >= maxSize) {
+      break;
+    }
+    if (availableTabIds.has(tabId)) {
+      next.add(tabId);
+    }
+  }
+  return next;
+}
+
+export function useMountedTabSet(input: UseMountedTabSetInput): UseMountedTabSetResult {
+  const { activeTabId, allTabIds, cap } = input;
+  const allTabIdsKey = allTabIds.join("\\u0000");
+  const availableTabIds = useMemo(() => {
+    void allTabIdsKey;
+    return new Set(allTabIds);
+  }, [allTabIds, allTabIdsKey]);
+  const [mountedTabIds, setMountedTabIds] = useState(() => createInitialMountedTabIds(input));
+  const lruRef = useRef(activeTabId && allTabIds.includes(activeTabId) ? [activeTabId] : []);
+  const renderMountedTabIds = useMemo(
+    () =>
+      deriveRenderMountedTabIds({
+        activeTabId,
+        availableTabIds,
+        cap,
+        mountedTabIds,
+      }),
+    [activeTabId, availableTabIds, cap, mountedTabIds],
+  );
+
+  useLayoutEffect(() => {
+    const nextLru = lruRef.current.filter((tabId) => availableTabIds.has(tabId));
+    if (activeTabId && availableTabIds.has(activeTabId)) {
+      const existingIndex = nextLru.indexOf(activeTabId);
+      if (existingIndex >= 0) {
+        nextLru.splice(existingIndex, 1);
+      }
+      nextLru.unshift(activeTabId);
+    }
+    if (nextLru.length > cap) {
+      nextLru.length = cap;
+    }
+
+    lruRef.current = nextLru;
+    setMountedTabIds((previousMountedTabIds) => {
+      const nextMountedTabIds = new Set(nextLru);
+      return setsEqual(previousMountedTabIds, nextMountedTabIds)
+        ? previousMountedTabIds
+        : nextMountedTabIds;
+    });
+  }, [activeTabId, availableTabIds, cap]);
+
+  return { mountedTabIds: renderMountedTabIds };
+}
+`;
+
+test.afterEach(async () => {
+  for (const task of cleanupTasks.splice(0)) {
+    await task.run();
+  }
+});
+
+test("changes diff keeps code rows aligned with the gutter", async ({ page }) => {
+  const workspace = await createWorkspaceWithMountedTabDiff();
+  await useCodeFont(page, 9);
+  await useUnwrappedDiffLines(page);
+  await openWorkspaceChanges(page, workspace);
+
+  await expectDiffCodeFontSize(page, 9);
+  await expectVisibleDiffRowsAligned(page);
+  await expectDiffCodeTextAlignedWithGutterText(page, [
+    {
+      codeText: "function createInitialMountedTabIds(input: UseMountedTabSetInput)",
+      lineNumber: "20",
+    },
+    { codeText: "return next;", lineNumber: "55" },
+    { codeText: "useLayoutEffect(() => {", lineNumber: "78" },
+  ]);
+  await expectHoverCommentButtonAlignedWithCodeLine(page, {
+    codeText: "function createInitialMountedTabIds(input: UseMountedTabSetInput)",
+    lineNumber: "20",
+  });
+});
+
+test("changes diff keeps unwrapped gutter and code rows aligned after code size changes", async ({
+  page,
+}) => {
+  const workspace = await createWorkspaceWithMountedTabDiff();
+  await useCodeFont(page, 12);
+  await useUnwrappedDiffLines(page);
+  await openWorkspaceChanges(page, workspace);
+
+  await changeCodeFontSizeFromSettings(page, 18);
+  await returnToWorkspaceChanges(page);
+  await scrollToLowerUnwrappedDiffRows(page);
+
+  await expectDiffCodeFontSize(page, 18);
+  await expectVisibleDiffRowsShareTypography(page);
+  await expectVisibleDiffRowsAligned(page);
+});
+
+async function useCodeFont(page: Page, codeFontSize: number): Promise<void> {
+  await page.addInitScript(
+    ({ settingsKey, fontSize }) => {
+      localStorage.setItem(
+        settingsKey,
+        JSON.stringify({
+          theme: "dark",
+          sendBehavior: "interrupt",
+          serviceUrlBehavior: "ask",
+          terminalScrollbackLines: 10_000,
+          uiFontFamily: "",
+          monoFontFamily: "",
+          uiFontSize: 16,
+          codeFontSize: fontSize,
+          syntaxTheme: "one",
+        }),
+      );
+    },
+    { settingsKey: APP_SETTINGS_KEY, fontSize: codeFontSize },
+  );
+}
+
+async function useUnwrappedDiffLines(page: Page): Promise<void> {
+  await page.addInitScript(
+    ({ preferencesKey }) => {
+      localStorage.setItem(
+        preferencesKey,
+        JSON.stringify({ layout: "unified", wrapLines: false, hideWhitespace: false }),
+      );
+    },
+    { preferencesKey: CHANGES_PREFERENCES_KEY },
+  );
+}
+
+async function expectDiffCodeFontSize(page: Page, fontSize: number): Promise<void> {
+  const actualFontSize = await page
+    .getByTestId("diff-code-text-1")
+    .evaluate((text) => Number.parseFloat(getComputedStyle(text).fontSize));
+  expect(actualFontSize).toBe(fontSize);
+}
+
+async function expectVisibleDiffRowsAligned(page: Page): Promise<void> {
+  const geometry = await readVisibleDiffRowGeometry(page);
+  expect(geometry.maxDelta, JSON.stringify(geometry.rows, null, 2)).toBeLessThanOrEqual(1);
+}
+
+async function expectVisibleDiffRowsShareTypography(page: Page): Promise<void> {
+  const geometry = await readVisibleDiffRowGeometry(page);
+  expect(geometry.mismatchedTypography, JSON.stringify(geometry, null, 2)).toEqual([]);
+}
+
+async function readVisibleDiffRowGeometry(page: Page): Promise<{
+  maxDelta: number;
+  mismatchedTypography: { index: number; gutterLineHeight: number; codeLineHeight: number }[];
+  rows: {
+    index: number;
+    gutterTop: number;
+    codeTop: number;
+    delta: number;
+    gutterLineHeight: number;
+    codeLineHeight: number;
+  }[];
+}> {
+  return page.locator("body").evaluate(({ ownerDocument }) => {
+    const root = ownerDocument.querySelector('[data-testid="diff-file-0-body"]');
+    if (!root) {
+      throw new Error("Expanded diff body is not mounted");
+    }
+
+    const readRows = (prefix: string, textPrefix: string) =>
+      Array.from(root.querySelectorAll<HTMLElement>(`[data-testid^="${prefix}"]`)).map((row) => {
+        const testId = row.getAttribute("data-testid") ?? "";
+        const index = Number(testId.slice(prefix.length));
+        const rect = row.getBoundingClientRect();
+        const text = root.querySelector<HTMLElement>(`[data-testid="${textPrefix}${index}"]`);
+        const lineHeight = text ? Number.parseFloat(getComputedStyle(text).lineHeight) : 0;
+        return { index, top: rect.top, height: rect.height, lineHeight };
+      });
+
+    const gutters = new Map(
+      readRows("diff-gutter-row-", "diff-gutter-text-").map((row) => [row.index, row]),
+    );
+    const codes = readRows("diff-code-row-", "diff-code-text-");
+    const rows = codes
+      .map((code) => {
+        const gutter = gutters.get(code.index);
+        if (!gutter) {
+          throw new Error(`Missing gutter row ${code.index}`);
+        }
+        return {
+          index: code.index,
+          gutterTop: gutter.top,
+          codeTop: code.top,
+          delta: Math.abs(code.top - gutter.top),
+          gutterLineHeight: gutter.lineHeight,
+          codeLineHeight: code.lineHeight,
+        };
+      })
+      .filter((row) => row.gutterTop >= 0 && row.codeTop >= 0);
+
+    return {
+      maxDelta: Math.max(...rows.map((row) => row.delta)),
+      mismatchedTypography: rows
+        .filter((row) => Math.abs(row.gutterLineHeight - row.codeLineHeight) > 0.5)
+        .map((row) => ({
+          index: row.index,
+          gutterLineHeight: row.gutterLineHeight,
+          codeLineHeight: row.codeLineHeight,
+        })),
+      rows,
+    };
+  });
+}
+
+async function createWorkspaceWithMountedTabDiff(): Promise<DirtyWorkspace> {
+  const repo = await createTempGitRepo("diff-row-alignment-", {
+    files: [{ path: "src/use-mounted-tab-set.ts", content: BEFORE }],
+  });
+  const client = await connectSeedClient();
+  cleanupTasks.push({
+    run: async () => {
+      await client.close().catch(() => undefined);
+      await repo.cleanup().catch(() => undefined);
+    },
+  });
+
+  await writeFile(path.join(repo.path, "src/use-mounted-tab-set.ts"), AFTER);
+  const opened = await client.openProject(repo.path);
+  if (!opened.workspace) {
+    throw new Error(opened.error ?? `Failed to open project ${repo.path}`);
+  }
+  return { id: opened.workspace.id };
+}
+
+async function openWorkspaceChanges(page: Page, workspace: DirtyWorkspace): Promise<void> {
+  await page.setViewportSize({ width: 1400, height: 900 });
+  await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.id));
+  await waitForWorkspaceTabsVisible(page);
+  await page.getByRole("button", { name: "Open explorer" }).click();
+  await openChangesInVisibleExplorer(page);
+  await page.getByTestId("diff-file-0").click();
+  await expectExpandedMountedTabDiff(page);
+}
+
+async function openChangesInVisibleExplorer(page: Page): Promise<void> {
+  await expect(page.getByTestId("explorer-tab-changes")).toBeVisible({ timeout: 30_000 });
+  await expect(page.getByText("use-mounted-tab-set.ts")).toBeVisible({ timeout: 30_000 });
+}
+
+async function expectExpandedMountedTabDiff(page: Page): Promise<void> {
+  await expect(page.getByTestId("diff-file-0-body")).toBeVisible({ timeout: 30_000 });
+  await expect(page.getByText("function createInitialMountedTabIds")).toBeVisible({
+    timeout: 30_000,
+  });
+}
+
+async function changeCodeFontSizeFromSettings(page: Page, codeFontSize: number): Promise<void> {
+  await page.getByTestId("sidebar-settings").click();
+  await expect(page).toHaveURL(new RegExp(`${buildSettingsSectionRoute("general")}|/settings$`));
+  await page.getByRole("button", { name: "Appearance" }).click();
+  await page.getByLabel("Code font size").fill(String(codeFontSize));
+  await page.getByLabel("Code font size").press("Enter");
+  await expect(page.getByLabel("Code font size")).toHaveValue(String(codeFontSize));
+}
+
+async function returnToWorkspaceChanges(page: Page): Promise<void> {
+  await page.getByTestId("settings-back-to-workspace").click();
+  await waitForWorkspaceTabsVisible(page);
+  await openChangesInVisibleExplorer(page);
+  await expectExpandedMountedTabDiff(page);
+}
+
+async function scrollToLowerUnwrappedDiffRows(page: Page): Promise<void> {
+  const lastRowIndex = await page.getByTestId("diff-file-0-body").evaluate((root) => {
+    const rows = Array.from(root.querySelectorAll<HTMLElement>('[data-testid^="diff-code-row-"]'));
+    if (rows.length === 0) {
+      throw new Error("No unwrapped code rows are mounted");
+    }
+    return Math.max(
+      ...rows.map((row) => Number((row.getAttribute("data-testid") ?? "").slice(14))),
+    );
+  });
+  await page.getByTestId(`diff-code-row-${lastRowIndex}`).scrollIntoViewIfNeeded();
+  await expect(page.getByTestId(`diff-code-row-${lastRowIndex}`)).toBeVisible();
+}
+
+async function expectDiffCodeTextAlignedWithGutterText(
+  page: Page,
+  lines: { codeText: string; lineNumber: string }[],
+): Promise<void> {
+  const geometries = await readDiffTextGeometry(page, lines);
+  for (const geometry of geometries) {
+    expect(geometry.codeTop, geometry.codeText).toBeCloseTo(geometry.gutterTop, 0);
+  }
+}
+
+async function expectHoverCommentButtonAlignedWithCodeLine(
+  page: Page,
+  line: { codeText: string; lineNumber: string },
+): Promise<void> {
+  const target = await readDiffTextGeometry(page, [line]).then((rows) => rows[0]);
+  if (!target) {
+    throw new Error(`Could not find target line ${line.lineNumber}`);
+  }
+  await page.getByTestId(`diff-code-row-${target.index}`).hover();
+  const geometry = await page
+    .getByTestId(`diff-gutter-action-${target.index}`)
+    .evaluate((action, expectedCodeCenterY) => {
+      const rect = action.getBoundingClientRect();
+      return {
+        actionCenterY: rect.top + rect.height / 2,
+        codeCenterY: expectedCodeCenterY,
+      };
+    }, target.codeCenterY);
+  expect(geometry.actionCenterY).toBeCloseTo(geometry.codeCenterY, 0);
+}
+
+async function readDiffTextGeometry(
+  page: Page,
+  lines: { codeText: string; lineNumber: string }[],
+): Promise<
+  { index: number; codeText: string; codeTop: number; gutterTop: number; codeCenterY: number }[]
+> {
+  return page.locator("body").evaluate(({ ownerDocument }, targets) => {
+    const root = ownerDocument.querySelector('[data-testid="explorer-content-area"]');
+    if (!root) {
+      throw new Error("Changes panel is not mounted");
+    }
+
+    const readIndexedElements = (prefix: string) =>
+      Array.from(root.querySelectorAll<HTMLElement>(`[data-testid^="${prefix}"]`)).map(
+        (element) => {
+          const testId = element.getAttribute("data-testid") ?? "";
+          return { index: Number(testId.slice(prefix.length)), element };
+        },
+      );
+
+    const gutterTexts = readIndexedElements("diff-gutter-text-");
+    const codeTexts = readIndexedElements("diff-code-text-");
+
+    return targets.map((target) => {
+      const gutter = gutterTexts.find(
+        ({ element }) => (element.textContent ?? "").trim() === target.lineNumber,
+      );
+      if (!gutter) {
+        throw new Error(`Could not find gutter line ${target.lineNumber}`);
+      }
+      const code = codeTexts.find(
+        ({ index, element }) =>
+          index === gutter.index && (element.textContent ?? "").includes(target.codeText),
+      );
+      if (!code) {
+        throw new Error(`Could not find code row ${target.codeText}`);
+      }
+
+      const codeRect = code.element.getBoundingClientRect();
+      const gutterRect = gutter.element.getBoundingClientRect();
+
+      return {
+        index: gutter.index,
+        codeText: target.codeText,
+        codeTop: codeRect.top,
+        gutterTop: gutterRect.top,
+        codeCenterY: codeRect.top + codeRect.height / 2,
+      };
+    });
+  }, lines);
+}
--- a/packages/app/e2e/global-setup.ts
+++ b/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)
    }`,
  );
@@ -587,13 +533,23 @@ async function startRelay(excludedPorts: Set<number>): Promise<number> {
  );
 }

-function startMetro(metroPort: number, buffer: ReturnType<typeof createLineBuffer>): ChildProcess {
+function startMetro(input: {
+  metroPort: number;
+  daemonPort: number;
+  buffer: ReturnType<typeof createLineBuffer>;
+}): ChildProcess {
  const appDir = path.resolve(__dirname, "..");
-  const child = spawn("npx", ["expo", "start", "--web", "--port", String(metroPort)], {
+  const child = spawn("npx", ["expo", "start", "--web", "--port", String(input.metroPort)], {
    cwd: appDir,
    env: {
      ...process.env,
      BROWSER: "none",
+      ...(process.env.E2E_DESKTOP_RUNTIME === "1"
+        ? {
+            PASEO_WEB_PLATFORM: "electron",
+            EXPO_PUBLIC_LOCAL_DAEMON: `127.0.0.1:${input.daemonPort}`,
+          }
+        : {}),
    },
    stdio: ["ignore", "pipe", "pipe"],
    detached: false,
@@ -605,7 +561,7 @@ function startMetro(metroPort: number, buffer: ReturnType<typeof createLineBuffe
      .split("\n")
      .filter((line) => line.trim());
    for (const line of lines) {
-      buffer.add(`[stdout] ${line}`);
+      input.buffer.add(`[stdout] ${line}`);
      console.log(`[metro] ${line}`);
    }
  });
@@ -616,7 +572,7 @@ function startMetro(metroPort: number, buffer: ReturnType<typeof createLineBuffe
      .split("\n")
      .filter((line) => line.trim());
    for (const line of lines) {
-      buffer.add(`[stderr] ${line}`);
+      input.buffer.add(`[stderr] ${line}`);
      console.error(`[metro] ${line}`);
    }
  });
@@ -629,7 +585,7 @@ interface DaemonSpawnArgs {
  relayPort: number;
  metroPort: number;
  paseoHome: string;
-  fakeToolBinDir: string;
+  fakeEditorBinDir: string;
  editorRecordPath: string;
  dictation: DictationConfig;
  buffer: ReturnType<typeof createLineBuffer>;
@@ -644,7 +600,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 +666,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 +683,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();

@@ -739,13 +695,17 @@ export default async function globalSetup() {

  try {
    const relayPort = await startRelay(new Set([port, metroPort]));
-    metroProcess = startMetro(metroPort, metroLineBuffer);
+    metroProcess = startMetro({
+      metroPort,
+      daemonPort: port,
+      buffer: metroLineBuffer,
+    });
    daemonProcess = startDaemon({
      port,
      relayPort,
      metroPort,
      paseoHome,
-      fakeToolBinDir,
+      fakeEditorBinDir,
      editorRecordPath,
      dictation,
      buffer: daemonLineBuffer,
@@ -765,9 +725,8 @@ export default async function globalSetup() {
      }),
    ]);

-    const offer = await waitForPairingOfferFromCli({
-      repoRoot,
-      paseoHome,
+    const offer = await waitForPairingOfferFromDaemon({
+      port,
    });

    process.env.E2E_DAEMON_PORT = String(port);
--- a/packages/app/e2e/helpers/composer.ts
+++ b/packages/app/e2e/helpers/composer.ts
@@ -165,14 +165,14 @@ export async function startRunningMockAgent(
    provider: "mock",
    cwd: repo.path,
    model: opts.model,
-    initialPrompt: opts.prompt,
  });
  const agentUrl = `${buildHostWorkspaceRoute(serverId, repo.path)}?open=${encodeURIComponent(`agent:${agent.id}`)}`;
  await page.goto(agentUrl);
+  await expectComposerVisible(page);
+  await client.sendAgentMessage(agent.id, opts.prompt);
  await expect(page.getByRole("button", { name: /stop|cancel/i }).first()).toBeVisible({
    timeout: 30_000,
  });
-  await expectComposerVisible(page);
  return { client, repo };
 }

--- a/packages/app/e2e/helpers/desktop-updates.ts
+++ b/packages/app/e2e/helpers/desktop-updates.ts
@@ -1,4 +1,5 @@
 import { readFileSync } from "node:fs";
+import { appendFile } from "node:fs/promises";
 import { expect, type Page } from "@playwright/test";
 import { openSettings } from "./app";
 import { getE2EDaemonPort } from "./daemon-port";
@@ -58,12 +59,31 @@ export interface DesktopBridgeConfig {
  daemonLogPath?: string;
  /** Initial manageBuiltInDaemon setting. Defaults to false. */
  manageBuiltInDaemon?: boolean;
+  /** Daemon listen address reported by desktop_daemon_status. Defaults to 127.0.0.1:6767. */
+  daemonListen?: string;
+  /** Keep start_desktop_daemon pending to hold the desktop startup blocker open. */
+  hangDaemonStart?: boolean;
  /**
   * Controls what dialog.ask returns when the daemon management confirm dialog
   * fires. True = confirm (proceed with the action), false = cancel. Defaults to
   * false so tests that only assert copy don't inadvertently trigger state changes.
   */
  confirmShouldAccept?: boolean;
+  editorTargets?: DesktopEditorTargetConfig[];
+  editorRecordPath?: string;
+}
+
+interface DesktopEditorTargetConfig {
+  id: string;
+  label: string;
+  kind: "editor" | "file-manager";
+}
+
+interface DesktopEditorOpenRecord {
+  editorId: string;
+  path: string;
+  cwd?: string;
+  mode?: "open" | "reveal";
 }

 export interface ConfirmDialogCall {
@@ -74,6 +94,7 @@ export interface ConfirmDialogCall {
 declare global {
  interface Window {
    __capturedDialogCall: ConfirmDialogCall | undefined;
+    __recordDesktopEditorOpen?: (input: DesktopEditorOpenRecord) => Promise<void>;
  }
 }

@@ -87,6 +108,15 @@ declare global {
 * can assert dialog copy without depending on window.confirm concatenation.
 */
 export async function injectDesktopBridge(page: Page, config: DesktopBridgeConfig): Promise<void> {
+  if (config.editorRecordPath) {
+    await page.exposeFunction(
+      "__recordDesktopEditorOpen",
+      async (input: DesktopEditorOpenRecord) => {
+        await appendFile(config.editorRecordPath as string, `${JSON.stringify(input)}\n`, "utf8");
+      },
+    );
+  }
+
  await page.addInitScript((cfg) => {
    // Mutable state shared across IPC calls within this page
    let manageDaemon = cfg.manageBuiltInDaemon ?? false;
@@ -98,7 +128,7 @@ export async function injectDesktopBridge(page: Page, config: DesktopBridgeConfi
      return {
        serverId: cfg.serverId,
        status: daemonRunning ? "running" : "stopped",
-        listen: null,
+        listen: cfg.daemonListen ?? "127.0.0.1:6767",
        hostname: null,
        pid: currentPid,
        home: "",
@@ -108,7 +138,31 @@ export async function injectDesktopBridge(page: Page, config: DesktopBridgeConfi
      };
    }

-    (window as unknown as { paseoDesktop: unknown }).paseoDesktop = {
+    function startDesktopDaemon() {
+      if (cfg.hangDaemonStart) {
+        return new Promise(() => undefined);
+      }
+      startCount += 1;
+      daemonRunning = true;
+      // First start (bootstrap) returns the configured PID; subsequent starts
+      // (after a stop) get a fresh PID so tests can observe the change.
+      currentPid = (cfg.daemonPid ?? 10000) + (startCount - 1) * 1000;
+      return buildDaemonStatus();
+    }
+
+    const desktopBridge: {
+      platform: string;
+      invoke: (command: string, args?: Record<string, unknown>) => Promise<unknown>;
+      dialog: {
+        ask: (message: string, options?: Record<string, unknown>) => Promise<boolean>;
+      };
+      getPendingOpenProject: () => Promise<string | null>;
+      events: { on: () => Promise<() => void> };
+      editor?: {
+        listTargets: () => Promise<DesktopEditorTargetConfig[]>;
+        openTarget: (input: DesktopEditorOpenRecord) => Promise<void>;
+      };
+    } = {
      platform: "darwin",
      invoke: async (command: string, args?: Record<string, unknown>) => {
        if (command === "check_app_update") {
@@ -180,12 +234,7 @@ export async function injectDesktopBridge(page: Page, config: DesktopBridgeConfi
        }

        if (command === "start_desktop_daemon") {
-          startCount += 1;
-          daemonRunning = true;
-          // First start (bootstrap) returns the configured PID; subsequent starts
-          // (after a stop) get a fresh PID so tests can observe the change.
-          currentPid = (cfg.daemonPid ?? 10000) + (startCount - 1) * 1000;
-          return buildDaemonStatus();
+          return startDesktopDaemon();
        }

        return null;
@@ -202,15 +251,26 @@ export async function injectDesktopBridge(page: Page, config: DesktopBridgeConfi
      getPendingOpenProject: async () => null,
      events: { on: async () => () => undefined },
    };
+
+    if (cfg.editorTargets) {
+      desktopBridge.editor = {
+        listTargets: async () => cfg.editorTargets ?? [],
+        openTarget: async (input: DesktopEditorOpenRecord) => {
+          await window.__recordDesktopEditorOpen?.(input);
+        },
+      };
+    }
+
+    (window as unknown as { paseoDesktop: unknown }).paseoDesktop = desktopBridge;
  }, config);
 }

 export async function openDesktopSettings(page: Page, serverId: string): Promise<void> {
  await openSettings(page);
  await openSettingsHost(page, serverId);
-  // The daemon-lifecycle card moved to the Daemon section in the flat-settings
+  // The daemon-lifecycle card moved to the Host section in the flat-settings
  // layout; navigate there before asserting it.
-  await openSettingsHostSection(page, serverId, "daemon");
+  await openSettingsHostSection(page, serverId, "host");
  await expect(page.getByTestId("host-page-daemon-lifecycle-card")).toBeVisible({
    timeout: 15_000,
  });
--- a/packages/app/e2e/helpers/launcher.ts
+++ b/packages/app/e2e/helpers/launcher.ts
@@ -69,34 +69,46 @@ export async function pressNewTabShortcut(page: Page): Promise<void> {

 // ─── Tab bar assertions ───────────────────────────────────────────────────

-/** Assert the new agent tab button is visible in the tab bar. */
+/** Assert the inline new-agent plus button is visible in the tab bar. */
 export async function assertNewChatTileVisible(page: Page): Promise<void> {
  await expect(
-    page.getByTestId("workspace-new-agent-tab").filter({ visible: true }).first(),
+    page.getByTestId("workspace-new-agent-tab-inline").filter({ visible: true }).first(),
  ).toBeVisible();
 }

-/** Assert the new terminal button is visible in the tab bar. */
-export async function assertTerminalTileVisible(page: Page): Promise<void> {
+/** Assert the new-tab dropdown trigger is visible in the tab bar. */
+export async function assertNewTabMenuTriggerVisible(page: Page): Promise<void> {
  await expect(
-    page.getByTestId("workspace-new-terminal").filter({ visible: true }).first(),
+    page.getByTestId("workspace-new-tab-menu-trigger").filter({ visible: true }).first(),
  ).toBeVisible();
 }

 // ─── Tab creation actions ─────────────────────────────────────────────────

-/** Click the new agent tab button to create a draft/chat tab. */
+/** Click the inline plus button to create a draft/chat tab. */
 export async function clickNewChat(page: Page): Promise<void> {
-  const button = page.getByTestId("workspace-new-agent-tab").filter({ visible: true }).first();
+  const button = page
+    .getByTestId("workspace-new-agent-tab-inline")
+    .filter({ visible: true })
+    .first();
  await expect(button).toBeVisible({ timeout: 10_000 });
  await button.click();
 }

-/** Click the new terminal button to create a terminal tab. */
+/** Open the new-tab menu and click "New terminal". */
 export async function clickNewTerminal(page: Page): Promise<void> {
-  const button = page.getByTestId("workspace-new-terminal").filter({ visible: true }).first();
-  await expect(button).toBeVisible({ timeout: 10_000 });
-  await button.click();
+  const trigger = page
+    .getByTestId("workspace-new-tab-menu-trigger")
+    .filter({ visible: true })
+    .first();
+  await expect(trigger).toBeVisible({ timeout: 10_000 });
+  await trigger.click();
+  const item = page
+    .getByTestId("workspace-new-tab-menu-terminal")
+    .filter({ visible: true })
+    .first();
+  await expect(item).toBeVisible({ timeout: 10_000 });
+  await item.click();
 }

 // ─── Tab title assertions ──────────────────────────────────────────────────
@@ -117,9 +129,9 @@ export async function waitForTabWithTitle(
  ).toBeVisible({ timeout });
 }

-/** Assert the new agent tab button is visible in the tab bar. */
+/** Assert the inline new-agent plus button is visible in the tab bar. */
 export async function assertSingleNewTabButton(page: Page): Promise<void> {
-  const buttons = page.getByTestId("workspace-new-agent-tab").filter({ visible: true });
+  const buttons = page.getByTestId("workspace-new-agent-tab-inline").filter({ visible: true });
  const count = await buttons.count();
  expect(count).toBeGreaterThanOrEqual(1);
 }
--- a/packages/app/e2e/helpers/new-workspace.ts
+++ b/packages/app/e2e/helpers/new-workspace.ts
@@ -124,14 +124,30 @@ export async function openNewWorkspaceComposer(
  });
 }

-export async function clickNewWorkspaceButton(
+export async function openGlobalNewWorkspaceComposer(page: Page): Promise<void> {
+  await page.getByTestId("sidebar-new-workspace").click();
+
+  await expect(page).toHaveURL(/\/h\/[^/]+\/new(?:\?.*)?$/, {
+    timeout: 30_000,
+  });
+}
+
+export async function expectNewWorkspaceProjectSelected(
  page: Page,
-  input: { projectKey: string; projectDisplayName: string; prompt?: string },
+  projectDisplayName: string,
+): Promise<void> {
+  const projectPicker = page.getByRole("button", { name: "Workspace project" });
+  await expect(projectPicker).toBeVisible({ timeout: 30_000 });
+  await expect(projectPicker).toContainText(projectDisplayName);
+}
+
+export async function submitNewWorkspacePrompt(
+  page: Page,
+  prompt = "Hello from e2e",
 ): Promise<void> {
-  await openNewWorkspaceComposer(page, input);
  const composer = page.getByRole("textbox", { name: "Message agent..." });
  await expect(composer).toBeVisible({ timeout: 30_000 });
-  await composer.fill(input.prompt ?? "Hello from e2e");
+  await composer.fill(prompt);
  const createButton = page
    .getByTestId("message-input-root")
    .getByRole("button", { name: "Create" });
@@ -139,6 +155,14 @@ export async function clickNewWorkspaceButton(
  await createButton.click();
 }

+export async function clickNewWorkspaceButton(
+  page: Page,
+  input: { projectKey: string; projectDisplayName: string; prompt?: string },
+): Promise<void> {
+  await openNewWorkspaceComposer(page, input);
+  await submitNewWorkspacePrompt(page, input.prompt);
+}
+
 export async function openStartingRefPicker(page: Page): Promise<void> {
  const trigger = page.getByTestId("new-workspace-ref-picker-trigger");
  await expect(trigger).toBeVisible({ timeout: 30_000 });
@@ -177,7 +201,9 @@ export async function selectPickerOptionByKeyboard(page: Page, label: string): P
  const searchInput = page.getByPlaceholder("Search branches and PRs");
  await expect(searchInput).toBeVisible({ timeout: 30_000 });
  await page.keyboard.type(label);
-  await page.keyboard.press("ArrowDown");
+  await expect(page.getByTestId(`new-workspace-ref-picker-branch-${label}`)).toBeVisible({
+    timeout: 10_000,
+  });
  await page.keyboard.press("Enter");
 }

@@ -212,7 +238,13 @@ export async function expectComposerGithubAttachmentPill(

 export async function assertNewWorkspaceSidebarAndHeader(
  page: Page,
-  input: { serverId: string; previousWorkspaceId: string; projectDisplayName: string },
+  input: {
+    serverId: string;
+    previousWorkspaceId: string;
+    projectDisplayName: string;
+    assertSidebarRow?: boolean;
+    assertHeader?: boolean;
+  },
 ): Promise<{ workspaceId: string }> {
  // Wait for URL to redirect to the newly created workspace.
  // Uses URL as source of truth to avoid picking up sidebar rows from concurrent tests.
@@ -230,15 +262,19 @@ export async function assertNewWorkspaceSidebarAndHeader(
    throw new Error(`Expected URL to redirect to a new workspace.\nCurrent URL: ${page.url()}`);
  }

-  const createdWorkspaceRow = page.getByTestId(
-    `sidebar-workspace-row-${input.serverId}:${workspaceId}`,
-  );
-  await expect(createdWorkspaceRow.first()).toBeVisible({ timeout: 30_000 });
+  if (input.assertSidebarRow !== false) {
+    const createdWorkspaceRow = page.getByTestId(
+      `sidebar-workspace-row-${input.serverId}:${workspaceId}`,
+    );
+    await expect(createdWorkspaceRow.first()).toBeVisible({ timeout: 30_000 });
+  }

-  await expectWorkspaceHeader(page, {
-    title: workspaceLabelFromPath(workspaceId),
-    subtitle: input.projectDisplayName,
-  });
+  if (input.assertHeader !== false) {
+    await expectWorkspaceHeader(page, {
+      title: workspaceLabelFromPath(workspaceId),
+      subtitle: input.projectDisplayName,
+    });
+  }

  return { workspaceId };
 }
--- a/packages/app/e2e/helpers/pr-pane.ts
+++ b/packages/app/e2e/helpers/pr-pane.ts
@@ -1,5 +1,5 @@
 import { expect, type Page } from "@playwright/test";
-import { getStateLabel } from "@/git/pr-pane-data";
+import { getStateLabel } from "@/git/pull-request-panel/data";

 export async function openPrPane(page: Page): Promise<void> {
  await page.getByRole("button", { name: "Open explorer" }).click();
--- a/packages/app/e2e/helpers/project-settings.ts
+++ b/packages/app/e2e/helpers/project-settings.ts
@@ -34,7 +34,7 @@ export async function editWorktreeSetup(page: Page, setupCommands: string[]): Pr
 }

 export async function clickSaveProjectSettings(page: Page): Promise<void> {
-  await page.getByRole("button", { name: "Save project config" }).click();
+  await page.getByRole("button", { name: "Save" }).click();
 }

 export async function clickRetryProjectSettingsSave(page: Page): Promise<void> {
@@ -79,7 +79,7 @@ export async function expectWriteFailedCalloutActions(page: Page): Promise<void>
 }

 export async function expectSaveButtonDisabled(page: Page): Promise<void> {
-  await expect(page.getByRole("button", { name: "Save project config" })).toBeDisabled();
+  await expect(page.getByRole("button", { name: "Save" })).toBeDisabled();
 }

 // --- Form-state assertions ---
--- a/packages/app/e2e/helpers/questions.ts
+++ b/packages/app/e2e/helpers/questions.ts
@@ -0,0 +1,102 @@
+import { expect, type Page } from "@playwright/test";
+
+export async function waitForQuestionPrompt(page: Page, timeout = 30_000): Promise<void> {
+  await expect(page.getByTestId("question-form-card").first()).toBeVisible({ timeout });
+}
+
+export async function expectCurrentQuestion(
+  page: Page,
+  input: { index: number; total: number; question: string },
+): Promise<void> {
+  const card = page.getByTestId("question-form-card").first();
+  await expect(card.getByTestId("question-form-current-question")).toHaveText(input.question);
+  await expect(
+    card.getByRole("button", { name: `Question ${input.index} of ${input.total}` }),
+  ).toHaveAttribute("aria-selected", "true");
+}
+
+export async function expectQuestionHidden(page: Page, question: string): Promise<void> {
+  await expect(page.getByText(question, { exact: true })).toHaveCount(0);
+}
+
+export async function chooseQuestionOption(page: Page, option: string): Promise<void> {
+  await page
+    .getByTestId("question-form-card")
+    .first()
+    .getByRole("button", { name: option })
+    .click();
+}
+
+export async function expectQuestionOptionSelected(page: Page, option: string): Promise<void> {
+  await expect(
+    page.getByTestId("question-form-card").first().getByRole("button", { name: option }),
+  ).toHaveAttribute("aria-selected", "true");
+}
+
+export async function openQuestion(
+  page: Page,
+  input: { index: number; total: number },
+): Promise<void> {
+  await page
+    .getByTestId("question-form-card")
+    .first()
+    .getByRole("button", { name: `Question ${input.index} of ${input.total}` })
+    .click();
+}
+
+export async function expectQuestionNavigationEnabled(
+  page: Page,
+  input: { index: number; total: number },
+): Promise<void> {
+  await expect(
+    page
+      .getByTestId("question-form-card")
+      .first()
+      .getByRole("button", { name: `Question ${input.index} of ${input.total}` }),
+  ).toBeEnabled();
+}
+
+export async function fillQuestionAnswer(
+  page: Page,
+  input: { question: string; answer: string },
+): Promise<void> {
+  await page
+    .getByTestId("question-form-card")
+    .first()
+    .getByRole("textbox", { name: input.question })
+    .fill(input.answer);
+}
+
+export async function submitQuestionAnswers(page: Page): Promise<void> {
+  await page.getByTestId("question-form-primary-action").click();
+  await expect(page.getByTestId("question-form-card")).toHaveCount(0, { timeout: 30_000 });
+}
+
+export async function expectQuestionPrimaryActionEnabled(page: Page, label: string): Promise<void> {
+  await expect(
+    page.getByTestId("question-form-card").first().getByRole("button", { name: label }),
+  ).toBeEnabled();
+}
+
+export async function expectQuestionPrimaryActionDisabled(
+  page: Page,
+  label: string,
+): Promise<void> {
+  await expect(
+    page.getByTestId("question-form-card").first().getByRole("button", { name: label }),
+  ).toBeDisabled();
+}
+
+export async function expectQuestionDismissEnabled(page: Page): Promise<void> {
+  await expect(
+    page.getByTestId("question-form-card").first().getByRole("button", { name: "Dismiss" }),
+  ).toBeEnabled();
+}
+
+export async function continueToNextQuestion(page: Page): Promise<void> {
+  await page
+    .getByTestId("question-form-card")
+    .first()
+    .getByRole("button", { name: "Next" })
+    .click();
+}
--- a/packages/app/e2e/helpers/seed-client.ts
+++ b/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,
--- a/packages/app/e2e/helpers/settings.ts
+++ b/packages/app/e2e/helpers/settings.ts
@@ -1,8 +1,18 @@
 import { expect, type Page } from "@playwright/test";
-import { TEST_HOST_LABEL } from "./daemon-registry";
+import { buildCreateAgentPreferences, buildSeededHost, TEST_HOST_LABEL } from "./daemon-registry";
 import { escapeRegex } from "./regex";
 import { getServerId } from "./server-id";

+const DISABLE_DEFAULT_SEED_ONCE_KEY = "@paseo:e2e-disable-default-seed-once";
+const SEED_NONCE_KEY = "@paseo:e2e-seed-nonce";
+const REGISTRY_KEY = "@paseo:daemon-registry";
+
+interface SavedSettingsHostInput {
+  serverId: string;
+  label: string;
+  endpoint: string;
+}
+
 const SECTION_LABELS = {
  general: "General",
  appearance: "Appearance",
@@ -15,7 +25,7 @@ const SECTION_LABELS = {

 export type SettingsSection = keyof typeof SECTION_LABELS | "projects";

-type HostSection = "connections" | "orchestration" | "providers" | "daemon";
+type HostSection = "connections" | "agents" | "workspaces" | "providers" | "host";

 export async function openSettingsSection(page: Page, section: SettingsSection): Promise<void> {
  const sidebar = page.getByTestId("settings-sidebar");
@@ -84,6 +94,60 @@ export async function openCompactSettings(page: Page): Promise<void> {
  await expect(page.getByTestId("settings-sidebar")).toBeVisible();
 }

+export async function seedSavedSettingsHosts(
+  page: Page,
+  hosts: SavedSettingsHostInput[],
+): Promise<void> {
+  await page.goto("/");
+  const nowIso = new Date().toISOString();
+  const registry = hosts.map((host) =>
+    buildSeededHost({
+      serverId: host.serverId,
+      label: host.label,
+      endpoint: host.endpoint,
+      nowIso,
+    }),
+  );
+  const firstHost = registry[0];
+  if (!firstHost) {
+    throw new Error("Expected at least one settings host fixture.");
+  }
+  const preferences = buildCreateAgentPreferences(firstHost.serverId);
+
+  await page.evaluate(
+    ({ keys, storedRegistry, storedPreferences }) => {
+      const nonce = localStorage.getItem(keys.seedNonce);
+      if (!nonce) {
+        throw new Error("Expected e2e seed nonce before overriding settings host registry.");
+      }
+
+      localStorage.setItem(keys.registry, JSON.stringify(storedRegistry));
+      localStorage.setItem("@paseo:create-agent-preferences", JSON.stringify(storedPreferences));
+      localStorage.setItem(keys.disableDefaultSeedOnce, nonce);
+    },
+    {
+      keys: {
+        disableDefaultSeedOnce: DISABLE_DEFAULT_SEED_ONCE_KEY,
+        registry: REGISTRY_KEY,
+        seedNonce: SEED_NONCE_KEY,
+      },
+      storedRegistry: registry,
+      storedPreferences: preferences,
+    },
+  );
+}
+
+export async function selectSettingsHost(page: Page, serverId: string): Promise<void> {
+  await page.getByTestId("settings-host-picker").click();
+  await page.getByTestId(`settings-host-picker-item-${serverId}`).click();
+}
+
+export async function expectSettingsHostPickerLabel(page: Page, label: string): Promise<void> {
+  await expect(
+    page.getByTestId("settings-host-picker").getByText(label, { exact: true }),
+  ).toBeVisible();
+}
+
 export async function expectCompactSettingsList(page: Page): Promise<void> {
  await expect(page).toHaveURL(/\/settings$/);
  await expect(page.getByTestId("settings-sidebar")).toBeVisible();
@@ -116,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();
 }
@@ -231,9 +307,9 @@ export async function openHostSection(
 }

 export async function expectHostActionCards(page: Page, serverId: string): Promise<void> {
-  // Restart + remove cards live on the Daemon section; providers moved to its
+  // Restart + remove cards live on the Host section; providers moved to its
  // own Providers section (asserted via expectHostProvidersCard).
-  await openSettingsHostSection(page, serverId, "daemon");
+  await openSettingsHostSection(page, serverId, "host");
  await expect(page.getByTestId("host-page-restart-card")).toBeVisible();
  await expect(page.getByTestId("host-page-restart-button")).toBeVisible();
  await expect(page.getByTestId("host-page-remove-host-card")).toBeVisible();
@@ -255,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();
 }

@@ -268,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(
@@ -296,9 +371,10 @@ export async function expectRetiredSidebarSectionsAbsent(page: Page): Promise<vo

  // Host group rows are now flat top-level sections (no drill-in).
  await expect(sidebar.getByTestId("settings-host-section-connections")).toBeVisible();
-  await expect(sidebar.getByTestId("settings-host-section-orchestration")).toBeVisible();
+  await expect(sidebar.getByTestId("settings-host-section-agents")).toBeVisible();
+  await expect(sidebar.getByTestId("settings-host-section-workspaces")).toBeVisible();
  await expect(sidebar.getByTestId("settings-host-section-providers")).toBeVisible();
-  await expect(sidebar.getByTestId("settings-host-section-daemon")).toBeVisible();
+  await expect(sidebar.getByTestId("settings-host-section-host")).toBeVisible();

  // The old per-host entry rows are replaced by the host picker.
  await expect(sidebar.locator('[data-testid^="settings-host-entry-"]')).toHaveCount(0);
--- a/packages/app/e2e/helpers/startup-dsl.ts
+++ b/packages/app/e2e/helpers/startup-dsl.ts
@@ -139,17 +139,18 @@ class StartupAssertions {
    this.page = page;
  }

-  async expectsReconnectWelcome(): Promise<this> {
-    await expect(this.page.getByTestId("welcome-screen")).toBeVisible({ timeout: 15_000 });
-    await expect(this.page.getByTestId("welcome-open-settings")).toBeVisible();
-    await expect(this.page.getByTestId("welcome-direct-connection")).toBeVisible();
-    await expect(this.page.getByTestId("welcome-paste-pairing-link")).toBeVisible();
-    await expect(this.page.getByTestId("welcome-scan-qr")).toHaveCount(0);
+  async expectsSavedHostShell(input: { label: string }): Promise<this> {
+    await expect(this.page.getByText(input.label, { exact: true })).toBeVisible({
+      timeout: 15_000,
+    });
+    await expect(this.page.getByRole("button", { name: "Add project" })).toBeVisible();
+    await expect(this.page.getByRole("button", { name: "Home" })).toBeVisible();
+    await expect(this.page.getByRole("button", { name: "Settings" })).toBeVisible();
+    await expect(this.page.getByTestId("welcome-screen")).toHaveCount(0);
    return this;
  }

-  async expectsNoSavedHostStatus(input: { label: string }): Promise<this> {
-    await expect(this.page.getByText(input.label, { exact: true })).toHaveCount(0);
+  async expectsNoSavedHostErrorStatus(): Promise<this> {
    await expect(this.page.getByText("Connection error", { exact: true })).toHaveCount(0);
    await expect(this.page.getByText("Offline", { exact: true })).toHaveCount(0);
    return this;
--- a/packages/app/e2e/helpers/timeline-pagination.ts
+++ b/packages/app/e2e/helpers/timeline-pagination.ts
@@ -0,0 +1,102 @@
+import { expect, type Page } from "@playwright/test";
+import { buildAgentRoute, seedMockAgentWorkspace, type MockAgentWorkspace } from "./mock-agent";
+
+interface LongTimelineAgentOptions {
+  turns: number;
+}
+
+interface LongTimelineAgent extends MockAgentWorkspace {
+  oldestPrompt: string;
+  newestPrompt: string;
+}
+
+const PROMPT_PREFIX = "timeline-pagination-turn";
+
+function promptForTurn(index: number): string {
+  return `${PROMPT_PREFIX}-${index}: emit 1 coalesced agent stream updates`;
+}
+
+export async function seedLongMockAgentTimeline(
+  options: LongTimelineAgentOptions,
+): Promise<LongTimelineAgent> {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "timeline-pagination-",
+    title: "Timeline pagination regression",
+    model: "ten-second-stream",
+  });
+
+  for (let index = 0; index < options.turns; index += 1) {
+    await agent.client.sendAgentMessage(agent.agentId, promptForTurn(index));
+    await agent.client.waitForFinish(agent.agentId, 15_000);
+  }
+
+  return {
+    ...agent,
+    oldestPrompt: promptForTurn(0),
+    newestPrompt: promptForTurn(options.turns - 1),
+  };
+}
+
+export async function openAgentTimeline(page: Page, agent: LongTimelineAgent): Promise<void> {
+  await page.goto(buildAgentRoute(agent.cwd, agent.agentId));
+  await page.waitForURL(
+    (url) => url.pathname.includes("/workspace/") && !url.searchParams.has("open"),
+    { timeout: 60_000 },
+  );
+}
+
+export async function expectTimelinePromptVisible(page: Page, prompt: string): Promise<void> {
+  await expect(page.getByText(prompt, { exact: true })).toBeVisible({ timeout: 30_000 });
+}
+
+export async function expectTimelinePromptNotMounted(page: Page, prompt: string): Promise<void> {
+  await expect(page.getByText(prompt, { exact: true })).toHaveCount(0);
+}
+
+export async function scrollTimelineToOldestLoadedEdge(page: Page): Promise<void> {
+  const scroll = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
+  await scroll.hover();
+  await page.mouse.wheel(0, -20_000);
+  await page.evaluate(
+    () =>
+      new Promise<void>((resolve) => {
+        requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
+      }),
+  );
+  await scroll.evaluate((element) => {
+    if (!(element instanceof HTMLElement)) {
+      throw new Error("Agent chat scroll element is not an HTMLElement");
+    }
+    element.scrollTop = 0;
+    element.dispatchEvent(new Event("scroll", { bubbles: true }));
+  });
+}
+
+export async function scrollTimelineUntilOlderHistoryIsReachable(page: Page): Promise<void> {
+  const scroll = page.locator('[data-testid="agent-chat-scroll"]:visible').first();
+  const previousHeight = await scroll.evaluate((element) => {
+    if (!(element instanceof HTMLElement)) {
+      throw new Error("Agent chat scroll element is not an HTMLElement");
+    }
+    return element.scrollHeight;
+  });
+
+  await page.evaluate(
+    () =>
+      new Promise<void>((resolve) => {
+        requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
+      }),
+  );
+  await scrollTimelineToOldestLoadedEdge(page);
+  await expect
+    .poll(async () =>
+      scroll.evaluate((element) => {
+        if (!(element instanceof HTMLElement)) {
+          throw new Error("Agent chat scroll element is not an HTMLElement");
+        }
+        return element.scrollHeight;
+      }),
+    )
+    .toBeGreaterThan(previousHeight);
+  await scrollTimelineToOldestLoadedEdge(page);
+}
--- a/packages/app/e2e/helpers/workspace-tabs.ts
+++ b/packages/app/e2e/helpers/workspace-tabs.ts
@@ -21,7 +21,7 @@ export async function waitForWorkspaceTabsVisible(page: Page): Promise<void> {
  await expect(visibleTestId(page, "workspace-tabs-row").first()).toBeVisible({
    timeout: 30_000,
  });
-  await expect(visibleTestId(page, "workspace-new-agent-tab").first()).toBeVisible({
+  await expect(visibleTestId(page, "workspace-new-agent-tab-inline").first()).toBeVisible({
    timeout: 30_000,
  });
 }
--- a/packages/app/e2e/import-session.opencode.real.spec.ts
+++ b/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 });
+}
--- a/packages/app/e2e/launcher-tab.spec.ts
+++ b/packages/app/e2e/launcher-tab.spec.ts
@@ -2,7 +2,7 @@ import { test, expect } from "./fixtures";
 import {
  gotoWorkspace,
  assertNewChatTileVisible,
-  assertTerminalTileVisible,
+  assertNewTabMenuTriggerVisible,
  assertSingleNewTabButton,
  pressNewTabShortcut,
  clickNewChat,
@@ -91,7 +91,7 @@ test.describe("Tab creation", () => {
    await gotoWorkspace(page, workspace.workspaceId);
    await assertSingleNewTabButton(page);
    await assertNewChatTileVisible(page);
-    await assertTerminalTileVisible(page);
+    await assertNewTabMenuTriggerVisible(page);
  });
 });

--- a/packages/app/e2e/new-workspace.spec.ts
+++ b/packages/app/e2e/new-workspace.spec.ts
@@ -7,16 +7,17 @@ import {
  archiveWorkspaceFromDaemon,
  archiveLocalWorkspaceFromDaemon,
  assertNewWorkspaceSidebarAndHeader,
-  clickNewWorkspaceButton,
  closeBranchPicker,
  connectNewWorkspaceDaemonClient,
  createWorktreeViaDaemon,
  delayBrowserAgentCreatedStatus,
  expectComposerGithubAttachmentPill,
+  expectNewWorkspaceProjectSelected,
  expectPickerClosed,
  expectPickerOpen,
  expectPickerSelected,
  expectStartingRefPickerTriggerPr,
+  openGlobalNewWorkspaceComposer,
  openBranchPicker,
  openNewWorkspaceComposer,
  openProjectViaDaemon,
@@ -24,8 +25,10 @@ import {
  selectBranchInPicker,
  selectGitHubPrInPicker,
  selectPickerOptionByKeyboard,
+  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,
@@ -36,6 +39,147 @@ import {
  workspaceLabelFromPath,
 } from "./helpers/workspace-ui";

+interface WorkspaceStatusGroupEvent {
+  rowTestId: string;
+  bucket: string;
+  indicatorTestId: string | null;
+  label: string;
+  at: number;
+}
+
+async function switchSidebarToStatusGrouping(page: import("@playwright/test").Page) {
+  await page.getByTestId("sidebar-grouping-selector").click();
+  await page.getByTestId("sidebar-grouping-status").click();
+  await expect(page.getByTestId("sidebar-status-group-done")).toBeVisible({ timeout: 30_000 });
+}
+
+async function startTrackingSidebarStatusGroups(page: import("@playwright/test").Page) {
+  await page.evaluate(() => {
+    interface StatusGroupEvent {
+      rowTestId: string;
+      bucket: string;
+      indicatorTestId: string | null;
+      label: string;
+      at: number;
+    }
+    const win = window as typeof window & {
+      __workspaceStatusGroupEvents?: StatusGroupEvent[];
+      __workspaceStatusGroupObserver?: MutationObserver;
+    };
+    win.__workspaceStatusGroupEvents = [];
+    win.__workspaceStatusGroupObserver?.disconnect();
+
+    const capture = () => {
+      const events = win.__workspaceStatusGroupEvents;
+      if (!events) return;
+      const groups = document.querySelectorAll<HTMLElement>(
+        '[data-testid^="sidebar-status-group-"]',
+      );
+      for (const group of groups) {
+        const groupTestId = group.getAttribute("data-testid") ?? "";
+        const bucket = groupTestId.replace("sidebar-status-group-", "");
+        const label = group.textContent ?? "";
+        const block = group.parentElement?.parentElement;
+        if (!block) continue;
+        const rows = block.querySelectorAll<HTMLElement>('[data-testid^="sidebar-workspace-row-"]');
+        for (const row of rows) {
+          const rowTestId = row.getAttribute("data-testid");
+          if (!rowTestId) continue;
+          const indicatorTestId =
+            row
+              .querySelector<HTMLElement>('[data-testid^="workspace-status-indicator-"]')
+              ?.getAttribute("data-testid") ?? null;
+          const last = events.at(-1);
+          if (
+            last?.rowTestId === rowTestId &&
+            last.bucket === bucket &&
+            last.indicatorTestId === indicatorTestId
+          ) {
+            continue;
+          }
+          events.push({ rowTestId, bucket, indicatorTestId, label, at: performance.now() });
+        }
+      }
+    };
+
+    capture();
+    const observer = new MutationObserver(capture);
+    observer.observe(document.body, { childList: true, subtree: true, characterData: true });
+    win.__workspaceStatusGroupObserver = observer;
+  });
+}
+
+async function getTrackedSidebarStatusGroups(
+  page: import("@playwright/test").Page,
+): Promise<WorkspaceStatusGroupEvent[]> {
+  return page.evaluate(() => {
+    const win = window as typeof window & {
+      __workspaceStatusGroupEvents?: WorkspaceStatusGroupEvent[];
+    };
+    return win.__workspaceStatusGroupEvents ?? [];
+  });
+}
+
+async function waitForWorkspaceStatusGroupEvent(input: {
+  page: import("@playwright/test").Page;
+  rowTestId: string;
+  bucket: string;
+}) {
+  await input.page.waitForFunction(
+    ({ expectedRowTestId, expectedBucket }) => {
+      const win = window as typeof window & {
+        __workspaceStatusGroupEvents?: WorkspaceStatusGroupEvent[];
+      };
+      for (const event of win.__workspaceStatusGroupEvents ?? []) {
+        if (event.rowTestId === expectedRowTestId && event.bucket === expectedBucket) {
+          return true;
+        }
+      }
+      return false;
+    },
+    { expectedRowTestId: input.rowTestId, expectedBucket: input.bucket },
+    { timeout: 30_000 },
+  );
+}
+
+async function expectWorkspaceStatusGroupEvents(input: {
+  page: import("@playwright/test").Page;
+  rowTestId: string;
+  includes: string;
+  excludes: string;
+  includesIndicator?: string;
+  excludesIndicator?: string;
+}) {
+  await waitForWorkspaceStatusGroupEvent({
+    page: input.page,
+    rowTestId: input.rowTestId,
+    bucket: input.includes,
+  });
+  const createdWorkspaceEvents = (await getTrackedSidebarStatusGroups(input.page)).filter(
+    (event) => event.rowTestId === input.rowTestId,
+  );
+  expect(createdWorkspaceEvents.map((event) => event.bucket)).toContain(input.includes);
+  expect(createdWorkspaceEvents.filter((event) => event.bucket === input.excludes)).toEqual([]);
+  if (input.includesIndicator) {
+    expect(createdWorkspaceEvents.map((event) => event.indicatorTestId)).toContain(
+      input.includesIndicator,
+    );
+  }
+  if (input.excludesIndicator) {
+    expect(
+      createdWorkspaceEvents.filter((event) => event.indicatorTestId === input.excludesIndicator),
+    ).toEqual([]);
+  }
+}
+
+async function submitNewWorkspaceWithoutPrompt(page: import("@playwright/test").Page) {
+  const createButton = page
+    .getByTestId("message-input-root")
+    .getByRole("button", { name: "Create" });
+  await expect(createButton).toBeVisible({ timeout: 30_000 });
+  await createButton.click();
+}
+
 test.describe("New workspace flow", () => {
  let client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
  const localWorkspaceIds = new Set<string>();
@@ -193,7 +337,7 @@ test.describe("New workspace flow", () => {
    }
  });

-  test("clicking new workspace redirects, renders header, shows sidebar row, and keeps one agent tab", async ({
+  test("global new workspace uses the last active project and creates one agent tab", async ({
    page,
  }) => {
    const serverId = getServerId();
@@ -217,15 +361,16 @@ test.describe("New workspace flow", () => {
        subtitle: openedProject.projectDisplayName,
      });

-      await clickNewWorkspaceButton(page, {
-        projectKey: openedProject.projectKey,
-        projectDisplayName: openedProject.projectDisplayName,
-      });
+      await openGlobalNewWorkspaceComposer(page);
+      await expectNewWorkspaceProjectSelected(page, openedProject.projectDisplayName);
+      await submitNewWorkspacePrompt(page);

      const createdWorkspace = await assertNewWorkspaceSidebarAndHeader(page, {
        serverId,
        previousWorkspaceId: openedProject.workspaceId,
        projectDisplayName: openedProject.projectDisplayName,
+        assertSidebarRow: false,
+        assertHeader: false,
      });
      createdWorktreeIds.add(createdWorkspace.workspaceId);

@@ -312,6 +457,8 @@ test.describe("New workspace flow", () => {
        serverId,
        previousWorkspaceId: openedProject.workspaceId,
        projectDisplayName: openedProject.projectDisplayName,
+        assertSidebarRow: false,
+        assertHeader: false,
      });
      createdWorktreeIds.add(createdWorkspace.workspaceId);

@@ -343,6 +490,117 @@ test.describe("New workspace flow", () => {
    }
  });

+  test("new workspace with initial agent never appears in the Done status group", async ({
+    page,
+  }) => {
+    const serverId = getServerId();
+
+    const tempRepo = await createTempGitRepo("new-workspace-status-optimistic-");
+
+    try {
+      const openedProject = await openProjectViaDaemon(client, tempRepo.path);
+      localWorkspaceIds.add(openedProject.workspaceId);
+
+      await gotoAppShell(page);
+      await waitForSidebarHydration(page);
+
+      await switchWorkspaceViaSidebar({
+        page,
+        serverId,
+        targetWorkspacePath: openedProject.workspaceId,
+      });
+      await expectWorkspaceHeader(page, {
+        title: openedProject.workspaceName,
+        subtitle: openedProject.projectDisplayName,
+      });
+
+      await switchSidebarToStatusGrouping(page);
+      await startTrackingSidebarStatusGroups(page);
+
+      await openGlobalNewWorkspaceComposer(page);
+      await expectNewWorkspaceProjectSelected(page, openedProject.projectDisplayName);
+      await submitNewWorkspacePrompt(page);
+
+      const createdWorkspace = await assertNewWorkspaceSidebarAndHeader(page, {
+        serverId,
+        previousWorkspaceId: openedProject.workspaceId,
+        projectDisplayName: openedProject.projectDisplayName,
+        assertSidebarRow: false,
+        assertHeader: false,
+      });
+      createdWorktreeIds.add(createdWorkspace.workspaceId);
+
+      const rowTestId = `sidebar-workspace-row-${serverId}:${createdWorkspace.workspaceId}`;
+      await expectWorkspaceStatusGroupEvents({
+        page,
+        rowTestId,
+        includes: "running",
+        excludes: "done",
+        includesIndicator: "workspace-status-indicator-running",
+      });
+    } finally {
+      await tempRepo.cleanup();
+    }
+  });
+
+  test("new workspace without an initial agent appears in the Done status group", async ({
+    page,
+  }) => {
+    const serverId = getServerId();
+
+    const tempRepo = await createTempGitRepo("new-workspace-status-empty-");
+
+    try {
+      const openedProject = await openProjectViaDaemon(client, tempRepo.path);
+      localWorkspaceIds.add(openedProject.workspaceId);
+
+      await gotoAppShell(page);
+      await waitForSidebarHydration(page);
+
+      await switchWorkspaceViaSidebar({
+        page,
+        serverId,
+        targetWorkspacePath: openedProject.workspaceId,
+      });
+      await expectWorkspaceHeader(page, {
+        title: openedProject.workspaceName,
+        subtitle: openedProject.projectDisplayName,
+      });
+
+      await switchSidebarToStatusGrouping(page);
+      await startTrackingSidebarStatusGroups(page);
+
+      await openGlobalNewWorkspaceComposer(page);
+      await expectNewWorkspaceProjectSelected(page, openedProject.projectDisplayName);
+      await submitNewWorkspaceWithoutPrompt(page);
+
+      const createdWorkspace = await assertNewWorkspaceSidebarAndHeader(page, {
+        serverId,
+        previousWorkspaceId: openedProject.workspaceId,
+        projectDisplayName: openedProject.projectDisplayName,
+      });
+      createdWorktreeIds.add(createdWorkspace.workspaceId);
+
+      const rowTestId = `sidebar-workspace-row-${serverId}:${createdWorkspace.workspaceId}`;
+      await expectWorkspaceStatusGroupEvents({
+        page,
+        rowTestId,
+        includes: "done",
+        excludes: "running",
+        excludesIndicator: "workspace-status-indicator-loading",
+      });
+      await expectWorkspaceStatusGroupEvents({
+        page,
+        rowTestId,
+        includes: "done",
+        excludes: "running",
+        excludesIndicator: "workspace-status-indicator-running",
+      });
+    } finally {
+      await tempRepo.cleanup();
+    }
+  });
+
  test("selected branch becomes the base of a new workspace worktree", async ({ page }) => {
    const serverId = getServerId();

@@ -400,7 +658,7 @@ test.describe("New workspace flow", () => {
    }
  });

-  test("branch picker opens via keyboard, navigates options, and selects on Enter", async ({
+  test("branch picker opens via keyboard and selects the filtered option on Enter", async ({
    page,
  }) => {
    const tempRepo = await createTempGitRepo("picker-keyboard-", { branches: ["main", "dev"] });
@@ -450,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);
@@ -463,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();
    }
  });
 });
--- a/packages/app/e2e/provider-settings-refresh.spec.ts
+++ b/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();
+    }
+  });
+});
--- a/packages/app/e2e/question-prompt-pagination.spec.ts
+++ b/packages/app/e2e/question-prompt-pagination.spec.ts
@@ -0,0 +1,127 @@
+import { test } from "./fixtures";
+import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+import {
+  chooseQuestionOption,
+  continueToNextQuestion,
+  expectCurrentQuestion,
+  expectQuestionDismissEnabled,
+  expectQuestionHidden,
+  expectQuestionNavigationEnabled,
+  expectQuestionOptionSelected,
+  expectQuestionPrimaryActionDisabled,
+  expectQuestionPrimaryActionEnabled,
+  fillQuestionAnswer,
+  openQuestion,
+  submitQuestionAnswers,
+  waitForQuestionPrompt,
+} from "./helpers/questions";
+
+const TOTAL_QUESTIONS = 3;
+const SURFACE_QUESTION = "Which surface should this apply to?";
+const ROLLOUT_QUESTION = "Which rollout should we use?";
+const SUCCESS_QUESTION = "What success criteria should we use?";
+const REPO_URL_QUESTION = "What is the GitHub private repo URL to push to?";
+const COMMIT_MESSAGE_QUESTION = "What should the first commit message be?";
+
+test.describe("Question prompt pagination", () => {
+  test("shows one question at a time with numbered navigation", async ({ page }) => {
+    test.setTimeout(180_000);
+
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "question-pagination-",
+      title: "Question pagination e2e",
+      initialPrompt: "Emit synthetic questions.",
+    });
+
+    try {
+      await openAgentRoute(page, session);
+      await waitForQuestionPrompt(page, 120_000);
+
+      await expectCurrentQuestion(page, {
+        index: 1,
+        total: TOTAL_QUESTIONS,
+        question: SURFACE_QUESTION,
+      });
+      await expectQuestionHidden(page, ROLLOUT_QUESTION);
+      await expectQuestionHidden(page, SUCCESS_QUESTION);
+
+      await chooseQuestionOption(page, "App");
+      await expectCurrentQuestion(page, {
+        index: 2,
+        total: TOTAL_QUESTIONS,
+        question: ROLLOUT_QUESTION,
+      });
+
+      await openQuestion(page, { index: 1, total: TOTAL_QUESTIONS });
+      await expectCurrentQuestion(page, {
+        index: 1,
+        total: TOTAL_QUESTIONS,
+        question: SURFACE_QUESTION,
+      });
+      await expectQuestionOptionSelected(page, "App");
+
+      await openQuestion(page, { index: 2, total: TOTAL_QUESTIONS });
+      await chooseQuestionOption(page, "Behind feature flag");
+      await expectCurrentQuestion(page, {
+        index: 3,
+        total: TOTAL_QUESTIONS,
+        question: SUCCESS_QUESTION,
+      });
+
+      await fillQuestionAnswer(page, {
+        question: SUCCESS_QUESTION,
+        answer: "Only one prompt is visible at a time.",
+      });
+      await submitQuestionAnswers(page);
+    } finally {
+      await session.cleanup();
+    }
+  });
+
+  test("free-write questions use Next before final Submit", async ({ page }) => {
+    test.setTimeout(180_000);
+
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "question-free-write-",
+      title: "Question free-write e2e",
+      initialPrompt: "Emit synthetic questions: two free-write questions.",
+    });
+
+    try {
+      await openAgentRoute(page, session);
+      await waitForQuestionPrompt(page, 120_000);
+
+      await expectCurrentQuestion(page, {
+        index: 1,
+        total: 2,
+        question: REPO_URL_QUESTION,
+      });
+
+      await fillQuestionAnswer(page, {
+        question: REPO_URL_QUESTION,
+        answer: "git@github.com:user/private-repo.git",
+      });
+
+      await expectQuestionPrimaryActionEnabled(page, "Next");
+      await expectQuestionDismissEnabled(page);
+      await expectQuestionNavigationEnabled(page, { index: 2, total: 2 });
+
+      await continueToNextQuestion(page);
+      await expectCurrentQuestion(page, {
+        index: 2,
+        total: 2,
+        question: COMMIT_MESSAGE_QUESTION,
+      });
+      await expectQuestionPrimaryActionDisabled(page, "Submit");
+
+      await fillQuestionAnswer(page, {
+        question: COMMIT_MESSAGE_QUESTION,
+        answer: "Initialize private repo",
+      });
+      await expectQuestionPrimaryActionEnabled(page, "Submit");
+      await submitQuestionAnswers(page);
+    } finally {
+      await session.cleanup();
+    }
+  });
+});
--- a/packages/app/e2e/settings-host-page.spec.ts
+++ b/packages/app/e2e/settings-host-page.spec.ts
@@ -33,15 +33,15 @@ test.describe("Settings host page", () => {
    await expectHostConnectionsCard(page, port);
  });

-  test("orchestration section shows the inject MCP toggle", async ({ page }) => {
+  test("agents section shows the inject MCP toggle", async ({ page }) => {
    const serverId = getServerId();

    await gotoAppShell(page);
    await openSettings(page);
    await openSettingsHost(page, serverId);

-    await openHostSection(page, serverId, "orchestration");
-    await expectSettingsHeader(page, "Orchestration");
+    await openHostSection(page, serverId, "agents");
+    await expectSettingsHeader(page, "Agents");
    await expectHostInjectMcpCard(page);
  });

@@ -56,15 +56,15 @@ test.describe("Settings host page", () => {
    await expectSettingsHeader(page, "Providers");
  });

-  test("daemon section shows the host label and restart/remove action cards", async ({ page }) => {
+  test("host section shows the host label and restart/remove action cards", async ({ page }) => {
    const serverId = getServerId();

    await gotoAppShell(page);
    await openSettings(page);
    await openSettingsHost(page, serverId);

-    await openHostSection(page, serverId, "daemon");
-    await expectSettingsHeader(page, "Daemon");
+    await openHostSection(page, serverId, "host");
+    await expectSettingsHeader(page, "Host");
    await expectHostLabelDisplayed(page);
    await expectHostActionCards(page, serverId);
  });
@@ -75,14 +75,14 @@ test.describe("Settings host page", () => {
    await gotoAppShell(page);
    await openSettings(page);
    await openSettingsHost(page, serverId);
-    await openHostSection(page, serverId, "daemon");
+    await openHostSection(page, serverId, "host");

    await expectHostLabelDisplayed(page);
    await clickEditHostLabel(page);
    await expectHostLabelEditMode(page, TEST_HOST_LABEL);
  });

-  test("daemon section does not render pair-device or daemon-lifecycle rows for a remote daemon", async ({
+  test("host section does not render pair-device or daemon-lifecycle rows for a remote daemon", async ({
    page,
  }) => {
    const serverId = getServerId();
@@ -90,7 +90,7 @@ test.describe("Settings host page", () => {
    await gotoAppShell(page);
    await openSettings(page);
    await openSettingsHost(page, serverId);
-    await openHostSection(page, serverId, "daemon");
+    await openHostSection(page, serverId, "host");

    // TODO: add local-daemon fixture for positive Pair/Daemon coverage.
    await expectHostNoLocalOnlyRows(page);
@@ -113,7 +113,7 @@ test.describe("Settings host page", () => {

    await expectHostPageVisible(page, serverId);
    await expectSettingsHeader(page, "Connections");
-    await openHostSection(page, serverId, "daemon");
+    await openHostSection(page, serverId, "host");
    await expectHostLabelDisplayed(page);
    await expectHostActionCards(page, serverId);
  });
--- a/packages/app/e2e/settings-i18n.spec.ts
+++ b/packages/app/e2e/settings-i18n.spec.ts
@@ -0,0 +1,23 @@
+import { test, expect } from "./fixtures";
+import { gotoAppShell, openSettings } from "./helpers/app";
+import { openSettingsSection } from "./helpers/settings";
+
+test("Settings language selector switches General labels", async ({ page }) => {
+  test.setTimeout(120_000);
+
+  await gotoAppShell(page);
+  await openSettings(page);
+  await openSettingsSection(page, "general");
+
+  await expect(page.getByText("Default send", { exact: true }).first()).toBeVisible();
+
+  await page.getByRole("button", { name: "System", exact: true }).click();
+  await page.getByRole("button", { name: "简体中文 - Simplified Chinese", exact: true }).click();
+
+  await expect(page.getByText("默认发送", { exact: true }).first()).toBeVisible();
+
+  await page.getByRole("button", { name: "简体中文", exact: true }).click();
+  await page.getByRole("button", { name: "English - 英语", exact: true }).click();
+
+  await expect(page.getByText("Default send", { exact: true }).first()).toBeVisible();
+});
--- a/packages/app/e2e/settings-navigation.spec.ts
+++ b/packages/app/e2e/settings-navigation.spec.ts
@@ -1,6 +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,
@@ -26,7 +29,21 @@ import {
  expectAboutContent,
  expectGeneralContent,
  expectAppearanceContent,
+  seedSavedSettingsHosts,
+  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 }) => {
@@ -157,4 +174,44 @@ test.describe("Settings — compact master-detail", () => {
    await expect(page).toHaveURL(/\/settings$/);
    await expectSettingsSidebarVisible(page);
  });
+
+  test("switching the host picker on the settings list scopes host rows without navigating", async ({
+    page,
+  }) => {
+    const primaryServerId = getServerId();
+    const secondaryServerId = "srv_e2e_settings_secondary";
+    const secondaryHostLabel = "Stable horse";
+    const endpoint = `127.0.0.1:${getE2EDaemonPort()}`;
+
+    await seedSavedSettingsHosts(page, [
+      { serverId: primaryServerId, label: "First horse", endpoint },
+      { serverId: secondaryServerId, label: secondaryHostLabel, endpoint },
+    ]);
+    await gotoAppShell(page);
+    await openCompactSettings(page);
+
+    await selectSettingsHost(page, secondaryServerId);
+
+    await expect(page).toHaveURL(/\/settings$/);
+    await expectSettingsSidebarVisible(page);
+    await expectSettingsHostPickerLabel(page, secondaryHostLabel);
+
+    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();
+  });
 });
--- a/packages/app/e2e/settings-sidebar-scroll.spec.ts
+++ b/packages/app/e2e/settings-sidebar-scroll.spec.ts
@@ -0,0 +1,61 @@
+import { test, expect } from "./fixtures";
+import { gotoAppShell, openSettings } from "./helpers/app";
+
+test.describe("Settings sidebar scrolling", () => {
+  test.use({ viewport: { width: 900, height: 260 } });
+
+  test("desktop drag region does not cover the scroll body", async ({ page }) => {
+    await page.addInitScript(() => {
+      window.paseoDesktop = {
+        platform: "darwin",
+        events: { on: () => () => {} },
+        invoke: async (command: string) => {
+          if (command === "get_desktop_settings") {
+            return {
+              releaseChannel: "stable",
+              daemon: { manageBuiltInDaemon: true, keepRunningAfterQuit: true },
+            };
+          }
+          return null;
+        },
+      };
+    });
+
+    await gotoAppShell(page);
+    await openSettings(page);
+
+    const sidebar = page.getByTestId("settings-sidebar");
+    await expect(sidebar).toBeVisible();
+
+    const geometry = await sidebar.evaluate((node) => {
+      let scroller: HTMLElement | null = null;
+      for (const element of node.querySelectorAll<HTMLElement>("*")) {
+        if (element.scrollHeight > element.clientHeight) {
+          scroller = element;
+          break;
+        }
+      }
+      if (!scroller) return null;
+
+      const scrollerRect = scroller.getBoundingClientRect();
+      const dragRegions = [];
+      for (const element of node.querySelectorAll<HTMLElement>("*")) {
+        if (getComputedStyle(element).getPropertyValue("-webkit-app-region") === "drag") {
+          const rect = element.getBoundingClientRect();
+          dragRegions.push({ bottom: rect.bottom });
+        }
+      }
+
+      return {
+        scrollBodyTop: scrollerRect.top,
+        dragRegions,
+      };
+    });
+
+    expect(geometry).not.toBeNull();
+    expect(geometry!.dragRegions).not.toEqual([]);
+    for (const dragRegion of geometry!.dragRegions) {
+      expect(dragRegion.bottom).toBeLessThanOrEqual(geometry!.scrollBodyTop + 1);
+    }
+  });
+});
--- a/packages/app/e2e/startup-loading.spec.ts
+++ b/packages/app/e2e/startup-loading.spec.ts
@@ -4,7 +4,7 @@ import { getServerId } from "./helpers/server-id";
 import { startupScenario } from "./helpers/startup-dsl";

 test.describe("Startup loading presentation", () => {
-  test("mobile reconnect keeps connection recovery actions visible", async ({ page }) => {
+  test("mobile reconnect preserves the saved host shell", async ({ page }) => {
    const startup = await startupScenario(page)
      .withMobileViewport()
      .withSavedHost({
@@ -14,8 +14,8 @@ test.describe("Startup loading presentation", () => {
      })
      .openRoot();

-    await startup.expectsReconnectWelcome();
-    await startup.expectsNoSavedHostStatus({ label: "Dev" });
+    await startup.expectsSavedHostShell({ label: "Dev" });
+    await startup.expectsNoSavedHostErrorStatus();
    await startup.expectsNoLocalServerStartupCopy();
  });

--- a/packages/app/e2e/workspace-agent-title-handoff.spec.ts
+++ b/packages/app/e2e/workspace-agent-title-handoff.spec.ts
@@ -181,7 +181,7 @@ test.describe("Workspace agent title handoff", () => {

      await page.goto(buildHostWorkspaceRoute(getServerId(), workspace.workspaceId));
      await waitForWorkspaceTabsVisible(page);
-      await page.getByTestId("workspace-new-agent-tab").click();
+      await page.getByTestId("workspace-new-agent-tab-inline").click();
      await expectComposerVisible(page);

      const promptTitle = "Investigate optimistic tab title handoff";
--- a/packages/app/e2e/workspace-navigation-regression.spec.ts
+++ b/packages/app/e2e/workspace-navigation-regression.spec.ts
@@ -9,7 +9,7 @@ import {
  openWorkspaceWithAgents,
 } from "./helpers/archive-tab";
 import { expectComposerVisible } from "./helpers/composer";
-import { daemonWsRoutePattern } from "./helpers/daemon-port";
+import { daemonWsRoutePattern, getE2EDaemonPort } from "./helpers/daemon-port";
 import { seedWorkspace } from "./helpers/seed-client";
 import {
  getVisibleWorkspaceAgentTabIds,
@@ -32,6 +32,7 @@ import {
 } from "./helpers/workspace-ui";
 import { clickSettingsBackToWorkspace } from "./helpers/settings";
 import { getServerId } from "./helpers/server-id";
+import { injectDesktopBridge } from "./helpers/desktop-updates";

 const LOADING_WORKSPACE_TEXT_PATTERN = /Loading workspace/i;

@@ -79,6 +80,43 @@ async function closeFirstVisibleDraftTab(page: Page): Promise<void> {
  await closeButton.first().click();
 }

+async function openWorkspaceThroughApp(
+  page: Page,
+  input: {
+    serverId: string;
+    workspace: Awaited<ReturnType<typeof seedWorkspace>>;
+  },
+): Promise<void> {
+  await gotoAppShell(page);
+  await waitForSidebarHydration(page);
+  await switchWorkspaceViaSidebar({
+    page,
+    serverId: input.serverId,
+    targetWorkspacePath: input.workspace.workspaceId,
+  });
+  await waitForWorkspaceTabsVisible(page);
+  await expectWorkspaceLocation(page, input);
+}
+
+async function expectWorkspaceLocation(
+  page: Page,
+  input: {
+    serverId: string;
+    workspace: Awaited<ReturnType<typeof seedWorkspace>>;
+  },
+): Promise<void> {
+  await expect(page).toHaveURL(
+    buildHostWorkspaceRoute(input.serverId, input.workspace.workspaceId),
+    {
+      timeout: 30_000,
+    },
+  );
+  await expectWorkspaceHeader(page, {
+    title: input.workspace.workspaceName,
+    subtitle: input.workspace.projectDisplayName,
+  });
+}
+
 async function installDaemonWebSocketGate(page: Page) {
  let acceptingConnections = true;
  const activeSockets = new Set<WebSocketRoute>();
@@ -260,6 +298,41 @@ test.describe("Workspace navigation regression", () => {
    }
  });

+  test("refresh keeps the user on the same workspace route", async ({ page }) => {
+    const serverId = getServerId();
+    const daemonGate = await installDaemonWebSocketGate(page);
+    const workspace = await seedWorkspace({ repoPrefix: "workspace-refresh-route-" });
+
+    try {
+      const agent = await createIdleAgent(workspace.client, {
+        cwd: workspace.repoPath,
+        title: `workspace-refresh-route-${Date.now()}`,
+      });
+      await injectDesktopBridge(page, {
+        serverId,
+        manageBuiltInDaemon: true,
+        hangDaemonStart: true,
+        daemonListen: `127.0.0.1:${getE2EDaemonPort()}`,
+      });
+      await openWorkspaceThroughApp(page, { serverId, workspace });
+      await waitForWorkspaceTabsVisible(page);
+      await expectWorkspaceTabVisible(page, agent.id);
+      await expectWorkspaceLocation(page, { serverId, workspace });
+
+      await daemonGate.drop();
+      await page.reload();
+      await expect(page.getByTestId("startup-splash")).toBeVisible({ timeout: 30_000 });
+      daemonGate.restore();
+      await waitForSidebarHydration(page);
+
+      await expectWorkspaceLocation(page, { serverId, workspace });
+      await waitForWorkspaceTabsVisible(page);
+    } finally {
+      daemonGate.restore();
+      await workspace.cleanup();
+    }
+  });
+
  test("sidebar navigation and reload keep workspace selection and tabs aligned", async ({
    page,
  }) => {
--- a/packages/app/e2e/workspace-open-in-editor.spec.ts
+++ b/packages/app/e2e/workspace-open-in-editor.spec.ts
@@ -5,8 +5,10 @@ import { injectDesktopBridge } from "./helpers/desktop-updates";
 import { clickSettingsBackToWorkspace } from "./helpers/settings";

 interface EditorOpenRecord {
-  command: string;
-  args: string[];
+  editorId: string;
+  path: string;
+  cwd?: string;
+  mode?: "open" | "reveal";
 }

 function requireE2EEnv(name: string): string {
@@ -43,8 +45,8 @@ async function chooseEditorTarget(page: Page, targetId: "vscode"): Promise<void>

 async function expectEditorOpened(input: {
  recordPath: string;
-  command: string;
-  workspacePath: string;
+  editorId: string;
+  path: string;
  afterCount: number;
 }): Promise<void> {
  await expect
@@ -53,10 +55,7 @@ async function expectEditorOpened(input: {
        const records = await readEditorOpenRecords(input.recordPath);
        return records
          .slice(input.afterCount)
-          .some(
-            (record) =>
-              record.command === input.command && record.args.includes(input.workspacePath),
-          );
+          .some((record) => record.editorId === input.editorId && record.path === input.path);
      },
      { timeout: 30_000 },
    )
@@ -73,7 +72,14 @@ test.describe("Workspace open in editor", () => {
    const serverId = requireE2EEnv("E2E_SERVER_ID");
    const recordPath = requireE2EEnv("E2E_EDITOR_RECORD_PATH");
    await rm(recordPath, { force: true });
-    await injectDesktopBridge(page, { serverId });
+    await injectDesktopBridge(page, {
+      serverId,
+      editorTargets: [
+        { id: "cursor", label: "Cursor", kind: "editor" },
+        { id: "vscode", label: "VS Code", kind: "editor" },
+      ],
+      editorRecordPath: recordPath,
+    });

    const workspace = await withWorkspace({ prefix: "workspace-editor-target-" });
    await workspace.navigateTo();
@@ -81,8 +87,8 @@ test.describe("Workspace open in editor", () => {
    await chooseEditorTarget(page, "vscode");
    await expectEditorOpened({
      recordPath,
-      command: "code",
-      workspacePath: workspace.repoPath,
+      editorId: "vscode",
+      path: workspace.repoPath,
      afterCount: 0,
    });
    const recordsAfterSelection = (await readEditorOpenRecords(recordPath)).length;
@@ -94,8 +100,8 @@ test.describe("Workspace open in editor", () => {
    await page.getByTestId("workspace-open-in-editor-primary").click();
    await expectEditorOpened({
      recordPath,
-      command: "code",
-      workspacePath: workspace.repoPath,
+      editorId: "vscode",
+      path: workspace.repoPath,
      afterCount: recordsAfterSelection,
    });
    const recordsAfterReturnOpen = (await readEditorOpenRecords(recordPath)).length;
@@ -105,8 +111,8 @@ test.describe("Workspace open in editor", () => {
    await page.getByTestId("workspace-open-in-editor-primary").click();
    await expectEditorOpened({
      recordPath,
-      command: "code",
-      workspacePath: workspace.repoPath,
+      editorId: "vscode",
+      path: workspace.repoPath,
      afterCount: recordsAfterReturnOpen,
    });
  });
--- a/packages/app/metro.config.cjs
+++ b/packages/app/metro.config.cjs
@@ -78,4 +78,31 @@ config.resolver.resolveRequest = (context, moduleName, platform) => {
  return resolveWithCustomWebOverlay(context, moduleName, platform);
 };

+if (process.env.PASEO_SERVE_SIM_PREVIEW === "1") {
+  const { simMiddleware } = require("serve-sim/middleware");
+  const originalEnhanceMiddleware = config.server?.enhanceMiddleware;
+  config.server = config.server ?? {};
+  config.server.enhanceMiddleware = (metroMiddleware, server) => {
+    const middleware = originalEnhanceMiddleware
+      ? originalEnhanceMiddleware(metroMiddleware, server)
+      : metroMiddleware;
+    const serveSimulator = simMiddleware({
+      basePath: "/.sim",
+      device: process.env.PASEO_SERVE_SIM_DEVICE_UDID,
+    });
+    return (req, res, next) => {
+      serveSimulator(req, res, (error) => {
+        if (error) {
+          if (next) {
+            next(error);
+            return;
+          }
+          throw error;
+        }
+        middleware(req, res, next);
+      });
+    };
+  };
+}
+
 module.exports = config;
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.1.89",
+  "version": "0.1.94",
  "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",
@@ -73,6 +73,7 @@
    "expo-image-picker": "^17.0.8",
    "expo-keep-awake": "^15.0.7",
    "expo-linking": "~8.0.8",
+    "expo-localization": "~17.0.9",
    "expo-notifications": "^0.32.16",
    "expo-router": "~6.0.13",
    "expo-sharing": "^14.0.8",
@@ -80,12 +81,15 @@
    "expo-system-ui": "~6.0.7",
    "expo-updates": "~29.0.12",
    "fast-deep-equal": "^3.1.3",
+    "htmlparser2": "^12.0.0",
+    "i18next": "^26.3.0",
    "lucide-react-native": "^0.546.0",
    "markdown-it": "^10.0.0",
    "mnemonic-id": "^3.2.7",
    "qrcode": "^1.5.4",
    "react": "19.1.0",
    "react-dom": "19.1.0",
+    "react-i18next": "^17.0.8",
    "react-native": "0.81.5",
    "react-native-draggable-flatlist": "^4.0.3",
    "react-native-edge-to-edge": "^1.7.0",
@@ -125,6 +129,7 @@
    "jsdom": "^20.0.3",
    "material-icon-theme": "^5.32.0",
    "playwright": "^1.56.1",
+    "serve-sim": "^0.1.40",
    "typescript": "~5.9.2",
    "vitest": "^4.1.6",
    "wrangler": "^4.75.0",
--- a/packages/app/playwright.config.ts
+++ b/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: [
    {
--- a/packages/app/src/agent-stream/bottom-anchor-controller.test.ts
+++ b/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", () => {
--- a/packages/app/src/agent-stream/bottom-anchor-controller.ts
+++ b/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;
--- a/packages/app/src/agent-stream/view.tsx
+++ b/packages/app/src/agent-stream/view.tsx
@@ -10,6 +10,7 @@ import React, {
  type ComponentProps,
  type ReactNode,
 } from "react";
+import { useTranslation } from "react-i18next";
 import {
  View,
  Text,
@@ -157,6 +158,7 @@ function renderStreamItemWithTurnFooter(input: {
 function renderListEmptyComponent(input: {
  renderModel: AgentStreamRenderModel;
  emptyStateStyle: StyleProp<ViewStyle>;
+  emptyText: string;
 }): ReactNode {
  if (
    input.renderModel.boundary.hasVirtualizedHistory ||
@@ -170,7 +172,7 @@ function renderListEmptyComponent(input: {

  return (
    <View style={input.emptyStateStyle}>
-      <Text style={stylesheet.emptyStateText}>Start chatting with this agent...</Text>
+      <Text style={stylesheet.emptyStateText}>{input.emptyText}</Text>
    </View>
  );
 }
@@ -245,6 +247,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
    },
    ref,
  ) {
+    const { t } = useTranslation();
    const viewportRef = useRef<StreamViewportHandle | null>(null);
    const isMobile = useIsCompactFormFactor();
    const streamRenderStrategy = useMemo(
@@ -637,8 +640,13 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi

    const emptyStateStyle = useMemo(() => [stylesheet.emptyState, stylesheet.contentWrapper], []);
    const listEmptyComponent = useMemo(
-      () => renderListEmptyComponent({ renderModel, emptyStateStyle }),
-      [renderModel, emptyStateStyle],
+      () =>
+        renderListEmptyComponent({
+          renderModel,
+          emptyStateStyle,
+          emptyText: t("agentStream.empty"),
+        }),
+      [renderModel, emptyStateStyle, t],
    );

    const { boundary, auxiliary } = renderModel;
@@ -745,7 +753,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
                  style={stylesheet.scrollToBottomButton}
                  onPress={scrollToBottom}
                  accessibilityRole="button"
-                  accessibilityLabel="Scroll to bottom"
+                  accessibilityLabel={t("agentStream.scrollToBottom")}
                  testID="scroll-to-bottom-button"
                >
                  <ChevronDown size={24} color={stylesheet.scrollToBottomIcon.color} />
@@ -906,11 +914,14 @@ function PermissionRequestCard({
  permission: PendingPermission;
  client: DaemonClient | null;
 }) {
+  const { t } = useTranslation();
  const isMobile = useIsCompactFormFactor();

  const { request } = permission;
  const isPlanRequest = request.kind === "plan";
-  const title = isPlanRequest ? "Plan" : (request.title ?? request.name ?? "Permission Required");
+  const title = isPlanRequest
+    ? t("agentStream.permission.plan")
+    : (request.title ?? request.name ?? t("agentStream.permission.required"));
  const description = request.description ?? "";
  const resolvedToolCallDetail = useMemo(
    () =>
@@ -931,19 +942,21 @@ function PermissionRequestCard({
    return [
      {
        id: "reject",
-        label: "Deny",
+        label: t("agentStream.permission.deny"),
        behavior: "deny",
        variant: "danger",
        intent: "dismiss",
      },
      {
        id: "accept",
-        label: isPlanRequest ? "Implement" : "Accept",
+        label: isPlanRequest
+          ? t("agentStream.permission.implement")
+          : t("agentStream.permission.accept"),
        behavior: "allow",
        variant: "primary",
      },
    ];
-  }, [isPlanRequest, request]);
+  }, [isPlanRequest, request, t]);

  const planMarkdown = useMemo(() => {
    if (!request) {
@@ -968,7 +981,7 @@ function PermissionRequestCard({
      response: AgentPermissionResponse;
    }) => {
      if (!client) {
-        throw new Error("Daemon client unavailable");
+        throw new Error(t("common.errors.daemonClientUnavailable"));
      }
      return client.respondToPermissionAndWait(
        input.agentId,
@@ -1042,7 +1055,7 @@ function PermissionRequestCard({
  const footer = (
    <>
      <Text testID="permission-request-question" style={permissionStyles.question}>
-        How would you like to proceed?
+        {t("agentStream.permission.question")}
      </Text>

      <View style={optionsContainerStyle}>
@@ -1094,7 +1107,7 @@ function PermissionRequestCard({

      {planMarkdown ? (
        <PlanCard
-          title="Proposed plan"
+          title={t("agentStream.permission.proposedPlan")}
          text={planMarkdown}
          testID="permission-plan-card"
          disableOuterSpacing
--- a/packages/app/src/app/_layout.tsx
+++ b/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";
@@ -46,7 +47,14 @@ import {
 import { SidebarCalloutProvider } from "@/contexts/sidebar-callout-context";
 import { ToastProvider } from "@/contexts/toast-context";
 import { VoiceProvider } from "@/contexts/voice-context";
-import { startDaemonIfGateAllows, startHostRuntimeBootstrap } from "@/app/host-runtime-bootstrap";
+import {
+  resolveStartupBlocker,
+  resolveStartupNavigationReady,
+  shouldRunStartupGiveUpTimer,
+  startDaemonIfGateAllows,
+  startHostRuntimeBootstrap,
+  type StartupBlocker,
+} from "@/app/host-runtime-bootstrap";
 import { shouldUseDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
 import { listenToDesktopEvent } from "@/desktop/electron/events";
 import { updateDesktopWindowControls } from "@/desktop/electron/window";
@@ -57,17 +65,16 @@ import { UpdateCalloutSource } from "@/desktop/updates/update-callout-source";
 import { useActiveWorktreeNewAction } from "@/hooks/use-active-worktree-new-action";
 import { useFaviconStatus } from "@/hooks/use-favicon-status";
 import { useKeyboardShortcuts } from "@/hooks/use-keyboard-shortcuts";
-import { useLatchedBoolean } from "@/hooks/use-latched-boolean";
 import { useCompactWebViewportZoomLock } from "@/hooks/use-compact-web-viewport-zoom-lock";
 import { useOpenProject } from "@/hooks/use-open-project";
 import { useAppSettings } from "@/hooks/use-settings";
 import { useStableEvent } from "@/hooks/use-stable-event";
+import { I18nProvider } from "@/i18n/provider";
 import { keyboardActionDispatcher } from "@/keyboard/keyboard-action-dispatcher";
 import { polyfillCrypto } from "@/polyfills/crypto";
 import { queryClient } from "@/query/query-client";
 import {
  getHostRuntimeStore,
-  hasConfiguredLocalDaemonOverride,
  useHostMutations,
  useHostRuntimeClient,
  useHosts,
@@ -79,9 +86,9 @@ import { THEME_TO_UNISTYLES, type ThemeName } from "@/styles/theme";
 import type { HostProfile } from "@/types/host-connection";
 import { resolveActiveHost } from "@/utils/active-host";
 import { toggleDesktopSidebarsWithCheckoutIntent } from "@/utils/desktop-sidebar-toggle";
+import { canOpenLeftSidebarGesture } from "@/utils/sidebar-animation-state";
 import {
  buildHostRootRoute,
-  mapPathnameToServer,
  parseHostAgentRouteFromPathname,
  parseServerIdFromPathname,
  parseWorkspaceOpenIntent,
@@ -101,6 +108,7 @@ export interface HostRuntimeBootstrapState {
  retry: () => void;
  hasGivenUpWaitingForHost: boolean;
  storeReady: boolean;
+  startupBlocker: StartupBlocker;
 }

 const HostRuntimeBootstrapContext = createContext<HostRuntimeBootstrapState>({
@@ -108,6 +116,7 @@ const HostRuntimeBootstrapContext = createContext<HostRuntimeBootstrapState>({
  retry: () => {},
  hasGivenUpWaitingForHost: false,
  storeReady: false,
+  startupBlocker: { kind: "none" },
 });

 function PushNotificationRouter() {
@@ -311,18 +320,26 @@ function HostRuntimeBootstrapProvider({ children }: { children: ReactNode }) {
  const anyOnlineHostServerId = useEarliestOnlineHostServerId();
  const daemonStartError = useDaemonStartLastError();
  const daemonStartIsRunning = useDaemonStartIsRunning();
-  const waitForConfiguredLocalDaemon =
-    hasConfiguredLocalDaemonOverride() && !shouldUseDesktopDaemon();
-
  const [hasGivenUpWaitingForHost, setHasGivenUpWaitingForHost] = useState(false);
+  const isDesktopRuntime = shouldUseDesktopDaemon();
+  const startupBlocker = useMemo(
+    () =>
+      resolveStartupBlocker({
+        isDesktopRuntime,
+        anyOnlineHostServerId,
+        daemonStartIsRunning,
+        daemonStartError,
+      }),
+    [anyOnlineHostServerId, daemonStartError, daemonStartIsRunning, isDesktopRuntime],
+  );
+  const shouldRunGiveUpTimer = shouldRunStartupGiveUpTimer({
+    startupBlocker,
+    anyOnlineHostServerId,
+    hasGivenUpWaitingForHost,
+  });
+
  useEffect(() => {
-    if (
-      anyOnlineHostServerId ||
-      daemonStartError ||
-      daemonStartIsRunning ||
-      waitForConfiguredLocalDaemon ||
-      hasGivenUpWaitingForHost
-    ) {
+    if (!shouldRunGiveUpTimer) {
      return;
    }
    const handle = setTimeout(() => {
@@ -331,13 +348,7 @@ function HostRuntimeBootstrapProvider({ children }: { children: ReactNode }) {
    return () => {
      clearTimeout(handle);
    };
-  }, [
-    anyOnlineHostServerId,
-    daemonStartError,
-    daemonStartIsRunning,
-    waitForConfiguredLocalDaemon,
-    hasGivenUpWaitingForHost,
-  ]);
+  }, [shouldRunGiveUpTimer]);

  const retry = useCallback(() => {
    const daemonStartService = getDaemonStartService({ store: getHostRuntimeStore() });
@@ -348,14 +359,13 @@ function HostRuntimeBootstrapProvider({ children }: { children: ReactNode }) {
    });
  }, []);

-  const splashError = !anyOnlineHostServerId ? daemonStartError : null;
-  const isCurrentlyStoreReady =
-    Boolean(anyOnlineHostServerId) || Boolean(splashError) || hasGivenUpWaitingForHost;
-  const storeReady = useLatchedBoolean(isCurrentlyStoreReady);
+  const splashError =
+    startupBlocker.kind === "managed-daemon-error" ? startupBlocker.message : null;
+  const storeReady = resolveStartupNavigationReady({ startupBlocker });

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

  return (
@@ -493,7 +503,6 @@ function MobileGestureWrapper({
  children: ReactNode;
  chromeEnabled: boolean;
 }) {
-  const mobileView = usePanelStore((state) => state.mobileView);
  const showMobileAgentList = usePanelStore((state) => state.showMobileAgentList);
  const horizontalScroll = useHorizontalScrollOptional();
  const {
@@ -503,12 +512,13 @@ function MobileGestureWrapper({
    animateToOpen,
    animateToClose,
    isGesturing,
+    mobilePanelState,
    gestureAnimatingRef,
    openGestureRef,
  } = useSidebarAnimation();
  const touchStartX = useSharedValue(0);
  const touchStartY = useSharedValue(0);
-  const openGestureEnabled = chromeEnabled && mobileView === "agent";
+  const openGestureEnabled = chromeEnabled;

  const handleGestureOpen = useCallback(() => {
    gestureAnimatingRef.current = true;
@@ -538,6 +548,11 @@ function MobileGestureWrapper({
          const absDeltaX = Math.abs(deltaX);
          const absDeltaY = Math.abs(deltaY);

+          if (!canOpenLeftSidebarGesture(mobilePanelState.value, translateX.value, windowWidth)) {
+            stateManager.fail();
+            return;
+          }
+
          if (horizontalScroll?.isAnyScrolledRight.value) {
            stateManager.fail();
            return;
@@ -593,6 +608,7 @@ function MobileGestureWrapper({
      windowWidth,
      translateX,
      backdropOpacity,
+      mobilePanelState,
      animateToOpen,
      animateToClose,
      handleGestureOpen,
@@ -800,7 +816,6 @@ function OpenProjectListener() {
 }

 function AppWithSidebar({ children }: { children: ReactNode }) {
-  const router = useRouter();
  const pathname = usePathname();
  const params = useGlobalSearchParams<{ open?: string | string[] }>();
  const hosts = useHosts();
@@ -809,16 +824,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(() => {
@@ -921,19 +926,24 @@ 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>
-        </KeyboardProvider>
-      </SafeAreaProvider>
+      <I18nProvider>
+        <SafeAreaProvider>
+          <KeyboardProvider>
+            <PortalProvider>
+              <BottomSheetModalProvider>{children}</BottomSheetModalProvider>
+            </PortalProvider>
+          </KeyboardProvider>
+        </SafeAreaProvider>
+      </I18nProvider>
    </QueryProvider>
  );
 }
--- a/packages/app/src/app/h/[serverId]/_layout.tsx
+++ b/packages/app/src/app/h/[serverId]/_layout.tsx
@@ -0,0 +1,31 @@
+import { Redirect, Slot, useLocalSearchParams } from "expo-router";
+import { useHostRuntimeBootstrapState } from "@/app/_layout";
+import { resolveStartupRoute } from "@/app/host-runtime-bootstrap";
+import { useHostRegistryStatus, useHosts } from "@/runtime/host-runtime";
+
+export default function HostRouteLayout() {
+  return <KnownHostRoute />;
+}
+
+function KnownHostRoute() {
+  const params = useLocalSearchParams<{ serverId?: string | string[] }>();
+  const hosts = useHosts();
+  const hostRegistryStatus = useHostRegistryStatus();
+  const bootstrapState = useHostRuntimeBootstrapState();
+  const routeServerId = typeof params.serverId === "string" ? params.serverId : null;
+  const startupRoute = resolveStartupRoute({
+    route: { kind: "host", serverId: routeServerId },
+    startupBlocker: bootstrapState.startupBlocker,
+    hostRegistryStatus,
+    hosts,
+  });
+
+  if (startupRoute.kind === "redirect") {
+    return <Redirect href={startupRoute.href} />;
+  }
+
+  // Keep the host Slot mounted while startup gates are active. React Navigation
+  // web can reserialize a shallower tree and drop nested workspace URL segments
+  // if the layout swaps Slot for a splash; leaf routes own the splash boundary.
+  return <Slot />;
+}
--- a/packages/app/src/app/h/[serverId]/new.tsx
+++ b/packages/app/src/app/h/[serverId]/new.tsx
@@ -1,4 +1,5 @@
 import { useLocalSearchParams } from "expo-router";
+import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
 import { NewWorkspaceScreen } from "@/screens/new-workspace-screen";

 export default function HostNewWorkspaceRoute() {
@@ -9,20 +10,18 @@ export default function HostNewWorkspaceRoute() {
    projectId?: string;
  }>();
  const serverId = typeof params.serverId === "string" ? params.serverId : "";
-  const sourceDirectory = typeof params.dir === "string" ? params.dir : "";
+  const sourceDirectory = typeof params.dir === "string" ? params.dir : undefined;
  const displayName = typeof params.name === "string" ? params.name : undefined;
  const projectId = typeof params.projectId === "string" ? params.projectId : undefined;

-  if (!sourceDirectory) {
-    return null;
-  }
-
  return (
-    <NewWorkspaceScreen
-      serverId={serverId}
-      sourceDirectory={sourceDirectory}
-      displayName={displayName}
-      projectId={projectId}
-    />
+    <HostRouteBootstrapBoundary>
+      <NewWorkspaceScreen
+        serverId={serverId}
+        sourceDirectory={sourceDirectory}
+        displayName={displayName}
+        projectId={projectId}
+      />
+    </HostRouteBootstrapBoundary>
  );
 }
--- a/packages/app/src/app/h/[serverId]/workspace/[workspaceId]/index.tsx
+++ b/packages/app/src/app/h/[serverId]/workspace/[workspaceId]/index.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { useNavigation } from "@react-navigation/native";
 import { StyleSheet, View } from "react-native";
 import { useGlobalSearchParams, useLocalSearchParams, useRootNavigationState } from "expo-router";
@@ -7,9 +7,18 @@ import {
  type ActiveWorkspaceSelection,
  useActiveWorkspaceSelection,
 } from "@/stores/navigation-active-workspace-store";
+import { useHasHydratedWorkspaces, useWorkspaceExists } from "@/stores/session-store-hooks";
 import type { WorkspaceTabTarget } from "@/stores/workspace-tabs-store";
 import { WorkspaceScreen } from "@/screens/workspace/workspace-screen";
 import { useWorkspaceLayoutStoreHydrated } from "@/stores/workspace-layout-store";
+import {
+  areWorkspaceSelectionListsEqual,
+  areWorkspaceSelectionsEqual,
+  getWorkspaceSelectionKey,
+  pruneMountedWorkspaceSelections,
+  shouldKeepWorkspaceDeckEntryMounted,
+  WORKSPACE_DECK_MAX_MOUNTED_WORKSPACES,
+} from "@/screens/workspace/workspace-deck-retention";
 import {
  decodeWorkspaceIdFromPathSegment,
  parseWorkspaceOpenIntent,
@@ -152,28 +161,33 @@ function HostWorkspaceRouteContent() {
  return <WorkspaceDeck />;
 }

-function areWorkspaceSelectionsEqual(
-  left: ActiveWorkspaceSelection | null,
-  right: ActiveWorkspaceSelection | null,
-): boolean {
-  return left?.serverId === right?.serverId && left?.workspaceId === right?.workspaceId;
-}
-
 function WorkspaceDeck() {
  const activeSelection = useActiveWorkspaceSelection();
  const [mountedSelections, setMountedSelections] = useState<ActiveWorkspaceSelection[]>(() =>
    activeSelection ? [activeSelection] : [],
  );
+  const unmountWorkspaceSelection = useCallback((selection: ActiveWorkspaceSelection) => {
+    setMountedSelections((current) =>
+      current.filter(
+        (mountedSelection) => !areWorkspaceSelectionsEqual(mountedSelection, selection),
+      ),
+    );
+  }, []);

  useEffect(() => {
    if (!activeSelection) {
      return;
    }
    setMountedSelections((current) => {
-      if (current.some((selection) => areWorkspaceSelectionsEqual(selection, activeSelection))) {
+      const next = pruneMountedWorkspaceSelections({
+        currentSelections: current,
+        activeSelection,
+        maxMountedWorkspaces: WORKSPACE_DECK_MAX_MOUNTED_WORKSPACES,
+      });
+      if (areWorkspaceSelectionListsEqual(current, next)) {
        return current;
      }
-      return [...current, activeSelection];
+      return next;
    });
  }, [activeSelection]);

@@ -184,25 +198,61 @@ function WorkspaceDeck() {
  return (
    <View style={styles.deck}>
      {mountedSelections.map((selection) => {
-        const isActive = areWorkspaceSelectionsEqual(selection, activeSelection);
        return (
-          <View
-            key={`${selection.serverId}:${selection.workspaceId}`}
-            style={isActive ? styles.activeDeckEntry : styles.inactiveDeckEntry}
-            testID={`workspace-deck-entry-${selection.serverId}:${selection.workspaceId}`}
-          >
-            <WorkspaceScreen
-              serverId={selection.serverId}
-              workspaceId={selection.workspaceId}
-              isRouteFocused={isActive}
-            />
-          </View>
+          <WorkspaceDeckEntry
+            key={getWorkspaceSelectionKey(selection)}
+            selection={selection}
+            activeSelection={activeSelection}
+            onUnmountInactive={unmountWorkspaceSelection}
+          />
        );
      })}
    </View>
  );
 }

+function WorkspaceDeckEntry({
+  selection,
+  activeSelection,
+  onUnmountInactive,
+}: {
+  selection: ActiveWorkspaceSelection;
+  activeSelection: ActiveWorkspaceSelection;
+  onUnmountInactive: (selection: ActiveWorkspaceSelection) => void;
+}) {
+  const isActive = areWorkspaceSelectionsEqual(selection, activeSelection);
+  const hasHydratedWorkspaces = useHasHydratedWorkspaces(selection.serverId);
+  const workspaceExists = useWorkspaceExists(selection.serverId, selection.workspaceId);
+  const shouldKeepMounted = shouldKeepWorkspaceDeckEntryMounted({
+    isActive,
+    hasHydratedWorkspaces,
+    workspaceExists,
+  });
+
+  useEffect(() => {
+    if (!shouldKeepMounted) {
+      onUnmountInactive(selection);
+    }
+  }, [onUnmountInactive, selection, shouldKeepMounted]);
+
+  if (!shouldKeepMounted) {
+    return null;
+  }
+
+  return (
+    <View
+      style={isActive ? styles.activeDeckEntry : styles.inactiveDeckEntry}
+      testID={`workspace-deck-entry-${selection.serverId}:${selection.workspaceId}`}
+    >
+      <WorkspaceScreen
+        serverId={selection.serverId}
+        workspaceId={selection.workspaceId}
+        isRouteFocused={isActive}
+      />
+    </View>
+  );
+}
+
 const styles = StyleSheet.create({
  deck: {
    flex: 1,
--- a/packages/app/src/app/host-runtime-bootstrap.test.ts
+++ b/packages/app/src/app/host-runtime-bootstrap.test.ts
@@ -1,9 +1,10 @@
 import { describe, expect, it, vi } from "vitest";
 import {
-  resolveStartupRedirectRoute,
-  resolveStartupWorkspaceSelection,
+  resolveStartupBlocker,
+  resolveStartupNavigationReady,
+  resolveStartupRoute,
+  shouldRunStartupGiveUpTimer,
  startHostRuntimeBootstrap,
-  WELCOME_ROUTE,
 } from "./host-runtime-bootstrap";

 function createFakeStore() {
@@ -117,131 +118,229 @@ describe("startHostRuntimeBootstrap", () => {
  });
 });

-describe("resolveStartupRedirectRoute", () => {
-  const baseInput = {
-    pathname: "/",
+describe("startup blocking policy", () => {
+  const noBlockerInput = {
+    isDesktopRuntime: false,
+    anyOnlineHostServerId: null,
+    daemonStartIsRunning: false,
+    daemonStartError: null,
+  };
+
+  it("runs the give-up timer when no startup blocker is active", () => {
+    const blocker = resolveStartupBlocker(noBlockerInput);
+
+    expect(blocker).toEqual({ kind: "none" });
+    expect(resolveStartupNavigationReady({ startupBlocker: blocker })).toBe(true);
+    expect(
+      shouldRunStartupGiveUpTimer({
+        startupBlocker: blocker,
+        anyOnlineHostServerId: null,
+        hasGivenUpWaitingForHost: false,
+      }),
+    ).toBe(true);
+  });
+
+  it("blocks navigation while desktop is starting the managed daemon", () => {
+    const blocker = resolveStartupBlocker({
+      ...noBlockerInput,
+      isDesktopRuntime: true,
+      daemonStartIsRunning: true,
+    });
+
+    expect(blocker).toEqual({ kind: "managed-daemon-starting" });
+    expect(resolveStartupNavigationReady({ startupBlocker: blocker })).toBe(false);
+    expect(
+      shouldRunStartupGiveUpTimer({
+        startupBlocker: blocker,
+        anyOnlineHostServerId: null,
+        hasGivenUpWaitingForHost: false,
+      }),
+    ).toBe(false);
+  });
+
+  it("unblocks navigation when any host is online", () => {
+    const blocker = resolveStartupBlocker({
+      ...noBlockerInput,
+      isDesktopRuntime: true,
+      anyOnlineHostServerId: "srv_desktop",
+      daemonStartIsRunning: true,
+    });
+
+    expect(blocker).toEqual({ kind: "none" });
+    expect(resolveStartupNavigationReady({ startupBlocker: blocker })).toBe(true);
+  });
+
+  it("keeps desktop daemon startup errors on the startup error surface", () => {
+    const blocker = resolveStartupBlocker({
+      ...noBlockerInput,
+      isDesktopRuntime: true,
+      daemonStartError: "daemon failed to start",
+    });
+
+    expect(blocker).toEqual({
+      kind: "managed-daemon-error",
+      message: "daemon failed to start",
+    });
+    expect(resolveStartupNavigationReady({ startupBlocker: blocker })).toBe(true);
+    expect(
+      shouldRunStartupGiveUpTimer({
+        startupBlocker: blocker,
+        anyOnlineHostServerId: null,
+        hasGivenUpWaitingForHost: false,
+      }),
+    ).toBe(false);
+  });
+});
+
+describe("resolveStartupRoute", () => {
+  const baseIndexInput = {
+    route: { kind: "index" as const, pathname: "/" },
+    startupBlocker: { kind: "none" as const },
+    hostRegistryStatus: "ready" as const,
+    hosts: [],
    anyOnlineHostServerId: null,
    workspaceSelection: null,
    isWorkspaceSelectionLoaded: true,
    hasGivenUpWaitingForHost: false,
  };
+  const baseHostInput = {
+    route: { kind: "host" as const, serverId: "server-saved" },
+    startupBlocker: { kind: "none" as const },
+    hostRegistryStatus: "ready" as const,
+    hosts: [],
+  };

-  it("returns null when the pathname is not the index route", () => {
+  it("renders non-index routes instead of making an index startup decision", () => {
    expect(
-      resolveStartupRedirectRoute({
-        ...baseInput,
-        pathname: "/h/server-1",
-        anyOnlineHostServerId: "server-1",
+      resolveStartupRoute({
+        ...baseIndexInput,
+        route: { kind: "index", pathname: "/settings" },
      }),
-    ).toBeNull();
+    ).toEqual({ kind: "render" });
  });

-  it("waits while the persisted workspace selection has not finished loading", () => {
+  it("keeps startup on the splash while the persisted workspace selection is loading", () => {
    expect(
-      resolveStartupRedirectRoute({
-        ...baseInput,
+      resolveStartupRoute({
+        ...baseIndexInput,
        anyOnlineHostServerId: "server-1",
        isWorkspaceSelectionLoaded: false,
      }),
-    ).toBeNull();
+    ).toEqual({ kind: "splash" });
  });

-  it("waits while no host is online and the give-up timer has not fired", () => {
-    expect(resolveStartupRedirectRoute(baseInput)).toBeNull();
+  it("keeps startup on the splash while the host registry is loading", () => {
+    expect(
+      resolveStartupRoute({
+        ...baseIndexInput,
+        hostRegistryStatus: "loading",
+      }),
+    ).toEqual({ kind: "splash" });
  });

-  describe("scenario: saved-host-online", () => {
-    it("leaves matching persisted workspace navigation to the workspace navigator", () => {
-      const route = resolveStartupRedirectRoute({
-        ...baseInput,
-        anyOnlineHostServerId: "server-1",
+  it("does not treat loading hosts as an empty registry when a workspace is already restored", () => {
+    expect(
+      resolveStartupRoute({
+        ...baseIndexInput,
+        hostRegistryStatus: "loading",
        workspaceSelection: { serverId: "server-1", workspaceId: "workspace-a" },
-      });
-
-      expect(route).toBeNull();
-    });
-
-    it("resolves the persisted workspace when the online host matches it", () => {
-      const selection = resolveStartupWorkspaceSelection({
-        ...baseInput,
-        anyOnlineHostServerId: "server-1",
-        workspaceSelection: { serverId: "server-1", workspaceId: "workspace-a" },
-      });
-
-      expect(selection).toEqual({ serverId: "server-1", workspaceId: "workspace-a" });
-    });
-
-    it("leaves persisted workspace navigation to the workspace navigator when another host is first online", () => {
-      const route = resolveStartupRedirectRoute({
-        ...baseInput,
-        anyOnlineHostServerId: "server-2",
-        workspaceSelection: { serverId: "server-1", workspaceId: "workspace-a" },
-      });
-
-      expect(route).toBeNull();
-    });
-
-    it("resolves the persisted workspace when another host is first online", () => {
-      const selection = resolveStartupWorkspaceSelection({
-        ...baseInput,
-        anyOnlineHostServerId: "server-2",
-        workspaceSelection: { serverId: "server-1", workspaceId: "workspace-a" },
-      });
-
-      expect(selection).toEqual({ serverId: "server-1", workspaceId: "workspace-a" });
-    });
-
-    it("redirects to the host root when no persisted workspace exists", () => {
-      const route = resolveStartupRedirectRoute({
-        ...baseInput,
-        anyOnlineHostServerId: "server-2",
-      });
-
-      expect(route).toBe("/h/server-2");
-    });
+        hasGivenUpWaitingForHost: true,
+      }),
+    ).toEqual({ kind: "splash" });
  });

-  describe("scenario: daemon-start-success-only (host comes online via daemon-start upsert)", () => {
-    it("redirects to the host that came online", () => {
-      const route = resolveStartupRedirectRoute({
-        ...baseInput,
-        anyOnlineHostServerId: "srv_desktop",
-      });
-
-      expect(route).toBe("/h/srv_desktop");
-    });
+  it("restores the saved workspace only after the host registry proves the host exists", () => {
+    expect(
+      resolveStartupRoute({
+        ...baseIndexInput,
+        hosts: [{ serverId: "server-1" }],
+        workspaceSelection: { serverId: "server-1", workspaceId: "workspace-a" },
+      }),
+    ).toEqual({ kind: "redirect", href: "/h/server-1/workspace/workspace-a" });
  });

-  describe("scenario: both-succeed", () => {
-    it("leaves matching persisted workspace navigation to the workspace navigator", () => {
-      const route = resolveStartupRedirectRoute({
-        ...baseInput,
-        anyOnlineHostServerId: "server-saved",
+  it("falls back to a saved host when the restored workspace host is no longer saved", () => {
+    expect(
+      resolveStartupRoute({
+        ...baseIndexInput,
        workspaceSelection: { serverId: "server-saved", workspaceId: "workspace-a" },
-      });
-
-      expect(route).toBeNull();
-    });
+        hosts: [{ serverId: "server-next" }],
+        hasGivenUpWaitingForHost: true,
+      }),
+    ).toEqual({ kind: "redirect", href: "/h/server-next" });
  });

-  describe("scenario: both-fail (no host comes online, give-up timer fires)", () => {
-    it("redirects to the welcome route", () => {
-      const route = resolveStartupRedirectRoute({
-        ...baseInput,
+  it("redirects to the online host when no saved workspace is selected", () => {
+    expect(
+      resolveStartupRoute({
+        ...baseIndexInput,
+        anyOnlineHostServerId: "srv-desktop",
+      }),
+    ).toEqual({ kind: "redirect", href: "/h/srv-desktop" });
+  });
+
+  it("keeps a known connecting host in app-owned routing instead of showing welcome", () => {
+    expect(
+      resolveStartupRoute({
+        ...baseIndexInput,
+        hosts: [{ serverId: "server-saved" }],
        hasGivenUpWaitingForHost: true,
-      });
+      }),
+    ).toEqual({ kind: "redirect", href: "/h/server-saved" });
+  });

-      expect(route).toBe(WELCOME_ROUTE);
-    });
-
-    it("still redirects to the host when one comes online before the timer expires", () => {
-      const route = resolveStartupRedirectRoute({
-        ...baseInput,
-        anyOnlineHostServerId: "server-saved",
+  it("shows welcome after root startup gives up and no host exists", () => {
+    expect(
+      resolveStartupRoute({
+        ...baseIndexInput,
        hasGivenUpWaitingForHost: true,
-      });
+      }),
+    ).toEqual({ kind: "redirect", href: "/welcome" });
+  });

-      expect(route).toBe("/h/server-saved");
-    });
+  it("keeps host routes mounted while the host registry is loading", () => {
+    expect(
+      resolveStartupRoute({
+        ...baseHostInput,
+        hostRegistryStatus: "loading",
+      }),
+    ).toEqual({ kind: "render" });
+  });
+
+  it("keeps host routes mounted while the managed daemon is starting", () => {
+    expect(
+      resolveStartupRoute({
+        ...baseHostInput,
+        startupBlocker: { kind: "managed-daemon-starting" },
+      }),
+    ).toEqual({ kind: "render" });
+  });
+
+  it("renders a host route once the route host is known", () => {
+    expect(
+      resolveStartupRoute({
+        ...baseHostInput,
+        hosts: [{ serverId: "server-saved" }],
+      }),
+    ).toEqual({ kind: "render" });
+  });
+
+  it("sends removed host routes to a saved host instead of welcome", () => {
+    expect(
+      resolveStartupRoute({
+        ...baseHostInput,
+        route: { kind: "host", serverId: "server-removed" },
+        hosts: [{ serverId: "server-next" }],
+      }),
+    ).toEqual({ kind: "redirect", href: "/h/server-next/open-project" });
+  });
+
+  it("shows welcome from a host route only after the registry proves no hosts exist", () => {
+    expect(
+      resolveStartupRoute({
+        ...baseHostInput,
+        route: { kind: "host", serverId: "server-removed" },
+      }),
+    ).toEqual({ kind: "redirect", href: "/welcome" });
  });
 });
--- a/packages/app/src/app/host-runtime-bootstrap.ts
+++ b/packages/app/src/app/host-runtime-bootstrap.ts
@@ -1,7 +1,11 @@
 import type { ActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
 import type { DaemonStartResult } from "@/runtime/daemon-start-service";
 import type { Href } from "expo-router";
-import { buildHostRootRoute } from "@/utils/host-routes";
+import {
+  buildHostOpenProjectRoute,
+  buildHostRootRoute,
+  buildHostWorkspaceRoute,
+} from "@/utils/host-routes";

 export interface HostRuntimeBootstrapStore {
  boot: () => void;
@@ -56,53 +60,175 @@ export function startDaemonIfGateAllows(input: {
    });
 }

-export const WELCOME_ROUTE: Href = "/welcome";
+const WELCOME_ROUTE: Href = "/welcome";

-export interface ResolveStartupRedirectInput {
+export type StartupBlocker =
+  | { kind: "none" }
+  | { kind: "managed-daemon-starting" }
+  | { kind: "managed-daemon-error"; message: string };
+
+export interface ResolveStartupBlockerInput {
+  isDesktopRuntime: boolean;
+  anyOnlineHostServerId: string | null;
+  daemonStartIsRunning: boolean;
+  daemonStartError: string | null;
+}
+
+export function resolveStartupBlocker(input: ResolveStartupBlockerInput): StartupBlocker {
+  if (!input.isDesktopRuntime) {
+    return { kind: "none" };
+  }
+
+  if (input.anyOnlineHostServerId) {
+    return { kind: "none" };
+  }
+
+  if (input.daemonStartError) {
+    return { kind: "managed-daemon-error", message: input.daemonStartError };
+  }
+
+  if (input.daemonStartIsRunning) {
+    return { kind: "managed-daemon-starting" };
+  }
+
+  return { kind: "none" };
+}
+
+export function resolveStartupNavigationReady(input: { startupBlocker: StartupBlocker }): boolean {
+  return input.startupBlocker.kind !== "managed-daemon-starting";
+}
+
+export function shouldRunStartupGiveUpTimer(input: {
+  startupBlocker: StartupBlocker;
+  anyOnlineHostServerId: string | null;
+  hasGivenUpWaitingForHost: boolean;
+}): boolean {
+  if (input.anyOnlineHostServerId) {
+    return false;
+  }
+  if (input.hasGivenUpWaitingForHost) {
+    return false;
+  }
+  return input.startupBlocker.kind === "none";
+}
+
+export type StartupRegistryStatus = "loading" | "ready";
+
+export interface IndexStartupRouteTarget {
+  kind: "index";
  pathname: string;
+}
+
+export interface HostStartupRouteTarget {
+  kind: "host";
+  serverId: string | null;
+}
+
+export type StartupRouteTarget = IndexStartupRouteTarget | HostStartupRouteTarget;
+
+interface ResolveStartupRouteBaseInput {
+  startupBlocker: StartupBlocker;
+  hostRegistryStatus: StartupRegistryStatus;
+  hosts: readonly { serverId: string }[];
+}
+
+export interface ResolveIndexStartupRouteInput extends ResolveStartupRouteBaseInput {
+  route: IndexStartupRouteTarget;
  anyOnlineHostServerId: string | null;
  workspaceSelection: ActiveWorkspaceSelection | null;
  isWorkspaceSelectionLoaded: boolean;
  hasGivenUpWaitingForHost: boolean;
 }

+export interface ResolveHostStartupRouteInput extends ResolveStartupRouteBaseInput {
+  route: HostStartupRouteTarget;
+}
+
+export type ResolveStartupRouteInput = ResolveIndexStartupRouteInput | ResolveHostStartupRouteInput;
+
+export type StartupRouteDecision =
+  | { kind: "render" }
+  | { kind: "splash" }
+  | { kind: "redirect"; href: Href };
+
 function isIndexPathname(pathname: string) {
  return pathname === "/" || pathname === "";
 }

-export function resolveStartupWorkspaceSelection(
-  input: ResolveStartupRedirectInput,
-): ActiveWorkspaceSelection | null {
-  if (!isIndexPathname(input.pathname)) {
-    return null;
+function hostExists(hosts: readonly { serverId: string }[], serverId: string | null): boolean {
+  if (!serverId) {
+    return false;
  }
-  if (!input.isWorkspaceSelectionLoaded) {
-    return null;
-  }
-  if (!input.workspaceSelection) {
-    return null;
-  }
-  return input.workspaceSelection;
+  return hosts.some((host) => host.serverId === serverId);
 }

-export function resolveStartupRedirectRoute(input: ResolveStartupRedirectInput): Href | null {
-  if (!isIndexPathname(input.pathname)) {
-    return null;
+function resolveReadyIndexStartupRoute(input: ResolveIndexStartupRouteInput): StartupRouteDecision {
+  if (!isIndexPathname(input.route.pathname)) {
+    return { kind: "render" };
  }
+
  if (!input.isWorkspaceSelectionLoaded) {
-    return null;
+    return { kind: "splash" };
+  }
+
+  const workspaceSelection = input.workspaceSelection;
+  if (workspaceSelection && hostExists(input.hosts, workspaceSelection.serverId)) {
+    return {
+      kind: "redirect",
+      href: buildHostWorkspaceRoute(workspaceSelection.serverId, workspaceSelection.workspaceId),
+    };
  }

  if (input.anyOnlineHostServerId) {
-    if (resolveStartupWorkspaceSelection(input)) {
-      return null;
-    }
-    return buildHostRootRoute(input.anyOnlineHostServerId);
+    return { kind: "redirect", href: buildHostRootRoute(input.anyOnlineHostServerId) };
+  }
+
+  const savedHostServerId = input.hosts[0]?.serverId ?? null;
+  if (savedHostServerId) {
+    return { kind: "redirect", href: buildHostRootRoute(savedHostServerId) };
  }

  if (input.hasGivenUpWaitingForHost) {
-    return WELCOME_ROUTE;
+    return { kind: "redirect", href: WELCOME_ROUTE };
  }

-  return null;
+  return { kind: "splash" };
+}
+
+function resolveReadyHostStartupRoute(input: ResolveHostStartupRouteInput): StartupRouteDecision {
+  if (hostExists(input.hosts, input.route.serverId)) {
+    return { kind: "render" };
+  }
+
+  const fallbackServerId = input.hosts[0]?.serverId ?? null;
+  if (fallbackServerId) {
+    return { kind: "redirect", href: buildHostOpenProjectRoute(fallbackServerId) };
+  }
+
+  return { kind: "redirect", href: WELCOME_ROUTE };
+}
+
+function isHostStartupRouteInput(
+  input: ResolveStartupRouteInput,
+): input is ResolveHostStartupRouteInput {
+  return input.route.kind === "host";
+}
+
+export function resolveStartupRoute(input: ResolveStartupRouteInput): StartupRouteDecision {
+  if (isHostStartupRouteInput(input)) {
+    if (input.startupBlocker.kind !== "none" || input.hostRegistryStatus === "loading") {
+      return { kind: "render" };
+    }
+    return resolveReadyHostStartupRoute(input);
+  }
+
+  if (input.startupBlocker.kind !== "none") {
+    return { kind: "splash" };
+  }
+
+  if (input.hostRegistryStatus === "loading") {
+    return { kind: "splash" };
+  }
+
+  return resolveReadyIndexStartupRoute(input);
 }
--- a/packages/app/src/app/index.tsx
+++ b/packages/app/src/app/index.tsx
@@ -2,16 +2,13 @@ import React from "react";
 import { Redirect, usePathname } from "expo-router";
 import { StartupSplashScreen } from "@/screens/startup-splash-screen";
 import { useEarliestOnlineHostServerId, useHostRuntimeBootstrapState } from "@/app/_layout";
-import {
-  resolveStartupRedirectRoute,
-  resolveStartupWorkspaceSelection,
-} from "@/app/host-runtime-bootstrap";
+import { resolveStartupRoute } from "@/app/host-runtime-bootstrap";
+import { useHostRegistryStatus, useHosts } from "@/runtime/host-runtime";
 import {
  useIsLastWorkspaceSelectionHydrated,
  useLastWorkspaceSelection,
 } from "@/stores/navigation-active-workspace-store";
 import { shouldUseDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
-import { buildHostWorkspaceRoute } from "@/utils/host-routes";

 const isDesktop = shouldUseDesktopDaemon();

@@ -19,37 +16,24 @@ export default function Index() {
  const pathname = usePathname();
  const bootstrapState = useHostRuntimeBootstrapState();
  const anyOnlineHostServerId = useEarliestOnlineHostServerId();
+  const hosts = useHosts();
+  const hostRegistryStatus = useHostRegistryStatus();
  const workspaceSelection = useLastWorkspaceSelection();
  const isWorkspaceSelectionLoaded = useIsLastWorkspaceSelectionHydrated();

-  const redirectRoute = resolveStartupRedirectRoute({
-    pathname,
-    anyOnlineHostServerId,
-    workspaceSelection,
-    isWorkspaceSelectionLoaded,
-    hasGivenUpWaitingForHost: bootstrapState.hasGivenUpWaitingForHost,
-  });
-  const startupWorkspaceSelection = resolveStartupWorkspaceSelection({
-    pathname,
+  const startupRoute = resolveStartupRoute({
+    route: { kind: "index", pathname },
+    startupBlocker: bootstrapState.startupBlocker,
+    hostRegistryStatus,
+    hosts,
    anyOnlineHostServerId,
    workspaceSelection,
    isWorkspaceSelectionLoaded,
    hasGivenUpWaitingForHost: bootstrapState.hasGivenUpWaitingForHost,
  });

-  if (startupWorkspaceSelection) {
-    return (
-      <Redirect
-        href={buildHostWorkspaceRoute(
-          startupWorkspaceSelection.serverId,
-          startupWorkspaceSelection.workspaceId,
-        )}
-      />
-    );
-  }
-
-  if (redirectRoute) {
-    return <Redirect href={redirectRoute} />;
+  if (startupRoute.kind === "redirect") {
+    return <Redirect href={startupRoute.href} />;
  }

  return <StartupSplashScreen bootstrapState={isDesktop ? bootstrapState : undefined} />;
--- a/packages/app/src/app/pair-scan.tsx
+++ b/packages/app/src/app/pair-scan.tsx
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Alert, Pressable, Text, View } from "react-native";
 import { useLocalSearchParams, useRouter, type Href } from "expo-router";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
@@ -120,6 +121,7 @@ function extractOfferUrlFromScan(result: BarcodeScanningResult): string | null {

 export default function PairScanScreen() {
  const { theme } = useUnistyles();
+  const { t } = useTranslation();
  const insets = useSafeAreaInsets();
  const router = useRouter();
  const params = useLocalSearchParams<{
@@ -190,13 +192,13 @@ export default function PairScanScreen() {
        navigateToPairedHost(profile.serverId);
      } catch (error) {
        lastScannedRef.current = null;
-        const message = error instanceof Error ? error.message : "Unable to pair host";
-        Alert.alert("Error", message);
+        const message = error instanceof Error ? error.message : t("pairing.scan.unableToPair");
+        Alert.alert(t("pairing.scan.errorTitle"), message);
      } finally {
        setIsPairing(false);
      }
    },
-    [isPairing, navigateToPairedHost, upsertDaemonFromOfferUrl],
+    [isPairing, navigateToPairedHost, t, upsertDaemonFromOfferUrl],
  );

  const handleRouterBack = useCallback(() => router.back(), [router]);
@@ -216,15 +218,13 @@ export default function PairScanScreen() {
  if (isWeb) {
    return (
      <View style={styles.container}>
-        <BackHeader title="Scan QR" onBack={handleRouterBack} />
+        <BackHeader title={t("pairing.scan.title")} onBack={handleRouterBack} />
        <View style={bodyStyle}>
          <View style={styles.permissionCard}>
-            <Text style={styles.permissionTitle}>Not available on web</Text>
-            <Text style={styles.permissionBody}>
-              {`QR scanning isn't supported in the web build. Use "Paste link" instead.`}
-            </Text>
+            <Text style={styles.permissionTitle}>{t("pairing.scan.webUnavailableTitle")}</Text>
+            <Text style={styles.permissionBody}>{t("pairing.scan.webUnavailableBody")}</Text>
            <Pressable style={styles.permissionButton} onPress={closeToSource}>
-              <Text style={styles.permissionButtonText}>Back to Settings</Text>
+              <Text style={styles.permissionButtonText}>{t("pairing.scan.backToSettings")}</Text>
            </Pressable>
          </View>
        </View>
@@ -236,17 +236,15 @@ export default function PairScanScreen() {

  return (
    <View style={styles.container}>
-      <BackHeader title="Scan QR" onBack={closeToSource} />
+      <BackHeader title={t("pairing.scan.title")} onBack={closeToSource} />

      <View style={bodyStyle}>
        {!granted ? (
          <View style={styles.permissionCard}>
-            <Text style={styles.permissionTitle}>Camera permission</Text>
-            <Text style={styles.permissionBody}>
-              Allow camera access to scan the pairing QR code from your daemon.
-            </Text>
+            <Text style={styles.permissionTitle}>{t("pairing.scan.cameraPermissionTitle")}</Text>
+            <Text style={styles.permissionBody}>{t("pairing.scan.cameraPermissionBody")}</Text>
            <Pressable style={styles.permissionButton} onPress={handleRequestPermission}>
-              <Text style={styles.permissionButtonText}>Grant permission</Text>
+              <Text style={styles.permissionButtonText}>{t("pairing.scan.grantPermission")}</Text>
            </Pressable>
          </View>
        ) : (
@@ -264,7 +262,7 @@ export default function PairScanScreen() {
                <View style={CORNER_BL_STYLE} />
                <View style={CORNER_BR_STYLE} />
              </View>
-              {isPairing ? <Text style={helperTextStyle}>Pairing…</Text> : null}
+              {isPairing ? <Text style={helperTextStyle}>{t("pairing.scan.pairing")}</Text> : null}
            </View>
          </View>
        )}
--- a/packages/app/src/app/settings/hosts/[serverId]/[hostSection].tsx
+++ b/packages/app/src/app/settings/hosts/[serverId]/[hostSection].tsx
@@ -2,13 +2,13 @@ import { useLocalSearchParams } from "expo-router";
 import { useMemo } from "react";
 import { HostRouteBootstrapBoundary } from "@/components/host-route-bootstrap-boundary";
 import SettingsScreen from "@/screens/settings-screen";
-import { type HostSectionSlug, isHostSectionSlug } from "@/utils/host-routes";
+import { normalizeHostSectionSlug } from "@/utils/host-routes";

 export default function SettingsHostSectionRoute() {
  const params = useLocalSearchParams<{ serverId?: string; hostSection?: string }>();
  const serverId = typeof params.serverId === "string" ? params.serverId.trim() : "";
  const rawSection = typeof params.hostSection === "string" ? params.hostSection : "";
-  const section: HostSectionSlug = isHostSectionSlug(rawSection) ? rawSection : "connections";
+  const section = normalizeHostSectionSlug(rawSection) ?? "connections";
  const view = useMemo(() => ({ kind: "host" as const, serverId, section }), [serverId, section]);

  return (
--- a/packages/app/src/assets/acp-provider-icons.ts
+++ b/packages/app/src/assets/acp-provider-icons.ts
@@ -1,6 +1,7 @@
 // Vendored ACP provider SVG assets.

 export const ACP_PROVIDER_ICON_SVGS = {
+  agy: '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="currentColor" fill-rule="evenodd">\n  <path d="M21.751 22.607c1.34 1.005 3.35.335 1.508-1.508C17.73 15.74 18.904 1 12.037 1 5.17 1 6.342 15.74.815 21.1c-2.01 2.009.167 2.511 1.507 1.506 5.192-3.517 4.857-9.714 9.715-9.714 4.857 0 4.522 6.197 9.714 9.715z"/>\n</svg>\n',
  "agoragentic-acp":
    '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">\n  <circle cx="8" cy="8" r="7" stroke="currentColor" stroke-width="1.5"/>\n  <path d="M5.5 10.5L8 4L10.5 10.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>\n  <line x1="6.25" y1="8.75" x2="9.75" y2="8.75" stroke="currentColor" stroke-width="1.2" stroke-linecap="round"/>\n</svg>\n',
  "amp-acp":
@@ -27,7 +28,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',
--- a/packages/app/src/assets/acp-provider-icons/deepseek-tui.svg
+++ b/packages/app/src/assets/acp-provider-icons/deepseek-tui.svg
--- a/packages/app/src/assistant-file-links/index.ts
+++ b/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,
--- a/packages/app/src/assistant-file-links/link-press-context.ts
+++ b/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);
+}
--- a/packages/app/src/assistant-file-links/link.tsx
+++ b/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>
    );
  }
--- a/packages/app/src/assistant-file-links/resolver.ts
+++ b/packages/app/src/assistant-file-links/resolver.ts
@@ -4,6 +4,7 @@ import {
  type AssistantFileLinkClassification,
  type InlinePathTarget,
 } from "./parse";
+import { i18n } from "@/i18n/i18next";

 export interface AssistantFileLinkSource {
  href: string;
@@ -60,7 +61,7 @@ export interface FetchDaemonResolutionInput {

 export class UnresolvedFileLinkError extends Error {
  constructor(readonly token: string) {
-    super(`No file found for ${token}`);
+    super(i18n.t("common.errors.noFileFound", { token }));
    this.name = "UnresolvedFileLinkError";
  }
 }
--- a/packages/app/src/assistant-file-links/use-file-link.ts
+++ b/packages/app/src/assistant-file-links/use-file-link.ts
@@ -1,5 +1,6 @@
 import { useCallback, useMemo } from "react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useTranslation } from "react-i18next";
 import { useStableEvent } from "@/hooks/use-stable-event";
 import type { OpenFileDisposition } from "@/workspace/file-open";
 import { openExternalUrl } from "@/utils/open-external-url";
@@ -11,7 +12,6 @@ import {
 import {
  classifyForResolution,
  fetchDaemonResolution,
-  UnresolvedFileLinkError,
  type AssistantFileLinkResolution,
  type AssistantFileLinkSource,
 } from "./resolver";
@@ -40,6 +40,7 @@ type AssistantFileLinkQueryKey = readonly [
 const DISABLED_QUERY_KEY = ["assistantFileLink", null, null, ""] as const;

 export function useFileLink(source: AssistantFileLinkSource): UseFileLinkResult {
+  const { t } = useTranslation();
  const context = useAssistantFileLinkResolverContext();
  const queryClient = useQueryClient();
  const stableSource = useStableSource(source);
@@ -91,6 +92,7 @@ export function useFileLink(source: AssistantFileLinkSource): UseFileLinkResult
        disposition,
        context,
        queryClient,
+        formatNoFileFoundMessage: (token) => t("common.errors.noFileFound", { token }),
      });
    },
  );
@@ -163,6 +165,7 @@ function openAssistantFileLink(input: {
  disposition: OpenFileDisposition;
  context: AssistantFileLinkResolverContextValue;
  queryClient: ReturnType<typeof useQueryClient>;
+  formatNoFileFoundMessage: (token: string) => string;
 }): void {
  const capturedConfig = input.context.configRef.current;
  const capturedResolution = classifyForResolution(input.source, {
@@ -211,7 +214,7 @@ function openAssistantFileLink(input: {
    } catch (error) {
      await dispatchUnresolvedError({
        error,
-        fallbackToken: capturedResolution.token,
+        noFileFoundMessage: input.formatNoFileFoundMessage(capturedResolution.token),
        capturedServerId: capturedConfig.serverId,
        capturedWorkspaceRoot: capturedConfig.workspaceRoot,
        context: input.context,
@@ -322,7 +325,7 @@ async function dispatchExternalUrl(input: {

 async function dispatchUnresolvedError(input: {
  error: unknown;
-  fallbackToken: string;
+  noFileFoundMessage: string;
  capturedServerId?: string;
  capturedWorkspaceRoot?: string;
  context: AssistantFileLinkResolverContextValue;
@@ -334,9 +337,7 @@ async function dispatchUnresolvedError(input: {
  ) {
    return;
  }
-  const token =
-    input.error instanceof UnresolvedFileLinkError ? input.error.token : input.fallbackToken;
-  current.toast?.show(`No file found for ${token}`, {
+  current.toast?.show(input.noFileFoundMessage, {
    variant: "error",
    testID: "assistant-file-link-not-found-toast",
  });
--- a/packages/app/src/attachments/types.ts
+++ b/packages/app/src/attachments/types.ts
@@ -41,14 +41,35 @@ export interface BrowserElementAttachment {
  formatted: string;
 }

-export type ComposerAttachment =
+export type PullRequestContextAttachmentKind =
+  | "github.pull_request_comment"
+  | "github.pull_request_review"
+  | "github.pull_request_check";
+
+interface PullRequestContextAttachmentFields {
+  id: string;
+  title: string;
+  subtitle?: string;
+  text: string;
+  url?: string | null;
+}
+
+export type PullRequestContextAttachment =
+  | ({ kind: "github.pull_request_comment" } & PullRequestContextAttachmentFields)
+  | ({ kind: "github.pull_request_review" } & PullRequestContextAttachmentFields)
+  | ({ kind: "github.pull_request_check" } & PullRequestContextAttachmentFields);
+
+export type UserComposerAttachment =
  | { kind: "image"; metadata: AttachmentMetadata }
  | { kind: "github_issue"; item: GitHubSearchItem }
-  | { kind: "github_pr"; item: GitHubSearchItem }
+  | { kind: "github_pr"; item: GitHubSearchItem };
+
+export type WorkspaceComposerAttachment =
  | {
      kind: "browser_element";
      attachment: BrowserElementAttachment;
    }
+  | PullRequestContextAttachment
  | {
      kind: "review";
      attachment: Extract<AgentAttachment, { type: "review" }>;
@@ -56,15 +77,7 @@ export type ComposerAttachment =
      commentCount: number;
    };

-export type UserComposerAttachment = Exclude<
-  ComposerAttachment,
-  { kind: "review" } | { kind: "browser_element" }
->;
-
-export type WorkspaceComposerAttachment = Extract<
-  ComposerAttachment,
-  { kind: "review" } | { kind: "browser_element" }
->;
+export type ComposerAttachment = UserComposerAttachment | WorkspaceComposerAttachment;

 export type AttachmentDataSource =
  | { kind: "bytes"; bytes: Uint8Array }
--- a/packages/app/src/attachments/workspace-attachment-utils.test.ts
+++ b/packages/app/src/attachments/workspace-attachment-utils.test.ts
@@ -0,0 +1,57 @@
+import { describe, expect, it } from "vitest";
+import type { ComposerAttachment, PullRequestContextAttachment } from "./types";
+import {
+  isWorkspaceAttachment,
+  userAttachmentsOnly,
+  workspaceAttachmentToSubmitAttachment,
+} from "./workspace-attachment-utils";
+
+function contextAttachment(
+  overrides: Partial<PullRequestContextAttachment> = {},
+): PullRequestContextAttachment {
+  return {
+    kind: "github.pull_request_comment",
+    id: "comment-1",
+    title: "Comment · octocat",
+    subtitle: "Fix flaky build",
+    text: "GitHub pull request comment\n\nLooks good.",
+    url: "https://github.com/getpaseo/paseo/pull/42#issuecomment-1",
+    ...overrides,
+  };
+}
+
+describe("workspace attachment utilities", () => {
+  it("treats pull request context as a workspace attachment", () => {
+    expect(isWorkspaceAttachment(contextAttachment())).toBe(true);
+  });
+
+  it("strips context attachments from user draft attachments", () => {
+    const normalAttachment: ComposerAttachment = {
+      kind: "github_issue",
+      item: {
+        kind: "issue",
+        number: 12,
+        title: "Bug",
+        url: "https://github.com/getpaseo/paseo/issues/12",
+        state: "open",
+        body: "Bug report",
+        labels: [],
+        baseRefName: null,
+        headRefName: null,
+      },
+    };
+
+    expect(userAttachmentsOnly([normalAttachment, contextAttachment()])).toEqual([
+      normalAttachment,
+    ]);
+  });
+
+  it("serializes context attachments as protocol text attachments", () => {
+    expect(workspaceAttachmentToSubmitAttachment(contextAttachment())).toEqual({
+      type: "text",
+      mimeType: "text/plain",
+      title: "Comment · octocat",
+      text: "GitHub pull request comment\n\nLooks good.",
+    });
+  });
+});
--- a/packages/app/src/attachments/workspace-attachment-utils.ts
+++ b/packages/app/src/attachments/workspace-attachment-utils.ts
@@ -1,14 +1,29 @@
 import type {
  ComposerAttachment,
+  PullRequestContextAttachment,
  UserComposerAttachment,
  WorkspaceComposerAttachment,
 } from "@/attachments/types";
 import type { AgentAttachment } from "@getpaseo/protocol/messages";

+export function isPullRequestContextAttachment(
+  attachment: ComposerAttachment | undefined,
+): attachment is PullRequestContextAttachment {
+  return (
+    attachment?.kind === "github.pull_request_comment" ||
+    attachment?.kind === "github.pull_request_review" ||
+    attachment?.kind === "github.pull_request_check"
+  );
+}
+
 export function isWorkspaceAttachment(
  attachment: ComposerAttachment | undefined,
 ): attachment is WorkspaceComposerAttachment {
-  return attachment?.kind === "review" || attachment?.kind === "browser_element";
+  return (
+    attachment?.kind === "review" ||
+    attachment?.kind === "browser_element" ||
+    isPullRequestContextAttachment(attachment)
+  );
 }

 export function userAttachmentsOnly(
@@ -16,7 +31,9 @@ export function userAttachmentsOnly(
 ): UserComposerAttachment[] {
  return attachments.filter(
    (attachment): attachment is UserComposerAttachment =>
-      attachment.kind !== "review" && attachment.kind !== "browser_element",
+      attachment.kind !== "review" &&
+      attachment.kind !== "browser_element" &&
+      !isPullRequestContextAttachment(attachment),
  );
 }

@@ -31,5 +48,13 @@ export function workspaceAttachmentToSubmitAttachment(
      text: attachment.attachment.formatted,
    };
  }
+  if (isPullRequestContextAttachment(attachment)) {
+    return {
+      type: "text",
+      mimeType: "text/plain",
+      title: attachment.title,
+      text: attachment.text,
+    };
+  }
  return attachment.kind === "review" ? attachment.attachment : null;
 }
--- a/packages/app/src/attachments/workspace-attachments-store.test.ts
+++ b/packages/app/src/attachments/workspace-attachments-store.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import type { WorkspaceComposerAttachment } from "./types";
 import {
+  appendWorkspaceAttachment,
  buildWorkspaceAttachmentScopeKey,
  resetWorkspaceAttachmentsStore,
  useWorkspaceAttachmentsStore,
@@ -46,6 +47,16 @@ function reviewAttachment(body: string): WorkspaceComposerAttachment {
  };
 }

+function contextAttachment(id: string): WorkspaceComposerAttachment {
+  return {
+    kind: "github.pull_request_comment",
+    id,
+    title: "Comment · octocat",
+    text: "GitHub pull request comment\n\nLooks good.",
+    url: `https://github.com/getpaseo/paseo/pull/42#${id}`,
+  };
+}
+
 describe("workspace attachments store", () => {
  it("scopes workspace attachments by server and workspace before cwd fallback", () => {
    expect(
@@ -86,4 +97,45 @@ describe("workspace attachments store", () => {

    expect(useWorkspaceAttachmentsStore.getState().attachmentsByScope[scopeKey]).toBeUndefined();
  });
+
+  it("appends unique context attachments without dropping other workspace attachments", () => {
+    const review = reviewAttachment("Please simplify this.");
+    const context = contextAttachment("comment-1");
+
+    expect(appendWorkspaceAttachment([review], context)).toEqual([review, context]);
+  });
+
+  it("dedupes repeated context attachments by provider, source, and id", () => {
+    const original = contextAttachment("comment-1");
+    const replacement = {
+      ...contextAttachment("comment-1"),
+      title: "Comment · octocat updated",
+      text: "Updated text",
+    };
+
+    expect(appendWorkspaceAttachment([original], replacement)).toEqual([replacement]);
+  });
+
+  it("adds a workspace attachment against the current scope state", () => {
+    resetWorkspaceAttachmentsStore();
+    const scopeKey = buildWorkspaceAttachmentScopeKey({
+      serverId: "local",
+      workspaceId: "workspace-1",
+      cwd: "/repo",
+    });
+    const review = reviewAttachment("Please simplify this.");
+    const context = contextAttachment("comment-1");
+
+    const addWorkspaceAttachment = useWorkspaceAttachmentsStore.getState().addWorkspaceAttachment;
+    useWorkspaceAttachmentsStore
+      .getState()
+      .setWorkspaceAttachments({ scopeKey, attachments: [review] });
+
+    addWorkspaceAttachment({ scopeKey, attachment: context });
+
+    expect(useWorkspaceAttachmentsStore.getState().attachmentsByScope[scopeKey]).toEqual([
+      review,
+      context,
+    ]);
+  });
 });
--- a/packages/app/src/attachments/workspace-attachments-store.ts
+++ b/packages/app/src/attachments/workspace-attachments-store.ts
@@ -19,6 +19,10 @@ interface WorkspaceAttachmentsStoreActions {
    scopeKey: string;
    attachments: readonly WorkspaceComposerAttachment[];
  }) => void;
+  addWorkspaceAttachment: (input: {
+    scopeKey: string;
+    attachment: WorkspaceComposerAttachment;
+  }) => void;
  clearWorkspaceAttachments: (input: { scopeKey: string }) => void;
 }

@@ -60,6 +64,35 @@ function areWorkspaceAttachmentsEqual(
  return left.every((attachment, index) => attachment === right[index]);
 }

+function getContextAttachmentKey(attachment: WorkspaceComposerAttachment): string | null {
+  if (
+    attachment.kind !== "github.pull_request_comment" &&
+    attachment.kind !== "github.pull_request_review" &&
+    attachment.kind !== "github.pull_request_check"
+  ) {
+    return null;
+  }
+  return JSON.stringify({
+    kind: attachment.kind,
+    id: attachment.id,
+  });
+}
+
+export function appendWorkspaceAttachment(
+  current: readonly WorkspaceComposerAttachment[],
+  attachment: WorkspaceComposerAttachment,
+): WorkspaceComposerAttachment[] {
+  const contextKey = getContextAttachmentKey(attachment);
+  if (contextKey === null) {
+    return [...current, attachment];
+  }
+
+  const next = current.filter(
+    (currentAttachment) => getContextAttachmentKey(currentAttachment) !== contextKey,
+  );
+  return [...next, attachment];
+}
+
 export const useWorkspaceAttachmentsStore = create<WorkspaceAttachmentsStore>()((set) => ({
  attachmentsByScope: {},
  setWorkspaceAttachments: ({ scopeKey, attachments }) => {
@@ -84,6 +117,21 @@ export const useWorkspaceAttachmentsStore = create<WorkspaceAttachmentsStore>()(
      };
    });
  },
+  addWorkspaceAttachment: ({ scopeKey, attachment }) => {
+    set((state) => {
+      const current = state.attachmentsByScope[scopeKey] ?? EMPTY_WORKSPACE_ATTACHMENTS;
+      const attachments = appendWorkspaceAttachment(current, attachment);
+      if (areWorkspaceAttachmentsEqual(current, attachments)) {
+        return state;
+      }
+      return {
+        attachmentsByScope: {
+          ...state.attachmentsByScope,
+          [scopeKey]: attachments,
+        },
+      };
+    });
+  },
  clearWorkspaceAttachments: ({ scopeKey }) => {
    set((state) => {
      if (!state.attachmentsByScope[scopeKey]) {
--- a/packages/app/src/browser/new-tab-requests/index.test.ts
+++ b/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();
+  });
+});
--- a/packages/app/src/browser/new-tab-requests/index.ts
+++ b/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]);
+}
--- a/packages/app/src/client-slash-commands/index.ts
+++ b/packages/app/src/client-slash-commands/index.ts
@@ -8,6 +8,7 @@ export interface ClientSlashCommand {
  name: string;
  aliases: readonly string[];
  description: string;
+  descriptionKey: "composer.clientCommands.archiveAgent" | "composer.clientCommands.freshDraft";
  argumentHint: string;
  kind: ClientSlashCommandKind;
  execution: ClientSlashCommandExecution;
@@ -18,6 +19,7 @@ export const CLIENT_SLASH_COMMANDS: readonly ClientSlashCommand[] = [
    name: "exit",
    aliases: ["quit", "q"],
    description: "Archive the current agent",
+    descriptionKey: "composer.clientCommands.archiveAgent",
    argumentHint: "",
    kind: "archive-agent",
    execution: "immediate",
@@ -26,6 +28,7 @@ export const CLIENT_SLASH_COMMANDS: readonly ClientSlashCommand[] = [
    name: "clear",
    aliases: ["new"],
    description: "Archive this agent and start a fresh draft",
+    descriptionKey: "composer.clientCommands.freshDraft",
    argumentHint: "",
    kind: "replace-agent-with-draft",
    execution: "immediate",
--- a/packages/app/src/components/adaptive-modal-sheet-layout.test.ts
+++ b/packages/app/src/components/adaptive-modal-sheet-layout.test.ts
@@ -0,0 +1,40 @@
+import { describe, expect, it } from "vitest";
+import { getCompactSheetSafeAreaPadding } from "@/components/adaptive-modal-sheet-layout";
+
+describe("getCompactSheetSafeAreaPadding", () => {
+  it("adds the bottom inset to compact sheet footers", () => {
+    expect(
+      getCompactSheetSafeAreaPadding({
+        isCompact: true,
+        hasFooter: true,
+        baseContentPadding: 24,
+        baseFooterPadding: 12,
+        safeAreaBottom: 34,
+      }),
+    ).toEqual({ footerPaddingBottom: 46 });
+  });
+
+  it("adds the bottom inset to compact sheet content when there is no footer", () => {
+    expect(
+      getCompactSheetSafeAreaPadding({
+        isCompact: true,
+        hasFooter: false,
+        baseContentPadding: 24,
+        baseFooterPadding: 12,
+        safeAreaBottom: 34,
+      }),
+    ).toEqual({ contentPaddingBottom: 58 });
+  });
+
+  it("does not inset desktop sheets", () => {
+    expect(
+      getCompactSheetSafeAreaPadding({
+        isCompact: false,
+        hasFooter: false,
+        baseContentPadding: 24,
+        baseFooterPadding: 12,
+        safeAreaBottom: 34,
+      }),
+    ).toEqual({});
+  });
+});
--- a/packages/app/src/components/adaptive-modal-sheet-layout.ts
+++ b/packages/app/src/components/adaptive-modal-sheet-layout.ts
@@ -0,0 +1,30 @@
+export interface CompactSheetSafeAreaPaddingInput {
+  isCompact: boolean;
+  hasFooter: boolean;
+  baseContentPadding: number;
+  baseFooterPadding: number;
+  safeAreaBottom: number;
+}
+
+export interface CompactSheetSafeAreaPadding {
+  contentPaddingBottom?: number;
+  footerPaddingBottom?: number;
+}
+
+export function getCompactSheetSafeAreaPadding({
+  isCompact,
+  hasFooter,
+  baseContentPadding,
+  baseFooterPadding,
+  safeAreaBottom,
+}: CompactSheetSafeAreaPaddingInput): CompactSheetSafeAreaPadding {
+  if (!isCompact || safeAreaBottom <= 0) {
+    return {};
+  }
+
+  if (hasFooter) {
+    return { footerPaddingBottom: baseFooterPadding + safeAreaBottom };
+  }
+
+  return { contentPaddingBottom: baseContentPadding + safeAreaBottom };
+}
--- a/packages/app/src/components/adaptive-modal-sheet.tsx
+++ b/packages/app/src/components/adaptive-modal-sheet.tsx
@@ -1,6 +1,7 @@
 import { forwardRef, useCallback, useEffect, useMemo } from "react";
 import type { ReactNode, Ref } from "react";
 import { createPortal } from "react-dom";
+import { useTranslation } from "react-i18next";
 import { Modal, Pressable, ScrollView, Text, TextInput, View } from "react-native";
 import type { TextInputProps } from "react-native";
 import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
@@ -12,6 +13,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";
@@ -19,7 +21,9 @@ import {
  IsolatedBottomSheetModal,
  useIsolatedBottomSheetVisibility,
 } from "@/components/ui/isolated-bottom-sheet-modal";
+import { getCompactSheetSafeAreaPadding } from "@/components/adaptive-modal-sheet-layout";
 import { isNative, isWeb } from "@/constants/platform";
+import { useSafeAreaInsets } from "react-native-safe-area-context";

 // Horizontal indent token shared by the sheet header (title, back arrow,
 // leading icon, search input icon) and any row primitive rendered inside the
@@ -230,14 +234,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 & {
@@ -301,6 +305,7 @@ export function SheetHeaderView({
  testID?: string;
 }) {
  const { theme } = useUnistyles();
+  const { t } = useTranslation();
  const titleStyle = useMemo(
    () => [styles.title, { color: theme.colors.foreground }],
    [theme.colors.foreground],
@@ -324,7 +329,7 @@ export function SheetHeaderView({
            hitSlop={8}
            style={styles.headerBackButton}
            accessibilityRole="button"
-            accessibilityLabel={back?.accessibilityLabel ?? back?.label ?? "Back"}
+            accessibilityLabel={back?.accessibilityLabel ?? back?.label ?? t("common.actions.back")}
            testID="sheet-header-back"
          >
            {({ pressed }) => (
@@ -344,7 +349,11 @@ export function SheetHeaderView({
        </View>
        {header.actions ? <View style={styles.headerActions}>{header.actions}</View> : null}
        {showCloseButton ? (
-          <Pressable accessibilityLabel="Close" style={styles.closeButton} onPress={onClose}>
+          <Pressable
+            accessibilityLabel={t("common.actions.close")}
+            style={styles.closeButton}
+            onPress={onClose}
+          >
            {({ pressed }) => (
              <X
                size={16}
@@ -360,7 +369,7 @@ export function SheetHeaderView({
          <AdaptiveTextInput
            // @ts-expect-error - outlineStyle is web-only
            style={SEARCH_INPUT_STYLE}
-            placeholder={search.placeholder ?? "Search"}
+            placeholder={search.placeholder ?? t("common.actions.search")}
            resetKey={search.resetKey}
            onChangeText={handleSearchChange}
            autoCapitalize="none"
@@ -376,6 +385,7 @@ export function SheetHeaderView({

 export function InlineHeaderView({ header }: { header: SheetHeader }) {
  const { theme } = useUnistyles();
+  const { t } = useTranslation();
  const back = header.back;
  const handleBackPress = back?.onPress;
  const hasInlineRow = Boolean(handleBackPress || header.leading || header.actions);
@@ -390,7 +400,9 @@ export function InlineHeaderView({ header }: { header: SheetHeader }) {
              hitSlop={8}
              style={styles.headerBackButton}
              accessibilityRole="button"
-              accessibilityLabel={back?.accessibilityLabel ?? back?.label ?? "Back"}
+              accessibilityLabel={
+                back?.accessibilityLabel ?? back?.label ?? t("common.actions.back")
+              }
              testID="sheet-header-back"
            >
              {({ pressed }) => (
@@ -414,7 +426,7 @@ export function InlineHeaderView({ header }: { header: SheetHeader }) {
          <AdaptiveTextInput
            // @ts-expect-error - outlineStyle is web-only
            style={SEARCH_INPUT_STYLE}
-            placeholder={header.search.placeholder ?? "Search"}
+            placeholder={header.search.placeholder ?? t("common.actions.search")}
            resetKey={header.search.resetKey}
            onChangeText={header.search.onChange}
            autoCapitalize="none"
@@ -442,6 +454,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({
@@ -455,13 +468,54 @@ export function AdaptiveModalSheet({
  desktopMaxWidth,
  onFilesDropped,
  scrollable = true,
+  presentation,
 }: AdaptiveModalSheetProps) {
  const { theme } = useUnistyles();
+  const { t } = useTranslation();
  const isMobile = useIsCompactFormFactor();
+  const insets = useSafeAreaInsets();
  const resolvedSnapPoints = useMemo(() => snapPoints ?? ["65%", "90%"], [snapPoints]);
+  const compactSafeAreaPadding = useMemo(
+    () =>
+      getCompactSheetSafeAreaPadding({
+        isCompact: isMobile,
+        hasFooter: Boolean(footer),
+        baseContentPadding: theme.spacing[SHEET_HORIZONTAL_PADDING_SCALE],
+        baseFooterPadding: theme.spacing[3],
+        safeAreaBottom: insets.bottom,
+      }),
+    [footer, insets.bottom, isMobile, theme.spacing],
+  );
+  const bottomSheetContentStyle = useMemo(
+    () => [
+      styles.bottomSheetContent,
+      compactSafeAreaPadding.contentPaddingBottom != null
+        ? { paddingBottom: compactSafeAreaPadding.contentPaddingBottom }
+        : null,
+    ],
+    [compactSafeAreaPadding.contentPaddingBottom],
+  );
+  const bottomSheetStaticContentStyle = useMemo(
+    () => [
+      styles.bottomSheetStaticContent,
+      compactSafeAreaPadding.contentPaddingBottom != null
+        ? { paddingBottom: compactSafeAreaPadding.contentPaddingBottom }
+        : null,
+    ],
+    [compactSafeAreaPadding.contentPaddingBottom],
+  );
+  const footerStyle = useMemo(
+    () => [
+      styles.footer,
+      compactSafeAreaPadding.footerPaddingBottom != null
+        ? { paddingBottom: compactSafeAreaPadding.footerPaddingBottom }
+        : null,
+    ],
+    [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,
@@ -502,20 +556,21 @@ export function AdaptiveModalSheet({
        keyboardBehavior="extend"
        keyboardBlurBehavior="restore"
        accessible={false}
+        presentation={presentation}
      >
        <SheetHeaderView header={header} onClose={onClose} testID={testID} />
        {scrollable ? (
          <BottomSheetScrollView
-            contentContainerStyle={styles.bottomSheetContent}
+            contentContainerStyle={bottomSheetContentStyle}
            keyboardShouldPersistTaps="handled"
            showsVerticalScrollIndicator={false}
          >
            {children}
          </BottomSheetScrollView>
        ) : (
-          <View style={styles.bottomSheetStaticContent}>{children}</View>
+          <View style={bottomSheetStaticContentStyle}>{children}</View>
        )}
-        {footer ? <View style={styles.footer}>{footer}</View> : null}
+        {footer ? <View style={footerStyle}>{footer}</View> : null}
      </IsolatedBottomSheetModal>
    );
  }
@@ -534,13 +589,17 @@ export function AdaptiveModalSheet({
      ) : (
        <View style={styles.desktopStaticContent}>{children}</View>
      )}
-      {footer ? <View style={styles.footer}>{footer}</View> : null}
+      {footer ? <View style={footerStyle}>{footer}</View> : null}
    </>
  );

  const desktopContent = (
    <View style={styles.desktopOverlay} testID={testID}>
-      <Pressable accessibilityLabel="Dismiss" style={ABSOLUTE_FILL_STYLE} onPress={onClose} />
+      <Pressable
+        accessibilityLabel={t("common.actions.dismiss")}
+        style={ABSOLUTE_FILL_STYLE}
+        onPress={onClose}
+      />
      <View style={desktopCardStyle}>
        {onFilesDropped ? (
          <FileDropZone onFilesDropped={onFilesDropped}>{cardInner}</FileDropZone>
--- a/packages/app/src/components/add-host-method-modal.tsx
+++ b/packages/app/src/components/add-host-method-modal.tsx
@@ -1,12 +1,11 @@
-import { useCallback } from "react";
+import { useCallback, useMemo } from "react";
+import { useTranslation } from "react-i18next";
 import { Pressable, Text, View } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { QrCode, Link2, ClipboardPaste } from "lucide-react-native";
 import { AdaptiveModalSheet, type SheetHeader } from "./adaptive-modal-sheet";
 import { isNative } from "@/constants/platform";

-const ADD_CONNECTION_HEADER: SheetHeader = { title: "Add connection" };
-
 const styles = StyleSheet.create((theme) => ({
  option: {
    flexDirection: "row",
@@ -49,6 +48,8 @@ export function AddHostMethodModal({
  onPasteLink,
 }: AddHostMethodModalProps) {
  const { theme } = useUnistyles();
+  const { t } = useTranslation();
+  const header = useMemo<SheetHeader>(() => ({ title: t("pairing.connectionMethods.title") }), [t]);

  const handleDirect = useCallback(() => {
    onDirectConnection();
@@ -64,7 +65,7 @@ export function AddHostMethodModal({

  return (
    <AdaptiveModalSheet
-      header={ADD_CONNECTION_HEADER}
+      header={header}
      visible={visible}
      onClose={onClose}
      testID="add-host-method-modal"
@@ -73,13 +74,15 @@ export function AddHostMethodModal({
        style={styles.option}
        onPress={handleDirect}
        accessibilityRole="button"
-        accessibilityLabel="Direct connection"
+        accessibilityLabel={t("pairing.connectionMethods.direct.title")}
        testID="add-host-method-direct"
      >
        <Link2 size={18} color={theme.colors.foreground} />
        <View style={styles.optionBody}>
-          <Text style={styles.optionText}>Direct connection</Text>
-          <Text style={styles.optionSubtext}>Local network or VPN.</Text>
+          <Text style={styles.optionText}>{t("pairing.connectionMethods.direct.title")}</Text>
+          <Text style={styles.optionSubtext}>
+            {t("pairing.connectionMethods.direct.description")}
+          </Text>
        </View>
      </Pressable>

@@ -88,12 +91,14 @@ export function AddHostMethodModal({
          style={styles.option}
          onPress={handleScan}
          accessibilityRole="button"
-          accessibilityLabel="Scan QR code"
+          accessibilityLabel={t("pairing.connectionMethods.scanQr.title")}
        >
          <QrCode size={18} color={theme.colors.foreground} />
          <View style={styles.optionBody}>
-            <Text style={styles.optionText}>Scan QR code</Text>
-            <Text style={styles.optionSubtext}>Encrypted relay connection.</Text>
+            <Text style={styles.optionText}>{t("pairing.connectionMethods.scanQr.title")}</Text>
+            <Text style={styles.optionSubtext}>
+              {t("pairing.connectionMethods.scanQr.description")}
+            </Text>
          </View>
        </Pressable>
      ) : null}
@@ -102,13 +107,15 @@ export function AddHostMethodModal({
        style={styles.option}
        onPress={handlePaste}
        accessibilityRole="button"
-        accessibilityLabel="Paste pairing link"
+        accessibilityLabel={t("pairing.connectionMethods.pasteLink.title")}
        testID="add-host-method-pair-link"
      >
        <ClipboardPaste size={18} color={theme.colors.foreground} />
        <View style={styles.optionBody}>
-          <Text style={styles.optionText}>Paste pairing link</Text>
-          <Text style={styles.optionSubtext}>Encrypted relay connection.</Text>
+          <Text style={styles.optionText}>{t("pairing.connectionMethods.pasteLink.title")}</Text>
+          <Text style={styles.optionSubtext}>
+            {t("pairing.connectionMethods.pasteLink.description")}
+          </Text>
        </View>
      </Pressable>
    </AdaptiveModalSheet>
--- a/packages/app/src/components/add-host-modal.tsx
+++ b/packages/app/src/components/add-host-modal.tsx
@@ -1,4 +1,5 @@
 import { useCallback, useMemo, useReducer, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Alert, Pressable, Text, View } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -15,7 +16,6 @@ import { AdaptiveModalSheet, AdaptiveTextInput, type SheetHeader } from "./adapt
 import { Button } from "@/components/ui/button";

 const FLEX_ONE_STYLE = { flex: 1 } as const;
-const DIRECT_CONNECTION_HEADER: SheetHeader = { title: "Direct connection" };

 interface DirectConnectionDraft {
  host: string;
@@ -31,6 +31,20 @@ interface PreparedDirectConnection {
  password?: string;
 }

+interface DirectConnectionLabels {
+  hostRequired: string;
+  invalidPort: string;
+  invalidConnection: string;
+  failedToConnect: (endpoint: string) => string;
+  noAdditionalDetails: (detail: string) => string;
+  timedOut: string;
+  refused: string;
+  hostNotFound: string;
+  hostUnreachable: string;
+  tlsError: string;
+  unableToConnect: string;
+}
+
 const styles = StyleSheet.create((theme) => ({
  field: {
    gap: theme.spacing[2],
@@ -128,14 +142,17 @@ function isIpv6Host(host: string): boolean {
  return host.includes(":") && !host.startsWith("[") && !host.endsWith("]");
 }

-function buildConnectionUriFromDraft(draft: DirectConnectionDraft): string {
+function buildConnectionUriFromDraft(
+  draft: DirectConnectionDraft,
+  labels: DirectConnectionLabels,
+): string {
  const host = draft.host.trim();
  const port = Number(draft.port.trim());
  if (!host) {
-    throw new Error("Host is required");
+    throw new Error(labels.hostRequired);
  }
  if (!Number.isInteger(port) || port < 1 || port > 65535) {
-    throw new Error("Port must be between 1 and 65535");
+    throw new Error(labels.invalidPort);
  }

  return serializeConnectionUriForStorage({
@@ -147,8 +164,11 @@ function buildConnectionUriFromDraft(draft: DirectConnectionDraft): string {
  });
 }

-function prepareDirectConnection(draft: DirectConnectionDraft): PreparedDirectConnection {
-  const parsed = parseConnectionUri(buildConnectionUriFromDraft(draft));
+function prepareDirectConnection(
+  draft: DirectConnectionDraft,
+  labels: DirectConnectionLabels,
+): PreparedDirectConnection {
+  const parsed = parseConnectionUri(buildConnectionUriFromDraft(draft, labels));
  const endpoint = parsed.isIpv6
    ? `[${parsed.host}]:${parsed.port}`
    : `${parsed.host}:${parsed.port}`;
@@ -178,7 +198,10 @@ function normalizeTransportMessage(message: string | null | undefined): string |
  return trimmed;
 }

-function formatTechnicalTransportDetails(details: (string | null)[]): string | null {
+function formatTechnicalTransportDetails(
+  details: (string | null)[],
+  labels: DirectConnectionLabels,
+): string | null {
  const unique = Array.from(
    new Set(
      details
@@ -197,22 +220,24 @@ function formatTechnicalTransportDetails(details: (string | null)[]): string | n
  });

  if (allGeneric) {
-    return `${unique[0]} (no additional details provided)`;
+    return labels.noAdditionalDetails(unique[0] ?? "");
  }

  return unique.join(" — ");
 }

-function buildConnectionFailureCopy(
-  endpoint: string,
-  error: unknown,
-): { title: string; detail: string | null; raw: string | null } {
-  const title = `We failed to connect to ${endpoint}.`;
+function buildConnectionFailureCopy(input: {
+  endpoint: string;
+  error: unknown;
+  labels: DirectConnectionLabels;
+}): { title: string; detail: string | null; raw: string | null } {
+  const { endpoint, error, labels } = input;
+  const title = labels.failedToConnect(endpoint);

  const raw = (() => {
    if (error instanceof DaemonConnectionTestError) {
      return (
-        formatTechnicalTransportDetails([error.reason, error.lastError]) ??
+        formatTechnicalTransportDetails([error.reason, error.lastError], labels) ??
        normalizeTransportMessage(error.message)
      );
    }
@@ -228,26 +253,25 @@ function buildConnectionFailureCopy(
  if (raw === "Incorrect password" || raw === "Password required") {
    detail = raw;
  } else if (rawLower.includes("timed out")) {
-    detail = "Connection timed out. Check the host/port and your network.";
+    detail = labels.timedOut;
  } else if (
    rawLower.includes("econnrefused") ||
    rawLower.includes("connection refused") ||
    rawLower.includes("err_connection_refused")
  ) {
-    detail = "Connection refused. Is the server running at this address?";
+    detail = labels.refused;
  } else if (rawLower.includes("enotfound") || rawLower.includes("not found")) {
-    detail = "Host not found. Check the hostname and try again.";
+    detail = labels.hostNotFound;
  } else if (rawLower.includes("ehostunreach") || rawLower.includes("host is unreachable")) {
-    detail = "Host is unreachable. Check your network and firewall.";
+    detail = labels.hostUnreachable;
  } else if (
    rawLower.includes("certificate") ||
    rawLower.includes("tls") ||
    rawLower.includes("ssl")
  ) {
-    detail =
-      "TLS error. Direct connections use SSL only when a TLS terminator is in front of the daemon.";
+    detail = labels.tlsError;
  } else {
-    detail = "Unable to connect. Check the host/port and that the daemon is reachable.";
+    detail = labels.unableToConnect;
  }

  return { title, detail, raw };
@@ -267,6 +291,7 @@ export interface AddHostModalProps {

 export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostModalProps) {
  const { theme } = useUnistyles();
+  const { t } = useTranslation();
  const daemons = useHosts();
  const { probeAndUpsertDirectConnection } = useHostMutations();
  const isMobile = useIsCompactFormFactor();
@@ -308,6 +333,23 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
    () => ({ checked: useTls, disabled: isSaving }),
    [isSaving, useTls],
  );
+  const directConnectionLabels = useMemo<DirectConnectionLabels>(
+    () => ({
+      hostRequired: t("pairing.direct.errors.hostRequired"),
+      invalidPort: t("pairing.direct.errors.invalidPort"),
+      invalidConnection: t("pairing.direct.errors.invalidConnection"),
+      failedToConnect: (endpoint) => t("pairing.direct.errors.failedToConnect", { endpoint }),
+      noAdditionalDetails: (detail) => t("pairing.direct.errors.noAdditionalDetails", { detail }),
+      timedOut: t("pairing.direct.errors.timedOut"),
+      refused: t("pairing.direct.errors.refused"),
+      hostNotFound: t("pairing.direct.errors.hostNotFound"),
+      hostUnreachable: t("pairing.direct.errors.hostUnreachable"),
+      tlsError: t("pairing.direct.errors.tlsError"),
+      unableToConnect: t("pairing.direct.errors.unableToConnect"),
+    }),
+    [t],
+  );
+  const header = useMemo<SheetHeader>(() => ({ title: t("pairing.direct.title") }), [t]);

  const handleClose = useCallback(() => {
    if (isSaving) return;
@@ -328,9 +370,13 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod

    let connection: PreparedDirectConnection;
    try {
-      connection = prepareDirectConnection({ host, port, useTls, password });
+      connection = prepareDirectConnection(
+        { host, port, useTls, password },
+        directConnectionLabels,
+      );
    } catch (error) {
-      const message = error instanceof Error ? error.message : "Invalid connection";
+      const message =
+        error instanceof Error ? error.message : directConnectionLabels.invalidConnection;
      setErrorMessage(message);
      return;
    }
@@ -349,10 +395,20 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
      onSaved?.({ profile, serverId, hostname, isNewHost });
      handleClose();
    } catch (error) {
-      const { title, detail, raw: rawDetail } = buildConnectionFailureCopy(connection.uri, error);
+      const {
+        title,
+        detail,
+        raw: rawDetail,
+      } = buildConnectionFailureCopy({
+        endpoint: connection.uri,
+        error,
+        labels: directConnectionLabels,
+      });
      let combined: string;
      if (rawDetail && detail && rawDetail !== detail) {
-        combined = `${title}\n${detail}\nDetails: ${rawDetail}`;
+        combined = `${title}\n${detail}\n${t("pairing.direct.errors.details", {
+          detail: rawDetail,
+        })}`;
      } else if (detail) {
        combined = `${title}\n${detail}`;
      } else {
@@ -360,13 +416,14 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
      }
      setErrorMessage(combined);
      if (!isMobile) {
-        Alert.alert("Connection failed", combined);
+        Alert.alert(t("pairing.direct.errors.failedTitle"), combined);
      }
    } finally {
      setIsSaving(false);
    }
  }, [
    daemons,
+    directConnectionLabels,
    handleClose,
    host,
    isMobile,
@@ -375,6 +432,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
    password,
    port,
    probeAndUpsertDirectConnection,
+    t,
    useTls,
  ]);

@@ -398,7 +456,9 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
  const handleToggleAdvanced = useCallback(() => {
    if (!isAdvancedOpen) {
      try {
-        setAdvancedUri(buildConnectionUriFromDraft({ host, port, useTls, password }));
+        setAdvancedUri(
+          buildConnectionUriFromDraft({ host, port, useTls, password }, directConnectionLabels),
+        );
      } catch {
        setAdvancedUri("");
      }
@@ -419,27 +479,27 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
      setErrorMessage("");
    }
    setIsAdvancedOpen(false);
-  }, [advancedUri, host, isAdvancedOpen, password, port, useTls]);
+  }, [advancedUri, directConnectionLabels, host, isAdvancedOpen, password, port, useTls]);

  const AdvancedIcon = isAdvancedOpen ? ChevronDown : ChevronRight;
  const PasswordIcon = isPasswordVisible ? EyeOff : Eye;

  return (
    <AdaptiveModalSheet
-      header={DIRECT_CONNECTION_HEADER}
+      header={header}
      visible={visible}
      onClose={handleClose}
      testID="add-host-modal"
    >
-      <Text style={styles.helper}>Enter the address of a Paseo server.</Text>
+      <Text style={styles.helper}>{t("pairing.direct.helper")}</Text>

      <View style={styles.portRow}>
        <View style={hostFieldStyle}>
-          <Text style={styles.label}>Host</Text>
+          <Text style={styles.label}>{t("pairing.direct.fields.host")}</Text>
          <AdaptiveTextInput
            testID="direct-host-input"
            nativeID="direct-host-input"
-            accessibilityLabel="Host"
+            accessibilityLabel={t("pairing.direct.fields.host")}
            initialValue={host}
            resetKey={`direct-host-${inputResetKey}`}
            value={host}
@@ -455,11 +515,11 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
          />
        </View>
        <View style={portFieldStyle}>
-          <Text style={styles.label}>Port</Text>
+          <Text style={styles.label}>{t("pairing.direct.fields.port")}</Text>
          <AdaptiveTextInput
            testID="direct-port-input"
            nativeID="direct-port-input"
-            accessibilityLabel="Port"
+            accessibilityLabel={t("pairing.direct.fields.port")}
            initialValue={port}
            resetKey={`direct-port-${inputResetKey}`}
            value={port}
@@ -482,7 +542,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
        onPress={handleToggleUseTls}
        disabled={isSaving}
        accessibilityRole="checkbox"
-        accessibilityLabel="Use SSL"
+        accessibilityLabel={t("pairing.direct.fields.useSsl")}
        accessibilityState={useTlsAccessibilityState}
        testID="direct-ssl-toggle"
      >
@@ -493,21 +553,21 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
            </View>
          ) : null}
        </View>
-        <Text style={styles.label}>Use SSL</Text>
+        <Text style={styles.label}>{t("pairing.direct.fields.useSsl")}</Text>
      </Pressable>

      <View style={styles.field}>
-        <Text style={styles.label}>Password</Text>
+        <Text style={styles.label}>{t("pairing.direct.fields.password")}</Text>
        <View style={styles.passwordRow}>
          <AdaptiveTextInput
            testID="direct-password-input"
            nativeID="direct-password-input"
-            accessibilityLabel="Password"
+            accessibilityLabel={t("pairing.direct.fields.password")}
            initialValue={password}
            resetKey={`direct-password-${inputResetKey}`}
            value={password}
            onChangeText={setPassword}
-            placeholder="Optional"
+            placeholder={t("pairing.direct.fields.optional")}
            placeholderTextColor={theme.colors.foregroundMuted}
            style={passwordInputStyle}
            autoCapitalize="none"
@@ -522,7 +582,11 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
            onPress={handleTogglePasswordVisibility}
            disabled={isSaving}
            accessibilityRole="button"
-            accessibilityLabel={isPasswordVisible ? "Hide password" : "Show password"}
+            accessibilityLabel={
+              isPasswordVisible
+                ? t("pairing.direct.passwordVisibility.hide")
+                : t("pairing.direct.passwordVisibility.show")
+            }
            testID="direct-password-visibility-toggle"
          >
            <PasswordIcon size={18} color={theme.colors.foregroundMuted} />
@@ -536,17 +600,19 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
          onPress={handleToggleAdvanced}
          disabled={isSaving}
          accessibilityRole="button"
-          accessibilityLabel={isAdvancedOpen ? "Hide advanced" : "Show advanced"}
+          accessibilityLabel={
+            isAdvancedOpen ? t("pairing.direct.advanced.hide") : t("pairing.direct.advanced.show")
+          }
          testID="direct-host-advanced-toggle"
        >
          <AdvancedIcon size={16} color={theme.colors.foregroundMuted} />
-          <Text style={styles.advancedText}>Advanced</Text>
+          <Text style={styles.advancedText}>{t("pairing.direct.advanced.label")}</Text>
        </Pressable>
        {isAdvancedOpen ? (
          <AdaptiveTextInput
            testID="direct-host-uri-input"
            nativeID="direct-host-uri-input"
-            accessibilityLabel="Connection URI"
+            accessibilityLabel={t("pairing.direct.fields.connectionUri")}
            initialValue={advancedUri}
            resetKey={`direct-host-uri-${inputResetKey}`}
            value={advancedUri}
@@ -572,7 +638,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
          onPress={handleCancel}
          disabled={isSaving}
        >
-          Cancel
+          {t("pairing.direct.actions.cancel")}
        </Button>
        <Button
          style={FLEX_ONE_STYLE}
@@ -582,7 +648,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
          leftIcon={connectIcon}
          testID="direct-host-submit"
        >
-          {isSaving ? "Connecting..." : "Connect"}
+          {isSaving ? t("pairing.direct.actions.connecting") : t("pairing.direct.actions.connect")}
        </Button>
      </View>
    </AdaptiveModalSheet>
--- a/packages/app/src/components/agent-list.tsx
+++ b/packages/app/src/components/agent-list.tsx
@@ -11,6 +11,8 @@ import {
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useCallback, useMemo, useState, type ReactElement } from "react";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import type { TFunction } from "i18next";
+import { useTranslation } from "react-i18next";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { formatTimeAgo } from "@/utils/time";
 import { shortenPath } from "@/utils/shorten-path";
@@ -33,8 +35,18 @@ interface AgentListProps {
  showAttentionIndicator?: boolean;
 }

+type DateSectionKey = "today" | "yesterday" | "thisWeek" | "thisMonth" | "older";
+
+const DATE_SECTION_ORDER = [
+  "today",
+  "yesterday",
+  "thisWeek",
+  "thisMonth",
+  "older",
+] as const satisfies readonly DateSectionKey[];
+
 type FlatListItem =
-  | { type: "header"; key: string; title: string }
+  | { type: "header"; key: string; section: DateSectionKey }
  | { type: "agent"; key: string; agent: AggregatedAgent };

 function buildHistoricalAgentDetail(agent: AggregatedAgent): Agent {
@@ -94,7 +106,7 @@ function rememberArchivedAgentDetail(agent: AggregatedAgent) {
  });
 }

-function deriveDateSectionLabel(lastActivityAt: Date): string {
+function deriveDateSectionKey(lastActivityAt: Date): DateSectionKey {
  const now = new Date();
  const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
  const yesterdayStart = new Date(todayStart.getTime() - 24 * 60 * 60 * 1000);
@@ -105,35 +117,50 @@ function deriveDateSectionLabel(lastActivityAt: Date): string {
  );

  if (activityStart.getTime() >= todayStart.getTime()) {
-    return "Today";
+    return "today";
  }
  if (activityStart.getTime() >= yesterdayStart.getTime()) {
-    return "Yesterday";
+    return "yesterday";
  }

  const diffTime = todayStart.getTime() - activityStart.getTime();
  const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24));
  if (diffDays <= 7) {
-    return "This week";
+    return "thisWeek";
  }
  if (diffDays <= 30) {
-    return "This month";
+    return "thisMonth";
  }
-  return "Older";
+  return "older";
 }

-function formatStatusLabel(status: AggregatedAgent["status"]): string {
+function formatDateSectionLabel(t: TFunction, section: DateSectionKey): string {
+  switch (section) {
+    case "today":
+      return t("agentList.dateSections.today");
+    case "yesterday":
+      return t("agentList.dateSections.yesterday");
+    case "thisWeek":
+      return t("agentList.dateSections.thisWeek");
+    case "thisMonth":
+      return t("agentList.dateSections.thisMonth");
+    case "older":
+      return t("agentList.dateSections.older");
+  }
+}
+
+function formatStatusLabel(t: TFunction, status: AggregatedAgent["status"]): string {
  switch (status) {
    case "initializing":
-      return "Starting";
+      return t("agentList.status.initializing");
    case "idle":
-      return "Idle";
+      return t("agentList.status.idle");
    case "running":
-      return "Running";
+      return t("agentList.status.running");
    case "error":
-      return "Error";
+      return t("agentList.status.error");
    case "closed":
-      return "Closed";
+      return t("agentList.status.closed");
    default:
      return status;
  }
@@ -188,12 +215,14 @@ function SessionRow({
  onLongPress: (agent: AggregatedAgent) => void;
 }) {
  const { theme } = useUnistyles();
+  const { t } = useTranslation();
  const timeAgo = formatTimeAgo(agent.lastActivityAt);
  const agentKey = `${agent.serverId}:${agent.id}`;
  const isSelected = selectedAgentId === agentKey;
-  const statusLabel = formatStatusLabel(agent.status);
+  const statusLabel = formatStatusLabel(t, agent.status);
  const projectPath = shortenPath(agent.cwd);
  const ProviderIcon = getProviderIcon(agent.provider);
+  const pendingPermissionCount = agent.pendingPermissionCount ?? 0;

  const pressableStyle = useCallback(
    ({ pressed, hovered = false }: PressableStateCallbackType & { hovered?: boolean }) => [
@@ -231,14 +260,19 @@ function SessionRow({
            <ProviderIcon size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
          </View>
          <Text style={sessionTitleStyle} numberOfLines={1}>
-            {agent.title || "New session"}
+            {agent.title || t("agentList.fallbackTitle")}
          </Text>
-          {agent.archivedAt ? <SessionBadge label="Archived" icon={archivedIcon} /> : null}
-          {(agent.pendingPermissionCount ?? 0) > 0 ? (
-            <SessionBadge label={`${agent.pendingPermissionCount} pending`} tone="warning" />
+          {agent.archivedAt ? (
+            <SessionBadge label={t("agentList.badges.archived")} icon={archivedIcon} />
+          ) : null}
+          {pendingPermissionCount > 0 ? (
+            <SessionBadge
+              label={t("agentList.badges.pending", { count: pendingPermissionCount })}
+              tone="warning"
+            />
          ) : null}
          {!isMobile && showAttentionIndicator && agent.requiresAttention ? (
-            <SessionBadge label="Attention" tone="danger" />
+            <SessionBadge label={t("agentList.badges.attention")} tone="danger" />
          ) : null}
        </View>
        {isMobile && (
@@ -272,7 +306,7 @@ function SessionRow({
      )}
      {isMobile && showAttentionIndicator && agent.requiresAttention ? (
        <View style={styles.rowTrailing}>
-          <SessionBadge label="Attention" tone="danger" />
+          <SessionBadge label={t("agentList.badges.attention")} tone="danger" />
        </View>
      ) : null}
    </Pressable>
@@ -289,6 +323,7 @@ export function AgentList({
  showAttentionIndicator = true,
 }: AgentListProps) {
  const { theme } = useUnistyles();
+  const { t } = useTranslation();
  const insets = useSafeAreaInsets();
  const [actionAgent, setActionAgent] = useState<AggregatedAgent | null>(null);
  const isMobile = useIsCompactFormFactor();
@@ -324,7 +359,7 @@ export function AgentList({

  const handleAgentLongPress = useCallback(
    (agent: AggregatedAgent) => {
-      const isRunning = agent.status === "running" || agent.status === "initializing";
+      const isRunning = agent.status === "running";
      if (isRunning) {
        setActionAgent(agent);
        return;
@@ -354,22 +389,21 @@ export function AgentList({
  }, [actionAgent, actionClient, archiveAgent]);

  const flatItems = useMemo((): FlatListItem[] => {
-    const order = ["Today", "Yesterday", "This week", "This month", "Older"] as const;
-    const buckets = new Map<string, AggregatedAgent[]>();
+    const buckets = new Map<DateSectionKey, AggregatedAgent[]>();
    for (const agent of agents) {
-      const label = deriveDateSectionLabel(agent.lastActivityAt);
-      const existing = buckets.get(label) ?? [];
+      const section = deriveDateSectionKey(agent.lastActivityAt);
+      const existing = buckets.get(section) ?? [];
      existing.push(agent);
-      buckets.set(label, existing);
+      buckets.set(section, existing);
    }

    const result: FlatListItem[] = [];
-    for (const label of order) {
-      const data = buckets.get(label);
+    for (const section of DATE_SECTION_ORDER) {
+      const data = buckets.get(section);
      if (!data || data.length === 0) {
        continue;
      }
-      result.push({ type: "header", key: `header:${label}`, title: label });
+      result.push({ type: "header", key: `header:${section}`, section });
      for (const agent of data) {
        result.push({ type: "agent", key: `${agent.serverId}:${agent.id}`, agent });
      }
@@ -382,7 +416,7 @@ export function AgentList({
      if (item.type === "header") {
        return (
          <View style={styles.sectionHeading}>
-            <Text style={styles.sectionTitle}>{item.title}</Text>
+            <Text style={styles.sectionTitle}>{formatDateSectionLabel(t, item.section)}</Text>
          </View>
        );
      }
@@ -397,7 +431,7 @@ export function AgentList({
        />
      );
    },
-    [handleAgentLongPress, handleAgentPress, isMobile, selectedAgentId, showAttentionIndicator],
+    [handleAgentLongPress, handleAgentPress, isMobile, selectedAgentId, showAttentionIndicator, t],
  );

  const keyExtractor = useCallback((item: FlatListItem) => item.key, []);
@@ -454,8 +488,8 @@ export function AgentList({
            <View style={styles.sheetHandle} />
            <Text style={styles.sheetTitle}>
              {isActionDaemonUnavailable
-                ? "Host offline"
-                : "This agent is still running. Archiving it will stop the agent."}
+                ? t("agentList.archiveSheet.hostOffline")
+                : t("agentList.archiveSheet.runningAgent")}
            </Text>
            <View style={styles.sheetButtonRow}>
              <Pressable
@@ -463,7 +497,7 @@ export function AgentList({
                onPress={handleCloseActionSheet}
                testID="agent-action-cancel"
              >
-                <Text style={styles.sheetCancelText}>Cancel</Text>
+                <Text style={styles.sheetCancelText}>{t("common.actions.cancel")}</Text>
              </Pressable>
              <Pressable
                disabled={isActionDaemonUnavailable}
@@ -471,7 +505,7 @@ export function AgentList({
                onPress={handleArchiveAgent}
                testID="agent-action-archive"
              >
-                <Text style={sheetArchiveTextStyle}>Archive</Text>
+                <Text style={sheetArchiveTextStyle}>{t("agentList.archiveSheet.archive")}</Text>
              </Pressable>
            </View>
          </View>
--- a/packages/app/src/components/archived-agent-callout.tsx
+++ b/packages/app/src/components/archived-agent-callout.tsx
@@ -1,5 +1,6 @@
 import { useCallback, useMemo, useState } from "react";
 import { View, Text } from "react-native";
+import { useTranslation } from "react-i18next";
 import { StyleSheet } from "react-native-unistyles";
 import Animated from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
@@ -15,6 +16,7 @@ interface ArchivedAgentCalloutProps {
 }

 export function ArchivedAgentCallout({ serverId, agentId }: ArchivedAgentCalloutProps) {
+  const { t } = useTranslation();
  const insets = useSafeAreaInsets();
  const client = useHostRuntimeClient(serverId);
  const isConnected = useHostRuntimeIsConnected(serverId);
@@ -43,14 +45,14 @@ export function ArchivedAgentCallout({ serverId, agentId }: ArchivedAgentCallout
      <View style={styles.inputAreaContainer}>
        <View style={styles.inputAreaContent}>
          <View style={styles.callout}>
-            <Text style={styles.calloutText}>This agent is archived</Text>
+            <Text style={styles.calloutText}>{t("agentPanel.archived.callout")}</Text>
            <Button
              size="sm"
              variant="secondary"
              onPress={handleUnarchive}
              disabled={!isConnected || isUnarchiving}
            >
-              Unarchive
+              {t("agentPanel.archived.unarchive")}
            </Button>
          </View>
        </View>
--- a/packages/app/src/components/attachment-lightbox.test.tsx
+++ b/packages/app/src/components/attachment-lightbox.test.tsx
@@ -55,6 +55,17 @@ vi.mock("@/constants/platform", () => ({
  isNative: false,
 }));

+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key: string) =>
+      ({
+        "message.attachments.closeImage": "Close image",
+        "message.attachments.dismissImage": "Dismiss image",
+        "message.attachments.imageLoadFailed": "Couldn't load image",
+      })[key] ?? key,
+  }),
+}));
+
 vi.mock("react-native-safe-area-context", () => ({
  useSafeAreaInsets: () => ({ top: 0, right: 0, bottom: 0, left: 0 }),
 }));
--- a/packages/app/src/components/attachment-lightbox.tsx
+++ b/packages/app/src/components/attachment-lightbox.tsx
@@ -4,6 +4,7 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Image as ExpoImage } from "expo-image";
 import { X } from "lucide-react-native";
+import { useTranslation } from "react-i18next";
 import type { AttachmentMetadata } from "@/attachments/types";
 import { useAttachmentPreviewUrl } from "@/attachments/use-attachment-preview-url";
 import { isWeb } from "@/constants/platform";
@@ -15,6 +16,7 @@ interface AttachmentLightboxProps {

 export function AttachmentLightbox({ metadata, onClose }: AttachmentLightboxProps) {
  const { theme } = useUnistyles();
+  const { t } = useTranslation();
  const insets = useSafeAreaInsets();
  const url = useAttachmentPreviewUrl(metadata);
  const [errored, setErrored] = useState(false);
@@ -63,14 +65,14 @@ export function AttachmentLightbox({ metadata, onClose }: AttachmentLightboxProp
        <Pressable
          testID="attachment-lightbox-backdrop"
          accessibilityRole="button"
-          accessibilityLabel="Dismiss image"
+          accessibilityLabel={t("message.attachments.dismissImage")}
          onPress={onClose}
          style={styles.backdrop}
        />
        <View style={styles.contentLayer}>
          <View style={styles.imageArea}>
            {hasError ? (
-              <Text style={styles.errorText}>Couldn&apos;t load image</Text>
+              <Text style={styles.errorText}>{t("message.attachments.imageLoadFailed")}</Text>
            ) : (
              <Pressable onPress={noopPress} style={styles.imagePressable}>
                <ExpoImage
@@ -86,7 +88,7 @@ export function AttachmentLightbox({ metadata, onClose }: AttachmentLightboxProp
          <Pressable
            testID="attachment-lightbox-close"
            accessibilityRole="button"
-            accessibilityLabel="Close image"
+            accessibilityLabel={t("message.attachments.closeImage")}
            hitSlop={8}
            onPress={onClose}
            style={closeButtonStyle}
--- a/packages/app/src/components/branch-switcher.tsx
+++ b/packages/app/src/components/branch-switcher.tsx
@@ -3,6 +3,7 @@ import { Pressable, View, type PressableStateCallbackType } from "react-native";
 import { useQueryClient } from "@tanstack/react-query";
 import { ChevronDown, GitBranch } from "lucide-react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { useTranslation } from "react-i18next";
 import { Combobox, ComboboxItem } from "@/components/ui/combobox";
 import type { ComboboxProps } from "@/components/ui/combobox";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -27,6 +28,7 @@ export function BranchSwitcher({
  isGitCheckout,
 }: BranchSwitcherProps) {
  const { theme } = useUnistyles();
+  const { t } = useTranslation();
  const isCompact = useIsCompactFormFactor();
  const anchorRef = useRef<View>(null);
  const client = useHostRuntimeClient(serverId);
@@ -91,7 +93,7 @@ export function BranchSwitcher({
        onPress={handleOpen}
        style={triggerStyle}
        accessibilityRole="button"
-        accessibilityLabel={`Current branch: ${currentBranchName}. Press to switch branch.`}
+        accessibilityLabel={t("branchSwitcher.currentBranch", { branchName: currentBranchName })}
      >
        {titleContent}
        {!isCompact ? <ChevronDown size={12} color={theme.colors.foregroundMuted} /> : null}
@@ -101,10 +103,10 @@ export function BranchSwitcher({
        value={currentBranchName}
        onSelect={handleBranchSelect}
        searchable
-        placeholder="Switch branch..."
-        searchPlaceholder="Filter branches..."
-        emptyText="No branches found."
-        title="Switch branch"
+        placeholder={t("branchSwitcher.placeholder")}
+        searchPlaceholder={t("branchSwitcher.searchPlaceholder")}
+        emptyText={t("branchSwitcher.empty")}
+        title={t("branchSwitcher.title")}
        open={isOpen}
        onOpenChange={setIsOpen}
        anchorRef={anchorRef}
--- a/Show More
+++ b/Show More