docs(plugins): the hook result comment names metadata as the field that stays

test(server): fixtures for agents and workspaces carry metadata
Agent snapshots and workspace records now always carry metadata, so the hand-built fixtures and expectations in three existing suites name it.
2026-11-02 06:33:05 +00:00 · 2026-11-02 05:09:28 +01:00 · 2026-11-02 04:09:28 +01:00 · 2026-11-02 03:50:36 +01:00 · 2026-11-02 03:42:12 +01:00 · 2026-11-02 03:27:23 +01:00
885 changed files with 12058 additions and 148752 deletions
@@ -1,3 +0,0 @@
-vendor/react-native-gpui/** linguist-vendored
-packages/app/gpui/package-lock.json linguist-generated
-packages/app/gpui/desktop/Cargo.lock linguist-generated
@@ -135,6 +135,32 @@ jobs:
        env:
          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+      # Backport electron-builder#10172 to the pinned build tool only.
+      # Remove this step when app-builder-lib is upgraded to a release containing it.
+      - name: Repair temporary keychain password in signing tool
+        shell: bash
+        run: |
+          node <<'KEYCHAIN_FIX'
+          const fs = require('node:fs');
+          const path = require('node:path');
+          const manifestPath = require.resolve('app-builder-lib/package.json');
+          if (JSON.parse(fs.readFileSync(manifestPath, 'utf8')).version !== '26.8.1') {
+            throw new Error('Reassess/remove the signing backport for the new app-builder-lib version');
+          }
+          const sourcePath = path.join(path.dirname(manifestPath), 'out/codeSign/macCodeSign.js');
+          let source = fs.readFileSync(sourcePath, 'utf8');
+          const replacements = [
+            ['importCerts(keychainFile, certPaths, cscPasswords)', 'importCerts(keychainFile, certPaths, cscPasswords, keychainPassword)'],
+            ['importCerts(keychainFile, paths, keyPasswords)', 'importCerts(keychainFile, paths, keyPasswords, keychainPassword)'],
+            ['["set-key-partition-list", "-S", "apple-tool:,apple:", "-s", "-k", password, keychainFile]', '["set-key-partition-list", "-S", "apple-tool:,apple:", "-s", "-k", keychainPassword, keychainFile]'],
+          ];
+          for (const [before, after] of replacements) {
+            if (source.split(before).length !== 2) throw new Error('Unexpected signing tool source; refusing to patch');
+            source = source.replace(before, after);
+          }
+          fs.writeFileSync(sourcePath, source);
+          KEYCHAIN_FIX
+
      - name: Set desktop package version from tag
        shell: bash
        run: |
@@ -98,9 +98,3 @@ app.json

 # Project-local Serena configuration and memories.
 .serena/
-
-# Vendored experimental React Native desktop runtime.
-!vendor/
-!vendor/react-native-gpui/
-!vendor/react-native-gpui/**
-!packages/app/gpui/app.json
@@ -11,5 +11,5 @@
  "arrowParens": "always",
  "bracketSameLine": false,
  "bracketSpacing": true,
-  "ignorePatterns": ["*.lock", "**/*.gen.ts", "**/*.gen.tsx", "vendor/**"]
+  "ignorePatterns": ["*.lock", "**/*.gen.ts", "**/*.gen.tsx"]
 }
@@ -3,7 +3,7 @@
  "options": {
    "typeAware": false
  },
-  "ignorePatterns": [".dev/**", "vendor/**"],
+  "ignorePatterns": [".dev/**"],
  "plugins": ["react", "react-perf", "unicorn", "typescript", "oxc", "import", "promise"],
  "jsPlugins": ["./scripts/oxlint/paseo-plugin.mjs"],
  "categories": {
@@ -1,15 +1,81 @@
 # Changelog

-Not released yet. These changes are on `main` but not in 0.14.0; the next release entry includes them.
+## 0.15.0-beta.1 - 2026-11-01

-Added:
+Daemon restarts now keep terminal programs running and automatically resume interrupted agents in their existing conversations.

- Copy gitignored files selected by `.worktreeinclude` into new worktrees before setup and agents, using the built-in `worktree-include` plugin ([#8100](https://github.com/getpaseo/paseo/pull/8100))
- Let plugins choose worktree paths and creation options through `worktree.create.before`, with listing, archive, deletion, and recovery at custom locations; includes a sibling-directory placement example ([#8117](https://github.com/getpaseo/paseo/pull/8117))
+Mobile terminals have native rendering and draggable text-selection handles. Reconnecting restores up to 10,000 lines of terminal history.

-Improved:
+Worktree setup can copy ignored files and use plugin-defined locations before agents start.

- Added `server.addHook` with `subject.operation.position` names and the awaited `worktree.create.after` hook before setup and agents; deprecated the previous plugin hook registration methods without changing their behavior ([#8081](https://github.com/getpaseo/paseo/pull/8081))
+### Added
+
+- 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))
+- 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))
+- Added daemon-wide support for `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` ([#8177](https://github.com/getpaseo/paseo/pull/8177))
+- Fetch usage only while displayed, with a host setting to disable usage checks entirely ([#8181](https://github.com/getpaseo/paseo/pull/8181))
+
+### Improved
+
+- Replaced mobile terminal text rendering to align CJK characters, emoji, styled text and the cursor with terminal columns ([#8336](https://github.com/getpaseo/paseo/pull/8336), [#8375](https://github.com/getpaseo/paseo/pull/8375))
+- Restore the configured terminal scrollback on reconnect, up to 10,000 retained lines ([#8282](https://github.com/getpaseo/paseo/pull/8282) by [@DrakenKor](https://github.com/DrakenKor), [@lennartschoch](https://github.com/lennartschoch))
+- Load paginated Codex histories when importing or reopening sessions ([#8171](https://github.com/getpaseo/paseo/pull/8171) by [@dundunHa](https://github.com/dundunHa), [@hr95savage](https://github.com/hr95savage))
+- Stopped rereading and retaining an unused copy of Codex history when reopening a cached chat ([#8132](https://github.com/getpaseo/paseo/pull/8132))
+- Split large daemon responses across relay frames instead of disconnecting at the frame limit ([#8302](https://github.com/getpaseo/paseo/pull/8302))
+- Truncate oversized chat entries before sending them to the app, including large tool results and embedded data ([#8274](https://github.com/getpaseo/paseo/pull/8274))
+- Show subagent activity in its own panel instead of duplicating it inside the parent’s tool card ([#8276](https://github.com/getpaseo/paseo/pull/8276))
+- Show exact usage reset times alongside more precise countdowns ([#8162](https://github.com/getpaseo/paseo/pull/8162))
+
+### Plugins
+
+- Fixed discarded messages returning after rewinding plugin conversations ([#8368](https://github.com/getpaseo/paseo/pull/8368) by [@mcowger](https://github.com/mcowger), [@omercnet](https://github.com/omercnet))
+- Reduced plugin downloads with smaller client bundles and a cache reused across reconnects and app launches ([#8040](https://github.com/getpaseo/paseo/pull/8040), [#8076](https://github.com/getpaseo/paseo/pull/8076) by [@luoph](https://github.com/luoph), [@RRD-dev](https://github.com/RRD-dev))
+- Preserved plugin screens and local state during temporary host disconnections ([#8105](https://github.com/getpaseo/paseo/pull/8105) by [@luoph](https://github.com/luoph), [@RRD-dev](https://github.com/RRD-dev))
+- Let plugins choose worktree locations and creation options through `worktree.create.before` ([#8117](https://github.com/getpaseo/paseo/pull/8117) by [@mcowger](https://github.com/mcowger))
+- Added `server.addHook` with an awaited `worktree.create.after` hook before workspace setup and agents start ([#8081](https://github.com/getpaseo/paseo/pull/8081))
+- Released redundant plugin streaming snapshots instead of retaining them for the session’s lifetime ([#7675](https://github.com/getpaseo/paseo/pull/7675) by [@suntianc](https://github.com/suntianc))
+
+### Fixed
+
+- Fixed rewinding Claude conversations to messages sent during an active turn ([#8372](https://github.com/getpaseo/paseo/pull/8372) by [@tieo](https://github.com/tieo))
+- Fixed duplicate rows and missing replies when resuming Claude subagents after reopening a session ([#8408](https://github.com/getpaseo/paseo/pull/8408) by [@luoph](https://github.com/luoph), [@RRD-dev](https://github.com/RRD-dev))
+- Fixed Codex agents created without a prompt failing after their runtime reopens ([#8393](https://github.com/getpaseo/paseo/pull/8393) by [@babo-jeonguk](https://github.com/babo-jeonguk))
+- Fixed newly running agents appearing as finished immediately after creation ([#8396](https://github.com/getpaseo/paseo/pull/8396) by [@luoph](https://github.com/luoph))
+- Fixed ACP startup exits waiting for a timeout instead of reporting the process error ([#8384](https://github.com/getpaseo/paseo/pull/8384) by [@Peanut-HZM](https://github.com/Peanut-HZM))
+- Fixed skills missing from new ACP agents when commands arrive in multiple batches ([#8387](https://github.com/getpaseo/paseo/pull/8387) by [@Peanut-HZM](https://github.com/Peanut-HZM))
+- Fixed sidebar titles and statuses stopping updates after directory subscriptions are released ([#8403](https://github.com/getpaseo/paseo/pull/8403) by [@ragokan](https://github.com/ragokan))
+- Kept the open workspace visible in collapsed sidebar groups ([#8395](https://github.com/getpaseo/paseo/pull/8395) by [@0xroylee](https://github.com/0xroylee))
+- Fixed relative chat links opening missing files instead of files in nested repositories ([#8361](https://github.com/getpaseo/paseo/pull/8361) by [@apple-ouyang](https://github.com/apple-ouyang))
+- Accepted host:port and pasted URLs in the Direct connection Host field ([#8223](https://github.com/getpaseo/paseo/pull/8223) by [@DaydreamCoding](https://github.com/DaydreamCoding))
+- Fixed terminal Ctrl+V paste over plain HTTP on non-Mac keyboards ([#8230](https://github.com/getpaseo/paseo/pull/8230) by [@DaydreamCoding](https://github.com/DaydreamCoding))
+- Stopped failed history loads from repeatedly reopening the provider, with Retry available in the chat ([#8278](https://github.com/getpaseo/paseo/pull/8278))
+- Fixed Claude settings files being discarded when Paseo adds its own launch settings ([#8148](https://github.com/getpaseo/paseo/pull/8148) by [@yayugu](https://github.com/yayugu))
+- Fixed steering messages replacing a turn that was still starting and losing its original prompt ([#6192](https://github.com/getpaseo/paseo/pull/6192))
+- Fixed Pi tool-result images missing during streaming and after reopening the chat ([#8280](https://github.com/getpaseo/paseo/pull/8280) by [@duyiliu](https://github.com/duyiliu))
+- Fixed completed `edxeth/pi-subagents` children remaining marked as working ([#8176](https://github.com/getpaseo/paseo/pull/8176) by [@Zeno2019](https://github.com/Zeno2019))
+- Fixed Claude background subagent status after reopening a conversation ([#6259](https://github.com/getpaseo/paseo/pull/6259))
+- Fixed reused plugin subagents showing their previous completed status during new work ([#8080](https://github.com/getpaseo/paseo/pull/8080) by [@bccy](https://github.com/bccy))
+- Fixed custom Codex providers with reserved names such as `ollama` ([#6954](https://github.com/getpaseo/paseo/pull/6954) by [@mr860819](https://github.com/mr860819))
+- 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 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))
+- Fixed split dividers drifting ahead of or behind the pointer while dragging ([#6011](https://github.com/getpaseo/paseo/pull/6011))
+- Fixed delayed native filesystem watcher startup leaving Git updates unobserved ([#8107](https://github.com/getpaseo/paseo/pull/8107))
+- Fixed bundled skill arguments being passed incorrectly to Codex and Pi ([#8252](https://github.com/getpaseo/paseo/pull/8252) by [@AspireOne](https://github.com/AspireOne))
+
+### 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
+- 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,15 +1,81 @@
-# 更新日志
+# Changelog

-尚未发布。以下变更已合入 `main`，但不包含在 0.14.0 中；下一个版本的条目会包含它们。
+## 0.15.0-beta.1 - 2026-11-01

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

- 在 setup 和 Agent 启动前，使用内置的 `worktree-include` 插件将 `.worktreeinclude` 选中的被 gitignore 忽略的文件复制到新工作树 ([#8100](https://github.com/getpaseo/paseo/pull/8100))
- 插件可通过 `worktree.create.before` 选择工作树路径和创建选项，自定义位置的工作树支持列出、归档、删除和恢复；附带同级目录放置示例 ([#8117](https://github.com/getpaseo/paseo/pull/8117))
+移动端终端采用原生渲染，并提供可拖动的文本选择手柄。重新连接时最多恢复 10,000 行终端历史。

-改进：
+worktree 初始化支持复制被忽略的文件，并在 Agent 启动前使用插件指定的位置。

- 新增采用 `subject.operation.position` 命名的 `server.addHook` 和在 setup 及 Agent 之前等待的 `worktree.create.after` 钩子，弃用原有的插件钩子注册方法并保留原有行为 ([#8081](https://github.com/getpaseo/paseo/pull/8081))
+### 新增
+
+- 点击回复中的已知 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)，贡献者：[@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))
+- 让 daemon 的网络请求支持 `HTTP_PROXY`、`HTTPS_PROXY` 和 `NO_PROXY` ([#8177](https://github.com/getpaseo/paseo/pull/8177))
+- 仅在显示用量时查询用量，并提供主机设置以完全关闭用量查询 ([#8181](https://github.com/getpaseo/paseo/pull/8181))
+
+### 改进
+
+- 更换移动端终端文本渲染方式，让中日韩字符、表情符号、带样式文本和光标对齐终端列 ([#8336](https://github.com/getpaseo/paseo/pull/8336), [#8375](https://github.com/getpaseo/paseo/pull/8375))
+- 重新连接时恢复设置指定的终端回滚历史，最多保留 10,000 行 ([#8282](https://github.com/getpaseo/paseo/pull/8282)，贡献者：[@DrakenKor](https://github.com/DrakenKor), [@lennartschoch](https://github.com/lennartschoch))
+- 导入或重新打开 Codex 会话时加载分页历史 ([#8171](https://github.com/getpaseo/paseo/pull/8171)，贡献者：[@dundunHa](https://github.com/dundunHa), [@hr95savage](https://github.com/hr95savage))
+- 重新打开已有缓存的 Codex 聊天时，不再重复读取并保留未使用的历史副本 ([#8132](https://github.com/getpaseo/paseo/pull/8132))
+- 将 daemon 的大型响应拆分为多个 relay 帧，避免达到单帧限制时断开连接 ([#8302](https://github.com/getpaseo/paseo/pull/8302))
+- 向应用发送聊天条目前截断超大内容，包括大型工具结果和内嵌数据 ([#8274](https://github.com/getpaseo/paseo/pull/8274))
+- 在子 Agent 自己的面板中显示活动，不再在父 Agent 的工具卡片中重复显示 ([#8276](https://github.com/getpaseo/paseo/pull/8276))
+- 在更精确的倒计时旁显示用量限制的具体重置时间 ([#8162](https://github.com/getpaseo/paseo/pull/8162))
+
+### 插件
+
+- 修复了插件会话回退后已丢弃的消息重新出现的问题 ([#8368](https://github.com/getpaseo/paseo/pull/8368)，贡献者：[@mcowger](https://github.com/mcowger), [@omercnet](https://github.com/omercnet))
+- 通过缩小客户端代码包并在重连和应用启动时复用缓存，减少插件下载量 ([#8040](https://github.com/getpaseo/paseo/pull/8040), [#8076](https://github.com/getpaseo/paseo/pull/8076)，贡献者：[@luoph](https://github.com/luoph), [@RRD-dev](https://github.com/RRD-dev))
+- 在主机暂时断开连接期间保留插件页面和本地状态 ([#8105](https://github.com/getpaseo/paseo/pull/8105)，贡献者：[@luoph](https://github.com/luoph), [@RRD-dev](https://github.com/RRD-dev))
+- 让插件通过 `worktree.create.before` 指定 worktree 的位置和创建选项 ([#8117](https://github.com/getpaseo/paseo/pull/8117)，贡献者：[@mcowger](https://github.com/mcowger))
+- 新增 `server.addHook`，并在工作区初始化和 Agent 启动前等待 `worktree.create.after` hook 完成 ([#8081](https://github.com/getpaseo/paseo/pull/8081))
+- 释放多余的插件流式快照，不再将其保留到会话结束 ([#7675](https://github.com/getpaseo/paseo/pull/7675)，贡献者：[@suntianc](https://github.com/suntianc))
+
+### 修复
+
+- 修复了无法将 Claude 会话回退到运行过程中发送的消息的问题 ([#8372](https://github.com/getpaseo/paseo/pull/8372)，贡献者：[@tieo](https://github.com/tieo))
+- 修复了重新打开会话后恢复 Claude 子 Agent 时出现重复行和回复缺失的问题 ([#8408](https://github.com/getpaseo/paseo/pull/8408)，贡献者：[@luoph](https://github.com/luoph), [@RRD-dev](https://github.com/RRD-dev))
+- 修复了未发送提示词的 Codex Agent 在运行时重新打开后无法使用的问题 ([#8393](https://github.com/getpaseo/paseo/pull/8393)，贡献者：[@babo-jeonguk](https://github.com/babo-jeonguk))
+- 修复了刚开始运行的 Agent 在创建后立即显示为已完成的问题 ([#8396](https://github.com/getpaseo/paseo/pull/8396)，贡献者：[@luoph](https://github.com/luoph))
+- 修复了 ACP 启动进程退出后仍等待超时而未及时报告错误的问题 ([#8384](https://github.com/getpaseo/paseo/pull/8384)，贡献者：[@Peanut-HZM](https://github.com/Peanut-HZM))
+- 修复了命令分批到达时新 ACP Agent 的技能列表不完整的问题 ([#8387](https://github.com/getpaseo/paseo/pull/8387)，贡献者：[@Peanut-HZM](https://github.com/Peanut-HZM))
+- 修复了目录订阅释放后侧栏标题和状态停止更新的问题 ([#8403](https://github.com/getpaseo/paseo/pull/8403)，贡献者：[@ragokan](https://github.com/ragokan))
+- 在折叠的侧栏分组中保持当前工作区可见 ([#8395](https://github.com/getpaseo/paseo/pull/8395)，贡献者：[@0xroylee](https://github.com/0xroylee))
+- 修复了聊天中的相对链接未打开嵌套仓库中的文件而指向不存在文件的问题 ([#8361](https://github.com/getpaseo/paseo/pull/8361)，贡献者：[@apple-ouyang](https://github.com/apple-ouyang))
+- 在直接连接的主机字段中支持 host:port 和粘贴的 URL ([#8223](https://github.com/getpaseo/paseo/pull/8223)，贡献者：[@DaydreamCoding](https://github.com/DaydreamCoding))
+- 修复了非 Mac 键盘通过普通 HTTP 访问网页终端时 Ctrl+V 无法粘贴的问题 ([#8230](https://github.com/getpaseo/paseo/pull/8230)，贡献者：[@DaydreamCoding](https://github.com/DaydreamCoding))
+- 停止在历史加载失败后反复重新打开 Provider，可在聊天中手动重试 ([#8278](https://github.com/getpaseo/paseo/pull/8278))
+- 修复了 Paseo 添加自身启动设置时丢弃 Claude 设置文件的问题 ([#8148](https://github.com/getpaseo/paseo/pull/8148)，贡献者：[@yayugu](https://github.com/yayugu))
+- 修复了引导消息替换尚在启动的轮次并丢失原始提示词的问题 ([#6192](https://github.com/getpaseo/paseo/pull/6192))
+- 修复了 Pi 工具结果中的图片在流式输出和重新打开聊天后缺失的问题 ([#8280](https://github.com/getpaseo/paseo/pull/8280)，贡献者：[@duyiliu](https://github.com/duyiliu))
+- 修复了 `edxeth/pi-subagents` 子 Agent 完成后仍显示为工作中的问题 ([#8176](https://github.com/getpaseo/paseo/pull/8176)，贡献者：[@Zeno2019](https://github.com/Zeno2019))
+- 修复了重新打开会话后的 Claude 后台子 Agent 状态 ([#6259](https://github.com/getpaseo/paseo/pull/6259))
+- 修复了复用的插件子 Agent 开始新任务时仍显示上次已完成状态的问题 ([#8080](https://github.com/getpaseo/paseo/pull/8080)，贡献者：[@bccy](https://github.com/bccy))
+- 修复了使用 `ollama` 等保留名称的自定义 Codex Provider ([#6954](https://github.com/getpaseo/paseo/pull/6954)，贡献者：[@mr860819](https://github.com/mr860819))
+- 修复了 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))
+- 修复了删除 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))
+- 修复了拖动分隔线时，分隔线偏离指针的问题 ([#6011](https://github.com/getpaseo/paseo/pull/6011))
+- 修复了原生文件监听器启动延迟导致 Git 更新未被监听的问题 ([#8107](https://github.com/getpaseo/paseo/pull/8107))
+- 修复了内置 skill 参数未正确传递给 Codex 和 Pi 的问题 ([#8252](https://github.com/getpaseo/paseo/pull/8252)，贡献者：[@AspireOne](https://github.com/AspireOne))
+
+### 说明
+
+- 首次从 0.14.0 升级时仍会关闭终端；安装新 daemon 后才支持保留终端，Windows 桌面应用升级仍会关闭终端
+- Agent 自动恢复默认开启，并发送 `Resume working.`；可在主机设置 → Agent 中修改提示词或关闭此功能
+- 降级到 0.14.0 前，请恢复备份的 `config.json`，或删除已保存的 Agent 恢复和用量查询设置

 ## 0.14.0 - 2026-10-29

@@ -92,6 +92,7 @@ Each agent is stored as a separate JSON file, grouped by project directory.
 | `lastUserMessageAt`  | `string?` (ISO 8601)                     | Last user message timestamp                                                                                                                                                                                                                                                                                                                                                         |
 | `title`              | `string?`                                | User-visible title                                                                                                                                                                                                                                                                                                                                                                  |
 | `labels`             | `Record<string, string>`                 | Key-value labels (default `{}`). Paseo uses `paseo.parent-agent-id` for parentage and client-scoped `paseo.open-agent-tab.*` labels while managed subagent tabs are open — see [agent-lifecycle.md](./agent-lifecycle.md)                                                                                                                                                           |
+| `metadata`           | `Record<string, JsonValue>`              | Plugin-owned data (default `{}`). Paseo stores and forwards it and never reads a key. Set at creation or through `agent.metadata.update.request`; `null` in a patch removes a key                                                                                                                                                                                                   |
 | `lastStatus`         | `AgentStatus`                            | One of: `"initializing"`, `"idle"`, `"running"`, `"error"`, `"closed"`. `closed` means the record is resumable but has no live provider runtime; archive remains represented separately by `archivedAt`.                                                                                                                                                                            |
 | `lastModeId`         | `string?`                                | Last active mode ID                                                                                                                                                                                                                                                                                                                                                                 |
 | `config`             | `SerializableConfig?`                    | Agent session configuration (see below)                                                                                                                                                                                                                                                                                                                                             |
@@ -478,6 +479,7 @@ Array of workspace records. A workspace is a specific working directory within a
 | `archivedAt`                   | `string \| null` (ISO 8601)                                  | Soft-delete; required nullable                                                                                                                                                                |
 | `autoArchivedChangeRequestUrl` | `string \| null`                                             | Change request whose merged state triggered auto-archive. Restore replaces it with the current merged change request, when present, so repeated snapshots cannot archive the workspace again. |
 | `labels`                       | `string[]?`                                                  | Normalized display names assigned from this host's shared label catalog. Missing means unlabelled.                                                                                            |
+| `metadata`                     | `Record<string, JsonValue>`                                  | Plugin-owned data (default `{}`). Paseo stores and forwards it and never reads a key. Set at creation or through `workspace.metadata.update.request`.                                         |
 | `pinnedAt`                     | `string \| null` (ISO 8601)                                  | Pinned-to-top-of-sidebar timestamp; null means "not pinned"                                                                                                                                   |
 | `untrustedSource`              | `{ kind: "change_request", forge, number, headRepository }?` | Provenance captured when a cross-repository change request creates the workspace. Missing means repository automation is allowed; explicit setup removes the field.                           |

@@ -29,13 +29,6 @@ the titlebar row. Production builds leave the variable unset and show no label.

 `npm run dev` is only a shorthand for `npm run dev:server`. Keep `127.0.0.1:6767` for the packaged app and production-style `~/.paseo` state.

-## Experimental GPUI client
-
-The opt-in [GPUI target](../packages/app/gpui/README.md) runs the existing React
-Native app on Linux. Its contributor guide covers setup, the renderer comparison,
-unsupported features, native checks, and experiments to pick up. It connects to
-an already-running daemon and does not replace the Electron dev command.
-
 ## Nix desktop package

 The flake exposes `packages.<system>.desktop` on Linux and macOS:
@@ -511,13 +511,21 @@ need no change. See [catalogue ownership](providers.md#provider-snapshot-refresh
 `send()` resolves after acceptance. Publish operation completion, prompt disposition, turn state,
 configuration, permissions, persistence, and complete timeline snapshots through `onEvent()`.
 Route messages, structured commands, steering, and command side effects through `session.prompt`.
-Provider settings are toggle/select data that Paseo renders in the composer. Keep private options in
-the opaque `ProviderSessionConfig.providerOptions` object on `session.open`.
-It contains the provider defaults and per-agent overrides merged by the daemon.
+A provider's configuration is the opaque `ProviderSessionConfig.providerOptions` object on
+`session.open`. It contains the provider defaults and per-agent overrides merged by the daemon.
 Validate and apply it inside the provider; core does not know your option shape.
 See [provider options](custom-providers.md#provider-options) for configuration and
 merge semantics.

+The provider draws some of those keys in the composer by reporting `controls` and the values it runs
+(`providerOptions`) in `session.config`. A running-agent change arrives as
+`session.configure` with `changes.providerOptions` and follows the same apply-or-throw contract as
+built-in providers ([options flow](providers.md#options-flow)). `PluginAgentSession` in
+`packages/server/src/server/agent/plugin-provider.ts` is that adapter. A provider still reporting
+`settings` is read through `plugin-provider-options.ts`, which turns each setting into a control and
+its value into an option and is sent both shapes in `session.configure`; delete it with
+`COMPAT(plugin-provider-settings)`. The ACP shim still reports `settings`.
+
 Providers add an optional veto to daemon baseline cleanup through the per-session
 [runtime safety query](../public-docs/plugins/providers.md#permit-idle-runtime-cleanup).
 The daemon calls the same `AgentSession.canStopRuntime()` interface for built-ins and plugins;
@@ -30,6 +30,65 @@ at session startup. See [provider configuration](custom-providers.md#provider-op
 for defaults and merge rules, and the [SDK guide](../public-docs/sdk/provider-options.md)
 for native keys and examples.

+### Options flow
+
+`options` on the agent snapshot is the only option state. Controls describe how to draw an
+option and read `options`; they hold no value of their own. Any option can be read and set with
+or without a control.
+
+- **Create and resume.** The provider opens with the options it is given and emits nothing about
+  them while opening. `openOptionsPatch` carries every option the session ended up with that
+  differs from what it was given, including a setting nobody asked for (a native default such as
+  Cursor opening with Fast on). It is set before `createSession`/`resumeSession` resolves and the
+  daemon stores it before the agent is published. A reopened agent resumes that state, so a
+  native default the provider later changes does not follow. `options` on the snapshot is what
+  the session opened with, and afterwards it moves only through an apply or an `options_changed`.
+  Editing a provider default in `config.json` affects agents the next time they open.
+- **Live apply.** `applyOptions` receives the keys the patch touches, resolved against the
+  `config.json` defaults. A removal arrives as the default the key falls back to, or `null` when
+  there is none; the provider returns the setting to its own default if it can, or throws to
+  reject. A key the running session cannot apply (one the provider reads only when it opens) is
+  rejected too, so a stored option always describes what runs. Claude reads most options when it
+  starts its query, and replacing a started query would end its background work, so after the
+  first prompt only Fast can change. Codex fixes its approval policy and sandbox when the thread
+  starts, so it applies only `service_tier` and `plan_mode` live. A session with no
+  `applyOptions` rejects every patch; the daemon enforces this. The provider returns the options
+  it ended up with when they differ from the request. The daemon
+  stores the patch and that result in one step after the call resolves, onto the agent's options
+  as they are at that moment, so the last write wins. Throwing rejects the whole patch and
+  none of it is stored. Emit nothing from inside the call. If the provider's own state moved
+  before it refused, it reports the moved values once as `options_changed` after the call has
+  ended, because the stored options must match what runs.
+- **Old data converts in the agent manager.** Codex used to take `fast_mode`; it takes
+  `service_tier` now. `AgentManager` runs `convertLegacyOptions` (`option-controls.ts`) on an
+  agent's own options when it creates, resumes, imports, reloads or applies to it, and on draft
+  controls, before defaults merge and before anything is stored (`true` is `"fast"`, `false` is
+  `"default"`, and a `service_tier` in the same input wins). The manager converts for the adapter
+  behind the provider id, following `derivedFromProviderId`, so a custom provider with
+  `extends: "codex"` is converted too. Configured defaults convert in the provider registry. A
+  stored record keeps `fast_mode` until the agent is next opened or applied to, and is stored
+  converted from then on. Nothing past the manager sees `fast_mode` for Codex. Codex resolves
+  `"fast"` to the model's Fast tier and reports the id it runs through `openOptionsPatch` or the
+  `applyOptions` result like any other value. The `featureValues` to `options` fold is separate
+  and provider-agnostic; it stays at the protocol and legacy edges.
+- **Clients draw from the daemon's answer.** The app reads `controls` and `options` from the
+  agent snapshot for a running or closed agent. A draft and a profile form send everything they
+  would create with (seed, the provider's last-used control values once the provider has said it
+  still draws them, and the user's edits) in `provider.controls.list.request` and draw only what
+  comes back, so an alias such as a legacy Fast profile's `service_tier: "fast"` is resolved once,
+  by the daemon. A toggle shows over the last answer until its own answer arrives. The draft's
+  layers live in a plain model (`agent-controls/draft-options-model.ts`): applying a profile
+  replaces provider and options in one step, while choosing a provider by hand starts over. A
+  profile saves its stored options plus the form's edits, so options no control draws survive an
+  edit. A daemon without `server_info.features.providerOptionControls` sends `features` and
+  `featureValues`; `packages/client/src/compat/legacy-provider-options.ts` is the one place that
+  turns those into `controls` and `options` and back, so nothing in the app branches on it. A
+  create that carries options first lists the controls for its own provider, model, mode and
+  thinking level, since which options are controls differs by model, and sends those as
+  `featureValues`; callers do not prime anything.
+- **Provider-initiated changes.** A setting the provider changes on its own is an
+  `options_changed` event. The daemon stores and forwards it and does not push the old value back.
+
 Exact MCP preapproval is a separate daemon-owned contract. A new provider must fail
 closed for Hub unattended execution until it can approve one exact injected MCP
 server and tool identity without approving native tools.
@@ -115,7 +174,7 @@ Submitted user-message wire items carry the same Paseo ID in `messageId` and `cl

 Provider adapters must terminalize every transient timeline row before emitting the turn's terminal event. Codex may omit the completed `contextCompaction` item when a turn ends during compaction, so its adapter closes any pending root compaction before forwarding `turn_completed`, `turn_failed`, or `turn_canceled`. A terminal turn must never leave the client showing an operation as still loading.

-Draft metadata lookups should avoid creating provider sessions when the upstream provider has top-level APIs for that metadata. Prefer `AgentClient.fetchCatalog`, `listCommands`, or `listFeatures` over creating a scratch `AgentSession`; scratch sessions can show up as empty native sessions in provider import/history UIs. `fetchCatalog` is the single discovery API for models and modes — provider implementations may use one process, separate upstream calls, or static data internally, but callers outside the provider do not get separate runtime model/mode probes. Draft command listing and scratch-session feature listing require an explicit draft model. Do not resolve a default model through catalog discovery. A client-level `listFeatures` implementation may return features from an incomplete, model-less draft and owns which features are valid in that state.
+Draft metadata lookups should avoid creating provider sessions when the upstream provider has top-level APIs for that metadata. Prefer `AgentClient.fetchCatalog`, `listCommands`, or `listControls` over creating a scratch `AgentSession`; scratch sessions can show up as empty native sessions in provider import/history UIs. `fetchCatalog` is the single discovery API for models and modes — provider implementations may use one process, separate upstream calls, or static data internally, but callers outside the provider do not get separate runtime model/mode probes. Draft command listing and scratch-session control listing require an explicit draft model. Do not resolve a default model through catalog discovery. A client-level `listControls` implementation may return controls from an incomplete, model-less draft and owns which features are valid in that state.

 Provider session import has its own contract. The picker calls `listImportableSessions` and receives rows only: provider handle, cwd, title, prompt previews, and last activity. Import calls `importSession({ providerHandleId, cwd })` for the selected row and must not call listing again. The provider returns the resumed session, storage config, persistence handle, and hydrated timeline for that one native session; `AgentManager.importProviderSession` seeds the daemon timeline and publishes the Paseo agent only after it is ready.

@@ -478,7 +537,7 @@ interface AgentSession {
  readonly provider: AgentProvider;
  readonly id: string | null;
  readonly capabilities: AgentCapabilityFlags;
-  readonly features?: AgentFeature[];
+  readonly controls?: AgentOptionControl[];
  run(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<AgentRunResult>;
  startTurn(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<{ turnId: string }>;
  steerActiveTurn?(prompt: AgentPromptInput, options: SteerActiveTurnOptions): Promise<SteerResult>;
@@ -500,13 +559,15 @@ interface AgentSession {
  listCommands?(): Promise<AgentSlashCommand[]>;
  setModel?(modelId: string | null): Promise<void>;
  setThinkingOption?(thinkingOptionId: string | null): Promise<void | AgentProviderNotice>;
-  setFeature?(featureId: string, value: unknown): Promise<void>;
+  applyOptions?(options: ProviderOptions): Promise<void>;
  tryHandleOutOfBand?(prompt: AgentPromptInput): {
    run(ctx: { emit: (event: AgentStreamEvent) => void }): Promise<void>;
  } | null;
 }
 ```

+`describePersistence()` returns a handle only once a new provider process could resume it. Reload, idle runtime collection and daemon restart resume whatever handle the agent stored; a stored agent without one starts a new session instead. When there is no handle, `AgentManager` stores `getRuntimeInfo().sessionId` as one, so that ID follows the same rule. Codex, for example, starts a thread when the agent is created but writes its rollout only at its first turn, and `thread/resume` fails for it until then, so its adapter reports neither ID before Codex announces that turn.
+
 `setMode` and `setThinkingOption` may return an `AgentProviderNotice` when the provider knows the change needs user-facing context. For example, providers that stage changes until the next turn should return an `info` notice while a turn is already running. The app renders the notice generically as a toast; provider-specific lifecycle behavior stays in the provider implementation.

 ### Steps
@@ -6,15 +6,25 @@ Web and Electron draw terminals with xterm.js. iOS and Android keep an `@xterm/h

 xterm decides which column every cell occupies. The native views never let text advance move a cell. Each row is shaped once, one run per font face, so Hangul jamo, ligatures, combining marks, conjuncts and fallback fonts see their neighbours. Each shaped cluster is then drawn at its first cell's column, centred in the columns it owns, and scaled down when its glyphs are wider. Cursor, selection, hit-testing and copy all use xterm's columns, so they stay correct whatever the font does.

-A cluster is the run of cells the shaper merged, and it is drawn once from the shaped row. Drawing part of a cluster on its own reshapes it: a half-form conjunct such as `स्ते` comes apart into `स्` with a visible virama. So colour and selection never split a cluster. A cluster whose cells differ in colour is drawn once per colour, clipped to that colour's columns.
+A cluster is the run of cells the shaper merged, and it is drawn once from the shaped row. xterm usually keeps a conjunct in one cell (see [Character widths](#character-widths)), but a colour change inside it leaves `क्` and `ष` in separate cells that still shape together. Drawing part of a cluster on its own reshapes it: the conjunct comes apart into `क्` with a visible virama. So colour and selection never split a cluster. A cluster whose cells differ in colour is drawn once per colour, clipped to that colour's columns.

-Android also groups cells with `android.icu.text.BreakIterator`, because Minikin's advances and cursor boundaries alone split some conjuncts. Grapheme rules follow the OS ICU version. Android 10 (API 29) splits `स्ते` after the virama and renders it incorrectly. The tested corpus passed on API 33, 34 and 35; API 30–32 have not been tested. We accept that version-dependent limitation to avoid bundling approximately 14 MB of ICU4J data. CoreText keeps this conjunct together on iOS. This renderer does not guarantee identical shaping across OS versions.
+Android also groups cells with `android.icu.text.BreakIterator`, because Minikin's advances and cursor boundaries alone split some clusters that span cells. Grouping only merges whole cells, so a conjunct xterm keeps in one cell cannot be split by the OS. Grapheme rules follow the OS ICU version, and we accept that to avoid bundling approximately 14 MB of ICU4J data. Before the buffers used grapheme widths, Android 10 (API 29) split `स्ते` across its two cells. This renderer does not guarantee identical shaping across OS versions.

 `TerminalRowLayoutTest.kt` is the Android regression test. It draws the rows of `grapheme-rows.json` and compares each with its grapheme clusters drawn one at a time, and with a wrong clustering that must not match. `terminal-frame.test.ts` checks that those rows are what xterm produces and that the clusters are UAX #29 grapheme clusters. Run it with `./gradlew :paseo-terminal:connectedDebugAndroidTest` from `packages/app/android`, with `ANDROID_SERIAL` set.

 The view reports ready only after it has measured its grid size. The pane attaches with that size, so the daemon replays the terminal at the client's size. Before this, the replay arrived at the PTY's old size, the resize came after it, and the shell's redraw landed on the wrong rows.

-Emoji widths come from the headless buffer, which uses xterm's default Unicode 6 table. `👍` gets one column, and `👋🏽` and `🇰🇷` get two cells drawn as one cluster. Web loads the Unicode 11 addon, so the same output can wrap differently on web and native.
+## Character widths
+
+The daemon, native and web buffers all load `@xterm/addon-unicode-graphemes`: the daemon through `packages/server/src/terminal/headless-terminal.ts`, native in `createNativeHeadlessTerminal`, web in `terminal-emulator-runtime.ts`. Each emoji cluster takes one two-column cell, including VS16 (`❤️`), skin tones (`👋🏽`), flags (`🇰🇷`) and ZWJ sequences (`👨‍👩‍👧`). That is the width colour-emoji fonts draw at. Under xterm's default Unicode 6 table `😀` got one column, and the native views scaled it to half size to fit.
+
+Every buffer must use the same table. The daemon answers cursor-position reports (`CSI 6n`) from its buffer, and a client re-parses the daemon's ANSI replay with its own table. A disagreement moves the cursor and the later cells of any row that holds a disputed cluster: after replay from a Unicode 6 daemon, the cursor that followed `A😀😀😀B` lands inside the third emoji.
+
+Daemons that use grapheme widths advertise `server_info.features["terminal-grapheme-widths"]`. `terminal-pane.tsx` reads it once and passes `characterWidths` to the emulator. Against an older daemon the app keeps each renderer's previous table: xterm's default on native, Unicode 11 on web. An older app against a newer daemon cannot match it, because every client shares the daemon's one buffer. A terminal kept by a worker from an unreleased pre-grapheme build keeps that worker's table until it exits.
+
+The table follows Unicode grapheme clusters, as Node's `string-width` does for Ink-based agent TUIs. Indic conjuncts follow the same rule: `क्ष` and `स्ते` take one column, and the native views scale them down to fit it. Shells measure with the C library's `wcwidth` instead. glibc counts `❤️` as one column, `👋🏽` as four and `क्ष` as two, so a line editor that measures those disagrees with the terminal.
+
+Use `@xterm/addon-unicode-graphemes` 0.5.0-beta.330 or later. Earlier versions read their width table from the wrong offset when Node decodes it into a pooled `Buffer`, which gives wrong widths or a load error depending on earlier allocations. `headless-terminal.test.ts` forces that case in a fresh process.

 ## Ink outside the row

@@ -1 +1 @@
-sha256-zFjdXeRpqrjEZk44ZCvEOTnVVGX0ASfDPktYNiWZpsw=
+sha256-CeT2PtYIAFwvBC9LIku8VkTl0pvKxYzSCn0QW2ManfU=
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.14.0",
+  "version": "0.15.0-beta.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "workspaces": [
@@ -14740,16 +14740,52 @@
        "node": ">=10.0.0"
      }
    },
+    "node_modules/@xterm/addon-image": {
+      "version": "0.10.0-beta.331",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.331.tgz",
+      "integrity": "sha512-ShBTb3QF0ul/i55lfRdJpcu0hlA4aJdqRdzzHdOCws2WUzSsG0SCfMhLjzaoO1dVUGNj2Z7PNLqiXnlyqOinbg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@xterm/xterm": "^6.1.0-beta.336"
+      }
+    },
    "node_modules/@xterm/addon-serialize": {
      "version": "0.14.0",
      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0.tgz",
      "integrity": "sha512-uteyTU1EkrQa2Ux6P/uFl2fzmXI46jy5uoQMKEOM0fKTyiW7cSn0WrFenHm5vO5uEXX/GpwW/FgILvv3r0WbkA==",
      "license": "MIT"
    },
+    "node_modules/@xterm/addon-unicode-graphemes": {
+      "version": "0.5.0-beta.330",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode-graphemes/-/addon-unicode-graphemes-0.5.0-beta.330.tgz",
+      "integrity": "sha512-Zoiv/8tmku4LcU7bEL6zer+DNN6p6F8VCkyviSmbDxpA/W9zSnWDiD/ZpwFDQqegwjSptGzBNMhW2Os1sa+lUw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@xterm/xterm": "^6.1.0-beta.336"
+      }
+    },
+    "node_modules/@xterm/addon-webgl": {
+      "version": "0.20.0-beta.329",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.329.tgz",
+      "integrity": "sha512-bwqMma7X4cCBfwmWqKuhxNLkIXKW0lJTapaQ0g/9Kq7n6D6VCL4dYQCQ6DoeHv27ncJD4WzeoDTCEeSn0cspfg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@xterm/xterm": "^6.1.0-beta.336"
+      }
+    },
    "node_modules/@xterm/headless": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.0.0.tgz",
-      "integrity": "sha512-5Yj1QINYCyzrZtf8OFIHi47iQtI+0qYFPHmouEfG8dHNxbZ9Tb9YGSuLcsEwj9Z+OL75GJqPyJbyoFer80a2Hw==",
+      "version": "6.1.0-beta.334",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.334.tgz",
+      "integrity": "sha512-QkwuIeP9dXlk/eOsAbqX8AvtS/W8EhRo6dkl2YYZr+jWAWSfDDMi+zPlegWUflSdsRKMURMvzvvkVZr6GztK4g==",
+      "license": "MIT",
+      "workspaces": [
+        "addons/*"
+      ]
+    },
+    "node_modules/@xterm/xterm": {
+      "version": "6.1.0-beta.336",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.336.tgz",
+      "integrity": "sha512-QrvZZsffXsLW4Z3sba9GqimLvVwlb8b3W1NwZ+l6DdRnpH5pg5cFGWg2ceIburmfaGQ07YJHNekwxxlTcHZ3BA==",
      "license": "MIT",
      "workspaces": [
        "addons/*"
@@ -37596,7 +37632,7 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "dependencies": {
        "@codemirror/commands": "6.10.4",
        "@codemirror/language": "6.12.4",
@@ -37626,13 +37662,14 @@
        "@tanstack/react-virtual": "^3.13.21",
        "@xterm/addon-clipboard": "^0.3.0-beta.213",
        "@xterm/addon-fit": "^0.12.0-beta.213",
-        "@xterm/addon-image": "^0.10.0-beta.213",
+        "@xterm/addon-image": "0.10.0-beta.331",
        "@xterm/addon-ligatures": "^0.11.0-beta.213",
        "@xterm/addon-search": "^0.17.0-beta.213",
+        "@xterm/addon-unicode-graphemes": "0.5.0-beta.330",
        "@xterm/addon-unicode11": "^0.10.0-beta.213",
        "@xterm/addon-web-links": "^0.13.0-beta.213",
-        "@xterm/addon-webgl": "0.20.0-beta.291",
-        "@xterm/xterm": "6.1.0-beta.292",
+        "@xterm/addon-webgl": "0.20.0-beta.329",
+        "@xterm/xterm": "6.1.0-beta.336",
        "buffer": "^6.0.3",
        "expo": "~57.0.30",
        "expo-asset": "~57.0.20",
@@ -37710,7 +37747,7 @@
        "@vitest/browser": "^4.1.7",
        "@vitest/browser-playwright": "^4.1.7",
        "@xterm/addon-serialize": "0.14.0",
-        "@xterm/headless": "^6.1.0-beta.213",
+        "@xterm/headless": "6.1.0-beta.334",
        "babel-preset-expo": "~57.0.16",
        "dotenv": "^17.2.3",
        "eas-cli": "^16.24.1",
@@ -38489,15 +38526,6 @@
        "@xterm/xterm": "^6.1.0-beta.213"
      }
    },
-    "packages/app/node_modules/@xterm/addon-image": {
-      "version": "0.10.0-beta.213",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.213.tgz",
-      "integrity": "sha512-L3QxLkj8g8TioVea9p1oVze52Jr75rRZPPLm1tgZl0X2EGJGFHnQzE3QRsgmYWI7R5j3kwwi3MRAkOAgvOK8uA==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.213"
-      }
-    },
    "packages/app/node_modules/@xterm/addon-ligatures": {
      "version": "0.11.0-beta.213",
      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.213.tgz",
@@ -38541,34 +38569,6 @@
        "@xterm/xterm": "^6.1.0-beta.213"
      }
    },
-    "packages/app/node_modules/@xterm/addon-webgl": {
-      "version": "0.20.0-beta.291",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.291.tgz",
-      "integrity": "sha512-gH7r5g8f2NWMhBtaeApuwLQTJmX4uq7zT0okjeNWkFAD0nxzbUPB+kt6sogZZ5K90XYPt2OLu/bhuvF6DmKqOQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.292"
-      }
-    },
-    "packages/app/node_modules/@xterm/headless": {
-      "version": "6.1.0-beta.213",
-      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.213.tgz",
-      "integrity": "sha512-D08E4Bl0HRhYZRL2o5PxD4FNQN9qXpI8QSw3CkKrsym5dtTRAqsynVYE8V8echQrxfb+EpR0CB5reM7tEGZ/fA==",
-      "dev": true,
-      "license": "MIT",
-      "workspaces": [
-        "addons/*"
-      ]
-    },
-    "packages/app/node_modules/@xterm/xterm": {
-      "version": "6.1.0-beta.292",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.292.tgz",
-      "integrity": "sha512-17zqK5tM/l6qeD7McF42OrEJ6w3XqJ2vFVKdWqu0cYLzdFqMWAHp2oFNc8Fj5DmqDSl1E1FZEg6IFflDllTvLA==",
-      "license": "MIT",
-      "workspaces": [
-        "addons/*"
-      ]
-    },
    "packages/app/node_modules/babel-plugin-syntax-hermes-parser": {
      "version": "0.36.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-hermes-parser/-/babel-plugin-syntax-hermes-parser-0.36.1.tgz",
@@ -39800,12 +39800,12 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.14.0",
-        "@getpaseo/protocol": "0.14.0",
-        "@getpaseo/server": "0.14.0",
+        "@getpaseo/client": "0.15.0-beta.1",
+        "@getpaseo/protocol": "0.15.0-beta.1",
+        "@getpaseo/server": "0.15.0-beta.1",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -40052,10 +40052,10 @@
    },
    "packages/client": {
      "name": "@getpaseo/client",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "dependencies": {
-        "@getpaseo/protocol": "0.14.0",
-        "@getpaseo/relay": "0.14.0",
+        "@getpaseo/protocol": "0.15.0-beta.1",
+        "@getpaseo/relay": "0.15.0-beta.1",
        "ws": "^8.20.0",
        "zod": "^4.4.3"
      },
@@ -40067,7 +40067,7 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "license": "Apache-2.0",
      "dependencies": {
        "@getpaseo/cli": "*",
@@ -40311,7 +40311,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "license": "MIT",
      "devDependencies": {
        "@types/jest": "^29.5.14",
@@ -40357,7 +40357,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "dependencies": {
        "@codemirror/language": "6.12.4",
        "@codemirror/legacy-modes": "^6.5.3",
@@ -40386,15 +40386,15 @@
    },
    "packages/plugin": {
      "name": "@getpaseo/plugin",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "dependencies": {
        "@agentclientprotocol/sdk": "^1.4.0",
        "i18next": "^26.3.0",
        "use-sync-external-store": "^1.6.0"
      },
      "devDependencies": {
-        "@getpaseo/client": "0.14.0",
-        "@getpaseo/protocol": "0.14.0",
+        "@getpaseo/client": "0.15.0-beta.1",
+        "@getpaseo/protocol": "0.15.0-beta.1",
        "@types/node": "^20.9.0",
        "@types/react": "~19.2.0",
        "react": "19.2.3",
@@ -40404,8 +40404,8 @@
        "zod": "^4.4.3"
      },
      "peerDependencies": {
-        "@getpaseo/client": "0.14.0",
-        "@getpaseo/protocol": "0.14.0",
+        "@getpaseo/client": "0.15.0-beta.1",
+        "@getpaseo/protocol": "0.15.0-beta.1",
        "react": ">=19.1.0 <20",
        "react-native": ">=0.81.5",
        "zod": "^4.4.3"
@@ -40427,7 +40427,7 @@
    },
    "packages/protocol": {
      "name": "@getpaseo/protocol",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "dependencies": {
        "semver": "^7.8.5",
        "zod": "^4.4.3"
@@ -40454,7 +40454,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "dependencies": {
        "@noble/ciphers": "^2.4.0",
        "@noble/curves": "^2.4.0",
@@ -40675,22 +40675,23 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.17.1",
        "@anthropic-ai/claude-agent-sdk": "0.3.246",
        "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.14.0",
-        "@getpaseo/highlight": "0.14.0",
-        "@getpaseo/plugin": "0.14.0",
-        "@getpaseo/protocol": "0.14.0",
-        "@getpaseo/relay": "0.14.0",
+        "@getpaseo/client": "0.15.0-beta.1",
+        "@getpaseo/highlight": "0.15.0-beta.1",
+        "@getpaseo/plugin": "0.15.0-beta.1",
+        "@getpaseo/protocol": "0.15.0-beta.1",
+        "@getpaseo/relay": "0.15.0-beta.1",
        "@isaacs/ttlcache": "^2.1.4",
        "@modelcontextprotocol/sdk": "1.29.0",
        "@opencode-ai/sdk": "1.14.46",
        "@opencode/client": "2.0.10",
        "@xterm/addon-serialize": "0.14.0",
-        "@xterm/headless": "^6.0.0",
+        "@xterm/addon-unicode-graphemes": "0.5.0-beta.330",
+        "@xterm/headless": "6.1.0-beta.334",
        "ai": "5.0.78",
        "ajv": "^8.20.0",
        "bcryptjs": "^3.0.3",
@@ -41630,7 +41631,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.29.1",
        "@cloudflare/workers-types": "^4.20260317.1",
@@ -43240,7 +43241,7 @@
    },
    "plugins": {
      "name": "@getpaseo/builtin-plugins",
-      "version": "0.14.0",
+      "version": "0.15.0-beta.1",
      "dependencies": {
        "@getpaseo/plugin": "*",
        "zod": "^4.4.3"
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.14.0",
+  "version": "0.15.0-beta.1",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -122,11 +122,7 @@
    "release:promote": "npm run release:check && npm run version:all:promote && npm run release:publish && npm run release:push",
    "release:patch": "npm run release:check && npm run version:all:patch && npm run release:publish && npm run release:push",
    "release:minor": "npm run release:check && npm run version:all:minor && npm run release:publish && npm run release:push",
-    "release:major": "npm run release:check && npm run version:all:major && npm run release:publish && npm run release:push",
-    "gpui:install": "node scripts/gpui.mjs install",
-    "gpui:bundle": "node scripts/gpui.mjs bundle",
-    "build:gpui": "node scripts/gpui.mjs build",
-    "dev:gpui": "node scripts/gpui.mjs run"
+    "release:major": "npm run release:check && npm run version:all:major && npm run release:publish && npm run release:push"
  },
  "devDependencies": {
    "@types/ws": "^8.5.14",
@@ -62,7 +62,7 @@ async function readProviderFeaturePreferences(page: Page, provider: string): Pro
      const raw = localStorage.getItem(preferencesKey);
      if (!raw) return null;
      const preferences = JSON.parse(raw) as FormPreferences;
-      return preferences.providerPreferences?.[providerId]?.featureValues ?? null;
+      return preferences.providerPreferences?.[providerId]?.options ?? null;
    },
    { preferencesKey: CREATE_AGENT_PREFERENCES_KEY, providerId: provider },
  );
@@ -145,7 +145,7 @@ test.describe("Agent profiles repair modeless provider preferences", () => {
        provider: featureProviderId,
        model: featureModelId,
        modeId: "bypassPermissions",
-        featureValues: { fast_mode: true },
+        options: { fast_mode: true },
      },
    ]);
    const provider = await seedModelProvider({
@@ -181,7 +181,7 @@ test.describe("Agent profiles repair modeless provider preferences", () => {
      expect(createAgentRequest).toMatchObject({
        config: {
          provider: featureProviderId,
-          featureValues: { fast_mode: true },
+          providerOptions: { fast_mode: true },
        },
      });
    } finally {
@@ -38,6 +38,9 @@ import {
  fillDirectHostUri,
  expectDirectHostFormValues,
  expectDirectHostSslEnabled,
+  expectDirectHostSslDisabled,
+  fillDirectHostAddress,
+  toggleDirectHostSsl,
  expectDirectHostUriValue,
  expectDirectHostUriHidden,
  expectDiagnosticsContent,
@@ -284,6 +287,16 @@ test.describe("Settings sidebar navigation", () => {
    await expectAddHostMethodOptions(page);
    await selectHostConnectionType(page, "direct");

+    await fillDirectHostAddress(page, "example.paseo.test", "7443");
+    await expectDirectHostSslDisabled(page);
+    await toggleDirectHostSsl(page);
+    await expectDirectHostSslEnabled(page);
+    await toggleHostAdvanced(page);
+    await expectDirectHostUriValue(page, "tcp://example.paseo.test:7443?ssl=true");
+    await toggleHostAdvanced(page);
+    await toggleDirectHostSsl(page);
+    await expectDirectHostSslDisabled(page);
+
    await toggleHostAdvanced(page);
    await fillDirectHostUri(page, "tcp://example.paseo.test:7443?ssl=true&password=shared-secret");
    await toggleHostAdvanced(page);
@@ -426,3 +426,81 @@ test("Manual restores pre-beta order and keeps drag order across sorting and rel
    await seed.cleanup();
  }
 });
+
+function workspaceRows(page: Page, ids: string[]) {
+  return page.locator(
+    ids.map((id) => `[data-testid="sidebar-workspace-row-${getServerId()}:${id}"]`).join(", "),
+  );
+}
+
+async function openWorkspaceRow(page: Page, workspaceId: string) {
+  await page.getByTestId(`sidebar-workspace-row-${getServerId()}:${workspaceId}`).click();
+  await expect(page).toHaveURL(new RegExp(`/workspace/${workspaceId}`));
+}
+
+test("collapsed groups lead with the open workspace instead of hiding it behind Show more", async ({
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const { seed, ids } = await seedCompactProject();
+  try {
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+    await selectWorkspaceSort(page, "Created");
+    const { rows, group } = compactProjectRows(page, seed);
+    await expectWorkspaceOrder(rows, ids.slice(0, 7));
+    await revealWorkspaces(group, "Show more");
+    await openWorkspaceRow(page, ids[9]!);
+    await expectWorkspaceOrder(rows, ids);
+    await revealWorkspaces(group, "Show less");
+    await expectWorkspaceOrder(rows, [ids[9]!, ...ids.slice(0, 7)]);
+    await expect(
+      page.getByTestId(`sidebar-workspace-row-${getServerId()}:${ids[9]!}`),
+    ).toHaveAttribute("aria-selected", "true");
+    await reconnectSidebar(page);
+    await expectWorkspaceOrder(rows, [ids[9]!, ...ids.slice(0, 7)]);
+    await expect(
+      page.getByTestId(`sidebar-workspace-row-${getServerId()}:${ids[9]!}`),
+    ).toHaveAttribute("aria-selected", "true");
+    await openWorkspaceRow(page, ids[2]!);
+    await expectWorkspaceOrder(rows, ids.slice(0, 7));
+    await expect(
+      page.getByTestId(`sidebar-workspace-row-${getServerId()}:${ids[2]!}`),
+    ).toHaveAttribute("aria-selected", "true");
+  } finally {
+    await seed.cleanup();
+  }
+});
+
+test("a Manual drag in a collapsed group keeps the open workspace's saved place", async ({
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const { seed, ids } = await seedCompactProject();
+  try {
+    await gotoAppShell(page);
+    await waitForSidebarHydration(page);
+    const projectKey = projectEquivalenceViewKey(seed.projectKey);
+    await restorePreBetaOrder(
+      page,
+      projectKey,
+      ids.map((id) => `${getServerId()}:${id}`),
+    );
+    await selectWorkspaceSort(page, "Manual");
+    const rows = workspaceRows(page, ids);
+    const toggle = page.getByTestId(`sidebar-project-show-more-${projectKey}`);
+    await expectWorkspaceOrder(rows, ids.slice(0, 7));
+    await toggle.click();
+    await openWorkspaceRow(page, ids[9]!);
+    await toggle.click();
+    await expectWorkspaceOrder(rows, [ids[9]!, ...ids.slice(0, 7)]);
+    await quickDragFirstRowAfterSecond(workspaceRows(page, [ids[0]!, ids[1]!]), pressWorkspaceRow);
+    await expectWorkspaceOrder(rows, [ids[9]!, ids[1]!, ids[0]!, ...ids.slice(2, 7)]);
+    await reconnectSidebar(page);
+    await expectWorkspaceOrder(rows, [ids[9]!, ids[1]!, ids[0]!, ...ids.slice(2, 7)]);
+    await toggle.click();
+    await expectWorkspaceOrder(rows, [ids[1]!, ids[0]!, ...ids.slice(2)]);
+  } finally {
+    await seed.cleanup();
+  }
+});
@@ -70,25 +70,31 @@ test("previous and next traverse every visible workspace while digit shortcuts s
        workspaceId: order[8],
      });
    });
-    await test.step("hidden Done rows remain shortcut targets without expanding the project", async () => {
-      await expectHiddenWorkspaceShortcuts(page, order);
+    await test.step("collapsed groups keep shortcut targets selected without expanding", async () => {
+      await expectCollapsedWorkspaceShortcuts(page, order);
    });
  } finally {
    await project.cleanup();
  }
 });

-async function expectHiddenWorkspaceShortcuts(page: Page, order: string[]) {
+async function expectCollapsedWorkspaceShortcuts(page: Page, order: string[]) {
  await page.getByLabel("Show less", { exact: true }).click();
  const rows = page.getByRole("button", { name: /^Workspace \d{2}$/ });
-  await expect(rows).toHaveCount(7);
+  await expect(rows).toHaveCount(8);
+  await expectSidebarWorkspaceSelected({ page, serverId: getServerId(), workspaceId: order[8] });
  await switchWorkspaceViaSidebar({ page, serverId: getServerId(), workspaceId: order[0] });
+  await expect(rows).toHaveCount(7);
  await page.keyboard.press("Alt+9");
  await expect(page).toHaveURL(new RegExp(`/workspace/${order[8]}$`));
+  await expectSidebarWorkspaceSelected({ page, serverId: getServerId(), workspaceId: order[8] });
+  await expect(rows).toHaveCount(8);
+  await page.keyboard.press("Alt+]");
+  await expect(page).toHaveURL(new RegExp(`/workspace/${order[9]}$`));
+  await expectSidebarWorkspaceSelected({ page, serverId: getServerId(), workspaceId: order[9] });
+  await expect(rows).toHaveCount(8);
  await expect(page.getByTestId(`sidebar-workspace-row-${getServerId()}:${order[8]}`)).toHaveCount(
    0,
  );
-  await page.keyboard.press("Alt+]");
-  await expect(page).toHaveURL(new RegExp(`/workspace/${order[9]}$`));
-  await expect(rows).toHaveCount(7);
+  await expect(page.getByLabel("Show more", { exact: true })).toBeVisible();
 }
@@ -1,5 +1,6 @@
 import assert from "node:assert/strict";
 import { writeFileSync } from "node:fs";
+import { UnicodeGraphemesAddon } from "@xterm/addon-unicode-graphemes";
 import xterm from "@xterm/headless";
 import { PNG } from "pngjs";
 import { ACCENT, fixtureLines, fixtureOutput, RULER_CELLS, SELECT_LINE } from "./fixture.mjs";
@@ -82,6 +83,8 @@ async function fixtureTerminal(size) {
    rows: size.rows,
    allowProposedApi: true,
  });
+  // The app's buffer uses grapheme widths; the expected cells must too.
+  terminal.loadAddon(new UnicodeGraphemesAddon());
  await new Promise((done) =>
    terminal.write(fixtureOutput(size.columns).replaceAll("\n", "\r\n"), done),
  );
@@ -351,9 +351,24 @@ export async function expectDirectHostFormValues(
 }

 export async function expectDirectHostSslEnabled(page: Page): Promise<void> {
+  await expect(page.getByRole("checkbox", { name: "Use SSL", exact: true })).toBeChecked();
  await expect(page.getByTestId("direct-ssl-toggle-checked")).toBeVisible();
 }

+export async function fillDirectHostAddress(page: Page, host: string, port: string): Promise<void> {
+  await page.getByRole("textbox", { name: "Host", exact: true }).fill(host);
+  await page.getByRole("textbox", { name: "Port", exact: true }).fill(port);
+}
+
+export async function toggleDirectHostSsl(page: Page): Promise<void> {
+  await page.getByRole("checkbox", { name: "Use SSL", exact: true }).click();
+}
+
+export async function expectDirectHostSslDisabled(page: Page): Promise<void> {
+  await expect(page.getByRole("checkbox", { name: "Use SSL", exact: true })).not.toBeChecked();
+  await expect(page.getByTestId("direct-ssl-toggle-checked")).toHaveCount(0);
+}
+
 export async function expectDirectHostUriValue(page: Page, uri: string): Promise<void> {
  await expect(page.getByTestId("direct-host-uri-input")).toHaveValue(uri);
 }
@@ -1,3 +0,0 @@
-node_modules/
-desktop/build/
-desktop/autolink/
@@ -1,3 +0,0 @@
-workspaces=false
-legacy-peer-deps=true
-install-links=true
@@ -1,202 +0,0 @@
-# Experimental GPUI client
-
-Run Paseo's existing React Native app in a native GPUI window on Linux. This is
-a community starting point: the real workspace UI runs, but terminal/diff
-renderers and several native services still need porting. The normal desktop
-build remains Electron. No daemon changes or release installers are included.
-
-## Run it
-
-Start from the repository's [development setup](../../../docs/development.md).
-A fresh checkout needs the root dependencies and workspace build outputs:
-
-```sh
-npm ci
-npm run build:server
-npm run gpui:install
-EXPO_PUBLIC_LOCAL_DAEMON=localhost:6768 npm run dev:gpui
-```
-
-Use an already-running compatible daemon and replace `localhost:6768` with its
-endpoint. These GPUI commands never start or restart a daemon. The address is
-inlined at bundle time. The app's normal connection/authentication rules apply.
-
-You also need Rust stable through rustup, CMake, Ninja, Clang, Linux X11/Wayland
-development libraries, and Vulkan. The tested Linux x86_64 host already had
-most build tools; it additionally needed `libxkbcommon-x11-dev`. A clean-machine
-prerequisite check is still needed. The first native build downloads dependencies
-and builds Rust/C++; allow several minutes and several GB of disk.
-
-`dev:gpui` bundles the app, autolinks native modules, builds, and opens the window.
-Restart after editing. It uses an offline production JS bundle; Fast Refresh is
-not wired into this launcher. `build:gpui` builds without opening a window.
-`gpui:bundle -- --dev false` only writes the JS bundle, source map, and assets to
-`.artifacts/gpui/`. Bundle validation checks that the real routes are present and
-that no `react-native-webview` modules were included.
-
-## Approach and renderer choice
-
-```text
-Existing Paseo RootApp + Expo Router + state/client/plugin code
-                         |
-                  React in Hermes
-                         |
-               React Native Fabric
-                         |
-              Rust GPUI native renderer
-                         |
-                  Linux GPU window
-
-Existing Paseo client <-- WebSocket --> separately running Node daemon
-```
-
-The separate npm project is deliberate: the selected runtime uses RN 0.87.1,
-while Paseo's mobile app uses RN 0.86.3. Metro redirects native dependencies to
-that installation and resolves the rest from the app. This avoids changing the
-mobile dependency baseline just to try another renderer. It also creates a
-version-maintenance cost that needs testing before this becomes a supported target.
-
-The choice was to preserve the existing app's RN component and library contracts:
-
-| Candidate                                                                                                                           | Integration model                                                                                                | Consequence for this experiment                                                                                                                                                                                                  |
-| ----------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [Streetwriters react-native-gpui](https://github.com/streetwriters/react-native-gpui/tree/de11aa265e6fb36c80e8a30315bce6d34a9be7d6) | React Native Fabric, Hermes, and GPUI, with ports of screens, gestures, Reanimated/worklets, safe areas, and SVG | Chosen because it lets the existing RN app reach a real Linux window with targeted adapters. These ports are still experimental.                                                                                                 |
-| [natew/react-native-gpui](https://github.com/natew/react-native-gpui/tree/b2254543357f02fdd983d0d8a584d1d1bd93f5da)                 | Custom React reconciler with an RN-like component surface; its README targets macOS arm64/Metal                  | Useful implementation reference. Running this Linux app would also require platform work and compatibility with the RN libraries it imports.                                                                                     |
-| [GPUIX](https://github.com/remorses/gpuix)                                                                                          | Custom React/Solid renderer, its own JSX primitives, and Node-API native bindings; supports Bun/Node execution   | Also native GPUI, with interesting packaging and specialized surfaces. Adopting it would require replacing or adapting Paseo's RN component/library contracts. It remains an alternative worth testing, not a rejected renderer. |
-| Existing Electron target                                                                                                            | RN Web inside Chromium, with the desktop host bridge                                                             | Preserves the working desktop feature set, but does not answer the experiment's question of running the app through a native renderer.                                                                                           |
-
-This is an integration choice, not a performance comparison. There are no
-controlled CPU, memory, startup, or frame-time results against these alternatives.
-
-## What belongs in the change
-
-| Area                                                                   | Why it is here                                                                                                                                                                                                              |
-| ---------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `vendor/react-native-gpui/`                                            | Editable, pinned runtime source. This accounts for roughly 130,000 lines of the diff. GitHub marks it as vendored; inspect [UPSTREAM](../../../vendor/react-native-gpui/UPSTREAM) for provenance and the two local patches. |
-| npm and Cargo lockfiles                                                | Reproduce the experiment's dependencies. Roughly 15,000 generated lines, collapsed on GitHub.                                                                                                                               |
-| `desktop/`, `index.js`, `routes.js`, Metro/Babel config, root launcher | Register the full app, select the native runtime, compile native services, and bundle the actual route graph. The explicit route context prevents an apparently successful build with no app routes.                        |
-| `adapters/`                                                            | Desktop implementations of the app-used APIs, plus explicit unavailable-capability implementations for mobile features. About 700 lines; these are limited ports, not complete replacements for Expo/Unistyles.             |
-| Shared app edits                                                       | One capability gate for alpha-mask shimmer. GPUI shows the logo and labels without that effect. Existing web/iOS/Android paths keep their behavior.                                                                         |
-| Native tests and this guide                                            | Make the working slice reproducible and give contributors bounded follow-up work.                                                                                                                                           |
-
-Upstream examples, its tester/testing package, website, unused fonts/vector-icon
-ports, starter navigation dependencies, sample icon, and unused nested Cargo config
-are omitted. Build outputs, native binaries, downloaded SDKs, logs, screenshots,
-and the exploratory size-measurement copy stay out of Git.
-
-The retained runtime still includes its build machinery, platform backends,
-headers, and tests. Arbitrarily deleting those to reduce line count makes an
-upstream refresh harder. Vendoring can later be replaced by a pinned dependency
-once the local patches are upstreamed and distribution is reproducible.
-
-### Editing the runtime
-
-Edit `vendor/react-native-gpui`, then run `npm run gpui:install` before rebuilding.
-npm copies local packages rather than symlinking them; the install command
-refreshes those copies even when their versions have not changed.
-
-There are two local renderer changes:
-
- `node_view.rs`: a `pointerEvents="box-none"` view must not install its own hit
-  area. Before the patch, Paseo's empty portal overlay intercepted sidebar clicks.
- `StatusBar.desktop.js`: desktop windows do not have the mobile OS status bar.
-
-GPUI remains a pinned Cargo git dependency. Upstream tooling downloads Hermes
-and React Native prebuilt libraries. The snapshot is not an offline or fully
-source-built distribution, and release packaging has not been verified.
-
-## Working slice and limits
-
-Verified on Linux x86_64: all 24 app routes in the bundle, connection to the dev
-daemon, the real project/workspace sidebar, opening an existing workspace,
-existing message rendering, and native composer typing/deletion. The native
-regression test restores the draft and does not send a message. Rust tests cover
-SHA-256/random-byte bounds and real SQLite parameter binding/transaction rollback.
-
-The following are not feature-parity claims:
-
-| Area                               | Current state                                                                                                                                                 |
-| ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Styling                            | Adapter evaluates existing Unistyles theme/style factories and breakpoints. No Nitro shadow-tree integration. Full theme/resize behavior needs QA.            |
-| Storage/crypto/localization        | Native filesystem + SQLite + SHA-256 + OS randomness. Intl ships English locale data and IANA time zones. The Rust service contains Linux-specific OS access. |
-| Clipboard/files                    | Text clipboard, native file dialogs, PNG/JPEG picking, and download/export adapters exist. End-to-end dialog/transfer coverage is still missing.              |
-| Voice/camera/push/power inhibition | Unavailable. Requests either report the missing capability or use the app's existing unavailable-capability implementation.                                   |
-| Image conversion/image clipboard   | Unavailable. The picker accepts PNG/JPEG without conversion.                                                                                                  |
-| Mermaid/HTML/document previews     | Mermaid and HTML show source. Document previews report unavailable. No embedded browser backend.                                                              |
-| Terminals                          | The mobile view expects an Expo `PaseoTerminal` component. No GPUI implementation yet.                                                                        |
-| Diffs                              | The mobile surface uses React Native Skia. No GPUI drawing backend yet.                                                                                       |
-| Plugins                            | The existing loader evaluates JS and injects host React/RN. No end-to-end plugin verification on GPUI yet.                                                    |
-| Other platforms                    | The upstream runtime targets macOS/Windows too; this Paseo integration has only been exercised on Linux.                                                      |
-
-The initial stripped development executable was about 68 MiB, with about 10 MiB
-of Hermes/JSI libraries and a 21 MiB JS bundle, approximately 100 MiB uncompressed.
-That measurement excludes the daemon, is not an optimized release installer, and
-does not establish memory usage or a size advantage over another renderer.
-
-## Experiments to pick up
-
-Each experiment should preserve the real app and demonstrate a user workflow.
-
-1. **Native terminal.** Implement a GPUI component for the existing
-   [`PaseoTerminalView`](../modules/paseo-terminal/index.tsx) frame contract.
-   Keep the JS headless xterm emulator, transport, and frame generation initially.
-   Verify resize/replay, keyboard/IME/paste, scrollback/selection, and the existing
-   Unicode corpus. [Terminal rendering](../../../docs/terminal-rendering.md)
-   explains why shaping must preserve xterm's cell columns.
-2. **Diff surface.** Keep `src/git/diff-document`'s model and review actions;
-   add GPUI text measurement and painting instead of the Skia surface. Test
-   unified/split views, wrapping, scrolling, selection, and inline reviews on
-   large real diffs. The [C++ layout experiment](../modules/paseo-diff-prototype/README.md)
-   is a separate candidate for shared geometry; it is not a finished renderer.
-3. **Plugins.** Load a small plugin into an isolated daemon, open its real screen
-   or workspace panel, call a plugin RPC, and reload it. Verify subscriptions and
-   cleanup. Track unsupported services explicitly instead of adding fake APIs.
-4. **Native services and styling.** Exercise dialogs, downloads, clipboard,
-   persistence/restart, theme switching, resizing, and focus. Replace the narrow
-   adapters with complete implementations only where the app needs them.
-5. **Portability and packaging.** Build on clean Linux, then macOS/Windows. Replace
-   Linux-only randomness/timezone access, check font/shaping and IME behavior, and
-   verify relocatable libraries/assets. Measure a release build and a controlled
-   workflow before claiming a performance or size improvement.
-6. **Bundled daemon, independently.** First run the unchanged daemon under Bun
-   in isolation. Verify PTY/native dependencies, terminal-worker subprocesses,
-   provider launches, and dynamic plugins. Then compare standalone/AOT packaging
-   and size. This branch neither ports the daemon nor embeds it in the UI process.
-
-A Rust/GPUI terminal or diff painter can share desktop implementation across the
-upstream renderer's supported OSes. Reusing it on mobile still requires mobile
-bindings and graphics integration; choosing Rust or C++ alone does not provide that.
-
-## Verification
-
-Run the normal checks from the root. GPUI adapters are excluded from the mobile
-TypeScript project; its typecheck alone does not validate this target.
-
-```sh
-npm run typecheck
-npm run lint
-npm run format:check
-```
-
-For the native UI regression, use a daemon with an existing workspace and build
-with the driver. Run the native app on an isolated display when testing on a
-machine in use:
-
-```sh
-EXPO_PUBLIC_LOCAL_DAEMON=localhost:6768 npm run build:gpui -- --features test-driver,visual-capture
-RN_GPUI_TEST_DRIVER=1 RN_GPUI_TEST_DRIVER_TOKEN=local-test \
-RN_GPUI_DEV_MODE=0 RN_GPUI_BUNDLE="$PWD/.artifacts/gpui/paseo.bundle" \
-RN_GPUI_ASSETS_DIR="$PWD/.artifacts/gpui/assets/assets" \
-xvfb-run -a -s '-screen 0 2560x1600x24' \
-packages/app/gpui/desktop/target/debug/react-native-gpui-paseo-gpui
-```
-
-Use the printed `RN_GPUI_TEST_DRIVER_PORT` in another shell:
-
-```sh
-PASEO_GPUI_TEST_URL=ws://127.0.0.1:PORT PASEO_GPUI_TEST_TOKEN=local-test \
-npx vitest run packages/app/gpui/native.test.ts --bail=1
-```
-
-Without a driver URL the test is skipped. Put diagnostic logs/captures in
-`.artifacts/gpui/`; do not commit them or publish private workspace contents as QA.
@@ -1,73 +0,0 @@
-import { promises as fs, paths } from "@react-native-gpui/fs";
-import Desktop from "../desktop/src/NativePaseoDesktop";
-
-let writes = Promise.resolve();
-const directory = () => `${paths.appData}/paseo-gpui/storage`;
-const filename = (key) => `${directory()}/${Desktop.sha256(key)}.json`;
-async function read(key) {
-  try {
-    return JSON.parse(await fs.readFile(filename(key), "utf8")).value;
-  } catch (error) {
-    if (error.code === "ENOENT") return null;
-    throw error;
-  }
-}
-function mutate(operation) {
-  const result = writes.then(operation);
-  writes = result.catch(() => {});
-  return result;
-}
-async function write(key, value) {
-  await fs.mkdir(directory(), { recursive: true });
-  const target = filename(key);
-  await fs.writeFile(`${target}.tmp`, JSON.stringify({ key, value }), "utf8");
-  await fs.rename(`${target}.tmp`, target);
-}
-async function keys() {
-  let entries;
-  try {
-    entries = await fs.readdir(directory());
-  } catch (error) {
-    if (error.code === "ENOENT") return [];
-    throw error;
-  }
-  return Promise.all(
-    entries
-      .filter((name) => name.endsWith(".json"))
-      .map(async (name) => JSON.parse(await fs.readFile(`${directory()}/${name}`, "utf8")).key),
-  );
-}
-const storage = {
-  async getItem(key) {
-    await writes;
-    return read(key);
-  },
-  setItem(key, value) {
-    return mutate(() => write(key, value));
-  },
-  removeItem(key) {
-    return mutate(() => fs.rm(filename(key), { force: true }));
-  },
-  async getAllKeys() {
-    await writes;
-    return keys();
-  },
-  async multiGet(items) {
-    await writes;
-    return Promise.all(items.map(async (key) => [key, await read(key)]));
-  },
-  multiSet(items) {
-    return mutate(async () => {
-      for (const [key, value] of items) await write(key, value);
-    });
-  },
-  multiRemove(items) {
-    return mutate(async () => {
-      for (const key of items) await fs.rm(filename(key), { force: true });
-    });
-  },
-  clear() {
-    return mutate(() => fs.rm(directory(), { recursive: true, force: true }));
-  },
-};
-export default storage;
@@ -1,21 +0,0 @@
-// Preserve the voice model's lifecycle without loading mobile-only Expo audio
-// during app startup. Requests fail explicitly until a Linux audio backend exists.
-export function createAudioEngine() {
-  const unavailable = async () => {
-    throw new Error("Voice capture and playback are not available in the GPUI build yet.");
-  };
-  return {
-    initialize: unavailable,
-    startCapture: unavailable,
-    play: unavailable,
-    async destroy() {},
-    async stopCapture() {},
-    stop() {},
-    clearQueue() {},
-    isPlaying: () => false,
-    isMuted: () => false,
-    toggleMute() {
-      throw new Error("Voice capture is not available in the GPUI build yet.");
-    },
-  };
-}
@@ -1,16 +0,0 @@
-import { TurboModuleRegistry } from "react-native";
-const clipboard = TurboModuleRegistry.getEnforcing("Clipboard");
-export const getStringAsync = () => clipboard.getString();
-export async function setStringAsync(value) {
-  clipboard.setString(value);
-  return true;
-}
-export async function hasStringAsync() {
-  return (await getStringAsync()).length > 0;
-}
-export async function getImageAsync() {
-  throw new Error("Image clipboard is not implemented for GPUI yet");
-}
-export async function setImageAsync() {
-  throw new Error("Image clipboard is not implemented for GPUI yet");
-}
@@ -1,24 +0,0 @@
-import Desktop from "../desktop/src/NativePaseoDesktop";
-export function getRandomValues(array) {
-  if (
-    !ArrayBuffer.isView(array) ||
-    array instanceof DataView ||
-    array instanceof Float32Array ||
-    array instanceof Float64Array
-  ) {
-    throw new TypeError("getRandomValues requires an integer typed array");
-  }
-  if (array.byteLength > 65536) throw new RangeError("Random request exceeds 65536 bytes");
-  new Uint8Array(array.buffer, array.byteOffset, array.byteLength).set(
-    Desktop.randomBytes(array.byteLength),
-  );
-  return array;
-}
-export function randomUUID() {
-  return globalThis.crypto.randomUUID();
-}
-export const CryptoDigestAlgorithm = { SHA256: "SHA-256" };
-export async function digestStringAsync(algorithm, text) {
-  if (algorithm !== "SHA-256") throw new Error(`Unsupported digest algorithm: ${algorithm}`);
-  return Desktop.sha256(text);
-}
@@ -1,14 +0,0 @@
-import { dialog, promises } from "@react-native-gpui/fs";
-export async function getDocumentAsync(options = {}) {
-  const paths = await dialog.open({ multiple: options.multiple ?? false });
-  return {
-    canceled: paths.length === 0,
-    assets: await Promise.all(
-      paths.map(async (path) => ({
-        uri: `file://${path}`,
-        name: path.split("/").at(-1),
-        size: (await promises.stat(path)).size,
-      })),
-    ),
-  };
-}
@@ -1,19 +0,0 @@
-import React from "react";
-import { ScrollView, Text, View } from "react-native";
-import { HighlightedCodeBlock } from "../../src/components/highlighted-code-block";
-
-export function FileHtmlPreview({ html, testID }) {
-  return (
-    <ScrollView testID={testID}>
-      <Text>HTML rendering is not available in GPUI. Showing source.</Text>
-      <HighlightedCodeBlock code={html} language="html" />
-    </ScrollView>
-  );
-}
-export function DocumentFrame({ testID }) {
-  return (
-    <View testID={testID}>
-      <Text>Document preview is not available in the GPUI build yet.</Text>
-    </View>
-  );
-}
@@ -1,11 +0,0 @@
-import {
-  EventEmitter,
-  NativeModule,
-  SharedObject,
-  SharedRef,
-} from "expo-modules-core/src/polyfill/CoreModule";
-export function ensureNativeModulesAreInstalled() {
-  if (globalThis.expo) return;
-  globalThis.expo = { EventEmitter, NativeModule, SharedObject, SharedRef, modules: {} };
-}
-ensureNativeModulesAreInstalled();
@@ -1,30 +0,0 @@
-import { Linking } from "react-native";
-import { NativeModule } from "expo-modules-core/src/polyfill/CoreModule";
-
-class DesktopLinking extends NativeModule {
-  initialURL = null;
-  subscription;
-  constructor() {
-    super();
-    Linking.getInitialURL()
-      .then((url) => {
-        this.initialURL = url;
-        if (url) this.emit("onURLReceived", { url });
-        return url;
-      })
-      .catch((error) => console.error("[GPUI linking]", error));
-  }
-  getLinkingURL = () => this.initialURL;
-  clearInitialURL() {
-    this.initialURL = null;
-  }
-  startObserving() {
-    this.subscription = Linking.addEventListener("url", (event) =>
-      this.emit("onURLReceived", event),
-    );
-  }
-  stopObserving() {
-    this.subscription?.remove();
-  }
-}
-export default new DesktopLinking();
@@ -1,129 +0,0 @@
-import fs, { promises, paths } from "@react-native-gpui/fs";
-import { Buffer } from "buffer";
-const pathOf = (value) => String(value?.uri ?? value).replace(/^file:\/\//, "");
-const join = (parts) =>
-  parts
-    .map(pathOf)
-    .join("/")
-    .replace(/\/{2,}/g, "/");
-export const cacheDirectory = `file://${paths.appCache}/paseo-gpui/`;
-export const documentDirectory = `file://${paths.appData}/paseo-gpui/`;
-export const EncodingType = { Base64: "base64", UTF8: "utf8" };
-export const Paths = { cache: cacheDirectory, document: documentDirectory };
-export async function getInfoAsync(uri) {
-  try {
-    const stat = await promises.stat(pathOf(uri));
-    return { exists: true, isDirectory: stat.isDirectory(), size: stat.size, uri };
-  } catch (error) {
-    if (error.code === "ENOENT") return { exists: false, uri };
-    throw error;
-  }
-}
-export const makeDirectoryAsync = (uri, options = {}) =>
-  promises.mkdir(pathOf(uri), { recursive: options.intermediates });
-export const copyAsync = ({ from, to }) => promises.copyFile(pathOf(from), pathOf(to));
-export const moveAsync = ({ from, to }) => promises.rename(pathOf(from), pathOf(to));
-export const readAsStringAsync = (uri, options = {}) =>
-  promises.readFile(pathOf(uri), options.encoding ?? "utf8");
-export const writeAsStringAsync = (uri, contents, options = {}) =>
-  promises.writeFile(pathOf(uri), contents, options.encoding ?? "utf8");
-export const deleteAsync = (uri, options = {}) =>
-  promises.rm(pathOf(uri), { recursive: true, force: options.idempotent });
-export const readDirectoryAsync = (uri) => promises.readdir(pathOf(uri));
-export class File {
-  constructor(...parts) {
-    this.uri = `file://${join(parts)}`;
-  }
-  get name() {
-    return pathOf(this).split("/").at(-1);
-  }
-  get exists() {
-    return fs.existsSync(pathOf(this));
-  }
-  get size() {
-    return fs.statSync(pathOf(this)).size;
-  }
-  create({ overwrite = false, intermediates = false } = {}) {
-    if (intermediates)
-      fs.mkdirSync(pathOf(this).split("/").slice(0, -1).join("/"), { recursive: true });
-    fs.writeFileSync(pathOf(this), "", { flag: overwrite ? "w" : "wx" });
-  }
-  write(value) {
-    fs.writeFileSync(pathOf(this), value);
-  }
-  delete() {
-    fs.rmSync(pathOf(this));
-  }
-  async bytes() {
-    return promises.readFile(pathOf(this));
-  }
-  async arrayBuffer() {
-    const bytes = await this.bytes();
-    return bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
-  }
-  async base64() {
-    return Buffer.from(await this.bytes()).toString("base64");
-  }
-  async text() {
-    return promises.readFile(pathOf(this), "utf8");
-  }
-  move(destination) {
-    fs.renameSync(pathOf(this), pathOf(destination));
-    this.uri = destination.uri;
-  }
-  copy(destination) {
-    fs.copyFileSync(pathOf(this), pathOf(destination));
-  }
-  static async downloadFileAsync(url, destination) {
-    const response = await fetch(url);
-    if (!response.ok) throw new Error(`Download failed: ${response.status}`);
-    const file = destination instanceof File ? destination : new File(destination);
-    await promises.writeFile(pathOf(file), new Uint8Array(await response.arrayBuffer()));
-    return file;
-  }
-}
-export class Directory {
-  constructor(...parts) {
-    this.uri = `file://${join(parts)}`;
-  }
-  get exists() {
-    return fs.existsSync(pathOf(this));
-  }
-  create({ intermediates = false } = {}) {
-    fs.mkdirSync(pathOf(this), { recursive: intermediates });
-  }
-  delete() {
-    fs.rmSync(pathOf(this), { recursive: true });
-  }
-  list() {
-    return fs
-      .readdirSync(pathOf(this), { withFileTypes: true })
-      .map((entry) =>
-        entry.isDirectory() ? new Directory(this, entry.name) : new File(this, entry.name),
-      );
-  }
-}
-
-export function createDownloadResumable(url, uri, options = {}, onProgress) {
-  const controller = new AbortController();
-  return {
-    async downloadAsync() {
-      const response = await fetch(url, { headers: options.headers, signal: controller.signal });
-      if (!response.ok) throw new Error(`Download failed: ${response.status}`);
-      const bytes = new Uint8Array(await response.arrayBuffer());
-      const target = pathOf(uri);
-      await promises.mkdir(target.split("/").slice(0, -1).join("/"), { recursive: true });
-      await promises.writeFile(`${target}.part`, bytes);
-      await promises.rename(`${target}.part`, target);
-      onProgress?.({ totalBytesWritten: bytes.length, totalBytesExpectedToWrite: bytes.length });
-      return {
-        uri,
-        status: response.status,
-        headers: Object.fromEntries(response.headers.entries()),
-      };
-    },
-    async cancelAsync() {
-      controller.abort();
-    },
-  };
-}
@@ -1,8 +0,0 @@
-// The GPUI picker accepts JPEG/PNG directly. Other formats require a future
-// native decoder; never claim conversion succeeded for an unsupported format.
-export const SaveFormat = { PNG: "png", JPEG: "jpeg", WEBP: "webp" };
-export const ImageManipulator = {
-  manipulate() {
-    throw new Error("Image conversion is not available in the GPUI build; select a PNG or JPEG.");
-  },
-};
@@ -1,28 +0,0 @@
-import { dialog, promises } from "@react-native-gpui/fs";
-// Desktop access is granted for each selection by the system file dialog.
-export const PermissionStatus = {
-  GRANTED: "granted",
-  DENIED: "denied",
-  UNDETERMINED: "undetermined",
-};
-const permission = { status: "granted", granted: true, canAskAgain: true, expires: "never" };
-export const requestMediaLibraryPermissionsAsync = async () => permission;
-export const useMediaLibraryPermissions = () => [permission, requestMediaLibraryPermissionsAsync];
-export const getPendingResultAsync = async () => null;
-export async function launchImageLibraryAsync(options = {}) {
-  const paths = await dialog.open({
-    multiple: options.allowsMultipleSelection,
-    filters: [{ name: "Images", extensions: ["png", "jpg", "jpeg"] }],
-  });
-  return {
-    canceled: !paths.length,
-    assets: await Promise.all(
-      paths.map(async (path) => ({
-        uri: `file://${path}`,
-        fileName: path.split("/").at(-1),
-        fileSize: (await promises.stat(path)).size,
-        mimeType: /\.png$/i.test(path) ? "image/png" : "image/jpeg",
-      })),
-    ),
-  };
-}
@@ -1,16 +0,0 @@
-/* oxlint-disable import/no-unassigned-import -- These packages install Intl and locale data by side effect. */
-// Hermes' Linux build omits Intl; install real locale algorithms before app code.
-import "@formatjs/intl-getcanonicallocales/polyfill-force.js";
-import "@formatjs/intl-locale/polyfill-force.js";
-import "@formatjs/intl-pluralrules/polyfill-force.js";
-import "@formatjs/intl-pluralrules/locale-data/en.js";
-import "@formatjs/intl-numberformat/polyfill-force.js";
-import "@formatjs/intl-numberformat/locale-data/en.js";
-import "@formatjs/intl-datetimeformat/polyfill-force.js";
-import "@formatjs/intl-datetimeformat/locale-data/en.js";
-import "@formatjs/intl-datetimeformat/add-all-tz.js";
-import "@formatjs/intl-displaynames/polyfill-force.js";
-import "@formatjs/intl-displaynames/locale-data/en.js";
-import "@formatjs/intl-segmenter/polyfill-force.js";
-import Desktop from "../desktop/src/NativePaseoDesktop";
-Intl.DateTimeFormat.__setDefaultTimeZone(Desktop.timezone());
@@ -1,6 +0,0 @@
-// No desktop power-inhibition lease is acquired by this backend yet.
-export const isAvailableAsync = async () => false;
-export async function activateKeepAwakeAsync() {
-  throw new Error("Power inhibition is not available in the GPUI build.");
-}
-export async function deactivateKeepAwake() {}
@@ -1,60 +0,0 @@
-import { useEffect } from "react";
-import { Keyboard, ScrollView, useAnimatedValue } from "react-native";
-import { useSharedValue } from "react-native-reanimated";
-
-// A GPUI desktop window has no software-keyboard inset. RN still owns focus
-// and physical keyboard events; the mobile layout API observes its events.
-export function KeyboardProvider({ children }) {
-  return children;
-}
-export const KeyboardAwareScrollView = ScrollView;
-export const KeyboardController = {
-  isVisible: () => Keyboard.isVisible(),
-  dismiss: () => Keyboard.dismiss(),
-};
-export const KeyboardEvents = { addListener: (...args) => Keyboard.addListener(...args) };
-export function useReanimatedKeyboardAnimation() {
-  const height = useSharedValue(0);
-  const progress = useSharedValue(0);
-  useEffect(() => {
-    const shown = Keyboard.addListener("keyboardDidShow", (event) => {
-      height.value = -event.endCoordinates.height;
-      progress.value = 1;
-    });
-    const hidden = Keyboard.addListener("keyboardDidHide", () => {
-      height.value = 0;
-      progress.value = 0;
-    });
-    return () => {
-      shown.remove();
-      hidden.remove();
-    };
-  }, [height, progress]);
-  return { height, progress };
-}
-export function useKeyboardAnimation() {
-  const height = useAnimatedValue(0);
-  const progress = useAnimatedValue(0);
-  return { height, progress };
-}
-export function useGenericKeyboardHandler(handlers) {
-  useEffect(() => {
-    const subscriptions = [
-      Keyboard.addListener("keyboardDidShow", (event) => {
-        const value = {
-          height: event.endCoordinates.height,
-          progress: 1,
-          duration: event.duration,
-        };
-        handlers.onStart?.(value);
-        handlers.onEnd?.(value);
-      }),
-      Keyboard.addListener("keyboardDidHide", () => {
-        const value = { height: 0, progress: 0, duration: 0 };
-        handlers.onStart?.(value);
-        handlers.onEnd?.(value);
-      }),
-    ];
-    return () => subscriptions.forEach((subscription) => subscription.remove());
-  }, [handlers]);
-}
@@ -1,5 +0,0 @@
-import Desktop from "../desktop/src/NativePaseoDesktop";
-export function getLocales() {
-  const languageTag = Desktop.locale().split(".")[0].replaceAll("_", "-");
-  return [{ languageTag, languageCode: languageTag.split("-")[0] }];
-}
@@ -1,13 +0,0 @@
-import React from "react";
-import { Text, View } from "react-native";
-import { HighlightedCodeBlock } from "../../src/components/highlighted-code-block";
-export function MermaidFenceHost(props) {
-  return (
-    <View>
-      <Text style={props.inheritedStyles}>
-        Diagram rendering is not available in the GPUI build yet.
-      </Text>
-      <HighlightedCodeBlock {...props} language="mermaid" />
-    </View>
-  );
-}
@@ -1,5 +0,0 @@
-import { Buffer } from "buffer";
-import Desktop from "../desktop/src/NativePaseoDesktop";
-export function randomBytes(length) {
-  return Buffer.from(Desktop.randomBytes(length));
-}
@@ -1,3 +0,0 @@
-// GPUI's native TextInput owns text paste, selection, and IME. The mobile
-// PasteInput module's image-paste extension is not available on this target.
-export { TextInput as default } from "react-native";
@@ -1,11 +0,0 @@
-import { dialog, promises } from "@react-native-gpui/fs";
-// Linux exports a downloaded file through the native Save dialog.
-export const isAvailableAsync = async () => true;
-export async function shareAsync(uri, options = {}) {
-  const source = uri.replace(/^file:\/\//, "");
-  const destination = await dialog.save({
-    title: options.dialogTitle ?? "Save file",
-    defaultName: source.split("/").at(-1),
-  });
-  if (destination) await promises.copyFile(source, destination);
-}
@@ -1,37 +0,0 @@
-import Desktop from "../desktop/src/NativePaseoDesktop";
-let pending = Promise.resolve();
-function enqueue(operation) {
-  const result = pending.then(operation);
-  pending = result.catch(() => {});
-  return result;
-}
-const connection = {
-  async execAsync(sql) {
-    Desktop.sqlite(sql, "batch");
-  },
-  async runAsync(sql, params = []) {
-    Desktop.sqlite(sql, JSON.stringify(params));
-  },
-  async getAllAsync(sql, params = []) {
-    return JSON.parse(Desktop.sqlite(sql, JSON.stringify(params)));
-  },
-};
-export async function openDatabaseAsync(name) {
-  if (name !== "paseo-replica-row-store.db") throw new Error(`Unknown GPUI database: ${name}`);
-  return {
-    execAsync: (...args) => enqueue(() => connection.execAsync(...args)),
-    runAsync: (...args) => enqueue(() => connection.runAsync(...args)),
-    getAllAsync: (...args) => enqueue(() => connection.getAllAsync(...args)),
-    withExclusiveTransactionAsync: (operation) =>
-      enqueue(async () => {
-        await connection.execAsync("BEGIN IMMEDIATE");
-        try {
-          await operation(connection);
-          await connection.execAsync("COMMIT");
-        } catch (error) {
-          await connection.execAsync("ROLLBACK");
-          throw error;
-        }
-      }),
-  };
-}
@@ -1,26 +0,0 @@
-import * as RN from "react-native";
-import { createUnistylesElement } from "./unistyles";
-export const View = createUnistylesElement(RN.View);
-export const Text = createUnistylesElement(RN.Text);
-export const ScrollView = createUnistylesElement(RN.ScrollView);
-export const TextInput = createUnistylesElement(RN.TextInput);
-export const Pressable = createUnistylesElement(RN.Pressable);
-export const Image = createUnistylesElement(RN.Image);
-export const ImageBackground = createUnistylesElement(RN.ImageBackground);
-export const FlatList = createUnistylesElement(RN.FlatList);
-export const SectionList = createUnistylesElement(RN.SectionList);
-export const TouchableOpacity = createUnistylesElement(RN.TouchableOpacity);
-export const TouchableHighlight = createUnistylesElement(RN.TouchableHighlight);
-export const TouchableWithoutFeedback = createUnistylesElement(RN.TouchableWithoutFeedback);
-export const ActivityIndicator = createUnistylesElement(RN.ActivityIndicator);
-export const KeyboardAvoidingView = createUnistylesElement(RN.KeyboardAvoidingView);
-export const SafeAreaView = createUnistylesElement(RN.SafeAreaView);
-export const Switch = createUnistylesElement(RN.Switch);
-export const StatusBar = RN.StatusBar;
-export const Animated = {
-  ...RN.Animated,
-  View: createUnistylesElement(RN.Animated.View),
-  Text: createUnistylesElement(RN.Animated.Text),
-  ScrollView: createUnistylesElement(RN.Animated.ScrollView),
-  Image: createUnistylesElement(RN.Animated.Image),
-};
@@ -1,140 +0,0 @@
-import React, { forwardRef, useSyncExternalStore } from "react";
-import * as Native from "react-native";
-
-// GPUI has Fabric but no Nitro/Unistyles shadow-tree bindings. Keep the app's
-// style factories and theme API; this backend updates subscribed React views.
-const listeners = new Set();
-const resolveStyle = Symbol("paseo.gpui.style");
-let revision = 0;
-let themes = {};
-let themeName = "dark";
-let adaptive = true;
-let breakpoints = {};
-const emit = () => {
-  revision += 1;
-  for (const listener of listeners) listener();
-};
-const subscribe = (listener) => {
-  listeners.add(listener);
-  return () => listeners.delete(listener);
-};
-const snapshot = () => revision;
-const theme = () => themes[themeName];
-const runtime = () => ({
-  themeName,
-  colorScheme: Native.Appearance.getColorScheme() ?? "light",
-  screen: Native.Dimensions.get("window"),
-  insets: { top: 0, bottom: 0, left: 0, right: 0, ime: 0 },
-  pixelRatio: Native.PixelRatio.get(),
-  fontScale: Native.PixelRatio.getFontScale(),
-  breakpoint: Object.keys(breakpoints).findLast(
-    (key) => breakpoints[key] <= Native.Dimensions.get("window").width,
-  ),
-});
-Native.Dimensions.addEventListener("change", emit);
-Native.Appearance.addChangeListener(({ colorScheme }) => {
-  if (adaptive && themes[colorScheme]) themeName = colorScheme;
-  emit();
-});
-function responsive(value) {
-  if (Array.isArray(value)) return value.map(responsive);
-  if (!value || typeof value !== "object") return value;
-  if (Object.getPrototypeOf(value) !== Object.prototype) return value;
-  const keys = Object.keys(value);
-  if (keys.length && keys.every((key) => key in breakpoints)) {
-    const width = Native.Dimensions.get("window").width;
-    const key = keys
-      .sort((a, b) => breakpoints[a] - breakpoints[b])
-      .findLast((candidate) => breakpoints[candidate] <= width);
-    return key === undefined ? undefined : responsive(value[key]);
-  }
-  return Object.fromEntries(Object.entries(value).map(([key, item]) => [key, responsive(item)]));
-}
-function materialize(style) {
-  if (Array.isArray(style)) return style.map(materialize);
-  if (style && typeof style === "object" && style[resolveStyle]) return style[resolveStyle]();
-  return style;
-}
-function styledProps(props) {
-  const result = { ...props };
-  for (const key of ["style", "contentContainerStyle"]) {
-    if (typeof props[key] === "function")
-      result[key] = (...args) => materialize(props[key](...args));
-    else if (props[key]) result[key] = materialize(props[key]);
-  }
-  return result;
-}
-export const UnistylesRuntime = {
-  get themeName() {
-    return themeName;
-  },
-  get breakpoint() {
-    return runtime().breakpoint;
-  },
-  get colorScheme() {
-    return runtime().colorScheme;
-  },
-  getTheme: theme,
-  setTheme(name) {
-    if (!themes[name]) throw new Error(`Unknown GPUI theme: ${name}`);
-    themeName = name;
-    emit();
-  },
-  updateTheme(name, update) {
-    themes[name] = update(themes[name]);
-    emit();
-  },
-  setAdaptiveThemes(value) {
-    adaptive = value;
-    if (value && themes[runtime().colorScheme]) themeName = runtime().colorScheme;
-    emit();
-  },
-};
-export const StyleSheet = {
-  ...Native.StyleSheet,
-  configure(config) {
-    themes = config.themes;
-    breakpoints = config.breakpoints;
-    adaptive = config.settings?.adaptiveThemes ?? false;
-    themeName =
-      config.settings?.initialTheme ?? (adaptive ? runtime().colorScheme : Object.keys(themes)[0]);
-    emit();
-  },
-  create(factory) {
-    const evaluate = () => (typeof factory === "function" ? factory(theme(), runtime()) : factory);
-    const initial = evaluate();
-    const sheet = {};
-    for (const key of Object.keys(initial)) {
-      const wrap = (args) => {
-        const resolve = () => {
-          const value = evaluate()[key];
-          return responsive(typeof value === "function" ? value(...args) : value);
-        };
-        return Object.defineProperty({ ...resolve() }, resolveStyle, { value: resolve });
-      };
-      sheet[key] = typeof initial[key] === "function" ? (...args) => wrap(args) : wrap([]);
-    }
-    return sheet;
-  },
-};
-// Existing consumers retain this API; new app code should use style factories.
-export function useUnistyles() {
-  useSyncExternalStore(subscribe, snapshot, snapshot);
-  return { theme: theme(), rt: runtime() };
-}
-export function withUnistyles(Component, mappings) {
-  const Wrapped = forwardRef(function GpuiThemed(props, ref) {
-    useSyncExternalStore(subscribe, snapshot, snapshot);
-    const { uniProps, ...rest } = props;
-    return React.createElement(Component, {
-      ...styledProps({
-        ...mappings?.(theme(), runtime()),
-        ...uniProps?.(theme(), runtime()),
-        ...rest,
-      }),
-      ref,
-    });
-  });
-  return Wrapped;
-}
-export const createUnistylesElement = withUnistyles;
@@ -1 +0,0 @@
-{ "name": "Paseo", "displayName": "Paseo GPUI" }
@@ -1,7 +0,0 @@
-module.exports = function (api) {
-  api.cache(true);
-  return {
-    presets: [[require.resolve("babel-preset-expo"), { unstable_transformImportMeta: true }]],
-    plugins: [[require.resolve("react-native-unistyles/plugin"), { root: "../src" }]],
-  };
-};
@@ -1,4 +0,0 @@
-build/
-.cache/
-autolink/
-target/
@@ -1,55 +0,0 @@
-[package]
-name = "react-native-gpui-paseo-gpui"
-version = "0.1.0"
-edition = "2021"
-
-# Set CARGO_PROFILE_DEV_DEBUG=full to opt into full debug information.
-[profile.dev]
-debug = "line-tables-only"
-split-debuginfo = "packed"
-
-# Dependencies are optimized even in a dev build: GPUI rebuilds and paints the
-# element tree on every frame, and they are only compiled once.
-[profile.dev.package."*"]
-debug = false
-opt-level = 3
-
-# The C++ bridge picks its CMake build type from this crate's opt-level, and a
-# Release build of React Native has no dev server, inspector or Fast Refresh.
-[profile.dev.package.rn-gpui-sys]
-opt-level = 0
-
-[profile.release]
-debug = "line-tables-only"
-# Cargo strips inside the linker, before dsymutil, so package-desktop writes the
-# dSYM and then strips. Full LTO: 2 MB smaller for 1.4x the build time.
-strip = "none"
-split-debuginfo = "packed"
-lto = "fat"
-codegen-units = 1
-
-[build-dependencies]
-rn-gpui-module-build = { path = "../node_modules/@react-native-gpui/core/ReactGpui/rn-gpui-module-build" }
-serde_json = "1"
-
-[features]
-visual-capture = ["react-native-gpui/visual-capture"]
-test-driver = ["react-native-gpui/test-driver"]
-
-[dependencies]
-serde_json = "1"
-sha2 = "0.10"
-rusqlite = { version = "0.38", features = ["bundled"] }
-rn-gpui-module = { path = "../node_modules/@react-native-gpui/core/ReactGpui/rn-gpui-module" }
-rn-gpui-autolink = { path = "autolink" }
-react-native-gpui = { path = "../node_modules/@react-native-gpui/core/ReactGpui/rn-gpui" }
-
-[patch.crates-io]
-# Managed by @react-native-gpui/cli autolink; do not edit between these markers.
-react-native-gpui = { path = "../node_modules/@react-native-gpui/core/ReactGpui/rn-gpui" }
-rn-gpui-sys = { path = "../node_modules/@react-native-gpui/core/ReactGpui/rn-gpui-sys" }
-rn-gpui-module = { path = "../node_modules/@react-native-gpui/core/ReactGpui/rn-gpui-module" }
-rn-gpui-module-build = { path = "../node_modules/@react-native-gpui/core/ReactGpui/rn-gpui-module-build" }
-gpui = { git = "https://github.com/streetwriters/gpui-fast", rev = "8da7d89" }
-gpui_platform = { git = "https://github.com/streetwriters/gpui-fast", rev = "8da7d89" }
-# End managed by autolink.
@@ -1,172 +0,0 @@
-fn main() {
-    // Forwards the engine's Node-API exports out of this executable, which is
-    // what lets a stock `.node` addon resolve them on Windows.
-    //
-    // A DLL records every import as a name *plus the file it comes from*, and a
-    // node-gyp addon records "from `node.exe`" — Windows has no global symbol
-    // scope for it to fall back on. Node's own answer is that the host process
-    // exports the Node-API functions, so that is what this does: the executable
-    // re-exports each of the VM's `napi_*`/`node_api_*` names, forwarded to
-    // `hermesvm.dll`. Addons that use node-gyp's delay-load hook (the default)
-    // then reach this process instead of looking for `node.exe` on disk.
-    //
-    // It is a no-op on macOS and Linux, where an addon's imports resolve against
-    // whatever is already loaded and need no forwarding. Declare it once, before
-    // the module list; it does not depend on anything else in this file.
-    rn_gpui_module_build::forward_node_api_exports();
-
-    // App-local Rust TurboModules: list one entry per `src/Native*.ts` spec,
-    // for example `&["src/NativeGreeting.ts"]`. Their glue is generated into
-    // this crate's OUT_DIR, and main.rs registers the modules.
-    rn_gpui_module_build::generate(&["src/NativePaseoDesktop.ts"]);
-
-    let desktop_root = std::path::PathBuf::from(
-        std::env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR is set"),
-    );
-    // `app.json` names the app; `desktop/desktop.json` carries the identifier
-    // and everything else the packaging step needs. The loader the CLI uses is
-    // JavaScript, so this reads the same file directly and applies the two
-    // defaults it would apply.
-    let project_root = desktop_root
-        .parent()
-        .expect("desktop folder has a React Native project root");
-    let app_json_path = project_root.join("app.json");
-    println!("cargo:rerun-if-changed={}", app_json_path.display());
-    let app_json: serde_json::Value = serde_json::from_slice(
-        &std::fs::read(&app_json_path)
-            .unwrap_or_else(|error| panic!("read {}: {error}", app_json_path.display())),
-    )
-    .unwrap_or_else(|error| panic!("parse {}: {error}", app_json_path.display()));
-    let app_name = app_json["name"]
-        .as_str()
-        .filter(|name| !name.is_empty())
-        .expect("app.json must define a nonempty name");
-    if app_json["desktop"]
-        .as_object()
-        .is_some_and(|desktop| !desktop.is_empty())
-    {
-        panic!("move `app.json` desktop.* into `desktop/desktop.json` (see the README)");
-    }
-
-    let desktop_json_path = project_root.join("desktop/desktop.json");
-    println!("cargo:rerun-if-changed={}", desktop_json_path.display());
-    let desktop_json: serde_json::Value = std::fs::read(&desktop_json_path)
-        .ok()
-        .and_then(|bytes| serde_json::from_slice(&bytes).ok())
-        .unwrap_or(serde_json::Value::Null);
-    let app_id = match desktop_json["identifier"].as_str() {
-        Some(identifier) if !identifier.is_empty() => identifier.to_string(),
-        _ => format!(
-            "com.example.{}",
-            app_name
-                .to_lowercase()
-                .chars()
-                .map(|c| if c.is_ascii_alphanumeric() { c } else { '-' })
-                .collect::<String>()
-        ),
-    };
-    println!("cargo:rustc-env=RN_GPUI_APP_NAME={app_name}");
-    println!("cargo:rustc-env=RN_GPUI_APP_ID={app_id}");
-    // Only a debug build names the bundle it was developed against. A release
-    // binary must find the bundle beside its own executable, because the path
-    // baked in here is where this machine happened to build it — and on the
-    // machine the package is installed on, that path does not exist.
-    println!("cargo:rerun-if-env-changed=PROFILE");
-    if std::env::var("PROFILE").as_deref() == Ok("debug") {
-        println!(
-            "cargo:rustc-env=RN_GPUI_DEFAULT_BUNDLE={}",
-            desktop_root.join("build/index.bundle").display()
-        );
-    }
-
-    println!("cargo:rerun-if-env-changed=DEP_RN_GPUI_RUNTIME_RPATHS");
-    println!("cargo:rerun-if-env-changed=RN_GPUI_PACKAGING");
-    let Ok(paths) = std::env::var("DEP_RN_GPUI_RUNTIME_RPATHS") else {
-        return;
-    };
-    let dirs = paths.split('|').filter(|path| !path.is_empty());
-    if std::env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("windows") {
-        stage_shared_libraries(dirs);
-        return;
-    }
-    // `RN_GPUI_PACKAGING` means this binary is about to be installed somewhere
-    // else, so only the relative rpaths belong in it. Keeping the absolute ones
-    // would let a packaged app load this build tree's libraries in preference to
-    // its own on the machine that built it — which hides exactly the packaging
-    // bugs the packaged run exists to catch.
-    let packaging = std::env::var("RN_GPUI_PACKAGING").is_ok();
-    if !packaging {
-        for path in dirs {
-            println!("cargo:rustc-link-arg=-Wl,-rpath,{path}");
-        }
-    }
-    emit_relocatable_rpaths(app_name);
-}
-
-/// rpaths that survive being installed somewhere else.
-///
-/// The absolute paths above let a development build run from this tree. A
-/// packaged app is copied to another machine, where those paths do not exist,
-/// so a release build also carries paths relative to the executable: the
-/// layout the installers produce.
-fn emit_relocatable_rpaths(app_name: &str) {
-    if std::env::var("PROFILE").as_deref() != Ok("release") {
-        return;
-    }
-    let os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
-    let mut emit = |rpath: String| println!("cargo:rustc-link-arg=-Wl,-rpath,{rpath}");
-    match os.as_str() {
-        // An app bundle puts the executable in Contents/MacOS and the shipped
-        // libraries in Contents/Frameworks.
-        "macos" => emit("@executable_path/../Frameworks".into()),
-        // Linux installs the executable at `usr/bin` and ships its libraries
-        // under `usr/lib`:
-        // - the deb puts them in `usr/lib/<app>`;
-        // - an AppImage's libraries are flat in `usr/lib`, because that is the
-        //   directory AppRun puts on the library path and the one linuxdeploy
-        //   resolves dependencies from before the image is assembled.
-        // Both are covered, so one binary works in either layout.
-        "linux" => {
-            emit(format!("$ORIGIN/../lib/{app_name}"));
-            emit("$ORIGIN/../lib".into());
-            emit("$ORIGIN".into());
-        }
-        // Windows has no rpath: the DLLs are copied beside the executable.
-        _ => {}
-    }
-}
-
-/// Windows has no rpath: the loader finds a DLL next to the executable or on
-/// `PATH`, so every directory the runtime reports as holding a shared library
-/// (the Hermes binary directory in particular) is copied into the profile
-/// directory that receives this app's executable. Without this the app builds
-/// and then fails to start with "hermesvm.dll was not found".
-fn stage_shared_libraries<'a>(dirs: impl Iterator<Item = &'a str>) {
-    let out_dir = std::path::PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR is set"));
-    // <profile>/build/<package>-<hash>/out -> <profile>
-    let Some(profile_dir) = out_dir.ancestors().nth(3) else {
-        return;
-    };
-    for dir in dirs {
-        let Ok(entries) = std::fs::read_dir(dir) else {
-            continue;
-        };
-        for entry in entries.flatten() {
-            let source = entry.path();
-            let is_shared_library = source
-                .extension()
-                .and_then(|extension| extension.to_str())
-                .is_some_and(|extension| extension.eq_ignore_ascii_case("dll"));
-            if !is_shared_library {
-                continue;
-            }
-            let Some(name) = source.file_name() else {
-                continue;
-            };
-            println!("cargo:rerun-if-changed={}", source.display());
-            std::fs::copy(&source, profile_dir.join(name)).unwrap_or_else(|error| {
-                panic!("copy {} next to the executable: {error}", source.display())
-            });
-        }
-    }
-}
@@ -1 +0,0 @@
-{ "identifier": "sh.paseo.gpui" }
@@ -1,83 +0,0 @@
-const path = require("node:path");
-const { makeMetroConfig } = require("@react-native-gpui/core/metro.config");
-const projectRoot = path.resolve(__dirname, "..");
-process.env.EXPO_ROUTER_APP_ROOT = path.resolve(projectRoot, "../src/app");
-const config = makeMetroConfig({ projectRoot });
-const resolveRequest = config.resolver.resolveRequest;
-config.watchFolders.push(path.resolve(projectRoot, "../../.."));
-config.transformer.unstable_allowRequireContext = true;
-config.resolver.disableHierarchicalLookup = false;
-config.resolver.blockList = /[/\\]gpui[/\\]desktop[/\\](target|build|autolink)[/\\]/;
-const nativePackages = [
-  "react",
-  "react-native-reanimated",
-  "react-native-worklets",
-  "react-native-gesture-handler",
-  "react-native-screens",
-  "react-native-safe-area-context",
-  "react-native-svg",
-];
-
-const adapters = {
-  "expo-keep-awake": "keep-awake.js",
-  "expo-image-picker": "image-picker.js",
-  "expo-image-manipulator": "image-manipulator.js",
-  "expo-sharing": "sharing.js",
-  "expo-document-picker": "document-picker.js",
-  "@mattermost/react-native-paste-input": "paste-input.js",
-  "@react-native-async-storage/async-storage": "async-storage.js",
-  "expo-localization": "localization.js",
-  "expo-clipboard": "clipboard.js",
-  "expo-file-system": "file-system.js",
-  "expo-file-system/legacy": "file-system.js",
-  "react-native-keyboard-controller": "keyboard.jsx",
-  crypto: "node-crypto.js",
-  "node:crypto": "node-crypto.js",
-  "expo-sqlite": "sqlite.js",
-  "expo-crypto": "crypto.js",
-  "react-native-unistyles": "unistyles.js",
-};
-const fileAdapters = {
-  "/audio/audio-engine.native.ts": "audio.js",
-  "/components/markdown/fence/mermaid/host.native.tsx": "mermaid.jsx",
-  "/file-panels/html-preview.tsx": "document-preview.jsx",
-  "/file-panels/document-frame/index.tsx": "document-preview.jsx",
-};
-config.resolver.resolveRequest = (context, name, platform) => {
-  if (adapters[name]) name = path.resolve(projectRoot, "adapters", adapters[name]);
-  if (
-    name.endsWith("/ensureNativeModulesAreInstalled") &&
-    context.originModulePath.includes("expo-modules-core")
-  )
-    name = path.resolve(projectRoot, "adapters/expo-install.js");
-  if (name === "./ExpoLinking" && context.originModulePath.includes("expo-linking"))
-    name = path.resolve(projectRoot, "adapters/expo-linking.js");
-  // Linux has no Expo mobile push-token or camera provider; reuse the app's
-  // existing unavailable-capability implementations.
-  if (name === "expo-notifications")
-    name = path.resolve(projectRoot, "../src/fdroid/expo-notifications.ts");
-  if (name === "expo-camera") name = path.resolve(projectRoot, "../src/fdroid/expo-camera.tsx");
-  if (name === "expo-router/_ctx") name = path.resolve(projectRoot, "routes.js");
-  if (name === "qrcode") name = "qrcode/lib/browser.js";
-  if (name.startsWith("react-native-unistyles/components/native/"))
-    name = path.resolve(projectRoot, "adapters/unistyles-components.js");
-  if (name.startsWith("@/")) name = path.resolve(projectRoot, "../src", name.slice(2));
-  if (
-    name.startsWith("react-native/") ||
-    nativePackages.some((pkg) => name === pkg || name.startsWith(`${pkg}/`))
-  ) {
-    context = {
-      ...context,
-      disableHierarchicalLookup: true,
-      nodeModulesPaths: [path.join(projectRoot, "node_modules")],
-    };
-  }
-  const result = resolveRequest(context, name, platform);
-  const replacement = Object.entries(fileAdapters).find(([suffix]) =>
-    result.filePath?.endsWith(suffix),
-  );
-  if (replacement)
-    return { type: "sourceFile", filePath: path.resolve(projectRoot, "adapters", replacement[1]) };
-  return result;
-};
-module.exports = config;
@@ -1,9 +0,0 @@
-import { TurboModuleRegistry, type TurboModule } from "react-native";
-export interface Spec extends TurboModule {
-  sqlite(sql: string, params: string): string;
-  locale(): string;
-  timezone(): string;
-  sha256(text: string): string;
-  randomBytes(length: number): Array<number>;
-}
-export default TurboModuleRegistry.getEnforcing<Spec>("PaseoDesktop");
@@ -1,29 +0,0 @@
-rn_gpui_module::include_specs!();
-
-mod services;
-
-fn main() {
-    react_native_gpui::register_module(native_paseo_desktop_module::<services::PaseoDesktop>());
-    rn_gpui_autolink::ensure_linked();
-    // A debug build knows where its own bundle is; a release build does not, and
-    // must not: the path would name the machine that built it. A packaged release
-    // app resolves the bundle beside its executable instead.
-    #[cfg(debug_assertions)]
-    if std::env::var_os("RN_GPUI_BUNDLE").is_none() {
-        std::env::set_var("RN_GPUI_BUNDLE", env!("RN_GPUI_DEFAULT_BUNDLE"));
-    }
-    let config = react_native_gpui::DesktopAppConfig::from_env_with_defaults(
-        env!("RN_GPUI_APP_NAME"),
-        env!("RN_GPUI_APP_ID"),
-    )
-    .window_title("Paseo GPUI")
-    .window_size(1024.0, 768.0)
-    .dev_menu(true)
-    .configure_window(|options| {
-        // GPUI window options are public: titlebar, resizability, display,
-        // decorations, min size, and other native window behavior.
-        options.is_resizable = true;
-    });
-
-    react_native_gpui::run_with(config);
-}
@@ -1,174 +0,0 @@
-use crate::{NativePaseoDesktopEvents, NativePaseoDesktopSpec};
-use rn_gpui_module::ModuleError;
-use std::io::Read;
-
-pub struct PaseoDesktop {
-    database: std::sync::Mutex<Option<rusqlite::Connection>>,
-}
-impl PaseoDesktop {
-    fn database(
-        &self,
-    ) -> Result<std::sync::MutexGuard<'_, Option<rusqlite::Connection>>, ModuleError> {
-        let mut guard = self
-            .database
-            .lock()
-            .map_err(|e| ModuleError::new(e.to_string()))?;
-        if guard.is_none() {
-            let base = std::env::var("XDG_DATA_HOME")
-                .map(std::path::PathBuf::from)
-                .unwrap_or_else(|_| {
-                    std::path::PathBuf::from(std::env::var("HOME").expect("HOME is set"))
-                        .join(".local/share")
-                });
-            let dir = base.join("paseo-gpui");
-            std::fs::create_dir_all(&dir).map_err(|e| ModuleError::new(e.to_string()))?;
-            *guard = Some(
-                rusqlite::Connection::open(dir.join("replica.db"))
-                    .map_err(|e| ModuleError::new(e.to_string()))?,
-            );
-        }
-        Ok(guard)
-    }
-}
-impl NativePaseoDesktopSpec for PaseoDesktop {
-    fn new(_events: NativePaseoDesktopEvents) -> Self {
-        Self {
-            database: std::sync::Mutex::new(None),
-        }
-    }
-    fn sqlite(&self, sql: String, params: String) -> Result<String, ModuleError> {
-        let fail = |e: rusqlite::Error| ModuleError::new(e.to_string());
-        let db = self.database()?;
-        let db = db.as_ref().unwrap();
-        if params == "batch" {
-            db.execute_batch(&sql).map_err(fail)?;
-            return Ok("[]".into());
-        }
-        let values: Vec<serde_json::Value> =
-            serde_json::from_str(&params).map_err(|e| ModuleError::new(e.to_string()))?;
-        let values: Vec<rusqlite::types::Value> = values
-            .into_iter()
-            .map(|v| match v {
-                serde_json::Value::Null => rusqlite::types::Value::Null,
-                serde_json::Value::String(v) => rusqlite::types::Value::Text(v),
-                serde_json::Value::Number(v) => v
-                    .as_i64()
-                    .map(rusqlite::types::Value::Integer)
-                    .unwrap_or_else(|| rusqlite::types::Value::Real(v.as_f64().unwrap())),
-                _ => rusqlite::types::Value::Text(v.to_string()),
-            })
-            .collect();
-        let mut stmt = db.prepare(&sql).map_err(fail)?;
-        let names: Vec<String> = stmt.column_names().into_iter().map(str::to_owned).collect();
-        let mut rows = stmt
-            .query(rusqlite::params_from_iter(values))
-            .map_err(fail)?;
-        let mut results = Vec::new();
-        while let Some(row) = rows.next().map_err(fail)? {
-            let mut object = serde_json::Map::new();
-            for (index, name) in names.iter().enumerate() {
-                let value = match row.get_ref(index).map_err(fail)? {
-                    rusqlite::types::ValueRef::Null => serde_json::Value::Null,
-                    rusqlite::types::ValueRef::Integer(v) => v.into(),
-                    rusqlite::types::ValueRef::Real(v) => serde_json::json!(v),
-                    rusqlite::types::ValueRef::Text(v) => {
-                        String::from_utf8_lossy(v).into_owned().into()
-                    }
-                    rusqlite::types::ValueRef::Blob(_) => {
-                        return Err(ModuleError::new(
-                            "Replica store does not support blob columns",
-                        ))
-                    }
-                };
-                object.insert(name.clone(), value);
-            }
-            results.push(object);
-        }
-        serde_json::to_string(&results).map_err(|e| ModuleError::new(e.to_string()))
-    }
-    fn timezone(&self) -> Result<String, ModuleError> {
-        if let Ok(zone) = std::env::var("TZ") {
-            if !zone.is_empty() {
-                return Ok(zone.trim_start_matches(':').into());
-            }
-        }
-        if let Ok(path) = std::fs::read_link("/etc/localtime") {
-            if let Some((_, zone)) = path.to_string_lossy().split_once("/zoneinfo/") {
-                return Ok(zone.into());
-            }
-        }
-        Ok(std::fs::read_to_string("/etc/timezone")
-            .map(|s| s.trim().into())
-            .unwrap_or_else(|_| "UTC".into()))
-    }
-    fn locale(&self) -> Result<String, ModuleError> {
-        Ok(["LC_ALL", "LC_MESSAGES", "LANG"]
-            .iter()
-            .find_map(|key| std::env::var(key).ok().filter(|v| !v.is_empty()))
-            .unwrap_or_else(|| "en_US.UTF-8".into()))
-    }
-    fn sha256(&self, text: String) -> Result<String, ModuleError> {
-        use sha2::{Digest, Sha256};
-        Ok(format!("{:x}", Sha256::digest(text.as_bytes())))
-    }
-    fn random_bytes(&self, length: f64) -> Result<Vec<f64>, ModuleError> {
-        if !length.is_finite() || length < 0.0 || length > 65536.0 || length.fract() != 0.0 {
-            return Err(ModuleError::new("Invalid random byte count"));
-        }
-        let mut bytes = vec![0u8; length as usize];
-        std::fs::File::open("/dev/urandom")
-            .and_then(|mut source| source.read_exact(&mut bytes))
-            .map_err(|error| ModuleError::new(error.to_string()))?;
-        Ok(bytes.into_iter().map(f64::from).collect())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    fn service() -> PaseoDesktop {
-        PaseoDesktop {
-            database: std::sync::Mutex::new(Some(rusqlite::Connection::open_in_memory().unwrap())),
-        }
-    }
-    #[test]
-    fn crypto_matches_sha256_and_bounds_random_requests() {
-        let service = service();
-        assert_eq!(
-            service.sha256("abc".into()).unwrap(),
-            "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad"
-        );
-        assert_eq!(service.random_bytes(32.0).unwrap().len(), 32);
-        assert!(service.random_bytes(65537.0).is_err());
-        assert!(service.random_bytes(-1.0).is_err());
-    }
-    #[test]
-    fn replica_transactions_bind_values_and_roll_back() {
-        let service = service();
-        service
-            .sqlite(
-                "CREATE TABLE rows (key TEXT PRIMARY KEY, value TEXT);".into(),
-                "batch".into(),
-            )
-            .unwrap();
-        service
-            .sqlite(
-                "INSERT INTO rows VALUES (?, ?)".into(),
-                r#"["key","quoted ' value"]"#.into(),
-            )
-            .unwrap();
-        service
-            .sqlite(
-                "BEGIN IMMEDIATE; DELETE FROM rows; ROLLBACK;".into(),
-                "batch".into(),
-            )
-            .unwrap();
-        let result = service
-            .sqlite("SELECT key, value FROM rows".into(), "[]".into())
-            .unwrap();
-        assert_eq!(
-            serde_json::from_str::<serde_json::Value>(&result).unwrap(),
-            serde_json::json!([{"key":"key","value":"quoted ' value"}])
-        );
-    }
-}
@@ -1,10 +0,0 @@
-/* oxlint-disable import/no-unassigned-import -- Install globals before app modules evaluate. */
-import "./adapters/intl";
-import "../src/polyfills/install-early";
-import "../src/styles/unistyles";
-import { AppRegistry } from "react-native";
-import { RootApp } from "../src/root-app";
-
-// GPUI owns the native surface. Keep Paseo's full router and providers, while
-// leaving Expo's mobile registration and WebView-based dev overlay out.
-AppRegistry.registerComponent("Paseo", () => RootApp);
@@ -1,103 +0,0 @@
-import { afterAll, beforeAll, expect, test } from "vitest";
-
-// Runs against the actual Paseo bundle in the compiled GPUI app. Start with
-// RN_GPUI_TEST_DRIVER=1 and pass its loopback URL and token to this test.
-const endpoint = process.env.PASEO_GPUI_TEST_URL;
-const token = process.env.PASEO_GPUI_TEST_TOKEN;
-let socket: WebSocket;
-let nextId = 0;
-interface Node {
-  tag: number;
-  component: string;
-  testID: string;
-  text: string;
-  children?: Node[];
-}
-const pending = new Map<number, { resolve(value: unknown): void; reject(error: Error): void }>();
-function request<T = unknown>(method: string, params: Record<string, unknown> = {}): Promise<T> {
-  const id = ++nextId;
-  return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => {
-      pending.delete(id);
-      reject(new Error(`GPUI ${method} timed out`));
-    }, 15_000);
-    pending.set(id, {
-      resolve: (value) => {
-        clearTimeout(timer);
-        resolve(value as T);
-      },
-      reject: (error) => {
-        clearTimeout(timer);
-        reject(error);
-      },
-    });
-    socket.send(JSON.stringify({ jsonrpc: "2.0", id, method, params: { ...params, token } }));
-  });
-}
-function flatten(node: Node): Node[] {
-  return [node, ...(node.children ?? []).flatMap(flatten)];
-}
-async function nodes() {
-  return (await request<{ children: Node[] }>("tree")).children.flatMap(flatten);
-}
-beforeAll(async () => {
-  if (!endpoint) return;
-  if (!token) throw new Error("PASEO_GPUI_TEST_TOKEN is required");
-  socket = new WebSocket(endpoint);
-  await new Promise<void>((resolve, reject) => {
-    socket.addEventListener("open", () => resolve(), { once: true });
-    socket.addEventListener("error", () => reject(new Error("GPUI driver connection failed")), {
-      once: true,
-    });
-  });
-  socket.addEventListener("message", (event) => {
-    const response = JSON.parse(String(event.data));
-    const waiter = pending.get(response.id);
-    if (!waiter) return;
-    pending.delete(response.id);
-    const error = response.error ?? response.result?.error;
-    if (error) waiter.reject(new Error(JSON.stringify(error)));
-    else waiter.resolve(response.result);
-  });
-});
-afterAll(() => socket?.close());
-
-test.skipIf(!endpoint)(
-  "real Paseo portal passes workspace clicks and the native composer edits text",
-  async () => {
-    const workspace = (await nodes()).find((node) =>
-      node.testID.startsWith("sidebar-workspace-row-"),
-    );
-    expect(workspace, "connected daemon must have an existing workspace").toBeDefined();
-    // Regression: the upstream box-none portal hit area intercepted this click.
-    expect(await request("click", { tag: workspace!.tag })).toEqual({ clicked: true });
-    await expect
-      .poll(async () => (await nodes()).some((node) => node.testID === "workspace-header-title"), {
-        timeout: 15_000,
-      })
-      .toBe(true);
-    await expect
-      .poll(async () => (await nodes()).some((node) => node.component === "TextInput"), {
-        timeout: 15_000,
-      })
-      .toBe(true);
-    const input = (await nodes()).find((node) => node.component === "TextInput")!;
-    const original = (await request<{ text: string }>("getProps", { tag: input.tag })).text;
-    try {
-      await request("click", { tag: input.tag });
-      await request("press", { key: "ctrl-a" });
-      await request("press", { key: "backspace" });
-      expect(
-        await request("type", { tag: input.tag, text: "GPUI native input regression" }),
-      ).toEqual({ typed: true });
-      await expect
-        .poll(async () => (await request<{ text: string }>("getProps", { tag: input.tag })).text)
-        .toBe("GPUI native input regression");
-    } finally {
-      await request("press", { key: "ctrl-a" });
-      await request("press", { key: "backspace" });
-      if (original) await request("type", { tag: input.tag, text: original });
-    }
-  },
-  45_000,
-);
@@ -1,40 +0,0 @@
-{
-  "name": "paseo-gpui",
-  "version": "0.0.0",
-  "private": true,
-  "dependencies": {
-    "@formatjs/intl-datetimeformat": "^7.9.0",
-    "@formatjs/intl-displaynames": "^7.4.0",
-    "@formatjs/intl-getcanonicallocales": "^3.3.0",
-    "@formatjs/intl-locale": "^5.4.1",
-    "@formatjs/intl-numberformat": "^9.5.0",
-    "@formatjs/intl-pluralrules": "^6.4.0",
-    "@formatjs/intl-segmenter": "^12.3.0",
-    "@react-native-gpui/codegen": "file:../../../vendor/react-native-gpui/packages/codegen",
-    "@react-native-gpui/core": "file:../../../vendor/react-native-gpui/packages/core",
-    "@react-native-gpui/fs": "file:../../../vendor/react-native-gpui/modules/fs",
-    "@react-native-gpui/gesture-handler": "file:../../../vendor/react-native-gpui/modules/gesture-handler",
-    "@react-native-gpui/hermes": "file:../../../vendor/react-native-gpui/packages/hermes",
-    "@react-native-gpui/reanimated": "file:../../../vendor/react-native-gpui/modules/reanimated",
-    "@react-native-gpui/safe-area-context": "file:../../../vendor/react-native-gpui/modules/safe-area-context",
-    "@react-native-gpui/screens": "file:../../../vendor/react-native-gpui/modules/screens",
-    "@react-native-gpui/svg": "file:../../../vendor/react-native-gpui/modules/svg",
-    "@react-native-gpui/worklets": "file:../../../vendor/react-native-gpui/modules/worklets",
-    "@react-native/assets-registry": "^0.87.1",
-    "react": "19.2.3",
-    "react-native": "0.87.1",
-    "react-native-gesture-handler": "3.3.0",
-    "react-native-reanimated": "https://github.com/ammarahm-ed/react-native-reanimated/releases/download/4.7.1-desktop.1/react-native-reanimated-4.7.1.tgz",
-    "react-native-safe-area-context": "5.10.1",
-    "react-native-screens": "4.28.0",
-    "react-native-svg": "15.15.5",
-    "react-native-worklets": "https://github.com/ammarahm-ed/react-native-reanimated/releases/download/worklets-0.13.0-desktop.1/react-native-worklets-0.13.0.tgz"
-  },
-  "devDependencies": {
-    "@react-native-community/cli": "20.2.0",
-    "@react-native-gpui/cli": "file:../../../vendor/react-native-gpui/packages/cli",
-    "@react-native/babel-preset": "0.87.1",
-    "@react-native/metro-config": "0.87.1",
-    "typescript": "^5.8.3"
-  }
-}
@@ -1,2 +0,0 @@
-/// <reference types="@react-native-gpui/core/types" />
-// Added by react-native-gpui. Do not edit: it is regenerated.
@@ -1,17 +0,0 @@
-const path = require("node:path");
-module.exports = {
-  // This target only launches desktop. RN CLI 20.2's built-in
-  // run-ios/run-android option lists conflict with the CLI's global verbose
-  // option, and this app has no native mobile projects to launch.
-  commands: ["build-android", "build-ios", "log-android", "log-ios", "run-android", "run-ios"].map(
-    (name) => ({
-      name,
-      description: `${name} is not configured for Paseo GPUI`,
-      func: () => {
-        throw new Error(`${name} is not configured for Paseo GPUI`);
-      },
-    }),
-  ),
-  project: { desktop: {} },
-  reactNativePath: path.dirname(require.resolve("react-native/package.json")),
-};
@@ -1,7 +0,0 @@
-// Use the existing route tree. Expo's transformer normally supplies this root
-// through a Babel caller field; the RN desktop transformer does not.
-export const ctx = require.context(
-  "../src/app",
-  true,
-  /^(?:\.\/)(?!(?:(?:(?:.*\+api)|(?:\+(html|native-intent))))\.[tj]sx?$).*\.[tj]sx?$/,
-);
@@ -1,3 +0,0 @@
-[toolchain]
-channel = "stable"
-profile = "minimal"
@@ -1,21 +1,21 @@
 [
  {
    "output": "स्ते",
-    "row": "2,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1;8,4294638330,0,0;स्ते      ",
-    "clusterStarts": [0, 2, 3, 4, 5, 6, 7],
-    "contrastStarts": [0, 1, 2, 3, 4, 5, 6, 7]
+    "row": "4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;8,4294638330,0,0;स्ते       ",
+    "clusterStarts": [0, 1, 2, 3, 4, 5, 6, 7],
+    "contrastStarts": [0, 2, 3, 4, 5, 6, 7]
  },
  {
    "output": "क्ष",
-    "row": "2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;8,4294638330,0,0;क्ष      ",
-    "clusterStarts": [0, 2, 3, 4, 5, 6, 7],
-    "contrastStarts": [0, 1, 2, 3, 4, 5, 6, 7]
+    "row": "3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;8,4294638330,0,0;क्ष       ",
+    "clusterStarts": [0, 1, 2, 3, 4, 5, 6, 7],
+    "contrastStarts": [0, 2, 3, 4, 5, 6, 7]
  },
  {
    "output": "নক্ষত্র",
-    "row": "1,1,2,1,1,1,2,1,1,1,1,1,1,1,1,1;8,4294638330,0,0;নক্ষত্র   ",
-    "clusterStarts": [0, 1, 3, 5, 6, 7],
-    "contrastStarts": [0, 1, 2, 3, 4, 5, 6, 7]
+    "row": "1,1,3,1,3,1,1,1,1,1,1,1,1,1,1,1;8,4294638330,0,0;নক্ষত্র     ",
+    "clusterStarts": [0, 1, 2, 3, 4, 5, 6, 7],
+    "contrastStarts": [0, 2, 3, 4, 5, 6, 7]
  },
  {
    "output": "क्अ",
@@ -31,7 +31,7 @@
  },
  {
    "output": "अ्क",
-    "row": "2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;8,4294638330,0,0;अ्क      ",
+    "row": "3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;8,4294638330,0,0;अ्क       ",
    "clusterStarts": [0, 1, 2, 3, 4, 5, 6, 7],
    "contrastStarts": [0, 2, 3, 4, 5, 6, 7]
  }
@@ -1,6 +1,5 @@
 package sh.paseo.terminal

-import android.os.Build
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Paint
@@ -44,13 +43,6 @@ class TerminalRowLayoutTest {
      val output = row.getString("output")
      val (toExpected, toContrast) = difference(drawn, expected) to difference(drawn, contrast)
      Log.i("TerminalRowLayoutTest", "$output expected=$toExpected contrast=$toContrast")
-      // Android 10's platform ICU splits this conjunct. Keep its observed raster baseline
-      // explicit rather than claiming this supported OS passes the modern grapheme corpus.
-      if (Build.VERSION.SDK_INT == 29 && output == "स्ते") {
-        assertTrue("Android 10 unexpectedly matches modern conjunct clustering", toExpected > MATCH_TOLERANCE)
-        assertTrue("Android 10 split-conjunct baseline changed", toContrast <= MATCH_TOLERANCE)
-        continue
-      }
      assertTrue("$output differs from its grapheme clusters by $toExpected", toExpected <= MATCH_TOLERANCE)
      assertTrue("$output also matches the wrong clusters", toContrast > MATCH_TOLERANCE)
    }
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.14.0",
+  "version": "0.15.0-beta.1",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -71,13 +71,14 @@
    "@tanstack/react-virtual": "^3.13.21",
    "@xterm/addon-clipboard": "^0.3.0-beta.213",
    "@xterm/addon-fit": "^0.12.0-beta.213",
-    "@xterm/addon-image": "^0.10.0-beta.213",
+    "@xterm/addon-image": "0.10.0-beta.331",
    "@xterm/addon-ligatures": "^0.11.0-beta.213",
    "@xterm/addon-search": "^0.17.0-beta.213",
+    "@xterm/addon-unicode-graphemes": "0.5.0-beta.330",
    "@xterm/addon-unicode11": "^0.10.0-beta.213",
    "@xterm/addon-web-links": "^0.13.0-beta.213",
-    "@xterm/addon-webgl": "0.20.0-beta.291",
-    "@xterm/xterm": "6.1.0-beta.292",
+    "@xterm/addon-webgl": "0.20.0-beta.329",
+    "@xterm/xterm": "6.1.0-beta.336",
    "buffer": "^6.0.3",
    "expo": "~57.0.30",
    "expo-asset": "~57.0.20",
@@ -155,7 +156,7 @@
    "@vitest/browser": "^4.1.7",
    "@vitest/browser-playwright": "^4.1.7",
    "@xterm/addon-serialize": "0.14.0",
-    "@xterm/headless": "^6.1.0-beta.213",
+    "@xterm/headless": "6.1.0-beta.334",
    "babel-preset-expo": "~57.0.16",
    "dotenv": "^17.2.3",
    "eas-cli": "^16.24.1",
@@ -18,7 +18,7 @@ export interface AgentCommandsDraftConfig {
  modeId?: string;
  model?: string;
  thinkingOptionId?: string;
-  featureValues?: Record<string, unknown>;
+  providerOptions?: Record<string, unknown>;
 }

 export function normalizeAgentCommandsCwd(cwd: string): string {
@@ -98,7 +98,7 @@ export function draftAgentCommandsQueryKey(input: {
    "thinking",
    draftConfig.thinkingOptionId ?? null,
    "features",
-    draftConfig.featureValues ?? null,
+    draftConfig.providerOptions ?? null,
  ] as const;
 }

@@ -0,0 +1,149 @@
+import { describe, expect, it } from "vitest";
+import type { AgentOptionControl } from "@getpaseo/protocol/agent-types";
+import { isControlActive } from "./option-controls";
+import {
+  draftControlsRequest,
+  openDraftOptions,
+  ownDraftOptions,
+  viewDraftOptions,
+} from "./draft-options-model";
+
+const SPEED: AgentOptionControl = {
+  type: "select",
+  key: "service_tier",
+  label: "Speed",
+  defaultValue: "default",
+  choices: [
+    { value: "default", label: "Standard" },
+    { value: "priority", label: "Fast" },
+  ],
+};
+const WEB_SEARCH: AgentOptionControl = { type: "toggle", key: "web_search", label: "Web search" };
+
+function answer(
+  provider: string,
+  requestKey: string,
+  options: Record<string, unknown>,
+  controls = [SPEED, WEB_SEARCH],
+) {
+  return { provider, requestKey, controls, options };
+}
+
+describe("draft options model", () => {
+  it("draws a legacy Fast profile as the Fast tier the daemon resolved", () => {
+    const model = openDraftOptions({ provider: "codex", seed: { service_tier: "fast" } });
+    model.applyResolved(answer("codex", "k1", { service_tier: "priority" }));
+
+    const view = viewDraftOptions(model.getState(), { provider: "codex", requestKey: "k1" });
+
+    expect(view?.options).toEqual({ service_tier: "priority" });
+    expect(view && isControlActive(SPEED, view.options)).toBe(true);
+    // The daemon still gets the stored value to resolve, and so does create.
+    expect(ownDraftOptions(model.getState())).toEqual({ service_tier: "fast" });
+  });
+
+  it("applying a profile from another provider keeps its options through the provider change", () => {
+    const model = openDraftOptions({ provider: "claude" });
+    model.applyResolved(answer("claude", "k1", {}));
+
+    model.applyProfile({
+      provider: "codex",
+      options: { sandbox_mode: "read-only", service_tier: "fast" },
+    });
+    // The form follows the profile to its provider.
+    model.observeProvider("codex");
+
+    expect(ownDraftOptions(model.getState())).toEqual({
+      sandbox_mode: "read-only",
+      service_tier: "fast",
+    });
+    expect(model.getState().resolved).toBeNull();
+  });
+
+  it("choosing another provider by hand starts the options over", () => {
+    const model = openDraftOptions({ provider: "codex", seed: { sandbox_mode: "read-only" } });
+    model.setOption("web_search", true);
+
+    model.observeProvider("claude");
+
+    expect(ownDraftOptions(model.getState())).toBeUndefined();
+    expect(model.getState().resolved).toBeNull();
+  });
+
+  it("never pairs a manually chosen provider with the previous provider's options", () => {
+    const model = openDraftOptions({ provider: "claude" });
+    model.applyResolved(answer("claude", "k1", { fast_mode: true }));
+    model.setOption("fast_mode", true);
+    const form = { provider: "claude", cwd: "/repo" };
+    expect(draftControlsRequest(model.getState(), form)).toMatchObject({
+      provider: "claude",
+      providerOptions: { fast_mode: true },
+    });
+
+    // The form shows OpenCode on its next render; the model has not observed it yet.
+    expect(draftControlsRequest(model.getState(), { ...form, provider: "opencode" })).toBeNull();
+
+    model.observeProvider("opencode");
+    const request = draftControlsRequest(model.getState(), { ...form, provider: "opencode" });
+    expect(request).toEqual({ provider: "opencode", cwd: "/repo" });
+  });
+
+  it("keeps a draft's seed when the first provider is chosen", () => {
+    const model = openDraftOptions({ provider: null, seed: { web_search: true } });
+
+    model.observeProvider("claude");
+
+    expect(ownDraftOptions(model.getState())).toEqual({ web_search: true });
+  });
+
+  it("sends a remembered value to the daemon, and draws only what comes back", () => {
+    const model = openDraftOptions({ provider: "codex" });
+    model.setRemembered({ service_tier: "fast", retired: true });
+    // Nothing is known about the provider's controls yet.
+    expect(ownDraftOptions(model.getState())).toBeUndefined();
+
+    model.applyResolved(answer("codex", "k1", { service_tier: "default" }));
+    expect(ownDraftOptions(model.getState())).toEqual({ service_tier: "fast" });
+    // The answer to the first request does not show the remembered value as if it applied.
+    expect(
+      viewDraftOptions(model.getState(), { provider: "codex", requestKey: "k2" })?.options,
+    ).toEqual({ service_tier: "default" });
+
+    model.applyResolved(answer("codex", "k2", { service_tier: "priority" }));
+    expect(
+      viewDraftOptions(model.getState(), { provider: "codex", requestKey: "k2" })?.options,
+    ).toEqual({ service_tier: "priority" });
+  });
+
+  it("does not let a remembered value override the seed", () => {
+    const model = openDraftOptions({ provider: "codex", seed: { service_tier: "default" } });
+    model.applyResolved(answer("codex", "k1", { service_tier: "default" }));
+    model.setRemembered({ service_tier: "fast" });
+
+    expect(ownDraftOptions(model.getState())).toEqual({ service_tier: "default" });
+  });
+
+  it("lays a toggle over the previous answer until the new one arrives", () => {
+    const model = openDraftOptions({ provider: "claude" });
+    model.applyResolved(answer("claude", "k1", { web_search: false }));
+
+    model.setOption("web_search", true);
+
+    expect(
+      viewDraftOptions(model.getState(), { provider: "claude", requestKey: "k2" })?.options,
+    ).toEqual({ web_search: true });
+    model.applyResolved(answer("claude", "k2", { web_search: true }));
+    expect(
+      viewDraftOptions(model.getState(), { provider: "claude", requestKey: "k2" })?.options,
+    ).toEqual({ web_search: true });
+  });
+
+  it("draws nothing for a provider the answer is not for", () => {
+    const model = openDraftOptions({ provider: "claude" });
+    model.applyResolved(answer("claude", "k1", {}));
+
+    expect(viewDraftOptions(model.getState(), { provider: "codex", requestKey: "k1" })).toBe(
+      undefined,
+    );
+  });
+});
@@ -0,0 +1,168 @@
+import type {
+  AgentOptionControl,
+  AgentSessionConfig,
+  ProviderOptions,
+} from "@getpaseo/protocol/agent-types";
+
+/**
+ * The options of one draft agent, as a plain model (see docs/forms.md). It owns which layers
+ * make up the draft's options; the daemon owns what they mean. Every layer is sent to the daemon
+ * (`ownDraftOptions`) and the UI draws what comes back (`viewDraftOptions`), so no alias,
+ * default or legacy key is resolved here.
+ *
+ * - `seed`: options the draft started from (a profile, a forked agent).
+ * - `remembered`: the provider's last-used control values.
+ * - `edits`: toggles made in this draft.
+ *
+ * Choosing a provider by hand starts the options over; applying a profile replaces the provider
+ * and the options in one step, so the provider change that follows does not clear them.
+ */
+export interface ResolvedDraftOptions {
+  provider: string;
+  /** Names the request that produced this answer; see `viewDraftOptions`. */
+  requestKey: string;
+  controls: AgentOptionControl[];
+  options: ProviderOptions;
+}
+
+export interface DraftOptionsState {
+  provider: string | null;
+  seed: ProviderOptions;
+  remembered: ProviderOptions;
+  edits: ProviderOptions;
+  resolved: ResolvedDraftOptions | null;
+}
+
+export interface DraftOptionsModel {
+  getState: () => DraftOptionsState;
+  subscribe: (listener: () => void) => () => void;
+  /** The provider the draft's form now has. A different one than the model's is a manual choice. */
+  observeProvider: (provider: string | null) => void;
+  applyProfile: (profile: { provider: string; options: ProviderOptions }) => void;
+  setRemembered: (remembered: ProviderOptions) => void;
+  setOption: (key: string, value: unknown) => void;
+  applyResolved: (resolved: ResolvedDraftOptions) => void;
+}
+
+export function openDraftOptions(input: {
+  provider: string | null;
+  seed?: ProviderOptions;
+}): DraftOptionsModel {
+  let state: DraftOptionsState = {
+    provider: input.provider,
+    seed: input.seed ?? {},
+    remembered: {},
+    edits: {},
+    resolved: null,
+  };
+  const listeners = new Set<() => void>();
+
+  function publish(update: (current: DraftOptionsState) => DraftOptionsState): void {
+    const next = update(state);
+    if (next === state) return;
+    state = next;
+    for (const listener of listeners) listener();
+  }
+
+  return {
+    getState: () => state,
+    subscribe: (listener) => {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    },
+    observeProvider: (provider) =>
+      publish((current) => {
+        if (provider === current.provider) return current;
+        // The first provider a draft picks does not discard what it was opened with.
+        if (current.provider === null) return { ...current, provider };
+        return { ...current, provider, seed: {}, edits: {}, resolved: null };
+      }),
+    applyProfile: (profile) =>
+      publish((current) => ({
+        ...current,
+        provider: profile.provider,
+        seed: profile.options,
+        edits: {},
+        resolved: current.provider === profile.provider ? current.resolved : null,
+      })),
+    setRemembered: (remembered) => publish((current) => ({ ...current, remembered })),
+    setOption: (key, value) =>
+      publish((current) =>
+        Object.is(current.edits[key], value)
+          ? current
+          : { ...current, edits: { ...current.edits, [key]: value } },
+      ),
+    applyResolved: (resolved) => publish((current) => ({ ...current, resolved })),
+  };
+}
+
+/**
+ * Everything the draft would create with, for the daemon to resolve. A last-used value applies
+ * once the provider has told us it still draws a control for that key, and never over the seed.
+ */
+export function ownDraftOptions(state: DraftOptionsState): ProviderOptions | undefined {
+  const controlKeys = new Set((state.resolved?.controls ?? []).map((control) => control.key));
+  const remembered = Object.fromEntries(
+    Object.entries(state.remembered).filter(
+      ([key]) => controlKeys.has(key) && !(key in state.seed),
+    ),
+  );
+  const own = { ...state.seed, ...remembered, ...state.edits };
+  return Object.keys(own).length > 0 ? own : undefined;
+}
+
+export type DraftControlsRequest = Pick<
+  AgentSessionConfig,
+  "provider" | "cwd" | "modeId" | "model" | "thinkingOptionId" | "providerOptions"
+>;
+
+/**
+ * The listing request for the draft's form, built from one snapshot of the model. The form
+ * reaches a new provider before the model has observed it, and the model still holds the
+ * previous provider's options until it does; that render has no request, so a request never
+ * pairs one provider with another's options.
+ */
+export function draftControlsRequest(
+  state: DraftOptionsState,
+  form: {
+    provider: string | null;
+    cwd: string;
+    modeId?: string | null;
+    modelId?: string | null;
+    thinkingOptionId?: string | null;
+  },
+): DraftControlsRequest | null {
+  if (!form.provider || !form.cwd || form.provider !== state.provider) return null;
+  const providerOptions = ownDraftOptions(state);
+  return {
+    provider: form.provider,
+    cwd: form.cwd,
+    ...(form.modeId ? { modeId: form.modeId } : {}),
+    ...(form.modelId ? { model: form.modelId } : {}),
+    ...(form.thinkingOptionId ? { thinkingOptionId: form.thinkingOptionId } : {}),
+    ...(providerOptions ? { providerOptions } : {}),
+  };
+}
+
+/**
+ * What the controls draw: the daemon's answer for this provider. The last answer stays up while
+ * a newer request is in flight, with the toggles made since laid over it, so a switch does not
+ * wait for the round trip. It never carries a seed or remembered value the daemon has not
+ * resolved.
+ */
+export function viewDraftOptions(
+  state: DraftOptionsState,
+  current: { provider: string | null; requestKey: string },
+): { controls: AgentOptionControl[]; options: ProviderOptions } | undefined {
+  const { resolved } = state;
+  if (!resolved || resolved.provider !== current.provider) return undefined;
+  return {
+    controls: resolved.controls,
+    options:
+      resolved.requestKey === current.requestKey
+        ? resolved.options
+        : { ...resolved.options, ...state.edits },
+  };
+}
@@ -0,0 +1,16 @@
+import { Settings2 } from "lucide-react-native";
+import { describe, expect, it } from "vitest";
+import { getAgentFeatureIcon } from "./icons";
+
+describe("getAgentFeatureIcon", () => {
+  it("draws the Lucide icon a plugin provider names", () => {
+    const icon = getAgentFeatureIcon("Mic");
+    expect(icon).not.toBe(Settings2);
+    expect(getAgentFeatureIcon("Mic")).toBe(icon);
+  });
+
+  it("falls back to the generic icon for a missing or unknown name", () => {
+    expect(getAgentFeatureIcon()).toBe(Settings2);
+    expect(getAgentFeatureIcon("not-an-icon")).toBe(Settings2);
+  });
+});
@@ -13,6 +13,7 @@ import {
  ShieldQuestionMark,
  Zap,
 } from "lucide-react-native";
+import { isLucideIconName, pluginIconComponent } from "@/plugins/icons";
 import { getModeVisuals, type AgentProviderDefinition } from "@getpaseo/protocol/provider-manifest";

 export interface AgentControlIconProps {
@@ -60,6 +61,9 @@ export function getAgentModeOptionIcon(
  return icon ? MODE_ICONS[icon] : undefined;
 }

+/** A built-in control names its icon in kebab case; a plugin provider names a Lucide icon. */
 export function getAgentFeatureIcon(icon?: string): AgentControlIcon {
-  return (icon ? FEATURE_ICONS[icon] : undefined) ?? Settings2;
+  if (!icon) return Settings2;
+  if (FEATURE_ICONS[icon]) return FEATURE_ICONS[icon];
+  return isLucideIconName(icon) ? pluginIconComponent(icon) : Settings2;
 }
@@ -0,0 +1,50 @@
+import { describe, expect, it } from "vitest";
+import type { AgentOptionControl } from "@getpaseo/protocol/agent-types";
+import {
+  getControlTooltip,
+  isControlActive,
+  readSelectOption,
+  readToggleOption,
+} from "./option-controls";
+
+const speed: AgentOptionControl = {
+  type: "select",
+  key: "service_tier",
+  label: "Speed",
+  defaultValue: "default",
+  choices: [
+    { value: "default", label: "Normal" },
+    { value: "priority", label: "Fast" },
+  ],
+};
+const fast: AgentOptionControl = { type: "toggle", key: "fast_mode", label: "Fast" };
+
+describe("option controls", () => {
+  it("reads a select from options and falls back to the control's default", () => {
+    if (speed.type !== "select") throw new Error("select expected");
+    expect(readSelectOption(speed, { service_tier: "priority" })).toBe("priority");
+    expect(readSelectOption(speed, {})).toBe("default");
+    expect(readSelectOption(speed, { service_tier: "unknown-tier" })).toBe("default");
+  });
+
+  it("reads a toggle from options and is off when unset", () => {
+    if (fast.type !== "toggle") throw new Error("toggle expected");
+    expect(readToggleOption(fast, { fast_mode: true })).toBe(true);
+    expect(readToggleOption(fast, {})).toBe(false);
+  });
+
+  it("is active when the option differs from the control's default", () => {
+    expect(isControlActive(speed, { service_tier: "priority" })).toBe(true);
+    expect(isControlActive(speed, { service_tier: "default" })).toBe(false);
+    expect(isControlActive(speed, {})).toBe(false);
+    expect(isControlActive(fast, { fast_mode: true })).toBe(true);
+    expect(isControlActive(fast, {})).toBe(false);
+  });
+
+  it("prefers a control's tooltip over its label", () => {
+    expect(getControlTooltip({ label: "Plan", tooltip: "Toggle plan mode" })).toBe(
+      "Toggle plan mode",
+    );
+    expect(getControlTooltip({ label: "Custom" })).toBe("Custom");
+  });
+});
@@ -0,0 +1,47 @@
+import type {
+  AgentOptionControl,
+  AgentOptionSelectControl,
+  AgentOptionToggleControl,
+  ProviderOptions,
+} from "@getpaseo/protocol/agent-types";
+
+/**
+ * The composer's option controls. A control only describes how to draw one option key; the
+ * value is read from `options`, which the daemon resolved (defaults, aliases, what runs).
+ */
+export interface ComposerOptionControls {
+  controls: AgentOptionControl[];
+  options: ProviderOptions;
+  onSetOption: (key: string, value: unknown) => void;
+}
+
+export function readToggleOption(
+  control: AgentOptionToggleControl,
+  options: ProviderOptions,
+): boolean {
+  const value = options[control.key];
+  return typeof value === "boolean" ? value : (control.defaultValue ?? false);
+}
+
+/** The selected choice's value, or the control's default when the option names no choice. */
+export function readSelectOption(
+  control: AgentOptionSelectControl,
+  options: ProviderOptions,
+): string | null {
+  const value = options[control.key];
+  if (typeof value === "string" && control.choices.some((choice) => choice.value === value)) {
+    return value;
+  }
+  return control.defaultValue ?? null;
+}
+
+/** Whether the option is set to something other than the control's default. */
+export function isControlActive(control: AgentOptionControl, options: ProviderOptions): boolean {
+  if (control.type === "toggle") return readToggleOption(control, options);
+  const value = readSelectOption(control, options);
+  return value !== null && value !== control.defaultValue;
+}
+
+export function getControlTooltip(control: Pick<AgentOptionControl, "label" | "tooltip">): string {
+  return control.tooltip ?? control.label;
+}
@@ -23,7 +23,7 @@ describe("materializeAgentProfile", () => {
          model: "claude-opus-5",
          modeId: "plan",
          thinkingOptionId: "think-hard",
-          featureValues: { web_search: true },
+          options: { web_search: true },
        }),
      ),
    ).toEqual({
@@ -31,7 +31,7 @@ describe("materializeAgentProfile", () => {
      modelId: "claude-opus-5",
      modeId: "plan",
      thinkingOptionId: "think-hard",
-      featureValues: { web_search: true },
+      options: { web_search: true },
    });
  });

@@ -41,7 +41,7 @@ describe("materializeAgentProfile", () => {
      modelId: "",
      modeId: "",
      thinkingOptionId: "",
-      featureValues: {},
+      options: {},
    });
  });

