chore(release): cut 0.15.0-beta.1

(cherry picked from commit b2666a0aec)

CHANGELOG.md

@@ -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
 

CHANGELOG.zh-CN.md

@@ -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
 

docs/custom-providers.md

@@ -65,6 +65,7 @@ per-agent examples and provider-specific keys.
 ## Table of Contents
 
 - [Extending a built-in provider](#extending-a-built-in-provider)
+- [OpenCode with an existing v2 server](#opencode-with-an-existing-v2-server)
 - [Z.AI (Zhipu) coding plan](#zai-zhipu-coding-plan)
 - [Alibaba Cloud (Qwen) coding plan](#alibaba-cloud-qwen-coding-plan)
 - [Codex with a custom OpenAI-compatible endpoint](#codex-with-a-custom-openai-compatible-endpoint)
@@ -107,6 +108,35 @@ See [Codex with a custom OpenAI-compatible endpoint](#codex-with-a-custom-openai
 
 ---
 
+## OpenCode with an existing v2 server
+
+Paseo first uses an explicitly configured server, then a healthy locally registered OpenCode v2 service, then starts its own helper. It never stops a reused service. To select a server explicitly, set its URL in the provider environment:
+
+```json
+{
+  "agents": {
+    "providers": {
+      "opencode": {
+        "env": {
+          "PASEO_OPENCODE_SERVER_URL": "http://127.0.0.1:4096",
+          "PASEO_OPENCODE_SERVER_PASSWORD": "<server password>"
+        }
+      }
+    }
+  }
+}
+```
+
+`PASEO_OPENCODE_SERVER_URL` must be an absolute `http` or `https` URL. Omit `PASEO_OPENCODE_SERVER_PASSWORD` when the server has no authentication; when set, Paseo authenticates with HTTP Basic auth as `opencode`.
+
+A configured URL takes precedence even when unreachable; Paseo reports the connection error. The local service registration supplies its own authentication. For a discovered local service, Paseo installs its bridge package in OpenCode's watched global plugin directory without changing the existing configuration. Refresh reads the existing service's catalogs without starting another server.
+
+An explicitly configured server needs the bridge installed separately. Connect once and start a session: the setup error gives the local package directory. Copy that directory to the server's OpenCode global `plugins` directory, then retry. For a server on another machine, set `PASEO_OPENCODE_BRIDGE_PORT` in the Paseo OpenCode provider environment before starting Paseo, and set `PASEO_OPENCODE_BRIDGE_URL` to the URL the OpenCode server can use to reach that port. For example, an SSH reverse tunnel can expose the Paseo loopback port on the OpenCode host. The bridge token is exchanged through the OpenCode connection and is not written into the plugin package.
+
+OpenCode's custom MCP registrations are shared by all sessions in a location. Paseo rejects custom MCP servers and per-agent process environment overrides on a reused server rather than applying them to other sessions or ignoring them. Session identity is applied to each session's shell environment. A Paseo-owned helper supports custom process and MCP settings; it is selected when there is no explicit URL or healthy registered service.
+
+---
+
 ## Z.AI (Zhipu) coding plan
 
 [Z.AI](https://z.ai) is a Chinese AI company (Zhipu AI) that offers an Anthropic-compatible API endpoint. Their GLM Coding Plan provides flat-rate access to GLM models through Claude Code's Anthropic API protocol. These are **not** Anthropic Claude models — they are Zhipu's own GLM models exposed through an Anthropic-compatible API.

docs/providers.md

@@ -89,7 +89,7 @@ OMP supports native Paseo host tools. The adapter registers the full caller-scop
 
 Pi RPC extension UI dialog requests (`select`, `input`, `editor`, `confirm`) are bridged into Paseo question permissions and answered with `extension_ui_response`. Pi extensions such as `ask_user` may chain dialogs: for example, a `select` can be followed by an optional-comment `input`. When an `ask_user` tool call declares `allowComment: true`, Paseo presents the selection and optional comment as one question permission, answers Pi's initial `select` immediately, then auto-answers the follow-up optional `input` with the comment the user already supplied (or an empty string). Preserve placeholders and optional/skip semantics for standalone optional inputs so the app can still distinguish "skip this optional input" from "cancel the whole dialog." Fire-and-forget extension UI requests such as notifications are intentionally ignored by the provider adapter unless Paseo grows first-class UI for them.
 
-OpenCode adapters target v1.14.46 and v2.0.10. V2 rejects binaries older than the tested 2.0.10 SDK at runtime selection. Runtime selection uses the configured command and environment. A recognized version is cached until provider configuration reload; a failed, timed-out, or unrecognized probe retains the v1 path and retries detection on the next operation. Load v2 code and materialize its plugin only after positive v2 selection; v1 sessions remain undecorated. Keep upstream SDK types inside the version-specific adapter. OpenCode owns storage migration; a missing native session must fail resume rather than create a replacement. V2 has no native archive/unarchive operation: archiving affects Paseo only. V1 retains native archiving.
+OpenCode adapters target v1.14.46 and v2.0.10. V2 rejects versions older than 2.0.10. Paseo selects an explicit server, then a healthy local registered service, then its own helper. It never stops a reused service. A local service loads the Paseo bridge from its watched plugin directory; sessions bind their own bridge credentials through OpenCode RPC. See [OpenCode with an existing v2 server](custom-providers.md#opencode-with-an-existing-v2-server) for setup and isolation limits. Load v2 code and materialize its plugin only after positive v2 selection; v1 sessions remain undecorated. Keep upstream SDK types inside the version-specific adapter. OpenCode owns storage migration; a missing native session must fail resume rather than create a replacement. V2 has no native archive/unarchive operation: archiving affects Paseo only. V1 retains native archiving.
 
 Use OpenCode v2 execution events to trigger turn completion, with active-state and durable-log reconciliation after admission, reconnect, and while a turn remains active. Do not use `session.wait`: a healthy turn exceeding Node's HTTP headers deadline produces a transport error while OpenCode keeps working. The live event feed has no replay, and shutdown interruption preserves the previous idle outcome, so the session snapshot alone cannot recover missed execution events. Quiet streams are healthy: v2 heartbeats are SSE comments, not application events.
 
@@ -507,6 +507,8 @@ interface AgentSession {
 }
 ```
 
+`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

docs/terminal-rendering.md

@@ -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
 

nix/npm-deps.hash

@@ -1 +1 @@
-sha256-zFjdXeRpqrjEZk44ZCvEOTnVVGX0ASfDPktYNiWZpsw=
+sha256-CeT2PtYIAFwvBC9LIku8VkTl0pvKxYzSCn0QW2ManfU=

package-lock.json

@@ -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"

package.json

@@ -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": [

packages/app/e2e/browser/appearance-theme-picker.spec.ts

@@ -9,11 +9,9 @@ test("shows Pure black in the appearance picker", async ({ page }, testInfo) =>
   await expect(page.getByTestId("settings-sidebar")).toBeVisible();
   await openSettingsSection(page, "appearance");
 
-  await expect(page.getByRole("radio", { name: "System", exact: true })).toBeChecked();
-  await expect(
-    page.getByRole("radiogroup", { name: "Theme" }).getByRole("radio").first(),
-  ).toHaveAccessibleName("System");
-  await expect(page.getByRole("radio", { name: "Pure black", exact: true })).toBeVisible();
+  const themeTrigger = page.getByLabel("Theme: System", { exact: true });
+  await themeTrigger.click();
+  await expect(page.getByText("Pure black", { exact: true })).toBeVisible();
   await page.screenshot({
     path: testInfo.outputPath("appearance-theme-picker.png"),
     fullPage: true,

packages/app/e2e/browser/assistant-file-link-tooltip.spec.ts

@@ -1,4 +1,5 @@
-import { writeFile } from "node:fs/promises";
+import { execFileSync } from "node:child_process";
+import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { test, expect, type Page } from "../support/fixtures";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
@@ -67,3 +68,54 @@ test("opening an assistant file link dismisses its tooltip over the file tab", a
     await agent.cleanup();
   }
 });
+
+async function readLinkedGuide(page: Page, linkName: string, content: string): Promise<void> {
+  await page.getByRole("link", { name: linkName, exact: true }).click();
+  await expect(page.getByTestId("markdown-preview-frame").filter({ visible: true })).toContainText(
+    content,
+  );
+}
+
+async function returnToNestedLinks(page: Page): Promise<void> {
+  await page.getByRole("button", { name: "Nested file links", exact: true }).click();
+  await expect(page.getByRole("link", { name: "nested guide", exact: true })).toBeVisible();
+}
+
+test("assistant directory paths find nested files and preserve exact workspace paths", async ({
+  page,
+}, testInfo) => {
+  testInfo.setTimeout(120_000);
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "nested-file-link-",
+    title: "Nested file links",
+    featureValues: {
+      mockStreamingAssistantResponse:
+        "Read [nested guide](schema/x.md), [exact guide](schema/exact.md), and [missing guide](schema/missing.md).",
+      mockStreamingAssistantIntervalMs: 5,
+    },
+  });
+  try {
+    await mkdir(path.join(agent.cwd, "repo-a/schema"), { recursive: true });
+    execFileSync("git", ["init", "-b", "main"], { cwd: path.join(agent.cwd, "repo-a") });
+    await writeFile(
+      path.join(agent.cwd, "repo-a/schema/x.md"),
+      "# Nested file content\n\nDetails\n",
+    );
+    await mkdir(path.join(agent.cwd, "schema"), { recursive: true });
+    await writeFile(path.join(agent.cwd, "schema/exact.md"), "# Exact file content\n");
+    await writeFile(path.join(agent.cwd, "repo-a/schema/exact.md"), "# Wrong nested content\n");
+    await openAgentRoute(page, agent);
+    await agent.client.sendAgentMessage(agent.agentId, "Show the file links.");
+    await agent.client.waitForFinish(agent.agentId, 30_000);
+
+    await expect(page.getByRole("textbox", { name: "Message agent..." }).first()).toBeEnabled();
+    await readLinkedGuide(page, "nested guide", "Nested file content");
+    await returnToNestedLinks(page);
+    await readLinkedGuide(page, "exact guide", "Exact file content");
+    await returnToNestedLinks(page);
+    await page.getByRole("link", { name: "missing guide", exact: true }).click();
+    await expect(page.getByText("File not found", { exact: true })).toBeVisible();
+  } finally {
+    await agent.cleanup();
+  }
+});

packages/app/e2e/browser/composer-autocomplete.spec.ts

@@ -1,5 +1,9 @@
 import { expect, test, type Page } from "../support/fixtures";
-import { composerLocator, expectComposerVisible } from "../support/helpers/composer";
+import {
+  attachFileFromMenu,
+  composerLocator,
+  expectComposerVisible,
+} from "../support/helpers/composer";
 import {
   openAgentRoute,
   seedMockAgentWorkspace,
@@ -365,6 +369,56 @@ function expectPopoverDoesNotDisappearAfterFirstVisible(frames: PopoverFrame[]):
 }
 
 test.describe("Composer autocomplete", () => {
+  test("inserts suggested commands from assistant messages without sending", async ({ page }) => {
+    const requests = recordCommandRequestsByAgentId(page);
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "suggested-command-",
+      title: "Suggested commands",
+      initialPrompt: "Suggest `/mock` without running it",
+      featureValues: { mockAssistantResponse: "Try `/mock` or [Run mock](/mock)." },
+    });
+    try {
+      await openAgentRoute(page, session);
+      const message = page.getByTestId("assistant-message").filter({ hasText: "Run mock" });
+      await expect(message).toBeVisible();
+      await expect(page.getByTestId("user-message").getByRole("link")).toHaveCount(0);
+      await expect.poll(() => requests.length).toBe(1);
+      await attachFileFromMenu(page, {
+        name: "note.txt",
+        mimeType: "text/plain",
+        buffer: Buffer.from("attachment"),
+      });
+      await expect(page.getByTestId("composer-file-attachment-pill")).toContainText("note.txt");
+      await message.getByRole("link", { name: "/mock", exact: true }).click();
+      await expect(composerLocator(page)).toHaveValue("/mock ");
+      await expect(
+        page.getByTestId("composer-autocomplete-popover").filter({ visible: true }),
+      ).toHaveCount(0);
+      await expect(composerLocator(page)).toBeFocused();
+      await message.getByRole("link", { name: "Run mock" }).click();
+      await expect(composerLocator(page)).toHaveValue("/mock /mock ");
+      await expect(
+        page.getByTestId("composer-autocomplete-popover").filter({ visible: true }),
+      ).toHaveCount(0);
+      await expect(composerLocator(page)).toBeFocused();
+      await expect(page.getByTestId("composer-file-attachment-pill")).toContainText("note.txt");
+      await composerLocator(page).fill("draft");
+      await composerLocator(page).evaluate((element: HTMLTextAreaElement) =>
+        element.setSelectionRange(0, 0),
+      );
+      await message.getByRole("link", { name: "/mock", exact: true }).click();
+      await composerLocator(page).pressSequentially("argument");
+      await expect(composerLocator(page)).toHaveValue("draft /mock argument");
+      await composerLocator(page).fill("/");
+      await expect(
+        page.getByTestId("composer-autocomplete-popover").filter({ visible: true }),
+      ).toContainText("/mock");
+      expect(requests).toHaveLength(1);
+    } finally {
+      await session.cleanup();
+    }
+  });
+
   test("keeps New workspace off the running-agent command list before a project is chosen", async ({
     page,
   }) => {

packages/app/e2e/browser/folder-links.spec.ts

@@ -81,6 +81,8 @@ for (const folder of [
   "docs/guides",
   "docs/guides/",
   "docs/指南",
+  "examples/next.js/",
+  "examples/next.js",
 ]) {
   test(`chat folder link opens folder contents: ${folder}`, async ({ page }) => {
     const session = await seedMockAgentWorkspace({
@@ -92,6 +94,9 @@ for (const folder of [
     try {
       await mkdir(path.join(session.cwd, folder), { recursive: true });
       await writeFile(path.join(session.cwd, folder, "guide.md"), "# Folder link destination\n");
+      const competingFile = path.join(session.cwd, "repo-a", folder.replace(/\/$/, ""));
+      await mkdir(path.dirname(competingFile), { recursive: true });
+      await writeFile(competingFile, "This is a file, not the requested folder.\n");
       await session.client.waitForFinish(session.agentId, 30_000);
       await page.addInitScript(() => {
         localStorage.setItem(

packages/app/e2e/browser/onboarding.spec.ts

@@ -1,231 +0,0 @@
-import { execFileSync } from "node:child_process";
-import { mkdir, rm } from "node:fs/promises";
-import path from "node:path";
-import { expect, metroTest as test } from "../support/fixtures";
-import {
-  addProjectFromSetup,
-  continueSetup,
-  expectSetupStep,
-  finishSetup,
-  goToSetupStep,
-  openAppAsNewUser,
-  openTailscaleDocsFromSetup,
-  paseoToolsSwitch,
-  pickTheme,
-  projectSuggestion,
-  setupModal,
-  setupPrimaryButton,
-  showSetupAgainFromSettings,
-  skipSetup,
-  startSetupHost,
-} from "../support/helpers/onboarding";
-import { enableRelayAndExpectOffer } from "../support/helpers/pair-device";
-import { seedWorkspace } from "../support/helpers/seed-client";
-import { openSettingsHostSection } from "../support/helpers/settings";
-import { createTempDirectory, createTempGitRepo } from "../support/helpers/workspace";
-
-// Midnight's muted foreground (#9a9db0), which the step description is drawn in.
-const MIDNIGHT_MUTED_FOREGROUND = "rgb(154, 157, 176)";
-
-test("a new user is walked through setup once", async ({ page }, testInfo) => {
-  const host = await startSetupHost("fresh");
-  const repo = await createTempGitRepo("onboarding-folder-");
-
-  try {
-    await openAppAsNewUser(page, host);
-
-    await test.step("setup opens on Appearance and a theme applies at once", async () => {
-      await expectSetupStep(page, "Welcome to Paseo");
-      await pickTheme(page, "Midnight");
-      await expect(
-        setupModal(page).getByText(/^Run Claude Code, Codex and other agents/),
-      ).toHaveCSS("color", MIDNIGHT_MUTED_FOREGROUND);
-      await page.screenshot({ path: testInfo.outputPath("1-appearance.png") });
-    });
-
-    await test.step("Providers shows the same provider list as Settings", async () => {
-      await continueSetup(page);
-      await expectSetupStep(page, "Your agents");
-      await expect(setupModal(page).getByTestId("host-page-providers-card")).toBeVisible();
-      await page.screenshot({ path: testInfo.outputPath("2-providers.png") });
-    });
-
-    await test.step("with no agent history, Add project opens the regular flow and the folder shows as added", async () => {
-      await continueSetup(page);
-      await expectSetupStep(page, "Add your projects");
-      await expect(
-        setupModal(page).getByText("No recent projects found", { exact: true }),
-      ).toBeVisible({ timeout: 60_000 });
-      await addProjectFromSetup(page, repo.path);
-      await expectSetupStep(page, "Add your projects");
-      await expect(setupModal(page).getByText(repo.path, { exact: true })).toBeVisible();
-      await expect(setupModal(page).getByText("Added", { exact: true })).toBeVisible();
-      await page.screenshot({ path: testInfo.outputPath("3-projects.png") });
-    });
-
-    await test.step("Orchestration shows the Paseo tools switch", async () => {
-      await continueSetup(page);
-      await expectSetupStep(page, "Let agents use Paseo");
-      await expect(
-        setupModal(page).getByRole("switch", { name: "Inject Paseo tools", exact: true }),
-      ).toBeVisible();
-      await page.screenshot({ path: testInfo.outputPath("4-orchestration.png") });
-    });
-
-    await test.step("Skip setup closes it for good", async () => {
-      await skipSetup(page);
-      await page.reload();
-      await expect(
-        page.locator('[data-testid^="sidebar-project-row-"]').filter({
-          hasText: path.basename(repo.path),
-        }),
-      ).toBeVisible({ timeout: 60_000 });
-      await expect(setupModal(page)).toHaveCount(0);
-    });
-  } finally {
-    await host.close();
-    await repo.cleanup();
-  }
-});
-
-test("setup suggests the repos the user already ran agents in", async ({ page }, testInfo) => {
-  const repo = await createTempGitRepo("onboarding-history-");
-  const repoName = path.basename(repo.path);
-  const subdirectory = path.join(repo.path, "packages", "web");
-  await mkdir(subdirectory, { recursive: true });
-  const worktree = `${repo.path}-fix`;
-  execFileSync("git", ["worktree", "add", "-b", "fix", worktree], { cwd: repo.path });
-  const scratch = await createTempDirectory("onboarding-scratch-");
-  const scratchName = path.basename(scratch.path);
-  const host = await startSetupHost("history", {
-    claudeSessionsIn: [repo.path, subdirectory, worktree, scratch.path, scratch.path, scratch.path],
-    withBrokenProvider: true,
-  });
-
-  try {
-    await openAppAsNewUser(page, host);
-    await expectSetupStep(page, "Welcome to Paseo");
-    await goToSetupStep(page, "Projects");
-    await expectSetupStep(page, "Add your projects");
-
-    await test.step("the repo, its subfolder and its worktree become one checked row", async () => {
-      await expect(projectSuggestion(page, repoName)).toBeChecked({ timeout: 60_000 });
-      await expect(projectSuggestion(page, repoName)).toContainText("3 sessions");
-      await expect(projectSuggestion(page, scratchName)).toBeChecked();
-      await expect(setupModal(page).getByRole("checkbox")).toHaveCount(2);
-    });
-
-    await test.step("a provider that cannot read its history offers Retry", async () => {
-      await expect(
-        setupModal(page).getByText("Couldn't read Broken ACP history", { exact: true }),
-      ).toBeVisible({ timeout: 60_000 });
-      await expect(setupModal(page).getByRole("button", { name: "Retry" })).toBeVisible();
-    });
-
-    await test.step("the footer adds what is checked; the Add project flow is separate", async () => {
-      await expect(setupPrimaryButton(page, "Add 2 projects")).toBeVisible();
-      await expect(setupModal(page).getByRole("button", { name: "Continue" })).toHaveCount(0);
-      await expect(
-        setupModal(page).getByRole("button", { name: "Add another project…", exact: true }),
-      ).toBeVisible();
-      await page.screenshot({ path: testInfo.outputPath("8-project-suggestions.png") });
-      await projectSuggestion(page, repoName).click();
-      await projectSuggestion(page, scratchName).click();
-      await expect(setupPrimaryButton(page, "Continue")).toBeVisible();
-      await projectSuggestion(page, repoName).click();
-      await projectSuggestion(page, scratchName).click();
-    });
-
-    await test.step("a folder that cannot be added keeps the user on the step", async () => {
-      await scratch.cleanup();
-      await setupPrimaryButton(page, "Add 2 projects").click();
-      await expect(setupPrimaryButton(page, "Add 1 project")).toBeVisible({ timeout: 30_000 });
-      await expectSetupStep(page, "Add your projects");
-      await expect(projectSuggestion(page, scratchName)).toBeChecked();
-      await expect(projectSuggestion(page, scratchName)).toContainText("Directory not found");
-      await expect(projectSuggestion(page, repoName)).toHaveCount(0);
-      await page.screenshot({ path: testInfo.outputPath("9-project-suggestion-failed.png") });
-    });
-
-    await test.step("with nothing checked, Continue moves on without adding", async () => {
-      await projectSuggestion(page, scratchName).click();
-      await setupPrimaryButton(page, "Continue").click();
-      await expectSetupStep(page, "Let agents use Paseo");
-      await expect(
-        page.locator('[data-testid^="sidebar-project-row-"]').filter({ hasText: repoName }),
-      ).toBeVisible({ timeout: 60_000 });
-      await expect(
-        page.locator('[data-testid^="sidebar-project-row-"]').filter({ hasText: scratchName }),
-      ).toHaveCount(0);
-    });
-  } finally {
-    await host.close();
-    await rm(worktree, { recursive: true, force: true });
-    await repo.cleanup();
-    await scratch.cleanup();
-  }
-});
-
-test("an existing user only sees setup when they ask for it", async ({ page }) => {
-  const host = await startSetupHost("existing");
-  const workspace = await seedWorkspace({ repoPrefix: "onboarding-existing-", port: host.port });
-
-  try {
-    await openAppAsNewUser(page, host);
-    await expect(
-      page.getByTestId(`sidebar-workspace-row-${host.serverId}:${workspace.workspaceId}`),
-    ).toBeVisible({ timeout: 60_000 });
-    await expect(setupModal(page)).toHaveCount(0);
-
-    await showSetupAgainFromSettings(page);
-    await expectSetupStep(page, "Welcome to Paseo");
-    await expect(setupModal(page).getByRole("tab", { name: "Appearance" })).toHaveAttribute(
-      "aria-selected",
-      "true",
-    );
-  } finally {
-    await workspace.cleanup();
-    await host.close();
-  }
-});
-
-test("setup choices carry over to Settings and the phone step pairs over relay", async ({
-  page,
-}, testInfo) => {
-  const host = await startSetupHost("phone", { mutableRelay: { enabled: false } });
-
-  try {
-    await openAppAsNewUser(page, host);
-    await expectSetupStep(page, "Welcome to Paseo");
-
-    await test.step("Paseo tools turned on in setup", async () => {
-      await goToSetupStep(page, "Orchestration");
-      await expectSetupStep(page, "Let agents use Paseo");
-      await expect(paseoToolsSwitch(setupModal(page))).not.toBeChecked();
-      await paseoToolsSwitch(setupModal(page)).click();
-      await expect(paseoToolsSwitch(setupModal(page))).toBeChecked();
-    });
-
-    await test.step("Phone asks for relay consent, then shows the pairing QR", async () => {
-      await continueSetup(page);
-      await expectSetupStep(page, "Take your agents with you");
-      await expect(setupModal(page).getByText("Enable relay?", { exact: true })).toBeVisible();
-      await page.screenshot({ path: testInfo.outputPath("5-phone-consent.png") });
-      expect(await openTailscaleDocsFromSetup(page)).toBe(
-        "https://paseo.sh/docs/connectivity#tailscale",
-      );
-      await enableRelayAndExpectOffer(page);
-      await page.screenshot({ path: testInfo.outputPath("6-phone-qr.png") });
-    });
-
-    await test.step("Finish closes setup and Settings shows the same Paseo tools value", async () => {
-      await finishSetup(page);
-      await page.locator('[data-testid="sidebar-settings"]:visible').first().click();
-      await openSettingsHostSection(page, host.serverId, "agents");
-      await expect(paseoToolsSwitch(page)).toBeChecked();
-      await page.screenshot({ path: testInfo.outputPath("7-settings-agents.png") });
-    });
-  } finally {
-    await host.close();
-  }
-});

packages/app/e2e/browser/plugin-theme.spec.ts

@@ -2,6 +2,7 @@ import { pluginRequirements } from "../support/helpers/plugin-fixture";
 import { mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
+import type { Page } from "@playwright/test";
 import { expect, test } from "../support/fixtures";
 import { connectNewWorkspaceDaemonClient } from "../support/helpers/new-workspace";
 import { openSettingsSection } from "../support/helpers/settings";
@@ -68,7 +69,8 @@ test("applies a contributed theme and falls back when its plugin is gone", async
     await openSettingsSection(page, "appearance");
 
     const sectionTitle = page.getByText("Theme", { exact: true }).first();
-    const mochaItem = page.getByRole("radio", { name: "Catppuccin Mocha", exact: true });
+    await page.getByLabel("Theme: System", { exact: true }).click();
+    const mochaItem = page.getByText("Catppuccin Mocha", { exact: true });
     await expect(mochaItem).toBeVisible({ timeout: 30_000 });
     await page.screenshot({
       path: testInfo.outputPath("plugin-theme-picker.png"),
@@ -77,14 +79,14 @@ test("applies a contributed theme and falls back when its plugin is gone", async
     });
 
     await test.step("a contributed light theme uses the light palette", async () => {
-      const latteItem = page.getByRole("radio", { name: "Catppuccin Latte", exact: true });
-      await latteItem.click();
-      await expect(latteItem).toBeChecked();
+      await page.getByText("Catppuccin Latte", { exact: true }).click();
+      await expect(page.getByLabel("Theme: Catppuccin Latte", { exact: true })).toBeVisible();
       await expect(sectionTitle).toHaveCSS("color", LATTE_MUTED_FOREGROUND);
+      await page.getByLabel("Theme: Catppuccin Latte", { exact: true }).click();
     });
 
     await mochaItem.click();
-    await expect(mochaItem).toBeChecked();
+    await expect(page.getByLabel("Theme: Catppuccin Mocha", { exact: true })).toBeVisible();
     await expect(sectionTitle).toHaveCSS("color", MOCHA_MUTED_FOREGROUND);
     await page.screenshot({
       path: testInfo.outputPath("plugin-theme-applied.png"),
@@ -93,13 +95,15 @@ test("applies a contributed theme and falls back when its plugin is gone", async
 
     await test.step("the selection survives a reload", async () => {
       await page.reload();
-      await expect(mochaItem).toBeChecked({ timeout: 30_000 });
+      await expect(page.getByLabel("Theme: Catppuccin Mocha", { exact: true })).toBeVisible({
+        timeout: 30_000,
+      });
       await expect(sectionTitle).toHaveCSS("color", MOCHA_MUTED_FOREGROUND);
     });
 
     await test.step("removing the plugin falls back to the default theme", async () => {
       await client.removePlugin(PLUGIN_ID);
-      await expect(page.getByRole("radio", { name: "System", exact: true })).toBeChecked({
+      await expect(page.getByLabel("Theme: System", { exact: true })).toBeVisible({
         timeout: 30_000,
       });
       await expect(sectionTitle).not.toHaveCSS("color", MOCHA_MUTED_FOREGROUND);
@@ -143,7 +147,15 @@ const MANY_THEMES_SOURCE = `export default function contribute(plugin) {
   return () => {};
 }`;
 
-test("reaches the last theme when a plugin contributes more themes than fit", async ({
+async function scrollThemeMenuToLastTheme(page: Page) {
+  const firstTheme = page.getByText("Pack theme 1", { exact: true });
+  await expect(firstTheme).toBeVisible({ timeout: 30_000 });
+  await firstTheme.hover();
+  await page.mouse.wheel(0, 4000);
+  await expect(page.getByText(LAST_THEME_NAME, { exact: true })).toBeInViewport({ ratio: 1 });
+}
+
+test("scrolls to the last theme when a plugin contributes more themes than fit", async ({
   page,
 }, testInfo) => {
   const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-theme-many-e2e-"));
@@ -163,16 +175,15 @@ test("reaches the last theme when a plugin contributes more themes than fit", as
     await expect(page.getByTestId("settings-sidebar")).toBeVisible();
     await openSettingsSection(page, "appearance");
 
-    const lastTheme = page.getByRole("radio", { name: LAST_THEME_NAME, exact: true });
-    await expect(lastTheme).toBeAttached({ timeout: 30_000 });
-    await lastTheme.scrollIntoViewIfNeeded();
+    await page.getByLabel("Theme: System", { exact: true }).click();
+    await scrollThemeMenuToLastTheme(page);
     await page.screenshot({
       path: testInfo.outputPath("plugin-theme-picker-scrolled.png"),
       animations: "disabled",
     });
 
-    await lastTheme.click();
-    await expect(lastTheme).toBeChecked();
+    await page.getByText(LAST_THEME_NAME, { exact: true }).click();
+    await expect(page.getByLabel(`Theme: ${LAST_THEME_NAME}`, { exact: true })).toBeVisible();
   } finally {
     await client.removePlugin(MANY_THEMES_PLUGIN_ID).catch(() => undefined);
     await client

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

@@ -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);
@@ -313,12 +326,12 @@ test.describe("Settings sidebar navigation", () => {
 
     await test.step("a dropdown owns Escape", async () => {
       await openSettingsSection(page, "appearance");
-      await page.getByLabel(/Highlight theme:/).click();
-      await expect(page.getByRole("menuitem", { name: "GitHub", exact: true })).toBeVisible();
+      await page.getByLabel(/Theme:/).click();
+      await expect(page.getByRole("menuitem", { name: "System", exact: true })).toBeVisible();
 
       await page.keyboard.press("Escape");
 
-      await expect(page.getByRole("menuitem", { name: "GitHub", exact: true })).toHaveCount(0);
+      await expect(page.getByRole("menuitem", { name: "System", exact: true })).toHaveCount(0);
       await expect(page).toHaveURL(/\/settings(\/|$)/);
     });
 

packages/app/e2e/browser/sidebar-reorder.spec.ts

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

packages/app/e2e/browser/workspace-relative-navigation.spec.ts

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

packages/app/e2e/mobile/system-bars/android.mjs

@@ -38,9 +38,12 @@ async function expectDarkIcons(expected, context) {
   assert.equal(windowState(), expected, context);
 }
 
-// Settings > Appearance shows every theme as a tile in one radio group.
 function selectTheme(theme) {
+  const current = ad("snapshot", "-i").match(/"Theme: ([^"]+)"/)?.[1];
+  assert(current, "Start on Settings > Appearance");
+  ad("press", `label="Theme: ${current}"`, "--settle");
   ad("press", `label="${theme}"`, "--settle");
+  ad("wait", "text", `Theme: ${theme}`, "5000");
 }
 
 ad("settings", "appearance", "light");

packages/app/e2e/mobile/terminal-rendering/check.mjs

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

packages/app/e2e/support/fixtures.ts

@@ -107,8 +107,6 @@ const daemonTest = metroTest.extend<
 });
 
 const test = daemonTest.extend<{
-  /** Specs start past first-run setup; onboarding specs opt out to see a fresh install. */
-  e2eOnboardingCompleted: boolean;
   paseoE2ESetup: void;
   outdatedDaemon: OutdatedDaemon;
   desktopManagedOutdatedDaemon: OutdatedDaemon;
@@ -116,9 +114,8 @@ const test = daemonTest.extend<{
   projectPickerFixture: TrackedProjectPickerFixture;
   withWorkspace: WithWorkspace;
 }>({
-  e2eOnboardingCompleted: [true, { option: true }],
   paseoE2ESetup: [
-    async ({ page, e2eOnboardingCompleted }, provide, testInfo) => {
+    async ({ page }, provide, testInfo) => {
       const daemonPort = getE2EDaemonPort();
       const metroPort = process.env.E2E_METRO_PORT;
       if (!metroPort) {
@@ -160,7 +157,7 @@ const test = daemonTest.extend<{
       const createAgentPreferences = buildCreateAgentPreferences();
 
       await page.addInitScript(
-        ({ daemon, preferences, seedNonce: nonce, extraHostsKey, onboardingCompleted }) => {
+        ({ daemon, preferences, seedNonce: nonce, extraHostsKey }) => {
           // `addInitScript` runs on every navigation (including reloads). Some tests intentionally
           // override storage and reload; they can opt out of seeding for the *next* navigation by
           // setting this flag before the reload.
@@ -188,20 +185,12 @@ const test = daemonTest.extend<{
           if (!localStorage.getItem("@paseo:app-settings")) {
             localStorage.setItem("@paseo:app-settings", JSON.stringify({ chatDisplay: "full" }));
           }
-          // The shared daemon often has no projects, which would open first-run setup over the app.
-          if (onboardingCompleted && !localStorage.getItem("@paseo:onboarding")) {
-            localStorage.setItem(
-              "@paseo:onboarding",
-              JSON.stringify({ completedAt: new Date(0).toISOString() }),
-            );
-          }
         },
         {
           daemon: testDaemon,
           preferences: createAgentPreferences,
           seedNonce,
           extraHostsKey: EXTRA_HOSTS_KEY,
-          onboardingCompleted: e2eOnboardingCompleted,
         },
       );
 

packages/app/e2e/support/helpers/isolated-host-daemon.ts

@@ -25,8 +25,6 @@ export interface IsolatedHostDaemon {
 }
 
 export interface IsolatedHostDaemonOptions {
-  /** Written to the daemon's config.json; `mutableRelay` adds `daemon.relay` to it. */
-  config?: { daemon?: Record<string, unknown>; [key: string]: unknown };
   environment?: NodeJS.ProcessEnv;
   mutableRelay?: {
     enabled: boolean;
@@ -95,28 +93,6 @@ async function waitForServer(port: number, child: ChildProcess): Promise<void> {
   );
 }
 
-function withMutableRelay(
-  config: NonNullable<IsolatedHostDaemonOptions["config"]>,
-  relay: NonNullable<IsolatedHostDaemonOptions["mutableRelay"]>,
-): NonNullable<IsolatedHostDaemonOptions["config"]> {
-  const endpoint =
-    relay.endpoint ??
-    (process.env.E2E_RELAY_PORT ? `127.0.0.1:${process.env.E2E_RELAY_PORT}` : "127.0.0.1:9");
-  return {
-    ...config,
-    daemon: {
-      ...config.daemon,
-      relay: {
-        enabled: relay.enabled,
-        endpoint,
-        publicEndpoint: endpoint,
-        useTls: false,
-        publicUseTls: false,
-      },
-    },
-  };
-}
-
 export async function startIsolatedHostDaemon(
   serverId: string,
   options: IsolatedHostDaemonOptions = {},
@@ -162,13 +138,24 @@ export async function startIsolatedHostDaemon(
       throw error;
     }
   }
-  const config = options.mutableRelay
-    ? withMutableRelay(options.config ?? {}, options.mutableRelay)
-    : options.config;
-  if (config) {
+  if (options.mutableRelay) {
+    const endpoint =
+      options.mutableRelay.endpoint ??
+      (process.env.E2E_RELAY_PORT ? `127.0.0.1:${process.env.E2E_RELAY_PORT}` : "127.0.0.1:9");
     await writeFile(
       path.join(paseoHome, "config.json"),
-      `${JSON.stringify({ version: 1, ...config })}\n`,
+      `${JSON.stringify({
+        version: 1,
+        daemon: {
+          relay: {
+            enabled: options.mutableRelay.enabled,
+            endpoint,
+            publicEndpoint: endpoint,
+            useTls: false,
+            publicUseTls: false,
+          },
+        },
+      })}\n`,
     );
   }
   const serverDir = publishedPackageRoot

packages/app/e2e/support/helpers/onboarding.ts

@@ -1,192 +0,0 @@
-import { randomUUID } from "node:crypto";
-import { mkdir, mkdtemp, rm, utimes, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import path from "node:path";
-import { expect, type Locator, type Page } from "@playwright/test";
-import { addProjectFlow, addProjectFlowInput, chooseAddProjectMethod } from "./add-project-flow";
-import { buildCreateAgentPreferences, buildSeededHost } from "./daemon-registry";
-import { startIsolatedHostDaemon, type IsolatedHostDaemonOptions } from "./isolated-host-daemon";
-
-/** Points a fresh browser profile at one host, with no first-run record and no app settings. */
-export async function openAppAsNewUser(
-  page: Page,
-  host: { serverId: string; port: number },
-): Promise<void> {
-  const seededHost = buildSeededHost({
-    serverId: host.serverId,
-    endpoint: `127.0.0.1:${host.port}`,
-    nowIso: new Date().toISOString(),
-  });
-  await page.route(/:6767\b/, (route) => route.abort());
-  await page.routeWebSocket(/:6767\b/, async (webSocket) => {
-    await webSocket.close({ code: 1008, reason: "Blocked developer daemon during e2e." });
-  });
-  await page.addInitScript(
-    ({ registryHost, preferences }) => {
-      localStorage.setItem("@paseo:e2e", "1");
-      localStorage.setItem("@paseo:daemon-registry", JSON.stringify([registryHost]));
-      localStorage.setItem("@paseo:create-agent-preferences", JSON.stringify(preferences));
-    },
-    { registryHost: seededHost, preferences: buildCreateAgentPreferences() },
-  );
-  await page.goto("/");
-}
-
-export function setupModal(page: Page): Locator {
-  return page.getByRole("dialog").filter({ hasText: "Set up Paseo" });
-}
-
-export async function expectSetupStep(page: Page, title: string): Promise<void> {
-  await expect(setupModal(page).getByRole("heading", { name: title, exact: true })).toBeVisible({
-    timeout: 60_000,
-  });
-}
-
-export async function pickTheme(page: Page, name: string): Promise<void> {
-  const tile = setupModal(page).getByRole("radio", { name, exact: true });
-  await tile.click();
-  await expect(tile).toBeChecked();
-}
-
-export async function continueSetup(page: Page): Promise<void> {
-  await setupModal(page).getByRole("button", { name: "Continue", exact: true }).click();
-}
-
-export async function skipSetup(page: Page): Promise<void> {
-  await setupModal(page).getByRole("button", { name: "Skip setup", exact: true }).click();
-  await expect(setupModal(page)).toHaveCount(0);
-}
-
-/** Adds a folder through the regular Add project flow, opened from the setup's Projects step. */
-export async function addProjectFromSetup(page: Page, projectPath: string): Promise<void> {
-  await setupModal(page).getByRole("button", { name: "Add project", exact: true }).click();
-  await expect(addProjectFlow(page)).toBeVisible({ timeout: 30_000 });
-  await chooseAddProjectMethod(page, "directory-search");
-  await addProjectFlowInput(page).fill(projectPath);
-  await page.keyboard.press("Enter");
-  await expect(addProjectFlow(page)).toHaveCount(0, { timeout: 30_000 });
-}
-
-export async function showSetupAgainFromSettings(page: Page): Promise<void> {
-  await page.locator('[data-testid="sidebar-settings"]:visible').first().click();
-  await page.getByRole("button", { name: "Show setup again", exact: true }).click();
-}
-
-export async function goToSetupStep(page: Page, label: string): Promise<void> {
-  await setupModal(page).getByRole("tab", { name: label, exact: true }).click();
-}
-
-export function paseoToolsSwitch(scope: Page | Locator): Locator {
-  return scope.getByRole("switch", { name: "Inject Paseo tools", exact: true });
-}
-
-export async function finishSetup(page: Page): Promise<void> {
-  await setupModal(page).getByRole("button", { name: "Finish", exact: true }).click();
-  await expect(setupModal(page)).toHaveCount(0);
-}
-
-/** Clicks the Tailscale docs link in the Phone step and returns the page it opened. */
-export async function openTailscaleDocsFromSetup(page: Page): Promise<string> {
-  await page
-    .context()
-    .route("https://paseo.sh/**", (route) =>
-      route.fulfill({ contentType: "text/html", body: "<title>Paseo docs</title>" }),
-    );
-  const popup = page.waitForEvent("popup");
-  await setupModal(page).getByRole("link", { name: "Read how to connect over Tailscale" }).click();
-  const docs = await popup;
-  await docs.waitForLoadState("domcontentloaded");
-  const url = docs.url();
-  await docs.close();
-  return url;
-}
-
-export interface SetupHost {
-  serverId: string;
-  port: number;
-  close(): Promise<void>;
-}
-
-/**
- * An isolated host whose only agent history is the Claude sessions given here, so suggestions
- * never depend on the machine running the test. `withBrokenProvider` adds a provider that cannot
- * start.
- */
-export async function startSetupHost(
-  label: string,
-  options: {
-    claudeSessionsIn?: readonly string[];
-    withBrokenProvider?: boolean;
-    mutableRelay?: IsolatedHostDaemonOptions["mutableRelay"];
-  } = {},
-): Promise<SetupHost> {
-  const serverId = `srv_onboarding_${label}_${randomUUID().replaceAll("-", "").slice(0, 8)}`;
-  const claudeConfigDir = await seedClaudeHistory(options.claudeSessionsIn ?? []);
-  const daemon = await startIsolatedHostDaemon(serverId, {
-    config: claudeOnlyConfig({ withBrokenProvider: options.withBrokenProvider ?? false }),
-    environment: { ...process.env, CLAUDE_CONFIG_DIR: claudeConfigDir },
-    mutableRelay: options.mutableRelay,
-  });
-  return {
-    serverId,
-    port: daemon.port,
-    close: async () => {
-      await daemon.close();
-      await rm(claudeConfigDir, { recursive: true, force: true });
-    },
-  };
-}
-
-/** Writes one recent Claude session per folder into a fresh CLAUDE_CONFIG_DIR. */
-async function seedClaudeHistory(cwds: readonly string[]): Promise<string> {
-  const configDir = await mkdtemp(path.join(tmpdir(), "paseo-onboarding-claude-"));
-  const newest = Date.now() - 60_000;
-  for (const [index, cwd] of cwds.entries()) {
-    const sessionId = `onboarding-session-${index + 1}`;
-    const projectDir = path.join(configDir, "projects", cwd.replace(/[^a-zA-Z0-9]/g, "-"));
-    await mkdir(projectDir, { recursive: true });
-    const sessionPath = path.join(projectDir, `${sessionId}.jsonl`);
-    const record = {
-      type: "user",
-      uuid: `${sessionId}-user`,
-      message: { role: "user", content: `Work on session ${index + 1}` },
-      cwd,
-      sessionId,
-    };
-    await writeFile(sessionPath, `${JSON.stringify(record)}\n`);
-    const timestamp = new Date(newest - index * 60_000);
-    await utimes(sessionPath, timestamp, timestamp);
-  }
-  return configDir;
-}
-
-function claudeOnlyConfig(options: { withBrokenProvider: boolean }) {
-  const brokenProvider = {
-    "broken-acp": {
-      extends: "acp",
-      label: "Broken ACP",
-      command: ["missing-agent-command", "acp"],
-    },
-  };
-  return {
-    agents: {
-      providers: {
-        codex: { enabled: false },
-        copilot: { enabled: false },
-        omp: { enabled: false },
-        opencode: { enabled: false },
-        pi: { enabled: false },
-        ...(options.withBrokenProvider ? brokenProvider : {}),
-      },
-    },
-  };
-}
-
-export function projectSuggestion(page: Page, name: string): Locator {
-  return setupModal(page).getByRole("checkbox", { name, exact: true });
-}
-
-/** The footer's main button, which adds the checked suggestions when there are any. */
-export function setupPrimaryButton(page: Page, label: string): Locator {
-  return setupModal(page).getByRole("button", { name: label, exact: true });
-}

packages/app/e2e/support/helpers/settings.ts

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

packages/app/modules/paseo-terminal/android/src/androidTest/assets/grapheme-rows.json

@@ -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]
   }

packages/app/modules/paseo-terminal/android/src/androidTest/java/sh/paseo/terminal/TerminalRowLayoutTest.kt

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

packages/app/package.json

@@ -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",

packages/app/src/agent-commands/cache/index.ts

@@ -1,8 +1,16 @@
 import type { QueryClient } from "@tanstack/react-query";
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
+import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
+import equal from "fast-deep-equal";
 import { normalizeWorkspacePath } from "@/utils/workspace-identity";
 
 export const AGENT_COMMANDS_QUERY_ROOT = "agentCommands";
+export const sessionCommandQueryPolicy = {
+  staleTime: 600_000,
+  gcTime: 1_800_000,
+  refetchOnMount: true,
+  refetchOnWindowFocus: false,
+} as const;
 
 export interface AgentCommandsDraftConfig {
   provider: AgentProvider;
@@ -21,6 +29,46 @@ export function agentCommandsQueryRoot(serverId: string) {
   return [AGENT_COMMANDS_QUERY_ROOT, serverId] as const;
 }
 
+/** Snapshot announcements contain provider metadata, not command catalogs. Ignore initial
+ * discovery and unrelated providers; explicit refresh still invalidates every catalog. */
+export function invalidateCommandsForProviderChange(input: {
+  queryClient: QueryClient;
+  serverId: string;
+  cwd: string | null;
+  previous: readonly ProviderSnapshotEntry[] | undefined;
+  current: readonly ProviderSnapshotEntry[];
+}): Promise<void> {
+  const previous = new Map((input.previous ?? []).map((entry) => [entry.provider, entry]));
+  const current = new Map(input.current.map((entry) => [entry.provider, entry]));
+  const relevant = (entry: ProviderSnapshotEntry | undefined) =>
+    entry && {
+      status: entry.status,
+      enabled: entry.enabled,
+      source: entry.source,
+      models: entry.models,
+      modes: entry.modes,
+      defaultModeId: entry.defaultModeId,
+    };
+  return input.queryClient.invalidateQueries({
+    queryKey: agentCommandsQueryRoot(input.serverId),
+    predicate: (query) => {
+      const isDraft = query.queryKey[2] === "draft";
+      const provider =
+        query.meta?.agentCommandProvider ?? (isDraft ? query.queryKey[6] : undefined);
+      const cwd = query.meta?.agentCommandCwd ?? (isDraft ? query.queryKey[4] : undefined);
+      if (input.cwd && typeof cwd === "string" && normalizeAgentCommandsCwd(cwd) !== input.cwd)
+        return false;
+      if (typeof provider !== "string") return false;
+      const before = previous.get(provider);
+      const after = current.get(provider);
+      if (!before) return after?.status === "ready" && query.state.status === "error";
+      if (before.status !== "ready")
+        return after?.status === "ready" && query.state.status === "error";
+      return !equal(relevant(before), relevant(after));
+    },
+  });
+}
+
 export function sessionAgentCommandsQueryKey(input: { serverId: string; agentId: string }) {
   return [...agentCommandsQueryRoot(input.serverId), "session", input.agentId] as const;
 }

packages/app/src/agent-commands/index.tsx

@@ -0,0 +1,99 @@
+import { createContext, useCallback, useContext, useMemo, type ReactNode } from "react";
+import { useQueryClient } from "@tanstack/react-query";
+import type { ComposerEditingSession } from "@/composer/editing-session";
+import { agentCommandsQueryKey } from "./cache";
+import {
+  useAgentCommandsQuery,
+  type AgentSlashCommand,
+  type DraftCommandConfig,
+} from "./use-query";
+
+export type {
+  AgentSlashCommand,
+  DraftCommandConfig,
+  DraftCommandTarget,
+  AgentCommandsClient,
+} from "./use-query";
+export { fetchAgentCommands } from "./use-query";
+
+type CommandQuery = ReturnType<typeof useAgentCommandsQuery>;
+const QueryContext = createContext<CommandQuery | null>(null);
+export interface CommandHints {
+  names: ReadonlySet<string>;
+  insert(command: string): void;
+}
+const HintsContext = createContext<CommandHints | null>(null);
+
+function useLiveAgentCommands() {
+  return useContext(QueryContext);
+}
+export function useAutocompleteCommands(input: {
+  serverId: string;
+  agentId: string;
+  enabled: boolean;
+  draftConfig?: DraftCommandConfig;
+}) {
+  const live = useLiveAgentCommands();
+  const fallback = useAgentCommandsQuery({
+    serverId: input.serverId,
+    agentId: input.agentId,
+    enabled: !live && input.enabled,
+    draftConfig: input.draftConfig,
+  });
+  return live ?? fallback;
+}
+export function useAgentCommandHints() {
+  return useContext(HintsContext);
+}
+export function matchCommandLink(
+  url: string,
+  sourceType: "markdown" | "text" | "inline-code" | undefined,
+  names: ReadonlySet<string>,
+): string | null {
+  return (sourceType === "markdown" || sourceType === "inline-code") &&
+    url.startsWith("/") &&
+    names.has(url.slice(1))
+    ? url
+    : null;
+}
+
+export function AgentCommandsProvider({
+  serverId,
+  agentId,
+  editingSession,
+  enabled,
+  children,
+}: {
+  serverId: string;
+  agentId: string;
+  editingSession: ComposerEditingSession;
+  enabled: boolean;
+  children: ReactNode;
+}) {
+  const query = useAgentCommandsQuery({ serverId, agentId, enabled });
+  const queryClient = useQueryClient();
+  const namesKey = JSON.stringify(
+    [...new Set(query.commands.map((command) => command.name))].sort(),
+  );
+  const names = useMemo<ReadonlySet<string>>(
+    () => new Set(JSON.parse(namesKey) as string[]),
+    [namesKey],
+  );
+  const insert = useCallback(
+    (token: string) => {
+      const commands = queryClient.getQueryData<AgentSlashCommand[]>(
+        agentCommandsQueryKey({ serverId, agentId }),
+      );
+      if (token.startsWith("/") && commands?.some((command) => `/${command.name}` === token)) {
+        editingSession.insertCommand(token);
+      }
+    },
+    [agentId, editingSession, queryClient, serverId],
+  );
+  const hints = useMemo(() => ({ names, insert }), [names, insert]);
+  return (
+    <QueryContext.Provider value={enabled ? query : null}>
+      <HintsContext.Provider value={enabled ? hints : null}>{children}</HintsContext.Provider>
+    </QueryContext.Provider>
+  );
+}

packages/app/src/agent-commands/query.test.ts

@@ -1,11 +1,61 @@
 import { describe, expect, it } from "vitest";
+import { QueryClient, QueryObserver } from "@tanstack/react-query";
+import { fetchQueryOptions } from "@/data/query";
 import {
   agentCommandsQueryKey,
   agentCommandsQueryRoot,
   draftAgentCommandsQueryKey,
   normalizeAgentCommandsCwd,
   sessionAgentCommandsQueryKey,
-} from "./agent-commands-query";
+  sessionCommandQueryPolicy,
+} from "./cache";
+
+it("reuses fresh commands and keeps stale commands during a shared refresh and failure", async () => {
+  const client = new QueryClient({ defaultOptions: { queries: { gcTime: 300_000 } } });
+  const key = sessionAgentCommandsQueryKey({ serverId: "s", agentId: "a" });
+  let calls = 0;
+  let fail = false;
+  let resolveRefresh: (value: string[]) => void = () => {};
+  const refresh = new Promise<string[]>((resolve) => {
+    resolveRefresh = resolve;
+  });
+  const options = fetchQueryOptions({
+    ...sessionCommandQueryPolicy,
+    staleTimeMs: sessionCommandQueryPolicy.staleTime,
+    dataShape: "value",
+    queryKey: key,
+    retry: false,
+    queryFn: async () => {
+      calls++;
+      if (fail) throw new Error("offline");
+      return refresh;
+    },
+  });
+  client.setQueryData(key, ["old"]);
+  const fresh = new QueryObserver(client, options);
+  const unsubscribeFresh = fresh.subscribe(() => {});
+  expect(calls).toBe(0);
+  unsubscribeFresh();
+  client.setQueryData(key, ["old"], { updatedAt: 1 });
+  const first = new QueryObserver(client, options);
+  const second = new QueryObserver(client, options);
+  const unsubscribeFirst = first.subscribe(() => {});
+  const unsubscribeSecond = second.subscribe(() => {});
+  expect(calls).toBe(1);
+  expect(first.getCurrentResult().data).toEqual(["old"]);
+  expect(client.getQueryCache().find({ queryKey: key })?.gcTime).toBe(1_800_000);
+  resolveRefresh(["new"]);
+  await refresh;
+  await first.refetch({ cancelRefetch: false });
+  expect(second.getCurrentResult().data).toEqual(["new"]);
+  fail = true;
+  await client.invalidateQueries({ queryKey: key });
+  expect(first.getCurrentResult().data).toEqual(["new"]);
+  expect(first.getCurrentResult().isError).toBe(true);
+  unsubscribeFirst();
+  unsubscribeSecond();
+  client.clear();
+});
 
 describe("agent command query keys", () => {
   it("shares draft commands across draft tabs with the same provider setup", () => {

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

@@ -1,9 +1,5 @@
 import { describe, expect, it } from "vitest";
-import {
-  type AgentCommandsClient,
-  type DraftCommandConfig,
-  fetchAgentCommands,
-} from "./use-agent-commands-query";
+import { type AgentCommandsClient, type DraftCommandConfig, fetchAgentCommands } from "./use-query";
 
 type ListCommands = AgentCommandsClient["listCommands"];
 type ListCommandsResult = Awaited<ReturnType<ListCommands>>;
@@ -38,6 +34,12 @@ function commandsPayload(commands: ListCommandsResult["commands"]): ListCommands
 }
 
 describe("fetchAgentCommands", () => {
+  it("rejects a discovery error so a previous catalog is retained", async () => {
+    const client = createClient({ ...commandsPayload([]), error: "provider unavailable" });
+    await expect(fetchAgentCommands({ client, agentId: "agent-1" })).rejects.toThrow(
+      "provider unavailable",
+    );
+  });
   it("loads commands for a draft composer without an agent id", async () => {
     const client = createClient(
       commandsPayload([{ name: "compact", description: "Compact context", argumentHint: "" }]),

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

@@ -1,12 +1,15 @@
-import { useQuery } from "@tanstack/react-query";
+import { useFetchQuery } from "@/data/query";
 import { useTranslation } from "react-i18next";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { useRetainedPanelActive } from "@/components/retained-panel";
+import { useSessionStore } from "@/stores/session-store";
+import { useShallow } from "zustand/shallow";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
-import { agentCommandsQueryKey, type AgentCommandsDraftConfig } from "@/hooks/agent-commands-query";
-
-const DRAFT_COMMANDS_STALE_TIME = Number.POSITIVE_INFINITY;
-const SESSION_COMMANDS_STALE_TIME = 60_000;
+import {
+  agentCommandsQueryKey,
+  sessionCommandQueryPolicy,
+  type AgentCommandsDraftConfig,
+} from "./cache";
 
 export interface AgentSlashCommand {
   name: string;
@@ -41,6 +44,7 @@ export async function fetchAgentCommands(input: {
     agentId: input.agentId,
     draftConfig: input.draftConfig,
   });
+  if (response.error) throw new Error(response.error);
   return response.commands as AgentSlashCommand[];
 }
 
@@ -62,8 +66,16 @@ export function useAgentCommandsQuery({
   const queryEnabled = enabled && retainedPanelActive;
   const client = useHostRuntimeClient(serverId);
   const isConnected = useHostRuntimeIsConnected(serverId);
+  const { provider, cwd } = useSessionStore(
+    useShallow((state) => {
+      const agent =
+        state.sessions[serverId]?.agents?.get(agentId) ??
+        state.sessions[serverId]?.agentDetails?.get(agentId);
+      return { provider: agent?.provider, cwd: agent?.cwd };
+    }),
+  );
 
-  const query = useQuery({
+  const query = useFetchQuery({
     queryKey: agentCommandsQueryKey({ serverId, agentId, draftConfig }),
     queryFn: async () => {
       if (!client) {
@@ -72,7 +84,15 @@ export function useAgentCommandsQuery({
       return fetchAgentCommands({ client, agentId, draftConfig });
     },
     enabled: queryEnabled && !!client && isConnected && (!!agentId || !!draftConfig),
-    staleTime: draftConfig ? DRAFT_COMMANDS_STALE_TIME : SESSION_COMMANDS_STALE_TIME,
+    dataShape: "value",
+    meta: {
+      agentCommandProvider: draftConfig?.provider ?? provider,
+      agentCommandCwd: draftConfig?.cwd ?? cwd,
+    },
+    ...(draftConfig
+      ? { immutableWhen: () => true as const }
+      : { ...sessionCommandQueryPolicy, staleTimeMs: sessionCommandQueryPolicy.staleTime }),
+    subscribed: queryEnabled,
     retry: 3,
     retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 5000),
   });
@@ -84,7 +104,7 @@ export function useAgentCommandsQuery({
   return {
     commands: query.data ?? [],
     isLoading,
-    isError: query.isError,
+    isError: query.isError && query.data === undefined,
     error: query.error,
   };
 }

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

@@ -468,6 +468,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       () =>
         createInlinePathOpener({
           workspaceRoot,
+          resolveRelativeFiles: true,
           client,
           openFile: openInlineFile,
           openDirectory: openInlineDirectory,

packages/app/src/app/_layout.tsx

@@ -35,7 +35,6 @@ import { DownloadToast } from "@/components/download-toast";
 import { QuittingOverlay } from "@/components/quitting-overlay";
 import { KeyboardShortcutsDialog } from "@/components/keyboard-shortcuts-dialog";
 import { ChangelogHost } from "@/changelog";
-import { OnboardingHost } from "@/onboarding";
 import { AppDiagnosticHost } from "@/components/app-diagnostic-host";
 import { AppearanceStyleBoundary } from "@/components/appearance-style-boundary";
 import { LeftSidebar } from "@/components/left-sidebar";
@@ -495,7 +494,6 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
         <WorkspacePinShortcutHandler />
         <WorkspaceRenameHost />
         <CommandCenter />
-        <OnboardingHost />
         <AddProjectFlowHost />
         <HostChooserModal />
         <HostConfirmationSheet />

packages/app/src/appearance/theme-picker.tsx

@@ -1,280 +0,0 @@
-import { useCallback, useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { Text, View, type PressableStateCallbackType } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { PressHighlight } from "@/components/ui/press-highlight";
-import { DEFAULT_THEME_PREFERENCE, useAppSettings, type AppSettings } from "@/hooks/use-settings";
-import type { PluginThemeOption } from "@/plugins/themes";
-import {
-  THEME_OPTIONS,
-  PLUGIN_THEME_PREFERENCE,
-  darkTheme,
-  lightTheme,
-  type Theme,
-} from "@/styles/theme";
-import { useContributedThemes } from "./provider";
-
-type BuiltInThemePreference = Exclude<AppSettings["theme"], typeof PLUGIN_THEME_PREFERENCE>;
-
-// System leads the grid because it is the default.
-const PICKER_THEME_OPTIONS = [
-  ...THEME_OPTIONS.filter((option) => option.name === "auto"),
-  ...THEME_OPTIONS.filter((option) => option.name !== "auto"),
-];
-
-const PREVIEW_WIDTH = 128;
-const PREVIEW_HEIGHT = 72;
-
-/**
- * Every theme as a tile with a small preview drawn from its own tokens. Picking a tile applies
- * the theme to the whole app at once. Settings → Appearance and first-run setup share it.
- */
-export function ThemePicker() {
-  const { t } = useTranslation();
-  const { settings, updateSettings } = useAppSettings();
-  const { options: pluginThemes, selected: selectedPluginTheme, select } = useContributedThemes();
-  // A selected contribution that is no longer installed shows the fallback the app renders.
-  const builtInValue =
-    settings.theme === PLUGIN_THEME_PREFERENCE ? DEFAULT_THEME_PREFERENCE : settings.theme;
-
-  const selectBuiltIn = useCallback(
-    (theme: BuiltInThemePreference) => {
-      void updateSettings({ theme });
-    },
-    [updateSettings],
-  );
-
-  return (
-    <View
-      style={styles.grid}
-      accessibilityRole="radiogroup"
-      accessibilityLabel={t("settings.appearance.theme.title")}
-    >
-      {PICKER_THEME_OPTIONS.map((option) => (
-        <BuiltInThemeTile
-          key={option.name}
-          value={option.name}
-          selected={selectedPluginTheme === null && builtInValue === option.name}
-          onSelect={selectBuiltIn}
-        />
-      ))}
-      {pluginThemes.map((option) => (
-        <PluginThemeTile
-          key={option.id}
-          option={option}
-          selected={selectedPluginTheme?.id === option.id}
-          onSelect={select}
-        />
-      ))}
-    </View>
-  );
-}
-
-function BuiltInThemeTile({
-  value,
-  selected,
-  onSelect,
-}: {
-  value: BuiltInThemePreference;
-  selected: boolean;
-  onSelect: (value: BuiltInThemePreference) => void;
-}) {
-  const { t } = useTranslation();
-  const handlePress = useCallback(() => onSelect(value), [onSelect, value]);
-  const option = THEME_OPTIONS.find((candidate) => candidate.name === value);
-  return (
-    <ThemeTile
-      label={t(`settings.appearance.theme.options.${value}`)}
-      selected={selected}
-      onPress={handlePress}
-      previewTheme={option && "theme" in option ? option.theme : "system"}
-    />
-  );
-}
-
-function PluginThemeTile({
-  option,
-  selected,
-  onSelect,
-}: {
-  option: PluginThemeOption;
-  selected: boolean;
-  onSelect: (option: PluginThemeOption) => void;
-}) {
-  const handlePress = useCallback(() => onSelect(option), [onSelect, option]);
-  return (
-    <ThemeTile
-      label={option.name}
-      selected={selected}
-      onPress={handlePress}
-      previewTheme={option.theme}
-    />
-  );
-}
-
-function ThemeTile({
-  label,
-  selected,
-  onPress,
-  previewTheme,
-}: {
-  label: string;
-  selected: boolean;
-  onPress: () => void;
-  /** "system" follows the OS, so its preview shows both halves. */
-  previewTheme: Theme | "system";
-}) {
-  const accessibilityState = useMemo(() => ({ checked: selected }), [selected]);
-  const tileStyle = useCallback(
-    ({ hovered }: PressableStateCallbackType & { hovered?: boolean }) => [
-      styles.tile,
-      hovered && !selected && styles.tileHovered,
-      selected && styles.tileSelected,
-    ],
-    [selected],
-  );
-  return (
-    <PressHighlight
-      style={tileStyle}
-      onPress={onPress}
-      accessibilityRole="radio"
-      accessibilityLabel={label}
-      accessibilityState={accessibilityState}
-      aria-checked={selected}
-    >
-      <View style={styles.previewFrame}>
-        {previewTheme === "system" ? <SystemThemePreview /> : <ThemePreview theme={previewTheme} />}
-      </View>
-      <Text style={styles.label} numberOfLines={1}>
-        {label}
-      </Text>
-    </PressHighlight>
-  );
-}
-
-/** A sketch of the app — sidebar, a few lines of text and an accent bubble — in `theme`'s colors. */
-function ThemePreview({ theme }: { theme: Theme }) {
-  const colors = theme.colors;
-  const previewStyles = useMemo(
-    () => ({
-      root: [styles.preview, { backgroundColor: colors.surface0 }],
-      sidebar: [styles.previewSidebar, { backgroundColor: colors.surfaceSidebar }],
-      mutedLine: { backgroundColor: colors.foregroundMuted },
-      strongLine: { backgroundColor: colors.foreground },
-      bubble: [styles.previewBubble, { backgroundColor: colors.accent }],
-    }),
-    [colors],
-  );
-  return (
-    <View style={previewStyles.root}>
-      <View style={previewStyles.sidebar}>
-        <View style={[styles.previewLine, styles.sidebarLineWide, previewStyles.mutedLine]} />
-        <View style={[styles.previewLine, styles.sidebarLineNarrow, previewStyles.mutedLine]} />
-        <View style={[styles.previewLine, styles.sidebarLineMedium, previewStyles.mutedLine]} />
-      </View>
-      <View style={styles.previewMain}>
-        <View style={[styles.previewTitle, previewStyles.strongLine]} />
-        <View style={[styles.previewLine, styles.mainLineWide, previewStyles.mutedLine]} />
-        <View style={[styles.previewLine, styles.mainLineNarrow, previewStyles.mutedLine]} />
-        <View style={previewStyles.bubble} />
-      </View>
-    </View>
-  );
-}
-
-/** "System" follows the OS: light on the left half, dark on the right. */
-function SystemThemePreview() {
-  return (
-    <View style={styles.preview}>
-      <ThemePreview theme={lightTheme} />
-      <View style={styles.systemDarkHalf}>
-        <View style={styles.systemDarkOffset}>
-          <ThemePreview theme={darkTheme} />
-        </View>
-      </View>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  grid: {
-    flexDirection: "row",
-    flexWrap: "wrap",
-    gap: theme.spacing[3],
-  },
-  tile: {
-    width: PREVIEW_WIDTH + theme.spacing[1] * 2 + theme.borderWidth[2] * 2,
-    padding: theme.spacing[1],
-    gap: theme.spacing[1],
-    borderRadius: theme.borderRadius.lg,
-    borderWidth: theme.borderWidth[2],
-    borderColor: "transparent",
-  },
-  tileHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
-  tileSelected: {
-    borderColor: theme.colors.accent,
-  },
-  previewFrame: {
-    borderRadius: theme.borderRadius.md,
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
-    overflow: "hidden",
-  },
-  label: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.sm,
-    paddingHorizontal: theme.spacing[1],
-  },
-  preview: {
-    width: PREVIEW_WIDTH,
-    height: PREVIEW_HEIGHT,
-    flexDirection: "row",
-    overflow: "hidden",
-  },
-  previewSidebar: {
-    width: 36,
-    paddingHorizontal: 6,
-    paddingVertical: 8,
-    gap: 5,
-  },
-  previewMain: {
-    flex: 1,
-    padding: 8,
-    gap: 5,
-  },
-  previewLine: {
-    height: 4,
-    borderRadius: 2,
-    opacity: 0.6,
-  },
-  previewTitle: {
-    width: "55%",
-    height: 5,
-    borderRadius: 2,
-  },
-  sidebarLineWide: { width: "100%" },
-  sidebarLineNarrow: { width: "60%" },
-  sidebarLineMedium: { width: "80%" },
-  mainLineWide: { width: "90%" },
-  mainLineNarrow: { width: "65%" },
-  previewBubble: {
-    marginTop: "auto",
-    alignSelf: "flex-end",
-    width: "45%",
-    height: 10,
-    borderRadius: 5,
-  },
-  systemDarkHalf: {
-    position: "absolute",
-    top: 0,
-    bottom: 0,
-    left: PREVIEW_WIDTH / 2,
-    width: PREVIEW_WIDTH / 2,
-    overflow: "hidden",
-  },
-  systemDarkOffset: {
-    marginLeft: -PREVIEW_WIDTH / 2,
-  },
-}));

packages/app/src/assistant-file-links/path-open.test.ts

@@ -64,7 +64,10 @@ it("ignores an older probe after a newer file link opens", async () => {
   const opened: string[] = [];
   const opener = createInlinePathOpener({
     workspaceRoot: "/repo",
-    client: { listDirectory: () => pendingProbe },
+    client: {
+      listDirectory: () => pendingProbe,
+      getDirectorySuggestions: async () => ({ entries: [], error: null }),
+    },
     openFile: (location) => {
       opened.push(location.path);
     },
@@ -91,7 +94,10 @@ it("ignores a pending probe when its view is left", async () => {
   const opened: string[] = [];
   const opener = createInlinePathOpener({
     workspaceRoot: "/repo",
-    client: { listDirectory: () => pendingProbe },
+    client: {
+      listDirectory: () => pendingProbe,
+      getDirectorySuggestions: async () => ({ entries: [], error: null }),
+    },
     openFile: (location) => {
       opened.push(location.path);
     },
@@ -130,3 +136,45 @@ it("sends folders outside the workspace away from the workspace Files panel", as
   expect(outsideFolders).toEqual(["~/Downloads/contracts", "/tmp/reports"]);
   expect(workspaceFolders).toEqual(["docs"]);
 });
+
+it("keeps a later selection when an earlier nested-file lookup finishes last", async () => {
+  const { createInlinePathOpener } = await import("./path-open");
+  const lookup = Promise.withResolvers<{
+    entries: Array<{ path: string; kind: "file" }>;
+    error: null;
+  }>();
+  const queries: string[] = [];
+  const opened: string[] = [];
+  const opener = createInlinePathOpener({
+    workspaceRoot: "/repo",
+    resolveRelativeFiles: true,
+    client: {
+      listDirectory: async () => {
+        throw new Error("Not a directory");
+      },
+      getDirectorySuggestions: async ({ query }: { query: string }) => {
+        queries.push(query);
+        return lookup.promise;
+      },
+    },
+    openFile: (location) => {
+      opened.push(location.path);
+    },
+    openDirectory: (directory) => {
+      opened.push(directory);
+    },
+    openOutsideDirectory: (directory) => {
+      opened.push(directory);
+    },
+  });
+  const earlier = opener.open(
+    { raw: "schema/x.md:2", path: "/repo/schema/x.md", lineStart: 2 },
+    "side",
+  );
+  await Promise.resolve();
+  expect(queries).toEqual(["schema/x.md"]);
+  await opener.open({ raw: "./guide.md:2", path: "/repo/guide.md", lineStart: 2 }, "side");
+  lookup.resolve({ entries: [{ path: "repo-a/schema/x.md", kind: "file" }], error: null });
+  await earlier;
+  expect(opened).toEqual(["guide.md"]);
+});

packages/app/src/assistant-file-links/path-open.ts

@@ -5,6 +5,7 @@ import {
   type OpenFileDisposition,
 } from "@/workspace/file-open";
 import { isAbsolutePath } from "@/utils/path";
+import { resolveMissingNestedRelativeFile, type GetDirectorySuggestions } from "./resolver";
 
 interface PathOpenInput {
   file?: string;
@@ -50,7 +51,11 @@ export async function resolveInlinePathOpen(input: PathOpenInput): Promise<PathO
 
 export function createInlinePathOpener(input: {
   workspaceRoot: string;
-  client: PathOpenInput["client"];
+  client: {
+    listDirectory(root: string, path: string): Promise<unknown>;
+    getDirectorySuggestions: GetDirectorySuggestions;
+  } | null;
+  resolveRelativeFiles?: boolean;
   openFile: (location: WorkspaceFileLocation, disposition: OpenFileDisposition) => void;
   openDirectory: (path: string) => void;
   openOutsideDirectory: (path: string) => void;
@@ -73,10 +78,21 @@ export function createInlinePathOpener(input: {
       } else if (destination.kind === "outsideDirectory") {
         input.openOutsideDirectory(destination.directoryPath);
       } else if (normalized.file) {
+        const resolvedTarget =
+          input.resolveRelativeFiles && input.client
+            ? await resolveMissingNestedRelativeFile({
+                target,
+                workspaceRoot: input.workspaceRoot,
+                getDirectorySuggestions: input.client.getDirectorySuggestions.bind(input.client),
+              })
+            : target;
+        if (ownGeneration !== generation) return;
+        const resolved = normalizeInlinePathTarget(resolvedTarget.path, input.workspaceRoot);
+        if (!resolved?.file) return;
         const location = normalizeWorkspaceFileLocation({
-          path: normalized.file,
-          lineStart: target.lineStart,
-          lineEnd: target.lineEnd,
+          path: resolved.file,
+          lineStart: resolvedTarget.lineStart,
+          lineEnd: resolvedTarget.lineEnd,
         });
         if (location) input.openFile(location, disposition);
       }

packages/app/src/assistant-file-links/resolver.test.ts

@@ -7,6 +7,7 @@ import {
   classifyForResolution,
   fetchDaemonResolution,
   getAssistantFileLinkToken,
+  resolveMissingNestedRelativeFile,
   UnresolvedFileLinkError,
   type AssistantFileLinkContext,
   type DirectorySuggestionEntry,
@@ -424,6 +425,174 @@ describe("fetchDaemonResolution", () => {
   });
 });
 
+describe("resolveMissingNestedRelativeFile", () => {
+  const target = {
+    raw: "schema/x.md:12-14",
+    path: "/Users/test/project/schema/x.md",
+    lineStart: 12,
+    lineEnd: 14,
+  };
+
+  it("opens a nested-repo suffix when the workspace-root path is missing", async () => {
+    const { getDirectorySuggestions, searches } = suggestionsFromMap({
+      "schema/x.md": [{ path: "repo-a/schema/x.md", kind: "file" }],
+    });
+
+    const result = await resolveMissingNestedRelativeFile({
+      target,
+      workspaceRoot: "/Users/test/project",
+      getDirectorySuggestions,
+    });
+
+    expect(searches).toEqual([
+      {
+        query: "schema/x.md",
+        cwd: "/Users/test/project",
+        matchMode: "suffix",
+        limit: 1,
+      },
+    ]);
+    expect(result).toEqual({
+      ...target,
+      path: "/Users/test/project/repo-a/schema/x.md",
+    });
+  });
+
+  it("keeps the exact workspace path when suggestions return that relative path", async () => {
+    const { getDirectorySuggestions } = suggestionsFromMap({
+      "schema/x.md": [{ path: "schema/x.md", kind: "file" }],
+    });
+
+    const result = await resolveMissingNestedRelativeFile({
+      target,
+      workspaceRoot: "/Users/test/project",
+      getDirectorySuggestions,
+    });
+
+    expect(result).toEqual(target);
+  });
+
+  it("keeps the original target when suggestions are empty", async () => {
+    const { getDirectorySuggestions } = suggestionsFromMap({});
+
+    await expect(
+      resolveMissingNestedRelativeFile({
+        target,
+        workspaceRoot: "/Users/test/project",
+        getDirectorySuggestions,
+      }),
+    ).resolves.toEqual(target);
+  });
+
+  it("keeps the original target when the daemon throws", async () => {
+    await expect(
+      resolveMissingNestedRelativeFile({
+        target,
+        workspaceRoot: "/Users/test/project",
+        getDirectorySuggestions: unavailableSuggestions,
+      }),
+    ).resolves.toEqual(target);
+  });
+
+  it.each([
+    ["a bare filename", { ...target, path: "/Users/test/project/file.ts" }],
+    ["a path outside the workspace", { ...target, path: "/tmp/schema/x.md" }],
+    ["a home-relative path", { ...target, path: "~/schema/x.md" }],
+  ])("does not search %s", async (_label, candidate) => {
+    const { getDirectorySuggestions, searches } = suggestionsFromMap({
+      "schema/x.md": [{ path: "repo-a/schema/x.md", kind: "file" }],
+    });
+
+    const result = await resolveMissingNestedRelativeFile({
+      target: candidate,
+      workspaceRoot: "/Users/test/project",
+      getDirectorySuggestions,
+    });
+
+    expect(searches).toEqual([]);
+    expect(result).toEqual(candidate);
+  });
+
+  it("does not search when the workspace root is blank", async () => {
+    const { getDirectorySuggestions, searches } = suggestionsFromMap({});
+
+    const result = await resolveMissingNestedRelativeFile({
+      target,
+      workspaceRoot: "   ",
+      getDirectorySuggestions,
+    });
+
+    expect(searches).toEqual([]);
+    expect(result).toEqual(target);
+  });
+
+  it.each([
+    ["/Users/test/project/schema/x.md", "/Users/test/project"],
+    ["file:///Users/test/project/schema/x.md", "/Users/test/project"],
+    ["C:/repo/schema/x.md", "C:/repo"],
+    ["\\\\server\\share\\schema\\x.md", "//server/share"],
+  ])("keeps absolute destination %s", async (raw, workspaceRoot) => {
+    const { getDirectorySuggestions, searches } = suggestionsFromMap({
+      "schema/x.md": [{ path: "repo-a/schema/x.md", kind: "file" }],
+    });
+    const absoluteTarget = { raw, path: `${workspaceRoot}/schema/x.md` };
+    await expect(
+      resolveMissingNestedRelativeFile({
+        target: absoluteTarget,
+        workspaceRoot,
+        getDirectorySuggestions,
+      }),
+    ).resolves.toEqual(absoluteTarget);
+    expect(searches).toEqual([]);
+  });
+
+  it.each(["docs/guides", "./docs/guides", "docs/guides/"])(
+    "keeps folder href %s direct",
+    async (raw) => {
+      const { getDirectorySuggestions, searches } = suggestionsFromMap({
+        "docs/guides": [{ path: "repo-a/docs/guides", kind: "file" }],
+      });
+      const folderTarget = { raw, path: "/Users/test/project/docs/guides" };
+      await expect(
+        resolveMissingNestedRelativeFile({
+          target: folderTarget,
+          workspaceRoot: "/Users/test/project",
+          getDirectorySuggestions,
+        }),
+      ).resolves.toEqual(folderTarget);
+      expect(searches).toEqual([]);
+    },
+  );
+
+  it("normalizes a Windows workspace root before the suffix lookup", async () => {
+    const windowsTarget = {
+      raw: "schema/x.md",
+      path: "C:\\repo\\schema\\x.md",
+      lineStart: undefined,
+      lineEnd: undefined,
+    };
+    const { getDirectorySuggestions, searches } = suggestionsFromMap({
+      "schema/x.md": [{ path: "repo-a/schema/x.md", kind: "file" }],
+    });
+
+    const result = await resolveMissingNestedRelativeFile({
+      target: windowsTarget,
+      workspaceRoot: "C:\\repo\\",
+      getDirectorySuggestions,
+    });
+
+    expect(searches).toEqual([
+      {
+        query: "schema/x.md",
+        cwd: "C:\\repo\\",
+        matchMode: "suffix",
+        limit: 1,
+      },
+    ]);
+    expect(result.path).toBe("C:/repo/repo-a/schema/x.md");
+  });
+});
+
 describe("getAssistantFileLinkToken", () => {
   it("uses rendered text for markdown-it linkified tokens and href for explicit links", () => {
     expect(

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

@@ -5,6 +5,7 @@ import {
   type InlinePathTarget,
 } from "./parse";
 import { i18n } from "@/i18n/i18next";
+import { isAbsolutePath } from "@/utils/path";
 
 export interface AssistantFileLinkSource {
   href: string;
@@ -105,6 +106,62 @@ export async function fetchDaemonResolution({
   };
 }
 
+/** Only file-looking paths nested inside the workspace need suffix search. */
+function nestedRelativeLookupQuery(
+  targetPath: string,
+  workspaceRoot: string | undefined,
+): string | null {
+  const root = workspaceRoot?.trim();
+  if (!root) {
+    return null;
+  }
+  const normalizedRoot = root.replace(/\\/g, "/").replace(/\/+$/, "");
+  const normalizedPath = targetPath.replace(/\\/g, "/");
+  const prefix = `${normalizedRoot}/`;
+  if (!normalizedPath.startsWith(prefix)) {
+    return null;
+  }
+  const relative = normalizedPath.slice(prefix.length);
+  if (!relative.includes("/") || !isFileLookingAssistantToken(encodeURI(relative))) {
+    return null;
+  }
+  return relative;
+}
+
+/** When a markdown link points at workspaceRoot/schema/x.md and that file is
+ * missing, ask the same suffix lookup bare names already use. An exact hit
+ * stays on that path. A suffix hit such as repo-a/schema/x.md replaces it.
+ * Lookup failure keeps the original target.
+ */
+export async function resolveMissingNestedRelativeFile(input: {
+  target: InlinePathTarget;
+  workspaceRoot?: string;
+  getDirectorySuggestions: GetDirectorySuggestions;
+}): Promise<InlinePathTarget> {
+  if (
+    isAbsoluteInlineCodeToken(input.target.raw) ||
+    input.target.raw.startsWith("~/") ||
+    input.target.raw.endsWith("/")
+  ) {
+    return input.target;
+  }
+  const query = nestedRelativeLookupQuery(input.target.path, input.workspaceRoot);
+  if (!query) {
+    return input.target;
+  }
+  try {
+    return await fetchDaemonResolution({
+      ambiguousQuery: query,
+      token: input.target.raw,
+      target: input.target,
+      workspaceRoot: input.workspaceRoot,
+      getDirectorySuggestions: input.getDirectorySuggestions,
+    });
+  } catch {
+    return input.target;
+  }
+}
+
 export function classifyForResolution(
   source: AssistantFileLinkSource,
   context: AssistantFileLinkContext,
@@ -215,11 +272,7 @@ export function shouldResolveDirectFileThroughSuggestions(input: {
 }
 
 function isAbsoluteInlineCodeToken(token: string): boolean {
-  return (
-    token.startsWith("/") ||
-    token.toLowerCase().startsWith("file://") ||
-    /^[A-Za-z]:[\\/]/.test(token)
-  );
+  return isAbsolutePath(token) || token.toLowerCase().startsWith("file://");
 }
 
 function isLinkifiedSource(source: AssistantFileLinkSource): boolean {

packages/app/src/components/add-host-modal.tsx

@@ -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}>

packages/app/src/components/direct-connection-host.test.ts

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

packages/app/src/components/direct-connection-host.ts

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

packages/app/src/components/markdown/images.ts

@@ -35,11 +35,15 @@ export interface MarkdownImageContext {
   filePath?: string;
 }
 
-export function useMarkdownSource(text: string, context: MarkdownImageContext) {
+export function useMarkdownSource(
+  text: string,
+  context: MarkdownImageContext,
+  commandNames?: ReadonlySet<string>,
+) {
   const occurrenceKey = useId();
   const prepared = useMemo(
-    () => prepareMarkdownSource(text, context.workspaceRoot, { supportsSvg: isWeb }),
-    [text, context.workspaceRoot],
+    () => prepareMarkdownSource(text, context.workspaceRoot, { supportsSvg: isWeb, commandNames }),
+    [text, context.workspaceRoot, commandNames],
   );
   const sources = [...new Set(prepared.images.map((image) => image.source))];
   const acquisitions = sources.map((source) => {

packages/app/src/components/markdown/renderer.test.ts

@@ -2,6 +2,8 @@ import { fromMarkdown } from "mdast-util-from-markdown";
 import { toNativeLinkRecognition } from "react-native-enriched-markdown/src/utils/regexParser";
 import { parseMarkdown } from "react-native-enriched-markdown/src/web/parseMarkdown";
 import { recognizeTextLinks } from "react-native-enriched-markdown/src/web/recognizeTextLinks";
+import { matchCommandLink } from "@/agent-commands";
+
 import { classifyAssistantFileLink } from "@/assistant-file-links";
 import { markInlineImages } from "react-native-enriched-markdown/src/web/utils";
 import type { ASTNode } from "react-native-enriched-markdown/src/web/types";
@@ -13,6 +15,28 @@ import { createMarkdownStyles } from "./styles";
 import { prepareMarkdownSource, PENDING_MARKDOWN_IMAGE } from "./source";
 import { normalizeMarkdownHtml } from "./html";
 
+it("recognizes complete known commands in inline code", () => {
+  const names = new Set(["code-review", "review:fast"]);
+  const prepared = prepareMarkdownSource("`/code-review` `/unknown`", undefined, {
+    commandNames: names,
+  });
+  expect(prepared.linkRecognition.inlineCode.test("/code-review")).toBe(true);
+  expect(prepared.linkRecognition.inlineCode.test("/unknown")).toBe(
+    prepareMarkdownSource("`/unknown`").linkRecognition.inlineCode.test("/unknown"),
+  );
+  const nonPath = prepareMarkdownSource("`/review:fast`", undefined, { commandNames: names });
+  expect(nonPath.linkRecognition.inlineCode.test("/review:fast")).toBe(true);
+  expect(matchCommandLink("/code-review", "inline-code", names)).toBe("/code-review");
+});
+
+it("resolves authored root-relative links only when the target is a known command", () => {
+  const names = new Set(["code-review"]);
+  expect(matchCommandLink("/code-review", "markdown", names)).toBe("/code-review");
+  expect(matchCommandLink("/code-review/file", "markdown", names)).toBeNull();
+  expect(matchCommandLink("/code-review", "text", names)).toBeNull();
+  expect(matchCommandLink("https://example.com/code-review", "markdown", names)).toBeNull();
+});
+
 describe("shared Markdown source adaptation", () => {
   it("keeps paragraphs, fences and quotes together for the library", () => {
     const source = "First paragraph.\n\nSecond paragraph.\n\n```ts\nconst n = 1;\n```\n\n> Quote";

packages/app/src/components/markdown/renderer.tsx

@@ -6,6 +6,7 @@ import {
   useAssistantFileLinkEnvironment,
 } from "@/assistant-file-links";
 import { useStableEvent } from "@/hooks/use-stable-event";
+import { matchCommandLink, useAgentCommandHints, type CommandHints } from "@/agent-commands";
 import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
 import type { Theme } from "@/styles/theme";
 import { isWeb } from "@/constants/platform";
@@ -48,6 +49,7 @@ export interface MarkdownRendererProps extends MarkdownImageContext {
   selectable?: boolean;
   streaming?: boolean;
   onLinkPress?: (url: string) => unknown;
+  agentCommands?: boolean;
 }
 
 /** All Markdown surfaces share the same engine and source adaptation. */
@@ -59,15 +61,21 @@ export const MarkdownRenderer = memo(function MarkdownRenderer(props: MarkdownRe
     () => splitStreamingMarkdown(completeLines, true).head.length,
     [completeLines],
   );
-  if (!streaming || boundary === 0) return <MarkdownPart {...props} />;
+  const Part = props.agentCommands ? CommandMarkdownPart : MarkdownPart;
+  if (!streaming || boundary === 0) return <Part {...props} />;
   return (
     <MarkdownBlockStack>
-      <MarkdownPart {...props} text={props.text.slice(0, boundary)} />
-      <MarkdownPart {...props} text={props.text.slice(boundary)} />
+      <Part {...props} text={props.text.slice(0, boundary)} />
+      <Part {...props} text={props.text.slice(boundary)} />
     </MarkdownBlockStack>
   );
 });
 
+const CommandMarkdownPart = memo(function CommandMarkdownPart(props: MarkdownRendererProps) {
+  const commandHints = useAgentCommandHints();
+  return <MarkdownPart {...props} commandHints={commandHints} />;
+});
+
 const MarkdownPart = memo(function MarkdownPart({
   text,
   compact = false,
@@ -75,8 +83,10 @@ const MarkdownPart = memo(function MarkdownPart({
   selectable = true,
   streaming = false,
   onLinkPress,
+  agentCommands: _agentCommands,
+  commandHints = null,
   ...imageContext
-}: MarkdownRendererProps) {
+}: MarkdownRendererProps & { commandHints?: CommandHints | null }) {
   const environment = useAssistantFileLinkEnvironment();
   const actions = useAssistantFileLinkActions();
   const client =
@@ -84,14 +94,23 @@ const MarkdownPart = memo(function MarkdownPart({
     (environment.client?.readFile
       ? { readFile: environment.client.readFile.bind(environment.client) }
       : undefined);
-  const { markdown, imageSources, linkRecognition, linkSource } = useMarkdownSource(text, {
-    workspaceRoot: environment.workspaceRoot,
-    serverId: environment.serverId,
-    ...imageContext,
-    client,
-  });
+  const { markdown, imageSources, linkRecognition, linkSource } = useMarkdownSource(
+    text,
+    {
+      workspaceRoot: environment.workspaceRoot,
+      serverId: environment.serverId,
+      ...imageContext,
+      client,
+    },
+    commandHints?.names,
+  );
   const [image, setImage] = useState<ImageLightboxSource | null>(null);
   const pressLink = useStableEvent(({ url, sourceType }: LinkPressEvent) => {
+    const command = commandHints && matchCommandLink(url, sourceType, commandHints.names);
+    if (command) {
+      commandHints.insert(command);
+      return;
+    }
     const source = linkSource(url, sourceType);
     if (onLinkPress && !actions.canResolveFile(source)) onLinkPress(url);
     else actions.open(source, "preferred");

packages/app/src/components/markdown/source.ts

@@ -56,7 +56,11 @@ function linkMetadata(inlineCodePaths: ReadonlySet<string>) {
   };
 }
 
-function collectInlineCodePaths(source: string, workspaceRoot?: string): ReadonlySet<string> {
+function collectInlineCodePaths(
+  source: string,
+  workspaceRoot?: string,
+  commandNames?: ReadonlySet<string>,
+): ReadonlySet<string> {
   const paths = new Set<string>();
   const previousEnds = new Map<number, number>();
   // Collect candidates between consecutive runs of equal length. The engine owns
@@ -74,7 +78,11 @@ function collectInlineCodePaths(source: string, workspaceRoot?: string): Readonl
       value = value.slice(1, -1);
     }
     const classification = classifyAssistantFileLink(value, { workspaceRoot });
-    if (classification && classification.kind !== "external") paths.add(value);
+    if (
+      (classification && classification.kind !== "external") ||
+      (value.startsWith("/") && commandNames?.has(value.slice(1)))
+    )
+      paths.add(value);
   }
   return paths;
 }
@@ -112,7 +120,7 @@ function workspaceHoverTitle(link: Link, markup: string, workspaceRoot?: string)
 export function prepareMarkdownSource(
   source: string,
   workspaceRoot?: string,
-  options: { supportsSvg?: boolean } = {},
+  options: { supportsSvg?: boolean; commandNames?: ReadonlySet<string> } = {},
 ) {
   source = normalizeMarkdownHtml(source);
   const images: MarkdownImage[] = [];
@@ -122,7 +130,9 @@ export function prepareMarkdownSource(
       extensions: [gfmTable()],
       mdastExtensions: [gfmTableFromMarkdown()],
     }));
-  const metadata = linkMetadata(collectInlineCodePaths(source, workspaceRoot));
+  const metadata = linkMetadata(
+    collectInlineCodePaths(source, workspaceRoot, options.commandNames),
+  );
   const edits: { start: number; end: number; text: string }[] = [];
   if (
     !source.includes("![") &&

packages/app/src/components/message.tsx

@@ -1199,6 +1199,7 @@ export const AssistantMessage = memo(function AssistantMessage({
     >
       <MarkdownRenderer
         text={revealedMessage}
+        agentCommands
         streaming={phase !== "complete" || revealedMessage.length < renderedMessage.text.length}
         client={client}
         workspaceRoot={workspaceRoot}

packages/app/src/components/sidebar-agent-list-skeleton.tsx

@@ -1,8 +1,7 @@
-import { useMemo } from "react";
-import { Animated, View } from "react-native";
+import { useEffect, useMemo, useRef } from "react";
+import { Animated, View, type StyleProp, type ViewStyle } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { projectIconRadius } from "@/components/project-icon-view";
-import { SkeletonPulse, useSkeletonPulse } from "@/components/ui/skeleton";
 
 const PROJECT_ICON_SIZE = 16;
 
@@ -12,6 +11,17 @@ const ROW_KEYS_BY_SECTION: readonly (readonly string[])[] = SECTION_OPACITIES.ma
   [0, 1, 2].map((r) => `skeleton-row-${sIdx}-${r}`),
 );
 
+function SkeletonPulse({ pulse, style }: { pulse: Animated.Value; style: StyleProp<ViewStyle> }) {
+  const opacity = pulse.interpolate({
+    inputRange: [0, 1],
+    outputRange: [0.4, 0.8],
+  });
+
+  const pulseStyle = useMemo(() => [style, { opacity }], [style, opacity]);
+
+  return <Animated.View style={pulseStyle} />;
+}
+
 function SkeletonSection({
   pulse,
   sectionOpacity,
@@ -47,7 +57,27 @@ function SkeletonSection({
 }
 
 export function SidebarAgentListSkeleton() {
-  const pulse = useSkeletonPulse();
+  const pulse = useRef(new Animated.Value(0)).current;
+
+  useEffect(() => {
+    const animation = Animated.loop(
+      Animated.sequence([
+        Animated.timing(pulse, {
+          toValue: 1,
+          duration: 1000,
+          useNativeDriver: true,
+        }),
+        Animated.timing(pulse, {
+          toValue: 0,
+          duration: 1000,
+          useNativeDriver: true,
+        }),
+      ]),
+    );
+
+    animation.start();
+    return () => animation.stop();
+  }, [pulse]);
 
   return (
     <View style={styles.container}>

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

@@ -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());

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

@@ -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}

packages/app/src/components/sidebar/sidebar-group-visibility.test.ts

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

packages/app/src/components/sidebar/sidebar-group-visibility.ts

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

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

@@ -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}

packages/app/src/components/sidebar/use-limited-sidebar-group.ts

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

packages/app/src/components/terminal-emulator-contract.ts

@@ -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;

packages/app/src/components/terminal-emulator-native-grid.native.tsx

@@ -93,6 +93,7 @@ function NativeTerminalEmulator({
   testId = "terminal-surface",
   xtermTheme = DEFAULT_XTERM_THEME,
   scrollbackLines,
+  characterWidths,
   fontFamily,
   fontSize,
   keyboardInset = 0,
@@ -373,6 +374,7 @@ function NativeTerminalEmulator({
       rows: size.rows,
       cols: size.cols,
       scrollbackLines,
+      characterWidths,
     });
     terminalRef.current = terminal;
     screenModelRef.current = createNativeTerminalScreenModel({ terminal });
@@ -387,6 +389,7 @@ function NativeTerminalEmulator({
     resetInputModeTracker,
     resolveTerminalScreen,
     scrollbackLines,
+    characterWidths,
     clearSelection,
   ]);
 

packages/app/src/components/terminal-emulator.tsx

@@ -27,6 +27,7 @@ import {
 } from "../terminal/runtime/terminal-emulator-runtime";
 import { encodeTerminalPaste } from "../terminal/runtime/terminal-paste";
 import type { TerminalFile } from "../terminal/file-paste";
+import type { TerminalCharacterWidths } from "../terminal/character-widths";
 import type {
   TerminalLocalFileLinkSource,
   TerminalLocalFileLinkTarget,
@@ -96,6 +97,7 @@ interface TerminalEmulatorProps {
   ref: Ref<TerminalEmulatorHandle>;
   streamKey: string;
   supportsTerminalInputModeReplay: boolean;
+  characterWidths: TerminalCharacterWidths;
   testId?: string;
   xtermTheme?: ITheme;
   scrollbackLines: number;
@@ -154,6 +156,7 @@ export default function TerminalEmulator({
     cursor: "#e6e6e6",
   },
   scrollbackLines,
+  characterWidths,
   fontFamily,
   fontSize,
   swipeGesturesEnabled = false,
@@ -183,6 +186,8 @@ export default function TerminalEmulator({
   const fontSizeRef = useRef(fontSize);
   const scrollbackLinesRef = useRef(scrollbackLines);
   scrollbackLinesRef.current = scrollbackLines;
+  const characterWidthsRef = useRef(characterWidths);
+  characterWidthsRef.current = characterWidths;
   fontFamilyRef.current = fontFamily;
   fontSizeRef.current = fontSize;
   const themeKey = useMemo(() => buildXtermThemeKey(xtermTheme), [xtermTheme]);
@@ -315,6 +320,10 @@ export default function TerminalEmulator({
     runtimeRef.current?.setScrollback({ lines: scrollbackLines });
   }, [scrollbackLines]);
 
+  useEffect(() => {
+    runtimeRef.current?.setCharacterWidths({ widths: characterWidths });
+  }, [characterWidths]);
+
   useEffect(() => {
     const root = rootRef.current;
     if (!root || !swipeGesturesEnabled) {
@@ -447,6 +456,7 @@ export default function TerminalEmulator({
       },
     });
     runtime.setPendingModifiers({ pendingModifiers: pendingModifiersRef.current });
+    runtime.setCharacterWidths({ widths: characterWidthsRef.current });
     runtime.mount({
       root,
       host,

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

@@ -1,5 +1,6 @@
 import { TerminalFind, type TerminalPaneFindHandle } from "@/terminal/find";
 import type { TerminalFindResult } from "@/terminal/runtime/terminal-emulator-runtime";
+import type { TerminalCharacterWidths } from "@/terminal/character-widths";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -304,6 +305,11 @@ export function TerminalPane({
   const supportsTerminalSizeOwnership = useSessionStore(
     (state) => state.sessions[serverId]?.serverInfo?.features?.["terminal-size-ownership"] === true,
   );
+  const characterWidths: TerminalCharacterWidths = useSessionStore((state) =>
+    state.sessions[serverId]?.serverInfo?.features?.["terminal-grapheme-widths"] === true
+      ? "graphemes"
+      : "legacy",
+  );
   const setFocusedTerminalId = useSessionStore((state) => state.setFocusedTerminalId);
 
   const scopeKey = useMemo(() => terminalScopeKey({ serverId, cwd }), [serverId, cwd]);
@@ -1171,6 +1177,7 @@ export function TerminalPane({
             dom={TERMINAL_EMULATOR_DOM_PROPS}
             streamKey={terminalStreamKey}
             supportsTerminalInputModeReplay={supportsTerminalInputModeReplay}
+            characterWidths={characterWidths}
             testId="terminal-surface"
             xtermTheme={xtermTheme}
             scrollbackLines={settings.terminalScrollbackLines}

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

@@ -1,34 +0,0 @@
-import { useEffect, useMemo, useRef } from "react";
-import { Animated, type StyleProp, type ViewStyle } from "react-native";
-
-/** One looping value per skeleton, shared by its shapes so they pulse together. */
-export function useSkeletonPulse(): Animated.Value {
-  const pulse = useRef(new Animated.Value(0)).current;
-  useEffect(() => {
-    const animation = Animated.loop(
-      Animated.sequence([
-        Animated.timing(pulse, { toValue: 1, duration: 1000, useNativeDriver: true }),
-        Animated.timing(pulse, { toValue: 0, duration: 1000, useNativeDriver: true }),
-      ]),
-    );
-    animation.start();
-    return () => animation.stop();
-  }, [pulse]);
-  return pulse;
-}
-
-/** A placeholder shape; `style` sets its size, radius and color. */
-export function SkeletonPulse({
-  pulse,
-  style,
-}: {
-  pulse: Animated.Value;
-  style: StyleProp<ViewStyle>;
-}) {
-  const opacity = pulse.interpolate({
-    inputRange: [0, 1],
-    outputRange: [0.4, 0.8],
-  });
-  const pulseStyle = useMemo(() => [style, { opacity }], [style, opacity]);
-  return <Animated.View style={pulseStyle} />;
-}

packages/app/src/composer/draft/input-draft.live.test.tsx

@@ -2,7 +2,7 @@
 import React, { act } from "react";
 import { createRoot, type Root } from "react-dom/client";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { useDraftStore } from "@/stores/draft-store";
 import type { AttachmentMetadata, ComposerAttachment } from "@/attachments/types";
 import { createWorkspaceFileAttachment } from "@/attachments/workspace-file";
@@ -126,17 +126,13 @@ afterEach(async () => {
   });
 });
 
-let useAgentInputDraft: typeof import("./input-draft").useAgentInputDraft;
 type DraftRecordForTest = ReturnType<typeof useDraftStore.getState>["drafts"][string];
 
-beforeAll(async () => {
-  Object.defineProperty(globalThis, "IS_REACT_ACT_ENVIRONMENT", {
-    value: true,
-    configurable: true,
-  });
-
-  ({ useAgentInputDraft } = await import("./input-draft"));
+Object.defineProperty(globalThis, "IS_REACT_ACT_ENVIRONMENT", {
+  value: true,
+  configurable: true,
 });
+const { useAgentInputDraft } = await import("./input-draft");
 
 describe("useAgentInputDraft live contract", () => {
   beforeEach(() => {

packages/app/src/composer/draft/input-draft.ts

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { UserComposerAttachment } from "@/attachments/types";
 import type { TextReplacement } from "@/composer/types";
 import type { DraftAgentControlsProps } from "@/composer/agent-controls";
-import type { DraftCommandTarget } from "@/hooks/use-agent-commands-query";
+import type { DraftCommandTarget } from "@/agent-commands";
 import {
   useAgentFormState,
   type CreateAgentInitialValues,

packages/app/src/composer/editing-session/index.test.ts

@@ -2,6 +2,31 @@ import { describe, expect, it } from "vitest";
 import { ComposerEditingSession, ComposerEditingSessions } from "./index";
 
 describe("composer editing session", () => {
+  it("appends commands to the current editor buffer and focuses it", () => {
+    const session = new ComposerEditingSession();
+    let text = "draft typed since publication";
+    let focuses = 0;
+    let selection = { start: 0, end: 0 };
+    const detach = session.attachEditor({
+      getText: () => text,
+      replaceText: (next, nextSelection) => {
+        text = next;
+        selection = nextSelection;
+      },
+      focus: () => {
+        focuses += 1;
+      },
+    });
+    session.insertCommand("/review");
+    expect(selection).toEqual({ start: text.length, end: text.length });
+    session.insertCommand("/test");
+    expect(text).toBe("draft typed since publication /review /test ");
+    expect(focuses).toBe(2);
+    expect(selection).toEqual({ start: text.length, end: text.length });
+    detach();
+    session.insertCommand("/ignored");
+    expect(text).toBe("draft typed since publication /review /test ");
+  });
   it("publishes fullscreen changes once per transition", () => {
     const session = new ComposerEditingSession();
     const changes: boolean[] = [];

packages/app/src/composer/editing-session/index.tsx

@@ -30,10 +30,29 @@ export interface ComposerRetainedEditor {
  */
 export class ComposerEditingSession {
   private fullscreen = false;
+  private editor: {
+    getText(): string;
+    replaceText(text: string, selection: ComposerSelection): void;
+    focus(): void;
+  } | null = null;
   private retained: ComposerRetainedEditor | null = null;
   private listeners = new Set<() => void>();
   constructor(private readonly onChange?: () => void) {}
   getFullscreen = () => this.fullscreen;
+  attachEditor(editor: NonNullable<ComposerEditingSession["editor"]>) {
+    this.editor = editor;
+    return () => {
+      if (this.editor === editor) this.editor = null;
+    };
+  }
+  insertCommand(command: string) {
+    const editor = this.editor;
+    if (!editor) return;
+    const text = editor.getText();
+    const nextText = `${text}${text && !/\s$/.test(text) ? " " : ""}${command} `;
+    editor.replaceText(nextText, { start: nextText.length, end: nextText.length });
+    editor.focus();
+  }
   /** Called by the unmounting editor; the next mount of this session takes it. */
   retainEditor(retained: ComposerRetainedEditor) {
     this.retained = retained;

packages/app/src/composer/index.tsx

@@ -71,7 +71,7 @@ import {
 } from "./input/input";
 import type { ImageAttachment, MessagePayload, TextReplacement } from "./types";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
-import type { DraftCommandTarget } from "@/hooks/use-agent-commands-query";
+import type { DraftCommandTarget } from "@/agent-commands";
 import { encodeImages } from "@/utils/encode-images";
 import { focusWithRetries } from "@/utils/web-focus";
 import {

packages/app/src/composer/input/input.tsx

@@ -1407,6 +1407,16 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       [onChangeText, updateComposerHeightForText, updateLiveTextPresence],
     );
 
+    useLayoutEffect(
+      () =>
+        editingSession.attachEditor({
+          getText: () => textInputRef.current?.getText() ?? valueRef.current,
+          replaceText,
+          focus: () => textInputRef.current?.focus(),
+        }),
+      [editingSession, replaceText],
+    );
+
     useImperativeHandle(ref, () => ({
       focus: () => {
         textInputRef.current?.focus();

packages/app/src/data/providers-snapshot.ts

@@ -8,7 +8,7 @@ import {
 } from "./provider-snapshot-cache";
 import { queryClient as singletonQueryClient } from "./query-client";
 import { replaceProviderSnapshotIcons } from "@/data/provider-icons";
-import { agentCommandsQueryRoot } from "@/hooks/agent-commands-query";
+import { agentCommandsQueryRoot } from "@/agent-commands/cache";
 import type { AgentProvider } from "@getpaseo/protocol/agent-types";
 import { normalizeWorkspacePath } from "@/utils/workspace-identity";
 

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

@@ -1,11 +1,12 @@
 import type { OwnedSubscription } from "@getpaseo/client";
+import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
 import type { Query, QueryCacheNotifyEvent, QueryClient, QueryKey } from "@tanstack/react-query";
 import type {
   ListTerminalsResponse,
   MutableDaemonConfig,
   SessionOutboundMessage,
 } from "@getpaseo/protocol/messages";
-import { agentCommandsQueryRoot } from "@/hooks/agent-commands-query";
+import { invalidateCommandsForProviderChange } from "@/agent-commands/cache";
 import { shareCheckoutDiff } from "@/git/diff-sharing";
 import { orderCheckoutDiffFiles } from "@/git/diff-order";
 import { daemonConfigQueryKey } from "@/data/daemon-config";
@@ -186,10 +187,10 @@ export async function applyProvidersSnapshotUpdate(input: {
   const snapshot = { ...input.message.payload, requestId: "providers_snapshot_update" };
   const cwd = normalizeProvidersSnapshotCwd(snapshot.cwd);
   const queryKey = providersSnapshotQueryKey(input.serverId, cwd);
-  const previous = input.queryClient.getQueryData<{ snapshotHash?: string }>(queryKey);
+  const previous = input.queryClient.getQueryData<{ entries: ProviderSnapshotEntry[] }>(queryKey);
   let announcement: typeof snapshot | undefined = snapshot;
   void input.queryClient.cancelQueries({ queryKey, exact: true });
-  await input.queryClient.fetchQuery({
+  const current = await input.queryClient.fetchQuery({
     queryKey,
     staleTime: 0,
     structuralSharing: false,
@@ -205,12 +206,13 @@ export async function applyProvidersSnapshotUpdate(input: {
       });
     },
   });
-  if (!snapshot.snapshotHash || previous?.snapshotHash !== snapshot.snapshotHash) {
-    void input.queryClient.invalidateQueries({
-      queryKey: agentCommandsQueryRoot(input.serverId),
-      exact: false,
-    });
-  }
+  void invalidateCommandsForProviderChange({
+    queryClient: input.queryClient,
+    serverId: input.serverId,
+    cwd,
+    previous: previous?.entries,
+    current: current.entries,
+  });
 }
 
 export function mountServerDataPushRouter(input: PushRouterInput): () => void {

packages/app/src/data/query.ts

@@ -27,7 +27,7 @@ type ReplicaQueryInput<TQueryFnData, TError, TData, TQueryKey extends QueryKey>
 
 type FetchQueryInput<TQueryFnData, TError, TData, TQueryKey extends QueryKey> = Omit<
   UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-  "initialData" | "placeholderData" | "queryFn" | "refetchOnMount" | "staleTime"
+  "initialData" | "placeholderData" | "queryFn" | "staleTime"
 > & {
   dataShape: "list" | "value";
   queryFn: QueryFnOption<TQueryFnData, TError, TData, TQueryKey>;
@@ -113,7 +113,7 @@ export function fetchQueryOptions<
         dataShape,
       },
     },
-    refetchOnMount: immutableWhen ? true : "always",
+    refetchOnMount: options.refetchOnMount ?? (immutableWhen ? true : "always"),
     staleTime: immutableWhen
       ? (query) =>
           query.state.data !== undefined && immutableWhen(query.state.data) ? Infinity : 0

packages/app/src/desktop/components/pair-device-section.tsx

@@ -22,7 +22,6 @@ import {
 } from "@/components/ui/text-input";
 
 const RELAY_DOCS_URL = "https://paseo.sh/docs/security";
-const TAILSCALE_DOCS_URL = "https://paseo.sh/docs/connectivity#tailscale";
 const FLEX_ONE_STYLE = { flex: 1 } as const;
 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
 const ThemedShieldCheck = withUnistyles(ShieldCheck);
@@ -220,14 +219,7 @@ function RelayConsent(props: PairDeviceBodyProps) {
       </View>
       <View style={styles.directRow}>
         <ThemedNetwork size={14} style={styles.directIcon} />
-        <View style={styles.directContent}>
-          <Text style={styles.directHint}>{t("pairing.device.directConnectionHint")}</Text>
-          <ExternalLink
-            href={TAILSCALE_DOCS_URL}
-            label={t("pairing.device.tailscaleDocs")}
-            accessibilityLabel={t("pairing.device.tailscaleDocsAccessibility")}
-          />
-        </View>
+        <Text style={styles.directHint}>{t("pairing.device.directConnectionHint")}</Text>
       </View>
     </View>
   );
@@ -346,12 +338,8 @@ const styles = StyleSheet.create((theme) => ({
     color: theme.colors.foregroundMuted,
     marginTop: 1, // optical: seats the glyph on the hint's first text line
   },
-  directContent: {
-    flex: 1,
-    alignItems: "flex-start",
-    gap: theme.spacing[2],
-  },
   directHint: {
+    flex: 1,
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.sm,
     lineHeight: theme.fontSize.sm * 1.5,

packages/app/src/git/checkout-status-cache.test.ts

@@ -16,7 +16,7 @@ import {
   resolveWorkingDiffComparison,
   selectWorkingDiffComparison,
 } from "@/git/working-diff-comparison";
-import { draftAgentCommandsQueryKey } from "@/hooks/agent-commands-query";
+import { draftAgentCommandsQueryKey } from "@/agent-commands/cache";
 import {
   applyCheckoutStatusUpdateFromEvent,
   ensureCheckoutStatus,

packages/app/src/git/checkout-status-cache.ts

@@ -8,7 +8,7 @@ import {
   invalidatePrPaneTimelineForCheckout,
 } from "@/git/query-keys";
 import { type CheckoutPrStatusPayload, normalizeCheckoutPrStatusPayload } from "@/git/pr-status";
-import { resetDraftAgentCommandsForCheckout } from "@/hooks/agent-commands-query";
+import { resetDraftAgentCommandsForCheckout } from "@/agent-commands/cache";
 
 export type CheckoutStatusPayload = CheckoutStatusResponse["payload"];
 export type { CheckoutPrStatusPayload } from "@/git/pr-status";

packages/app/src/git/pull-request-panel/activity-skeleton.tsx

@@ -1,9 +1,39 @@
-import { View } from "react-native";
+import { useEffect, useMemo, useRef } from "react";
+import { Animated, View, type StyleProp, type ViewStyle } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
-import { SkeletonPulse, useSkeletonPulse } from "@/components/ui/skeleton";
 
 const ROW_KEYS = [0, 1, 2].map((i) => `pr-activity-skeleton-row-${i}`);
 
+export function useSkeletonPulse(): Animated.Value {
+  const pulse = useRef(new Animated.Value(0)).current;
+  useEffect(() => {
+    const animation = Animated.loop(
+      Animated.sequence([
+        Animated.timing(pulse, { toValue: 1, duration: 1000, useNativeDriver: true }),
+        Animated.timing(pulse, { toValue: 0, duration: 1000, useNativeDriver: true }),
+      ]),
+    );
+    animation.start();
+    return () => animation.stop();
+  }, [pulse]);
+  return pulse;
+}
+
+export function SkeletonPulse({
+  pulse,
+  style,
+}: {
+  pulse: Animated.Value;
+  style: StyleProp<ViewStyle>;
+}) {
+  const opacity = pulse.interpolate({
+    inputRange: [0, 1],
+    outputRange: [0.4, 0.8],
+  });
+  const pulseStyle = useMemo(() => [style, { opacity }], [style, opacity]);
+  return <Animated.View style={pulseStyle} />;
+}
+
 export function PrActivitySkeleton() {
   const pulse = useSkeletonPulse();
 

packages/app/src/git/pull-request-panel/pane-skeleton.tsx

@@ -2,8 +2,7 @@ import { Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
 import { PaneContentToolbar } from "@/components/ui/pane-content-toolbar";
-import { SkeletonPulse, useSkeletonPulse } from "@/components/ui/skeleton";
-import { PrActivitySkeleton } from "./activity-skeleton";
+import { PrActivitySkeleton, SkeletonPulse, useSkeletonPulse } from "./activity-skeleton";
 
 const CHECK_ROW_KEYS = [0, 1, 2].map((i) => `pr-pane-skeleton-check-${i}`);
 

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

@@ -4,11 +4,11 @@ import type { TFunction } from "i18next";
 import { useTranslation } from "react-i18next";
 import type { AutocompleteOption } from "@/components/ui/autocomplete";
 import {
-  useAgentCommandsQuery,
+  useAutocompleteCommands,
   type AgentSlashCommand,
   type DraftCommandConfig,
   type DraftCommandTarget,
-} from "./use-agent-commands-query";
+} from "@/agent-commands";
 import { orderAutocompleteOptions } from "@/components/ui/autocomplete-utils";
 import { useAutocomplete } from "./use-autocomplete";
 import { useSessionStore } from "@/stores/session-store";
@@ -432,7 +432,7 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
     autocompleteCwd,
   });
 
-  const commandsQuery = useAgentCommandsQuery({
+  const commandsQuery = useAutocompleteCommands({
     serverId,
     agentId,
     enabled: mode === "command" && canLoadCommands && canListCommands,

packages/app/src/hooks/use-agent-history.test.ts

@@ -1,4 +1,4 @@
-import { beforeAll, describe, expect, it } from "vitest";
+import { describe, expect, it } from "vitest";
 import type {
   DaemonClient,
   FetchAgentHistoryEntry,
@@ -13,18 +13,8 @@ import { allAgentHistoryQueryKey } from "./agent-history-query-key";
   }
 ).__DEV__ = false;
 
-type UseAgentHistoryModule = typeof import("./use-agent-history");
-
-let fetchAgentHistoryBatch: UseAgentHistoryModule["fetchAgentHistoryBatch"];
-let fetchAgentHistoryPage: UseAgentHistoryModule["fetchAgentHistoryPage"];
-let collectAgentHistoryHostErrors: UseAgentHistoryModule["collectAgentHistoryHostErrors"];
-
-beforeAll(async () => {
-  const module = await import("./use-agent-history");
-  fetchAgentHistoryBatch = module.fetchAgentHistoryBatch;
-  fetchAgentHistoryPage = module.fetchAgentHistoryPage;
-  collectAgentHistoryHostErrors = module.collectAgentHistoryHostErrors;
-});
+const { fetchAgentHistoryBatch, fetchAgentHistoryPage, collectAgentHistoryHostErrors } =
+  await import("./use-agent-history");
 
 type FetchAgentHistory = DaemonClient["fetchAgentHistory"];
 type FetchAgentHistoryResult = Awaited<ReturnType<FetchAgentHistory>>;

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

@@ -1,4 +1,4 @@
-import { QueryClient } from "@tanstack/react-query";
+import { QueryClient, QueryObserver } from "@tanstack/react-query";
 import { beforeEach, describe, expect, it } from "vitest";
 
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
@@ -8,7 +8,7 @@ import {
   expandProviderSnapshot,
 } from "@getpaseo/protocol/provider-snapshot-codec";
 import type { CachedProviderSnapshot, ProviderSnapshotCache } from "@/data/provider-snapshot-cache";
-import { draftAgentCommandsQueryKey } from "@/hooks/agent-commands-query";
+import { draftAgentCommandsQueryKey, sessionAgentCommandsQueryKey } from "@/agent-commands/cache";
 import { providerSnapshotIcons } from "@/data/provider-icons";
 import { applyProvidersSnapshotUpdate, type ProvidersSnapshotUpdate } from "@/data/push-router";
 import {
@@ -363,6 +363,153 @@ describe("applyProvidersSnapshotUpdate", () => {
     };
   }
 
+  it("refreshes active commands only when their provider changes after discovery", async () => {
+    const key = sessionAgentCommandsQueryKey({ serverId, agentId: "agent-1" });
+    let requests = 0;
+    const observer = new QueryObserver(queryClient, {
+      queryKey: key,
+      queryFn: async () => {
+        requests++;
+        return [{ name: "review" }];
+      },
+      staleTime: Infinity,
+      meta: { agentCommandProvider: "codex", agentCommandCwd: "/repo-a" },
+    });
+    const unsubscribe = observer.subscribe(() => {});
+    await observer.refetch({ cancelRefetch: false });
+    expect(requests).toBe(1);
+    const codex = codexEntry("ready", [readyCodexModel]);
+    const other = { provider: "claude", status: "loading", enabled: true } as ProviderSnapshotEntry;
+    await applyProvidersSnapshotUpdate({
+      client: createClient(),
+      serverId,
+      queryClient,
+      message: updateMessage([codexEntry("loading"), other], "/repo-a"),
+    });
+    expect(requests).toBe(1);
+    await applyProvidersSnapshotUpdate({
+      client: createClient(),
+      serverId,
+      queryClient,
+      message: updateMessage([codex, other], "/repo-a"),
+    });
+    expect(requests).toBe(1);
+    await applyProvidersSnapshotUpdate({
+      client: createClient(),
+      serverId,
+      queryClient,
+      message: updateMessage([codex, { ...other, status: "ready" }], "/repo-a"),
+    });
+    expect(requests).toBe(1);
+    await applyProvidersSnapshotUpdate({
+      client: createClient(),
+      serverId,
+      queryClient,
+      message: updateMessage(
+        [
+          { ...codex, fetchedAt: "2026-01-01T00:00:02.000Z" },
+          { ...other, status: "ready" },
+        ],
+        "/repo-a",
+      ),
+    });
+    expect(requests).toBe(1);
+    queryClient.setQueryData(
+      providersSnapshotQueryKey(serverId, "/repo-b"),
+      providersSnapshot([codex]),
+    );
+    await applyProvidersSnapshotUpdate({
+      client: createClient(),
+      serverId,
+      queryClient,
+      message: updateMessage(
+        [codexEntry("ready", [{ ...readyCodexModel, label: "Other checkout" }])],
+        "/repo-b",
+      ),
+    });
+    expect(requests).toBe(1);
+    await applyProvidersSnapshotUpdate({
+      client: createClient(),
+      serverId,
+      queryClient,
+      message: updateMessage(
+        [
+          codexEntry("ready", [{ ...readyCodexModel, label: "Updated" }]),
+          { ...other, status: "ready" },
+        ],
+        "/repo-a",
+      ),
+    });
+    await observer.refetch({ cancelRefetch: false });
+    expect(requests).toBe(2);
+    unsubscribe();
+    queryClient.clear();
+  });
+
+  it("retries a failed command discovery when its provider first becomes ready", async () => {
+    const key = sessionAgentCommandsQueryKey({ serverId, agentId: "agent-1" });
+    let ready = false;
+    let requests = 0;
+    const observer = new QueryObserver(queryClient, {
+      queryKey: key,
+      queryFn: async () => {
+        requests++;
+        if (!ready) throw new Error("provider unavailable");
+        return [{ name: "review" }];
+      },
+      retry: false,
+      meta: { agentCommandProvider: "codex", agentCommandCwd: "/repo-a" },
+    });
+    const unsubscribe = observer.subscribe(() => {});
+    await observer.refetch({ cancelRefetch: false });
+    expect(observer.getCurrentResult().isError).toBe(true);
+    ready = true;
+    await applyProvidersSnapshotUpdate({
+      client: createClient(),
+      serverId,
+      queryClient,
+      message: updateMessage([codexEntry("ready", [readyCodexModel])], "/repo-a"),
+    });
+    await observer.refetch({ cancelRefetch: false });
+    expect(requests).toBe(2);
+    expect(observer.getCurrentResult().data).toEqual([{ name: "review" }]);
+    unsubscribe();
+    queryClient.clear();
+  });
+
+  it("refreshes again when its provider changes during an active refresh", async () => {
+    const key = sessionAgentCommandsQueryKey({ serverId, agentId: "agent-1" });
+    queryClient.setQueryData(key, [{ name: "old" }]);
+    let requests = 0;
+    const waiting = new Promise<{ name: string }[]>(() => {});
+    const observer = new QueryObserver(queryClient, {
+      queryKey: key,
+      queryFn: async () => (++requests === 1 ? waiting : [{ name: "new" }]),
+      staleTime: Infinity,
+      meta: { agentCommandProvider: "codex", agentCommandCwd: "/repo-a" },
+    });
+    const unsubscribe = observer.subscribe(() => {});
+    queryClient.setQueryData(
+      providersSnapshotQueryKey(serverId, "/repo-a"),
+      providersSnapshot([codexEntry("ready", [readyCodexModel])]),
+    );
+    const send = (label: string) =>
+      applyProvidersSnapshotUpdate({
+        client: createClient(),
+        serverId,
+        queryClient,
+        message: updateMessage([codexEntry("ready", [{ ...readyCodexModel, label }])], "/repo-a"),
+      });
+    await send("First change");
+    expect(requests).toBe(1);
+    await send("Second change");
+    expect(requests).toBe(2);
+    await observer.refetch({ cancelRefetch: false });
+    expect(observer.getCurrentResult().data).toEqual([{ name: "new" }]);
+    unsubscribe();
+    queryClient.clear();
+  });
+
   it("routes updates to the home query cache when the message carries no cwd", async () => {
     await applyProvidersSnapshotUpdate({
       client: createClient(),
@@ -455,6 +602,10 @@ describe("applyProvidersSnapshotUpdate", () => {
       draftConfig: { provider: "codex", cwd: "/repo-a" },
     });
     queryClient.setQueryData(commandsKey, [{ name: "compact", description: "", argumentHint: "" }]);
+    queryClient.setQueryData(
+      providersSnapshotQueryKey(serverId, "/repo-a"),
+      providersSnapshot([codexEntry("ready")]),
+    );
 
     await applyProvidersSnapshotUpdate({
       client: createClient(),

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

@@ -1641,82 +1641,6 @@ export const ar: TranslationResources = {
     },
   },
   onboarding: {
-    setup: {
-      title: "إعداد Paseo",
-      footnote: "كل ما هنا موجود أيضًا في الإعدادات",
-      stepCounter: "الخطوة {{current}} من {{total}}",
-      skip: "تخطي الإعداد",
-      continue: "متابعة",
-      finish: "إنهاء",
-      steps: {
-        appearance: {
-          label: "المظهر",
-          title: "مرحبًا بك في Paseo",
-          description:
-            "شغّل Claude Code وCodex ووكلاء آخرين على هذا الكمبيوتر، من مكتبك أو من هاتفك. اختر مظهرًا أولًا.",
-        },
-        providers: {
-          label: "المزوّدون",
-          title: "وكلاؤك",
-          description:
-            "يشغّل Paseo أدوات CLI للوكلاء المثبتة على هذا الكمبيوتر. أوقف ما لا تريده في منتقي الوكلاء.",
-        },
-        projects: {
-          label: "المشاريع",
-          title: "أضف مشاريعك",
-          description:
-            "أضف المجلدات التي تريد أن يعمل فيها الوكلاء. يمكنك إضافة المزيد لاحقًا من الشريط الجانبي.",
-          addProject: "إضافة مشروع",
-          addAnotherProject: "إضافة مشروع آخر…",
-          added: "تمت الإضافة",
-          suggestions: {
-            loading: "جارٍ البحث عن المجلدات التي عملت فيها",
-            stillReading: "ما زلنا نقرأ سجل {{providers}}…",
-            readFailed: "تعذّرت قراءة سجل {{provider}}",
-            empty: "لم يتم العثور على مشاريع حديثة",
-            sessions_one: "جلسة واحدة ({{count}})",
-            sessions_other: "{{count}} جلسات",
-            addSelected_one: "إضافة مشروع واحد ({{count}})",
-            addSelected_other: "إضافة {{count}} مشاريع",
-            adding: "جارٍ الإضافة…",
-            addFailed: "تعذّرت إضافة هذا المجلد",
-          },
-        },
-        orchestration: {
-          label: "التنسيق",
-          title: "اسمح للوكلاء باستخدام Paseo",
-          description:
-            "باستخدام أدوات Paseo، يمكن للوكيل تسليم العمل لوكلاء آخرين وإنشاء مساحات العمل والجداول بنفسه.",
-          capabilities: {
-            agents: {
-              title: "تشغيل وكلاء آخرين وتوجيههم",
-              description:
-                "شغّل وكلاء Codex أو Claude Code أو OpenCode وأرسل لهم الطلبات وانتظر نتائجهم.",
-            },
-            workspaces: {
-              title: "إنشاء مساحات عمل",
-              description: "افتح worktree لكل مهمة حتى لا يتعارض الوكلاء العاملون بالتوازي.",
-            },
-            schedules: {
-              title: "الجداول ونبضات المتابعة",
-              description: "تحقق من CI كل 10 دقائق وأصلح الإخفاقات.",
-            },
-            terminals: {
-              title: "الطرفيات والسكربتات",
-              description: "شغّل خادم التطوير لمساحة العمل واقرأ مخرجاته.",
-            },
-          },
-        },
-        phone: {
-          label: "الهاتف",
-          title: "خذ وكلاءك معك",
-          description:
-            "يتصل Paseo لنظامي iOS وAndroid بهذا الكمبيوتر. يواصل الوكلاء العمل هنا، ويتابعهم هاتفك ويوافق على الأذونات ويرسل الطلبات.",
-          appStore: "App Store",
-          googlePlay: "Google Play",
-        },
-      },
-    },
     title: "مرحبا بكم في Paseo",
     subtitle: "قم بتوصيل جهاز الكمبيوتر الخاص بك للبدء",
     actions: {
@@ -1935,8 +1859,6 @@ export const ar: TranslationResources = {
       notNow: "ليس الآن",
       directConnectionHint:
         "بدون التتابع، اتصل مباشرة عبر TCP أو Tailscale أو شبكة VPN أخرى. لن يتم إنشاء رمز QR.",
-      tailscaleDocs: "إعداد Tailscale",
-      tailscaleDocsAccessibility: "اقرأ كيفية الاتصال عبر Tailscale",
       updateRequired: "حدّث المضيف لتمكين التتابع من Paseo Desktop.",
       unavailable: "عرض الاقتران غير متاح.",
       hint: "قم بمسح رمز QR هذا باستخدام Paseo على هاتفك، أو انسخ الرابط أدناه.",
@@ -2436,11 +2358,6 @@ export const ar: TranslationResources = {
     general: {
       title: "عام",
       sending: "الإرسال",
-      setup: {
-        label: "الإعداد الأولي",
-        description: "أعد المرور على المظهر والمزوّدين والمشاريع وإقران الهاتف",
-        action: "إظهار الإعداد مجددًا",
-      },
       browserData: {
         title: "بيانات المتصفح",
         siteData: "ملفات تعريف الارتباط وبيانات المواقع",

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

@@ -1666,82 +1666,6 @@ export const en = {
     },
   },
   onboarding: {
-    setup: {
-      title: "Set up Paseo",
-      footnote: "Everything here is also in Settings",
-      stepCounter: "Step {{current}} of {{total}}",
-      skip: "Skip setup",
-      continue: "Continue",
-      finish: "Finish",
-      steps: {
-        appearance: {
-          label: "Appearance",
-          title: "Welcome to Paseo",
-          description:
-            "Run Claude Code, Codex and other agents on this computer, from your desk or your phone. First, pick a look.",
-        },
-        providers: {
-          label: "Providers",
-          title: "Your agents",
-          description:
-            "Paseo runs the agent CLIs already on this computer. Turn off any you don't want in the agent picker.",
-        },
-        projects: {
-          label: "Projects",
-          title: "Add your projects",
-          description:
-            "Add the folders you want agents to work in. You can add more later from the sidebar.",
-          addProject: "Add project",
-          addAnotherProject: "Add another project…",
-          added: "Added",
-          suggestions: {
-            loading: "Looking for folders you've worked in",
-            stillReading: "Still reading {{providers}} history…",
-            readFailed: "Couldn't read {{provider}} history",
-            empty: "No recent projects found",
-            sessions_one: "{{count}} session",
-            sessions_other: "{{count}} sessions",
-            addSelected_one: "Add {{count}} project",
-            addSelected_other: "Add {{count}} projects",
-            adding: "Adding…",
-            addFailed: "Couldn't add this folder",
-          },
-        },
-        orchestration: {
-          label: "Orchestration",
-          title: "Let agents use Paseo",
-          description:
-            "With Paseo tools, an agent can hand work to other agents and set up its own workspaces and schedules.",
-          capabilities: {
-            agents: {
-              title: "Start and steer other agents",
-              description:
-                "Launch Codex, Claude Code or OpenCode agents, send them prompts and wait for their results.",
-            },
-            workspaces: {
-              title: "Create workspaces",
-              description: "Open a worktree for each task so parallel agents don't collide.",
-            },
-            schedules: {
-              title: "Schedules and heartbeats",
-              description: "Check CI every 10 minutes and fix failures.",
-            },
-            terminals: {
-              title: "Terminals and scripts",
-              description: "Run your workspace's dev server and read its output.",
-            },
-          },
-        },
-        phone: {
-          label: "Phone",
-          title: "Take your agents with you",
-          description:
-            "Paseo for iOS and Android connects to this computer. Agents keep running here; your phone watches them, approves permissions and sends prompts.",
-          appStore: "App Store",
-          googlePlay: "Google Play",
-        },
-      },
-    },
     title: "Welcome to Paseo",
     subtitle: "Connect your computer to get started",
     actions: {
@@ -1960,8 +1884,6 @@ export const en = {
       notNow: "Not now",
       directConnectionHint:
         "Without relay, connect directly over TCP, Tailscale, or another VPN. No QR code is created.",
-      tailscaleDocs: "Set up Tailscale",
-      tailscaleDocsAccessibility: "Read how to connect over Tailscale",
       updateRequired: "Update the host to enable relay from Paseo Desktop.",
       unavailable: "Pairing offer unavailable.",
       hint: "Scan this QR code with Paseo on your phone, or copy the link below.",
@@ -2525,11 +2447,6 @@ export const en = {
     general: {
       title: "General",
       sending: "Sending",
-      setup: {
-        label: "First-run setup",
-        description: "Walk through appearance, providers, projects and phone pairing again",
-        action: "Show setup again",
-      },
       browserData: {
         title: "Browser data",
         siteData: "Cookies and site data",

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

@@ -1687,84 +1687,6 @@ export const es: TranslationResources = {
     },
   },
   onboarding: {
-    setup: {
-      title: "Configurar Paseo",
-      footnote: "Todo lo de aquí también está en Ajustes",
-      stepCounter: "Paso {{current}} de {{total}}",
-      skip: "Omitir configuración",
-      continue: "Continuar",
-      finish: "Finalizar",
-      steps: {
-        appearance: {
-          label: "Apariencia",
-          title: "Te damos la bienvenida a Paseo",
-          description:
-            "Ejecuta Claude Code, Codex y otros agentes en este ordenador, desde tu escritorio o tu teléfono. Primero, elige un aspecto.",
-        },
-        providers: {
-          label: "Proveedores",
-          title: "Tus agentes",
-          description:
-            "Paseo usa las CLI de agentes que ya están en este ordenador. Desactiva las que no quieras ver en el selector de agentes.",
-        },
-        projects: {
-          label: "Proyectos",
-          title: "Añade tus proyectos",
-          description:
-            "Añade las carpetas en las que quieres que trabajen los agentes. Puedes añadir más después desde la barra lateral.",
-          addProject: "Añadir proyecto",
-          addAnotherProject: "Añadir otro proyecto…",
-          added: "Añadido",
-          suggestions: {
-            loading: "Buscando carpetas en las que has trabajado",
-            stillReading: "Todavía leyendo el historial de {{providers}}…",
-            readFailed: "No se pudo leer el historial de {{provider}}",
-            empty: "No se encontraron proyectos recientes",
-            sessions_one: "{{count}} sesión",
-            sessions_other: "{{count}} sesiones",
-            addSelected_one: "Añadir {{count}} proyecto",
-            addSelected_other: "Añadir {{count}} proyectos",
-            adding: "Añadiendo…",
-            addFailed: "No se pudo añadir esta carpeta",
-          },
-        },
-        orchestration: {
-          label: "Orquestación",
-          title: "Deja que los agentes usen Paseo",
-          description:
-            "Con las herramientas de Paseo, un agente puede pasar trabajo a otros agentes y crear sus propios espacios de trabajo y programaciones.",
-          capabilities: {
-            agents: {
-              title: "Iniciar y dirigir otros agentes",
-              description:
-                "Lanza agentes de Codex, Claude Code u OpenCode, envíales instrucciones y espera sus resultados.",
-            },
-            workspaces: {
-              title: "Crear espacios de trabajo",
-              description:
-                "Abre un worktree por tarea para que los agentes en paralelo no choquen.",
-            },
-            schedules: {
-              title: "Programaciones y heartbeats",
-              description: "Revisa la CI cada 10 minutos y corrige los fallos.",
-            },
-            terminals: {
-              title: "Terminales y scripts",
-              description:
-                "Ejecuta el servidor de desarrollo de tu espacio de trabajo y lee su salida.",
-            },
-          },
-        },
-        phone: {
-          label: "Teléfono",
-          title: "Lleva tus agentes contigo",
-          description:
-            "Paseo para iOS y Android se conecta a este ordenador. Los agentes siguen ejecutándose aquí; tu teléfono los supervisa, aprueba permisos y envía instrucciones.",
-          appStore: "App Store",
-          googlePlay: "Google Play",
-        },
-      },
-    },
     title: "Bienvenido aPaseo",
     subtitle: "Conecte su computadora para comenzar",
     actions: {
@@ -1985,8 +1907,6 @@ export const es: TranslationResources = {
       notNow: "Ahora no",
       directConnectionHint:
         "Sin relé, conéctese directamente por TCP, Tailscale u otra VPN. No se crea ningún código QR.",
-      tailscaleDocs: "Configurar Tailscale",
-      tailscaleDocsAccessibility: "Leer cómo conectarse con Tailscale",
       updateRequired: "Actualice el host para habilitar el relé desde Paseo Desktop.",
       unavailable: "Oferta de maridaje no disponible.",
       hint: "Escanee este códigoQRconPaseoen su teléfono o copie el enlace a continuación.",
@@ -2450,12 +2370,6 @@ export const es: TranslationResources = {
     general: {
       title: "General",
       sending: "Envío",
-      setup: {
-        label: "Configuración inicial",
-        description:
-          "Vuelve a recorrer apariencia, proveedores, proyectos y emparejamiento del teléfono",
-        action: "Mostrar configuración de nuevo",
-      },
       browserData: {
         title: "Datos del navegador",
         siteData: "Cookies y datos de sitios",

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

@@ -1685,84 +1685,6 @@ export const fr: TranslationResources = {
     },
   },
   onboarding: {
-    setup: {
-      title: "Configurer Paseo",
-      footnote: "Tout ceci se trouve aussi dans les Réglages",
-      stepCounter: "Étape {{current}} sur {{total}}",
-      skip: "Passer la configuration",
-      continue: "Continuer",
-      finish: "Terminer",
-      steps: {
-        appearance: {
-          label: "Apparence",
-          title: "Bienvenue dans Paseo",
-          description:
-            "Lancez Claude Code, Codex et d'autres agents sur cet ordinateur, depuis votre bureau ou votre téléphone. Choisissez d'abord un style.",
-        },
-        providers: {
-          label: "Fournisseurs",
-          title: "Vos agents",
-          description:
-            "Paseo utilise les CLI d'agents déjà installées sur cet ordinateur. Désactivez celles que vous ne voulez pas dans le sélecteur d'agents.",
-        },
-        projects: {
-          label: "Projets",
-          title: "Ajoutez vos projets",
-          description:
-            "Ajoutez les dossiers dans lesquels les agents doivent travailler. Vous pourrez en ajouter d'autres depuis la barre latérale.",
-          addProject: "Ajouter un projet",
-          addAnotherProject: "Ajouter un autre projet…",
-          added: "Ajouté",
-          suggestions: {
-            loading: "Recherche des dossiers dans lesquels vous avez travaillé",
-            stillReading: "Lecture de l'historique {{providers}} en cours…",
-            readFailed: "Impossible de lire l'historique {{provider}}",
-            empty: "Aucun projet récent trouvé",
-            sessions_one: "{{count}} session",
-            sessions_other: "{{count}} sessions",
-            addSelected_one: "Ajouter {{count}} projet",
-            addSelected_other: "Ajouter {{count}} projets",
-            adding: "Ajout…",
-            addFailed: "Impossible d'ajouter ce dossier",
-          },
-        },
-        orchestration: {
-          label: "Orchestration",
-          title: "Laissez les agents utiliser Paseo",
-          description:
-            "Avec les outils Paseo, un agent peut confier du travail à d'autres agents et créer ses propres espaces de travail et planifications.",
-          capabilities: {
-            agents: {
-              title: "Lancer et piloter d'autres agents",
-              description:
-                "Lancez des agents Codex, Claude Code ou OpenCode, envoyez-leur des instructions et attendez leurs résultats.",
-            },
-            workspaces: {
-              title: "Créer des espaces de travail",
-              description:
-                "Ouvrez un worktree par tâche pour que les agents en parallèle ne se gênent pas.",
-            },
-            schedules: {
-              title: "Planifications et heartbeats",
-              description: "Vérifier la CI toutes les 10 minutes et corriger les échecs.",
-            },
-            terminals: {
-              title: "Terminaux et scripts",
-              description:
-                "Lancez le serveur de développement de votre espace de travail et lisez sa sortie.",
-            },
-          },
-        },
-        phone: {
-          label: "Téléphone",
-          title: "Emportez vos agents partout",
-          description:
-            "Paseo pour iOS et Android se connecte à cet ordinateur. Les agents continuent de tourner ici ; votre téléphone les suit, approuve les permissions et envoie des instructions.",
-          appStore: "App Store",
-          googlePlay: "Google Play",
-        },
-      },
-    },
     title: "Bienvenue dans Paseo",
     subtitle: "Connectez votre ordinateur pour commencer",
     actions: {
@@ -1983,8 +1905,6 @@ export const fr: TranslationResources = {
       notNow: "Pas maintenant",
       directConnectionHint:
         "Sans relais, connectez-vous directement via TCP, Tailscale ou un autre VPN. Aucun code QR n’est créé.",
-      tailscaleDocs: "Configurer Tailscale",
-      tailscaleDocsAccessibility: "Lire comment se connecter via Tailscale",
       updateRequired: "Mettez à jour l’hôte pour activer le relais depuis Paseo Desktop.",
       unavailable: "Offre d’association indisponible.",
       hint: "Scannez ce code QR avec Paseo sur votre téléphone, ou copiez le lien ci-dessous.",
@@ -2450,12 +2370,6 @@ export const fr: TranslationResources = {
     general: {
       title: "Général",
       sending: "Envoi",
-      setup: {
-        label: "Configuration initiale",
-        description:
-          "Reprendre l'apparence, les fournisseurs, les projets et l'appairage du téléphone",
-        action: "Afficher la configuration",
-      },
       browserData: {
         title: "Données du navigateur",
         siteData: "Cookies et données des sites",

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

@@ -1658,83 +1658,6 @@ export const ja: TranslationResources = {
     },
   },
   onboarding: {
-    setup: {
-      title: "Paseo のセットアップ",
-      footnote: "ここでの設定はすべて設定画面でも変更できます",
-      stepCounter: "ステップ {{current}}/{{total}}",
-      skip: "セットアップをスキップ",
-      continue: "続ける",
-      finish: "完了",
-      steps: {
-        appearance: {
-          label: "外観",
-          title: "Paseo へようこそ",
-          description:
-            "このコンピューターで Claude Code、Codex などのエージェントを、デスクからでもスマートフォンからでも実行できます。まずは見た目を選びましょう。",
-        },
-        providers: {
-          label: "プロバイダー",
-          title: "エージェント",
-          description:
-            "Paseo はこのコンピューターにインストール済みのエージェント CLI を使います。エージェント選択に表示したくないものはオフにしてください。",
-        },
-        projects: {
-          label: "プロジェクト",
-          title: "プロジェクトを追加",
-          description:
-            "エージェントに作業させるフォルダーを追加します。後からサイドバーで追加することもできます。",
-          addProject: "プロジェクトを追加",
-          addAnotherProject: "別のプロジェクトを追加…",
-          added: "追加済み",
-          suggestions: {
-            loading: "作業したフォルダーを探しています",
-            stillReading: "{{providers}} の履歴を読み込んでいます…",
-            readFailed: "{{provider}} の履歴を読み込めませんでした",
-            empty: "最近のプロジェクトは見つかりませんでした",
-            sessions_one: "{{count}} セッション",
-            sessions_other: "{{count}} セッション",
-            addSelected_one: "{{count}} 件のプロジェクトを追加",
-            addSelected_other: "{{count}} 件のプロジェクトを追加",
-            adding: "追加しています…",
-            addFailed: "このフォルダーを追加できませんでした",
-          },
-        },
-        orchestration: {
-          label: "オーケストレーション",
-          title: "エージェントに Paseo を使わせる",
-          description:
-            "Paseo ツールを使うと、エージェントは他のエージェントに作業を任せたり、自分でワークスペースやスケジュールを作成したりできます。",
-          capabilities: {
-            agents: {
-              title: "他のエージェントを起動・操作",
-              description:
-                "Codex、Claude Code、OpenCode のエージェントを起動し、プロンプトを送って結果を待ちます。",
-            },
-            workspaces: {
-              title: "ワークスペースを作成",
-              description:
-                "タスクごとに worktree を作成し、並行するエージェント同士の衝突を防ぎます。",
-            },
-            schedules: {
-              title: "スケジュールとハートビート",
-              description: "10 分ごとに CI を確認して失敗を修正する。",
-            },
-            terminals: {
-              title: "ターミナルとスクリプト",
-              description: "ワークスペースの開発サーバーを起動し、その出力を読み取ります。",
-            },
-          },
-        },
-        phone: {
-          label: "スマートフォン",
-          title: "エージェントを持ち歩く",
-          description:
-            "iOS と Android 版 Paseo はこのコンピューターに接続します。エージェントはここで動き続け、スマートフォンで状況を確認し、権限を承認し、プロンプトを送れます。",
-          appStore: "App Store",
-          googlePlay: "Google Play",
-        },
-      },
-    },
     title: "Paseoへようこそ",
     subtitle: "始めるにはコンピューターに接続してください",
     actions: {
@@ -1955,8 +1878,6 @@ export const ja: TranslationResources = {
       notNow: "今はしない",
       directConnectionHint:
         "リレーを使わない場合は、TCP、Tailscale、または別の VPN で直接接続してください。QR コードは作成されません。",
-      tailscaleDocs: "Tailscale を設定",
-      tailscaleDocsAccessibility: "Tailscale で接続する方法を読む",
       updateRequired: "Paseo Desktop からリレーを有効にするにはホストを更新してください。",
       unavailable: "ペアリングオファーが利用できません。",
       hint: "スマートフォンのPaseoでこのQRコードをスキャンするか、以下のリンクをコピーしてください。",
@@ -2422,12 +2343,6 @@ export const ja: TranslationResources = {
     general: {
       title: "一般",
       sending: "送信",
-      setup: {
-        label: "初回セットアップ",
-        description:
-          "外観、プロバイダー、プロジェクト、スマートフォンのペアリングをもう一度設定します",
-        action: "セットアップを再表示",
-      },
       browserData: {
         title: "ブラウザーデータ",
         siteData: "Cookie とサイトデータ",

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

@@ -1651,82 +1651,6 @@ export const ko: TranslationResources = {
     },
   },
   onboarding: {
-    setup: {
-      title: "Paseo 설정",
-      footnote: "여기의 모든 항목은 설정에서도 변경할 수 있습니다",
-      stepCounter: "{{total}}단계 중 {{current}}단계",
-      skip: "설정 건너뛰기",
-      continue: "계속",
-      finish: "완료",
-      steps: {
-        appearance: {
-          label: "모양",
-          title: "Paseo에 오신 것을 환영합니다",
-          description:
-            "이 컴퓨터에서 Claude Code, Codex 등 여러 에이전트를 책상에서도, 휴대폰에서도 실행하세요. 먼저 모양을 고르세요.",
-        },
-        providers: {
-          label: "제공자",
-          title: "에이전트",
-          description:
-            "Paseo는 이 컴퓨터에 이미 설치된 에이전트 CLI를 사용합니다. 에이전트 선택기에 표시하고 싶지 않은 항목은 끄세요.",
-        },
-        projects: {
-          label: "프로젝트",
-          title: "프로젝트 추가",
-          description:
-            "에이전트가 작업할 폴더를 추가하세요. 나중에 사이드바에서 더 추가할 수 있습니다.",
-          addProject: "프로젝트 추가",
-          addAnotherProject: "다른 프로젝트 추가…",
-          added: "추가됨",
-          suggestions: {
-            loading: "작업했던 폴더를 찾는 중",
-            stillReading: "{{providers}} 기록을 아직 읽는 중…",
-            readFailed: "{{provider}} 기록을 읽지 못했습니다",
-            empty: "최근 프로젝트를 찾지 못했습니다",
-            sessions_one: "세션 {{count}}개",
-            sessions_other: "세션 {{count}}개",
-            addSelected_one: "프로젝트 {{count}}개 추가",
-            addSelected_other: "프로젝트 {{count}}개 추가",
-            adding: "추가하는 중…",
-            addFailed: "이 폴더를 추가하지 못했습니다",
-          },
-        },
-        orchestration: {
-          label: "오케스트레이션",
-          title: "에이전트가 Paseo를 사용하도록 허용",
-          description:
-            "Paseo 도구를 사용하면 에이전트가 다른 에이전트에게 작업을 넘기고 직접 워크스페이스와 일정을 만들 수 있습니다.",
-          capabilities: {
-            agents: {
-              title: "다른 에이전트 시작 및 조정",
-              description:
-                "Codex, Claude Code, OpenCode 에이전트를 시작하고 프롬프트를 보낸 뒤 결과를 기다립니다.",
-            },
-            workspaces: {
-              title: "워크스페이스 만들기",
-              description: "작업마다 worktree를 열어 병렬 에이전트끼리 충돌하지 않게 합니다.",
-            },
-            schedules: {
-              title: "일정과 하트비트",
-              description: "10분마다 CI를 확인하고 실패를 수정합니다.",
-            },
-            terminals: {
-              title: "터미널과 스크립트",
-              description: "워크스페이스의 개발 서버를 실행하고 출력을 읽습니다.",
-            },
-          },
-        },
-        phone: {
-          label: "휴대폰",
-          title: "어디서나 에이전트와 함께",
-          description:
-            "iOS 및 Android용 Paseo가 이 컴퓨터에 연결됩니다. 에이전트는 여기서 계속 실행되고, 휴대폰으로 상태를 보고 권한을 승인하며 프롬프트를 보냅니다.",
-          appStore: "App Store",
-          googlePlay: "Google Play",
-        },
-      },
-    },
     title: "Paseo에 오신 것을 환영합니다",
     subtitle: "시작하려면 컴퓨터를 연결하세요",
     actions: {
@@ -1945,8 +1869,6 @@ export const ko: TranslationResources = {
       notNow: "지금은 아님",
       directConnectionHint:
         "릴레이 없이 TCP, Tailscale 또는 다른 VPN을 통해 직접 연결하세요. QR 코드가 생성되지 않습니다.",
-      tailscaleDocs: "Tailscale 설정",
-      tailscaleDocsAccessibility: "Tailscale로 연결하는 방법 읽기",
       updateRequired: "Paseo 데스크톱에서 릴레이를 활성화하려면 호스트를 업데이트하세요.",
       unavailable: "페어링 정보를 사용할 수 없습니다.",
       hint: "휴대폰의 Paseo로 이 QR 코드를 스캔하거나 아래 링크를 복사하세요.",
@@ -2410,11 +2332,6 @@ export const ko: TranslationResources = {
     general: {
       title: "일반",
       sending: "전송",
-      setup: {
-        label: "초기 설정",
-        description: "모양, 제공자, 프로젝트, 휴대폰 페어링을 다시 진행합니다",
-        action: "설정 다시 보기",
-      },
       browserData: {
         title: "브라우저 데이터",
         siteData: "쿠키 및 사이트 데이터",

packages/app/src/i18n/resources/pt-BR.ts

@@ -1672,83 +1672,6 @@ export const ptBR: TranslationResources = {
     },
   },
   onboarding: {
-    setup: {
-      title: "Configurar o Paseo",
-      footnote: "Tudo aqui também está em Configurações",
-      stepCounter: "Etapa {{current}} de {{total}}",
-      skip: "Pular configuração",
-      continue: "Continuar",
-      finish: "Concluir",
-      steps: {
-        appearance: {
-          label: "Aparência",
-          title: "Boas-vindas ao Paseo",
-          description:
-            "Execute Claude Code, Codex e outros agentes neste computador, da sua mesa ou do seu celular. Primeiro, escolha um visual.",
-        },
-        providers: {
-          label: "Provedores",
-          title: "Seus agentes",
-          description:
-            "O Paseo usa as CLIs de agentes já instaladas neste computador. Desative as que você não quer no seletor de agentes.",
-        },
-        projects: {
-          label: "Projetos",
-          title: "Adicione seus projetos",
-          description:
-            "Adicione as pastas em que os agentes devem trabalhar. Você pode adicionar mais depois pela barra lateral.",
-          addProject: "Adicionar projeto",
-          addAnotherProject: "Adicionar outro projeto…",
-          added: "Adicionado",
-          suggestions: {
-            loading: "Procurando pastas em que você trabalhou",
-            stillReading: "Ainda lendo o histórico de {{providers}}…",
-            readFailed: "Não foi possível ler o histórico de {{provider}}",
-            empty: "Nenhum projeto recente encontrado",
-            sessions_one: "{{count}} sessão",
-            sessions_other: "{{count}} sessões",
-            addSelected_one: "Adicionar {{count}} projeto",
-            addSelected_other: "Adicionar {{count}} projetos",
-            adding: "Adicionando…",
-            addFailed: "Não foi possível adicionar esta pasta",
-          },
-        },
-        orchestration: {
-          label: "Orquestração",
-          title: "Deixe os agentes usarem o Paseo",
-          description:
-            "Com as ferramentas do Paseo, um agente pode passar trabalho para outros agentes e criar seus próprios workspaces e agendamentos.",
-          capabilities: {
-            agents: {
-              title: "Iniciar e guiar outros agentes",
-              description:
-                "Inicie agentes do Codex, Claude Code ou OpenCode, envie prompts e aguarde os resultados.",
-            },
-            workspaces: {
-              title: "Criar workspaces",
-              description:
-                "Abra um worktree por tarefa para que agentes em paralelo não entrem em conflito.",
-            },
-            schedules: {
-              title: "Agendamentos e heartbeats",
-              description: "Verificar a CI a cada 10 minutos e corrigir falhas.",
-            },
-            terminals: {
-              title: "Terminais e scripts",
-              description: "Execute o servidor de desenvolvimento do workspace e leia a saída.",
-            },
-          },
-        },
-        phone: {
-          label: "Celular",
-          title: "Leve seus agentes com você",
-          description:
-            "O Paseo para iOS e Android se conecta a este computador. Os agentes continuam rodando aqui; seu celular os acompanha, aprova permissões e envia prompts.",
-          appStore: "App Store",
-          googlePlay: "Google Play",
-        },
-      },
-    },
     title: "Bem-vindo ao Paseo",
     subtitle: "Conecte seu computador para começar",
     actions: {
@@ -1969,8 +1892,6 @@ export const ptBR: TranslationResources = {
       notNow: "Agora não",
       directConnectionHint:
         "Sem relay, conecte diretamente por TCP, Tailscale ou outra VPN. Nenhum código QR é criado.",
-      tailscaleDocs: "Configurar Tailscale",
-      tailscaleDocsAccessibility: "Ler como conectar pelo Tailscale",
       updateRequired: "Atualize o host para ativar o relay pelo Paseo Desktop.",
       unavailable: "Oferta de pareamento indisponível.",
       hint: "Escaneie este QR code com o Paseo no seu celular ou copie o link abaixo.",
@@ -2434,11 +2355,6 @@ export const ptBR: TranslationResources = {
     general: {
       title: "Geral",
       sending: "Envio",
-      setup: {
-        label: "Configuração inicial",
-        description: "Rever aparência, provedores, projetos e pareamento do celular",
-        action: "Mostrar configuração novamente",
-      },
       browserData: {
         title: "Dados do navegador",
         siteData: "Cookies e dados de sites",

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

@@ -1670,83 +1670,6 @@ export const ru: TranslationResources = {
     },
   },
   onboarding: {
-    setup: {
-      title: "Настройка Paseo",
-      footnote: "Всё это также есть в настройках",
-      stepCounter: "Шаг {{current}} из {{total}}",
-      skip: "Пропустить настройку",
-      continue: "Продолжить",
-      finish: "Готово",
-      steps: {
-        appearance: {
-          label: "Оформление",
-          title: "Добро пожаловать в Paseo",
-          description:
-            "Запускайте Claude Code, Codex и других агентов на этом компьютере — за столом или с телефона. Сначала выберите оформление.",
-        },
-        providers: {
-          label: "Провайдеры",
-          title: "Ваши агенты",
-          description:
-            "Paseo использует CLI агентов, уже установленные на этом компьютере. Отключите те, которые не нужны в списке агентов.",
-        },
-        projects: {
-          label: "Проекты",
-          title: "Добавьте проекты",
-          description:
-            "Добавьте папки, в которых будут работать агенты. Позже можно добавить ещё из боковой панели.",
-          addProject: "Добавить проект",
-          addAnotherProject: "Добавить другой проект…",
-          added: "Добавлено",
-          suggestions: {
-            loading: "Ищем папки, в которых вы работали",
-            stillReading: "Ещё читаем историю {{providers}}…",
-            readFailed: "Не удалось прочитать историю {{provider}}",
-            empty: "Недавних проектов не найдено",
-            sessions_one: "{{count}} сессия",
-            sessions_other: "Сессий: {{count}}",
-            addSelected_one: "Добавить {{count}} проект",
-            addSelected_other: "Добавить проекты: {{count}}",
-            adding: "Добавляем…",
-            addFailed: "Не удалось добавить эту папку",
-          },
-        },
-        orchestration: {
-          label: "Оркестрация",
-          title: "Дайте агентам доступ к Paseo",
-          description:
-            "С инструментами Paseo агент может передавать работу другим агентам и сам создавать рабочие пространства и расписания.",
-          capabilities: {
-            agents: {
-              title: "Запуск других агентов и управление ими",
-              description:
-                "Запускайте агентов Codex, Claude Code или OpenCode, отправляйте им запросы и ждите результатов.",
-            },
-            workspaces: {
-              title: "Создание рабочих пространств",
-              description:
-                "Отдельный worktree для каждой задачи, чтобы параллельные агенты не мешали друг другу.",
-            },
-            schedules: {
-              title: "Расписания и heartbeat",
-              description: "Проверять CI каждые 10 минут и исправлять сбои.",
-            },
-            terminals: {
-              title: "Терминалы и скрипты",
-              description: "Запускайте dev-сервер рабочего пространства и читайте его вывод.",
-            },
-          },
-        },
-        phone: {
-          label: "Телефон",
-          title: "Агенты всегда под рукой",
-          description:
-            "Paseo для iOS и Android подключается к этому компьютеру. Агенты продолжают работать здесь, а телефон следит за ними, одобряет разрешения и отправляет запросы.",
-          appStore: "App Store",
-          googlePlay: "Google Play",
-        },
-      },
-    },
     title: "Добро пожаловать в Paseo",
     subtitle: "Подключите компьютер, чтобы начать",
     actions: {
@@ -1968,8 +1891,6 @@ export const ru: TranslationResources = {
       notNow: "Не сейчас",
       directConnectionHint:
         "Без ретранслятора подключайтесь напрямую через TCP, Tailscale или другую VPN. QR-код создаваться не будет.",
-      tailscaleDocs: "Настроить Tailscale",
-      tailscaleDocsAccessibility: "Узнать, как подключиться через Tailscale",
       updateRequired: "Обновите хост, чтобы включить ретранслятор из Paseo Desktop.",
       unavailable: "Данные для сопряжения недоступны.",
       hint: "Отсканируйте этот QR-код с помощью Paseo на телефоне или скопируйте ссылку ниже.",
@@ -2436,11 +2357,6 @@ export const ru: TranslationResources = {
     general: {
       title: "Основные",
       sending: "Отправка",
-      setup: {
-        label: "Первоначальная настройка",
-        description: "Снова пройти оформление, провайдеры, проекты и привязку телефона",
-        action: "Показать настройку снова",
-      },
       browserData: {
         title: "Данные браузера",
         siteData: "Файлы cookie и данные сайтов",

packages/app/src/i18n/resources/zh-CN.ts

@@ -1624,79 +1624,6 @@ export const zhCN: TranslationResources = {
     },
   },
   onboarding: {
-    setup: {
-      title: "设置 Paseo",
-      footnote: "这里的所有选项也都在设置中",
-      stepCounter: "第 {{current}} 步，共 {{total}} 步",
-      skip: "跳过设置",
-      continue: "继续",
-      finish: "完成",
-      steps: {
-        appearance: {
-          label: "外观",
-          title: "欢迎使用 Paseo",
-          description:
-            "在这台电脑上运行 Claude Code、Codex 和其他代理，无论在桌前还是用手机。先选一个外观。",
-        },
-        providers: {
-          label: "提供方",
-          title: "你的代理",
-          description: "Paseo 使用这台电脑上已安装的代理 CLI。关闭不想在代理选择器中显示的项。",
-        },
-        projects: {
-          label: "项目",
-          title: "添加项目",
-          description: "添加你希望代理工作的文件夹。之后也可以从侧边栏添加更多。",
-          addProject: "添加项目",
-          addAnotherProject: "添加其他项目…",
-          added: "已添加",
-          suggestions: {
-            loading: "正在查找你工作过的文件夹",
-            stillReading: "仍在读取 {{providers}} 历史记录…",
-            readFailed: "无法读取 {{provider}} 历史记录",
-            empty: "未找到最近的项目",
-            sessions_one: "{{count}} 个会话",
-            sessions_other: "{{count}} 个会话",
-            addSelected_one: "添加 {{count}} 个项目",
-            addSelected_other: "添加 {{count}} 个项目",
-            adding: "正在添加…",
-            addFailed: "无法添加此文件夹",
-          },
-        },
-        orchestration: {
-          label: "编排",
-          title: "让代理使用 Paseo",
-          description:
-            "启用 Paseo 工具后，代理可以把工作交给其他代理，并自行创建工作区和计划任务。",
-          capabilities: {
-            agents: {
-              title: "启动并引导其他代理",
-              description: "启动 Codex、Claude Code 或 OpenCode 代理，向它们发送提示并等待结果。",
-            },
-            workspaces: {
-              title: "创建工作区",
-              description: "为每个任务打开一个 worktree，避免并行代理相互冲突。",
-            },
-            schedules: {
-              title: "计划任务和心跳",
-              description: "每 10 分钟检查一次 CI 并修复失败。",
-            },
-            terminals: {
-              title: "终端和脚本",
-              description: "运行工作区的开发服务器并读取输出。",
-            },
-          },
-        },
-        phone: {
-          label: "手机",
-          title: "随身带上你的代理",
-          description:
-            "iOS 和 Android 版 Paseo 会连接到这台电脑。代理继续在这里运行，手机用来查看进度、批准权限和发送提示。",
-          appStore: "App Store",
-          googlePlay: "Google Play",
-        },
-      },
-    },
     title: "欢迎使用 Paseo",
     subtitle: "连接你的电脑即可开始",
     actions: {
@@ -1911,8 +1838,6 @@ export const zhCN: TranslationResources = {
       notNow: "暂不",
       directConnectionHint:
         "不使用中继时，请通过 TCP、Tailscale 或其他 VPN 直接连接。不会生成二维码。",
-      tailscaleDocs: "设置 Tailscale",
-      tailscaleDocsAccessibility: "了解如何通过 Tailscale 连接",
       updateRequired: "请更新主机，以便从 Paseo Desktop 启用中继。",
       unavailable: "配对 offer 不可用。",
       hint: "用手机上的 Paseo 扫描此二维码，或复制下方链接。",
@@ -2374,11 +2299,6 @@ export const zhCN: TranslationResources = {
     general: {
       title: "通用",
       sending: "发送",
-      setup: {
-        label: "首次设置",
-        description: "重新设置外观、提供方、项目和手机配对",
-        action: "再次显示设置",
-      },
       browserData: {
         title: "浏览器数据",
         siteData: "Cookie 和网站数据",

packages/app/src/onboarding/index.ts

@@ -1,9 +0,0 @@
-/**
- * First-run setup: a one-time modal that walks a new user through the surfaces Settings
- * already has — appearance, providers, projects, Paseo tools and phone pairing.
- *
- * The app shell mounts the host; Settings reopens it. Whether it opens, which steps it has,
- * and how completion is remembered stay inside; import from `@/onboarding` only.
- */
-export { OnboardingHost } from "./onboarding-host";
-export { useOpenOnboarding } from "./use-open-onboarding";

packages/app/src/onboarding/internal/completion-storage.ts

@@ -1,25 +0,0 @@
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import { z } from "zod";
-import { readValidatedJson } from "@/storage/validated-storage";
-import type { OnboardingCompletionStorage } from "./model";
-
-export const ONBOARDING_STORAGE_KEY = "@paseo:onboarding";
-
-const OnboardingRecordSchema = z.object({ completedAt: z.string() });
-
-export const asyncStorageOnboardingCompletion: OnboardingCompletionStorage = {
-  async isCompleted() {
-    const record = await readValidatedJson(
-      AsyncStorage,
-      ONBOARDING_STORAGE_KEY,
-      OnboardingRecordSchema,
-    );
-    return record !== null;
-  },
-  async markCompleted() {
-    await AsyncStorage.setItem(
-      ONBOARDING_STORAGE_KEY,
-      JSON.stringify({ completedAt: new Date().toISOString() }),
-    );
-  },
-};

packages/app/src/onboarding/internal/model.test.ts

@@ -1,202 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  createOnboardingModel,
-  type OnboardingCompletionStorage,
-  type OnboardingModel,
-  type OnboardingSetupHost,
-} from "./model";
-
-class MemoryCompletionStorage implements OnboardingCompletionStorage {
-  completed: boolean;
-
-  constructor(completed = false) {
-    this.completed = completed;
-  }
-
-  async isCompleted(): Promise<boolean> {
-    return this.completed;
-  }
-
-  async markCompleted(): Promise<void> {
-    this.completed = true;
-  }
-}
-
-const FRESH_HOST: OnboardingSetupHost = {
-  serverId: "local",
-  isConnected: true,
-  hasHydratedWorkspaces: true,
-  hasProjects: false,
-};
-
-/** Presses Continue on whatever step is showing. */
-function advance(model: OnboardingModel) {
-  const state = model.getState();
-  if (state.status !== "open") throw new Error("setup is not open");
-  model.next(state.visit);
-}
-
-function currentVisit(model: OnboardingModel): number {
-  const state = model.getState();
-  if (state.status !== "open") throw new Error("setup is not open");
-  return state.visit;
-}
-
-async function openModel(storage = new MemoryCompletionStorage()) {
-  const model = createOnboardingModel({ storage });
-  await model.ready;
-  return model;
-}
-
-describe("onboarding model", () => {
-  it("opens on the appearance step for a connected host with no projects", async () => {
-    const model = await openModel();
-
-    model.applySetupHost(FRESH_HOST, { includePhoneStep: true });
-
-    expect(model.getState()).toMatchObject({
-      status: "open",
-      serverId: "local",
-      steps: ["appearance", "providers", "projects", "orchestration", "phone"],
-      stepIndex: 0,
-    });
-  });
-
-  it("waits until the host is connected and its workspaces are hydrated", async () => {
-    const model = await openModel();
-
-    model.applySetupHost(null, { includePhoneStep: true });
-    model.applySetupHost({ ...FRESH_HOST, isConnected: false }, { includePhoneStep: true });
-    model.applySetupHost(
-      { ...FRESH_HOST, hasHydratedWorkspaces: false },
-      { includePhoneStep: true },
-    );
-    expect(model.getState()).toEqual({ status: "deciding" });
-
-    model.applySetupHost(FRESH_HOST, { includePhoneStep: true });
-    expect(model.getState().status).toBe("open");
-  });
-
-  it("stays hidden for a host that already has projects, even after they are removed", async () => {
-    const model = await openModel();
-
-    model.applySetupHost({ ...FRESH_HOST, hasProjects: true }, { includePhoneStep: true });
-    model.applySetupHost(FRESH_HOST, { includePhoneStep: true });
-
-    expect(model.getState()).toEqual({ status: "hidden" });
-  });
-
-  it("stays hidden once setup was completed on this client", async () => {
-    const model = await openModel(new MemoryCompletionStorage(true));
-
-    model.applySetupHost(FRESH_HOST, { includePhoneStep: true });
-
-    expect(model.getState()).toEqual({ status: "hidden" });
-  });
-
-  it("decides only after the completion record has loaded", async () => {
-    const model = createOnboardingModel({ storage: new MemoryCompletionStorage(true) });
-
-    model.applySetupHost(FRESH_HOST, { includePhoneStep: true });
-    expect(model.getState()).toEqual({ status: "deciding" });
-
-    await model.ready;
-    expect(model.getState()).toEqual({ status: "hidden" });
-  });
-
-  it("keeps the modal open when the host gains its first project during setup", async () => {
-    const model = await openModel();
-    model.applySetupHost(FRESH_HOST, { includePhoneStep: true });
-    advance(model);
-    advance(model);
-
-    model.applySetupHost({ ...FRESH_HOST, hasProjects: true }, { includePhoneStep: true });
-
-    expect(model.getState()).toMatchObject({ status: "open", stepIndex: 2 });
-  });
-
-  it("omits the phone step when the client is a phone", async () => {
-    const model = await openModel();
-
-    model.applySetupHost(FRESH_HOST, { includePhoneStep: false });
-
-    expect(model.getState()).toMatchObject({
-      steps: ["appearance", "providers", "projects", "orchestration"],
-    });
-  });
-
-  it("moves between steps without leaving the step list", async () => {
-    const model = await openModel();
-    model.applySetupHost(FRESH_HOST, { includePhoneStep: false });
-
-    model.back();
-    expect(model.getState()).toMatchObject({ stepIndex: 0 });
-    advance(model);
-    advance(model);
-    advance(model);
-    advance(model);
-    expect(model.getState()).toMatchObject({ stepIndex: 3 });
-    model.goTo("providers");
-    expect(model.getState()).toMatchObject({ stepIndex: 1 });
-    model.back();
-    expect(model.getState()).toMatchObject({ stepIndex: 0 });
-  });
-
-  it("ignores a late advance from a step visit the user already left", async () => {
-    const model = await openModel(new MemoryCompletionStorage(true));
-    model.reopen("local", { includePhoneStep: true });
-    model.goTo("projects");
-
-    // Projects are still being added when the user leaves Projects and comes back.
-    const addingFrom = currentVisit(model);
-    model.goTo("appearance");
-    model.goTo("projects");
-    model.next(addingFrom);
-    expect(model.getState()).toMatchObject({ stepIndex: 2 });
-
-    // Or closes setup, opens it again and returns to Projects before the add finishes.
-    await model.complete();
-    model.reopen("local", { includePhoneStep: true });
-    model.goTo("projects");
-    model.next(addingFrom);
-    expect(model.getState()).toMatchObject({ status: "open", stepIndex: 2 });
-  });
-
-  it("records completion when setup closes, so it does not open again", async () => {
-    const storage = new MemoryCompletionStorage();
-    const model = await openModel(storage);
-    model.applySetupHost(FRESH_HOST, { includePhoneStep: true });
-
-    await model.complete();
-
-    expect(model.getState()).toEqual({ status: "hidden" });
-    expect(storage.completed).toBe(true);
-    const relaunched = await openModel(storage);
-    relaunched.applySetupHost(FRESH_HOST, { includePhoneStep: true });
-    expect(relaunched.getState()).toEqual({ status: "hidden" });
-  });
-
-  it("reopens on the first step for an existing user", async () => {
-    const model = await openModel(new MemoryCompletionStorage(true));
-    model.applySetupHost({ ...FRESH_HOST, hasProjects: true }, { includePhoneStep: true });
-
-    model.reopen("local", { includePhoneStep: true });
-
-    expect(model.getState()).toMatchObject({ status: "open", serverId: "local", stepIndex: 0 });
-  });
-
-  it("notifies subscribers on every state change", async () => {
-    const model = await openModel();
-    const seen: string[] = [];
-    model.subscribe(() => {
-      const state = model.getState();
-      seen.push(state.status === "open" ? `open:${state.stepIndex}` : state.status);
-    });
-
-    model.applySetupHost(FRESH_HOST, { includePhoneStep: true });
-    advance(model);
-    await model.complete();
-
-    expect(seen).toEqual(["open:0", "open:1", "hidden"]);
-  });
-});

packages/app/src/onboarding/internal/model.ts

@@ -1,165 +0,0 @@
-export type OnboardingStepId = "appearance" | "providers" | "projects" | "orchestration" | "phone";
-
-const STEPS_WITHOUT_PHONE: readonly OnboardingStepId[] = [
-  "appearance",
-  "providers",
-  "projects",
-  "orchestration",
-];
-const STEPS_WITH_PHONE: readonly OnboardingStepId[] = [...STEPS_WITHOUT_PHONE, "phone"];
-
-export interface OnboardingCompletionStorage {
-  isCompleted(): Promise<boolean>;
-  markCompleted(): Promise<void>;
-}
-
-/** The host setup runs against: the desktop's managed daemon, otherwise the first saved host. */
-export interface OnboardingSetupHost {
-  serverId: string;
-  isConnected: boolean;
-  hasHydratedWorkspaces: boolean;
-  hasProjects: boolean;
-}
-
-export interface OnboardingStepOptions {
-  /** False when the client is itself a phone, where pairing a phone makes no sense. */
-  includePhoneStep: boolean;
-}
-
-export type OnboardingState =
-  | { status: "deciding" }
-  | { status: "hidden" }
-  | {
-      status: "open";
-      serverId: string;
-      steps: readonly OnboardingStepId[];
-      stepIndex: number;
-      /** Identifies this stay on the current step; it changes on every move, close or reopen. */
-      visit: number;
-    };
-
-export interface OnboardingModel {
-  /** Resolves once the completion record has loaded. */
-  ready: Promise<void>;
-  getState(): OnboardingState;
-  subscribe(listener: () => void): () => void;
-  applySetupHost(host: OnboardingSetupHost | null, options: OnboardingStepOptions): void;
-  reopen(serverId: string, options: OnboardingStepOptions): void;
-  /**
-   * Moves on from the step visit the caller saw. A no-op once that visit ended, so an action that
-   * finishes late never moves a step the user left or a setup they closed and reopened.
-   */
-  next(visit: number): void;
-  back(): void;
-  goTo(step: OnboardingStepId): void;
-  /** Closes setup, whether the user finished or skipped it, and remembers that on this client. */
-  complete(): Promise<void>;
-}
-
-type Completion = "loading" | "completed" | "pending";
-
-interface PendingHost {
-  host: OnboardingSetupHost | null;
-  options: OnboardingStepOptions;
-}
-
-function isReadyForSetup(host: OnboardingSetupHost | null): host is OnboardingSetupHost {
-  return host !== null && host.isConnected && host.hasHydratedWorkspaces;
-}
-
-export function createOnboardingModel(input: {
-  storage: OnboardingCompletionStorage;
-}): OnboardingModel {
-  const listeners = new Set<() => void>();
-  let state: OnboardingState = { status: "deciding" };
-  let completion: Completion = "loading";
-  let pendingHost: PendingHost | null = null;
-  let visits = 0;
-
-  function openState(serverId: string, options: OnboardingStepOptions): OnboardingState {
-    visits += 1;
-    return {
-      status: "open",
-      serverId,
-      steps: options.includePhoneStep ? STEPS_WITH_PHONE : STEPS_WITHOUT_PHONE,
-      stepIndex: 0,
-      visit: visits,
-    };
-  }
-
-  function setState(next: OnboardingState) {
-    state = next;
-    for (const listener of listeners) {
-      listener();
-    }
-  }
-
-  // The gate is decided once per launch: a host that later loses its projects, or a
-  // project added during setup, never flips the decision.
-  function decide() {
-    if (state.status !== "deciding" || completion === "loading") return;
-    if (completion === "completed") {
-      setState({ status: "hidden" });
-      return;
-    }
-    const host = pendingHost?.host ?? null;
-    if (!pendingHost || !isReadyForSetup(host)) return;
-    setState(
-      host.hasProjects ? { status: "hidden" } : openState(host.serverId, pendingHost.options),
-    );
-  }
-
-  function moveTo(stepIndex: number) {
-    if (state.status !== "open") return;
-    const clamped = Math.max(0, Math.min(stepIndex, state.steps.length - 1));
-    if (clamped === state.stepIndex) return;
-    visits += 1;
-    setState({ ...state, stepIndex: clamped, visit: visits });
-  }
-
-  async function loadCompletion(): Promise<void> {
-    try {
-      completion = (await input.storage.isCompleted()) ? "completed" : "pending";
-    } catch {
-      // An unreadable record must not trap an existing user in setup.
-      completion = "completed";
-    }
-    decide();
-  }
-
-  const ready = loadCompletion();
-
-  return {
-    ready,
-    getState: () => state,
-    subscribe(listener) {
-      listeners.add(listener);
-      return () => {
-        listeners.delete(listener);
-      };
-    },
-    applySetupHost(host, options) {
-      pendingHost = { host, options };
-      decide();
-    },
-    reopen(serverId, options) {
-      setState(openState(serverId, options));
-    },
-    next(visit) {
-      if (state.status === "open" && state.visit === visit) moveTo(state.stepIndex + 1);
-    },
-    back() {
-      if (state.status === "open") moveTo(state.stepIndex - 1);
-    },
-    goTo(step) {
-      if (state.status !== "open") return;
-      const stepIndex = state.steps.indexOf(step);
-      if (stepIndex >= 0) moveTo(stepIndex);
-    },
-    async complete() {
-      completion = "completed";
-      setState({ status: "hidden" });
-      await input.storage.markCompleted();
-    },
-  };
-}

packages/app/src/onboarding/internal/onboarding-instance.ts

@@ -1,10 +0,0 @@
-import { asyncStorageOnboardingCompletion } from "./completion-storage";
-import { createOnboardingModel, type OnboardingModel } from "./model";
-
-let instance: OnboardingModel | null = null;
-
-/** The app's one setup model, created on first use so storage is read once per launch. */
-export function getOnboardingModel(): OnboardingModel {
-  instance ??= createOnboardingModel({ storage: asyncStorageOnboardingCompletion });
-  return instance;
-}

packages/app/src/onboarding/internal/onboarding-modal.tsx

@@ -1,343 +0,0 @@
-import { useCallback, useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { Text, View, type PressableStateCallbackType } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { Check } from "lucide-react-native";
-import { AdaptiveModalSheet, FULL_SHEET_SNAP_POINTS } from "@/components/adaptive-modal-sheet";
-import { PaseoLogo } from "@/components/icons/paseo-logo";
-import { Button } from "@/components/ui/button";
-import { PressHighlight } from "@/components/ui/press-highlight";
-import { ScrollView } from "@/components/ui/scroll-view";
-import { useIsCompactFormFactor } from "@/constants/layout";
-import { useProjectSuggestions, type ProjectSuggestionsController } from "@/project-suggestions";
-import type { Theme } from "@/styles/theme";
-import type { OnboardingModel, OnboardingState, OnboardingStepId } from "./model";
-import { OnboardingStepContent } from "./steps";
-
-type OpenState = Extract<OnboardingState, { status: "open" }>;
-
-const ThemedCheck = withUnistyles(Check);
-const accentForegroundMapping = (theme: Theme) => ({ color: theme.colors.accentForeground });
-
-export function OnboardingModal({ model, state }: { model: OnboardingModel; state: OpenState }) {
-  const { t } = useTranslation();
-  const isCompact = useIsCompactFormFactor();
-  const step = state.steps[state.stepIndex];
-  const isFirst = state.stepIndex === 0;
-  const isLast = state.stepIndex === state.steps.length - 1;
-  // Held here so Continue can add the checked folders; reading history from the first step means
-  // the Projects step rarely waits.
-  const projectSuggestions = useProjectSuggestions(state.serverId);
-  const { addChecked } = projectSuggestions;
-
-  const handleComplete = useCallback(() => {
-    void model.complete();
-  }, [model]);
-  const handleBack = useCallback(() => model.back(), [model]);
-  const { visit } = state;
-  const handleNext = useCallback(() => model.next(visit), [model, visit]);
-  const handleAddSuggestions = useCallback(() => {
-    void (async () => {
-      if (await addChecked()) model.next(visit);
-    })();
-  }, [addChecked, model, visit]);
-  const primary = usePrimaryAction({
-    step,
-    isLast,
-    projectSuggestions,
-    onFinish: handleComplete,
-    onNext: handleNext,
-    onAddSuggestions: handleAddSuggestions,
-  });
-
-  const header = useMemo(
-    () => ({
-      title: t("onboarding.setup.title"),
-      leading: <PaseoLogo size={20} />,
-      subtitle: isCompact ? (
-        <Text style={styles.stepCounter}>
-          {t("onboarding.setup.stepCounter", {
-            current: state.stepIndex + 1,
-            total: state.steps.length,
-          })}
-        </Text>
-      ) : undefined,
-    }),
-    [isCompact, state.stepIndex, state.steps.length, t],
-  );
-
-  const footer = (
-    <>
-      <View>
-        {isLast ? null : (
-          <Button variant="ghost" onPress={handleComplete}>
-            {t("onboarding.setup.skip")}
-          </Button>
-        )}
-      </View>
-      <View style={styles.footerActions}>
-        {isFirst ? null : (
-          <Button variant="secondary" onPress={handleBack}>
-            {t("common.actions.back")}
-          </Button>
-        )}
-        <Button variant="default" onPress={primary.onPress} loading={primary.busy}>
-          {primary.label}
-        </Button>
-      </View>
-    </>
-  );
-
-  return (
-    <AdaptiveModalSheet
-      visible
-      onClose={handleComplete}
-      header={header}
-      footer={footer}
-      scrollable={false}
-      snapPoints={FULL_SHEET_SNAP_POINTS}
-      desktopMaxWidth={880}
-      desktopHeight={640}
-      contentStyle={styles.content}
-      testID="onboarding-modal"
-    >
-      <View style={styles.body}>
-        {isCompact ? null : <StepRail state={state} onSelect={model.goTo} />}
-        <ScrollView style={styles.pane}>
-          {/* Padding lives on a wrapper: the ScrollView's contentContainerStyle skips Unistyles. */}
-          <View style={styles.paneContent}>
-            <View style={styles.stepHeader}>
-              <Text style={styles.stepTitle} accessibilityRole="header">
-                {t(`onboarding.setup.steps.${step}.title`)}
-              </Text>
-              <Text style={styles.stepDescription}>
-                {t(`onboarding.setup.steps.${step}.description`)}
-              </Text>
-            </View>
-            <OnboardingStepContent
-              step={step}
-              serverId={state.serverId}
-              projectSuggestions={projectSuggestions}
-              onFinish={handleComplete}
-            />
-          </View>
-        </ScrollView>
-      </View>
-    </AdaptiveModalSheet>
-  );
-}
-
-/**
- * The footer's main button. On Projects, with folders checked, it adds them and moves on only once
- * every one was added; otherwise it continues, or finishes on the last step.
- */
-function usePrimaryAction(input: {
-  step: OnboardingStepId;
-  isLast: boolean;
-  projectSuggestions: ProjectSuggestionsController;
-  onFinish: () => void;
-  onNext: () => void;
-  onAddSuggestions: () => void;
-}): { label: string; busy: boolean; onPress: () => void } {
-  const { t } = useTranslation();
-  const { step, isLast, projectSuggestions, onFinish, onNext, onAddSuggestions } = input;
-  const { checkedCount, isAdding } = projectSuggestions;
-  if (isLast) {
-    return { label: t("onboarding.setup.finish"), busy: false, onPress: onFinish };
-  }
-  // Rows leave the list as they are added, so the count can reach zero while adding.
-  if (step === "projects" && (isAdding || checkedCount > 0)) {
-    return {
-      label: isAdding
-        ? t("onboarding.setup.steps.projects.suggestions.adding")
-        : t("onboarding.setup.steps.projects.suggestions.addSelected", { count: checkedCount }),
-      busy: isAdding,
-      onPress: onAddSuggestions,
-    };
-  }
-  return { label: t("onboarding.setup.continue"), busy: false, onPress: onNext };
-}
-
-function StepRail({
-  state,
-  onSelect,
-}: {
-  state: OpenState;
-  onSelect: (step: OnboardingStepId) => void;
-}) {
-  const { t } = useTranslation();
-  return (
-    <View style={styles.rail}>
-      <View style={styles.railSteps}>
-        {state.steps.map((step, index) => (
-          <StepRailItem
-            key={step}
-            step={step}
-            number={index + 1}
-            current={index === state.stepIndex}
-            done={index < state.stepIndex}
-            onSelect={onSelect}
-          />
-        ))}
-      </View>
-      <Text style={styles.railFootnote}>{t("onboarding.setup.footnote")}</Text>
-    </View>
-  );
-}
-
-function StepRailItem({
-  step,
-  number,
-  current,
-  done,
-  onSelect,
-}: {
-  step: OnboardingStepId;
-  number: number;
-  current: boolean;
-  done: boolean;
-  onSelect: (step: OnboardingStepId) => void;
-}) {
-  const { t } = useTranslation();
-  const label = t(`onboarding.setup.steps.${step}.label`);
-  const handlePress = useCallback(() => onSelect(step), [onSelect, step]);
-  const accessibilityState = useMemo(() => ({ selected: current }), [current]);
-  const itemStyle = useCallback(
-    ({ hovered }: PressableStateCallbackType & { hovered?: boolean }) => [
-      styles.railItem,
-      hovered && !current && styles.railItemHovered,
-      current && styles.railItemCurrent,
-    ],
-    [current],
-  );
-  return (
-    <PressHighlight
-      style={itemStyle}
-      onPress={handlePress}
-      accessibilityRole="tab"
-      accessibilityLabel={label}
-      accessibilityState={accessibilityState}
-      aria-selected={current}
-    >
-      <View style={done || current ? styles.railBadgeActive : styles.railBadge}>
-        {done ? (
-          <ThemedCheck size={12} strokeWidth={3} uniProps={accentForegroundMapping} />
-        ) : (
-          <Text style={current ? styles.railBadgeTextActive : styles.railBadgeText}>{number}</Text>
-        )}
-      </View>
-      <Text style={current ? styles.railLabelCurrent : styles.railLabel} numberOfLines={1}>
-        {label}
-      </Text>
-    </PressHighlight>
-  );
-}
-
-const BADGE_SIZE = 20;
-
-const styles = StyleSheet.create((theme) => ({
-  content: {
-    padding: 0,
-    gap: 0,
-  },
-  body: {
-    flex: 1,
-    minHeight: 0,
-    flexDirection: "row",
-  },
-  rail: {
-    width: 200,
-    padding: theme.spacing[3],
-    justifyContent: "space-between",
-    borderRightWidth: theme.borderWidth[1],
-    borderRightColor: theme.colors.surface2,
-    backgroundColor: theme.colors.surface1,
-  },
-  railSteps: {
-    gap: theme.spacing[1],
-  },
-  railItem: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    paddingHorizontal: theme.spacing[2],
-    paddingVertical: theme.spacing[2],
-    borderRadius: theme.borderRadius.md,
-  },
-  railItemHovered: {
-    backgroundColor: theme.colors.surface2,
-  },
-  railItemCurrent: {
-    backgroundColor: theme.colors.surface2,
-  },
-  railBadge: {
-    width: BADGE_SIZE,
-    height: BADGE_SIZE,
-    borderRadius: BADGE_SIZE / 2,
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
-    alignItems: "center",
-    justifyContent: "center",
-  },
-  railBadgeActive: {
-    width: BADGE_SIZE,
-    height: BADGE_SIZE,
-    borderRadius: BADGE_SIZE / 2,
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.accent,
-    backgroundColor: theme.colors.accent,
-    alignItems: "center",
-    justifyContent: "center",
-  },
-  railBadgeText: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  railBadgeTextActive: {
-    color: theme.colors.accentForeground,
-    fontSize: theme.fontSize.sm,
-  },
-  railLabel: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  railLabelCurrent: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.medium,
-  },
-  railFootnote: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-    paddingHorizontal: theme.spacing[2],
-  },
-  pane: {
-    flex: 1,
-    minHeight: 0,
-  },
-  paneContent: {
-    padding: theme.spacing[6],
-    gap: theme.spacing[6],
-  },
-  stepHeader: {
-    gap: theme.spacing[2],
-  },
-  stepTitle: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.xl,
-    fontWeight: theme.fontWeight.medium,
-  },
-  stepDescription: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
-    lineHeight: theme.fontSize.base * 1.5,
-  },
-  stepCounter: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  footerActions: {
-    flexDirection: "row",
-    gap: theme.spacing[2],
-  },
-}));

packages/app/src/onboarding/internal/steps/appearance-step.tsx

@@ -1,5 +0,0 @@
-import { ThemePicker } from "@/appearance/theme-picker";
-
-export function AppearanceStep() {
-  return <ThemePicker />;
-}

packages/app/src/onboarding/internal/steps/index.tsx

@@ -1,32 +0,0 @@
-import type { ProjectSuggestionsController } from "@/project-suggestions";
-import type { OnboardingStepId } from "../model";
-import { AppearanceStep } from "./appearance-step";
-import { OrchestrationStep } from "./orchestration-step";
-import { PhoneStep } from "./phone-step";
-import { ProjectsStep } from "./projects-step";
-import { ProvidersStep } from "./providers-step";
-
-export function OnboardingStepContent({
-  step,
-  serverId,
-  projectSuggestions,
-  onFinish,
-}: {
-  step: OnboardingStepId;
-  serverId: string;
-  projectSuggestions: ProjectSuggestionsController;
-  onFinish: () => void;
-}) {
-  switch (step) {
-    case "appearance":
-      return <AppearanceStep />;
-    case "providers":
-      return <ProvidersStep serverId={serverId} />;
-    case "projects":
-      return <ProjectsStep serverId={serverId} suggestions={projectSuggestions} />;
-    case "orchestration":
-      return <OrchestrationStep serverId={serverId} />;
-    case "phone":
-      return <PhoneStep serverId={serverId} onFinish={onFinish} />;
-  }
-}

packages/app/src/onboarding/internal/steps/orchestration-step.tsx

@@ -1,86 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { Text, View } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { CalendarClock, GitBranch, SquareTerminal, Users } from "lucide-react-native";
-import { PaseoToolsCard } from "@/screens/settings/paseo-tools-card";
-import type { Theme } from "@/styles/theme";
-
-const ThemedUsers = withUnistyles(Users);
-type ThemedIcon = typeof ThemedUsers;
-
-const CAPABILITIES: ReadonlyArray<{
-  key: "agents" | "workspaces" | "schedules" | "terminals";
-  icon: ThemedIcon;
-}> = [
-  { key: "agents", icon: ThemedUsers },
-  { key: "workspaces", icon: withUnistyles(GitBranch) },
-  { key: "schedules", icon: withUnistyles(CalendarClock) },
-  { key: "terminals", icon: withUnistyles(SquareTerminal) },
-];
-
-const mutedMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-
-export function OrchestrationStep({ serverId }: { serverId: string }) {
-  const { t } = useTranslation();
-  return (
-    <View style={styles.container}>
-      <View style={styles.capabilities}>
-        {CAPABILITIES.map(({ key, icon }) => (
-          <Capability
-            key={key}
-            icon={icon}
-            title={t(`onboarding.setup.steps.orchestration.capabilities.${key}.title`)}
-            description={t(`onboarding.setup.steps.orchestration.capabilities.${key}.description`)}
-          />
-        ))}
-      </View>
-      <PaseoToolsCard serverId={serverId} />
-    </View>
-  );
-}
-
-function Capability({
-  icon: Icon,
-  title,
-  description,
-}: {
-  icon: ThemedIcon;
-  title: string;
-  description: string;
-}) {
-  return (
-    <View style={styles.capability}>
-      <Icon size={16} uniProps={mutedMapping} />
-      <View style={styles.capabilityText}>
-        <Text style={styles.capabilityTitle}>{title}</Text>
-        <Text style={styles.capabilityDescription}>{description}</Text>
-      </View>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  container: {
-    gap: theme.spacing[6],
-  },
-  capabilities: {
-    gap: theme.spacing[4],
-  },
-  capability: {
-    flexDirection: "row",
-    gap: theme.spacing[3],
-  },
-  capabilityText: {
-    flex: 1,
-    gap: theme.spacing[1],
-  },
-  capabilityTitle: {
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-  },
-  capabilityDescription: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-    lineHeight: theme.fontSize.sm * 1.5,
-  },
-}));

packages/app/src/onboarding/internal/steps/phone-step.tsx

@@ -1,45 +0,0 @@
-import { useCallback } from "react";
-import { useTranslation } from "react-i18next";
-import { View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { Button } from "@/components/ui/button";
-import { PairDeviceSection } from "@/desktop/components/pair-device-section";
-import { openExternalUrl } from "@/utils/open-external-url";
-
-const APP_STORE_URL = "https://apps.apple.com/app/paseo-pocket-engineer/id6758887924";
-const PLAY_STORE_URL = "https://play.google.com/store/apps/details?id=sh.paseo";
-
-export function PhoneStep({ serverId, onFinish }: { serverId: string; onFinish: () => void }) {
-  const { t } = useTranslation();
-  const openAppStore = useCallback(() => {
-    void openExternalUrl(APP_STORE_URL).catch(console.error);
-  }, []);
-  const openPlayStore = useCallback(() => {
-    void openExternalUrl(PLAY_STORE_URL).catch(console.error);
-  }, []);
-
-  return (
-    <View style={styles.container}>
-      <View style={styles.storeLinks}>
-        <Button variant="outline" onPress={openAppStore}>
-          {t("onboarding.setup.steps.phone.appStore")}
-        </Button>
-        <Button variant="outline" onPress={openPlayStore}>
-          {t("onboarding.setup.steps.phone.googlePlay")}
-        </Button>
-      </View>
-      <PairDeviceSection serverId={serverId} onClose={onFinish} />
-    </View>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  container: {
-    gap: theme.spacing[6],
-  },
-  storeLinks: {
-    flexDirection: "row",
-    flexWrap: "wrap",
-    gap: theme.spacing[2],
-  },
-}));

packages/app/src/onboarding/internal/steps/projects-step.tsx

@@ -1,89 +0,0 @@
-import { useCallback } from "react";
-import { useTranslation } from "react-i18next";
-import { Text, View } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { Check, FolderPlus } from "lucide-react-native";
-import { Button } from "@/components/ui/button";
-import { useOpenAddProject } from "@/hooks/use-open-add-project";
-import { ProjectSuggestionList, type ProjectSuggestionsController } from "@/project-suggestions";
-import { useProjectRootPaths } from "@/stores/session-store-hooks";
-import { settingsStyles } from "@/styles/settings";
-import type { Theme } from "@/styles/theme";
-
-const ThemedCheck = withUnistyles(Check);
-const successMapping = (theme: Theme) => ({ color: theme.colors.palette.green[400] });
-
-function basename(path: string): string {
-  const segments = path.split(/[\\/]/).filter((segment) => segment.length > 0);
-  return segments.at(-1) ?? path;
-}
-
-/** Adding the checked suggestions is the setup's primary action; see the modal footer. */
-export function ProjectsStep({
-  serverId,
-  suggestions,
-}: {
-  serverId: string;
-  suggestions: ProjectSuggestionsController;
-}) {
-  const { t } = useTranslation();
-  const openAddProject = useOpenAddProject();
-  const projectRootPaths = useProjectRootPaths(serverId);
-  const handleAddProject = useCallback(() => openAddProject(serverId), [openAddProject, serverId]);
-
-  return (
-    <View style={styles.container}>
-      <ProjectSuggestionList suggestions={suggestions} />
-      {projectRootPaths.length > 0 ? (
-        <View style={settingsStyles.card}>
-          {projectRootPaths.map((rootPath, index) => (
-            <View
-              key={rootPath}
-              style={[settingsStyles.row, index > 0 && settingsStyles.rowBorder]}
-            >
-              <View style={settingsStyles.rowContent}>
-                <Text style={settingsStyles.rowTitle} numberOfLines={1}>
-                  {basename(rootPath)}
-                </Text>
-                <Text style={settingsStyles.rowHint} numberOfLines={1}>
-                  {rootPath}
-                </Text>
-              </View>
-              <View style={styles.addedBadge}>
-                <ThemedCheck size={14} uniProps={successMapping} />
-                <Text style={styles.addedLabel}>{t("onboarding.setup.steps.projects.added")}</Text>
-              </View>
-            </View>
-          ))}
-        </View>
-      ) : null}
-      <View style={styles.actions}>
-        <Button variant="outline" leftIcon={FolderPlus} onPress={handleAddProject}>
-          {suggestions.list.status === "ready" && suggestions.list.rows.length > 0
-            ? t("onboarding.setup.steps.projects.addAnotherProject")
-            : t("onboarding.setup.steps.projects.addProject")}
-        </Button>
-      </View>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  container: {
-    gap: theme.spacing[4],
-  },
-  actions: {
-    flexDirection: "row",
-    flexWrap: "wrap",
-    gap: theme.spacing[2],
-  },
-  addedBadge: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1],
-  },
-  addedLabel: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-}));

packages/app/src/onboarding/internal/steps/providers-step.tsx

@@ -1,10 +0,0 @@
-import { View } from "react-native";
-import { ProvidersSection } from "@/screens/settings/providers-section";
-
-export function ProvidersStep({ serverId }: { serverId: string }) {
-  return (
-    <View>
-      <ProvidersSection serverId={serverId} />
-    </View>
-  );
-}

packages/app/src/onboarding/internal/use-setup-host.ts

@@ -1,14 +0,0 @@
-import { useLocalDaemonServerIdState } from "@/hooks/use-is-local-daemon";
-import { useHosts } from "@/runtime/host-runtime";
-
-/**
- * The host setup configures: the desktop's built-in daemon, otherwise the first saved host.
- * Null while the desktop daemon is still reporting its id, or when there is no host at all.
- */
-export function useSetupHostServerId(): string | null {
-  const localDaemon = useLocalDaemonServerIdState();
-  const hosts = useHosts();
-  if (localDaemon.status === "loading") return null;
-  if (localDaemon.status === "resolved" && localDaemon.serverId) return localDaemon.serverId;
-  return hosts[0]?.serverId ?? null;
-}

packages/app/src/onboarding/onboarding-host.tsx

@@ -1,40 +0,0 @@
-import { useEffect, useSyncExternalStore } from "react";
-import { useIsCompactFormFactor } from "@/constants/layout";
-import { isNative } from "@/constants/platform";
-import { useDirectoryDemand } from "@/hooks/use-directory-demand";
-import { useHostRuntimeIsConnected } from "@/runtime/host-runtime";
-import { useHasHydratedWorkspaces, useProjectRootPaths } from "@/stores/session-store-hooks";
-import { getOnboardingModel } from "./internal/onboarding-instance";
-import { OnboardingModal } from "./internal/onboarding-modal";
-import { useSetupHostServerId } from "./internal/use-setup-host";
-
-/** Mounted once by the app shell. Decides whether setup opens, then owns the modal. */
-export function OnboardingHost() {
-  // Native phones are set up from a desktop; setup never opens there.
-  if (isNative) return null;
-  return <OnboardingGate />;
-}
-
-function OnboardingGate() {
-  const model = getOnboardingModel();
-  const state = useSyncExternalStore(model.subscribe, model.getState, model.getState);
-  const serverId = useSetupHostServerId();
-  const isConnected = useHostRuntimeIsConnected(serverId ?? "");
-  const hasHydratedWorkspaces = useHasHydratedWorkspaces(serverId);
-  const projectRootPaths = useProjectRootPaths(serverId);
-  const isCompact = useIsCompactFormFactor();
-  const hasProjects = projectRootPaths.length > 0;
-
-  // Without demand nothing may ask a fresh host for its workspaces, and the gate would wait forever.
-  useDirectoryDemand(state.status === "hidden" ? null : serverId);
-
-  useEffect(() => {
-    model.applySetupHost(
-      serverId ? { serverId, isConnected, hasHydratedWorkspaces, hasProjects } : null,
-      { includePhoneStep: !isCompact },
-    );
-  }, [model, serverId, isConnected, hasHydratedWorkspaces, hasProjects, isCompact]);
-
-  if (state.status !== "open") return null;
-  return <OnboardingModal model={model} state={state} />;
-}

packages/app/src/onboarding/use-open-onboarding.ts

@@ -1,15 +0,0 @@
-import { useCallback } from "react";
-import { useIsCompactFormFactor } from "@/constants/layout";
-import { getOnboardingModel } from "./internal/onboarding-instance";
-import { useSetupHostServerId } from "./internal/use-setup-host";
-
-/** Reopens setup on its first step. Null when there is no host to set up. */
-export function useOpenOnboarding(): (() => void) | null {
-  const serverId = useSetupHostServerId();
-  const isCompact = useIsCompactFormFactor();
-  const open = useCallback(() => {
-    if (!serverId) return;
-    getOnboardingModel().reopen(serverId, { includePhoneStep: !isCompact });
-  }, [isCompact, serverId]);
-  return serverId ? open : null;
-}

packages/app/src/panels/agent-panel.tsx

@@ -28,6 +28,7 @@ import { FileDropZone } from "@/components/file-drop/file-drop-zone";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { RetainedChatContent } from "./retained-chat-content";
 import { Composer } from "@/composer";
+import { AgentCommandsProvider } from "@/agent-commands";
 import {
   useComposerEditingSession,
   useComposerFullscreen,
@@ -1255,7 +1256,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
     </ChatSurface>
   );
 
-  return (
+  const content = (
     <RewindComposerRestoreProvider
       textSource={agentInputDraft.textSource}
       setText={agentInputDraft.replaceText}
@@ -1274,8 +1275,40 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
       </View>
     </RewindComposerRestoreProvider>
   );
+  return wrapAgentCommandProvider({
+    enabled: showsComposer && hasActiveComposer,
+    serverId,
+    agentId,
+    editingSession: composerEditingSession,
+    children: content,
+  });
 });
 
+function wrapAgentCommandProvider({
+  enabled,
+  serverId,
+  agentId,
+  editingSession,
+  children,
+}: {
+  enabled: boolean;
+  serverId: string;
+  agentId: string;
+  editingSession: ComposerEditingSession;
+  children: ReactNode;
+}) {
+  return (
+    <AgentCommandsProvider
+      serverId={serverId}
+      agentId={agentId}
+      editingSession={editingSession}
+      enabled={enabled}
+    >
+      {children}
+    </AgentCommandsProvider>
+  );
+}
+
 function ChatSurface({
   children,
   disabled,