test(terminal): make runtime copy fixture independent of umask

Set the source helper permissions after creation so the copy test measures preservation instead of inheriting the shell file-creation mask. The existing test fails under umask 077 without this setup correction. Fixes #8175
test(server): verify peer messages preserve answerable questions
2026-11-01 14:12:51 +00:00 · 2026-11-01 08:24:24 +00:00 · 2026-11-01 08:18:30 +00:00 · 2026-10-31 18:42:08 -04:00
86 changed files with 1791 additions and 3676 deletions
@@ -1,81 +1,15 @@
 # Changelog

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

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

-Mobile terminals have native rendering and draggable text-selection handles. Reconnecting restores up to 10,000 lines of terminal history.
+- 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))

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

-### 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
+- 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))

 ## 0.14.0 - 2026-10-29

@@ -1,81 +1,15 @@
-# Changelog
+# 更新日志

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

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

-移动端终端采用原生渲染，并提供可拖动的文本选择手柄。重新连接时最多恢复 10,000 行终端历史。
+- 在 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))

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

-### 新增
-
- 点击回复中的已知 Agent 命令，将其插入 Composer 草稿 ([#8371](https://github.com/getpaseo/paseo/pull/8371))
- 复用已运行的 OpenCode v2 服务 ([#7435](https://github.com/getpaseo/paseo/pull/7435)，贡献者：[@mcowger](https://github.com/mcowger))
- 让终端中的程序在 daemon 重启、崩溃和支持的更新过程中继续运行 ([#7644](https://github.com/getpaseo/paseo/pull/7644), [#8155](https://github.com/getpaseo/paseo/pull/8155)，贡献者：[@sebastianarena](https://github.com/sebastianarena))
- 主机重启后，自动在原有会话中恢复被中断的 Agent ([#8127](https://github.com/getpaseo/paseo/pull/8127)，贡献者：[@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 恢复和用量查询设置
+- 新增采用 `subject.operation.position` 命名的 `server.addHook` 和在 setup 及 Agent 之前等待的 `worktree.create.after` 钩子，弃用原有的插件钩子注册方法并保留原有行为 ([#8081](https://github.com/getpaseo/paseo/pull/8081))

 ## 0.14.0 - 2026-10-29

@@ -74,10 +74,7 @@ registrations remain inspectable; a changed destination requires explicit identi

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

 Disposing a routed API releases its observations and session. It does not remove the saved host or
 affect sibling API scopes. Disposing the origin cascades to its derived scopes. Observations restore
@@ -6,25 +6,15 @@ 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. 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.
+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.

-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.
+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.

 `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.

-## 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.
+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.

 ## Ink outside the row

@@ -127,7 +127,7 @@ buildNpmPackage {
        # The Nix output is not a distributable DMG, so leave it unsigned and
        # disable the hardened runtime that requires a matching signature.
        CSC_IDENTITY_AUTO_DISCOVERY=false \
-          npm exec --offline -- electron-builder \
+          ../../node_modules/.bin/electron-builder \
            --config electron-builder.yml \
            --dir \
            --mac \
@@ -1 +1 @@
-sha256-KN/AVZV/o0TleLLpmggSrdJqjFDJ/NJYVHiC54xb4jQ=
+sha256-zFjdXeRpqrjEZk44ZCvEOTnVVGX0ASfDPktYNiWZpsw=
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -38,9 +38,6 @@ import {
  fillDirectHostUri,
  expectDirectHostFormValues,
  expectDirectHostSslEnabled,
-  expectDirectHostSslDisabled,
-  fillDirectHostAddress,
-  toggleDirectHostSsl,
  expectDirectHostUriValue,
  expectDirectHostUriHidden,
  expectDiagnosticsContent,
@@ -287,16 +284,6 @@ 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);
@@ -1,6 +1,5 @@
 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";
@@ -83,8 +82,6 @@ async function fixtureTerminal(size) {
    rows: size.rows,
    allowProposedApi: true,
  });
-  // The app's buffer uses grapheme widths; the expected cells must too.
-  terminal.loadAddon(new UnicodeGraphemesAddon());
  await new Promise((done) =>
    terminal.write(fixtureOutput(size.columns).replaceAll("\n", "\r\n"), done),
  );
@@ -351,24 +351,9 @@ export async function expectDirectHostFormValues(
 }

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

-export async function fillDirectHostAddress(page: Page, host: string, port: string): Promise<void> {
-  await page.getByRole("textbox", { name: "Host", exact: true }).fill(host);
-  await page.getByRole("textbox", { name: "Port", exact: true }).fill(port);
-}
-
-export async function toggleDirectHostSsl(page: Page): Promise<void> {
-  await page.getByRole("checkbox", { name: "Use SSL", exact: true }).click();
-}
-
-export async function expectDirectHostSslDisabled(page: Page): Promise<void> {
-  await expect(page.getByRole("checkbox", { name: "Use SSL", exact: true })).not.toBeChecked();
-  await expect(page.getByTestId("direct-ssl-toggle-checked")).toHaveCount(0);
-}
-
 export async function expectDirectHostUriValue(page: Page, uri: string): Promise<void> {
  await expect(page.getByTestId("direct-host-uri-input")).toHaveValue(uri);
 }
@@ -1,21 +1,21 @@
 [
  {
    "output": "स्ते",
-    "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]
+    "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]
  },
  {
    "output": "क्ष",
-    "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]
+    "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]
  },
  {
    "output": "নক্ষত্র",
-    "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]
+    "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]
  },
  {
    "output": "क्अ",
@@ -31,7 +31,7 @@
  },
  {
    "output": "अ्क",
-    "row": "3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;8,4294638330,0,0;अ्क       ",
+    "row": "2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;8,4294638330,0,0;अ्क      ",
    "clusterStarts": [0, 1, 2, 3, 4, 5, 6, 7],
    "contrastStarts": [0, 2, 3, 4, 5, 6, 7]
  }
@@ -1,5 +1,6 @@
 package sh.paseo.terminal

+import android.os.Build
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Paint
@@ -43,6 +44,13 @@ class TerminalRowLayoutTest {
      val output = row.getString("output")
      val (toExpected, toContrast) = difference(drawn, expected) to difference(drawn, contrast)
      Log.i("TerminalRowLayoutTest", "$output expected=$toExpected contrast=$toContrast")
+      // Android 10's platform ICU splits this conjunct. Keep its observed raster baseline
+      // explicit rather than claiming this supported OS passes the modern grapheme corpus.
+      if (Build.VERSION.SDK_INT == 29 && output == "स्ते") {
+        assertTrue("Android 10 unexpectedly matches modern conjunct clustering", toExpected > MATCH_TOLERANCE)
+        assertTrue("Android 10 split-conjunct baseline changed", toContrast <= MATCH_TOLERANCE)
+        continue
+      }
      assertTrue("$output differs from its grapheme clusters by $toExpected", toExpected <= MATCH_TOLERANCE)
      assertTrue("$output also matches the wrong clusters", toContrast > MATCH_TOLERANCE)
    }
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -71,14 +71,13 @@
    "@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.331",
+    "@xterm/addon-image": "^0.10.0-beta.213",
    "@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.329",
-    "@xterm/xterm": "6.1.0-beta.336",
+    "@xterm/addon-webgl": "0.20.0-beta.291",
+    "@xterm/xterm": "6.1.0-beta.292",
    "buffer": "^6.0.3",
    "expo": "~57.0.30",
    "expo-asset": "~57.0.20",
@@ -156,7 +155,7 @@
    "@vitest/browser": "^4.1.7",
    "@vitest/browser-playwright": "^4.1.7",
    "@xterm/addon-serialize": "0.14.0",
-    "@xterm/headless": "6.1.0-beta.334",
+    "@xterm/headless": "^6.1.0-beta.213",
    "babel-preset-expo": "~57.0.16",
    "dotenv": "^17.2.3",
    "eas-cli": "^16.24.1",
@@ -476,7 +476,6 @@ 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}>
@@ -12,7 +12,6 @@ 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";

@@ -33,7 +32,6 @@ export interface TerminalEmulatorProps {
  ref: Ref<TerminalEmulatorHandle>;
  streamKey: string;
  supportsTerminalInputModeReplay: boolean;
-  characterWidths: TerminalCharacterWidths;
  testId?: string;
  xtermTheme?: ITheme;
  scrollbackLines: number;
@@ -93,7 +93,6 @@ function NativeTerminalEmulator({
  testId = "terminal-surface",
  xtermTheme = DEFAULT_XTERM_THEME,
  scrollbackLines,
-  characterWidths,
  fontFamily,
  fontSize,
  keyboardInset = 0,
@@ -374,7 +373,6 @@ function NativeTerminalEmulator({
      rows: size.rows,
      cols: size.cols,
      scrollbackLines,
-      characterWidths,
    });
    terminalRef.current = terminal;
    screenModelRef.current = createNativeTerminalScreenModel({ terminal });
@@ -389,7 +387,6 @@ function NativeTerminalEmulator({
    resetInputModeTracker,
    resolveTerminalScreen,
    scrollbackLines,
-    characterWidths,
    clearSelection,
  ]);

@@ -27,7 +27,6 @@ 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,
@@ -97,7 +96,6 @@ interface TerminalEmulatorProps {
  ref: Ref<TerminalEmulatorHandle>;
  streamKey: string;
  supportsTerminalInputModeReplay: boolean;
-  characterWidths: TerminalCharacterWidths;
  testId?: string;
  xtermTheme?: ITheme;
  scrollbackLines: number;
@@ -156,7 +154,6 @@ export default function TerminalEmulator({
    cursor: "#e6e6e6",
  },
  scrollbackLines,
-  characterWidths,
  fontFamily,
  fontSize,
  swipeGesturesEnabled = false,
@@ -186,8 +183,6 @@ 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]);
@@ -320,10 +315,6 @@ 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) {
@@ -456,7 +447,6 @@ export default function TerminalEmulator({
      },
    });
    runtime.setPendingModifiers({ pendingModifiers: pendingModifiersRef.current });
-    runtime.setCharacterWidths({ widths: characterWidthsRef.current });
    runtime.mount({
      root,
      host,
@@ -1,6 +1,5 @@
 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";
@@ -305,11 +304,6 @@ 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]);
@@ -1177,7 +1171,6 @@ export function TerminalPane({
            dom={TERMINAL_EMULATOR_DOM_PROPS}
            streamKey={terminalStreamKey}
            supportsTerminalInputModeReplay={supportsTerminalInputModeReplay}
-            characterWidths={characterWidths}
            testId="terminal-surface"
            xtermTheme={xtermTheme}
            scrollbackLines={settings.terminalScrollbackLines}
@@ -16,8 +16,7 @@ import {
  normalizeWorkspaceDescriptor,
  useSessionStore,
 } from "@/stores/session-store";
-import { normalizeAgentSnapshot, projectAgentSnapshot } from "@/utils/agent-snapshots";
-import { deriveProjectPlacementFromCwd } from "@/utils/project-placement";
+import { normalizeAgentSnapshot } from "@/utils/agent-snapshots";
 import { selectWorkspaceDirectoryServerIds } from "@/stores/session-store-hooks/selectors";
 import { useWorkspaceLabels } from "@/workspace-labels";
 import type { DirectoryReplicaMutation } from "@/runtime/replica-cache";
@@ -42,15 +41,12 @@ class FakeDirectoryClient {
  supportsWorkspaceLabels = false;
  listWorkspaceLabelsCalls = 0;
  fetchAgentsCalls = 0;
-  observeAgentsCalls = 0;
  lastAgentOptions: unknown;
  fetchWorkspacesCalls = 0;
-  observeWorkspacesCalls = 0;
  lastWorkspaceOptions: unknown;
  listProjectsCalls = 0;
  lastProjectOptions: unknown;
  projectResult: ProjectListResult | null = null;
-  readonly listSnapshots: Promise<unknown>[] = [];
  private pendingAgentFetch: Promise<AgentFetchResult> | null = null;
  private pendingWorkspaceFetch: Promise<WorkspaceFetchResult> | null = null;
  private pendingProjectFetch: Promise<ProjectListResult> | null = null;
@@ -155,22 +151,15 @@ class FakeDirectoryClient {
  }

  observeAgents(options: Parameters<DaemonClient["observeAgents"]>[0]) {
-    this.observeAgentsCalls += 1;
-    const subscription = subscriptionFixture(
-      this.fetchAgents({ ...options, subscribe: {} }),
-      (receive) => this.on("agent_update", receive),
+    return subscriptionFixture(this.fetchAgents({ ...options, subscribe: {} }), (receive) =>
+      this.on("agent_update", receive),
    );
-    this.listSnapshots.push(subscription.ready);
-    return subscription;
  }

  observeWorkspaces(options: Parameters<DaemonClient["observeWorkspaces"]>[0]) {
-    this.observeWorkspacesCalls += 1;
-    const subscription = subscriptionFixture(this.fetchWorkspaces(options), (receive) =>
+    return subscriptionFixture(this.fetchWorkspaces(options), (receive) =>
      this.on("workspace_update", receive),
    );
-    this.listSnapshots.push(subscription.ready);
-    return subscription;
  }

  observeEvents(events: readonly SessionOutboundMessage["type"][]) {
@@ -603,83 +592,6 @@ describe("DirectorySync session readiness", () => {
    directory.dispose();
  });

-  it.each([
-    ["full", "before"],
-    ["full", "after"],
-    ["route", "before"],
-    ["route", "after"],
-  ] as const)(
-    "restores live directory updates when %s demand returns %s refresh completion",
-    async (demand, timing) => {
-      const serverId = `released-directory-${demand}-${timing}`;
-      const { client, directory } = createDirectory(serverId);
-      const store = useSessionStore.getState();
-      store.initializeSession(serverId, client as unknown as DaemonClient, 1);
-      store.updateSessionServerInfo(serverId, {
-        serverId,
-        hostname: null,
-        version: "test",
-        features: { workspaceMultiplicity: true, projectList: true },
-      });
-      const source = {};
-      function setDemand(demanded: boolean): void {
-        if (demand === "full") directory.setDemand(source, demanded);
-        else directory.setAgentRouteDemand(demanded ? ["agent-1"] : []);
-      }
-      const releaseProjects = client.holdProjectFetch();
-      const projects: ProjectListResult = { requestId: "projects", projects: [] };
-
-      try {
-        setDemand(true);
-        const refresh = directory.refreshDemand();
-        await expect
-          .poll(() => [client.observeAgentsCalls, client.observeWorkspacesCalls])
-          .toEqual([1, 1]);
-
-        await Promise.all(client.listSnapshots);
-        setDemand(false);
-        if (timing === "before") setDemand(true);
-        releaseProjects(projects);
-        await refresh;
-        if (timing === "after") setDemand(true);
-
-        await expect
-          .poll(() => [client.observeAgentsCalls, client.observeWorkspacesCalls])
-          .toEqual([2, 2]);
-        client.emit({
-          type: "agent_update",
-          payload: {
-            kind: "upsert",
-            agent: {
-              ...projectAgentSnapshot(createAgent(serverId, "agent-1")),
-              title: "Live title",
-            },
-            project: deriveProjectPlacementFromCwd("/repo"),
-          },
-        });
-        client.emit({
-          type: "workspace_update",
-          payload: {
-            kind: "upsert",
-            workspace: { ...createWorkspaceEntry("workspace-1"), name: "Live workspace" },
-          },
-        });
-
-        await expect
-          .poll(() => {
-            const session = useSessionStore.getState().sessions[serverId];
-            return [
-              session.agents.get("agent-1")?.title,
-              session.workspaces.get("workspace-1")?.name,
-            ];
-          })
-          .toEqual(["Live title", "Live workspace"]);
-      } finally {
-        directory.dispose();
-      }
-    },
-  );
-
  it("publishes cached directory data before the authoritative request completes", async () => {
    const serverId = "cached-directory";
    serverIds.add(serverId);
@@ -160,7 +160,6 @@ export class DirectorySync {
  private readonly fullDemandSources = new Set<object>();
  private readonly scriptStatusDemand = new Map<object, string>();
  private demandRefresh: Promise<void> | null = null;
-  private subscriptionGeneration = 0;
  private satisfiedDemandSource: DirectorySourceToken | null = null;
  private cursors: DirectoryCheckpoint = {};

@@ -263,7 +262,6 @@ export class DirectorySync {
  }

  private releaseSubscriptions(): void {
-    this.subscriptionGeneration += 1;
    for (const subscription of [
      this.agentSubscription,
      this.workspaceSubscription,
@@ -364,7 +362,6 @@ export class DirectorySync {
    this.observeDirectoryEvents();
    this.observeScriptStatusEvents();
    const source = this.connection.source;
-    const subscriptionGeneration = this.subscriptionGeneration;
    if (
      !force &&
      this.satisfiedDemandSource?.clientGeneration === source.clientGeneration &&
@@ -381,19 +378,17 @@ export class DirectorySync {
          ]).then(() => undefined);
    this.demandRefresh = refresh
      .then(() => {
-        if (this.subscriptionGeneration === subscriptionGeneration) {
-          this.satisfiedDemandSource = source;
-        }
+        this.satisfiedDemandSource = source;
        return undefined;
      })
      .finally(() => {
        this.demandRefresh = null;
        const current = this.connection.source;
-        const sourceChanged =
-          current.clientGeneration !== source.clientGeneration ||
-          current.connectionEpoch !== source.connectionEpoch;
-        const subscriptionsReleased = this.subscriptionGeneration !== subscriptionGeneration;
-        if (this.hasDemand() && (sourceChanged || subscriptionsReleased)) {
+        if (
+          this.hasDemand() &&
+          (current.clientGeneration !== source.clientGeneration ||
+            current.connectionEpoch !== source.connectionEpoch)
+        ) {
          void this.requestDemandRefresh().catch(() => undefined);
        }
      });
@@ -1,9 +0,0 @@
-/**
- * The table a terminal buffer measures characters with.
- *
- * The daemon answers cursor reports and replays the screen from its own buffer,
- * so the app measures with the table the host advertises. `graphemes` gives each
- * emoji cluster one two-column cell. `legacy` is what each renderer used before
- * hosts advertised grapheme widths. See docs/terminal-rendering.md.
- */
-export type TerminalCharacterWidths = "graphemes" | "legacy";
@@ -159,52 +159,4 @@ describe("native headless terminal state", () => {
      { char: "B", width: 1 },
    ]);
  });
-
-  // Apple Color Emoji and Noto Color Emoji are two cells wide. The native
-  // renderer scales a cluster to its column slot, so a one-column emoji
-  // renders at half size. Each emoji cluster must occupy one wide cell.
-  test.each([
-    ["presentation emoji", "😀"],
-    ["thumbs up", "👍"],
-    ["check mark", "✅"],
-    ["VS16 heart", "❤️"],
-    ["skin-tone modifier", "👋🏽"],
-    ["regional-indicator flag", "🇰🇷"],
-    ["ZWJ family", "👨‍👩‍👧"],
-    ["ZWJ technologist", "👩‍💻"],
-  ])("gives a %s cluster one two-column cell", async (_name, cluster) => {
-    const terminal = createNativeHeadlessTerminal({ rows: 2, cols: 12 });
-
-    await terminal.write(`A${cluster}B`);
-    const [row] = terminal.getBufferWindow({ startRow: 0, rowCount: 1 }).rows;
-
-    expect(row.slice(0, 4).map((cell) => ({ char: cell.char, width: cell.width }))).toEqual([
-      { char: "A", width: 1 },
-      { char: cluster, width: 2 },
-      { char: " ", width: 0 },
-      { char: "B", width: 1 },
-    ]);
-    expect(terminal.getViewportState().cursor.col).toBe(4);
-  });
-
-  // A host without grapheme widths answers cursor reports and replays with
-  // xterm's default table. The native buffer matches it so the cursor lands
-  // where the host put it.
-  test("measures with xterm's default table for hosts without grapheme widths", async () => {
-    const terminal = createNativeHeadlessTerminal({
-      rows: 2,
-      cols: 12,
-      characterWidths: "legacy",
-    });
-
-    await terminal.write("A😀B");
-    const [row] = terminal.getBufferWindow({ startRow: 0, rowCount: 1 }).rows;
-
-    expect(row.slice(0, 3).map((cell) => ({ char: cell.char, width: cell.width }))).toEqual([
-      { char: "A", width: 1 },
-      { char: "😀", width: 1 },
-      { char: "B", width: 1 },
-    ]);
-    expect(terminal.getViewportState().cursor.col).toBe(3);
-  });
 });
@@ -1,5 +1,3 @@
-import { UnicodeGraphemesAddon } from "@xterm/addon-unicode-graphemes";
-import type { TerminalCharacterWidths } from "../character-widths";
 import {
  Terminal as HeadlessTerminal,
  type IBufferCell,
@@ -19,8 +17,6 @@ export interface NativeHeadlessTerminalOptions {
  rows: number;
  cols: number;
  scrollbackLines?: number;
-  /** Defaults to `graphemes`, the table current daemons use. */
-  characterWidths?: TerminalCharacterWidths;
 }

 export interface NativeHeadlessTerminal {
@@ -301,12 +297,6 @@ export function createNativeHeadlessTerminal(
    scrollback: options.scrollbackLines ?? 1000,
    allowProposedApi: true,
  });
-  // Grapheme widths give each emoji cluster one two-column cell, the width the
-  // native renderer draws it at. Legacy hosts measure with xterm's default
-  // table, so their cursor reports and replay stay consistent with it.
-  if ((options.characterWidths ?? "graphemes") === "graphemes") {
-    terminal.loadAddon(new UnicodeGraphemesAddon());
-  }
  const decoder = new TextDecoder();
  let coordinateEpoch = 0;
  const coordinateStorage = new Map<object, TerminalCoordinateStorage>();
@@ -90,16 +90,18 @@ describe("native terminal frame", () => {
  test("keeps combining marks and joiners inside the cell xterm assigned them", async () => {
    const { frame } = await frameFor("éx̸ 각 क्ष 👩‍💻");

-    expect(cellLayout(frame.rows[0]).slice(0, 9)).toEqual([
+    expect(cellLayout(frame.rows[0]).slice(0, 11)).toEqual([
      { text: "é", col: 0, span: 1 },
      { text: "x̸", col: 1, span: 1 },
      { text: " ", col: 2, span: 1 },
      { text: "각", col: 3, span: 2 },
      { text: " ", col: 5, span: 1 },
-      { text: "क्ष", col: 6, span: 1 },
-      { text: " ", col: 7, span: 1 },
-      { text: "👩‍💻", col: 8, span: 2 },
-      { text: " ", col: 10, span: 1 },
+      { text: "क्", col: 6, span: 1 },
+      { text: "ष", col: 7, span: 1 },
+      { text: " ", col: 8, span: 1 },
+      { text: "👩‍", col: 9, span: 1 },
+      { text: "💻", col: 10, span: 1 },
+      { text: " ", col: 11, span: 1 },
    ]);
  });

@@ -235,7 +237,7 @@ test("builds native frames after replay commits at captured geometry and the lat
    expect(frame.columns).toBe(50);
    expect(frame.rows).toHaveLength(10);
    expect(frame.rows[0].text.trimEnd()).toBe("LIVE-界🙂");
-    expect(frame.rows[0].styles.slice(0, 4)).toEqual([9, RED, 0, 0]);
+    expect(frame.rows[0].styles.slice(0, 4)).toEqual([8, RED, 0, 0]);
    expect(encodeTerminalFrame(frame).rows[0]).toContain("LIVE-界🙂");
  } finally {
    drain.dispose();
@@ -717,13 +717,11 @@ describe("terminal emulator runtime in a real browser", () => {
    { name: "DA1-zero", bytes: "\x1b[0c" },
    { name: "DA2", bytes: "\x1b[>c" },
    { name: "DA3", bytes: "\x1b[=c" },
-    { name: "XTVERSION", bytes: "\x1b[>q" },
    { name: "DSR-5", bytes: "\x1b[5n" },
    { name: "DSR-6", bytes: "\x1b[6n" },
    { name: "DSR-?6", bytes: "\x1b[?6n" },
    { name: "DECRQM", bytes: "\x1b[1$p" },
    { name: "DECRQM-?", bytes: "\x1b[?1$p" },
-    { name: "DECRQSS", bytes: "\x1bP$qm\x1b\\" },
    { name: "OSC-10-foreground-color", bytes: "\x1b]10;?\x07" },
    { name: "OSC-11-background-color", bytes: "\x1b]11;?\x07" },
    { name: "OSC-12-cursor-color", bytes: "\x1b]12;?\x07" },
@@ -823,67 +821,6 @@ describe("incremental replay lifecycle", () => {
    expect(mounted.inputs).toHaveLength(1);
    expect(mounted.inputs[0]?.startsWith("\x1b]4;1;rgb:")).toBe(true);
  });
-
-  it("measures emoji clusters with the daemon's grapheme widths and copies them intact", async () => {
-    const mounted = createTerminalHost({ width: 720, height: 360 });
-    const text = "A😀B❤️C👋🏽D👨‍👩‍👧E";
-    await new Promise<void>((resolve) =>
-      mounted.runtime.write({ data: terminalOutput(text), onCommitted: resolve }),
-    );
-
-    const terminal = window.__paseoTerminal;
-    if (!terminal) {
-      throw new Error("Expected the browser terminal to be mounted");
-    }
-    const line = terminal.buffer.active.getLine(terminal.buffer.active.cursorY);
-    const cells = Array.from({ length: 13 }, (_, col) => {
-      const cell = line?.getCell(col);
-      return { chars: cell?.getChars(), width: cell?.getWidth() };
-    });
-
-    expect(cells).toEqual([
-      { chars: "A", width: 1 },
-      { chars: "😀", width: 2 },
-      { chars: "", width: 0 },
-      { chars: "B", width: 1 },
-      { chars: "❤️", width: 2 },
-      { chars: "", width: 0 },
-      { chars: "C", width: 1 },
-      { chars: "👋🏽", width: 2 },
-      { chars: "", width: 0 },
-      { chars: "D", width: 1 },
-      { chars: "👨‍👩‍👧", width: 2 },
-      { chars: "", width: 0 },
-      { chars: "E", width: 1 },
-    ]);
-    expect(terminal.buffer.active.cursorX).toBe(13);
-
-    terminal.select(0, terminal.buffer.active.cursorY, 13);
-    expect(terminal.getSelection()).toBe(text);
-  });
-
-  // A host without grapheme widths answers cursor reports and replays with its
-  // own table. The web client keeps the Unicode 11 table it used before.
-  it("measures with the legacy table for hosts without grapheme widths", async () => {
-    const mounted = createTerminalHost({ width: 720, height: 360 });
-    const terminal = window.__paseoTerminal;
-    if (!terminal) {
-      throw new Error("Expected the browser terminal to be mounted");
-    }
-    const buffer = terminal.buffer;
-    async function cursorAfter(text: string): Promise<number> {
-      await new Promise<void>((resolve) =>
-        mounted.runtime.write({ data: terminalOutput(`\r\n${text}`), onCommitted: resolve }),
-      );
-      return buffer.active.cursorX;
-    }
-
-    mounted.runtime.setCharacterWidths({ widths: "legacy" });
-    expect([await cursorAfter("A😀B"), await cursorAfter("A❤️B")]).toEqual([4, 3]);
-
-    mounted.runtime.setCharacterWidths({ widths: "graphemes" });
-    expect([await cursorAfter("A😀B"), await cursorAfter("A❤️B")]).toEqual([4, 4]);
-  });
 });

 it("restores fitted web geometry after replay before live output", async () => {
@@ -36,12 +36,6 @@ vi.mock("@xterm/addon-unicode11", () => ({
  },
 }));

-vi.mock("@xterm/addon-unicode-graphemes", () => ({
-  UnicodeGraphemesAddon: class UnicodeGraphemesAddon {
-    dispose(): void {}
-  },
-}));
-
 vi.mock("@xterm/addon-web-links", () => ({
  WebLinksAddon: class WebLinksAddon {
    dispose(): void {}
@@ -3,12 +3,10 @@ import { FitAddon } from "@xterm/addon-fit";
 import { ImageAddon } from "@xterm/addon-image";
 import { SearchAddon } from "@xterm/addon-search";
 import { Unicode11Addon } from "@xterm/addon-unicode11";
-import { UnicodeGraphemesAddon } from "@xterm/addon-unicode-graphemes";
 import { WebLinksAddon } from "@xterm/addon-web-links";
 import { WebglAddon } from "@xterm/addon-webgl";
 import { LigaturesAddon } from "@xterm/addon-ligatures/lib/addon-ligatures.mjs";
 import { Terminal, type ITheme, type IMarker } from "@xterm/xterm";
-import type { TerminalCharacterWidths } from "../character-widths";
 import {
  type TerminalInputModeState,
  TerminalInputModeTracker,
@@ -234,12 +232,6 @@ function findFileOnlyPaste(transfer: DataTransfer | null): File | null {
  return null;
 }

-// Grapheme widths match the daemon and native buffers. Legacy hosts keep the
-// Unicode 11 table web used before. See docs/terminal-rendering.md.
-function applyCharacterWidths(terminal: Terminal, widths: TerminalCharacterWidths): void {
-  terminal.unicode.activeVersion = widths === "graphemes" ? "15-graphemes" : "11";
-}
-
 export class TerminalEmulatorRuntime {
  constructor(
    private readonly options: FindShortcutPlatform = { isMac: isMacUserAgent() },
@@ -252,7 +244,6 @@ export class TerminalEmulatorRuntime {
    shift: false,
    alt: false,
  };
-  private characterWidths: TerminalCharacterWidths = "graphemes";
  private terminal: Terminal | null = null;
  private fitAddon: FitAddon | null = null;
  private searchAddon: SearchAddon | null = null;
@@ -340,16 +331,6 @@ export class TerminalEmulatorRuntime {
    this.pendingModifiers = input.pendingModifiers;
  }

-  setCharacterWidths(input: { widths: TerminalCharacterWidths }): void {
-    this.characterWidths = input.widths;
-    const terminal = this.terminal;
-    if (!terminal) {
-      return;
-    }
-    applyCharacterWidths(terminal, input.widths);
-    this.refreshVisibleRows();
-  }
-
  private loadSearchAddon(terminal: Terminal): void {
    const searchAddon = new SearchAddon({ highlightLimit: FIND_HIGHLIGHT_LIMIT });
    terminal.loadAddon(searchAddon);
@@ -574,12 +555,11 @@ export class TerminalEmulatorRuntime {
      theme: withOverviewRulerBorderHidden(input.theme),
    });
    const fitAddon = new FitAddon();
+    const unicode11Addon = new Unicode11Addon();
    let webglAddon: WebglAddon | null = null;
    let imageAddon: ImageAddon | null = null;
    terminal.loadAddon(fitAddon);
-    terminal.loadAddon(new Unicode11Addon());
-    terminal.loadAddon(new UnicodeGraphemesAddon());
-    applyCharacterWidths(terminal, this.characterWidths);
+    terminal.loadAddon(unicode11Addon);
    terminal.loadAddon(new WebLinksAddon(openExternalLink));
    const localFileLinkProvider = terminal.registerLinkProvider(
      createTerminalLocalFileLinkProvider(terminal, {
@@ -614,6 +594,11 @@ export class TerminalEmulatorRuntime {
    terminal.open(input.host);
    this.themeBackgroundElements = this.collectThemeBackgroundElements(input);
    this.applyThemeBackground(input.theme);
+    try {
+      terminal.unicode.activeVersion = "11";
+    } catch {
+      // Ignore if unicode API isn't available in this build/runtime.
+    }

    const disposeImageAddon = (): void => {
      try {
@@ -647,7 +632,6 @@ export class TerminalEmulatorRuntime {
      terminal.parser.registerCsiHandler({ final: "c" }, () => true);
      terminal.parser.registerCsiHandler({ prefix: ">", final: "c" }, () => true);
      terminal.parser.registerCsiHandler({ prefix: "=", final: "c" }, () => true);
-      terminal.parser.registerCsiHandler({ prefix: ">", final: "q" }, () => true);
      terminal.parser.registerCsiHandler({ final: "n" }, () => true);
      terminal.parser.registerCsiHandler({ prefix: "?", final: "n" }, () => true);
      terminal.parser.registerCsiHandler({ final: "R" }, () => true);
@@ -656,7 +640,6 @@ export class TerminalEmulatorRuntime {
        { prefix: "?", intermediates: "$", final: "p" },
        () => true,
      );
-      terminal.parser.registerDcsHandler({ intermediates: "$", final: "q" }, () => true);
      for (const code of [10, 11, 12]) {
        terminal.parser.registerOscHandler(code, (data) => data.trim() === "?");
      }
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/cli",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "description": "Paseo CLI - control your AI coding agents from the command line",
  "bin": {
    "paseo": "bin/paseo"
@@ -28,9 +28,9 @@
  },
  "dependencies": {
    "@clack/prompts": "^1.0.0",
-    "@getpaseo/client": "0.15.0-beta.1",
-    "@getpaseo/protocol": "0.15.0-beta.1",
-    "@getpaseo/server": "0.15.0-beta.1",
+    "@getpaseo/client": "0.14.0",
+    "@getpaseo/protocol": "0.14.0",
+    "@getpaseo/server": "0.14.0",
    "chalk": "^5.3.0",
    "commander": "^12.0.0",
    "mime-types": "^2.1.35",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/client",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "description": "Paseo client SDK package",
  "files": [
    "dist",
@@ -47,8 +47,8 @@
    "test": "vitest run"
  },
  "dependencies": {
-    "@getpaseo/protocol": "0.15.0-beta.1",
-    "@getpaseo/relay": "0.15.0-beta.1",
+    "@getpaseo/protocol": "0.14.0",
+    "@getpaseo/relay": "0.14.0",
    "ws": "^8.20.0",
    "zod": "^4.4.3"
  },
@@ -204,16 +204,15 @@ export function createHostTransportFactory(
 }
 export function createHostClient(
  connection: string,
-  config: Omit<DaemonClientConfig, "url"> & HostTransportOptions,
+  config: Omit<DaemonClientConfig, "url" | "transportFactory"> & HostTransportOptions,
  budget?: HostTransportBudget,
 ): DaemonClient {
  const target = parseHostTarget(connection);
-  const { webSocketAgent, transportFactory, ...clientConfig } = config;
+  const { webSocketAgent, ...clientConfig } = config;
  return new DaemonClient({
    ...clientConfig,
    url: "ws://host-connector/ws",
    ...(target.password ? { password: target.password } : {}),
-    transportFactory:
-      transportFactory ?? createHostTransportFactory(connection, budget, { webSocketAgent }),
+    transportFactory: createHostTransportFactory(connection, budget, { webSocketAgent }),
  });
 }
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/desktop",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "private": true,
  "description": "Paseo desktop app (Electron wrapper)",
  "homepage": "https://paseo.sh",
@@ -41,7 +41,7 @@
    "@types/node": "24.6.0",
    "@types/ws": "^8.5.14",
    "electron": "44.2.0",
-    "electron-builder": "26.18.0",
+    "electron-builder": "26.8.1",
    "typescript": "5.9.3",
    "unzip-crx-3": "^0.2.0",
    "vitest": "^4.1.6",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "description": "Native module for two way audio streaming",
  "keywords": [
    "ExpoTwoWayAudio",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/highlight",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "files": [
    "dist",
    "!dist/**/*.map",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/plugin",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "description": "Paseo plugin SDK package",
  "files": [
    "dist",
@@ -77,8 +77,8 @@
    "use-sync-external-store": "^1.6.0"
  },
  "devDependencies": {
-    "@getpaseo/client": "0.15.0-beta.1",
-    "@getpaseo/protocol": "0.15.0-beta.1",
+    "@getpaseo/client": "0.14.0",
+    "@getpaseo/protocol": "0.14.0",
    "@types/node": "^20.9.0",
    "@types/react": "~19.2.0",
    "react": "19.2.3",
@@ -88,8 +88,8 @@
    "zod": "^4.4.3"
  },
  "peerDependencies": {
-    "@getpaseo/client": "0.15.0-beta.1",
-    "@getpaseo/protocol": "0.15.0-beta.1",
+    "@getpaseo/client": "0.14.0",
+    "@getpaseo/protocol": "0.14.0",
    "react": ">=19.1.0 <20",
    "react-native": ">=0.81.5",
    "zod": "^4.4.3"
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/protocol",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "description": "Paseo shared protocol schemas and wire types",
  "files": [
    "dist",
@@ -3751,8 +3751,6 @@ export const ServerInfoStatusPayloadSchema = z
        "terminal-input-mode-replay": z.boolean().optional(),
        // COMPAT(terminalSizeOwnership): added in v0.2.6, remove gate after 2027-02-02.
        "terminal-size-ownership": z.boolean().optional(),
-        // COMPAT(terminalGraphemeWidths): added in v0.15.0, remove gate after 2027-05-01.
-        "terminal-grapheme-widths": z.boolean().optional(),
        // COMPAT(rewind): added in v0.1.X, drop the gate when floor >= v0.1.X.
        rewind: z.boolean().optional(),
        // COMPAT(agentTimelinePromptIndex): added in v0.2.X, drop the gate when floor >= v0.2.X.
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/relay",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "description": "Paseo relay for bridging daemon and client connections",
  "files": [
    "dist",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/server",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "description": "Paseo backend server",
  "files": [
    "dist/server",
@@ -107,18 +107,17 @@
    "@agentclientprotocol/sdk": "^0.17.1",
    "@anthropic-ai/claude-agent-sdk": "0.3.246",
    "@anthropic-ai/sdk": "^0.104.2",
-    "@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",
+    "@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",
    "@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/addon-unicode-graphemes": "0.5.0-beta.330",
-    "@xterm/headless": "6.1.0-beta.334",
+    "@xterm/headless": "^6.0.0",
    "ai": "5.0.78",
    "ajv": "^8.20.0",
    "bcryptjs": "^3.0.3",
@@ -120,7 +120,6 @@ import {
 } from "../provider-launch-config.js";
 import { renderPromptAttachmentAsText } from "../prompt-attachments.js";
 import { appendOrReplaceGrowingAssistantMessage, runProviderTurn } from "./provider-runner.js";
-import { resolveResumeProcessCwd } from "./resume-process-cwd.js";
 import {
  buildStringCommandShellInvocation,
  createStringCommandShellEnvOverlay,
@@ -166,6 +165,18 @@ function rejectOnProcessFailure(child: ChildProcess, stderrChunks: string[]): Pr
  });
 }

+async function isDirectory(target: string): Promise<boolean> {
+  try {
+    return (await fs.stat(target)).isDirectory();
+  } catch (error) {
+    const code = (error as NodeJS.ErrnoException).code;
+    if (code === "ENOENT" || code === "ENOTDIR") {
+      return false;
+    }
+    throw error;
+  }
+}
+
 function isRecord(value: unknown): value is Record<string, unknown> {
  return value != null && typeof value === "object" && !Array.isArray(value);
 }
@@ -2872,8 +2883,11 @@ export class ACPAgentSession implements AgentSession, ACPClient {
  // Loading an archived agent's history runs nothing in its working directory, which
  // may have been removed with its worktree. session/load still names the original
  // directory; only the process starts from the home directory.
-  private resolveProcessCwd(): Promise<string> {
-    return resolveResumeProcessCwd(this.config.cwd, this.resumePurpose);
+  private async resolveProcessCwd(): Promise<string> {
+    if (this.resumePurpose !== "history" || (await isDirectory(this.config.cwd))) {
+      return this.config.cwd;
+    }
+    return homedir();
  }

  private async spawnProcess(): Promise<SpawnedACPProcess> {
@@ -8,7 +8,6 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";

 import { createTestLogger } from "../../../../test-utils/test-logger.js";
 import type { AgentStreamEvent } from "../../agent-sdk-types.js";
-import { streamSession } from "../test-utils/session-stream-adapter.js";
 import { ClaudeAgentClient } from "./agent.js";
 import { claudeProjectDirSync } from "./project-dir.js";

@@ -78,29 +77,6 @@ function sidechainEntry(options: { agentId?: string; stopReason?: string | null
  });
 }

-function buildQueryMock(events: unknown[]) {
-  let index = 0;
-  return {
-    next: vi.fn(async () => {
-      if (index >= events.length) return { done: true, value: undefined };
-      const value = events[index];
-      index += 1;
-      return { done: false, value };
-    }),
-    interrupt: vi.fn(async () => undefined),
-    return: vi.fn(async () => undefined),
-    close: vi.fn(() => undefined),
-    setPermissionMode: vi.fn(async () => undefined),
-    setModel: vi.fn(async () => undefined),
-    supportedModels: vi.fn(async () => []),
-    supportedCommands: vi.fn(async () => []),
-    rewindFiles: vi.fn(async () => ({ canRewind: true })),
-    [Symbol.asyncIterator]() {
-      return this;
-    },
-  };
-}
-
 describe("ClaudeAgentSession persisted subagent replay", () => {
  const logger = createTestLogger();
  const queryFactory = vi.fn(() => {
@@ -1286,106 +1262,4 @@ describe("ClaudeAgentSession persisted subagent replay", () => {
    );
    expect(items).toEqual([{ type: "assistant_message", text: report }]);
  });
-
-  test("keeps a subagent resumed after the session reopens on the row its transcript restored", async () => {
-    // Verified on the wire (Claude Code 2.1.309): SendMessage resumes a finished subagent under its
-    // original task_id but a new tool_use_id, and the child's frames still name the original Task
-    // call as their parent. A reopened session only knows that child from its transcript.
-    writeSession({
-      parentLines: [taskToolUse(), taskToolResult()],
-      meta: JSON.stringify({ agentType: "general-purpose", toolUseId: TOOL_USE_ID }),
-      sidechainLines: [
-        JSON.stringify({
-          type: "assistant",
-          isSidechain: true,
-          agentId: AGENT_ID,
-          sessionId: "replay-session",
-          timestamp: "2026-07-26T06:27:50.000Z",
-          effort: "high",
-          message: {
-            role: "assistant",
-            model: "claude-sonnet-5",
-            content: [{ type: "text", text: "summary of the docs" }],
-            stop_reason: "end_turn",
-          },
-        }),
-      ],
-    });
-    const liveQuery = vi.fn(() =>
-      buildQueryMock([
-        {
-          type: "system",
-          subtype: "init",
-          session_id: "replay-session",
-          permissionMode: "default",
-        },
-        {
-          type: "system",
-          subtype: "task_started",
-          task_id: AGENT_ID,
-          tool_use_id: "toolu_send_message",
-          description: "Summarize the docs",
-          subagent_type: "general-purpose",
-          task_type: "local_agent",
-          is_backgrounded: true,
-          prompt: "Summarize them again",
-        },
-        {
-          type: "assistant",
-          parent_tool_use_id: TOOL_USE_ID,
-          session_id: "replay-session",
-          message: {
-            id: "msg_resumed_child",
-            role: "assistant",
-            model: "claude-opus-5",
-            content: [{ type: "text", text: "summary again" }],
-          },
-        },
-        {
-          type: "system",
-          subtype: "task_updated",
-          task_id: AGENT_ID,
-          patch: { status: "completed" },
-        },
-        {
-          type: "result",
-          subtype: "success",
-          usage: { input_tokens: 1, cache_read_input_tokens: 0, output_tokens: 1 },
-          total_cost_usd: 0,
-        },
-      ]),
-    );
-    const session = await new ClaudeAgentClient({
-      logger,
-      queryFactory: liveQuery,
-      resolveVersion: async () => "2.1.309",
-      resolveBinary: async () => "/test/claude/bin",
-    }).resumeSession({ provider: "claude", sessionId: "replay-session" }, { cwd });
-    const events: AgentStreamEvent[] = [];
-    for await (const event of streamSession(session, "Ask it to summarize again")) {
-      events.push(event);
-      if (event.type === "turn_completed" || event.type === "turn_failed") break;
-    }
-    await session.close();
-
-    const live = events.flatMap((event) =>
-      event.type === "provider_subagent" ? [event.event] : [],
-    );
-    expect(new Set(live.map((event) => event.id))).toEqual(new Set([TOOL_USE_ID]));
-    expect(live).toContainEqual(
-      expect.objectContaining({
-        type: "upsert",
-        id: TOOL_USE_ID,
-        subtitle: "general-purpose · Opus 5 · High",
-      }),
-    );
-    expect(live).toContainEqual(
-      expect.objectContaining({
-        type: "timeline",
-        id: TOOL_USE_ID,
-        item: expect.objectContaining({ type: "assistant_message", text: "summary again" }),
-      }),
-    );
-    expect(live.at(-1)).toMatchObject({ type: "upsert", id: TOOL_USE_ID, status: "completed" });
-  });
 });
@@ -5455,7 +5455,6 @@ class ClaudeAgentSession implements AgentSession {
        convertEntry: (entry) => this.convertHistoryEntry(entry),
      })),
    ];
-    this.taskProtocolSource.restore(subagentReplay.restored);
    const restoredProviderSubagentIds = new Set(
      observations
        .filter((observation) => observation.kind === "declared")
@@ -156,42 +156,6 @@ describe("ClaudeTaskProtocolSource", () => {
    ]);
  });

-  it("resumes a child a reopened session restored on its original row", () => {
-    const source = new ClaudeTaskProtocolSource();
-    source.restore([
-      {
-        taskId: "a1730a6215e1f5cf6",
-        id: "toolu_original",
-        presentation: { title: "general-purpose", model: "claude-sonnet-5", effort: "high" },
-      },
-    ]);
-
-    // Restored is not running: a canceled turn and an unannounced frame leave it alone.
-    expect(source.cancelRunningForegroundTasks()).toEqual([]);
-    expect(source.resolveSubagentId("toolu_original")).toBeUndefined();
-
-    expect(
-      source.observe(taskStarted({ tool_use_id: "toolu_resumed", prompt: "Resumed prompt" })),
-    ).toEqual([
-      { kind: "status", id: "toolu_original", status: "running" },
-      {
-        kind: "timeline",
-        id: "toolu_original",
-        item: { type: "user_message", text: "Resumed prompt" },
-      },
-    ]);
-    expect(source.resolveSubagentId("toolu_original")).toBe("toolu_original");
-    expect(source.resolveSubagentId("toolu_resumed")).toBe("toolu_original");
-    expect(
-      source.observeSidechainFrame(
-        { type: "assistant", message: { model: "claude-opus-5" } } as unknown as SDKMessage,
-        "toolu_original",
-      ),
-    ).toEqual([
-      { kind: "subtitle", id: "toolu_original", subtitle: "general-purpose · Opus 5 · High" },
-    ]);
-  });
-
  it("declares a distinct task separately", () => {
    const source = new ClaudeTaskProtocolSource();
    source.observe(taskStarted({ task_id: "first", tool_use_id: "toolu_first" }));
@@ -121,16 +121,6 @@ function readString(value: unknown): string | undefined {
  return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
 }

-/**
- * A subagent a reopened session rebuilt from its transcript. Its `taskId` (the transcript's
- * agentId) is the task id Claude announces again when SendMessage resumes the child.
- */
-export interface ClaudeRestoredSubagent {
-  taskId: string;
-  id: string;
-  presentation: ClaudeSubagentPresentationFacts;
-}
-
 export interface ClaudeTaskProtocolSourceInput {
  /**
   * The parent's Task tool input, by tool_use id.
@@ -172,14 +162,6 @@ export class ClaudeTaskProtocolSource {
  private readonly backgroundedIds = new Set<string>();
  /** Last status emitted per subagent, so a redundant announcement is not re-broadcast. */
  private readonly lastStatusById = new Map<string, ProviderSubagentStatus>();
-  /**
-   * Children a reopened session restored from its transcript, by task id. Claude resumes one under
-   * its old task id with a new tool id, while its frames keep the original Task call as parent.
-   * Without this the resume reads as a new task: a second row, and every frame dropped as
-   * undeclared. Held apart from the declared table so a restored child is left alone until
-   * Claude announces it again.
-   */
-  private readonly restoredByTaskId = new Map<string, ClaudeRestoredSubagent>();
  /** Claude facts stay inside the provider boundary; clients receive one compact subtitle. */
  private readonly presentationById = new Map<string, ClaudeSubagentPresentationFacts>();
  private readonly lastSubtitleById = new Map<string, string>();
@@ -264,14 +246,6 @@ export class ClaudeTaskProtocolSource {
    }
  }

-  /** Remember the children a reopened session restored, for Claude to resume by task id. */
-  restore(subagents: Iterable<ClaudeRestoredSubagent>): void {
-    for (const subagent of subagents) {
-      if (this.subagentIdByTaskId.has(subagent.taskId)) continue;
-      this.restoredByTaskId.set(subagent.taskId, subagent);
-    }
-  }
-
  /**
   * Forget the session.
   *
@@ -285,7 +259,6 @@ export class ClaudeTaskProtocolSource {
    this.ownerSubagentIdByToolUseId.clear();
    this.ownerSubagentIdByTaskId.clear();
    this.declaredIds.clear();
-    this.restoredByTaskId.clear();
    this.workflowTaskIds.clear();
    this.lastWorkflowResultByTaskId.clear();
    this.idsWithExistingParentToolCard.clear();
@@ -342,8 +315,7 @@ export class ClaudeTaskProtocolSource {
    if (!id || message.skip_transcript === true || !isProviderSubagentTask(message)) return [];

    this.sawTaskStarted = true;
-    const existingId =
-      this.subagentIdByTaskId.get(message.task_id) ?? this.adoptRestored(message.task_id);
+    const existingId = this.subagentIdByTaskId.get(message.task_id);
    this.recordBackgrounded(existingId ?? id, message.is_backgrounded);
    if (existingId) {
      return this.observeExistingTaskStart(message, id, existingId);
@@ -352,20 +324,6 @@ export class ClaudeTaskProtocolSource {
    return this.observeNewTaskStart(message, id, parentSubagentId);
  }

-  /** Declare a restored child under the id its transcript gave it, with what it already showed. */
-  private adoptRestored(taskId: string): string | undefined {
-    const restored = this.restoredByTaskId.get(taskId);
-    if (!restored) return undefined;
-    this.restoredByTaskId.delete(taskId);
-    this.subagentIdByTaskId.set(taskId, restored.id);
-    this.canonicalIdByToolUseId.set(restored.id, restored.id);
-    this.declaredIds.add(restored.id);
-    this.presentationById.set(restored.id, restored.presentation);
-    const subtitle = buildClaudeSubagentSubtitle(restored.presentation);
-    if (subtitle) this.lastSubtitleById.set(restored.id, subtitle);
-    return restored.id;
-  }
-
  private observeExistingTaskStart(
    message: TaskStartedMessage,
    toolUseId: string,
@@ -85,50 +85,6 @@ describe("parseClaudeSubagentMeta", () => {
 });

 describe("observeReplaySubagents", () => {
-  it("restores a resumed child on its original row after consuming async history", async () => {
-    async function* entries(): AsyncGenerator<ClaudeReplayEntry> {
-      yield { type: "assistant", message: { model: "claude-opus-5" } };
-      yield {
-        type: "assistant",
-        effort: "high",
-        message: { model: "claude-sonnet-5", usage: { input_tokens: 10, output_tokens: 2 } },
-      };
-    }
-    const replay = await observeReplaySubagents({
-      subagents: [{ agentId: AGENT_ID, meta: { toolUseId: TOOL_USE_ID }, entries: entries() }],
-      parent: parentWithTaskCall(),
-      convertEntry: async () => [],
-    });
-    expect(replay.restored).toEqual([
-      {
-        taskId: AGENT_ID,
-        id: TOOL_USE_ID,
-        presentation: {
-          title: "general-purpose",
-          model: "claude-sonnet-5",
-          effort: "high",
-          usage: { totalTokens: 12 },
-        },
-      },
-    ]);
-    const live = new ClaudeTaskProtocolSource();
-    live.restore(replay.restored);
-    expect(
-      live.observe({
-        type: "system",
-        subtype: "task_started",
-        task_id: AGENT_ID,
-        tool_use_id: "resumed-tool",
-        description: "Resume the captured task",
-        task_type: "local_agent",
-        is_backgrounded: true,
-        uuid: "00000000-0000-0000-0000-000000000000",
-        session_id: "reopened-session",
-      }),
-    ).toEqual([{ kind: "status", id: TOOL_USE_ID, status: "running" }]);
-    expect(live.resolveSubagentId("resumed-tool")).toBe(TOOL_USE_ID);
-  });
-
  it("links a subagent to its Task call through meta.toolUseId", async () => {
    const observations = (
      await observeReplaySubagents({
@@ -5,7 +5,6 @@ import { normalizeProviderReplayTimestamp } from "../../../provider-history-time
 import type { ProviderSubagentStatus } from "../../../provider-subagents/store.js";
 import { isClaudeInterruptPlaceholderText } from "../interrupt-placeholder.js";
 import { resolveObservedClaudeModelId } from "../models.js";
-import type { ClaudeRestoredSubagent } from "./live-source.js";
 import type { SubagentObservation } from "./observation.js";
 import { buildClaudeSubagentSubtitle, type ClaudeSubagentUsage } from "./presentation.js";

@@ -247,7 +246,6 @@ async function observeSubagent(
  parent: ClaudeReplayParentFacts,
  convertEntry: (entry: ClaudeReplayEntry) => AgentTimelineItem[] | Promise<AgentTimelineItem[]>,
  toolOwners: Map<string, string>,
-  restored: ClaudeRestoredSubagent[],
  parentSubagentId?: string,
 ): Promise<SubagentObservation[]> {
  const link = resolveParentLink(subagent, parent);
@@ -278,14 +276,13 @@ async function observeSubagent(
  const observations = [
    declareSubagent(subagent, link, toolCall, parentSubagentId, firstTimestamp),
  ];
-  const title = toolCall?.title ?? subagent.meta?.agentType;
-  // The agentId is the task_id Claude resumes this child under, so live can find it again.
-  restored.push({
-    taskId: subagent.agentId,
-    id: link.id,
-    presentation: { ...(title ? { title } : {}), ...runtime, ...(usage ? { usage } : {}) },
-  });
-  const subtitle = observeSubtitle(link, title, runtime, usage, lastTimestamp);
+  const subtitle = observeSubtitle(
+    link,
+    toolCall?.title ?? subagent.meta?.agentType,
+    runtime,
+    usage,
+    lastTimestamp,
+  );
  if (subtitle) observations.push(subtitle);
  for (const observation of timeline) observations.push(observation);
  const terminalStatus = link.status ?? childTerminalStatus;
@@ -340,14 +337,9 @@ export async function observeReplaySubagents(input: {
  subagents: readonly ClaudeReplaySubagentInput[];
  parent: ClaudeReplayParentFacts;
  convertEntry: (entry: ClaudeReplayEntry) => AgentTimelineItem[] | Promise<AgentTimelineItem[]>;
-}): Promise<{
-  observations: SubagentObservation[];
-  toolOwners: ReadonlyMap<string, string>;
-  restored: readonly ClaudeRestoredSubagent[];
-}> {
+}): Promise<{ observations: SubagentObservation[]; toolOwners: ReadonlyMap<string, string> }> {
  const observations: SubagentObservation[] = [];
  const toolOwners = new Map<string, string>();
-  const restored: ClaudeRestoredSubagent[] = [];
  const unresolved = [...input.subagents].sort(
    (left, right) => (left.meta?.spawnDepth ?? 1) - (right.meta?.spawnDepth ?? 1),
  );
@@ -372,7 +364,6 @@ export async function observeReplaySubagents(input: {
        parent,
        input.convertEntry,
        toolOwners,
-        restored,
        ownerId,
      )) {
        observations.push(observation);
@@ -382,7 +373,7 @@ export async function observeReplaySubagents(input: {
      madeProgress = true;
    }
  }
-  return { observations, toolOwners, restored };
+  return { observations, toolOwners };
 }

 function resolveReplayOwner(
@@ -5,13 +5,11 @@ import {
  mkdirSync,
  mkdtempSync,
  openSync,
-  readFileSync,
  readSync,
-  realpathSync,
  rmSync,
  writeFileSync,
 } from "node:fs";
-import { homedir, tmpdir } from "node:os";
+import { tmpdir } from "node:os";
 import path from "node:path";
 import pino from "pino";
 import { setImmediate as waitForImmediate } from "node:timers/promises";
@@ -25,7 +23,6 @@ import {
  PiRpcAgentSession,
  transformPiModels,
 } from "./agent.js";
-import { PiCliRuntime } from "./cli-runtime.js";
 import { FakePi } from "./test-utils/fake-pi.js";
 import { createPiExtensionHost } from "./extensions/index.js";
 import { PiExtensionHost } from "./extensions/host.js";
@@ -2722,7 +2719,6 @@ describe("PiRpcAgentClient", () => {
    const root = mkdtempSync(path.join(tmpdir(), "paseo-pi-import-config-"));
    const cwd = path.join(root, "workspace");
    const sessionsDir = path.join(root, "sessions");
-    mkdirSync(cwd, { recursive: true });
    mkdirSync(sessionsDir, { recursive: true });
    const sessionFile = path.join(sessionsDir, "20260103_session.jsonl");
    writeFileSync(
@@ -3536,320 +3532,6 @@ describe("PiRpcAgentClient", () => {
  });
 });

-describe("PiRpcAgentClient history resume", () => {
-  const BUILTIN_MCP_COMMAND = {
-    name: "mcp",
-    source: "extension",
-    sourceInfo: { path: "builtin:mcp" },
-  } as const;
-  const PASEO_MCP_SERVERS = {
-    paseo: { type: "http", url: "http://127.0.0.1:6767/mcp/agents" },
-  } as const;
-
-  interface ArchivedPiSession {
-    handle: {
-      provider: string;
-      sessionId: string;
-      nativeHandle: string;
-      metadata: { cwd: string; model?: string };
-    };
-    sessionFile: string;
-    header: Record<string, unknown>;
-    body: string;
-    originalBytes: Buffer;
-  }
-
-  function createDeletedFolder(): string {
-    const folder = mkdtempSync(path.join(tmpdir(), "paseo-pi-deleted-cwd-"));
-    rmSync(folder, { recursive: true, force: true });
-    return folder;
-  }
-
-  function createFileWhereFolderWas(): string {
-    const folder = createDeletedFolder();
-    writeFileSync(folder, "not a directory");
-    onTestFinished(() => rmSync(folder, { force: true }));
-    return folder;
-  }
-
-  function createExistingFolder(): string {
-    const folder = mkdtempSync(path.join(tmpdir(), "paseo-pi-existing-cwd-"));
-    onTestFinished(() => rmSync(folder, { recursive: true, force: true }));
-    return folder;
-  }
-
-  function writeArchivedSession(cwd: string, metadata: { model?: string } = {}): ArchivedPiSession {
-    const dir = mkdtempSync(path.join(tmpdir(), "paseo-pi-archived-session-"));
-    onTestFinished(() => rmSync(dir, { recursive: true, force: true }));
-    const sessionFile = path.join(dir, "2026-01-01_pi-session-1.jsonl");
-    const header = {
-      type: "session",
-      version: 3,
-      id: "pi-session-1",
-      timestamp: "2026-01-01T00:00:00.000Z",
-      cwd,
-    };
-    const body = [
-      JSON.stringify({
-        type: "message",
-        id: "entry-1",
-        parentId: null,
-        message: { role: "user", content: "Où est le café ☕ ?" },
-      }),
-      JSON.stringify({
-        type: "message",
-        id: "entry-2",
-        parentId: "entry-1",
-        message: { role: "assistant", content: [{ type: "text", text: "Dans la cuisine." }] },
-      }),
-    ]
-      .map((line) => `${line}\n`)
-      .join("");
-    writeFileSync(sessionFile, `${JSON.stringify(header)}\n${body}`);
-    return {
-      handle: {
-        provider: "pi",
-        sessionId: "pi-session-1",
-        nativeHandle: sessionFile,
-        metadata: { cwd, ...metadata },
-      },
-      sessionFile,
-      header,
-      body,
-      originalBytes: readFileSync(sessionFile),
-    };
-  }
-
-  function readSessionCopy(sessionFile: string): { header: unknown; body: string } {
-    const content = readUtf8File(sessionFile);
-    const headerEnd = content.indexOf("\n");
-    return {
-      header: JSON.parse(content.slice(0, headerEnd)),
-      body: content.slice(headerEnd + 1),
-    };
-  }
-
-  function resumeArchived(
-    client: PiRpcAgentClient,
-    archived: ArchivedPiSession,
-    purpose: "history" | "interactive",
-    overrides: Partial<AgentSessionConfig> = {},
-  ): Promise<AgentSession> {
-    return client.resumeSession(archived.handle, overrides, undefined, { purpose });
-  }
-
-  function writeFakePiProcess(): {
-    command: [string, ...string[]];
-    readLaunches: () => Array<{ cwd: string; session: string | null }>;
-  } {
-    const dir = mkdtempSync(path.join(tmpdir(), "paseo-pi-process-"));
-    onTestFinished(() => rmSync(dir, { recursive: true, force: true }));
-    const scriptPath = path.join(dir, "fake-pi.cjs");
-    const launchesPath = path.join(dir, "launches.jsonl");
-    writeFileSync(
-      scriptPath,
-      `
-const fs = require("node:fs");
-const readline = require("node:readline");
-const [launchesPath, ...piArgs] = process.argv.slice(2);
-const sessionFlag = piArgs.indexOf("--session");
-const sessionFile = sessionFlag === -1 ? null : piArgs[sessionFlag + 1];
-fs.appendFileSync(launchesPath, JSON.stringify({ cwd: process.cwd(), session: sessionFile }) + "\\n");
-if (sessionFile) {
-  const header = JSON.parse(fs.readFileSync(sessionFile, "utf8").split("\\n", 1)[0]);
-  if (header.cwd && !fs.existsSync(header.cwd)) {
-    fs.writeSync(
-      2,
-      "Stored session working directory does not exist: " + header.cwd + "\\nSession file: " + sessionFile + "\\nCurrent working directory: " + process.cwd() + "\\n",
-    );
-    process.exit(1);
-  }
-}
-const models = [
-  { provider: "openrouter", id: "a" },
-  { provider: "openrouter", id: "b" },
-];
-const state = {
-  sessionId: "pi-session-1",
-  sessionFile,
-  model: models[0],
-  thinkingLevel: "medium",
-  isStreaming: false,
-  isCompacting: false,
-  messageCount: 0,
-  pendingMessageCount: 0,
-};
-const commands = [${JSON.stringify(BUILTIN_MCP_COMMAND)}];
-function handle(request) {
-  switch (request.type) {
-    case "get_state":
-      return state;
-    case "get_commands":
-      return { commands };
-    case "get_available_models":
-      return { models };
-    case "set_model":
-      fs.appendFileSync(
-        sessionFile,
-        JSON.stringify({ type: "model_change", id: "model-1", provider: request.provider, modelId: request.modelId }) + "\\n",
-      );
-      state.model = models.find((model) => model.id === request.modelId);
-      return state.model;
-    default:
-      return {};
-  }
-}
-readline.createInterface({ input: process.stdin }).on("line", (line) => {
-  const request = JSON.parse(line);
-  process.stdout.write(
-    JSON.stringify({ id: request.id, type: "response", command: request.type, success: true, data: handle(request) }) + "\\n",
-  );
-});
-`,
-    );
-    return {
-      command: [process.execPath, scriptPath, launchesPath],
-      readLaunches: () =>
-        readUtf8File(launchesPath)
-          .trim()
-          .split("\n")
-          .map((line) => JSON.parse(line) as { cwd: string; session: string | null }),
-    };
-  }
-
-  test.each([
-    ["is gone", createDeletedFolder],
-    ["is now a file", createFileWhereFolderWas],
-  ])(
-    "a history resume of an agent whose folder %s starts Pi from the home directory on a copy of its session",
-    async (_folderState, createFolder) => {
-      const archived = writeArchivedSession(createFolder());
-      const pi = new FakePi();
-
-      const session = await resumeArchived(createClient(pi), archived, "history");
-      onTestFinished(() => session.close());
-
-      expect(pi.recordedLaunches).toHaveLength(1);
-      const launch = pi.recordedLaunches[0]!;
-      expect(launch.cwd).toBe(homedir());
-      expect(launch.session).not.toBe(archived.sessionFile);
-      expect(readSessionCopy(launch.session!)).toEqual({
-        header: { ...archived.header, cwd: homedir() },
-        body: archived.body,
-      });
-    },
-  );
-
-  test("a history resume of an agent whose folder is gone removes its session copy on close and leaves the original unchanged", async () => {
-    const archived = writeArchivedSession(createDeletedFolder());
-    const pi = new FakePi();
-
-    const session = await resumeArchived(createClient(pi), archived, "history");
-    const sessionCopy = pi.recordedLaunches[0]!.session!;
-    expect(existsSync(sessionCopy)).toBe(true);
-    await session.close();
-
-    expect(existsSync(path.dirname(sessionCopy))).toBe(false);
-    expect(readFileSync(archived.sessionFile)).toEqual(archived.originalBytes);
-  });
-
-  test("a history resume of an agent whose folder is gone persists the original session file while Pi reports the copy", async () => {
-    const storedCwd = createDeletedFolder();
-    const archived = writeArchivedSession(storedCwd);
-    const pi = new FakePi();
-
-    const session = await resumeArchived(createClient(pi), archived, "history");
-    onTestFinished(() => session.close());
-    await session.getRuntimeInfo();
-
-    expect(pi.latestSession().state.sessionFile).toBe(pi.recordedLaunches[0]!.session);
-    expect(session.describePersistence()).toMatchObject({
-      nativeHandle: archived.sessionFile,
-      metadata: { cwd: storedCwd },
-    });
-  });
-
-  test("a history resume of an agent whose folder is gone removes its session copy when Pi fails to start", async () => {
-    const archived = writeArchivedSession(createDeletedFolder());
-    const pi = new FakePi();
-    pi.queueSessionSetup((session) => {
-      session.getStateError = new Error("Pi RPC process exited with code 1 and signal null");
-    });
-
-    await expect(resumeArchived(createClient(pi), archived, "history")).rejects.toThrow(
-      "Pi RPC process exited with code 1",
-    );
-
-    expect(pi.recordedLaunches).toHaveLength(1);
-    expect(pi.recordedLaunches[0]!.session).not.toBe(archived.sessionFile);
-    expect(existsSync(path.dirname(pi.recordedLaunches[0]!.session!))).toBe(false);
-  });
-
-  test("a history resume of an agent whose folder is gone checks MCP support from the home directory", async () => {
-    const archived = writeArchivedSession(createDeletedFolder());
-    const pi = new FakePi();
-    pi.queueCommands([BUILTIN_MCP_COMMAND]);
-
-    const session = await resumeArchived(createClient(pi), archived, "history", {
-      mcpServers: PASEO_MCP_SERVERS,
-    });
-    onTestFinished(() => session.close());
-
-    expect(pi.recordedLaunches.map((launch) => launch.cwd)).toEqual([homedir(), homedir()]);
-    expect(session.capabilities.supportsMcpServers).toBe(true);
-  });
-
-  test("an interactive resume of an agent whose folder is gone still fails in its stored folder", async () => {
-    const storedCwd = createDeletedFolder();
-    const archived = writeArchivedSession(storedCwd);
-    const pi = new FakePi();
-
-    await expect(resumeArchived(createClient(pi), archived, "interactive")).rejects.toThrow(
-      `Stored session working directory does not exist: ${storedCwd}`,
-    );
-
-    expect(pi.recordedLaunches).toMatchObject([{ cwd: storedCwd, session: archived.sessionFile }]);
-  });
-
-  test("a history resume of an agent whose folder exists keeps the stored folder and session file", async () => {
-    const storedCwd = createExistingFolder();
-    const archived = writeArchivedSession(storedCwd);
-    const pi = new FakePi();
-
-    const session = await resumeArchived(createClient(pi), archived, "history");
-    onTestFinished(() => session.close());
-
-    expect(pi.recordedLaunches).toMatchObject([{ cwd: storedCwd, session: archived.sessionFile }]);
-  });
-
-  test("a history resume of an agent whose folder is gone opens its session in a real Pi process started from the home directory", async () => {
-    const archived = writeArchivedSession(createDeletedFolder(), { model: "openrouter/b" });
-    const fakePiProcess = writeFakePiProcess();
-    const logger = pino({ level: "silent" });
-    const client = new PiRpcAgentClient({
-      logger,
-      runtime: new PiCliRuntime({ logger, command: fakePiProcess.command }),
-    });
-
-    const session = await resumeArchived(client, archived, "history", {
-      mcpServers: PASEO_MCP_SERVERS,
-    });
-    onTestFinished(() => session.close());
-
-    const launches = fakePiProcess.readLaunches();
-    const home = realpathSync.native(homedir());
-    expect(launches.map((launch) => realpathSync.native(launch.cwd))).toEqual([home, home]);
-    expect(session.capabilities.supportsMcpServers).toBe(true);
-    const sessionCopy = launches[1]!.session!;
-    expect(readUtf8File(sessionCopy)).toContain('"type":"model_change"');
-    expect(session.describePersistence()?.nativeHandle).toBe(archived.sessionFile);
-
-    await session.close();
-    expect(existsSync(path.dirname(sessionCopy))).toBe(false);
-    expect(readFileSync(archived.sessionFile)).toEqual(archived.originalBytes);
-  });
-});
-
 describe("transformPiModels", () => {
  test("normalizes labels that include the upstream provider prefix", () => {
    expect(
@@ -2,7 +2,7 @@ import { mapCustomMessageToToolCall } from "../custom-message.js";
 import { randomUUID } from "node:crypto";
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
-import { basename, join, resolve as resolvePath } from "node:path";
+import { join, resolve as resolvePath } from "node:path";
 import type { Logger } from "pino";
 import stripAnsi from "strip-ansi";
 import { z } from "zod";
@@ -22,7 +22,6 @@ import {
  type AgentPersistenceHandle,
  type AgentPromptInput,
  type AgentProvider,
-  type AgentResumeSessionOptions,
  type AgentRunOptions,
  type AgentRunResult,
  type AgentRuntimeInfo,
@@ -76,13 +75,8 @@ import {
  piExtensionRuntimeBridge,
  type PiExtensionEventOutput,
 } from "./extensions/index.js";
-import { resolveResumeProcessCwd } from "../resume-process-cwd.js";
 import { revertPiConversation } from "./rewind.js";
-import {
-  copyPiSessionFileWithCwd,
-  listPiImportableSessions,
-  readPiImportSessionConfig,
-} from "./session-descriptor.js";
+import { listPiImportableSessions, readPiImportSessionConfig } from "./session-descriptor.js";
 import type { PiRuntime, PiRuntimeSession, PiStartSessionInput } from "./runtime.js";
 import type {
  PiAgentSessionEvent,
@@ -251,7 +245,6 @@ interface PiRpcAgentSessionOptions {
  initialState: PiSessionState;
  capabilities: AgentCapabilityFlags;
  currentModeId?: string | null;
-  persistedSessionFile?: string;
  cleanup?: () => void;
  extensionTimeoutMs?: number;
  logger: Logger;
@@ -499,14 +492,13 @@ function buildResumeConfig(

 function buildResumeStartInput(input: {
  resumeConfig: PiResumeConfig;
-  processCwd: string;
  sessionFile: string;
  launchContext: AgentLaunchContext | undefined;
  mcpConfigFile: PiTempFile | null;
  paseoExtension: PiTempFile | null;
 }): PiStartSessionInput {
  return {
-    cwd: input.processCwd,
+    cwd: input.resumeConfig.cwd,
    env: input.launchContext?.env,
    session: input.sessionFile,
    thinkingOptionId: normalizePiThinkingOption(input.resumeConfig.thinkingOptionId) ?? undefined,
@@ -626,19 +618,6 @@ function createPiMcpConfigFile(
  };
 }

-async function createPiSessionCopy(sessionFile: string, cwd: string): Promise<PiTempFile> {
-  const dir = mkdtempSync(join(tmpdir(), "paseo-pi-session-"));
-  const cleanup = () => rmSync(dir, { recursive: true, force: true });
-  const filePath = join(dir, basename(sessionFile));
-  try {
-    await copyPiSessionFileWithCwd({ sourceFile: sessionFile, targetFile: filePath, cwd });
-  } catch (error) {
-    cleanup();
-    throw error;
-  }
-  return { path: filePath, cleanup };
-}
-
 function createPiPaseoExtensionFile({
  systemPrompt,
  mcpServers = {},
@@ -1253,7 +1232,6 @@ export class PiRpcAgentSession implements AgentSession {
    this.capabilities = options.capabilities;
    this.provider = PI_PROVIDER;
    this.currentModeId = options.currentModeId ?? null;
-    this.persistedSessionFile = options.persistedSessionFile;
    this.cleanup = options.cleanup;
    this.extensionTimeoutMs = options.extensionTimeoutMs ?? DEFAULT_PI_EXTENSION_RESULT_TIMEOUT_MS;
    this.logger = options.logger;
@@ -1284,7 +1262,6 @@ export class PiRpcAgentSession implements AgentSession {

  private readonly runtimeSession: PiRuntimeSession;
  private readonly config: AgentSessionConfig;
-  private readonly persistedSessionFile?: string;
  private readonly cleanup?: () => void;
  private readonly extensionTimeoutMs: number;

@@ -1519,7 +1496,7 @@ export class PiRpcAgentSession implements AgentSession {
    return {
      provider: this.provider,
      sessionId: this.state.sessionId,
-      nativeHandle: this.persistedSessionFile ?? this.state.sessionFile,
+      nativeHandle: this.state.sessionFile,
      metadata: {
        cwd: this.config.cwd,
        ...(this.config.model ? { model: this.config.model } : {}),
@@ -2668,7 +2645,6 @@ export class PiRpcAgentClient implements AgentClient {
    handle: AgentPersistenceHandle,
    overrides?: Partial<AgentSessionConfig>,
    launchContext?: AgentLaunchContext,
-    options?: AgentResumeSessionOptions,
  ): Promise<AgentSession> {
    const sessionFile = handle.nativeHandle;
    if (!sessionFile) {
@@ -2677,7 +2653,6 @@ export class PiRpcAgentClient implements AgentClient {

    const persistenceMetadata = parsePersistenceMetadata(handle.metadata);
    const resumeConfig = buildResumeConfig(persistenceMetadata, overrides, this.provider);
-    const processCwd = await resolveResumeProcessCwd(resumeConfig.cwd, options?.purpose);

    const providerOptions = PiProviderOptionsSchema.parse(
      resumeConfig.config.providerOptions ?? {},
@@ -2688,7 +2663,7 @@ export class PiRpcAgentClient implements AgentClient {
      ...launchContext?.env,
    };
    const mcp = await this.prepareMcpInjection(
-      processCwd,
+      resumeConfig.cwd,
      resumeConfig.config.mcpServers,
      mcpEnv,
      runtime,
@@ -2701,29 +2676,20 @@ export class PiRpcAgentClient implements AgentClient {
      ),
      mcpServers: mcp?.kind === "builtin" ? mcp.servers : undefined,
    });
-    const tempFiles = mcpConfigFile ? [mcpConfigFile, paseoExtension] : [paseoExtension];
-    const cleanupTempFiles = () => {
-      for (const tempFile of tempFiles) tempFile.cleanup();
-    };
-    let sessionCopy: PiTempFile | null = null;
    let runtimeSession: PiRuntimeSession;
    try {
-      if (processCwd !== resumeConfig.cwd) {
-        sessionCopy = await createPiSessionCopy(sessionFile, processCwd);
-        tempFiles.push(sessionCopy);
-      }
      runtimeSession = await runtime.startSession(
        buildResumeStartInput({
          resumeConfig,
-          processCwd,
-          sessionFile: sessionCopy?.path ?? sessionFile,
+          sessionFile,
          launchContext,
          mcpConfigFile,
          paseoExtension,
        }),
      );
    } catch (error) {
-      cleanupTempFiles();
+      mcpConfigFile?.cleanup();
+      paseoExtension?.cleanup();
      throw error;
    }
    try {
@@ -2736,15 +2702,15 @@ export class PiRpcAgentClient implements AgentClient {
        },
        initialState,
        capabilities: capabilitiesForSession(mcp !== null),
-        persistedSessionFile: sessionCopy ? sessionFile : undefined,
-        cleanup: cleanupTempFiles,
+        cleanup: combineCleanup([mcpConfigFile?.cleanup, paseoExtension?.cleanup]),
        extensionTimeoutMs: providerOptions.extensionTimeoutMs,
        logger: this.logger,
        usagePollScheduler: this.usagePollScheduler,
      });
    } catch (error) {
      await runtimeSession.close().catch(() => undefined);
-      cleanupTempFiles();
+      mcpConfigFile?.cleanup();
+      paseoExtension?.cleanup();
      throw error;
    }
  }
@@ -1,13 +1,9 @@
-import { mkdtemp, mkdir, readFile, rm, utimes, writeFile } from "node:fs/promises";
+import { mkdtemp, mkdir, utimes, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { expect, onTestFinished, test } from "vitest";
+import { expect, test } from "vitest";

-import {
-  copyPiSessionFileWithCwd,
-  listPiImportableSessions,
-  readPiImportSessionConfig,
-} from "./session-descriptor.js";
+import { listPiImportableSessions, readPiImportSessionConfig } from "./session-descriptor.js";

 async function writeSession(root: string, lines: unknown[]): Promise<string> {
  const sessionsDir = path.join(root, "sessions", "project");
@@ -220,97 +216,3 @@ test("Pi import config preserves thinking before a later model in large sessions
    thinkingOptionId: "low",
  });
 });
-
-test("a Pi session copy names the new cwd in its header and keeps every later byte", async () => {
-  const root = await mkdtemp(path.join(tmpdir(), "paseo-pi-session-copy-"));
-  onTestFinished(() => rm(root, { recursive: true, force: true }));
-  const header = {
-    type: "session",
-    version: 3,
-    id: "pi-session-1",
-    timestamp: "2026-01-01T00:00:00.000Z",
-    cwd: path.join(root, "removed-worktree"),
-  };
-  const body = Buffer.from(
-    Array.from(
-      { length: 2_000 },
-      (_, index) =>
-        `${JSON.stringify({ type: "message", id: `entry-${index}`, message: { role: "user", content: `café ☕ ${index}` } })}\n`,
-    ).join(""),
-  );
-  expect(body.length).toBeGreaterThan(64 * 1024);
-  const sourceFile = path.join(root, "source.jsonl");
-  const targetFile = path.join(root, "copy.jsonl");
-  await writeFile(sourceFile, Buffer.concat([Buffer.from(`${JSON.stringify(header)}\n`), body]));
-
-  await copyPiSessionFileWithCwd({ sourceFile, targetFile, cwd: "/home/user" });
-
-  const copy = await readFile(targetFile);
-  const headerEnd = copy.indexOf(0x0a);
-  expect(JSON.parse(copy.subarray(0, headerEnd).toString("utf8"))).toEqual({
-    ...header,
-    cwd: "/home/user",
-  });
-  expect(copy.subarray(headerEnd + 1).equals(body)).toBe(true);
-});
-
-test("a Pi session copy refuses a file without a session header", async () => {
-  const root = await mkdtemp(path.join(tmpdir(), "paseo-pi-session-copy-"));
-  onTestFinished(() => rm(root, { recursive: true, force: true }));
-  const sourceFile = path.join(root, "source.jsonl");
-  await writeFile(sourceFile, `${JSON.stringify({ type: "message", id: "entry-1" })}\n`);
-
-  await expect(
-    copyPiSessionFileWithCwd({ sourceFile, targetFile: path.join(root, "copy.jsonl"), cwd: "/" }),
-  ).rejects.toThrow(`Pi session file has no session header: ${sourceFile}`);
-});
-
-const COPY_BODY = [
-  { type: "message", id: "entry-1", message: { role: "user", content: "café ☕" } },
-  { type: "message", id: "entry-2", message: { role: "assistant", content: "Dans la cuisine." } },
-]
-  .map((entry) => `${JSON.stringify(entry)}\n`)
-  .join("");
-
-const COPY_HEADER = {
-  type: "session",
-  version: 3,
-  id: "pi-session-1",
-  timestamp: "2026-01-01T00:00:00.000Z",
-  cwd: "/removed-worktree",
-};
-
-async function copySessionContent(content: string): Promise<Buffer> {
-  const root = await mkdtemp(path.join(tmpdir(), "paseo-pi-session-copy-"));
-  onTestFinished(() => rm(root, { recursive: true, force: true }));
-  const sourceFile = path.join(root, "source.jsonl");
-  const targetFile = path.join(root, "copy.jsonl");
-  await writeFile(sourceFile, content);
-  await copyPiSessionFileWithCwd({ sourceFile, targetFile, cwd: "/home/user" });
-  return readFile(targetFile);
-}
-
-test.each([
-  ["a header line longer than 64 KiB", "", { ...COPY_HEADER, padding: "x".repeat(70 * 1024) }],
-  ["a header with an empty cwd", "", { ...COPY_HEADER, cwd: "" }],
-  ["blank lines before the header", "\n\r\n", COPY_HEADER],
-])("a Pi session copy accepts %s", async (_headerShape, prefix, header) => {
-  const copy = await copySessionContent(`${prefix}${JSON.stringify(header)}\n${COPY_BODY}`);
-
-  const headerEnd = copy.indexOf(0x0a);
-  expect(JSON.parse(copy.subarray(0, headerEnd).toString("utf8"))).toEqual({
-    ...header,
-    cwd: "/home/user",
-  });
-  expect(copy.subarray(headerEnd + 1).equals(Buffer.from(COPY_BODY))).toBe(true);
-});
-
-test("a Pi session copy reports a missing session file", async () => {
-  const root = await mkdtemp(path.join(tmpdir(), "paseo-pi-session-copy-"));
-  onTestFinished(() => rm(root, { recursive: true, force: true }));
-  const sourceFile = path.join(root, "missing.jsonl");
-
-  await expect(
-    copyPiSessionFileWithCwd({ sourceFile, targetFile: path.join(root, "copy.jsonl"), cwd: "/" }),
-  ).rejects.toThrow(`Pi session file is missing: ${sourceFile}`);
-});
@@ -1,8 +1,7 @@
-import { createReadStream, createWriteStream, type Dirent } from "node:fs";
-import { open, readdir, readFile, stat, writeFile } from "node:fs/promises";
+import type { Dirent } from "node:fs";
+import { open, readdir, readFile, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import path from "node:path";
-import { pipeline } from "node:stream/promises";

 import type {
  ImportableProviderSession,
@@ -19,7 +18,6 @@ const PI_SESSION_DIR_ENV = "PI_CODING_AGENT_SESSION_DIR";
 const HEAD_BYTES = 64 * 1024;
 const TAIL_BYTES = 256 * 1024;
 const FULL_SCAN_LINE_LIMIT = 2_000;
-const PI_SESSION_HEADER_SCAN_BYTES = 1024 * 1024;
 // Rank all discovered files cheaply, then parse only a bounded recent window.
 const IMPORT_CANDIDATE_OVERSCAN = 40;
 const IMPORT_CANDIDATE_MIN = 400;
@@ -102,59 +100,6 @@ export async function listPiImportableSessions(
  );
 }

-export async function copyPiSessionFileWithCwd(input: {
-  sourceFile: string;
-  targetFile: string;
-  cwd: string;
-}): Promise<void> {
-  const found = findSessionHeaderLine(
-    await readSessionFileStart(input.sourceFile, PI_SESSION_HEADER_SCAN_BYTES),
-  );
-  if (!found) {
-    throw new Error(`Pi session file has no session header: ${input.sourceFile}`);
-  }
-  await writeFile(input.targetFile, `${JSON.stringify({ ...found.header, cwd: input.cwd })}\n`, {
-    mode: 0o600,
-  });
-  await pipeline(
-    createReadStream(input.sourceFile, { start: found.bodyStart }),
-    createWriteStream(input.targetFile, { flags: "a" }),
-  );
-}
-
-function findSessionHeaderLine(
-  scanned: Buffer,
-): { header: Record<string, unknown>; bodyStart: number } | null {
-  let lineStart = 0;
-  while (lineStart < scanned.length) {
-    const newline = scanned.indexOf(0x0a, lineStart);
-    const bodyStart = newline === -1 ? scanned.length : newline + 1;
-    const line = scanned.subarray(lineStart, bodyStart).toString("utf8").trim();
-    if (line) {
-      const header = parseJsonRecord(line);
-      return header?.type === "session" ? { header, bodyStart } : null;
-    }
-    lineStart = bodyStart;
-  }
-  return null;
-}
-
-async function readSessionFileStart(filePath: string, maxBytes: number): Promise<Buffer> {
-  const handle = await open(filePath, "r").catch((error: unknown) => {
-    if ((error as NodeJS.ErrnoException).code === "ENOENT") {
-      throw new Error(`Pi session file is missing: ${filePath}`);
-    }
-    throw error;
-  });
-  try {
-    const buffer = Buffer.alloc(maxBytes);
-    const { bytesRead } = await handle.read(buffer, 0, maxBytes, 0);
-    return buffer.subarray(0, bytesRead);
-  } finally {
-    await handle.close().catch(() => undefined);
-  }
-}
-
 export async function readPiImportSessionConfig(filePath: string): Promise<PiImportSessionConfig> {
  const descriptor = await readPiSessionDescriptor(filePath);
  if (!descriptor) return {};
@@ -1,5 +1,3 @@
-import { existsSync, readFileSync } from "node:fs";
-
 import type {
  PiRuntime,
  PiRuntimeLaunch,
@@ -77,12 +75,6 @@ export class FakePi implements PiRuntime {
    const session = new FakePiSession(launch, this.removedModels);
    session.commands = this.queuedCommands.shift() ?? [];
    this.queuedSessionSetups.shift()?.(session);
-    const missingSessionCwd = launch.noSession ? null : readMissingSessionCwd(launch.session);
-    if (missingSessionCwd !== null) {
-      session.getStateError = new Error(
-        `Pi RPC process exited with code 1 and signal null\nStored session working directory does not exist: ${missingSessionCwd}\nSession file: ${launch.session}\nCurrent working directory: ${launch.cwd}`,
-      );
-    }
    this.sessions.push(session);
    return session;
  }
@@ -109,27 +101,6 @@ export class FakePi implements PiRuntime {
  }
 }

-function readMissingSessionCwd(sessionFile: string | undefined): string | null {
-  if (!sessionFile || !existsSync(sessionFile)) {
-    return null;
-  }
-  const [headerLine = ""] = readFileSync(sessionFile, "utf8").split("\n", 1);
-  let header: unknown;
-  try {
-    header = JSON.parse(headerLine);
-  } catch {
-    return null;
-  }
-  if (typeof header !== "object" || header === null || !("cwd" in header)) {
-    return null;
-  }
-  const { type, cwd } = header as { type?: unknown; cwd?: unknown };
-  if (type !== "session" || typeof cwd !== "string" || !cwd || existsSync(cwd)) {
-    return null;
-  }
-  return cwd;
-}
-
 export class FakePiSession implements PiRuntimeSession {
  readonly environment: Record<string, string>;
  readonly prompts: Array<{ message: string; imageCount: number }> = [];
@@ -1,26 +0,0 @@
-import { stat } from "node:fs/promises";
-import { homedir } from "node:os";
-
-import type { AgentResumePurpose } from "../agent-sdk-types.js";
-
-export async function resolveResumeProcessCwd(
-  cwd: string,
-  purpose: AgentResumePurpose | undefined,
-): Promise<string> {
-  if (purpose !== "history" || (await isDirectory(cwd))) {
-    return cwd;
-  }
-  return homedir();
-}
-
-async function isDirectory(target: string): Promise<boolean> {
-  try {
-    return (await stat(target)).isDirectory();
-  } catch (error) {
-    const code = (error as NodeJS.ErrnoException).code;
-    if (code === "ENOENT" || code === "ENOTDIR") {
-      return false;
-    }
-    throw error;
-  }
-}
@@ -670,11 +670,11 @@ describe("paseo daemon bootstrap", () => {

  test("rolls back standalone listener without starting plugins when main listen fails", async () => {
    const mainPort = await findFreePort();
+    const standalonePort = await findFreePort();
    const occupiedMain = http.createServer((_req, res) => {
      res.end("occupied-main");
    });
    await new Promise<void>((resolve) => occupiedMain.listen(mainPort, "127.0.0.1", resolve));
-    const standalonePort = await findFreePort();

    const paseoHomeRoot = await mkdtemp(path.join(os.tmpdir(), "paseo-main-rollback-"));
    const paseoHome = path.join(paseoHomeRoot, ".paseo");
@@ -784,211 +784,6 @@ test("old capabilities fail before execution and authentication errors recover t
  expect((await online(paseo)).hosts[0]!.serverId).toBe(b.daemon.getServerId());
 });

-async function updatableDestination() {
-  let features: { connectedHosts: boolean; hostMultiplexing: boolean } | undefined;
-  let holding = false;
-  const held: (() => void)[] = [];
-  let connections = 0;
-  const http = createServer();
-  const ws = new WebSocketServer({ server: http });
-  ws.on("connection", (socket) => {
-    connections++;
-    socket.on("message", (data) => {
-      const frame = JSON.parse(data.toString());
-      if (frame.type === "ping") socket.send(JSON.stringify({ type: "pong" }));
-      if (frame.type !== "hello") return;
-      const reply = () =>
-        socket.send(
-          JSON.stringify({
-            type: "session",
-            message: {
-              type: "status",
-              payload: {
-                status: "server_info",
-                serverId: "srv_updated",
-                hostname: "updated",
-                version: "0.12.0",
-                ...(features ? { features } : {}),
-              },
-            },
-          }),
-        );
-      if (holding) held.push(reply);
-      else reply();
-    });
-  });
-  http.listen(0, "127.0.0.1");
-  await once(http, "listening");
-  cleanup.push(async () => {
-    for (const socket of ws.clients) socket.terminate();
-    await new Promise<void>((resolve) => ws.close(() => resolve()));
-    await new Promise<void>((resolve) => http.close(() => resolve()));
-  });
-  const address = http.address();
-  if (!address || typeof address === "string") throw new Error("Missing destination port");
-  return {
-    port: address.port,
-    connections: () => connections,
-    hold: () => {
-      holding = true;
-    },
-    update: () => {
-      features = { connectedHosts: true, hostMultiplexing: true };
-      holding = false;
-      for (const reply of held.splice(0)) reply();
-    },
-  };
-}
-async function capabilityRetry(paseo: ReturnType<typeof createPaseoApi>): Promise<number> {
-  let retryAt = "";
-  await expect
-    .poll(
-      async () => {
-        const row = (await paseo.hosts.list()).hosts[0];
-        retryAt = row?.nextRetryAt ?? "";
-        return row;
-      },
-      { timeout: 5000 },
-    )
-    .toMatchObject({
-      status: "offline",
-      nextRetryAt: expect.any(String),
-      error: { code: "unsupported_capability" },
-    });
-  return Date.parse(retryAt);
-}
-
-test("a destination updated past unsupported_capability keeps its guidance while retrying and comes online, while duplicate_host stays terminal", async () => {
-  const destination = await updatableDestination();
-  const a = await daemon();
-  const { paseo } = await api(a);
-  const host = await paseo.hosts.add({ connection: `127.0.0.1:${destination.port}` });
-  await capabilityRetry(paseo);
-  destination.hold();
-  await expect
-    .poll(async () => (await paseo.hosts.list()).hosts[0], { timeout: 5000 })
-    .toMatchObject({ status: "connecting", error: { code: "unsupported_capability" } });
-  await expect(paseo.hosts.client("srv_updated")).rejects.toMatchObject({
-    code: "unsupported_capability",
-  });
-  destination.update();
-  expect((await online(paseo)).hosts[0]).toMatchObject({
-    registrationId: host.registrationId,
-    serverId: "srv_updated",
-    nextRetryAt: null,
-    error: null,
-  });
-  await paseo.hosts.add({ connection: `ws://127.0.0.1:${destination.port}/ws` });
-  await expect
-    .poll(async () => (await paseo.hosts.list()).hosts[1], { timeout: 5000 })
-    .toMatchObject({ status: "error", nextRetryAt: null, error: { code: "duplicate_host" } });
-});
-
-test("disabling or removing a host cancels its pending capability retry", async () => {
-  const destination = await updatableDestination();
-  const a = await daemon();
-  const { paseo } = await api(a);
-  const host = await paseo.hosts.add({ connection: `127.0.0.1:${destination.port}` });
-  let retryAt = await capabilityRetry(paseo);
-  let connections = destination.connections();
-  await paseo.hosts.update(host.registrationId, { enabled: false });
-  await new Promise((resolve) => setTimeout(resolve, retryAt - Date.now() + 500));
-  expect(destination.connections()).toBe(connections);
-  await paseo.hosts.update(host.registrationId, { enabled: true });
-  retryAt = await capabilityRetry(paseo);
-  connections = destination.connections();
-  await paseo.hosts.remove(host.registrationId);
-  await new Promise((resolve) => setTimeout(resolve, retryAt - Date.now() + 500));
-  expect(destination.connections()).toBe(connections);
-});
-
-import {
-  createDaemonChannel,
-  exportPublicKey,
-  generateKeyPair,
-  openDaemonSecureChannel,
-  type Transport,
-} from "@getpaseo/relay/e2ee";
-test("a capability retry over a relay keeps the protected endpoint security it negotiated", async () => {
-  const keys = generateKeyPair();
-  const legacyReceived: unknown[] = [];
-  let connections = 0;
-  let retryClosed = false;
-  const http = createServer();
-  const ws = new WebSocketServer({ server: http });
-  ws.on("connection", (socket) => {
-    connections++;
-    const wire: Transport = {
-      send: (data) => socket.send(data),
-      close: (code, reason) => socket.close(code, reason),
-      onmessage: null,
-      onclose: null,
-      onerror: null,
-    };
-    socket.on("message", (data, isBinary) => {
-      const bytes = Buffer.from(data as Buffer);
-      wire.onmessage?.({
-        data: isBinary
-          ? bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength)
-          : bytes.toString(),
-        isBinary,
-      });
-    });
-    socket.on("close", (code, reason) => wire.onclose?.(code, reason.toString()));
-    if (connections > 1) {
-      socket.on("close", () => {
-        retryClosed = true;
-      });
-      void createDaemonChannel(wire, keys, {
-        onmessage: (data) => legacyReceived.push(data),
-      }).catch(() => {});
-      return;
-    }
-    const channel = openDaemonSecureChannel(wire, {
-      daemonKeyPair: keys,
-      events: {
-        onmessage: (data) => {
-          if (typeof data !== "string" || JSON.parse(data).type !== "hello") return;
-          void channel.then((secure) =>
-            secure.send(
-              JSON.stringify({
-                type: "session",
-                message: {
-                  type: "status",
-                  payload: {
-                    status: "server_info",
-                    serverId: "srv_relayed",
-                    hostname: "relayed",
-                    version: "0.12.0",
-                  },
-                },
-              }),
-            ),
-          );
-        },
-      },
-    });
-    void channel.catch(() => {});
-  });
-  http.listen(0, "127.0.0.1");
-  await once(http, "listening");
-  cleanup.push(async () => {
-    for (const socket of ws.clients) socket.terminate();
-    await new Promise<void>((resolve) => ws.close(() => resolve()));
-    await new Promise<void>((resolve) => http.close(() => resolve()));
-  });
-  const address = http.address();
-  if (!address || typeof address === "string") throw new Error("Missing relay port");
-  const a = await daemon();
-  const { paseo } = await api(a);
-  await paseo.hosts.add({
-    connection: `relay://127.0.0.1:${address.port}/srv_relayed?key=${encodeURIComponent(exportPublicKey(keys.publicKey))}`,
-  });
-  await capabilityRetry(paseo);
-  await expect.poll(() => retryClosed, { timeout: 15000 }).toBe(true);
-  expect(legacyReceived).toEqual([]);
-});
-
 test("an unreachable saved target becomes online after its daemon starts without being added again", async () => {
  const reservation = createServer();
  reservation.listen(0, "127.0.0.1");
@@ -7,12 +7,10 @@ import { z } from "zod";
 import {
  createHostClient,
  createHostChannelTransport,
-  createHostTransportFactory,
  parseHostTarget,
  HostTransportBudget,
 } from "@getpaseo/client/node";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import type { DaemonTransportFactory } from "@getpaseo/client/internal/daemon-client-transport-types";
 import {
  HostSummarySchema,
  HostAddSchema,
@@ -237,30 +235,23 @@ export class ConnectedHosts {
      if (route.registrationId === id)
        route.close(code, "Host access was disabled, replaced or removed");
  }
-  private start(
-    row: Saved,
-    resume?: { failures: number; transports: DaemonTransportFactory },
-  ): void {
+  private start(row: Saved): void {
    if (!row.enabled || this.closed) return;
-    const transports =
-      resume?.transports ??
-      createHostTransportFactory(row.connection, this.budget, {
-        webSocketAgent: webSocketProxyAgent,
-      });
    let stopped = false;
-    let attempts = resume?.failures ?? 0;
-    let retry: ReturnType<typeof setTimeout> | undefined;
-    const client = createHostClient(row.connection, {
-      clientId: `host-link-${this.self.serverId}-${row.registrationId}`,
-      connectTimeoutMs: 10000,
-      transportFactory: transports,
-    });
+    const client = createHostClient(
+      row.connection,
+      {
+        clientId: `host-link-${this.self.serverId}-${row.registrationId}`,
+        connectTimeoutMs: 10000,
+        webSocketAgent: webSocketProxyAgent,
+      },
+      this.budget,
+    );
    const live: Live = {
      client,
      accepted: false,
      stop: () => {
        stopped = true;
-        clearTimeout(retry);
        void client.close();
      },
    };
@@ -294,7 +285,7 @@ export class ConnectedHosts {
        if (info.features?.connectedHosts !== true || info.features?.hostMultiplexing !== true)
          throw new HostError(
            "unsupported_capability",
-            "Update the destination daemon to use connected hosts; retrying automatically.",
+            "Update the destination daemon to use connected hosts.",
          );
        // Pin and persist under the same writer as management to prevent discovery races.
        await this.mutate(async () => {
@@ -313,22 +304,16 @@ export class ConnectedHosts {
          if (stopped || client.getLastServerInfoMessage() !== info || !client.isConnected) return;
          Object.assign(row, next);
          live.accepted = true;
-          attempts = 0;
          this.changed();
        });
      } catch (error) {
        if (stopped) return;
+        row.status = "error";
        row.error = connectionFailure(error, client.authFailureReason !== null) ?? {
          code: "host_offline",
          message: "Host connection failed",
        };
-        if (terminalFailures.has(row.error.code)) {
-          row.status = "error";
-          row.nextRetryAt = null;
-        } else {
-          stopped = true;
-          retry = this.scheduleAcceptanceRetry(row, attempts, transports);
-        }
+        row.nextRetryAt = null;
        this.changed();
        await client.close();
      }
@@ -344,17 +329,18 @@ export class ConnectedHosts {
        if (route.registrationId === row.registrationId) route.close();
      row.status = state.status === "connecting" ? "connecting" : "offline";
      row.nextRetryAt = state.status === "disconnected" ? (state.nextRetryAt ?? null) : null;
-      if (state.status === "disconnected")
-        row.error = connectionFailure(
-          Object.assign(new Error("Check the SSH configuration and daemon credentials"), {
-            code: state.failureCode,
-          }),
-          client.authFailureReason !== null,
-        ) ?? {
-          code: "host_offline",
-          message: "Cannot reach host. Check the connection; retrying automatically.",
-        };
-      else if (row.error?.code !== "unsupported_capability") row.error = null;
+      row.error =
+        state.status === "disconnected"
+          ? (connectionFailure(
+              Object.assign(new Error("Check the SSH configuration and daemon credentials"), {
+                code: state.failureCode,
+              }),
+              client.authFailureReason !== null,
+            ) ?? {
+              code: "host_offline",
+              message: "Cannot reach host. Check the connection; retrying automatically.",
+            })
+          : null;
      if (row.error?.code === "authentication_failed") {
        row.status = "error";
        row.nextRetryAt = null;
@@ -365,18 +351,6 @@ export class ConnectedHosts {
    });
    void client.connect().catch(() => {});
  }
-  private scheduleAcceptanceRetry(
-    row: Saved,
-    failures: number,
-    transports: DaemonTransportFactory,
-  ): ReturnType<typeof setTimeout> {
-    const delay = acceptanceRetryDelayMs(failures);
-    row.status = "offline";
-    row.nextRetryAt = new Date(Date.now() + delay).toISOString();
-    const retry = setTimeout(() => this.start(row, { failures: failures + 1, transports }), delay);
-    retry.unref();
-    return retry;
-  }
  async openRoute(input: {
    serverId: string;
    scopeId: string;
@@ -557,20 +531,6 @@ export class ConnectedHosts {
  }
 }

-const ACCEPTANCE_RETRY_BASE_MS = 1500;
-const ACCEPTANCE_RETRY_MAX_MS = 30_000;
-
-function acceptanceRetryDelayMs(failures: number): number {
-  return Math.min(ACCEPTANCE_RETRY_BASE_MS * 2 ** failures, ACCEPTANCE_RETRY_MAX_MS);
-}
-
-const terminalFailures = new Set([
-  "server_id_mismatch",
-  "self_host",
-  "duplicate_host",
-  "authentication_failed",
-]);
-
 function connectionFailure(error: unknown, authenticationFailed: boolean): HostSummary["error"] {
  if (error instanceof HostError) return { code: error.code, message: error.message };
  if (error instanceof Error && "code" in error && error.code === "authentication_failed")
@@ -88,9 +88,13 @@ test.each(["uncommitted", "base", "commit"] as const)(
  60_000,
 );

-test.each(["single", "batch", "rename"] as const)(
-  "%s diff includes hunks from a repository subdirectory before and after commit",
-  async (shape) => {
+test.each(
+  (["uncommitted", "base"] as const).flatMap((mode) =>
+    (["single", "batch", "rename"] as const).map((shape) => ({ mode, shape })),
+  ),
+)(
+  "$mode $shape diff includes hunks from a repository subdirectory",
+  async ({ mode, shape }) => {
    const ctx = await createDaemonTestContext();
    const cwd = mkdtempSync(join(tmpdir(), "checkout-diff-subdirectory-"));

@@ -108,7 +112,9 @@ test.each(["single", "batch", "rename"] as const)(
      }
      git(cwd, "add", ".");
      git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "initial");
-      git(cwd, "checkout", "-b", "feature");
+      if (mode === "base") {
+        git(cwd, "checkout", "-b", "feature");
+      }
      const filename = shape === "rename" ? "renamed.txt" : "normal.txt";
      if (shape === "rename") {
        git(cwd, "mv", "sub/normal.txt", `sub/${filename}`);
@@ -117,38 +123,36 @@ test.each(["single", "batch", "rename"] as const)(
      if (shape === "batch") {
        writeFileSync(join(cwd, "sibling.txt"), "new sibling\n");
      }
-      async function expectSubdirectoryDiff(mode: "uncommitted" | "base") {
-        const compare = { mode, baseRef: "main" };
-        const rootDiff = await ctx.client.getCheckoutDiff(cwd, compare);
-        const subdirectoryDiff = await ctx.client.getCheckoutDiff(subdirectory, compare);
-        const subscription = ctx.client.observeCheckoutDiff(subdirectory, compare);
-        const liveDiff = await subscription.ready;
-        await subscription.release();
-
-        expect(rootDiff.error).toBeNull();
-        expect(subdirectoryDiff.error).toBeNull();
-        expect(liveDiff.error).toBeNull();
-        expect(liveDiff.files).toEqual(rootDiff.files);
-        expect(rootDiff.files).toHaveLength(shape === "batch" ? 2 : 1);
-        const file = rootDiff.files.find((candidate) => candidate.path === `sub/${filename}`);
-        expect(file).toMatchObject({
-          additions: 1,
-          deletions: 1,
-          ...(shape === "rename" ? { oldPath: "sub/normal.txt" } : {}),
-        });
-        expect(file?.hunks.flatMap((hunk) => hunk.lines)).toEqual(
-          expect.arrayContaining([
-            expect.objectContaining({ type: "remove", content: "before" }),
-            expect.objectContaining({ type: "add", content: "after" }),
-          ]),
-        );
-        expect(subdirectoryDiff.files).toEqual(rootDiff.files);
+      if (mode === "base") {
+        git(cwd, "add", ".");
+        git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "edit");
      }

-      await expectSubdirectoryDiff("uncommitted");
-      git(cwd, "add", ".");
-      git(cwd, "-c", "commit.gpgsign=false", "commit", "-m", "edit");
-      await expectSubdirectoryDiff("base");
+      const compare = { mode, baseRef: "main" };
+      const rootDiff = await ctx.client.getCheckoutDiff(cwd, compare);
+      const subdirectoryDiff = await ctx.client.getCheckoutDiff(subdirectory, compare);
+      const subscription = ctx.client.observeCheckoutDiff(subdirectory, compare);
+      const liveDiff = await subscription.ready;
+      await subscription.release();
+
+      expect(rootDiff.error).toBeNull();
+      expect(subdirectoryDiff.error).toBeNull();
+      expect(liveDiff.error).toBeNull();
+      expect(liveDiff.files).toEqual(rootDiff.files);
+      expect(rootDiff.files).toHaveLength(shape === "batch" ? 2 : 1);
+      const file = rootDiff.files.find((candidate) => candidate.path === `sub/${filename}`);
+      expect(file).toMatchObject({
+        additions: 1,
+        deletions: 1,
+        ...(shape === "rename" ? { oldPath: "sub/normal.txt" } : {}),
+      });
+      expect(file?.hunks.flatMap((hunk) => hunk.lines)).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ type: "remove", content: "before" }),
+          expect.objectContaining({ type: "add", content: "after" }),
+        ]),
+      );
+      expect(subdirectoryDiff.files).toEqual(rootDiff.files);
    } finally {
      await ctx.cleanup();
      rmSync(cwd, { recursive: true, force: true });
@@ -0,0 +1,129 @@
+import { mkdir, mkdtemp, rm } from "node:fs/promises";
+import path from "node:path";
+import type { FormInfo } from "@opencode/client";
+import { expect, test } from "vitest";
+
+import { createTestLogger } from "../../test-utils/test-logger.js";
+import { OpenCodeV2AgentClient } from "../agent/providers/opencode/v2/agent.js";
+import { V2Harness } from "../agent/providers/opencode/test-utils/v2-harness.js";
+import { createTestAgentClients } from "../test-utils/fake-agent-client.js";
+import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
+import { DaemonClient } from "../test-utils/daemon-client.js";
+
+async function createQuestionHarness() {
+  const artifacts = path.resolve(".artifacts");
+  await mkdir(artifacts, { recursive: true });
+  const root = await mkdtemp(path.join(artifacts, "peer-permissions-"));
+  const runtime = new V2Harness();
+  runtime.autoComplete = false;
+  runtime.api.model.list = async () => ({ location: runtime.info.location, data: [] });
+  runtime.api.provider.list = async () => ({
+    location: runtime.info.location,
+    data: [{ id: "test", name: "Test", activation: "enabled", package: "test" }],
+  });
+  let form: FormInfo | null = null;
+  const answers: Array<Record<string, unknown>> = [];
+  runtime.api.session.form.list = async () => (form ? [form] : []);
+  runtime.api.session.form.cancel = async () => {
+    form = null;
+    runtime.finishExecution("interrupted");
+  };
+  runtime.api.session.form.reply = async ({ answer }) => {
+    answers.push(answer);
+    form = null;
+    runtime.finishExecution();
+  };
+  // A steer is admitted to the existing execution, rather than starting another one.
+  runtime.prompt = async (input) => {
+    runtime.prompts.push(input.text);
+    if (runtime.prompts.length === 1) runtime.startExecution();
+  };
+  const provider = new OpenCodeV2AgentClient({
+    logger: createTestLogger(),
+    runtime: runtime.runtime,
+  });
+  const daemon = await createTestPaseoDaemon({
+    agentClients: { ...createTestAgentClients(), opencode: provider },
+    paseoHomeRoot: path.join(root, "daemon"),
+    staticDir: path.join(root, "static"),
+    cleanup: false,
+  });
+  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
+  try {
+    await client.connect();
+    await client.fetchAgents({ subscribe: {} });
+    const recipient = await client.createAgent({
+      provider: "opencode",
+      cwd: root,
+      title: "Waiting for a human answer",
+    });
+    const sender = await client.createAgent({ provider: "claude", cwd: root });
+    await client.sendMessage(recipient.id, "Ask which color to use");
+    await expect.poll(() => runtime.prompts).toHaveLength(1);
+    form = {
+      id: "color-question",
+      sessionID: "session",
+      title: "Color",
+      fields: [{ key: "color", title: "Color", type: "string" }],
+    };
+    runtime.push({ id: "question-created", created: 2, type: "form.created", data: { form } });
+    await client.waitForAgentUpsert(recipient.id, (agent) =>
+      (agent.pendingPermissions ?? []).some((request) => request.id === "color-question"),
+    );
+    return {
+      client,
+      recipient,
+      sender,
+      answers,
+      async close() {
+        await client.close();
+        await daemon.close();
+        await rm(root, { recursive: true, force: true });
+      },
+    };
+  } catch (error) {
+    await client.close();
+    await daemon.close();
+    await rm(root, { recursive: true, force: true });
+    throw error;
+  }
+}
+
+test("an agent-sourced steer leaves the question pending and answerable", async () => {
+  const { client, recipient, sender, answers, close } = await createQuestionHarness();
+  try {
+    await client.sendAgentMessage(recipient.id, "Peer status check", {
+      sourceAgentId: sender.id,
+    });
+    // The public wait includes admitted message delivery before reporting permission status.
+    const waiting = await client.waitForFinish(recipient.id);
+    expect(waiting.status).toBe("permission");
+    expect(waiting.final?.pendingPermissions).toMatchObject([
+      { id: "color-question", kind: "question" },
+    ]);
+    await client.respondToPermission(recipient.id, "color-question", {
+      behavior: "allow",
+      updatedInput: { answers: { Color: "Blue" } },
+    });
+    await client.waitForAgentUpsert(
+      recipient.id,
+      (agent) => (agent.pendingPermissions ?? []).length === 0 && agent.status === "idle",
+    );
+    expect(answers).toEqual([{ color: "Blue" }]);
+  } finally {
+    await close();
+  }
+});
+
+test("a human steer still dismisses the question", async () => {
+  const { client, recipient, answers, close } = await createQuestionHarness();
+  try {
+    await client.sendAgentMessage(recipient.id, "Use red instead", { activeTurnBehavior: "steer" });
+    const finished = await client.waitForFinish(recipient.id);
+    expect(finished.status).toBe("idle");
+    expect(finished.final?.pendingPermissions ?? []).toEqual([]);
+    expect(answers).toEqual([]);
+  } finally {
+    await close();
+  }
+});
@@ -20,7 +20,6 @@ import { DaemonConfigStore } from "../daemon-config-store.js";
 import { PluginService } from "./index.js";
 import { BuiltinPluginLoader } from "./builtin/index.js";
 import { ManagedPluginSources } from "./managed-source.js";
-import type { PluginProviderMetadata } from "./plugin-process-protocol.js";
 import {
  startNpmRegistry,
  npmPluginPackages,
@@ -180,55 +179,6 @@ function createPluginSelectivePausedRuntime(pausedPluginId: string) {
  return { runtime, started, releaseStart, starts };
 }

-function createGatedRuntime(providers: Record<string, readonly PluginProviderMetadata[]> = {}) {
-  const gates = new Map<string, PromiseWithResolvers<void>>();
-  const gate = (pluginId: string) => {
-    const existing = gates.get(pluginId);
-    if (existing) return existing;
-    const created = Promise.withResolvers<void>();
-    gates.set(pluginId, created);
-    return created;
-  };
-  const begun: string[] = [];
-  const running = new Set<string>();
-  const runtime: TestPluginRuntime = {
-    ...emptyUsageRuntime,
-    catalog: () => [...running].map((id) => ({ id, clientBundle: "bundle" })),
-    invoke: async () => undefined,
-    getLogs: () => [],
-    clearLogs: () => undefined,
-    getProviderRegistrations: (pluginId) =>
-      running.has(pluginId) ? (providers[pluginId] ?? []) : [],
-    startPlugin: async (pluginId) => {
-      begun.push(pluginId);
-      await gate(pluginId).promise;
-      running.add(pluginId);
-    },
-    stopPluginById: async (pluginId) => running.delete(pluginId),
-    stopAll: async () => {
-      running.clear();
-    },
-    subscribe: () => () => undefined,
-    bindPaseoSessionHost: () => undefined,
-  };
-  return {
-    runtime,
-    begun,
-    finish: (pluginId: string) => gate(pluginId).resolve(),
-    fail: (pluginId: string, error: Error) => gate(pluginId).reject(error),
-  };
-}
-
-function nextNotification(service: PluginService, pluginId: string): Promise<void> {
-  return new Promise((resolve) => {
-    const unsubscribe = service.subscribe((notified) => {
-      if (notified !== pluginId) return;
-      unsubscribe();
-      resolve();
-    });
-  });
-}
-
 describe("PluginService", () => {
  it.each([
    { shadow: false, runtime: "subprocess" },
@@ -422,127 +372,15 @@ describe("PluginService", () => {
      "startup-first": { source: "directory", path: first },
      "startup-second": { source: "directory", path: second },
    });
-    const notifications: { pluginId: string; running: boolean }[] = [];
-    service.subscribe((pluginId) =>
-      notifications.push({ pluginId, running: catalogIds(service).includes(pluginId) }),
-    );
+    const snapshots: string[][] = [];
+    service.subscribe(() => snapshots.push(catalogIds(service)));

    await service.start();

-    expect(notifications).toEqual([
-      { pluginId: "startup-first", running: true },
-      { pluginId: "startup-second", running: true },
-    ]);
-    expect(catalogIds(service)).toEqual(["startup-first", "startup-second"]);
+    expect(snapshots).toEqual([["startup-first"], ["startup-first", "startup-second"]]);
    await service.stopAllPlugins();
  }, 20_000);

-  it("starts configured plugins concurrently and publishes them in config order", async () => {
-    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
-    roots.push(home);
-    const gated = createGatedRuntime();
-    const service = createService(
-      home,
-      {
-        alpha: { source: "directory", path: "/plugins/alpha" },
-        beta: { source: "directory", path: "/plugins/beta" },
-        gamma: { source: "directory", path: "/plugins/gamma" },
-      },
-      { runtime: gated.runtime },
-    );
-    const notified: string[] = [];
-    service.subscribe((pluginId) => notified.push(pluginId));
-    let started = false;
-    const starting = (async () => {
-      await service.start();
-      started = true;
-    })();
-
-    await expect.poll(() => gated.begun).toEqual(["alpha", "beta", "gamma"]);
-
-    gated.finish("gamma");
-    const alphaPublished = nextNotification(service, "alpha");
-    gated.finish("alpha");
-    await alphaPublished;
-    expect(notified).toEqual(["alpha"]);
-    expect(started).toBe(false);
-
-    gated.finish("beta");
-    await starting;
-    expect(notified).toEqual(["alpha", "beta", "gamma"]);
-    expect(catalogIds(service)).toEqual(["alpha", "beta", "gamma"]);
-    await service.stopAllPlugins();
-  });
-
-  it("starts the other configured plugins when one fails while they are still starting", async () => {
-    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
-    roots.push(home);
-    const gated = createGatedRuntime();
-    const service = createService(
-      home,
-      {
-        broken: { source: "directory", path: "/plugins/broken" },
-        healthy: { source: "directory", path: "/plugins/healthy" },
-      },
-      { runtime: gated.runtime },
-    );
-    const notified: string[] = [];
-    service.subscribe((pluginId) => notified.push(pluginId));
-    const starting = service.start();
-
-    await expect.poll(() => gated.begun).toEqual(["broken", "healthy"]);
-    const brokenPublished = nextNotification(service, "broken");
-    gated.fail("broken", new Error("startup exploded"));
-    await brokenPublished;
-    gated.finish("healthy");
-    await starting;
-
-    expect(notified).toEqual(["broken", "healthy"]);
-    expect(catalogIds(service)).toEqual(["healthy"]);
-    expect(await service.listPlugins()).toMatchObject([
-      { id: "broken", status: "failed", error: "startup exploded" },
-      { id: "healthy", status: "running" },
-    ]);
-    await service.stopAllPlugins();
-  });
-
-  it("keeps a provider ID with the plugin listed first when both start at once", async () => {
-    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
-    roots.push(home);
-    const gated = createGatedRuntime({
-      first: [{ id: "shared-agent", label: "First agent" }],
-      second: [{ id: "shared-agent", label: "Second agent" }],
-    });
-    const service = createService(
-      home,
-      {
-        first: { source: "directory", path: "/plugins/first" },
-        second: { source: "directory", path: "/plugins/second" },
-      },
-      { runtime: gated.runtime },
-    );
-    const starting = service.start();
-
-    await expect.poll(() => gated.begun).toEqual(["first", "second"]);
-    gated.finish("second");
-    gated.finish("first");
-    await starting;
-
-    expect(service.getProviderRegistrations()).toMatchObject([
-      { id: "shared-agent", label: "First agent" },
-    ]);
-    expect(catalogIds(service)).toEqual(["first"]);
-    expect(await service.listPlugins()).toMatchObject([
-      { id: "first", status: "running" },
-      {
-        id: "second",
-        status: "failed",
-        error: 'Plugin second cannot register provider ID "shared-agent" twice',
-      },
-    ]);
-    await service.stopAllPlugins();
-  });
-
  it("uses an explicit config key, exposes reload failure, and retries from disk", async () => {
    const home = await mkdtemp(path.join(tmpdir(), "paseo-plugin-home-"));
    roots.push(home);
@@ -230,18 +230,11 @@ export class PluginService {
      }
    });
    if (config.pluginsEnabled === true) {
-      let earlierPublished: Promise<unknown> = Promise.resolve();
-      await Promise.all(
-        Object.entries(config.plugins ?? {})
-          .filter(([, source]) => source.enabled !== false)
-          .map(async ([pluginId]) => {
-            const publishTurn = earlierPublished;
-            const starting = this.startConfigured(pluginId, publishTurn);
-            earlierPublished = Promise.all([publishTurn, starting]);
-            await starting;
-            this.notify(pluginId);
-          }),
-      );
+      for (const [pluginId, source] of Object.entries(config.plugins ?? {})) {
+        if (source.enabled === false) continue;
+        await this.startConfigured(pluginId);
+        this.notify(pluginId);
+      }
    }
    this.configStore.onFieldChange("pluginsEnabled", (value) => {
      this.handleGlobalSwitch(value === true);
@@ -567,12 +560,12 @@ export class PluginService {
    }).catch((error) => this.logger.error({ err: error }, "Failed to enable plugins"));
  }

-  private async startConfigured(pluginId: string, publishTurn?: Promise<unknown>): Promise<void> {
+  private async startConfigured(pluginId: string): Promise<void> {
    const source = this.configStore.get().plugins?.[pluginId];
    if (!source || source.enabled === false || !this.canPublish(pluginId)) return;
    this.errors.delete(pluginId);
    try {
-      await this.startPlugin(pluginId, source.path, publishTurn);
+      await this.startPlugin(pluginId, source.path);
    } catch (error) {
      if (this.canPublish(pluginId)) this.recordFailure(pluginId, error);
    }
@@ -601,13 +594,8 @@ export class PluginService {
    );
  }

-  private async startPlugin(
-    pluginId: string,
-    sourcePath: string,
-    publishTurn?: Promise<unknown>,
-  ): Promise<void> {
+  private async startPlugin(pluginId: string, sourcePath: string): Promise<void> {
    await this.runtime.startPlugin(pluginId, sourcePath, () => this.canPublish(pluginId));
-    await publishTurn;
    try {
      await this.publishProviderRegistrations(pluginId, sourcePath);
      this.publishUsageSources(pluginId);
@@ -61,24 +61,10 @@ describe("managed Git plugin sources", () => {
    roots.push(home);
    const sources = new ManagedPluginSources(home);

-    // Own the failure response instead of relying on a closed port and OS connect timing.
-    const server = createServer((_request, response) => {
-      response.writeHead(500, { "Content-Type": "text/plain" });
-      response.end("clone rejected for oauth2:super-secret\n");
+    const failure = sources.prepareInstall({
+      source: "git:https://oauth2:super-secret@127.0.0.1:1/missing.git",
    });
-    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
-    const address = server.address() as { port: number };
-    try {
-      const failure = sources.prepareInstall({
-        source: `git:http://oauth2:super-secret@127.0.0.1:${address.port}/missing.git`,
-      });
-      await expect(failure).rejects.toThrow("500");
-      await expect(failure).rejects.toThrow("clone rejected for [redacted]:[redacted]");
-      await expect(failure).rejects.not.toThrow(/oauth2|super-secret/);
-    } finally {
-      server.closeAllConnections();
-      await new Promise<void>((resolve) => server.close(() => resolve()));
-    }
+    await expect(failure).rejects.not.toThrow(/oauth2|super-secret/);
  });

  it("normalizes explicit GitHub and Git identifiers to the same Git source", async () => {
@@ -1,9 +1,7 @@
-import { type EventEmitter, once } from "node:events";
 import { readdirSync, readFileSync, statSync } from "node:fs";
 import path from "node:path";
 import http from "node:http";
 import net from "node:net";
-import type { Duplex } from "node:stream";
 import express from "express";
 import { describe, expect, it } from "vitest";
 import pino from "pino";
@@ -334,39 +332,48 @@ describe("service proxy subsystem shape", () => {
  });
 });

-interface ProxiedServiceFixture {
+interface ForwardedFixture {
  upstreamPort: number;
  daemonPort: number;
-  daemon: http.Server;
  hostname: string;
  close(): Promise<void>;
 }

 /**
- * Runs a real workspace service behind a real daemon listener that serves the
- * service proxy for both HTTP and upgrades.
+ * Runs a real workspace service behind a real daemon listener. The upstream
+ * echoes the headers it received so tests can assert what actually crossed the
+ * proxy, not what a helper returned.
 */
-async function startProxiedService(
-  upstream: http.Server,
-  options: { upstreamHost?: string; logger?: pino.Logger } = {},
-): Promise<ProxiedServiceFixture> {
-  const { upstreamHost = "127.0.0.1", logger: proxyLogger = logger } = options;
-  // Upgraded sockets keep the server alive; close() alone would hang.
-  const sockets = new Set<net.Socket>();
-  function trackConnections(server: http.Server) {
-    server.on("connection", (socket: net.Socket) => {
-      sockets.add(socket);
-      socket.once("close", () => sockets.delete(socket));
+async function startForwardedHeadersFixture(upstreamHost = "127.0.0.1"): Promise<ForwardedFixture> {
+  const upstream = http.createServer((req, res) => {
+    let body = "";
+    req.on("data", (chunk: Buffer) => {
+      body += chunk.toString();
    });
-  }
-  trackConnections(upstream);
+    req.on("end", () => {
+      res.writeHead(200, { "content-type": "application/json" });
+      res.end(JSON.stringify({ ...req.headers, method: req.method, url: req.url, body }));
+    });
+  });
+  const upgradeSockets: net.Socket[] = [];
+  upstream.on("upgrade", (req, socket) => {
+    upgradeSockets.push(socket);
+    // The client resets this connection once it has the echo, so the reset
+    // reaches us as an 'error'. A raw upgrade socket has no default handler —
+    // without this the event goes unhandled and takes down the test process.
+    socket.on("error", () => socket.destroy());
+    const payload = JSON.stringify(req.headers);
+    socket.write(
+      `HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nX-Echo-Length: ${payload.length}\r\n\r\n${payload}`,
+    );
+  });
  await new Promise<void>((resolve, reject) => {
    upstream.once("error", reject);
    upstream.listen(0, upstreamHost, resolve);
  });
  const upstreamPort = (upstream.address() as net.AddressInfo).port;

-  const serviceProxy = createServiceProxySubsystem({ logger: proxyLogger });
+  const serviceProxy = createServiceProxySubsystem({ logger });
  const route = serviceProxy.registerWorkspaceService({
    workspaceId: "workspace-a",
    projectSlug: "repo",
@@ -383,51 +390,24 @@ async function startProxiedService(
    res.status(404).send("404 Not Found");
  });
  const daemon = http.createServer(app);
-  trackConnections(daemon);
  daemon.on("upgrade", serviceProxy.upgradeHandler({ passthroughUnknown: false }));
  await new Promise<void>((resolve) => daemon.listen(daemonPort, "127.0.0.1", resolve));

  return {
    upstreamPort,
    daemonPort,
-    daemon,
    hostname: route.hostname,
    async close() {
-      for (const socket of sockets) socket.destroy();
+      // Upgraded sockets keep the server alive; close() alone would hang.
+      for (const socket of upgradeSockets) socket.destroy();
+      daemon.closeAllConnections();
      await new Promise<void>((resolve) => daemon.close(() => resolve()));
+      upstream.closeAllConnections();
      await new Promise<void>((resolve) => upstream.close(() => resolve()));
    },
  };
 }

-/**
- * The upstream echoes the headers it received so tests can assert what
- * actually crossed the proxy, not what a helper returned.
- */
-function startForwardedHeadersFixture(upstreamHost = "127.0.0.1"): Promise<ProxiedServiceFixture> {
-  const upstream = http.createServer((req, res) => {
-    let body = "";
-    req.on("data", (chunk: Buffer) => {
-      body += chunk.toString();
-    });
-    req.on("end", () => {
-      res.writeHead(200, { "content-type": "application/json" });
-      res.end(JSON.stringify({ ...req.headers, method: req.method, url: req.url, body }));
-    });
-  });
-  upstream.on("upgrade", (req, socket) => {
-    // The client resets this connection once it has the echo, so the reset
-    // reaches us as an 'error'. A raw upgrade socket has no default handler —
-    // without this the event goes unhandled and takes down the test process.
-    socket.on("error", () => socket.destroy());
-    const payload = JSON.stringify(req.headers);
-    socket.write(
-      `HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nX-Echo-Length: ${payload.length}\r\n\r\n${payload}`,
-    );
-  });
-  return startProxiedService(upstream, { upstreamHost });
-}
-
 function upgradeThroughProxy(
  port: number,
  host: string,
@@ -671,198 +651,3 @@ describe("service proxy forwarded headers", () => {
    }
  });
 });
-
-function closed(emitter: EventEmitter): Promise<void> {
-  return new Promise((resolve) => {
-    emitter.once("close", () => resolve());
-  });
-}
-
-async function within<T>(promise: Promise<T>, ms: number, failure: string): Promise<T> {
-  let timer: NodeJS.Timeout | undefined;
-  const timeout = new Promise<never>((_resolve, reject) => {
-    timer = setTimeout(() => reject(new Error(`${failure} after ${ms}ms`)), ms);
-  });
-  try {
-    return await Promise.race([promise, timeout]);
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-function requestThroughProxy(
-  fixture: ProxiedServiceFixture,
-  requestPath: string,
-): http.ClientRequest {
-  return http.get({
-    hostname: "127.0.0.1",
-    port: fixture.daemonPort,
-    path: requestPath,
-    headers: { host: fixture.hostname },
-  });
-}
-
-const STRAY_WARNING_GRACE_MS = 100;
-
-function createUpgradeUpstream(onUpgrade: (socket: Duplex) => void): http.Server {
-  const upstream = http.createServer();
-  upstream.on("upgrade", (_req, socket) => {
-    socket.on("error", () => socket.destroy());
-    socket.on("end", () => socket.end());
-    socket.write(
-      "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\n\r\n",
-    );
-    onUpgrade(socket);
-  });
-  return upstream;
-}
-
-function openUpgradeThroughProxy(fixture: ProxiedServiceFixture): Promise<net.Socket> {
-  return new Promise((resolve, reject) => {
-    const socket = net.connect({ host: "127.0.0.1", port: fixture.daemonPort }, () => {
-      const lines = [
-        "GET /ws HTTP/1.1",
-        `Host: ${fixture.hostname}`,
-        "Upgrade: websocket",
-        "Connection: Upgrade",
-        "",
-        "",
-      ];
-      socket.write(lines.join("\r\n"));
-    });
-    let raw = "";
-    socket.on("data", (chunk: Buffer) => {
-      raw += chunk.toString();
-      if (raw.includes("\r\n\r\n")) resolve(socket);
-    });
-    socket.on("close", () => reject(new Error("upgrade closed before the 101 arrived")));
-    socket.on("error", reject);
-  });
-}
-
-describe("service proxy connection teardown", () => {
-  it("closes the upstream connection when a client leaves an event stream", async () => {
-    const upstreamResponse = Promise.withResolvers<http.ServerResponse>();
-    const upstream = http.createServer((_req, res) => {
-      res.writeHead(200, { "content-type": "text/event-stream" });
-      res.write("data: open\n\n");
-      upstreamResponse.resolve(res);
-    });
-    const fixture = await startProxiedService(upstream);
-    try {
-      const request = requestThroughProxy(fixture, "/events");
-      const [response] = (await once(request, "response")) as [http.IncomingMessage];
-      await once(response, "data");
-      const upstreamClosed = closed(await upstreamResponse.promise);
-
-      request.destroy();
-
-      await within(upstreamClosed, 1000, "the service still holds the event stream");
-    } finally {
-      await fixture.close();
-    }
-  }, 5000);
-
-  it("aborts the upstream request when a client leaves before the response starts", async () => {
-    const warnings: unknown[] = [];
-    const proxyLogger = pino(
-      { level: "warn" },
-      { write: (line: string) => warnings.push(JSON.parse(line)) },
-    );
-    const upstreamResponse = Promise.withResolvers<http.ServerResponse>();
-    const upstream = http.createServer((_req, res) => {
-      upstreamResponse.resolve(res);
-    });
-    const fixture = await startProxiedService(upstream, { logger: proxyLogger });
-    try {
-      const request = requestThroughProxy(fixture, "/slow");
-      request.on("error", () => undefined);
-      const upstreamClosed = closed(await upstreamResponse.promise);
-
-      request.destroy();
-
-      await within(upstreamClosed, 1000, "the service still holds the abandoned request");
-      await new Promise((resolve) => setTimeout(resolve, STRAY_WARNING_GRACE_MS));
-      expect(warnings).toEqual([]);
-    } finally {
-      await fixture.close();
-    }
-  }, 5000);
-
-  it("lets a complete response finish without resetting the service", async () => {
-    const upstreamResponse = Promise.withResolvers<http.ServerResponse>();
-    const upstream = http.createServer((_req, res) => {
-      res.writeHead(200, { "content-type": "text/plain" });
-      res.write("first;");
-      upstreamResponse.resolve(res);
-    });
-    const fixture = await startProxiedService(upstream);
-    try {
-      const response = httpGet(fixture.daemonPort, fixture.hostname, { path: "/" });
-      const res = await upstreamResponse.promise;
-      const upstreamClosed = closed(res);
-
-      res.end("second");
-
-      await expect(response).resolves.toEqual({ status: 200, body: "first;second" });
-      await within(upstreamClosed, 1000, "the service response never closed");
-      expect(res.writableFinished).toBe(true);
-    } finally {
-      await fixture.close();
-    }
-  }, 5000);
-
-  it("closes the upstream WebSocket when the daemon drops the client socket", async () => {
-    const upstreamSocket = Promise.withResolvers<Duplex>();
-    const fixture = await startProxiedService(
-      createUpgradeUpstream((socket) => upstreamSocket.resolve(socket)),
-    );
-    const daemonSide = Promise.withResolvers<Duplex>();
-    fixture.daemon.on("upgrade", (_req, socket) => daemonSide.resolve(socket));
-    try {
-      const client = await openUpgradeThroughProxy(fixture);
-      const upstreamClosed = closed(await upstreamSocket.promise);
-
-      (await daemonSide.promise).destroy();
-
-      await within(upstreamClosed, 1000, "the service still holds the WebSocket");
-      client.destroy();
-    } finally {
-      await fixture.close();
-    }
-  }, 5000);
-
-  it("closes the upstream WebSocket when the client disconnects", async () => {
-    const upstreamSocket = Promise.withResolvers<Duplex>();
-    const fixture = await startProxiedService(
-      createUpgradeUpstream((socket) => upstreamSocket.resolve(socket)),
-    );
-    try {
-      const client = await openUpgradeThroughProxy(fixture);
-      const upstreamClosed = closed(await upstreamSocket.promise);
-
-      client.destroy();
-
-      await within(upstreamClosed, 1000, "the service still holds the WebSocket");
-    } finally {
-      await fixture.close();
-    }
-  }, 5000);
-
-  it("closes the client WebSocket when the service closes it", async () => {
-    const upstreamSocket = Promise.withResolvers<Duplex>();
-    const fixture = await startProxiedService(
-      createUpgradeUpstream((socket) => upstreamSocket.resolve(socket)),
-    );
-    try {
-      const client = await openUpgradeThroughProxy(fixture);
-      const clientClosed = closed(client);
-
-      (await upstreamSocket.promise).destroy();
-
-      await within(clientClosed, 1000, "the client WebSocket is still open");
-    } finally {
-      await fixture.close();
-    }
-  }, 5000);
-});
@@ -342,14 +342,7 @@ function proxyHttpRequest({
      proxyRes.pipe(res, { end: true });
    },
  );
-  let clientClosed = false;
-  res.on("close", () => {
-    if (res.writableFinished) return;
-    clientClosed = true;
-    proxyReq.destroy();
-  });
  proxyReq.on("error", (err) => {
-    if (clientClosed) return;
    logger.warn(
      { err, hostname: route.hostname, port: route.port },
      "Service proxy: upstream unreachable",
@@ -406,9 +399,6 @@ function proxyUpgradeRequest({
  socket.on("error", () => {
    targetSocket.destroy();
  });
-  socket.on("close", () => {
-    targetSocket.destroy();
-  });
 }

 function sameRouteOwner(left: ServiceProxyRouteEntry, right: ServiceProxyRouteEntry): boolean {
@@ -8318,7 +8318,7 @@ export class Session {
            },
            activeTurnBehavior: msg.activeTurnBehavior ?? "steer",
            sessionMode: msg.sessionMode,
-            clearPendingPermissions: true,
+            clearPendingPermissions: false,
          });
          deliveryStatus = "queued";
          queued();
@@ -95,13 +95,7 @@ it("accepts terminalId and token reports through the route into the tracker", as
    command: process.execPath,
    args: [
      "-e",
-      `
-        const fs = require("node:fs");
-        const envPath = ${JSON.stringify(envPath)};
-        fs.writeFileSync(envPath + ".tmp", JSON.stringify({ terminalId: process.env.PASEO_TERMINAL_ID, token: process.env.PASEO_ACTIVITY_TOKEN, url: process.env.PASEO_TERMINAL_ACTIVITY_URL }));
-        fs.renameSync(envPath + ".tmp", envPath);
-        setInterval(() => {}, 1000);
-      `,
+      `require("node:fs").writeFileSync(${JSON.stringify(envPath)}, JSON.stringify({ terminalId: process.env.PASEO_TERMINAL_ID, token: process.env.PASEO_ACTIVITY_TOKEN, url: process.env.PASEO_TERMINAL_ACTIVITY_URL })); setInterval(() => {}, 1000);`,
    ],
  });
  await waitForCondition(() => existsSync(envPath), 10000);
@@ -1157,7 +1157,6 @@ describe("relay external socket reconnect behavior", () => {
    expect(serverInfo.features?.workspaceMarkUnread).toBe(true);
    expect(serverInfo.features?.["terminal-input-mode-replay"]).toBe(true);
    expect(serverInfo.features?.["terminal-size-ownership"]).toBe(true);
-    expect(serverInfo.features?.["terminal-grapheme-widths"]).toBe(true);
    expect(serverInfo.features?.agentTurnIdentity).toBeUndefined();
    expect(serverInfo.permissions).toEqual(DAEMON_PERMISSIONS);
    await server.close();
@@ -2077,8 +2077,6 @@ export class VoiceAssistantWebSocketServer {
        "terminal-input-mode-replay": true,
        // COMPAT(terminalSizeOwnership): added in v0.2.6, remove gate after 2027-02-02.
        "terminal-size-ownership": true,
-        // COMPAT(terminalGraphemeWidths): added in v0.15.0, remove gate after 2027-05-01.
-        "terminal-grapheme-widths": true,
        workspaceTerminals: true,
        // COMPAT(rewind): added in v0.1.X, drop the gate when floor >= v0.1.X.
        rewind: true,
@@ -583,21 +583,16 @@ test("Git refresh, command tracing and 10,000 ignored alias events do no synchro
      // the cold filter. Allocations made by the filter still count.
      global.gc();
      await tick();
-      await marker('FILTER_START');
-      // Schedule the control only after marker IO settles, so it cannot run
-      // and allocate garbage before the cold filter starts. No await may
-      // separate this scheduling from the synchronous measurement.
+      // Unrelated callbacks must not consume the synchronous filter's budget.
      const threadCpuUsage = Reflect.get(process, 'threadCpuUsage');
-      let unrelatedWorkStarted = false;
      const unrelatedWork = tick().then(() => {
-        unrelatedWorkStarted = true;
        const started = threadCpuUsage();
        while (true) {
          const cpu = threadCpuUsage(started);
          if (cpu.user + cpu.system >= 80000) break;
        }
      });
-      assert.equal(unrelatedWorkStarted, false, 'control work must not contaminate the cold filter');
+      await marker('FILTER_START');
      hook.enable();
      let blockingMs;
      try {
@@ -614,7 +609,6 @@ test("Git refresh, command tracing and 10,000 ignored alias events do no synchro
        await marker('FILTER_END');
      }
      await unrelatedWork;
-      assert.equal(unrelatedWorkStarted, true, 'control work must run outside the filter span');
      assert.equal(fsCalls, 0, "filesystem calls");
      assert.equal(notifications, 0, "ignored event notification");
      assert.ok(blockingMs < 20, 'blocking filter work: ' + blockingMs);
@@ -1,60 +0,0 @@
-import { spawnSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
-import { describe, expect, it } from "vitest";
-import { createHeadlessTerminal } from "./headless-terminal.js";
-
-const EMOJI_ROW = "A😀👍❤️👋🏽🇰🇷👨‍👩‍👧B";
-// A, six two-column emoji clusters, B.
-const EMOJI_ROW_END_COL = 1 + 6 * 2 + 1;
-
-async function cursorColAfter(text: string): Promise<number> {
-  const terminal = createHeadlessTerminal({ rows: 2, cols: 40 });
-  try {
-    await new Promise<void>((resolve) => terminal.write(text, resolve));
-    return terminal.buffer.active.cursorX;
-  } finally {
-    terminal.dispose();
-  }
-}
-
-describe("createHeadlessTerminal", () => {
-  it("gives each emoji cluster one two-column cell", async () => {
-    expect(await cursorColAfter(EMOJI_ROW)).toBe(EMOJI_ROW_END_COL);
-  });
-
-  it("keeps ASCII and CJK widths", async () => {
-    expect(await cursorColAfter("ABC")).toBe(3);
-    expect(await cursorColAfter("中文")).toBe(4);
-  });
-
-  // The width table is decoded into a Node Buffer when the module loads. A
-  // Buffer carved out of Node's shared pool starts at a non-zero byteOffset,
-  // and an addon that reads the table header from offset 0 gets wrong widths
-  // or fails to load. Whether the pool offset is zero depends on earlier
-  // allocations, so the test forces a non-zero offset in a fresh process
-  // before the module loads. Zero bytes in front of the table make the
-  // misread header deterministic.
-  it("decodes widths correctly when Node's buffer pool offset is non-zero", () => {
-    const moduleUrl = new URL("./headless-terminal.ts", import.meta.url).href;
-    const script = `
-      Buffer.poolSize = 8 * 1024 * 1024;
-      const occupied = Buffer.from(new Uint8Array(3 * 1024 * 1024));
-      if (occupied.byteOffset !== 0 || occupied.buffer.byteLength !== Buffer.poolSize) {
-        throw new Error("expected a fresh shared pool");
-      }
-      const { createHeadlessTerminal } = await import(${JSON.stringify(moduleUrl)});
-      const terminal = createHeadlessTerminal({ rows: 2, cols: 40 });
-      await new Promise((resolve) => terminal.write(${JSON.stringify(EMOJI_ROW)}, resolve));
-      process.stdout.write(String(terminal.buffer.active.cursorX));
-      terminal.dispose();
-    `;
-    const result = spawnSync(
-      process.execPath,
-      ["--import", "tsx", "--input-type=module", "--eval", script],
-      { cwd: fileURLToPath(new URL(".", import.meta.url)), encoding: "utf8" },
-    );
-
-    expect(result.status, result.stderr).toBe(0);
-    expect(result.stdout).toBe(String(EMOJI_ROW_END_COL));
-  });
-});
@@ -1,22 +0,0 @@
-import { UnicodeGraphemesAddon } from "@xterm/addon-unicode-graphemes";
-import xterm, { type Terminal } from "@xterm/headless";
-
-export interface HeadlessTerminalOptions {
-  rows: number;
-  cols: number;
-  scrollback?: number;
-}
-
-/**
- * A headless xterm that measures text the way Paseo clients render it.
- *
- * Grapheme-cluster widths give every emoji cluster (VS16, skin-tone, flags,
- * ZWJ sequences) one two-column cell, matching color-emoji fonts. Clients
- * replay this buffer's ANSI with the same table, so cells and the cursor line
- * up after reconnect. See docs/terminal-rendering.md.
- */
-export function createHeadlessTerminal(options: HeadlessTerminalOptions): Terminal {
-  const terminal = new xterm.Terminal({ ...options, allowProposedApi: true });
-  terminal.loadAddon(new UnicodeGraphemesAddon());
-  return terminal;
-}
@@ -1,5 +1,6 @@
 import { afterEach, describe, expect, it } from "vitest";
 import {
+  chmodSync,
  existsSync,
  mkdirSync,
  mkdtempSync,
@@ -54,6 +55,7 @@ function makeSources(bundleSource = "export {};\n"): {
  mkdirSync(native, { recursive: true });
  writeFileSync(path.join(native, "pty.node"), "native");
  writeFileSync(path.join(native, "spawn-helper"), "#!/bin/sh\n", { mode: 0o755 });
+  chmodSync(path.join(native, "spawn-helper"), 0o755);
  // Another platform's build is not copied.
  mkdirSync(path.join(nodePtyDirectory, "prebuilds", "other-platform"));
  return { bundleDirectory, nodePtyDirectory };
@@ -410,12 +410,7 @@ describe("createTerminal", () => {
          cwd: realpathSync(tmpdir()),
          cols: 500,
          command: process.execPath,
-          // Keep the PTY alive until the screen assertion; exit disposes its parser.
-          args: [
-            "-e",
-            "process.stdout.write(JSON.stringify(process.argv.slice(1))); setInterval(() => {}, 100000)",
-            nastyPrompt,
-          ],
+          args: ["-e", "process.stdout.write(JSON.stringify(process.argv.slice(1)))", nastyPrompt],
        }),
      );

@@ -568,71 +563,6 @@ describe("createTerminal", () => {
    expect(state.grid[0][1].char).toBe("");
  });

-  it("reports the cursor column after an emoji cluster in DSR replies", async () => {
-    // Programs that measure the cursor (prompts, TUIs) must see the same
-    // column the client renders: an emoji occupies two cells.
-    const program = `
-      process.stdin.setRawMode(true);
-      process.stdin.once("data", (reply) => {
-        process.stdout.write("\\r\\nREPLY " + JSON.stringify(reply.toString()).slice(2, -1));
-      });
-      process.stdout.write("A😀\\x1b[6n");
-      setInterval(() => {}, 100000);
-    `;
-    const session = trackSession(
-      await createTerminal({
-        workspaceId: "ws-test",
-        cwd: realpathSync(tmpdir()),
-        cols: 40,
-        rows: 5,
-        command: process.execPath,
-        args: ["-e", program],
-      }),
-    );
-
-    const state = await waitForState(session, (current) =>
-      getRowText(current, 1).startsWith("REPLY"),
-    );
-
-    expect(getRowText(state, 1)).toBe("REPLY u001b[1;4R");
-  });
-
-  it("replays emoji clusters at their columns with the cursor after them", async () => {
-    const text = "A😀B❤️C👋🏽D👨‍👩‍👧E";
-    const session = trackSession(
-      await createTerminal({
-        workspaceId: "ws-test",
-        cwd: realpathSync(tmpdir()),
-        cols: 40,
-        rows: 5,
-        command: process.execPath,
-        args: [
-          "-e",
-          `process.stdout.write(${JSON.stringify(text)}); setInterval(() => {}, 100000);`,
-        ],
-      }),
-    );
-
-    const state = await waitForState(session, (current) => rowHasChar(current.grid[0], "E"));
-
-    expect(state.grid[0].slice(0, 13).map((cell) => cell.char)).toEqual([
-      "A",
-      "😀",
-      "",
-      "B",
-      "❤️",
-      "",
-      "C",
-      "👋🏽",
-      "",
-      "D",
-      "👨‍👩‍👧",
-      "",
-      "E",
-    ]);
-    expect(state.cursor).toEqual({ row: 0, col: 13 });
-  });
-
  it("captures exit diagnostics from the terminal buffer", async () => {
    const session = trackSession(
      await createTerminal({
@@ -1,5 +1,5 @@
 import * as pty from "node-pty";
-import type { Terminal as TerminalType } from "@xterm/headless";
+import xterm, { type Terminal as TerminalType } from "@xterm/headless";
 import { randomUUID } from "crypto";
 import {
  accessSync,
@@ -25,7 +25,6 @@ import {
  findExecutable,
  findExecutableWithoutProbing,
 } from "../executable-resolution/executable-resolution.js";
-import { createHeadlessTerminal } from "./headless-terminal.js";
 import { createTerminalSerializer } from "./terminal-serializer.js";
 import {
  captureTerminalLines,
@@ -37,6 +36,7 @@ import { TerminalInputModeTracker } from "@getpaseo/protocol/terminal-input-mode
 import { TerminalActivityTracker } from "./activity/terminal-activity-tracker.js";
 import type { TerminalActivity, TerminalActivityState } from "@getpaseo/protocol/terminal-activity";

+const { Terminal } = xterm;
 const require = createRequire(import.meta.url);
 let nodePtySpawnHelperChecked = false;
 const TERMINAL_TITLE_DEBOUNCE_MS = 150;
@@ -796,7 +796,13 @@ export async function createTerminal(
  const activityChangeListeners = new Set<(transition: TerminalActivityTransition) => void>();
  let titleChangeSubscription: { dispose(): void } | null = null;

-  const terminal = createHeadlessTerminal({ rows, cols, scrollback: 10000 });
+  // Create xterm.js headless terminal
+  const terminal = new Terminal({
+    rows,
+    cols,
+    scrollback: 10000,
+    allowProposedApi: true,
+  });

  const serialize = createTerminalSerializer(terminal);

@@ -1,14 +1,15 @@
+import xterm from "@xterm/headless";
 import type { TerminalState } from "@getpaseo/protocol/messages";
-import { createHeadlessTerminal } from "../headless-terminal.js";
 import type { LocalTerminalSession } from "../terminal.js";

 /** Observe the public ANSI replay using a real receiver; no production cell extraction API. */
 export async function readTerminalState(session: LocalTerminalSession): Promise<TerminalState> {
  const { metadata, data } = session.serializeReplay();
-  const terminal = createHeadlessTerminal({
+  const terminal = new xterm.Terminal({
    rows: metadata.rows,
    cols: metadata.cols,
    scrollback: 10000,
+    allowProposedApi: true,
  });
  try {
    await new Promise<void>((resolve) => terminal.write(data, resolve));
@@ -1863,8 +1863,7 @@ it("completes a replay larger than the socket budget while a sibling stays usabl
      ...nodeTerminalCommand(`
      const row = Array.from({length: 1000}, (_, i) => "\\x1b[" + (31 + i % 2) + "mX").join("");
      for (let i = 0; i < 900; i++) process.stdout.write(row + "\\r\\n");
-      // Seeing the marker must mean no trailing newline can still add history.
-      process.stdout.write("READY-WIDE");
+      process.stdout.write("READY-WIDE\\r\\n");
      process.stdin.on("data", data => { if (data.toString().includes("small")) { process.stdout.write("SAME-TERMINAL-LIVE\\r\\n"); return; } process.stdout.write("q".repeat(8 * 1024 * 1024) + "\\r\\nRECOVERED-LIVE\\r\\n", () => require("node:fs").writeFileSync(${JSON.stringify(overflowProgress)}, "done")); });
      setInterval(() => {}, 1000);
    `),
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/website",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "private": true,
  "type": "module",
  "scripts": {
@@ -186,13 +186,7 @@ function insertDocByPath(nodes: DocsNavNode[], doc: Doc, stripTopDirectory = fal

  // A section's top-level directory and its category name the same thing, so
  // only directories below it become collapsible groups.
-  if (
-    stripTopDirectory &&
-    directories[0] &&
-    doc.frontmatter.category?.toLowerCase().endsWith(directories[0].toLowerCase())
-  ) {
-    directories.shift();
-  }
+  if (stripTopDirectory) directories.shift();

  let current = nodes;
  let parent: Extract<DocsNavNode, { type: "group" }> | undefined;
@@ -2,25 +2,6 @@ import { describe, expect, it } from "vitest";
 import { buildDocsNavTree, getDoc, getDocs, getLegacyDocsRedirect, parseHeadings } from "./docs";

 describe("plugin documentation", () => {
-  it.each(["en", "zh-CN"] as const)(
-    "nests local file copying under Git worktrees in %s",
-    (locale) => {
-      const workspaces = buildDocsNavTree(getDocs(locale)).find(
-        (node) => node.type === "category" && node.label === "Workspaces",
-      );
-      expect(workspaces).toMatchObject({
-        children: expect.arrayContaining([
-          expect.objectContaining({
-            type: "group",
-            href: "/docs/worktrees",
-            children: [expect.objectContaining({ href: "/docs/worktrees/worktreeinclude" })],
-          }),
-        ]),
-      });
-      expect(getDoc("worktrees/worktreeinclude", locale)).toBeDefined();
-    },
-  );
-
  it("groups current guides by task without version navigation", () => {
    const plugins = buildDocsNavTree(getDocs("en")).find(
      (node) => node.type === "category" && node.label === "Plugins",
@@ -4,7 +4,7 @@ import { expect, it } from "vitest";

 const docsRoot = path.resolve(import.meta.dirname, "../../../public-docs");

-it.each(["schedules.md", "schedules-cli.md", "mcp.md", "worktrees/index.md"])(
+it.each(["schedules.md", "schedules-cli.md", "mcp.md", "worktrees.md"])(
  "%s makes schedule run retention discoverable",
  async (file) => {
    const markdown = await readFile(path.join(docsRoot, file), "utf8");
@@ -705,59 +705,3 @@ index a9c1804..f5a3c20 100644
 
         return Insets(
             this._insets.top / density,
-diff --git a/node_modules/react-native-unistyles/cxx/shadowTree/ShadowTreeManager.cpp b/node_modules/react-native-unistyles/cxx/shadowTree/ShadowTreeManager.cpp
-index 01026dc..3786ec4 100644
--- a/node_modules/react-native-unistyles/cxx/shadowTree/ShadowTreeManager.cpp
-+++ b/node_modules/react-native-unistyles/cxx/shadowTree/ShadowTreeManager.cpp
-@@ -17,13 +17,16 @@ void shadow::ShadowTreeManager::updateShadowTree(jsi::Runtime& rt) {
-         }
- 
- #if REACT_NATIVE_VERSION_MINOR >= 81
-        std::unordered_map<Tag, folly::dynamic> tagToProps;
-+        // Paseo backport of https://github.com/jpudysz/react-native-unistyles/pull/1357.
-+        // UIManager::updateShadowTree commits a root cloned before the commit, so when a
-+        // window-size commit (rotation, keyboard) lands in between, the retried Unistyles
-+        // commit puts the previous layout constraints back and the app stays laid out for
-+        // the old size. Commit here instead and clone from the root the commit hands us.
-+        std::unordered_set<SurfaceId> affectedSurfaces;
- 
-         for (const auto& [family, props] : updates) {
-             auto safeProps = props.isObject() ? props : folly::dynamic::object();
- 
-            tagToProps.insert({family->getTag(), safeProps});
-
-             auto* mutableFamily = const_cast<ShadowNodeFamily*>(family);
- 
-             if (mutableFamily->nativeProps_DEPRECATED && mutableFamily->nativeProps_DEPRECATED->isObject()) {
-@@ -31,9 +34,30 @@ void shadow::ShadowTreeManager::updateShadowTree(jsi::Runtime& rt) {
-             } else {
-                 mutableFamily->nativeProps_DEPRECATED = std::make_unique<folly::dynamic>(safeProps);
-             }
-+
-+            affectedSurfaces.insert(family->getSurfaceId());
-         }
- 
-        UIManagerBinding::getBinding(rt)->getUIManager().updateShadowTree(std::move(tagToProps));
-+        const auto& shadowTreeRegistry = UIManagerBinding::getBinding(rt)->getUIManager().getShadowTreeRegistry();
-+
-+        shadowTreeRegistry.enumerate([&updates, &affectedSurfaces](const ShadowTree& shadowTree, bool&){
-+            if (!affectedSurfaces.contains(shadowTree.getSurfaceId())) {
-+                return;
-+            }
-+
-+            auto transaction = [&updates](const RootShadowNode& oldRootShadowNode) -> RootShadowNode::Unshared {
-+                auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(oldRootShadowNode, updates);
-+
-+                return std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
-+                    oldRootShadowNode,
-+                    updates,
-+                    affectedNodes
-+                ));
-+            };
-+
-+            // mountSynchronously: this is an update from C++, not React
-+            shadowTree.commit(transaction, {false, true});
-+        });
- #else
-         const auto& shadowTreeRegistry = UIManagerBinding::getBinding(rt)->getUIManager().getShadowTreeRegistry();
- 
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/builtin-plugins",
-  "version": "0.15.0-beta.1",
+  "version": "0.14.0",
  "private": true,
  "type": "module",
  "scripts": {
@@ -84,7 +84,16 @@ Add `--forge <name>` when Paseo cannot infer the forge from the source checkout.

 ## Copy local files with .worktreeinclude

-Use [`.worktreeinclude`](/docs/worktrees/worktreeinclude) to copy selected gitignored files, such as `.env`, from your source checkout before setup runs.
+Create `.worktreeinclude` at the root of your source checkout to copy selected gitignored files into new worktrees:
+
+```gitignore
+.env
+config/*.local.json
+```
+
+Patterns use gitignore syntax. A file must match `.worktreeinclude` and be gitignored to be copied. Tracked files are never copied, and existing destination files are never overwritten. Without `.worktreeinclude`, no local files are copied. Symlinked directories and nested repositories inside an included path cause the copy to fail and abort worktree creation.
+
+The built-in `worktree-include` plugin copies from the checkout you create the worktree from, including when that checkout is another worktree. Copying finishes before setup, terminals, and the first agent. A copy failure aborts creation and removes the new worktree. Copies use copy-on-write clones on APFS and btrfs when supported, with a regular copy elsewhere.

 ## paseo.json

@@ -82,7 +82,16 @@ paseo workspace create \

 ## 使用 .worktreeinclude 复制本地文件 {#copy-local-files-with-worktreeinclude}

-使用 [`.worktreeinclude`](/docs/worktrees/worktreeinclude)，在 setup 运行前将 `.env` 等选定的 Git 忽略文件从源检出复制到新 worktree。
+在源检出的根目录创建 `.worktreeinclude`，将选定的 Git 忽略文件复制到新的 worktree：
+
+```gitignore
+.env
+config/*.local.json
+```
+
+模式使用 gitignore 语法。只有同时匹配 `.worktreeinclude` 且被 Git 忽略的文件才会复制。已跟踪的文件不会被复制，目标中已存在的文件不会被覆盖。没有 `.worktreeinclude` 时，不会复制任何本地文件。包含路径中的符号链接目录和嵌套仓库会导致复制失败，并中止 worktree 创建。
+
+内置的 `worktree-include` 插件从你创建 worktree 时所选的检出复制文件，即使源检出本身也是 worktree。复制会在 setup、终端和第一个 Agent 运行之前完成。复制失败会中止创建并删除新的 worktree。支持时会在 APFS 和 btrfs 上使用写时复制克隆，否则执行普通复制。

 ## paseo.json {#paseojson}

@@ -1,61 +0,0 @@
---
-title: .worktreeinclude
-description: Copy gitignored local files into new Paseo worktrees.
-nav: .worktreeinclude
-order: 12
-category: Workspaces
---
-
-# .worktreeinclude
-
-Add `.worktreeinclude` at the root of your source checkout to copy local configuration into new [Git worktrees](/docs/worktrees). Paseo copies matching gitignored files before setup, terminals, and the first Agent start.
-
-## Copy your local configuration
-
-For a project whose `.gitignore` includes `.env` and `config/*.local.json`, create this `.worktreeinclude`:
-
-```gitignore
-.env
-config/*.local.json
-```
-
-When you create a worktree through Paseo, an existing `.env` and matching files such as `config/dev.local.json` are copied to the same relative paths in the new worktree. Their contents stay out of Git.
-
-Commit `.worktreeinclude` to share the patterns with your team. Each teammate supplies their own ignored files in the checkout they create worktrees from.
-
-## Pattern syntax
-
-Use gitignore syntax, with one pattern per line. Comments start with `#`. Prefix a pattern with `!` to exclude a match:
-
-```gitignore
-# Local environment and configuration
-.env
-config/*.local.json
-!config/production.local.json
-```
-
-A pattern only selects files that Git already ignores. Adding a path here does not ignore it, so also configure `.gitignore` when needed. Tracked files and untracked files that Git does not ignore are excluded.
-
-## When files are copied
-
-The built-in `worktree-include` plugin reads the file from the checkout you create the worktree from. That source can itself be another worktree. Keep the plugin enabled for copying to run.
-
- Without `.worktreeinclude`, the plugin copies nothing.
- Matching files must exist in the source checkout.
- Existing destination files are skipped, preserving their contents.
- Copies happen during creation, with no ongoing synchronization between checkouts.
- A copy error aborts creation and removes the new worktree. Avoid including symlinked directories or nested repositories, which cannot be copied as files.
-
-## Run commands during setup
-
-Use `.worktreeinclude` for files that already exist locally. Use a [setup hook](/docs/worktrees#setup-and-teardown) to install dependencies, generate files, or fetch secrets:
-
-```json
-{
-  "worktree": {
-    "setup": "npm ci"
-  }
-}
-```
-
-Put this configuration in `paseo.json` on the base branch used for the new worktree. Copied files are available when setup runs.
@@ -1,61 +0,0 @@
---
-title: .worktreeinclude
-description: 将 Git 忽略的本地文件复制到新的 Paseo worktree。
-nav: .worktreeinclude
-order: 12
-category: Workspaces
---
-
-# .worktreeinclude
-
-在源检出的根目录添加 `.worktreeinclude`，将本地配置复制到新的 [Git worktree](/docs/worktrees)。Paseo 会在 setup、终端和首个 Agent 启动之前复制匹配的 Git 忽略文件。
-
-## 复制本地配置 {#copy-your-local-configuration}
-
-如果项目的 `.gitignore` 包含 `.env` 和 `config/*.local.json`，创建以下 `.worktreeinclude`：
-
-```gitignore
-.env
-config/*.local.json
-```
-
-通过 Paseo 创建 worktree 时，已有的 `.env` 和 `config/dev.local.json` 等匹配文件会被复制到新 worktree 中的相同相对路径。文件内容仍不会纳入 Git。
-
-提交 `.worktreeinclude`，与团队共享这些模式。每位团队成员在用于创建 worktree 的检出中提供自己的忽略文件。
-
-## 模式语法 {#pattern-syntax}
-
-使用 gitignore 语法，每行一个模式。注释以 `#` 开头。模式前加 `!` 可排除匹配项：
-
-```gitignore
-# Local environment and configuration
-.env
-config/*.local.json
-!config/production.local.json
-```
-
-模式只会选择 Git 已忽略的文件。在此添加路径不会使 Git 忽略该文件，需要时还应配置 `.gitignore`。已跟踪的文件和未被 Git 忽略的未跟踪文件都不会被复制。
-
-## 文件复制时机 {#when-files-are-copied}
-
-内置的 `worktree-include` 插件从用于创建 worktree 的检出读取该文件。源检出也可以是另一个 worktree。保持该插件启用才能执行复制。
-
- 没有 `.worktreeinclude` 时，插件不会复制任何文件。
- 匹配的文件必须存在于源检出中。
- 目标中已存在的文件会被跳过，保留原有内容。
- 复制发生在创建期间，之后不会在检出之间持续同步。
- 复制错误会中止创建并删除新 worktree。避免包含符号链接目录或嵌套仓库，因为它们无法作为文件复制。
-
-## 在 setup 期间运行命令 {#run-commands-during-setup}
-
-使用 `.worktreeinclude` 复制本地已有文件。使用 [setup 钩子](/docs/worktrees#setup-and-teardown) 安装依赖、生成文件或获取密钥：
-
-```json
-{
-  "worktree": {
-    "setup": "npm ci"
-  }
-}
-```
-
-将此配置放入新 worktree 所用基准分支的 `paseo.json` 中。setup 运行时，复制的文件已可使用。
@@ -1,5 +1,5 @@
 import assert from "node:assert/strict";
-import { readFileSync, readdirSync, mkdtempSync, mkdirSync, writeFileSync, rmSync } from "node:fs";
+import { readFileSync, readdirSync, mkdtempSync, writeFileSync, rmSync } from "node:fs";
 import { spawnSync } from "node:child_process";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
@@ -679,48 +679,3 @@ test("macOS jobs use latest runners while preserving release architectures", ()
  // GitHub has no standard macos-latest-intel alias; use the newest Intel image.
  assert.match(release, /runner: macos-26-intel\n\s+electron_arch: x64/);
 });
-
-test("Nix desktop packaging resolves the workspace-local builder", () => {
-  const source = readFileSync(new URL("nix/desktop-package.nix", repoRoot), "utf8");
-  const invocation = source.match(/^\s+([^\n]*electron-builder) \\\n/m)?.[1];
-  assert.ok(invocation, "Nix invokes the desktop packaging tool");
-  const directory = mkdtempSync(join(tmpdir(), "nix-builder-resolution-"));
-  try {
-    const desktop = join(directory, "packages/desktop");
-    mkdirSync(join(desktop, "node_modules/.bin"), { recursive: true });
-    mkdirSync(join(desktop, "node_modules/electron-builder"));
-    writeFileSync(
-      join(desktop, "node_modules/electron-builder/package.json"),
-      JSON.stringify({
-        name: "electron-builder",
-        version: "1.0.0",
-        bin: { "electron-builder": "../.bin/electron-builder" },
-      }),
-    );
-    writeFileSync(
-      join(directory, "package.json"),
-      JSON.stringify({ private: true, workspaces: ["packages/desktop"] }),
-    );
-    writeFileSync(
-      join(desktop, "package.json"),
-      JSON.stringify({
-        name: "desktop-fixture",
-        private: true,
-        devDependencies: { "electron-builder": "1.0.0" },
-      }),
-    );
-    writeFileSync(
-      join(desktop, "node_modules/.bin/electron-builder"),
-      '#!/bin/sh\nprintf "workspace-builder\\n"\n',
-      { mode: 0o755 },
-    );
-    const result = spawnSync("sh", ["-c", `${invocation} --version`], {
-      cwd: desktop,
-      encoding: "utf8",
-    });
-    assert.equal(result.status, 0, result.stderr);
-    assert.equal(result.stdout.trim(), "workspace-builder");
-  } finally {
-    rmSync(directory, { recursive: true, force: true });
-  }
-});
@@ -28,9 +28,6 @@ const patchedPackages = [
  // withUnistyles: also keep the uniProps filter until upstream consumes its control prop.
  // Android configuration: backport 3.5.3; remove the two NativePlatform hunks at >= 3.5.3.
  // https://github.com/jpudysz/react-native-unistyles/compare/v3.5.2...v3.5.3
-  // Layout constraints: backport of https://github.com/jpudysz/react-native-unistyles/pull/1357
-  // (commit from the root the commit hands us, so a concurrent window-size commit is kept).
-  // Remove the ShadowTreeManager hunk when the installed release includes that PR.
  {
    nodeModulesPath: "node_modules/react-native-unistyles",
    patchPrefix: "react-native-unistyles+",