chore(release): cut 0.15.0-beta.1

docs(changelog): prepare 0.15.0-beta.1
fix: update lockfile signatures and Nix hash [skip ci]
2026-11-03 23:23:21 +00:00 · 2026-11-01 06:19:33 +01:00 · 2026-11-01 06:11:09 +01:00 · 2026-11-01 06:11:09 +01:00
541 changed files with 5830 additions and 24960 deletions
@@ -406,7 +406,10 @@
    {
      "files": [
        "packages/app/src/app/_layout.tsx",
+        "packages/app/src/app/pair-scan.tsx",
        "packages/app/src/components/adaptive-modal-sheet.tsx",
+        "packages/app/src/components/add-host-method-modal.tsx",
+        "packages/app/src/components/add-host-modal.tsx",
        "packages/app/src/components/agent-list.tsx",
        "packages/app/src/components/agent-status-dot.tsx",
        "packages/app/src/components/attachment-lightbox.tsx",
@@ -425,6 +428,7 @@
        "packages/app/src/components/hosts/host-picker.tsx",
        "packages/app/src/components/icons/paseo-logo.tsx",
        "packages/app/src/components/left-sidebar.tsx",
+        "packages/app/src/components/pair-link-modal.tsx",
        "packages/app/src/components/plan-card.tsx",
        "packages/app/src/components/provider-diagnostic-sheet.tsx",
        "packages/app/src/components/question-form-card.tsx",
@@ -539,10 +543,14 @@
        "packages/app/src/agent-skills/selection-sheet.tsx",
        "packages/app/src/agent-stream/chat-outline/rail.web.tsx",
        "packages/app/src/agent-stream/view.tsx",
+        "packages/app/src/app/pair-scan.tsx",
        "packages/app/src/changelog/internal/changelog-sheet.tsx",
        "packages/app/src/command-center/command-center.tsx",
        "packages/app/src/components/adaptive-modal-sheet.tsx",
+        "packages/app/src/components/add-host-method-modal.tsx",
+        "packages/app/src/components/add-host-modal.tsx",
        "packages/app/src/components/add-project-flow.tsx",
+        "packages/app/src/components/add-remote-ssh-host-modal.tsx",
        "packages/app/src/components/agent-list.tsx",
        "packages/app/src/components/app-diagnostic-sheet.tsx",
        "packages/app/src/components/attachment-lightbox.tsx",
@@ -1,8 +1,8 @@
 # Changelog

-## 0.15.0 - 2026-11-03
+## 0.15.0-beta.1 - 2026-11-01

-Daemon restarts now keep terminal programs running. Interrupted agents can resume in their existing conversations when you turn on agent recovery.
+Daemon restarts now keep terminal programs running and automatically resume interrupted agents in their existing conversations.

 Mobile terminals have native rendering and draggable text-selection handles. Reconnecting restores up to 10,000 lines of terminal history.

@@ -13,7 +13,7 @@ Worktree setup can copy ignored files and use plugin-defined locations before ag
 - Insert known agent commands from replies into the Composer draft ([#8371](https://github.com/getpaseo/paseo/pull/8371))
 - Reuse running OpenCode v2 services ([#7435](https://github.com/getpaseo/paseo/pull/7435) by [@mcowger](https://github.com/mcowger))
 - Kept terminal programs running across daemon restarts, crashes and supported updates ([#7644](https://github.com/getpaseo/paseo/pull/7644), [#8155](https://github.com/getpaseo/paseo/pull/8155) by [@sebastianarena](https://github.com/sebastianarena))
- Added an opt-in setting to resume interrupted agents in their existing conversations after a host restart ([#8127](https://github.com/getpaseo/paseo/pull/8127), [#8619](https://github.com/getpaseo/paseo/pull/8619) by [@coolwindX](https://github.com/coolwindX), [@suntianc](https://github.com/suntianc))
+- Automatically resume interrupted agents in their existing conversations after a host restart ([#8127](https://github.com/getpaseo/paseo/pull/8127) by [@coolwindX](https://github.com/coolwindX), [@suntianc](https://github.com/suntianc))
 - Added draggable terminal text-selection handles on iOS and Android ([#8348](https://github.com/getpaseo/paseo/pull/8348))
 - Let phones and tablets rotate with the system orientation setting ([#8256](https://github.com/getpaseo/paseo/pull/8256) by [@magiclaw](https://github.com/magiclaw), [@yzim](https://github.com/yzim))
 - Copy ignored files selected by `.worktreeinclude` into new worktrees before setup and agents start ([#8100](https://github.com/getpaseo/paseo/pull/8100) by [@cprecioso](https://github.com/cprecioso))
@@ -64,7 +64,6 @@ Worktree setup can copy ignored files and use plugin-defined locations before ag
 - Fixed the MiniMax Code catalog command failing to select an executable ([#8201](https://github.com/getpaseo/paseo/pull/8201) by [@Peanut-HZM](https://github.com/Peanut-HZM))
 - Fixed Android keeping the wrong layout after folding or unfolding while backgrounded ([#8285](https://github.com/getpaseo/paseo/pull/8285))
 - Fixed Android workspace layouts and header fades retaining their old size after rotation ([#8349](https://github.com/getpaseo/paseo/pull/8349), [#8377](https://github.com/getpaseo/paseo/pull/8377))
- Fixed chat reconnecting and updating status being hidden behind the header on iOS and Android phones ([#8568](https://github.com/getpaseo/paseo/pull/8568))
 - Fixed deleted agents leaving unclosable tabs in another window ([#8248](https://github.com/getpaseo/paseo/pull/8248) by [@loganmeyer](https://github.com/loganmeyer))
 - Fixed transcript text retaining old theme colors after the theme changes while the window is hidden ([#8199](https://github.com/getpaseo/paseo/pull/8199) by [@Nurshot](https://github.com/Nurshot), [@dansabin](https://github.com/dansabin))
 - Fixed web menus snapping back to their loading size after content arrives ([#8180](https://github.com/getpaseo/paseo/pull/8180) by [@babo-jeonguk](https://github.com/babo-jeonguk))
@@ -75,7 +74,7 @@ Worktree setup can copy ignored files and use plugin-defined locations before ag
 ### Notes

 - The first upgrade from 0.14.0 still closes terminals; terminal preservation starts once the new daemon is installed, and Windows desktop app upgrades still close them
- Agent recovery is off by default; turn on **Resume agents after restart** in Host settings → Agents to send `Resume working.` or your own prompt
+- Automatic agent recovery is on by default and sends `Resume working.`; change the prompt or disable it in Host settings → Agents
 - Before downgrading to 0.14.0, restore a backed-up `config.json` or remove the saved agent-resume and usage-check settings

 ## 0.14.0 - 2026-10-29
@@ -1,8 +1,8 @@
 # Changelog

-## 0.15.0 - 2026-11-03
+## 0.15.0-beta.1 - 2026-11-01

-daemon 重启后，终端中的程序继续运行。开启 Agent 恢复后，被中断的 Agent 会在原有会话中恢复工作。
+daemon 重启后，终端中的程序继续运行，被中断的 Agent 会自动在原有会话中恢复工作。

 移动端终端采用原生渲染，并提供可拖动的文本选择手柄。重新连接时最多恢复 10,000 行终端历史。

@@ -13,7 +13,7 @@ worktree 初始化支持复制被忽略的文件，并在 Agent 启动前使用
 - 点击回复中的已知 Agent 命令，将其插入 Composer 草稿 ([#8371](https://github.com/getpaseo/paseo/pull/8371))
 - 复用已运行的 OpenCode v2 服务 ([#7435](https://github.com/getpaseo/paseo/pull/7435)，贡献者：[@mcowger](https://github.com/mcowger))
 - 让终端中的程序在 daemon 重启、崩溃和支持的更新过程中继续运行 ([#7644](https://github.com/getpaseo/paseo/pull/7644), [#8155](https://github.com/getpaseo/paseo/pull/8155)，贡献者：[@sebastianarena](https://github.com/sebastianarena))
- 新增可选设置，在主机重启后于原有会话中恢复被中断的 Agent ([#8127](https://github.com/getpaseo/paseo/pull/8127), [#8619](https://github.com/getpaseo/paseo/pull/8619)，贡献者：[@coolwindX](https://github.com/coolwindX), [@suntianc](https://github.com/suntianc))
+- 主机重启后，自动在原有会话中恢复被中断的 Agent ([#8127](https://github.com/getpaseo/paseo/pull/8127)，贡献者：[@coolwindX](https://github.com/coolwindX), [@suntianc](https://github.com/suntianc))
 - 在 iOS 和 Android 终端中新增可拖动的文本选择手柄 ([#8348](https://github.com/getpaseo/paseo/pull/8348))
 - 让手机和平板遵循系统屏幕旋转设置 ([#8256](https://github.com/getpaseo/paseo/pull/8256)，贡献者：[@magiclaw](https://github.com/magiclaw), [@yzim](https://github.com/yzim))
 - 通过 `.worktreeinclude` 选择要复制到新 worktree 的被忽略文件，在初始化和 Agent 启动前完成复制 ([#8100](https://github.com/getpaseo/paseo/pull/8100)，贡献者：[@cprecioso](https://github.com/cprecioso))
@@ -64,7 +64,6 @@ worktree 初始化支持复制被忽略的文件，并在 Agent 启动前使用
 - 修复了 MiniMax Code 目录命令无法选定可执行文件的问题 ([#8201](https://github.com/getpaseo/paseo/pull/8201)，贡献者：[@Peanut-HZM](https://github.com/Peanut-HZM))
 - 修复了 Android 应用在后台折叠或展开后保留错误布局的问题 ([#8285](https://github.com/getpaseo/paseo/pull/8285))
 - 修复了 Android 屏幕旋转后工作区布局和顶栏渐变保留旧尺寸的问题 ([#8349](https://github.com/getpaseo/paseo/pull/8349), [#8377](https://github.com/getpaseo/paseo/pull/8377))
- 修复了 iOS 和 Android 手机聊天中重新连接和更新状态被顶栏遮挡的问题 ([#8568](https://github.com/getpaseo/paseo/pull/8568))
 - 修复了删除 Agent 后，另一个窗口留下无法关闭的标签页的问题 ([#8248](https://github.com/getpaseo/paseo/pull/8248)，贡献者：[@loganmeyer](https://github.com/loganmeyer))
 - 修复了窗口隐藏期间切换主题后，聊天文本保留旧主题颜色的问题 ([#8199](https://github.com/getpaseo/paseo/pull/8199)，贡献者：[@Nurshot](https://github.com/Nurshot), [@dansabin](https://github.com/dansabin))
 - 修复了网页菜单加载内容后跳回加载时尺寸的问题 ([#8180](https://github.com/getpaseo/paseo/pull/8180)，贡献者：[@babo-jeonguk](https://github.com/babo-jeonguk))
@@ -75,7 +74,7 @@ worktree 初始化支持复制被忽略的文件，并在 Agent 启动前使用
 ### 说明

 - 首次从 0.14.0 升级时仍会关闭终端；安装新 daemon 后才支持保留终端，Windows 桌面应用升级仍会关闭终端
- Agent 恢复默认关闭；在主机设置 → Agent 中开启 **重启后恢复智能体**，即可发送 `Resume working.` 或自定义提示词
+- Agent 自动恢复默认开启，并发送 `Resume working.`；可在主机设置 → Agent 中修改提示词或关闭此功能
 - 降级到 0.14.0 前，请恢复备份的 `config.json`，或删除已保存的 Agent 恢复和用量查询设置

 ## 0.14.0 - 2026-10-29
@@ -34,7 +34,6 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [docs/hover.md](docs/hover.md)                                       | Hover — the canonical pattern (plain View + onPointerEnter/Leave, separate inner Pressable) and the three ways agents break it |
 | [docs/unistyles.md](docs/unistyles.md)                               | Unistyles gotchas — `useUnistyles()` is forbidden, alternatives in order                                                       |
 | [docs/floating-panels.md](docs/floating-panels.md)                   | Anchored popovers — Portal/Modal escape for Android, lifecycle gates, keyboard-shared-value, status-bar offset, the flash      |
-| [docs/keyboard-shortcuts.md](docs/keyboard-shortcuts.md)             | The binding table, per-platform key sources, badges vs routing, iOS `UIKeyCommand` limits                                      |
 | [docs/menus.md](docs/menus.md)                                       | The menu engine — popover vs sheet, submenu pages, hover intent, when a decision earns a submenu                               |
 | [docs/expo-router.md](docs/expo-router.md)                           | Expo Router route ownership, startup restore, and native blank-screen gotchas                                                  |
 | [docs/notifications.md](docs/notifications.md)                       | Notification tap ownership, native replay and acknowledgement, startup handoff, and payload QA                                 |
@@ -14,10 +14,9 @@ Each live agent in `AgentManager` carries a `lastStatus` of `initializing`, `idl

 ## Daemon restart recovery

-Restart recovery is off by default. Enable `agents.resumeOnStartup` in host config or
-Host settings → Agents to resume interrupted agents after graceful shutdown or a crash. The daemon
-reopens the saved provider conversation and settings, then sends `Resume working.`. Customize
-the prompt with `agents.resumePrompt` or the same settings page.
+Hosts resume interrupted agents by default after graceful shutdown or a crash. The daemon
+reopens the saved provider conversation and settings, then sends `Resume working.`. Change
+`agents.resumePrompt` or disable `agents.resumeOnStartup` in host config or Host settings → Agents.
 Disabling recovery consumes pending intent; enabling it later does not revive old work.

 Only agents recorded as running qualify. Idle and initializing agents stay inactive. Archived
@@ -174,7 +174,7 @@ REACT_NATIVE_PACKAGER_HOSTNAME=localhost \

 This is the Android counterpart of the iOS local-simulator flow in [development.md](development.md): on iOS the simulator shares the Mac's loopback so `localhost:<port>` works directly; on Android you need `10.0.2.2` or `adb reverse`.

-## Inverted timeline input
+## Inverted timeline selection

 Android focus and selection visibility requests must not reposition inverted timelines. The
 `modules/paseo-scroll` package keeps React Native's scroll manager interface and returns zero for
@@ -183,10 +183,6 @@ Native's Android list uses `scale: -1`, which decomposes into a 180-degree rotat
 `scaleY`; checking the scale property alone misses it. Dragging and explicit scroll
 commands still work; non-inverted scroll views keep Android's default behavior.

-Mouse wheel axes also bypass the inversion transform. The same module reverses the vertical
-wheel axis for inverted scroll views before delegating to Android, preserving native scroll
-bounds and React Native's scroll events and disabled-scroll behavior.
-
 Register this package before React Native's core package through its Expo config plugin. Normal
 Android builds use the prebuilt `react-android` library, so patching Java under `node_modules` does
 not change the shipped scroll view. Keep this behavior in the app's compiled native module.
@@ -74,10 +74,7 @@ registrations remain inspectable; a changed destination requires explicit identi

 Both daemons advertise `connectedHosts`; the shared link additionally requires `hostMultiplexing`.
 A completes capability and pinned-identity checks on each physical recovery before admitting channels. There is no local fallback. An older daemon continues to serve existing local
-operations; requesting this feature gives update guidance. The registry retries an older destination
-with capped backoff, so it comes online once updated. Self, duplicate, changed-identity, and
-authentication failures stay in `error` until an update changes the connection, `enabled`, or
-`replaceIdentity`, or A restarts.
+operations; requesting this feature gives update guidance.

 Disposing a routed API releases its observations and session. It does not remove the saved host or
 affect sibling API scopes. Disposing the origin cascades to its derived scopes. Observations restore
@@ -20,7 +20,7 @@ A semantic element used in three or more places is a primitive. One of a kind is

 Primitives live in `packages/app/src/components/ui/` and `packages/app/src/components/headers/`. Card and row layout live in `packages/app/src/styles/settings.ts`. Section structure lives in `packages/app/src/screens/settings/settings-section.tsx`.

-A pressable styled to look like a button is wrong; the button is `<Button>` (`packages/app/src/components/ui/button.tsx`). A pressable wrapping an icon is wrong; the icon action is `<ToolbarButton>` (`packages/app/src/components/ui/pane-content-toolbar.tsx`), which owns the hitbox, the rounded `interactionHighlight` fill on hover and press, the compact size, and the tooltip. Rows on a menu surface are `<MenuItem>`, or `<ComposerTrackRow>` in a track panel; other rows are `<PressHighlight>` (`packages/app/src/components/ui/press-highlight.tsx`), which flashes on native the moment a finger lands. A bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/components/settings/headings/settings-section.tsx`). A docs link in its header is its `link` prop, which renders `Label ↗` on the title's rail; a ghost button with an arrow is wrong. A custom `Modal` for a confirmation is wrong; the confirmation is `confirmDialog` (`packages/app/src/utils/confirm-dialog.ts`). A hand-rolled overflow menu is wrong; the menu is `<DropdownMenu>` (`packages/app/src/components/ui/dropdown-menu.tsx`). A hand-rolled status pill is wrong; the pill is `<StatusBadge>` (`packages/app/src/components/ui/status-badge.tsx`). A circle pinned over a scrolling surface is wrong; the floating action is `<FloatingActionButton>` (`packages/app/src/components/ui/floating-action-button.tsx`), one per surface, and the surface reserves `FLOATING_ACTION_BUTTON_CLEARANCE` below its content so the button never traps the last row.
+A pressable styled to look like a button is wrong; the button is `<Button>` (`packages/app/src/components/ui/button.tsx`). A pressable wrapping an icon is wrong; the icon action is `<ToolbarButton>` (`packages/app/src/components/ui/pane-content-toolbar.tsx`), which owns the hitbox, the rounded `interactionHighlight` fill on hover and press, the compact size, and the tooltip. Rows on a menu surface are `<MenuItem>`, or `<ComposerTrackRow>` in a track panel; other rows are `<PressHighlight>` (`packages/app/src/components/ui/press-highlight.tsx`), which flashes on native the moment a finger lands. A bare `<Text>` styled to look like a section header is wrong; the section header is `<SettingsSection>` (`packages/app/src/screens/settings/settings-section.tsx`). A custom `Modal` for a confirmation is wrong; the confirmation is `confirmDialog` (`packages/app/src/utils/confirm-dialog.ts`). A hand-rolled overflow menu is wrong; the menu is `<DropdownMenu>` (`packages/app/src/components/ui/dropdown-menu.tsx`). A hand-rolled status pill is wrong; the pill is `<StatusBadge>` (`packages/app/src/components/ui/status-badge.tsx`). A circle pinned over a scrolling surface is wrong; the floating action is `<FloatingActionButton>` (`packages/app/src/components/ui/floating-action-button.tsx`), one per surface, and the surface reserves `FLOATING_ACTION_BUTTON_CLEARANCE` below its content so the button never traps the last row.

 Before adding a new component, read `components/ui/`. The primitive usually exists.

@@ -35,8 +35,8 @@ The authored interface ramp uses a 14px base. New native installs default to 15p
 Weight has three tiers, applied by role:

 - **Screen titles** — the title in app chrome — use `<ScreenTitle>` (`packages/app/src/components/headers/screen-title.tsx`), which renders `fontSize.base` at weight `400` on compact and `300` on desktop. The New workspace hero is the only larger product title; it uses `fontSize["2xl"]` (`packages/app/src/screens/new-workspace-screen.tsx`).
- **Structural labels** use `fontWeight.medium`. This applies to section labels above a stack of rows (`packages/app/src/components/agent-list.tsx:519-523`, `packages/app/src/components/keyboard-shortcuts-dialog.tsx:63-67`), form field labels above an input inside a modal (`packages/app/src/hosts/add-host/internal/add-host-modal.tsx:19-23`, `packages/app/src/hosts/add-host/internal/pair-link-modal.tsx:24-28`), the title at the top of a modal/sheet/dialog (`packages/app/src/components/adaptive-modal-sheet.tsx:90-94`, `packages/app/src/components/ui/combobox.tsx:1607-1611`, `packages/app/src/components/welcome-screen.tsx:48-53`), action button labels in tight components such as the sidebar callout actions (`packages/app/src/components/sidebar-callout.tsx:218-221`), and inline data emphasis on dense metadata rows (`packages/app/src/components/git-diff-pane.tsx:2322-2327`, `packages/app/src/components/file-explorer-pane.tsx:1115-1122`).
- **Content** uses `fontWeight.normal`. This applies to settings rows (`packages/app/src/styles/settings.ts`), sidebar primary list-item titles (`packages/app/src/components/sidebar-workspace-list.tsx:2680-2686`, `packages/app/src/components/agent-list.tsx:572-578`), `<StatusBadge>` text (`packages/app/src/components/ui/status-badge.tsx:56-60`), and `<SidebarCallout>` titles (`packages/app/src/components/sidebar-callout.tsx:175-180`).
+- **Structural labels** use `fontWeight.medium`. This applies to section labels above a stack of rows (`packages/app/src/components/agent-list.tsx:519-523`, `packages/app/src/components/keyboard-shortcuts-dialog.tsx:63-67`), form field labels above an input inside a modal (`packages/app/src/components/add-host-modal.tsx:19-23`, `packages/app/src/components/pair-link-modal.tsx:24-28`), the title at the top of a modal/sheet/dialog (`packages/app/src/components/adaptive-modal-sheet.tsx:90-94`, `packages/app/src/components/ui/combobox.tsx:1607-1611`, `packages/app/src/components/welcome-screen.tsx:48-53`), action button labels in tight components such as the sidebar callout actions (`packages/app/src/components/sidebar-callout.tsx:218-221`), and inline data emphasis on dense metadata rows (`packages/app/src/components/git-diff-pane.tsx:2322-2327`, `packages/app/src/components/file-explorer-pane.tsx:1115-1122`).
+- **Content** uses `fontWeight.normal`. This applies to settings rows (`packages/app/src/styles/settings.ts`), sidebar primary list-item titles (`packages/app/src/components/sidebar-workspace-list.tsx:2680-2686`, `packages/app/src/components/agent-list.tsx:572-578`), `<Button>` text (`packages/app/src/components/ui/button.tsx:80-84`), `<StatusBadge>` text (`packages/app/src/components/ui/status-badge.tsx:56-60`), and `<SidebarCallout>` titles (`packages/app/src/components/sidebar-callout.tsx:175-180`).

 The rule, condensed: text that _names_ a surface or a group is `medium`. Text that lives _inside_ a surface or a group is `normal`. Top-of-screen titles are `<ScreenTitle>`, which is lighter still.

@@ -68,9 +68,9 @@ the sidebar. Apply it as `backgroundColor`; setting `opacity` on the control als

 `destructive` is filled with `destructive`. It only appears inside a confirm. The button on the page is `outline`; the destructive button is the confirm button inside the dialog.

-Controls come in two sizes, defined once in `control-geometry.ts`. The default is the right size almost everywhere — pages, dialogs, forms, settings rows, the setup flow — so don't pass a size. It is 32px tall where a pointer drives it and 44px in the compact layout, so every phone control is a full touch target; the breakpoint, not the caller, makes that choice. `sm` is 28px with `fontSize.sm` labels and is for tight chrome only: toolbars, nested settings rows, dense inline row actions. A `size="sm"` on an ordinary page or dialog is wrong, and so is choosing a size from `useIsCompactFormFactor()`.
+Sizes: `xs` for ultra-tight inline triggers. `sm` for any button sitting in a row. `md` is the page default. `lg` is reserved for large standalone CTAs.

-Buttons are pills (`borderRadius.full`) with medium-weight labels; an icon-only button is a circle. `<Switch>` follows the same two sizes: a 34×20 track by default and in `sm`, 44×26 in the compact layout, and it reserves its size's control height so a row holding one lines up with a row holding a button. Buttons, text fields, dropdown triggers, and `<SegmentedControl>` (`packages/app/src/components/ui/segmented-control.tsx`) share the size contract — the same size name means the same height and label size on every control kind, so controls in one row line up. Segments run tighter than a button, because the gap between segments already reads as padding. The selected segment is a `surface3` fill with `foreground` text, not an inverted one — inverting it inside thin chrome puts a white slab in the toolbar. A settings row sizes the controls in its trailing slot itself, default in a card and `sm` when nested (`packages/app/src/components/ui/control-size.tsx`), so don't pass a size to a button, dropdown or field placed in a row. Code that computes with a control's height outside a stylesheet uses `controlHeightForLayout`. Never shrink a control's font or padding locally to fit a context — if the context needs a smaller control, the size tier is missing or the wrong one is in use.
+Sizes are a shared contract across control kinds, defined once in `control-geometry.ts`: `xs` = 28px tall with `fontSize.sm` labels, `sm` = 32px with `fontSize.base`, `md`/`lg` = 44px with `fontSize.base`. `<SegmentedControl>` (`packages/app/src/components/ui/segmented-control.tsx`) takes the same `xs`/`sm`/`md` sizes — a segmented control next to a `<Button>` of the same size always matches in height, label size, and corner radius. Its segments run one padding step tighter than a button, because the gap between segments already reads as padding. The selected segment is a `surface3` fill with `foreground` text, not an inverted one — inverting it inside thin chrome puts a white slab in the toolbar. Text fields take `xs`, `sm` and `md`. Thin chrome such as the file toolbar uses `xs`. A settings row sizes the controls in its trailing slot itself, `sm` in a card and `xs` when nested (`packages/app/src/components/ui/control-size.tsx`), so don't pass a size to a button, dropdown or field placed in a row. Never shrink a control's font or padding locally to fit a context — if the context needs a smaller control, the size tier is missing or the wrong one is in use.

 A `<Pressable>` wrapping a `<Text>` is a sixth variant. It is wrong. `<Button>` accepts `style`, `textStyle`, `leftIcon`, `disabled`, `size`, and `variant`.

@@ -102,7 +102,7 @@ Five primitives. The pick is determined by option count, the need to search, and

 `<ContextMenu>` is for right-click and long-press on a target. The row is the trigger; there is no visible affordance. Used for incidental actions on workspace rows in the sidebar (`packages/app/src/components/sidebar-workspace-list.tsx`).

-`<AdaptiveModalSheet>` is for a focused task. Multi-field forms (`packages/app/src/hosts/add-host/internal/add-host-modal.tsx`, `packages/app/src/hosts/add-host/internal/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. Both sit on `surface0`, the same base as a screen, so settings cards and inputs inside a modal read the way they do on the Settings screen. Raw `Modal` is wrong for any of these.
+`<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 the presentation. Its content inset — the gutter that puts sheet content on the same rails as the sheet header — and compact bottom safe-area padding are the sheet's, not the caller's. A caller declares layout intent through `contentStyle` and never branches on form factor to add its own margins. 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.

@@ -114,7 +114,7 @@ Three themes is `DropdownMenu`. Thirty hosts is `Combobox`. A label and a value

 ## 7. Density and rhythm

-Settings detail pages, the projects detail page, and any list+detail content sit inside a centered, max-width 720 column (`packages/app/src/screens/settings-screen.tsx`, `packages/app/src/screens/projects-screen.tsx`). Lines stay readable, the eye does not have to track wide horizontal distances. Form modals carry their own narrower content frame (`packages/app/src/hosts/add-host/internal/add-host-modal.tsx`).
+Settings detail pages, the projects detail page, and any list+detail content sit inside a centered, max-width 720 column (`packages/app/src/screens/settings-screen.tsx`, `packages/app/src/screens/projects-screen.tsx`). Lines stay readable, the eye does not have to track wide horizontal distances. Form modals carry their own narrower content frame (`packages/app/src/components/add-host-modal.tsx`).

 Workspace and chat surfaces use the full width — these are working surfaces, not reading surfaces. The composer carries `MAX_CONTENT_WIDTH` from `packages/app/src/constants/layout.ts` to keep lines readable while letting the workspace pane fill the rest.

@@ -126,7 +126,7 @@ Cards inside a section sit closer than sections. Rows inside a card touch — on

 Rows have generous vertical padding: roughly 16px of content plus 16px of vertical padding for settings rows, 8–12px for sidebar list items where many rows must fit. Compressing rows below the established density to fit more on the screen is wrong. Too many rows means more cards or more sections, not smaller rows.

-Rows revealed under a `<SettingsCollapsibleRow>` are nested rows, one step smaller than card rows: 8px of vertical padding, `fontSize.sm` text, `sm` controls, and one fixed height so rows with and without a trailing button line up. The collapsible row sets this for everything under it (`packages/app/src/components/settings/row-density.tsx`). Never pass a density to a row, and never pad or resize a nested row by hand.
+Rows revealed under a `<SettingsCollapsibleRow>` are nested rows, one step smaller than card rows: 8px of vertical padding, `fontSize.sm` text, `xs` controls, and one fixed height so rows with and without a trailing button line up. The collapsible row sets this for everything under it (`packages/app/src/components/settings/row-density.tsx`). Never pass a density to a row, and never pad or resize a nested row by hand.

 The whitespace is the design.

@@ -197,11 +197,11 @@ Terminology:

 Loading is inline by default. `<LoadingSpinner size={14} color={foregroundMuted} />` sits next to the thing it relates to (`packages/app/src/screens/settings/providers-section.tsx:227-231`). Page-level loading is a centered `<LoadingSpinner size="large">` (`packages/app/src/screens/sessions-screen.tsx:69-72`). Card-level loading is a single short line, not a spinner. In-row dropdown items use `<DropdownMenuItem status="pending" pendingLabel="Removing...">`; the menu item handles its own pending state.

-Screen-level empty states use a centered, muted noun phrase and at most one ghost button (`packages/app/src/screens/sessions-screen.tsx`). Sidebar list empty states use a quiet bordered card with a left-aligned `sm` title, a muted `sm` description, and `sm` `<Button>` actions. Use `secondary` for the primary action and `outline` for a secondary action (`packages/app/src/components/sidebar/empty-states.tsx`). Keep both forms short and free of illustrations.
+Screen-level empty states use a centered, muted noun phrase and at most one ghost button (`packages/app/src/screens/sessions-screen.tsx`). Sidebar list empty states use a quiet bordered card with a left-aligned `sm` title, a muted `sm` description, and `xs` `<Button>` actions. Use `secondary` for the primary action and `outline` for a secondary action (`packages/app/src/components/sidebar/empty-states.tsx`). Keep both forms short and free of illustrations.

 Inline errors are a single sentence in `palette.red[300]` `xs`, sitting under the field or inside the card it relates to (`packages/app/src/screens/settings/providers-section.tsx:115-119`).

-Page-level alerts — informational notices, success confirmations, warnings, or recoverable errors that need a small visible block on the page — use `<Alert>` (`packages/app/src/components/ui/alert.tsx`). Variants: `default`, `info`, `success`, `warning`, `error`. The chrome is quiet by design: a 1px tinted border, transparent background, a small variant-tinted icon, the title in the variant accent, the description in `foregroundMuted`. Actions go in the `children` slot as `<Button variant="outline">` — recovery actions are low-frequency and outline keeps them quiet alongside the alert's accent (`packages/app/src/screens/project-settings-screen.tsx`). One `<Alert>` at a time per region.
+Page-level alerts — informational notices, success confirmations, warnings, or recoverable errors that need a small visible block on the page — use `<Alert>` (`packages/app/src/components/ui/alert.tsx`). Variants: `default`, `info`, `success`, `warning`, `error`. The chrome is quiet by design: a 1px tinted border, transparent background, a small variant-tinted icon, the title in the variant accent, the description in `foregroundMuted`. Actions go in the `children` slot as `<Button variant="outline" size="sm">` — recovery actions are low-frequency and outline keeps them quiet alongside the alert's accent (`packages/app/src/screens/project-settings-screen.tsx`). One `<Alert>` at a time per region.

 Sidebar callouts — cross-cutting alerts that apply across the whole app, like worktree setup, Rosetta install, and desktop update available — register through `useSidebarCallouts()` and render in the left sidebar via `<SidebarCallout>` (`packages/app/src/components/sidebar-callout.tsx`). The chrome (top-border-only, full-width action buttons) is tuned for that ~280px column. Canonical sources: `packages/app/src/components/worktree-setup-callout-source.tsx`, `packages/app/src/desktop/updates/rosetta-callout-source.tsx`, `packages/app/src/desktop/updates/update-callout-source.tsx`. Never import `<SidebarCallout>` into a page — that's what `<Alert>` is for.

@@ -251,7 +251,7 @@ New status pills use `<StatusBadge>`. Identity, shortcut, and interactive link b

 ## 14. Forbidden

- `fontWeight.medium` on row titles, body text, badge text, or `<SidebarCallout>` titles. Medium is reserved for the structural-label tier described in §3 — section labels, modal/sheet titles, dense metadata emphasis, and tight action labels. Anything else is `normal`. `<ScreenTitle>` is responsive `400/300` and is never overridden.
+- `fontWeight.medium` on row titles, body text, button labels, badge text, or `<SidebarCallout>` titles. Medium is reserved for the structural-label tier described in §3 — section labels, modal/sheet titles, dense metadata emphasis, and tight action labels. Anything else is `normal`. `<ScreenTitle>` is responsive `400/300` and is never overridden.
 - `<Pressable>` wrapping `<Text>` to make a button. `<Button>` exists.
 - Importing `Pressable` or a `Touchable*` outside `components/ui/`. A raw pressable has no standard press or hover feedback, so every one drifts. `paseo/no-raw-pressable` reports it; the files on its burn-down list in `.oxlintrc.json` may only leave it.
 - Bare `<Text>` for a section header inside settings. `<SettingsSection>` exists.
@@ -278,7 +278,7 @@ New status pills use `<StatusBadge>`. Identity, shortcut, and interactive link b
 | List+detail (compact stack, desktop sidebar+pane)   | `packages/app/src/screens/settings-screen.tsx`, `packages/app/src/screens/projects-screen.tsx`                                                                                                                                                                                                           |
 | Detail card+row                                     | `packages/app/src/screens/settings/host-page.tsx`, `packages/app/src/screens/settings/providers-section.tsx`                                                                                                                                                                                             |
 | Section grouping inside a card list                 | `packages/app/src/screens/settings/settings-section.tsx`                                                                                                                                                                                                                                                 |
-| Form modal (label + input fields, primary + cancel) | `packages/app/src/hosts/add-host/internal/add-host-modal.tsx`, `packages/app/src/hosts/add-host/internal/pair-link-modal.tsx`, `packages/app/src/components/project-picker-modal.tsx`                                                                                                                    |
+| Form modal (label + input fields, primary + cancel) | `packages/app/src/components/add-host-modal.tsx`, `packages/app/src/components/pair-link-modal.tsx`, `packages/app/src/components/project-picker-modal.tsx`                                                                                                                                              |
 | Destructive confirmation                            | `confirmDialog` invoked from `packages/app/src/screens/settings/host-page.tsx:541-547`                                                                                                                                                                                                                   |
 | Centered hero / first-run                           | `packages/app/src/components/welcome-screen.tsx`                                                                                                                                                                                                                                                         |
 | Sidebar list (workspaces, hosts)                    | `packages/app/src/components/sidebar-workspace-list.tsx`, `packages/app/src/components/left-sidebar.tsx`                                                                                                                                                                                                 |
@@ -58,12 +58,6 @@ restore the same workspace and could repeat the crash.

 ## App-Wide Route Hops

-Keep Add host in `hosts/add-host`, opened through `useAddHost()`. It is an in-place
-flow; callers choose what happens after success. Settings opts into the new host’s
-Overview. Do not send callers to Settings with an `addHost` query parameter: a
-retained route replays that request when appearance changes remount its content.
-The flow provider and sheet host stay outside appearance keys so open drafts survive.
-
 When app-wide routes such as `/new`, `/settings`, or `/sessions` navigate back
 into a host workspace, use `navigateToWorkspace()`. Do not make the caller
 branch on its current route.
@@ -97,15 +97,19 @@ Register the adapter in `defaultForgeRegistry` with:
 - `matchesHost` from manifest `cloudHosts`
 - `probeHost` when self-hosted/Enterprise detection is supported

-Current change-request lookup matches the branch and repository for both open and
-terminal requests. Prefer an open request, then a terminal request at the local
-HEAD, then the most recently updated terminal request. A reused branch can show
-its previous request until a new one opens. Auto-archive separately requires an
-observed open-to-merged transition and a fresh exact match between checkout HEAD
-and the PR head, along with the existing workspace safety checks.
+Current change-request lookup uses two identities deliberately:

-Keep checkout HEAD in adapter cache and poll identities so checkout changes
-refresh the facts used by archive eligibility.
+- An open PR/MR belongs to the checkout when its head branch and head repository
+  match. Its remote head SHA may differ because the checkout can be ahead,
+  behind, or contain commits that have not been pushed yet.
+- A merged or closed PR/MR belongs to the checkout only when its recorded head
+  SHA exactly matches the checkout's current `HEAD`. Branch names are reusable;
+  selecting the newest terminal request by branch alone can silently attach an
+  old promotion or feature request to new work.
+
+Thread the checkout head SHA through adapter cache and poll identities as well
+as the lookup itself. Otherwise a commit made on the same branch can inherit the
+previous commit's cached terminal status until the cache expires.

 Cloud hosts in the manifest are a bounded public-host list, not a self-host
 allowlist. Self-hosted detection is a trust gate: Paseo only talks to a forge
@@ -121,8 +125,7 @@ rendering stack:
 `acme.ts` exports a `ClientForgeLogicModule`:

 - `id`
- optional `urlGrammar` (including `referencePaths` for composer auto-attachment
-  and Markdown shorthand references)
+- optional `urlGrammar` (including `referencePaths` for composer auto-attachment)
 - optional `facts` registration (schema, merge-capability, native-check fallbacks)

 `acme.view.tsx` exports a `ClientForgeViewModule`:
@@ -209,12 +212,6 @@ are stale, run `npm run build:server`.
  neutral extractor matches the pasted host and full repository path against
  the current remote before it invokes cwd-routed forge search. Do not add a
  central forge switch or guess a self-hosted Gitea-family brand from URL shape.
- Shorthand references in rendered Markdown (`#12`, GitLab and Gitea `!12`,
-  cross-repository `owner/repo#12`) come from the `sigil` on each
-  `referencePaths` entry. Leave `sigil` off a kind the forge does not link in
-  prose: GitHub has no `!`, and its `#` targets `/issues/`, which GitHub
-  redirects to the pull request. `packages/app/src/git/forge-shorthand` builds
-  the recognition pattern from the workspace descriptor's forge and remote.
 - GitLab pipeline status constants belong to the GitLab adapter/client module,
  not protocol.
 - GitLab `manual` jobs need `allow_failure` to distinguish optional gray jobs
@@ -1,86 +0,0 @@
-# Keyboard shortcuts
-
-Define shortcuts in [the shared binding table](../packages/app/src/keyboard/keyboard-shortcuts.ts). Platforms contribute key sources, not separate action maps, so matching and user rebinds stay consistent across runtimes. Add a shortcut through a binding; add platform support through a key source.
-
-## Badges and routing
-
-Routing runs whenever the app mounts its key sources, independently of layout.
-Use `useHardwareKeyboardPresent()` for hints and the Shortcuts settings section.
-iOS reads `GCKeyboard.coalesced` and connection notifications. Android watches input
-devices and hardware keyboard configuration. Web starts with a fine hover pointer and recognizes the first modified
-keydown, including on touch devices. Compact Electron keeps its bindings.
-
-Keyboard navigation needs the sidebar's filtered workspace model even when its visual
-panel is hidden. Retain that model while keyboard navigation is active; gating it on
-panel visibility leaves number shortcuts with no targets after a compact startup.
-
-Composer send-key customization remains a separate capability. Native retains its
-existing Return submission path; advertising its web-only customization would expose
-settings the native composer does not implement.
-
-## Native sources
-
-Use the iOS window press stream for hardware keys. `UIKeyCommand` only takes keys
-that must bypass the focused text control: composer Return and the top overlay's
-Enter and arrows. Keep the stream as the sole shortcut emitter: a command-owned
-press is still observed by the window.
-
-The source spike used an iPad Pro 11-inch (M4) simulator on iOS 18.6 with a
-`UITextView` first responder. Both `UIWindow.sendEvent` and the root controller's
-`pressesBegan` received Cmd+B, Cmd+P and Escape. With Escape registered as a
-`UIKeyCommand`, the window observed it and the command handler also ran.
-
-Simulator reserves Cmd+K for Toggle Software Keyboard. Injecting it produced
-HID 184 with empty characters rather than K; plain K, Cmd+B and Cmd+P arrived
-normally. Keep Simulator input capture off: Send Keyboard Input to Device
-prevented synthetic AppleScript input from arriving, including plain text.
-For simulator QA, use Cmd+B/P to check delivery and rebind the command center to
-Cmd+J to check toggle and rebind behavior. Cmd+K delivery needs a physical iPad.
-Simulator also reserves Cmd+1…4, Cmd+Shift+A and Cmd+comma. Exercise those actions
-through rebinds. For numeric injection, use AppleScript physical key codes (for example
-25 for 9); `keystroke "9"` did not deliver a digit in the QA session.
-Simulator exposes a virtual `GCKeyboard` even with Connect Hardware Keyboard off.
-Verify the iOS absence case on a physical iPhone.
-
-Never register Backspace: it would take deletion away from text fields. Changes
-to the native module require a native rebuild; an over-the-air JavaScript update
-cannot deliver them.
-
-## Overlay ownership
-
-Register keyboard handling with `useOverlayRegistration` from `@/keyboard`.
-Pass the surface's open state, layer, handled keys and `onKeyDown`. The highest
-layer gets first refusal; the latest registration wins a tie. Native registration
-does not need a DOM ref. Web adds focus trapping and restoration through its adapter.
-
-Capture a global overlay’s layer in state for its opening lifetime. Memo caches can
-be discarded or removed by React Compiler; recomputing against the registry lets an
-open modal rise above its own children and creates competing focus traps.
-
-Declare Enter and arrow keys only while the surface owns them. Native sources
-use the top overlay's declarations to take those keys before text controls edit.
-Backspace stays with the focused input. Composition confirmation must not select
-an overlay row or submit the composer.
-
-Android modals have their own windows. Observe them through React Native's
-`ExtraWindowEventListener` as well as the activity window. The dev client bypasses
-Expo's root-container handler, so an activity root-view wrapper misses presses.
-A modal can forward an unhandled event into the activity window. Observe the event
-once across that nested delivery without retaining recycled Android `KeyEvent`s.
-Keep an overlay-owned press consumed through key-up, even if its key-down closes
-the overlay; otherwise the modal's default Escape handler can close a second layer.
-
-iOS scene startup installs the observing window after Expo creates its root view.
-Keep that integration in the hardware keyboard module's config plugin. Its window
-owns both the press stream and the text-control key commands, including above modals.
-
-## Focus scopes
-
-The composer and terminal declare focus with `useKeyboardFocusSurface`. Native
-scope derives from those declarations and command-center state. Releasing an old
-surface must not clear a newer owner's declaration during a tab switch. Web keeps
-its DOM-derived scope.
-
-Escape interrupts an agent only in the message input or an unclaimed surface.
-A focused terminal excludes that binding. The source leaves terminal Escape alone;
-terminal Escape/Ctrl forwarding is a separate feature.
@@ -10,9 +10,9 @@ Every block is separated by one gap, `density.blockGap`: 12 on compact layouts,

 ## Links and images

-Workspace file links use the shared file-link resolver. The workspace supplies its client, root and open-file action once; chat can supply the agent's more specific context. URLs use the same link press path. Recognized inline-code paths stay tappable. The library callback carries the tapped occurrence’s syntax context. Preserve it when opening files: explicit Markdown links decode URL escapes, while recognized inline-code paths preserve literal percent characters and use suffix lookup. Identical URL strings in different occurrences must stay distinct. Explicit absolute workspace links receive a relative hover title; existing authored titles remain intact. Inside a workspace, forge references such as `#12` and `owner/repo#12` are recognized in prose (not code) and open the workspace forge; the reference pattern comes before path recognition so `group/project#12` is not read as a path. See [forge providers](forge-providers.md#gotchas).
+Workspace file links use the shared file-link resolver. The workspace supplies its client, root and open-file action once; chat can supply the agent's more specific context. URLs use the same link press path. Recognized inline-code paths stay tappable. The library callback carries the tapped occurrence’s syntax context. Preserve it when opening files: explicit Markdown links decode URL escapes, while recognized inline-code paths preserve literal percent characters and use suffix lookup. Identical URL strings in different occurrences must stay distinct. Explicit absolute workspace links receive a relative hover title; existing authored titles remain intact.

-Resolve workspace image paths over the existing session RPC, then give the library a cached native file URL or web blob URL. HTTP(S) images pass through unchanged. This preserves relay, SSH and local socket connections, which do not expose a daemon HTTP endpoint. Each mounted renderer owns its image acquisition identity, so a later reply reads a rewritten path again while the earlier mounted reply retains its snapshot. Image taps open the attachment lightbox. File previews resolve relative images against the Markdown file's directory. An image alone on its line becomes its own paragraph before the library sees it, so it renders as a block on every platform; the library only treats sole-child paragraph images as blocks, and with hard soft breaks every newline is a break node, which left own-line images inline on iOS and web. Images that share a line with text stay inline at line height and keep their aspect ratio. A linked image counts as an image, so review-bot badges such as `[![Retrigger](badge.svg)](url) Confidence` stay inline on web; the library's web renderer only checked direct paragraph children, so it rendered them as full-width block images (local patch in `patches/react-native-enriched-markdown+*.patch`).
+Resolve workspace image paths over the existing session RPC, then give the library a cached native file URL or web blob URL. HTTP(S) images pass through unchanged. This preserves relay, SSH and local socket connections, which do not expose a daemon HTTP endpoint. Each mounted renderer owns its image acquisition identity, so a later reply reads a rewritten path again while the earlier mounted reply retains its snapshot. Image taps open the attachment lightbox. File previews resolve relative images against the Markdown file's directory. An image alone on its line becomes its own paragraph before the library sees it, so it renders as a block on every platform; the library only treats sole-child paragraph images as blocks, and with hard soft breaks every newline is a break node, which left own-line images inline on iOS and web. Images that share a line with text stay inline.

 ## Engine constraints

@@ -357,27 +357,9 @@ keys are stored under a `param.` prefix; plugins never see it and may use any ke
 `openScreen` validates its input once (`parsePluginOpenScreenInput`); code past it trusts the
 params.

-RPC and subscription contracts validate inputs, outputs, and events in both the app and plugin
-subprocess. `useRpc` returns a typed async function. Use the host-provided `@tanstack/react-query`
-for request state and caching; Paseo gives each plugin installation its own query client.
-
-A subscription is a session-owned observation (`plugin-rpc` delivery family): the session that
-subscribed owns its lifetime, so release, disconnect, plugin stop, and reload need no plugin code.
-Each subscriber gets its own handler call in the subprocess; there is no fan-out or replay. The
-runtime buffers pushes until the session has sent `plugin.rpc.subscribe.response`, so a client
-never sees an event for an unknown subscription. The app installation's lifetime aborts every
-subscription its surfaces left open, and a reload replaces the installation, which resubscribes
-mounted hooks.
-
-The byte rule (a top-level `Uint8Array` is binary, a nested one is a validation error) is checked
-once per hop by `assertPluginWireValue`. Bytes ride plugin binary frames, opcodes `0x20`-`0x2f`
-(`packages/protocol/src/binary-frames/plugin.ts`); nothing on the path copies or re-encodes them,
-and `plugin-subscriptions.perf.e2e.test.ts` locks that. Keep it that way: never stringify a plugin
-payload for a log, and the client's bootstrap buffer holds bytes only until the first observer
-attaches. Binary outputs reach only clients that send `pluginBinaryPayloads`. A binary input
-frame (`0x22`) becomes a synthetic `plugin.rpc.invoke.request` and runs through the normal message
-path, so it is authorized like any other invoke. The author contract, including the native upload
-limit, is in [stream events from the daemon](../public-docs/plugins/reference.md#subscriptions).
+RPC contracts validate inputs and outputs in both the app and plugin subprocess. `useRpc` returns a
+typed async function. Use the host-provided `@tanstack/react-query` for request state and caching;
+Paseo gives each plugin installation its own query client.

 `usePaseo()` and the handler's `{ paseo }` context expose the same `PaseoApi`: projects,
 workspaces, agents, terminals, providers, and daemon config. They do not expose connection lifecycle.
@@ -1,10 +0,0 @@
-Daemon restarts now keep terminal programs running. Interrupted agents can resume in their existing conversations when you turn on agent recovery.
-
-Mobile terminals have native rendering and draggable text-selection handles. Reconnecting restores up to 10,000 lines of terminal history.
-
-Worktree setup can copy ignored files and use plugin-defined locations before agents start.
-
-Added
- Insert known agent commands from replies into the Composer draft
-
-Full notes: https://paseo.sh/changelog
@@ -1,10 +0,0 @@
-Daemon restarts now keep terminal programs running. Interrupted agents can resume in their existing conversations when you turn on agent recovery.
-
-Mobile terminals have native rendering and draggable text-selection handles. Reconnecting restores up to 10,000 lines of terminal history.
-
-Worktree setup can copy ignored files and use plugin-defined locations before agents start.
-
-Added
- Insert known agent commands from replies into the Composer draft
-
-Full notes: https://paseo.sh/changelog
@@ -1,10 +0,0 @@
-Daemon restarts now keep terminal programs running. Interrupted agents can resume in their existing conversations when you turn on agent recovery.
-
-Mobile terminals have native rendering and draggable text-selection handles. Reconnecting restores up to 10,000 lines of terminal history.
-
-Worktree setup can copy ignored files and use plugin-defined locations before agents start.
-
-Added
- Insert known agent commands from replies into the Composer draft
-
-Full notes: https://paseo.sh/changelog
@@ -1,10 +0,0 @@
-Daemon restarts now keep terminal programs running. Interrupted agents can resume in their existing conversations when you turn on agent recovery.
-
-Mobile terminals have native rendering and draggable text-selection handles. Reconnecting restores up to 10,000 lines of terminal history.
-
-Worktree setup can copy ignored files and use plugin-defined locations before agents start.
-
-Added
- Insert known agent commands from replies into the Composer draft
-
-Full notes: https://paseo.sh/changelog
@@ -127,7 +127,7 @@ buildNpmPackage {
        # The Nix output is not a distributable DMG, so leave it unsigned and
        # disable the hardened runtime that requires a matching signature.
        CSC_IDENTITY_AUTO_DISCOVERY=false \
-          npm exec --offline -- electron-builder \
+          ../../node_modules/.bin/electron-builder \
            --config electron-builder.yml \
            --dir \
            --mac \
@@ -1 +1 @@
-sha256-VdM4lXdgNEXPpTfvHSFvF9nm302rK/ZbVkZUp9tyOfg=
+sha256-CeT2PtYIAFwvBC9LIku8VkTl0pvKxYzSCn0QW2ManfU=
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.15.0",
+  "version": "0.15.0-beta.1",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -142,7 +142,6 @@ export default {
      searchPaths: ["../../node_modules", "./node_modules"],
    },
    plugins: [
-      "./modules/paseo-hardware-keyboard/app.plugin",
      "expo-router",
      withPasteInput,
      withAndroidScroll,
@@ -94,21 +94,3 @@ it("allows all orientations on iPhone and iPad", async () => {
    await rm(root, { recursive: true, force: true });
  }
 }, 30_000);
-
-// Scene startup is the integration boundary for the iOS keyboard window.
-describe("hardware keyboard scene integration", () => {
-  it("installs observation after Expo creates the scene window and is idempotent", () => {
-    const {
-      configureHardwareKeyboardAppDelegate,
-    } = require("./modules/paseo-hardware-keyboard/app.plugin.js");
-    const source =
-      "import Expo\nclass Scene {\n  super.scene(scene, willConnectTo: session, options: connectionOptions)\n}\n";
-    const configured = configureHardwareKeyboardAppDelegate(source);
-    expect(configured).toContain("import PaseoHardwareKeyboard");
-    expect(configured).toContain("PaseoHardwareKeyboardWindow.observing(window)");
-    expect(configured.indexOf("super.scene")).toBeLessThan(
-      configured.indexOf(".observing(window)"),
-    );
-    expect(configureHardwareKeyboardAppDelegate(configured)).toBe(configured);
-  });
-});
@@ -5,7 +5,6 @@ import path from "node:path";
 import { test, expect } from "../support/fixtures";
 import {
  addProjectFlow,
-  chooseAddHostFromProjectFlow,
  addProjectFlowBack,
  addProjectFlowHost,
  addProjectFlowInput,
@@ -15,14 +14,11 @@ import {
  expectNewWorkspaceForAddedProject,
  expectAddProjectResultVisible,
  navigateAddProjectResults,
-  navigateAndDismissAddProject,
-  watchAddProjectRenderWarnings,
  openAddProjectFlow,
  openAddProjectHostSelection,
 } from "../support/helpers/add-project-flow";
 import { gotoAppShell } from "../support/helpers/app";
 import {
-  disconnectAllHostsAndReload,
  addConnectedHostAndReload,
  addConnectedHostsAndReload,
  addOfflineHostAndReload,
@@ -73,19 +69,6 @@ async function expectProjectHasNoWorkspaces(projectId: string): Promise<void> {
 test.describe("Add Project command-center flow", () => {
  test.describe.configure({ timeout: 180_000 });

-  test("Add host replaces the project dialog when no hosts are connected", async ({ page }) => {
-    await gotoAppShell(page);
-    await disconnectAllHostsAndReload(page);
-    await openAddProjectHostSelection(page);
-    const originalUrl = page.url();
-    await chooseAddHostFromProjectFlow(page);
-    await expect(addProjectFlow(page)).toBeHidden();
-    await expect(
-      page.getByRole("button", { name: "Direct connection", exact: true }),
-    ).toBeVisible();
-    await expect(page).toHaveURL(originalUrl);
-  });
-
  test("method selection shows the daemon's available project sources without search", async ({
    page,
  }) => {
@@ -148,7 +131,6 @@ test.describe("Add Project command-center flow", () => {
    test("Escape and Back restore searchable page input before closing at the root", async ({
      page,
    }) => {
-      const renderWarnings = watchAddProjectRenderWarnings(page);
      await gotoAppShell(page);
      await addConnectedHostAndReload(page, {
        serverId: secondaryHost.serverId,
@@ -186,9 +168,8 @@ test.describe("Add Project command-center flow", () => {

      await page.keyboard.press("Escape");
      await expectAddProjectPage(page, "host");
-      await navigateAndDismissAddProject(page);
+      await page.keyboard.press("Escape");
      await expect(addProjectFlow(page)).not.toBeVisible();
-      expect(renderWarnings).toEqual([]);
    });

    test("New directory creates a Project on the selected remote host", async ({ page }) => {
@@ -9,11 +9,9 @@ test("shows Pure black in the appearance picker", async ({ page }, testInfo) =>
  await expect(page.getByTestId("settings-sidebar")).toBeVisible();
  await openSettingsSection(page, "appearance");

-  await expect(page.getByRole("radio", { name: "System", exact: true })).toBeChecked();
-  await expect(
-    page.getByRole("radiogroup", { name: "Theme" }).getByRole("radio").first(),
-  ).toHaveAccessibleName("System");
-  await expect(page.getByRole("radio", { name: "Pure black", exact: true })).toBeVisible();
+  const themeTrigger = page.getByLabel("Theme: System", { exact: true });
+  await themeTrigger.click();
+  await expect(page.getByText("Pure black", { exact: true })).toBeVisible();
  await page.screenshot({
    path: testInfo.outputPath("appearance-theme-picker.png"),
    fullPage: true,
@@ -1,7 +1,6 @@
 import { execFileSync } from "node:child_process";
 import { mkdtemp, writeFile } from "node:fs/promises";
 import path from "node:path";
-import type { Locator } from "@playwright/test";
 import { test, expect, type Page } from "../support/fixtures";
 import { getServerId } from "../support/helpers/server-id";
 import { connectSeedClient } from "../support/helpers/seed-client";
@@ -60,14 +59,6 @@ async function openCompactActionsMenu(page: Page, workspaceId: string) {
  return menu;
 }

-async function expectActionsInOrder(menu: Locator, labels: readonly string[]) {
-  const items = menu.getByRole("menuitem");
-  await expect(items).toHaveCount(labels.length);
-  for (const [index, label] of labels.entries()) {
-    await expect(items.nth(index).getByText(label, { exact: true })).toBeVisible();
-  }
-}
-
 test("compact git actions menu lists a promoted Pull once", async ({ page }) => {
  const repoPath = await createRemoteRepo("compact-menu-pull-");
  cleanupTasks.push(async () => {
@@ -92,7 +83,12 @@ test("compact git actions menu lists a promoted Pull once", async ({ page }) =>
  const menu = await openCompactActionsMenu(page, workspaceId);

  await expect(menu.getByTestId("changes-menu-pull")).toHaveCount(1);
-  await expectActionsInOrder(menu, ["Pull", "Push", "Pull and push", "Archive workspace"]);
+  await expect(menu.getByRole("menuitem")).toHaveText([
+    "Pull",
+    "Push",
+    "Pull and push",
+    "Archive workspace",
+  ]);
 });

 test("compact git actions menu lists a promoted Push once", async ({ page }) => {
@@ -110,5 +106,10 @@ test("compact git actions menu lists a promoted Push once", async ({ page }) =>
  const menu = await openCompactActionsMenu(page, workspaceId);

  await expect(menu.getByTestId("changes-menu-push")).toHaveCount(1);
-  await expectActionsInOrder(menu, ["Push", "Pull", "Pull and push", "Archive workspace"]);
+  await expect(menu.getByRole("menuitem")).toHaveText([
+    "Push",
+    "Pull",
+    "Pull and push",
+    "Archive workspace",
+  ]);
 });
@@ -3,7 +3,7 @@ import {
  composerLocator,
  expectComposerDraft,
  expectComposerVisible,
-  fillComposerDraft,
+  submitMessage,
  typeIntoFocusedComposer,
 } from "../support/helpers/composer";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
@@ -12,14 +12,8 @@ function userMessages(page: Page) {
  return page.getByTestId("user-message");
 }

-async function sendDraftWhenReady(page: Page) {
-  await expect(page.getByRole("button", { name: "Send message", exact: true })).toBeEnabled();
-  await pressInComposer(page, "Enter");
-}
-
 async function sendAndWaitForMessage(page: Page, text: string, expectedCount: number) {
-  await fillComposerDraft(page, text);
-  await sendDraftWhenReady(page);
+  await submitMessage(page, text);
  await expect(userMessages(page)).toHaveCount(expectedCount, { timeout: 30_000 });
  await expectComposerDraft(page, "");
 }
@@ -55,7 +49,7 @@ test.describe("Composer recall", () => {
      await pressInComposer(page, "ArrowUp");
      await expectComposerDraft(page, "add tests for login");

-      await sendDraftWhenReady(page);
+      await pressInComposer(page, "Enter");
      await expect(userMessages(page)).toHaveCount(3, { timeout: 30_000 });
      await expect(userMessages(page).last()).toContainText("add tests for login");
    } finally {
@@ -63,24 +63,6 @@ function htmlPreview(page: Page) {
  };
 }

-async function followHtmlPreviewLink(page: Page, name: string): Promise<void> {
-  await htmlPreview(page).document.getByRole("link", { name, exact: true }).click();
-}
-
-async function expectPageHandlesFragment(
-  page: Page,
-  handler: "Document" | "Window",
-): Promise<void> {
-  const preview = htmlPreview(page);
-  await followHtmlPreviewLink(page, `${handler} handled jump`);
-  await expect(preview.document.getByRole("status")).toHaveText(`${handler} handled click`);
-  await expect(
-    preview.document.getByRole("heading", { name: "Target section" }),
-  ).not.toBeInViewport();
-  expect(await preview.document.locator("body").evaluate(() => location.hash)).toBe("");
-  expect(await preview.document.locator("body").evaluate(() => window.scrollY)).toBe(0);
-}
-
 async function selectFileView(page: Page, view: "Preview" | "Source"): Promise<void> {
  const option = page.getByTestId("file-panel-bar").getByRole("button", {
    name: view,
@@ -844,192 +826,6 @@ test.describe("CodeMirror workspace file editing", () => {
    await expect(preview.host).toBeVisible();
  });

-  test("keeps HTML fragment links in the preview and scrolls to the target", async ({
-    page,
-    withWorkspace,
-  }) => {
-    const workspace = await withWorkspace({ prefix: "html-fragments-" });
-    await writeFile(
-      path.join(workspace.repoPath, "fragments.html"),
-      `<!doctype html><html><body>
-<a href="#section">Jump to section</a>
-<div style="height: 1200px"></div>
-<h2 id="section">Target section</h2>
-</body></html>`,
-      "utf8",
-    );
-    await workspace.navigateTo();
-    await openWorkspaceFile(page, "fragments.html");
-
-    const preview = htmlPreview(page);
-    await expect(preview.document.getByRole("link", { name: "Jump to section" })).toBeVisible();
-    await page.screenshot({ path: test.info().outputPath("fragment-before-click.png") });
-    await preview.document.getByRole("link", { name: "Jump to section" }).click();
-
-    await expect(
-      preview.document.getByRole("heading", { name: "Target section" }),
-    ).toBeInViewport();
-    expect(await preview.document.locator("body").evaluate(() => location.hash)).toBe("#section");
-    expect(await preview.document.locator("body").evaluate(() => window.scrollY)).toBeGreaterThan(
-      0,
-    );
-    await page.screenshot({ path: test.info().outputPath("fragment-after-click.png") });
-  });
-
-  test("lets an HTML page prevent fragment navigation", async ({ page, withWorkspace }) => {
-    const workspace = await withWorkspace({ prefix: "html-fragment-handler-" });
-    await writeFile(
-      path.join(workspace.repoPath, "handled.html"),
-      `<!doctype html><html><body>
-<a href="#section" onclick="event.preventDefault(); document.querySelector('output').textContent = 'Page handled click'">Handled jump</a>
-<output>Waiting for click</output>
-<div style="height: 1200px"></div><h2 id="section">Target section</h2>
-</body></html>`,
-      "utf8",
-    );
-    await workspace.navigateTo();
-    await openWorkspaceFile(page, "handled.html");
-
-    const preview = htmlPreview(page);
-    await preview.document.getByRole("link", { name: "Handled jump" }).click();
-    await expect(preview.document.locator("output")).toHaveText("Page handled click");
-    await expect(
-      preview.document.getByRole("heading", { name: "Target section" }),
-    ).not.toBeInViewport();
-    expect(await preview.document.locator("body").evaluate(() => location.hash)).toBe("");
-    expect(await preview.document.locator("body").evaluate(() => window.scrollY)).toBe(0);
-  });
-
-  test("respects delegated HTML fragment handlers and normal URL parsing", async ({
-    page,
-    withWorkspace,
-  }) => {
-    const workspace = await withWorkspace({ prefix: "html-fragment-defaults-" });
-    await writeFile(
-      path.join(workspace.repoPath, "defaults.html"),
-      `<!doctype html><html><body>
-<nav style="position: fixed; top: 0; background: white">
-<a href="#section" id="document-handler">Document handled jump</a>
-<a href="#section" id="window-handler">Window handled jump</a>
-<a href=" \t#section\n">Whitespace jump</a>
-<a href="#100%">Percent jump</a>
-<output>Waiting for click</output>
-</nav>
-<div style="height: 1200px"></div><h2 id="section">Target section</h2>
-<div style="height: 1200px"></div><h2 id="100%">Percent target</h2>
-<div style="height: 1200px"></div>
-<script>
-document.addEventListener('click', function(event) {
-  if (event.target.id === 'document-handler') {
-    event.preventDefault(); document.querySelector('output').textContent = 'Document handled click';
-  }
-});
-window.addEventListener('click', function(event) {
-  if (event.target.id === 'window-handler') {
-    event.preventDefault(); document.querySelector('output').textContent = 'Window handled click';
-  }
-});
-</script></body></html>`,
-      "utf8",
-    );
-    await workspace.navigateTo();
-    await openWorkspaceFile(page, "defaults.html");
-
-    const preview = htmlPreview(page);
-    await expectPageHandlesFragment(page, "Document");
-    await expectPageHandlesFragment(page, "Window");
-
-    await followHtmlPreviewLink(page, "Whitespace jump");
-    await expect(
-      preview.document.getByRole("heading", { name: "Target section" }),
-    ).toBeInViewport();
-    await followHtmlPreviewLink(page, "Percent jump");
-    await expect(
-      preview.document.getByRole("heading", { name: "Percent target" }),
-    ).toBeInViewport();
-  });
-
-  test("handles HTML fragment targets, empty and missing fragments, and modified clicks", async ({
-    page,
-    withWorkspace,
-  }) => {
-    const workspace = await withWorkspace({ prefix: "html-fragment-targets-" });
-    await writeFile(
-      path.join(workspace.repoPath, "targets.html"),
-      `<!doctype html><html><head><style>:target { color: rgb(255, 0, 0); }</style></head><body>
-<nav style="position: fixed; top: 0; background: white">
-<a href="#section"><span>Nested jump</span></a>
-<a href="#legacy">Named jump</a>
-<a href="#encoded%20section">Encoded jump</a>
-<a href="#missing">Missing jump</a>
-<a href="#">Empty jump</a>
-<output>Waiting for hashchange</output><output id="modified">Waiting for modified click</output>
-</nav>
-<div style="height: 1200px"></div><h2 id="section">Target section</h2>
-<div style="height: 1200px"></div><a name="legacy">Named target</a>
-<div style="height: 1200px"></div><h2 id="encoded section">Encoded target</h2>
-<div style="height: 1200px"></div>
-<script>
-window.addEventListener('hashchange', function () { document.querySelector('output').textContent = location.hash || '(empty)'; });
-function modifiedClick(event) {
-  if (event.button === 1 || event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) {
-    document.getElementById('modified').textContent = String(event.defaultPrevented);
-    event.preventDefault();
-  }
-}
-window.addEventListener('click', modifiedClick);
-window.addEventListener('auxclick', modifiedClick);
-window.addEventListener('contextmenu', modifiedClick);
-</script></body></html>`,
-      "utf8",
-    );
-    await workspace.navigateTo();
-    await openWorkspaceFile(page, "targets.html");
-
-    const preview = htmlPreview(page);
-    const body = preview.document.locator("body");
-    const nested = preview.document.getByText("Nested jump", { exact: true });
-    await nested.click();
-    await expect(preview.document.locator("output").first()).toHaveText("#section");
-    await expect(
-      preview.document.getByRole("heading", { name: "Target section" }),
-    ).toBeInViewport();
-    await expect(preview.document.locator("#section")).toHaveCSS("color", "rgb(255, 0, 0)");
-
-    await body.evaluate(() => window.scrollTo(0, 0));
-    await nested.click();
-    await expect(
-      preview.document.getByRole("heading", { name: "Target section" }),
-    ).toBeInViewport();
-
-    await preview.document.getByRole("link", { name: "Named jump" }).click();
-    await expect(preview.document.getByText("Named target", { exact: true })).toBeInViewport();
-    await expect(preview.document.locator("output").first()).toHaveText("#legacy");
-
-    await preview.document.getByRole("link", { name: "Encoded jump" }).click();
-    await expect(
-      preview.document.getByRole("heading", { name: "Encoded target" }),
-    ).toBeInViewport();
-    await expect(preview.document.locator("output").first()).toHaveText("#encoded%20section");
-    const scrollY = await body.evaluate(() => window.scrollY);
-    await preview.document.getByRole("link", { name: "Missing jump" }).click();
-    expect(await body.evaluate(() => location.hash)).toBe("#missing");
-    expect(await body.evaluate(() => window.scrollY)).toBe(scrollY);
-
-    await preview.document.getByRole("link", { name: "Empty jump" }).click();
-    await expect(preview.document.locator("output").first()).toHaveText("(empty)");
-    expect(await body.evaluate(() => window.scrollY)).toBe(0);
-
-    for (const modifier of ["Control", "Meta", "Shift", "Alt"] as const) {
-      await nested.click({ modifiers: [modifier] });
-      await expect(preview.document.locator("#modified")).toHaveText("false");
-    }
-    await nested.click({ button: "middle" });
-    await expect(preview.document.locator("#modified")).toHaveText("false");
-    expect(await body.evaluate(() => location.hash)).toBe("");
-    expect(await body.evaluate(() => window.scrollY)).toBe(0);
-  });
-
  test("runs inline scripts without allowing fetch egress", async ({ page, withWorkspace }) => {
    test.setTimeout(90_000);
    const workspace = await withWorkspace({ prefix: "file-editing-html-csp-" });
@@ -1,6 +1,4 @@
-import { writeFile } from "node:fs/promises";
-import path from "node:path";
-import { expect, test } from "../support/fixtures";
+import { test } from "../support/fixtures";
 import {
  collapseFolder,
  expandFolder,
@@ -10,7 +8,6 @@ import {
  openFileExplorer,
  openFileFromExplorer,
 } from "../support/helpers/file-explorer";
-import { delayDirectoryListingResponse } from "../support/helpers/directory-listing-gate";
 import { gotoWorkspace } from "../support/helpers/launcher";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";

@@ -52,66 +49,3 @@ test.describe("File explorer collapse", () => {
    await expectExplorerEntryVisible(page, "guide.md");
  });
 });
-
-test("Files Refresh reveals new files when a cached collapsed folder is reopened", async ({
-  page,
-}) => {
-  await gotoWorkspace(page, workspace.workspaceId);
-  await openFileExplorer(page);
-  await expandFolder(page, "docs");
-  await expectExplorerEntryVisible(page, "guide.md");
-  await collapseFolder(page, "docs");
-  await expectExplorerEntryHidden(page, "guide.md");
-  await createFileOutsidePaseo("docs/NEW.md");
-  await refreshFiles(page);
-  await expandFolder(page, "docs");
-  await expectExplorerEntryVisible(page, "guide.md");
-  await expectExplorerEntryVisible(page, "NEW.md");
-
-  await createFileOutsidePaseo("docs/NEXT.md");
-  await refreshFiles(page);
-  await expectExplorerEntryVisible(page, "NEXT.md");
-});
-
-async function refreshFiles(page: import("@playwright/test").Page): Promise<void> {
-  const refresh = page.getByRole("button", { name: "Refresh files", exact: true });
-  await refresh.click();
-  await expect(refresh).toBeEnabled();
-}
-
-async function createFileOutsidePaseo(filePath: string): Promise<void> {
-  await writeFile(path.join(workspace.repoPath, filePath), "# New output\n");
-}
-
-test("Files Refresh ignores an old reply for a folder collapsed while loading", async ({
-  page,
-}) => {
-  const reply = await delayDirectoryListingResponse(page, "docs");
-  await gotoWorkspace(page, workspace.workspaceId);
-  await openFileExplorer(page);
-  await expandFolder(page, "docs");
-  await reply.waitUntilHeld();
-  await collapseFolder(page, "docs");
-  await createFileOutsidePaseo("docs/DELAYED.md");
-  await refreshFiles(page);
-  await reply.release();
-  await expandFolder(page, "docs");
-  await expectExplorerEntryVisible(page, "DELAYED.md");
-});
-
-test("Files Refresh preserves expanded folders while their saved view is restoring", async ({
-  page,
-}) => {
-  await gotoWorkspace(page, workspace.workspaceId);
-  await openFileExplorer(page);
-  await expandFolder(page, "docs");
-  await expectExplorerEntryVisible(page, "guide.md");
-  const reply = await delayDirectoryListingResponse(page, "docs");
-  await page.reload();
-  await openFileExplorer(page);
-  await reply.waitUntilHeld();
-  await refreshFiles(page);
-  await expectExplorerEntryVisible(page, "guide.md");
-  await reply.release();
-  await expectExplorerEntryVisible(page, "guide.md");
-});
@@ -294,17 +294,10 @@ test("creates, renames, copies, and deletes entries through the file explorer",

  await entry("renamed.txt").click({ button: "right" });
  const deleteAction = page.getByTestId(/file-explorer-row-\d+-delete$/);
-  await expect
-    .poll(async () => {
-      const labelColor = await deleteAction
-        .getByText("Delete", { exact: true })
-        .evaluate((element) => getComputedStyle(element).color);
-      const iconColor = await deleteAction
-        .locator("svg")
-        .evaluate((element) => getComputedStyle(element).stroke);
-      return labelColor !== "" && iconColor === labelColor;
-    })
-    .toBe(true);
+  const deleteLabelColor = await deleteAction
+    .getByText("Delete", { exact: true })
+    .evaluate((element) => getComputedStyle(element).color);
+  await expect(deleteAction.locator("svg")).toHaveCSS("stroke", deleteLabelColor);
  const cancelledConfirmation = new Promise<string>((resolve) => {
    page.once("dialog", async (dialog) => {
      const message = dialog.message();
@@ -122,14 +122,10 @@ test.describe("New workspace entry points", () => {
      });
      const hostTrigger = page.getByTestId("host-picker-trigger");
      await expect(hostTrigger).toContainText("localhost", { timeout: 30_000 });
-      const originalUrl = page.url();
      await hostTrigger.click();
      await expect(page.getByTestId("new-workspace-host-picker-add-host")).toBeVisible();
      await page.getByTestId("new-workspace-host-picker-add-host").click();
-      await expect(
-        page.getByRole("button", { name: "Direct connection", exact: true }),
-      ).toBeVisible();
-      await expect(page).toHaveURL(originalUrl);
+      await expect(page).toHaveURL(/\/settings\/general\?addHost=/);
    } finally {
      await seeded.cleanup();
    }
@@ -1,311 +0,0 @@
-import { execFileSync } from "node:child_process";
-import { mkdir, rm } from "node:fs/promises";
-import path from "node:path";
-import { expect, metroTest as test } from "../support/fixtures";
-import {
-  addProjectFromSetup,
-  continueSetup,
-  expectSetupStep,
-  finishSetup,
-  goToSetupStep,
-  hostGivesAgentsPaseoTools,
-  openAppAsNewUser,
-  openRelayPairingFromSetup,
-  closeRelayPairing,
-  openTailscaleDocsFromSetup,
-  paseoToolsSwitch,
-  pickTheme,
-  projectSuggestion,
-  projectSuggestionRow,
-  setupModal,
-  setupPrimaryButton,
-  showSetupAgainFromSettings,
-  skipSetup,
-  startSetupHost,
-} from "../support/helpers/onboarding";
-import {
-  chooseCustomSkills,
-  openSkillSelection,
-  saveSkillSelection,
-} from "../support/helpers/agent-skills";
-import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
-import { enableRelayAndExpectOffer } from "../support/helpers/pair-device";
-import { seedWorkspace } from "../support/helpers/seed-client";
-import { openSettingsHostSection } from "../support/helpers/settings";
-import { createTempDirectory, createTempGitRepo } from "../support/helpers/workspace";
-
-// Midnight's muted foreground (#9a9db0), which the step description is drawn in.
-const MIDNIGHT_MUTED_FOREGROUND = "rgb(154, 157, 176)";
-
-test("a new user is walked through setup once", async ({ page }, testInfo) => {
-  const host = await startSetupHost("fresh");
-  const repo = await createTempGitRepo("onboarding-folder-");
-
-  try {
-    await openAppAsNewUser(page, host);
-
-    await test.step("setup opens on Appearance and a theme applies at once", async () => {
-      await expectSetupStep(page, "Welcome to Paseo");
-      await pickTheme(page, "Midnight");
-      await expect(
-        setupModal(page).getByText("Let's start by picking a look", { exact: true }),
-      ).toHaveCSS("color", MIDNIGHT_MUTED_FOREGROUND);
-      await page.screenshot({ path: testInfo.outputPath("1-appearance.png") });
-    });
-
-    await test.step("Providers shows the same provider list as Settings", async () => {
-      await continueSetup(page);
-      await expectSetupStep(page, "Your agents");
-      await expect(setupModal(page).getByTestId("host-page-providers-card")).toBeVisible();
-      await page.screenshot({ path: testInfo.outputPath("2-providers.png") });
-    });
-
-    await test.step("with no agent history, Add project opens the regular flow and the folder shows as added", async () => {
-      await continueSetup(page);
-      await expectSetupStep(page, "Add your projects");
-      await expect(
-        setupModal(page).getByText("No recent projects found", { exact: true }),
-      ).toBeVisible({ timeout: 60_000 });
-      await addProjectFromSetup(page, repo.path);
-      await expectSetupStep(page, "Add your projects");
-      await expect(setupModal(page).getByText(repo.path, { exact: true })).toBeVisible();
-      await expect(setupModal(page).getByText("Added", { exact: true })).toBeVisible();
-      await page.screenshot({ path: testInfo.outputPath("3-projects.png") });
-    });
-
-    await test.step("Orchestration starts with its switches on", async () => {
-      await continueSetup(page);
-      await expectSetupStep(page, "Let agents use Paseo");
-      await expect(paseoToolsSwitch(setupModal(page))).toBeChecked();
-      await expect(
-        setupModal(page).getByRole("switch", { name: "Orchestration skills", exact: true }),
-      ).toBeChecked();
-      await page.screenshot({ path: testInfo.outputPath("4-orchestration.png") });
-    });
-
-    await test.step("Skip setup closes it for good", async () => {
-      await skipSetup(page);
-      await page.reload();
-      await expect(
-        page.locator('[data-testid^="sidebar-project-row-"]').filter({
-          hasText: path.basename(repo.path),
-        }),
-      ).toBeVisible({ timeout: 60_000 });
-      await expect(setupModal(page)).toHaveCount(0);
-    });
-  } finally {
-    await host.close();
-    await repo.cleanup();
-  }
-});
-
-test("setup suggests the repos the user already ran agents in", async ({ page }, testInfo) => {
-  const repo = await createTempGitRepo("onboarding-history-");
-  const repoName = path.basename(repo.path);
-  const subdirectory = path.join(repo.path, "packages", "web");
-  await mkdir(subdirectory, { recursive: true });
-  const worktree = `${repo.path}-fix`;
-  execFileSync("git", ["worktree", "add", "-b", "fix", worktree], { cwd: repo.path });
-  const scratch = await createTempDirectory("onboarding-scratch-");
-  const scratchName = path.basename(scratch.path);
-  const host = await startSetupHost("history", {
-    claudeSessionsIn: [repo.path, subdirectory, worktree, scratch.path, scratch.path, scratch.path],
-    withBrokenProvider: true,
-  });
-
-  try {
-    await openAppAsNewUser(page, host);
-    await expectSetupStep(page, "Welcome to Paseo");
-    await goToSetupStep(page, "Projects");
-    await expectSetupStep(page, "Add your projects");
-
-    await test.step("the repo, its subfolder and its worktree become one checked row", async () => {
-      await expect(projectSuggestion(page, repoName)).toBeChecked({ timeout: 60_000 });
-      await expect(projectSuggestion(page, scratchName)).toBeChecked();
-      await expect(setupModal(page).getByTestId("project-suggestion")).toHaveCount(2);
-    });
-
-    await test.step("a provider that cannot read its history adds nothing and shows no error", async () => {
-      await expect(setupModal(page).getByTestId("project-suggestions-skeleton")).toHaveCount(0, {
-        timeout: 60_000,
-      });
-      await expect(setupModal(page).getByText(/Broken ACP/)).toHaveCount(0);
-      await expect(setupModal(page).getByTestId("project-suggestion")).toHaveCount(2);
-    });
-
-    await test.step("the footer adds what is checked; the Add project flow is separate", async () => {
-      await expect(setupPrimaryButton(page, "Add 2 projects")).toBeVisible();
-      await expect(setupModal(page).getByRole("button", { name: "Continue" })).toHaveCount(0);
-      await expect(
-        setupModal(page).getByRole("button", { name: "Add project", exact: true }),
-      ).toBeVisible();
-      await page.screenshot({ path: testInfo.outputPath("8-project-suggestions.png") });
-      await projectSuggestion(page, repoName).click();
-      await projectSuggestion(page, scratchName).click();
-      await expect(setupPrimaryButton(page, "Continue")).toBeVisible();
-      await projectSuggestion(page, repoName).click();
-      await projectSuggestion(page, scratchName).click();
-    });
-
-    await test.step("a folder that cannot be added keeps the user on the step", async () => {
-      await scratch.cleanup();
-      await setupPrimaryButton(page, "Add 2 projects").click();
-      await expect(setupPrimaryButton(page, "Add 1 project")).toBeVisible({ timeout: 30_000 });
-      await expectSetupStep(page, "Add your projects");
-      await expect(projectSuggestion(page, scratchName)).toBeChecked();
-      await expect(projectSuggestionRow(page, scratchName)).toContainText("Directory not found");
-      await expect(projectSuggestion(page, repoName)).toHaveCount(0);
-      await page.screenshot({ path: testInfo.outputPath("9-project-suggestion-failed.png") });
-    });
-
-    await test.step("with nothing checked, Continue moves on without adding", async () => {
-      await projectSuggestion(page, scratchName).click();
-      await setupPrimaryButton(page, "Continue").click();
-      await expectSetupStep(page, "Let agents use Paseo");
-      await expect(
-        page.locator('[data-testid^="sidebar-project-row-"]').filter({ hasText: repoName }),
-      ).toBeVisible({ timeout: 60_000 });
-      await expect(
-        page.locator('[data-testid^="sidebar-project-row-"]').filter({ hasText: scratchName }),
-      ).toHaveCount(0);
-    });
-  } finally {
-    await host.close();
-    await rm(worktree, { recursive: true, force: true });
-    await repo.cleanup();
-    await scratch.cleanup();
-  }
-});
-
-test("an existing user only sees setup when they ask for it", async ({ page }) => {
-  const host = await startSetupHost("existing");
-  const workspace = await seedWorkspace({ repoPrefix: "onboarding-existing-", port: host.port });
-
-  try {
-    await openAppAsNewUser(page, host);
-    await expect(
-      page.getByTestId(`sidebar-workspace-row-${host.serverId}:${workspace.workspaceId}`),
-    ).toBeVisible({ timeout: 60_000 });
-    await expect(setupModal(page)).toHaveCount(0);
-
-    await showSetupAgainFromSettings(page);
-    await expectSetupStep(page, "Welcome to Paseo");
-    await expect(setupModal(page).getByRole("tab", { name: "Appearance" })).toHaveAttribute(
-      "aria-selected",
-      "true",
-    );
-  } finally {
-    await workspace.cleanup();
-    await host.close();
-  }
-});
-
-test("setup choices carry over to Settings and the phone step pairs over relay", async ({
-  page,
-}, testInfo) => {
-  const host = await startSetupHost("phone", { mutableRelay: { enabled: false } });
-
-  try {
-    await openAppAsNewUser(page, host);
-    await expectSetupStep(page, "Welcome to Paseo");
-
-    await test.step("Paseo tools start on in setup and Continue turns them on", async () => {
-      await goToSetupStep(page, "Orchestration");
-      await expectSetupStep(page, "Let agents use Paseo");
-      await expect(paseoToolsSwitch(setupModal(page))).toBeChecked();
-      await continueSetup(page);
-    });
-
-    await test.step("Phone offers Tailscale docs and pairs over relay in its own modal", async () => {
-      await expectSetupStep(page, "Take your agents with you");
-      await page.screenshot({ path: testInfo.outputPath("5-phone.png") });
-      expect(await openTailscaleDocsFromSetup(page)).toBe(
-        "https://paseo.sh/docs/connectivity#tailscale",
-      );
-      const pairing = await openRelayPairingFromSetup(page);
-      await expect(pairing.getByText("Enable relay?", { exact: true })).toBeVisible();
-      await enableRelayAndExpectOffer(page);
-      await page.screenshot({ path: testInfo.outputPath("6-phone-qr.png") });
-      await closeRelayPairing(pairing);
-    });
-
-    await test.step("Finish closes setup and Settings shows the same Paseo tools value", async () => {
-      await finishSetup(page);
-      await page.locator('[data-testid="sidebar-settings"]:visible').first().click();
-      await openSettingsHostSection(page, host.serverId, "agents");
-      await expect(paseoToolsSwitch(page)).toBeChecked();
-      await page.screenshot({ path: testInfo.outputPath("7-settings-agents.png") });
-    });
-  } finally {
-    await host.close();
-  }
-});
-
-test("with no skills picked, skills read as off and Continue moves on", async ({ page }) => {
-  const host = await startSetupHost("no-skills");
-
-  try {
-    await openAppAsNewUser(page, host);
-    await expectSetupStep(page, "Welcome to Paseo");
-    await goToSetupStep(page, "Orchestration");
-    await expectSetupStep(page, "Let agents use Paseo");
-
-    await openSkillSelection(page);
-    await chooseCustomSkills(page, []);
-    await saveSkillSelection(page);
-    const skillsSwitch = setupModal(page).getByRole("switch", {
-      name: "Orchestration skills",
-      exact: true,
-    });
-    await expect(skillsSwitch).not.toBeChecked();
-
-    await continueSetup(page);
-    await expectSetupStep(page, "Take your agents with you");
-  } finally {
-    await host.close();
-  }
-});
-
-test("in the compact layout, Finish on Orchestration applies its switches", async ({ page }) => {
-  await page.setViewportSize({ width: 390, height: 844 });
-  const host = await startSetupHost("compact");
-  const gate = await installDaemonWebSocketGate(page, { port: host.port });
-  // The compact sheet is the only surface on screen, and Orchestration is its last step.
-  const step = (title: string) =>
-    expect(page.getByRole("heading", { name: title, exact: true })).toBeVisible({
-      timeout: 60_000,
-    });
-  const primary = (label: string) => page.getByRole("button", { name: label, exact: true });
-
-  try {
-    await openAppAsNewUser(page, host);
-    await step("Welcome to Paseo");
-    await primary("Continue").click();
-    await step("Your agents");
-    await primary("Continue").click();
-    await step("Add your projects");
-    await primary("Continue").click();
-
-    // The setup host starts with Paseo tools off; the switch starts on.
-    expect(await hostGivesAgentsPaseoTools(host)).toBe(false);
-    await step("Let agents use Paseo");
-    await expect(paseoToolsSwitch(page)).toBeChecked();
-    // Skills are not installed, so leaving them off has nothing to apply.
-    const skillsSwitch = page.getByRole("switch", { name: "Orchestration skills", exact: true });
-    await skillsSwitch.click();
-    await expect(skillsSwitch).not.toBeChecked();
-    gate.holdNextClientRequest("set_daemon_config_request");
-    await primary("Finish").click();
-
-    // While the choices apply, none of them can change.
-    await gate.waitForHeldClientRequest();
-    await expect(paseoToolsSwitch(page)).toBeDisabled();
-    await expect(skillsSwitch).toBeDisabled();
-    gate.releaseHeldClientRequest();
-
-    await expect.poll(() => hostGivesAgentsPaseoTools(host), { timeout: 30_000 }).toBe(true);
-    await expect(page.getByRole("heading", { name: "Let agents use Paseo" })).toHaveCount(0);
-  } finally {
-    await host.close();
-  }
-});
@@ -27,7 +27,6 @@ import { seedWorkspace } from "../support/helpers/seed-client";
 import { getServerId } from "../support/helpers/server-id";
 import { installUsageReportsFixture } from "../support/helpers/usage-reports";
 import { claudeAndCodexReports } from "../support/helpers/usage-sidebar-item";
-import { daemonWsRoutePattern } from "../support/helpers/daemon-port";

 const APP_SETTINGS_KEY = "@paseo:app-settings";

@@ -134,30 +133,6 @@ function sidebarFooter(page: Page): Locator {
  return visibleTestId(page, "sidebar-add-project").locator("xpath=..");
 }

-function isPluginCatalogResponse(message: string | Buffer): boolean {
-  if (typeof message !== "string") return false;
-  const frame = JSON.parse(message);
-  return frame.type === "session" && frame.message?.type === "plugin.catalog.get.response";
-}
-
-async function holdNextPluginCatalogResponse(page: Page) {
-  const response = Promise.withResolvers<() => void>();
-  let holdCatalog = true;
-  await page.routeWebSocket(daemonWsRoutePattern(), (socket) => {
-    const server = socket.connectToServer();
-    socket.onMessage((message) => server.send(message));
-    server.onMessage((message) => {
-      if (holdCatalog && isPluginCatalogResponse(message)) {
-        holdCatalog = false;
-        response.resolve(() => socket.send(message));
-        return;
-      }
-      socket.send(message);
-    });
-  });
-  return { response: response.promise };
-}
-
 test.describe("Plugin sidebar items", () => {
  let workspaceId: string;
  let cleanup: () => Promise<void>;
@@ -176,38 +151,6 @@ test.describe("Plugin sidebar items", () => {
    await cleanup();
  });

-  test("a restored plugin screen waits for its catalog before rendering", async ({ page }) => {
-    await page.setViewportSize(WIDE);
-    await gotoWorkspace(page, workspaceId);
-    const row = headerRow(page, SHOWCASE_PLUGIN_ID, "deploys");
-    await expect(row).toBeVisible({ timeout: 30_000 });
-    await row.click();
-    const body = page.getByText("Deploys screen body", { exact: true });
-    await expect(body).toBeVisible();
-    const screenUrl = page.url();
-    const catalog = await holdNextPluginCatalogResponse(page);
-
-    await page.reload();
-    const releaseCatalog = await catalog.response;
-    try {
-      await expect(
-        page.getByRole("progressbar", { name: "Loading plugin", exact: true }),
-      ).toBeVisible();
-      await expect(
-        page.getByText("This plugin surface is unavailable.", { exact: true }),
-      ).toHaveCount(0);
-      await expect(body).toHaveCount(0);
-    } finally {
-      releaseCatalog();
-    }
-
-    await expect(body).toBeVisible();
-    await expect(
-      page.getByRole("progressbar", { name: "Loading plugin", exact: true }),
-    ).toHaveCount(0);
-    await expect(page).toHaveURL(screenUrl);
-  });
-
  test("a plugin's screen, header row, footer popover and command work together", async ({
    page,
  }) => {
@@ -1,79 +0,0 @@
-import { writeFile } from "node:fs/promises";
-import path from "node:path";
-import { expect, test, type Page } from "../support/fixtures";
-import { gotoAppShell } from "../support/helpers/app";
-import { openCommandCenter } from "../support/helpers/command-center";
-import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
-import { copyPluginExample } from "../support/helpers/plugin-fixture";
-import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
-import { getServerId } from "../support/helpers/server-id";
-import {
-  switchWorkspaceViaSidebar,
-  waitForWorkspaceInSidebar,
-} from "../support/helpers/workspace-ui";
-
-async function runCommand(page: Page, title: string): Promise<void> {
-  const panel = await openCommandCenter(page);
-  await panel.getByTestId("command-center-input").fill(title);
-  await panel.getByRole("button", { name: title, exact: true }).click();
-  await expect(panel).not.toBeVisible();
-}
-
-/** Installs a plugin example, opens a seeded workspace, and runs `exercise` against them. */
-async function withExample(
-  page: Page,
-  example: { name: string; id: string },
-  exercise: (workspace: SeededWorkspace) => Promise<void>,
-): Promise<void> {
-  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
-  const previous = await client.getDaemonConfig();
-  const copy = await copyPluginExample(example.name);
-  const workspace = await seedWorkspace({ repoPrefix: `${example.name}-` });
-  try {
-    await client.patchDaemonConfig({ pluginsEnabled: true });
-    await client.installDirectoryPlugin(copy.directory);
-    await page.setViewportSize({ width: 1280, height: 800 });
-    await gotoAppShell(page);
-    const target = { serverId: getServerId(), workspaceId: workspace.workspaceId };
-    await waitForWorkspaceInSidebar(page, target);
-    await switchWorkspaceViaSidebar({ page, ...target });
-    await exercise(workspace);
-  } finally {
-    try {
-      await client.removePlugin(example.id);
-    } finally {
-      await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
-      await workspace.cleanup();
-      await client.close();
-      await copy.cleanup();
-    }
-  }
-}
-
-test.describe("plugin subscriptions", () => {
-  test.describe.configure({ timeout: 180_000 });
-
-  test("a panel follows events the daemon pushes as files change", async ({ page }) => {
-    await withExample(page, { name: "diff-watch", id: "diff-watch" }, async (workspace) => {
-      await runCommand(page, "Open live changes");
-      await expect(page.getByText("No changes", { exact: true })).toBeVisible();
-
-      await writeFile(path.join(workspace.repoPath, "pushed.txt"), "from the test\n");
-      await expect(page.getByText("1 file changed", { exact: true })).toBeVisible();
-      await expect(page.getByText("pushed.txt", { exact: true })).toBeVisible();
-    });
-  });
-
-  test("a panel plays streamed bytes and sends bytes back", async ({ page }) => {
-    await withExample(page, { name: "media-stream", id: "media-stream" }, async () => {
-      await runCommand(page, "Open media stream");
-      await expect(page.getByText("live", { exact: true })).toBeVisible();
-      await expect(page.getByText(/^[1-9]\d* video frames/)).toBeVisible();
-
-      await page.getByRole("button", { name: "Send this frame back", exact: true }).click();
-      await expect(
-        page.getByText(/^The daemon received [1-9]\d* bytes, sha256 [0-9a-f]{12}$/),
-      ).toBeVisible();
-    });
-  });
-});
@@ -2,6 +2,7 @@ import { pluginRequirements } from "../support/helpers/plugin-fixture";
 import { mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
+import type { Page } from "@playwright/test";
 import { expect, test } from "../support/fixtures";
 import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
 import { openSettingsSection } from "../support/helpers/settings";
@@ -68,7 +69,8 @@ test("applies a contributed theme and falls back when its plugin is gone", async
    await openSettingsSection(page, "appearance");

    const sectionTitle = page.getByText("Theme", { exact: true }).first();
-    const mochaItem = page.getByRole("radio", { name: "Catppuccin Mocha", exact: true });
+    await page.getByLabel("Theme: System", { exact: true }).click();
+    const mochaItem = page.getByText("Catppuccin Mocha", { exact: true });
    await expect(mochaItem).toBeVisible({ timeout: 30_000 });
    await page.screenshot({
      path: testInfo.outputPath("plugin-theme-picker.png"),
@@ -77,14 +79,14 @@ test("applies a contributed theme and falls back when its plugin is gone", async
    });

    await test.step("a contributed light theme uses the light palette", async () => {
-      const latteItem = page.getByRole("radio", { name: "Catppuccin Latte", exact: true });
-      await latteItem.click();
-      await expect(latteItem).toBeChecked();
+      await page.getByText("Catppuccin Latte", { exact: true }).click();
+      await expect(page.getByLabel("Theme: Catppuccin Latte", { exact: true })).toBeVisible();
      await expect(sectionTitle).toHaveCSS("color", LATTE_MUTED_FOREGROUND);
+      await page.getByLabel("Theme: Catppuccin Latte", { exact: true }).click();
    });

    await mochaItem.click();
-    await expect(mochaItem).toBeChecked();
+    await expect(page.getByLabel("Theme: Catppuccin Mocha", { exact: true })).toBeVisible();
    await expect(sectionTitle).toHaveCSS("color", MOCHA_MUTED_FOREGROUND);
    await page.screenshot({
      path: testInfo.outputPath("plugin-theme-applied.png"),
@@ -93,13 +95,15 @@ test("applies a contributed theme and falls back when its plugin is gone", async

    await test.step("the selection survives a reload", async () => {
      await page.reload();
-      await expect(mochaItem).toBeChecked({ timeout: 30_000 });
+      await expect(page.getByLabel("Theme: Catppuccin Mocha", { exact: true })).toBeVisible({
+        timeout: 30_000,
+      });
      await expect(sectionTitle).toHaveCSS("color", MOCHA_MUTED_FOREGROUND);
    });

    await test.step("removing the plugin falls back to the default theme", async () => {
      await client.removePlugin(PLUGIN_ID);
-      await expect(page.getByRole("radio", { name: "System", exact: true })).toBeChecked({
+      await expect(page.getByLabel("Theme: System", { exact: true })).toBeVisible({
        timeout: 30_000,
      });
      await expect(sectionTitle).not.toHaveCSS("color", MOCHA_MUTED_FOREGROUND);
@@ -143,7 +147,15 @@ const MANY_THEMES_SOURCE = `export default function contribute(plugin) {
  return () => {};
 }`;

-test("reaches the last theme when a plugin contributes more themes than fit", async ({
+async function scrollThemeMenuToLastTheme(page: Page) {
+  const firstTheme = page.getByText("Pack theme 1", { exact: true });
+  await expect(firstTheme).toBeVisible({ timeout: 30_000 });
+  await firstTheme.hover();
+  await page.mouse.wheel(0, 4000);
+  await expect(page.getByText(LAST_THEME_NAME, { exact: true })).toBeInViewport({ ratio: 1 });
+}
+
+test("scrolls to the last theme when a plugin contributes more themes than fit", async ({
  page,
 }, testInfo) => {
  const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-theme-many-e2e-"));
@@ -163,16 +175,15 @@ test("reaches the last theme when a plugin contributes more themes than fit", as
    await expect(page.getByTestId("settings-sidebar")).toBeVisible();
    await openSettingsSection(page, "appearance");

-    const lastTheme = page.getByRole("radio", { name: LAST_THEME_NAME, exact: true });
-    await expect(lastTheme).toBeAttached({ timeout: 30_000 });
-    await lastTheme.scrollIntoViewIfNeeded();
+    await page.getByLabel("Theme: System", { exact: true }).click();
+    await scrollThemeMenuToLastTheme(page);
    await page.screenshot({
      path: testInfo.outputPath("plugin-theme-picker-scrolled.png"),
      animations: "disabled",
    });

-    await lastTheme.click();
-    await expect(lastTheme).toBeChecked();
+    await page.getByText(LAST_THEME_NAME, { exact: true }).click();
+    await expect(page.getByLabel(`Theme: ${LAST_THEME_NAME}`, { exact: true })).toBeVisible();
  } finally {
    await client.removePlugin(MANY_THEMES_PLUGIN_ID).catch(() => undefined);
    await client
@@ -108,7 +108,10 @@ test.describe("Question option text", () => {
    }
  });

-  test("selecting description text keeps the question open", async ({ page, context }) => {
+  test("selecting description text never answers, and the label still does", async ({
+    page,
+    context,
+  }) => {
    test.setTimeout(180_000);
    const { session, card } = await openLinkedQuestions(page, context);
    try {
@@ -117,13 +120,16 @@ test.describe("Question option text", () => {

      await dragAcross(page, description);
      await expect.poll(() => selectedText(page)).toBe(DONE_DESCRIPTION);
+      await expectChecked(done, false);
+
      await description.getByText("Logs are at", { exact: false }).dblclick({
        position: { x: 4, y: 4 },
      });
      await expect.poll(() => selectedText(page)).toBe("Logs");
      await expectCurrentQuestion(page, { index: 1, total: 2, question: LINKED_QUESTION });
-      await expectChecked(done, true);
-      await continueToNextQuestion(page);
+      await expectChecked(done, false);
+
+      await done.getByText("Done", { exact: true }).click();
      await expectCurrentQuestion(page, { index: 2, total: 2, question: CHECKS_QUESTION });
      await openQuestion(page, { index: 1, total: 2 });
      await expectChecked(done, true);
@@ -132,17 +138,11 @@ test.describe("Question option text", () => {
    }
  });

-  test("double-clicking a single-select label selects once without advancing", async ({
-    page,
-    context,
-  }) => {
+  test("double-clicking a single-select label answers once", async ({ page, context }) => {
    test.setTimeout(180_000);
    const { session, card } = await openLinkedQuestions(page, context);
    try {
      await card.getByRole("radio", { name: "Done" }).getByText("Done", { exact: true }).dblclick();
-      await expectCurrentQuestion(page, { index: 1, total: 2, question: LINKED_QUESTION });
-      await expectChecked(card.getByRole("radio", { name: "Done" }), true);
-      await continueToNextQuestion(page);

      await expectCurrentQuestion(page, { index: 2, total: 2, question: CHECKS_QUESTION });
      await expectChecked(card.getByRole("checkbox", { name: "Lint" }), false);
@@ -154,12 +154,14 @@ test.describe("Question option text", () => {
    }
  });

-  test("multi-select descriptions support links and text selection", async ({ page, context }) => {
+  test("multi-select description links and selection leave the option unchanged", async ({
+    page,
+    context,
+  }) => {
    test.setTimeout(180_000);
    const { session, card } = await openLinkedQuestions(page, context);
    try {
      await card.getByRole("radio", { name: "Done" }).getByText("Done", { exact: true }).click();
-      await continueToNextQuestion(page);
      await expectCurrentQuestion(page, { index: 2, total: 2, question: CHECKS_QUESTION });

      const lint = card.getByRole("checkbox", { name: "Lint" });
@@ -175,16 +177,18 @@ test.describe("Question option text", () => {

      await dragAcross(page, description);
      await expect.poll(() => selectedText(page)).toBe(LINT_DESCRIPTION);
+      await expectChecked(lint, false);
+
      await description.getByText("Rules:", { exact: false }).dblclick({
        position: { x: 4, y: 4 },
      });
      await expect.poll(() => selectedText(page)).toBe("Rules");
-      await expectChecked(lint, true);
+      await expectChecked(lint, false);

      await typecheck.getByText("Typecheck", { exact: true }).dblclick();
      await expectChecked(typecheck, true);
      await lint.getByText("Lint", { exact: true }).click();
-      await expectChecked(lint, false);
+      await expectChecked(lint, true);
    } finally {
      await session.cleanup();
    }
@@ -264,7 +268,6 @@ test.describe("Question prompt pagination", () => {
      await expectQuestionHidden(page, SUCCESS_QUESTION);

      await chooseQuestionOption(page, "App");
-      await continueToNextQuestion(page);
      await expectCurrentQuestion(page, {
        index: 2,
        total: TOTAL_QUESTIONS,
@@ -285,7 +288,6 @@ test.describe("Question prompt pagination", () => {
        preview: 'flags.enabled("new-surface")',
      });
      await chooseQuestionOption(page, "Behind feature flag");
-      await continueToNextQuestion(page);
      await expectCurrentQuestion(page, {
        index: 3,
        total: TOTAL_QUESTIONS,
@@ -464,9 +466,7 @@ retryTest(
    retryTest.setTimeout(180_000);
    const card = page.getByTestId("question-form-card");
    await chooseQuestionOption(page, "App");
-    await continueToNextQuestion(page);
    await chooseQuestionOption(page, "Behind feature flag");
-    await continueToNextQuestion(page);
    await fillQuestionAnswer(page, {
      question: SUCCESS_QUESTION,
      answer: "Preserve my answers after a failed submission.",
@@ -520,9 +520,7 @@ retryTest(
    const card = page.getByTestId("question-form-card");
    questionClient.releaseFirstResponse();
    await chooseQuestionOption(page, "App");
-    await continueToNextQuestion(page);
    await chooseQuestionOption(page, "Behind feature flag");
-    await continueToNextQuestion(page);
    await fillQuestionAnswer(page, {
      question: SUCCESS_QUESTION,
      answer: "Start with the internal team.",
@@ -1,8 +1,3 @@
-import {
-  openGlobalNewWorkspaceComposer,
-  fillNewWorkspaceDraft,
-  expectNewWorkspaceDraft,
-} from "../support/helpers/new-workspace";
 import { readFile, mkdir, rename, rm } from "node:fs/promises";
 import path from "node:path";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
@@ -262,15 +257,12 @@ test.describe("Settings host page", () => {
  });
 });

-test("restart recovery defaults off and persists opt-in and custom prompt", async ({ page }) => {
+test("restart recovery host controls persist the opt-out and custom prompt", async ({ page }) => {
  const serverId = getServerId();
  await gotoAppShell(page);
  await openSettings(page);
  await openSettingsHost(page, serverId);
  await openHostSection(page, serverId, "agents");
-  await expectRestartRecoveryEnabled(page, false);
-  await setRestartRecoveryEnabled(page, true);
-  await page.reload();
  await expectRestartRecoveryEnabled(page, true);
  await expectRestartRecoveryPrompt(page, "Resume working.");
  await editRestartRecoveryPrompt(page, "Continue the interrupted work.");
@@ -281,71 +273,3 @@ test("restart recovery defaults off and persists opt-in and custom prompt", asyn
  await expectRestartRecoveryPrompt(page, "Continue the interrupted work.");
  await editRestartRecoveryPrompt(page, "Resume working.");
 });
-
-test("sidebar Add host preserves its caller and stays closed after theme changes", async ({
-  page,
-}) => {
-  await gotoAppShell(page);
-  await expect(page).toHaveURL(/\/open-project$/);
-  const originalUrl = page.url();
-  await openSidebarAddHost(page);
-  await expect(page).toHaveURL(originalUrl);
-  await closeAddHostAndChangeTheme(page);
-  await expect(page.getByRole("button", { name: "Direct connection", exact: true })).toBeHidden();
-  await expect(page).toHaveURL(originalUrl);
-});
-
-async function openSidebarAddHost(page: import("@playwright/test").Page) {
-  await page.getByRole("button", { name: "Hosts", exact: true }).click();
-  await page.getByRole("button", { name: "Add host", exact: true }).click();
-  await expect(page.getByRole("button", { name: "Direct connection", exact: true })).toBeVisible();
-}
-
-async function closeAddHostAndChangeTheme(page: import("@playwright/test").Page) {
-  await page.getByRole("button", { name: "Close", exact: true }).click();
-  await expect(page.getByRole("button", { name: "Direct connection", exact: true })).toBeHidden();
-  await page.keyboard.press("Control+Alt+t");
-}
-
-test("sidebar Add host completes without navigating", async ({ page }) => {
-  await gotoAppShell(page);
-  await expect(page).toHaveURL(/\/open-project$/);
-  const originalUrl = page.url();
-  await openSidebarAddHost(page);
-  await connectToTestHost(page);
-  await expect(page).toHaveURL(originalUrl);
-  await expect(page.getByRole("button", { name: "Hosts", exact: true })).toBeVisible();
-});
-
-test("Settings Add host opens the saved host Overview", async ({ page }) => {
-  await gotoAppShell(page);
-  await openSettings(page);
-  await addDirectHostFromSettings(page, { host: "127.0.0.1", port: Number(getE2EDaemonPort()) });
-  await expectSettingsHeader(page, "Overview");
-  await expect(page).toHaveURL(new RegExp(`/settings/hosts/${getServerId()}/host$`));
-});
-
-test("New workspace Add host preserves the prompt after connecting", async ({ page }) => {
-  await gotoAppShell(page);
-  await openGlobalNewWorkspaceComposer(page);
-  await fillNewWorkspaceDraft(page, "Keep this unfinished prompt while I add a host.");
-  const originalUrl = page.url();
-  await openNewWorkspaceAddHost(page);
-  await expect(page).toHaveURL(originalUrl);
-  await connectToTestHost(page);
-  await expect(page).toHaveURL(originalUrl);
-  await expectNewWorkspaceDraft(page, "Keep this unfinished prompt while I add a host.");
-});
-
-async function openNewWorkspaceAddHost(page: import("@playwright/test").Page) {
-  await page.getByTestId("host-picker-trigger").click();
-  await page.getByRole("button", { name: "Add host", exact: true }).click();
-}
-
-async function connectToTestHost(page: import("@playwright/test").Page) {
-  await page.getByRole("button", { name: "Direct connection", exact: true }).click();
-  await page.getByRole("textbox", { name: "Host", exact: true }).fill("127.0.0.1");
-  await page.getByRole("textbox", { name: "Port", exact: true }).fill(String(getE2EDaemonPort()));
-  await page.getByRole("button", { name: "Connect", exact: true }).click();
-  await expect(page.getByTestId("add-host-modal")).toBeHidden({ timeout: 30_000 });
-}
@@ -326,12 +326,12 @@ test.describe("Settings sidebar navigation", () => {

    await test.step("a dropdown owns Escape", async () => {
      await openSettingsSection(page, "appearance");
-      await page.getByLabel(/Highlight theme:/).click();
-      await expect(page.getByRole("menuitem", { name: "GitHub", exact: true })).toBeVisible();
+      await page.getByLabel(/Theme:/).click();
+      await expect(page.getByRole("menuitem", { name: "System", exact: true })).toBeVisible();

      await page.keyboard.press("Escape");

-      await expect(page.getByRole("menuitem", { name: "GitHub", exact: true })).toHaveCount(0);
+      await expect(page.getByRole("menuitem", { name: "System", exact: true })).toHaveCount(0);
      await expect(page).toHaveURL(/\/settings(\/|$)/);
    });

@@ -38,9 +38,12 @@ async function expectDarkIcons(expected, context) {
  assert.equal(windowState(), expected, context);
 }

-// Settings > Appearance shows every theme as a tile in one radio group.
 function selectTheme(theme) {
+  const current = ad("snapshot", "-i").match(/"Theme: ([^"]+)"/)?.[1];
+  assert(current, "Start on Settings > Appearance");
+  ad("press", `label="Theme: ${current}"`, "--settle");
  ad("press", `label="${theme}"`, "--settle");
+  ad("wait", "text", `Theme: ${theme}`, "5000");
 }

 ad("settings", "appearance", "light");
@@ -1,54 +0,0 @@
-// Open an existing compact chat, with the keyboard closed, then interrupt its host connection.
-// Hold that interruption externally (for example, stop a disposable SSH TCP forward).
-// Leave the daemon running. This test observes the public reconnecting state.
-// node placement.mjs <session> <platform> <coordinate-scale> <composer-label> <artifacts>
-// coordinate-scale is screenshot pixels per layout point (Android density; iOS snapshots use 1).
-import assert from "node:assert/strict";
-import { execFileSync } from "node:child_process";
-import { mkdirSync, writeFileSync } from "node:fs";
-import path from "node:path";
-
-const [, , session, platform, coordinateScale, composerLabel, artifacts] = process.argv;
-assert(
-  session && ["android", "ios"].includes(platform) && composerLabel && artifacts,
-  "Pass all five arguments",
-);
-const scale = Number(coordinateScale);
-assert(scale > 0, "Pass a positive coordinate scale");
-mkdirSync(artifacts, { recursive: true });
-function ad(...args) {
-  return execFileSync("agent-device", ["--session", session, "--platform", platform, ...args], {
-    encoding: "utf8",
-    timeout: 90_000,
-  });
-}
-function capture(name) {
-  const snapshot = ad("snapshot", "--raw", "--json");
-  writeFileSync(path.join(artifacts, `${name}.json`), snapshot);
-  ad("screenshot", path.join(artifacts, `${name}.png`));
-  const nodes = JSON.parse(snapshot).data.nodes;
-  const header = nodes.find((node) => node.identifier === "floating-header");
-  const toast = nodes.find((node) => node.identifier === "agent-reconnecting-toast");
-  assert(header?.rect && toast?.rect, "Measured header and reconnecting toast must be present");
-  assert(toast.rect.height > 0 && toast.rect.width > 0, "Toast must have visible bounds");
-  const gap = (toast.rect.y - header.rect.y - header.rect.height) / scale;
-  assert(Math.abs(gap - 12) <= 1, `${name}: actual header-to-toast gap ${gap}, expected12 points`);
-  return toast.rect.y / scale;
-}
-
-ad("wait", 'id="agent-reconnecting-toast"', "20000");
-const closedTop = capture("keyboard-closed");
-ad("press", `label=${JSON.stringify(composerLabel)}`);
-const opened = ad("snapshot", "--raw", "--json");
-const nodes = JSON.parse(opened).data.nodes;
-assert(
-  nodes.some(
-    (node) => /keyboard/i.test(node.type ?? "") || /inputmethod/i.test(node.bundleId ?? ""),
-  ),
-  "Use a real visible software keyboard; open Android sessions with --no-test-ime",
-);
-const openTop = capture("keyboard-open");
-assert(Math.abs(openTop - closedTop) <= 1, "Keyboard must not translate the toast");
-console.log(
-  "PASS: rendered reconnecting toast stays12 points below measured header, keyboard closed/open",
-);
@@ -107,8 +107,6 @@ const daemonTest = metroTest.extend<
 });

 const test = daemonTest.extend<{
-  /** Specs start past first-run setup; onboarding specs opt out to see a fresh install. */
-  e2eOnboardingCompleted: boolean;
  paseoE2ESetup: void;
  outdatedDaemon: OutdatedDaemon;
  desktopManagedOutdatedDaemon: OutdatedDaemon;
@@ -116,9 +114,8 @@ const test = daemonTest.extend<{
  projectPickerFixture: TrackedProjectPickerFixture;
  withWorkspace: WithWorkspace;
 }>({
-  e2eOnboardingCompleted: [true, { option: true }],
  paseoE2ESetup: [
-    async ({ page, e2eOnboardingCompleted }, provide, testInfo) => {
+    async ({ page }, provide, testInfo) => {
      const daemonPort = getE2EDaemonPort();
      const metroPort = process.env.E2E_METRO_PORT;
      if (!metroPort) {
@@ -160,7 +157,7 @@ const test = daemonTest.extend<{
      const createAgentPreferences = buildCreateAgentPreferences();

      await page.addInitScript(
-        ({ daemon, preferences, seedNonce: nonce, extraHostsKey, onboardingCompleted }) => {
+        ({ daemon, preferences, seedNonce: nonce, extraHostsKey }) => {
          // `addInitScript` runs on every navigation (including reloads). Some tests intentionally
          // override storage and reload; they can opt out of seeding for the *next* navigation by
          // setting this flag before the reload.
@@ -188,20 +185,12 @@ const test = daemonTest.extend<{
          if (!localStorage.getItem("@paseo:app-settings")) {
            localStorage.setItem("@paseo:app-settings", JSON.stringify({ chatDisplay: "full" }));
          }
-          // The shared daemon often has no projects, which would open first-run setup over the app.
-          if (onboardingCompleted && !localStorage.getItem("@paseo:onboarding")) {
-            localStorage.setItem(
-              "@paseo:onboarding",
-              JSON.stringify({ completedAt: new Date(0).toISOString() }),
-            );
-          }
        },
        {
          daemon: testDaemon,
          preferences: createAgentPreferences,
          seedNonce,
          extraHostsKey: EXTRA_HOSTS_KEY,
-          onboardingCompleted: e2eOnboardingCompleted,
        },
      );

@@ -113,29 +113,3 @@ export async function expectAddProjectResultVisible(page: Page, text: string): P
    })
    .toBe(true);
 }
-
-export async function chooseAddHostFromProjectFlow(page: Page): Promise<void> {
-  await page.getByRole("button", { name: /Add host.*No connected hosts/ }).click();
-}
-
-export async function navigateAndDismissAddProject(page: Page): Promise<void> {
-  // Keep both keys in one task so Escape closes with a selection update still queued.
-  await page.evaluate(() => {
-    for (const key of ["ArrowDown", "Escape"]) {
-      window.dispatchEvent(
-        new KeyboardEvent("keydown", { key, code: key, bubbles: true, cancelable: true }),
-      );
-    }
-  });
-}
-
-export function watchAddProjectRenderWarnings(page: Page): string[] {
-  const warnings: string[] = [];
-  page.on("console", (message) => {
-    const text = message.text();
-    if (text.includes("Cannot update a component") && text.includes("AddProjectFlow")) {
-      warnings.push(text);
-    }
-  });
-  return warnings;
-}
@@ -154,7 +154,7 @@ export async function chooseCustomSkills(page: Page, selected: string[]): Promis
  await all.click();
  const keep = new Set(selected);
  for (const name of await listSkillChoices(page)) {
-    if (!keep.has(name)) await skillSwitch(page, name).click();
+    if (!keep.has(name)) await page.getByRole("checkbox", { name, exact: true }).click();
  }
  await expectSkillChoices(page, selected);
 }
@@ -176,7 +176,7 @@ export async function cancelSkillSelection(page: Page): Promise<void> {
 }

 export async function toggleSkill(page: Page, name: string): Promise<void> {
-  await skillSwitch(page, name).click();
+  await page.getByRole("checkbox", { name, exact: true }).click();
 }

 export function answerNextRemovalWarning(
@@ -222,21 +222,15 @@ export async function expectSkillFile(
 export async function expectSkillChoices(page: Page, selected: string[]): Promise<void> {
  const expected = new Set(selected);
  for (const name of await listSkillChoices(page)) {
-    await expect(skillSwitch(page, name)).toBeChecked({
+    await expect(page.getByRole("checkbox", { name, exact: true })).toBeChecked({
      checked: expected.has(name),
    });
  }
 }

-/** One bundled skill's switch in the picker; "All skills" sits outside the list. */
-function skillSwitch(page: Page, name: string) {
-  return page.getByTestId("skill-selection-list-card").getByRole("switch", { name, exact: true });
-}
-
 async function listSkillChoices(page: Page): Promise<string[]> {
  return page
-    .getByTestId("skill-selection-list-card")
-    .getByRole("switch")
+    .getByRole("checkbox")
    .evaluateAll((elements) =>
      elements
        .map((element) => element.getAttribute("aria-label") ?? "")
@@ -1,5 +1,5 @@
 import type { Page, WebSocketRoute } from "@playwright/test";
-import { daemonWsRoutePattern, wsRoutePatternForPort } from "./daemon-port";
+import { daemonWsRoutePattern } from "./daemon-port";

 export interface DirectoryBootstrapCounts {
  agents: number;
@@ -294,8 +294,7 @@ function recordClientRequest(
  directoryStarts.total[directory] += 1;
 }

-/** Gates the shared E2E daemon, or the daemon on `port` for a spec that runs its own. */
-export async function installDaemonWebSocketGate(page: Page, options: { port?: number } = {}) {
+export async function installDaemonWebSocketGate(page: Page) {
  let acceptingConnections = true;
  let reconnectWithFreshClient = false;
  let suppressAgentStream = false;
@@ -446,11 +445,7 @@ export async function installDaemonWebSocketGate(page: Page, options: { port?: n
    return true;
  };

-  const routePattern =
-    options.port === undefined
-      ? daemonWsRoutePattern()
-      : wsRoutePatternForPort(String(options.port));
-  await page.routeWebSocket(routePattern, (ws) => {
+  await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
    if (!acceptingConnections) {
      blockedConnectionCount += 1;
      for (const resolve of blockedConnectionWaiters) resolve();
@@ -1,44 +0,0 @@
-import type { Page, WebSocketRoute } from "@playwright/test";
-import { daemonWsRoutePattern } from "./daemon-port";
-
-function listingResponse(message: string | Buffer) {
-  try {
-    const envelope = JSON.parse(message.toString());
-    return envelope.message?.type === "file_explorer_response" ? envelope.message.payload : null;
-  } catch {
-    return null;
-  }
-}
-
-/** Delay one real directory response after the daemon has read its contents. */
-export async function delayDirectoryListingResponse(page: Page, directoryPath: string) {
-  let held: { socket: WebSocketRoute; message: string | Buffer; requestId: string } | null = null;
-  let resolveHeld!: () => void;
-  const heldResponse = new Promise<void>((resolve) => {
-    resolveHeld = resolve;
-  });
-  await page.routeWebSocket(daemonWsRoutePattern(), (socket) => {
-    const server = socket.connectToServer();
-    socket.onMessage((message) => server.send(message));
-    server.onMessage((message) => {
-      const response = listingResponse(message);
-      if (!held && response?.mode === "list" && response.path === directoryPath) {
-        held = { socket, message, requestId: response.requestId };
-        resolveHeld();
-        return;
-      }
-      socket.send(message);
-    });
-  });
-  return {
-    waitUntilHeld: () => heldResponse,
-    release: async () => {
-      if (!held) throw new Error("Directory response must be held before release");
-      held.socket.send(held.message);
-      // Let the delivered reply update the UI before the user reopens the folder.
-      await page.evaluate(
-        () => new Promise<void>((resolve) => requestAnimationFrame(() => resolve())),
-      );
-    },
-  };
-}
@@ -273,25 +273,3 @@ export async function reloadPreservingHostRegistry(page: Page): Promise<void> {
  );
  await page.reload();
 }
-
-export async function disconnectAllHostsAndReload(page: Page): Promise<void> {
-  await page.evaluate(
-    ({ registryKey, nonceKey, disableSeedKey }) => {
-      const nonce = localStorage.getItem(nonceKey);
-      if (!nonce) throw new Error("Expected the e2e seed nonce");
-      const hosts = JSON.parse(localStorage.getItem(registryKey) ?? "[]");
-      for (const host of hosts) {
-        host.connections = [{ id: "offline", type: "directTcp", endpoint: "127.0.0.1:59999" }];
-        host.preferredConnectionId = "offline";
-      }
-      localStorage.setItem(registryKey, JSON.stringify(hosts));
-      localStorage.setItem(disableSeedKey, nonce);
-    },
-    {
-      registryKey: REGISTRY_KEY,
-      nonceKey: SEED_NONCE_KEY,
-      disableSeedKey: DISABLE_DEFAULT_SEED_ONCE_KEY,
-    },
-  );
-  await page.reload();
-}
@@ -25,8 +25,6 @@ export interface IsolatedHostDaemon {
 }

 export interface IsolatedHostDaemonOptions {
-  /** Written to the daemon's config.json; `mutableRelay` adds `daemon.relay` to it. */
-  config?: { daemon?: Record<string, unknown>; [key: string]: unknown };
  environment?: NodeJS.ProcessEnv;
  mutableRelay?: {
    enabled: boolean;
@@ -95,28 +93,6 @@ async function waitForServer(port: number, child: ChildProcess): Promise<void> {
  );
 }

-function withMutableRelay(
-  config: NonNullable<IsolatedHostDaemonOptions["config"]>,
-  relay: NonNullable<IsolatedHostDaemonOptions["mutableRelay"]>,
-): NonNullable<IsolatedHostDaemonOptions["config"]> {
-  const endpoint =
-    relay.endpoint ??
-    (process.env.E2E_RELAY_PORT ? `127.0.0.1:${process.env.E2E_RELAY_PORT}` : "127.0.0.1:9");
-  return {
-    ...config,
-    daemon: {
-      ...config.daemon,
-      relay: {
-        enabled: relay.enabled,
-        endpoint,
-        publicEndpoint: endpoint,
-        useTls: false,
-        publicUseTls: false,
-      },
-    },
-  };
-}
-
 export async function startIsolatedHostDaemon(
  serverId: string,
  options: IsolatedHostDaemonOptions = {},
@@ -162,13 +138,24 @@ export async function startIsolatedHostDaemon(
      throw error;
    }
  }
-  const config = options.mutableRelay
-    ? withMutableRelay(options.config ?? {}, options.mutableRelay)
-    : options.config;
-  if (config) {
+  if (options.mutableRelay) {
+    const endpoint =
+      options.mutableRelay.endpoint ??
+      (process.env.E2E_RELAY_PORT ? `127.0.0.1:${process.env.E2E_RELAY_PORT}` : "127.0.0.1:9");
    await writeFile(
      path.join(paseoHome, "config.json"),
-      `${JSON.stringify({ version: 1, ...config })}\n`,
+      `${JSON.stringify({
+        version: 1,
+        daemon: {
+          relay: {
+            enabled: options.mutableRelay.enabled,
+            endpoint,
+            publicEndpoint: endpoint,
+            useTls: false,
+            publicUseTls: false,
+          },
+        },
+      })}\n`,
    );
  }
  const serverDir = publishedPackageRoot
@@ -1,230 +0,0 @@
-import { randomUUID } from "node:crypto";
-import { mkdir, mkdtemp, rm, utimes, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import path from "node:path";
-import { expect, type Locator, type Page } from "@playwright/test";
-import type { DaemonClient as InternalDaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { addProjectFlow, addProjectFlowInput, chooseAddProjectMethod } from "./add-project-flow";
-import { connectDaemonClient } from "./daemon-client-loader";
-import { buildCreateAgentPreferences, buildSeededHost } from "./daemon-registry";
-import { startIsolatedHostDaemon, type IsolatedHostDaemonOptions } from "./isolated-host-daemon";
-
-/** Points a fresh browser profile at one host, with no first-run record and no app settings. */
-export async function openAppAsNewUser(
-  page: Page,
-  host: { serverId: string; port: number },
-): Promise<void> {
-  const seededHost = buildSeededHost({
-    serverId: host.serverId,
-    endpoint: `127.0.0.1:${host.port}`,
-    nowIso: new Date().toISOString(),
-  });
-  await page.route(/:6767\b/, (route) => route.abort());
-  await page.routeWebSocket(/:6767\b/, async (webSocket) => {
-    await webSocket.close({ code: 1008, reason: "Blocked developer daemon during e2e." });
-  });
-  await page.addInitScript(
-    ({ registryHost, preferences }) => {
-      localStorage.setItem("@paseo:e2e", "1");
-      localStorage.setItem("@paseo:daemon-registry", JSON.stringify([registryHost]));
-      localStorage.setItem("@paseo:create-agent-preferences", JSON.stringify(preferences));
-    },
-    { registryHost: seededHost, preferences: buildCreateAgentPreferences() },
-  );
-  await page.goto("/");
-}
-
-export function setupModal(page: Page): Locator {
-  return page.getByTestId("onboarding-modal").getByRole("dialog");
-}
-
-export async function expectSetupStep(page: Page, title: string): Promise<void> {
-  await expect(setupModal(page).getByRole("heading", { name: title, exact: true })).toBeVisible({
-    timeout: 60_000,
-  });
-}
-
-export async function pickTheme(page: Page, name: string): Promise<void> {
-  const tile = setupModal(page).getByRole("radio", { name, exact: true });
-  await tile.click();
-  await expect(tile).toBeChecked();
-}
-
-export async function continueSetup(page: Page): Promise<void> {
-  await setupModal(page).getByRole("button", { name: "Continue", exact: true }).click();
-}
-
-export async function skipSetup(page: Page): Promise<void> {
-  await setupModal(page).getByRole("button", { name: "Skip setup", exact: true }).click();
-  await expect(setupModal(page)).toHaveCount(0);
-}
-
-/** Adds a folder through the regular Add project flow, opened from the setup's Projects step. */
-export async function addProjectFromSetup(page: Page, projectPath: string): Promise<void> {
-  await setupModal(page).getByRole("button", { name: "Add project", exact: true }).click();
-  await expect(addProjectFlow(page)).toBeVisible({ timeout: 30_000 });
-  await chooseAddProjectMethod(page, "directory-search");
-  await addProjectFlowInput(page).fill(projectPath);
-  await page.keyboard.press("Enter");
-  await expect(addProjectFlow(page)).toHaveCount(0, { timeout: 30_000 });
-}
-
-export async function showSetupAgainFromSettings(page: Page): Promise<void> {
-  await page.locator('[data-testid="sidebar-settings"]:visible').first().click();
-  await page.getByRole("button", { name: "Show setup again", exact: true }).click();
-}
-
-export async function goToSetupStep(page: Page, label: string): Promise<void> {
-  await setupModal(page).getByRole("tab", { name: label, exact: true }).click();
-}
-
-export function paseoToolsSwitch(scope: Page | Locator): Locator {
-  return scope.getByRole("switch", { name: "Inject Paseo tools", exact: true });
-}
-
-/** Whether the host gives its agents Paseo tools, read from the host itself. */
-export async function hostGivesAgentsPaseoTools(host: { port: number }): Promise<boolean> {
-  const client = await connectDaemonClient<
-    Pick<InternalDaemonClient, "connect" | "close" | "getDaemonConfig">
-  >({ clientIdPrefix: "app-e2e-onboarding", port: host.port });
-  try {
-    return (await client.getDaemonConfig()).config.mcp.injectIntoAgents !== false;
-  } finally {
-    await client.close();
-  }
-}
-
-export async function finishSetup(page: Page): Promise<void> {
-  await setupModal(page).getByRole("button", { name: "Finish", exact: true }).click();
-  await expect(setupModal(page)).toHaveCount(0);
-}
-
-/** Opens the Phone step's Relay row: the pair device modal, over setup. */
-export async function openRelayPairingFromSetup(page: Page): Promise<Locator> {
-  await setupModal(page).getByRole("button", { name: "Relay", exact: true }).click();
-  const pairing = page.getByTestId("onboarding-pair-device-card");
-  await expect(pairing).toBeVisible();
-  return pairing;
-}
-
-export async function closeRelayPairing(pairing: Locator): Promise<void> {
-  await pairing.getByRole("button", { name: "Close", exact: true }).click();
-  await expect(pairing).toHaveCount(0);
-}
-
-/** Clicks the Phone step's Tailscale row and returns the docs page it opened. */
-export async function openTailscaleDocsFromSetup(page: Page): Promise<string> {
-  await page
-    .context()
-    .route("https://paseo.sh/**", (route) =>
-      route.fulfill({ contentType: "text/html", body: "<title>Paseo docs</title>" }),
-    );
-  const popup = page.waitForEvent("popup");
-  await setupModal(page).getByRole("link", { name: "Tailscale, Docs", exact: true }).click();
-  const docs = await popup;
-  await docs.waitForLoadState("domcontentloaded");
-  const url = docs.url();
-  await docs.close();
-  return url;
-}
-
-export interface SetupHost {
-  serverId: string;
-  port: number;
-  close(): Promise<void>;
-}
-
-/**
- * An isolated host whose only agent history is the Claude sessions given here, so suggestions
- * never depend on the machine running the test. Its HOME is a scratch folder, so the skills setup
- * installs never land in the real ~/.agents, ~/.claude or ~/.codex. `withBrokenProvider` adds a
- * provider that cannot start.
- */
-export async function startSetupHost(
-  label: string,
-  options: {
-    claudeSessionsIn?: readonly string[];
-    withBrokenProvider?: boolean;
-    mutableRelay?: IsolatedHostDaemonOptions["mutableRelay"];
-  } = {},
-): Promise<SetupHost> {
-  const serverId = `srv_onboarding_${label}_${randomUUID().replaceAll("-", "").slice(0, 8)}`;
-  const claudeConfigDir = await seedClaudeHistory(options.claudeSessionsIn ?? []);
-  const home = await mkdtemp(path.join(tmpdir(), "paseo-onboarding-home-"));
-  const daemon = await startIsolatedHostDaemon(serverId, {
-    config: claudeOnlyConfig({ withBrokenProvider: options.withBrokenProvider ?? false }),
-    environment: { ...process.env, HOME: home, CLAUDE_CONFIG_DIR: claudeConfigDir },
-    mutableRelay: options.mutableRelay,
-  });
-  return {
-    serverId,
-    port: daemon.port,
-    close: async () => {
-      await daemon.close();
-      await rm(claudeConfigDir, { recursive: true, force: true });
-      await rm(home, { recursive: true, force: true });
-    },
-  };
-}
-
-/** Writes one recent Claude session per folder into a fresh CLAUDE_CONFIG_DIR. */
-async function seedClaudeHistory(cwds: readonly string[]): Promise<string> {
-  const configDir = await mkdtemp(path.join(tmpdir(), "paseo-onboarding-claude-"));
-  const newest = Date.now() - 60_000;
-  for (const [index, cwd] of cwds.entries()) {
-    const sessionId = `onboarding-session-${index + 1}`;
-    const projectDir = path.join(configDir, "projects", cwd.replace(/[^a-zA-Z0-9]/g, "-"));
-    await mkdir(projectDir, { recursive: true });
-    const sessionPath = path.join(projectDir, `${sessionId}.jsonl`);
-    const record = {
-      type: "user",
-      uuid: `${sessionId}-user`,
-      message: { role: "user", content: `Work on session ${index + 1}` },
-      cwd,
-      sessionId,
-    };
-    await writeFile(sessionPath, `${JSON.stringify(record)}\n`);
-    const timestamp = new Date(newest - index * 60_000);
-    await utimes(sessionPath, timestamp, timestamp);
-  }
-  return configDir;
-}
-
-function claudeOnlyConfig(options: { withBrokenProvider: boolean }) {
-  const brokenProvider = {
-    "broken-acp": {
-      extends: "acp",
-      label: "Broken ACP",
-      command: ["missing-agent-command", "acp"],
-    },
-  };
-  return {
-    agents: {
-      providers: {
-        codex: { enabled: false },
-        copilot: { enabled: false },
-        omp: { enabled: false },
-        opencode: { enabled: false },
-        pi: { enabled: false },
-        ...(options.withBrokenProvider ? brokenProvider : {}),
-      },
-    },
-  };
-}
-
-/** The switch that picks a suggested project for adding. */
-export function projectSuggestion(page: Page, name: string): Locator {
-  return setupModal(page).getByRole("switch", { name, exact: true });
-}
-
-/** The whole suggestion row, with its path, last use and any add error beside the switch. */
-export function projectSuggestionRow(page: Page, name: string): Locator {
-  return setupModal(page)
-    .getByTestId("project-suggestion")
-    .filter({ has: page.getByRole("switch", { name, exact: true }) });
-}
-
-/** The footer's main button, which adds the checked suggestions when there are any. */
-export function setupPrimaryButton(page: Page, label: string): Locator {
-  return setupModal(page).getByRole("button", { name: label, exact: true });
-}
@@ -1,16 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'expo-module-gradle-plugin'
-
-group = 'sh.paseo.keyboard'
-version = '0.1.0'
-android {
-  namespace 'sh.paseo.keyboard'
-  defaultConfig {
-    versionCode 1
-    versionName '0.1.0'
-  }
-}
-dependencies {
-  implementation 'com.facebook.react:react-android'
-  testImplementation 'junit:junit:4.13.2'
-}
@@ -1,7 +0,0 @@
-package sh.paseo.keyboard
-
-import android.view.KeyCharacterMap
-
-internal fun hardwareCharacterKey(character: Int): String =
-  if (character and KeyCharacterMap.COMBINING_ACCENT != 0) "Dead"
-  else String(Character.toChars(character))
@@ -1,164 +0,0 @@
-package sh.paseo.keyboard
-
-import android.content.ComponentCallbacks
-import android.content.res.Configuration
-import android.hardware.input.InputManager
-import android.os.Handler
-import android.os.Looper
-import android.view.InputDevice
-import android.view.KeyEvent
-import android.view.Window
-import android.widget.EditText
-import android.view.inputmethod.BaseInputConnection
-import com.facebook.react.bridge.UiThreadUtil
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.interfaces.ExtraWindowEventListener
-import expo.modules.kotlin.modules.Module
-import expo.modules.kotlin.modules.ModuleDefinition
-
-internal object HardwareKeyboard {
-  var module: PaseoHardwareKeyboardModule? = null
-  @Volatile var overlayKeys: Set<String> = emptySet()
-  private val windows = mutableMapOf<Window, KeyboardWindowCallback>()
-  val dispatcher = WindowKeyDispatcher<KeyEvent>()
-  private val consumedPresses = mutableSetOf<Int>()
-
-  fun observe(window: Window) {
-    if (windows.containsKey(window)) return
-    val callback = KeyboardWindowCallback(window, window.callback)
-    windows[window] = callback
-    window.callback = callback
-  }
-  fun release(window: Window) {
-    val callback = windows.remove(window) ?: return
-    if (window.callback === callback) window.callback = callback.previous
-  }
-  fun releaseAll() {
-    windows.keys.toList().forEach { release(it) }
-    consumedPresses.clear()
-  }
-
-  fun dispatch(event: KeyEvent, composing: Boolean): Boolean {
-    if (event.flags and KeyEvent.FLAG_SOFT_KEYBOARD != 0) return false
-    if (event.action != KeyEvent.ACTION_DOWN && event.action != KeyEvent.ACTION_UP) return false
-    val code = code(event.keyCode)
-    if (code.isEmpty()) return false
-    val textModifiers = event.metaState and KeyEvent.META_CTRL_MASK.inv() and KeyEvent.META_META_MASK.inv()
-    val character = event.getUnicodeChar(textModifiers)
-    val named = !code.startsWith("Key") && !code.startsWith("Digit")
-    val key = when {
-      code.startsWith("Control") -> "Control"
-      code.startsWith("Meta") -> "Meta"
-      code.startsWith("Shift") -> "Shift"
-      code.startsWith("Alt") -> "Alt"
-      named && (character == 0 || code == "Enter" || code == "Tab" || code == "Backspace") -> code
-      character != 0 -> hardwareCharacterKey(character)
-      else -> code
-    }
-    module?.emit(mapOf(
-      "key" to key, "code" to code,
-      "altKey" to event.isAltPressed, "ctrlKey" to event.isCtrlPressed,
-      "metaKey" to event.isMetaPressed, "shiftKey" to event.isShiftPressed,
-      "repeat" to (event.repeatCount > 0), "isComposing" to composing,
-      "phase" to if (event.action == KeyEvent.ACTION_UP) "up" else "down"
-    ))
-    if (event.action == KeyEvent.ACTION_UP) return consumedPresses.remove(event.keyCode)
-    val overlayOwnsKey = key != "Dead" && key in overlayKeys && !event.isCtrlPressed && !event.isMetaPressed && !event.isAltPressed && !composing
-    if (overlayOwnsKey) consumedPresses.add(event.keyCode)
-    return overlayOwnsKey
-  }
-
-  private fun code(keyCode: Int): String = when (keyCode) {
-    in KeyEvent.KEYCODE_A..KeyEvent.KEYCODE_Z -> "Key" + ('A'.code + keyCode - KeyEvent.KEYCODE_A).toChar()
-    in KeyEvent.KEYCODE_0..KeyEvent.KEYCODE_9 -> "Digit" + (keyCode - KeyEvent.KEYCODE_0)
-    in KeyEvent.KEYCODE_F1..KeyEvent.KEYCODE_F12 -> "F" + (keyCode - KeyEvent.KEYCODE_F1 + 1)
-    KeyEvent.KEYCODE_ENTER, KeyEvent.KEYCODE_NUMPAD_ENTER -> "Enter"
-    KeyEvent.KEYCODE_ESCAPE -> "Escape"
-    KeyEvent.KEYCODE_DEL -> "Backspace"
-    KeyEvent.KEYCODE_FORWARD_DEL -> "Delete"
-    KeyEvent.KEYCODE_TAB -> "Tab"
-    KeyEvent.KEYCODE_SPACE -> "Space"
-    KeyEvent.KEYCODE_DPAD_UP -> "ArrowUp"
-    KeyEvent.KEYCODE_DPAD_DOWN -> "ArrowDown"
-    KeyEvent.KEYCODE_DPAD_LEFT -> "ArrowLeft"
-    KeyEvent.KEYCODE_DPAD_RIGHT -> "ArrowRight"
-    KeyEvent.KEYCODE_CTRL_LEFT -> "ControlLeft"
-    KeyEvent.KEYCODE_CTRL_RIGHT -> "ControlRight"
-    KeyEvent.KEYCODE_META_LEFT -> "MetaLeft"
-    KeyEvent.KEYCODE_META_RIGHT -> "MetaRight"
-    KeyEvent.KEYCODE_SHIFT_LEFT -> "ShiftLeft"
-    KeyEvent.KEYCODE_SHIFT_RIGHT -> "ShiftRight"
-    KeyEvent.KEYCODE_ALT_LEFT -> "AltLeft"
-    KeyEvent.KEYCODE_ALT_RIGHT -> "AltRight"
-    KeyEvent.KEYCODE_COMMA -> "Comma"
-    KeyEvent.KEYCODE_PERIOD -> "Period"
-    KeyEvent.KEYCODE_MINUS -> "Minus"
-    KeyEvent.KEYCODE_EQUALS -> "Equal"
-    KeyEvent.KEYCODE_LEFT_BRACKET -> "BracketLeft"
-    KeyEvent.KEYCODE_RIGHT_BRACKET -> "BracketRight"
-    KeyEvent.KEYCODE_BACKSLASH -> "Backslash"
-    KeyEvent.KEYCODE_SEMICOLON -> "Semicolon"
-    KeyEvent.KEYCODE_APOSTROPHE -> "Quote"
-    KeyEvent.KEYCODE_GRAVE -> "Backquote"
-    KeyEvent.KEYCODE_SLASH -> "Slash"
-    else -> ""
-  }
-}
-
-private class KeyboardWindowCallback(private val window: Window, val previous: Window.Callback) : Window.Callback by previous {
-  override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-    val editable = (window.currentFocus as? EditText)?.text
-    val composing = editable != null && BaseInputConnection.getComposingSpanStart(editable) >= 0
-    return HardwareKeyboard.dispatcher.dispatch(event, { HardwareKeyboard.dispatch(event, composing) }, { previous.dispatchKeyEvent(event) })
-  }
-}
-
-class PaseoHardwareKeyboardModule : Module(), ExtraWindowEventListener, InputManager.InputDeviceListener, ComponentCallbacks {
-  private var inputManager: InputManager? = null
-  private var registeredReactContext: ReactContext? = null
-  private fun keyboardPresent(): Boolean {
-    val config = registeredReactContext?.resources?.configuration
-    return (config?.keyboard == Configuration.KEYBOARD_QWERTY && config.hardKeyboardHidden != Configuration.HARDKEYBOARDHIDDEN_YES) ||
-      InputDevice.getDeviceIds().any { id -> InputDevice.getDevice(id)?.let { !it.isVirtual && it.keyboardType == InputDevice.KEYBOARD_TYPE_ALPHABETIC } == true }
-  }
-  private fun presenceChanged() { sendEvent("onHardwareKeyboardPresenceChanged", emptyMap<String, Any>()) }
-  override fun onInputDeviceAdded(id: Int) { presenceChanged() }
-  override fun onInputDeviceRemoved(id: Int) { presenceChanged() }
-  override fun onInputDeviceChanged(id: Int) { presenceChanged() }
-  override fun onConfigurationChanged(config: Configuration) { presenceChanged() }
-  override fun onLowMemory() {}
-  override fun onExtraWindowCreate(window: Window) { HardwareKeyboard.observe(window) }
-  override fun onExtraWindowDestroy(window: Window) { HardwareKeyboard.release(window) }
-  override fun definition() = ModuleDefinition {
-    Name("PaseoHardwareKeyboard")
-    Events("onHardwareKeyboardShortcut", "onHardwareKeyboardPresenceChanged")
-    OnCreate {
-      HardwareKeyboard.module = this@PaseoHardwareKeyboardModule
-      val context = appContext.reactContext
-      require(context is ReactContext) { "Hardware keyboard observation requires a React context" }
-      registeredReactContext = context
-      context.registerComponentCallbacks(this@PaseoHardwareKeyboardModule)
-      inputManager = context.getSystemService(InputManager::class.java)
-      inputManager?.registerInputDeviceListener(this@PaseoHardwareKeyboardModule, Handler(Looper.getMainLooper()))
-      context.addExtraWindowEventListener(this@PaseoHardwareKeyboardModule)
-      UiThreadUtil.runOnUiThread { appContext.currentActivity?.window?.let { HardwareKeyboard.observe(it) } }
-    }
-    OnDestroy {
-      inputManager?.unregisterInputDeviceListener(this@PaseoHardwareKeyboardModule)
-      inputManager = null
-      registeredReactContext?.unregisterComponentCallbacks(this@PaseoHardwareKeyboardModule)
-      registeredReactContext?.removeExtraWindowEventListener(this@PaseoHardwareKeyboardModule)
-      registeredReactContext = null
-      if (HardwareKeyboard.module === this@PaseoHardwareKeyboardModule) {
-        HardwareKeyboard.module = null
-        HardwareKeyboard.overlayKeys = emptySet()
-        UiThreadUtil.runOnUiThread { if (HardwareKeyboard.module == null) HardwareKeyboard.releaseAll() }
-      }
-    }
-    Function("getHardwareKeyboardPresent") { keyboardPresent() }
-    Function("setOverlayKeys") { keys: List<String> ->
-      HardwareKeyboard.overlayKeys = keys.filter { it in setOf("Escape", "Enter", "ArrowUp", "ArrowDown") }.toSet()
-    }
-  }
-  internal fun emit(event: Map<String, Any>) { sendEvent("onHardwareKeyboardShortcut", event) }
-}
@@ -1,17 +0,0 @@
-package sh.paseo.keyboard
-
-import android.app.Activity
-import android.content.Context
-import android.os.Bundle
-import expo.modules.core.interfaces.Package
-import expo.modules.core.interfaces.ReactActivityLifecycleListener
-
-class PaseoHardwareKeyboardPackage : Package {
-  override fun createReactActivityLifecycleListeners(activityContext: Context): List<ReactActivityLifecycleListener> = listOf(
-    object : ReactActivityLifecycleListener {
-      override fun onCreate(activity: Activity, savedInstanceState: Bundle?) { HardwareKeyboard.observe(activity.window) }
-      override fun onResume(activity: Activity) { HardwareKeyboard.observe(activity.window) }
-      override fun onDestroy(activity: Activity) { HardwareKeyboard.release(activity.window) }
-    }
-  )
-}
@@ -1,11 +0,0 @@
-package sh.paseo.keyboard
-
-// A modal can forward the same physical event into the activity window. Keep
-// observation outside that nested delivery, without retaining recycled KeyEvents.
-internal class WindowKeyDispatcher<Event : Any> {
-  private val delivering = java.util.Collections.newSetFromMap(java.util.IdentityHashMap<Event, Boolean>())
-  fun dispatch(event: Event, observe: () -> Boolean, deliver: () -> Boolean): Boolean {
-    if (!delivering.add(event)) return deliver()
-    return try { observe() || deliver() } finally { delivering.remove(event) }
-  }
-}
@@ -1,11 +0,0 @@
-package sh.paseo.keyboard
-import org.junit.Assert.assertEquals
-import org.junit.Test
-class HardwareCharacterKeyTest {
-  @Test fun deadAccentUsesDomKeyWithoutThrowing() {
-    assertEquals("Dead", hardwareCharacterKey(Int.MIN_VALUE or 0xB4))
-  }
-  @Test fun ordinaryUnicodeRemainsText() {
-    assertEquals("é", hardwareCharacterKey(0xE9))
-  }
-}
@@ -1,27 +0,0 @@
-package sh.paseo.keyboard
-
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-class WindowKeyDispatcherTest {
-  @Test fun observesOnePressAcrossNestedWindows() {
-    val dispatcher = WindowKeyDispatcher<Any>()
-    val event = Any()
-    var observations = 0
-    var deliveries = 0
-    dispatcher.dispatch(event, { observations++; false }, {
-      dispatcher.dispatch(event, { observations++; false }, { deliveries++; false })
-    })
-    assertEquals(1, observations)
-    assertEquals(1, deliveries)
-    dispatcher.dispatch(event, { observations++; false }, { false })
-    assertEquals(2, observations)
-  }
-  @Test fun consumedOverlayKeyDoesNotReachTheView() {
-    val dispatcher = WindowKeyDispatcher<Any>()
-    var deliveries = 0
-    assertTrue(dispatcher.dispatch(Any(), { true }, { deliveries++; false }))
-    assertEquals(0, deliveries)
-  }
-}
@@ -1,29 +0,0 @@
-const { withAppDelegate } = require("expo/config-plugins");
-const SCENE_START = "super.scene(scene, willConnectTo: session, options: connectionOptions)";
-
-function configureHardwareKeyboardAppDelegate(source) {
-  source = source.replace(
-    /^import PaseoHardwareKeyboard$/m,
-    "internal import PaseoHardwareKeyboard",
-  );
-  if (source.includes("PaseoHardwareKeyboardWindow.observing(window)")) return source;
-  if (!source.includes(SCENE_START)) {
-    throw new Error("Hardware keyboard observation requires the app's Expo scene delegate");
-  }
-  const installation = `${SCENE_START}
-    if let window {
-      let observedWindow = PaseoHardwareKeyboardWindow.observing(window)
-      self.window = observedWindow
-      (UIApplication.shared.delegate as? ExpoReactNativeFactoryProvider)?.window = observedWindow
-    }`;
-  return "internal import PaseoHardwareKeyboard\n" + source.replace(SCENE_START, installation);
-}
-module.exports = function withHardwareKeyboardWindow(config) {
-  return withAppDelegate(config, (modConfig) => {
-    modConfig.modResults.contents = configureHardwareKeyboardAppDelegate(
-      modConfig.modResults.contents,
-    );
-    return modConfig;
-  });
-};
-module.exports.configureHardwareKeyboardAppDelegate = configureHardwareKeyboardAppDelegate;
@@ -1,9 +1,7 @@
 {
-  "platforms": ["ios", "android"],
+  "platforms": ["ios"],
  "ios": {
-    "modules": ["PaseoHardwareKeyboardModule"]
-  },
-  "android": {
-    "modules": ["sh.paseo.keyboard.PaseoHardwareKeyboardModule"]
+    "modules": ["PaseoHardwareKeyboardModule"],
+    "reactDelegateHandlers": ["PaseoHardwareKeyboardReactDelegateHandler"]
  }
 }
@@ -1,159 +1,53 @@
 import ExpoModulesCore
 import UIKit
-import GameController

 private let hardwareSubmitEventName = "onHardwareKeyboardSubmit"
-private let hardwareShortcutEventName = "onHardwareKeyboardShortcut"

 private weak var activeModule: PaseoHardwareKeyboardModule?
 private var isHardwareSubmitEnabled = false
-private var overlayKeys: Set<String> = []

-/// UIKit spells non-character keys as sentinel input strings rather than as the
-/// character they would type. JS sends the DOM `code` and the mapping lives
-/// here, so the constants stay in the one place that owns UIKit vocabulary.
-private let namedKeyInputs: [String: String] = [
-  "Escape": UIKeyCommand.inputEscape,
-  "ArrowUp": UIKeyCommand.inputUpArrow,
-  "ArrowDown": UIKeyCommand.inputDownArrow,
-  "Enter": "\r",
-]
-
-/// Whether the first responder is mid-IME-composition.
-///
-/// A committing key has to stay out of the way while a CJK candidate is being
-/// chosen: Enter confirms the candidate, and consuming it as a key command
-/// would submit the half-composed text instead.
-private func isComposingText() -> Bool {
-  guard let responder = UIResponder.paseoCurrentFirstResponder as? UITextInput else {
-    return false
+@objc
+public class PaseoHardwareKeyboardReactDelegateHandler: ExpoReactDelegateHandler {
+  public override func createRootViewController() -> UIViewController? {
+    return PaseoHardwareKeyboardRootViewController()
  }
-  return responder.markedTextRange != nil
 }

 public class PaseoHardwareKeyboardModule: Module {
-  private var keyboardObservers: [NSObjectProtocol] = []
  public func definition() -> ModuleDefinition {
    Name("PaseoHardwareKeyboard")

-    Events(hardwareSubmitEventName, hardwareShortcutEventName, "onHardwareKeyboardPresenceChanged")
+    Events(hardwareSubmitEventName)

    OnCreate {
      activeModule = self
-      for name in [Notification.Name.GCKeyboardDidConnect, Notification.Name.GCKeyboardDidDisconnect] {
-        self.keyboardObservers.append(NotificationCenter.default.addObserver(forName: name, object: nil, queue: .main) { [weak self] _ in
-          self?.sendEvent("onHardwareKeyboardPresenceChanged", [:])
-        })
-      }
    }

-    Function("getHardwareKeyboardPresent") { GCKeyboard.coalesced != nil }
-
    Function("setHardwareKeyboardSubmitEnabled") { (enabled: Bool) in
      DispatchQueue.main.async {
        isHardwareSubmitEnabled = enabled
      }
    }

-    Function("setOverlayKeys") { (keys: [String]) in
-      DispatchQueue.main.async {
-        overlayKeys = Set(keys).intersection(["Enter", "ArrowUp", "ArrowDown"])
-        UIMenuSystem.main.setNeedsRebuild()
-      }
-    }
-
    OnDestroy {
-      self.keyboardObservers.forEach(NotificationCenter.default.removeObserver)
-      self.keyboardObservers = []
      if activeModule === self {
        activeModule = nil
-        isHardwareSubmitEnabled = false
-        overlayKeys = []
      }
+      isHardwareSubmitEnabled = false
    }
  }

  fileprivate func emitHardwareKeyboardSubmit() {
    sendEvent(hardwareSubmitEventName, [:])
  }
-
-  fileprivate func emitHardwareKeyboardPress(_ press: UIPress, isRepeat: Bool) {
-    guard let key = press.key else { return }
-    let code = hardwareKeyCode(key)
-    let characters = key.characters
-    let named = namedKeyInputs.first { $0.value == characters }?.key
-    let keyName: String
-    if code.hasPrefix("Meta") { keyName = "Meta" }
-    else if code.hasPrefix("Control") { keyName = "Control" }
-    else if code.hasPrefix("Shift") { keyName = "Shift" }
-    else if code.hasPrefix("Alt") { keyName = "Alt" }
-    else { keyName = named ?? (characters.isEmpty ? code : characters) }
-    guard !code.isEmpty else { return }
-    sendEvent(hardwareShortcutEventName, [
-      "key": keyName,
-      "code": code,
-      "altKey": key.modifierFlags.contains(.alternate),
-      "ctrlKey": key.modifierFlags.contains(.control),
-      "metaKey": key.modifierFlags.contains(.command),
-      "shiftKey": key.modifierFlags.contains(.shift),
-      "repeat": isRepeat,
-      "isComposing": isComposingText(),
-      "phase": press.phase == .ended || press.phase == .cancelled ? "up" : "down",
-    ])
-  }
 }

-public final class PaseoHardwareKeyboardWindow: UIWindow {
-  private var pressedCodes: Set<Int> = []
-  public static func observing(_ original: UIWindow) -> UIWindow {
-    if original is PaseoHardwareKeyboardWindow { return original }
-    guard let scene = original.windowScene else { return original }
-    let observed = PaseoHardwareKeyboardWindow(windowScene: scene)
-    observed.windowLevel = original.windowLevel
-    observed.backgroundColor = original.backgroundColor
-    let controller = original.rootViewController
-    original.rootViewController = nil
-    original.isHidden = true
-    observed.rootViewController = controller
-    observed.makeKeyAndVisible()
-    return observed
-  }
-
-  public override func sendEvent(_ event: UIEvent) {
-    if let event = event as? UIPressesEvent {
-      for press in event.allPresses where press.phase == .began || press.phase == .ended || press.phase == .cancelled {
-        guard let key = press.key else { continue }
-        let raw = Int(key.keyCode.rawValue)
-        let isRepeat = press.phase == .began && pressedCodes.contains(raw)
-        if press.phase == .began { pressedCodes.insert(raw) }
-        else { pressedCodes.remove(raw) }
-        activeModule?.emitHardwareKeyboardPress(press, isRepeat: isRepeat)
-      }
+private final class PaseoHardwareKeyboardRootViewController: UIViewController {
+  override var keyCommands: [UIKeyCommand]? {
+    guard isHardwareSubmitEnabled && UIDevice.current.userInterfaceIdiom == .pad else {
+      return super.keyCommands
    }
-    super.sendEvent(event)
-  }
-  public override var keyCommands: [UIKeyCommand]? {
-    var commands = super.keyCommands ?? []
-    if isHardwareSubmitEnabled && !isPlainReturnClaimed && !isComposingText()
-      && UIDevice.current.userInterfaceIdiom == .pad
-    {
-      commands.append(makeSubmitCommand())
-    }
-    if !isComposingText() { commands.append(contentsOf: overlayKeys.compactMap(makeShortcutCommand)) }
-    return commands
-  }

-  /// Whether something registered has already asked for an unmodified Return.
-  ///
-  /// The submit command is registered for as long as the composer holds focus,
-  /// which includes while a picker is open over it. Registering both would put
-  /// two commands on one press, and the composer would win a press the picker
-  /// asked for — Enter would create the workspace instead of choosing a project.
-  private var isPlainReturnClaimed: Bool {
-    overlayKeys.contains("Enter")
-  }
-
-  private func makeSubmitCommand() -> UIKeyCommand {
    let command = UIKeyCommand(
      input: "\r",
      modifierFlags: [],
@@ -162,14 +56,7 @@ public final class PaseoHardwareKeyboardWindow: UIWindow {
    if #available(iOS 15.0, *) {
      command.wantsPriorityOverSystemBehavior = true
    }
-    return command
-  }
-
-  private func makeShortcutCommand(_ key: String) -> UIKeyCommand? {
-    guard let input = namedKeyInputs[key] else { return nil }
-    let command = UIKeyCommand(input: input, modifierFlags: [], action: #selector(handleHardwareKeyboardShortcut(_:)))
-    if #available(iOS 15.0, *) { command.wantsPriorityOverSystemBehavior = true }
-    return command
+    return (super.keyCommands ?? []) + [command]
  }

  @objc
@@ -180,9 +67,6 @@ public final class PaseoHardwareKeyboardWindow: UIWindow {
    activeModule?.emitHardwareKeyboardSubmit()
  }

-  @objc
-  private func handleHardwareKeyboardShortcut(_ sender: UIKeyCommand) {}
-
  private func canSubmitCurrentTextInput() -> Bool {
    guard let responder = UIResponder.paseoCurrentFirstResponder else {
      return false
@@ -213,25 +97,3 @@ private extension UIResponder {
    UIResponder.currentFirstResponder = self
  }
 }
-
-
-private func hardwareKeyCode(_ key: UIKey) -> String {
-  let raw = key.keyCode.rawValue
-  if raw >= 4 && raw <= 29 {
-    let letter = UnicodeScalar(Int(raw) + 61)!
-    return "Key" + String(letter)
-  }
-  if raw >= 30 && raw <= 38 { return "Digit" + String(raw - 29) }
-  if raw == 39 { return "Digit0" }
-  let codes: [Int: String] = [
-    40: "Enter", 41: "Escape", 42: "Backspace", 43: "Tab", 44: "Space",
-    45: "Minus", 46: "Equal", 47: "BracketLeft", 48: "BracketRight",
-    49: "Backslash", 51: "Semicolon", 52: "Quote", 53: "Backquote",
-    54: "Comma", 55: "Period", 56: "Slash", 76: "Delete", 79: "ArrowRight",
-    80: "ArrowLeft", 81: "ArrowDown", 82: "ArrowUp", 224: "ControlLeft",
-    225: "ShiftLeft", 226: "AltLeft", 227: "MetaLeft", 228: "ControlRight",
-    229: "ShiftRight", 230: "AltRight", 231: "MetaRight",
-  ]
-  if raw >= 58 && raw <= 69 { return "F" + String(raw - 57) }
-  return codes[Int(raw)] ?? ""
-}
@@ -4,13 +4,11 @@ import android.graphics.Rect
 import android.text.Selection
 import android.text.Spannable
 import android.view.View
-import android.view.InputDevice
-import android.view.MotionEvent
-import android.os.SystemClock
 import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import com.facebook.react.bridge.BridgeReactContext
 import com.facebook.react.bridge.JavaOnlyArray
 import com.facebook.react.bridge.JavaOnlyMap
 import com.facebook.react.soloader.OpenSourceMergedSoMapping
@@ -26,40 +24,6 @@ import org.junit.runner.RunWith

@RunWith(AndroidJUnit4::class)
 class ScrollSelectionTest {
-  @Test fun mouseWheelMovesInvertedViewportInVisualDirection() = withScroll(inverted = true) { scroll, _ ->
-    val before = scroll.scrollY
-    withWheel(1f) { event ->
-      assertTrue(scroll.dispatchGenericMotionEvent(event))
-      assertTrue("Wheel up must move toward older messages: $before -> ${scroll.scrollY}", scroll.scrollY > before)
-      assertEquals("The caller's event must not change", 1f, event.getAxisValue(MotionEvent.AXIS_VSCROLL))
-    }
-    val afterUp = scroll.scrollY
-    withWheel(-1f) { event ->
-      assertTrue(scroll.dispatchGenericMotionEvent(event))
-      assertTrue("Wheel down must move toward newer messages: $afterUp -> ${scroll.scrollY}", scroll.scrollY < afterUp)
-    }
-  }
-
-  @Test fun mouseWheelKeepsOrdinaryScrollDirection() = withScroll(inverted = false) { scroll, _ ->
-    val before = scroll.scrollY
-    withWheel(1f) { event ->
-      assertTrue(scroll.dispatchGenericMotionEvent(event))
-      assertTrue(scroll.scrollY < before)
-    }
-    val afterUp = scroll.scrollY
-    withWheel(-1f) { event ->
-      assertTrue(scroll.dispatchGenericMotionEvent(event))
-      assertTrue(scroll.scrollY > afterUp)
-    }
-  }
-
-  @Test fun mouseWheelRespectsDisabledScrolling() = withScroll(inverted = true) { scroll, _ ->
-    scroll.setScrollEnabled(false)
-    val before = scroll.scrollY
-    withWheel(1f) { scroll.dispatchGenericMotionEvent(it) }
-    assertEquals(before, scroll.scrollY)
-  }
-
  @Test fun focusingSelectableTextKeepsInvertedViewportStill() = withScroll(inverted = true) { scroll, text ->
    val before = scroll.scrollY
    assertTrue(text.requestFocus())
@@ -106,7 +70,7 @@ class ScrollSelectionTest {
      val appContext = instrumentation.targetContext
      DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(appContext)
      SoLoader.init(appContext, OpenSourceMergedSoMapping)
-      val reactContext = ScrollTestContext(appContext)
+      val reactContext = BridgeReactContext(appContext)
      val context = ThemedReactContext(reactContext, appContext)
      val manager = PaseoScrollPackage().createViewManager(reactContext, ReactScrollViewManager.REACT_CLASS) as ReactScrollViewManager
      val scroll = manager.createViewInstance(context)
@@ -134,26 +98,4 @@ class ScrollSelectionTest {
  }

  private fun exact(size: Int) = View.MeasureSpec.makeMeasureSpec(size, View.MeasureSpec.EXACTLY)
-
-  private fun withWheel(axis: Float, check: (MotionEvent) -> Unit) {
-    val time = SystemClock.uptimeMillis()
-    val properties = MotionEvent.PointerProperties().apply {
-      id = 0
-      toolType = MotionEvent.TOOL_TYPE_MOUSE
-    }
-    val coordinates = MotionEvent.PointerCoords().apply {
-      x = 150f
-      y = 150f
-      setAxisValue(MotionEvent.AXIS_VSCROLL, axis)
-    }
-    val event = MotionEvent.obtain(
-      time, time, MotionEvent.ACTION_SCROLL, 1, arrayOf(properties), arrayOf(coordinates),
-      0, 0, 1f, 1f, 0, 0, InputDevice.SOURCE_MOUSE, 0,
-    )
-    try {
-      check(event)
-    } finally {
-      event.recycle()
-    }
-  }
 }
@@ -1,19 +0,0 @@
-package sh.paseo.scroll;
-
-import android.content.Context;
-import com.facebook.react.bridge.BridgeReactContext;
-import com.facebook.react.uimanager.events.BlackHoleEventDispatcher;
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.uimanager.events.EventDispatcherProvider;
-
-/** Native-only tests use RN's dispatcher for a context without a JS instance. */
-final class ScrollTestContext extends BridgeReactContext implements EventDispatcherProvider {
-  ScrollTestContext(Context context) {
-    super(context);
-  }
-
-  @Override
-  public EventDispatcher getEventDispatcher() {
-    return BlackHoleEventDispatcher.INSTANCE;
-  }
-}
@@ -2,8 +2,6 @@ package sh.paseo.scroll

 import android.graphics.Matrix
 import android.graphics.Rect
-import android.view.InputDevice
-import android.view.MotionEvent
 import com.facebook.react.ReactPackage
 import com.facebook.react.ViewManagerOnDemandReactPackage
 import com.facebook.react.bridge.NativeModule
@@ -32,47 +30,13 @@ private class PaseoScrollViewManager : ReactScrollViewManager() {
 private class PaseoScrollView(context: ThemedReactContext) : ReactScrollView(context) {
  private val transformValues = FloatArray(9)

-  private fun isVerticallyInverted(): Boolean {
-    // Android FlatList uses scale: -1, which RN decomposes into a 180-degree
-    // rotation with positive scaleY. Read the resulting transform, not scaleY.
-    matrix.getValues(transformValues)
-    return transformValues[Matrix.MSCALE_Y] < 0
-  }
-
-  override fun onGenericMotionEvent(event: MotionEvent): Boolean {
-    if (!isVerticallyInverted() || event.actionMasked != MotionEvent.ACTION_SCROLL ||
-        !event.isFromSource(InputDevice.SOURCE_CLASS_POINTER)) {
-      return super.onGenericMotionEvent(event)
-    }
-    if (!scrollEnabled) return false
-
-    // Android applies wheel axes directly to scrollY; the inversion transform only
-    // transforms pointer coordinates. Reverse the vertical axis before delegating so
-    // platform scroll bounds and scroll events still apply.
-    val properties = Array(event.pointerCount) { index ->
-      MotionEvent.PointerProperties().also { event.getPointerProperties(index, it) }
-    }
-    val coordinates = Array(event.pointerCount) { index ->
-      MotionEvent.PointerCoords().also {
-        event.getPointerCoords(index, it)
-        it.setAxisValue(MotionEvent.AXIS_VSCROLL, -it.getAxisValue(MotionEvent.AXIS_VSCROLL))
-      }
-    }
-    val correctedEvent = MotionEvent.obtain(
-      event.downTime, event.eventTime, event.action, event.pointerCount, properties, coordinates,
-      event.metaState, event.buttonState, event.xPrecision, event.yPrecision,
-      event.deviceId, event.edgeFlags, event.source, event.flags,
-    )
-    return try {
-      super.onGenericMotionEvent(correctedEvent)
-    } finally {
-      correctedEvent.recycle()
-    }
-  }
-
  // Both RN focus handling and Android selection visibility requests use this calculation.
  // Its coordinates ignore inversion. Keep focus/selection bookkeeping, but leave timeline
  // movement to user gestures and explicit scroll commands.
-  override fun computeScrollDeltaToGetChildRectOnScreen(rect: Rect): Int =
-    if (isVerticallyInverted()) 0 else super.computeScrollDeltaToGetChildRectOnScreen(rect)
+  override fun computeScrollDeltaToGetChildRectOnScreen(rect: Rect): Int {
+    // RN's Android scale: -1 becomes a 180-degree rotation with positive scaleY.
+    matrix.getValues(transformValues)
+    if (transformValues[Matrix.MSCALE_Y] < 0) return 0
+    return super.computeScrollDeltaToGetChildRectOnScreen(rect)
+  }
 }
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.15.0",
+  "version": "0.15.0-beta.1",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -40,7 +40,7 @@
    "dev:ios": "npm --prefix ../.. run build:client && cross-env APP_VARIANT=development expo run:ios",
    "build:apk": "npm --prefix ../.. run build:apk",
    "build:apk:arm64": "npm --prefix ../.. run build:apk:arm64",
-    "test:android": "expo prebuild --platform android --no-install && cd android && ./gradlew :paseo-native-trace:testReleaseUnitTest :paseo-hardware-keyboard:testReleaseUnitTest :react-native-enriched-markdown:testReleaseUnitTest --tests '*InlineCodeFormattingTest' --no-daemon --max-workers=2 -Dorg.gradle.parallel=false"
+    "test:android": "expo prebuild --platform android --no-install && cd android && ./gradlew :paseo-native-trace:testReleaseUnitTest :react-native-enriched-markdown:testReleaseUnitTest --tests '*InlineCodeFormattingTest' --no-daemon --max-workers=2 -Dorg.gradle.parallel=false"
  },
  "dependencies": {
    "@codemirror/commands": "6.10.4",
@@ -8,7 +8,7 @@ import { Combobox, type ComboboxOption } from "@/components/ui/combobox";
 import {
  createControlGeometry,
  resolveControlInteractionStyles,
-  type ControlSize,
+  type FieldControlSize,
 } from "@/components/ui/control-geometry";
 import { Field } from "@/components/ui/form-field";
 import { identityForeground } from "@/styles/identity-colors";
@@ -153,7 +153,7 @@ export function AgentProfileAppearanceField({
  icon: string;
  color: string;
  onChange: (next: { icon: string; color: string }) => void;
-  size?: ControlSize;
+  size?: FieldControlSize;
  disabled?: boolean;
  testID?: string;
  triggerTestID?: string;
@@ -6,7 +6,7 @@ import type { AgentFeature } from "@getpaseo/protocol/agent-types";
 import type { AgentProfile } from "@getpaseo/protocol/messages";
 import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
-import { type ControlSize } from "@/components/ui/control-geometry";
+import { type FieldControlSize } from "@/components/ui/control-geometry";
 import { Field, FormTextInput } from "@/components/ui/form-field";
 import {
  SelectField,
@@ -14,6 +14,7 @@ import {
  type SelectFieldOption,
 } from "@/components/ui/select-field";
 import { Switch } from "@/components/ui/switch";
+import { useIsCompactFormFactor } from "@/constants/layout";
 import { toErrorMessage } from "@/utils/error-messages";
 import { AgentProfileAppearanceField } from "./agent-profile-appearance-field";
 import type {
@@ -132,7 +133,7 @@ function OpenAgentProfileEditModal({
  onSave,
 }: AgentProfileEditModalProps & { onDismiss: () => void }): ReactElement {
  const { t } = useTranslation();
-  const controlSize: ControlSize = "md";
+  const controlSize: FieldControlSize = useIsCompactFormFactor() ? "md" : "sm";
  const snapshot = useMemo(
    () => ({ mode, ...(profile ? { profile } : {}), ...(seed ? { seed } : {}) }),
    [mode, profile, seed],
@@ -409,7 +410,7 @@ function AgentProfileFeatureRow({
  feature: AgentFeature;
  isFirst: boolean;
  disabled: boolean;
-  size: ControlSize;
+  size: FieldControlSize;
  model: AgentProfileFormModel;
 }): ReactElement {
  const rowStyle = useMemo(
@@ -103,6 +103,7 @@ export function AgentProfileRow({
      <View style={styles.rowActions}>
        <Button
          variant="ghost"
+          size="sm"
          leftIcon={moveUpIcon}
          onPress={handleMoveUp}
          disabled={isFirst}
@@ -111,6 +112,7 @@ export function AgentProfileRow({
        />
        <Button
          variant="ghost"
+          size="sm"
          leftIcon={moveDownIcon}
          onPress={handleMoveDown}
          disabled={isLast}
@@ -119,6 +121,7 @@ export function AgentProfileRow({
        />
        <Button
          variant="ghost"
+          size="sm"
          leftIcon={editIcon}
          onPress={handleEdit}
          accessibilityLabel={t("settings.host.agentProfiles.editProfile")}
@@ -126,6 +129,7 @@ export function AgentProfileRow({
        />
        <Button
          variant="ghost"
+          size="sm"
          leftIcon={removeIcon}
          onPress={handleRemove}
          accessibilityLabel={t("settings.host.agentProfiles.remove")}
@@ -124,6 +124,7 @@ export function AgentProfilesSection({ serverId }: { serverId: string }): ReactE
    () => (
      <Button
        variant="ghost"
+        size="sm"
        leftIcon={addIcon}
        onPress={handleAddOpen}
        disabled={!profiles}
@@ -180,7 +181,7 @@ export function AgentProfilesSection({ serverId }: { serverId: string }): ReactE
              <Text style={styles.emptyText} testID="agent-profiles-empty">
                {t("settings.host.agentProfiles.emptyState")}
              </Text>
-              <Button leftIcon={addIcon} onPress={handleAddOpen} disabled={!profiles}>
+              <Button size="sm" leftIcon={addIcon} onPress={handleAddOpen} disabled={!profiles}>
                {t("settings.host.agentProfiles.newProfile")}
              </Button>
            </View>
@@ -3,27 +3,29 @@ import { useTranslation } from "react-i18next";
 import { Text, View } from "react-native";
 import { useFocusEffect } from "expo-router/react-navigation";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { Settings2 } from "lucide-react-native";
+import { ArrowUpRight, Blocks, Check, Settings2 } from "lucide-react-native";
 import type { AgentSkillOperation, AgentSkillsStatus } from "@getpaseo/protocol/messages";
 import type { TFunction } from "i18next";
-import { SettingsCard, SettingsRow, SettingsSection } from "@/components/settings";
 import { Button } from "@/components/ui/button";
-import { Switch } from "@/components/ui/switch";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { settingsStyles } from "@/styles/settings";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 import { confirmDialog } from "@/utils/confirm-dialog";
+import { openExternalUrl } from "@/utils/open-external-url";
 import { SkillSelectionSheet } from "./selection-sheet";
-import { useAgentSkills, type AgentSkillsController } from "./use-agent-skills";
-
-export { useAgentSkills, type AgentSkillsController } from "./use-agent-skills";
+import { useAgentSkills } from "./use-agent-skills";

 const OP_KIND_ORDER: Record<AgentSkillOperation["kind"], number> = {
  add: 0,
  update: 1,
  delete: 2,
 };
+const ThemedBlocks = withUnistyles(Blocks);
+const ThemedCheck = withUnistyles(Check);
 const ThemedSettings = withUnistyles(Settings2);
+const ThemedArrowUpRight = withUnistyles(ArrowUpRight);
 const SKILLS_DOCS_URL = "https://paseo.sh/docs/skills";
+const foregroundMapping = (theme: Theme) => ({ color: theme.colors.foreground });
 const mutedMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });

 function formatUpdateMessage(ops: readonly AgentSkillOperation[], t: TFunction): string {
@@ -33,50 +35,91 @@ function formatUpdateMessage(ops: readonly AgentSkillOperation[], t: TFunction):
    .join("\n");
 }

-/** Whether the host has Paseo's skills installed in any form, current or not. */
-export function areSkillsInstalled(status: AgentSkillsStatus | null): boolean {
-  return status !== null && status.state !== "not-installed";
-}
-
-/** Whether the saved selection names any skill there is to install. */
-export function hasSelectedSkills(status: AgentSkillsStatus | null): boolean {
-  if (!status) return false;
-  if (status.selection.mode === "all") return status.available.length > 0;
-  return status.selection.skills.some((name) => status.available.includes(name));
-}
-
 export function AgentSkillsSection({ serverId }: { serverId: string }) {
  const { t } = useTranslation();
  const skills = useAgentSkills(serverId);
-  const { refresh, connected, supported, reconcile, uninstall } = skills;
+  const refreshSkills = skills.refresh;
+  const skillsConnected = skills.connected;
+  const skillsSupported = skills.supported;
+  const [isChoosing, setIsChoosing] = useState(false);
  useFocusEffect(
    useCallback(() => {
-      if (connected && supported) void refresh();
+      if (skillsConnected && skillsSupported) void refreshSkills();
      return undefined;
-    }, [refresh, connected, supported]),
+    }, [refreshSkills, skillsConnected, skillsSupported]),
  );
-  const handleValueChange = useCallback(
-    (next: boolean) => {
-      void (next ? reconcile() : uninstall());
-    },
-    [reconcile, uninstall],
+  const maintenanceOps = useMemo(
+    () => skills.status?.ops.filter((op) => op.kind !== "delete") ?? [],
+    [skills.status?.ops],
  );
-  const docsLink = useMemo(
-    () => ({
-      href: SKILLS_DOCS_URL,
-      label: t("settings.host.skills.docs"),
-      accessibilityLabel: t("settings.host.skills.openDocs"),
-    }),
-    [t],
+  const state =
+    skills.status?.state === "drift" && maintenanceOps.length === 0
+      ? "up-to-date"
+      : (skills.status?.state ?? null);
+  const hasSelected =
+    (skills.status?.selection.mode === "all" && skills.status.available.length > 0) ||
+    (skills.status?.selection.mode === "custom" &&
+      skills.status.selection.skills.some((name) => skills.status?.available.includes(name)));
+
+  const handleReconcile = useCallback(async () => {
+    if (skills.isWorking) return;
+    const confirmed = await confirmDialog({
+      title: t("settings.host.skills.updateTitle"),
+      message:
+        maintenanceOps.length > 0
+          ? formatUpdateMessage(maintenanceOps, t)
+          : t("settings.host.skills.updateFallback"),
+      confirmLabel: t("settings.host.skills.actions.update"),
+    });
+    if (confirmed) await skills.reconcile();
+  }, [maintenanceOps, skills, t]);
+  const handleUninstall = useCallback(async () => {
+    if (skills.isWorking) return;
+    const confirmed = await confirmDialog({
+      title: t("settings.host.skills.uninstallTitle"),
+      message: t("settings.host.skills.uninstallMessage"),
+      confirmLabel: t("settings.host.skills.actions.uninstall"),
+      destructive: true,
+    });
+    if (confirmed) await skills.uninstall();
+  }, [skills, t]);
+  const chooseIcon = useMemo(
+    () => <ThemedSettings size={ICON_SIZE.sm} uniProps={mutedMapping} />,
+    [],
+  );
+  const handleOpen = useCallback(() => setIsChoosing(true), []);
+  const handleClose = useCallback(() => setIsChoosing(false), []);
+  const handleOpenDocs = useCallback(() => {
+    void openExternalUrl(SKILLS_DOCS_URL);
+  }, []);
+  const docsIcon = useMemo(
+    () => <ThemedArrowUpRight size={ICON_SIZE.sm} uniProps={mutedMapping} />,
+    [],
+  );
+  const trailing = useMemo(
+    () => (
+      <Button
+        variant="ghost"
+        size="sm"
+        leftIcon={docsIcon}
+        textStyle={settingsStyles.sectionHeaderLinkText}
+        style={settingsStyles.sectionHeaderLink}
+        onPress={handleOpenDocs}
+        accessibilityLabel={t("settings.host.skills.openDocs")}
+      >
+        {t("settings.host.skills.docs")}
+      </Button>
+    ),
+    [docsIcon, handleOpenDocs, t],
  );

-  if (!connected || !supported) {
+  if (!skills.connected || !skills.supported) {
    return (
-      <SettingsSection title={t("settings.host.skills.sectionTitle")} link={docsLink}>
+      <SettingsSection title={t("settings.host.skills.sectionTitle")} trailing={trailing}>
        <View style={settingsStyles.card} testID="host-agent-skills-unavailable">
          <View style={styles.emptyCard}>
            <Text style={styles.mutedText}>
-              {connected
+              {skills.connected
                ? t("settings.host.skills.unsupported")
                : t("settings.host.skills.unavailable")}
            </Text>
@@ -87,112 +130,109 @@ export function AgentSkillsSection({ serverId }: { serverId: string }) {
  }

  return (
-    <SettingsSection title={t("settings.host.skills.sectionTitle")} link={docsLink}>
-      <SettingsCard testID="host-agent-skills-card">
-        <AgentSkillsRow
-          skills={skills}
-          value={areSkillsInstalled(skills.status)}
-          onValueChange={handleValueChange}
+    <SettingsSection title={t("settings.host.skills.sectionTitle")} trailing={trailing}>
+      <View style={settingsStyles.card} testID="host-agent-skills-card">
+        <View style={settingsStyles.row}>
+          <View style={settingsStyles.rowContent}>
+            <View style={styles.rowTitleRow}>
+              <ThemedBlocks size={ICON_SIZE.md} uniProps={foregroundMapping} />
+              <Text style={settingsStyles.rowTitle}>{t("settings.host.skills.title")}</Text>
+            </View>
+            <Text style={settingsStyles.rowHint}>
+              {state === "drift"
+                ? t("settings.host.skills.updateAvailable")
+                : t("settings.host.skills.description")}
+            </Text>
+          </View>
+          <View style={styles.actionsRow}>
+            <Button
+              variant="ghost"
+              size="sm"
+              leftIcon={chooseIcon}
+              onPress={handleOpen}
+              disabled={skills.status === null || skills.isWorking}
+              accessibilityLabel={t("settings.host.skills.choose")}
+            />
+            {hasSelected ? (
+              <SkillsActions
+                state={state}
+                isWorking={skills.isWorking}
+                onInstall={skills.reconcile}
+                onReconcile={handleReconcile}
+                onUninstall={handleUninstall}
+              />
+            ) : null}
+          </View>
+        </View>
+      </View>
+      {skills.status ? (
+        <SkillSelectionSheet
+          visible={isChoosing}
+          available={skills.status.available}
+          selection={skills.status.selection}
+          isSaving={skills.isWorking}
+          onSave={skills.saveSelection}
+          onClose={handleClose}
        />
-      </SettingsCard>
+      ) : null}
    </SettingsSection>
  );
 }

-/**
- * The orchestration skills row: a switch for whether they are installed, a gear that opens the
- * skill picker, and Update when the installed skills fall behind the bundled ones. The caller
- * decides what the switch is bound to; the picker and Update always act on the host.
- */
-export function AgentSkillsRow({
-  skills,
-  value,
-  onValueChange,
-  disabled = false,
+function SkillsActions({
+  state,
+  isWorking,
+  onReconcile,
+  onInstall,
+  onUninstall,
 }: {
-  skills: AgentSkillsController;
-  value: boolean;
-  onValueChange: (next: boolean) => void;
-  disabled?: boolean;
+  state: AgentSkillsStatus["state"] | null;
+  isWorking: boolean;
+  onReconcile: () => void;
+  onInstall: () => void;
+  onUninstall: () => void;
 }) {
  const { t } = useTranslation();
-  const { status, isWorking, reconcile, saveSelection } = skills;
-  const [isChoosing, setIsChoosing] = useState(false);
-  // Deleting a deselected skill is a choice made in the picker, not an update to offer here.
-  const maintenanceOps = useMemo(
-    () => status?.ops.filter((op) => op.kind !== "delete") ?? [],
-    [status?.ops],
-  );
-  const needsUpdate = status?.state === "drift" && maintenanceOps.length > 0;
-
-  const handleUpdate = useCallback(async () => {
-    if (isWorking) return;
-    const confirmed = await confirmDialog({
-      title: t("settings.host.skills.updateTitle"),
-      message: formatUpdateMessage(maintenanceOps, t),
-      confirmLabel: t("settings.host.skills.actions.update"),
-    });
-    if (confirmed) await reconcile();
-  }, [isWorking, maintenanceOps, reconcile, t]);
-  const handleOpen = useCallback(() => setIsChoosing(true), []);
-  const handleClose = useCallback(() => setIsChoosing(false), []);
-  const chooseIcon = useMemo(
-    () => <ThemedSettings size={ICON_SIZE.sm} uniProps={mutedMapping} />,
-    [],
-  );
-
-  return (
-    <>
-      <SettingsRow
-        label={t("settings.host.skills.title")}
-        hint={
-          needsUpdate
-            ? t("settings.host.skills.updateAvailable")
-            : t("settings.host.skills.description")
-        }
-      >
-        <View style={styles.controls}>
-          {needsUpdate ? (
-            <Button variant="outline" onPress={handleUpdate} disabled={disabled || isWorking}>
-              {isWorking
-                ? t("settings.host.skills.actions.working")
-                : t("settings.host.skills.actions.update")}
-            </Button>
-          ) : null}
-          <Button
-            variant="ghost"
-            leftIcon={chooseIcon}
-            onPress={handleOpen}
-            disabled={disabled || status === null || isWorking}
-            accessibilityLabel={t("settings.host.skills.choose")}
-          />
-          <Switch
-            value={value}
-            onValueChange={onValueChange}
-            // Nothing picked means nothing to install; the gear is the way forward.
-            disabled={
-              disabled || status === null || isWorking || (!value && !hasSelectedSkills(status))
-            }
-            accessibilityLabel={t("settings.host.skills.title")}
-          />
+  if (state === "up-to-date") {
+    return (
+      <View style={styles.actionsRow}>
+        <View style={styles.installedLabel}>
+          <ThemedCheck size={14} uniProps={mutedMapping} />
+          <Text style={styles.mutedText}>{t("settings.host.skills.actions.installed")}</Text>
        </View>
-      </SettingsRow>
-      {status ? (
-        <SkillSelectionSheet
-          visible={isChoosing}
-          available={status.available}
-          selection={status.selection}
-          isSaving={isWorking}
-          onSave={saveSelection}
-          onClose={handleClose}
-        />
-      ) : null}
-    </>
+        <Button variant="outline" size="sm" onPress={onUninstall} disabled={isWorking}>
+          {t("settings.host.skills.actions.uninstall")}
+        </Button>
+      </View>
+    );
+  }
+  if (state === "drift") {
+    return (
+      <View style={styles.actionsRow}>
+        <Button variant="outline" size="sm" onPress={onReconcile} disabled={isWorking}>
+          {isWorking
+            ? t("settings.host.skills.actions.working")
+            : t("settings.host.skills.actions.update")}
+        </Button>
+        <Button variant="outline" size="sm" onPress={onUninstall} disabled={isWorking}>
+          {t("settings.host.skills.actions.uninstall")}
+        </Button>
+      </View>
+    );
+  }
+  return (
+    <Button variant="outline" size="sm" onPress={onInstall} disabled={isWorking}>
+      {isWorking
+        ? t("settings.host.skills.actions.installing")
+        : t("settings.host.skills.actions.install")}
+    </Button>
  );
 }

 const styles = StyleSheet.create((theme) => ({
-  controls: { flexDirection: "row", alignItems: "center", gap: theme.spacing[2] },
+  rowTitleRow: { flexDirection: "row", alignItems: "center", gap: theme.spacing[2] },
+  installedLabel: { flexDirection: "row", alignItems: "center", gap: 4 },
  mutedText: { color: theme.colors.foregroundMuted, fontSize: theme.fontSize.sm },
+  actionsRow: { flexDirection: "row", alignItems: "center", gap: theme.spacing[2] },
  emptyCard: { padding: theme.spacing[4] },
 }));
@@ -1,18 +1,23 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Text, View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
+import { Pressable, Text, View } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { Check } from "lucide-react-native";
 import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import { Switch } from "@/components/ui/switch";
-import { SettingsCard, SettingsRow, SettingsSection } from "@/components/settings";
+import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { settingsStyles } from "@/styles/settings";
+import type { Theme } from "@/styles/theme";
 import { confirmDialog } from "@/utils/confirm-dialog";
 import type {
  AgentSkillSelection as SkillSelection,
  AgentSkillsSaveResult as SkillsSaveResult,
 } from "@getpaseo/protocol/messages";

+const ThemedCheck = withUnistyles(Check);
+const checkedIconMapping = (theme: Theme) => ({ color: theme.colors.accentForeground });
+
 interface SkillSelectionSheetProps {
  visible: boolean;
  available: readonly string[];
@@ -152,11 +157,12 @@ export function SkillSelectionSheet({
      footer={footer}
      testID="skill-selection-sheet"
    >
-      <SettingsCard testID="skill-selection-all-card">
-        <SettingsRow
-          label={t("settings.host.skills.chooseAll")}
-          hint={t("settings.host.skills.chooseAllHint")}
-        >
+      <View style={settingsStyles.card} testID="skill-selection-all-card">
+        <View style={settingsStyles.row}>
+          <View style={settingsStyles.rowContent}>
+            <Text style={settingsStyles.rowTitle}>{t("settings.host.skills.chooseAll")}</Text>
+            <Text style={settingsStyles.rowHint}>{t("settings.host.skills.chooseAllHint")}</Text>
+          </View>
          <Switch
            value={allSkills}
            onValueChange={handleToggleAll}
@@ -164,29 +170,30 @@ export function SkillSelectionSheet({
            accessibilityLabel={t("settings.host.skills.chooseAll")}
            testID="skill-selection-all"
          />
-        </SettingsRow>
-      </SettingsCard>
+        </View>
+      </View>

      {/* The sheet body already spaces its blocks apart, so the section owns
          only the gap between its label and the list the label names. */}
      <SettingsSection title={t("settings.host.skills.chooseList")} flush>
-        <SettingsCard testID="skill-selection-list-card">
+        <View style={settingsStyles.card} testID="skill-selection-list-card">
          {available.length === 0 ? (
            <View style={settingsStyles.row}>
              <Text style={settingsStyles.rowHint}>{t("settings.host.skills.chooseEmpty")}</Text>
            </View>
          ) : (
-            available.map((name) => (
-              <SkillRow
+            available.map((name, index) => (
+              <SkillCheckboxRow
                key={name}
                name={name}
                checked={isSkillSelected(draft, name)}
                disabled={allSkills || isSaving}
+                withBorder={index > 0}
                onToggle={handleToggleSkill}
              />
            ))
          )}
-        </SettingsCard>
+        </View>
      </SettingsSection>

      {saveError ? <Text style={settingsStyles.rowError}>{saveError}</Text> : null}
@@ -194,27 +201,52 @@ export function SkillSelectionSheet({
  );
 }

-function SkillRow({
-  name,
-  checked,
-  disabled,
-  onToggle,
-}: {
+interface SkillCheckboxRowProps {
  name: string;
  checked: boolean;
  disabled: boolean;
+  withBorder: boolean;
  onToggle: (name: string) => void;
-}) {
-  const handleValueChange = useCallback(() => onToggle(name), [name, onToggle]);
+}
+
+function SkillCheckboxRow({
+  name,
+  checked,
+  disabled,
+  withBorder,
+  onToggle,
+}: SkillCheckboxRowProps) {
+  const handlePress = useCallback(() => onToggle(name), [name, onToggle]);
+  const accessibilityState = useMemo(() => ({ checked, disabled }), [checked, disabled]);
+  const rowStyle = useMemo(
+    () => [
+      settingsStyles.row,
+      withBorder ? settingsStyles.rowBorder : null,
+      styles.checkboxRow,
+      disabled ? styles.disabledRow : null,
+    ],
+    [disabled, withBorder],
+  );
+  const boxStyle = useMemo(
+    () => [styles.checkbox, checked ? styles.checkboxChecked : null],
+    [checked],
+  );
+
  return (
-    <SettingsRow label={name}>
-      <Switch
-        value={checked}
-        onValueChange={handleValueChange}
-        disabled={disabled}
-        accessibilityLabel={name}
-      />
-    </SettingsRow>
+    <Pressable
+      style={rowStyle}
+      onPress={handlePress}
+      disabled={disabled}
+      accessibilityRole="checkbox"
+      accessibilityLabel={name}
+      accessibilityState={accessibilityState}
+      aria-checked={checked}
+    >
+      <View style={boxStyle}>
+        {checked ? <ThemedCheck size={14} uniProps={checkedIconMapping} /> : null}
+      </View>
+      <Text style={settingsStyles.rowTitle}>{name}</Text>
+    </Pressable>
  );
 }

@@ -227,4 +259,24 @@ const styles = StyleSheet.create((theme) => ({
  footerButton: {
    flex: 1,
  },
+  checkboxRow: {
+    justifyContent: "flex-start",
+    gap: theme.spacing[3],
+  },
+  disabledRow: {
+    opacity: theme.opacity[50],
+  },
+  checkbox: {
+    width: 22,
+    height: 22,
+    borderRadius: theme.borderRadius.sm,
+    borderWidth: 1,
+    borderColor: theme.colors.border,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  checkboxChecked: {
+    backgroundColor: theme.colors.accent,
+    borderColor: theme.colors.accent,
+  },
 }));
@@ -10,9 +10,6 @@ import { useToast } from "@/contexts/toast-context";
 import { useFetchQuery } from "@/data/query";
 import { useHostFeature } from "@/runtime/host-features";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
-import { confirmDialog } from "@/utils/confirm-dialog";
-
-export type AgentSkillsController = ReturnType<typeof useAgentSkills>;

 export function useAgentSkills(serverId: string) {
  const { t } = useTranslation();
@@ -86,30 +83,12 @@ export function useAgentSkills(serverId: string) {
  const refresh = useCallback(async () => {
    await refetch();
  }, [refetch]);
-  // Both resolve to whether the host ended in the asked-for state; failures are already toasted.
-  const runReconcile = useCallback(
-    () =>
-      reconcileAsync().then(
-        (status) => status.state !== "not-installed",
-        () => false,
-      ),
-    [reconcileAsync],
-  );
-  // Uninstalling deletes whole skill folders, including anything the user added inside them, so
-  // it always asks first. Declining resolves false, as a failure does.
+  const runReconcile = useCallback(async () => {
+    await reconcileAsync().catch(() => undefined);
+  }, [reconcileAsync]);
  const runUninstall = useCallback(async () => {
-    const confirmed = await confirmDialog({
-      title: t("settings.host.skills.uninstallTitle"),
-      message: t("settings.host.skills.uninstallMessage"),
-      confirmLabel: t("settings.host.skills.actions.uninstall"),
-      destructive: true,
-    });
-    if (!confirmed) return false;
-    return uninstallAsync().then(
-      (status) => status.state === "not-installed",
-      () => false,
-    );
-  }, [t, uninstallAsync]);
+    await uninstallAsync().catch(() => undefined);
+  }, [uninstallAsync]);
  const saveSelection = useCallback(
    (selection: AgentSkillSelection, confirmedRemovals: readonly string[] = []) =>
      saveAsync({ selection, confirmedRemovals }),
@@ -15,7 +15,7 @@ import { PaneFind, findShortcutPlatform, isFindShortcut, type PaneFindHandle } f
 import { Button } from "@/components/ui/button";
 import { usePaneFocus } from "@/panels/pane-context";
 import { useRetainedPanelActive } from "@/components/retained-panel";
-import { hasActiveOverlay } from "@/keyboard";
+import { hasActiveWebOverlay } from "@/lib/overlay-root";
 import { isImeComposingKeyboardEvent } from "@/utils/keyboard-ime";
 import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { planTimelinePromptJump } from "@/timeline/timeline-sync-plan";
@@ -104,7 +104,7 @@ export function ChatFind({
  useEffect(() => {
    if (!active || !isInteractive) return;
    const onKeyDown = (event: KeyboardEvent) => {
-      if (event.defaultPrevented || hasActiveOverlay() || isImeComposingKeyboardEvent(event))
+      if (event.defaultPrevented || hasActiveWebOverlay() || isImeComposingKeyboardEvent(event))
        return;
      if (isFindShortcut(event, findShortcutPlatform())) {
        event.preventDefault();
@@ -147,7 +147,7 @@ export function ChatFind({
          {state.failure && (
            <View style={styles.error}>
              <Text style={styles.errorText}>{t(FAILURE_TEXT[state.failure])}</Text>
-              <Button size="sm" variant="ghost" onPress={model.retry}>
+              <Button size="xs" variant="ghost" onPress={model.retry}>
                {t("paneFind.retry")}
              </Button>
            </View>
@@ -69,9 +69,6 @@ function installProbe(
    queryClient: new QueryClient(),
    paseo: {} as InstalledPlugin["paseo"],
    invoke: async () => undefined,
-    subscribe: () => {
-      throw new Error("Subscriptions are not used here");
-    },
  };
 }

@@ -1,5 +1,3 @@
-import { useHardwareKeyboardPresent } from "@/keyboard";
-import { AddHostProvider, AddHostFlowHost } from "@/hosts/add-host";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
 import { useIsExplorerSidebarOpen } from "@/workspace-tabs/explorer-sidebar";
@@ -37,7 +35,6 @@ import { DownloadToast } from "@/components/download-toast";
 import { QuittingOverlay } from "@/components/quitting-overlay";
 import { KeyboardShortcutsDialog } from "@/components/keyboard-shortcuts-dialog";
 import { ChangelogHost } from "@/changelog";
-import { OnboardingHost } from "@/onboarding";
 import { AppDiagnosticHost } from "@/components/app-diagnostic-host";
 import { AppearanceStyleBoundary } from "@/components/appearance-style-boundary";
 import { LeftSidebar } from "@/components/left-sidebar";
@@ -91,7 +88,7 @@ import { useActiveWorktreeNewAction } from "@/hooks/use-active-worktree-new-acti
 import { useGlobalNewWorkspaceAction } from "@/hooks/use-global-new-workspace-action";
 import { useLatchedBoolean } from "@/hooks/use-latched-boolean";
 import { useFaviconStatus } from "@/hooks/use-favicon-status";
-import { useKeyboardShortcuts } from "@/keyboard/use-shortcuts";
+import { useKeyboardShortcuts } from "@/hooks/use-keyboard-shortcuts";
 import { KeyboardShiftProvider } from "@/keyboard/shift";
 import { useCompactWebViewportZoomLock } from "@/hooks/use-compact-web-viewport-zoom-lock";
 import { useOpenProject } from "@/hooks/use-open-project";
@@ -468,7 +465,6 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
  const surface = (
    <View style={layoutStyles.surfaceFill}>
      {workspaceChrome}
-      <AddHostFlowHost />
      <AppearanceStyleBoundary>
        {!isCompactLayout && appChromeLayout.sidebarToggleOwner === "window" ? (
          <WindowChromeRegion corners="top-left">
@@ -498,7 +494,6 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
        <WorkspacePinShortcutHandler />
        <WorkspaceRenameHost />
        <CommandCenter />
-        <OnboardingHost />
        <AddProjectFlowHost />
        <HostChooserModal />
        <HostConfirmationSheet />
@@ -550,12 +545,8 @@ function SidebarChrome({
  const isMobileActive = useIsMobilePanelActive("agent-list");
  const isDesktopOpen = usePanelStore((state) => state.desktop.agentListOpen);
  const active = visible && (isCompactLayout ? isMobileActive : isDesktopOpen);
-  const hardwareKeyboardPresent = useHardwareKeyboardPresent();
  return (
-    <SidebarModelProvider
-      active={active}
-      keyboardNavigationActive={keyboardShortcutsEnabled && hardwareKeyboardPresent}
-    >
+    <SidebarModelProvider active={active}>
      {mounted ? <LeftSidebar active={active} /> : null}
      <WorkspaceShortcutTargetsSubscriber enabled={keyboardShortcutsEnabled} />
    </SidebarModelProvider>
@@ -814,6 +805,7 @@ function RootStack() {
        <Stack.Screen name="open-project" />
        <Stack.Screen name="sessions" />
        <Stack.Screen name="schedules" />
+        <Stack.Screen name="pair-scan" />
      </Stack.Protected>
      <Stack.Screen name="h/[serverId]" />
      <Stack.Screen name="settings/hosts/[serverId]/index" />
@@ -898,13 +890,11 @@ function RootAppTree() {
    <GestureHandlerRootView style={flexStyle}>
      <View style={layoutStyles.surfaceFill}>
        <LucideProvider strokeWidth={ICON_STROKE_WIDTH}>
-          <AddHostProvider>
-            <RootProviders>
-              <RuntimeProviders>
-                <AppShell />
-              </RuntimeProviders>
-            </RootProviders>
-          </AddHostProvider>
+          <RootProviders>
+            <RuntimeProviders>
+              <AppShell />
+            </RuntimeProviders>
+          </RootProviders>
        </LucideProvider>
      </View>
    </GestureHandlerRootView>
@@ -1,14 +1,17 @@
 import { useCallback, useEffect, useMemo, useState, useSyncExternalStore } from "react";
 import { useTranslation } from "react-i18next";
-import { Text, View } from "react-native";
+import { Pressable, Text, View } from "react-native";
+import { useLocalSearchParams, useRouter, type Href } from "expo-router";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { StyleSheet } from "react-native-unistyles";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { CameraView, useCameraPermissions } from "expo-camera";
 import type { BarcodeScanningResult, BarcodeSettings } from "expo-camera";
 import { getHostRuntimeStore } from "@/runtime/host-runtime";
-import { openPairScan } from "./pair-scan-model";
+import { openPairScan } from "@/hosts/pair-scan-model";
+import { buildHostRootRoute, buildSettingsHostRoute } from "@/utils/host-routes";
 import { isWeb } from "@/constants/platform";
-import { PairLinkModal } from "./pair-link-modal";
+import { BackHeader } from "@/components/headers/back-header";
+import { PairLinkModal } from "@/components/pair-link-modal";
 import { Button } from "@/components/ui/button";

 const styles = StyleSheet.create((theme) => ({
@@ -110,26 +113,50 @@ const styles = StyleSheet.create((theme) => ({
  },
 }));

-export function PairScanContent({
-  onConnected,
-  onClose,
-}: {
-  onConnected: (serverId: string) => void;
-  onClose: () => void;
-}) {
+export default function PairScanScreen() {
+  const { theme } = useUnistyles();
  const { t } = useTranslation();
  const insets = useSafeAreaInsets();
+  const router = useRouter();
+  const params = useLocalSearchParams<{
+    source?: string;
+  }>();
+  const source = typeof params.source === "string" ? params.source : "settings";
+
  const [permission, requestPermission] = useCameraPermissions();

+  const navigateToPairedHost = useCallback(
+    (serverId: string) => {
+      if (source === "onboarding") {
+        router.replace(buildHostRootRoute(serverId));
+        return;
+      }
+      router.replace(buildSettingsHostRoute(serverId));
+    },
+    [router, source],
+  );
+
  const [scan] = useState(() =>
    openPairScan({
-      importConnectionLink: (link) => getHostRuntimeStore().importConnectionLink(link, "hostRoot"),
-      onConnected,
+      importConnectionLink: (link) =>
+        getHostRuntimeStore().importConnectionLink(
+          link,
+          source === "onboarding" ? "hostRoot" : "hostSettings",
+        ),
+      onConnected: navigateToPairedHost,
    }),
  );
  const scanState = useSyncExternalStore(scan.subscribe, scan.getState, scan.getState);
  useEffect(() => () => scan.close(), [scan]);

+  const closeToSource = useCallback(() => {
+    try {
+      router.back();
+    } catch {
+      router.replace("/" as Href);
+    }
+  }, [router]);
+
  useEffect(() => {
    if (isWeb) return;
    if (permission && permission.granted) return;
@@ -142,29 +169,35 @@ export function PairScanContent({
    [scan],
  );

+  const handleRouterBack = useCallback(() => router.back(), [router]);
  const savePasswordPairing = useCallback(
-    ({ serverId }: { serverId: string }) => onConnected(serverId),
-    [onConnected],
+    ({ serverId }: { serverId: string }) => navigateToPairedHost(serverId),
+    [navigateToPairedHost],
  );
  const handleRequestPermission = useCallback(() => {
    void requestPermission();
  }, [requestPermission]);

  const bodyStyle = useMemo(
-    () => [styles.body, { paddingBottom: insets.bottom + 24 }],
-    [insets.bottom],
+    () => [styles.body, { paddingBottom: insets.bottom + theme.spacing[6] }],
+    [insets.bottom, theme.spacing],
+  );
+  const helperTextStyle = useMemo(
+    () => [styles.helperText, { color: theme.colors.foreground }],
+    [theme.colors.foreground],
  );

  if (isWeb) {
    return (
      <View style={styles.container}>
+        <BackHeader title={t("pairing.scan.title")} onBack={handleRouterBack} />
        <View style={bodyStyle}>
          <View style={styles.permissionCard}>
            <Text style={styles.permissionTitle}>{t("pairing.scan.webUnavailableTitle")}</Text>
            <Text style={styles.permissionBody}>{t("pairing.scan.webUnavailableBody")}</Text>
-            <Button style={styles.permissionButton} onPress={onClose}>
-              <Text style={styles.permissionButtonText}>{t("common.actions.back")}</Text>
-            </Button>
+            <Pressable style={styles.permissionButton} onPress={closeToSource}>
+              <Text style={styles.permissionButtonText}>{t("pairing.scan.backToSettings")}</Text>
+            </Pressable>
          </View>
        </View>
      </View>
@@ -175,14 +208,16 @@ export function PairScanContent({

  return (
    <View style={styles.container}>
+      <BackHeader title={t("pairing.scan.title")} onBack={closeToSource} />
+
      <View style={bodyStyle}>
        {!granted ? (
          <View style={styles.permissionCard}>
            <Text style={styles.permissionTitle}>{t("pairing.scan.cameraPermissionTitle")}</Text>
            <Text style={styles.permissionBody}>{t("pairing.scan.cameraPermissionBody")}</Text>
-            <Button style={styles.permissionButton} onPress={handleRequestPermission}>
+            <Pressable style={styles.permissionButton} onPress={handleRequestPermission}>
              <Text style={styles.permissionButtonText}>{t("pairing.scan.grantPermission")}</Text>
-            </Button>
+            </Pressable>
          </View>
        ) : (
          <View style={styles.cameraWrap}>
@@ -200,10 +235,10 @@ export function PairScanContent({
                <View style={[styles.corner, styles.cornerBR]} />
              </View>
              {scanState.status === "pairing" ? (
-                <Text style={styles.helperText}>{t("pairing.scan.pairing")}</Text>
+                <Text style={helperTextStyle}>{t("pairing.scan.pairing")}</Text>
              ) : null}
              {scanState.status === "stopped" && scanState.error ? (
-                <Text style={styles.helperText}>{scanState.error}</Text>
+                <Text style={helperTextStyle}>{scanState.error}</Text>
              ) : null}
              {scanState.status === "stopped" ? (
                <Button
@@ -35,9 +35,10 @@ function SettingsDaemonRedirect() {
 }

 export default function SettingsSectionRoute() {
-  const params = useLocalSearchParams<{ section?: string }>();
+  const params = useLocalSearchParams<{ section?: string; addHost?: string }>();
  const rawSection = typeof params.section === "string" ? params.section : "";
  const section: SettingsSectionSlug = isSettingsSectionSlug(rawSection) ? rawSection : "general";
+  const openAddHostIntent = typeof params.addHost === "string" ? params.addHost : null;
  const view = useMemo(() => ({ kind: "section" as const, section }), [section]);

  // COMPAT(settingsDaemonRedirect): added 2026-07-08, remove after 2027-01-08.
@@ -49,5 +50,5 @@ export default function SettingsSectionRoute() {
    );
  }

-  return <SettingsScreen view={view} />;
+  return <SettingsScreen view={view} openAddHostIntent={openAddHostIntent} />;
 }
@@ -1,292 +0,0 @@
-import { useCallback, useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { Text, View, type PressableStateCallbackType } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { PressHighlight } from "@/components/ui/press-highlight";
-import { DEFAULT_THEME_PREFERENCE, useAppSettings, type AppSettings } from "@/hooks/use-settings";
-import type { PluginThemeOption } from "@/plugins/themes";
-import {
-  THEME_OPTIONS,
-  PLUGIN_THEME_PREFERENCE,
-  darkTheme,
-  lightTheme,
-  type Theme,
-} from "@/styles/theme";
-import { useContributedThemes } from "./provider";
-
-type BuiltInThemePreference = Exclude<AppSettings["theme"], typeof PLUGIN_THEME_PREFERENCE>;
-
-// System leads the grid because it is the default.
-const PICKER_THEME_OPTIONS = [
-  ...THEME_OPTIONS.filter((option) => option.name === "auto"),
-  ...THEME_OPTIONS.filter((option) => option.name !== "auto"),
-];
-
-const PREVIEW_ASPECT_RATIO = 16 / 9;
-
-/**
- * Every theme as a tile with a small preview drawn from its own tokens. Picking a tile applies
- * the theme to the whole app at once. Settings → Appearance and first-run setup share it.
- */
-export function ThemePicker() {
-  const { t } = useTranslation();
-  const { settings, updateSettings } = useAppSettings();
-  const { options: pluginThemes, selected: selectedPluginTheme, select } = useContributedThemes();
-  // A selected contribution that is no longer installed shows the fallback the app renders.
-  const builtInValue =
-    settings.theme === PLUGIN_THEME_PREFERENCE ? DEFAULT_THEME_PREFERENCE : settings.theme;
-
-  const selectBuiltIn = useCallback(
-    (theme: BuiltInThemePreference) => {
-      void updateSettings({ theme });
-    },
-    [updateSettings],
-  );
-
-  return (
-    <View
-      style={styles.grid}
-      accessibilityRole="radiogroup"
-      accessibilityLabel={t("settings.appearance.theme.title")}
-    >
-      {PICKER_THEME_OPTIONS.map((option) => (
-        <BuiltInThemeTile
-          key={option.name}
-          value={option.name}
-          selected={selectedPluginTheme === null && builtInValue === option.name}
-          onSelect={selectBuiltIn}
-        />
-      ))}
-      {pluginThemes.map((option) => (
-        <PluginThemeTile
-          key={option.id}
-          option={option}
-          selected={selectedPluginTheme?.id === option.id}
-          onSelect={select}
-        />
-      ))}
-    </View>
-  );
-}
-
-function BuiltInThemeTile({
-  value,
-  selected,
-  onSelect,
-}: {
-  value: BuiltInThemePreference;
-  selected: boolean;
-  onSelect: (value: BuiltInThemePreference) => void;
-}) {
-  const { t } = useTranslation();
-  const handlePress = useCallback(() => onSelect(value), [onSelect, value]);
-  const option = THEME_OPTIONS.find((candidate) => candidate.name === value);
-  return (
-    <ThemeTile
-      label={t(`settings.appearance.theme.options.${value}`)}
-      selected={selected}
-      onPress={handlePress}
-      previewTheme={option && "theme" in option ? option.theme : "system"}
-    />
-  );
-}
-
-function PluginThemeTile({
-  option,
-  selected,
-  onSelect,
-}: {
-  option: PluginThemeOption;
-  selected: boolean;
-  onSelect: (option: PluginThemeOption) => void;
-}) {
-  const handlePress = useCallback(() => onSelect(option), [onSelect, option]);
-  return (
-    <ThemeTile
-      label={option.name}
-      selected={selected}
-      onPress={handlePress}
-      previewTheme={option.theme}
-    />
-  );
-}
-
-function ThemeTile({
-  label,
-  selected,
-  onPress,
-  previewTheme,
-}: {
-  label: string;
-  selected: boolean;
-  onPress: () => void;
-  /** "system" follows the OS, so its preview shows both halves. */
-  previewTheme: Theme | "system";
-}) {
-  const accessibilityState = useMemo(() => ({ checked: selected }), [selected]);
-  const tileStyle = useCallback(
-    ({ hovered }: PressableStateCallbackType & { hovered?: boolean }) => [
-      styles.tile,
-      hovered && !selected && styles.tileHovered,
-      selected && styles.tileSelected,
-    ],
-    [selected],
-  );
-  return (
-    <View style={styles.cell}>
-      <PressHighlight
-        style={tileStyle}
-        onPress={onPress}
-        accessibilityRole="radio"
-        accessibilityLabel={label}
-        accessibilityState={accessibilityState}
-        aria-checked={selected}
-      >
-        <View style={styles.previewFrame}>
-          {previewTheme === "system" ? (
-            <SystemThemePreview />
-          ) : (
-            <ThemePreview theme={previewTheme} />
-          )}
-        </View>
-        <Text style={styles.label} numberOfLines={1}>
-          {label}
-        </Text>
-      </PressHighlight>
-    </View>
-  );
-}
-
-/** A sketch of the app — sidebar, a few lines of text and an accent bubble — in `theme`'s colors. */
-function ThemePreview({ theme }: { theme: Theme }) {
-  const colors = theme.colors;
-  const previewStyles = useMemo(
-    () => ({
-      root: [styles.preview, { backgroundColor: colors.surface0 }],
-      sidebar: [styles.previewSidebar, { backgroundColor: colors.surfaceSidebar }],
-      mutedLine: { backgroundColor: colors.foregroundMuted },
-      strongLine: { backgroundColor: colors.foreground },
-      bubble: [styles.previewBubble, { backgroundColor: colors.accent }],
-    }),
-    [colors],
-  );
-  return (
-    <View style={previewStyles.root}>
-      <View style={previewStyles.sidebar}>
-        <View style={[styles.previewLine, styles.sidebarLineWide, previewStyles.mutedLine]} />
-        <View style={[styles.previewLine, styles.sidebarLineNarrow, previewStyles.mutedLine]} />
-        <View style={[styles.previewLine, styles.sidebarLineMedium, previewStyles.mutedLine]} />
-      </View>
-      <View style={styles.previewMain}>
-        <View style={[styles.previewTitle, previewStyles.strongLine]} />
-        <View style={[styles.previewLine, styles.mainLineWide, previewStyles.mutedLine]} />
-        <View style={[styles.previewLine, styles.mainLineNarrow, previewStyles.mutedLine]} />
-        <View style={previewStyles.bubble} />
-      </View>
-    </View>
-  );
-}
-
-/** "System" follows the OS: light on the left half, dark on the right. */
-function SystemThemePreview() {
-  return (
-    <View style={styles.preview}>
-      <ThemePreview theme={lightTheme} />
-      <View style={styles.systemDarkHalf}>
-        <View style={styles.systemDarkOffset}>
-          <ThemePreview theme={darkTheme} />
-        </View>
-      </View>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  // Columns fill the row: each cell is a fixed fraction of it, and the half-gap padding on every
-  // cell plus the negative margin here leaves exactly one gap between neighbors.
-  grid: {
-    flexDirection: "row",
-    flexWrap: "wrap",
-    margin: -theme.spacing[3] / 2,
-  },
-  cell: {
-    width: { xs: "50%", md: "25%" },
-    padding: theme.spacing[3] / 2,
-  },
-  tile: {
-    padding: theme.spacing[1],
-    gap: theme.spacing[1],
-    borderRadius: theme.borderRadius.lg,
-    borderWidth: theme.borderWidth[2],
-    borderColor: "transparent",
-  },
-  tileHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
-  tileSelected: {
-    borderColor: theme.colors.accent,
-  },
-  previewFrame: {
-    borderRadius: theme.borderRadius.md,
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
-    overflow: "hidden",
-  },
-  label: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.sm,
-    paddingHorizontal: theme.spacing[1],
-  },
-  preview: {
-    width: "100%",
-    aspectRatio: PREVIEW_ASPECT_RATIO,
-    flexDirection: "row",
-    overflow: "hidden",
-  },
-  previewSidebar: {
-    width: 36,
-    paddingHorizontal: 6,
-    paddingVertical: 8,
-    gap: 5,
-  },
-  previewMain: {
-    flex: 1,
-    padding: 8,
-    gap: 5,
-  },
-  previewLine: {
-    height: 4,
-    borderRadius: 2,
-    opacity: 0.6,
-  },
-  previewTitle: {
-    width: "55%",
-    height: 5,
-    borderRadius: 2,
-  },
-  sidebarLineWide: { width: "100%" },
-  sidebarLineNarrow: { width: "60%" },
-  sidebarLineMedium: { width: "80%" },
-  mainLineWide: { width: "90%" },
-  mainLineNarrow: { width: "65%" },
-  previewBubble: {
-    marginTop: "auto",
-    alignSelf: "flex-end",
-    width: "45%",
-    height: 10,
-    borderRadius: 5,
-  },
-  systemDarkHalf: {
-    position: "absolute",
-    top: 0,
-    bottom: 0,
-    left: "50%",
-    width: "50%",
-    overflow: "hidden",
-  },
-  // A full-width dark preview shifted left by half, so only its right half shows.
-  systemDarkOffset: {
-    width: "200%",
-    marginLeft: "-100%",
-  },
-}));
@@ -118,7 +118,7 @@ function ChangelogBody({ state, shownReleases, onShowMore, onRetry }: ChangelogB
          description={t("changelog.error.description")}
          testID="changelog-error"
        >
-          <Button variant="outline" onPress={onRetry} testID="changelog-retry">
+          <Button variant="outline" size="sm" onPress={onRetry} testID="changelog-retry">
            {t("common.actions.retry")}
          </Button>
        </Alert>
@@ -1,4 +1,3 @@
-import { useOverlayRegistration, type KeyboardInputEvent } from "@/keyboard";
 import { Modal } from "@/components/ui/modal";
 import equal from "fast-deep-equal";
 import { recordRenderProfileReasons } from "@/utils/render-profiler";
@@ -53,7 +52,11 @@ import { useProjects } from "@/hooks/use-projects";
 import { useTimeAgo } from "@/hooks/use-time-ago";
 import { createProjectIconTarget } from "@/projects/icon-target";
 import { useProjectIcons } from "@/projects/icons";
-import { OverlayLayerProvider, useGlobalOverlayLayer } from "@/lib/overlay-root";
+import {
+  OverlayLayerProvider,
+  useGlobalWebOverlayLayer,
+  useWebOverlayRegistration,
+} from "@/lib/overlay-root";
 import { useHosts } from "@/runtime/host-runtime";
 import {
  useKeyboardShortcutsStore,
@@ -760,10 +763,6 @@ function SectionRow({ row }: { row: Extract<CommandCenterListRow, { kind: "secti
  );
 }

-// Escape arrives without asking; it is registered for `agent.interrupt` anyway.
-// Backspace stays off deliberately — the palette pops its scope with it on web,
-// but a registered command would stop the search field deleting text.
-
 export function CommandCenter() {
  const { t } = useTranslation();
  const isCompact = useIsCompactFormFactor();
@@ -781,7 +780,7 @@ export function CommandCenter() {
    interaction,
  );
  const showBottomSheet = isCompact && isNative;
-  const modalLayer = useGlobalOverlayLayer("modal", state.open);
+  const modalLayer = useGlobalWebOverlayLayer("modal", isWeb && state.open && !showBottomSheet);
  const { sheetRef, handleSheetChange, handleSheetDismiss } = useIsolatedBottomSheetVisibility({
    visible: state.open,
    isEnabled: showBottomSheet,
@@ -875,20 +874,23 @@ export function CommandCenter() {
      : {}),
    scrollEventThrottle: 16,
  };
+  const keyPress = useCallback(
+    ({ nativeEvent: { key } }: { nativeEvent: { key: string } }) => state.key(key),
+    [state],
+  );
  const submit = useCallback(() => state.key("Enter"), [state]);
-  const handleOverlayKeyDown = useCallback(
-    (event: KeyboardInputEvent) => {
+  const handleWebOverlayKeyDown = useCallback(
+    (event: KeyboardEvent) => {
      if (!state.key(event.key)) return false;
      event.preventDefault();
      return true;
    },
    [state],
  );
-  const setOverlayScope = useOverlayRegistration({
-    keys: ["Escape", "Enter", "ArrowUp", "ArrowDown"],
-    active: state.open,
+  const setWebOverlayScope = useWebOverlayRegistration({
+    active: isWeb && state.open && !showBottomSheet,
    layer: modalLayer,
-    onKeyDown: handleOverlayKeyDown,
+    onKeyDown: handleWebOverlayKeyDown,
  });

  if (showBottomSheet) {
@@ -909,46 +911,45 @@ export function CommandCenter() {
        keyboardBlurBehavior="restore"
        accessible={false}
      >
-        <OverlayLayerProvider layer={modalLayer}>
-          <View style={[styles.bottomSheetHeader, styles.searchRow]} testID="command-center-header">
-            {state.scope === "files" ? (
-              <ScopeChip label={t("shell.commandCenter.files")} onRemove={state.clearScope} />
-            ) : null}
-            <ThemedBottomSheetTextInput
-              testID="command-center-input"
-              ref={bottomSheetInputRef}
-              initialValue={state.query}
-              variant="bottom-sheet"
-              onChangeText={state.setQuery}
-              onSubmitEditing={submit}
-              placeholder={
-                state.scope === "files"
-                  ? t("shell.commandCenter.filePlaceholder")
-                  : t("shell.commandCenter.placeholder")
-              }
-              style={[styles.input, styles.growingInput]}
-              autoCapitalize="none"
-              autoCorrect={false}
-              autoFocus
-            />
-            <FileSearchLoadingIndicator
-              loading={state.fileSearchLoading}
-              label={t("shell.commandCenter.searchingFiles")}
-            />
-          </View>
-          {fileSearchError}
-          <BottomSheetFlatList ref={bottomSheetListRef} {...commonListProps} />
-        </OverlayLayerProvider>
+        <View style={[styles.bottomSheetHeader, styles.searchRow]} testID="command-center-header">
+          {state.scope === "files" ? (
+            <ScopeChip label={t("shell.commandCenter.files")} onRemove={state.clearScope} />
+          ) : null}
+          <ThemedBottomSheetTextInput
+            testID="command-center-input"
+            ref={bottomSheetInputRef}
+            initialValue={state.query}
+            variant="bottom-sheet"
+            onChangeText={state.setQuery}
+            onKeyPress={keyPress}
+            onSubmitEditing={submit}
+            placeholder={
+              state.scope === "files"
+                ? t("shell.commandCenter.filePlaceholder")
+                : t("shell.commandCenter.placeholder")
+            }
+            style={[styles.input, styles.growingInput]}
+            autoCapitalize="none"
+            autoCorrect={false}
+            autoFocus
+          />
+          <FileSearchLoadingIndicator
+            loading={state.fileSearchLoading}
+            label={t("shell.commandCenter.searchingFiles")}
+          />
+        </View>
+        {fileSearchError}
+        <BottomSheetFlatList ref={bottomSheetListRef} {...commonListProps} />
      </IsolatedBottomSheetModal>
    );
  }
  if (!state.open) return null;
  return (
-    <OverlayLayerProvider layer={modalLayer}>
+    <OverlayLayerProvider layer={isWeb ? modalLayer : 0}>
      <Modal visible transparent animationType="fade" onRequestClose={state.close}>
        <View style={styles.overlay}>
          <Pressable style={styles.backdrop} onPress={state.close} />
-          <View ref={setOverlayScope} testID="command-center-panel" style={styles.panel}>
+          <View ref={setWebOverlayScope} testID="command-center-panel" style={styles.panel}>
            <View style={[styles.header, styles.searchRow]} testID="command-center-header">
              {state.scope === "files" ? (
                <ScopeChip label={t("shell.commandCenter.files")} onRemove={state.clearScope} />
@@ -1,4 +1,3 @@
-import { usesDesktopBindings } from "@/keyboard";
 import { useMemo } from "react";
 import { router, type Href } from "expo-router";
 import { useTranslation } from "react-i18next";
@@ -16,12 +15,12 @@ import {
  Settings,
 } from "lucide-react-native";
 import { withUnistyles } from "react-native-unistyles";
-import { useIsCompactFormFactor } from "@/constants/layout";
+import { getIsElectronRuntime, useIsCompactFormFactor } from "@/constants/layout";
 import { useKeyboardShortcutOverrides } from "@/hooks/use-keyboard-shortcut-overrides";
 import { useOpenAddProject } from "@/hooks/use-open-add-project";
 import { useImportSession } from "@/hooks/use-import-session";
 import { useKeyboardActionDispatcher } from "@/keyboard/keyboard-action-dispatcher-context";
-import { useHardwareKeyboardPresent } from "@/keyboard";
+import { useKeyboardShortcutsAvailable } from "@/keyboard/availability";
 import { resolveShortcutKeysForAction } from "@/keyboard/keyboard-shortcuts";
 import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
 import { usePanelStore } from "@/stores/panel-store";
@@ -112,7 +111,7 @@ export function CommandCenterRootActions() {
  const keyboardActionDispatcher = useKeyboardActionDispatcher();
  const { t } = useTranslation();
  const { overrides } = useKeyboardShortcutOverrides();
-  const shortcutsAvailable = useHardwareKeyboardPresent();
+  const shortcutsAvailable = useKeyboardShortcutsAvailable();
  const openAddProject = useOpenAddProject();
  const { open: openImportSession, sheet: importSessionSheet } = useImportSession();
  const settingsRoute = useMemo<Href>(() => buildSettingsRoute(), []);
@@ -129,7 +128,7 @@ export function CommandCenterRootActions() {
  const toggleDesktopAgentList = usePanelStore((state) => state.toggleDesktopAgentList);
  const toggleAgentList = isCompact ? toggleMobileAgentList : toggleDesktopAgentList;
  const shortcutPlatform = useMemo(
-    () => ({ isMac: getShortcutOs() === "mac", usesDesktopBindings }),
+    () => ({ isMac: getShortcutOs() === "mac", isDesktop: getIsElectronRuntime() }),
    [],
  );
  const actions = useMemo<CommandCenterContribution[]>(() => {
@@ -1,4 +1,3 @@
-import { usesDesktopBindings } from "@/keyboard";
 import { useCallback, useMemo, type ReactElement } from "react";
 import { useTranslation } from "react-i18next";
 import {
@@ -106,7 +105,7 @@ function staticIcon(element: ReactElement | undefined): CommandCenterIcon | unde
 }

 function resolveWorkspaceShortcuts(overrides: ShortcutOverrides): WorkspaceCommandCenterShortcuts {
-  const platform = { isMac: getShortcutOs() === "mac", usesDesktopBindings };
+  const platform = { isMac: getShortcutOs() === "mac", isDesktop: getIsElectron() };
  return resolveWorkspaceCommandCenterShortcuts({ overrides, platform });
 }

@@ -6,7 +6,7 @@ describe("resolveWorkspaceCommandCenterShortcuts", () => {
    expect(
      resolveWorkspaceCommandCenterShortcuts({
        overrides: {},
-        platform: { isMac: true, usesDesktopBindings: true },
+        platform: { isMac: true, isDesktop: true },
      }).newAgent,
    ).toEqual([["mod", "shift", "A"]]);
  });
@@ -6,7 +6,7 @@ import type { WorkspaceCommandCenterShortcuts } from "./workspace-contributions"

 interface ResolveWorkspaceCommandCenterShortcutsInput {
  overrides: ShortcutOverrides;
-  platform: { isMac: boolean; usesDesktopBindings: boolean };
+  platform: { isMac: boolean; isDesktop: boolean };
 }

 export function resolveWorkspaceCommandCenterShortcuts({
@@ -1,4 +1,3 @@
-import { useOverlayRegistration, type KeyboardInputEvent } from "@/keyboard";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import type { ComponentProps, ReactNode } from "react";
 import { createPortal } from "react-dom";
@@ -7,7 +6,12 @@ import { Keyboard, Pressable, Text, View } from "react-native";
 import type { DimensionValue, StyleProp, ViewProps, ViewStyle } from "react-native";
 import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { getOverlayRoot, OverlayLayerProvider, useGlobalOverlayLayer } from "../lib/overlay-root";
+import {
+  getOverlayRoot,
+  OverlayLayerProvider,
+  useGlobalWebOverlayLayer,
+  useWebOverlayRegistration,
+} from "../lib/overlay-root";
 import {
  BottomSheetHandle,
  useBottomSheetGestureHandlers,
@@ -95,7 +99,7 @@ const styles = StyleSheet.create((theme) => ({
    maxHeight: "85%",
    flexShrink: 1,
    minHeight: 0,
-    backgroundColor: theme.colors.surface0,
+    backgroundColor: theme.colors.surface1,
    borderRadius: theme.borderRadius.xl,
    borderWidth: 1,
    borderColor: theme.colors.surface2,
@@ -136,12 +140,6 @@ const styles = StyleSheet.create((theme) => ({
    padding: theme.spacing[SHEET_HEADER_CLOSE_PADDING_SCALE],
    borderRadius: theme.borderRadius.lg,
  },
-  // Without a header the close button floats over the card's top-right corner.
-  floatingClose: {
-    position: "absolute",
-    top: theme.spacing[4],
-    right: theme.spacing[4],
-  },
  searchRow: {
    flexDirection: "row",
    alignItems: "center",
@@ -495,27 +493,8 @@ export function InlineHeaderView({ header }: { header: SheetHeader }) {
  );
 }

-/**
- * The sheet's action row: a top border, the sheet's side inset, and children spread across it.
- * The sheet draws it for `footer`; a body that splits into panes renders it at the bottom of one.
- */
-export function SheetFooter({
-  style,
-  children,
-}: {
-  style?: StyleProp<ViewStyle>;
-  children: ReactNode;
-}) {
-  return <View style={[styles.footer, style]}>{children}</View>;
-}
-
 export interface AdaptiveModalSheetProps {
-  /**
-   * The title row with the close button. Leave it out when the body draws its own chrome, such as
-   * a full-height side rail: the desktop card then floats the close button over its top-right
-   * corner, and the compact sheet closes from its handle.
-   */
-  header?: SheetHeader;
+  header: SheetHeader;
  visible: boolean;
  onClose: () => void;
  onDismiss?: () => void;
@@ -555,7 +534,7 @@ function CompactSheetBody({
  contentStyle,
  children,
 }: {
-  header?: SheetHeader;
+  header: SheetHeader;
  onClose: () => void;
  testID?: string;
  footer: ReactNode;
@@ -585,7 +564,7 @@ function CompactSheetBody({
  );
  return (
    <SheetVisibleFrame footer={footerView}>
-      {header ? <SheetHeaderView header={header} onClose={onClose} testID={testID} /> : null}
+      <SheetHeaderView header={header} onClose={onClose} testID={testID} />
      <View style={[styles.compactStaticContent, bodyStyle]}>
        {scrollable ? (
          <ScrollView
@@ -633,7 +612,7 @@ export function AdaptiveModalSheet({
  const isKeyboardVisible = useKeyboardVisibility(visible);
  const resolvedSnapPoints = useMemo(() => snapPoints ?? ["65%", "90%"], [snapPoints]);
  const footerView = useMemo(
-    () => (footer ? <SheetFooter style={footerContainerStyle}>{footer}</SheetFooter> : null),
+    () => (footer ? <View style={[styles.footer, footerContainerStyle]}>{footer}</View> : null),
    [footer, footerContainerStyle],
  );
  useEffect(() => {
@@ -651,7 +630,7 @@ export function AdaptiveModalSheet({
  });
  const [shouldRenderWeb, setShouldRenderWeb] = useState(visible);
  const [isWebClosing, setIsWebClosing] = useState(false);
-  const modalLayer = useGlobalOverlayLayer("modal", visible || shouldRenderWeb);
+  const modalLayer = useGlobalWebOverlayLayer("modal", isWeb && !isMobile && shouldRenderWeb);
  const handleDismiss = useCallback(() => {
    handleSheetDismiss();
    onDismiss?.();
@@ -679,8 +658,8 @@ export function AdaptiveModalSheet({
    [isWebClosing, modalLayer],
  );

-  const handleOverlayKeyDown = useCallback(
-    (event: KeyboardInputEvent) => {
+  const handleWebOverlayKeyDown = useCallback(
+    (event: KeyboardEvent) => {
      if (event.key !== "Escape") return false;
      event.preventDefault();
      event.stopPropagation();
@@ -689,11 +668,10 @@ export function AdaptiveModalSheet({
    },
    [onClose],
  );
-  const setOverlayScope = useOverlayRegistration({
-    keys: ["Escape"],
-    active: visible,
+  const setWebOverlayScope = useWebOverlayRegistration({
+    active: isWeb && !isMobile && visible,
    layer: modalLayer,
-    onKeyDown: handleOverlayKeyDown,
+    onKeyDown: handleWebOverlayKeyDown,
  });

  useEffect(() => {
@@ -732,20 +710,18 @@ export function AdaptiveModalSheet({
        accessible={false}
        presentation={presentation}
      >
-        <OverlayLayerProvider layer={modalLayer}>
-          <CompactSheetBody
-            header={header}
-            onClose={onClose}
-            testID={testID}
-            footer={footerView}
-            isKeyboardVisible={isKeyboardVisible}
-            scrollable={scrollable}
-            bodyStyle={bodyStyle}
-            contentStyle={contentStyle}
-          >
-            {children}
-          </CompactSheetBody>
-        </OverlayLayerProvider>
+        <CompactSheetBody
+          header={header}
+          onClose={onClose}
+          testID={testID}
+          footer={footerView}
+          isKeyboardVisible={isKeyboardVisible}
+          scrollable={scrollable}
+          bodyStyle={bodyStyle}
+          contentStyle={contentStyle}
+        >
+          {children}
+        </CompactSheetBody>
      </IsolatedBottomSheetModal>
    );
  }
@@ -754,7 +730,7 @@ export function AdaptiveModalSheet({
    desktopHeight == null ? styles.desktopStaticContent : styles.compactStaticContent;
  const cardInner = (
    <OverlayLayerProvider layer={modalLayer}>
-      {header ? <SheetHeaderView header={header} onClose={onClose} /> : null}
+      <SheetHeaderView header={header} onClose={onClose} />
      <View style={[scrollable ? styles.desktopScrollContainer : desktopStaticStyle, bodyStyle]}>
        {scrollable ? (
          <ScrollView
@@ -770,15 +746,6 @@ export function AdaptiveModalSheet({
        )}
      </View>
      {footerView}
-      {header ? null : (
-        <View style={styles.floatingClose}>
-          <SheetHeaderIconButton
-            icon={X}
-            accessibilityLabel={t("common.actions.close")}
-            onPress={onClose}
-          />
-        </View>
-      )}
    </OverlayLayerProvider>
  );

@@ -789,7 +756,13 @@ export function AdaptiveModalSheet({
        style={ABSOLUTE_FILL_STYLE}
        onPress={onClose}
      />
-      <View ref={setOverlayScope} style={desktopCardStyle} role="dialog" aria-modal tabIndex={-1}>
+      <View
+        ref={setWebOverlayScope}
+        style={desktopCardStyle}
+        role="dialog"
+        aria-modal
+        tabIndex={-1}
+      >
        {cardInner}
      </View>
    </View>
@@ -1,10 +1,9 @@
-import { PressHighlight } from "@/components/ui/press-highlight";
 import { useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { Text, View } from "react-native";
+import { Pressable, Text, View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { QrCode, Link2, ClipboardPaste, Terminal } from "lucide-react-native";
-import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
+import { AdaptiveModalSheet, type SheetHeader } from "./adaptive-modal-sheet";
 import { isFdroidBuild } from "@/constants/build-profile";
 import { isNative } from "@/constants/platform";
 import { isElectronRuntime } from "@/desktop/host";
@@ -85,7 +84,7 @@ export function AddHostMethodModal({
      onClose={onClose}
      testID="add-host-method-modal"
    >
-      <PressHighlight
+      <Pressable
        style={styles.option}
        onPress={handleDirect}
        accessibilityRole="button"
@@ -99,10 +98,10 @@ export function AddHostMethodModal({
            {t("pairing.connectionMethods.direct.description")}
          </Text>
        </View>
-      </PressHighlight>
+      </Pressable>

      {isElectronRuntime() ? (
-        <PressHighlight
+        <Pressable
          style={styles.option}
          onPress={handleRemoteSsh}
          accessibilityRole="button"
@@ -116,11 +115,11 @@ export function AddHostMethodModal({
              {t("pairing.connectionMethods.remoteSsh.description")}
            </Text>
          </View>
-        </PressHighlight>
+        </Pressable>
      ) : null}

      {isNative && !isFdroidBuild ? (
-        <PressHighlight
+        <Pressable
          style={styles.option}
          onPress={handleScan}
          accessibilityRole="button"
@@ -133,10 +132,10 @@ export function AddHostMethodModal({
              {t("pairing.connectionMethods.scanQr.description")}
            </Text>
          </View>
-        </PressHighlight>
+        </Pressable>
      ) : null}

-      <PressHighlight
+      <Pressable
        style={styles.option}
        onPress={handlePaste}
        accessibilityRole="button"
@@ -150,7 +149,7 @@ export function AddHostMethodModal({
            {t("pairing.connectionMethods.pasteLink.description")}
          </Text>
        </View>
-      </PressHighlight>
+      </Pressable>
    </AdaptiveModalSheet>
  );
 }
@@ -1,22 +1,17 @@
-import { PressHighlight } from "@/components/ui/press-highlight";
 import { useCallback, useMemo, useReducer, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Alert, Text, View } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { Alert, Pressable, Text, View } from "react-native";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { Check, ChevronDown, ChevronRight, Eye, EyeOff, Link2 } from "lucide-react-native";
 import type { HostProfile } from "@/types/host-connection";
 import { useHosts, useHostMutations } from "@/runtime/host-runtime";
 import { parseConnectionUri, serializeConnectionUri } from "@/utils/daemon-endpoints";
-import { buildConnectionFailureCopy } from "@/components/connection-failure-copy";
-import {
-  AdaptiveModalSheet,
-  AdaptiveTextInput,
-  type SheetHeader,
-} from "@/components/adaptive-modal-sheet";
+import { buildConnectionFailureCopy } from "./connection-failure-copy";
+import { AdaptiveModalSheet, AdaptiveTextInput, type SheetHeader } from "./adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
-import { PairingTargetTracker } from "@/components/pair-link-credentials";
-import { buildDirectConnectionUri } from "@/components/direct-connection-host";
+import { PairingTargetTracker } from "./pair-link-credentials";
+import { buildDirectConnectionUri } from "./direct-connection-host";

 const FLEX_ONE_STYLE = { flex: 1 } as const;

@@ -193,6 +188,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
 }

 function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostModalProps) {
+  const { theme } = useUnistyles();
  const { t } = useTranslation();
  const daemons = useHosts();
  const { probeAndUpsertDirectConnection, beginLinkPairing } = useHostMutations();
@@ -211,7 +207,10 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
  const [inputResetKey, bumpInputResetKey] = useReducer((key: number) => key + 1, 0);
  const advancedTarget = useRef(new PairingTargetTracker("", true));

-  const connectIcon = useMemo(() => <ThemedLink2 size={16} />, []);
+  const connectIcon = useMemo(
+    () => <Link2 size={16} color={theme.colors.accentForeground} />,
+    [theme.colors.accentForeground],
+  );
  const hostFieldStyle = useMemo(() => [styles.field, styles.hostField], []);
  const portFieldStyle = useMemo(() => [styles.field, styles.portField], []);
  const checkboxStyle = useMemo(
@@ -416,8 +415,8 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
    setIsAdvancedOpen(false);
  }, [advancedUri, directConnectionLabels, host, isAdvancedOpen, password, port, useTls]);

-  const AdvancedIcon = isAdvancedOpen ? ThemedChevronDown : ThemedChevronRight;
-  const PasswordIcon = isPasswordVisible ? ThemedEyeOff : ThemedEye;
+  const AdvancedIcon = isAdvancedOpen ? ChevronDown : ChevronRight;
+  const PasswordIcon = isPasswordVisible ? EyeOff : Eye;

  return (
    <AdaptiveModalSheet
@@ -431,7 +430,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
      <View style={styles.portRow}>
        <View style={hostFieldStyle}>
          <Text style={styles.label}>{t("pairing.direct.fields.host")}</Text>
-          <ThemedAdaptiveTextInput
+          <AdaptiveTextInput
            testID="direct-host-input"
            nativeID="direct-host-input"
            accessibilityLabel={t("pairing.direct.fields.host")}
@@ -439,6 +438,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
            resetKey={`direct-host-${inputResetKey}`}
            onChangeText={setHost}
            placeholder="localhost"
+            placeholderTextColor={theme.colors.foregroundMuted}
            style={styles.input}
            autoCapitalize="none"
            autoCorrect={false}
@@ -449,7 +449,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
        </View>
        <View style={portFieldStyle}>
          <Text style={styles.label}>{t("pairing.direct.fields.port")}</Text>
-          <ThemedAdaptiveTextInput
+          <AdaptiveTextInput
            testID="direct-port-input"
            nativeID="direct-port-input"
            accessibilityLabel={t("pairing.direct.fields.port")}
@@ -457,6 +457,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
            resetKey={`direct-port-${inputResetKey}`}
            onChangeText={setPort}
            placeholder="6767"
+            placeholderTextColor={theme.colors.foregroundMuted}
            style={styles.input}
            autoCapitalize="none"
            autoCorrect={false}
@@ -468,7 +469,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
        </View>
      </View>

-      <PressHighlight
+      <Pressable
        style={styles.checkboxRow}
        onPress={handleToggleUseTls}
        disabled={isSaving}
@@ -481,17 +482,17 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
        <View style={checkboxStyle}>
          {useTls ? (
            <View testID="direct-ssl-toggle-checked">
-              <ThemedCheck size={14} />
+              <Check size={14} color={theme.colors.accentForeground} />
            </View>
          ) : null}
        </View>
        <Text style={styles.label}>{t("pairing.direct.fields.useSsl")}</Text>
-      </PressHighlight>
+      </Pressable>

      <View style={styles.field}>
        <Text style={styles.label}>{t("pairing.direct.fields.password")}</Text>
        <View style={styles.passwordRow}>
-          <ThemedAdaptiveTextInput
+          <AdaptiveTextInput
            testID="direct-password-input"
            nativeID="direct-password-input"
            accessibilityLabel={t("pairing.direct.fields.password")}
@@ -499,6 +500,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
            resetKey={`direct-password-${inputResetKey}`}
            onChangeText={setPassword}
            placeholder={t("pairing.direct.fields.optional")}
+            placeholderTextColor={theme.colors.foregroundMuted}
            style={passwordInputStyle}
            autoCapitalize="none"
            autoCorrect={false}
@@ -507,7 +509,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
            returnKeyType="done"
            onSubmitEditing={handleSubmitEditing}
          />
-          <PressHighlight
+          <Pressable
            style={styles.iconButton}
            onPress={handleTogglePasswordVisibility}
            disabled={isSaving}
@@ -519,13 +521,13 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
            }
            testID="direct-password-visibility-toggle"
          >
-            <PasswordIcon size={18} />
-          </PressHighlight>
+            <PasswordIcon size={18} color={theme.colors.foregroundMuted} />
+          </Pressable>
        </View>
      </View>

      <View style={styles.field}>
-        <PressHighlight
+        <Pressable
          style={styles.advancedToggle}
          onPress={handleToggleAdvanced}
          disabled={isSaving}
@@ -535,11 +537,11 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
          }
          testID="direct-host-advanced-toggle"
        >
-          <AdvancedIcon size={16} />
+          <AdvancedIcon size={16} color={theme.colors.foregroundMuted} />
          <Text style={styles.advancedText}>{t("pairing.direct.advanced.label")}</Text>
-        </PressHighlight>
+        </Pressable>
        {isAdvancedOpen ? (
-          <ThemedAdaptiveTextInput
+          <AdaptiveTextInput
            testID="direct-host-uri-input"
            nativeID="direct-host-uri-input"
            accessibilityLabel={t("pairing.direct.fields.connectionUri")}
@@ -547,6 +549,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
            resetKey={`direct-host-uri-${inputResetKey}`}
            onChangeText={handleChangeAdvancedUri}
            placeholder="tcp://localhost:6767?ssl=true"
+            placeholderTextColor={theme.colors.foregroundMuted}
            style={styles.input}
            autoCapitalize="none"
            autoCorrect={false}
@@ -582,23 +585,3 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
    </AdaptiveModalSheet>
  );
 }
-
-const ThemedLink2 = withUnistyles(Link2, (theme) => ({ color: theme.colors.accentForeground }));
-
-const ThemedCheck = withUnistyles(Check, (theme) => ({ color: theme.colors.accentForeground }));
-
-const ThemedChevronDown = withUnistyles(ChevronDown, (theme) => ({
-  color: theme.colors.foregroundMuted,
-}));
-
-const ThemedChevronRight = withUnistyles(ChevronRight, (theme) => ({
-  color: theme.colors.foregroundMuted,
-}));
-
-const ThemedEye = withUnistyles(Eye, (theme) => ({ color: theme.colors.foregroundMuted }));
-
-const ThemedEyeOff = withUnistyles(EyeOff, (theme) => ({ color: theme.colors.foregroundMuted }));
-
-const ThemedAdaptiveTextInput = withUnistyles(AdaptiveTextInput, (theme) => ({
-  placeholderTextColor: theme.colors.foregroundMuted,
-}));
@@ -1,5 +1,3 @@
-import { useOverlayRegistration, type KeyboardInputEvent } from "@/keyboard";
-import { useAddHost } from "@/hosts/add-host";
 import { Modal } from "@/components/ui/modal";
 import { usePanelStore } from "@/stores/panel-store";
 import { getHostRuntimeStore } from "@/runtime/host-runtime";
@@ -70,15 +68,19 @@ import {
 } from "@/components/project-picker-options";
 import { Shortcut } from "@/components/ui/shortcut";
 import { useRevealActiveItem } from "@/components/ui/scroll-reveal";
-import { useHardwareKeyboardPresent } from "@/keyboard";
+import { useKeyboardShortcutsAvailable } from "@/keyboard/availability";
 import { getIsElectronRuntime } from "@/constants/layout";
-import { isWeb } from "@/constants/platform";
+import { isNative, isWeb } from "@/constants/platform";
 import { pickDirectory } from "@/desktop/pick-directory";
 import { useFetchQuery } from "@/data/query";
 import { getOpenProjectFailureReason, registerProjectDescriptor } from "@/hooks/open-project";
 import { useIsLocalDaemon, useLocalDaemonServerId } from "@/hooks/use-is-local-daemon";
 import { useCloneGithubProject, useOpenProject } from "@/hooks/use-open-project";
-import { OverlayLayerProvider, useGlobalOverlayLayer } from "@/lib/overlay-root";
+import {
+  OverlayLayerProvider,
+  useGlobalWebOverlayLayer,
+  useWebOverlayRegistration,
+} from "@/lib/overlay-root";
 import {
  useHosts,
  useHostRuntimeClient,
@@ -90,7 +92,7 @@ import { useRecommendedProjectPaths } from "@/stores/session-store-hooks";
 import type { AddProjectFlowRequest } from "@/stores/add-project-flow-store";
 import type { Theme } from "@/styles/theme";
 import { shortenPath } from "@/utils/shorten-path";
-import { buildNewWorkspaceRoute } from "@/utils/host-routes";
+import { buildNewWorkspaceRoute, buildSettingsAddHostRoute } from "@/utils/host-routes";

 interface AddProjectFlowProps {
  request: AddProjectFlowRequest;
@@ -299,7 +301,7 @@ function FlowRow({
 }

 function FlowHint({ keys, action }: { keys: string[]; action: string }) {
-  const shortcutsAvailable = useHardwareKeyboardPresent();
+  const shortcutsAvailable = useKeyboardShortcutsAvailable();
  if (!shortcutsAvailable) return null;

  return (
@@ -323,7 +325,6 @@ function setPageStatus(
 // The product flow is intentionally one cohesive page-stack state machine.
 // eslint-disable-next-line complexity
 export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
-  const addHost = useAddHost();
  const hosts = useHosts();
  const hostIds = useMemo(() => hosts.map((host) => host.serverId), [hosts]);
  const connectionStatuses = useHostRuntimeConnectionStatuses(hostIds);
@@ -457,10 +458,13 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
  });

  const handleBack = useCallback(() => {
-    const previous = backAddProjectPage(state);
-    if (previous) setState(previous);
-    else onClose();
-  }, [onClose, state]);
+    setState((current) => {
+      const previous = backAddProjectPage(current);
+      if (previous) return previous;
+      onClose();
+      return current;
+    });
+  }, [onClose]);

  const openNewWorkspaceForProject = useCallback(
    (serverId: string, project: WorkspaceProjectDescriptorPayload) => {
@@ -612,9 +616,9 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
          icon: Plus,
          testID: "add-project-flow-add-host",
          select: () => {
-            // The native project Modal must release its window before the root sheet opens.
            onClose();
-            addHost();
+            usePanelStore.getState().showMobileAgent();
+            router.push(buildSettingsAddHostRoute(Date.now()));
          },
        });
      }
@@ -713,7 +717,6 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
    directoryPaths,
    githubQuery.data,
    host,
-    addHost,
    onClose,
    openAddedProject,
    page,
@@ -809,22 +812,30 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
    [activeIndex, handleBack, rows, submitActive],
  );

-  const modalLayer = useGlobalOverlayLayer("modal", true);
-  const handleOverlayKeyDown = useCallback(
-    (event: KeyboardInputEvent) => {
+  const modalLayer = useGlobalWebOverlayLayer("modal", isWeb);
+  const handleWebOverlayKeyDown = useCallback(
+    (event: KeyboardEvent) => {
      if (!handleKey(event.key)) return false;
      event.preventDefault();
      return true;
    },
    [handleKey],
  );
-  const setOverlayScope = useOverlayRegistration({
-    keys: ["Escape", "Enter", "ArrowUp", "ArrowDown"],
-    active: true,
+  const setWebOverlayScope = useWebOverlayRegistration({
+    active: isWeb,
    layer: modalLayer,
-    onKeyDown: handleOverlayKeyDown,
+    onKeyDown: handleWebOverlayKeyDown,
  });

+  const handleNativeKeyPress = useCallback(
+    ({ nativeEvent: { key } }: { nativeEvent: { key: string } }) => {
+      if (key === "ArrowDown" || key === "ArrowUp" || key === "Escape") {
+        handleKey(key);
+      }
+    },
+    [handleKey],
+  );
+
  const handleInputChange = useCallback((value: string) => {
    setState((current) =>
      currentAddProjectPage(current).kind === "new-directory-name"
@@ -859,7 +870,7 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
      <View style={styles.overlay} testID="add-project-flow">
        <Pressable style={styles.backdrop} onPress={onClose} testID="add-project-flow-backdrop" />
        <View
-          ref={setOverlayScope}
+          ref={setWebOverlayScope}
          style={styles.panel}
          testID={`add-project-flow-page-${page.kind}`}
          accessibilityLabel={`Add project: ${page.kind}`}
@@ -878,11 +889,29 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
                ) : null}
              </View>
            </View>
+            {page.kind === "method" && isNative ? (
+              // Native hardware-keyboard events need a focused responder even without a visible field.
+              <TextInput
+                ref={inputRef}
+                onKeyPress={handleNativeKeyPress}
+                onSubmitEditing={submitActive}
+                showSoftInputOnFocus={false}
+                caretHidden
+                contextMenuHidden
+                accessible={false}
+                accessibilityElementsHidden
+                importantForAccessibility="no-hide-descendants"
+                pointerEvents="none"
+                style={styles.keyboardCapture}
+                testID="add-project-flow-keyboard-capture"
+              />
+            ) : null}
            {page.kind !== "method" ? (
              <ThemedTextInput
                ref={inputRef}
                initialValue={pageInput(page)}
                onChangeText={handleInputChange}
+                onKeyPress={isWeb ? undefined : handleNativeKeyPress}
                onSubmitEditing={isWeb ? undefined : submitActive}
                placeholder={pagePlaceholder(page)}
                style={styles.input}
@@ -964,7 +993,7 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
    </Modal>
  );

-  return createElement(OverlayLayerProvider, { layer: modalLayer }, modal);
+  return createElement(OverlayLayerProvider, { layer: isWeb ? modalLayer : 0 }, modal);
 }

 const styles = StyleSheet.create((theme) => ({
@@ -1038,6 +1067,12 @@ const styles = StyleSheet.create((theme) => ({
    paddingVertical: theme.spacing[1],
    outlineStyle: "none",
  } as object,
+  keyboardCapture: {
+    position: "absolute",
+    width: 1,
+    height: 1,
+    opacity: 0,
+  },
  results: { flexGrow: 0, flexShrink: 1, minHeight: 0 },
  resultsContent: { paddingVertical: theme.spacing[2] },
  row: {
@@ -1,7 +1,7 @@
-import { PressHighlight } from "@/components/ui/press-highlight";
 import { useCallback, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import {
+  Pressable,
  Text,
  View,
  type PressableStateCallbackType,
@@ -21,8 +21,9 @@ import {
  resolveControlInteractionStyles,
 } from "@/components/ui/control-geometry";
 import type { EditingTextInputHandle } from "@/components/ui/text-input";
+import { useIsCompactFormFactor } from "@/constants/layout";
 import { DaemonConnectionTestError } from "@/utils/test-daemon-connection";
-import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
+import { AdaptiveModalSheet, type SheetHeader } from "./adaptive-modal-sheet";

 const FLEX_ONE_STYLE = { flex: 1 } as const;
 const ThemedTerminal = withUnistyles(Terminal);
@@ -48,10 +49,18 @@ const styles = StyleSheet.create((theme) => {
      minWidth: 0,
    },
    // Boxed adornment next to the field: same height and radius as the field
-    // chrome, and the shared interaction phases.
-    iconButton: {
-      minHeight: CONTROL_HEIGHTS.md,
-      width: CONTROL_HEIGHTS.md,
+    // chrome of the active form size, and the shared interaction phases.
+    iconButtonSm: {
+      minHeight: CONTROL_HEIGHTS.compact,
+      width: CONTROL_HEIGHTS.compact,
+      alignItems: "center",
+      justifyContent: "center",
+      borderRadius: theme.borderRadius.md,
+      backgroundColor: theme.colors.surface2,
+    },
+    iconButtonMd: {
+      minHeight: CONTROL_HEIGHTS.field,
+      width: CONTROL_HEIGHTS.field,
      alignItems: "center",
      justifyContent: "center",
      borderRadius: theme.borderRadius.lg,
@@ -97,6 +106,7 @@ export function AddRemoteSshHostModal({
 }: AddRemoteSshHostModalProps) {
  const { t } = useTranslation();
  const hosts = useHosts();
+  const isCompact = useIsCompactFormFactor();
  const { probeAndUpsertRemoteSshConnection } = useHostMutations();
  const targetRef = useRef("");
  const passwordRef = useRef("");
@@ -164,11 +174,11 @@ export function AddRemoteSshHostModal({
    }

    clear();
+    onClose();
    onSaved?.({
      ...result,
      isNewHost: !hosts.some((profile) => profile.serverId === result.serverId),
    });
-    onClose();
  }, [clear, hosts, isSaving, onClose, onSaved, probeAndUpsertRemoteSshConnection, t]);
  const handleTargetChange = useCallback((value: string) => {
    targetRef.current = value;
@@ -183,7 +193,7 @@ export function AddRemoteSshHostModal({
    (
      state: PressableStateCallbackType & { hovered?: boolean; focused?: boolean },
    ): StyleProp<ViewStyle> => [
-      styles.iconButton,
+      isCompact ? styles.iconButtonMd : styles.iconButtonSm,
      resolveControlInteractionStyles(
        {
          controlRest: styles.controlRest,
@@ -199,7 +209,7 @@ export function AddRemoteSshHostModal({
        },
      ),
    ],
-    [isSaving],
+    [isCompact, isSaving],
  );
  const handleSubmit = useCallback(() => void handleSave(), [handleSave]);

@@ -218,6 +228,7 @@ export function AddRemoteSshHostModal({
      >
        <FormTextInput
          ref={inputRef}
+          size={isCompact ? "md" : "sm"}
          testID="remote-ssh-target-input"
          accessibilityLabel={t("pairing.remoteSsh.fields.target")}
          initialValue=""
@@ -235,6 +246,7 @@ export function AddRemoteSshHostModal({
          <View style={styles.passwordInputWrap}>
            <FormTextInput
              ref={passwordInputRef}
+              size={isCompact ? "md" : "sm"}
              testID="remote-ssh-password-input"
              accessibilityLabel={t("pairing.remoteSsh.fields.password")}
              initialValue=""
@@ -248,7 +260,7 @@ export function AddRemoteSshHostModal({
              onSubmitEditing={handleSubmit}
            />
          </View>
-          <PressHighlight
+          <Pressable
            style={iconButtonStyle}
            onPress={handleTogglePasswordVisibility}
            disabled={isSaving}
@@ -261,7 +273,7 @@ export function AddRemoteSshHostModal({
            testID="remote-ssh-password-visibility-toggle"
          >
            {isPasswordVisible ? <ThemedEyeOff size={18} /> : <ThemedEye size={18} />}
-          </PressHighlight>
+          </Pressable>
        </View>
      </Field>
      <View style={styles.actions}>
@@ -41,6 +41,7 @@ export function ArchivedAgentCallout({ serverId, agentId }: ArchivedAgentCallout
            <View style={styles.callout}>
              <Text style={styles.calloutText}>{t("agentPanel.archived.callout")}</Text>
              <Button
+                size="sm"
                variant="secondary"
                onPress={handleUnarchive}
                disabled={!isConnected || isUnarchiving}
@@ -1,4 +1,3 @@
-import { useOverlayRegistration, type KeyboardInputEvent } from "@/keyboard";
 import { Modal } from "@/components/ui/modal";
 import { type ReactNode, useCallback, useEffect, useMemo, useState } from "react";
 import { Pressable, Text, View } from "react-native";
@@ -9,12 +8,12 @@ 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 { isNative } from "@/constants/platform";
+import { isNative, isWeb } from "@/constants/platform";
 import { SPACING } from "@/styles/theme";
 import { WindowChromeRootRegion } from "@/utils/desktop-window";
 import { ZoomableImage } from "@/components/zoomable-viewport/image";
 import type { ViewportSize } from "@/components/zoomable-viewport/geometry";
-import { useGlobalOverlayLayer } from "@/lib/overlay-root";
+import { useGlobalWebOverlayLayer, useWebOverlayRegistration } from "@/lib/overlay-root";

 export type ImageLightboxSource =
  | { type: "attachment"; metadata: AttachmentMetadata }
@@ -35,14 +34,14 @@ export function AttachmentLightbox({ source, onClose }: AttachmentLightboxProps)
  const url = source?.type === "uri" ? source.uri : attachmentUrl;
  const contentSize = source?.type === "uri" ? source.contentSize : undefined;
  const [errored, setErrored] = useState(false);
-  const modalLayer = useGlobalOverlayLayer("modal", source !== null);
+  const modalLayer = useGlobalWebOverlayLayer("modal", isWeb && source !== null);

  useEffect(() => {
    setErrored(false);
  }, [metadata?.id, url]);

-  const handleOverlayKeyDown = useCallback(
-    (event: KeyboardInputEvent) => {
+  const handleWebOverlayKeyDown = useCallback(
+    (event: KeyboardEvent) => {
      if (event.key !== "Escape") return false;
      event.preventDefault();
      event.stopPropagation();
@@ -51,11 +50,10 @@ export function AttachmentLightbox({ source, onClose }: AttachmentLightboxProps)
    },
    [onClose],
  );
-  const setOverlayScope = useOverlayRegistration({
-    keys: ["Escape"],
-    active: source !== null,
+  const setWebOverlayScope = useWebOverlayRegistration({
+    active: isWeb && source !== null,
    layer: modalLayer,
-    onKeyDown: handleOverlayKeyDown,
+    onKeyDown: handleWebOverlayKeyDown,
  });

  const actions = useMemo(
@@ -85,7 +83,7 @@ export function AttachmentLightbox({ source, onClose }: AttachmentLightboxProps)
            image was opened (inside a sheet tab, the bottom one is already spent). */}
        <SafeAreaProvider>
          <WindowChromeRootRegion corners="both">
-            <View ref={setOverlayScope} style={styles.root}>
+            <View ref={setWebOverlayScope} style={styles.root}>
              <Pressable
                testID="attachment-lightbox-backdrop"
                accessibilityRole="button"
@@ -27,6 +27,7 @@ export function CommunityLinks() {
    <View style={styles.row}>
      <Button
        variant="ghost"
+        size="sm"
        leftIcon={renderGitHubIcon}
        onPress={handleOpenGitHub}
        testID="community-links-github-star"
@@ -35,6 +36,7 @@ export function CommunityLinks() {
      </Button>
      <Button
        variant="ghost"
+        size="sm"
        leftIcon={Heart}
        onPress={handleOpenSponsor}
        testID="community-links-sponsor"
@@ -43,6 +45,7 @@ export function CommunityLinks() {
      </Button>
      <Button
        variant="ghost"
+        size="sm"
        leftIcon={renderDiscordIcon}
        onPress={handleOpenDiscord}
        testID="community-links-discord"
@@ -56,9 +59,6 @@ export function CommunityLinks() {
 const styles = StyleSheet.create(() => ({
  row: {
    flexDirection: "row",
-    // Shrinks and wraps rather than running off a narrow phone screen.
-    flexShrink: 1,
-    flexWrap: "wrap",
    justifyContent: "center",
    alignItems: "center",
    gap: 0,
@@ -64,15 +64,10 @@ import { useIsLocalDaemon } from "@/hooks/use-is-local-daemon";
 import { buildWorkspaceExplorerStateKey } from "@/hooks/use-file-explorer-actions";
 import { usePanelStore, type ExpandedPathsUpdate, type SortOption } from "@/stores/panel-store";
 import { buildAbsoluteExplorerPath } from "@/utils/explorer-paths";
-import {
-  DIRECTORY_LISTING_INVALIDATED,
-  type DirectoryListingResult,
-} from "@/file-explorer/directory-listings";
 import { isHiddenExplorerPath } from "@/file-explorer/visibility";
 import {
  flattenExplorerTree,
  reconcileRestoredExpandedPaths,
-  refreshExplorerDirectories,
  restoreExpandedDirectories,
  setExpandedDirectoryPath,
  showHiddenFilesAndRestoreExpandedDirectories,
@@ -440,7 +435,6 @@ export function FileExplorerPane({

  const {
    requestDirectoryListing,
-    invalidateDirectoryListings,
    createEntry,
    renameEntry,
    duplicateEntry,
@@ -892,11 +886,9 @@ export function FileExplorerPane({
      refreshExplorerDirectories({
        hasWorkspaceScope,
        expandedPaths,
-        showHiddenFiles: usePanelStore.getState().explorerShowHiddenFiles,
        requestDirectoryListing,
-        invalidateDirectoryListings,
      }),
-    [invalidateDirectoryListings, expandedPaths, hasWorkspaceScope, requestDirectoryListing],
+    [expandedPaths, hasWorkspaceScope, requestDirectoryListing],
  );
  const { refetch: refetchExplorer, isFetching: isRefreshFetching } = useQuery({
    queryKey: ["fileExplorerRefresh", serverId, workspaceStateKey],
@@ -1432,7 +1424,7 @@ function toggleDirectory({
  requestDirectoryListing: (
    path: string,
    opts?: { recordHistory?: boolean; setCurrentPath?: boolean },
-  ) => Promise<DirectoryListingResult>;
+  ) => Promise<ExplorerDirectory | null>;
  setExpandedPathsForWorkspace: (workspaceStateKey: string, paths: ExpandedPathsUpdate) => void;
 }): void {
  if (!workspaceStateKey) {
@@ -1569,7 +1561,7 @@ async function initializeExplorer({
  requestDirectoryListing: (
    path: string,
    opts?: { recordHistory?: boolean; setCurrentPath?: boolean },
-  ) => Promise<DirectoryListingResult>;
+  ) => Promise<ExplorerDirectory | null>;
  setExpandedPathsForWorkspace: (workspaceStateKey: string, paths: ExpandedPathsUpdate) => void;
 }): Promise<void> {
  if (!hasWorkspaceScope || hasInitializedRef.current) {
@@ -1580,7 +1572,6 @@ async function initializeExplorer({
    recordHistory: false,
    setCurrentPath: false,
  });
-  if (rootDirectory === DIRECTORY_LISTING_INVALIDATED) return;
  if (!rootDirectory) {
    hasInitializedRef.current = false;
    return;
@@ -1602,10 +1593,7 @@ async function initializeExplorer({
  const hiddenPersistedPaths = showHiddenFiles
    ? []
    : Array.from(persistedExpandedPaths).filter(isHiddenExplorerPath);
-  const restoredPathsWithHidden =
-    restoredPaths === DIRECTORY_LISTING_INVALIDATED
-      ? DIRECTORY_LISTING_INVALIDATED
-      : [...restoredPaths, ...hiddenPersistedPaths];
+  const restoredPathsWithHidden = [...restoredPaths, ...hiddenPersistedPaths];
  setExpandedPathsForWorkspace(workspaceStateKey, (currentPaths) =>
    reconcileRestoredExpandedPaths({
      persistedExpandedPaths,
@@ -1615,6 +1603,39 @@ async function initializeExplorer({
  );
 }

+async function refreshExplorerDirectories({
+  hasWorkspaceScope,
+  expandedPaths,
+  requestDirectoryListing,
+}: {
+  hasWorkspaceScope: boolean;
+  expandedPaths: Set<string>;
+  requestDirectoryListing: (
+    path: string,
+    opts?: { recordHistory?: boolean; setCurrentPath?: boolean },
+  ) => Promise<ExplorerDirectory | null>;
+}): Promise<null> {
+  if (!hasWorkspaceScope) {
+    return null;
+  }
+  const showHiddenFiles = usePanelStore.getState().explorerShowHiddenFiles;
+  const directoryPaths = Array.from(expandedPaths).filter(
+    (path) => showHiddenFiles || !isHiddenExplorerPath(path),
+  );
+  if (!directoryPaths.includes(".")) {
+    directoryPaths.unshift(".");
+  }
+  await Promise.all(
+    directoryPaths.map((path) =>
+      requestDirectoryListing(path, {
+        recordHistory: false,
+        setCurrentPath: false,
+      }),
+    ),
+  );
+  return null;
+}
+
 function getErrorRecoveryPath(state: AgentFileExplorerState | undefined): string {
  if (!state) {
    return ".";
@@ -1,26 +1,8 @@
-import { createContext, useContext, useCallback, useState, useId, type ReactNode } from "react";
+import { useCallback, useState, type ReactNode } from "react";
 import { View, type LayoutChangeEvent } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
-import { Portal, PortalHost } from "@gorhom/portal";
-import { useRetainedPanelActive } from "@/components/retained-panel";
 import { EdgeFade } from "@/components/ui/edge-fade";

-const OverlayClearanceContext = createContext(0);
-const OverlayHostContext = createContext<string | null>(null);
-
-/** Keep status overlays above the fade without lifting the scrolling content. */
-export function FloatingHeaderOverlay({ children }: { children: ReactNode }) {
-  const hostName = useContext(OverlayHostContext);
-  const active = useRetainedPanelActive();
-  if (!hostName) return children;
-  return active ? <Portal hostName={hostName}>{children}</Portal> : null;
-}
-
-/** Clearance for stationary overlays inside this layout, measured to the header bottom. */
-export function useFloatingHeaderOverlayClearance(): number {
-  return useContext(OverlayClearanceContext);
-}
-
 /** How far the fade runs past the header's bottom edge, so content dissolves instead of clipping. */
 const FADE_OVERHANG = 48;
 /** Share of the fade that stays opaque, so the header's title and icons keep contrast. */
@@ -38,24 +20,15 @@ interface FloatingHeaderLayoutProps {
 * same tree position in both modes, so toggling `floating` never remounts them.
 */
 export function FloatingHeaderLayout({ header, floating, children }: FloatingHeaderLayoutProps) {
-  const overlayHostName = useId();
  const [headerHeight, setHeaderHeight] = useState(0);
  const handleHeaderLayout = useCallback((event: LayoutChangeEvent) => {
    setHeaderHeight(Math.round(event.nativeEvent.layout.height));
  }, []);

-  const overlayClearance = floating ? headerHeight : 0;
-
  return (
    <View style={styles.root}>
      {floating ? null : header}
-      <View style={styles.content}>
-        <OverlayClearanceContext.Provider value={overlayClearance}>
-          <OverlayHostContext.Provider value={floating ? overlayHostName : null}>
-            {children(floating ? headerHeight : 0)}
-          </OverlayHostContext.Provider>
-        </OverlayClearanceContext.Provider>
-      </View>
+      <View style={styles.content}>{children(floating ? headerHeight : 0)}</View>
      {floating ? (
        <View style={styles.overlay} pointerEvents="box-none">
          <EdgeFade
@@ -64,19 +37,11 @@ export function FloatingHeaderLayout({ header, floating, children }: FloatingHea
            backdrop="surfaceWorkspace"
            style={styles.fade}
          />
-          <View
-            testID="floating-header"
-            collapsable={false}
-            pointerEvents="box-none"
-            onLayout={handleHeaderLayout}
-          >
+          <View pointerEvents="box-none" onLayout={handleHeaderLayout}>
            {header}
          </View>
        </View>
      ) : null}
-      <View style={styles.statusOverlay} pointerEvents="box-none">
-        <PortalHost name={overlayHostName} />
-      </View>
    </View>
  );
 }
@@ -90,13 +55,6 @@ const styles = StyleSheet.create({
    flex: 1,
    minHeight: 0,
  },
-  statusOverlay: {
-    position: "absolute",
-    top: 0,
-    bottom: 0,
-    left: 0,
-    right: 0,
-  },
  overlay: {
    position: "absolute",
    top: 0,
@@ -1,9 +0,0 @@
-import { SvgPathIcon, type SvgPathIconProps } from "./svg-path-icon";
-
-// Same mark as the website's download buttons (packages/website/src/downloads.tsx).
-const APPLE_PATH =
-  "M12.152 6.896c-.948 0-2.415-1.078-3.96-1.04-2.04.027-3.91 1.183-4.961 3.014-2.117 3.675-.546 9.103 1.519 12.09 1.013 1.454 2.208 3.09 3.792 3.039 1.52-.065 2.09-.987 3.935-.987 1.831 0 2.35.987 3.96.948 1.637-.026 2.676-1.48 3.676-2.948 1.156-1.688 1.636-3.325 1.662-3.415-.039-.013-3.182-1.221-3.22-4.857-.026-3.04 2.48-4.494 2.597-4.559-1.429-2.09-3.623-2.324-4.39-2.376-2-.156-3.675 1.09-4.61 1.09zM15.53 3.83c.843-1.012 1.4-2.427 1.245-3.83-1.207.052-2.662.805-3.532 1.818-.78.896-1.454 2.338-1.273 3.714 1.338.104 2.715-.688 3.559-1.701";
-
-export function AppleIcon(props: SvgPathIconProps) {
-  return <SvgPathIcon {...props} path={APPLE_PATH} viewBox="0 0 24 24" />;
-}
@@ -1,19 +0,0 @@
-import Svg, { Path } from "react-native-svg";
-
-/**
- * The four-colour Play mark, the same one as the website's download buttons
- * (packages/website/src/downloads.tsx). Brand colours are fixed, so it takes no color.
- */
-export function GooglePlayIcon({ size = 16 }: { size?: number }) {
-  return (
-    <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
-      <Path d="M3.27 2.17c-.2.21-.32.55-.32 1v17.66c0 .45.12.79.33 1l9.87-9.84z" fill="#00F076" />
-      <Path
-        d="m16.43 8.72-3.28 3.27 3.29 3.28 3.9-2.22c1.13-.64 1.13-1.42 0-2.06z"
-        fill="#FFCE00"
-      />
-      <Path d="m13.15 11.99 3.28-3.27L4.63 2.01c-.56-.32-1.04-.28-1.36.16z" fill="#00D6FF" />
-      <Path d="M3.28 21.83c.32.44.8.48 1.36.16l11.8-6.72-3.29-3.28z" fill="#FF3A44" />
-    </Svg>
-  );
-}
@@ -206,7 +206,7 @@ function ProviderErrorBannerRow({
      </Text>
      <Button
        variant="ghost"
-        size="sm"
+        size="xs"
        onPress={handleRetry}
        testID={`import-session-retry-${row.provider}`}
      >
@@ -266,7 +266,7 @@ function ScopeSubtitle({
      {isScoped ? (
        <Button
          variant="ghost"
-          size="sm"
+          size="xs"
          onPress={onShowAll}
          testID="import-session-show-all"
          style={styles.subtitleAction}
@@ -1,8 +1,8 @@
-import { usesDesktopBindings } from "@/keyboard";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
+import { getIsElectronRuntime } from "@/constants/layout";
 import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Shortcut } from "@/components/ui/shortcut";
 import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
@@ -24,13 +24,14 @@ export function KeyboardShortcutsDialog() {

  const shortcutOs = getShortcutOs();
  const isMac = shortcutOs === "mac";
+  const isDesktopApp = getIsElectronRuntime();
  const { overrides } = useKeyboardShortcutOverrides();
  // Effective bindings, so a shortcut the user unassigned lists no keys here
  // instead of advertising a default that no longer fires.
  const bindings = useMemo(() => buildEffectiveBindings(overrides), [overrides]);
  const sections = useMemo(
-    () => buildKeyboardShortcutHelpSections({ isMac, usesDesktopBindings }, bindings),
-    [bindings, isMac],
+    () => buildKeyboardShortcutHelpSections({ isMac, isDesktop: isDesktopApp }, bindings),
+    [bindings, isDesktopApp, isMac],
  );
  const visibleSections = useMemo(
    () => filterShortcutHelpSections({ sections, query, translate: t, shortcutOs }),
@@ -1,4 +1,3 @@
-import { useAddHost } from "@/hosts/add-host";
 import { router } from "expo-router";
 import {
  CircleGauge,
@@ -63,7 +62,7 @@ import { usePanelStore } from "@/stores/panel-store";
 import { useOwnsWindowChromeCorner, WindowChromeSafeArea } from "@/utils/desktop-window";
 import { useCloseAgentListGesture } from "@/mobile-panels/gestures";
 import { MobilePanelOverlay } from "@/mobile-panels/presentation";
-import { buildSettingsRoute } from "@/utils/host-routes";
+import { buildSettingsAddHostRoute, buildSettingsRoute } from "@/utils/host-routes";
 import { openHostOverview } from "@/navigation/settings-navigation";
 import { UsageSidebarItem, UsageSidebarRoot, useUsageSummary, useOpenSidebarUsage } from "@/usage";
 import { SidebarAgentListSkeleton } from "./sidebar-agent-list-skeleton";
@@ -178,8 +177,14 @@ export const LeftSidebar = memo(function LeftSidebar({ active }: { active: boole
    router.push(buildSettingsRoute());
  }, []);

-  const handleAddHostMobile = useAddHost();
-  const handleAddHostDesktop = handleAddHostMobile;
+  const handleAddHostMobile = useCallback(() => {
+    showMobileAgent();
+    router.push(buildSettingsAddHostRoute(Date.now()));
+  }, [showMobileAgent]);
+
+  const handleAddHostDesktop = useCallback(() => {
+    router.push(buildSettingsAddHostRoute(Date.now()));
+  }, []);

  const handleOpenHostSettingsMobile = useCallback(
    (serverId: string) => {
@@ -38,18 +38,12 @@ export interface MarkdownImageContext {
 export function useMarkdownSource(
  text: string,
  context: MarkdownImageContext,
-  links: { commandNames?: ReadonlySet<string>; forgeReferencePattern?: string } = {},
+  commandNames?: ReadonlySet<string>,
 ) {
  const occurrenceKey = useId();
-  const { commandNames, forgeReferencePattern } = links;
  const prepared = useMemo(
-    () =>
-      prepareMarkdownSource(text, context.workspaceRoot, {
-        supportsSvg: isWeb,
-        commandNames,
-        forgeReferencePattern,
-      }),
-    [text, context.workspaceRoot, commandNames, forgeReferencePattern],
+    () => prepareMarkdownSource(text, context.workspaceRoot, { supportsSvg: isWeb, commandNames }),
+    [text, context.workspaceRoot, commandNames],
  );
  const sources = [...new Set(prepared.images.map((image) => image.source))];
  const acquisitions = sources.map((source) => {
@@ -3,7 +3,6 @@ import { toNativeLinkRecognition } from "react-native-enriched-markdown/src/util
 import { parseMarkdown } from "react-native-enriched-markdown/src/web/parseMarkdown";
 import { recognizeTextLinks } from "react-native-enriched-markdown/src/web/recognizeTextLinks";
 import { matchCommandLink } from "@/agent-commands";
-import { createForgeShorthand } from "@/git/forge-shorthand";

 import { classifyAssistantFileLink } from "@/assistant-file-links";
 import { markInlineImages } from "react-native-enriched-markdown/src/web/utils";
@@ -111,37 +110,6 @@ describe("shared Markdown source adaptation", () => {
      ["https://x/q.png", false],
    ]);
  });
-  it("renders linked images that share a line with text inline", async () => {
-    // A review bot's summary header: linked badges inside a heading with the score text.
-    const reviewHeader =
-      '<h2><a href="https://x/retrigger"><picture><source media="(prefers-color-scheme: dark)" srcset="https://x/r-dark.svg"><img alt="Retrigger" src="https://x/r.svg" align="right"></picture></a>Confidence Score: 5/5</h2>';
-    const source = [
-      reviewHeader,
-      "[![Alone](https://x/alone.png)](https://x)",
-      "[![a](https://x/a.png)](https://x) [![b](https://x/b.png)](https://x)",
-      "See [![gh](https://x/gh.png) GitHub](https://x) for more.",
-    ].join("\n\n");
-    const tree = await parseMarkdown(prepareMarkdownSource(source).render(), {
-      hardSoftBreaks: true,
-      latexMath: false,
-    });
-    markInlineImages(tree);
-    const images: ASTNode[] = [];
-    const collect = (node: ASTNode) => {
-      if (node.type === "Image") images.push(node);
-      node.children?.forEach(collect);
-    };
-    collect(tree);
-    expect(
-      images.map((image) => [image.attributes?.url, image.attributes?.isInline === true]),
-    ).toEqual([
-      ["https://x/r.svg", true],
-      ["https://x/alone.png", false],
-      ["https://x/a.png", true],
-      ["https://x/b.png", true],
-      ["https://x/gh.png", true],
-    ]);
-  });
  it("escapes spoiler delimiters only in prose", () => {
    expect(prepareMarkdownSource("Show ||words|| and `||code||`.").render()).toBe(
      "Show \\|\\|words\\|\\| and `||code||`.",
@@ -162,186 +130,6 @@ it("preserves empty table cells while escaping spoilers in cell text", () => {
  );
 });

-it("renders a table directly after a paragraph through the library parser", async () => {
-  const source = "**Notes**\n| Item | Detail |\n| --- | --- |\n| A | one |\n| B | two |";
-  const separated = "**Notes**\n\n| Item | Detail |\n| --- | --- |\n| A | one |\n| B | two |";
-  const flags = { hardSoftBreaks: true, latexMath: false };
-  const expected = await parseMarkdown(separated, flags);
-  expect(expected.children?.map((node) => node.type)).toEqual(["Paragraph", "Table"]);
-  expect(await parseMarkdown(prepareMarkdownSource(source).render(), flags)).toEqual(expected);
-});
-
-it.each([
-  [
-    "a quote",
-    "> Notes\n> | Item |\n> | --- |\n> | A |",
-    "> Notes\n>\n> | Item |\n> | --- |\n> | A |",
-    ["Document", ["Blockquote", "Paragraph", "Table"]],
-  ],
-  [
-    "a list item",
-    "- Notes\n  | Item |\n  | --- |\n  | A |\n- Next",
-    "- Notes\n\n  | Item |\n  | --- |\n  | A |\n- Next",
-    ["Document", ["UnorderedList", ["ListItem", "Paragraph", "Table"], ["ListItem", "Paragraph"]]],
-  ],
-  [
-    "a quoted list item",
-    "> - Notes\n>   | Item |\n>   | --- |\n>   | A |",
-    "> - Notes\n>\n>   | Item |\n>   | --- |\n>   | A |",
-    ["Document", ["Blockquote", ["UnorderedList", ["ListItem", "Paragraph", "Table"]]]],
-  ],
-  [
-    "a quote inside a list item",
-    "- > Notes\n  > | Item |\n  > | --- |\n  > | A |",
-    "- > Notes\n  >\n  > | Item |\n  > | --- |\n  > | A |",
-    ["Document", ["UnorderedList", ["ListItem", ["Blockquote", "Paragraph", "Table"]]]],
-  ],
-  [
-    "aligned columns without outer pipes",
-    "Notes\nItem | Detail\n:--- | ---:\nA | one",
-    "Notes\n\nItem | Detail\n:--- | ---:\nA | one",
-    ["Document", "Paragraph", "Table"],
-  ],
-  [
-    "an entity at the start of a header without outer pipes",
-    "Notes\nAT&amp;T | Detail\n--- | ---\nA | one",
-    "Notes\n\nAT\\&T | Detail\n--- | ---\nA | one",
-    ["Document", "Paragraph", "Table"],
-  ],
-  [
-    "a local image at the start of a header without outer pipes",
-    "Notes\n![Local](assets/a.png) | Detail\n--- | ---\nA | one",
-    "Notes\n\nLocal | Detail\n--- | ---\nA | one",
-    ["Document", "Paragraph", "Table"],
-  ],
-  [
-    "CRLF lines",
-    "Notes\r\n| Item |\r\n| --- |\r\n| A |",
-    "Notes\r\n\r\n| Item |\r\n| --- |\r\n| A |",
-    ["Document", "Paragraph", "Table"],
-  ],
-  [
-    "CR lines",
-    "Notes\r| Item |\r| --- |\r| A |",
-    "Notes\r\r| Item |\r| --- |\r| A |",
-    ["Document", "Paragraph", "Table"],
-  ],
-  [
-    "a quote with CRLF lines",
-    "> Notes\r\n> | Item |\r\n> | --- |\r\n> | A |",
-    "> Notes\r\n>\r\n> | Item |\r\n> | --- |\r\n> | A |",
-    ["Document", ["Blockquote", "Paragraph", "Table"]],
-  ],
-  [
-    "a list item with CRLF lines",
-    "- Notes\r\n  | Item |\r\n  | --- |\r\n  | A |\r\n- Next",
-    "- Notes\r\n\r\n  | Item |\r\n  | --- |\r\n  | A |\r\n- Next",
-    ["Document", ["UnorderedList", ["ListItem", "Paragraph", "Table"], ["ListItem", "Paragraph"]]],
-  ],
-  [
-    "a quote with CR lines",
-    "> Notes\r> | Item |\r> | --- |\r> | A |",
-    "> Notes\r>\r> | Item |\r> | --- |\r> | A |",
-    ["Document", ["Blockquote", "Paragraph", "Table"]],
-  ],
-  [
-    "a list item with CR lines",
-    "- Notes\r  | Item |\r  | --- |\r  | A |\r- Next",
-    "- Notes\r\r  | Item |\r  | --- |\r  | A |\r- Next",
-    ["Document", ["UnorderedList", ["ListItem", "Paragraph", "Table"], ["ListItem", "Paragraph"]]],
-  ],
-  [
-    "a non-interrupting ordered marker with tildes",
-    "Intro\n2. ~~~\n   Notes\n   | A |\n   | --- |\n   | x |",
-    "Intro\n2. ~~~\n   Notes\n\n   | A |\n   | --- |\n   | x |",
-    ["Document", "Paragraph", "Table"],
-  ],
-  [
-    "a non-interrupting ordered marker with backticks",
-    "Notes\n2. ```\n   | Item |\n   | --- |\n   | A |",
-    "Notes\n2. ```\n\n   | Item |\n   | --- |\n   | A |",
-    ["Document", "Paragraph", "Table"],
-  ],
-])("preserves tables after paragraphs in %s", async (_name, source, separated, expected) => {
-  const rendered = prepareMarkdownSource(source).render();
-  expect(rendered).toEqual(separated);
-  const flags = { hardSoftBreaks: true, latexMath: false };
-  function blocks(node: ASTNode): unknown {
-    if (node.type === "Paragraph" || node.type === "Table") return node.type;
-    return [node.type, ...(node.children ?? []).map(blocks)];
-  }
-  expect(blocks(await parseMarkdown(rendered, flags))).toEqual(expected);
-});
-
-it.each([
-  [
-    "a literal backslash",
-    "Notes\\\n| Item |\n| --- |\n| A |",
-    "Notes\\\n\n| Item |\n| --- |\n| A |",
-    "Notes\\",
-  ],
-  [
-    "an entity and literal backslash with LF lines",
-    "AT&amp;T\\\n| Item |\n| --- |\n| A |",
-    "AT\\&T\\\n\n| Item |\n| --- |\n| A |",
-    "AT&T\\",
-  ],
-  [
-    "an entity and literal backslash with CRLF lines",
-    "AT&amp;T\\\r\n| Item |\r\n| --- |\r\n| A |",
-    "AT\\&T\\\r\n\r\n| Item |\r\n| --- |\r\n| A |",
-    "AT&T\\",
-  ],
-  [
-    "an entity and literal backslash with CR lines",
-    "AT&amp;T\\\r| Item |\r| --- |\r| A |",
-    "AT\\&T\\\r\r| Item |\r| --- |\r| A |",
-    "AT&T\\",
-  ],
-])(
-  "preserves paragraph text before an interrupting table in %s",
-  async (_name, source, separated, text) => {
-    const rendered = prepareMarkdownSource(source).render();
-    expect(rendered).toEqual(separated);
-    const tree = await parseMarkdown(rendered, { hardSoftBreaks: true, latexMath: false });
-    expect(tree.children?.map((node) => node.type)).toEqual(["Paragraph", "Table"]);
-    expect(tree.children?.[0]?.children?.map((node) => node.content).join("")).toEqual(text);
-  },
-);
-
-it.each([
-  "```yaml\n---\nkey: value\n---\n```\n",
-  "~~~md\n| Item |\n| --- |\n| A |\n~~~\n",
-  "````md\n```\n| Item |\n| --- |\n```\n`````\n",
-  "> ```md\n> | Item |\n> | --- |\n> ```\n",
-  "> ```md\n> Code\n",
-  "- ```md\n  Code\n",
-  "    ```\n\n",
-  "```not`a-fence\n",
-])("renders a table after a fence without changing its code: %s", async (prefix) => {
-  const table = "| Item |\n| --- |\n| A |";
-  const rendered = prepareMarkdownSource(`${prefix}Notes\n${table}`).render();
-  expect(rendered).toEqual(`${prefix}Notes\n\n${table}`);
-  const tree = await parseMarkdown(rendered, { hardSoftBreaks: true, latexMath: false });
-  expect(tree.children?.slice(-2).map((node) => node.type)).toEqual(["Paragraph", "Table"]);
-});
-
-it.each([
-  "| Item | Detail |\n| --- | --- |\n" + "| A | one |\n".repeat(100),
-  "Notes\n\n| Item | Detail |\n| --- | --- |\n" + "| A | one |\n".repeat(100),
-  "Notes\n\n| Item |\n| --- |\n| A |",
-  "| Item |\n| --- |\n| A |",
-  "```md\nNotes\n| Item |\n| --- |\n| A |\n```",
-  "```yaml\n---\nkey: value\n---\n```",
-  "```yaml\n---\nkey: value",
-  "~~~md\n| Item |\n| --- |\n| A |\n~~~",
-  "````md\n```\n| Item |\n| --- |\n```\n````",
-  "    Notes\n    | Item |\n    | --- |\n    | A |",
-  "Notes\n| Item | Detail |\n| --- |\n| A |",
-])("leaves separated tables and table-like text unchanged: %s", (source) => {
-  expect(prepareMarkdownSource(source).render()).toEqual(source);
-});
-
 it.each([
  "src/components/message.tsx",
  "C:\\repo\\file.ts",
@@ -444,47 +232,6 @@ it("lets the engine own code boundaries while classifying candidate values", asy
  ]);
 });

-it("recognizes forge references in prose but not in code, links or paths", async () => {
-  const shorthand = createForgeShorthand({
-    forge: "gitlab",
-    remoteUrl: "git@gitlab.com:g/p.git",
-  })!;
-  const source = [
-    "Fixed in #12 and !13, see g/sub/q#14 and https://example.com/a#15.",
-    "`#16` and [#17](https://example.com) and src/app/index.ts and src/a/b/c#18",
-    "```\n#19\n```",
-  ].join("\n\n");
-  const prepared = prepareMarkdownSource(source, "/repo", {
-    forgeReferencePattern: shorthand.pattern,
-  });
-  const tree = recognizeTextLinks(
-    await parseMarkdown(prepared.render(), { latexMath: false }),
-    prepared.linkRecognition.text,
-    prepared.linkRecognition.inlineCode,
-  );
-  const recognized: string[] = [];
-  function collect(node: ASTNode) {
-    if (node.type === "Link" && node.attributes?.recognizedLink === "true") {
-      recognized.push(String(node.attributes.url));
-    }
-    node.children?.forEach(collect);
-  }
-  collect(tree);
-  expect(recognized).toEqual(["#12", "!13", "g/sub/q#14", "src/app/index.ts", "src/a/b/c#18"]);
-  expect(recognized.map((url) => shorthand.resolve(url))).toEqual([
-    "https://gitlab.com/g/p/-/issues/12",
-    "https://gitlab.com/g/p/-/merge_requests/13",
-    "https://gitlab.com/g/sub/q/-/issues/14",
-    null,
-    "https://gitlab.com/src/a/b/c/-/issues/18",
-  ]);
-  // A rejected native regex silently falls back to no recognition at all.
-  expect(toNativeLinkRecognition(prepared.linkRecognition).text).toMatchObject({
-    isDisabled: false,
-    isDefault: false,
-  });
-});
-
 describe("bare URL sentence punctuation", () => {
  it.each([".", ",", ";", ":", "!", "?", ")", ").", "...", "?!"])(
    "leaves %s outside the link and preserves the rendered sentence",
@@ -7,8 +7,6 @@ import {
 } from "@/assistant-file-links";
 import { useStableEvent } from "@/hooks/use-stable-event";
 import { matchCommandLink, useAgentCommandHints, type CommandHints } from "@/agent-commands";
-import { useForgeShorthand } from "@/git/forge-shorthand";
-import { openExternalUrl } from "@/utils/open-external-url";
 import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
 import type { Theme } from "@/styles/theme";
 import { isWeb } from "@/constants/platform";
@@ -91,7 +89,6 @@ const MarkdownPart = memo(function MarkdownPart({
 }: MarkdownRendererProps & { commandHints?: CommandHints | null }) {
  const environment = useAssistantFileLinkEnvironment();
  const actions = useAssistantFileLinkActions();
-  const forgeShorthand = useForgeShorthand();
  const client =
    imageContext.client ??
    (environment.client?.readFile
@@ -105,7 +102,7 @@ const MarkdownPart = memo(function MarkdownPart({
      ...imageContext,
      client,
    },
-    { commandNames: commandHints?.names, forgeReferencePattern: forgeShorthand?.pattern },
+    commandHints?.names,
  );
  const [image, setImage] = useState<ImageLightboxSource | null>(null);
  const pressLink = useStableEvent(({ url, sourceType }: LinkPressEvent) => {
@@ -114,11 +111,6 @@ const MarkdownPart = memo(function MarkdownPart({
      commandHints.insert(command);
      return;
    }
-    const forgeUrl = sourceType === "text" ? forgeShorthand?.resolve(url) : null;
-    if (forgeUrl) {
-      void openExternalUrl(forgeUrl);
-      return;
-    }
    const source = linkSource(url, sourceType);
    if (onLinkPress && !actions.canResolveFile(source)) onLinkPress(url);
    else actions.open(source, "preferred");
@@ -7,7 +7,6 @@ import type {
 } from "react-native-enriched-markdown";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useFileLink } from "@/assistant-file-links";
-import { useForgeShorthand } from "@/git/forge-shorthand";
 import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip";
 import { HighlightedCodeBlock } from "@/components/highlighted-code-block";
 import type { Theme } from "@/styles/theme";
@@ -32,13 +31,7 @@ function WebCodeBlock({ code, language }: CodeBlockRendererProps) {
 const LINK_HOVER_STYLE = { textDecoration: "underline" } as const;

 function WebLink({ link, anchorProps, children }: LinkRendererProps) {
-  const forgeShorthand = useForgeShorthand();
-  // A forge reference like `#12` carries its web URL so hover, copy and new-tab opens work.
-  const forgeUrl = link.sourceType === "text" ? forgeShorthand?.resolve(link.url) : null;
-  const { tooltipPath, onHoverIn } = useFileLink(
-    forgeUrl ? markdownLinkSource(forgeUrl) : markdownLinkSource(link.url, link.sourceType),
-  );
-  const tooltip = forgeUrl ?? tooltipPath;
+  const { tooltipPath, onHoverIn } = useFileLink(markdownLinkSource(link.url, link.sourceType));
  const [hovered, setHovered] = useState(false);
  const handleMouseEnter = useCallback(() => setHovered(true), []);
  const handleMouseLeave = useCallback(() => setHovered(false), []);
@@ -53,7 +46,6 @@ function WebLink({ link, anchorProps, children }: LinkRendererProps) {
  const anchor = (
    <a
      {...anchorProps}
-      href={forgeUrl ?? anchorProps.href}
      style={anchorStyle}
      onMouseEnter={handleMouseEnter}
      onMouseLeave={handleMouseLeave}
@@ -66,10 +58,10 @@ function WebLink({ link, anchorProps, children }: LinkRendererProps) {
      <TooltipTrigger asChild onHoverIn={onHoverIn}>
        <InlineLinkTrigger>{anchor}</InlineLinkTrigger>
      </TooltipTrigger>
-      {tooltip ? (
+      {tooltipPath ? (
        <TooltipContent side="top" align="start" maxWidth={520}>
          <Text selectable={false} style={styles.tooltipPath}>
-            {tooltip}
+            {tooltipPath}
          </Text>
        </TooltipContent>
      ) : null}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mohamed Boudra	8bd38fb236	chore(release): cut 0.15.0-beta.1	2026-11-01 06:19:33 +01:00
Mohamed Boudra	7e5ad53491	docs(changelog): prepare 0.15.0-beta.1	2026-11-01 06:11:09 +01:00
paseo-ai[bot]	a529578cd1	fix: update lockfile signatures and Nix hash [skip ci] (cherry picked from commit `b2666a0aec`)	2026-11-01 06:11:09 +01:00