test(server): isolate proxy fixture credential directories

fix(server): apply proxy policy to connected host links
fix(server): read Windows proxy environment entries once
2026-10-29 12:42:57 +00:00 · 2026-10-29 07:44:07 +01:00 · 2026-10-29 07:33:03 +01:00 · 2026-10-29 07:23:57 +01:00 · 2026-10-29 06:54:19 +01:00 · 2026-10-29 06:43:07 +01:00
154 changed files with 4676 additions and 1647 deletions
@@ -1,6 +1,17 @@
 # Changelog

-## 0.14.0-beta.1 - 2026-10-27
+Not released yet. These changes are on `main` but not in 0.14.0-beta.2; the next release entry includes them.
+
+Added:
+
+- 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))
+
+Improved:
+
+- 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-beta.2 - 2026-10-28

 Plugins can now add tools to individual agents and configure their MCP servers when sessions open.

@@ -10,9 +21,8 @@ Voice settings now let you configure speech providers and download local models

 ### Added

- 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 give tools to specific agents ([#7938](https://github.com/getpaseo/paseo/pull/7938))
- Added collapse and expand controls for completed conversation turns ([#7785](https://github.com/getpaseo/paseo/pull/7785), [#7990](https://github.com/getpaseo/paseo/pull/7990), [#8026](https://github.com/getpaseo/paseo/pull/8026) by [@akaready](https://github.com/akaready), [@Dey11](https://github.com/Dey11), [@Sebeb](https://github.com/Sebeb), [@Waishnav](https://github.com/Waishnav))
+- Added Chat display settings that group tool calls or collapse completed conversation turns ([#7785](https://github.com/getpaseo/paseo/pull/7785), [#7990](https://github.com/getpaseo/paseo/pull/7990), [#8026](https://github.com/getpaseo/paseo/pull/8026), [#8042](https://github.com/getpaseo/paseo/pull/8042), [#8109](https://github.com/getpaseo/paseo/pull/8109) by [@akaready](https://github.com/akaready), [@Dey11](https://github.com/Dey11), [@Sebeb](https://github.com/Sebeb), [@Waishnav](https://github.com/Waishnav))
 - Let plugins add MCP servers whenever an agent session opens ([#7983](https://github.com/getpaseo/paseo/pull/7983))
 - Added downloadable local speech models in Voice settings, including SenseVoice and Whisper for Chinese dictation ([#7295](https://github.com/getpaseo/paseo/pull/7295))
 - Added a choice of Enter or ⌘/Ctrl+Enter to send messages ([#5503](https://github.com/getpaseo/paseo/pull/5503) by [@lukelabonte](https://github.com/lukelabonte))
@@ -22,10 +32,9 @@ Voice settings now let you configure speech providers and download local models

 ### Improved

- 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))
-
 - Release eligible agent runtimes after one idle hour, resuming the saved session on the next prompt ([#7782](https://github.com/getpaseo/paseo/pull/7782))
 - Added a link back to the parent in subagent panes ([#7784](https://github.com/getpaseo/paseo/pull/7784))
+- Opened subagents in place of the subagent list on phones, with Back returning to the list ([#8093](https://github.com/getpaseo/paseo/pull/8093))
 - Added clickable links and selectable descriptions to question cards ([#7419](https://github.com/getpaseo/paseo/pull/7419) by [@NoSync](https://github.com/NoSync))
 - Kept large Import session lists responsive on web ([#7872](https://github.com/getpaseo/paseo/pull/7872) by [@royenheart](https://github.com/royenheart))
 - Enlarged project and workspace menu buttons on phones ([#7928](https://github.com/getpaseo/paseo/pull/7928))
@@ -51,10 +60,12 @@ Voice settings now let you configure speech providers and download local models
 - Fixed outside-folder links replacing Files with an access error ([#7726](https://github.com/getpaseo/paseo/pull/7726) by [@jtomaszewski](https://github.com/jtomaszewski))
 - Fixed command suggestions overlapping a growing Composer on phones ([#7910](https://github.com/getpaseo/paseo/pull/7910))
 - Fixed bare Markdown URLs losing ports or stopping at colons in paths ([#7859](https://github.com/getpaseo/paseo/pull/7859) by [@mariotaku](https://github.com/mariotaku))
- Fixed inline code sizing inside emphasis, links and headings ([#7889](https://github.com/getpaseo/paseo/pull/7889))
+- Fixed inline code sizing inside emphasis, links and headings ([#7889](https://github.com/getpaseo/paseo/pull/7889), [#8088](https://github.com/getpaseo/paseo/pull/8088))
+- Fixed compact navigation sizes and a cramped Settings detail pane in docked windows 600–719 wide ([#8052](https://github.com/getpaseo/paseo/pull/8052) by [@zeyugao](https://github.com/zeyugao))
 - Fixed Settings losing the selected host or sidebar scroll position between sections ([#7893](https://github.com/getpaseo/paseo/pull/7893), [#7899](https://github.com/getpaseo/paseo/pull/7899) by [@bingqilinweimaotai](https://github.com/bingqilinweimaotai), [@wangnan0916](https://github.com/wangnan0916))
 - Fixed OpenCode v2 subagent rows missing model and token details ([#7799](https://github.com/getpaseo/paseo/pull/7799) by [@Davnn1](https://github.com/Davnn1))
 - Fixed file-link tooltips staying over the preview after leaving a chat ([#7842](https://github.com/getpaseo/paseo/pull/7842))
+- Fixed model discovery errors touching the model picker edges ([#8039](https://github.com/getpaseo/paseo/pull/8039) by [@ilteoood](https://github.com/ilteoood))
 - Fixed model selectors staying open over Settings ([#7783](https://github.com/getpaseo/paseo/pull/7783) by [@ragokan](https://github.com/ragokan))

 ### Notes
@@ -1,6 +1,17 @@
 # 更新日志

-## 0.14.0-beta.1 - 2026-10-27
+尚未发布。以下变更已合入 `main`，但不包含在 0.14.0-beta.2 中；下一个版本的条目会包含它们。
+
+新增：
+
+- 在 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))
+
+改进：
+
+- 新增采用 `subject.operation.position` 命名的 `server.addHook` 和在 setup 及 Agent 之前等待的 `worktree.create.after` 钩子，弃用原有的插件钩子注册方法并保留原有行为 ([#8081](https://github.com/getpaseo/paseo/pull/8081))
+
+## 0.14.0-beta.2 - 2026-10-28

 插件现在可以为单个 Agent 添加工具，并在会话打开时配置其 MCP 服务器。

@@ -11,7 +22,7 @@
 ### 新增

 - 插件现在可以为特定 Agent 提供工具 ([#7938](https://github.com/getpaseo/paseo/pull/7938))
- 新增已完成对话轮次的折叠和展开功能 ([#7785](https://github.com/getpaseo/paseo/pull/7785), [#7990](https://github.com/getpaseo/paseo/pull/7990), [#8026](https://github.com/getpaseo/paseo/pull/8026) by [@akaready](https://github.com/akaready), [@Dey11](https://github.com/Dey11), [@Sebeb](https://github.com/Sebeb), [@Waishnav](https://github.com/Waishnav))
+- 新增“聊天显示”设置，可将工具调用分组或折叠已完成的对话轮次 ([#7785](https://github.com/getpaseo/paseo/pull/7785), [#7990](https://github.com/getpaseo/paseo/pull/7990), [#8026](https://github.com/getpaseo/paseo/pull/8026), [#8042](https://github.com/getpaseo/paseo/pull/8042), [#8109](https://github.com/getpaseo/paseo/pull/8109) by [@akaready](https://github.com/akaready), [@Dey11](https://github.com/Dey11), [@Sebeb](https://github.com/Sebeb), [@Waishnav](https://github.com/Waishnav))
 - 插件现在可以在每次打开 Agent 会话时添加 MCP 服务器 ([#7983](https://github.com/getpaseo/paseo/pull/7983))
 - 语音设置新增可下载的本地语音模型，支持使用 SenseVoice 和 Whisper 进行中文听写 ([#7295](https://github.com/getpaseo/paseo/pull/7295))
 - 新增 Enter 或 ⌘/Ctrl+Enter 发送消息的快捷键选项 ([#5503](https://github.com/getpaseo/paseo/pull/5503) by [@lukelabonte](https://github.com/lukelabonte))
@@ -21,10 +32,9 @@

 ### 改进

- 新增采用 `subject.operation.position` 命名的 `server.addHook` 和在 setup 及 Agent 之前等待的 `worktree.create.after` 钩子，弃用原有的插件钩子注册方法并保留原有行为 ([#8081](https://github.com/getpaseo/paseo/pull/8081))
-
 - 符合条件的 Agent 运行时空闲一小时后释放，下次发送提示词时恢复已保存的会话 ([#7782](https://github.com/getpaseo/paseo/pull/7782))
 - 在子 Agent 窗格中新增返回父 Agent 的链接 ([#7784](https://github.com/getpaseo/paseo/pull/7784))
+- 在手机上从子 Agent 列表打开子 Agent 时直接替换列表，点按“返回”可回到列表 ([#8093](https://github.com/getpaseo/paseo/pull/8093))
 - 问题卡片新增可点击链接和可选中的描述文本 ([#7419](https://github.com/getpaseo/paseo/pull/7419) by [@NoSync](https://github.com/NoSync))
 - 减少网页端长会话导入列表的操作卡顿 ([#7872](https://github.com/getpaseo/paseo/pull/7872) by [@royenheart](https://github.com/royenheart))
 - 增大手机上项目和工作区菜单按钮的点击区域 ([#7928](https://github.com/getpaseo/paseo/pull/7928))
@@ -50,10 +60,12 @@
 - 修复工作区外的文件夹链接使 Files 显示访问错误的问题 ([#7726](https://github.com/getpaseo/paseo/pull/7726) by [@jtomaszewski](https://github.com/jtomaszewski))
 - 修复手机上命令建议与不断增高的 Composer 重叠的问题 ([#7910](https://github.com/getpaseo/paseo/pull/7910))
 - 修复 Markdown 裸链接丢失端口或在路径冒号处截断的问题 ([#7859](https://github.com/getpaseo/paseo/pull/7859) by [@mariotaku](https://github.com/mariotaku))
- 修复强调、链接和标题中行内代码的字号问题 ([#7889](https://github.com/getpaseo/paseo/pull/7889))
+- 修复强调、链接和标题中行内代码的字号问题 ([#7889](https://github.com/getpaseo/paseo/pull/7889), [#8088](https://github.com/getpaseo/paseo/pull/8088))
+- 修复宽度 600–719 的停靠布局使用紧凑导航尺寸、设置详情面板过窄的问题 ([#8052](https://github.com/getpaseo/paseo/pull/8052) by [@zeyugao](https://github.com/zeyugao))
 - 修复切换设置页面时丢失已选主机或侧栏滚动位置的问题 ([#7893](https://github.com/getpaseo/paseo/pull/7893), [#7899](https://github.com/getpaseo/paseo/pull/7899) by [@bingqilinweimaotai](https://github.com/bingqilinweimaotai), [@wangnan0916](https://github.com/wangnan0916))
 - 修复 OpenCode v2 子 Agent 行缺少模型和 token 详情的问题 ([#7799](https://github.com/getpaseo/paseo/pull/7799) by [@Davnn1](https://github.com/Davnn1))
 - 修复离开聊天后文件链接提示仍遮挡预览的问题 ([#7842](https://github.com/getpaseo/paseo/pull/7842))
+- 修复模型发现错误信息紧贴模型选择器边缘的问题 ([#8039](https://github.com/getpaseo/paseo/pull/8039) by [@ilteoood](https://github.com/ilteoood))
 - 修复模型选择器在打开设置后仍然显示的问题 ([#7783](https://github.com/getpaseo/paseo/pull/7783) by [@ragokan](https://github.com/ragokan))

 ### 说明
@@ -12,6 +12,26 @@ initializing → idle → running → idle (or error → closed)

 Each live agent in `AgentManager` carries a `lastStatus` of `initializing`, `idle`, `running`, or `error`. `closed` is the persisted, resumable state for an agent record that has no live provider runtime. State transitions persist to disk and stream to subscribed clients via WebSocket.

+## Daemon restart recovery
+
+Hosts resume interrupted agents by default after graceful shutdown or a crash. The daemon
+reopens the saved provider conversation and settings, then sends `Resume working.`. Change
+`agents.resumePrompt` or disable `agents.resumeOnStartup` in host config or Host settings → Agents.
+Disabling recovery consumes pending intent; enabling it later does not revive old work.
+
+Only agents recorded as running qualify. Idle and initializing agents stay inactive. Archived
+agents or workspaces, private helpers and Hub-owned executions retain their own lifecycle.
+Explicit creation environment overrides are saved with the agent and reapplied when reopening.
+
+Startup chooses candidates before anything else reads or repairs persisted running state, then
+opens connections and resumes every candidate in the background. A provider that is slow to reopen
+holds back only its own agent; a failed reopen is logged. Graceful shutdown records intent before
+closing runtimes.
+
+This is best-effort continuation. A crash between saving intent and dispatching a prompt can lose
+or repeat a continuation. Provider resume owns conversation restoration; there is no recovery retry
+loop or exactly-once turn guarantee.
+
 ## Runtime residency

 An unarchived agent may be `closed` without being deleted or archived. Closing releases its provider
@@ -139,8 +159,10 @@ caller, child, and host into one watch.

 Bootstrap restores these watches after repairing stale running records to `closed` and before opening
 ingress. Reading a closed child's result does not load its provider. A finish notification reports that
-the child's run has settled; the parent decides whether its task is complete. Recovery never resumes
-child work. Archived or deleted parents suppress delivery; parent-owned creation watches also stop
+the child's run has settled; the parent decides whether its task is complete. A child chosen for restart
+recovery is observed only after its resume was sent, so the parent never hears that it was closed
+in between. Archived or deleted parents suppress delivery;
+parent-owned creation watches also stop
 reporting after detachment.

 Intent remains stored until the parent's notification dispatch is acknowledged. Dispatch failure
@@ -493,6 +493,16 @@ The supervisor alone publishes its ready worker's endpoint in `paseo.pid`, clear

 Worker restart retains supervisor arguments/environment and rereads the configuration file. Updating a package and observing its new worker version do not refresh the running supervisor code; the launcher owns full-process replacement. See [CLI lifecycle contracts](../public-docs/cli.md#daemon-management).

+## Outbound networking
+
+The daemon and its plugin processes honor `HTTPS_PROXY`, `HTTP_PROXY`, and `NO_PROXY`
+(including lowercase forms, which take precedence). Fetch and relay, Hub, and connected-host WebSockets
+share this policy. Loopback (`localhost`, `127.0.0.1`, `::1`) always goes direct.
+A proxy without a scheme uses HTTP. Invalid values and unsupported proxy schemes
+are treated as unset, with one warning naming the variable in `daemon.log`.
+Agent and terminal environments are unchanged. System proxy settings and SOCKS-only
+`ALL_PROXY` configurations are not supported.
+
 ## Deployment models

 1. **Local daemon** (default): `paseo daemon start` on `127.0.0.1:6767`
@@ -203,7 +203,7 @@ Inline errors are a single sentence in `palette.red[300]` `xs`, sitting under th

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

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

 Imperative errors are `Alert.alert("Error", "Unable to ...")` (the React Native `Alert` API, not this component) for failures that interrupt the flow and have no place on the page.

@@ -447,6 +447,12 @@ owns payloads, ordering, failure behavior, and examples. `agent.create.before` e
 configuration; `agent.open.before` contributes launch-only `env`, `tools`, and `mcpServers` on
 every open. Executable tool definitions stay in the plugin process; only metadata crosses the boundary.

+Worktree placement is resolved before Git source planning, so a hook can change the branch and base
+without undoing fetched refs. Restores use the recorded destination and bypass creation hooks.
+Workspace records decide ownership, including explicit non-ownership after recovery. Without a record,
+ownership checks prefer the marker-verified worktree root over the legacy
+path shape: a plugin can place a worktree several directories below the default worktrees root.
+
 Emit from the operation owner, not a client subscription. Provider history replay must not trigger
 live hooks. Notifications must not be awaited inside agent mutations: a handler can send a prompt
 or answer a permission through its own daemon session. Awaiting it there deadlocks that command.
@@ -10,6 +10,11 @@ then replaces the previous tool state or merges into the current text item. Inte
 are never retained for history or catch-up. Provider history is the durable transcript authority
 and rebuilds the projection when an agent resumes.

+Pagination bounds each read, not total resident history. Active and idle agents retain their
+projected transcript; archive releases it and later history reads rebuild it from the provider.
+Streaming overhead must remain proportional to the retained transcript. Cumulative text snapshots
+must be released after their deltas have been consumed.
+
 The invariants are:

 > A continuously subscribed client applies every committed row in order. Opening or resuming an
@@ -1 +1 @@
-sha256-5/wat91m8GWxkGVk211lu9KFLhDQNEF/dlMhHMGf8Q0=
+sha256-AmMp/4ugSUKXTL6H0oJaGJMztVGiYCPXeWteQaaaguw=
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "workspaces": [
@@ -37590,7 +37590,7 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "dependencies": {
        "@codemirror/commands": "6.10.4",
        "@codemirror/language": "6.12.4",
@@ -39793,12 +39793,12 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.14.0-beta.1",
-        "@getpaseo/protocol": "0.14.0-beta.1",
-        "@getpaseo/server": "0.14.0-beta.1",
+        "@getpaseo/client": "0.14.0-beta.2",
+        "@getpaseo/protocol": "0.14.0-beta.2",
+        "@getpaseo/server": "0.14.0-beta.2",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -40045,10 +40045,10 @@
    },
    "packages/client": {
      "name": "@getpaseo/client",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "dependencies": {
-        "@getpaseo/protocol": "0.14.0-beta.1",
-        "@getpaseo/relay": "0.14.0-beta.1",
+        "@getpaseo/protocol": "0.14.0-beta.2",
+        "@getpaseo/relay": "0.14.0-beta.2",
        "ws": "^8.20.0",
        "zod": "^4.4.3"
      },
@@ -40060,7 +40060,7 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "license": "Apache-2.0",
      "dependencies": {
        "@getpaseo/cli": "*",
@@ -40304,7 +40304,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "license": "MIT",
      "devDependencies": {
        "@types/jest": "^29.5.14",
@@ -40350,7 +40350,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "dependencies": {
        "@codemirror/language": "6.12.4",
        "@codemirror/legacy-modes": "^6.5.3",
@@ -40379,15 +40379,15 @@
    },
    "packages/plugin": {
      "name": "@getpaseo/plugin",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "dependencies": {
        "@agentclientprotocol/sdk": "^1.4.0",
        "i18next": "^26.3.0",
        "use-sync-external-store": "^1.6.0"
      },
      "devDependencies": {
-        "@getpaseo/client": "0.14.0-beta.1",
-        "@getpaseo/protocol": "0.14.0-beta.1",
+        "@getpaseo/client": "0.14.0-beta.2",
+        "@getpaseo/protocol": "0.14.0-beta.2",
        "@types/node": "^20.9.0",
        "@types/react": "~19.2.0",
        "react": "19.2.3",
@@ -40397,8 +40397,8 @@
        "zod": "^4.4.3"
      },
      "peerDependencies": {
-        "@getpaseo/client": "0.14.0-beta.1",
-        "@getpaseo/protocol": "0.14.0-beta.1",
+        "@getpaseo/client": "0.14.0-beta.2",
+        "@getpaseo/protocol": "0.14.0-beta.2",
        "react": ">=19.1.0 <20",
        "react-native": ">=0.81.5",
        "zod": "^4.4.3"
@@ -40420,7 +40420,7 @@
    },
    "packages/protocol": {
      "name": "@getpaseo/protocol",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "dependencies": {
        "semver": "^7.8.5",
        "zod": "^4.4.3"
@@ -40447,7 +40447,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "dependencies": {
        "@noble/ciphers": "^2.4.0",
        "@noble/curves": "^2.4.0",
@@ -40668,16 +40668,16 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.17.1",
        "@anthropic-ai/claude-agent-sdk": "0.3.246",
        "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.14.0-beta.1",
-        "@getpaseo/highlight": "0.14.0-beta.1",
-        "@getpaseo/plugin": "0.14.0-beta.1",
-        "@getpaseo/protocol": "0.14.0-beta.1",
-        "@getpaseo/relay": "0.14.0-beta.1",
+        "@getpaseo/client": "0.14.0-beta.2",
+        "@getpaseo/highlight": "0.14.0-beta.2",
+        "@getpaseo/plugin": "0.14.0-beta.2",
+        "@getpaseo/protocol": "0.14.0-beta.2",
+        "@getpaseo/relay": "0.14.0-beta.2",
        "@isaacs/ttlcache": "^2.1.4",
        "@modelcontextprotocol/sdk": "1.29.0",
        "@opencode-ai/sdk": "1.14.46",
@@ -40690,6 +40690,7 @@
        "esbuild": "^0.25.12",
        "express": "^4.18.2",
        "fast-deep-equal": "^3.1.3",
+        "https-proxy-agent": "^7.0.6",
        "lru-cache": "^11.5.1",
        "markdown-it": "^10.0.0",
        "mnemonic-id": "^3.2.7",
@@ -40707,6 +40708,7 @@
        "strip-ansi": "^7.1.2",
        "tree-kill": "^1.2.2",
        "typescript": "^5.9.3",
+        "undici": "^7.24.8",
        "uuid": "^9.0.1",
        "which": "^5.0.0",
        "ws": "^8.14.2",
@@ -41280,6 +41282,15 @@
        "url": "https://opencollective.com/vitest"
      }
    },
+    "packages/server/node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
    "packages/server/node_modules/ajv": {
      "version": "8.20.0",
      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
@@ -41349,6 +41360,19 @@
        "@esbuild/win32-x64": "0.25.12"
      }
    },
+    "packages/server/node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
    "packages/server/node_modules/isexe": {
      "version": "3.1.5",
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz",
@@ -41598,7 +41622,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.29.1",
        "@cloudflare/workers-types": "^4.20260317.1",
@@ -43208,7 +43232,7 @@
    },
    "plugins": {
      "name": "@getpaseo/builtin-plugins",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
      "dependencies": {
        "@getpaseo/plugin": "*",
        "zod": "^4.4.3"
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -1,69 +0,0 @@
-import { randomUUID } from "node:crypto";
-import type { Page } from "@playwright/test";
-import { expect, metroTest as test } from "../support/fixtures";
-import { gotoAppShell } from "../support/helpers/app";
-import { buildSeededHost } from "../support/helpers/daemon-registry";
-import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
-
-// 0.8.0 predates terminalsSurviveRestart and supports daemonSelfUpdate.
-const PUBLISHED_DAEMON_VERSION = "0.8.0";
-const COMPACT = { width: 390, height: 844 };
-
-// Opens the app against a published 0.8.0 daemon, with the developer daemon blocked.
-async function withOutdatedDaemon(page: Page, run: () => Promise<void>): Promise<void> {
-  const serverId = `srv_daemon_outdated_${randomUUID().replaceAll("-", "").slice(0, 12)}`;
-  const daemon = await startIsolatedHostDaemon(serverId, {
-    publishedVersion: PUBLISHED_DAEMON_VERSION,
-  });
-
-  try {
-    const host = buildSeededHost({
-      serverId,
-      endpoint: `127.0.0.1:${daemon.port}`,
-      nowIso: new Date().toISOString(),
-    });
-    await page.route(/:6767\b/, (route) => route.abort());
-    await page.routeWebSocket(/:6767\b/, async (webSocket) => {
-      await webSocket.close({ code: 1008, reason: "Blocked developer daemon during e2e." });
-    });
-    await page.addInitScript(
-      ({ seededHost }) => {
-        localStorage.setItem("@paseo:e2e", "1");
-        localStorage.setItem("@paseo:daemon-registry", JSON.stringify([seededHost]));
-      },
-      { seededHost: host },
-    );
-
-    await gotoAppShell(page);
-    await run();
-  } finally {
-    await daemon.close();
-  }
-}
-
-async function expectOutdatedNotice(page: Page): Promise<void> {
-  const callout = page.getByTestId("daemon-outdated-callout").first();
-  await expect(callout).toBeVisible({ timeout: 30_000 });
-  await expect(callout).toContainText("Daemon out of date");
-  await expect(callout).toContainText(`daemon v${PUBLISHED_DAEMON_VERSION}`);
-  await expect(callout).toContainText("Updating restarts the daemon and closes open terminals.");
-  const update = page.getByTestId("daemon-outdated-callout-update").first();
-  await expect(update).toBeVisible();
-  await expect(update).toBeEnabled();
-}
-
-test("sidebar shows an update notice when the active host's daemon is older than the app", async ({
-  page,
-}) => {
-  test.setTimeout(180_000);
-  await withOutdatedDaemon(page, () => expectOutdatedNotice(page));
-});
-
-test("compact sidebar shows the update notice, which is a native callout", async ({ page }) => {
-  test.setTimeout(180_000);
-  await page.setViewportSize(COMPACT);
-  await withOutdatedDaemon(page, async () => {
-    await page.getByRole("button", { name: "Open menu", exact: true }).first().click();
-    await expectOutdatedNotice(page);
-  });
-});
@@ -204,19 +204,26 @@ test.describe("Projects settings", () => {
  }) => {
    const repo = await createTempGitRepo("projects-settings-empty-");
    const client = await connectSeedClient();
-    let projectId: string | null = null;
+    let projectViewKey: string | null = null;

    try {
      await gotoAppShell(page);

-      projectId = await addProjectFromSidebar(page, repo.path);
-      await openProjectSettingsFromSidebar(page, projectId);
+      projectViewKey = await addProjectFromSidebar(page, repo.path);
+      await openProjectSettingsFromSidebar(page, projectViewKey);

      await expectProjectSettingsFormVisible(page);
      await expect(page.getByTestId("project-settings-back-button")).not.toBeVisible();
    } finally {
-      if (projectId) {
-        await client.removeProject(projectId).catch(() => undefined);
+      if (projectViewKey) {
+        const project = (await client.listProjects()).projects.find(
+          (entry) => entry.projectKey === projectViewKey,
+        );
+        expect(project).toBeDefined();
+        await client.removeProject(project!.projectId);
+        expect(
+          (await client.listProjects()).projects.map((entry) => entry.projectKey),
+        ).not.toContain(projectViewKey);
      }
      await client.close().catch(() => undefined);
      await repo.cleanup().catch(() => undefined);
@@ -30,6 +30,10 @@ import {
  addDirectHostFromSettings,
  expectHostOnlineWithoutError,
  expectIdleAgentRelease,
+  editRestartRecoveryPrompt,
+  expectRestartRecoveryEnabled,
+  expectRestartRecoveryPrompt,
+  setRestartRecoveryEnabled,
  setIdleAgentRelease,
 } from "../support/helpers/settings";

@@ -252,3 +256,20 @@ test.describe("Settings host page", () => {
    await expectHostActionCards(page, serverId);
  });
 });
+
+test("restart recovery host controls persist the opt-out and custom prompt", async ({ page }) => {
+  const serverId = getServerId();
+  await gotoAppShell(page);
+  await openSettings(page);
+  await openSettingsHost(page, serverId);
+  await openHostSection(page, serverId, "agents");
+  await expectRestartRecoveryEnabled(page, true);
+  await expectRestartRecoveryPrompt(page, "Resume working.");
+  await editRestartRecoveryPrompt(page, "Continue the interrupted work.");
+  await setRestartRecoveryEnabled(page, false);
+  await page.reload();
+  await expectRestartRecoveryEnabled(page, false);
+  await setRestartRecoveryEnabled(page, true);
+  await expectRestartRecoveryPrompt(page, "Continue the interrupted work.");
+  await editRestartRecoveryPrompt(page, "Resume working.");
+});
@@ -415,19 +415,8 @@ test.describe("Settings — compact master-detail", () => {
    const workspace = await withWorkspace({ prefix: "host-picker-settings-back-" });
    const workspaceRoute = buildHostWorkspaceRoute(getServerId(), workspace.workspaceId);

-    const worktreeSetupCallout = page.locator('[data-testid^="worktree-setup-callout-"]');
-
-    await test.step("the wide sidebar shows the worktree setup prompt for this workspace", async () => {
-      await page.setViewportSize({ width: 1280, height: 900 });
-      await openWorkspace(page, workspace);
-      await expect(worktreeSetupCallout.first()).toBeVisible({ timeout: 30_000 });
-      await page.setViewportSize({ width: 390, height: 844 });
-    });
-
+    await openWorkspace(page, workspace);
    await page.getByRole("button", { name: "Open menu", exact: true }).click();
-    // The compact sidebar shows only native callouts, so the prompt stays out.
-    await expect(page.getByTestId("sidebar-hosts-trigger")).toBeVisible();
-    await expect(worktreeSetupCallout).toHaveCount(0);
    await page.getByTestId("sidebar-hosts-trigger").click();
    await page.getByRole("button", { name: /Open .* settings/ }).click();

@@ -53,11 +53,18 @@ async function quickDragFirstRowAfterSecond(
  await page.mouse.move(source.x, source.y + 7);
  await expect(trailingScrim).toHaveCount(0);
  await page.mouse.move(target.x, target.y, { steps: 4 });
-  await page.mouse.up();
+  await finishSidebarDrag(page);

  await expect.poll(() => rowTestIds(rows)).toEqual([before[1], before[0]]);
 }

+async function finishSidebarDrag(page: Page): Promise<void> {
+  await page.mouse.up();
+  // dnd-kit's pointer sensor keeps its document click blocker for 50 ms after drop.
+  // Row order updates before that blocker is removed; wait before the next user action.
+  await page.waitForTimeout(60);
+}
+
 async function dragWithoutReordering(rows: Locator): Promise<void> {
  const before = await rowTestIds(rows);
  const source = await visibleBoundingBox(rows.nth(0));
@@ -66,7 +73,7 @@ async function dragWithoutReordering(rows: Locator): Promise<void> {
  await page.mouse.move(source.x + source.width / 2, source.y + source.height / 2);
  await page.mouse.down();
  await page.mouse.move(target.x + target.width / 2, target.y + target.height / 2, { steps: 5 });
-  await page.mouse.up();
+  await finishSidebarDrag(page);
  await expect.poll(() => rowTestIds(rows)).toEqual(before);
 }

@@ -717,15 +717,15 @@ test("open usage clocks advance without refreshing or reopening", async ({ page
    await openCompactUsageWithClock(page, now);
    const card = page.getByTestId("usage-report-login-journey:account");
    await expect(card.getByTestId("usage-freshness")).toHaveText("Updated just now");
-    await expect(card.getByText("resets 30m", { exact: false }).first()).toBeVisible();
+    await expect(card.getByText("resets in 30m", { exact: false }).first()).toBeVisible();
    // The shared minute clock is wall-aligned, and the daemon timestamps use real time.
    // After two browser minutes the latest displayed tick is one or two minutes old.
    await advanceUsageClock(page, 120_000);
    await expect(card.getByTestId("usage-freshness")).toHaveText(/^Updated [12]m ago$/);
-    await expect(card.getByText(/resets (28|29)m/).first()).toBeVisible();
-    await expect(card.getByText(/runs out (28|29)m/)).toBeVisible();
+    await expect(card.getByText(/resets in (28|29)m/).first()).toBeVisible();
+    await expect(card.getByText(/runs out in (28|29)m/)).toBeVisible();
    await expect(card.getByTestId("provider-usage-balance-credits-reset")).toHaveText(
-      /^resets (28|29)m$/,
+      /^resets in (28|29)m\s·\s/,
    );
  } finally {
    await login.cleanup();
@@ -1,35 +0,0 @@
-# Native daemon-outdated notice
-
-The flow needs the development app connected to an isolated daemon older than the app. Install a published daemon that predates `terminalsSurviveRestart`, start it in its own home, and bundle the app against it. `<checkout>` is the root of this repository; `<port>`, `<metro-port>` and `<udid>` are a free daemon port, a free Metro port and the booted simulator.
-
-Run this once, in any directory. It installs into `/tmp/old-daemon`, not globally:
-
-```sh
-npm install --prefix /tmp/old-daemon --no-package-lock @getpaseo/server@0.8.0
-```
-
-Terminal 1, the old daemon. It runs in the foreground; keep it running:
-
-```sh
-cd /tmp/old-daemon/node_modules/@getpaseo/server
-PASEO_HOME=/tmp/old-daemon-home PASEO_LISTEN=0.0.0.0:<port> PASEO_RELAY_ENABLED=0 node dist/scripts/supervisor-entrypoint.js
-```
-
-Terminal 2, Metro. It runs in the foreground; keep it running:
-
-```sh
-cd <checkout>/packages/app
-APP_VARIANT=development EXPO_PUBLIC_LOCAL_DAEMON=localhost:<port> npx expo start --port <metro-port> --clear
-```
-
-Terminal 3, the flow, while terminals 1 and 2 are still running:
-
-```sh
-cd <checkout>
-xcrun simctl openurl <udid> "paseo://expo-development-client/?url=http%3A%2F%2F127.0.0.1%3A<metro-port>"
-maestro --udid <udid> test packages/app/e2e/mobile/agent-device/native-daemon-outdated-notice.ios.yaml --env DAEMON_VERSION=0.8.0
-```
-
-Start with the sidebar closed. The flow opens it, then asserts the notice, its daemon version, the terminals line for a daemon without `terminalsSurviveRestart`, and an enabled Update button. Do not tap Update: on 0.8.0 it runs a global `npm install -g @getpaseo/cli@latest`.
-
-When you are done, stop terminals 1 and 2 and remove `/tmp/old-daemon` and `/tmp/old-daemon-home`.
@@ -1,26 +0,0 @@
-appId: sh.paseo.debug
---
-# The app must be connected to a daemon older than the app that predates
-# terminalsSurviveRestart (0.8.0). See native-daemon-outdated-notice-preconditions.md.
- launchApp
- runFlow:
-    when:
-      visible: ".*getRegistrationInfoAsync.*"
-    commands:
-      - tapOn: ".*getRegistrationInfoAsync.*"
-      - tapOn: Dismiss
- extendedWaitUntil:
-    visible: "Open menu"
-    timeout: 60000
- tapOn: "Open menu"
- extendedWaitUntil:
-    visible:
-      id: daemon-outdated-callout
-    timeout: 30000
- assertVisible: "Daemon out of date"
- assertVisible: ".*daemon v${DAEMON_VERSION}.*"
- assertVisible: "Updating restarts the daemon and closes open terminals."
- assertVisible:
-    id: daemon-outdated-callout-update
-    enabled: true
- takeScreenshot: native-daemon-outdated-notice
@@ -560,3 +560,41 @@ export async function expectHostOnlineWithoutError(page: Page): Promise<void> {
  await expect(page.getByTestId("host-page-identity")).toContainText("Online");
  await expect(page.getByTestId("host-connection-error")).toHaveCount(0);
 }
+
+function restartRecoverySwitch(page: Page) {
+  return page.getByRole("switch", { name: "Resume agents after restart", exact: true });
+}
+
+function restartRecoveryEditButton(page: Page) {
+  return page.getByRole("button", { name: "Edit prompt", exact: true });
+}
+
+export async function setRestartRecoveryEnabled(page: Page, enabled: boolean) {
+  const toggle = restartRecoverySwitch(page);
+  await toggle.click();
+  await expectRestartRecoveryEnabled(page, enabled);
+}
+
+// The prompt is only editable while restart recovery is on.
+export async function expectRestartRecoveryEnabled(page: Page, enabled: boolean) {
+  await expect(restartRecoverySwitch(page)).toBeChecked({ checked: enabled });
+  await expect(restartRecoveryEditButton(page)).toBeEnabled({ enabled });
+}
+
+export async function editRestartRecoveryPrompt(page: Page, prompt: string) {
+  await restartRecoveryEditButton(page).click();
+  const sheet = page.getByTestId("host-page-restart-recovery-sheet");
+  await sheet.getByRole("textbox", { name: "Resume prompt", exact: true }).fill(prompt);
+  await sheet.getByRole("button", { name: "Save", exact: true }).click();
+  await expect(sheet).toHaveCount(0);
+}
+
+export async function expectRestartRecoveryPrompt(page: Page, prompt: string) {
+  await restartRecoveryEditButton(page).click();
+  const sheet = page.getByTestId("host-page-restart-recovery-sheet");
+  await expect(sheet.getByRole("textbox", { name: "Resume prompt", exact: true })).toHaveValue(
+    prompt,
+  );
+  await sheet.getByRole("button", { name: "Cancel", exact: true }).click();
+  await expect(sheet).toHaveCount(0);
+}
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -84,7 +84,6 @@ import { getDesktopHost } from "@/desktop/host";
 import { loadDesktopSettings } from "@/desktop/settings/desktop-settings";
 import { RosettaCalloutSource } from "@/desktop/updates/rosetta-callout-source";
 import { UpdateCalloutSource } from "@/desktop/updates/update-callout-source";
-import { DaemonOutdatedCalloutSource } from "@/components/daemon-outdated-callout-source";
 import { useActiveWorktreeNewAction } from "@/hooks/use-active-worktree-new-action";
 import { useGlobalNewWorkspaceAction } from "@/hooks/use-global-new-workspace-action";
 import { useLatchedBoolean } from "@/hooks/use-latched-boolean";
@@ -487,7 +486,6 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
        <DownloadToast />
        <RosettaCalloutSource />
        <UpdateCalloutSource />
-        <DaemonOutdatedCalloutSource />
        <LegacyAgentSkillsMigration />
        <WorktreeSetupCalloutSource />
        <CommandCenterRootActions />
@@ -1,182 +0,0 @@
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import type { TFunction } from "i18next";
-import { useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import {
-  type SidebarCalloutAction,
-  SidebarCalloutDescriptionText,
-} from "@/components/sidebar-callout";
-import {
-  type DaemonOutdatedUpdateState,
-  resolveDaemonOutdatedCallout,
-} from "@/components/resolve-daemon-outdated-callout";
-import { useSidebarCallouts } from "@/contexts/sidebar-callout-context";
-import { useLocalDaemonServerId } from "@/hooks/use-is-local-daemon";
-import { useStableEvent } from "@/hooks/use-stable-event";
-import { useHostRuntimeClient, useHostRuntimeIsConnected, useHosts } from "@/runtime/host-runtime";
-import { updateDaemonFromSettings } from "@/screens/settings/daemon-lifecycle";
-import { useLastWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
-import { useSessionStore } from "@/stores/session-store";
-import { orderHostsLocalFirst, resolveActiveHostServerId } from "@/types/host-connection";
-import { resolveAppVersion } from "@/utils/app-version";
-import { confirmDialog } from "@/utils/confirm-dialog";
-
-interface HostUpdateState {
-  serverId: string;
-  update: DaemonOutdatedUpdateState;
-}
-
-const IDLE: DaemonOutdatedUpdateState = { status: "idle" };
-
-function DaemonOutdatedDescription({ lines }: { lines: string[] }) {
-  return (
-    <>
-      {lines.map((line) => (
-        <SidebarCalloutDescriptionText key={line}>{line}</SidebarCalloutDescriptionText>
-      ))}
-    </>
-  );
-}
-
-interface ConfirmAndUpdateDaemonInput {
-  serverId: string;
-  hostLabel: string;
-  client: DaemonClient;
-  t: TFunction;
-  onState: (next: DaemonOutdatedUpdateState) => void;
-}
-
-async function confirmAndUpdateDaemon(input: ConfirmAndUpdateDaemonInput): Promise<void> {
-  const { serverId, hostLabel, client, t, onState } = input;
-  let confirmed: boolean;
-  try {
-    confirmed = await confirmDialog({
-      title: t("settings.host.daemon.update.confirmTitle", { name: hostLabel }),
-      message: t("settings.host.daemon.update.confirmMessage"),
-      confirmLabel: t("settings.host.daemon.update.confirm"),
-      cancelLabel: t("common.actions.cancel"),
-      destructive: false,
-    });
-  } catch (error) {
-    console.error("[DaemonOutdatedCallout] Failed to open update confirmation", error);
-    onState({ status: "failed", message: t("settings.host.daemon.update.dialogFailedMessage") });
-    return;
-  }
-  if (!confirmed) return;
-
-  const phaseLabels = {
-    starting: t("settings.host.daemon.update.phaseStarting"),
-    downloading: t("settings.host.daemon.update.phaseDownloading"),
-    installing: t("settings.host.daemon.update.phaseInstalling"),
-    complete: t("settings.host.daemon.update.phaseComplete"),
-  };
-  onState({ status: "updating", phase: phaseLabels.starting });
-  const requestId = `sidebar_daemon_update_${serverId}`;
-  const unsubscribe = client.on("daemon.update.progress", (message) => {
-    if (message.payload.requestId !== requestId) return;
-    onState({ status: "updating", phase: phaseLabels[message.payload.phase] });
-  });
-  try {
-    await updateDaemonFromSettings(serverId, {
-      updateDaemon: () => client.updateDaemon(requestId),
-      getStatus: async () => ({
-        ...(await client.getDaemonStatus()),
-        serverId: client.getLastServerInfoMessage()?.serverId ?? "",
-        version: client.getLastServerInfoMessage()?.version ?? null,
-      }),
-    });
-    onState({ status: "idle" });
-  } catch (error) {
-    console.error(`[DaemonOutdatedCallout] Failed to update daemon ${hostLabel}`, error);
-    onState({
-      status: "failed",
-      message: t("settings.host.daemon.update.requestFailedMessage", {
-        error: error instanceof Error ? error.message : String(error),
-      }),
-    });
-  } finally {
-    unsubscribe();
-  }
-}
-
-/** Sidebar notice when the active host's daemon is older than this app. */
-export function DaemonOutdatedCalloutSource() {
-  const { t } = useTranslation();
-  const callouts = useSidebarCallouts();
-  const hosts = useHosts();
-  const localServerId = useLocalDaemonServerId();
-  const lastWorkspaceSelection = useLastWorkspaceSelection();
-  const orderedHosts = useMemo(
-    () => orderHostsLocalFirst(hosts, localServerId),
-    [hosts, localServerId],
-  );
-  // Same host resolution as settings: the last workspace's host, else the local daemon, else the first.
-  const serverId = resolveActiveHostServerId({
-    selectedServerId: lastWorkspaceSelection?.serverId ?? null,
-    localServerId,
-    hosts,
-    orderedHosts,
-  });
-  const hostLabel = hosts.find((host) => host.serverId === serverId)?.label ?? "";
-  const daemonClient = useHostRuntimeClient(serverId ?? "");
-  const isConnected = useHostRuntimeIsConnected(serverId ?? "");
-  const serverInfo = useSessionStore((state) =>
-    serverId ? (state.sessions[serverId]?.serverInfo ?? null) : null,
-  );
-  const [hostUpdate, setHostUpdate] = useState<HostUpdateState | null>(null);
-  const update = hostUpdate && hostUpdate.serverId === serverId ? hostUpdate.update : IDLE;
-
-  const runUpdate = useStableEvent(() => {
-    if (!serverId || !daemonClient) return;
-    void confirmAndUpdateDaemon({
-      serverId,
-      hostLabel,
-      client: daemonClient,
-      t,
-      onState: (next) => setHostUpdate({ serverId, update: next }),
-    });
-  });
-
-  useEffect(() => {
-    if (!serverId || !serverInfo) return;
-    const descriptor = resolveDaemonOutdatedCallout({
-      serverId,
-      hostLabel,
-      appVersion: resolveAppVersion(),
-      daemonVersion: serverInfo.version,
-      supportsSelfUpdate: serverInfo.features?.daemonSelfUpdate === true,
-      desktopManaged: serverInfo.desktopManaged === true,
-      // COMPAT(terminalsSurviveRestart): added in v0.12.0, remove gate after 2027-04-21.
-      terminalsSurviveRestart: serverInfo.features?.terminalsSurviveRestart === true,
-      isConnected,
-      update,
-    });
-    if (!descriptor) return;
-
-    const actions: SidebarCalloutAction[] = descriptor.updateAction
-      ? [
-          {
-            label: descriptor.updateAction.label,
-            onPress: runUpdate,
-            variant: "primary",
-            disabled: descriptor.updateAction.disabled,
-            testID: "daemon-outdated-callout-update",
-          },
-        ]
-      : [];
-    return callouts.show({
-      id: descriptor.id,
-      dismissalKey: descriptor.dismissalKey,
-      priority: descriptor.priority,
-      title: descriptor.title,
-      description: <DaemonOutdatedDescription lines={descriptor.description} />,
-      variant: descriptor.variant,
-      actions,
-      testID: descriptor.testID,
-      native: true,
-    });
-    // t: the resolver reads the active language through i18n, so a language change rebuilds the copy.
-  }, [callouts, hostLabel, isConnected, runUpdate, serverId, serverInfo, t, update]);
-
-  return null;
-}
@@ -40,7 +40,6 @@ import { SidebarSectionHeader } from "@/components/sidebar/sidebar-section-heade
 import { Shortcut } from "@/components/ui/shortcut";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { HEADER_INNER_HEIGHT, useIsCompactFormFactor } from "@/constants/layout";
-import { isNative } from "@/constants/platform";
 import { useOpenAddProject } from "@/hooks/use-open-add-project";
 import { useImportSession } from "@/hooks/use-import-session";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
@@ -606,8 +605,6 @@ function MobileSidebar({
          />
        )}

-        <SidebarCalloutSlot nativeOnly />
-
        <SidebarFooter
          handleOpenProject={handleOpenProject}
          handleSettings={handleSettings}
@@ -787,7 +784,7 @@ function DesktopSidebar({
          />
        )}

-        <SidebarCalloutSlot nativeOnly={isNative} />
+        <SidebarCalloutSlot />

        <SidebarFooter
          handleOpenProject={handleOpenProject}
@@ -1,195 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { i18n } from "@/i18n/i18next";
-import {
-  resolveDaemonOutdatedCallout,
-  type ResolveDaemonOutdatedCalloutInput,
-} from "./resolve-daemon-outdated-callout";
-
-function input(
-  overrides: Partial<ResolveDaemonOutdatedCalloutInput> = {},
-): ResolveDaemonOutdatedCalloutInput {
-  return {
-    serverId: "srv_alpha",
-    hostLabel: "Workstation",
-    appVersion: "0.12.0",
-    daemonVersion: "0.11.4",
-    supportsSelfUpdate: true,
-    desktopManaged: false,
-    terminalsSurviveRestart: true,
-    isConnected: true,
-    update: { status: "idle" },
-    ...overrides,
-  };
-}
-
-describe("resolveDaemonOutdatedCallout", () => {
-  it("shows an update notice when the daemon is older than the app", () => {
-    expect(resolveDaemonOutdatedCallout(input())).toEqual({
-      id: "daemon-outdated",
-      dismissalKey: "daemon-outdated:srv_alpha:0.11.4",
-      priority: 250,
-      title: "Daemon out of date",
-      description: [
-        "Workstation runs daemon v0.11.4. This app is v0.12.0.",
-        "Updating restarts the daemon. Terminals stay open.",
-      ],
-      variant: "default",
-      updateAction: { label: "Update", disabled: false },
-      testID: "daemon-outdated-callout",
-    });
-  });
-
-  it("hides when the daemon matches or is newer than the app", () => {
-    expect(resolveDaemonOutdatedCallout(input({ daemonVersion: "0.12.0" }))).toBeNull();
-    expect(resolveDaemonOutdatedCallout(input({ daemonVersion: "v0.12.0" }))).toBeNull();
-    expect(resolveDaemonOutdatedCallout(input({ daemonVersion: "0.12.1" }))).toBeNull();
-    expect(resolveDaemonOutdatedCallout(input({ daemonVersion: "1.0.0" }))).toBeNull();
-  });
-
-  it("compares numeric components numerically, not as strings", () => {
-    expect(
-      resolveDaemonOutdatedCallout(input({ appVersion: "0.10.0", daemonVersion: "0.9.9" })),
-    ).not.toBeNull();
-    expect(
-      resolveDaemonOutdatedCallout(input({ appVersion: "0.9.9", daemonVersion: "0.10.0" })),
-    ).toBeNull();
-  });
-
-  it("orders prereleases before their release", () => {
-    expect(
-      resolveDaemonOutdatedCallout(input({ appVersion: "0.12.0", daemonVersion: "0.12.0-beta.1" })),
-    ).not.toBeNull();
-    expect(
-      resolveDaemonOutdatedCallout(input({ appVersion: "0.12.0-beta.1", daemonVersion: "0.12.0" })),
-    ).toBeNull();
-    expect(
-      resolveDaemonOutdatedCallout(
-        input({ appVersion: "0.12.0-beta.10", daemonVersion: "0.12.0-beta.2" }),
-      ),
-    ).not.toBeNull();
-    expect(
-      resolveDaemonOutdatedCallout(
-        input({ appVersion: "0.12.0-beta.2", daemonVersion: "0.12.0-beta.2" }),
-      ),
-    ).toBeNull();
-    expect(
-      resolveDaemonOutdatedCallout(input({ appVersion: "0.12.0-rc.1", daemonVersion: "0.11.9" })),
-    ).not.toBeNull();
-  });
-
-  it("hides when either version is missing or unparseable", () => {
-    expect(resolveDaemonOutdatedCallout(input({ daemonVersion: null }))).toBeNull();
-    expect(resolveDaemonOutdatedCallout(input({ appVersion: null }))).toBeNull();
-    expect(resolveDaemonOutdatedCallout(input({ daemonVersion: "dev" }))).toBeNull();
-    expect(resolveDaemonOutdatedCallout(input({ daemonVersion: "0.11" }))).toBeNull();
-    expect(resolveDaemonOutdatedCallout(input({ appVersion: "unknown" }))).toBeNull();
-  });
-
-  it("offers no button for a desktop-managed daemon and points to Paseo on that computer", () => {
-    const descriptor = resolveDaemonOutdatedCallout(input({ desktopManaged: true }));
-
-    expect(descriptor?.updateAction).toBeNull();
-    expect(descriptor?.description).toEqual([
-      "Workstation runs daemon v0.11.4. This app is v0.12.0.",
-      "Paseo Desktop manages this daemon. Update Paseo on that computer.",
-      "Updating Paseo Desktop keeps terminals open on macOS and Linux, and closes them on Windows.",
-    ]);
-  });
-
-  it("never promises terminals survive a desktop update, which closes them on Windows", () => {
-    const descriptor = resolveDaemonOutdatedCallout(
-      input({ desktopManaged: true, terminalsSurviveRestart: true }),
-    );
-
-    expect(descriptor?.description).not.toContain(
-      "Updating restarts the daemon. Terminals stay open.",
-    );
-    expect(descriptor?.description.at(-1)).toContain("closes them on Windows");
-  });
-
-  it("says a desktop update closes terminals when the daemon does not keep them", () => {
-    const descriptor = resolveDaemonOutdatedCallout(
-      input({ desktopManaged: true, terminalsSurviveRestart: false }),
-    );
-
-    expect(descriptor?.description.at(-1)).toBe(
-      "Updating restarts the daemon and closes open terminals.",
-    );
-  });
-
-  it("offers no button when the daemon does not support self-update", () => {
-    const descriptor = resolveDaemonOutdatedCallout(input({ supportsSelfUpdate: false }));
-
-    expect(descriptor?.updateAction).toBeNull();
-    expect(descriptor?.description).toContain(
-      "This daemon can't update itself. Update Paseo on that computer.",
-    );
-  });
-
-  it("says the update closes terminals when the daemon does not keep them", () => {
-    const descriptor = resolveDaemonOutdatedCallout(input({ terminalsSurviveRestart: false }));
-
-    expect(descriptor?.description).toEqual([
-      "Workstation runs daemon v0.11.4. This app is v0.12.0.",
-      "Updating restarts the daemon and closes open terminals.",
-    ]);
-  });
-
-  it("disables the button while the host is disconnected", () => {
-    expect(resolveDaemonOutdatedCallout(input({ isConnected: false }))?.updateAction).toEqual({
-      label: "Update",
-      disabled: true,
-    });
-  });
-
-  it("shows the update phase on a disabled button while updating", () => {
-    const descriptor = resolveDaemonOutdatedCallout(
-      input({ update: { status: "updating", phase: "Downloading packages..." } }),
-    );
-
-    expect(descriptor?.variant).toBe("default");
-    expect(descriptor?.updateAction).toEqual({ label: "Downloading packages...", disabled: true });
-  });
-
-  it("surfaces a failed update as an error with the button available again", () => {
-    const descriptor = resolveDaemonOutdatedCallout(
-      input({ update: { status: "failed", message: "Failed to update the daemon: boom" } }),
-    );
-
-    expect(descriptor?.title).toBe("Daemon update failed");
-    expect(descriptor?.variant).toBe("error");
-    expect(descriptor?.description).toEqual(["Failed to update the daemon: boom"]);
-    expect(descriptor?.updateAction).toEqual({ label: "Update", disabled: false });
-  });
-
-  it("keys dismissal by host and daemon version", () => {
-    const key = resolveDaemonOutdatedCallout(input())?.dismissalKey;
-
-    expect(resolveDaemonOutdatedCallout(input({ daemonVersion: "v0.11.4" }))?.dismissalKey).toBe(
-      key,
-    );
-    expect(resolveDaemonOutdatedCallout(input({ appVersion: "0.13.0" }))?.dismissalKey).toBe(key);
-    expect(resolveDaemonOutdatedCallout(input({ daemonVersion: "0.11.5" }))?.dismissalKey).toBe(
-      "daemon-outdated:srv_alpha:0.11.5",
-    );
-    expect(resolveDaemonOutdatedCallout(input({ serverId: "srv_beta" }))?.dismissalKey).toBe(
-      "daemon-outdated:srv_beta:0.11.4",
-    );
-  });
-
-  it("uses the active app language", async () => {
-    await i18n.changeLanguage("es");
-    try {
-      const descriptor = resolveDaemonOutdatedCallout(input({ terminalsSurviveRestart: false }));
-
-      expect(descriptor?.title).toBe("Daemon desactualizado");
-      expect(descriptor?.description).toEqual([
-        "Workstation ejecuta el daemon v0.11.4. Esta app es v0.12.0.",
-        "Actualizar reinicia el daemon y cierra las terminales abiertas.",
-      ]);
-      expect(descriptor?.updateAction?.label).toBe("Actualizar");
-    } finally {
-      await i18n.changeLanguage("en");
-    }
-  });
-});
@@ -1,147 +0,0 @@
-import { i18n } from "@/i18n/i18next";
-
-export type DaemonOutdatedUpdateState =
-  | { status: "idle" }
-  | { status: "updating"; phase: string }
-  | { status: "failed"; message: string };
-
-export interface ResolveDaemonOutdatedCalloutInput {
-  serverId: string;
-  hostLabel: string;
-  appVersion: string | null;
-  daemonVersion: string | null;
-  supportsSelfUpdate: boolean;
-  desktopManaged: boolean;
-  terminalsSurviveRestart: boolean;
-  isConnected: boolean;
-  update: DaemonOutdatedUpdateState;
-}
-
-export interface DaemonOutdatedUpdateAction {
-  label: string;
-  disabled: boolean;
-}
-
-export interface DaemonOutdatedCalloutDescriptor {
-  id: "daemon-outdated";
-  dismissalKey: string;
-  priority: number;
-  title: string;
-  description: string[];
-  variant: "default" | "error";
-  updateAction: DaemonOutdatedUpdateAction | null;
-  testID: "daemon-outdated-callout";
-}
-
-interface ParsedVersion {
-  core: [number, number, number];
-  prerelease: string[];
-}
-
-const VERSION_PATTERN =
-  /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z.-]+)?$/i;
-const NUMERIC_IDENTIFIER = /^\d+$/;
-
-function parseVersion(value: string | null): ParsedVersion | null {
-  const match = value?.trim().match(VERSION_PATTERN);
-  if (!match) return null;
-  return {
-    core: [Number(match[1]), Number(match[2]), Number(match[3])],
-    prerelease: match[4] ? match[4].split(".") : [],
-  };
-}
-
-function compareIdentifiers(left: string, right: string): number {
-  const isLeftNumeric = NUMERIC_IDENTIFIER.test(left);
-  const isRightNumeric = NUMERIC_IDENTIFIER.test(right);
-  if (isLeftNumeric && isRightNumeric) return Number(left) - Number(right);
-  if (isLeftNumeric) return -1;
-  if (isRightNumeric) return 1;
-  if (left < right) return -1;
-  if (left > right) return 1;
-  return 0;
-}
-
-// Semver precedence: a prerelease sorts before its release (0.12.0-beta.1 < 0.12.0).
-function compareVersions(left: ParsedVersion, right: ParsedVersion): number {
-  for (let index = 0; index < 3; index += 1) {
-    const difference = left.core[index] - right.core[index];
-    if (difference !== 0) return difference;
-  }
-  if (left.prerelease.length === 0 || right.prerelease.length === 0) {
-    return right.prerelease.length - left.prerelease.length;
-  }
-  const sharedLength = Math.min(left.prerelease.length, right.prerelease.length);
-  for (let index = 0; index < sharedLength; index += 1) {
-    const difference = compareIdentifiers(left.prerelease[index], right.prerelease[index]);
-    if (difference !== 0) return difference;
-  }
-  return left.prerelease.length - right.prerelease.length;
-}
-
-function resolveUpdateAction(input: ResolveDaemonOutdatedCalloutInput): DaemonOutdatedUpdateAction {
-  if (input.update.status === "updating") {
-    return { label: input.update.phase, disabled: true };
-  }
-  return { label: i18n.t("daemonOutdated.update"), disabled: !input.isConnected };
-}
-
-function formatVersion(version: ParsedVersion): string {
-  const core = version.core.join(".");
-  return version.prerelease.length > 0 ? `${core}-${version.prerelease.join(".")}` : core;
-}
-
-// A daemon that keeps terminals across restarts does not keep them across a Paseo Desktop update
-// on Windows, which closes them. server_info does not name the host's platform, so the line says
-// both.
-function resolveTerminalsLine(input: ResolveDaemonOutdatedCalloutInput): string {
-  if (!input.terminalsSurviveRestart) return i18n.t("daemonOutdated.terminalsClose");
-  if (input.desktopManaged) return i18n.t("daemonOutdated.desktopUpdateTerminals");
-  return i18n.t("daemonOutdated.terminalsStayOpen");
-}
-
-function resolveDescription(
-  input: ResolveDaemonOutdatedCalloutInput,
-  versions: { daemon: ParsedVersion; app: ParsedVersion },
-): string[] {
-  if (input.update.status === "failed") return [input.update.message];
-
-  const lines = [
-    i18n.t("daemonOutdated.versions", {
-      host: input.hostLabel,
-      daemonVersion: `v${formatVersion(versions.daemon)}`,
-      appVersion: `v${formatVersion(versions.app)}`,
-    }),
-  ];
-  if (input.desktopManaged) {
-    lines.push(i18n.t("daemonOutdated.desktopManaged"));
-  } else if (!input.supportsSelfUpdate) {
-    lines.push(i18n.t("daemonOutdated.selfUpdateUnsupported"));
-  }
-  lines.push(resolveTerminalsLine(input));
-  return lines;
-}
-
-export function resolveDaemonOutdatedCallout(
-  input: ResolveDaemonOutdatedCalloutInput,
-): DaemonOutdatedCalloutDescriptor | null {
-  const app = parseVersion(input.appVersion);
-  const daemon = parseVersion(input.daemonVersion);
-  if (!app || !daemon) return null;
-  if (compareVersions(daemon, app) >= 0) return null;
-
-  // The update RPC refuses desktop-managed daemons; those update with Paseo Desktop on that computer.
-  const canSelfUpdate = input.supportsSelfUpdate && !input.desktopManaged;
-  const isFailed = input.update.status === "failed";
-
-  return {
-    id: "daemon-outdated",
-    dismissalKey: `daemon-outdated:${input.serverId}:${formatVersion(daemon)}`,
-    priority: 250,
-    title: isFailed ? i18n.t("daemonOutdated.updateFailedTitle") : i18n.t("daemonOutdated.title"),
-    description: resolveDescription(input, { daemon, app }),
-    variant: isFailed ? "error" : "default",
-    updateAction: canSelfUpdate ? resolveUpdateAction(input) : null,
-    testID: "daemon-outdated-callout",
-  };
-}
@@ -0,0 +1 @@
+export * from "./sidebar-callout-slot.native";
@@ -0,0 +1,3 @@
+export function SidebarCalloutSlot() {
+  return null;
+}
@@ -91,7 +91,7 @@ describe("SidebarCalloutSlot", () => {
      root?.render(
        <SidebarCalloutProvider>
          <RegisterCallout />
-          <SidebarCalloutSlot nativeOnly={false} />
+          <SidebarCalloutSlot />
        </SidebarCalloutProvider>,
      );
      await Promise.resolve();
@@ -105,7 +105,7 @@ describe("SidebarCalloutSlot", () => {
    await act(async () => {
      root?.render(
        <SidebarCalloutProvider>
-          <SidebarCalloutSlot nativeOnly={false} />
+          <SidebarCalloutSlot />
        </SidebarCalloutProvider>,
      );
      await Promise.resolve();
@@ -2,14 +2,10 @@ import { View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { SidebarCalloutViewport } from "@/contexts/sidebar-callout-context";

-/**
- * `nativeOnly` limits the slot to callouts marked `native`. Native apps and every compact
- * sidebar pass it: the other callouts are about the desktop app.
- */
-export function SidebarCalloutSlot({ nativeOnly }: { nativeOnly: boolean }) {
+export function SidebarCalloutSlot() {
  return (
    <View style={styles.slot} collapsable={false}>
-      <SidebarCalloutViewport nativeOnly={nativeOnly} />
+      <SidebarCalloutViewport />
    </View>
  );
 }
@@ -21,7 +21,6 @@ import {
  showSidebarCallout,
  type SidebarCalloutEntry,
  type SidebarCalloutOptions,
-  type SidebarCalloutSelectionState,
  type SidebarCalloutState,
  unregisterSidebarCallout,
 } from "./sidebar-callout-state";
@@ -38,7 +37,7 @@ export interface SidebarCalloutsApi {
 const DISMISSED_CALLOUTS_STORAGE_KEY = "@paseo:sidebar-callout-dismissals";

 const SidebarCalloutApiContext = createContext<SidebarCalloutsApi | null>(null);
-const SidebarCalloutStateContext = createContext<SidebarCalloutSelectionState | null>(null);
+const SidebarCalloutStateContext = createContext<SidebarCalloutEntry | null>(null);

 function persistDismissedCalloutKeys(keys: ReadonlySet<string>): void {
  void AsyncStorage.setItem(
@@ -114,10 +113,11 @@ export function SidebarCalloutProvider({ children }: { children: ReactNode }) {
  });

  const api = useMemo<SidebarCalloutsApi>(() => ({ show, dismiss, clear }), [clear, dismiss, show]);
+  const activeCallout = useMemo(() => selectActiveSidebarCallout(state), [state]);

  return (
    <SidebarCalloutApiContext.Provider value={api}>
-      <SidebarCalloutStateContext.Provider value={state}>
+      <SidebarCalloutStateContext.Provider value={activeCallout}>
        {children}
      </SidebarCalloutStateContext.Provider>
    </SidebarCalloutApiContext.Provider>
@@ -132,20 +132,12 @@ export function useSidebarCallouts(): SidebarCalloutsApi {
  return api;
 }

-export function useActiveSidebarCallout(
-  options: { nativeOnly?: boolean } = {},
-): SidebarCalloutEntry | null {
-  const state = useContext(SidebarCalloutStateContext);
-  const nativeOnly = options.nativeOnly === true;
-  return useMemo(
-    () => (state ? selectActiveSidebarCallout(state, { nativeOnly }) : null),
-    [nativeOnly, state],
-  );
+export function useActiveSidebarCallout(): SidebarCalloutEntry | null {
+  return useContext(SidebarCalloutStateContext);
 }

-/** The active callout. `nativeOnly` limits it to callouts marked `native`, for native apps and compact sidebars. */
-export function SidebarCalloutViewport({ nativeOnly = false }: { nativeOnly?: boolean }) {
-  const activeCallout = useActiveSidebarCallout({ nativeOnly });
+export function SidebarCalloutViewport() {
+  const activeCallout = useActiveSidebarCallout();
  const api = useSidebarCallouts();
  if (!activeCallout) {
    return null;
@@ -31,30 +31,6 @@ describe("sidebar callout state", () => {
    expect(selectActiveSidebarCallout(state)?.title).toBe("Set up scripts");
  });

-  it("selects only callouts marked native for the native sidebar", () => {
-    let state = createSidebarCalloutState();
-    state = showSidebarCallout(state, {
-      id: "desktop-update",
-      priority: 300,
-      title: "Update available",
-    }).state;
-    state = showSidebarCallout(state, {
-      id: "daemon-outdated",
-      priority: 250,
-      title: "Daemon out of date",
-      native: true,
-    }).state;
-
-    expect(selectActiveSidebarCallout(state)?.title).toBe("Update available");
-    expect(selectActiveSidebarCallout(state, { nativeOnly: true })?.title).toBe(
-      "Daemon out of date",
-    );
-
-    state = dismissSidebarCallout(state, "daemon-outdated").state;
-
-    expect(selectActiveSidebarCallout(state, { nativeOnly: true })).toBeNull();
-  });
-
  it("replaces a callout by id without duplicating the queue item", () => {
    let state = createSidebarCalloutState();
    state = showSidebarCallout(state, {
@@ -14,8 +14,6 @@ export interface SidebarCalloutOptions {
  priority?: number;
  onDismiss?: () => void;
  testID?: string;
-  /** Also shown in the iOS and Android sidebar and every compact sidebar. Callouts about the desktop app leave it unset. */
-  native?: boolean;
 }

 export interface SidebarCalloutEntry extends SidebarCalloutOptions {
@@ -131,19 +129,10 @@ export function clearSidebarCallouts(state: SidebarCalloutState): SidebarCallout
  return { ...state, callouts: [] };
 }

-export type SidebarCalloutSelectionState = Pick<
-  SidebarCalloutState,
-  "callouts" | "dismissedKeys" | "dismissalStorageLoaded"
->;
-
 export function selectActiveSidebarCallout(
-  state: SidebarCalloutSelectionState,
-  options: { nativeOnly?: boolean } = {},
+  state: Pick<SidebarCalloutState, "callouts" | "dismissedKeys" | "dismissalStorageLoaded">,
 ): SidebarCalloutEntry | null {
  const visibleCallouts = state.callouts.filter((entry) => {
-    if (options.nativeOnly && entry.native !== true) {
-      return false;
-    }
    const dismissalKey = normalizeDismissalKey(entry.dismissalKey);
    if (!dismissalKey) {
      return true;
@@ -2058,18 +2058,6 @@ export const ar: TranslationResources = {
  sidebarCallout: {
    dismiss: "رفض",
  },
-  daemonOutdated: {
-    title: "الخدمة قديمة",
-    versions: "يشغّل {{host}} الخدمة {{daemonVersion}}. إصدار هذا التطبيق {{appVersion}}.",
-    terminalsStayOpen: "يعيد التحديث تشغيل الخدمة. تبقى الطرفيات مفتوحة.",
-    terminalsClose: "يعيد التحديث تشغيل الخدمة ويغلق الطرفيات المفتوحة.",
-    desktopUpdateTerminals:
-      "يُبقي تحديث Paseo Desktop الطرفيات مفتوحة على macOS وLinux، ويغلقها على Windows.",
-    desktopManaged: "يدير Paseo Desktop هذه الخدمة. حدّث Paseo على ذلك الحاسوب.",
-    selfUpdateUnsupported: "لا يمكن لهذه الخدمة تحديث نفسها. حدّث Paseo على ذلك الحاسوب.",
-    update: "تحديث",
-    updateFailedTitle: "فشل تحديث الخدمة",
-  },
  contextWindow: {
    noData: "لا توجد بيانات للسياق",
    accessibilityNoData: "نافذة السياق: لا توجد بيانات للسياق",
@@ -2169,6 +2157,7 @@ export const ar: TranslationResources = {
      minutes_few: "{{value}} دقائق",
      minutes_many: "{{value}} دقيقة",
      minutes_other: "{{value}} دقيقة",
+      pair: "{{first}} و{{second}}",
    },
    timing: {
      lastUpdated: "آخر تحديث {{relativeTime}}",
@@ -2176,6 +2165,8 @@ export const ar: TranslationResources = {
      resetTimePassed: "مضى وقت إعادة التعيين",
      resettingNow: "تتم إعادة التعيين الآن",
      resetsIn: "تتم إعادة التعيين خلال {{duration}}",
+      resetsAtWeekday: "{{weekday}} {{time}}",
+      resetsAtDate: "{{date}}، {{time}}",
      runsOutNow: "ينفد الآن",
      runsOutIn: "ينفد خلال {{duration}}",
      justNow: "الآن",
@@ -2790,6 +2781,14 @@ export const ar: TranslationResources = {
      },
      agents: {
        unavailable: "Connect to this host to manage agents",
+        resumeOnStartup: {
+          title: "استئناف الوكلاء بعد إعادة التشغيل",
+          info: "إعادة فتح الوكلاء الذين كانوا يعملون عند توقف المضيف وإرسال طلب الاستئناف. ينطبق ذلك بعد إعادة التشغيل العادية والتعطّل.",
+          hint: "متابعة العمل المنقطع تلقائيًا.",
+          prompt: "طلب الاستئناف",
+          edit: "تحرير",
+          editAccessibilityLabel: "تعديل الطلب",
+        },
        idleRuntimeCleanup: {
          title: "تحرير الوكلاء الخاملين",
          hint: "تحرير الذاكرة بعد ساعة من الخمول.",
@@ -2083,18 +2083,6 @@ export const en = {
  sidebarCallout: {
    dismiss: "Dismiss",
  },
-  daemonOutdated: {
-    title: "Daemon out of date",
-    versions: "{{host}} runs daemon {{daemonVersion}}. This app is {{appVersion}}.",
-    terminalsStayOpen: "Updating restarts the daemon. Terminals stay open.",
-    terminalsClose: "Updating restarts the daemon and closes open terminals.",
-    desktopUpdateTerminals:
-      "Updating Paseo Desktop keeps terminals open on macOS and Linux, and closes them on Windows.",
-    desktopManaged: "Paseo Desktop manages this daemon. Update Paseo on that computer.",
-    selfUpdateUnsupported: "This daemon can't update itself. Update Paseo on that computer.",
-    update: "Update",
-    updateFailedTitle: "Daemon update failed",
-  },
  contextWindow: {
    noData: "No context data",
    accessibilityNoData: "Context window: No context data",
@@ -2176,15 +2164,18 @@ export const en = {
      days: "{{value}}d",
      hours: "{{value}}h",
      minutes: "{{value}}m",
+      pair: "{{first}} {{second}}",
    },
    timing: {
      lastUpdated: "Last updated {{relativeTime}}",
      noSuccessfulUpdate: "No successful update",
      resetTimePassed: "Reset time passed",
      resettingNow: "resetting now",
-      resetsIn: "resets {{duration}}",
+      resetsIn: "resets in {{duration}}",
+      resetsAtWeekday: "{{weekday}} {{time}}",
+      resetsAtDate: "{{date}}, {{time}}",
      runsOutNow: "runs out now",
-      runsOutIn: "runs out {{duration}}",
+      runsOutIn: "runs out in {{duration}}",
      justNow: "just now",
      daysAgo: "{{value}}d ago",
      hoursAgo: "{{value}}h ago",
@@ -2882,6 +2873,14 @@ export const en = {
      },
      agents: {
        unavailable: "Connect to this host to manage agents",
+        resumeOnStartup: {
+          title: "Resume agents after restart",
+          info: "Reopen agents that were working when the host stopped and send the resume prompt. Applies after graceful restarts and crashes.",
+          hint: "Continue interrupted work automatically.",
+          prompt: "Resume prompt",
+          edit: "Edit",
+          editAccessibilityLabel: "Edit prompt",
+        },
        idleRuntimeCleanup: {
          title: "Release idle agents",
          hint: "Free up memory after an hour of inactivity.",
@@ -2106,19 +2106,6 @@ export const es: TranslationResources = {
  sidebarCallout: {
    dismiss: "Despedir",
  },
-  daemonOutdated: {
-    title: "Daemon desactualizado",
-    versions: "{{host}} ejecuta el daemon {{daemonVersion}}. Esta app es {{appVersion}}.",
-    terminalsStayOpen: "Actualizar reinicia el daemon. Las terminales siguen abiertas.",
-    terminalsClose: "Actualizar reinicia el daemon y cierra las terminales abiertas.",
-    desktopUpdateTerminals:
-      "Actualizar Paseo Desktop mantiene las terminales abiertas en macOS y Linux, y las cierra en Windows.",
-    desktopManaged: "Paseo Desktop administra este daemon. Actualiza Paseo en esa computadora.",
-    selfUpdateUnsupported:
-      "Este daemon no puede actualizarse solo. Actualiza Paseo en esa computadora.",
-    update: "Actualizar",
-    updateFailedTitle: "No se pudo actualizar el daemon",
-  },
  contextWindow: {
    noData: "No hay datos de contexto",
    accessibilityNoData: "Ventana de contexto: No hay datos de contexto",
@@ -2200,6 +2187,7 @@ export const es: TranslationResources = {
      days: "{{value}} d",
      hours: "{{value}} h",
      minutes: "{{value}} min",
+      pair: "{{first}} {{second}}",
    },
    timing: {
      lastUpdated: "Última actualización {{relativeTime}}",
@@ -2207,6 +2195,8 @@ export const es: TranslationResources = {
      resetTimePassed: "Pasó la hora de restablecimiento",
      resettingNow: "se restablece ahora",
      resetsIn: "se restablece en {{duration}}",
+      resetsAtWeekday: "{{weekday}} {{time}}",
+      resetsAtDate: "{{date}}, {{time}}",
      runsOutNow: "se agota ahora",
      runsOutIn: "se agota en {{duration}}",
      justNow: "ahora mismo",
@@ -2813,6 +2803,14 @@ export const es: TranslationResources = {
      },
      agents: {
        unavailable: "Connect to this host to manage agents",
+        resumeOnStartup: {
+          title: "Reanudar agentes tras reiniciar",
+          info: "Vuelve a abrir los agentes que estaban trabajando cuando se detuvo el host y envía el mensaje de reanudación. Se aplica tras reinicios normales y fallos.",
+          hint: "Continuar automáticamente el trabajo interrumpido.",
+          prompt: "Mensaje de reanudación",
+          edit: "Editar",
+          editAccessibilityLabel: "Editar mensaje",
+        },
        idleRuntimeCleanup: {
          title: "Liberar agentes inactivos",
          hint: "Libera memoria tras una hora de inactividad.",
@@ -2105,19 +2105,6 @@ export const fr: TranslationResources = {
  sidebarCallout: {
    dismiss: "Ignorer",
  },
-  daemonOutdated: {
-    title: "Daemon obsolète",
-    versions: "{{host}} exécute le daemon {{daemonVersion}}. Cette app est en {{appVersion}}.",
-    terminalsStayOpen: "La mise à jour redémarre le daemon. Les terminaux restent ouverts.",
-    terminalsClose: "La mise à jour redémarre le daemon et ferme les terminaux ouverts.",
-    desktopUpdateTerminals:
-      "La mise à jour de Paseo Desktop garde les terminaux ouverts sur macOS et Linux, et les ferme sur Windows.",
-    desktopManaged: "Paseo Desktop gère ce daemon. Mettez à jour Paseo sur cet ordinateur.",
-    selfUpdateUnsupported:
-      "Ce daemon ne peut pas se mettre à jour lui-même. Mettez à jour Paseo sur cet ordinateur.",
-    update: "Mettre à jour",
-    updateFailedTitle: "Échec de la mise à jour du daemon",
-  },
  contextWindow: {
    noData: "Aucune donnée de contexte",
    accessibilityNoData: "Fenêtre de contexte : aucune donnée de contexte",
@@ -2200,6 +2187,7 @@ export const fr: TranslationResources = {
      days: "{{value}} j",
      hours: "{{value}} h",
      minutes: "{{value}} min",
+      pair: "{{first}} {{second}}",
    },
    timing: {
      lastUpdated: "Dernière mise à jour {{relativeTime}}",
@@ -2207,6 +2195,8 @@ export const fr: TranslationResources = {
      resetTimePassed: "Heure de réinitialisation dépassée",
      resettingNow: "réinitialisation en cours",
      resetsIn: "se réinitialise dans {{duration}}",
+      resetsAtWeekday: "{{weekday}} {{time}}",
+      resetsAtDate: "{{date}}, {{time}}",
      runsOutNow: "s’épuise maintenant",
      runsOutIn: "s’épuise dans {{duration}}",
      justNow: "à l’instant",
@@ -2816,6 +2806,14 @@ export const fr: TranslationResources = {
      },
      agents: {
        unavailable: "Connectez-vous à cet hôte pour gérer les agents",
+        resumeOnStartup: {
+          title: "Reprendre les agents après un redémarrage",
+          info: "Rouvre les agents qui travaillaient lorsque l’hôte s’est arrêté et envoie le message de reprise. S’applique après un redémarrage normal ou un plantage.",
+          hint: "Continuer automatiquement le travail interrompu.",
+          prompt: "Message de reprise",
+          edit: "Modifier",
+          editAccessibilityLabel: "Modifier le message",
+        },
        idleRuntimeCleanup: {
          title: "Libérer les agents inactifs",
          hint: "Libère de la mémoire après une heure d’inactivité.",
@@ -2078,20 +2078,6 @@ export const ja: TranslationResources = {
  sidebarCallout: {
    dismiss: "閉じる",
  },
-  daemonOutdated: {
-    title: "デーモンが古くなっています",
-    versions: "{{host}}のデーモンは{{daemonVersion}}です。このアプリは{{appVersion}}です。",
-    terminalsStayOpen: "更新するとデーモンが再起動します。ターミナルは開いたままです。",
-    terminalsClose: "更新するとデーモンが再起動し、開いているターミナルは閉じられます。",
-    desktopUpdateTerminals:
-      "Paseo Desktop を更新すると、macOS と Linux ではターミナルは開いたままですが、Windows では閉じられます。",
-    desktopManaged:
-      "このデーモンはPaseo Desktopによって管理されています。そのコンピューターでPaseoを更新してください。",
-    selfUpdateUnsupported:
-      "このデーモンは自身を更新できません。そのコンピューターでPaseoを更新してください。",
-    update: "更新",
-    updateFailedTitle: "デーモンを更新できませんでした",
-  },
  contextWindow: {
    noData: "コンテキストデータがありません",
    accessibilityNoData: "コンテキストウィンドウ：コンテキストデータがありません",
@@ -2174,6 +2160,7 @@ export const ja: TranslationResources = {
      days: "{{value}}日",
      hours: "{{value}}時間",
      minutes: "{{value}}分",
+      pair: "{{first}}{{second}}",
    },
    timing: {
      lastUpdated: "最終更新: {{relativeTime}}",
@@ -2181,6 +2168,8 @@ export const ja: TranslationResources = {
      resetTimePassed: "リセット時刻を過ぎています",
      resettingNow: "まもなくリセット",
      resetsIn: "{{duration}}後にリセット",
+      resetsAtWeekday: "{{weekday}} {{time}}",
+      resetsAtDate: "{{date}} {{time}}",
      runsOutNow: "まもなく上限に到達",
      runsOutIn: "{{duration}}後に上限に到達",
      justNow: "たった今",
@@ -2781,6 +2770,14 @@ export const ja: TranslationResources = {
      },
      agents: {
        unavailable: "エージェントを管理するにはこのホストに接続してください",
+        resumeOnStartup: {
+          title: "再起動後にエージェントを再開",
+          info: "ホストの停止時に作業中だったエージェントを開き直し、再開メッセージを送信します。通常の再起動とクラッシュの両方に適用されます。",
+          hint: "中断された作業を自動的に続行します。",
+          prompt: "再開メッセージ",
+          edit: "編集",
+          editAccessibilityLabel: "メッセージを編集",
+        },
        idleRuntimeCleanup: {
          title: "アイドル状態のエージェントを解放",
          hint: "1 時間のアイドル状態の後にメモリを解放します。",
@@ -2068,20 +2068,6 @@ export const ko: TranslationResources = {
  sidebarCallout: {
    dismiss: "닫기",
  },
-  daemonOutdated: {
-    title: "데몬이 오래되었습니다",
-    versions: "{{host}}의 데몬은 {{daemonVersion}}입니다. 이 앱은 {{appVersion}}입니다.",
-    terminalsStayOpen: "업데이트하면 데몬이 다시 시작됩니다. 터미널은 열린 상태로 유지됩니다.",
-    terminalsClose: "업데이트하면 데몬이 다시 시작되고 열려 있는 터미널이 닫힙니다.",
-    desktopUpdateTerminals:
-      "Paseo Desktop을 업데이트하면 macOS와 Linux에서는 터미널이 열린 상태로 유지되고, Windows에서는 닫힙니다.",
-    desktopManaged:
-      "이 데몬은 Paseo Desktop에서 관리됩니다. 해당 컴퓨터에서 Paseo를 업데이트하세요.",
-    selfUpdateUnsupported:
-      "이 데몬은 스스로 업데이트할 수 없습니다. 해당 컴퓨터에서 Paseo를 업데이트하세요.",
-    update: "업데이트",
-    updateFailedTitle: "데몬 업데이트 실패",
-  },
  contextWindow: {
    noData: "컨텍스트 데이터 없음",
    accessibilityNoData: "컨텍스트 창: 컨텍스트 데이터 없음",
@@ -2163,6 +2149,7 @@ export const ko: TranslationResources = {
      days: "{{value}}일",
      hours: "{{value}}시간",
      minutes: "{{value}}분",
+      pair: "{{first}} {{second}}",
    },
    timing: {
      lastUpdated: "마지막 업데이트: {{relativeTime}}",
@@ -2170,6 +2157,8 @@ export const ko: TranslationResources = {
      resetTimePassed: "초기화 시간이 지났습니다",
      resettingNow: "지금 재설정 중",
      resetsIn: "{{duration}} 후 재설정",
+      resetsAtWeekday: "{{weekday}} {{time}}",
+      resetsAtDate: "{{date}} {{time}}",
      runsOutNow: "지금 한도에 도달",
      runsOutIn: "{{duration}} 후 한도에 도달",
      justNow: "방금",
@@ -2769,6 +2758,14 @@ export const ko: TranslationResources = {
      },
      agents: {
        unavailable: "에이전트를 관리하려면 이 호스트에 연결하세요",
+        resumeOnStartup: {
+          title: "재시작 후 에이전트 재개",
+          info: "호스트가 중지될 때 작업 중이던 에이전트를 다시 열고 재개 메시지를 보냅니다. 정상 재시작과 비정상 종료 후 모두 적용됩니다.",
+          hint: "중단된 작업을 자동으로 계속합니다.",
+          prompt: "재개 메시지",
+          edit: "편집",
+          editAccessibilityLabel: "메시지 편집",
+        },
        idleRuntimeCleanup: {
          title: "유휴 에이전트 해제",
          hint: "1시간 동안 활동이 없으면 메모리를 확보합니다.",
@@ -2091,19 +2091,6 @@ export const ptBR: TranslationResources = {
  sidebarCallout: {
    dismiss: "Dispensar",
  },
-  daemonOutdated: {
-    title: "Daemon desatualizado",
-    versions: "{{host}} executa o daemon {{daemonVersion}}. Este app é {{appVersion}}.",
-    terminalsStayOpen: "Atualizar reinicia o daemon. Os terminais continuam abertos.",
-    terminalsClose: "Atualizar reinicia o daemon e fecha os terminais abertos.",
-    desktopUpdateTerminals:
-      "Atualizar o Paseo Desktop mantém os terminais abertos no macOS e no Linux, e os fecha no Windows.",
-    desktopManaged: "O Paseo Desktop gerencia este daemon. Atualize o Paseo nesse computador.",
-    selfUpdateUnsupported:
-      "Este daemon não consegue se atualizar sozinho. Atualize o Paseo nesse computador.",
-    update: "Atualizar",
-    updateFailedTitle: "Falha ao atualizar o daemon",
-  },
  contextWindow: {
    noData: "Sem dados de contexto",
    accessibilityNoData: "Janela de contexto: sem dados de contexto",
@@ -2185,6 +2172,7 @@ export const ptBR: TranslationResources = {
      days: "{{value}} d",
      hours: "{{value}} h",
      minutes: "{{value}} min",
+      pair: "{{first}} {{second}}",
    },
    timing: {
      lastUpdated: "Última atualização {{relativeTime}}",
@@ -2192,6 +2180,8 @@ export const ptBR: TranslationResources = {
      resetTimePassed: "O horário de redefinição passou",
      resettingNow: "redefinindo agora",
      resetsIn: "redefine em {{duration}}",
+      resetsAtWeekday: "{{weekday}} {{time}}",
+      resetsAtDate: "{{date}}, {{time}}",
      runsOutNow: "esgota agora",
      runsOutIn: "esgota em {{duration}}",
      justNow: "agora mesmo",
@@ -2795,6 +2785,14 @@ export const ptBR: TranslationResources = {
      },
      agents: {
        unavailable: "Conecte-se a este host para gerenciar agentes",
+        resumeOnStartup: {
+          title: "Retomar agentes após reiniciar",
+          info: "Reabre os agentes que estavam trabalhando quando o host parou e envia a mensagem de retomada. Aplica-se após reinicializações normais e falhas.",
+          hint: "Continuar automaticamente o trabalho interrompido.",
+          prompt: "Mensagem de retomada",
+          edit: "Editar",
+          editAccessibilityLabel: "Editar mensagem",
+        },
        idleRuntimeCleanup: {
          title: "Liberar agentes ociosos",
          hint: "Libera memória após uma hora de inatividade.",
@@ -2091,18 +2091,6 @@ export const ru: TranslationResources = {
  sidebarCallout: {
    dismiss: "Закрыть",
  },
-  daemonOutdated: {
-    title: "Демон устарел",
-    versions: "На {{host}} работает демон {{daemonVersion}}. Версия приложения: {{appVersion}}.",
-    terminalsStayOpen: "Обновление перезапустит демон. Терминалы останутся открытыми.",
-    terminalsClose: "Обновление перезапустит демон и закроет открытые терминалы.",
-    desktopUpdateTerminals:
-      "Обновление Paseo Desktop оставляет терминалы открытыми в macOS и Linux и закрывает их в Windows.",
-    desktopManaged: "Этим демоном управляет Paseo Desktop. Обновите Paseo на том компьютере.",
-    selfUpdateUnsupported: "Этот демон не может обновиться сам. Обновите Paseo на том компьютере.",
-    update: "Обновить",
-    updateFailedTitle: "Не удалось обновить демон",
-  },
  contextWindow: {
    noData: "Нет данных о контексте",
    accessibilityNoData: "Контекстное окно: нет данных о контексте",
@@ -2184,6 +2172,7 @@ export const ru: TranslationResources = {
      days: "{{value}} дн.",
      hours: "{{value}} ч",
      minutes: "{{value}} мин",
+      pair: "{{first}} {{second}}",
    },
    timing: {
      lastUpdated: "Последнее обновление {{relativeTime}}",
@@ -2191,6 +2180,8 @@ export const ru: TranslationResources = {
      resetTimePassed: "Время сброса прошло",
      resettingNow: "сброс сейчас",
      resetsIn: "сброс через {{duration}}",
+      resetsAtWeekday: "{{weekday}} {{time}}",
+      resetsAtDate: "{{date}}, {{time}}",
      runsOutNow: "закончится сейчас",
      runsOutIn: "закончится через {{duration}}",
      justNow: "только что",
@@ -2804,6 +2795,14 @@ export const ru: TranslationResources = {
      },
      agents: {
        unavailable: "Подключитесь к этому хосту, чтобы управлять агентами",
+        resumeOnStartup: {
+          title: "Возобновлять агентов после перезапуска",
+          info: "Открывает агентов, которые работали при остановке хоста, и отправляет сообщение для продолжения. Применяется после обычного перезапуска и сбоя.",
+          hint: "Автоматически продолжать прерванную работу.",
+          prompt: "Сообщение для продолжения",
+          edit: "Редактировать",
+          editAccessibilityLabel: "Изменить сообщение",
+        },
        idleRuntimeCleanup: {
          title: "Освобождать неактивных агентов",
          hint: "Освобождает память после часа бездействия.",
@@ -2036,18 +2036,6 @@ export const zhCN: TranslationResources = {
  sidebarCallout: {
    dismiss: "关闭",
  },
-  daemonOutdated: {
-    title: "守护进程版本过旧",
-    versions: "{{host}} 运行的守护进程为 {{daemonVersion}}，此应用为 {{appVersion}}。",
-    terminalsStayOpen: "更新会重启守护进程，终端将保持打开。",
-    terminalsClose: "更新会重启守护进程，并关闭已打开的终端。",
-    desktopUpdateTerminals:
-      "更新 Paseo Desktop 时，macOS 和 Linux 上的终端保持打开，Windows 上的终端会被关闭。",
-    desktopManaged: "此守护进程由 Paseo Desktop 管理。请在那台电脑上更新 Paseo。",
-    selfUpdateUnsupported: "此守护进程无法自行更新。请在那台电脑上更新 Paseo。",
-    update: "更新",
-    updateFailedTitle: "守护进程更新失败",
-  },
  contextWindow: {
    noData: "暂无上下文数据",
    accessibilityNoData: "上下文窗口：暂无上下文数据",
@@ -2129,6 +2117,7 @@ export const zhCN: TranslationResources = {
      days: "{{value}}天",
      hours: "{{value}}小时",
      minutes: "{{value}}分钟",
+      pair: "{{first}}{{second}}",
    },
    timing: {
      lastUpdated: "上次更新于 {{relativeTime}}",
@@ -2136,6 +2125,8 @@ export const zhCN: TranslationResources = {
      resetTimePassed: "重置时间已过",
      resettingNow: "正在重置",
      resetsIn: "将在 {{duration}}后重置",
+      resetsAtWeekday: "{{weekday}} {{time}}",
+      resetsAtDate: "{{date}} {{time}}",
      runsOutNow: "即将用尽",
      runsOutIn: "将在 {{duration}}后用尽",
      justNow: "刚刚",
@@ -2725,6 +2716,14 @@ export const zhCN: TranslationResources = {
      },
      agents: {
        unavailable: "连接到这个 Host 以管理 Agent",
+        resumeOnStartup: {
+          title: "重启后恢复智能体",
+          info: "重新打开主机停止时正在工作的智能体，并发送恢复提示。适用于正常重启和崩溃后的恢复。",
+          hint: "自动继续被中断的工作。",
+          prompt: "恢复提示",
+          edit: "编辑",
+          editAccessibilityLabel: "编辑提示",
+        },
        idleRuntimeCleanup: {
          title: "释放空闲 Agent",
          hint: "空闲一小时后释放内存。",
@@ -65,6 +65,7 @@ import { ICON_SIZE } from "@/styles/theme";
 import type { Theme } from "@/styles/theme";
 import { useProviderIcon } from "@/components/provider-icons";
 import { BrowserToolsOptInCard } from "./browser-tools-card";
+import { RestartRecoveryCard } from "./restart-recovery-card";
 import { IdleRuntimeCleanupCard } from "./idle-runtime-cleanup-card";
 import { restartDaemonFromSettings, updateDaemonFromSettings } from "./daemon-lifecycle";

@@ -292,6 +293,7 @@ export function HostAgentsPage({ serverId }: { serverId: string }) {
          <InjectPaseoToolsCard serverId={serverId} />
          <BrowserToolsOptInCard serverId={serverId} />
          <AppendSystemPromptCard serverId={serverId} />
+          <RestartRecoveryCard serverId={serverId} />
          <IdleRuntimeCleanupCard serverId={serverId} />
        </SettingsSection>
      ) : (
@@ -0,0 +1,199 @@
+import { useCallback, useMemo, useState } from "react";
+import { Text, View } from "react-native";
+import { useMutation } from "@tanstack/react-query";
+import { useTranslation } from "react-i18next";
+import { StyleSheet } from "react-native-unistyles";
+import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
+import { SettingsTextAreaCard } from "@/components/settings-textarea";
+import { SettingsInfoTip } from "@/components/settings/headings/settings-info-tip";
+import { Button } from "@/components/ui/button";
+import { Switch } from "@/components/ui/switch";
+import { useDaemonConfig } from "@/hooks/use-daemon-config";
+import { useHostFeature } from "@/runtime/host-features";
+import { useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import { settingsStyles } from "@/styles/settings";
+
+const DEFAULT_RESUME_PROMPT = "Resume working.";
+
+// COMPAT(restartRecovery): added in v0.14.0, remove gate after 2027-04-28.
+export function RestartRecoveryCard({ serverId }: { serverId: string }) {
+  const { t } = useTranslation();
+  const isConnected = useHostRuntimeIsConnected(serverId);
+  const isSupported = useHostFeature(serverId, "resumeOnStartupSetting");
+  const { config, patchConfig } = useDaemonConfig(serverId);
+  const [isEditing, setIsEditing] = useState(false);
+  const mutation = useMutation({
+    mutationFn: async (next: { resumeOnStartup?: boolean; resumePrompt?: string }) => {
+      const result = await patchConfig(next);
+      if (!result) {
+        throw new Error(t("workspace.terminal.hostDisconnected"));
+      }
+      return result;
+    },
+  });
+
+  const handleValueChange = useCallback(
+    (next: boolean) => {
+      mutation.mutate({ resumeOnStartup: next });
+    },
+    [mutation],
+  );
+
+  const handleOpen = useCallback(() => {
+    mutation.reset();
+    setIsEditing(true);
+  }, [mutation]);
+
+  const handleClose = useCallback(() => {
+    if (mutation.isPending) return;
+    mutation.reset();
+    setIsEditing(false);
+  }, [mutation]);
+
+  const handleSave = useCallback(
+    (prompt: string) => {
+      mutation.mutate({ resumePrompt: prompt }, { onSuccess: () => setIsEditing(false) });
+    },
+    [mutation],
+  );
+
+  if (!isConnected || !isSupported || !config) return null;
+
+  const isEnabled = config.resumeOnStartup !== false;
+
+  return (
+    <>
+      <View style={settingsStyles.card} testID="host-page-restart-recovery-card">
+        <View style={settingsStyles.row}>
+          <View style={settingsStyles.rowContent}>
+            <View style={styles.titleRow}>
+              <Text style={settingsStyles.rowTitle}>
+                {t("settings.host.agents.resumeOnStartup.title")}
+              </Text>
+              <SettingsInfoTip
+                title={t("settings.host.agents.resumeOnStartup.title")}
+                info={t("settings.host.agents.resumeOnStartup.info")}
+              />
+            </View>
+            <Text style={settingsStyles.rowHint}>
+              {t("settings.host.agents.resumeOnStartup.hint")}
+            </Text>
+            {mutation.error && !isEditing ? (
+              <Text style={settingsStyles.rowError} testID="host-page-restart-recovery-error">
+                {mutation.error.message}
+              </Text>
+            ) : null}
+          </View>
+          <View style={styles.trailing}>
+            <Button
+              variant="outline"
+              size="sm"
+              onPress={handleOpen}
+              disabled={!isEnabled || mutation.isPending}
+              accessibilityLabel={t("settings.host.agents.resumeOnStartup.editAccessibilityLabel")}
+              testID="host-page-restart-recovery-edit"
+            >
+              {t("settings.host.agents.resumeOnStartup.edit")}
+            </Button>
+            <Switch
+              value={isEnabled}
+              onValueChange={handleValueChange}
+              disabled={mutation.isPending}
+              accessibilityLabel={t("settings.host.agents.resumeOnStartup.title")}
+              testID="host-page-restart-recovery-switch"
+            />
+          </View>
+        </View>
+      </View>
+
+      {isEditing ? (
+        <ResumePromptSheet
+          initialPrompt={config.resumePrompt ?? DEFAULT_RESUME_PROMPT}
+          isSaving={mutation.isPending}
+          error={mutation.error?.message ?? null}
+          onSave={handleSave}
+          onClose={handleClose}
+        />
+      ) : null}
+    </>
+  );
+}
+
+function ResumePromptSheet({
+  initialPrompt,
+  isSaving,
+  error,
+  onSave,
+  onClose,
+}: {
+  initialPrompt: string;
+  isSaving: boolean;
+  error: string | null;
+  onSave: (prompt: string) => void;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation();
+  const [draft, setDraft] = useState(initialPrompt);
+  const header = useMemo<SheetHeader>(
+    () => ({ title: t("settings.host.agents.resumeOnStartup.prompt") }),
+    [t],
+  );
+  const canSave = draft !== initialPrompt && draft.trim().length > 0 && !isSaving;
+
+  const handleSave = useCallback(() => onSave(draft), [draft, onSave]);
+
+  return (
+    <AdaptiveModalSheet
+      header={header}
+      visible
+      onClose={onClose}
+      testID="host-page-restart-recovery-sheet"
+      desktopMaxWidth={560}
+    >
+      <SettingsTextAreaCard
+        testID="host-page-restart-recovery-prompt-input"
+        accessibilityLabel={t("settings.host.agents.resumeOnStartup.prompt")}
+        value={draft}
+        onChangeText={setDraft}
+        placeholder={DEFAULT_RESUME_PROMPT}
+      />
+      {error ? (
+        <Text style={settingsStyles.rowError} testID="host-page-restart-recovery-error">
+          {error}
+        </Text>
+      ) : null}
+      <View style={styles.sheetActions}>
+        <Button variant="ghost" size="sm" onPress={onClose} disabled={isSaving}>
+          {t("common.actions.cancel")}
+        </Button>
+        <Button
+          variant="default"
+          size="sm"
+          onPress={handleSave}
+          disabled={!canSave}
+          testID="host-page-restart-recovery-save"
+        >
+          {t("common.actions.save")}
+        </Button>
+      </View>
+    </AdaptiveModalSheet>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  titleRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  trailing: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[3],
+  },
+  sheetActions: {
+    flexDirection: "row",
+    justifyContent: "flex-end",
+    gap: theme.spacing[2],
+  },
+}));
@@ -1,10 +1,16 @@
-import { useMemo } from "react";
 import type { TFunction } from "i18next";
 import { useTranslation } from "react-i18next";
-import { Text, View, type StyleProp, type ViewStyle } from "react-native";
+import { Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
-import { clampPct, formatAmount, formatProviderUsageLabel, formatResetLabel } from "./format";
-import type { UsageBalance, UsageTone } from "./types";
+import {
+  formatAmount,
+  formatProviderUsageLabel,
+  formatResetLabel,
+  formatResetTime,
+} from "./format";
+import { UsageMeter } from "./meter";
+import { UsageResetLine } from "./reset-line";
+import type { UsageBalance } from "./types";
 import { useRelativeTimeTick } from "./use-relative-time-tick";

 interface ResolvedBalance {
@@ -41,19 +47,6 @@ function resolveBalance({
  return { amountText: "—", usedPct: null };
 }

-function fillToneStyle(tone: UsageTone) {
-  switch (tone) {
-    case "ok":
-      return styles.fillOk;
-    case "warning":
-      return styles.fillWarning;
-    case "danger":
-      return styles.fillDanger;
-    default:
-      return styles.fillDefault;
-  }
-}
-
 export function UsageBalanceBar({
  balance,
  retained = false,
@@ -66,11 +59,7 @@ export function UsageBalanceBar({
  const { amountText, usedPct } = resolveBalance({ balance, t, locale: i18n.resolvedLanguage });
  const tone = balance.tone ?? "default";
  const resetLabel = formatResetLabel(balance.resetsAt, retained, now, t);
-
-  const fillStyle = useMemo<StyleProp<ViewStyle>>(
-    () => [styles.fill, fillToneStyle(tone), { width: `${clampPct(usedPct ?? 0)}%` }],
-    [usedPct, tone],
-  );
+  const resetTime = formatResetTime(balance.resetsAt, now, t);

  return (
    <View style={styles.container}>
@@ -78,22 +67,21 @@ export function UsageBalanceBar({
        <Text style={styles.label} numberOfLines={1}>
          {formatProviderUsageLabel(balance.id, balance.label, t)}
        </Text>
-        <View style={styles.value} testID={`provider-usage-balance-${balance.id}-value`}>
-          <Text style={styles.amount} numberOfLines={1} ellipsizeMode="tail">
-            {amountText}
-          </Text>
-          {resetLabel ? (
-            <Text style={styles.reset} testID={`provider-usage-balance-${balance.id}-reset`}>
-              {resetLabel}
-            </Text>
-          ) : null}
-        </View>
+        <Text
+          style={styles.amount}
+          numberOfLines={1}
+          ellipsizeMode="tail"
+          testID={`provider-usage-balance-${balance.id}-value`}
+        >
+          {amountText}
+        </Text>
      </View>
-      {usedPct != null ? (
-        <View style={styles.track}>
-          <View style={fillStyle} />
-        </View>
-      ) : null}
+      {usedPct != null ? <UsageMeter percent={usedPct} tone={tone} /> : null}
+      <UsageResetLine
+        countdown={resetLabel}
+        exactTime={resetTime}
+        testID={`provider-usage-balance-${balance.id}-reset`}
+      />
    </View>
  );
 }
@@ -110,44 +98,13 @@ const styles = StyleSheet.create((theme) => ({
  },
  label: {
    flexShrink: 1,
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  value: {
-    flexShrink: 1,
-    alignItems: "flex-end",
-  },
-  amount: {
    color: theme.colors.foreground,
    fontSize: theme.fontSize.sm,
    fontWeight: theme.fontWeight.medium,
  },
-  reset: {
-    color: theme.colors.foregroundMuted,
+  amount: {
+    flexShrink: 1,
+    color: theme.colors.foreground,
    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.normal,
-    textAlign: "right",
-  },
-  track: {
-    height: 4,
-    borderRadius: 2,
-    backgroundColor: theme.colors.surface3,
-    overflow: "hidden",
-  },
-  fill: {
-    height: 4,
-    borderRadius: 2,
-  },
-  fillDefault: {
-    backgroundColor: theme.colors.foregroundMuted,
-  },
-  fillOk: {
-    backgroundColor: theme.colors.statusSuccess,
-  },
-  fillWarning: {
-    backgroundColor: theme.colors.statusWarning,
-  },
-  fillDanger: {
-    backgroundColor: theme.colors.statusDanger,
  },
 }));
@@ -7,6 +7,7 @@ import {
  formatPct,
  formatProviderUsageLabel,
  formatResetLabel,
+  formatResetTime,
  formatRunsOutLabel,
 } from "./format";

@@ -36,8 +37,8 @@ describe("formatAmount", () => {
    const threeDaysAgo = new Date(NOW - 3 * 24 * 60 * 60 * 1000).toISOString();

    expect(formatPct(7, "en")).toBe("7%");
-    expect(formatResetLabel(twoHoursFromNow, false, NOW)).toBe("resets 2h");
-    expect(formatRunsOutLabel(twoHoursFromNow, NOW)).toBe("runs out 2h");
+    expect(formatResetLabel(twoHoursFromNow, false, NOW)).toBe("resets in 2h");
+    expect(formatRunsOutLabel(twoHoursFromNow, NOW)).toBe("runs out in 2h");

    await i18n.changeLanguage("ja");
    expect(formatResetLabel(twoHoursFromNow, false, NOW)).toBe("2時間後にリセット");
@@ -94,6 +95,70 @@ describe("formatAmount", () => {
  });
 });

+describe("reset countdown", () => {
+  const MINUTE = 60_000;
+  const HOUR = 60 * MINUTE;
+  const DAY = 24 * HOUR;
+  const countdown = (ms: number) => formatResetLabel(new Date(NOW + ms).toISOString(), false, NOW);
+
+  beforeEach(async () => {
+    await i18n.changeLanguage("en");
+  });
+
+  it("keeps counting down inside a day instead of sitting on the rounded-down day", () => {
+    expect(countdown(2 * DAY + 23 * HOUR + 10 * MINUTE)).toBe("resets in 2d 23h");
+    expect(countdown(2 * DAY + 22 * HOUR + 10 * MINUTE)).toBe("resets in 2d 22h");
+  });
+
+  it("says two units, dropping a unit that is zero", () => {
+    expect(countdown(DAY + 30 * MINUTE)).toBe("resets in 1d");
+    expect(countdown(4 * HOUR + 59 * MINUTE)).toBe("resets in 4h 59m");
+    expect(countdown(HOUR)).toBe("resets in 1h");
+    expect(countdown(37 * MINUTE)).toBe("resets in 37m");
+    expect(countdown(59 * 1000)).toBe("resets in 0m");
+  });
+
+  it("joins the at-risk countdown the same way", () => {
+    const iso = new Date(NOW + 3 * HOUR + 5 * MINUTE).toISOString();
+    expect(formatRunsOutLabel(iso, NOW)).toBe("runs out in 3h 5m");
+  });
+});
+
+describe("exact reset time", () => {
+  // Local-time dates, so the thresholds hold in any timezone the tests run in.
+  const now = new Date(2026, 9, 29, 12, 0).getTime();
+  const at = (...args: [number, number, number, number, number]) =>
+    formatResetTime(new Date(...args).toISOString(), now)?.replace(/\s/g, " ");
+
+  beforeEach(async () => {
+    await i18n.changeLanguage("en");
+  });
+
+  it("shows only the time within 24 hours", () => {
+    expect(at(2026, 9, 29, 15, 0)).toMatch(/^(3:00 PM|15:00)$/);
+    expect(at(2026, 9, 30, 11, 59)).toMatch(/^(11:59 AM|11:59)$/);
+  });
+
+  it("adds the weekday within 7 days", () => {
+    expect(at(2026, 9, 30, 12, 0)).toMatch(/^Fri (12:00 PM|12:00)$/);
+    expect(at(2026, 10, 5, 11, 59)).toMatch(/^Thu (11:59 AM|11:59)$/);
+  });
+
+  it("adds the date after 7 days", () => {
+    expect(at(2026, 10, 5, 12, 0)).toMatch(/^Nov 5, (12:00 PM|12:00)$/);
+  });
+
+  it("names the weekday in the app language", async () => {
+    await i18n.changeLanguage("fr");
+    expect(at(2026, 9, 31, 15, 0)).toMatch(/^sam\.? /);
+  });
+
+  it("says nothing for a time that has passed", () => {
+    expect(formatResetTime(new Date(now - 1).toISOString(), now)).toBeNull();
+    expect(formatResetTime(null, now)).toBeNull();
+  });
+});
+
 it("retained reset times that have passed do not claim the quota is resetting", () => {
  const past = "2000-01-01T00:00:00.000Z";
  expect(formatResetLabel(past, true)).toBe("Reset time passed");
@@ -1,5 +1,6 @@
 import type { TFunction } from "i18next";
 import { i18n } from "@/i18n/i18next";
+import { formatTimeOfDay } from "@/utils/time";
 import type { UsageDisplayAs } from "./preferences";
 import type { UsageBalanceUnit } from "./types";

@@ -50,7 +51,17 @@ export function formatDisplayPct(
    : t("providerUsage.values.remaining", { amount: percentage });
 }

-type RelativeDuration = { unit: "now" } | { unit: "minutes" | "hours" | "days"; count: number };
+type DurationUnit = "minutes" | "hours" | "days";
+interface DurationPart {
+  unit: DurationUnit;
+  count: number;
+}
+/** Two units, floored, so a countdown keeps moving: "2d 23h", "4h 59m", "37m". */
+type RelativeDuration = { kind: "now" } | { kind: "remaining"; parts: DurationPart[] };
+
+const MINUTE_MS = 60_000;
+const HOUR_MS = 60 * MINUTE_MS;
+const DAY_MS = 24 * HOUR_MS;

 function formatCount(value: number): string {
  return new Intl.NumberFormat(i18n.resolvedLanguage).format(value);
@@ -59,35 +70,34 @@ function formatCount(value: number): string {
 function relativeDuration(iso: string, now: number): RelativeDuration | null {
  const diffMs = new Date(iso).getTime() - now;
  if (!Number.isFinite(diffMs)) return null;
-  if (diffMs <= 0) return { unit: "now" };
-  const diffMinutes = Math.floor(diffMs / 60_000);
-  const diffHours = Math.floor(diffMinutes / 60);
-  const diffDays = Math.floor(diffHours / 24);
-  if (diffDays > 0) return { unit: "days", count: diffDays };
-  if (diffHours > 0) return { unit: "hours", count: diffHours };
-  return { unit: "minutes", count: diffMinutes };
+  if (diffMs <= 0) return { kind: "now" };
+  const days = Math.floor(diffMs / DAY_MS);
+  const hours = Math.floor((diffMs % DAY_MS) / HOUR_MS);
+  const minutes = Math.floor((diffMs % HOUR_MS) / MINUTE_MS);
+  if (days > 0) return remaining({ unit: "days", count: days }, { unit: "hours", count: hours });
+  if (hours > 0)
+    return remaining({ unit: "hours", count: hours }, { unit: "minutes", count: minutes });
+  return remaining({ unit: "minutes", count: minutes });
 }

-function formatRelativeDuration(duration: RelativeDuration, t: TFunction): string | null {
-  switch (duration.unit) {
-    case "now":
-      return null;
-    case "days":
-      return t("providerUsage.duration.days", {
-        count: duration.count,
-        value: formatCount(duration.count),
-      });
-    case "hours":
-      return t("providerUsage.duration.hours", {
-        count: duration.count,
-        value: formatCount(duration.count),
-      });
-    case "minutes":
-      return t("providerUsage.duration.minutes", {
-        count: duration.count,
-        value: formatCount(duration.count),
-      });
-  }
+/** The major unit, plus the minor one unless it is zero. */
+function remaining(major: DurationPart, minor?: DurationPart): RelativeDuration {
+  return { kind: "remaining", parts: minor && minor.count > 0 ? [major, minor] : [major] };
+}
+
+function formatDurationPart(part: DurationPart, t: TFunction): string {
+  return t(`providerUsage.duration.${part.unit}`, {
+    count: part.count,
+    value: formatCount(part.count),
+  });
+}
+
+function formatRelativeDuration(
+  duration: Extract<RelativeDuration, { kind: "remaining" }>,
+  t: TFunction,
+): string {
+  const [first, second] = duration.parts.map((part) => formatDurationPart(part, t));
+  return second ? t("providerUsage.duration.pair", { first, second }) : first;
 }

 export function formatResetLabel(
@@ -99,10 +109,34 @@ export function formatResetLabel(
  if (!iso) return null;
  const rel = relativeDuration(iso, now);
  if (!rel) return null;
-  if (rel.unit === "now" && retained) return t("providerUsage.timing.resetTimePassed");
-  if (rel.unit === "now") return t("providerUsage.timing.resettingNow");
-  const duration = formatRelativeDuration(rel, t);
-  return duration ? t("providerUsage.timing.resetsIn", { duration }) : null;
+  if (rel.kind === "now" && retained) return t("providerUsage.timing.resetTimePassed");
+  if (rel.kind === "now") return t("providerUsage.timing.resettingNow");
+  return t("providerUsage.timing.resetsIn", { duration: formatRelativeDuration(rel, t) });
+}
+
+/**
+ * When a window resets on the clock: "3:00 PM" within a day, "Fri 3:00 PM" within a week,
+ * "Oct 31, 3:00 PM" after that. Names follow the app language; 12/24h follows the device.
+ * Nothing for a time that has passed, where the countdown already says so.
+ */
+export function formatResetTime(
+  iso: string | null | undefined,
+  now = Date.now(),
+  t: TFunction = i18n.t,
+): string | null {
+  if (!iso) return null;
+  const at = new Date(iso);
+  const diffMs = at.getTime() - now;
+  if (!Number.isFinite(diffMs) || diffMs <= 0) return null;
+  const time = formatTimeOfDay(at);
+  const locale = i18n.resolvedLanguage;
+  if (diffMs < DAY_MS) return time;
+  if (diffMs < 7 * DAY_MS) {
+    const weekday = at.toLocaleDateString(locale, { weekday: "short" });
+    return t("providerUsage.timing.resetsAtWeekday", { weekday, time });
+  }
+  const date = at.toLocaleDateString(locale, { month: "short", day: "numeric" });
+  return t("providerUsage.timing.resetsAtDate", { date, time });
 }

 export function formatRunsOutLabel(
@@ -113,9 +147,8 @@ export function formatRunsOutLabel(
  if (!iso) return null;
  const rel = relativeDuration(iso, now);
  if (!rel) return null;
-  if (rel.unit === "now") return t("providerUsage.timing.runsOutNow");
-  const duration = formatRelativeDuration(rel, t);
-  return duration ? t("providerUsage.timing.runsOutIn", { duration }) : null;
+  if (rel.kind === "now") return t("providerUsage.timing.runsOutNow");
+  return t("providerUsage.timing.runsOutIn", { duration: formatRelativeDuration(rel, t) });
 }

 export function formatAgo(
@@ -46,8 +46,8 @@ export function UsageMeter({

 const styles = StyleSheet.create((theme) => ({
  track: {
-    height: 4,
-    borderRadius: 2,
+    height: 6,
+    borderRadius: 3,
    backgroundColor: theme.colors.surface3,
    overflow: "hidden",
  },
@@ -0,0 +1,48 @@
+import { Text, View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+
+/**
+ * The reset data of a window or balance: the countdown first, then the exact time. When the line
+ * is too narrow the exact time gives way (truncates) and the countdown stays whole.
+ */
+export function UsageResetLine({
+  countdown,
+  exactTime,
+  atRisk = false,
+  testID,
+}: {
+  countdown: string | null;
+  exactTime: string | null;
+  /** The countdown is a runs-out warning rather than a reset. */
+  atRisk?: boolean;
+  testID?: string;
+}) {
+  if (!countdown) return null;
+  return (
+    <View style={styles.line} testID={testID}>
+      <Text style={atRisk ? styles.atRisk : styles.text}>{countdown}</Text>
+      {exactTime ? (
+        <Text style={[styles.text, styles.exactTime]} numberOfLines={1} ellipsizeMode="tail">
+          {`\u00a0·\u00a0${exactTime}`}
+        </Text>
+      ) : null}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  line: { flexDirection: "row", alignItems: "center" },
+  text: {
+    flexShrink: 0,
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.normal,
+  },
+  atRisk: {
+    flexShrink: 0,
+    color: theme.colors.statusDanger,
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.normal,
+  },
+  exactTime: { flexShrink: 1 },
+}));
@@ -192,12 +192,7 @@ function PinnedUsageLine({
          <Fragment key={window.key}>
            {layout === "meters" ? (
              <View style={[styles.meterSlot, leadStyle]}>
-                <UsageMeter
-                  percent={window.percent}
-                  tone={window.tone}
-                  quiet
-                  style={styles.meter}
-                />
+                <UsageMeter percent={window.percent} tone={window.tone} quiet />
              </View>
            ) : null}
            <Text
@@ -269,10 +264,6 @@ const styles = StyleSheet.create((theme) => ({
    minWidth: MIN_METER_WIDTH,
    marginRight: METER_GAP,
  },
-  meter: {
-    height: 6,
-    borderRadius: 3,
-  },
  percent: {
    flexShrink: 0,
    color: theme.colors.foreground,
@@ -1,29 +1,24 @@
 import { Pin } from "lucide-react-native";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { Pressable, Text, View, type StyleProp, type ViewStyle } from "react-native";
+import { Pressable, Text, View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import {
  formatDisplayPct,
  formatProviderUsageLabel,
  formatResetLabel,
+  formatResetTime,
  formatRunsOutLabel,
 } from "./format";
 import { UsageMeter } from "./meter";
 import { displayPercent, usageWindowRowLabel } from "./model";
+import { UsageResetLine } from "./reset-line";
 import type { UsageDisplayAs } from "./preferences";
 import { windowTone } from "./tone";
 import type { UsageTone, UsageWindow } from "./types";
 import { useRelativeTimeTick } from "./use-relative-time-tick";

-// Pinned rows carry the pinned surface; hovering an unpinned row previews it at half strength,
-// so a hover never reads as the selection. Pinned rows do not react to hover.
-function highlightStyle(pinned: boolean, hovered: boolean) {
-  if (pinned) return styles.highlightPinned;
-  return hovered ? styles.highlightHovered : styles.highlightNone;
-}
-
 export function UsageWindowBar({
  window,
  displayAs,
@@ -54,9 +49,12 @@ export function UsageWindowBar({
    window.runsOutAt != null &&
    window.shortfallPct != null &&
    (!retained || Date.parse(window.runsOutAt) > now);
-  const trailing = isAtRisk
+  const countdown = isAtRisk
    ? formatRunsOutLabel(window.runsOutAt, now, t)
    : formatResetLabel(window.resetsAt, retained, now, t);
+  // The exact time belongs to the reset; beside a runs-out warning it would read as the moment
+  // the quota runs out.
+  const exactTime = isAtRisk ? null : formatResetTime(window.resetsAt, now, t);

  const value =
    shownPct != null ? formatDisplayPct(shownPct, displayAs, i18n.resolvedLanguage, t) : "—";
@@ -64,60 +62,57 @@ export function UsageWindowBar({
  const content = {
    label: formatProviderUsageLabel(window.id, window.label, t),
    value,
-    trailing,
+    countdown,
+    exactTime,
    isAtRisk,
    percent: shownPct ?? 0,
    tone,
    pinned,
  };

-  // Same padding as the pinnable row, so bars line up in both modes.
  if (!pinnable) {
    return (
      <View style={styles.row}>
-        <WindowRowContent {...content} highlight={styles.highlightNone} pinnable={false} />
+        <WindowRowContent {...content} pinnable={false} />
      </View>
    );
  }

-  // The whole row pins the window to the sidebar Usage item. Pinned or not, it keeps the same
-  // padding so toggling only changes the background.
+  // The whole row pins the window to the sidebar Usage item; the pin glyph is the only sign of it.
  return (
    <Pressable
      onPress={onTogglePin}
      accessibilityRole="checkbox"
-      accessibilityLabel={usageWindowRowLabel({ pinLabel, value, trailing })}
+      accessibilityLabel={usageWindowRowLabel({
+        pinLabel,
+        value,
+        trailing: [countdown, exactTime].filter(Boolean).join(" · "),
+      })}
      accessibilityState={accessibilityState}
      aria-checked={pinned}
      style={styles.row}
      testID={pinTestID}
    >
-      {({ hovered }: { hovered?: boolean }) => (
-        <WindowRowContent
-          {...content}
-          highlight={highlightStyle(pinned, Boolean(hovered))}
-          pinnable
-        />
-      )}
+      <WindowRowContent {...content} pinnable />
    </Pressable>
  );
 }

 function WindowRowContent({
-  highlight,
  label,
  value,
-  trailing,
+  countdown,
+  exactTime,
  isAtRisk,
  percent,
  tone,
  pinnable,
  pinned,
 }: {
-  highlight: StyleProp<ViewStyle>;
  label: string;
  value: string;
-  trailing: string | null | undefined;
+  countdown: string | null;
+  exactTime: string | null;
  isAtRisk: boolean;
  percent: number;
  tone: UsageTone;
@@ -126,24 +121,17 @@ function WindowRowContent({
 }) {
  return (
    <>
-      <View style={highlight} pointerEvents="none" />
-      <View style={styles.contentRow}>
-        <View style={styles.windowContent}>
-          <View style={styles.labelRow}>
-            <Text style={styles.label} numberOfLines={1}>
-              {label}
-            </Text>
-            <Text style={styles.value} numberOfLines={1} ellipsizeMode="tail">
-              {value}
-              {trailing ? (
-                <Text style={isAtRisk ? styles.atRisk : styles.reset}>{` · ${trailing}`}</Text>
-              ) : null}
-            </Text>
-          </View>
-          <UsageMeter percent={percent} tone={tone} />
-        </View>
+      <View style={styles.labelRow}>
+        <Text style={styles.label} numberOfLines={1}>
+          {label}
+        </Text>
+        <Text style={styles.value} numberOfLines={1}>
+          {value}
+        </Text>
        {pinnable ? <UsagePinGlyph pinned={pinned} /> : null}
      </View>
+      <UsageMeter percent={percent} tone={tone} />
+      <UsageResetLine countdown={countdown} exactTime={exactTime} atRisk={isAtRisk} />
    </>
  );
 }
@@ -153,9 +141,9 @@ const ThemedPin = withUnistyles(Pin);
 function UsagePinGlyph({ pinned }: { pinned: boolean }) {
  const { t } = useTranslation();
  const iconMapping = useMemo(
-    () => (theme: { colors: { foregroundMuted: string } }) => ({
-      color: theme.colors.foregroundMuted,
-      fill: pinned ? theme.colors.foregroundMuted : "none",
+    () => (theme: { colors: { foreground: string; foregroundMuted: string } }) => ({
+      color: pinned ? theme.colors.foreground : theme.colors.foregroundMuted,
+      fill: pinned ? theme.colors.foreground : "none",
    }),
    [pinned],
  );
@@ -179,59 +167,23 @@ function UsagePinGlyph({ pinned }: { pinned: boolean }) {
 }

 const styles = StyleSheet.create((theme) => ({
-  contentRow: { flexDirection: "row", alignItems: "center", gap: theme.spacing[2] },
-  windowContent: { flex: 1, gap: 3 },
+  row: { gap: 3, paddingVertical: theme.spacing[1.5] },
  pin: { width: 12, alignItems: "center" },
  tooltipText: { color: theme.colors.popoverForeground, fontSize: theme.fontSize.sm },
-  row: {
-    gap: 3,
-    // The highlight bleeds into the card padding so the label and bar stay on the card's rail.
-    marginHorizontal: -theme.spacing[2],
-    paddingHorizontal: theme.spacing[2],
-    paddingVertical: theme.spacing[1.5],
-    // Its own stacking context, so the highlight layer paints above the card and below the text.
-    zIndex: 0,
-  },
-  highlightNone: {
-    display: "none",
-  },
-  highlightPinned: {
-    ...StyleSheet.absoluteFill,
-    zIndex: -1,
-    borderRadius: theme.borderRadius.md,
-    backgroundColor: theme.colors.surface2,
-  },
-  // The pinned surface at half strength: a separate layer, so the text keeps full opacity.
-  highlightHovered: {
-    ...StyleSheet.absoluteFill,
-    zIndex: -1,
-    borderRadius: theme.borderRadius.md,
-    backgroundColor: theme.colors.surface2,
-    opacity: theme.opacity[50],
-  },
  labelRow: {
    flexDirection: "row",
-    justifyContent: "space-between",
    alignItems: "center",
    gap: theme.spacing[2],
  },
  label: {
    flex: 1,
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-  },
-  value: {
-    flexShrink: 1,
    color: theme.colors.foreground,
    fontSize: theme.fontSize.sm,
    fontWeight: theme.fontWeight.medium,
  },
-  reset: {
-    color: theme.colors.foregroundMuted,
-    fontWeight: theme.fontWeight.normal,
-  },
-  atRisk: {
-    color: theme.colors.statusDanger,
-    fontWeight: theme.fontWeight.normal,
+  value: {
+    flexShrink: 0,
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
  },
 }));
@@ -125,6 +125,11 @@ function getTimeFormatter(): Intl.DateTimeFormat {
  return cachedTimeFormatter;
 }

+/** A clock time in the device's 12h/24h preference: "3:00 PM" or "15:00". */
+export function formatTimeOfDay(date: Date): string {
+  return getTimeFormatter().format(date);
+}
+
 /**
 * Format a chat-message timestamp for hover-revealed UI.
 * - Same day: "10:11 PM" or "22:11" depending on user preference
@@ -132,7 +137,7 @@ function getTimeFormatter(): Intl.DateTimeFormat {
 * - Older, including today's weekday last week: "14 May 2026, 10:11 PM"
 */
 export function formatMessageTimestamp(date: Date, now: Date = new Date()): string {
-  const time = getTimeFormatter().format(date);
+  const time = formatTimeOfDay(date);
  const daysAgo = localCalendarDaysBetween(date, now);

  if (daysAgo === 0) {
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/cli",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
  "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.14.0-beta.1",
-    "@getpaseo/protocol": "0.14.0-beta.1",
-    "@getpaseo/server": "0.14.0-beta.1",
+    "@getpaseo/client": "0.14.0-beta.2",
+    "@getpaseo/protocol": "0.14.0-beta.2",
+    "@getpaseo/server": "0.14.0-beta.2",
    "chalk": "^5.3.0",
    "commander": "^12.0.0",
    "mime-types": "^2.1.35",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/client",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
  "description": "Paseo client SDK package",
  "files": [
    "dist",
@@ -47,8 +47,8 @@
    "test": "vitest run"
  },
  "dependencies": {
-    "@getpaseo/protocol": "0.14.0-beta.1",
-    "@getpaseo/relay": "0.14.0-beta.1",
+    "@getpaseo/protocol": "0.14.0-beta.2",
+    "@getpaseo/relay": "0.14.0-beta.2",
    "ws": "^8.20.0",
    "zod": "^4.4.3"
  },
@@ -2,6 +2,7 @@ export { createHostChannelTransport } from "../hosts/index.js";
 import { HostTransportBudget } from "./buffering.js";
 export { HostTransportBudget } from "./buffering.js";
 import { homedir } from "node:os";
+import type { Agent } from "node:http";
 import { WebSocket } from "ws";
 import { parseHostTarget, type HostTarget } from "@getpaseo/protocol/host-target";
 import { createSshTunnel, type SshTunnel } from "./ssh-tunnel.js";
@@ -19,10 +20,15 @@ export { parseHostTarget };
 export type { SshTunnel } from "./ssh-tunnel.js";
 export { createSshTunnel, resolveSshFailureDetail } from "./ssh-tunnel.js";

+export interface HostTransportOptions {
+  webSocketAgent?: (url: string) => Agent | undefined;
+}
+
 /** A factory owns one attempt, including a fresh SSH process and its teardown. */
 export function createHostTransportFactory(
  connection: string,
  budget = new HostTransportBudget(),
+  options: HostTransportOptions = {},
 ): DaemonTransportFactory {
  const target = parseHostTarget(connection);
  // Rises to "protected" once the daemon negotiates it, so a later attempt
@@ -68,12 +74,13 @@ export function createHostTransportFactory(
        return;
      }
      const socketPath = socketTarget.socketPath?.replace(/^~(?=\/)/, homedir());
-      let factory = createWebSocketTransportFactory((url, options) => {
+      let factory = createWebSocketTransportFactory((url, socketOptions) => {
        const socket = new WebSocket(
          socketPath && url.startsWith("ws+unix:") ? `ws+unix://${socketPath}:/ws` : url,
-          options?.protocols,
+          socketOptions?.protocols,
          {
-            headers: options?.headers,
+            headers: socketOptions?.headers,
+            agent: socketPath ? undefined : options.webSocketAgent?.(url),
            ...(socketPath ? { socketPath } : {}),
            maxPayload: 100 * 1024 * 1024,
          },
@@ -191,14 +198,15 @@ export function createHostTransportFactory(
 }
 export function createHostClient(
  connection: string,
-  config: Omit<DaemonClientConfig, "url" | "transportFactory">,
+  config: Omit<DaemonClientConfig, "url" | "transportFactory"> & HostTransportOptions,
  budget?: HostTransportBudget,
 ): DaemonClient {
  const target = parseHostTarget(connection);
+  const { webSocketAgent, ...clientConfig } = config;
  return new DaemonClient({
-    ...config,
+    ...clientConfig,
    url: "ws://host-connector/ws",
    ...(target.password ? { password: target.password } : {}),
-    transportFactory: createHostTransportFactory(connection, budget),
+    transportFactory: createHostTransportFactory(connection, budget, { webSocketAgent }),
  });
 }
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/desktop",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
  "private": true,
  "description": "Paseo desktop app (Electron wrapper)",
  "homepage": "https://paseo.sh",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
  "description": "Native module for two way audio streaming",
  "keywords": [
    "ExpoTwoWayAudio",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/highlight",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
  "files": [
    "dist",
    "!dist/**/*.map",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/plugin",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
  "description": "Paseo plugin SDK package",
  "files": [
    "dist",
@@ -77,8 +77,8 @@
    "use-sync-external-store": "^1.6.0"
  },
  "devDependencies": {
-    "@getpaseo/client": "0.14.0-beta.1",
-    "@getpaseo/protocol": "0.14.0-beta.1",
+    "@getpaseo/client": "0.14.0-beta.2",
+    "@getpaseo/protocol": "0.14.0-beta.2",
    "@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.14.0-beta.1",
-    "@getpaseo/protocol": "0.14.0-beta.1",
+    "@getpaseo/client": "0.14.0-beta.2",
+    "@getpaseo/protocol": "0.14.0-beta.2",
    "react": ">=19.1.0 <20",
    "react-native": ">=0.81.5",
    "zod": "^4.4.3"
@@ -255,6 +255,24 @@ describe("lifecycle hook SDK types", () => {
      typeErrors(`
      import type { PluginServerContext, PluginHooks, PluginHookPayload, PluginHookResult } from "@getpaseo/plugin/server";
      export default function contribute(server: PluginServerContext) {
+        server.addHook("worktree.create.before", async ({ request }) => {
+          if (request.kind === "checkout-branch") {
+            // @ts-expect-error Branch checkout has no branch-off base.
+            request.baseRef;
+          } else {
+            const base: string = request.baseRef;
+          }
+          const branch: string = request.branch;
+          // @ts-expect-error Repository identity is read-only.
+          request.repoRoot = "/other";
+          // @ts-expect-error Source checkout identity is read-only.
+          request.sourceCheckout = "/other";
+          if (request.kind === "checkout-change-request") {
+            const number: number = request.changeRequestNumber;
+          }
+          return { ...request, branch: "feature", baseRef: "main", slug: "feature", path: "/work/feature" };
+        });
+        server.addHook("worktree.create.before", async () => {});
        server.addHook("worktree.create.after", async ({ worktree }) => {
          const path: string = worktree.path;
          const branch: string = worktree.branch;
@@ -21,6 +21,7 @@ export type {
  PluginHookContext,
  PluginHookWorkspace,
  PluginHookWorktree,
+  PluginWorktreeCreateRequest,
  PluginHookAgent,
  PluginSessionOpenRequest,
  PluginTurnOutcome,
@@ -27,6 +27,40 @@ export interface PluginHookWorktree {
  sourceCheckout: string;
 }

+/** Resolved creation options before Git fetches refs or chooses a unique branch name. */
+export type PluginWorktreeCreateRequest = {
+  readonly repoRoot: string;
+  readonly sourceCheckout: string;
+  branch: string;
+  slug: string;
+  path: string;
+} & (
+  | { kind: "branch-off"; baseRef: string }
+  | { kind: "checkout-branch" }
+  | {
+      kind: "checkout-change-request";
+      baseRef: string;
+      forge: string;
+      changeRequestNumber: number;
+      headRef: string;
+      headRepositoryOwner?: string;
+      headRepository?: string;
+      checkoutRefs?: { remoteName?: string; remoteRef: string }[];
+      pushRemoteUrl?: string;
+      trackOriginHead?: boolean;
+    }
+  | {
+      kind: "checkout-github-pr";
+      baseRef: string;
+      githubPrNumber: number;
+      headRef: string;
+      headRepositoryOwner?: string;
+      checkoutRefs?: { remoteName?: string; remoteRef: string }[];
+      pushRemoteUrl?: string;
+      trackOriginHead?: boolean;
+    }
+);
+
 export interface PluginHookAgent {
  id: string;
  workspaceId: string | null;
@@ -81,6 +115,7 @@ export interface PluginHookEvents {
 }

 export interface PluginHookRequests {
+  "worktree.create.before": PluginWorktreeCreateRequest;
  "agent.create.before": { config: AgentSessionConfig; env?: Record<string, string> };
  "agent.open.before": PluginSessionOpenRequest;
  "workspace.create.before": Omit<WorkspaceCreateRequest, "type" | "requestId">;
@@ -140,6 +175,7 @@ export const pluginHookRegistry = {
  "workspace.create.before": { waits: true },
  "workspace.create.after": { waits: false },
  "workspace.archive.after": { waits: false },
+  "worktree.create.before": { waits: true },
  "worktree.create.after": { waits: true },
  "agent.create.before": { waits: true },
  "agent.create.after": { waits: false },
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/protocol",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
  "description": "Paseo shared protocol schemas and wire types",
  "files": [
    "dist",
@@ -237,6 +237,9 @@ export const MutableDaemonConfigSchema = z
    // COMPAT(idleRuntimeCleanupSetting): added in v0.13.0, keep optional while old daemons are supported.
    // Persisted host-wide value, applied live by the daemon.
    idleRuntimeCleanup: z.boolean().optional(),
+    // COMPAT(restartRecovery): added in v0.14.0, keep optional for older hosts.
+    resumeOnStartup: z.boolean().optional(),
+    resumePrompt: z.string().optional(),
    appendSystemPrompt: z.string().default(""),
    terminalProfiles: z.array(TerminalProfileSchema).optional(),
    agentProfiles: z.array(AgentProfileSchema).optional(),
@@ -262,6 +265,8 @@ export const MutableDaemonConfigPatchSchema = z
    autoArchiveAfterMerge: z.boolean().optional(),
    enableTerminalAgentHooks: z.boolean().optional(),
    idleRuntimeCleanup: z.boolean().optional(),
+    resumeOnStartup: z.boolean().optional(),
+    resumePrompt: z.string().optional(),
    appendSystemPrompt: z.string().optional(),
    terminalProfiles: z.array(TerminalProfileSchema).optional(),
    agentProfiles: z.array(AgentProfileSchema).optional(),
@@ -3731,6 +3736,8 @@ export const ServerInfoStatusPayloadSchema = z
        skillManagement: z.boolean().optional(),
        // COMPAT(idleRuntimeCleanupSetting): added in v0.13.0, remove gate after 2027-04-26.
        idleRuntimeCleanupSetting: z.boolean().optional(),
+        // COMPAT(restartRecovery): added in v0.14.0, remove gate after 2027-04-28.
+        resumeOnStartupSetting: z.boolean().optional(),
        // COMPAT(terminalRestoreModes): added in v0.1.81, remove gate after 2026-11-23.
        "terminal-restore-modes": z.boolean().optional(),
        // COMPAT(terminalInputModeReplay): added in v0.2.6, remove gate after 2027-02-02.
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/relay",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
  "description": "Paseo relay for bridging daemon and client connections",
  "files": [
    "dist",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/server",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
  "description": "Paseo backend server",
  "files": [
    "dist/server",
@@ -89,7 +89,7 @@
    "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
    "test": "npm run test:unit && npm run test:integration",
    "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/checkout-diff-content.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/terminal-worker-lifecycle.e2e.test.ts src/server/workspace-create-worktree-source.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts src/server/plugins/lifecycle.e2e.test.ts src/server/connected-hosts/hosts.e2e.test.ts && vitest run --maxWorkers=1 src/server/agent/providers/omp/history.e2e.test.ts src/server/daemon-e2e/git-operations.e2e.test.ts src/server/session.create-agent-worktree-autoarchive.e2e.test.ts src/server/agent/providers/opencode-bridge.local.e2e.test.ts src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"merges into|creates a worktree and auto-archives both|versioned runtime|oversized attachments|connected hosts|password-protected daemon refuses|replays selected OMP history\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/checkout-diff-content.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/terminal-worker-lifecycle.e2e.test.ts src/server/workspace-create-worktree-source.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts src/server/plugins/usage-sources.e2e.test.ts src/server/plugins/lifecycle.e2e.test.ts src/server/connected-hosts/hosts.e2e.test.ts && vitest run --maxWorkers=1 src/server/agent/providers/omp/history.e2e.test.ts src/server/daemon-e2e/git-operations.e2e.test.ts src/server/session.create-agent-worktree-autoarchive.e2e.test.ts src/server/agent/providers/opencode-bridge.local.e2e.test.ts src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"merges into|creates a worktree and auto-archives both|versioned runtime|oversized attachments|connected hosts|password-protected daemon refuses|replays selected OMP history\"",
    "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
    "test:integration:all": "npm run test:e2e",
    "test:integration:real": "vitest run real.e2e.test.ts",
@@ -107,11 +107,11 @@
    "@agentclientprotocol/sdk": "^0.17.1",
    "@anthropic-ai/claude-agent-sdk": "0.3.246",
    "@anthropic-ai/sdk": "^0.104.2",
-    "@getpaseo/client": "0.14.0-beta.1",
-    "@getpaseo/highlight": "0.14.0-beta.1",
-    "@getpaseo/plugin": "0.14.0-beta.1",
-    "@getpaseo/protocol": "0.14.0-beta.1",
-    "@getpaseo/relay": "0.14.0-beta.1",
+    "@getpaseo/client": "0.14.0-beta.2",
+    "@getpaseo/highlight": "0.14.0-beta.2",
+    "@getpaseo/plugin": "0.14.0-beta.2",
+    "@getpaseo/protocol": "0.14.0-beta.2",
+    "@getpaseo/relay": "0.14.0-beta.2",
    "@isaacs/ttlcache": "^2.1.4",
    "@modelcontextprotocol/sdk": "1.29.0",
    "@opencode-ai/sdk": "1.14.46",
@@ -124,6 +124,7 @@
    "esbuild": "^0.25.12",
    "express": "^4.18.2",
    "fast-deep-equal": "^3.1.3",
+    "https-proxy-agent": "^7.0.6",
    "lru-cache": "^11.5.1",
    "markdown-it": "^10.0.0",
    "mnemonic-id": "^3.2.7",
@@ -141,6 +142,7 @@
    "strip-ansi": "^7.1.2",
    "tree-kill": "^1.2.2",
    "typescript": "^5.9.3",
+    "undici": "^7.24.8",
    "uuid": "^9.0.1",
    "which": "^5.0.0",
    "ws": "^8.14.2",
@@ -135,6 +135,7 @@ export async function ensureAgentLoaded(
        labels: record.labels,
        workspaceId: record.workspaceId,
        owner: record.owner,
+        env: record.launchEnv,
      });
      deps.logger.info({ agentId, provider: record.provider }, "Agent created from stored config");
    }
@@ -2929,6 +2929,92 @@ test("createAgent passes daemon launch env through the provider launch context",
  });
 });

+test.each([
+  { provider: "codex", hasHandle: true },
+  { provider: "opencode", hasHandle: true },
+  { provider: "codex", hasHandle: false },
+  { provider: "opencode", hasHandle: false },
+])(
+  "$provider preserves explicit launch env across reloads and storage-backed resumes (handle: $hasHandle)",
+  async ({ provider, hasHandle }) => {
+    const workdir = mkdtempSync(join(tmpdir(), "agent-manager-launch-env-"));
+    const storagePath = join(workdir, "agents");
+    class LaunchEnvClient extends TestAgentClient {
+      lastLaunchContext: AgentLaunchContext | undefined;
+
+      override async createSession(
+        config: AgentSessionConfig,
+        context?: AgentLaunchContext,
+      ): Promise<AgentSession> {
+        this.lastLaunchContext = context;
+        const session = await super.createSession(config);
+        session.describePersistence = () => ({ provider, sessionId: session.id });
+        return session;
+      }
+
+      override async resumeSession(
+        handle: AgentPersistenceHandle,
+        config?: Partial<AgentSessionConfig>,
+        context?: AgentLaunchContext,
+      ): Promise<AgentSession> {
+        this.lastLaunchContext = context;
+        const session = await super.resumeSession(handle, config, context);
+        session.describePersistence = () => ({ provider, sessionId: handle.sessionId });
+        return session;
+      }
+    }
+
+    const client = new LaunchEnvClient(provider);
+    let storage = new AgentStorage(storagePath, logger);
+    let manager = new AgentManager({ clients: { [provider]: client }, registry: storage, logger });
+    const env = { XDG_DATA_HOME: join(workdir, "agent-data"), CUSTOM_EMPTY: "" };
+    const expectedEnv = { ...env };
+    const agent = await manager.createAgent({ provider, cwd: workdir }, undefined, {
+      workspaceId: undefined,
+      env,
+    });
+    onTestFinished(async () => {
+      await manager.closeAgent(agent.id);
+      await manager.flush();
+      rmSync(workdir, { recursive: true, force: true });
+    });
+    env.XDG_DATA_HOME = "caller-mutated";
+
+    await manager.closeAgent(agent.id);
+    await manager.flush();
+
+    if (!hasHandle) {
+      const record = await storage.get(agent.id);
+      if (!record) throw new Error("Created agent was not persisted");
+      await storage.upsert({ ...record, persistence: null });
+    }
+
+    // Fresh storage and manager instances must read the environment from disk.
+    for (let restart = 0; restart < 2; restart += 1) {
+      storage = new AgentStorage(storagePath, logger);
+      manager = new AgentManager({ clients: { [provider]: client }, registry: storage, logger });
+      const resumed = await ensureAgentLoaded(agent.id, {
+        agentManager: manager,
+        agentStorage: storage,
+        logger,
+      });
+      expect(client.lastLaunchContext).toEqual({
+        agentId: agent.id,
+        env: { ...expectedEnv, PASEO_AGENT_ID: agent.id, PASEO_AGENT_CWD: workdir },
+      });
+      await manager.reloadAgentSession(agent.id);
+      expect(client.lastLaunchContext).toEqual({
+        agentId: agent.id,
+        env: { ...expectedEnv, PASEO_AGENT_ID: agent.id, PASEO_AGENT_CWD: workdir },
+      });
+      expect(toAgentPayload(resumed)).not.toHaveProperty("launchEnv");
+      expect(toAgentPayload(resumed).persistence?.metadata).not.toHaveProperty("launchEnv");
+      await manager.closeAgent(agent.id);
+      await manager.flush();
+    }
+  },
+);
+
 test("createAgent passes persistSession to provider create options", async () => {
  const workdir = mkdtempSync(join(tmpdir(), "agent-manager-test-"));
  const storagePath = join(workdir, "agents");
@@ -421,6 +421,8 @@ interface ManagedAgentBase {
  owner?: AgentOwner;
  capabilities: AgentCapabilityFlags;
  config: AgentSessionConfig;
+  /** Explicit launch overrides, before per-opening hooks and daemon-owned variables. */
+  launchEnv?: Record<string, string>;
  runtimeInfo?: AgentRuntimeInfo;
  createdAt: Date;
  updatedAt: Date;
@@ -1399,6 +1401,7 @@ export class AgentManager {
      initialTitle: options.initialTitle,
      workspaceId: options.workspaceId,
      owner: options.owner,
+      launchEnv: options.env ? { ...options.env } : undefined,
      historyPrimed: true,
    });
    if (!agent.internal) {
@@ -1487,10 +1490,11 @@ export class AgentManager {
      : resumeOptions;
    const purpose = currentResumeOptions?.purpose ?? "interactive";

+    const launchEnv = record?.launchEnv;
    const { storedConfig, launchConfig, paseoToolPolicy } = await this.prepareSessionConfig(
      mergedConfig,
      resolvedAgentId,
-      { purpose },
+      { purpose, env: launchEnv },
    );
    const client = this.requireClient(handle.provider);
    const available = await client.isAvailable();
@@ -1505,7 +1509,7 @@ export class AgentManager {
      client,
      storedConfig.cwd,
      paseoToolPolicy,
-      undefined,
+      launchEnv,
      {
        reason: "resume",
        purpose,
@@ -1524,6 +1528,7 @@ export class AgentManager {
    await this.requireExternalMcpSupport(session, providerLaunchConfig, launchContext);
    return this.registerSession(session, storedConfig, resolvedAgentId, {
      ...options,
+      launchEnv,
      persistence: handle,
      restoring: true,
    });
@@ -1661,6 +1666,7 @@ export class AgentManager {
    const { storedConfig, launchConfig, paseoToolPolicy } = await this.prepareSessionConfig(
      refreshConfig,
      agentId,
+      { env: existing.launchEnv },
    );
    const hadPreviousPaseoToolPolicy = this.paseoToolPolicies.has(agentId);
    const previousPaseoToolPolicy = this.paseoToolPolicies.get(agentId);
@@ -1669,7 +1675,7 @@ export class AgentManager {
      client,
      storedConfig.cwd,
      paseoToolPolicy,
-      undefined,
+      existing.launchEnv,
      {
        reason: "refresh",
        purpose: "interactive",
@@ -1720,6 +1726,7 @@ export class AgentManager {
        labels: existing.labels,
        workspaceId: existing.workspaceId,
        owner: existing.owner,
+        launchEnv: existing.launchEnv,
        createdAt: existing.createdAt,
        updatedAt: existing.updatedAt,
        lastUserMessageAt: existing.lastUserMessageAt,
@@ -3763,6 +3770,7 @@ export class AgentManager {
      publishWhenReady?: boolean;
      workspaceId?: string;
      owner?: AgentOwner;
+      launchEnv?: Record<string, string>;
    },
  ): Promise<ManagedAgent> {
    let registered = false;
@@ -3948,6 +3956,7 @@ export class AgentManager {
          persistence?: AgentPersistenceHandle;
          workspaceId?: string;
          owner?: AgentOwner;
+          launchEnv?: Record<string, string>;
        }
      | undefined;
  }): ActiveManagedAgent {
@@ -3958,6 +3967,7 @@ export class AgentManager {
      cwd: config.cwd,
      workspaceId: options?.workspaceId,
      owner: options?.owner,
+      launchEnv: options?.launchEnv,
      session,
      capabilities: session.capabilities,
      config,
@@ -95,6 +95,7 @@ export function toStoredAgentRecord(
    lastStatus: agent.lifecycle,
    lastModeId: agent.currentModeId ?? config?.modeId ?? null,
    config: config ?? null,
+    launchEnv: agent.launchEnv ? { ...agent.launchEnv } : undefined,
    runtimeInfo,
    features: normalizeFeatures(agent.features),
    persistence,
@@ -54,8 +54,10 @@ const STORED_AGENT_SCHEMA = z.object({
  title: z.string().nullable().optional(),
  labels: z.record(z.string(), z.string()).default({}),
  lastStatus: AgentStatusSchema.default("closed"),
+  resumeOnStartup: z.boolean().optional(),
  lastModeId: z.string().nullable().optional(),
  config: SERIALIZABLE_CONFIG_SCHEMA,
+  launchEnv: z.record(z.string(), z.string()).optional(),
  runtimeInfo: z
    .object({
      provider: z.string(),
@@ -259,6 +261,8 @@ export class AgentStorage {
      if (existing && existing.archivedAt !== undefined) {
        record.archivedAt = existing.archivedAt;
      }
+      record.resumeOnStartup =
+        existing?.resumeOnStartup && agent.lifecycle !== "idle" && agent.lifecycle !== "error";
      return record;
    });
  }
@@ -13,6 +13,8 @@ import type { FinishObservation } from "../index.js";
 export function createFinishObservation(input: {
  agentManager: AgentManager;
  agentStorage: AgentStorage;
+  /** A child chosen for restart recovery reports its state only after its resume was sent. */
+  waitForResume(agentId: string, signal: AbortSignal): Promise<void>;
  messages(): AgentMessageDelivery;
  hosts(): ToolHosts;
  serverId: string;
@@ -24,6 +26,7 @@ export function createFinishObservation(input: {
    hosts: input.hosts,
    local: {
      async wait(agentId, signal) {
+        await input.waitForResume(agentId, signal);
        await input.messages().waitForDispatch(agentId, signal);
        signal.throwIfAborted();
        const live = agentManager.getAgent(agentId);
@@ -52,6 +55,7 @@ export function createFinishObservation(input: {
        };
      },
      async observe(agentId, handler, signal, onError) {
+        await input.waitForResume(agentId, signal);
        const stored = await agentStorage.get(agentId);
        let updates = Promise.resolve();
        const publish = (snapshot: AgentSnapshotPayload | null, event?: AgentStreamEvent) => {
@@ -881,6 +881,7 @@ async function createAgentMcpServer(
    logger: options.logger,
    ...createFinishObservation({
      ...options,
+      waitForResume: async () => {},
      messages: () => messages,
      serverId: options.serverId ?? "self",
      hosts: () => {
@@ -4,6 +4,8 @@ import { join } from "node:path";
 import { AgentStorage } from "./agent-storage.js";
 import { createIdleRuntimeCleanup } from "./idle-runtime-cleanup/index.js";
 import { relative } from "node:path";
+import { execFileSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
 import type {
  ProviderConnection,
  ProviderLaunch,
@@ -25,6 +27,21 @@ import {
  StaleProviderSessionError,
 } from "./stale-provider-session-error.js";

+test("long concurrent plugin and child streams retain text-sized history and release it on archive", () => {
+  const fixture = fileURLToPath(new URL("./test-utils/plugin-stream-memory.ts", import.meta.url));
+  const output = execFileSync(
+    process.execPath,
+    ["--expose-gc", "--max-old-space-size=512", "--import", "tsx", fixture],
+    {
+      encoding: "utf8",
+      timeout: 20_000,
+    },
+  );
+  const memory = JSON.parse(output) as { retained: number; closed: number };
+  expect(memory.retained).toBeLessThan(24 * 1024 * 1024);
+  expect(memory.closed).toBeLessThan(6 * 1024 * 1024);
+});
+
 const CAPABILITIES = [
  "prompt.message",
  "session.configure",
@@ -292,6 +309,99 @@ function expectNestedChildren(events: AgentStreamEvent[]) {
 }

 describe("PluginAgentClientRegistry", () => {
+  test("history keeps the tool's first position when completion follows later text", async () => {
+    const harness = createProviderHarness();
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([harness.registration]);
+    const client = registry.clients()[harness.registration.id]!;
+    const session = await client.createSession({ provider: client.provider, cwd: "/tmp" });
+    const opened = harness.inputs.find((input) => input.type === "session.open");
+    if (opened?.type !== "session.open") throw new Error("missing session open");
+    const tool = {
+      type: "tool_call" as const,
+      id: "tool-position",
+      callId: "call-position",
+      name: "read",
+      detail: { type: "unknown" as const, input: null, output: null },
+      error: null,
+    };
+    try {
+      harness.emit({
+        type: "timeline.item",
+        sessionId: opened.sessionId,
+        item: { ...tool, status: "running" },
+      });
+      harness.emit({
+        type: "timeline.item",
+        sessionId: opened.sessionId,
+        item: { type: "assistant_message", id: "later-text", text: "Working" },
+      });
+      harness.emit({
+        type: "timeline.item",
+        sessionId: opened.sessionId,
+        item: { ...tool, status: "completed" },
+      });
+      const items = [];
+      for await (const event of session.streamHistory())
+        if (event.type === "timeline") items.push(event.item);
+      expect(items).toEqual([
+        {
+          type: "tool_call",
+          callId: "call-position",
+          name: "read",
+          detail: tool.detail,
+          error: null,
+          status: "completed",
+        },
+        { type: "assistant_message", messageId: "later-text", text: "Working" },
+      ]);
+    } finally {
+      await session.close();
+      await registry.shutdown();
+    }
+  });
+
+  test("detached text deltas preserve split surrogates and history replays one complete message", async () => {
+    const harness = createProviderHarness();
+    const registry = new PluginAgentClientRegistry(createTestLogger());
+    registry.replace([harness.registration]);
+    const client = registry.clients()[harness.registration.id]!;
+    const session = await client.createSession({ provider: client.provider, cwd: "/tmp" });
+    const opened = harness.inputs.find((input) => input.type === "session.open");
+    if (opened?.type !== "session.open") throw new Error("missing session open");
+    const events: AgentStreamEvent[] = [];
+    session.subscribe((event) => events.push(event));
+    const prefix = "long prefix ".repeat(10);
+    const first = prefix + "a\uD83D";
+    const complete = first + "\uDE00b";
+    try {
+      for (const text of [first, complete, complete]) {
+        harness.emit({
+          type: "timeline.item",
+          sessionId: opened.sessionId,
+          item: { type: "assistant_message", id: "split-message", text },
+        });
+      }
+      const deltas = events.flatMap((event) =>
+        event.type === "timeline" && event.item.type === "assistant_message"
+          ? [event.item.text]
+          : [],
+      );
+      expect(deltas).toEqual([first, "\uDE00b"]);
+      expect(deltas.join("")).toBe(prefix + "a😀b");
+      const history: AgentStreamEvent[] = [];
+      for await (const event of session.streamHistory()) history.push(event);
+      expect(
+        history.flatMap((event) =>
+          event.type === "timeline" && event.item.type === "assistant_message" ? [event.item] : [],
+        ),
+      ).toEqual([{ type: "assistant_message", messageId: "split-message", text: complete }]);
+    } finally {
+      await session.close();
+      await registry.shutdown();
+    }
+  });
+
  test("stores only agent options while the plugin receives merged defaults", async () => {
    const logger = createTestLogger();
    const harness = createProviderHarness();
@@ -1,4 +1,5 @@
 import { randomUUID } from "node:crypto";
+import { PluginSessionHistory } from "./plugin-session-history.js";
 import { resolve as resolvePath } from "node:path";
 import type { Logger } from "pino";
 import type { JsonValue } from "@getpaseo/protocol/agent-types";
@@ -592,6 +593,7 @@ class ProviderRuntime {

 class ProviderRuntimeSession {
  readonly history: ProviderEvent[] = [];
+  private historyClaimed = false;
  private readonly listeners = new Set<(event: ProviderEvent) => void>();
  private capabilities: readonly string[] = [];
  private openRequest: { requestId: string; deferred: Deferred<void> } | null = null;
@@ -622,6 +624,10 @@ class ProviderRuntimeSession {
  }

  onEvent(listener: (event: ProviderEvent) => void): () => void {
+    // This buffer bridges session.open and adapter attachment. Once replayed,
+    // the adapter owns history; retaining live cumulative snapshots is quadratic.
+    this.historyClaimed = true;
+    this.history.length = 0;
    this.listeners.add(listener);
    return () => this.listeners.delete(listener);
  }
@@ -713,6 +719,7 @@ class ProviderRuntimeSession {
  }

  async close(): Promise<void> {
+    this.history.length = 0;
    if (this.restoration === "parent") {
      this.runtime.removeSession(this.id, this.providerSessionId);
      return;
@@ -826,7 +833,7 @@ class ProviderRuntimeSession {
    if (event.type === "session.persistence" && this.restoration === "core") {
      this.persistence = event.persistence;
    }
-    this.history.push(event);
+    if (!this.historyClaimed) this.history.push(event);
    for (const listener of this.listeners) listener(event);
  }
 }
@@ -1128,17 +1135,30 @@ class PluginAgentClient implements AgentClient {
  }
 }

+interface TimelineTextSnapshot {
+  type: "assistant_message" | "reasoning" | "user_message";
+  text: string;
+}
+
+function isTextSnapshotItem(
+  item: ProviderTimelineItem,
+): item is Extract<ProviderTimelineItem, { type: TimelineTextSnapshot["type"] }> {
+  return (
+    item.type === "assistant_message" || item.type === "reasoning" || item.type === "user_message"
+  );
+}
+
 class PluginAgentSession implements AgentSession {
  readonly initialTimeline: ImportedProviderSession["timeline"];
  private readonly listeners = new Set<(event: AgentStreamEvent) => void>();
-  private readonly history: AgentStreamEvent[] = [];
+  private readonly history = new PluginSessionHistory();
  private readonly pendingPermissions = new Map<string, AgentPermissionRequest>();
  private readonly permissionResponses = new Map<string, AgentPermissionResponse>();
  private readonly revertTokens = new Map<string, ProviderTimelineItem["revertToken"]>();
-  private readonly timelineSnapshots = new Map<string, ProviderTimelineItem>();
+  private readonly timelineSnapshots = new Map<string, TimelineTextSnapshot>();
  private readonly subagentIdsBySession = new Map<string, string | null>();
  private readonly childUnsubscribes = new Map<string, () => void>();
-  private readonly childSnapshots = new Map<string, Map<string, ProviderTimelineItem>>();
+  private readonly childSnapshots = new Map<string, Map<string, TimelineTextSnapshot>>();
  private unsubscribe: (() => void) | null = null;
  private currentTurnId: string | null = null;
  private closed = false;
@@ -1236,7 +1256,7 @@ class PluginAgentSession implements AgentSession {
  }

  async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
-    for (const event of this.history) yield event;
+    for (const event of this.history.read(this.provider)) yield event;
  }

  get canStopRuntime(): (() => Promise<boolean>) | undefined {
@@ -1304,6 +1324,12 @@ class PluginAgentSession implements AgentSession {
    for (const unsubscribe of this.childUnsubscribes.values()) unsubscribe();
    this.childUnsubscribes.clear();
    this.subagentIdsBySession.clear();
+    this.history.clear();
+    this.timelineSnapshots.clear();
+    this.childSnapshots.clear();
+    this.revertTokens.clear();
+    this.pendingPermissions.clear();
+    this.permissionResponses.clear();
    this.listeners.clear();
    this.onClose();
    await this.bridge.close();
@@ -1344,16 +1370,20 @@ class PluginAgentSession implements AgentSession {
  }

  timelineHistory(): ImportedProviderSession["timeline"] {
-    return this.history.flatMap((event) =>
-      event.type === "timeline" ? [{ item: event.item, timestamp: event.timestamp }] : [],
-    );
+    return this.history
+      .read(this.provider)
+      .flatMap((event) =>
+        event.type === "timeline" ? [{ item: event.item, timestamp: event.timestamp }] : [],
+      );
  }

  subagentHistory(): NonNullable<ImportedProviderSession["providerSubagentEvents"]> {
-    return this.history.filter(
-      (event): event is Extract<AgentStreamEvent, { type: "provider_subagent" }> =>
-        event.type === "provider_subagent",
-    );
+    return this.history
+      .read(this.provider)
+      .filter(
+        (event): event is Extract<AgentStreamEvent, { type: "provider_subagent" }> =>
+          event.type === "provider_subagent",
+      );
  }

  attachChild(
@@ -1382,7 +1412,7 @@ class PluginAgentSession implements AgentSession {
        cwd: opened.cwd,
      },
    });
-    const snapshots = new Map<string, ProviderTimelineItem>();
+    const snapshots = new Map<string, TimelineTextSnapshot>();
    this.childSnapshots.set(childId, snapshots);
    for (const event of child.history) this.acceptChildEvent(childId, event, snapshots);
    this.childUnsubscribes.set(
@@ -1568,7 +1598,7 @@ class PluginAgentSession implements AgentSession {
  private acceptChildEvent(
    childId: string,
    event: ProviderEvent,
-    snapshots: Map<string, ProviderTimelineItem>,
+    snapshots: Map<string, TimelineTextSnapshot>,
  ): void {
    if (event.type === "timeline.item") {
      const item = mapTimelineItem(event.item, snapshots);
@@ -1721,24 +1751,24 @@ function mapPromptContent(prompt: AgentPromptInput): ProviderContent[] {

 function mapTimelineItem(
  item: ProviderTimelineItem,
-  snapshots: Map<string, ProviderTimelineItem>,
+  snapshots: Map<string, TimelineTextSnapshot>,
  revertTokens?: Map<string, ProviderTimelineItem["revertToken"]>,
 ): AgentTimelineItem | null {
  const previous = snapshots.get(item.id);
-  snapshots.set(item.id, item);
-  const { id, revertToken, ...withoutIdentity } = item;
-  if (revertToken !== undefined && revertTokens) {
-    revertTokens.set(id, revertToken);
-    if (item.type === "user_message" || item.type === "assistant_message") {
-      revertTokens.set(item.messageId ?? id, revertToken);
-    }
+  if (isTextSnapshotItem(item)) {
+    snapshots.set(item.id, { type: item.type, text: item.text });
  }
+  const { id, revertToken: _revertToken, ...withoutIdentity } = item;
+  rememberRevertToken(item, revertTokens);

  if (item.type === "assistant_message" || item.type === "reasoning") {
    const previousText = previous?.type === item.type ? previous.text : "";
-    const text = item.text.startsWith(previousText)
+    const suffix = item.text.startsWith(previousText)
      ? item.text.slice(previousText.length)
      : item.text;
+    // Match OpenCode's detachedSuffix: a sliced delta otherwise keeps its entire
+    // cumulative IPC snapshot alive in the projected timeline. Preserve split surrogates.
+    const text = Buffer.from(suffix, "utf16le").toString("utf16le");
    if (text.length === 0) return null;
    return item.type === "assistant_message"
      ? { type: "assistant_message", text, messageId: item.messageId ?? id }
@@ -1766,6 +1796,17 @@ function mapTimelineItem(
  return withoutIdentity as AgentTimelineItem;
 }

+function rememberRevertToken(
+  item: ProviderTimelineItem,
+  tokens?: Map<string, ProviderTimelineItem["revertToken"]>,
+): void {
+  if (item.revertToken === undefined || !tokens) return;
+  tokens.set(item.id, item.revertToken);
+  if (item.type === "user_message" || item.type === "assistant_message") {
+    tokens.set(item.messageId ?? item.id, item.revertToken);
+  }
+}
+
 function persistenceHandle(
  provider: string,
  persistence: ProviderPersistence,
@@ -0,0 +1,66 @@
+import { TimelineProjection } from "./timeline-projection.js";
+import type { AgentStreamEvent } from "./agent-sdk-types.js";
+
+// Replay canonical items, rather than retaining every streamed delta or tool state.
+// Sequence numbers here only preserve adapter replay order, not wire cursors.
+export class PluginSessionHistory {
+  private readonly timelines = new Map<
+    string,
+    { projection: TimelineProjection; seq: number; positions: Map<number, number> }
+  >();
+  private readonly events: Array<{ seq: number; event: AgentStreamEvent }> = [];
+  private seq = 0;
+
+  push(event: AgentStreamEvent): void {
+    const seq = ++this.seq;
+    const child =
+      event.type === "provider_subagent" && event.event.type === "timeline" ? event.event : null;
+    if (event.type !== "timeline" && !child) {
+      this.events.push({ seq, event });
+      return;
+    }
+    const key = child?.id ?? "";
+    let projection = this.timelines.get(key);
+    if (!projection) {
+      projection = { projection: new TimelineProjection(), seq: 0, positions: new Map() };
+      this.timelines.set(key, projection);
+    }
+    const timeline = event.type === "timeline" ? event : child!;
+    const row = projection.projection.append({
+      seq: ++projection.seq,
+      item: timeline.item,
+      timestamp: timeline.timestamp ?? "",
+      ...(event.type === "timeline" && event.turnId ? { turnId: event.turnId } : {}),
+    });
+    if (!projection.positions.has(row.seqStart)) projection.positions.set(row.seqStart, seq);
+  }
+
+  read(provider: string): AgentStreamEvent[] {
+    const events = [...this.events];
+    for (const [id, projection] of this.timelines) {
+      for (const row of projection.projection.getRows()) {
+        const timestamp = row.timestamp ? { timestamp: row.timestamp } : {};
+        const event: AgentStreamEvent = id
+          ? {
+              type: "provider_subagent",
+              provider,
+              event: { type: "timeline", id, item: row.item, ...timestamp },
+            }
+          : {
+              type: "timeline",
+              provider,
+              item: row.item,
+              ...timestamp,
+              ...(row.turnId ? { turnId: row.turnId } : {}),
+            };
+        events.push({ seq: projection.positions.get(row.seqStart)!, event });
+      }
+    }
+    return events.sort((a, b) => a.seq - b.seq).map(({ event }) => event);
+  }
+
+  clear(): void {
+    this.timelines.clear();
+    this.events.length = 0;
+  }
+}
@@ -422,6 +422,237 @@ describe("ClaudeAgentSession persisted subagent replay", () => {
    });
  });

+  describe("a background subagent", () => {
+    // Shapes recorded from Claude Code 2.1.x: the launch returns at once with an async result,
+    // and a child stopped by an interrupt ends on the interrupt placeholder, not an end_turn.
+    function backgroundLaunch(): string[] {
+      return [
+        parentEntry([
+          {
+            type: "tool_use",
+            id: TOOL_USE_ID,
+            name: "Agent",
+            input: {
+              subagent_type: "general-purpose",
+              description: "probe sleeper",
+              run_in_background: true,
+            },
+          },
+        ]),
+        JSON.stringify({
+          type: "user",
+          sessionId: "replay-session",
+          timestamp: "2026-07-26T06:27:48.000Z",
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: TOOL_USE_ID,
+                content: [
+                  {
+                    type: "text",
+                    text: `Async agent launched successfully.\nagentId: ${AGENT_ID}`,
+                  },
+                ],
+              },
+            ],
+          },
+          toolUseResult: { isAsync: true, status: "async_launched", agentId: AGENT_ID },
+        }),
+      ];
+    }
+
+    function readStatus(event: { status?: string }): string | undefined {
+      return event.status;
+    }
+
+    function interruptedChild(): string[] {
+      return [
+        JSON.stringify({
+          type: "assistant",
+          isSidechain: true,
+          agentId: AGENT_ID,
+          timestamp: "2026-07-26T06:27:50.000Z",
+          message: {
+            role: "assistant",
+            content: [{ type: "tool_use", id: "toolu_child_bash", name: "Bash", input: {} }],
+            stop_reason: "tool_use",
+          },
+        }),
+        JSON.stringify({
+          type: "user",
+          isSidechain: true,
+          agentId: AGENT_ID,
+          timestamp: "2026-07-26T06:28:05.000Z",
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: "toolu_child_bash",
+                content: "The user doesn't want to proceed with this tool use.",
+                is_error: true,
+              },
+            ],
+          },
+        }),
+        JSON.stringify({
+          type: "user",
+          isSidechain: true,
+          agentId: AGENT_ID,
+          timestamp: "2026-07-26T06:28:05.001Z",
+          message: {
+            role: "user",
+            content: [{ type: "text", text: "[Request interrupted by user for tool use]" }],
+          },
+        }),
+      ];
+    }
+
+    test.each([
+      ["the meta sidecar", JSON.stringify({ toolUseId: TOOL_USE_ID })],
+      ["the legacy scrape", null],
+    ])("is canceled when an interrupt stopped it, linked through %s", async (_link, meta) => {
+      writeSession({ parentLines: backgroundLaunch(), meta, sidechainLines: interruptedChild() });
+
+      expect(upserts(await replayDescriptors()).at(-1)).toMatchObject({
+        id: TOOL_USE_ID,
+        status: "canceled",
+      });
+    });
+
+    test("stays running when the child was given a new prompt after the interrupt", async () => {
+      writeSession({
+        parentLines: backgroundLaunch(),
+        meta: JSON.stringify({ toolUseId: TOOL_USE_ID }),
+        sidechainLines: [
+          ...interruptedChild(),
+          JSON.stringify({
+            type: "user",
+            isSidechain: true,
+            agentId: AGENT_ID,
+            timestamp: "2026-07-26T06:29:00.000Z",
+            message: { role: "user", content: [{ type: "text", text: "Carry on with the task." }] },
+          }),
+        ],
+      });
+
+      const statuses = upserts(await replayDescriptors()).map(readStatus);
+      expect(statuses).not.toContain("canceled");
+      expect(statuses).toContain("running");
+    });
+
+    test.each(["interrupted", "running"])(
+      "ignores an API request copy of a %s child's launch result",
+      async (state) => {
+        const launch = backgroundLaunch();
+        const result = JSON.parse(launch[1]!);
+        writeSession({
+          parentLines: [
+            ...launch,
+            JSON.stringify({
+              type: "api-request-blob",
+              sessionId: "replay-session",
+              hash: "request-copy",
+              message: result.message,
+            }),
+          ],
+          meta: JSON.stringify({ toolUseId: TOOL_USE_ID }),
+          sidechainLines:
+            state === "interrupted"
+              ? interruptedChild()
+              : [sidechainEntry({ stopReason: "tool_use" })],
+        });
+        expect(upserts(await replayDescriptors()).at(-1)).toMatchObject({
+          id: TOOL_USE_ID,
+          status: state === "interrupted" ? "canceled" : "running",
+        });
+      },
+    );
+
+    test("stays running while the child has not finished", async () => {
+      writeSession({
+        parentLines: backgroundLaunch(),
+        meta: JSON.stringify({ toolUseId: TOOL_USE_ID }),
+        sidechainLines: [sidechainEntry({ stopReason: "tool_use" })],
+      });
+
+      const statuses = upserts(await replayDescriptors()).map(readStatus);
+      expect(statuses).not.toContain("completed");
+      expect(statuses).toContain("running");
+    });
+
+    function taskNotification(status: string, form = "user"): string {
+      const text = `<task-notification>\n<task-id>${AGENT_ID}</task-id>\n<tool-use-id>${TOOL_USE_ID}</tool-use-id>\n<status>${status}</status>\n<summary>Background task ended</summary>\n</task-notification>`;
+      const records = {
+        user: { message: { role: "user", content: [{ type: "text", text }] } },
+        system: {
+          subtype: "task_notification",
+          task_id: AGENT_ID,
+          tool_use_id: TOOL_USE_ID,
+          status,
+        },
+        "queue-operation": { operation: "enqueue", content: text },
+      };
+      return JSON.stringify({
+        type: form,
+        timestamp: "2026-07-26T06:29:00.000Z",
+        ...records[form as keyof typeof records],
+      });
+    }
+
+    for (const form of ["user", "system", "queue-operation"]) {
+      test.each([
+        ["completed", "completed"],
+        ["failed", "failed"],
+        ["killed", "canceled"],
+        ["stopped", "canceled"],
+      ])(
+        `restores a %s task notification from ${form} when the child stop_reason is null`,
+        async (status, expected) => {
+          writeSession({
+            parentLines: [...backgroundLaunch(), taskNotification(status, form)],
+            meta: JSON.stringify({ toolUseId: TOOL_USE_ID }),
+            sidechainLines: [sidechainEntry({ stopReason: null })],
+          });
+          expect(upserts(await replayDescriptors()).at(-1)).toMatchObject({
+            id: TOOL_USE_ID,
+            status: expected,
+          });
+        },
+      );
+    }
+
+    test("prefers a stopped notification over the child's end_turn", async () => {
+      writeSession({
+        parentLines: [...backgroundLaunch(), taskNotification("stopped")],
+        meta: JSON.stringify({ toolUseId: TOOL_USE_ID }),
+        sidechainLines: [sidechainEntry({ stopReason: "end_turn" })],
+      });
+      expect(upserts(await replayDescriptors()).at(-1)).toMatchObject({ status: "canceled" });
+    });
+
+    test("does not invent an outcome for an unknown notification status", async () => {
+      writeSession({
+        parentLines: [...backgroundLaunch(), taskNotification("unknown")],
+        meta: JSON.stringify({ toolUseId: TOOL_USE_ID }),
+        sidechainLines: [sidechainEntry({ stopReason: null })],
+      });
+      expect(upserts(await replayDescriptors()).at(-1)).toMatchObject({ status: "running" });
+    });
+
+    test("completes from the child's own end_turn", async () => {
+      writeSession({
+        parentLines: backgroundLaunch(),
+        meta: JSON.stringify({ toolUseId: TOOL_USE_ID }),
+        sidechainLines: [sidechainEntry({ stopReason: "end_turn" })],
+      });
+
+      expect(upserts(await replayDescriptors()).at(-1)).toMatchObject({ status: "completed" });
+    });
+  });
+
  test("does not replay a skill-spawned subagent the parent never named", async () => {
    // The reported bug. A /code-review subagent has no Task tool_use, so its sidecar carries only
    // agentType and its id appears nowhere in the parent — it used to replay as running forever,
@@ -887,6 +887,68 @@ describe("ClaudeAgentSession features", () => {
    await session.close();
  });

+  test("keeps an extraArgs settings file when Paseo sets Claude flag settings", async () => {
+    const settingsDir = await fs.mkdtemp(path.join(os.tmpdir(), "paseo-claude-settings-"));
+    const settingsPath = path.join(settingsDir, "settings.json");
+    await fs.writeFile(
+      settingsPath,
+      JSON.stringify({ env: { ENABLE_TOOL_SEARCH: "false" }, permissions: { deny: ["Monitor"] } }),
+    );
+    const { queryFactory } = createQueryMock();
+    const client = new ClaudeAgentClient({
+      logger,
+      queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    });
+    const session = await client.createSession({
+      provider: "claude",
+      cwd: process.cwd(),
+      model: "claude-opus-5-5",
+      providerOptions: {
+        extraArgs: { chrome: null, settings: settingsPath },
+      },
+    });
+
+    await session.startTurn("hello");
+
+    const options = queryFactory.mock.calls[0]?.[0].options;
+    expect(options?.extraArgs).toEqual({ chrome: null });
+    expect(options?.settings).toEqual({
+      env: { ENABLE_TOOL_SEARCH: "false" },
+      permissions: { deny: ["Monitor"] },
+      fastMode: false,
+    });
+    await session.close();
+    await fs.rm(settingsDir, { recursive: true, force: true });
+  });
+
+  test("keeps inline extraArgs settings JSON for internal agents", async () => {
+    const { queryFactory } = createQueryMock();
+    const client = new ClaudeAgentClient({
+      logger,
+      queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    });
+    const session = await client.createSession({
+      provider: "claude",
+      cwd: process.cwd(),
+      internal: true,
+      providerOptions: {
+        extraArgs: { settings: '{"env":{"ENABLE_TOOL_SEARCH":"false"}}' },
+      },
+    });
+
+    await session.startTurn("hello");
+
+    const options = queryFactory.mock.calls[0]?.[0].options;
+    expect(options?.extraArgs).toEqual({});
+    expect(options?.settings).toEqual({
+      env: { ENABLE_TOOL_SEARCH: "false" },
+      disableAllHooks: true,
+    });
+    await session.close();
+  });
+
  test("lists fast mode only for supported Opus models", async () => {
    const client = new ClaudeAgentClient({ logger, resolveBinary: async () => "/test/claude/bin" });

@@ -33,7 +33,9 @@ import {
  mapTaskNotificationSystemRecordToToolCall,
  mapTaskNotificationUserContentToToolCall,
  readTaskNotificationToolUseIdFromHistoryRecord,
+  readTaskNotificationFromHistoryRecord,
 } from "./task-notification-tool-call.js";
+import { isClaudeInterruptPlaceholderText } from "./interrupt-placeholder.js";
 import {
  getClaudeContextWindowMaxTokens,
  getClaudeModelsWithSettings,
@@ -46,6 +48,7 @@ import {
  parseClaudeCodeVersion,
  resolveClaudeDisabledThinkingForModel,
 } from "./model-manifest.js";
+import { expandTilde } from "../../../../utils/path.js";
 import { parsePartialJsonObject } from "./partial-json.js";
 import { withClaudeReplayHistory, type ClaudeReplayHistory } from "./transcript-history.js";
 import { ClaudeSidechainTracker } from "./sidechain-tracker.js";
@@ -56,6 +59,8 @@ import {
  type ClaudeHookObservationInput,
 } from "./subagents/live-source.js";
 import { observeReplaySubagents, type ClaudeReplayParentFacts } from "./subagents/replay-source.js";
+import { mapTaskStatus } from "./subagents/task-status.js";
+import type { ProviderSubagentStatus } from "../../provider-subagents/store.js";
 import { foldSubagentObservations, type SubagentObservation } from "./subagents/observation.js";
 import { observeReplayWorkflows } from "./subagents/workflow-replay-source.js";
 import { limitAgentTimelineItemContent } from "../../agent-timeline-content.js";
@@ -425,7 +430,6 @@ const CLAUDE_ROOT_ONLY_COMMANDS = new Set([
  "usage",
 ]);
 const INTERRUPT_TOOL_USE_PLACEHOLDER = "[Request interrupted by user for tool use]";
-const INTERRUPT_PLACEHOLDER_PATTERN = /^\[Request interrupted by user(?:[^\]]*)\]$/;
 const NO_RESPONSE_REQUESTED_PLACEHOLDER = "No response requested.";
 const STEER_SUPERSEDED_PERMISSION_MESSAGE =
  "The user answered with a message instead of approving. Their message follows.";
@@ -645,6 +649,40 @@ function readClaudeFastModeSetting(settings: ClaudeOptions["settings"]): boolean
  return typeof settings.fastMode === "boolean" ? settings.fastMode : null;
 }

+type ClaudeSettingsObject = NonNullable<Exclude<ClaudeOptions["settings"], string>>;
+
+// Mirrors `claude --settings`: the value is inline JSON or a path to a JSON file,
+// resolved against the session cwd like the Claude process would.
+async function readClaudeCliSettings(value: string, cwd: string): Promise<ClaudeSettingsObject> {
+  const trimmed = value.trim();
+  const isInlineJson = trimmed.startsWith("{");
+  const source = isInlineJson ? "--settings JSON" : path.resolve(cwd, expandTilde(trimmed));
+  let raw = trimmed;
+  if (!isInlineJson) {
+    try {
+      raw = await fsPromises.readFile(source, "utf8");
+    } catch (error) {
+      throw new Error(
+        `Failed to read Claude settings file ${source}: ${error instanceof Error ? error.message : String(error)}`,
+        { cause: error },
+      );
+    }
+  }
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (error) {
+    throw new Error(
+      `Claude ${source} is not valid JSON: ${error instanceof Error ? error.message : String(error)}`,
+      { cause: error },
+    );
+  }
+  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error(`Claude ${source} must contain a JSON object`);
+  }
+  return parsed as ClaudeSettingsObject;
+}
+
 function mergeClaudeSettings(
  settings: ClaudeOptions["settings"],
  updates: NonNullable<Exclude<ClaudeOptions["settings"], string>>,
@@ -789,11 +827,6 @@ function normalizeClaudeTranscriptText(value: unknown): string | null {
  return normalized.length > 0 ? normalized : null;
 }

-function isClaudeInterruptPlaceholderText(value: unknown): boolean {
-  const normalized = normalizeClaudeTranscriptText(value);
-  return normalized !== null && INTERRUPT_PLACEHOLDER_PATTERN.test(normalized);
-}
-
 function isClaudeNoResponsePlaceholderText(value: unknown): boolean {
  return normalizeClaudeTranscriptText(value) === NO_RESPONSE_REQUESTED_PLACEHOLDER;
 }
@@ -3612,7 +3645,7 @@ class ClaudeAgentSession implements AgentSession {
      this.config.providerOptions,
      this.config.toolPolicy,
    );
-    const settingsOptions = this.buildSettingsOptions(providerOptions, { ultracode });
+    const settingsOptions = await this.buildSettingsOptions(providerOptions, { ultracode });
    const sdkEnv = this.harnessEnvironment;
    assertClaudeModeCanRun(permissionMode, sdkEnv);

@@ -3697,10 +3730,10 @@ class ClaudeAgentSession implements AgentSession {
    return base;
  }

-  private buildSettingsOptions(
+  private async buildSettingsOptions(
    providerOptions: ClaudeProviderOptions,
    input: { ultracode: boolean },
-  ): Pick<ClaudeOptions, "settings"> | Record<string, never> {
+  ): Promise<Pick<ClaudeOptions, "settings" | "extraArgs"> | Record<string, never>> {
    const fastMode = this.resolveFastModeSetting();
    // Internal agents do daemon work such as naming a branch, so the user's and
    // project's hooks must not run for them.
@@ -3708,12 +3741,21 @@ class ClaudeAgentSession implements AgentSession {
    if (fastMode === null && !input.ultracode && !disableAllHooks) {
      return {};
    }
+    const updates = {
+      ...(fastMode === null ? {} : { fastMode }),
+      ...(input.ultracode ? { ultracode: true } : {}),
+      ...(disableAllHooks ? { disableAllHooks: true } : {}),
+    };
+    // The SDK replaces extraArgs.settings with Options.settings, so a user's
+    // `--settings` would be dropped whenever Paseo sets flag settings. Fold it in.
+    const { settings: extraArgsSettings, ...extraArgs } = providerOptions.extraArgs ?? {};
+    if (typeof extraArgsSettings !== "string") {
+      return { settings: mergeClaudeSettings(providerOptions.settings, updates) };
+    }
+    const cliSettings = await readClaudeCliSettings(extraArgsSettings, this.config.cwd);
    return {
-      settings: mergeClaudeSettings(providerOptions.settings, {
-        ...(fastMode === null ? {} : { fastMode }),
-        ...(input.ultracode ? { ultracode: true } : {}),
-        ...(disableAllHooks ? { disableAllHooks: true } : {}),
-      }),
+      extraArgs,
+      settings: { ...cliSettings, ...providerOptions.settings, ...updates },
    };
  }

@@ -6262,33 +6304,34 @@ async function readClaudeReplayParentFacts(
  entries: Iterable<ClaudeHistoryEntry> | AsyncIterable<ClaudeHistoryEntry>,
 ): Promise<ClaudeReplayParentFacts> {
  const toolCalls = new Map<string, { title?: string; description?: string }>();
-  const linksByAgentId = new Map<string, { toolCallId: string; failed: boolean }>();
-  const outcomes = new Map<string, { failed: boolean }>();
+  const linksByAgentId = new Map<string, { toolCallId: string }>();
+  const outcomes: Map<string, { status: ProviderSubagentStatus }> = new Map();
  for await (const entry of entries) {
+    const notification = readTaskNotificationFromHistoryRecord(entry);
+    const status = mapTaskStatus(notification?.status ?? undefined);
+    if (notification?.toolUseId && status) {
+      outcomes.set(notification.toolUseId, { status });
+    }
    const content = toObjectRecord(entry.message)?.content;
    if (!Array.isArray(content)) continue;
    for (const value of content) {
      const block = toObjectRecord(value);
+      const declaration = readClaudeReplayTaskDeclaration(entry.type, block);
+      if (declaration) toolCalls.set(declaration.id, declaration.identity);
      if (
-        block?.type === "tool_use" &&
-        (block.name === "Task" || block.name === "Agent") &&
-        typeof block.id === "string"
-      ) {
-        const input = toObjectRecord(block.input);
-        const title = readNonEmptyString(input?.name) ?? readNonEmptyString(input?.subagent_type);
-        const description = readNonEmptyString(input?.description);
-        toolCalls.set(block.id, {
-          ...(title ? { title } : {}),
-          ...(description ? { description } : {}),
+        entry.type !== "user" ||
+        block?.type !== "tool_result" ||
+        typeof block.tool_use_id !== "string"
+      )
+        continue;
+      if (toObjectRecord(entry.toolUseResult)?.status !== "async_launched")
+        outcomes.set(block.tool_use_id, {
+          status: block.is_error === true ? "failed" : "completed",
        });
-      }
-      if (block?.type !== "tool_result" || typeof block.tool_use_id !== "string") continue;
-      outcomes.set(block.tool_use_id, { failed: block.is_error === true });
      const agentId = readLegacyClaudeSubagentId(block.content);
      if (agentId)
        linksByAgentId.set(agentId, {
          toolCallId: block.tool_use_id,
-          failed: block.is_error === true,
        });
    }
  }
@@ -6299,6 +6342,29 @@ async function readClaudeReplayParentFacts(
  };
 }

+function readClaudeReplayTaskDeclaration(
+  entryType: unknown,
+  block: Record<string, unknown> | undefined,
+): {
+  id: string;
+  identity: { title?: string; description?: string };
+} | null {
+  if (
+    entryType !== "assistant" ||
+    block?.type !== "tool_use" ||
+    (block.name !== "Task" && block.name !== "Agent") ||
+    typeof block.id !== "string"
+  )
+    return null;
+  const input = toObjectRecord(block.input);
+  const title = readNonEmptyString(input?.name) ?? readNonEmptyString(input?.subagent_type);
+  const description = readNonEmptyString(input?.description);
+  return {
+    id: block.id,
+    identity: { ...(title ? { title } : {}), ...(description ? { description } : {}) },
+  };
+}
+
 function readLegacyClaudeSubagentId(content: unknown): string | undefined {
  return /agentId:\s*([\w-]+)/.exec(JSON.stringify(content))?.[1];
 }
@@ -0,0 +1,6 @@
+const INTERRUPT_PLACEHOLDER_PATTERN = /^\[Request interrupted by user(?:[^\]]*)\]$/;
+
+/** The text Claude Code records in place of a turn that an interrupt stopped. */
+export function isClaudeInterruptPlaceholderText(value: unknown): boolean {
+  return typeof value === "string" && INTERRUPT_PLACEHOLDER_PATTERN.test(value.trim());
+}
@@ -0,0 +1,46 @@
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import pino from "pino";
+import { expect, test } from "vitest";
+import { ClaudeAgentClient } from "./agent.js";
+
+test("the real SDK passes the user's settings file contents alongside Paseo flags", async () => {
+  const cwd = await fs.mkdtemp(path.join(os.tmpdir(), "paseo-claude-settings-argv-"));
+  const capturePath = path.join(cwd, "argv.json");
+  const binaryPath = path.join(cwd, "capture.mjs");
+  const settingsPath = path.join(cwd, "settings.json");
+  const userSettings = {
+    env: { ENABLE_TOOL_SEARCH: "false" },
+    permissions: { deny: ["Monitor"] },
+  };
+  try {
+    // A CLI fixture records the real SDK's arguments without making a model request.
+    await fs.writeFile(
+      binaryPath,
+      `import fs from "node:fs"; fs.writeFileSync(${JSON.stringify(capturePath)}, JSON.stringify(process.argv.slice(2)));`,
+    );
+    await fs.writeFile(settingsPath, JSON.stringify(userSettings));
+    const client = new ClaudeAgentClient({
+      logger: pino({ level: "silent" }),
+      resolveBinary: async () => binaryPath,
+    });
+    const session = await client.createSession({
+      provider: "claude",
+      cwd,
+      model: "claude-opus-5-5",
+      providerOptions: { extraArgs: { settings: settingsPath } },
+    });
+    try {
+      await session.startTurn("hello");
+    } finally {
+      await session.close();
+    }
+    const argv: string[] = JSON.parse(await fs.readFile(capturePath, "utf8"));
+    const settingsIndex = argv.indexOf("--settings");
+    expect(settingsIndex).toBeGreaterThanOrEqual(0);
+    expect(JSON.parse(argv[settingsIndex + 1]!)).toEqual({ ...userSettings, fastMode: false });
+  } finally {
+    await fs.rm(cwd, { recursive: true, force: true });
+  }
+});
@@ -1,7 +1,8 @@
+import type { ProviderSubagentStatus } from "../../../provider-subagents/store.js";
+import { mapTaskStatus } from "./task-status.js";
 import type { SDKMessage } from "@anthropic-ai/claude-agent-sdk";

 import type { AgentMetadata } from "../../../agent-sdk-types.js";
-import type { ProviderSubagentStatus } from "../../../provider-subagents/store.js";
 import { resolveObservedClaudeModelId } from "../models.js";
 import type { SubagentObservation } from "./observation.js";
 import {
@@ -120,28 +121,6 @@ function readString(value: unknown): string | undefined {
  return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
 }

-/**
- * The descriptor has no paused or pending state, and neither is terminal, so both read as
- * running. `killed` is a cancellation, not a failure — the child was stopped, it did not error.
- */
-function mapTaskStatus(status: string | undefined): ProviderSubagentStatus | undefined {
-  switch (status) {
-    case "pending":
-    case "running":
-    case "paused":
-      return "running";
-    case "completed":
-      return "completed";
-    case "failed":
-      return "failed";
-    case "killed":
-    case "stopped":
-      return "canceled";
-    default:
-      return undefined;
-  }
-}
-
 export interface ClaudeTaskProtocolSourceInput {
  /**
   * The parent's Task tool input, by tool_use id.
@@ -36,7 +36,7 @@ function parentWithTaskCall(failed = false): ClaudeReplayParentFacts {
      ],
    ]),
    linksByAgentId: new Map(),
-    outcomesByToolCallId: new Map([[TOOL_USE_ID, { failed }]]),
+    outcomesByToolCallId: new Map([[TOOL_USE_ID, { status: failed ? "failed" : "completed" }]]),
  };
 }

@@ -117,7 +117,7 @@ describe("observeReplaySubagents", () => {
                [nestedToolUseId, { title: "Explore", description: "Nested audit" }],
              ]),
              linksByAgentId: new Map(),
-              outcomesByToolCallId: new Map([[nestedToolUseId, { failed: false }]]),
+              outcomesByToolCallId: new Map([[nestedToolUseId, { status: "completed" }]]),
            },
          },
          {
@@ -173,8 +173,8 @@ describe("observeReplaySubagents", () => {
  it("falls back to the scraped link when there is no meta file", async () => {
    const parent: ClaudeReplayParentFacts = {
      toolCalls: new Map([[TOOL_USE_ID, { title: "Explore" }]]),
-      linksByAgentId: new Map([[AGENT_ID, { toolCallId: TOOL_USE_ID, failed: false }]]),
-      outcomesByToolCallId: new Map(),
+      linksByAgentId: new Map([[AGENT_ID, { toolCallId: TOOL_USE_ID }]]),
+      outcomesByToolCallId: new Map([[TOOL_USE_ID, { status: "completed" }]]),
    };

    const [declared, ...rest] = (
@@ -263,8 +263,8 @@ describe("observeReplaySubagents", () => {
          subagents: [{ agentId: AGENT_ID, meta: null, entries: [] }],
          parent: {
            toolCalls: new Map([[TOOL_USE_ID, { title: "Explore" }]]),
-            linksByAgentId: new Map([[AGENT_ID, { toolCallId: TOOL_USE_ID, failed: true }]]),
-            outcomesByToolCallId: new Map(),
+            linksByAgentId: new Map([[AGENT_ID, { toolCallId: TOOL_USE_ID }]]),
+            outcomesByToolCallId: new Map([[TOOL_USE_ID, { status: "failed" }]]),
          },
          convertEntry: () => [],
        })
@@ -3,6 +3,7 @@ import { z } from "zod";
 import type { AgentTimelineItem } from "../../../agent-sdk-types.js";
 import { normalizeProviderReplayTimestamp } from "../../../provider-history-timestamps.js";
 import type { ProviderSubagentStatus } from "../../../provider-subagents/store.js";
+import { isClaudeInterruptPlaceholderText } from "../interrupt-placeholder.js";
 import { resolveObservedClaudeModelId } from "../models.js";
 import type { SubagentObservation } from "./observation.js";
 import { buildClaudeSubagentSubtitle, type ClaudeSubagentUsage } from "./presentation.js";
@@ -139,9 +140,12 @@ export interface ClaudeReplayParentFacts {
  /** Task `tool_use` id -> identity declared in the parent's tool input. */
  toolCalls: ReadonlyMap<string, { title?: string; description?: string }>;
  /** agentId -> tool call, recovered by scraping tool-result text. Legacy fallback only. */
-  linksByAgentId: ReadonlyMap<string, { toolCallId: string; failed: boolean }>;
-  /** Task `tool_use` id -> outcome. Usable once meta.json supplies the link directly. */
-  outcomesByToolCallId: ReadonlyMap<string, { failed: boolean }>;
+  linksByAgentId: ReadonlyMap<string, { toolCallId: string }>;
+  /**
+   * Task `tool_use` id -> outcome, whichever way the child was linked. A background launch has
+   * none: its immediate result only says the child started.
+   */
+  outcomesByToolCallId: ReadonlyMap<string, { status: ProviderSubagentStatus }>;
 }

 interface ParentLink {
@@ -177,27 +181,14 @@ function resolveParentLink(
  parent: ClaudeReplayParentFacts,
 ): ParentLink | null {
  const metaToolUseId = subagent.meta?.toolUseId?.trim();
-  if (metaToolUseId && parent.toolCalls.has(metaToolUseId)) {
-    const outcome = parent.outcomesByToolCallId.get(metaToolUseId);
-    let status: ProviderSubagentStatus | null = null;
-    if (outcome) status = outcome.failed ? "failed" : "completed";
-    return {
-      id: metaToolUseId,
-      toolCallId: metaToolUseId,
-      status,
-    };
-  }
+  const toolCallId =
+    metaToolUseId && parent.toolCalls.has(metaToolUseId)
+      ? metaToolUseId
+      : parent.linksByAgentId.get(subagent.agentId)?.toolCallId;
+  if (!toolCallId || !parent.toolCalls.has(toolCallId)) return null;

-  const scraped = parent.linksByAgentId.get(subagent.agentId);
-  if (scraped && parent.toolCalls.has(scraped.toolCallId)) {
-    return {
-      id: scraped.toolCallId,
-      toolCallId: scraped.toolCallId,
-      status: scraped.failed ? "failed" : "completed",
-    };
-  }
-
-  return null;
+  const status = parent.outcomesByToolCallId.get(toolCallId)?.status ?? null;
+  return { id: toolCallId, toolCallId, status };
 }

 /**
@@ -276,9 +267,7 @@ async function observeSubagent(
    lastTimestamp = timestamp;
    Object.assign(runtime, readRuntime(entry));
    usage = readUsage(entry) ?? usage;
-    if (entry.type === "assistant") {
-      childTerminalStatus = entry.message?.stop_reason === "end_turn" ? "completed" : null;
-    }
+    childTerminalStatus = readChildTerminalStatus(entry, childTerminalStatus);
    recordReplayToolOwners(toolOwners, entry, link.id);
    for (const item of await convertEntry(entry)) {
      timeline.push({ kind: "timeline", id: link.id, item, ...(timestamp ? { timestamp } : {}) });
@@ -308,6 +297,30 @@ async function observeSubagent(
  return observations;
 }

+/** Advance the child's fallback outcome without retaining transcript entries. */
+function readChildTerminalStatus(
+  entry: ClaudeReplayEntry,
+  previous: ProviderSubagentStatus | null,
+): ProviderSubagentStatus | null {
+  if (entry.type === "assistant") {
+    return entry.message?.stop_reason === "end_turn" ? "completed" : null;
+  }
+  if (entry.type !== "user") return previous;
+  const texts = readUserTexts(entry);
+  if (texts.length === 0) return previous;
+  return texts.some(isClaudeInterruptPlaceholderText) ? "canceled" : null;
+}
+
+/** Tool results carry no user text and do not change the child's terminal status. */
+function readUserTexts(entry: ClaudeReplayEntry): string[] {
+  const content = entry.message?.content;
+  if (typeof content === "string") return [content];
+  if (!Array.isArray(content)) return [];
+  return content.flatMap((block: { type?: unknown; text?: unknown } | null) =>
+    block?.type === "text" && typeof block.text === "string" ? [block.text] : [],
+  );
+}
+
 function recordReplayToolOwners(
  owners: Map<string, string>,
  entry: ClaudeReplayEntry,
@@ -0,0 +1,23 @@
+import type { ProviderSubagentStatus } from "../../../provider-subagents/store.js";
+
+/**
+ * The descriptor has no paused or pending state, and neither is terminal, so both read as
+ * running. `killed` is a cancellation, not a failure — the child was stopped, it did not error.
+ */
+export function mapTaskStatus(status: string | undefined): ProviderSubagentStatus | undefined {
+  switch (status) {
+    case "pending":
+    case "running":
+    case "paused":
+      return "running";
+    case "completed":
+      return "completed";
+    case "failed":
+      return "failed";
+    case "killed":
+    case "stopped":
+      return "canceled";
+    default:
+      return undefined;
+  }
+}
@@ -407,19 +407,21 @@ export function mapTaskNotificationSystemRecordToToolCall(
 }

 export function readTaskNotificationToolUseIdFromHistoryRecord(record: unknown): string | null {
+  return readTaskNotificationFromHistoryRecord(record)?.toolUseId ?? null;
+}
+
+export function readTaskNotificationFromHistoryRecord(
+  record: unknown,
+): TaskNotificationEnvelope | null {
  const parsedRecord = TaskNotificationHistoryRecordSchema.safeParse(record);
-  if (!parsedRecord.success) {
-    return null;
-  }
+  if (!parsedRecord.success) return null;
  if (parsedRecord.data.type === "user" && parsedRecord.data.message) {
-    return (
-      parseTaskNotificationFromUserContent({
-        content: parsedRecord.data.message.content,
-        messageId: parsedRecord.data.uuid ?? parsedRecord.data.message_id,
-      })?.toolUseId ?? null
-    );
+    return parseTaskNotificationFromUserContent({
+      content: parsedRecord.data.message.content,
+      messageId: parsedRecord.data.uuid ?? parsedRecord.data.message_id,
+    });
  }
-  return parseTaskNotificationFromSystemRecord(record)?.toolUseId ?? null;
+  return parseTaskNotificationFromSystemRecord(record);
 }

 export function coerceTaskNotificationHistoryRecordToSystemMessage(
@@ -16,6 +16,7 @@ import type {
  AgentSessionConfig,
  AgentSlashCommand,
  AgentStreamEvent,
+  AgentTimelineItem,
 } from "../agent-sdk-types.js";
 import {
  buildCodexAppServerEnv,
@@ -114,7 +115,6 @@ interface CodexSessionTestAccess {
  ensureThreadLoaded(): Promise<void>;
  handleToolApprovalRequest(params: unknown): Promise<unknown>;
  handleNotification(method: string, params: unknown): Promise<void>;
-  loadPersistedHistory(client: CodexClientLike | null): Promise<void>;
  refreshResolvedCollaborationMode(): void;
  serviceTier: "fast" | null;
  planModeEnabled: boolean;
@@ -503,6 +503,81 @@ function archivedThreadErrorMessage(threadId: string): string {
  );
 }

+function codexUserItem(id: string, text: string) {
+  return { type: "userMessage", id, content: [{ type: "text", text }] };
+}
+
+function codexAgentItem(text: string) {
+  return { type: "agentMessage", id: `agent-${text}`, text };
+}
+
+// An AgentManager over a real Codex provider whose every spawn gets a fresh fake
+// app-server serving `threads` from thread/read.
+function createReopenableCodexAgent(threads: Record<string, unknown[]>) {
+  const appServers: FakeCodexAppServer[] = [];
+  const provider = new CodexAppServerAgentClient(createTestLogger());
+  const internals = castInternals<{
+    goalsEnabledPromise: Promise<boolean> | null;
+    autoReviewEnabledPromise: Promise<boolean> | null;
+    spawnAppServer: () => Promise<ChildProcessWithoutNullStreams>;
+  }>(provider);
+  internals.goalsEnabledPromise = Promise.resolve(false);
+  internals.autoReviewEnabledPromise = Promise.resolve(false);
+  internals.spawnAppServer = async () => {
+    const appServer = createFakeCodexAppServer({
+      "thread/read": (params) => {
+        const { threadId } = params as { threadId: string };
+        return { thread: { id: threadId, turns: threads[threadId] ?? [] } };
+      },
+    });
+    appServers.push(appServer);
+    return appServer.child;
+  };
+  // The fake app-server stands in for the Codex CLI, which test machines may not have.
+  const client: AgentClient = {
+    provider: "codex",
+    capabilities: provider.capabilities,
+    isAvailable: async () => true,
+    fetchCatalog: async () => ({ models: [], modes: [] }),
+    createSession: async () => {
+      throw new Error("Unexpected create");
+    },
+    resumeSession: (...args) => provider.resumeSession(...args),
+  };
+  const manager = new AgentManager({ clients: { codex: client }, logger: createTestLogger() });
+  const agentId = "00000000-0000-4000-8000-000000000001";
+  const handle = { provider: "codex", sessionId: "saved-thread" };
+  const config = createConfig({ cwd: process.cwd() });
+
+  async function open(): Promise<void> {
+    await manager.resumeAgentFromPersistence(handle, config, agentId);
+    await manager.hydrateTimelineFromProvider(agentId);
+  }
+
+  return {
+    manager,
+    agentId,
+    latestAppServer: () => appServers[appServers.length - 1],
+    threadMethods: (index: number) =>
+      appServers[index]
+        .requests()
+        .map((request) => request.method)
+        .filter((method) => typeof method === "string" && method.startsWith("thread/")),
+    // Cold-loads the agent, closes its runtime, and reopens it while Paseo keeps its timeline.
+    async loadCloseAndReopen(): Promise<AgentTimelineItem[]> {
+      await open();
+      const projected = manager.getTimeline(agentId);
+      await manager.closeAgent(agentId);
+      await open();
+      return projected;
+    },
+    async close(): Promise<void> {
+      await manager.closeAgent(agentId);
+      for (const appServer of appServers) appServer.assertNoErrors();
+    },
+  };
+}
+
 function asInternals(session: CodexTestSession): CodexSessionTestAccess {
  return castInternals<CodexSessionTestAccess>(session);
 }
@@ -1897,12 +1972,147 @@ describe("Codex app-server provider", () => {
      "thread/resume",
      "thread/unarchive",
      "thread/resume",
-      "thread/read",
    ]);
    await session.close();
    appServer.assertNoErrors();
  });

+  test("resumes a Codex thread without asking for its turns", async () => {
+    const appServer = createFakeCodexAppServer();
+    const provider = createProviderWithFakeAppServer(appServer);
+
+    const session = await provider.resumeSession({ sessionId: "saved-thread" });
+
+    expect(
+      appServer
+        .requests()
+        .filter((request) => request.method === "thread/resume")
+        .map((request) => request.params),
+    ).toEqual([expect.objectContaining({ threadId: "saved-thread", excludeTurns: true })]);
+    await session.close();
+    appServer.assertNoErrors();
+  });
+
+  test("reopening an agent whose timeline Paseo still holds does not read Codex history", async () => {
+    const codex = createReopenableCodexAgent({
+      "saved-thread": [
+        { id: "turn-1", items: [codexUserItem("user-1", "Hello"), codexAgentItem("Hi there.")] },
+      ],
+    });
+    try {
+      const projected = await codex.loadCloseAndReopen();
+
+      expect(projected).toEqual([
+        expect.objectContaining({ type: "user_message", messageId: "user-1", text: "Hello" }),
+        expect.objectContaining({ type: "assistant_message", text: "Hi there." }),
+      ]);
+      expect(codex.threadMethods(0)).toEqual([
+        "thread/loaded/list",
+        "thread/resume",
+        "thread/read",
+      ]);
+      expect(codex.threadMethods(1)).toEqual(["thread/loaded/list", "thread/resume"]);
+      expect(codex.manager.getTimeline(codex.agentId)).toEqual(projected);
+    } finally {
+      await codex.close();
+    }
+  });
+
+  test("rewinds an agent reopened without reading its Codex history", async () => {
+    const firstTurn = {
+      id: "turn-1",
+      items: [codexUserItem("user-1", "First"), codexAgentItem("First answer.")],
+    };
+    const codex = createReopenableCodexAgent({
+      "saved-thread": [
+        firstTurn,
+        { id: "turn-2", items: [codexUserItem("user-2", "Second"), codexAgentItem("Second.")] },
+      ],
+      "forked-thread": [firstTurn],
+    });
+    try {
+      await codex.loadCloseAndReopen();
+
+      await codex.manager.rewind(codex.agentId, "user-2", "conversation");
+
+      expect(codex.latestAppServer().recordedRollbacks).toEqual([
+        { threadId: "forked-thread", numTurns: 1 },
+      ]);
+      expect(codex.manager.getTimeline(codex.agentId)).toEqual([
+        expect.objectContaining({ type: "user_message", messageId: "user-1", text: "First" }),
+        expect.objectContaining({ type: "assistant_message", text: "First answer." }),
+      ]);
+    } finally {
+      await codex.close();
+    }
+  });
+
+  test("keeps a reopened agent's interaction with an earlier sub-agent on its original card", async () => {
+    const codex = createReopenableCodexAgent({
+      "saved-thread": [
+        {
+          id: "turn-1",
+          items: [
+            codexUserItem("user-1", "Delegate"),
+            {
+              type: "subAgentActivity",
+              id: "spawn-child",
+              kind: "started",
+              agentThreadId: "child-thread",
+              agentPath: "/root/child",
+            },
+          ],
+        },
+      ],
+      "child-thread": [{ id: "child-turn-1", items: [codexAgentItem("Child started.")] }],
+    });
+    try {
+      await codex.loadCloseAndReopen();
+      const appServer = codex.latestAppServer();
+
+      const run = codex.manager.runAgent(codex.agentId, "Ask the child again");
+      await appServer.waitForTurnStart();
+      appServer.startsTurn({ threadId: "saved-thread", turnId: "turn-2" });
+      appServer.beginsSubAgentActivity({
+        callId: "interact-child",
+        threadId: "child-thread",
+        parentThreadId: "saved-thread",
+        kind: "interacted",
+        agentPath: "/root/child",
+      });
+      appServer.says({ threadId: "child-thread", itemId: "child-reply", text: "Child replied." });
+      appServer.completesSubAgentActivity({
+        callId: "interact-child",
+        threadId: "child-thread",
+        parentThreadId: "saved-thread",
+        kind: "interacted",
+        agentPath: "/root/child",
+      });
+      appServer.completeTurn({ threadId: "saved-thread" });
+      await run;
+
+      const toolCalls = codex.manager
+        .getTimeline(codex.agentId)
+        .filter((item) => item.type === "tool_call");
+      expect(new Set(toolCalls.map((item) => item.callId))).toEqual(new Set(["spawn-child"]));
+      expect(toolCalls.at(-1)).toMatchObject({ callId: "spawn-child", status: "completed" });
+      expect(codex.manager.getProviderSubagent(codex.agentId, "child-thread")).toMatchObject({
+        toolCallId: "spawn-child",
+        status: "completed",
+      });
+      expect(
+        codex.manager
+          .fetchProviderSubagentTimeline(codex.agentId, "child-thread")
+          .rows.map((row) => row.item),
+      ).toEqual([
+        expect.objectContaining({ type: "assistant_message", text: "Child started." }),
+        expect.objectContaining({ type: "assistant_message", text: "Child replied." }),
+      ]);
+    } finally {
+      await codex.close();
+    }
+  });
+
  test("closes Codex app-server when an interactive resume fails", async () => {
    const appServer = createFakeCodexAppServer({
      "thread/resume": () => Promise.reject(new Error("thread resume failed")),
@@ -4673,8 +4883,6 @@ describe("Codex app-server provider", () => {
      }),
    };

-    await asInternals(session).loadPersistedHistory(session.client);
-
    const history: AgentStreamEvent[] = [];
    for await (const event of session.streamHistory()) {
      history.push(event);
@@ -4727,7 +4935,7 @@ describe("Codex app-server provider", () => {
      })),
    };

-    await asInternals(session).loadPersistedHistory(session.client);
+    await Array.fromAsync(session.streamHistory());

    expect(asInternals(session).codexUserMessageTurns().resolve("message-history")).toEqual({
      index: 0,
@@ -4796,8 +5004,6 @@ describe("Codex app-server provider", () => {
      }),
    };

-    await asInternals(session).loadPersistedHistory(session.client);
-
    const history: AgentStreamEvent[] = [];
    for await (const event of session.streamHistory()) {
      history.push(event);
@@ -4958,8 +5164,6 @@ describe("Codex app-server provider", () => {
      }),
    };

-    await asInternals(session).loadPersistedHistory(session.client);
-
    const history: AgentStreamEvent[] = [];
    for await (const event of session.streamHistory()) {
      history.push(event);
@@ -5023,8 +5227,6 @@ describe("Codex app-server provider", () => {
      }),
    };

-    await asInternals(session).loadPersistedHistory(session.client);
-
    const history: AgentStreamEvent[] = [];
    for await (const event of session.streamHistory()) {
      history.push(event);
@@ -5200,8 +5402,6 @@ describe("Codex app-server provider", () => {
      }),
    };

-    await asInternals(session).loadPersistedHistory(session.client);
-
    const history: AgentStreamEvent[] = [];
    for await (const event of session.streamHistory()) {
      history.push(event);
@@ -5261,8 +5461,6 @@ describe("Codex app-server provider", () => {
      }),
    };

-    await asInternals(session).loadPersistedHistory(session.client);
-
    const history: AgentStreamEvent[] = [];
    for await (const event of session.streamHistory()) {
      history.push(event);
@@ -5564,7 +5762,10 @@ describe("Codex app-server provider", () => {
    expect(session.currentThreadId).toBe("archived-thread-id");
    expect(requests).toEqual([
      { method: "thread/loaded/list", params: {} },
-      { method: "thread/resume", params: { threadId: "archived-thread-id" } },
+      {
+        method: "thread/resume",
+        params: { threadId: "archived-thread-id", excludeTurns: true },
+      },
    ]);
  });

@@ -6399,8 +6600,6 @@ describe("Codex app-server provider", () => {
      })),
    };

-    await asInternals(session).loadPersistedHistory(session.client);
-
    const history: AgentStreamEvent[] = [];
    for await (const event of session.streamHistory()) {
      history.push(event);
@@ -496,6 +496,11 @@ interface PersistedTimelineEntry {
  providerTurnId?: string;
 }

+interface CodexThreadHistory {
+  timeline: PersistedTimelineEntry[];
+  providerSubagentEvents: AgentStreamEvent[];
+}
+
 interface PersistedSubAgentRoute {
  childThreadId: string;
  toolCall: ToolCallTimelineItem;
@@ -3464,10 +3469,12 @@ export class CodexAppServerAgentSession implements AgentSession {
  private serviceTier: string | null = null;
  private speedModels: CodexModel[] = [];
  private planModeEnabled = false;
-  private historyPending = false;
-  private persistedHistory: PersistedTimelineEntry[] = [];
-  private loadingPersistedHistory = false;
-  private persistedProviderSubagentEvents: AgentStreamEvent[] = [];
+  // History read by rewind or an archived resume, held until streamHistory consumes it.
+  private stagedHistory: CodexThreadHistory | null = null;
+  // Collects provider subagent events emitted while a thread history read rebuilds routes.
+  private historySubagentEvents: AgentStreamEvent[] | null = null;
+  // A resumed thread's earlier turns and sub-agents are known only after reading its history.
+  private historyIndexed = true;
  private pendingPermissions = new Map<string, AgentPermissionRequest>();
  private mcpElicitationPermissionIds = new Map<number, string>();
  private pendingPermissionHandlers = new Map<string, CodexPendingPermissionHandler>();
@@ -3574,7 +3581,7 @@ export class CodexAppServerAgentSession implements AgentSession {

    if (this.resumeHandle?.sessionId) {
      this.currentThreadId = this.resumeHandle.sessionId;
-      this.historyPending = true;
+      this.historyIndexed = false;
      // Resuming can start a goal before the caller receives the session.
      if (this.initialResumePurpose === "interactive") this.startupEvents = [];
    }
@@ -3622,7 +3629,7 @@ export class CodexAppServerAgentSession implements AgentSession {

  private async establishConnection(): Promise<void> {
    if (this.initialResumePurpose === "history") {
-      await this.readArchivedHistory();
+      this.stagedHistory = await this.readArchivedHistory();
      this.connectionState = "history-ready";
      return;
    }
@@ -3655,7 +3662,6 @@ export class CodexAppServerAgentSession implements AgentSession {

      if (this.currentThreadId) {
        await this.ensureThreadLoaded();
-        await this.loadPersistedHistory(this.client);
        await this.applyDefaultModelAndThinking();
      }

@@ -3970,39 +3976,40 @@ export class CodexAppServerAgentSession implements AgentSession {
    );
  }

-  private async readArchivedHistory(): Promise<void> {
+  private async readArchivedHistory(): Promise<CodexThreadHistory> {
    const child = await this.spawnAppServer();
    const client = new CodexAppServerClient(child, this.logger, () => this.traceContext());
    try {
      await client.request("initialize", buildCodexAppServerInitializeParams());
      client.notify("initialized", {});
-      await this.loadPersistedHistory(client);
+      return await this.readThreadHistory(client);
    } finally {
      await client.dispose();
    }
  }

-  private async loadPersistedHistory(client: CodexAppServerClientLike | null): Promise<void> {
-    if (!client || !this.currentThreadId) return;
-    const threadId = this.currentThreadId;
-
-    const history = await loadCodexThreadHistoryTimeline({
-      threadId,
+  // Reads the thread and its sub-agent threads, rebuilding the turn index and
+  // sub-agent routes. The caller owns the returned history; nothing retains it.
+  private async readThreadHistory(
+    client: CodexAppServerClientLike | null,
+  ): Promise<CodexThreadHistory> {
+    if (!client || !this.currentThreadId) {
+      return { timeline: [], providerSubagentEvents: [] };
+    }
+    const { timeline, subAgentRoutes } = await loadCodexThreadHistoryTimeline({
+      threadId: this.currentThreadId,
      cwd: this.config.cwd ?? null,
-      requestThread: (threadIdToRead) => {
-        return readCodexThread(client, threadIdToRead);
-      },
+      requestThread: (threadIdToRead) => readCodexThread(client, threadIdToRead),
    });
-    const { timeline, subAgentRoutes } = history;
    this.subAgentCallsByCallId.clear();
    this.subAgentCallIdByChildThreadId.clear();
    this.pendingSubAgentNotificationsByThreadId.clear();
-    this.persistedProviderSubagentEvents = [];
-    this.loadingPersistedHistory = true;
+    const providerSubagentEvents: AgentStreamEvent[] = [];
+    this.historySubagentEvents = providerSubagentEvents;
    try {
      await this.loadPersistedSubAgentHistories(client, subAgentRoutes);
    } finally {
-      this.loadingPersistedHistory = false;
+      this.historySubagentEvents = null;
    }
    this.resetCodexUserMessageTurns();
    for (const entry of timeline) {
@@ -4013,8 +4020,15 @@ export class CodexAppServerAgentSession implements AgentSession {
        this.rememberCodexUserMessageTurn(entry.item.messageId, entry.providerTurnId);
      }
    }
-    this.persistedHistory = timeline;
-    this.historyPending = timeline.length > 0;
+    this.historyIndexed = true;
+    return { timeline, providerSubagentEvents };
+  }
+
+  // Turns and rewind route by the thread's earlier turns and sub-agents. A resumed
+  // session whose projection Paseo already holds reads them here and drops the rest.
+  private async ensureHistoryIndexed(): Promise<void> {
+    if (this.historyIndexed) return;
+    await this.readThreadHistory(this.client);
  }

  private async loadPersistedSubAgentHistories(
@@ -4066,7 +4080,8 @@ export class CodexAppServerAgentSession implements AgentSession {

  private async ensureThreadLoaded(): Promise<void> {
    if (!this.client || !this.currentThreadId) return;
-    const params: Record<string, unknown> = { threadId: this.currentThreadId };
+    // Paseo reads history only when it replays it; the resume response needs no turns.
+    const params: Record<string, unknown> = { threadId: this.currentThreadId, excludeTurns: true };
    const developerInstructions = composeSystemPromptParts(
      this.config.systemPrompt,
      this.config.daemonAppendSystemPrompt,
@@ -4386,6 +4401,7 @@ export class CodexAppServerAgentSession implements AgentSession {

      if (this.currentThreadId) {
        await this.ensureThreadLoaded();
+        await this.ensureHistoryIndexed();
      } else {
        await this.ensureThread();
      }
@@ -4559,21 +4575,12 @@ export class CodexAppServerAgentSession implements AgentSession {
  }

  async *streamHistory(): AsyncGenerator<AgentStreamEvent> {
-    if (
-      (!this.historyPending || this.persistedHistory.length === 0) &&
-      this.persistedProviderSubagentEvents.length === 0
-    ) {
-      return;
-    }
-    const history = this.persistedHistory;
-    const providerSubagents = this.persistedProviderSubagentEvents;
-    this.persistedHistory = [];
-    this.persistedProviderSubagentEvents = [];
-    this.historyPending = false;
-    for (const event of providerSubagents) {
+    const history = this.stagedHistory ?? (await this.readThreadHistory(this.client));
+    this.stagedHistory = null;
+    for (const event of history.providerSubagentEvents) {
      yield event;
    }
-    for (const entry of history) {
+    for (const entry of history.timeline) {
      yield {
        type: "timeline",
        provider: CODEX_PROVIDER,
@@ -4956,6 +4963,7 @@ export class CodexAppServerAgentSession implements AgentSession {
    } else {
      await this.ensureThread();
    }
+    await this.ensureHistoryIndexed();

    await revertCodexConversation({
      client: this.client,
@@ -4970,10 +4978,8 @@ export class CodexAppServerAgentSession implements AgentSession {
      setThreadId: async (threadId) => {
        this.currentThreadId = threadId;
        this.cachedRuntimeInfo = null;
-        this.persistedHistory = [];
-        this.historyPending = false;
-        await this.loadPersistedHistory(this.client);
-        this.reconcileAsyncQuestionsAfterRewind();
+        this.stagedHistory = await this.readThreadHistory(this.client);
+        this.reconcileAsyncQuestionsAfterRewind(this.stagedHistory.timeline);
      },
    });
  }
@@ -5211,6 +5217,8 @@ export class CodexAppServerAgentSession implements AgentSession {
      await this.connect();
      if (this.currentThreadId) {
        await this.ensureThreadLoaded();
+        // A goal runs turns of its own.
+        await this.ensureHistoryIndexed();
      } else {
        await this.ensureThread();
      }
@@ -5404,8 +5412,8 @@ export class CodexAppServerAgentSession implements AgentSession {
  }

  private emitEvent(event: AgentStreamEvent): void {
-    if (this.loadingPersistedHistory && event.type === "provider_subagent") {
-      this.persistedProviderSubagentEvents.push(event);
+    if (this.historySubagentEvents && event.type === "provider_subagent") {
+      this.historySubagentEvents.push(event);
      return;
    }
    this.notifySubscribers(event);
@@ -6583,9 +6591,9 @@ export class CodexAppServerAgentSession implements AgentSession {
    }
  }

-  private reconcileAsyncQuestionsAfterRewind(): void {
+  private reconcileAsyncQuestionsAfterRewind(timeline: readonly PersistedTimelineEntry[]): void {
    const retainedIds = new Set(
-      this.persistedHistory.flatMap(({ item }) =>
+      timeline.flatMap(({ item }) =>
        item.type === "tool_call" && item.name === "request_user_input_async" ? [item.callId] : [],
      ),
    );
@@ -461,9 +461,19 @@ test.each([
        process.platform === "win32"
          ? `${windowsPackage}-${process.arch}@${cliPackage.slice(cliPackage.lastIndexOf("@") + 1)}`
          : cliPackage;
+      // npm abandons a stalled registry download only after its 5 minute default, past this
+      // test's budget, and the killed install keeps the fixture locked. Retry stalls sooner.
      await execCommand(
        "npm",
-        ["install", "--prefix", root, "--no-audit", "--no-fund", installPackage],
+        [
+          "install",
+          "--prefix",
+          root,
+          "--no-audit",
+          "--no-fund",
+          "--fetch-timeout=30000",
+          installPackage,
+        ],
        {
          cwd: root,
          timeout: 180_000,
@@ -0,0 +1,105 @@
+import { expect, test } from "vitest";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { AgentStorage, parseStoredAgentRecord } from "../agent-storage.js";
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import { createRestartRecovery } from "./index.js";
+
+test("recovery saves intent before normalization, clears before dispatch, and resumes each agent independently", async () => {
+  const root = await mkdtemp(join(tmpdir(), "restart-recovery-"));
+  try {
+    const storage = new AgentStorage(root, createTestLogger());
+    for (const [id, lastStatus] of [
+      ["broken", "running"],
+      ["stuck", "running"],
+      ["working", "running"],
+      ["idle", "idle"],
+      ["initializing", "initializing"],
+    ] as const) {
+      await storage.upsert(
+        parseStoredAgentRecord({
+          id,
+          lastStatus,
+          provider: "codex",
+          cwd: root,
+          createdAt: new Date().toISOString(),
+          updatedAt: new Date().toISOString(),
+        }),
+      );
+    }
+    const dispatched: string[] = [];
+    const recovery = createRestartRecovery({
+      storage,
+      settings: () => ({ enabled: true, prompt: "Continue verbatim.\n" }),
+      eligible: async () => true,
+      dispatch: async (id, prompt) => {
+        expect((await storage.get(id))?.resumeOnStartup).toBe(false);
+        if (id === "broken") throw new Error("unavailable");
+        if (id === "stuck") return new Promise(() => {});
+        dispatched.push(id + prompt);
+      },
+      report: () => {},
+    });
+    await recovery.prepareStartup();
+    expect((await storage.get("working"))?.resumeOnStartup).toBe(true);
+    expect((await storage.get("working"))?.lastStatus).toBe("closed");
+    recovery.resumePending();
+    const running = new AbortController().signal;
+    await recovery.waitForResume("broken", running);
+    await recovery.waitForResume("working", running);
+    await recovery.waitForResume("idle", running);
+    expect(dispatched).toEqual(["workingContinue verbatim.\n"]);
+    const stopped = new AbortController();
+    stopped.abort();
+    await expect(recovery.waitForResume("stuck", stopped.signal)).rejects.toBeDefined();
+  } finally {
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
+test("opt-out consumes pending recovery and excludes archived, private, owned and archived-workspace agents", async () => {
+  const root = await mkdtemp(join(tmpdir(), "restart-recovery-"));
+  try {
+    const storage = new AgentStorage(root, createTestLogger());
+    for (const extra of [
+      { id: "running" },
+      { id: "archived", archivedAt: "today" },
+      { id: "private", internal: true },
+      { id: "owned", owner: { kind: "daemon", daemonId: "hub", executionId: "run" } },
+      { id: "workspace", workspaceId: "archived" },
+    ]) {
+      await storage.upsert(
+        parseStoredAgentRecord({
+          lastStatus: "running",
+          provider: "codex",
+          cwd: root,
+          createdAt: new Date().toISOString(),
+          updatedAt: new Date().toISOString(),
+          ...extra,
+        }),
+      );
+    }
+    let enabled = true;
+    const dispatched: string[] = [];
+    const recovery = createRestartRecovery({
+      storage,
+      settings: () => ({ enabled, prompt: "Resume working." }),
+      eligible: async (record) => record.workspaceId !== "archived",
+      dispatch: async (id) => {
+        dispatched.push(id);
+      },
+      report: () => {},
+    });
+    await recovery.captureRunningAgents();
+    expect((await storage.get("running"))?.resumeOnStartup).toBe(true);
+    enabled = false;
+    await recovery.prepareStartup();
+    enabled = true;
+    recovery.resumePending();
+    expect(dispatched).toEqual([]);
+    expect((await storage.list()).every((record) => !record.resumeOnStartup)).toBe(true);
+  } finally {
+    await rm(root, { recursive: true, force: true });
+  }
+});
@@ -0,0 +1,81 @@
+import type { AgentStorage, StoredAgentRecord } from "../agent-storage.js";
+interface Dependencies {
+  storage: AgentStorage;
+  settings(): { enabled: boolean; prompt: string };
+  eligible(record: StoredAgentRecord): Promise<boolean>;
+  dispatch(agentId: string, prompt: string): Promise<unknown>;
+  report(agentId: string, error: unknown): void;
+}
+export function createRestartRecovery(deps: Dependencies) {
+  // Candidates are chosen at startup; each settles once its resume was sent or abandoned.
+  const resuming = new Map<string, { promise: Promise<void>; resolve(): void }>();
+  const eligible = async (record: StoredAgentRecord) =>
+    !record.archivedAt && !record.internal && !record.owner && (await deps.eligible(record));
+  async function resume(agentId: string) {
+    const record = await deps.storage.get(agentId);
+    if (!record?.resumeOnStartup) return;
+    await deps.storage.upsert({ ...record, resumeOnStartup: false });
+    if (!deps.settings().enabled || !(await eligible(record))) return;
+    await deps.dispatch(agentId, deps.settings().prompt);
+  }
+  return {
+    /** Choose candidates before anything else reads or repairs persisted running status. */
+    async prepareStartup() {
+      for (const record of await deps.storage.list()) {
+        const pending =
+          deps.settings().enabled &&
+          (record.resumeOnStartup === true || record.lastStatus === "running") &&
+          (await eligible(record));
+        await deps.storage.upsert({
+          ...record,
+          resumeOnStartup: pending,
+          lastStatus:
+            record.lastStatus === "running" || record.lastStatus === "initializing"
+              ? "closed"
+              : record.lastStatus,
+        });
+        if (pending) {
+          let resolve!: () => void;
+          const promise = new Promise<void>((settle) => {
+            resolve = settle;
+          });
+          resuming.set(record.id, { promise, resolve });
+        }
+      }
+    },
+    async captureRunningAgents() {
+      await deps.storage.flush();
+      for (const record of await deps.storage.list()) {
+        if (record.lastStatus === "running" && (await eligible(record)))
+          await deps.storage.upsert({ ...record, resumeOnStartup: deps.settings().enabled });
+      }
+    },
+    /** Resume every candidate in the background; a slow provider holds back only its agent. */
+    resumePending() {
+      for (const [agentId, settled] of resuming) {
+        void resume(agentId)
+          .catch((error) => deps.report(agentId, error))
+          .finally(() => {
+            resuming.delete(agentId);
+            settled.resolve();
+          });
+      }
+    },
+    /** Wait until this agent's resume was sent or abandoned. Others return at once. */
+    async waitForResume(agentId: string, signal: AbortSignal) {
+      const settled = resuming.get(agentId);
+      if (!settled) return;
+      let abort!: () => void;
+      const aborted = new Promise<never>((_resolve, reject) => {
+        abort = () => reject(signal.reason);
+        if (signal.aborted) abort();
+        else signal.addEventListener("abort", abort, { once: true });
+      });
+      try {
+        await Promise.race([settled.promise, aborted]);
+      } finally {
+        signal.removeEventListener("abort", abort);
+      }
+    },
+  };
+}
@@ -0,0 +1,176 @@
+import assert from "node:assert/strict";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { setTimeout as delay } from "node:timers/promises";
+import type { ProviderEvent, ProviderRegistration } from "@getpaseo/plugin/server/provider";
+import pino from "pino";
+import { PluginAgentClientRegistry } from "../plugin-provider.js";
+import { InMemoryAgentTimelineStore } from "../agent-timeline-store.js";
+import { AgentManager } from "../agent-manager.js";
+import { AgentStorage } from "../agent-storage.js";
+import { buildProviderRegistry } from "../provider-registry.js";
+
+if (!global.gc) throw new Error("Run with --expose-gc");
+const logger = pino({ level: "silent" });
+const plugins = new PluginAgentClientRegistry(logger);
+const root = await mkdtemp(join(tmpdir(), "plugin-stream-memory-"));
+const emitters: Array<(event: ProviderEvent) => void> = [];
+const ids: string[] = [];
+const registrations: ProviderRegistration[] = Array.from({ length: 3 }, (_, index) => ({
+  id: `memory-${index}`,
+  label: "Memory fixture",
+  async connect() {
+    let listener: (event: ProviderEvent) => void = () => {};
+    const capabilities = ["prompt.message", "session.persistence"] as const;
+    return {
+      version: 1,
+      capabilities,
+      onEvent(callback) {
+        listener = callback;
+        // Plugin IPC delivers independent JSON strings, rather than shared ropes.
+        emitters[index] = (event) => listener(JSON.parse(JSON.stringify(event)));
+        return () => {
+          listener = () => {};
+        };
+      },
+      async send(input) {
+        if (input.type === "session.open") {
+          ids[index] = input.sessionId;
+          listener({
+            type: "session.opened",
+            requestId: input.requestId,
+            sessionId: input.sessionId,
+            cwd: "/tmp",
+            capabilities,
+            restoration: "core",
+            persistence: { version: 1, data: { index } },
+          });
+          listener({
+            type: "session.ready",
+            requestId: input.requestId,
+            sessionId: input.sessionId,
+          });
+        } else if (input.type === "catalog") {
+          listener({
+            type: "catalog",
+            requestId: input.requestId,
+            catalog: { models: [], modes: [], thinkingOptions: [] },
+          });
+        } else if (input.type === "session.close") {
+          listener({ type: "session.closed", sessionId: input.sessionId });
+          listener({ type: "request.completed", requestId: input.requestId });
+        }
+      },
+      async close() {},
+    };
+  },
+}));
+plugins.replace(registrations);
+const store = new InMemoryAgentTimelineStore();
+const manager = new AgentManager({
+  clients: plugins.clients(),
+  providerDefinitions: buildProviderRegistry(logger, { pluginProviders: plugins.definitions() }),
+  registry: new AgentStorage(root, logger),
+  timelineStore: store,
+  logger,
+});
+const agents = await Promise.all(
+  Object.keys(plugins.clients()).map((provider) =>
+    manager.createAgent({ provider, cwd: root }, undefined, {}),
+  ),
+);
+const sessions = agents.map((agent) => agent.session!);
+agents.forEach((_agent, index) => {
+  emitters[index]!({
+    type: "session.opened",
+    sessionId: `child-${index}`,
+    parentSessionId: ids[index]!,
+    capabilities: [],
+    restoration: "parent",
+    cwd: root,
+  });
+});
+global.gc();
+const before = process.memoryUsage().heapUsed;
+const steps = 4;
+const chunks = 200;
+const expected = new Map<string, string>();
+for (let step = 0; step < steps; step++) {
+  for (let index = 0; index < sessions.length; index++) {
+    const text = `${index}:${step}:` + "推理".repeat(15000) + "a\uD83D\uDE00b";
+    expected.set(`${index}:${step}`, text);
+    for (let chunk = 1; chunk <= chunks; chunk++) {
+      for (const sessionId of [ids[index]!, `child-${index}`]) {
+        emitters[index]!({
+          type: "timeline.item",
+          sessionId,
+          item: {
+            type: "reasoning",
+            id: `reason-${step}`,
+            text: text.slice(0, Math.ceil((chunk * text.length) / chunks)),
+          },
+        });
+      }
+    }
+    emitters[index]!({
+      type: "timeline.item",
+      sessionId: ids[index]!,
+      item: {
+        type: "tool_call",
+        id: `tool-${step}`,
+        callId: `tool-${step}`,
+        name: "read",
+        status: "completed",
+        error: null,
+        detail: { type: "unknown", input: null, output: "输出".repeat(16000) },
+      },
+    });
+    emitters[index]!({
+      type: "timeline.item",
+      sessionId: `child-${index}`,
+      item: {
+        type: "assistant_message",
+        id: `answer-${step}`,
+        text: "Child step complete.",
+      },
+    });
+  }
+  // Drain the manager's event queue; terminal tool states flush its real coalescer.
+  await delay(80);
+}
+global.gc();
+const retained = process.memoryUsage().heapUsed - before;
+assert(retained < 24 * 1024 * 1024, `Retained heap exceeded 24 MiB: ${retained} bytes`);
+for (let index = 0; index < sessions.length; index++) {
+  const items = store.getItems(agents[index]!.id);
+  assert.equal(items.length, steps * 2);
+  for (let step = 0; step < steps; step++) {
+    const item = items[step * 2]!;
+    assert.equal(item.type === "reasoning" && item.text, expected.get(`${index}:${step}`));
+  }
+  const children = manager.listProviderSubagents(agents[index]!.id);
+  assert.equal(children.length, 1);
+  let rootItems = 0;
+  let childItems = 0;
+  for await (const event of sessions[index]!.streamHistory()) {
+    if (event.type === "timeline") rootItems++;
+    if (event.type === "provider_subagent" && event.event.type === "timeline") childItems++;
+  }
+  assert.equal(rootItems, steps * 2);
+  assert.equal(childItems, steps * 2);
+  await manager.archiveAgent(agents[index]!.id);
+  assert.equal(store.has(agents[index]!.id), false);
+  assert.equal(
+    manager.listAgents().some((agent) => agent.id === agents[index]!.id),
+    false,
+  );
+}
+await plugins.shutdown();
+await manager.flushForShutdown();
+await rm(root, { recursive: true, force: true });
+global.gc();
+const closed = process.memoryUsage().heapUsed - before;
+// Keep closed session references alive, as callers can retain them after archive.
+assert.equal(sessions.length, 3);
+process.stdout.write(JSON.stringify({ retained, closed }));
@@ -323,7 +323,7 @@ export class TimelineProjection {
    this.sourceRanges.sort((a, b) => a.startSeq - b.startSeq);
  }

-  append(row: AgentTimelineRow): void {
+  append(row: AgentTimelineRow): ProjectedTimelineRow {
    const rowIndex = this.appendProjected(row);
    const last = this.sourceRanges.at(-1);
    if (last && last.rowIndex === rowIndex && last.endSeq + 1 === row.seq) {
@@ -331,6 +331,7 @@ export class TimelineProjection {
    } else {
      this.sourceRanges.push({ startSeq: row.seq, endSeq: row.seq, rowIndex });
    }
+    return { ...this.rows[rowIndex] };
  }

  private appendProjected(row: AgentTimelineRow): number {
@@ -1069,7 +1069,7 @@ function probeWebSocketConnection(
  });
 }

-test("startup closes stale active records before serving status without resuming sessions", async () => {
+test("disabled recovery closes stale active records without resuming sessions", async () => {
  const root = await mkdtemp(path.join(os.tmpdir(), "paseo-stale-status-"));
  const logger = pino({ level: "silent" });
  const storagePath = path.join(root, ".paseo", "agents");
@@ -1121,6 +1121,7 @@ test("startup closes stale active records before serving status without resuming
  let sessionsCreated = 0;
  const handle = await createTestPaseoDaemon({
    paseoHomeRoot: root,
+    resumeOnStartup: false,
    agentClients: createTestAgentClients({
      beforeCreateSession: async () => {
        sessionsCreated++;
@@ -1131,6 +1132,7 @@ test("startup closes stale active records before serving status without resuming
  try {
    const expected = records.map((record) => ({
      ...record,
+      resumeOnStartup: false,
      lastStatus:
        record.lastStatus === "running" || record.lastStatus === "initializing"
          ? "closed"
@@ -1,3 +1,5 @@
+import { createRestartRecovery } from "./agent/restart-recovery/index.js";
+import { sendPromptToAgent } from "./agent/agent-prompt.js";
 import { createIdleRuntimeCleanup } from "./agent/idle-runtime-cleanup/index.js";
 import {
  createFinishSubscriptions,
@@ -464,6 +466,8 @@ export interface PaseoDaemonConfig {
  downloadTokenTtlMs?: number;
  agentProviderSettings?: AgentProviderRuntimeSettingsMap;
  idleRuntimeCleanup?: boolean;
+  resumeOnStartup?: boolean;
+  resumePrompt?: string;
  providerCatalogRefreshTimeoutMs?: number;
  metadataGeneration?: {
    providers?: Array<{
@@ -594,6 +598,8 @@ function createInitialMutableDaemonConfig(config: ResolvedDaemonSettings): Mutab
    autoArchiveAfterMerge: config.autoArchiveAfterMerge ?? false,
    enableTerminalAgentHooks: config.enableTerminalAgentHooks ?? false,
    idleRuntimeCleanup: config.idleRuntimeCleanup !== false,
+    resumeOnStartup: config.resumeOnStartup !== false,
+    resumePrompt: config.resumePrompt ?? "Resume working.",
    appendSystemPrompt: config.appendSystemPrompt ?? "",
    pluginsEnabled: config.pluginsEnabled ?? false,
    plugins: config.plugins ?? {},
@@ -1036,7 +1042,19 @@ export async function createPaseoDaemon(
    agentStorage,
  );
  await agentStorage.initialize();
-  await closeStaleAgentRecords(agentStorage);
+  const restartRecovery = createRestartRecovery({
+    storage: agentStorage,
+    settings: () => ({
+      enabled: daemonConfigStore.get().resumeOnStartup !== false,
+      prompt: daemonConfigStore.get().resumePrompt ?? "Resume working.",
+    }),
+    eligible: async (record) =>
+      !record.workspaceId || !(await workspaceRegistry?.get(record.workspaceId))?.archivedAt,
+    dispatch: (agentId, prompt) =>
+      sendPromptToAgent({ agentId, prompt, agentManager, agentStorage, logger, unarchive: false }),
+    report: (agentId, err) => logger.error({ agentId, err }, "Agent restart recovery failed"),
+  });
+  await restartRecovery.prepareStartup();
  logger.info({ elapsed: elapsed() }, "Agent storage initialized");
  await bootstrapWorkspaceRegistries({
    serverId,
@@ -1470,6 +1488,7 @@ export async function createPaseoDaemon(
    ...createFinishObservation({
      agentManager,
      agentStorage,
+      waitForResume: restartRecovery.waitForResume,
      serverId,
      logger,
      messages: () => {
@@ -1869,6 +1888,7 @@ export async function createPaseoDaemon(
            pluginRuntime.bindPaseoSessionHost(wsServer);
            await pluginRuntime.start();
            providerSnapshotManager.settlePluginProviders();
+            restartRecovery.resumePending();
            await finishSubscriptions.start();
            wsServer.beginAcceptingConnections();
            const relaySecurityLogger = logger.child({ module: "relay-security" });
@@ -1963,6 +1983,7 @@ export async function createPaseoDaemon(
    await finishSubscriptions.close();
    await wsServer?.agentMessages.close();
    agentManager.prepareForShutdown();
+    await restartRecovery.captureRunningAgents();
    await closeAllAgents(logger, agentManager);
    await withTimeout({
      promise: pluginRuntime.drainEvents(),
@@ -2029,16 +2050,6 @@ export async function createPaseoDaemon(
  };
 }

-async function closeStaleAgentRecords(agentStorage: AgentStorage): Promise<void> {
-  // No provider runtimes are loaded at startup. Repair interrupted
-  // shutdowns before any status consumer sees the persisted active states.
-  for (const record of await agentStorage.list()) {
-    if (record.lastStatus === "running" || record.lastStatus === "initializing") {
-      await agentStorage.upsert({ ...record, lastStatus: "closed" });
-    }
-  }
-}
-
 /**
 * Closing an agent asks its provider to close the session and waits for the
 * answer. A provider that never answers must not hold the daemon open, so a
@@ -590,6 +590,8 @@ export type ResolvedDaemonSettings = Pick<
  | "relayRequireProtectedSecurity"
  | "appBaseUrl"
  | "idleRuntimeCleanup"
+  | "resumeOnStartup"
+  | "resumePrompt"
  | "providerCatalogRefreshTimeoutMs"
  | "metadataGeneration"
  | "providerOverrides"
@@ -677,6 +679,7 @@ export function resolveReloadableConfig(
    relayEnabled: relay.enabled,
    relayRequireProtectedSecurity: relay.requireProtectedSecurity,
    idleRuntimeCleanup: persisted.agents?.idleRuntimeCleanup ?? true,
+    ...resolveRestartRecoveryConfig(persisted.agents),
    providerCatalogRefreshTimeoutMs: persisted.agents?.catalogRefreshTimeoutMs,
    metadataGeneration: persisted.agents?.metadataGeneration,
    providerOverrides: extractProviderOverrides(
@@ -827,3 +830,10 @@ function resolveSpeechOverrideControlledPaths(
  if (env.PASEO_LOCAL_MODELS_DIR !== undefined) paths.push("providers.local.modelsDir");
  return paths;
 }
+
+function resolveRestartRecoveryConfig(agents: PersistedConfig["agents"]) {
+  return {
+    resumeOnStartup: agents?.resumeOnStartup ?? true,
+    resumePrompt: agents?.resumePrompt ?? "Resume working.",
+  };
+}
@@ -21,6 +21,7 @@ import {
  type HostUpdate,
 } from "@getpaseo/protocol/hosts";
 import type { DaemonPermission, WSHelloMessage } from "@getpaseo/protocol/messages";
+import { webSocketProxyAgent } from "../network/index.js";

 export class HostError extends Error {
  constructor(
@@ -242,6 +243,7 @@ export class ConnectedHosts {
      {
        clientId: `host-link-${this.self.serverId}-${row.registrationId}`,
        connectTimeoutMs: 10000,
+        webSocketAgent: webSocketProxyAgent,
      },
      this.budget,
    );
@@ -940,6 +940,15 @@ describe("DaemonConfigStore", () => {

    await store.patch({ idleRuntimeCleanup: true });
    expect(loadConfig(paseoHome, { env: {} }).idleRuntimeCleanup).toBe(true);
+    await store.patch({ resumeOnStartup: false, resumePrompt: "Keep going.\n" });
+    expect(loadPersistedConfig(paseoHome).agents).toMatchObject({
+      resumeOnStartup: false,
+      resumePrompt: "Keep going.\n",
+    });
+    expect(loadConfig(paseoHome, { env: {} })).toMatchObject({
+      resumeOnStartup: false,
+      resumePrompt: "Keep going.\n",
+    });
  });

  test("patch persists custom ACP provider overrides into config.json", async () => {
@@ -29,6 +29,8 @@ interface SupportedMutableConfigPatch {
  autoArchiveAfterMerge?: boolean;
  enableTerminalAgentHooks?: boolean;
  idleRuntimeCleanup?: boolean;
+  resumeOnStartup?: boolean;
+  resumePrompt?: string;
  appendSystemPrompt?: string;
  terminalProfiles?: MutableDaemonConfig["terminalProfiles"];
  agentProfiles?: MutableDaemonConfig["agentProfiles"];
@@ -193,6 +195,8 @@ const RELOADABLE_PATHS = [
  "daemon.agentProfiles",
  "app.baseUrl",
  "agents.idleRuntimeCleanup",
+  "agents.resumeOnStartup",
+  "agents.resumePrompt",
  "agents.providers",
  "agents.catalogRefreshTimeoutMs",
  "agents.metadataGeneration",
@@ -218,6 +222,8 @@ const PERSISTED_TO_MUTABLE_PATH = new Map<string, string>([
  ["daemon.agentProfiles", "agentProfiles"],
  ["app.baseUrl", "app.baseUrl"],
  ["agents.idleRuntimeCleanup", "idleRuntimeCleanup"],
+  ["agents.resumeOnStartup", "resumeOnStartup"],
+  ["agents.resumePrompt", "resumePrompt"],
  ["agents.providers", "providers"],
  ["agents.catalogRefreshTimeoutMs", "catalogRefreshTimeoutMs"],
  ["agents.metadataGeneration", "metadataGeneration"],
@@ -292,6 +298,8 @@ function pickSupportedPatchFields(patch: MutableDaemonConfigPatch): SupportedMut
    ...(patch.enableTerminalAgentHooks !== undefined
      ? { enableTerminalAgentHooks: patch.enableTerminalAgentHooks }
      : {}),
+    ...(patch.resumeOnStartup !== undefined ? { resumeOnStartup: patch.resumeOnStartup } : {}),
+    ...(patch.resumePrompt !== undefined ? { resumePrompt: patch.resumePrompt } : {}),
    ...(patch.idleRuntimeCleanup !== undefined
      ? { idleRuntimeCleanup: patch.idleRuntimeCleanup }
      : {}),
@@ -702,6 +710,7 @@ function mergeMutableAgentPatch(
    patch.providers === undefined &&
    patch.metadataGeneration === undefined &&
    patch.skills === undefined &&
+    !hasRestartRecoveryPatch(patch) &&
    patch.idleRuntimeCleanup === undefined &&
    removeProviders.length === 0
  ) {
@@ -735,6 +744,7 @@ function mergeMutableAgentPatch(
    next["skills"] = { selection: patch.skills.selection };
  }

+  Object.assign(next, restartRecoveryPatch(patch));
  if (patch.idleRuntimeCleanup !== undefined) {
    next["idleRuntimeCleanup"] = patch.idleRuntimeCleanup;
  }
@@ -771,3 +781,13 @@ function mergeMutableDaemonPatch(
  if (patch.agentProfiles !== undefined) next.agentProfiles = patch.agentProfiles;
  return Object.keys(next).length > 0 ? next : undefined;
 }
+
+function hasRestartRecoveryPatch(patch: SupportedMutableConfigPatch) {
+  return patch.resumeOnStartup !== undefined || patch.resumePrompt !== undefined;
+}
+function restartRecoveryPatch(patch: SupportedMutableConfigPatch) {
+  return {
+    ...(patch.resumeOnStartup !== undefined ? { resumeOnStartup: patch.resumeOnStartup } : {}),
+    ...(patch.resumePrompt !== undefined ? { resumePrompt: patch.resumePrompt } : {}),
+  };
+}
@@ -76,10 +76,14 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { DaemonClient } from "../test-utils/daemon-client.js";

-async function restartFixture(root: string) {
+async function restartFixture(
+  root: string,
+  settings: { resumeOnStartup?: boolean; resumePrompt?: string } = {},
+  fixture: { holdResume?: boolean } = {},
+) {
  const child = fork(
    fileURLToPath(new URL("../test-utils/finish-subscription-daemon.ts", import.meta.url)),
-    [root],
+    [root, JSON.stringify(settings), JSON.stringify(fixture)],
    {
      execArgv: ["--conditions=source", "--import", "tsx"],
      stdio: ["ignore", "pipe", "pipe", "ipc"],
@@ -183,7 +187,25 @@ test.each([false, true])(
      await expect.poll(() => readPrompts(root), { timeout: 15000 }).toHaveLength(1);
      const prompts = await readPrompts(root);
      expect(prompts[0]).toContain(`Agent ${childId}`);
-      expect(prompts[0]).toContain("was closed");
+      expect(prompts[0]).not.toContain("was closed");
+      const recoveredPrompts = (await readFile(path.join(root, "all-prompts.jsonl"), "utf8"))
+        .trim()
+        .split("\n")
+        .map((line) => JSON.parse(line));
+      expect(recoveredPrompts.filter((entry) => entry.prompt === "Resume working.")).toHaveLength(
+        1,
+      );
+      const restored = recoveredPrompts.find((entry) => entry.prompt === "Resume working.").config;
+      const original = recoveredPrompts.find((entry) =>
+        String(entry.prompt).includes("HOLD_CHILD"),
+      ).config;
+      expect(restored).toMatchObject({
+        provider: original.provider,
+        model: original.model,
+        modeId: original.modeId,
+        cwd: original.cwd,
+      });
+
      await expect
        .poll(
          async () =>
@@ -196,7 +218,7 @@ test.each([false, true])(
      client = new DaemonClient({ url: `ws://127.0.0.1:${second.port}/ws`, appVersion: "0.13.0" });
      await client.connect();
      await client.fetchAgents({ subscribe: {} });
-      expect((await client.fetchAgent(childId))?.agent.status).toBe("closed");
+      expect((await client.fetchAgent(childId))?.agent.status).toBe("idle");
      await client.close();
      client = undefined;
      await stopFixture(second.child, false);
@@ -220,3 +242,120 @@ test.each([false, true])(
  },
  60000,
 );
+
+test.each([false, true])(
+  "host restart recovery settings (enabled=%s)",
+  async (enabled) => {
+    const root = await mkdtemp(path.join(tmpdir(), "resume-settings-process-"));
+    const processes: ChildProcess[] = [];
+    let client: DaemonClient | undefined;
+    const settings = { resumeOnStartup: enabled, resumePrompt: "Continue exactly.\n" };
+    try {
+      const first = await restartFixture(root, settings);
+      processes.push(first.child);
+      client = new DaemonClient({ url: `ws://127.0.0.1:${first.port}/ws`, appVersion: "0.13.0" });
+      await client.connect();
+      const working = await client.createAgent({
+        provider: "claude",
+        cwd: first.cwd,
+        modeId: "full-access",
+      });
+      const idle = await client.createAgent({
+        provider: "claude",
+        cwd: first.cwd,
+        modeId: "full-access",
+      });
+      await client.sendMessage(working.id, "HOLD_CHILD");
+      await expect
+        .poll(
+          async () =>
+            (
+              await new AgentStorage(path.join(first.paseoHome, "agents"), createTestLogger()).get(
+                working.id,
+              )
+            )?.lastStatus,
+        )
+        .toBe("running");
+      const original = await new AgentStorage(
+        path.join(first.paseoHome, "agents"),
+        createTestLogger(),
+      ).get(working.id);
+      await client.close();
+      client = undefined;
+      await stopFixture(first.child, false);
+      const second = await restartFixture(root, settings);
+      processes.push(second.child);
+      client = new DaemonClient({ url: `ws://127.0.0.1:${second.port}/ws`, appVersion: "0.13.0" });
+      await client.connect();
+      const storage = new AgentStorage(path.join(second.paseoHome, "agents"), createTestLogger());
+      // Resume runs in the background; it is done once the saved intent is consumed.
+      await expect.poll(async () => (await storage.get(working.id))?.resumeOnStartup).toBe(false);
+      const resumePrompts = async () =>
+        (await readFile(path.join(root, "all-prompts.jsonl"), "utf8"))
+          .trim()
+          .split("\n")
+          .map((line) => JSON.parse(line))
+          .filter((entry) => entry.prompt === settings.resumePrompt);
+      await expect.poll(resumePrompts).toHaveLength(enabled ? 1 : 0);
+      expect((await client.fetchAgent(idle.id))?.agent.status).toBe("closed");
+      const restored = await storage.get(working.id);
+      expect(restored?.persistence?.sessionId).toBe(original?.persistence?.sessionId);
+    } finally {
+      await client?.close();
+      for (const child of processes.toReversed()) await stopFixture(child, true);
+      await rm(root, { recursive: true, force: true });
+    }
+  },
+  60000,
+);
+
+test("a provider that is slow to reopen does not hold daemon startup", async () => {
+  const root = await mkdtemp(path.join(tmpdir(), "resume-background-process-"));
+  const processes: ChildProcess[] = [];
+  let client: DaemonClient | undefined;
+  try {
+    const first = await restartFixture(root);
+    processes.push(first.child);
+    client = new DaemonClient({ url: `ws://127.0.0.1:${first.port}/ws`, appVersion: "0.13.0" });
+    await client.connect();
+    const working = await client.createAgent({
+      provider: "claude",
+      cwd: first.cwd,
+      modeId: "full-access",
+    });
+    await client.sendMessage(working.id, "HOLD_CHILD");
+    await expect
+      .poll(
+        async () =>
+          (
+            await new AgentStorage(path.join(first.paseoHome, "agents"), createTestLogger()).get(
+              working.id,
+            )
+          )?.lastStatus,
+      )
+      .toBe("running");
+    await client.close();
+    client = undefined;
+    await stopFixture(first.child, false);
+
+    const second = await restartFixture(root, {}, { holdResume: true });
+    processes.push(second.child);
+    client = new DaemonClient({ url: `ws://127.0.0.1:${second.port}/ws`, appVersion: "0.13.0" });
+    await client.connect();
+    expect((await client.fetchAgent(working.id))?.agent.id).toBe(working.id);
+    second.child.send("release-resume");
+    await expect
+      .poll(async () =>
+        (await readFile(path.join(root, "all-prompts.jsonl"), "utf8"))
+          .trim()
+          .split("\n")
+          .map((line) => JSON.parse(line).prompt)
+          .filter((prompt) => prompt === "Resume working."),
+      )
+      .toHaveLength(1);
+  } finally {
+    await client?.close();
+    for (const child of processes.toReversed()) await stopFixture(child, true);
+    await rm(root, { recursive: true, force: true });
+  }
+}, 30000);
@@ -1,5 +1,6 @@
 import { appendFileSync, mkdirSync } from "node:fs";
 import path from "node:path";
+import { initializeEnvironmentProxy } from "./network/index.js";
 import { createPaseoDaemon, formatListenTarget } from "./bootstrap.js";
 import { loadConfig } from "./config.js";
 import { resolvePaseoHome } from "./paseo-home.js";
@@ -132,6 +133,11 @@ function applyCliFlagOverrides(config: ReturnType<typeof loadConfig>): void {

 async function main() {
  const { paseoHome, logger, config } = bootstrapFromEnvironment();
+  for (const variable of initializeEnvironmentProxy()) {
+    writeWorkerLifecycleLog(paseoHome, "Ignoring invalid or unsupported HTTP proxy variable", {
+      variable,
+    });
+  }
  let daemon: Awaited<ReturnType<typeof createPaseoDaemon>> | null = null;
  let shutdownPromise: Promise<number> | null = null;
  let exitHookInstalled = false;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mohamed Boudra	0edf7eea7c	test(server): isolate proxy fixture credential directories	2026-10-29 07:44:07 +01:00
Mohamed Boudra	bf9dea429b	fix(server): apply proxy policy to connected host links	2026-10-29 07:33:03 +01:00
Mohamed Boudra	629ca2f9b6	fix(server): read Windows proxy environment entries once	2026-10-29 07:23:57 +01:00
Mohamed Boudra	b27a29c32f	refactor(server): treat ignored proxy variables as unset	2026-10-29 06:54:19 +01:00
Mohamed Boudra	32ddc6215a	fix(server): validate proxy settings without blocking startup Normalize scheme-less proxies and share HTTP-only validation across fetch and WebSockets. Record ignored variables without credentials in the daemon log. Separate built-in and directory plugin regressions through a typed fixture.	2026-10-29 06:43:07 +01:00
Mohamed Boudra	808024c95f	test(server): run usage source regressions in CI	2026-10-29 06:33:57 +01:00
Mohamed Boudra	2a630cf98c	fix(server): respect environment proxies across daemon traffic Install proxy routing at daemon and plugin process startup, with a separate HTTP agent for outbound WebSockets. Always exempt loopback so local provider bridges remain reachable.	2026-10-29 06:32:59 +01:00
Mohamed Boudra	e12feb633f	feat(usage): show when each limit resets, and make usage rows easier to read (#8162 ) The reset countdown floored to one unit, so a weekly window read "resets 2d" from 2d 23h down to 2d 0h and looked stuck for a day; the session window had the same problem with hours. Countdowns now use two units ("2d 23h", "4h 59m"), and every row also shows the clock time it resets ("7:20 AM", "Sat 8:00 AM", "Oct 31, 3:00 PM"), so users can plan work around a reset without hovering. Rows now put the window name and percent on one line, the bar under it, and the reset on its own full-width line, so the exact time fits at phone width in longer languages. The pinned-row background is gone; the pin glyph, drawn in the foreground colour when pinned, is the only pinned signal. Bars are 6px.	2026-10-29 11:24:34 +07:00
Mohamed Boudra	304cbde651	fix(server): reopening a Codex agent no longer reads and holds its full history (#8132 ) * fix(server): read Codex history only when Paseo replays it Reopening a Codex agent whose timeline Paseo still held read the full thread on connect and kept it on the session until the next replay, which never came, so every reopened agent held a second copy of its transcript. thread/resume also returned every turn, and only the sandbox policy was used from it. Resume now sends excludeTurns (older Codex ignores the unknown field) and the history read moves into streamHistory, whose caller owns the result. A resumed session still needs the earlier turns for rewind targets and the sub-agent routes that keep an earlier child's interactions on its original card, so the first turn, goal or rewind indexes the thread and drops the timeline it read. * test(server): run reopened Codex agent tests without the Codex CLI installed	2026-10-29 10:17:11 +07:00
paseo-bot[bot]andyayugu	0feaf0d987	Keep configured Claude settings when Paseo adds flags (#8148 ) * fix(claude): keep extraArgs settings when Paseo sets flag settings * test(claude): verify settings survive the real SDK launch Capture the executable arguments through the public provider session interface so SDK option precedence cannot silently discard the configured settings file again. Co-authored-by: yayugu <yayugu@gmail.com> --------- Co-authored-by: yayugu <yayugu@gmail.com> Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>	2026-10-28 23:07:21 +00:00
paseo-bot[bot]	d3f36e92a5	test(server): isolate config responsiveness from test runner work (#8131 ) Measure config reads in a fresh process so unrelated runner callbacks cannot consume the config CPU budget. Keep the existing budget, result, async I/O and yield assertions, and prove isolation with a busy parent callback. Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>	2026-10-28 21:25:31 +00:00
paseo-ai[bot]	1467121b16	fix: update lockfile signatures and Nix hash [skip ci]	2026-10-28 18:00:41 +00:00
Mohamed Boudra	2f0fb2a8ba	Bring 0.14.0-beta.2 versions and changelog to main (#8139 ) * docs(changelog): fold 0.14.0-beta.2 UI fixes into the 0.14.0 entry (cherry picked from commit `28bb7e29be`) * chore(release): cut 0.14.0-beta.2 (cherry picked from commit `1a05491be5`) * docs(changelog): keep unreleased main changes out of the 0.14.0-beta.2 entry The beta.2 tag was cut from a selective hotfix branch, so #8100, #8117 and #8081 are on main but not in beta.2. Every changelog parser (app, website, release-notes sync) skips the preamble, so listing them there keeps them out of the beta.2 release body and What's new until the next release entry absorbs them.	2026-10-29 00:50:24 +07:00
Mohamed Boudraandsuntianc	83ed52669d	Resume interrupted agents after host restart (#8127 ) * feat(server): resume interrupted agents after host restart Continue saved running conversations after graceful restart or crash, with host opt-out and a configurable continuation prompt. Preserve explicit launch overrides when reopening the same provider session. Co-authored-by: coolwind <45729206+coolwindX@users.noreply.github.com> Co-authored-by: suntianc <suntc8985@gmail.com> * fix(app): translate restart recovery host settings * test(app): synchronize sidebar drags and clean up added projects Wait for the drag sensor click blocker to expire before the next user action. Resolve UI project keys to daemon IDs for cleanup so empty projects do not contaminate later sidebar tests. * fix(app): tuck the resume prompt behind an edit sheet Match the System prompt row: an Edit button left of the restart recovery switch opens the prompt in a sheet, and is disabled while resume is off. * fix(server): resume interrupted agents without holding startup Startup now only chooses resume candidates before anything else reads or repairs persisted running state. Reopening and prompting run in the background after connections open, so a provider that is slow to reopen holds back only its own agent. Finish observation waits for a pending child's resume, so parents are not told the child was closed meanwhile. * style(server): format restart resume e2e test * test(server): wait for the fetch result before advancing the narrow refresh debounce The test released the held fetch, flushed six microtasks, then advanced the 1s refresh debounce. When the fetch result landed after that advance (slow Windows runners), the debounce started late and vi.waitFor's auto-advance reached it only at its real-time timeout. Wait on the service's in-flight fetch count instead, as the sibling test does. * test(server): retry stalled OpenCode fixture downloads within the test budget npm abandons a stalled registry download only after its 300s default fetch timeout, past the install's 180s budget. The killed install left the fixture directory locked on Windows, so cleanup failed with EBUSY and hid the timeout. Against a registry proxy that stalls the first tarball, a default install hung 225s; with --fetch-timeout it retried and finished in 16s. --------- Co-authored-by: suntianc <suntc8985@gmail.com>	2026-10-28 23:40:35 +07:00
Mohamed Boudra	5cfe8f1218	Remove the out-of-date daemon sidebar notice (#8133 ) The notice arrived with the terminal worker change (#7644) but is a separate product change. Remove it with the native/compact callout filtering it needed, restoring the sidebar callout slot to web-only. Restart and close terminals in Settings stays.	2026-10-28 23:30:16 +07:00
Mohamed Boudra	38506ed372	test(plugins): allow time for Windows legacy migration workflows (#8112 ) The migration case runs real Git operations and several plugin subprocess restarts. Windows CI exceeded its 30-second test deadline and entered cleanup while the operation was still active. Keep every assertion and allow 60 seconds for the complete workflow.	2026-10-28 22:59:21 +07:00
paseo-bot[bot]	abc97e0545	Keep an interrupted background Claude subagent canceled after a daemon restart (#6259 ) * Keep an interrupted background Claude subagent canceled after a daemon restart Replay read a background Agent call's immediate async-launch result as the child's outcome, so every background subagent restored as completed. Skip that result, and read a child transcript that ends on the interrupt placeholder as canceled, which is what the live path reported. * Keep a background Claude subagent running when it got a new prompt after an interrupt * fix(claude): preserve background subagent outcomes on replay Use persisted task notifications as replay outcomes with the live status mapping. Diagnostic API request copies contain launch tool results without async metadata, so only transcript messages supply task declarations and tool outcomes. --------- Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>	2026-10-28 14:56:13 +00:00
suntiancandsuntianc	33faacc055	fix(server): release retained plugin streaming snapshots (#7675 ) Release cumulative plugin snapshots after adapter attachment and retain canonical replay items. Preserve Unicode text, root/child ordering and current tool state; release history on close. Co-authored-by: suntianc <suntc8985@gmail.com>	2026-10-28 20:14:12 +07:00
paseo-bot[bot]	8537709e72	test(server): reduce npm fixture setup in the Windows timeout case (#8106 ) * test(server): batch npm fixture packing to reduce Windows setup time * test(server): describe the batched npm fixture setup budget --------- Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>	2026-10-28 12:57:33 +00:00
Mohamed BoudraandMatt Cowger	9fb7808191	feat(worktrees): let plugins choose creation options and placement (#8117 ) * feat(worktrees): let plugins choose creation options and placement Await the worktree creation request hook before Git source planning so plugins can change placement, branch and base without undoing a fetch. Manage arbitrary destinations through marker and registry ownership, and restore them at their recorded paths. Co-authored-by: Matt Cowger <matt@cowger.us> * fix(worktrees): compare repository paths across Windows aliases Deletion must recognize the same repository through Git native and long path spellings. Reuse ownership path equivalence instead of comparing canonical strings, and let the recovery fixture accept Git platform line endings. Co-authored-by: Matt Cowger <matt@cowger.us> * fix(worktrees): respect recorded ownership and creation intent Keep branch checkout distinct from branch-off, validate plugin placement once at the daemon boundary, and share default path collision resolution. A restored external worktree's marker must never override its recorded non-ownership. Co-authored-by: Matt Cowger <matt@cowger.us> * test(worktrees): record ownership in session archive fixture The fixture creates a Paseo-owned worktree, so its durable record must say so. Archive now treats a recorded false value as authoritative instead of replacing it with filesystem discovery. Co-authored-by: Matt Cowger <matt@cowger.us> * test(plugins): retry temp cleanup after worktree archive on Windows Windows releases directory handles after the daemon closes, so rmdir on the source repository can hit EBUSY. Retry like the other git temp-dir tests. * test(plugins): compare plugin-chosen worktree paths in canonical spelling Windows temp directories come back as 8.3 aliases while the daemon records the resolved spelling, so normalize the expected root the same way. --------- Co-authored-by: Matt Cowger <matt@cowger.us>	2026-10-28 18:55:50 +07:00
				`@@ -0,0 +1 @@`
				`export * from "./sidebar-callout-slot.native";`