@@ -61,7 +61,7 @@ describe("toAgentConfigApply", () => {
            model: "claude-opus-5",
            modeId: "plan",
            thinkingOptionId: "think-hard",
-            featureValues: { web_search: true },
+            options: { web_search: true },
          }),
        ),
      ),
@@ -69,7 +69,7 @@ describe("toAgentConfigApply", () => {
      modelId: "claude-opus-5",
      modeId: "plan",
      thinkingOptionId: "think-hard",
-      featureValues: { web_search: true },
+      options: { web_search: true },
    });
  });

@@ -81,8 +81,8 @@ describe("toAgentConfigApply", () => {

  it("omits an empty feature map so the agent keeps its own feature values", () => {
    expect(
-      toAgentConfigApply(materializeAgentProfile(profile({ featureValues: {} }))),
-    ).not.toHaveProperty("featureValues");
+      toAgentConfigApply(materializeAgentProfile(profile({ options: {} }))),
+    ).not.toHaveProperty("options");
  });

  it("never carries a provider, which a running agent cannot change", () => {
@@ -12,7 +12,7 @@ export interface MaterializedAgentProfile {
  modelId: string;
  modeId: string;
  thinkingOptionId: string;
-  featureValues: Record<string, unknown>;
+  options: Record<string, unknown>;
 }

 function trimmed(value: string | undefined): string {
@@ -25,7 +25,7 @@ export function materializeAgentProfile(profile: AgentProfile): MaterializedAgen
    modelId: trimmed(profile.model),
    modeId: trimmed(profile.modeId),
    thinkingOptionId: trimmed(profile.thinkingOptionId),
-    featureValues: profile.featureValues ?? {},
+    options: profile.options ?? {},
  };
 }

@@ -52,8 +52,6 @@ export function toAgentConfigApply(profile: MaterializedAgentProfile): AgentConf
    ...(profile.modelId ? { modelId: profile.modelId } : {}),
    ...(profile.modeId ? { modeId: profile.modeId } : {}),
    ...(profile.thinkingOptionId ? { thinkingOptionId: profile.thinkingOptionId } : {}),
-    ...(Object.keys(profile.featureValues).length > 0
-      ? { featureValues: profile.featureValues }
-      : {}),
+    ...(Object.keys(profile.options).length > 0 ? { options: profile.options } : {}),
  };
 }
@@ -1,7 +1,7 @@
 import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
 import { describe, expect, it } from "vitest";
 import {
-  buildFeatureRequestKey,
+  buildControlsRequestKey,
  openAgentProfileForm,
  type AgentProfileFormModel,
 } from "./profile-form-model";
@@ -173,7 +173,7 @@ describe("openAgentProfileForm", () => {
        model: "claude-opus-5",
        modeId: "plan",
        thinkingOptionId: "think-hard",
-        featureValues: { webSearch: true },
+        options: { webSearch: true },
        notes: "Visual work only.",
      },
    });
@@ -229,10 +229,11 @@ describe("openAgentProfileForm", () => {
      selectClaude(model);
      model.setModel("claude-opus-5", { label: "Opus 5" });
      model.setThinking("think-hard", { label: "Think hard" });
-      model.applyFeatures(model.getState().featureRequestKey ?? "", [
-        { type: "toggle", id: "webSearch", label: "Web search", value: false },
-      ]);
-      model.setFeatureValue("webSearch", true);
+      model.applyControls(model.getState().controlsRequestKey ?? "", {
+        controls: [{ type: "toggle", key: "webSearch", label: "Web search" }],
+        options: { webSearch: false },
+      });
+      model.setOption("webSearch", true);

      model.setProvider("codex", { label: "Codex" });
      const state = model.getState();
@@ -242,8 +243,9 @@ describe("openAgentProfileForm", () => {
      expect(state.modelDisplay).toEqual({ label: "GPT-5.2 Codex" });
      expect(state.thinkingOptionId).toBe("");
      expect(state.thinkingDisplay).toBeNull();
-      expect(state.featureValues).toEqual({});
-      expect(state.features).toEqual([]);
+      expect(state.options).toEqual({});
+      expect(state.optionEdits).toEqual({});
+      expect(state.controls).toEqual([]);
      expect(state.name).toBe("Test writer");
    });

@@ -334,23 +336,28 @@ describe("openAgentProfileForm", () => {
    });
  });

-  describe("features", () => {
-    it("asks for features per provider/model/mode/thinking combination", () => {
+  const WEB_SEARCH_CONTROLS = {
+    controls: [{ type: "toggle" as const, key: "webSearch", label: "Web search" }],
+    options: { webSearch: false },
+  };
+
+  describe("controls", () => {
+    it("asks for controls per provider/model/mode/thinking combination", () => {
      const model = openWithCatalog({ mode: "create" });
      selectClaude(model);

-      expect(model.getState().featureRequest).toEqual({
+      expect(model.getState().controlsRequest).toEqual({
        provider: "claude",
        model: "claude-opus-5",
        modeId: "plan",
        thinkingOptionId: "think",
      });
-      const firstKey = model.getState().featureRequestKey;
+      const firstKey = model.getState().controlsRequestKey;

      model.setModel("claude-haiku-4-5", { label: "Haiku 4.5" });

-      expect(model.getState().featureRequestKey).not.toBe(firstKey);
-      expect(model.getState().featureRequest).toEqual({
+      expect(model.getState().controlsRequestKey).not.toBe(firstKey);
+      expect(model.getState().controlsRequest).toEqual({
        provider: "claude",
        model: "claude-haiku-4-5",
        modeId: "plan",
@@ -361,77 +368,168 @@ describe("openAgentProfileForm", () => {
    it("moves from pending to complete only for the current request", () => {
      const model = openWithCatalog({ mode: "create" });
      selectClaude(model);
-      const key = model.getState().featureRequestKey ?? "";
-      expect(model.getState().featureResolution).toBe("pending");
+      const key = model.getState().controlsRequestKey ?? "";
+      expect(model.getState().controlsResolution).toBe("pending");

-      model.applyFeatures("stale-key", [
-        { type: "toggle", id: "webSearch", label: "Web search", value: false },
-      ]);
-      expect(model.getState().featureResolution).toBe("pending");
-      expect(model.getState().features).toEqual([]);
+      model.applyControls("stale-key", {
+        controls: [{ type: "toggle", key: "webSearch", label: "Web search" }],
+        options: { webSearch: false },
+      });
+      expect(model.getState().controlsResolution).toBe("pending");
+      expect(model.getState().controls).toEqual([]);

-      model.applyFeatures(key, [
-        { type: "toggle", id: "webSearch", label: "Web search", value: false },
-      ]);
-      expect(model.getState().featureResolution).toBe("complete");
-      expect(model.getState().disclosure.showFeaturesField).toBe(true);
+      model.applyControls(key, {
+        controls: [{ type: "toggle", key: "webSearch", label: "Web search" }],
+        options: { webSearch: false },
+      });
+      expect(model.getState().controlsResolution).toBe("complete");
+      expect(model.getState().disclosure.showControlsField).toBe(true);
    });

-    it("reflects a set feature value back into the rendered feature", () => {
+    it("reflects a set option back into the rendered controls", () => {
+      const model = openWithCatalog({ mode: "create" });
+      model.setName("Searcher");
+      selectClaude(model);
+      model.applyControls(model.getState().controlsRequestKey ?? "", WEB_SEARCH_CONTROLS);
+
+      model.setOption("webSearch", true);
+
+      expect(model.getState().controls[0]).toMatchObject({ key: "webSearch" });
+      expect(model.getState().controlOptions).toEqual({ webSearch: true });
+      expect(model.getState().submitValue?.options).toEqual({ webSearch: true });
+    });
+
+    it("keeps stored options while the controls are still pending", () => {
+      const model = openAgentProfileForm({
+        mode: "edit",
+        profile: { id: "p1", name: "UI work", provider: "claude", options: { webSearch: true } },
+      });
+      model.applyProviderCatalog(ENTRIES);
+
+      expect(model.getState().controlsResolution).toBe("pending");
+      expect(model.getState().submitValue?.options).toEqual({ webSearch: true });
+    });
+
+    it("keeps options no control draws, so editing a profile does not drop them", () => {
+      const model = openAgentProfileForm({
+        mode: "edit",
+        profile: {
+          id: "p1",
+          name: "UI work",
+          provider: "claude",
+          options: { webSearch: true, sandbox_mode: "read-only" },
+        },
+      });
+      model.applyProviderCatalog(ENTRIES);
+      model.applyControls(model.getState().controlsRequestKey ?? "", WEB_SEARCH_CONTROLS);
+      model.setOption("webSearch", false);
+
+      expect(model.getState().submitValue?.options).toEqual({
+        webSearch: false,
+        sandbox_mode: "read-only",
+      });
+    });
+
+    it("draws the options the daemon resolved from the stored ones, then the edits", () => {
+      const model = openAgentProfileForm({
+        mode: "edit",
+        profile: { id: "p1", name: "Fast", provider: "codex", options: { service_tier: "fast" } },
+      });
+      model.applyProviderCatalog(ENTRIES);
+
+      // The request carries the stored options so the daemon can resolve the legacy tier.
+      expect(model.getState().controlsRequest?.providerOptions).toEqual({ service_tier: "fast" });
+
+      model.applyControls(model.getState().controlsRequestKey ?? "", {
+        controls: [
+          {
+            type: "select",
+            key: "service_tier",
+            label: "Speed",
+            defaultValue: "default",
+            choices: [
+              { value: "default", label: "Standard" },
+              { value: "priority", label: "Fast" },
+            ],
+          },
+        ],
+        options: { service_tier: "priority" },
+      });
+
+      expect(model.getState().controlOptions).toEqual({ service_tier: "priority" });
+      // Nothing was edited, so the stored value is saved as it was.
+      expect(model.getState().submitValue?.options).toEqual({ service_tier: "fast" });
+    });
+
+    it("sends an edit to the daemon with the stored options, and draws the answer", () => {
+      const model = openAgentProfileForm({
+        mode: "edit",
+        profile: {
+          id: "p1",
+          name: "Fast",
+          provider: "codex",
+          options: { service_tier: "fast", sandbox_mode: "read-only" },
+        },
+      });
+      model.applyProviderCatalog(ENTRIES);
+      const speed = {
+        controls: [
+          {
+            type: "select" as const,
+            key: "service_tier",
+            label: "Speed",
+            defaultValue: "default",
+            choices: [
+              { value: "default", label: "Standard" },
+              { value: "priority", label: "Fast" },
+            ],
+          },
+        ],
+        options: { service_tier: "priority", sandbox_mode: "read-only" },
+      };
+      model.applyControls(model.getState().controlsRequestKey ?? "", speed);
+
+      model.setOption("service_tier", "default");
+
+      // The controls stay up while the daemon answers, with the toggle laid over the last answer.
+      expect(model.getState().controls).toHaveLength(1);
+      expect(model.getState().controlOptions).toMatchObject({ service_tier: "default" });
+      // The request carries everything the profile would save, so the daemon resolves it.
+      expect(model.getState().controlsRequest?.providerOptions).toEqual({
+        service_tier: "default",
+        sandbox_mode: "read-only",
+      });
+      expect(model.getState().controlsResolution).toBe("pending");
+
+      model.applyControls(model.getState().controlsRequestKey ?? "", {
+        ...speed,
+        options: { service_tier: "default", sandbox_mode: "read-only" },
+      });
+      expect(model.getState().controlsResolution).toBe("complete");
+      expect(model.getState().controlOptions).toEqual({
+        service_tier: "default",
+        sandbox_mode: "read-only",
+      });
+    });
+
+    it("draws no controls for the previous model while another model's answer is pending", () => {
      const model = openWithCatalog({ mode: "create" });
      selectClaude(model);
-      model.applyFeatures(model.getState().featureRequestKey ?? "", [
-        { type: "toggle", id: "webSearch", label: "Web search", value: false },
-      ]);
+      model.applyControls(model.getState().controlsRequestKey ?? "", WEB_SEARCH_CONTROLS);

-      model.setFeatureValue("webSearch", true);
+      model.setModel("claude-haiku-4-5", { label: "Haiku 4.5" });

-      expect(model.getState().features[0]).toMatchObject({ id: "webSearch", value: true });
-      expect(model.getState().featureValues).toEqual({ webSearch: true });
-    });
-
-    it("keeps stored feature values while the feature list is still pending", () => {
-      const model = openAgentProfileForm({
-        mode: "edit",
-        profile: {
-          id: "p1",
-          name: "UI work",
-          provider: "claude",
-          featureValues: { webSearch: true },
-        },
-      });
-      model.applyProviderCatalog(ENTRIES);
-
-      expect(model.getState().featureResolution).toBe("pending");
-      expect(model.getState().submitValue?.featureValues).toEqual({ webSearch: true });
-    });
-
-    it("prunes stored values the provider no longer reports", () => {
-      const model = openAgentProfileForm({
-        mode: "edit",
-        profile: {
-          id: "p1",
-          name: "UI work",
-          provider: "claude",
-          featureValues: { webSearch: true, retiredFlag: true },
-        },
-      });
-      model.applyProviderCatalog(ENTRIES);
-      model.applyFeatures(model.getState().featureRequestKey ?? "", [
-        { type: "toggle", id: "webSearch", label: "Web search", value: false },
-      ]);
-
-      expect(model.getState().featureValues).toEqual({ webSearch: true });
+      expect(model.getState().controls).toEqual([]);
    });

    it("resolves an unavailable feature listing without showing the field", () => {
      const model = openWithCatalog({ mode: "create" });
      selectClaude(model);

-      model.applyFeaturesUnavailable(model.getState().featureRequestKey ?? "");
+      model.applyControlsUnavailable(model.getState().controlsRequestKey ?? "");

-      expect(model.getState().featureResolution).toBe("complete");
-      expect(model.getState().disclosure.showFeaturesField).toBe(false);
+      expect(model.getState().controlsResolution).toBe("complete");
+      expect(model.getState().disclosure.showControlsField).toBe(false);
    });
  });

@@ -464,15 +562,15 @@ describe("openAgentProfileForm", () => {
  });
 });

-describe("buildFeatureRequestKey", () => {
+describe("buildControlsRequestKey", () => {
  it("is null without a provider", () => {
-    expect(buildFeatureRequestKey(null)).toBeNull();
+    expect(buildControlsRequestKey(null)).toBeNull();
  });

  it("separates the fields so a value cannot bleed across positions", () => {
-    expect(buildFeatureRequestKey({ provider: "claude", model: "a|b" })).toBe("claude|a|b||");
-    expect(buildFeatureRequestKey({ provider: "claude", modeId: "a" })).not.toBe(
-      buildFeatureRequestKey({ provider: "claude", model: "a" }),
+    expect(buildControlsRequestKey({ provider: "claude", model: "a|b" })).toBe("claude|a|b||");
+    expect(buildControlsRequestKey({ provider: "claude", modeId: "a" })).not.toBe(
+      buildControlsRequestKey({ provider: "claude", model: "a" }),
    );
  });
 });
@@ -1,5 +1,6 @@
 import type {
-  AgentFeature,
+  AgentOptionControl,
+  ProviderOptions,
  AgentMode,
  AgentModelDefinition,
  AgentSelectOption,
@@ -7,7 +8,6 @@ import type {
 } from "@getpaseo/protocol/agent-types";
 import type { AgentProfile } from "@getpaseo/protocol/messages";
 import { formatAgentModeLabel, formatThinkingOptionLabel } from "@/agent-controls/labels";
-import { applyFeatureValues, pruneFeatureValues } from "@/hooks/feature-preferences";
 import { filterSelectableModels } from "@/provider-selection/model-catalog";

 /**
@@ -57,11 +57,15 @@ export interface AgentProfileFormSnapshot {
 }

 /**
- * The inputs a feature listing needs. Features are provider-scoped and change
- * with model/mode/thinking, so every one of those is part of the request.
+ * The inputs a controls listing needs. Controls are provider-scoped and change
+ * with model/mode/thinking, so every one of those is part of the request. The
+ * profile's own options ride along so the daemon can resolve them (a legacy
+ * `service_tier: "fast"` is drawn as the model's Fast tier); they are the same
+ * for the life of one provider, so they are not part of the key.
 */
-export interface AgentProfileFeatureRequest {
+export interface AgentProfileControlsRequest {
  provider: string;
+  providerOptions?: ProviderOptions;
  model?: string;
  modeId?: string;
  thinkingOptionId?: string;
@@ -73,7 +77,7 @@ export interface AgentProfileFormDisclosure {
  showModelField: boolean;
  showModeField: boolean;
  showThinkingField: boolean;
-  showFeaturesField: boolean;
+  showControlsField: boolean;
 }

 export interface AgentProfileFormState {
@@ -86,13 +90,18 @@ export interface AgentProfileFormState {
  modelId: string;
  modeId: string;
  thinkingOptionId: string;
-  featureValues: Record<string, unknown>;
+  /** The options the profile was opened with, including ones no control draws. */
+  options: ProviderOptions;
+  /** Changes made in this form, over `options`. */
+  optionEdits: ProviderOptions;

  providerOptions: AgentProfileFormOption[];
  modelOptions: AgentProfileFormOption[];
  modeOptions: AgentProfileFormOption[];
  thinkingOptions: AgentProfileFormOption[];
-  features: AgentFeature[];
+  controls: AgentOptionControl[];
+  /** What the controls show: the options the daemon resolved from `options`, then the edits. */
+  controlOptions: ProviderOptions;

  providerDisplay: AgentProfileFormDisplay | null;
  modelDisplay: AgentProfileFormDisplay | null;
@@ -100,9 +109,9 @@ export interface AgentProfileFormState {
  thinkingDisplay: AgentProfileFormDisplay | null;

  catalogResolution: AgentProfileResolutionStatus;
-  featureResolution: AgentProfileResolutionStatus;
-  featureRequest: AgentProfileFeatureRequest | null;
-  featureRequestKey: string | null;
+  controlsResolution: AgentProfileResolutionStatus;
+  controlsRequest: AgentProfileControlsRequest | null;
+  controlsRequestKey: string | null;

  disclosure: AgentProfileFormDisclosure;
  isSubmitting: boolean;
@@ -118,9 +127,12 @@ export interface AgentProfileFormModel {
  /** Late input: the host-scoped provider catalog. Never touches selections. */
  applyProviderCatalog: (entries: readonly ProviderSnapshotEntry[]) => void;
  /** Late input: the feature list for one request. Stale keys are ignored. */
-  applyFeatures: (requestKey: string, features: readonly AgentFeature[]) => void;
+  applyControls: (
+    requestKey: string,
+    resolved: { controls: readonly AgentOptionControl[]; options: ProviderOptions },
+  ) => void;
  /** Resolve a request that produced no usable features (provider error). */
-  applyFeaturesUnavailable: (requestKey: string) => void;
+  applyControlsUnavailable: (requestKey: string) => void;
  setName: (value: string) => void;
  setAppearance: (value: { icon: string; color: string }) => void;
  setNotes: (value: string) => void;
@@ -128,7 +140,7 @@ export interface AgentProfileFormModel {
  setModel: (modelId: string, display: AgentProfileFormDisplay | null) => void;
  setMode: (modeId: string, display: AgentProfileFormDisplay | null) => void;
  setThinking: (thinkingOptionId: string, display: AgentProfileFormDisplay | null) => void;
-  setFeatureValue: (featureId: string, value: unknown) => void;
+  setOption: (key: string, value: unknown) => void;
  setSubmitting: (value: boolean) => void;
  setSubmitError: (value: string | null) => void;
 }
@@ -312,19 +324,29 @@ function refineDisplay(
  return current ?? { label: selectedId };
 }

-function buildFeatureRequest(state: AgentProfileFormState): AgentProfileFeatureRequest | null {
+function buildControlsRequest(state: AgentProfileFormState): AgentProfileControlsRequest | null {
  if (!state.provider) {
    return null;
  }
+  const ownOptions = ownOptionsOf(state);
  return {
    provider: state.provider,
    ...(state.modelId ? { model: state.modelId } : {}),
    ...(state.modeId ? { modeId: state.modeId } : {}),
    ...(state.thinkingOptionId ? { thinkingOptionId: state.thinkingOptionId } : {}),
+    ...(Object.keys(ownOptions).length > 0 ? { providerOptions: ownOptions } : {}),
  };
 }

-export function buildFeatureRequestKey(request: AgentProfileFeatureRequest | null): string | null {
+/** Everything the profile would save as its options; the daemon resolves them for the form. */
+function ownOptionsOf(
+  state: Pick<AgentProfileFormState, "options" | "optionEdits">,
+): ProviderOptions {
+  return { ...state.options, ...state.optionEdits };
+}
+
+/** The part of a request that decides which controls exist; options only change their values. */
+function buildControlsScopeKey(request: AgentProfileControlsRequest | null): string | null {
  if (!request) {
    return null;
  }
@@ -336,12 +358,25 @@ export function buildFeatureRequestKey(request: AgentProfileFeatureRequest | nul
  ].join("|");
 }

+export function buildControlsRequestKey(
+  request: AgentProfileControlsRequest | null,
+): string | null {
+  if (!request) {
+    return null;
+  }
+  const scope = buildControlsScopeKey(request);
+  return request.providerOptions
+    ? `${scope}|${JSON.stringify(Object.entries(request.providerOptions).sort(([a], [b]) => a.localeCompare(b)))}`
+    : scope;
+}
+
 function buildSubmitValue(state: AgentProfileFormState): AgentProfileValue | null {
  const name = state.name.trim();
  const notes = state.notes.trim();
  if (!name || !state.provider) {
    return null;
  }
+  const options = ownOptionsOf(state);
  return {
    name,
    ...(state.icon ? { icon: state.icon } : {}),
@@ -350,16 +385,16 @@ function buildSubmitValue(state: AgentProfileFormState): AgentProfileValue | nul
    ...(state.modelId ? { model: state.modelId } : {}),
    ...(state.modeId ? { modeId: state.modeId } : {}),
    ...(state.thinkingOptionId ? { thinkingOptionId: state.thinkingOptionId } : {}),
-    ...(Object.keys(state.featureValues).length > 0 ? { featureValues: state.featureValues } : {}),
+    ...(Object.keys(options).length > 0 ? { options } : {}),
    ...(notes ? { notes } : {}),
  };
 }

-function resolveFeatureStatus(
-  featureRequestKey: string | null,
+function resolveControlsStatus(
+  controlsRequestKey: string | null,
  featuresAreCurrent: boolean,
 ): AgentProfileResolutionStatus {
-  if (featureRequestKey === null) {
+  if (controlsRequestKey === null) {
    return "idle";
  }
  return featuresAreCurrent ? "complete" : "pending";
@@ -392,25 +427,27 @@ function buildInitialState(snapshot: AgentProfileFormSnapshot): AgentProfileForm
    modelId,
    modeId: profile.modeId ?? "",
    thinkingOptionId: profile.thinkingOptionId ?? "",
-    featureValues: { ...profile.featureValues },
+    options: { ...profile.options },
+    optionEdits: {},
    providerOptions: [],
    modelOptions: [],
    modeOptions: [],
    thinkingOptions: [],
-    features: [],
+    controls: [],
+    controlOptions: {},
    providerDisplay: seedDisplay(provider),
    modelDisplay: seedDisplay(modelId),
    modeDisplay: seedDisplay(profile.modeId),
    thinkingDisplay: seedDisplay(profile.thinkingOptionId),
    catalogResolution: "idle",
-    featureResolution: "idle",
-    featureRequest: null,
-    featureRequestKey: null,
+    controlsResolution: "idle",
+    controlsRequest: null,
+    controlsRequestKey: null,
    disclosure: {
      showModelField: false,
      showModeField: false,
      showThinkingField: false,
-      showFeaturesField: false,
+      showControlsField: false,
    },
    isSubmitting: false,
    submitError: null,
@@ -422,8 +459,10 @@ function buildInitialState(snapshot: AgentProfileFormSnapshot): AgentProfileForm
 export function openAgentProfileForm(snapshot: AgentProfileFormSnapshot): AgentProfileFormModel {
  let entries: readonly ProviderSnapshotEntry[] = [];
  let catalogResolution: AgentProfileResolutionStatus = "idle";
-  let resolvedFeatureKey: string | null = null;
-  let resolvedFeatures: AgentFeature[] = [];
+  let resolvedControlsKey: string | null = null;
+  let resolvedScopeKey: string | null = null;
+  let resolvedControls: AgentOptionControl[] = [];
+  let resolvedOptions: ProviderOptions = {};
  let listeners = new Set<() => void>();
  let closed = false;

@@ -436,14 +475,23 @@ export function openAgentProfileForm(snapshot: AgentProfileFormSnapshot): AgentP
      modes,
    });
    const thinking = resolveThinkingOptions(entries, next.provider, next.modelId);
-    const featureRequest = buildFeatureRequest(next);
-    const featureRequestKey = buildFeatureRequestKey(featureRequest);
+    const controlsRequest = buildControlsRequest(next);
+    const controlsRequestKey = buildControlsRequestKey(controlsRequest);
+    const controlsScopeKey = buildControlsScopeKey(controlsRequest);
    const featuresAreCurrent =
-      featureRequestKey !== null && featureRequestKey === resolvedFeatureKey;
-    const features = featuresAreCurrent
-      ? applyFeatureValues(resolvedFeatures, next.featureValues)
-      : [];
-    const featureResolution = resolveFeatureStatus(featureRequestKey, featuresAreCurrent);
+      controlsRequestKey !== null && controlsRequestKey === resolvedControlsKey;
+    // A toggle changes only the options, so the controls stay up while the daemon answers and the
+    // toggle shows over the last answer. A change of provider, model, mode or thinking draws none
+    // until its own answer arrives.
+    const controlsApply = controlsScopeKey !== null && controlsScopeKey === resolvedScopeKey;
+    const controls = controlsApply ? resolvedControls : [];
+    let controlOptions: ProviderOptions = next.options;
+    if (controlsApply) {
+      controlOptions = featuresAreCurrent
+        ? resolvedOptions
+        : { ...resolvedOptions, ...next.optionEdits };
+    }
+    const controlsResolution = resolveControlsStatus(controlsRequestKey, featuresAreCurrent);

    const withOptions: AgentProfileFormState = {
      ...next,
@@ -451,7 +499,8 @@ export function openAgentProfileForm(snapshot: AgentProfileFormSnapshot): AgentP
      modelOptions: buildModelOptions(models),
      modeOptions: buildModeOptions(modes),
      thinkingOptions: buildThinkingOptions(thinking),
-      features,
+      controls,
+      controlOptions,
      providerDisplay: refineDisplay(
        next.providerDisplay,
        next.provider,
@@ -479,9 +528,9 @@ export function openAgentProfileForm(snapshot: AgentProfileFormSnapshot): AgentP
        })(),
      ),
      catalogResolution,
-      featureResolution,
-      featureRequest,
-      featureRequestKey,
+      controlsResolution,
+      controlsRequest,
+      controlsRequestKey,
    };

    // A field appears once the catalog can populate it, and stays visible while
@@ -492,7 +541,7 @@ export function openAgentProfileForm(snapshot: AgentProfileFormSnapshot): AgentP
      showModeField: hasProvider && (modes.length > 0 || Boolean(withOptions.modeId)),
      showThinkingField:
        hasProvider && (thinking.length > 0 || Boolean(withOptions.thinkingOptionId)),
-      showFeaturesField: hasProvider && features.length > 0,
+      showControlsField: hasProvider && controls.length > 0,
    };
    const canSubmit =
      withOptions.name.trim().length > 0 &&
@@ -531,23 +580,24 @@ export function openAgentProfileForm(snapshot: AgentProfileFormSnapshot): AgentP
      catalogResolution = "complete";
      publish((current) => current);
    },
-    applyFeatures: (requestKey, features) => {
-      if (requestKey !== state.featureRequestKey) {
+    applyControls: (requestKey, resolved) => {
+      if (requestKey !== state.controlsRequestKey) {
        return;
      }
-      resolvedFeatureKey = requestKey;
-      resolvedFeatures = [...features];
-      publish((current) => ({
-        ...current,
-        featureValues: pruneFeatureValues(current.featureValues, resolvedFeatures),
-      }));
+      resolvedControlsKey = requestKey;
+      resolvedScopeKey = buildControlsScopeKey(state.controlsRequest);
+      resolvedControls = [...resolved.controls];
+      resolvedOptions = resolved.options;
+      publish((current) => current);
    },
-    applyFeaturesUnavailable: (requestKey) => {
-      if (requestKey !== state.featureRequestKey) {
+    applyControlsUnavailable: (requestKey) => {
+      if (requestKey !== state.controlsRequestKey) {
        return;
      }
-      resolvedFeatureKey = requestKey;
-      resolvedFeatures = [];
+      resolvedControlsKey = requestKey;
+      resolvedScopeKey = buildControlsScopeKey(state.controlsRequest);
+      resolvedControls = [];
+      resolvedOptions = {};
      publish((current) => current);
    },
    setName: (value) => publish((current) => ({ ...current, name: value })),
@@ -572,7 +622,8 @@ export function openAgentProfileForm(snapshot: AgentProfileFormSnapshot): AgentP
          modeDisplay: null,
          thinkingOptionId: "",
          thinkingDisplay: null,
-          featureValues: {},
+          options: {},
+          optionEdits: {},
        };
      }),
    setModel: (modelId, display) =>
@@ -598,10 +649,10 @@ export function openAgentProfileForm(snapshot: AgentProfileFormSnapshot): AgentP
      publish((current) => ({ ...current, modeId, modeDisplay: display })),
    setThinking: (thinkingOptionId, display) =>
      publish((current) => ({ ...current, thinkingOptionId, thinkingDisplay: display })),
-    setFeatureValue: (featureId, value) =>
+    setOption: (key, value) =>
      publish((current) => ({
        ...current,
-        featureValues: { ...current.featureValues, [featureId]: value },
+        optionEdits: { ...current.optionEdits, [key]: value },
      })),
    setSubmitting: (value) => publish((current) => ({ ...current, isSubmitting: value })),
    setSubmitError: (value) => publish((current) => ({ ...current, submitError: value })),
@@ -47,7 +47,7 @@ export function buildAgentProfileTags(input: {
    tags.push({ id: "thinking", label: formatThinkingOptionLabel({ id: thinkingOptionId }) });
  }

-  const featureCount = Object.keys(input.profile.featureValues ?? {}).length;
+  const featureCount = Object.keys(input.profile.options ?? {}).length;
  if (featureCount > 0) {
    tags.push({ id: "features", label: input.formatFeatureCount(featureCount) });
  }
@@ -117,9 +117,7 @@ export function useAgentProfilePicker(
          modelId: resolved.modelId,
          modeId: resolved.modeId,
          thinkingOptionId: resolved.thinkingOptionId,
-          ...(Object.keys(resolved.featureValues).length > 0
-            ? { featureValues: resolved.featureValues }
-            : {}),
+          ...(Object.keys(resolved.options).length > 0 ? { options: resolved.options } : {}),
        }),
      ).catch((error) => {
        console.warn("[useAgentProfilePicker] persist profile selection failed", error);
@@ -27,7 +27,7 @@ export function useAgentProfileFormCatalog(input: {
  }, [entries, input.model]);
 }

-export function useAgentProfileFormFeatures(input: {
+export function useAgentProfileFormControls(input: {
  serverId: string;
  model: AgentProfileFormModel;
  state: AgentProfileFormState;
@@ -35,14 +35,14 @@ export function useAgentProfileFormFeatures(input: {
  const { t } = useTranslation();
  const client = useHostRuntimeClient(input.serverId);
  const isConnected = useHostRuntimeIsConnected(input.serverId);
-  const request = input.state.featureRequest;
-  const requestKey = input.state.featureRequestKey;
+  const request = input.state.controlsRequest;
+  const requestKey = input.state.controlsRequestKey;

  // `dataShape: "value"` and not `"list"`: a list shape keeps the previous
  // page's data while the next request is in flight, which would hand the
  // features of one provider/model combination to the key of another.
-  const featuresQuery = useFetchQuery({
-    queryKey: ["agentProfileFeatures", input.serverId, requestKey],
+  const controlsQuery = useFetchQuery({
+    queryKey: ["agentProfileControls", input.serverId, requestKey],
    dataShape: "value",
    staleTimeMs: 5 * 60 * 1000,
    enabled: Boolean(client && isConnected && request),
@@ -51,28 +51,28 @@ export function useAgentProfileFormFeatures(input: {
      if (!client || !request) {
        throw new Error(t("workspace.terminal.hostDisconnected"));
      }
-      const payload = await client.listProviderFeatures({ ...request, cwd: HOME_SCOPE_CWD });
+      const payload = await client.listProviderControls({ ...request, cwd: HOME_SCOPE_CWD });
      if (payload.error) {
        throw new Error(payload.error);
      }
-      return payload.features ?? [];
+      return { controls: payload.controls ?? [], options: payload.options ?? {} };
    },
  });

-  const { data, isError } = featuresQuery;
+  const { data, isError } = controlsQuery;
  const { model } = input;

  useEffect(() => {
    if (!requestKey || !data) {
      return;
    }
-    model.applyFeatures(requestKey, data);
+    model.applyControls(requestKey, data);
  }, [data, model, requestKey]);

  useEffect(() => {
    if (!requestKey || !isError) {
      return;
    }
-    model.applyFeaturesUnavailable(requestKey);
+    model.applyControlsUnavailable(requestKey);
  }, [isError, model, requestKey]);
 }
@@ -2,7 +2,8 @@ import { useCallback, useEffect, useMemo, useRef, useState, type ReactElement }
 import { Text, View } from "react-native";
 import { useTranslation } from "react-i18next";
 import { StyleSheet } from "react-native-unistyles";
-import type { AgentFeature } from "@getpaseo/protocol/agent-types";
+import type { AgentOptionControl, ProviderOptions } from "@getpaseo/protocol/agent-types";
+import { readSelectOption, readToggleOption } from "@/agent-controls/option-controls";
 import type { AgentProfile } from "@getpaseo/protocol/messages";
 import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
@@ -25,7 +26,7 @@ import type {
 } from "../internal/profile-form-model";
 import {
  useAgentProfileFormCatalog,
-  useAgentProfileFormFeatures,
+  useAgentProfileFormControls,
 } from "../internal/use-profile-form-inputs";
 import {
  useAgentProfileFormModel,
@@ -141,7 +142,7 @@ function OpenAgentProfileEditModal({
  const model = useAgentProfileFormModel(snapshot);
  const state = useAgentProfileFormState(model);
  useAgentProfileFormCatalog({ serverId, model });
-  useAgentProfileFormFeatures({ serverId, model, state });
+  useAgentProfileFormControls({ serverId, model, state });

  const sheetHeader = useMemo<SheetHeader>(
    () => ({
@@ -328,16 +329,17 @@ function OpenAgentProfileEditModal({
          />
        ) : null}

-        {state.disclosure.showFeaturesField ? (
+        {state.disclosure.showControlsField ? (
          <Field
            label={t("settings.host.agentProfiles.featuresLabel")}
            testID="agent-profile-features-field"
          >
            <View style={styles.featureCard} testID="agent-profile-features-card">
-              {state.features.map((feature, index) => (
-                <AgentProfileFeatureRow
-                  key={feature.id}
-                  feature={feature}
+              {state.controls.map((control, index) => (
+                <AgentProfileControlRow
+                  key={control.key}
+                  control={control}
+                  options={state.controlOptions}
                  isFirst={index === 0}
                  disabled={state.isSubmitting}
                  size={controlSize}
@@ -400,14 +402,16 @@ function OpenAgentProfileEditModal({
  );
 }

-function AgentProfileFeatureRow({
-  feature,
+function AgentProfileControlRow({
+  control,
+  options,
  isFirst,
  disabled,
  size,
  model,
 }: {
-  feature: AgentFeature;
+  control: AgentOptionControl;
+  options: ProviderOptions;
  isFirst: boolean;
  disabled: boolean;
  size: FieldControlSize;
@@ -418,74 +422,75 @@ function AgentProfileFeatureRow({
    [isFirst],
  );
  const handleToggle = useCallback(
-    (value: boolean) => model.setFeatureValue(feature.id, value),
-    [feature.id, model],
+    (value: boolean) => model.setOption(control.key, value),
+    [control.key, model],
  );
  const handleSelect = useCallback(
-    (value: string) => model.setFeatureValue(feature.id, value),
-    [feature.id, model],
+    (value: string) => model.setOption(control.key, value),
+    [control.key, model],
  );
  const selectOptions = useMemo<SelectFieldOption<string>[]>(
    () =>
-      feature.type === "select"
-        ? feature.options.map((option) => ({
-            id: option.id,
-            value: option.id,
-            label: option.label,
-            ...(option.description ? { description: option.description } : {}),
-            testID: `agent-profile-feature-option-${feature.id}-${option.id}`,
+      control.type === "select"
+        ? control.choices.map((choice) => ({
+            id: choice.value,
+            value: choice.value,
+            label: choice.label,
+            ...(choice.description ? { description: choice.description } : {}),
+            testID: `agent-profile-feature-option-${control.key}-${choice.value}`,
          }))
        : [],
-    [feature],
+    [control],
  );
+  const selectedValue = control.type === "select" ? readSelectOption(control, options) : null;
  const selectedDisplay = useMemo<SelectFieldDisplay | null>(() => {
-    if (feature.type !== "select" || !feature.value) {
+    if (control.type !== "select" || !selectedValue) {
      return null;
    }
-    const option = feature.options.find((candidate) => candidate.id === feature.value);
-    return { label: option?.label ?? feature.value };
-  }, [feature]);
+    const choice = control.choices.find((candidate) => candidate.value === selectedValue);
+    return { label: choice?.label ?? selectedValue };
+  }, [control, selectedValue]);

-  if (feature.type === "select") {
+  if (control.type === "select") {
    return (
-      <View style={rowStyle} testID={`agent-profile-feature-row-${feature.id}`}>
+      <View style={rowStyle} testID={`agent-profile-feature-row-${control.key}`}>
        <SelectField
-          label={feature.label}
-          value={feature.value}
+          label={control.label}
+          value={selectedValue}
          selectedDisplay={selectedDisplay}
          options={selectOptions}
          onChange={handleSelect}
-          placeholder={feature.label}
-          emptyText={feature.label}
+          placeholder={control.label}
+          emptyText={control.label}
          disabled={disabled}
-          {...(feature.description ? { hint: feature.description } : {})}
-          title={feature.label}
+          {...(control.description ? { hint: control.description } : {})}
+          title={control.label}
          size={size}
-          testID={`agent-profile-feature-field-${feature.id}`}
-          triggerTestID={`agent-profile-feature-trigger-${feature.id}`}
+          testID={`agent-profile-feature-field-${control.key}`}
+          triggerTestID={`agent-profile-feature-trigger-${control.key}`}
        />
      </View>
    );
  }

  return (
-    <View style={rowStyle} testID={`agent-profile-feature-row-${feature.id}`}>
+    <View style={rowStyle} testID={`agent-profile-feature-row-${control.key}`}>
      <View style={styles.featureMeta}>
        <Text style={styles.featureLabel} numberOfLines={1}>
-          {feature.label}
+          {control.label}
        </Text>
-        {feature.description ? (
+        {control.description ? (
          <Text style={styles.featureDescription} numberOfLines={2}>
-            {feature.description}
+            {control.description}
          </Text>
        ) : null}
      </View>
      <Switch
-        value={feature.value === true}
+        value={readToggleOption(control, options)}
        onValueChange={handleToggle}
        disabled={disabled}
-        accessibilityLabel={feature.label}
-        testID={`agent-profile-feature-switch-${feature.id}`}
+        accessibilityLabel={control.label}
+        testID={`agent-profile-feature-switch-${control.key}`}
      />
    </View>
  );
@@ -1304,7 +1304,8 @@ function collectAgentSetupDiffs(left: AgentScreenAgent, right: AgentScreenAgent)
  if (left.runtimeInfo?.thinkingOptionId !== right.runtimeInfo?.thinkingOptionId) {
    reasons.push("agent.runtimeInfo.thinkingOptionId");
  }
-  if (left.features !== right.features) reasons.push("agent.features");
+  if (left.options !== right.options) reasons.push("agent.options");
+  if (left.controls !== right.controls) reasons.push("agent.controls");
  return reasons;
 }

@@ -40,16 +40,7 @@ function createAgent(overrides: Partial<Agent> = {}): Agent {
    cwd: "/repo",
    model: "agent-model",
    thinkingOptionId: "think-hard",
-    features: [
-      { type: "toggle", id: "web-search", label: "Web search", value: true },
-      {
-        type: "select",
-        id: "effort",
-        label: "Effort",
-        value: "high",
-        options: [{ id: "high", label: "High" }],
-      },
-    ],
+    options: { "web-search": true, effort: "high" },
    parentAgentId: null,
    labels: {},
    ...overrides,
@@ -114,7 +105,7 @@ describe("buildDraftAgentSetup", () => {
      modeId: "mode-current",
      model: "agent-model",
      thinkingOptionId: "think-hard",
-      featureValues: {
+      providerOptions: {
        "web-search": true,
        effort: "high",
      },
@@ -65,17 +65,12 @@ export function resolveClientSlashCommand(input: {
 }

 export function buildDraftAgentSetup(agent: Agent): WorkspaceDraftTabSetup {
-  const featureValues: Record<string, unknown> = {};
-  for (const feature of agent.features ?? []) {
-    featureValues[feature.id] = feature.value;
-  }
-
  return {
    provider: agent.provider,
    cwd: agent.cwd,
    modeId: agent.currentModeId ?? agent.runtimeInfo?.modeId ?? null,
    model: agent.model ?? agent.runtimeInfo?.model ?? null,
    thinkingOptionId: agent.thinkingOptionId ?? agent.runtimeInfo?.thinkingOptionId ?? null,
-    featureValues,
+    providerOptions: { ...agent.options },
  };
 }
@@ -1,5 +1,9 @@
 import { describe, expect, it } from "vitest";
-import type { AgentFeature, AgentMode, AgentSelectOption } from "@getpaseo/protocol/agent-types";
+import type {
+  AgentMode,
+  AgentOptionControl,
+  AgentSelectOption,
+} from "@getpaseo/protocol/agent-types";
 import type { ProviderSelectorProvider } from "@/provider-selection/provider-selection";
 import type { CommandCenterContribution } from "./contributions";
 import {
@@ -31,7 +35,7 @@ const ICONS: AgentControlContributionSource["icons"] = {
  thinking: TestIcon,
  planMode: TestIcon,
  mode: () => TestIcon,
-  feature: () => TestIcon,
+  control: () => TestIcon,
 };

 function provider(input: {
@@ -65,8 +69,8 @@ function provider(input: {
  };
 }

-function toggleFeature(id: string, value = false, icon?: string): AgentFeature {
-  return { type: "toggle", id, label: id, value, icon };
+function toggleControl(key: string, icon?: string): AgentOptionControl {
+  return { type: "toggle", key, label: key, icon };
 }

 function makeSource(
@@ -75,7 +79,7 @@ function makeSource(
    models?: Partial<AgentControlContributionSource["models"]>;
    thinking?: Partial<AgentControlContributionSource["thinking"]>;
    modes?: Partial<NonNullable<AgentControlContributionSource["modes"]>>;
-    features?: Partial<AgentControlContributionSource["features"]>;
+    optionControls?: Partial<AgentControlContributionSource["optionControls"]>;
  } = {},
 ): AgentControlContributionSource {
  return {
@@ -104,10 +108,11 @@ function makeSource(
      select: () => undefined,
      ...overrides.modes,
    },
-    features: {
-      list: [],
-      set: () => undefined,
-      ...overrides.features,
+    optionControls: {
+      controls: [],
+      options: {},
+      onSetOption: () => undefined,
+      ...overrides.optionControls,
    },
  };
 }
@@ -133,7 +138,7 @@ describe("Command Center agent-control contributions", () => {
    const contributions = buildAgentControlContributions({
      ...makeSource({
        models: { providers: [provider({ id: "claude", label: "Claude" })] },
-        features: { list: [toggleFeature("plan_mode", true)] },
+        optionControls: { controls: [toggleControl("plan_mode")], options: { plan_mode: true } },
      }),
      modes: undefined,
    });
@@ -323,9 +328,10 @@ describe("Command Center agent-control contributions", () => {
          selectedId: "default",
          defaultModeId: "default",
        },
-        features: {
-          list: [toggleFeature("plan_mode", true, "list-todo")],
-          set: (id, value) => {
+        optionControls: {
+          controls: [toggleControl("plan_mode", "list-todo")],
+          options: { plan_mode: true },
+          onSetOption: (id, value) => {
            calls.push([id, value]);
          },
        },
@@ -341,9 +347,10 @@ describe("Command Center agent-control contributions", () => {
    const calls: [string, unknown][] = [];
    const contributions = buildAgentControlContributions(
      makeSource({
-        features: {
-          list: [toggleFeature("fast_mode", false, "zap"), toggleFeature("auto_accept", true)],
-          set: (id, value) => {
+        optionControls: {
+          controls: [toggleControl("fast_mode", "zap"), toggleControl("auto_accept")],
+          options: { fast_mode: false, auto_accept: true },
+          onSetOption: (id, value) => {
            calls.push([id, value]);
          },
        },
@@ -376,7 +383,7 @@ describe("Command Center agent-control contributions", () => {
          selectedId: "default",
          defaultModeId: "default",
        },
-        features: { list: [toggleFeature("fast_mode")] },
+        optionControls: { controls: [toggleControl("fast_mode")], options: {} },
      }),
    );
    const ranks = new Map<string, number>();
@@ -1,9 +1,10 @@
 import type {
-  AgentFeature,
  AgentMode,
+  AgentOptionControl,
  AgentProvider,
  AgentSelectOption,
 } from "@getpaseo/protocol/agent-types";
+import { readToggleOption, type ComposerOptionControls } from "@/agent-controls/option-controls";
 import type { ProviderSelectorProvider } from "@/provider-selection/provider-selection";
 import { formatAgentModeLabel, formatThinkingOptionLabel } from "@/agent-controls/labels";
 import {
@@ -61,7 +62,7 @@ export interface AgentControlContributionIcons {
  thinking: CommandCenterIcon;
  planMode: CommandCenterIcon;
  mode(modeId: string): CommandCenterIcon;
-  feature(feature: AgentFeature): CommandCenterIcon;
+  control(control: AgentOptionControl): CommandCenterIcon;
 }

 interface CommandCenterChoice {
@@ -105,10 +106,7 @@ export interface AgentControlContributionSource {
    defaultModeId: string | null;
    select(modeId: string): void | Promise<void>;
  };
-  features: {
-    list: readonly AgentFeature[];
-    set(featureId: string, value: unknown): void | Promise<void>;
-  };
+  optionControls: ComposerOptionControls;
 }

 function buildContributions(
@@ -242,18 +240,19 @@ function toggleChoices(input: {
 }

 function buildPlanModeGroup(source: AgentControlContributionSource): CommandCenterChoiceGroup {
-  const planFeature = source.features.list.find(
-    (feature) => feature.id === PLAN_MODE_FEATURE_ID && feature.type === "toggle",
+  const { controls, options, onSetOption } = source.optionControls;
+  const planControl = controls.find(
+    (control) => control.key === PLAN_MODE_FEATURE_ID && control.type === "toggle",
  );
  let choices: CommandCenterChoice[] = [];
-  if (planFeature?.type === "toggle") {
+  if (planControl?.type === "toggle") {
    choices = toggleChoices({
      source,
      key: "plan",
-      icon: source.icons.feature(planFeature),
-      isOn: planFeature.value,
-      turnOn: () => source.features.set(PLAN_MODE_FEATURE_ID, true),
-      turnOff: () => source.features.set(PLAN_MODE_FEATURE_ID, false),
+      icon: source.icons.control(planControl),
+      isOn: readToggleOption(planControl, options),
+      turnOn: () => onSetOption(PLAN_MODE_FEATURE_ID, true),
+      turnOff: () => onSetOption(PLAN_MODE_FEATURE_ID, false),
    });
  } else if (source.modes) {
    const modes = source.modes;
@@ -280,18 +279,19 @@ function buildPlanModeGroup(source: AgentControlContributionSource): CommandCent
 }

 function buildFastModeGroup(source: AgentControlContributionSource): CommandCenterChoiceGroup {
-  const fastFeature = source.features.list.find(
-    (feature) => feature.id === FAST_MODE_FEATURE_ID && feature.type === "toggle",
+  const { controls, options, onSetOption } = source.optionControls;
+  const fastControl = controls.find(
+    (control) => control.key === FAST_MODE_FEATURE_ID && control.type === "toggle",
  );
  const choices =
-    fastFeature?.type === "toggle"
+    fastControl?.type === "toggle"
      ? toggleChoices({
          source,
          key: "fast",
-          icon: source.icons.feature(fastFeature),
-          isOn: fastFeature.value,
-          turnOn: () => source.features.set(FAST_MODE_FEATURE_ID, true),
-          turnOff: () => source.features.set(FAST_MODE_FEATURE_ID, false),
+          icon: source.icons.control(fastControl),
+          isOn: readToggleOption(fastControl, options),
+          turnOn: () => onSetOption(FAST_MODE_FEATURE_ID, true),
+          turnOff: () => onSetOption(FAST_MODE_FEATURE_ID, false),
        })
      : [];
  return {
@@ -1,11 +1,6 @@
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import type {
-  AgentFeature,
-  AgentMode,
-  AgentProvider,
-  AgentSelectOption,
-} from "@getpaseo/protocol/agent-types";
+import type { AgentMode, AgentProvider, AgentSelectOption } from "@getpaseo/protocol/agent-types";
 import type { AgentProviderDefinition } from "@getpaseo/protocol/provider-manifest";
 import {
  getAgentFeatureIcon,
@@ -14,6 +9,7 @@ import {
  ThinkingIcon,
 } from "@/agent-controls/icons";
 import { useProviderIcons } from "@/components/provider-icons";
+import type { ComposerOptionControls } from "@/agent-controls/option-controls";
 import type { ProviderSelectorProvider } from "@/provider-selection/provider-selection";
 import {
  buildAgentControlContributions,
@@ -44,15 +40,15 @@ export interface AgentControlCommandCenterSource {
    selectedId: string | null | undefined;
    select(modeId: string): void | Promise<void>;
  };
-  features: {
-    list: readonly AgentFeature[] | undefined;
-    set?: (featureId: string, value: unknown) => void | Promise<void>;
-  };
+  /** Absent when the surface cannot change options (the agent has no client). */
+  optionControls: ComposerOptionControls | null;
 }

-function ignoreAgentFeatureChange(): void {
-  return;
-}
+const NO_OPTION_CONTROLS: ComposerOptionControls = {
+  controls: [],
+  options: {},
+  onSetOption: () => undefined,
+};

 function resolveDefaultModeId(
  provider: string | null | undefined,
@@ -87,7 +83,7 @@ export function useAgentControlCommandCenterActions(input: {
 }): void {
  const { t } = useTranslation();
  const { controls } = input;
-  const { features, models, modes, thinking } = controls;
+  const { optionControls, models, modes, thinking } = controls;
  const getProviderIcon = useProviderIcons(controls.serverId);
  const actions = useMemo(
    () =>
@@ -104,7 +100,7 @@ export function useAgentControlCommandCenterActions(input: {
            getCommandCenterIcon(
              getAgentModeIcon(controls.provider ?? "", modeId, controls.providerDefinitions),
            ),
-          feature: (feature) => getCommandCenterIcon(getAgentFeatureIcon(feature.icon)),
+          control: (control) => getCommandCenterIcon(getAgentFeatureIcon(control.icon)),
        },
        models: {
          providers: models.providers,
@@ -123,10 +119,7 @@ export function useAgentControlCommandCenterActions(input: {
          modes?.select,
          resolveDefaultModeId(controls.provider, controls.providerDefinitions),
        ),
-        features: {
-          list: features.set ? (features.list ?? []) : [],
-          set: features.set ?? ignoreAgentFeatureChange,
-        },
+        optionControls: optionControls ?? NO_OPTION_CONTROLS,
      }),
    [
      getProviderIcon,
@@ -134,8 +127,7 @@ export function useAgentControlCommandCenterActions(input: {
      controls.provider,
      controls.providerDefinitions,
      controls.serverId,
-      features.list,
-      features.set,
+      optionControls,
      models.providers,
      models.select,
      models.selectedModelId,
@@ -6,15 +6,12 @@ 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,
-  serializeConnectionUriForStorage,
-} from "@/utils/daemon-endpoints";
+import { parseConnectionUri, serializeConnectionUri } from "@/utils/daemon-endpoints";
 import { buildConnectionFailureCopy } from "./connection-failure-copy";
 import { AdaptiveModalSheet, AdaptiveTextInput, type SheetHeader } from "./adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
 import { PairingTargetTracker } from "./pair-link-credentials";
+import { buildDirectConnectionUri } from "./direct-connection-host";

 const FLEX_ONE_STYLE = { flex: 1 } as const;

@@ -139,37 +136,11 @@ const styles = StyleSheet.create((theme) => ({
  },
 }));

-function isIpv6Host(host: string): boolean {
-  return host.includes(":") && !host.startsWith("[") && !host.endsWith("]");
-}
-
-function buildConnectionUriFromDraft(
-  draft: DirectConnectionDraft,
-  labels: DirectConnectionLabels,
-): string {
-  const host = draft.host.trim();
-  const port = Number(draft.port.trim());
-  if (!host) {
-    throw new Error(labels.hostRequired);
-  }
-  if (!Number.isInteger(port) || port < 1 || port > 65535) {
-    throw new Error(labels.invalidPort);
-  }
-
-  return serializeConnectionUriForStorage({
-    host,
-    port,
-    isIpv6: isIpv6Host(host),
-    useTls: draft.useTls,
-    ...(draft.password ? { password: draft.password } : {}),
-  });
-}
-
 function prepareDirectConnection(
  draft: DirectConnectionDraft,
  labels: DirectConnectionLabels,
 ): PreparedDirectConnection {
-  const parsed = parseConnectionUri(buildConnectionUriFromDraft(draft, labels));
+  const parsed = parseConnectionUri(buildDirectConnectionUri(draft, labels));
  const endpoint = parsed.isIpv6
    ? `[${parsed.host}]:${parsed.port}`
    : `${parsed.host}:${parsed.port}`;
@@ -420,7 +391,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
      advancedTarget.current = new PairingTargetTracker("", true);
      try {
        setAdvancedUri(
-          buildConnectionUriFromDraft({ host, port, useTls, password }, directConnectionLabels),
+          buildDirectConnectionUri({ host, port, useTls, password }, directConnectionLabels),
        );
      } catch {
        setAdvancedUri("");
@@ -505,6 +476,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
        accessibilityRole="checkbox"
        accessibilityLabel={t("pairing.direct.fields.useSsl")}
        accessibilityState={useTlsAccessibilityState}
+        aria-checked={useTls}
        testID="direct-ssl-toggle"
      >
        <View style={checkboxStyle}>
@@ -0,0 +1,68 @@
+import { describe, expect, it } from "vitest";
+import { buildDirectConnectionUri, normalizeDirectConnectionHost } from "./direct-connection-host";
+
+const labels = {
+  hostRequired: "host required",
+  invalidPort: "invalid port",
+};
+
+function buildUri(host: string, port = "6767"): string {
+  return buildDirectConnectionUri({ host, port, useTls: false, password: "" }, labels);
+}
+
+describe("normalizeDirectConnectionHost", () => {
+  it.each([
+    ["100.66.69.36", { host: "100.66.69.36", port: null, isIpv6: false }],
+    ["  100.66.69.36  ", { host: "100.66.69.36", port: null, isIpv6: false }],
+    ["100.66.69.36:6767", { host: "100.66.69.36", port: "6767", isIpv6: false }],
+    ["tcp://100.66.69.36:6767", { host: "100.66.69.36", port: "6767", isIpv6: false }],
+    ["http://100.66.69.36:6767/path?x=1#y", { host: "100.66.69.36", port: "6767", isIpv6: false }],
+    ["HTTPS://example.test", { host: "example.test", port: null, isIpv6: false }],
+    ["my-host.local:7000", { host: "my-host.local", port: "7000", isIpv6: false }],
+    ["[::1]", { host: "::1", port: null, isIpv6: true }],
+    ["[::1]:7000", { host: "::1", port: "7000", isIpv6: true }],
+    ["::1", { host: "::1", port: null, isIpv6: true }],
+    ["fe80::1", { host: "fe80::1", port: null, isIpv6: true }],
+    ["", { host: "", port: null, isIpv6: false }],
+  ])("normalizes %j", (input, expected) => {
+    expect(normalizeDirectConnectionHost(input)).toEqual(expected);
+  });
+});
+
+describe("buildDirectConnectionUri", () => {
+  it.each([
+    ["100.66.69.36", "tcp://100.66.69.36:6767"],
+    ["100.66.69.36:6767", "tcp://100.66.69.36:6767"],
+    ["tcp://100.66.69.36:6767", "tcp://100.66.69.36:6767"],
+    ["http://100.66.69.36:6767/path?x", "tcp://100.66.69.36:6767"],
+    ["my-host.local:6767", "tcp://my-host.local:6767"],
+    ["[::1]", "tcp://[::1]:6767"],
+    ["[::1]:7000", "tcp://[::1]:7000"],
+    ["::1", "tcp://[::1]:6767"],
+    ["fe80::1", "tcp://[fe80::1]:6767"],
+  ])("builds a tcp URI from host %j", (host, expected) => {
+    expect(buildUri(host)).toBe(expected);
+  });
+
+  it("lets a port typed in the host field override the port field", () => {
+    expect(buildUri("100.66.69.36:7000", "6767")).toBe("tcp://100.66.69.36:7000");
+  });
+
+  it("keeps TLS and password settings", () => {
+    expect(
+      buildDirectConnectionUri(
+        { host: "tcp://example.test:443", port: "6767", useTls: true, password: "secret" },
+        labels,
+      ),
+    ).toBe("tcp://example.test:443?ssl=true&password=secret");
+  });
+
+  it.each(["", "   ", "tcp://", "http:///path"])("requires a host for %j", (host) => {
+    expect(() => buildUri(host)).toThrow("host required");
+  });
+
+  it("rejects an invalid port", () => {
+    expect(() => buildUri("100.66.69.36", "70000")).toThrow("invalid port");
+    expect(() => buildUri("100.66.69.36:0")).toThrow("invalid port");
+  });
+});
@@ -0,0 +1,70 @@
+import { serializeConnectionUriForStorage } from "@/utils/daemon-endpoints";
+
+export interface DirectConnectionHostInput {
+  host: string;
+  port: string;
+  useTls: boolean;
+  password: string;
+}
+
+export interface DirectConnectionHostLabels {
+  hostRequired: string;
+  invalidPort: string;
+}
+
+export interface NormalizedDirectConnectionHost {
+  host: string;
+  /** Port typed into the host field, if any. Overrides the separate port field. */
+  port: string | null;
+  isIpv6: boolean;
+}
+
+const SCHEME_PATTERN = /^[a-z][a-z0-9+.-]*:\/\//i;
+const BRACKETED_IPV6_PATTERN = /^\[([^\]]*)\](?::(\d*))?$/;
+const HOST_WITH_PORT_PATTERN = /^([^:]+):(\d+)$/;
+
+/**
+ * Users often paste `host:port` or a full URL into the host field.
+ * Reduce it to a bare host (plus an optional port) before building the URI.
+ */
+export function normalizeDirectConnectionHost(input: string): NormalizedDirectConnectionHost {
+  let host = input.trim().replace(SCHEME_PATTERN, "");
+  const suffixIndex = host.search(/[/?#]/);
+  if (suffixIndex !== -1) {
+    host = host.slice(0, suffixIndex);
+  }
+
+  const bracketed = BRACKETED_IPV6_PATTERN.exec(host);
+  if (bracketed) {
+    return { host: bracketed[1] ?? "", port: bracketed[2] || null, isIpv6: true };
+  }
+
+  const hostWithPort = HOST_WITH_PORT_PATTERN.exec(host);
+  if (hostWithPort) {
+    return { host: hostWithPort[1] ?? "", port: hostWithPort[2] ?? null, isIpv6: false };
+  }
+
+  return { host, port: null, isIpv6: host.split(":").length > 2 };
+}
+
+export function buildDirectConnectionUri(
+  draft: DirectConnectionHostInput,
+  labels: DirectConnectionHostLabels,
+): string {
+  const normalized = normalizeDirectConnectionHost(draft.host);
+  const port = Number((normalized.port ?? draft.port).trim());
+  if (!normalized.host) {
+    throw new Error(labels.hostRequired);
+  }
+  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    throw new Error(labels.invalidPort);
+  }
+
+  return serializeConnectionUriForStorage({
+    host: normalized.host,
+    port,
+    isIpv6: normalized.isIpv6,
+    useTls: draft.useTls,
+    ...(draft.password ? { password: draft.password } : {}),
+  });
+}
@@ -15,7 +15,7 @@ import { useRewindAgentMutation } from "@/components/rewind/use-rewind-agent-mut
 import { TaskListRow } from "@/components/task-list-row";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { isNative, isWeb, supportsMaskedEffects } from "@/constants/platform";
+import { isNative, isWeb } from "@/constants/platform";
 import { useRevealedText, type MarkdownPhase } from "@/hooks/use-revealed-text";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
@@ -1800,7 +1800,7 @@ function computeShimmerMetrics(input: {
  // React Native Web only observes a node when onLayout exists at mount. Keep
  // measuring while idle so a retained badge has dimensions when it starts loading.
  const shouldMeasureWebShimmer = isWeb;
-  const shouldMeasureNativeShimmer = input.isLoading && isNative && supportsMaskedEffects;
+  const shouldMeasureNativeShimmer = input.isLoading && isNative;
  const isNativeShimmer =
    shouldMeasureNativeShimmer && input.labelRowWidth > 0 && input.labelRowHeight > 0;
  const webShimmerSpanStartX = input.labelOffsetX;
@@ -462,7 +462,7 @@ describe("sidebar group visibility", () => {

  it.each([0, 7, 8])("limits %i Done rows to seven", (count) => {
    const items = entries(Array(count).fill("done"));
-    const { result } = renderHook(() => useLimitedSidebarGroup(items, policy));
+    const { result } = renderHook(() => useLimitedSidebarGroup({ items, selection: null, policy }));
    expect(result.current.visibleItems).toEqual(items.slice(0, 7));
    expect(result.current.canToggle).toBe(count > 7);
  });
@@ -471,7 +471,9 @@ describe("sidebar group visibility", () => {
    "keeps row twelve visible for %s without filling gaps",
    (status) => {
      const items = entries([...Array(11).fill("done"), status]);
-      const { result } = renderHook(() => useLimitedSidebarGroup(items, policy));
+      const { result } = renderHook(() =>
+        useLimitedSidebarGroup({ items, selection: null, policy }),
+      );
      expect(names(result.current.visibleItems)).toEqual([
        "row-1",
        "row-2",
@@ -492,7 +494,11 @@ describe("sidebar group visibility", () => {
    const hydrated = new Map(items.slice(0, 9).map((item) => [item.workspaceKey, item]));
    for (const entriesByKey of [new Map(), hydrated]) {
      const { result } = renderHook(() =>
-        useLimitedSidebarGroup(items, createWorkspaceVisibilityPolicy(entriesByKey)),
+        useLimitedSidebarGroup({
+          items,
+          selection: null,
+          policy: createWorkspaceVisibilityPolicy(entriesByKey),
+        }),
      );
      expect(result.current.canToggle).toBe(true);
      expect(names(result.current.visibleItems)).toEqual(
@@ -512,7 +518,7 @@ describe("sidebar group visibility", () => {
      "needs_input",
      "failed",
    ]);
-    const { result } = renderHook(() => useLimitedSidebarGroup(items, policy));
+    const { result } = renderHook(() => useLimitedSidebarGroup({ items, selection: null, policy }));
    expect(result.current.visibleItems).toEqual(items);
    expect(result.current.canToggle).toBe(false);
  });
@@ -527,7 +533,7 @@ describe("sidebar group visibility", () => {
      "attention",
    ]);
    const { result, rerender, unmount } = renderHook(
-      ({ rows }) => useLimitedSidebarGroup(rows, policy),
+      ({ rows }) => useLimitedSidebarGroup({ items: rows, selection: null, policy }),
      { initialProps: { rows: items } },
    );
    expect(names(result.current.visibleItems)).toEqual([
@@ -568,7 +574,7 @@ describe("sidebar group visibility", () => {
    expect(result.current.expanded).toBe(false);
    act(() => result.current.toggleExpanded());
    unmount();
-    const remounted = renderHook(() => useLimitedSidebarGroup(items, policy));
+    const remounted = renderHook(() => useLimitedSidebarGroup({ items, selection: null, policy }));
    expect(remounted.result.current.expanded).toBe(false);
    expect(remounted.result.current.visibleItems).toHaveLength(10);
  });
@@ -592,7 +598,12 @@ describe("sidebar group visibility", () => {
      lifecycle: "active" as const,
    };
    const { result, rerender } = renderHook(
-      ({ last }) => useLimitedSidebarGroup([...items.slice(0, 11), last], policy),
+      ({ last }) =>
+        useLimitedSidebarGroup({
+          items: [...items.slice(0, 11), last],
+          selection: null,
+          policy,
+        }),
      { initialProps: { last: items[11] } },
    );
    expect(result.current.visibleItems).toHaveLength(7);
@@ -630,7 +641,7 @@ describe("sidebar group visibility", () => {

  it("preserves the twenty-row pinned policy regardless of status", () => {
    const items = entries(Array(21).fill("running"));
-    const { result } = renderHook(() => useLimitedSidebarGroup(items));
+    const { result } = renderHook(() => useLimitedSidebarGroup({ items, selection: null }));
    expect(result.current.visibleItems).toEqual(items.slice(0, 20));
    expect(result.current.canToggle).toBe(true);
    act(() => result.current.toggleExpanded());
@@ -1598,11 +1598,16 @@ function ProjectBlock({
    [workspaceEntriesByKey],
  );
  const {
+    leadingItem: leadingWorkspace,
    visibleItems: visibleWorkspaces,
    expanded: workspacesExpanded,
    canToggle: canToggleWorkspaces,
    toggleExpanded: toggleWorkspacesExpanded,
-  } = useLimitedSidebarGroup(project.workspaces, visibilityPolicy);
+  } = useLimitedSidebarGroup({
+    items: project.workspaces,
+    selection: selectionEnabled ? activeWorkspaceSelection : null,
+    policy: visibilityPolicy,
+  });
  const activeServerId = activeWorkspaceSelection?.serverId ?? null;
  const activeHostStatus = useHostRuntimeConnectionStatus(activeServerId ?? "");
  const preferredServerId = activeHostStatus === "online" ? activeServerId : null;
@@ -1761,28 +1766,33 @@ function ProjectBlock({
  let projectChildren = null;
  if (!collapsed) {
    if (project.workspaces.length > 0) {
+      const leadingWorkspaceRow = leadingWorkspace ? renderWorkspaceRow(leadingWorkspace) : null;
      projectChildren = (
        <>
          {manualSort ? (
-            <DraggableList
-              testID={`sidebar-workspace-list-${project.viewKey}`}
-              data={visibleWorkspaces}
-              keyExtractor={workspaceKeyExtractor}
-              renderItem={renderWorkspace}
-              onDragEnd={handleWorkspaceDragEnd}
-              extraData={activeWorkspaceSelectionKey(activeWorkspaceSelection)}
-              scrollEnabled={false}
-              useDragHandle
-              nestable={useNestable}
-              simultaneousGestureRef={parentGestureRef}
-              gestureHostPresented={dragGestureHostActive}
-              containerStyle={styles.workspaceListContainer}
-            />
+            <>
+              {leadingWorkspaceRow}
+              <DraggableList
+                testID={`sidebar-workspace-list-${project.viewKey}`}
+                data={visibleWorkspaces}
+                keyExtractor={workspaceKeyExtractor}
+                renderItem={renderWorkspace}
+                onDragEnd={handleWorkspaceDragEnd}
+                extraData={activeWorkspaceSelectionKey(activeWorkspaceSelection)}
+                scrollEnabled={false}
+                useDragHandle
+                nestable={useNestable}
+                simultaneousGestureRef={parentGestureRef}
+                gestureHostPresented={dragGestureHostActive}
+                containerStyle={styles.workspaceListContainer}
+              />
+            </>
          ) : (
            <View
              testID={`sidebar-workspace-list-${project.viewKey}`}
              style={styles.workspaceListContainer}
            >
+              {leadingWorkspaceRow}
              {visibleWorkspaces.map((item) => renderWorkspaceRow(item))}
            </View>
          )}
@@ -2188,11 +2198,15 @@ function ProjectModeList({
  const activeWorkspaceSelection = useActiveWorkspaceSelection();
  const { pinnedChats, unpinnedProjects } = pinnedGroups;
  const {
+    leadingItem: leadingPinnedChat,
    visibleItems: visiblePinnedChats,
    expanded: pinnedChatsExpanded,
    canToggle: canTogglePinnedChats,
    toggleExpanded: togglePinnedChatsExpanded,
-  } = useLimitedSidebarGroup(pinnedChats);
+  } = useLimitedSidebarGroup({
+    items: pinnedChats,
+    selection: selectionEnabled ? activeWorkspaceSelection : null,
+  });
  const nativeScrollGestureProps = useMemo(
    () =>
      parentGestureRef
@@ -2395,37 +2409,38 @@ function ProjectModeList({
    [renderProjectBlock],
  );

-  const renderPinnedChat = useCallback(
-    ({
-      item: workspace,
-      drag,
-      isActive,
-      dragHandleProps,
-    }: DraggableRenderItemInfo<SidebarWorkspacePlacement>) => {
-      return (
-        <MemoWorkspaceRowItem
-          workspace={workspace}
-          workspaceEntry={workspaceEntriesByKey.get(workspace.workspaceKey) ?? null}
-          hostBadge={hostBadgeByServerId.get(workspace.serverId) ?? null}
-          leadingProjectName={workspace.projectName}
-          leadingProjectIconDataUri={
-            projectIconByProjectViewKey.get(workspace.projectViewKey) ?? null
-          }
-          shortcutNumber={shortcutIndexByWorkspaceKey.get(workspace.workspaceKey) ?? null}
-          showShortcutBadge={showShortcutBadges}
-          canCopyBranchName={workspace.projectKind === "git"}
-          canPin={supportsPinningByServerId.get(workspace.serverId) === true}
-          onToggleWorkspacePin={onToggleWorkspacePin}
-          isCreating={creatingWorkspaceIds.has(workspace.workspaceId)}
-          selectionEnabled={selectionEnabled}
-          activeWorkspaceSelection={activeWorkspaceSelection}
-          onWorkspacePress={onWorkspacePress}
-          drag={drag}
-          isDragging={isActive}
-          dragHandleProps={dragHandleProps}
-        />
-      );
-    },
+  const renderPinnedChatRow = useCallback(
+    (
+      workspace: SidebarWorkspacePlacement,
+      input?: {
+        drag?: () => void;
+        isDragging?: boolean;
+        dragHandleProps?: DraggableListDragHandleProps;
+      },
+    ) => (
+      <MemoWorkspaceRowItem
+        key={workspace.workspaceKey}
+        workspace={workspace}
+        workspaceEntry={workspaceEntriesByKey.get(workspace.workspaceKey) ?? null}
+        hostBadge={hostBadgeByServerId.get(workspace.serverId) ?? null}
+        leadingProjectName={workspace.projectName}
+        leadingProjectIconDataUri={
+          projectIconByProjectViewKey.get(workspace.projectViewKey) ?? null
+        }
+        shortcutNumber={shortcutIndexByWorkspaceKey.get(workspace.workspaceKey) ?? null}
+        showShortcutBadge={showShortcutBadges}
+        canCopyBranchName={workspace.projectKind === "git"}
+        canPin={supportsPinningByServerId.get(workspace.serverId) === true}
+        onToggleWorkspacePin={onToggleWorkspacePin}
+        isCreating={creatingWorkspaceIds.has(workspace.workspaceId)}
+        selectionEnabled={selectionEnabled}
+        activeWorkspaceSelection={activeWorkspaceSelection}
+        onWorkspacePress={onWorkspacePress}
+        drag={input?.drag}
+        isDragging={input?.isDragging}
+        dragHandleProps={input?.dragHandleProps}
+      />
+    ),
    [
      activeWorkspaceSelection,
      creatingWorkspaceIds,
@@ -2441,6 +2456,22 @@ function ProjectModeList({
    ],
  );

+  const renderPinnedChat = useCallback(
+    ({
+      item: workspace,
+      drag,
+      isActive,
+      dragHandleProps,
+    }: DraggableRenderItemInfo<SidebarWorkspacePlacement>) => {
+      return renderPinnedChatRow(workspace, {
+        drag,
+        isDragging: isActive,
+        dragHandleProps,
+      });
+    },
+    [renderPinnedChatRow],
+  );
+
  const projectBody =
    projects.length === 0 ? (
      <SidebarProjectEmptyState onAddProject={onAddProject} onImportSession={onImportSession} />
@@ -2473,6 +2504,7 @@ function ProjectModeList({
          />
          {pinnedCollapsed ? null : (
            <>
+              {leadingPinnedChat ? renderPinnedChatRow(leadingPinnedChat) : null}
              <DraggableList
                testID="sidebar-pinned-list"
                data={visiblePinnedChats}
@@ -0,0 +1,137 @@
+import { describe, expect, it } from "vitest";
+import type { SidebarStateBucket } from "@/hooks/sidebar-workspaces-view-model";
+import type { ActiveWorkspaceSelection } from "@/stores/last-workspace-selection";
+import {
+  selectSidebarGroupVisibility,
+  type SidebarGroupItem,
+  type SidebarGroupVisibilityPolicy,
+} from "./sidebar-group-visibility";
+
+interface Item extends SidebarGroupItem {
+  id: number;
+  statusBucket: SidebarStateBucket;
+}
+
+const serverId = "host-a";
+
+function rows(statuses: readonly SidebarStateBucket[], rowServerId = serverId): Item[] {
+  return statuses.map((statusBucket, index) => ({
+    id: index + 1,
+    serverId: rowServerId,
+    workspaceId: `workspace-${index + 1}`,
+    statusBucket,
+  }));
+}
+
+const workspacePolicy: SidebarGroupVisibilityPolicy<Item> = {
+  kind: "workspaces",
+  getStatusBucket: (item) => item.statusBucket,
+};
+
+function selectionFor(item: SidebarGroupItem): ActiveWorkspaceSelection {
+  return { serverId: item.serverId, workspaceId: item.workspaceId };
+}
+
+describe("selectSidebarGroupVisibility", () => {
+  it("leads with a hidden open row while keeping the baseline order", () => {
+    const items = rows(Array(9).fill("done"));
+    const result = selectSidebarGroupVisibility({
+      items,
+      expanded: false,
+      policy: workspacePolicy,
+      selection: selectionFor(items[8]!),
+    });
+
+    expect(result.leadingItem).toBe(items[8]);
+    expect(result.visibleItems).toEqual(items.slice(0, 7));
+    expect(result.canToggle).toBe(true);
+  });
+
+  it("leaves selected rows in place when they are already in the baseline", () => {
+    const items = rows([...Array(8).fill("done"), "running", "done"]);
+    const expected = [...items.slice(0, 7), items[8]];
+
+    for (const selectedIndex of [2, 8]) {
+      const result = selectSidebarGroupVisibility({
+        items,
+        expanded: false,
+        policy: workspacePolicy,
+        selection: selectionFor(items[selectedIndex]!),
+      });
+
+      expect(result.leadingItem).toBeNull();
+      expect(result.visibleItems).toEqual(expected);
+      expect(result.canToggle).toBe(true);
+    }
+  });
+
+  it("shows the whole group without a toggle when the open row is the only hidden row", () => {
+    const items = rows(Array(8).fill("done"));
+    const result = selectSidebarGroupVisibility({
+      items,
+      expanded: false,
+      policy: workspacePolicy,
+      selection: selectionFor(items[7]!),
+    });
+
+    expect(result.leadingItem).toBeNull();
+    expect(result.visibleItems).toEqual(items);
+    expect(result.canToggle).toBe(false);
+  });
+
+  it("keeps expanded groups in their original order", () => {
+    const items = rows(Array(9).fill("done"));
+    const result = selectSidebarGroupVisibility({
+      items,
+      expanded: true,
+      policy: workspacePolicy,
+      selection: selectionFor(items[8]!),
+    });
+
+    expect(result.leadingItem).toBeNull();
+    expect(result.visibleItems).toEqual(items);
+    expect(result.canToggle).toBe(true);
+  });
+
+  it("applies the twenty-row limit to pinned groups", () => {
+    const items = rows(Array(22).fill("done"));
+    const result = selectSidebarGroupVisibility({
+      items,
+      expanded: false,
+      policy: { kind: "pinned" },
+      selection: selectionFor(items[21]!),
+    });
+
+    expect(result.leadingItem).toBe(items[21]);
+    expect(result.visibleItems).toEqual(items.slice(0, 20));
+    expect(result.canToggle).toBe(true);
+  });
+
+  it("preserves the current limit when selection is null", () => {
+    const items = rows(Array(8).fill("done"));
+    const result = selectSidebarGroupVisibility({
+      items,
+      expanded: false,
+      policy: workspacePolicy,
+      selection: null,
+    });
+
+    expect(result.leadingItem).toBeNull();
+    expect(result.visibleItems).toEqual(items.slice(0, 7));
+    expect(result.canToggle).toBe(true);
+  });
+
+  it("matches the open row by server and workspace identity", () => {
+    const items = rows(Array(9).fill("done"), "host-b");
+    const result = selectSidebarGroupVisibility({
+      items,
+      expanded: false,
+      policy: workspacePolicy,
+      selection: { serverId: serverId, workspaceId: items[8]!.workspaceId },
+    });
+
+    expect(result.leadingItem).toBeNull();
+    expect(result.visibleItems).toEqual(items.slice(0, 7));
+    expect(result.canToggle).toBe(true);
+  });
+});
@@ -1,4 +1,28 @@
 import type { SidebarStateBucket } from "@/hooks/sidebar-workspaces-view-model";
+import type { ActiveWorkspaceSelection } from "@/stores/last-workspace-selection";
+
+export interface SidebarGroupItem {
+  serverId: string;
+  workspaceId: string;
+}
+
+export interface SidebarGroupVisibilityInput<T> {
+  items: readonly T[];
+  expanded: boolean;
+  policy: SidebarGroupVisibilityPolicy<T>;
+  /** The workspace the group's rows highlight as selected. Null when no row can be selected. */
+  selection: ActiveWorkspaceSelection | null;
+}
+
+export interface SidebarGroupVisibility<T> {
+  /**
+   * The open workspace when the collapsed limit would hide it. Rendered before `visibleItems`,
+   * out of group order, outside any drag list. Never also present in `visibleItems`.
+   */
+  leadingItem: T | null;
+  visibleItems: T[];
+  canToggle: boolean;
+}

 export type SidebarGroupVisibilityPolicy<T> =
  | { kind: "pinned" }
@@ -16,18 +40,45 @@ export function createWorkspaceVisibilityPolicy<T extends { workspaceKey: string
  };
 }

-export function selectSidebarGroupVisibility<T>(
-  items: readonly T[],
-  expanded: boolean,
-  policy: SidebarGroupVisibilityPolicy<T>,
-) {
-  const limit = policy.kind === "pinned" ? 20 : 7;
-  const baseline = items.filter(
-    (item, index) =>
-      index < limit || (policy.kind === "workspaces" && policy.getStatusBucket(item) !== "done"),
+function isOpenWorkspace(
+  item: SidebarGroupItem,
+  selection: ActiveWorkspaceSelection | null,
+): boolean {
+  return (
+    selection !== null &&
+    item.serverId === selection.serverId &&
+    item.workspaceId === selection.workspaceId
  );
+}
+
+export function selectSidebarGroupVisibility<T extends SidebarGroupItem>(
+  input: SidebarGroupVisibilityInput<T>,
+): SidebarGroupVisibility<T> {
+  const { items, expanded, policy, selection } = input;
+  const limit = policy.kind === "pinned" ? 20 : 7;
+  const baseline: T[] = [];
+  let leadingItem: T | null = null;
+  let canToggle = false;
+
+  items.forEach((item, index) => {
+    const inBaseline =
+      index < limit || (policy.kind === "workspaces" && policy.getStatusBucket(item) !== "done");
+    if (inBaseline) {
+      baseline.push(item);
+    } else if (leadingItem === null && isOpenWorkspace(item, selection)) {
+      leadingItem = item;
+    } else {
+      canToggle = true;
+    }
+  });
+
+  if (expanded || !canToggle) {
+    return { leadingItem: null, visibleItems: items.slice(), canToggle };
+  }
+
  return {
-    visibleItems: expanded ? items.slice() : baseline,
-    canToggle: baseline.length < items.length,
+    leadingItem,
+    visibleItems: baseline,
+    canToggle,
  };
 }
@@ -147,6 +147,7 @@ export function SidebarStatusWorkspaceList({
  dragGestureHostActive,
 }: StatusWorkspaceListProps) {
  const { t } = useTranslation();
+  const activeWorkspaceSelection = useActiveWorkspaceSelection();
  const collapsedWorkspaceGroupKeys = useSidebarCollapsedSectionsStore(
    (state) => state.collapsedWorkspaceGroupKeys,
  );
@@ -155,23 +156,27 @@ export function SidebarStatusWorkspaceList({
    (state) => state.togglePinnedCollapsed,
  );
  const {
+    leadingItem: leadingPinnedWorkspace,
    visibleItems: visiblePinnedWorkspaces,
    expanded: pinnedWorkspacesExpanded,
    canToggle: canTogglePinnedWorkspaces,
    toggleExpanded: togglePinnedWorkspacesExpanded,
-  } = useLimitedSidebarGroup(pinnedWorkspaces);
+  } = useLimitedSidebarGroup({ items: pinnedWorkspaces, selection: activeWorkspaceSelection });

  const statusShortcutIndex = showShortcutBadges
    ? shortcutIndexByWorkspaceKey
    : EMPTY_SHORTCUT_INDEX;
-  const renderPinnedWorkspace = useCallback(
-    ({
-      item: workspace,
-      drag,
-      isActive,
-      dragHandleProps,
-    }: DraggableRenderItemInfo<SidebarWorkspaceEntry>) => (
+  const renderPinnedWorkspaceRow = useCallback(
+    (
+      workspace: SidebarWorkspaceEntry,
+      input?: {
+        drag?: () => void;
+        isDragging?: boolean;
+        dragHandleProps?: DraggableListDragHandleProps;
+      },
+    ) => (
      <StatusWorkspaceRow
+        key={workspace.workspaceKey}
        workspace={workspace}
        {...buildStatusRowProjectPresentation({
          workspace,
@@ -184,9 +189,9 @@ export function SidebarStatusWorkspaceList({
        canPin={supportsPinningByServerId.get(workspace.serverId) === true}
        onToggleWorkspacePin={onToggleWorkspacePin}
        onWorkspacePress={onWorkspacePress}
-        drag={drag}
-        isDragging={isActive}
-        dragHandleProps={dragHandleProps}
+        drag={input?.drag}
+        isDragging={input?.isDragging}
+        dragHandleProps={input?.dragHandleProps}
      />
    ),
    [
@@ -199,6 +204,20 @@ export function SidebarStatusWorkspaceList({
      supportsPinningByServerId,
    ],
  );
+  const renderPinnedWorkspace = useCallback(
+    ({
+      item: workspace,
+      drag,
+      isActive,
+      dragHandleProps,
+    }: DraggableRenderItemInfo<SidebarWorkspaceEntry>) =>
+      renderPinnedWorkspaceRow(workspace, {
+        drag,
+        isDragging: isActive,
+        dragHandleProps,
+      }),
+    [renderPinnedWorkspaceRow],
+  );
  const content = (
    <>
      {pinnedWorkspaces.length > 0 ? (
@@ -211,6 +230,7 @@ export function SidebarStatusWorkspaceList({
          />
          {pinnedCollapsed ? null : (
            <>
+              {leadingPinnedWorkspace ? renderPinnedWorkspaceRow(leadingPinnedWorkspace) : null}
              <DraggableList
                testID="sidebar-pinned-list"
                data={visiblePinnedWorkspaces}
@@ -345,12 +365,37 @@ function StatusGroupRows({
  supportsPinningByServerId: ReadonlyMap<string, boolean>;
  onToggleWorkspacePin: ToggleSidebarWorkspacePin;
 }) {
+  const activeWorkspaceSelection = useActiveWorkspaceSelection();
  const {
+    leadingItem: leadingWorkspace,
    visibleItems: visibleWorkspaces,
    expanded: workspacesExpanded,
    canToggle: canToggleWorkspaces,
    toggleExpanded: toggleWorkspacesExpanded,
-  } = useLimitedSidebarGroup(group.rows, STATUS_GROUP_VISIBILITY);
+  } = useLimitedSidebarGroup({
+    items: group.rows,
+    selection: activeWorkspaceSelection,
+    policy: STATUS_GROUP_VISIBILITY,
+  });
+
+  function renderWorkspaceRow(workspace: SidebarWorkspaceEntry) {
+    return (
+      <StatusWorkspaceRow
+        key={workspace.workspaceKey}
+        workspace={workspace}
+        {...buildStatusRowProjectPresentation({
+          workspace,
+          projectIconByProjectViewKey,
+          hostBadgeByServerId,
+        })}
+        shortcutNumber={shortcutIndex.get(workspace.workspaceKey) ?? null}
+        showShortcutBadge={showShortcutBadges}
+        canPin={supportsPinningByServerId.get(workspace.serverId) === true}
+        onToggleWorkspacePin={onToggleWorkspacePin}
+        onWorkspacePress={onWorkspacePress}
+      />
+    );
+  }

  return (
    <View style={collapsed ? undefined : styles.statusGroupBlockExpanded}>
@@ -360,22 +405,8 @@ function StatusGroupRows({
          style={styles.statusWorkspaceListContainer}
          testID={`sidebar-status-group-rows-${group.key}`}
        >
-          {visibleWorkspaces.map((workspace) => (
-            <StatusWorkspaceRow
-              key={workspace.workspaceKey}
-              workspace={workspace}
-              {...buildStatusRowProjectPresentation({
-                workspace,
-                projectIconByProjectViewKey,
-                hostBadgeByServerId,
-              })}
-              shortcutNumber={shortcutIndex.get(workspace.workspaceKey) ?? null}
-              showShortcutBadge={showShortcutBadges}
-              canPin={supportsPinningByServerId.get(workspace.serverId) === true}
-              onToggleWorkspacePin={onToggleWorkspacePin}
-              onWorkspacePress={onWorkspacePress}
-            />
-          ))}
+          {leadingWorkspace ? renderWorkspaceRow(leadingWorkspace) : null}
+          {visibleWorkspaces.map(renderWorkspaceRow)}
          {canToggleWorkspaces ? (
            <SidebarGroupToggleRow
              expanded={workspacesExpanded}
@@ -1,19 +1,32 @@
 import { useCallback, useMemo, useState } from "react";
 import {
  selectSidebarGroupVisibility,
+  type SidebarGroupItem,
+  type SidebarGroupVisibility,
  type SidebarGroupVisibilityPolicy,
 } from "./sidebar-group-visibility";
+import type { ActiveWorkspaceSelection } from "@/stores/last-workspace-selection";

 const PINNED_POLICY = { kind: "pinned" } as const;

-export function useLimitedSidebarGroup<T>(
-  items: readonly T[],
-  policy: SidebarGroupVisibilityPolicy<T> = PINNED_POLICY,
-) {
+interface LimitedSidebarGroupInput<T> {
+  items: readonly T[];
+  selection: ActiveWorkspaceSelection | null;
+  policy?: SidebarGroupVisibilityPolicy<T>;
+}
+
+export function useLimitedSidebarGroup<T extends SidebarGroupItem>({
+  items,
+  selection,
+  policy = PINNED_POLICY,
+}: LimitedSidebarGroupInput<T>): SidebarGroupVisibility<T> & {
+  expanded: boolean;
+  toggleExpanded: () => void;
+} {
  const [expanded, setExpanded] = useState(false);
  const visibility = useMemo(
-    () => selectSidebarGroupVisibility(items, expanded, policy),
-    [expanded, items, policy],
+    () => selectSidebarGroupVisibility({ items, expanded, policy, selection }),
+    [expanded, items, policy, selection],
  );
  const toggleExpanded = useCallback(() => setExpanded((current) => !current), []);

@@ -12,6 +12,7 @@ import type {
 } from "../terminal/local-links/terminal-local-link-provider";
 import type { TerminalClipboardWriter } from "../terminal/native-renderer/terminal-selection";
 import type { TerminalFile } from "../terminal/file-paste";
+import type { TerminalCharacterWidths } from "../terminal/character-widths";
 import type { PendingTerminalModifiers } from "../utils/terminal-keys";
 import type { TerminalRendererReadyChange } from "../utils/terminal-renderer-readiness";

@@ -32,6 +33,7 @@ export interface TerminalEmulatorProps {
  ref: Ref<TerminalEmulatorHandle>;
  streamKey: string;
  supportsTerminalInputModeReplay: boolean;
+  characterWidths: TerminalCharacterWidths;
  testId?: string;
  xtermTheme?: ITheme;
  scrollbackLines: number;
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`{ "name": "Paseo", "displayName": "Paseo GPUI" }`