test(app): match the turn collapse reply by its last streamed chunk

Back-to-back text chunks from the mock stream merge into one message depending on delivery timing, so the final reply and the folded message count vary run to run.
test(app): seed e2e settings fields without assuming an empty settings blob
2026-10-24 18:22:38 +00:00 · 2026-10-24 08:28:49 +02:00 · 2026-10-24 08:11:53 +02:00 · 2026-10-24 07:54:07 +02:00
78 changed files with 1016 additions and 1004 deletions
@@ -1,6 +1,6 @@
 # Changelog

-## 0.13.0 - 2026-10-24
+## 0.13.0-beta.2 - 2026-10-23

 Foldable phone layouts, agents that delegate work to other machines, plugin file panels, and plugin translations.

@@ -23,7 +23,7 @@ paseo host add 'relay://...' --label laptop

 ### Improved

- Changed sidebar workspaces to sort by Created, with Last prompt and Manual under Display → Sort ([#7635](https://github.com/getpaseo/paseo/pull/7635), [#7771](https://github.com/getpaseo/paseo/pull/7771))
+- Changed sidebar workspaces to sort by Created, with Last prompt under Display → Sort; workspaces no longer drag to reorder ([#7635](https://github.com/getpaseo/paseo/pull/7635))
 - Changed long project groups in the sidebar to show seven workspaces plus any that need attention or are working, with Show more for the rest ([#7635](https://github.com/getpaseo/paseo/pull/7635))
 - Changed Command Center agent and workspace results to show the same icons and status as tabs and the sidebar ([#7690](https://github.com/getpaseo/paseo/pull/7690))
 - Changed Manual metadata generation to use only the models you chose, without falling back to the defaults ([#7611](https://github.com/getpaseo/paseo/pull/7611))
@@ -32,7 +32,6 @@ paseo host add 'relay://...' --label laptop
 - Changed Explorer tabs on phones to keep full labels and scroll, with Close moved to the long-press menu ([#7589](https://github.com/getpaseo/paseo/pull/7589))
 - Changed relay connections to require the daemon password when the daemon has one; re-add relay hosts saved without it ([#7668](https://github.com/getpaseo/paseo/pull/7668) by [@nickmaglowsch](https://github.com/nickmaglowsch))
 - Kept the sidebar open on phones when you cancel Search, Import session or Add project ([#7693](https://github.com/getpaseo/paseo/pull/7693))
- Updated pinned ACP agents to their latest releases ([#7781](https://github.com/getpaseo/paseo/pull/7781) by [@JunWeiUp](https://github.com/JunWeiUp), [@LouisDeconinck](https://github.com/LouisDeconinck))
 - Removed the legacy terminal renderer; iOS and Android always use the native terminal renderer ([#7639](https://github.com/getpaseo/paseo/pull/7639))
 - Changed usage rows to say whether a percentage is used or remaining, in the app's language ([#7376](https://github.com/getpaseo/paseo/pull/7376) by [@michaelmwu](https://github.com/michaelmwu))
 - Changed an agent's report and its finish notification to reach the parent agent as one message ([#7561](https://github.com/getpaseo/paseo/pull/7561))
@@ -49,11 +48,10 @@ paseo host add 'relay://...' --label laptop
 - Added translated plugin listings through `translations` in `paseo-plugin.json` and `OVERVIEW.zh-CN.md` ([#7373](https://github.com/getpaseo/paseo/pull/7373))
 - Added `Markdown` to `@getpaseo/plugin/client/ui` to render Markdown with Paseo's renderer ([#7579](https://github.com/getpaseo/paseo/pull/7579))
 - Added inline SVG and component icons to every plugin `icon` ([#7368](https://github.com/getpaseo/paseo/pull/7368))
- Changed every plugin UI import to `@getpaseo/plugin/client/ui`; the previous entry point, including `useRevealedText`, still works and is deprecated ([#7474](https://github.com/getpaseo/paseo/pull/7474), [#7780](https://github.com/getpaseo/paseo/pull/7780) by [@luoph](https://github.com/luoph), [@RRD-dev](https://github.com/RRD-dev), [@mcowger](https://github.com/mcowger))
+- Changed every plugin UI import to `@getpaseo/plugin/client/ui`; the previous entry point still works and is deprecated ([#7474](https://github.com/getpaseo/paseo/pull/7474))
 - Deprecated the panel `context` and `agentId` props and `addWorkspacePanel`'s `context` field; use `params.agentId` and `addAgentPanel` ([#7685](https://github.com/getpaseo/paseo/pull/7685))
 - Changed turn-ended hooks to send an empty `timeline`; fetch recent history with `timeline.refetch` instead ([#7477](https://github.com/getpaseo/paseo/pull/7477))
 - Fixed plugin header buttons missing on phones and narrow windows; they now appear in the workspace ··· menu ([#7630](https://github.com/getpaseo/paseo/pull/7630))
- Fixed reopened ACP plugin agents showing an empty chat ([#7717](https://github.com/getpaseo/paseo/pull/7717) by [@nistream](https://github.com/nistream))
 - Fixed notification timeline transformers failing to load with "invalid item type: notification" ([#7582](https://github.com/getpaseo/paseo/pull/7582) by [@Gavinchen92](https://github.com/Gavinchen92))

 ### Fixed
@@ -68,11 +66,6 @@ paseo host add 'relay://...' --label laptop
 - Fixed workspace diff stats and merged-PR auto-archive missing updates while no app was showing the workspace ([#7681](https://github.com/getpaseo/paseo/pull/7681))
 - Fixed the `/` and `@` picker on iPhone covering the composer and hiding its best match behind the keyboard ([#7679](https://github.com/getpaseo/paseo/pull/7679) by [@masz77](https://github.com/masz77))
 - Fixed reopening a workspace marked unread on a phone leaving its agent stuck loading ([#7608](https://github.com/getpaseo/paseo/pull/7608))
- Fixed a new workspace's pin or title disappearing from the sidebar until the next update ([#7758](https://github.com/getpaseo/paseo/pull/7758) by [@stv1024](https://github.com/stv1024))
- Fixed Claude background command notifications appearing twice after a daemon restart ([#7737](https://github.com/getpaseo/paseo/pull/7737))
- Fixed voice replies skipping later sentences with OpenAI-compatible speech servers ([#7756](https://github.com/getpaseo/paseo/pull/7756) by [@grueneisfabian](https://github.com/grueneisfabian))
- Fixed Cursor usage showing bonus spend as overage instead of the quota percentages ([#7778](https://github.com/getpaseo/paseo/pull/7778) by [@kbitz](https://github.com/kbitz), [@stackia](https://github.com/stackia))
- Fixed the Android tablet taskbar covering the sidebar's Add project, Hosts, Help and Settings ([#7768](https://github.com/getpaseo/paseo/pull/7768))
 - Fixed Command Center jumping back to the selected result while you scroll ([#7688](https://github.com/getpaseo/paseo/pull/7688))
 - Fixed Claude system context appearing as an assistant message in imported or restored chats ([#7590](https://github.com/getpaseo/paseo/pull/7590) by [@khevamann](https://github.com/khevamann), [@rogerluan](https://github.com/rogerluan))
 - Fixed saved workspace tabs being lost when leaving or reloading the app right after it loads ([#7547](https://github.com/getpaseo/paseo/pull/7547))
@@ -80,7 +73,7 @@ paseo host add 'relay://...' --label laptop
 - Fixed Add image failing with "Failed to select image" on Android after changing the font size ([#7546](https://github.com/getpaseo/paseo/pull/7546) by [@RRD-dev](https://github.com/RRD-dev), [@idoyana](https://github.com/idoyana), [@luoph](https://github.com/luoph))
 - Fixed popovers, tooltips and context menus on Android opening one status bar below their trigger ([#7589](https://github.com/getpaseo/paseo/pull/7589))
 - Fixed the active Explorer tab being invisible in the light theme ([#7589](https://github.com/getpaseo/paseo/pull/7589))
- Fixed Android showing "Host not found" for untrusted certificates, and TLS advice for hostnames that don't resolve ([#7429](https://github.com/getpaseo/paseo/pull/7429), [#7701](https://github.com/getpaseo/paseo/pull/7701))
+- Fixed Android showing "Host not found" instead of a TLS error for untrusted certificates ([#7429](https://github.com/getpaseo/paseo/pull/7429))
 - Fixed the keyboard covering focused Settings fields on Android ([#7362](https://github.com/getpaseo/paseo/pull/7362))
 - Fixed Pull or Push appearing twice in the compact Changes menu ([#7355](https://github.com/getpaseo/paseo/pull/7355) by [@az33zy](https://github.com/az33zy))
 - Fixed Jump to tab and Jump to workspace saving shortcuts that don't end in a number ([#7365](https://github.com/getpaseo/paseo/pull/7365))
@@ -1,6 +1,6 @@
 # 更新日志

-## 0.13.0 - 2026-10-24
+## 0.13.0-beta.2 - 2026-10-23

 折叠屏手机布局、可将工作委派给其他机器的 Agent、插件文件面板，以及插件翻译。

@@ -23,7 +23,7 @@ paseo host add 'relay://...' --label laptop

 ### 改进

- 侧边栏工作区改为按“创建时间”排序，可在“显示”→“排序”中选择“最近提示词”或“手动” ([#7635](https://github.com/getpaseo/paseo/pull/7635), [#7771](https://github.com/getpaseo/paseo/pull/7771))
+- 侧边栏工作区改为按“创建时间”排序，可在“显示”→“排序”中选择“最近提示词”；工作区不再支持拖动排序 ([#7635](https://github.com/getpaseo/paseo/pull/7635))
 - 侧边栏中较长的项目分组现在显示七个工作区，以及所有需要处理或正在运行的工作区，其余的可通过“显示更多”查看 ([#7635](https://github.com/getpaseo/paseo/pull/7635))
 - Command Center 中的 Agent 和工作区结果现在显示与标签页和侧边栏相同的图标和状态 ([#7690](https://github.com/getpaseo/paseo/pull/7690))
 - 手动元数据生成现在只使用你选择的模型，不再回退到默认模型 ([#7611](https://github.com/getpaseo/paseo/pull/7611))
@@ -32,7 +32,6 @@ paseo host add 'relay://...' --label laptop
 - 手机上的 Explorer 标签页保留完整标签并可滚动，关闭操作移到了长按菜单中 ([#7589](https://github.com/getpaseo/paseo/pull/7589))
 - 如果 daemon 设置了密码，relay 连接现在需要该密码；请重新添加保存时未带密码的 relay 主机 ([#7668](https://github.com/getpaseo/paseo/pull/7668) by [@nickmaglowsch](https://github.com/nickmaglowsch))
 - 在手机上取消搜索、导入会话或添加项目时，侧边栏保持打开 ([#7693](https://github.com/getpaseo/paseo/pull/7693))
- 已固定版本的 ACP Agent 更新到最新版本 ([#7781](https://github.com/getpaseo/paseo/pull/7781) by [@JunWeiUp](https://github.com/JunWeiUp), [@LouisDeconinck](https://github.com/LouisDeconinck))
 - 移除了旧版终端渲染器；iOS 和 Android 始终使用原生终端渲染器 ([#7639](https://github.com/getpaseo/paseo/pull/7639))
 - 用量行现在用应用的语言说明百分比是已用还是剩余 ([#7376](https://github.com/getpaseo/paseo/pull/7376) by [@michaelmwu](https://github.com/michaelmwu))
 - Agent 的报告和完成通知现在合并为一条消息发送给父 Agent ([#7561](https://github.com/getpaseo/paseo/pull/7561))
@@ -49,11 +48,10 @@ paseo host add 'relay://...' --label laptop
 - 新增插件列表翻译，可通过 `paseo-plugin.json` 中的 `translations` 和 `OVERVIEW.zh-CN.md` 提供 ([#7373](https://github.com/getpaseo/paseo/pull/7373))
 - `@getpaseo/plugin/client/ui` 新增 `Markdown`，可使用 Paseo 的渲染器渲染 Markdown ([#7579](https://github.com/getpaseo/paseo/pull/7579))
 - 所有插件 `icon` 新增对内联 SVG 和组件图标的支持 ([#7368](https://github.com/getpaseo/paseo/pull/7368))
- 所有插件 UI 导入改为 `@getpaseo/plugin/client/ui`；原入口（包括 `useRevealedText`）仍可使用，但已弃用 ([#7474](https://github.com/getpaseo/paseo/pull/7474), [#7780](https://github.com/getpaseo/paseo/pull/7780) by [@luoph](https://github.com/luoph), [@RRD-dev](https://github.com/RRD-dev), [@mcowger](https://github.com/mcowger))
+- 所有插件 UI 导入改为 `@getpaseo/plugin/client/ui`；原入口仍可使用，但已弃用 ([#7474](https://github.com/getpaseo/paseo/pull/7474))
 - 弃用面板的 `context` 和 `agentId` 属性，以及 `addWorkspacePanel` 的 `context` 字段；请改用 `params.agentId` 和 `addAgentPanel` ([#7685](https://github.com/getpaseo/paseo/pull/7685))
 - turn-ended hook 现在发送空的 `timeline`；请改用 `timeline.refetch` 获取最近的历史记录 ([#7477](https://github.com/getpaseo/paseo/pull/7477))
 - 修复了插件标题栏按钮在手机和窄窗口中不显示的问题；它们现在显示在工作区的 ··· 菜单中 ([#7630](https://github.com/getpaseo/paseo/pull/7630))
- 修复了重新打开的 ACP 插件 Agent 聊天为空的问题 ([#7717](https://github.com/getpaseo/paseo/pull/7717) by [@nistream](https://github.com/nistream))
 - 修复了 notification 时间线转换器加载失败并报错 "invalid item type: notification" 的问题 ([#7582](https://github.com/getpaseo/paseo/pull/7582) by [@Gavinchen92](https://github.com/Gavinchen92))

 ### 修复
@@ -68,11 +66,6 @@ paseo host add 'relay://...' --label laptop
 - 修复了没有应用显示工作区时，工作区 diff 统计和已合并 PR 的自动归档不更新的问题 ([#7681](https://github.com/getpaseo/paseo/pull/7681))
 - 修复了 iPhone 上 `/` 和 `@` 选择器遮挡输入框、并把最佳匹配项藏在键盘后面的问题 ([#7679](https://github.com/getpaseo/paseo/pull/7679) by [@masz77](https://github.com/masz77))
 - 修复了在手机上重新打开标记为未读的工作区后 Agent 一直加载的问题 ([#7608](https://github.com/getpaseo/paseo/pull/7608))
- 修复了新工作区的置顶或标题在下次更新前从侧边栏消失的问题 ([#7758](https://github.com/getpaseo/paseo/pull/7758) by [@stv1024](https://github.com/stv1024))
- 修复了 daemon 重启后 Claude 后台命令通知出现两次的问题 ([#7737](https://github.com/getpaseo/paseo/pull/7737))
- 修复了使用 OpenAI 兼容语音服务时语音回复跳过后续句子的问题 ([#7756](https://github.com/getpaseo/paseo/pull/7756) by [@grueneisfabian](https://github.com/grueneisfabian))
- 修复了 Cursor 用量将赠送额度消费显示为超额、而不是配额百分比的问题 ([#7778](https://github.com/getpaseo/paseo/pull/7778) by [@kbitz](https://github.com/kbitz), [@stackia](https://github.com/stackia))
- 修复了 Android 平板任务栏遮挡侧边栏中添加项目、主机、帮助和设置的问题 ([#7768](https://github.com/getpaseo/paseo/pull/7768))
 - 修复了滚动时 Command Center 跳回所选结果的问题 ([#7688](https://github.com/getpaseo/paseo/pull/7688))
 - 修复了导入或恢复的聊天中 Claude 系统上下文显示为助手消息的问题 ([#7590](https://github.com/getpaseo/paseo/pull/7590) by [@khevamann](https://github.com/khevamann), [@rogerluan](https://github.com/rogerluan))
 - 修复了应用加载后立即离开或重新加载时已保存的工作区标签页丢失的问题 ([#7547](https://github.com/getpaseo/paseo/pull/7547))
@@ -80,7 +73,7 @@ paseo host add 'relay://...' --label laptop
 - 修复了 Android 上更改字体大小后添加图片失败并提示“选择图片失败”的问题 ([#7546](https://github.com/getpaseo/paseo/pull/7546) by [@RRD-dev](https://github.com/RRD-dev), [@idoyana](https://github.com/idoyana), [@luoph](https://github.com/luoph))
 - 修复了 Android 上弹出框、提示和上下文菜单在触发元素下方偏移一个状态栏高度打开的问题 ([#7589](https://github.com/getpaseo/paseo/pull/7589))
 - 修复了浅色主题中当前 Explorer 标签页不可见的问题 ([#7589](https://github.com/getpaseo/paseo/pull/7589))
- 修复了 Android 上不受信任的证书显示 "Host not found"、无法解析的主机名显示 TLS 建议的问题 ([#7429](https://github.com/getpaseo/paseo/pull/7429), [#7701](https://github.com/getpaseo/paseo/pull/7701))
+- 修复了 Android 上不受信任的证书显示 "Host not found" 而不是 TLS 错误的问题 ([#7429](https://github.com/getpaseo/paseo/pull/7429))
 - 修复了 Android 上键盘遮挡已聚焦的设置字段的问题 ([#7362](https://github.com/getpaseo/paseo/pull/7362))
 - 修复了紧凑 Changes 菜单中 Pull 或 Push 出现两次的问题 ([#7355](https://github.com/getpaseo/paseo/pull/7355) by [@az33zy](https://github.com/az33zy))
 - 修复了“跳转到标签”和“跳转到 workspace”可以保存不以数字结尾的快捷键的问题 ([#7365](https://github.com/getpaseo/paseo/pull/7365))
@@ -1,15 +0,0 @@
-Foldable phone layouts, agents that delegate work to other machines, plugin file panels, and plugin translations.
-
-Connect your daemon to another machine, then ask an agent to delegate work there:
-
-`sh
-
-paseo host add 192.168.1.20:6767 --label studio
-
-paseo host add 'ssh://me@build-box' --label build-box
-
-paseo host add 'relay://...' --label laptop
-
-`
-
-Full notes: https://paseo.sh/changelog
@@ -1,15 +0,0 @@
-Foldable phone layouts, agents that delegate work to other machines, plugin file panels, and plugin translations.
-
-Connect your daemon to another machine, then ask an agent to delegate work there:
-
-`sh
-
-paseo host add 192.168.1.20:6767 --label studio
-
-paseo host add 'ssh://me@build-box' --label build-box
-
-paseo host add 'relay://...' --label laptop
-
-`
-
-Full notes: https://paseo.sh/changelog
@@ -1,15 +0,0 @@
-Foldable phone layouts, agents that delegate work to other machines, plugin file panels, and plugin translations.
-
-Connect your daemon to another machine, then ask an agent to delegate work there:
-
-`sh
-
-paseo host add 192.168.1.20:6767 --label studio
-
-paseo host add 'ssh://me@build-box' --label build-box
-
-paseo host add 'relay://...' --label laptop
-
-`
-
-Full notes: https://paseo.sh/changelog
@@ -1,15 +0,0 @@
-Foldable phone layouts, agents that delegate work to other machines, plugin file panels, and plugin translations.
-
-Connect your daemon to another machine, then ask an agent to delegate work there:
-
-`sh
-
-paseo host add 192.168.1.20:6767 --label studio
-
-paseo host add 'ssh://me@build-box' --label build-box
-
-paseo host add 'relay://...' --label laptop
-
-`
-
-Full notes: https://paseo.sh/changelog
@@ -1 +1 @@
-sha256-DZOPOf81PkUxdD65BrfkTZhs6/DkfDWCFZ/SU+QrZbg=
+sha256-n6m3m0541/mBbMN1xrh/2uBCRQc62yicK1cdvyyUmmU=
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.13.0",
+  "version": "0.13.0-beta.2",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.13.0",
+      "version": "0.13.0-beta.2",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "workspaces": [
@@ -35695,7 +35695,7 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.13.0",
+      "version": "0.13.0-beta.2",
      "dependencies": {
        "@codemirror/commands": "6.10.4",
        "@codemirror/language": "6.12.4",
@@ -37961,12 +37961,12 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.13.0",
+      "version": "0.13.0-beta.2",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.13.0",
-        "@getpaseo/protocol": "0.13.0",
-        "@getpaseo/server": "0.13.0",
+        "@getpaseo/client": "0.13.0-beta.2",
+        "@getpaseo/protocol": "0.13.0-beta.2",
+        "@getpaseo/server": "0.13.0-beta.2",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -38213,10 +38213,10 @@
    },
    "packages/client": {
      "name": "@getpaseo/client",
-      "version": "0.13.0",
+      "version": "0.13.0-beta.2",
      "dependencies": {
-        "@getpaseo/protocol": "0.13.0",
-        "@getpaseo/relay": "0.13.0",
+        "@getpaseo/protocol": "0.13.0-beta.2",
+        "@getpaseo/relay": "0.13.0-beta.2",
        "ws": "^8.20.0",
        "zod": "^4.4.3"
      },
@@ -38228,7 +38228,7 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.13.0",
+      "version": "0.13.0-beta.2",
      "license": "Apache-2.0",
      "dependencies": {
        "@getpaseo/cli": "*",
@@ -38472,7 +38472,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.13.0",
+      "version": "0.13.0-beta.2",
      "license": "MIT",
      "devDependencies": {
        "@types/jest": "^29.5.14",
@@ -42124,7 +42124,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.13.0",
+      "version": "0.13.0-beta.2",
      "dependencies": {
        "@codemirror/language": "6.12.4",
        "@codemirror/legacy-modes": "^6.5.3",
@@ -42153,15 +42153,15 @@
    },
    "packages/plugin": {
      "name": "@getpaseo/plugin",
-      "version": "0.13.0",
+      "version": "0.13.0-beta.2",
      "dependencies": {
        "@agentclientprotocol/sdk": "^1.4.0",
        "i18next": "^26.3.0",
        "use-sync-external-store": "^1.6.0"
      },
      "devDependencies": {
-        "@getpaseo/client": "0.13.0",
-        "@getpaseo/protocol": "0.13.0",
+        "@getpaseo/client": "0.13.0-beta.2",
+        "@getpaseo/protocol": "0.13.0-beta.2",
        "@types/node": "^20.9.0",
        "@types/react": "~19.2.0",
        "react": "19.2.3",
@@ -42171,8 +42171,8 @@
        "zod": "^4.4.3"
      },
      "peerDependencies": {
-        "@getpaseo/client": "0.13.0",
-        "@getpaseo/protocol": "0.13.0",
+        "@getpaseo/client": "0.13.0-beta.2",
+        "@getpaseo/protocol": "0.13.0-beta.2",
        "react": ">=19.1.0 <20",
        "react-native": ">=0.81.5",
        "zod": "^4.4.3"
@@ -42194,7 +42194,7 @@
    },
    "packages/protocol": {
      "name": "@getpaseo/protocol",
-      "version": "0.13.0",
+      "version": "0.13.0-beta.2",
      "dependencies": {
        "semver": "^7.8.5",
        "zod": "^4.4.3"
@@ -42221,7 +42221,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.13.0",
+      "version": "0.13.0-beta.2",
      "dependencies": {
        "@noble/ciphers": "^2.4.0",
        "@noble/curves": "^2.4.0",
@@ -42442,16 +42442,16 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.13.0",
+      "version": "0.13.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.13.0",
-        "@getpaseo/highlight": "0.13.0",
-        "@getpaseo/plugin": "0.13.0",
-        "@getpaseo/protocol": "0.13.0",
-        "@getpaseo/relay": "0.13.0",
+        "@getpaseo/client": "0.13.0-beta.2",
+        "@getpaseo/highlight": "0.13.0-beta.2",
+        "@getpaseo/plugin": "0.13.0-beta.2",
+        "@getpaseo/protocol": "0.13.0-beta.2",
+        "@getpaseo/relay": "0.13.0-beta.2",
        "@isaacs/ttlcache": "^2.1.4",
        "@modelcontextprotocol/sdk": "1.29.0",
        "@opencode-ai/sdk": "1.14.46",
@@ -43372,7 +43372,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.13.0",
+      "version": "0.13.0-beta.2",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.29.1",
        "@cloudflare/workers-types": "^4.20260317.1",
@@ -44982,7 +44982,7 @@
    },
    "plugins": {
      "name": "@getpaseo/builtin-plugins",
-      "version": "0.13.0",
+      "version": "0.13.0-beta.2",
      "dependencies": {
        "@getpaseo/plugin": "*",
        "zod": "^4.4.3"
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.13.0",
+  "version": "0.13.0-beta.2",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -1415,12 +1415,14 @@ test("collapsing and expanding restores the real horizontal scroll offset", asyn
 async function useCodeFont(page: Page, codeFontSize: number): Promise<void> {
  await page.addInitScript(
    ({ settingsKey, fontSize }) => {
-      if (localStorage.getItem(settingsKey)) {
+      const settings = JSON.parse(localStorage.getItem(settingsKey) ?? "{}");
+      if (settings.codeFontSize !== undefined) {
        return;
      }
      localStorage.setItem(
        settingsKey,
        JSON.stringify({
+          ...settings,
          theme: "dark",
          sendBehavior: "interrupt",
          serviceUrlBehavior: "ask",
@@ -43,8 +43,6 @@ import {
 } from "../support/helpers/settings";
 import { getServerId } from "../support/helpers/server-id";
 import { expectAppRoute } from "../support/helpers/route-assertions";
-import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
-import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";

 async function openWorkspace(
  page: import("@playwright/test").Page,
@@ -55,74 +53,6 @@ async function openWorkspace(
 }

 test.describe("Settings sidebar navigation", () => {
-  test("opening Settings closes the composer model selector until it is opened again", async ({
-    page,
-    withWorkspace,
-  }, testInfo) => {
-    const workspace = await withWorkspace({ prefix: "settings-model-selector-" });
-    await gotoWorkspace(page, workspace.workspaceId);
-    await clickNewChat(page);
-
-    const selector = page.getByTestId("combined-model-selector").filter({ visible: true });
-    const popover = page.getByTestId("combobox-desktop-container");
-    await selector.click();
-    await expect(popover).toBeVisible();
-
-    const modifier = process.platform === "darwin" ? "Meta" : "Control";
-    await page.keyboard.press(`${modifier}+,`);
-    await expect(page).toHaveURL(/\/settings\/general$/);
-    await page.screenshot({ path: testInfo.outputPath("settings-after-model-selector.png") });
-    await expect(popover).toHaveCount(0);
-
-    await clickSettingsBackToWorkspace(page);
-    await expect(selector).toBeVisible();
-    await expect(popover).toHaveCount(0);
-
-    await selector.click();
-    await expect(popover).toBeVisible();
-    await page.keyboard.press("Escape");
-    await expect(popover).toHaveCount(0);
-  });
-
-  test("opening Settings closes an existing chat's model selector until it is opened again", async ({
-    page,
-  }, testInfo) => {
-    const workspace = await seedMockAgentWorkspace({
-      repoPrefix: "settings-existing-model-",
-      title: "Settings model selector",
-    });
-    try {
-      await openAgentRoute(page, {
-        workspaceId: workspace.workspaceId,
-        agentId: workspace.agentId,
-      });
-
-      const selector = page.getByTestId("combined-model-selector").filter({ visible: true });
-      const popover = page.getByTestId("combobox-desktop-container");
-      await selector.click();
-      await expect(popover).toBeVisible();
-
-      const modifier = process.platform === "darwin" ? "Meta" : "Control";
-      await page.keyboard.press(`${modifier}+,`);
-      await expect(page).toHaveURL(/\/settings\/general$/);
-      await page.screenshot({
-        path: testInfo.outputPath("settings-after-existing-model-selector.png"),
-      });
-      await expect(popover).toHaveCount(0);
-
-      await clickSettingsBackToWorkspace(page);
-      await expect(selector).toBeVisible();
-      await expect(popover).toHaveCount(0);
-
-      await selector.click();
-      await expect(popover).toBeVisible();
-      await page.keyboard.press("Escape");
-      await expect(popover).toHaveCount(0);
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
  test("clicking a sidebar section updates the URL and renders the section", async ({ page }) => {
    await gotoAppShell(page);
    await openSettings(page);
@@ -217,42 +147,6 @@ test.describe("Settings sidebar navigation", () => {
 test.describe("Settings — compact master-detail", () => {
  test.use({ viewport: { width: 390, height: 844 } });

-  test("the compact tab switcher reopens after Settings hides its workspace", async ({ page }) => {
-    const workspace = await seedMockAgentWorkspace({
-      repoPrefix: "settings-tab-switcher-",
-      title: "Compact tab switcher",
-    });
-    try {
-      await openAgentRoute(page, {
-        workspaceId: workspace.workspaceId,
-        agentId: workspace.agentId,
-      });
-
-      const switcher = page.getByTestId("workspace-tab-switcher-trigger").filter({ visible: true });
-      const newAgent = page.getByTestId("workspace-tab-switcher-new-agent");
-      await switcher.click();
-      await expect(newAgent).toBeInViewport();
-
-      // Navigate without dismissing the sheet through its backdrop first.
-      await page
-        .getByTestId("menu-button")
-        .filter({ visible: true })
-        .first()
-        .dispatchEvent("click");
-      await page.getByTestId("sidebar-settings").first().dispatchEvent("click");
-      await expectAppRoute(page, buildSettingsRoute());
-      await expect(newAgent).toHaveCount(0);
-
-      await closeCompactSettings(page);
-      await expect(switcher).toBeVisible();
-      await expect(newAgent).toHaveCount(0);
-      await switcher.click();
-      await expect(newAgent).toBeInViewport();
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
  test("opens compact app and host details and returns through the settings list", async ({
    page,
  }) => {
@@ -10,16 +10,6 @@ async function pressSettingsToggleShortcut(page: import("@playwright/test").Page
  await page.keyboard.press(`${modifier}+Comma`);
 }

-async function openComposerTab(page: import("@playwright/test").Page, agentId: string) {
-  await page
-    .getByTestId(`workspace-tab-agent_${agentId}`)
-    .filter({ visible: true })
-    .first()
-    .click();
-  await expectAgentTabActive(page, agentId);
-  await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeVisible();
-}
-
 interface ComposerFrame {
  at: number;
  visible: boolean;
@@ -37,9 +27,7 @@ async function startComposerFrameCapture(page: import("@playwright/test").Page)

    const sample = () => {
      if (capture.stopped) return;
-      const root = Array.from(
-        document.querySelectorAll<HTMLElement>('[data-testid="message-input-root"]'),
-      ).find((candidate) => candidate.offsetParent !== null);
+      const root = document.querySelector<HTMLElement>('[data-testid="message-input-root"]');
      const input = root?.querySelector<HTMLTextAreaElement>("textarea");
      if (root && input) {
        const style = getComputedStyle(input);
@@ -190,8 +178,6 @@ test.describe("Settings toggle tab regression", () => {
      await openWorkspaceWithAgents(page, [firstAgent, secondAgent]);
      await waitForTabBar(page);

-      await openComposerTab(page, firstAgent.id);
-      await openComposerTab(page, secondAgent.id);
      const input = page.getByRole("textbox", { name: "Message agent..." });
      await input.fill("Keep this short draft in the composer");
      const root = page.getByTestId("message-input-root").filter({ visible: true }).first();
@@ -208,7 +194,6 @@ test.describe("Settings toggle tab regression", () => {

      const frames = await stopComposerFrameCapture(page);
      const visibleFrames = frames.filter((frame) => frame.visible);
-      expect(visibleFrames.length, "Capture must observe the visible composer").toBeGreaterThan(0);
      const tallestIndex = visibleFrames.reduce(
        (index, frame, candidateIndex) =>
          frame.rootHeight > visibleFrames[index].rootHeight ? candidateIndex : index,
@@ -143,7 +143,7 @@ async function configureOverviewToolCalls(page: Page): Promise<void> {
  await page.addInitScript(() => {
    localStorage.setItem(
      "@paseo:app-settings",
-      JSON.stringify({ toolCallDetailLevel: "overview" }),
+      JSON.stringify({ chatDisplay: "collapseToolCalls" }),
    );
  });
 }
@@ -161,7 +161,7 @@ test("measures an overview heading that becomes loading after its idle mount", a
  await page.addInitScript(() => {
    localStorage.setItem(
      "@paseo:app-settings",
-      JSON.stringify({ toolCallDetailLevel: "overview" }),
+      JSON.stringify({ chatDisplay: "collapseToolCalls" }),
    );
  });
  const agent = await seedMockAgentWorkspace({
@@ -0,0 +1,67 @@
+import type { Page } from "@playwright/test";
+import { test, expect } from "../support/fixtures";
+import { expectComposerVisible } from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+
+type ChatDisplay = "full" | "collapseToolCalls" | "collapseTurns";
+
+async function useChatDisplay(page: Page, chatDisplay: ChatDisplay): Promise<void> {
+  await page.addInitScript((value) => {
+    localStorage.setItem("@paseo:app-settings", JSON.stringify({ chatDisplay: value }));
+  }, chatDisplay);
+}
+
+async function seedAnsweredAgent(title: string) {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "turn-collapse-",
+    title,
+    model: "ten-second-stream",
+    initialPrompt: "Why does the chat stop following new output?",
+  });
+  await agent.client.waitForFinish(agent.agentId, 30_000);
+  await agent.client.sendAgentMessage(agent.agentId, "Make the fix and run the burst script.");
+  await agent.client.waitForFinish(agent.agentId, 30_000);
+  return agent;
+}
+
+/** Chat rows between the latest turn's summary line and its reply, in document order. */
+async function rowsBetweenLatestSummaryAndReply(page: Page): Promise<number> {
+  return page.evaluate(() => {
+    const rows = [...document.querySelectorAll("[data-message-id]")];
+    const summaryRow = rows.findLastIndex((row) => row.querySelector("[data-testid=turn-summary]"));
+    const replyRow = rows.findLastIndex((row) =>
+      row.querySelector("[data-testid=assistant-message]"),
+    );
+    return replyRow - summaryRow - 1;
+  });
+}
+
+test.describe("Turn collapse", () => {
+  test("folds each answered turn behind a summary line that opens it", async ({ page }) => {
+    test.setTimeout(120_000);
+    await useChatDisplay(page, "collapseTurns");
+    const agent = await seedAnsweredAgent("Turn collapse");
+    try {
+      await openAgentRoute(page, agent);
+      await expectComposerVisible(page);
+
+      const summary = page.getByTestId("turn-summary").last().getByRole("button");
+      await expect(summary).toHaveText(/^Wrote \d+ messages?, edited 1 file/);
+      // Text chunks that stream back to back merge into one message, so the reply holds
+      // at least the stream's last chunk.
+      await expect(page.getByTestId("assistant-message").last()).toHaveText(
+        /\(end of synthetic stream\)$/,
+      );
+      await expect.poll(() => rowsBetweenLatestSummaryAndReply(page)).toBe(0);
+
+      await summary.click();
+      await expect.poll(() => rowsBetweenLatestSummaryAndReply(page)).toBeGreaterThan(0);
+      await expect(summary).toBeInViewport();
+
+      await summary.click();
+      await expect.poll(() => rowsBetweenLatestSummaryAndReply(page)).toBe(0);
+    } finally {
+      await agent.cleanup();
+    }
+  });
+});
@@ -180,6 +180,11 @@ const test = daemonTest.extend<{
          localStorage.setItem("@paseo:daemon-registry", JSON.stringify([daemon, ...extraHosts]));
          localStorage.removeItem("@paseo:settings");
          localStorage.setItem("@paseo:create-agent-preferences", JSON.stringify(preferences));
+          // New installs collapse finished turns; specs assert on the rows inside them, so they
+          // start from the full chat unless they seed their own settings.
+          if (!localStorage.getItem("@paseo:app-settings")) {
+            localStorage.setItem("@paseo:app-settings", JSON.stringify({ chatDisplay: "full" }));
+          }
        },
        {
          daemon: testDaemon,
@@ -116,7 +116,7 @@ export async function withTimelinePlugin(
  await page.addInitScript(() => {
    localStorage.setItem(
      "@paseo:app-settings",
-      JSON.stringify({ toolCallDetailLevel: "overview" }),
+      JSON.stringify({ chatDisplay: "collapseToolCalls" }),
    );
  });
  const agent = await seedMockAgentWorkspace({
@@ -63,8 +63,9 @@ export async function seedSidebarFooterPreferences(
 ): Promise<void> {
  await page.addInitScript(
    ({ key, sidebarFooterItems }) => {
-      if (localStorage.getItem(key)) return;
-      localStorage.setItem(key, JSON.stringify({ sidebarFooterItems }));
+      const settings = JSON.parse(localStorage.getItem(key) ?? "{}");
+      if (settings.sidebarFooterItems) return;
+      localStorage.setItem(key, JSON.stringify({ ...settings, sidebarFooterItems }));
    },
    { key: APP_SETTINGS_KEY, sidebarFooterItems: preferences },
  );
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.13.0",
+  "version": "0.13.0-beta.2",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -24,6 +24,7 @@ function viewport(root: HTMLElement, capture: Capture) {
  const handle: StreamViewportHandle = {
    scrollToBottom() {},
    prepareForViewportChange() {},
+    holdReadingPosition() {},
    scrollToMessage(_messageId, occurrence) {
      if (occurrence) capture.occurrence = occurrence;
    },
@@ -265,6 +265,7 @@ describe("useChatOutline", () => {
    const viewport: StreamViewportHandle = {
      scrollToBottom: vi.fn(),
      prepareForViewportChange: vi.fn(),
+      holdReadingPosition: vi.fn(),
      scrollToMessage,
    };
    const viewportRef = { current: viewport };
@@ -316,6 +317,7 @@ describe("useChatOutline", () => {
      current: {
        scrollToBottom: vi.fn(),
        prepareForViewportChange: vi.fn(),
+        holdReadingPosition: vi.fn(),
        scrollToMessage,
      },
    };
@@ -371,6 +373,7 @@ describe("useChatOutline", () => {
    const viewport: StreamViewportHandle = {
      scrollToBottom: vi.fn(),
      prepareForViewportChange: vi.fn(),
+      holdReadingPosition: vi.fn(),
      scrollToMessage,
    };
    const livePrompt = {
@@ -4,6 +4,7 @@ import { transformTimelineItem, type TimelineItemTransform } from "@/plugins/tim
 import type { InstalledPlugin } from "@/plugins/types";
 import {
  applyStreamEvent,
+  getStreamItemMessageId,
  hydrateStreamState,
  type StreamItem,
  type ToolCallItem,
@@ -13,7 +14,7 @@ import type { AgentStreamEventPayload } from "@getpaseo/protocol/messages";
 import { QueryClient } from "@tanstack/react-query";
 import { describe, expect, it } from "vitest";
 import { buildAgentStreamRenderModel } from "./model";
-import { createStreamPresentation, getStreamItemMessageId } from "./presentation";
+import { createStreamPresentation } from "./presentation";

 const runtime = {
  paseo: {},
@@ -97,7 +98,11 @@ function pluginData(items: StreamItem[]): unknown[] {
  return items.flatMap((item) => (item.kind === "plugin" ? [item.data] : []));
 }

-const presentationOptions = { level: "overview" as const, isTurnActive: true };
+const presentationOptions = {
+  display: "collapseToolCalls" as const,
+  expandedTurnHostIds: new Set<string>(),
+  isTurnActive: true,
+};

 function streamHarness(transform?: TimelineItemTransform) {
  let state: { tail: StreamItem[]; head: StreamItem[] } = { tail: [], head: [] };
@@ -1,3 +1,4 @@
+import type { ChatDisplay } from "@/hooks/use-settings";
 import type { TimelineItemTransform } from "@/plugins/timeline/model";
 import { projectPluginTimelineItems } from "@/plugins/timeline/projection";
 import {
@@ -5,23 +6,32 @@ import {
  projectToolCallDetailLevel,
  type PreparedToolCallHistory,
  type ToolCallDetailLevel,
+  type ToolCallDetailProjection,
 } from "@/tool-calls/detail-level/projection";
 import type { StreamItem, UserMessageItem } from "@/types/stream";
+import { collapseTurns, type TurnCollapse } from "./turn-collapse/model";

 interface PresentationInput {
  tail: StreamItem[];
  head: StreamItem[];
  transform: TimelineItemTransform | undefined;
-  level: ToolCallDetailLevel;
+  display: ChatDisplay;
+  /** User messages whose collapsed turn the reader opened. */
+  expandedTurnHostIds: ReadonlySet<string>;
  isTurnActive: boolean;
 }

-/** Find and scrolling address a plugin row by the source it replaces. */
-export function getStreamItemMessageId(item: StreamItem): string {
-  if (item.kind === "plugin") return item.sourceId ?? item.id;
-  return item.id;
+export interface StreamPresentation extends ToolCallDetailProjection {
+  turns: Omit<TurnCollapse, "tail">;
 }

+const NO_COLLAPSED_TURNS: StreamPresentation["turns"] = collapseTurns({
+  tail: [],
+  isLatestTurnOpen: false,
+  expandedHostIds: new Set(),
+  getGroupedCalls: () => undefined,
+});
+
 /** Source messages reach plugins before display projection. */
 export function createStreamPresentation() {
  const userMessageCache = new WeakMap<UserMessageItem, UserMessageItem>();
@@ -47,12 +57,47 @@ export function createStreamPresentation() {
  let preparedTail: StreamItem[] | undefined;
  let preparedLevel: ToolCallDetailLevel | undefined;
  let preparedHistory: PreparedToolCallHistory | null = null;
+  let collapsedSource: StreamItem[] | undefined;
+  let collapsedIsLatestTurnOpen = false;
+  let collapsedExpandedHostIds: ReadonlySet<string> | undefined;
+  let collapsed: TurnCollapse | undefined;

  function presentRows(item: StreamItem): StreamItem[] {
    return [item.kind === "user_message" ? presentUserMessage(item) : item];
  }

-  return (input: PresentationInput) => {
+  function collapse(
+    projection: ToolCallDetailProjection,
+    input: PresentationInput,
+  ): StreamPresentation {
+    if (input.display !== "collapseTurns") {
+      return { ...projection, turns: NO_COLLAPSED_TURNS };
+    }
+    // Live text updates reach the head only, so the folded history is reused until the
+    // retained rows, the latest turn's liveness, or the reader's expanded turns change.
+    const isLatestTurnOpen = input.isTurnActive || projection.head.length > 0;
+    if (
+      !collapsed ||
+      collapsedSource !== projection.tail ||
+      collapsedIsLatestTurnOpen !== isLatestTurnOpen ||
+      collapsedExpandedHostIds !== input.expandedTurnHostIds
+    ) {
+      collapsed = collapseTurns({
+        tail: projection.tail,
+        isLatestTurnOpen,
+        expandedHostIds: input.expandedTurnHostIds,
+        getGroupedCalls: (itemId) => projection.groupsByHostId.get(itemId)?.run.calls,
+      });
+      collapsedSource = projection.tail;
+      collapsedIsLatestTurnOpen = isLatestTurnOpen;
+      collapsedExpandedHostIds = input.expandedTurnHostIds;
+    }
+    const { tail, ...turns } = collapsed;
+    return { ...projection, tail, turns };
+  }
+
+  return (input: PresentationInput): StreamPresentation => {
+    const level: ToolCallDetailLevel = input.display === "full" ? "detailed" : "overview";
    // Retained history is not reprojected or regrouped on each live text update.
    if (historySource !== input.tail || historyTransform !== input.transform) {
      historyRows = projectPluginTimelineItems(input.tail, input.transform).flatMap<StreamItem>(
@@ -66,17 +111,20 @@ export function createStreamPresentation() {
      const blocks = presentRows(item);
      head.push(...blocks);
    }
-    if (preparedTail !== historyRows || preparedLevel !== input.level) {
-      preparedHistory = prepareToolCallHistory(input.level, historyRows);
+    if (preparedTail !== historyRows || preparedLevel !== level) {
+      preparedHistory = prepareToolCallHistory(level, historyRows);
      preparedTail = historyRows;
-      preparedLevel = input.level;
+      preparedLevel = level;
    }
-    return projectToolCallDetailLevel({
-      level: input.level,
-      tail: historyRows,
-      head,
-      preparedHistory,
-      isTurnActive: input.isTurnActive,
-    });
+    return collapse(
+      projectToolCallDetailLevel({
+        level,
+        tail: historyRows,
+        head,
+        preparedHistory,
+        isTurnActive: input.isTurnActive,
+      }),
+      input,
+    );
  };
 }
@@ -361,6 +361,7 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
        bottomAnchorController.prepareForStickyViewportChange();
        markNativeViewportSettling();
      },
+      holdReadingPosition: () => bottomAnchorController.detachByUser(),
    };
    viewportRef.current = handle;
    return () => {
@@ -20,7 +20,7 @@ import { withUnistyles } from "react-native-unistyles";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { useStableEvent } from "@/hooks/use-stable-event";
-import type { StreamItem } from "@/types/stream";
+import { getStreamItemMessageId, type StreamItem } from "@/types/stream";
 import type { Theme } from "@/styles/theme";
 import { WEB_SCROLLBAR_SIZE_PX } from "@/styles/web-scrollbar";
 import { DomOverlayScrollbar } from "@/components/ui/overlay-scrollbar/dom-overlay-scrollbar";
@@ -44,7 +44,6 @@ import {
  type HistoryStartSettleScheduler,
 } from "./history-start-settle-scheduler";
 import { useChatFindSelectedMessageId } from "@/agent-stream/chat-find";
-import { getStreamItemMessageId } from "./presentation";
 import { useScrollToMessage } from "./use-scroll-to-message.web";

 interface CreateWebStreamStrategyInput {
@@ -1174,6 +1173,11 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
        }
        scheduleStickToBottom();
      },
+      holdReadingPosition: () => {
+        cancelPendingStickToBottom();
+        setFollowOutput(false);
+        readingAnchor.scroll(scrollContainerRef.current?.scrollTop ?? 0);
+      },
      scrollToMessage,
    };
    viewportRef.current = handle;
@@ -1186,6 +1190,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
  }, [
    cancelPendingStickToBottom,
    forceStickToBottom,
+    readingAnchor,
    scheduleStickToBottom,
    scrollToMessage,
    viewportRef,
@@ -55,6 +55,8 @@ export interface StreamViewportHandle {
  focus?: () => void;
  scrollToBottom: (reason?: BottomAnchorLocalRequest["reason"]) => void;
  prepareForViewportChange: () => void;
+  /** Stop following output so the rows on screen stay put while rows below them open or close. */
+  holdReadingPosition: () => void;
  scrollToMessage?: (messageId: string, occurrence?: ScrollToMessageOccurrence) => void;
 }

@@ -0,0 +1,134 @@
+import { describe, expect, it } from "vitest";
+import type { StreamItem, ToolCallItem } from "@/types/stream";
+import { collapseTurns, type CollapseTurnsInput } from "./model";
+
+const at = new Date("2026-01-01T00:00:00.000Z");
+
+function user(id: string): StreamItem {
+  return { kind: "user_message", id, text: id, timestamp: at };
+}
+
+function reply(id: string): StreamItem {
+  return { kind: "assistant_message", id, text: id, timestamp: at };
+}
+
+function thought(id: string): StreamItem {
+  return { kind: "thought", id, text: id, timestamp: at, status: "ready" };
+}
+
+function shell(id: string): ToolCallItem {
+  return {
+    kind: "tool_call",
+    id,
+    timestamp: at,
+    payload: {
+      source: "agent",
+      data: {
+        provider: "claude",
+        callId: id,
+        name: "Bash",
+        status: "completed",
+        error: null,
+        detail: { type: "shell", command: "ls" },
+      },
+    },
+  };
+}
+
+function collapse(tail: StreamItem[], options: Partial<CollapseTurnsInput> = {}) {
+  return collapseTurns({
+    tail,
+    isLatestTurnOpen: false,
+    expandedHostIds: new Set(),
+    getGroupedCalls: () => undefined,
+    ...options,
+  });
+}
+
+const ids = (items: StreamItem[]) => items.map((item) => item.id);
+
+describe("collapseTurns", () => {
+  it("folds a finished turn's work into its user message and keeps the reply", () => {
+    const result = collapse([
+      user("u1"),
+      thought("t1"),
+      reply("early"),
+      shell("c1"),
+      shell("c2"),
+      reply("final"),
+    ]);
+
+    expect(ids(result.tail)).toEqual(["u1", "final"]);
+    expect(result.turnsByHostId.get("u1")).toEqual({
+      hostId: "u1",
+      expanded: false,
+      summary: {
+        messageCount: 1,
+        tools: expect.objectContaining({ commandCount: 2 }),
+      },
+    });
+    expect(result.hostIdByFoldedMessageId.get("early")).toBe("u1");
+  });
+
+  it("shows an expanded turn's work as nested rows between the prompt and the reply", () => {
+    const result = collapse([user("u1"), thought("t1"), shell("c1"), reply("final")], {
+      expandedHostIds: new Set(["u1"]),
+    });
+
+    expect(ids(result.tail)).toEqual(["u1", "t1", "c1", "final"]);
+    expect([...result.nestedItemIds]).toEqual(["t1", "c1"]);
+    expect(result.turnsByHostId.get("u1")?.expanded).toBe(true);
+  });
+
+  it("leaves the latest turn alone while it is still producing output", () => {
+    const tail = [user("u1"), shell("c1"), reply("r1"), user("u2"), shell("c2"), reply("r2")];
+
+    const result = collapse(tail, { isLatestTurnOpen: true });
+
+    expect(ids(result.tail)).toEqual(["u1", "r1", "u2", "c2", "r2"]);
+    expect([...result.turnsByHostId.keys()]).toEqual(["u1"]);
+  });
+
+  it("keeps rows after the reply, and turns with no work before the reply, as they are", () => {
+    const result = collapse([
+      user("u1"),
+      shell("c1"),
+      reply("r1"),
+      shell("after"),
+      user("u2"),
+      reply("r2"),
+    ]);
+
+    expect(ids(result.tail)).toEqual(["u1", "r1", "after", "u2", "r2"]);
+    expect([...result.turnsByHostId.keys()]).toEqual(["u1"]);
+  });
+
+  it("does not fold a turn that only thought before its reply", () => {
+    const tail = [user("u1"), thought("t1"), reply("r1")];
+
+    const result = collapse(tail);
+
+    expect(result.tail).toBe(tail);
+    expect(result.turnsByHostId.size).toBe(0);
+  });
+
+  it("does not fold a turn without a reply or whose prompt is above the loaded history", () => {
+    const tail = [shell("c0"), reply("r0"), user("u1"), shell("c1")];
+
+    const result = collapse(tail);
+
+    expect(result.tail).toBe(tail);
+    expect(result.turnsByHostId.size).toBe(0);
+  });
+
+  it("counts every call a tool-call group row stands for", () => {
+    const group = [shell("c1"), shell("c2"), shell("c3")];
+    const result = collapse([user("u1"), group[0]!, reply("final")], {
+      getGroupedCalls: (itemId) => (itemId === "c1" ? group : undefined),
+    });
+
+    expect(result.turnsByHostId.get("u1")?.summary).toMatchObject({
+      tools: { commandCount: 3 },
+    });
+  });
+});
@@ -0,0 +1,122 @@
+import { getStreamItemMessageId, type StreamItem, type ToolCallItem } from "@/types/stream";
+import { summarizeToolCalls, type OverviewSummary } from "@/tool-calls/detail-level/overview/model";
+
+export interface TurnSummary {
+  messageCount: number;
+  tools: OverviewSummary;
+}
+
+export interface CollapsedTurn {
+  /** The user message the turn answers. Its row carries the turn's summary line. */
+  hostId: string;
+  expanded: boolean;
+  summary: TurnSummary;
+}
+
+export interface TurnCollapse {
+  tail: StreamItem[];
+  turnsByHostId: ReadonlyMap<string, CollapsedTurn>;
+  /** Rows of expanded turns, which render inside the turn's indent rail. */
+  nestedItemIds: ReadonlySet<string>;
+  /** The turn a folded message belongs to, for surfaces that must reveal it. */
+  hostIdByFoldedMessageId: ReadonlyMap<string, string>;
+}
+
+export interface CollapseTurnsInput {
+  tail: StreamItem[];
+  /** The latest turn is still producing output, so it stays unfolded. */
+  isLatestTurnOpen: boolean;
+  expandedHostIds: ReadonlySet<string>;
+  /** The calls a tool-call group row stands for; undefined for a single call. */
+  getGroupedCalls: (itemId: string) => readonly ToolCallItem[] | undefined;
+}
+
+const EMPTY_TURNS: ReadonlyMap<string, CollapsedTurn> = new Map();
+const EMPTY_IDS: ReadonlySet<string> = new Set();
+const EMPTY_HOSTS: ReadonlyMap<string, string> = new Map();
+
+function summarizeTurn(
+  items: readonly StreamItem[],
+  getGroupedCalls: CollapseTurnsInput["getGroupedCalls"],
+): TurnSummary {
+  const calls: ToolCallItem[] = [];
+  let messageCount = 0;
+  for (const item of items) {
+    if (item.kind === "assistant_message") messageCount += 1;
+    else if (item.kind === "tool_call") calls.push(...(getGroupedCalls(item.id) ?? [item]));
+  }
+  return { messageCount, tools: summarizeToolCalls(calls) };
+}
+
+function hasWork(summary: TurnSummary): boolean {
+  return summary.messageCount > 0 || Object.values(summary.tools).some((count) => count > 0);
+}
+
+function findLastAssistantIndex(tail: StreamItem[], start: number, end: number): number {
+  for (let index = end - 1; index >= start; index -= 1) {
+    if (tail[index]?.kind === "assistant_message") return index;
+  }
+  return -1;
+}
+
+/**
+ * Folds each answered turn into its user message: everything the agent did before its last
+ * message collapses into one summary line, and that message stays in the chat. A turn folds
+ * only once it is complete, its user message is loaded, and it sent messages or called tools
+ * before its reply. Thoughts fold with the turn but are not counted.
+ */
+export function collapseTurns(input: CollapseTurnsInput): TurnCollapse {
+  const { tail } = input;
+  const output: StreamItem[] = [];
+  const turnsByHostId = new Map<string, CollapsedTurn>();
+  const nestedItemIds = new Set<string>();
+  const hostIdByFoldedMessageId = new Map<string, string>();
+
+  let runStart = 0;
+  const flushRun = (runEnd: number) => {
+    const host = tail[runStart - 1];
+    const isClosed = runEnd < tail.length || !input.isLatestTurnOpen;
+    const replyIndex = findLastAssistantIndex(tail, runStart, runEnd);
+    if (host?.kind !== "user_message" || !isClosed || replyIndex <= runStart) {
+      output.push(...tail.slice(runStart, runEnd));
+      return;
+    }
+    const folded = tail.slice(runStart, replyIndex);
+    const summary = summarizeTurn(folded, input.getGroupedCalls);
+    if (!hasWork(summary)) {
+      output.push(...tail.slice(runStart, runEnd));
+      return;
+    }
+    const expanded = input.expandedHostIds.has(host.id);
+    turnsByHostId.set(host.id, { hostId: host.id, expanded, summary });
+    for (const item of folded) {
+      hostIdByFoldedMessageId.set(getStreamItemMessageId(item), host.id);
+      if (expanded) nestedItemIds.add(item.id);
+    }
+    if (expanded) output.push(...folded);
+    output.push(...tail.slice(replyIndex, runEnd));
+  };
+
+  for (let index = 0; index < tail.length; index += 1) {
+    if (tail[index]?.kind !== "user_message") continue;
+    flushRun(index);
+    output.push(tail[index]!);
+    runStart = index + 1;
+  }
+  flushRun(tail.length);
+
+  if (turnsByHostId.size === 0) {
+    return {
+      tail,
+      turnsByHostId: EMPTY_TURNS,
+      nestedItemIds: EMPTY_IDS,
+      hostIdByFoldedMessageId: EMPTY_HOSTS,
+    };
+  }
+  return {
+    tail: output.length === tail.length ? tail : output,
+    turnsByHostId,
+    nestedItemIds,
+    hostIdByFoldedMessageId,
+  };
+}
@@ -0,0 +1,48 @@
+import { memo, useCallback, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { Summary } from "lucide-react-native";
+import { ExpandableBadge } from "@/components/message";
+import { useOverviewSummaryLabel } from "@/tool-calls/detail-level/overview/label";
+import type { CollapsedTurn } from "./model";
+
+/**
+ * The row a collapsed turn leaves under its user message, styled like a tool-call group.
+ * Pressing it opens the turn's rows beneath it.
+ */
+export const TurnSummaryLine = memo(function TurnSummaryLine({
+  turn,
+  onExpandedChange,
+}: {
+  turn: CollapsedTurn;
+  onExpandedChange: (hostId: string, expanded: boolean) => void;
+}) {
+  const { t } = useTranslation();
+  const { messageCount, tools } = turn.summary;
+  const messageParts = useMemo(
+    () =>
+      messageCount > 0
+        ? [
+            t(`turnSummary.messages.${messageCount === 1 ? "one" : "other"}`, {
+              count: messageCount,
+            }),
+          ]
+        : [],
+    [messageCount, t],
+  );
+  const label = useOverviewSummaryLabel(tools, messageParts);
+  const toggle = useCallback(
+    () => onExpandedChange(turn.hostId, !turn.expanded),
+    [onExpandedChange, turn.expanded, turn.hostId],
+  );
+
+  return (
+    <ExpandableBadge
+      testID="turn-summary"
+      label={label}
+      icon={Summary}
+      isExpanded={turn.expanded}
+      onToggle={toggle}
+      borderlessWhenExpanded
+    />
+  );
+});
@@ -1,8 +1,7 @@
 import type React from "react";
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef } from "react";
 import type { Virtualizer } from "@tanstack/react-virtual";
-import type { StreamItem } from "@/types/stream";
-import { getStreamItemMessageId } from "./presentation";
+import { getStreamItemMessageId, type StreamItem } from "@/types/stream";
 import { createPromptJumpSettleController, PROMPT_JUMP_TOP_INSET_PX } from "./prompt-jump-settle";
 import type { ScrollToMessageOccurrence } from "./strategy";

@@ -1,7 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
-import type { StreamItem } from "@/types/stream";
+import { getStreamItemMessageId, type StreamItem } from "@/types/stream";
 import { findMountedWindowStart, getMountedRecentStreamItems } from "./history-window";
-import { getStreamItemMessageId } from "./presentation";

 // Callers reveal a message, not a row: an assistant message is several block rows and
 // the window has to open at the first of them.
@@ -41,7 +41,7 @@ import {
  type InlinePathTarget,
 } from "@/components/message";
 import { PlanCard } from "@/components/plan-card";
-import type { StreamItem } from "@/types/stream";
+import { getStreamItemMessageId, type StreamItem } from "@/types/stream";
 import type { PendingMessageSubmission } from "@/composer/submission/model";
 import type { TurnPresentation } from "@/timeline/turn-liveness";
 import type { PendingPermission } from "@/types/shared";
@@ -62,8 +62,10 @@ import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { ToolCallDetailsContent } from "@/components/tool-call-details";
 import { QuestionFormCard } from "@/components/question-form-card";
 import { ToolCallSheetProvider } from "@/components/tool-call-sheet";
-import { createStreamPresentation, getStreamItemMessageId } from "./presentation";
+import { createStreamPresentation } from "./presentation";
 import { OverviewToolCallGroupView } from "@/tool-calls/detail-level/overview/view";
+import { IndentRail } from "@/components/indent-rail";
+import { TurnSummaryLine } from "./turn-collapse/summary-line";
 import { type AgentStreamRenderModel, buildAgentStreamRenderModel } from "./model";
 import { resolveStreamRenderStrategy } from "./strategy-resolver";
 import { type StreamSegmentRenderers, type StreamViewportHandle } from "./strategy";
@@ -148,9 +150,16 @@ function renderPendingPermissionsNode(input: {
  );
 }

+/**
+ * Where a row sits in an opened turn: its summary line's row, a row inside the turn, or the
+ * turn's last row. The rail runs through the gaps between them so the turn reads as one block.
+ */
+type TurnIndent = "none" | "openedHost" | "nested" | "lastNested";
+
 function renderStreamItemWithTurnFooter(input: {
  content: ReactNode;
  layoutItem: StreamLayoutItem;
+  turnIndent: TurnIndent;
  strategy: TurnContentStrategy;
  supportsTimelineCursor: boolean;
  onForkAssistantTurn?: AssistantTurnForkHandler;
@@ -171,7 +180,7 @@ function renderStreamItemWithTurnFooter(input: {
    />
  ) : null;
  const content = (
-    <StreamItemWrapper itemId={input.layoutItem.item.id} gapBelow={input.layoutItem.gapBelow}>
+    <StreamItemWrapper gapBelow={input.layoutItem.gapBelow} turnIndent={input.turnIndent}>
      {input.content}
    </StreamItemWrapper>
  );
@@ -333,7 +342,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
  ) {
    const { t } = useTranslation();
    const autoExpandReasoning = useSettings((settings) => settings.autoExpandReasoning);
-    const toolCallDetailLevel = useSettings((settings) => settings.toolCallDetailLevel);
+    const chatDisplay = useSettings((settings) => settings.chatDisplay);
    const chatOutlineEnabled = useSettings((settings) => settings.chatOutlineEnabled);
    const contentMaxWidth = useSettings(resolveContentMaxWidth);
    const viewportRef = useRef<StreamViewportHandle | null>(null);
@@ -357,6 +366,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
    const [expandedToolCallGroupIds, setExpandedToolCallGroupIds] = useState<Set<string>>(
      new Set(),
    );
+    const [expandedTurnHostIds, setExpandedTurnHostIds] = useState<ReadonlySet<string>>(new Set());

    // Get serverId (fallback to agent's serverId if not provided)
    const resolvedServerId = serverId ?? context.serverId ?? "";
@@ -421,6 +431,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
      setIsNearBottom(true);
      setExpandedInlineToolCallIds(new Set());
      setExpandedToolCallGroupIds(new Set());
+      setExpandedTurnHostIds(new Set());
    }, [agentId]);

    const isActive = useRetainedPanelActive();
@@ -512,7 +523,8 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
          tail: effectiveStreamItems,
          head: effectiveStreamHead ?? EMPTY_STREAM_HEAD,
          transform: transformTimelineItem,
-          level: toolCallDetailLevel,
+          display: chatDisplay,
+          expandedTurnHostIds,
          isTurnActive,
        }),
      [
@@ -520,7 +532,8 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
        effectiveStreamItems,
        effectiveStreamHead,
        transformTimelineItem,
-        toolCallDetailLevel,
+        chatDisplay,
+        expandedTurnHostIds,
        isTurnActive,
      ],
    );
@@ -651,6 +664,43 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
      [streamRenderStrategy],
    );

+    const setTurnExpanded = useCallback((hostId: string, expanded: boolean) => {
+      // A turn opens below its summary line; keep that line under the reader's pointer.
+      viewportRef.current?.holdReadingPosition();
+      setExpandedTurnHostIds((previous) => {
+        if (previous.has(hostId) === expanded) return previous;
+        const next = new Set(previous);
+        if (expanded) {
+          next.add(hostId);
+        } else {
+          next.delete(hostId);
+        }
+        return next;
+      });
+    }, []);
+    // Chat find reveals a match inside a collapsed turn by opening the turn first.
+    const revealLoadedMessage = useStableEvent((messageId: string): boolean => {
+      const hostId = presentation.turns.hostIdByFoldedMessageId.get(messageId);
+      if (hostId && !expandedTurnHostIds.has(hostId)) {
+        setTurnExpanded(hostId, true);
+        return true;
+      }
+      return revealLoadedHistory(messageId);
+    });
+    // Read through stable events so a collapse rerun does not change the renderer identity;
+    // rows whose turn state changed are revised through `historyRowRevision`.
+    const getCollapsedTurn = useStableEvent((hostId: string) =>
+      presentation.turns.turnsByHostId.get(hostId),
+    );
+    const getTurnIndent = useStableEvent((layoutItem: StreamLayoutItem): TurnIndent => {
+      const { nestedItemIds } = presentation.turns;
+      if (nestedItemIds.has(layoutItem.item.id)) {
+        const below = layoutItem.belowItem;
+        return below && nestedItemIds.has(below.id) ? "nested" : "lastNested";
+      }
+      return getCollapsedTurn(layoutItem.item.id)?.expanded ? "openedHost" : "none";
+    });
+
    const setToolCallGroupExpanded = useCallback((groupId: string, expanded: boolean) => {
      setExpandedToolCallGroupIds((previous) => {
        const next = new Set(previous);
@@ -665,7 +715,8 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi

    const renderUserMessageItem = useCallback(
      (layoutItem: StreamLayoutItem, item: Extract<StreamItem, { kind: "user_message" }>) => {
-        return (
+        const collapsedTurn = getCollapsedTurn(item.id);
+        const message = (
          <UserMessage
            serverId={resolvedServerId}
            agentId={agentId}
@@ -684,8 +735,25 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
            }
          />
        );
+        if (!collapsedTurn) {
+          return message;
+        }
+        return (
+          <>
+            {message}
+            <TurnSummaryLine turn={collapsedTurn} onExpandedChange={setTurnExpanded} />
+          </>
+        );
      },
-      [context.capabilities, agentId, client, pendingClientMessageIds, resolvedServerId],
+      [
+        context.capabilities,
+        agentId,
+        client,
+        getCollapsedTurn,
+        pendingClientMessageIds,
+        resolvedServerId,
+        setTurnExpanded,
+      ],
    );

    const renderAssistantMessageItem = useCallback(
@@ -893,12 +961,14 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
        return renderStreamItemWithTurnFooter({
          content,
          layoutItem,
+          turnIndent: getTurnIndent(layoutItem),
          strategy: streamRenderStrategy,
          supportsTimelineCursor: supportsAgentForkContextCursor,
          onForkAssistantTurn: readOnly ? undefined : handleForkAssistantTurn,
        });
      },
      [
+        getTurnIndent,
        handleForkAssistantTurn,
        readOnly,
        renderStreamItemContent,
@@ -1060,13 +1130,25 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
    const streamScrollEnabled =
      !streamRenderStrategy.shouldDisableParentScrollOnInlineDetailsExpansion() ||
      expandedInlineToolCallIds.size === 0;
+    const { nestedItemIds } = presentation.turns;
    const historyRowRevision = useMemo(
      () => ({
        contentById: presentation.historyGroupUpdatesByHostId,
-        displayStateById: expandedToolCallGroupIds,
+        displayStateById: {
+          has: (id: string) =>
+            expandedToolCallGroupIds.has(id) ||
+            expandedTurnHostIds.has(id) ||
+            nestedItemIds.has(id),
+        },
        globalDisplayState: isMobile,
      }),
-      [expandedToolCallGroupIds, isMobile, presentation.historyGroupUpdatesByHostId],
+      [
+        expandedToolCallGroupIds,
+        expandedTurnHostIds,
+        isMobile,
+        nestedItemIds,
+        presentation.historyGroupUpdatesByHostId,
+      ],
    );

    const findItems = useMemo(
@@ -1080,7 +1162,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
        epoch={timelineEpoch}
        items={findItems}
        viewportRef={viewportRef}
-        revealLoadedMessage={revealLoadedHistory}
+        revealLoadedMessage={revealLoadedMessage}
        visibleMessageIds={mountedMessageIds}
      >
        <ToolCallSheetProvider>
@@ -1763,15 +1845,41 @@ const permissionStyles = StyleSheet.create((theme) => ({
 }));

 interface StreamItemWrapperProps {
-  itemId: string;
  gapBelow: number;
+  turnIndent: TurnIndent;
  children: ReactNode;
 }

-function StreamItemWrapper({ gapBelow, children }: StreamItemWrapperProps) {
+function StreamItemWrapper({ gapBelow, turnIndent, children }: StreamItemWrapperProps) {
  const wrapperStyle = useMemo(
-    () => [stylesheet.streamItemWrapper, { marginBottom: gapBelow }],
-    [gapBelow],
+    () => [
+      stylesheet.streamItemWrapper,
+      { marginBottom: turnIndent === "nested" || turnIndent === "openedHost" ? 0 : gapBelow },
+    ],
+    [gapBelow, turnIndent],
  );
-  return <View style={wrapperStyle}>{children}</View>;
+  const gapStyle = useMemo(() => ({ paddingBottom: gapBelow }), [gapBelow]);
+  switch (turnIndent) {
+    case "none":
+      return <View style={wrapperStyle}>{children}</View>;
+    case "openedHost":
+      return (
+        <View style={wrapperStyle}>
+          {children}
+          <IndentRail style={gapStyle} />
+        </View>
+      );
+    case "nested":
+      return (
+        <View style={wrapperStyle}>
+          <IndentRail style={gapStyle}>{children}</IndentRail>
+        </View>
+      );
+    case "lastNested":
+      return (
+        <View style={wrapperStyle}>
+          <IndentRail>{children}</IndentRail>
+        </View>
+      );
+  }
 }
@@ -0,0 +1,32 @@
+import type { ReactNode } from "react";
+import { View, type StyleProp, type ViewStyle } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+
+/**
+ * Collapsed chat rows badge their summary with an icon whose center sits 7px into the content
+ * column (`ExpandableBadge` bleeds 13px left, then 1px border, 8px padding, 22px icon). The rail
+ * hangs from that center so opened rows read as children of the line that opened them.
+ */
+const RAIL_LEFT = 7;
+const RAIL_WIDTH = 1;
+export const INDENT_RAIL_CONTENT_OFFSET = 21;
+
+/** Indents opened chat rows under the summary that collapsed them, behind a vertical line. */
+export function IndentRail({
+  children,
+  style,
+}: {
+  children?: ReactNode;
+  style?: StyleProp<ViewStyle>;
+}) {
+  return <View style={[styles.rail, style]}>{children}</View>;
+}
+
+const styles = StyleSheet.create((theme) => ({
+  rail: {
+    marginLeft: RAIL_LEFT,
+    paddingLeft: INDENT_RAIL_CONTENT_OFFSET - RAIL_LEFT - RAIL_WIDTH,
+    borderLeftWidth: RAIL_WIDTH,
+    borderLeftColor: theme.colors.border,
+  },
+}));
@@ -971,6 +971,10 @@ const expandableBadgeStylesheet = StyleSheet.create((theme) => ({
    borderBottomLeftRadius: 0,
    borderBottomRightRadius: 0,
  },
+  // Details that do not sit in a card leave the header as a lone highlighted pill.
+  pressableExpandedDetached: {
+    borderRadius: theme.borderRadius.full,
+  },
  detailWrapperBorderless: {
    borderWidth: 0,
  },
@@ -2048,7 +2052,10 @@ export const ExpandableBadge = memo(function ExpandableBadge({
      expandableBadgeStylesheet.pressable,
      isPressed && isInteractive ? expandableBadgeStylesheet.pressablePressed : null,
      isExpanded && expandableBadgeStylesheet.pressableExpanded,
-      isExpanded && !borderlessWhenExpanded && expandableBadgeStylesheet.pressableExpandedAttached,
+      isExpanded &&
+        (borderlessWhenExpanded
+          ? expandableBadgeStylesheet.pressableExpandedDetached
+          : expandableBadgeStylesheet.pressableExpandedAttached),
    ],
    [borderlessWhenExpanded, isExpanded, isInteractive, isPressed],
  );
@@ -28,7 +28,6 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import type { EditingTextInputHandle } from "@/components/ui/text-input";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { useRetainedPanelActive } from "@/components/retained-panel";
 import { BottomSheetScrollView, type BottomSheetBackgroundProps } from "@gorhom/bottom-sheet";
 import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
@@ -911,9 +910,13 @@ function resolveInitialActiveIndex(
  return selectedIndex >= 0 ? selectedIndex : fallbackIndex;
 }

+type BottomSheetVisibility = ReturnType<typeof useIsolatedBottomSheetVisibility>;
+
 interface MobileBodyProps {
-  isOpen: boolean;
+  bottomSheetRef: BottomSheetVisibility["sheetRef"];
  snapPoints: string[];
+  handleSheetChange: BottomSheetVisibility["handleSheetChange"];
+  handleSheetDismiss: BottomSheetVisibility["handleSheetDismiss"];
  handleIndicatorStyle: { backgroundColor: string };
  titleColor: string;
  title: string;
@@ -941,22 +944,7 @@ interface MobileBodyProps {
  safeAreaBottom: number;
 }

-function MobileComboboxBody(props: MobileBodyProps): ReactElement | null {
-  const active = useRetainedPanelActive();
-  if (!active) return null;
-  // The visibility tracker must leave the tree with its sheet.
-  return <MobileComboboxSheet {...props} />;
-}
-
-function MobileComboboxSheet(props: MobileBodyProps): ReactElement {
-  const {
-    sheetRef: bottomSheetRef,
-    handleSheetChange,
-    handleSheetDismiss,
-  } = useIsolatedBottomSheetVisibility({
-    visible: props.isOpen,
-    onClose: props.onClose,
-  });
+function MobileComboboxBody(props: MobileBodyProps): ReactElement {
  const comboboxTitleStyle = useMemo(
    () => [styles.comboboxTitle, { color: props.titleColor }],
    [props.titleColor],
@@ -991,13 +979,13 @@ function MobileComboboxSheet(props: MobileBodyProps): ReactElement {

  return (
    <IsolatedBottomSheetModal
-      ref={bottomSheetRef}
+      ref={props.bottomSheetRef}
      contextBridge={null}
      snapPoints={props.snapPoints}
      index={0}
      enableDynamicSizing={false}
-      onChange={handleSheetChange}
-      onDismiss={handleSheetDismiss}
+      onChange={props.handleSheetChange}
+      onDismiss={props.handleSheetDismiss}
      backdropOpacity={0.45}
      enablePanDownToClose
      backgroundComponent={ComboboxSheetBackground}
@@ -1180,8 +1168,7 @@ function DesktopComboboxOptionsBody(props: {
  );
 }

-function DesktopComboboxBody(props: DesktopBodyProps): ReactElement | null {
-  const active = useRetainedPanelActive();
+function DesktopComboboxBody(props: DesktopBodyProps): ReactElement {
  const handleDesktopKey = props.handleDesktopKey;
  const handleWebOverlayKeyDown = useCallback(
    (event: KeyboardEvent) => {
@@ -1203,9 +1190,6 @@ function DesktopComboboxBody(props: DesktopBodyProps): ReactElement | null {
    [props.refs, setWebOverlayScope],
  );

-  // Remove the portal before a retained chat can freeze its closing update.
-  if (!active) return null;
-
  const overlay = (
    <OverlayLayerProvider layer={props.overlayLayer}>
      <View
@@ -1325,7 +1309,6 @@ export function Combobox({
  const resolvedEmptyText = emptyText ?? t("common.empty.noOptionsMatchSearch");
  const resolvedTitle = title ?? t("common.actions.select");
  const isMobile = useIsCompactFormFactor();
-  const active = useRetainedPanelActive();
  const floatingLayer = useOverlayLayer("floating");
  const safeAreaInsets = useSafeAreaInsets();
  const titleColor = theme.colors.foreground;
@@ -1365,10 +1348,6 @@ export function Combobox({
    bumpSearchResetKey();
  }, [setOpen, setSearchQueryWithCallback]);

-  useEffect(() => {
-    if (!active && isOpen) handleClose();
-  }, [active, isOpen, handleClose]);
-
  useResetSearchOnOpen(isOpen, setSearchQueryWithCallback, bumpSearchResetKey);

  const collisionPadding = useMemo(computeCollisionPadding, []);
@@ -1434,6 +1413,16 @@ export function Combobox({
    referenceWidth,
  });

+  const {
+    sheetRef: bottomSheetRef,
+    handleSheetChange,
+    handleSheetDismiss,
+  } = useIsolatedBottomSheetVisibility({
+    visible: isOpen,
+    isEnabled: isMobile,
+    onClose: handleClose,
+  });
+
  const normalizedSearch = searchable ? searchQuery.trim().toLowerCase() : "";
  const sanitizedSearchValue = searchQuery.trim();
  const showCustomOption = useMemo(
@@ -1583,8 +1572,10 @@ export function Combobox({
  if (isMobile) {
    return (
      <MobileComboboxBody
-        isOpen={isOpen}
+        bottomSheetRef={bottomSheetRef}
        snapPoints={snapPoints}
+        handleSheetChange={handleSheetChange}
+        handleSheetDismiss={handleSheetDismiss}
        handleIndicatorStyle={handleIndicatorStyle}
        titleColor={titleColor}
        title={resolvedTitle}
@@ -38,10 +38,10 @@ const CATALOG_DATA = [
    title: "Auggie CLI",
    description:
      "Augment Code's powerful software agent, backed by industry-leading context engine",
-    version: "0.36.0",
+    version: "0.33.0",
    iconId: "auggie",
    installLink: "https://www.augmentcode.com/",
-    command: ["npx", "-y", "@augmentcode/auggie@0.36.0", "--acp"],
+    command: ["npx", "-y", "@augmentcode/auggie@0.33.0", "--acp"],
    env: {
      AUGMENT_DISABLE_AUTO_UPDATE: "1",
    },
@@ -60,10 +60,10 @@ const CATALOG_DATA = [
    title: "Cline",
    description:
      "Autonomous coding agent CLI - capable of creating/editing files, running commands, using the browser, and more",
-    version: "3.0.73",
+    version: "3.0.46",
    iconId: "cline",
    installLink: "https://cline.bot/cli",
-    command: ["npx", "-y", "cline@3.0.73", "--acp"],
+    command: ["npx", "-y", "cline@3.0.46", "--acp"],
  },
  {
    id: "codebuddy-code",
@@ -123,10 +123,10 @@ const CATALOG_DATA = [
    id: "deepagents",
    title: "DeepAgents",
    description: "Batteries-included AI coding and general purpose agent powered by LangChain.",
-    version: "0.1.36",
+    version: "0.1.20",
    iconId: "deepagents",
    installLink: "https://docs.langchain.com/oss/javascript/deepagents/overview",
-    command: ["npx", "-y", "deepagents-acp@0.1.36"],
+    command: ["npx", "-y", "deepagents-acp@0.1.20"],
  },
  {
    id: "devin",
@@ -141,29 +141,29 @@ const CATALOG_DATA = [
    id: "dimcode",
    title: "DimCode",
    description: "A coding agent that puts leading models at your command.",
-    version: "0.5.21",
+    version: "0.2.36",
    iconId: "dimcode",
    installLink: "https://dimcode.dev/docs/acp.html",
-    command: ["npx", "-y", "dimcode@0.5.21", "acp"],
+    command: ["npx", "-y", "dimcode@0.2.36", "acp"],
  },
  {
    id: "dirac",
    title: "Dirac",
    description:
      "Reduces API costs by more than 50%, produces better and faster work. Uses Hash anchored parallel edits, AST manipulation and a whole lot of neat optimizations. Fully Open Source.",
-    version: "0.5.23",
+    version: "0.4.22",
    iconId: "dirac",
    installLink: "https://dirac.run",
-    command: ["npx", "-y", "dirac-cli@0.5.23", "--acp"],
+    command: ["npx", "-y", "dirac-cli@0.4.22", "--acp"],
  },
  {
    id: "factory-droid",
    title: "Factory Droid",
    description: "Factory Droid - AI coding agent powered by Factory AI",
-    version: "0.249.0",
+    version: "0.179.0",
    iconId: "factory-droid",
    installLink: "https://factory.ai/product/cli",
-    command: ["npx", "-y", "droid@0.249.0", "exec", "--output-format", "acp-daemon"],
+    command: ["npx", "-y", "droid@0.179.0", "exec", "--output-format", "acp-daemon"],
    env: {
      DROID_DISABLE_AUTO_UPDATE: "true",
      FACTORY_DROID_AUTO_UPDATE_ENABLED: "false",
@@ -174,19 +174,19 @@ const CATALOG_DATA = [
    id: "fast-agent",
    title: "fast-agent",
    description: "Code and build agents with comprehensive multi-provider support",
-    version: "0.10.47",
+    version: "0.9.22",
    iconId: "fast-agent",
    installLink: "https://fast-agent.ai/acp/",
-    command: ["uvx", "--from", "fast-agent-acp==0.10.47", "fast-agent-acp", "-x"],
+    command: ["uvx", "--from", "fast-agent-acp==0.9.22", "fast-agent-acp", "-x"],
  },
  {
    id: "gemini",
    title: "Gemini CLI",
    description: "Google's official CLI for Gemini",
-    version: "0.65.0",
+    version: "0.52.0",
    iconId: "gemini",
    installLink: "https://geminicli.com",
-    command: ["npx", "-y", "@google/gemini-cli@0.65.0", "--acp"],
+    command: ["npx", "-y", "@google/gemini-cli@0.52.0", "--acp"],
  },
  {
    id: "gjc",
@@ -205,11 +205,11 @@ const CATALOG_DATA = [
    id: "glm-acp-agent",
    title: "GLM Agent",
    description:
-      "ACP agent powered by Zhipu AI's GLM Coding Plan models (glm-5.3, glm-5.3-flash, glm-5-turbo, glm-4.7). Supports streaming, tool calls, mid-session model switching, image input via Z.AI Coding Plan Vision MCP, and session load/fork/resume with on-disk persistence.",
-    version: "1.15.0",
+      "ACP agent powered by Zhipu AI's GLM Coding Plan models (glm-5.1, glm-5-turbo, glm-4.7, glm-4.5-air). Supports streaming, tool calls, mid-session model switching, image input via Z.AI Coding Plan Vision MCP, and session load/fork/resume with on-disk persistence.",
+    version: "1.3.0",
    iconId: "glm-acp-agent",
    installLink: "https://github.com/stefandevo/glm-acp-agent",
-    command: ["npx", "-y", "glm-acp-agent@1.15.0"],
+    command: ["npx", "-y", "glm-acp-agent@1.3.0"],
  },
  {
    id: "goose",
@@ -289,20 +289,20 @@ const CATALOG_DATA = [
    id: "minimax-code",
    title: "MiniMax Code",
    description: "MiniMax's coding agent for the terminal",
-    version: "0.6.13",
+    version: "0.1.2",
    iconId: "minimax-code",
    installLink: "https://agent.minimax.io",
-    command: ["npx", "-y", "@minimax-ai/code@0.6.13", "acp"],
+    command: ["npx", "-y", "@minimax-ai/code@0.1.2", "acp"],
  },
  {
    id: "minion-code",
    title: "Minion Code",
    description:
      "An enhanced AI code assistant built on the Minion framework with rich development tools",
-    version: "0.1.45",
+    version: "0.1.44",
    iconId: "minion-code",
    installLink: "https://github.com/femto/minion-code",
-    command: ["uvx", "--from", "minion-code==0.1.45", "minion-code", "acp"],
+    command: ["uvx", "--from", "minion-code==0.1.44", "minion-code", "acp"],
  },
  {
    id: "mistral-vibe",
@@ -317,10 +317,10 @@ const CATALOG_DATA = [
    id: "nova",
    title: "Nova",
    description: "Nova by Compass AI - a fully-fledged software engineer at your command",
-    version: "1.1.59",
+    version: "1.1.29",
    iconId: "nova",
    installLink: "https://www.compassap.ai/portfolio/nova.html",
-    command: ["npx", "-y", "@compass-ai/nova@1.1.59", "acp"],
+    command: ["npx", "-y", "@compass-ai/nova@1.1.29", "acp"],
  },
  {
    id: "poolside",
@@ -335,19 +335,19 @@ const CATALOG_DATA = [
    id: "qoder",
    title: "Qoder CLI",
    description: "AI coding assistant with agentic capabilities",
-    version: "1.1.78",
+    version: "1.1.4",
    iconId: "qoder",
    installLink: "https://qoder.com",
-    command: ["npx", "-y", "@qoder-ai/qodercli@1.1.78", "--acp"],
+    command: ["npx", "-y", "@qoder-ai/qodercli@1.1.4", "--acp"],
  },
  {
    id: "qwen-code",
    title: "Qwen Code",
    description: "Alibaba's Qwen coding assistant",
-    version: "0.26.0",
+    version: "0.20.1",
    iconId: "qwen-code",
    installLink: "https://qwenlm.github.io/qwen-code-docs/en/users/overview",
-    command: ["npx", "-y", "@qwen-code/qwen-code@0.26.0", "--acp", "--experimental-skills"],
+    command: ["npx", "-y", "@qwen-code/qwen-code@0.20.1", "--acp", "--experimental-skills"],
  },
  {
    id: "sigit",
@@ -61,8 +61,8 @@ describe("ACP provider catalog", () => {
  it("offers MiniMax Code through its pinned public ACP package", () => {
    expect(findProvider("minimax-code")).toMatchObject({
      title: "MiniMax Code",
-      version: "0.6.13",
-      command: ["npx", "-y", "@minimax-ai/code@0.6.13", "acp"],
+      version: "0.1.2",
+      command: ["npx", "-y", "@minimax-ai/code@0.1.2", "acp"],
    });
    expect(findProvider("minimax-code").iconSvg).toContain("<svg");
  });
@@ -42,6 +42,7 @@ import {
  saveAppSettings as saveAppSettingsPure,
  type AppSettings,
  type AppSettingsUpdate,
+  type ChatDisplay,
  type OpenInSidePanePreferences,
  type PullRequestOpenLocation,
  type DesktopSettingsBridge,
@@ -84,6 +85,7 @@ export {
 export type {
  AppSettings,
  AppSettingsUpdate,
+  ChatDisplay,
  AppLanguage,
  OpenInSidePanePreferences,
  PullRequestOpenLocation,
@@ -185,6 +185,7 @@ describe("loadAppSettingsFromStorage", () => {

    expect(result).toEqual(DEFAULT_CLIENT_SETTINGS);
    expect(DEFAULT_CLIENT_SETTINGS.language).toBe("system");
+    expect(DEFAULT_CLIENT_SETTINGS.chatDisplay).toBe("collapseTurns");
    expect(JSON.parse(deps.storage.entries.get(APP_SETTINGS_KEY) ?? "null")).toEqual(
      DEFAULT_CLIENT_SETTINGS,
    );
@@ -454,6 +455,7 @@ describe("loadAppSettingsFromStorage", () => {
      ...DEFAULT_CLIENT_SETTINGS,
      theme: "dark",
      contentFontSize: DEFAULT_UI_BASE_FONT_SIZE,
+      chatDisplay: "full",
    });
    expect(JSON.parse(deps.storage.entries.get(APP_SETTINGS_KEY) ?? "null")).toEqual({
      manageBuiltInDaemon: false,
@@ -592,6 +594,7 @@ describe("loadSettingsFromStorage", () => {
      ...DEFAULT_APP_SETTINGS,
      theme: "light",
      contentFontSize: DEFAULT_UI_BASE_FONT_SIZE,
+      chatDisplay: "full",
    });
  });

@@ -636,6 +639,7 @@ describe("loadSettingsFromStorage", () => {
      ...DEFAULT_APP_SETTINGS,
      theme: "light",
      contentFontSize: DEFAULT_UI_BASE_FONT_SIZE,
+      chatDisplay: "full",
      manageBuiltInDaemon: false,
      releaseChannel: "beta",
    });
@@ -657,6 +661,7 @@ describe("loadSettingsFromStorage", () => {
      ...DEFAULT_APP_SETTINGS,
      theme: "light",
      contentFontSize: DEFAULT_UI_BASE_FONT_SIZE,
+      chatDisplay: "full",
    });
  });
 });
@@ -732,7 +737,7 @@ describe("saveAppSettings", () => {
      ...DEFAULT_CLIENT_SETTINGS,
      theme: "light",
      contentFontSize: DEFAULT_UI_BASE_FONT_SIZE,
-      toolCallDetailLevel: "overview",
+      chatDisplay: "collapseToolCalls",
    });
  });

@@ -787,27 +792,45 @@ describe("appearance settings", () => {
    expect(result.contentFontSize).toBe(DEFAULT_UI_BASE_FONT_SIZE);
    expect(result.codeFontSize).toBe(DEFAULT_CODE_FONT_SIZE);
    expect(result.syntaxTheme).toBe("one");
-    expect(result.toolCallDetailLevel).toBe("detailed");
+    expect(result.chatDisplay).toBe("full");
  });

-  it("migrates the enabled compact tool call preference to overview", async () => {
+  it("migrates the enabled compact tool call preference to collapsed tool calls", async () => {
    const deps = makeDeps({
      storage: createInMemoryKeyValueStorage({
        [APP_SETTINGS_KEY]: JSON.stringify({ compactToolCalls: true }),
      }),
    });

-    expect((await loadAppSettingsFromStorage(deps)).toolCallDetailLevel).toBe("overview");
+    expect((await loadAppSettingsFromStorage(deps)).chatDisplay).toBe("collapseToolCalls");
  });

-  it("clears settings with an unrecognized tool call detail level", async () => {
+  it.each([
+    ["overview", "collapseToolCalls"],
+    ["concise", "collapseToolCalls"],
+    ["detailed", "full"],
+    ["unknown", "full"],
+  ])("reads the %s tool call detail level as the %s chat display", async (legacy, display) => {
    const deps = makeDeps({
      storage: createInMemoryKeyValueStorage({
-        [APP_SETTINGS_KEY]: JSON.stringify({ toolCallDetailLevel: "unknown" }),
+        [APP_SETTINGS_KEY]: JSON.stringify({ toolCallDetailLevel: legacy }),
      }),
    });

-    expect((await loadAppSettingsFromStorage(deps)).toolCallDetailLevel).toBe("detailed");
+    expect((await loadAppSettingsFromStorage(deps)).chatDisplay).toBe(display);
+  });
+
+  it("keeps a stored chat display over the tool call detail level it replaced", async () => {
+    const deps = makeDeps({
+      storage: createInMemoryKeyValueStorage({
+        [APP_SETTINGS_KEY]: JSON.stringify({
+          chatDisplay: "collapseTurns",
+          toolCallDetailLevel: "detailed",
+        }),
+      }),
+    });
+
+    expect((await loadAppSettingsFromStorage(deps)).chatDisplay).toBe("collapseTurns");
  });

  it("migrates a switched-off checks row item to the hidden checks display", async () => {
@@ -40,7 +40,8 @@ export type WorkspaceTitleSource = "title" | "branch";
 export type PullRequestOpenLocation = "main" | "side" | "explorer";
 /** What a sidebar workspace row shows in the space to the right of its title. */
 export type SidebarWorkspaceTrailing = "diff" | "timestamp" | "none";
-export type ToolCallDetailLevel = "overview" | "detailed";
+/** How much of an agent's work the chat shows between the user's message and the reply. */
+export type ChatDisplay = "full" | "collapseToolCalls" | "collapseTurns";

 const ThemePreferenceSchema = z.enum([
  ...THEME_OPTIONS.map((option) => option.name),
@@ -100,7 +101,7 @@ export interface AppSettings {
  /** How usage reads and which windows the sidebar summary shows. */
  usage: UsagePreferences;
  autoExpandReasoning: boolean;
-  toolCallDetailLevel: ToolCallDetailLevel;
+  chatDisplay: ChatDisplay;
  chatOutlineEnabled: boolean;
  vimKeybindings: boolean;
  filePanelAssociations: Record<string, string>;
@@ -156,7 +157,7 @@ export const DEFAULT_CLIENT_SETTINGS: AppSettings = {
  sidebarFooterItems: [],
  usage: DEFAULT_USAGE_PREFERENCES,
  autoExpandReasoning: false,
-  toolCallDetailLevel: "detailed",
+  chatDisplay: "collapseTurns",
  chatOutlineEnabled: true,
  vimKeybindings: false,
  filePanelAssociations: {},
@@ -199,6 +200,7 @@ const SidebarRowItemsSchema = z
 type StoredAppSettingsFallback = AppSettings & {
  uiFontSize?: number;
  compactToolCalls?: boolean;
+  toolCallDetailLevel?: "overview" | "detailed";
  manageBuiltInDaemon?: boolean;
  releaseChannel?: ReleaseChannel;
  needsWrite: boolean;
@@ -251,11 +253,13 @@ const StoredAppSettingsSchema = z
    sidebarFooterItems: z.array(z.object({ key: z.string(), visible: z.boolean() })).catch([]),
    usage: UsagePreferencesSchema,
    autoExpandReasoning: z.boolean().catch(false),
+    chatDisplay: z.enum(["full", "collapseToolCalls", "collapseTurns"]).optional().catch("full"),
+    // COMPAT(toolCallDetailLevel): replaced by chatDisplay in v0.13, remove after 2027-04-24.
    toolCallDetailLevel: z
      .enum(["overview", "detailed"])
      .or(z.literal("concise").transform(() => "overview" as const))
      .optional()
-      .catch("detailed"),
+      .catch(undefined),
    // COMPAT(compactToolCalls): migrated in v0.1.105, remove after 2027-01-12.
    compactToolCalls: z.boolean().optional().catch(undefined),
    chatOutlineEnabled: z.boolean().catch(true),
@@ -305,8 +309,10 @@ const StoredAppSettingsSchema = z
      (isChecksHiddenByLegacyRowItem(stored.sidebarRowItems)
        ? "none"
        : DEFAULT_SIDEBAR_CHECKS_DISPLAY);
-    const toolCallDetailLevel =
-      stored.toolCallDetailLevel ?? (stored.compactToolCalls ? "overview" : "detailed");
+    const groupsToolCalls = stored.toolCallDetailLevel
+      ? stored.toolCallDetailLevel === "overview"
+      : stored.compactToolCalls === true;
+    const chatDisplay = stored.chatDisplay ?? (groupsToolCalls ? "collapseToolCalls" : "full");
    return {
      ...stored,
      openInSidePane,
@@ -321,7 +327,7 @@ const StoredAppSettingsSchema = z
          stored.sidebarRowItems.services ??
          (stored.sidebarRowItems.scripts === false ? false : DEFAULT_SIDEBAR_ROW_ITEMS.services),
      },
-      toolCallDetailLevel,
+      chatDisplay,
      needsWrite,
    };
  })
@@ -449,6 +455,7 @@ export function normalizeAppSettings(value: unknown): AppSettings {
    manageBuiltInDaemon: _manageBuiltInDaemon,
    releaseChannel: _releaseChannel,
    compactToolCalls: _compactToolCalls,
+    toolCallDetailLevel: _toolCallDetailLevel,
    uiFontSize: _uiFontSize,
    ...settings
  } = StoredAppSettingsSchema.parse(value);
@@ -2008,6 +2008,12 @@ export const ar: TranslationResources = {
    input: "مدخل",
    output: "الإخراج",
  },
+  turnSummary: {
+    messages: {
+      one: "كتب {{count}} رسالة",
+      other: "كتب {{count}} رسائل",
+    },
+  },
  toolCallGroup: {
    editedFiles: {
      one: "حرّر {{count}} ملفًا",
@@ -2312,12 +2318,13 @@ export const ar: TranslationResources = {
        label: "عرض التفكير دائماً",
        description: "إظهار تفكير الوكيل وخطوات الاستدلال بشكل كامل بشكل افتراضي",
      },
-      toolCallDetail: {
-        label: "عرض استدعاءات الأدوات",
-        description: "كيفية ظهور استدعاءات الأدوات في المخطط الزمني",
+      chatDisplay: {
+        label: "عرض المحادثة",
+        description: "مقدار عمل الوكيل الذي تعرضه المحادثة",
        options: {
-          overview: "ملخص",
-          detailed: "التفاصيل الكاملة",
+          full: "كامل",
+          collapseToolCalls: "طيّ استدعاءات الأدوات",
+          collapseTurns: "طيّ الأدوار",
        },
      },
      language: {
@@ -2033,6 +2033,12 @@ export const en = {
    input: "Input",
    output: "Output",
  },
+  turnSummary: {
+    messages: {
+      one: "wrote {{count}} message",
+      other: "wrote {{count}} messages",
+    },
+  },
  toolCallGroup: {
    editedFiles: {
      one: "edited {{count}} file",
@@ -2400,12 +2406,13 @@ export const en = {
        label: "Always expand reasoning",
        description: "Show agent thinking and chain-of-thought blocks fully expanded by default",
      },
-      toolCallDetail: {
-        label: "Tool call display",
-        description: "How tool calls appear in the timeline",
+      chatDisplay: {
+        label: "Chat display",
+        description: "How much of an agent's work the chat shows",
        options: {
-          overview: "Summary",
-          detailed: "Full detail",
+          full: "Full",
+          collapseToolCalls: "Collapse tool calls",
+          collapseTurns: "Collapse turns",
        },
      },
      language: {
@@ -2056,6 +2056,12 @@ export const es: TranslationResources = {
    input: "Aporte",
    output: "Producción",
  },
+  turnSummary: {
+    messages: {
+      one: "escribió {{count}} mensaje",
+      other: "escribió {{count}} mensajes",
+    },
+  },
  toolCallGroup: {
    editedFiles: {
      one: "editó {{count}} archivo",
@@ -2328,12 +2334,13 @@ export const es: TranslationResources = {
        description:
          "Mostrar los bloques de pensamiento y razonamiento del agente totalmente expandidos de forma predeterminada",
      },
-      toolCallDetail: {
-        label: "Visualización de llamadas a herramientas",
-        description: "Cómo aparecen las llamadas a herramientas en la cronología",
+      chatDisplay: {
+        label: "Visualización del chat",
+        description: "Cuánto del trabajo del agente muestra el chat",
        options: {
-          overview: "Resumen",
-          detailed: "Detalle completo",
+          full: "Completo",
+          collapseToolCalls: "Contraer llamadas a herramientas",
+          collapseTurns: "Contraer turnos",
        },
      },
      language: {
@@ -2055,6 +2055,12 @@ export const fr: TranslationResources = {
    input: "Entrée",
    output: "Sortie",
  },
+  turnSummary: {
+    messages: {
+      one: "{{count}} message écrit",
+      other: "{{count}} messages écrits",
+    },
+  },
  toolCallGroup: {
    editedFiles: {
      one: "{{count}} fichier modifié",
@@ -2326,12 +2332,13 @@ export const fr: TranslationResources = {
        label: "Toujours afficher le raisonnement",
        description: "Afficher par défaut le raisonnement de l’agent entièrement déplié",
      },
-      toolCallDetail: {
-        label: "Affichage des appels d’outils",
-        description: "Comment les appels d’outils apparaissent dans la chronologie",
+      chatDisplay: {
+        label: "Affichage du chat",
+        description: "La part du travail de l’agent affichée dans le chat",
        options: {
-          overview: "Résumé",
-          detailed: "Détails complets",
+          full: "Complet",
+          collapseToolCalls: "Réduire les appels d’outils",
+          collapseTurns: "Réduire les tours",
        },
      },
      language: {
@@ -2028,6 +2028,12 @@ export const ja: TranslationResources = {
    input: "入力",
    output: "出力",
  },
+  turnSummary: {
+    messages: {
+      one: "{{count}}件のメッセージを送信",
+      other: "{{count}}件のメッセージを送信",
+    },
+  },
  toolCallGroup: {
    editedFiles: {
      one: "{{count}}個のファイルを編集",
@@ -2296,12 +2302,13 @@ export const ja: TranslationResources = {
        label: "常に思考プロセスを展開",
        description: "デフォルトでAIのエージェント思考・推論ブロックを完全に展開して表示します",
      },
-      toolCallDetail: {
-        label: "ツール呼び出しの表示",
-        description: "タイムラインでのツール呼び出しの表示方法",
+      chatDisplay: {
+        label: "チャットの表示",
+        description: "チャットに表示するエージェントの作業量",
        options: {
-          overview: "要約",
-          detailed: "すべての詳細",
+          full: "すべて",
+          collapseToolCalls: "ツール呼び出しを折りたたむ",
+          collapseTurns: "ターンを折りたたむ",
        },
      },
      language: {
@@ -2018,6 +2018,12 @@ export const ko: TranslationResources = {
    input: "입력",
    output: "출력",
  },
+  turnSummary: {
+    messages: {
+      one: "{{count}} 메시지를 작성했습니다.",
+      other: "{{count}} 메시지를 작성했습니다.",
+    },
+  },
  toolCallGroup: {
    editedFiles: {
      one: "{{count}} 파일을 편집했습니다.",
@@ -2287,12 +2293,13 @@ export const ko: TranslationResources = {
        label: "추론 항상 펼치기",
        description: "에이전트의 사고 및 추론 블록을 기본적으로 모두 펼쳐 표시합니다.",
      },
-      toolCallDetail: {
-        label: "도구 호출 표시",
-        description: "타임라인에 도구 호출이 표시되는 방식",
+      chatDisplay: {
+        label: "채팅 표시",
+        description: "채팅에 표시할 에이전트 작업의 양",
        options: {
-          overview: "요약",
-          detailed: "전체 세부정보",
+          full: "전체",
+          collapseToolCalls: "도구 호출 접기",
+          collapseTurns: "턴 접기",
        },
      },
      language: {
@@ -2041,6 +2041,12 @@ export const ptBR: TranslationResources = {
    input: "Entrada",
    output: "Saída",
  },
+  turnSummary: {
+    messages: {
+      one: "escreveu {{count}} mensagem",
+      other: "escreveu {{count}} mensagens",
+    },
+  },
  toolCallGroup: {
    editedFiles: {
      one: "editou {{count}} arquivo",
@@ -2311,12 +2317,13 @@ export const ptBR: TranslationResources = {
        description:
          "Mostrar os blocos de pensamento e raciocínio do agente totalmente expandidos por padrão",
      },
-      toolCallDetail: {
-        label: "Exibição de chamadas de ferramentas",
-        description: "Como as chamadas de ferramentas aparecem na linha do tempo",
+      chatDisplay: {
+        label: "Exibição do chat",
+        description: "Quanto do trabalho do agente o chat mostra",
        options: {
-          overview: "Resumo",
-          detailed: "Detalhes completos",
+          full: "Completo",
+          collapseToolCalls: "Recolher chamadas de ferramentas",
+          collapseTurns: "Recolher turnos",
        },
      },
      language: {
@@ -2041,6 +2041,12 @@ export const ru: TranslationResources = {
    input: "Входные данные",
    output: "Выходные данные",
  },
+  turnSummary: {
+    messages: {
+      one: "написано {{count}} сообщение",
+      other: "написаны сообщения ({{count}})",
+    },
+  },
  toolCallGroup: {
    editedFiles: {
      one: "изменён {{count}} файл",
@@ -2313,12 +2319,13 @@ export const ru: TranslationResources = {
        description:
          "По умолчанию полностью разворачивать блоки размышлений и хода рассуждений агента",
      },
-      toolCallDetail: {
-        label: "Отображение вызовов инструментов",
-        description: "Как вызовы инструментов отображаются на временной шкале",
+      chatDisplay: {
+        label: "Отображение чата",
+        description: "Какую часть работы агента показывает чат",
        options: {
-          overview: "Сводка",
-          detailed: "Все подробности",
+          full: "Полностью",
+          collapseToolCalls: "Сворачивать вызовы инструментов",
+          collapseTurns: "Сворачивать ходы",
        },
      },
      language: {
@@ -1986,6 +1986,12 @@ export const zhCN: TranslationResources = {
    input: "输入",
    output: "输出",
  },
+  turnSummary: {
+    messages: {
+      one: "写了 {{count}} 条消息",
+      other: "写了 {{count}} 条消息",
+    },
+  },
  toolCallGroup: {
    editedFiles: {
      one: "编辑了 {{count}} 个文件",
@@ -2251,12 +2257,13 @@ export const zhCN: TranslationResources = {
        label: "始终展开推理过程",
        description: "默认情况下完全展开 AI 的思考和推理过程",
      },
-      toolCallDetail: {
-        label: "工具调用显示",
-        description: "工具调用在时间线中的显示方式",
+      chatDisplay: {
+        label: "聊天显示",
+        description: "聊天中显示多少智能体的工作",
        options: {
-          overview: "摘要",
-          detailed: "完整详情",
+          full: "完整",
+          collapseToolCalls: "折叠工具调用",
+          collapseTurns: "折叠轮次",
        },
      },
      language: {
@@ -1,5 +1,4 @@
 import { describe, expect, it } from "vitest";
-import { useRevealedText } from "@/hooks/use-revealed-text";
 import { runPluginClientBundle, type PluginClientRuntime } from "./evaluate";

 const runtime = {
@@ -706,21 +705,6 @@ describe("evaluatePluginClientBundle", () => {
    expect(plugin.surfaces.map((surface) => surface.id)).toEqual(["main"]);
  });

-  it("keeps the host reveal hook on the deprecated client/react-native entry", () => {
-    const plugin = evaluatePluginClientBundle(
-      "legacy-reveal",
-      bundle(`
-        const legacy = require("@getpaseo/plugin/client/react-native");
-        const ui = require("@getpaseo/plugin/client/ui");
-        if (typeof legacy.useRevealedText !== "function") throw new Error("Missing legacy reveal hook");
-        if (legacy.StreamedText !== ui.StreamedText) throw new Error("Missing current UI exports");
-        if ("useRevealedText" in ui) throw new Error("Legacy hook leaked into current UI");
-        plugin.addScreen({ id: "reveal", title: "Reveal", Component: legacy.useRevealedText });
-      `),
-    );
-    expect(plugin.surfaces[0]?.Component).toBe(useRevealedText);
-  });
-
  it("keeps shared and client runtime exports separate", () => {
    expect(() =>
      evaluatePluginClientBundle(
@@ -2,7 +2,6 @@ import { requirePluginText } from "@getpaseo/plugin/client/host";
 import type { createPluginHosts } from "./hosts";
 import { openExternalUrl } from "@/utils/open-external-url";
 import * as pluginUiRuntime from "./react-native/ui";
-import { useRevealedText } from "@/hooks/use-revealed-text";
 import { useSettings } from "./settings/use-settings";
 import * as pluginSharedRuntime from "@getpaseo/plugin";
 import * as pluginClientRuntime from "@getpaseo/plugin/client";
@@ -115,10 +114,6 @@ export type PluginClientRuntime = Pick<
  | "addHeaderButton"
 > & { hosts: ReturnType<typeof createPluginHosts> };

-// COMPAT(pluginReactNativeEntrypoint): added in v0.13.0, remove after 2027-04-20
-// The 0.12 entry exposed the reveal hook as well as UI components.
-const pluginReactNativeCompatRuntime = { ...pluginUiRuntime, useRevealedText };
-
 export function runPluginClientBundle(
  id: string,
  bundle: string,
@@ -508,7 +503,7 @@ export function runPluginClientBundle(
  };
  const runtimeRequire = (name: string): unknown => {
    // COMPAT(pluginReactNativeEntrypoint): added in v0.13.0, remove after 2027-04-20
-    if (name === "@getpaseo/plugin/client/react-native") return pluginReactNativeCompatRuntime;
+    if (name === "@getpaseo/plugin/client/react-native") return pluginUiRuntime;
    if (name === "@getpaseo/plugin/client/ui") return pluginUiRuntime;
    if (name === "react") return React;
    if (name === "react/jsx-runtime") return ReactJsxRuntime;
@@ -8,29 +8,25 @@ import {
  SettingsSwitch,
 } from "@/components/settings";
 import { isNative } from "@/constants/platform";
-import { useAppSettings, type AppSettings } from "@/hooks/use-settings";
+import { useAppSettings, type ChatDisplay } from "@/hooks/use-settings";

-const TOOL_CALL_DETAIL_LEVELS: readonly AppSettings["toolCallDetailLevel"][] = [
-  "detailed",
-  "overview",
-];
+const CHAT_DISPLAYS: readonly ChatDisplay[] = ["full", "collapseToolCalls", "collapseTurns"];

 export function ChatSection() {
  const { t } = useTranslation();
  const { settings, updateSettings } = useAppSettings();

-  const toolCallDetailOptions = useMemo(
+  const chatDisplayOptions = useMemo(
    () =>
-      TOOL_CALL_DETAIL_LEVELS.map((value) => ({
+      CHAT_DISPLAYS.map((value) => ({
        value,
-        label: t(`settings.general.toolCallDetail.options.${value}`),
+        label: t(`settings.general.chatDisplay.options.${value}`),
      })),
    [t],
  );

-  const changeToolCallDetailLevel = useCallback(
-    (toolCallDetailLevel: AppSettings["toolCallDetailLevel"]) =>
-      void updateSettings({ toolCallDetailLevel }),
+  const changeChatDisplay = useCallback(
+    (chatDisplay: ChatDisplay) => void updateSettings({ chatDisplay }),
    [updateSettings],
  );
  const changeAutoExpandReasoning = useCallback(
@@ -53,11 +49,11 @@ export function ChatSection() {
            onValueChange={changeAutoExpandReasoning}
          />
          <SettingsSelect
-            label={t("settings.general.toolCallDetail.label")}
-            hint={t("settings.general.toolCallDetail.description")}
-            value={settings.toolCallDetailLevel}
-            options={toolCallDetailOptions}
-            onValueChange={changeToolCallDetailLevel}
+            label={t("settings.general.chatDisplay.label")}
+            hint={t("settings.general.chatDisplay.description")}
+            value={settings.chatDisplay}
+            options={chatDisplayOptions}
+            onValueChange={changeChatDisplay}
          />
          {isNative ? null : (
            <SettingsSwitch
@@ -0,0 +1,45 @@
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import type { OverviewSummary } from "./model";
+
+function joinSummaryParts(parts: string[], conjunction: string): string {
+  if (parts.length === 0) {
+    return "";
+  }
+  let joined = parts[0] ?? "";
+  if (parts.length === 2) {
+    joined = `${parts[0]} ${conjunction} ${parts[1]}`;
+  } else if (parts.length > 2) {
+    joined = `${parts.slice(0, -1).join(", ")}, ${conjunction} ${parts.at(-1)}`;
+  }
+  const firstCharacter = joined[0];
+  return firstCharacter ? `${firstCharacter.toLocaleUpperCase()}${joined.slice(1)}` : joined;
+}
+
+/**
+ * One sentence of what a stretch of agent work did, such as "Edited 2 files and ran 3 commands".
+ * Leading parts come first, for summaries that count more than tool calls.
+ */
+export function useOverviewSummaryLabel(
+  summary: OverviewSummary,
+  leadingParts: readonly string[] = [],
+): string {
+  const { t } = useTranslation();
+  return useMemo(() => {
+    const parts = [...leadingParts];
+    const entries = [
+      [summary.editedFileCount, "toolCallGroup.editedFiles"],
+      [summary.commandCount, "toolCallGroup.commands"],
+      [summary.readFileCount, "toolCallGroup.readFiles"],
+      [summary.searchCount, "toolCallGroup.searches"],
+      [summary.otherToolCount, "toolCallGroup.otherTools"],
+      [summary.paseoCallCount, "toolCallGroup.paseoCalls"],
+    ] as const;
+    for (const [count, key] of entries) {
+      if (count > 0) {
+        parts.push(t(`${key}.${count === 1 ? "one" : "other"}`, { count }));
+      }
+    }
+    return joinSummaryParts(parts, t("toolCallGroup.and"));
+  }, [leadingParts, summary, t]);
+}
@@ -1,4 +1,5 @@
 import { isPaseoToolName } from "@getpaseo/protocol/tool-name-normalization";
+import type { ToolCallItem } from "@/types/stream";
 import { describeToolCall, type ToolCallRun } from "../grouping";

 const DIRECT_PASEO_TOOL_PREFIX = "paseo_";
@@ -28,19 +29,18 @@ function isSearchCall(name: string): boolean {
  return DIRECT_SEARCH_TOOL_SUFFIX_PATTERN.test(name);
 }

-export function buildOverviewGroup(run: ToolCallRun): OverviewToolCallGroup {
+/** Counts tool calls by what they did, for any summary of a stretch of agent work. */
+export function summarizeToolCalls(calls: readonly ToolCallItem[]): OverviewSummary {
  const editedFiles = new Set<string>();
  const readFiles = new Set<string>();
-  let isLoading = false;
  let commandCount = 0;
  let searchCount = 0;
  let otherToolCount = 0;
  let paseoCallCount = 0;

-  for (const call of run.calls) {
+  for (const call of calls) {
    const descriptor = describeToolCall(call);
    const normalizedName = descriptor.name.trim().toLowerCase();
-    isLoading ||= descriptor.status === "running" || descriptor.status === "executing";
    if (isPaseoCall(descriptor.name, normalizedName)) {
      paseoCallCount += 1;
    } else if (descriptor.detail.type === "edit" || descriptor.detail.type === "write") {
@@ -56,7 +56,7 @@ export function buildOverviewGroup(run: ToolCallRun): OverviewToolCallGroup {
    }
  }

-  const summary = {
+  return {
    editedFileCount: editedFiles.size,
    commandCount,
    readFileCount: readFiles.size,
@@ -64,10 +64,17 @@ export function buildOverviewGroup(run: ToolCallRun): OverviewToolCallGroup {
    otherToolCount,
    paseoCallCount,
  };
+}
+
+export function buildOverviewGroup(run: ToolCallRun): OverviewToolCallGroup {
+  const isLoading = run.calls.some((call) => {
+    const status = describeToolCall(call).status;
+    return status === "running" || status === "executing";
+  });
  return {
    mode: "overview",
    run,
    isLoading,
-    summary,
+    summary: summarizeToolCalls(run.calls),
  };
 }
@@ -1,11 +1,12 @@
-import React, { memo, useCallback, useMemo, useRef, type ReactNode } from "react";
+import React, { memo, useCallback, useRef, type ReactNode } from "react";
 import { ScrollView } from "react-native";
-import { useTranslation } from "react-i18next";
 import { Wrench } from "lucide-react-native";
 import { StyleSheet } from "react-native-unistyles";
+import { IndentRail } from "@/components/indent-rail";
 import { ExpandableBadge } from "@/components/message";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { type OverviewSummary, type OverviewToolCallGroup } from "./model";
+import { useOverviewSummaryLabel } from "./label";
+import type { OverviewToolCallGroup } from "./model";
 import { OverviewToolCallGroupSheet } from "./sheet";

 interface OverviewGroupProps {
@@ -18,41 +19,6 @@ interface OverviewGroupProps {

 const TOOL_CALL_GROUP_MAX_HEIGHT = 400;

-function joinSummaryParts(parts: string[], conjunction: string): string {
-  if (parts.length === 0) {
-    return "";
-  }
-  let joined = parts[0] ?? "";
-  if (parts.length === 2) {
-    joined = `${parts[0]} ${conjunction} ${parts[1]}`;
-  } else if (parts.length > 2) {
-    joined = `${parts.slice(0, -1).join(", ")}, ${conjunction} ${parts.at(-1)}`;
-  }
-  const firstCharacter = joined[0];
-  return firstCharacter ? `${firstCharacter.toLocaleUpperCase()}${joined.slice(1)}` : joined;
-}
-
-function useOverviewSummary(summary: OverviewSummary): string {
-  const { t } = useTranslation();
-  return useMemo(() => {
-    const parts: string[] = [];
-    const entries = [
-      [summary.editedFileCount, "toolCallGroup.editedFiles"],
-      [summary.commandCount, "toolCallGroup.commands"],
-      [summary.readFileCount, "toolCallGroup.readFiles"],
-      [summary.searchCount, "toolCallGroup.searches"],
-      [summary.otherToolCount, "toolCallGroup.otherTools"],
-      [summary.paseoCallCount, "toolCallGroup.paseoCalls"],
-    ] as const;
-    for (const [count, key] of entries) {
-      if (count > 0) {
-        parts.push(t(`${key}.${count === 1 ? "one" : "other"}`, { count }));
-      }
-    }
-    return joinSummaryParts(parts, t("toolCallGroup.and"));
-  }, [summary, t]);
-}
-
 export const OverviewToolCallGroupView = memo(function OverviewToolCallGroupView({
  group,
  expanded,
@@ -62,7 +28,7 @@ export const OverviewToolCallGroupView = memo(function OverviewToolCallGroupView
 }: OverviewGroupProps) {
  const scrollRef = useRef<ScrollView>(null);
  const isCompact = useIsCompactFormFactor();
-  const aggregateSummary = useOverviewSummary(group.summary);
+  const aggregateSummary = useOverviewSummaryLabel(group.summary);
  const scrollToLatest = useCallback(() => {
    scrollRef.current?.scrollToEnd({ animated: false });
  }, []);
@@ -82,7 +48,7 @@ export const OverviewToolCallGroupView = memo(function OverviewToolCallGroupView
        showsVerticalScrollIndicator
        onContentSizeChange={scrollToLatest}
      >
-        {children}
+        <IndentRail>{children}</IndentRail>
      </ScrollView>
    ),
    [children, scrollToLatest],
@@ -1,5 +1,4 @@
 import type { StreamItem } from "@/types/stream";
-import type { ToolCallDetailLevel } from "@/hooks/use-settings/storage";
 import {
  groupLiveToolCalls,
  prepareGroupedHistory,
@@ -8,7 +7,8 @@ import {
 } from "./grouping";
 import { buildOverviewGroup, type OverviewToolCallGroup } from "./overview/model";

-export type { ToolCallDetailLevel } from "@/hooks/use-settings/storage";
+/** Whether consecutive tool calls show one by one or as one summary row. */
+export type ToolCallDetailLevel = "overview" | "detailed";
 export type ToolCallDetailGroup = OverviewToolCallGroup;

 export interface PreparedToolCallHistory {
@@ -771,6 +771,12 @@ export type AgentToolCallItem = ToolCallItem & {
  payload: { source: "agent"; data: AgentToolCallData };
 };

+/** Find and scrolling address a plugin row by the source it replaces. */
+export function getStreamItemMessageId(item: StreamItem): string {
+  if (item.kind === "plugin") return item.sourceId ?? item.id;
+  return item.id;
+}
+
 export function isAgentToolCallItem(item: StreamItem): item is AgentToolCallItem {
  return item.kind === "tool_call" && item.payload.source === "agent";
 }
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/cli",
-  "version": "0.13.0",
+  "version": "0.13.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.13.0",
-    "@getpaseo/protocol": "0.13.0",
-    "@getpaseo/server": "0.13.0",
+    "@getpaseo/client": "0.13.0-beta.2",
+    "@getpaseo/protocol": "0.13.0-beta.2",
+    "@getpaseo/server": "0.13.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.13.0",
+  "version": "0.13.0-beta.2",
  "description": "Paseo client SDK package",
  "files": [
    "dist",
@@ -47,8 +47,8 @@
    "test": "vitest run"
  },
  "dependencies": {
-    "@getpaseo/protocol": "0.13.0",
-    "@getpaseo/relay": "0.13.0",
+    "@getpaseo/protocol": "0.13.0-beta.2",
+    "@getpaseo/relay": "0.13.0-beta.2",
    "ws": "^8.20.0",
    "zod": "^4.4.3"
  },
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/desktop",
-  "version": "0.13.0",
+  "version": "0.13.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.13.0",
+  "version": "0.13.0-beta.2",
  "description": "Native module for two way audio streaming",
  "keywords": [
    "ExpoTwoWayAudio",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/highlight",
-  "version": "0.13.0",
+  "version": "0.13.0-beta.2",
  "files": [
    "dist",
    "!dist/**/*.map",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/plugin",
-  "version": "0.13.0",
+  "version": "0.13.0-beta.2",
  "description": "Paseo plugin SDK package",
  "files": [
    "dist",
@@ -72,8 +72,8 @@
    "use-sync-external-store": "^1.6.0"
  },
  "devDependencies": {
-    "@getpaseo/client": "0.13.0",
-    "@getpaseo/protocol": "0.13.0",
+    "@getpaseo/client": "0.13.0-beta.2",
+    "@getpaseo/protocol": "0.13.0-beta.2",
    "@types/node": "^20.9.0",
    "@types/react": "~19.2.0",
    "react": "19.2.3",
@@ -83,8 +83,8 @@
    "zod": "^4.4.3"
  },
  "peerDependencies": {
-    "@getpaseo/client": "0.13.0",
-    "@getpaseo/protocol": "0.13.0",
+    "@getpaseo/client": "0.13.0-beta.2",
+    "@getpaseo/protocol": "0.13.0-beta.2",
    "react": ">=19.1.0 <20",
    "react-native": ">=0.81.5",
    "zod": "^4.4.3"
@@ -101,29 +101,12 @@ describe("plugin SDK import boundaries", () => {
    );
  });

-  it.each(compatibilityEntries)("%s respects the client boundary", (entry) => {
-    expect(
-      boundaryViolations(
-        path.resolve(sourceDirectory, "..", manifest.exports[entry].source),
-        "client",
-      ),
-    ).toEqual([]);
-  });
-
-  it("typechecks a 0.12 reveal-hook consumer without exposing the hook on current UI", () => {
-    expect(
-      typeErrors(`
-      import { useRevealedText, Icon } from "@getpaseo/plugin/client/react-native";
-      import { StreamedText } from "@getpaseo/plugin/client/ui";
-      // @ts-expect-error the legacy hook is not part of the current UI API
-      import { useRevealedText as currentHook } from "@getpaseo/plugin/client/ui";
-      import { Text } from "react-native";
-      function LegacyRow({ text, phase }: { text: string; phase: "streaming" | "complete" }) {
-        const revealed: string = useRevealedText(text, phase);
-        return <Text>{revealed}</Text>;
-      }
-    `),
-    ).toEqual([]);
+  it.each(compatibilityEntries)("%s only re-exports the UI entry", (entry) => {
+    const source = readFileSync(
+      path.resolve(sourceDirectory, "..", manifest.exports[entry].source),
+      "utf8",
+    );
+    expect(source.replace(/\/\/[^\n]*|\/\*[^]*?\*\//g, "").trim()).toBe('export * from "./ui.js";');
  });

  it.each(Object.entries(entries))(
@@ -1,6 +1,3 @@
 // COMPAT(pluginReactNativeEntrypoint): added in v0.13.0, remove after 2027-04-20
 /** @deprecated Import Paseo UI from @getpaseo/plugin/client/ui. */
 export * from "./ui.js";
-
-/** @deprecated Render StreamedText from @getpaseo/plugin/client/ui. Removed after 2027-04-20 with this entry. */
-export declare function useRevealedText(text: string, phase: "streaming" | "complete"): string;
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/protocol",
-  "version": "0.13.0",
+  "version": "0.13.0-beta.2",
  "description": "Paseo shared protocol schemas and wire types",
  "files": [
    "dist",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/relay",
-  "version": "0.13.0",
+  "version": "0.13.0-beta.2",
  "description": "Paseo relay for bridging daemon and client connections",
  "files": [
    "dist",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/server",
-  "version": "0.13.0",
+  "version": "0.13.0-beta.2",
  "description": "Paseo backend server",
  "files": [
    "dist/server",
@@ -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.13.0",
-    "@getpaseo/highlight": "0.13.0",
-    "@getpaseo/plugin": "0.13.0",
-    "@getpaseo/protocol": "0.13.0",
-    "@getpaseo/relay": "0.13.0",
+    "@getpaseo/client": "0.13.0-beta.2",
+    "@getpaseo/highlight": "0.13.0-beta.2",
+    "@getpaseo/plugin": "0.13.0-beta.2",
+    "@getpaseo/protocol": "0.13.0-beta.2",
+    "@getpaseo/relay": "0.13.0-beta.2",
    "@isaacs/ttlcache": "^2.1.4",
    "@modelcontextprotocol/sdk": "1.29.0",
    "@opencode-ai/sdk": "1.14.46",
@@ -1,4 +1,4 @@
-import fs, { chmodSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { chmodSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import pino from "pino";
@@ -7,9 +7,6 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import { ClaudeAgentClient } from "./agent.js";
 import { claudeProjectDirSync } from "./project-dir.js";
 import { withClaudeReplayHistory } from "./transcript-history.js";
-import type { AgentSession, AgentStreamEvent } from "../../agent-sdk-types.js";
-import type { ClaudeQueryFactory } from "./query.js";
-import { collectSessionTurnEvents } from "../test-utils/session-stream-adapter.js";

 /**
 * A resumed Claude agent whose transcript is missing or unreadable opens with an empty timeline.
@@ -32,18 +29,19 @@ describe("ClaudeAgentSession persisted history load", () => {
  let configDir: string;
  let records: LogRecord[];

-  async function resume(queryFactory?: ClaudeQueryFactory): Promise<AgentSession> {
+  async function resume(): Promise<void> {
    const client = new ClaudeAgentClient({
      logger: pino({ level: "info" }, { write: (line: string) => records.push(JSON.parse(line)) }),
-      queryFactory:
-        queryFactory ??
-        (() => {
-          throw new Error("history load must not start a query");
-        }),
-      resolveBinary: async () => process.execPath,
+      queryFactory: vi.fn(() => {
+        throw new Error("history load must not start a query");
+      }),
      resolveVersion: async () => "2.1.220",
    });
-    return client.resumeSession({ provider: "claude", sessionId: SESSION_ID }, { cwd });
+    const session = await client.resumeSession(
+      { provider: "claude", sessionId: SESSION_ID },
+      { cwd },
+    );
+    await session.close();
  }

  function transcriptPath(): string {
@@ -60,218 +58,12 @@ describe("ClaudeAgentSession persisted history load", () => {
  });

  afterEach(() => {
-    vi.restoreAllMocks();
    vi.unstubAllEnvs();
    rmSync(tempRoot, { recursive: true, force: true });
  });

-  test.each(["file_path", "files"])(
-    "replays %s without probing targets and preserves live existence checks",
-    async (field) => {
-      const existingPath = path.join(cwd, "existing.txt");
-      const missingPath = path.join(cwd, "missing.txt");
-      writeFileSync(existingPath, "existing");
-      const targets = [existingPath, missingPath];
-      const inputs = targets.map((target) => ({
-        [field]: field === "files" ? [target] : target,
-      }));
-      const toolBlocks = inputs.map((input, index) => ({
-        type: "tool_use",
-        id: `change-${index}`,
-        name: "FileChange",
-        input,
-      }));
-      const resultBlocks = toolBlocks.map((block) => ({
-        type: "tool_result",
-        tool_use_id: block.id,
-        content: "done",
-      }));
-      const transcript = [
-        { type: "user", message: { content: "Change files" } },
-        { type: "assistant", message: { content: toolBlocks } },
-        { type: "user", message: { content: resultBlocks } },
-        { type: "assistant", message: { content: "Finished" } },
-      ];
-      mkdirSync(path.dirname(transcriptPath()), { recursive: true });
-      writeFileSync(transcriptPath(), transcript.map((entry) => JSON.stringify(entry)).join("\n"));
-
-      // Observe the real filesystem calls; neither existing nor missing targets are mocked.
-      const exists = vi.spyOn(fs, "existsSync");
-      const liveMessages = [
-        { type: "assistant", message: { content: toolBlocks } },
-        { type: "user", message: { content: resultBlocks } },
-        { type: "result", subtype: "success", total_cost_usd: 0 },
-      ];
-      const queryFactory = vi.fn();
-      queryFactory.mockReturnValue({
-        async next() {
-          const value = liveMessages.shift();
-          return value ? { done: false, value } : { done: true, value: undefined };
-        },
-        close() {},
-        async return() {
-          return { done: true, value: undefined };
-        },
-        async supportedCommands() {
-          return [];
-        },
-        [Symbol.asyncIterator]() {
-          return this;
-        },
-      });
-      const session = await resume(queryFactory);
-      try {
-        const history: AgentStreamEvent[] = [];
-        for await (const event of session.streamHistory()) history.push(event);
-        expect(exists.mock.calls.filter(([target]) => targets.includes(String(target)))).toEqual(
-          [],
-        );
-        const running = inputs.map((input, index) => ({
-          type: "tool_call",
-          callId: `change-${index}`,
-          name: "FileChange",
-          status: "running",
-          error: null,
-          detail: { type: "unknown", input, output: null },
-        }));
-        const completed = inputs.map((input, index) => ({
-          type: "tool_call",
-          callId: `change-${index}`,
-          name: "FileChange",
-          status: "completed",
-          error: null,
-          detail: {
-            type: "unknown",
-            input,
-            output: {
-              output: "done",
-              files: [{ path: index === 0 ? "existing.txt" : "missing.txt", kind: "update" }],
-            },
-          },
-        }));
-        expect(history).toEqual(
-          [
-            { type: "user_message", text: "Change files" },
-            ...running,
-            ...completed,
-            { type: "assistant_message", text: "Finished" },
-          ].map((item) => ({ type: "timeline", provider: "claude", timestamp: undefined, item })),
-        );
-
-        exists.mockClear();
-        const live = await collectSessionTurnEvents(session, "Change files again");
-        expect(exists.mock.calls.filter(([target]) => targets.includes(String(target)))).toEqual([
-          [existingPath],
-          [missingPath],
-        ]);
-        const liveCompleted = live.flatMap((event) =>
-          event.type === "timeline" &&
-          event.item.type === "tool_call" &&
-          event.item.status === "completed"
-            ? [event.item]
-            : [],
-        );
-        const missing = completed[1];
-        expect(liveCompleted).toEqual([
-          completed[0],
-          {
-            ...missing,
-            detail: {
-              ...missing.detail,
-              output: { output: "done", files: [{ path: "missing.txt", kind: "add" }] },
-            },
-          },
-        ]);
-      } finally {
-        await session.close();
-      }
-    },
-  );
-
-  test.each(["parent", "subagent"])(
-    "replays %s Write and Edit calls without probing their targets",
-    async (scope) => {
-      const filePath = path.join(cwd, "unavailable", "file.txt");
-      const content = ["Write", "Edit"].map((name) => ({
-        type: "tool_use",
-        id: name,
-        name,
-        input: { file_path: filePath },
-      }));
-      const entry = { type: "assistant", message: { content } };
-      mkdirSync(path.dirname(transcriptPath()), { recursive: true });
-      if (scope === "subagent") {
-        const directory = path.join(path.dirname(transcriptPath()), SESSION_ID, "subagents");
-        mkdirSync(directory, { recursive: true });
-        writeFileSync(
-          path.join(directory, "agent-child.meta.json"),
-          JSON.stringify({ toolUseId: "task" }),
-        );
-        writeFileSync(
-          path.join(directory, "agent-child.jsonl"),
-          JSON.stringify({
-            ...entry,
-            isSidechain: true,
-            agentId: "child",
-          }),
-        );
-        writeFileSync(
-          transcriptPath(),
-          JSON.stringify({
-            type: "assistant",
-            message: {
-              content: [
-                {
-                  type: "tool_use",
-                  id: "task",
-                  name: "Task",
-                  input: { description: "Change files" },
-                },
-              ],
-            },
-          }),
-        );
-      } else {
-        writeFileSync(transcriptPath(), JSON.stringify(entry));
-      }
-
-      const exists = vi.spyOn(fs, "existsSync");
-      const session = await resume();
-      try {
-        const items = [];
-        for await (const event of session.streamHistory()) {
-          if (scope === "parent" && event.type === "timeline") items.push(event.item);
-          if (event.type === "provider_subagent" && event.event.type === "timeline") {
-            items.push(event.event.item);
-          }
-        }
-        expect(exists.mock.calls.filter(([target]) => target === filePath)).toEqual([]);
-        expect(items).toEqual([
-          {
-            type: "tool_call",
-            callId: "Write",
-            name: "Write",
-            status: "running",
-            error: null,
-            detail: { type: "write", filePath },
-          },
-          {
-            type: "tool_call",
-            callId: "Edit",
-            name: "Edit",
-            status: "running",
-            error: null,
-            detail: { type: "edit", filePath },
-          },
-        ]);
-      } finally {
-        await session.close();
-      }
-    },
-  );
-
  test("logs the resolved transcript path when the transcript does not exist", async () => {
-    await (await resume()).close();
+    await resume();

    expect(records).toContainEqual(
      expect.objectContaining({
@@ -287,7 +79,7 @@ describe("ClaudeAgentSession persisted history load", () => {
    // A directory at the transcript path exists but cannot be read as a file.
    mkdirSync(transcriptPath(), { recursive: true });

-    await (await resume()).close();
+    await resume();

    expect(records).toContainEqual(
      expect.objectContaining({
@@ -356,7 +148,7 @@ describe("ClaudeAgentSession persisted history load", () => {
      chmodSync(path.join(configDir, "projects"), 0o000);

      try {
-        await (await resume()).close();
+        await resume();
      } finally {
        chmodSync(path.join(configDir, "projects"), 0o755);
      }
@@ -2326,7 +2326,6 @@ class ClaudeAgentSession implements AgentSession {
    { type: "provider_subagent" }
  >[] = [];
  private historyPending = false;
-  private replayingHistory = false;
  private turnState: TurnState = "idle";
  private nextTurnOrdinal = 1;
  private cancelCurrentTurn: (() => void) | null = null;
@@ -5254,7 +5253,6 @@ class ClaudeAgentSession implements AgentSession {

  private loadPersistedHistory(sessionId: string): void {
    let historyPath: string | null = null;
-    this.replayingHistory = true;
    try {
      this.taskState.reset();
      historyPath = this.resolveHistoryPath(sessionId);
@@ -5274,8 +5272,6 @@ class ClaudeAgentSession implements AgentSession {
        { err: error, sessionId, historyPath },
        "Failed to load Claude history from transcript",
      );
-    } finally {
-      this.replayingHistory = false;
    }
  }

@@ -6043,11 +6039,6 @@ class ClaudeAgentSession implements AgentSession {
  }

  private detectFileKind(filePath: string): string {
-    // A historical target may be on an unreachable mount; its current state says nothing
-    // about whether the past operation created or updated it.
-    if (this.replayingHistory) {
-      return "update";
-    }
    try {
      return fs.existsSync(filePath) ? "update" : "add";
    } catch {
@@ -1,80 +0,0 @@
-import type { SessionInfo } from "@opencode/client";
-import { describe, expect, test } from "vitest";
-
-import type { AgentStreamEvent } from "../../../agent-sdk-types.js";
-import { V2Harness } from "../test-utils/v2-harness.js";
-import { SessionChildren } from "./children.js";
-
-function setup() {
-  const harness = new V2Harness();
-  const child: SessionInfo = {
-    ...harness.info,
-    id: "child",
-    parentID: "session",
-    title: "Check the worker model",
-    agent: "worker",
-    model: { providerID: "test", id: "worker-model", variant: "xhigh" },
-    tokens: { input: 10000, output: 3000, reasoning: 2000, cache: { read: 3000, write: 800 } },
-  };
-  harness.api.session.list = async (input) => ({
-    data: input?.parentID === "session" ? [child] : [],
-    cursor: {},
-  });
-  harness.api.session.get = async () => child;
-  const events: AgentStreamEvent[] = [];
-  const children = new SessionChildren({
-    client: () => harness.api,
-    id: "session",
-    emit: (event) => events.push(event),
-    reconcilePermissions: async () => {},
-  });
-  const upserts = () =>
-    events.flatMap((event) =>
-      event.type === "provider_subagent" && event.event.type === "upsert" ? [event.event] : [],
-    );
-  return { children, child, upserts };
-}
-
-describe("OpenCode v2 child presentation", () => {
-  test("restores agent, model, variant and all token categories in the child subtitle", async () => {
-    const { children, upserts } = setup();
-    await children.reconcile("session");
-    expect(upserts()).toEqual([
-      expect.objectContaining({
-        id: "child",
-        title: "Check the worker model",
-        parentSubagentId: null,
-        status: "completed",
-        subtitle: "worker · worker-model · Extra High · 18.8k tokens",
-      }),
-    ]);
-    await children.reconcile("session");
-    expect(upserts()).toHaveLength(1);
-  });
-
-  test("publishes changed child facts on live events even when its timestamp is unchanged", async () => {
-    const { children, child, upserts } = setup();
-    await children.observe({ id: "created", created: 1, type: "session.created", data: child });
-    child.model = { providerID: "test", id: "next-model", variant: "low" };
-    child.tokens.output += 1200;
-    await children.observe({
-      id: "finished",
-      created: 2,
-      type: "session.execution.succeeded",
-      durable: { aggregateID: "child", seq: 1, version: 1 },
-      data: { sessionID: "child" },
-    });
-    expect(upserts().map((event) => event.subtitle)).toEqual([
-      "worker · worker-model · Extra High · 18.8k tokens",
-      "worker · next-model · Low · 20k tokens",
-    ]);
-  });
-
-  test("keeps available agent information before a child has a model or token usage", async () => {
-    const { children, child, upserts } = setup();
-    delete child.model;
-    child.tokens = { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } };
-    await children.reconcile("session");
-    expect(upserts()[0]).toMatchObject({ title: "Check the worker model", subtitle: "worker" });
-  });
-});
@@ -7,7 +7,6 @@ import type { AgentStreamEvent } from "../../../agent-sdk-types.js";
 import type { ProviderSubagentInputEvent } from "../../../provider-subagents/store.js";

 import { messages } from "./history.js";
-import { buildOpenCodeSubagentSubtitle } from "../subagent-presentation.js";

 import type { V2Api } from "./api.js";
 interface ChildrenOptions {
@@ -66,23 +65,11 @@ export class SessionChildren {
    if (active[info.id]) status = "running";
    else if (info.outcome === "failed") status = "failed";
    else if (info.outcome === "interrupted") status = "canceled";
-    const subtitle = buildOpenCodeSubagentSubtitle({
-      agentName: info.agent,
-      modelId: info.model?.id,
-      variant: info.model?.variant,
-      totalTokens:
-        info.tokens.input +
-        info.tokens.output +
-        info.tokens.reasoning +
-        info.tokens.cache.read +
-        info.tokens.cache.write,
-    });
    const presentation: ProviderSubagentInputEvent = {
      type: "upsert",
      id: info.id,
      parentSubagentId: info.parentID === this.options.id ? null : info.parentID,
      title: info.title ?? null,
-      ...(subtitle ? { subtitle } : {}),
      status,
      cwd: info.location.directory,
      timestamp: new Date(info.time.updated).toISOString(),
@@ -1224,24 +1224,6 @@ describe("skills controller", () => {
    });
  });

-  it.skipIf(process.platform === "win32")(
-    "startup maintenance preserves user-owned skills linked from agent homes",
-    async () => {
-      const userSkill = path.join(harness.root, "user-checkout", "paseo");
-      await mkdir(userSkill, { recursive: true });
-      await writeFile(path.join(userSkill, "SKILL.md"), "locally edited skill");
-      for (const root of [harness.targets.agentsDir, harness.targets.claudeDir]) {
-        await mkdir(root, { recursive: true });
-        await symlink(userSkill, path.join(root, "paseo"), "dir");
-      }
-
-      await harness.controller.autoUpdate();
-
-      expect(await readFile(path.join(userSkill, "SKILL.md"), "utf8")).toBe("locally edited skill");
-      expect(await readdir(userSkill)).toEqual(["SKILL.md"]);
-    },
-  );
-
  it("updates a drifted install without touching the saved selection", async () => {
    await harness.controller.save({ mode: "custom", skills: ["paseo"] });
    await writeFile(path.join(harness.targets.agentsDir, "paseo", "SKILL.md"), "stale");
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/website",
-  "version": "0.13.0",
+  "version": "0.13.0-beta.2",
  "private": true,
  "type": "module",
  "scripts": {
@@ -1,92 +0,0 @@
-import { mkdtemp, writeFile, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { expect, it } from "vitest";
-import { fetchUsage } from "./usage.js";
-
-it("shows the reported Pro percentage pools without treating bonus spend as an overage", async () => {
-  const directory = await mkdtemp(join(tmpdir(), "cursor-reported-pools-"));
-  const locator = join(directory, "auth.json");
-  try {
-    await writeFile(locator, JSON.stringify({ accessToken: "fixture-token" }));
-    const report = await fetchUsage({ store: "file", locator }, async () =>
-      Response.json({
-        billingCycleStart: "2026-09-25T07:10:08.000Z",
-        billingCycleEnd: "2026-10-25T07:10:08.000Z",
-        planUsage: {
-          totalSpend: 5717,
-          includedSpend: 2000,
-          bonusSpend: 3717,
-          limit: 2000,
-          autoPercentUsed: 9.157777777777778,
-          apiPercentUsed: 35.46666666666667,
-          totalPercentUsed: 11.54949494949495,
-        },
-        spendLimitUsage: { individualLimit: 100, individualRemaining: 100, limitType: "user" },
-      }),
-    );
-    expect(report).toMatchObject({
-      status: "available",
-      windows: [
-        { id: "plan_usage", usedPct: 11.54949494949495 },
-        { id: "cursor_usage", usedPct: 9.157777777777778 },
-        { id: "third_party_usage", usedPct: 35.46666666666667 },
-      ],
-      balances: [],
-    });
-  } finally {
-    await rm(directory, { recursive: true, force: true });
-  }
-});
-
-it.each([
-  ["Pro+", 42015, 7000, 34.583333333333336, 4.6818181818181825, 32.07251908396947],
-  ["Teams", 77145, 2000, 61.8352380952381, 61.09, 61.716],
-] as const)(
-  "preserves the reported %s pools separately from bonus-inclusive dollars",
-  async (_plan, totalSpend, limit, autoPercentUsed, apiPercentUsed, totalPercentUsed) => {
-    const report = await reportFor({
-      totalSpend,
-      limit,
-      autoPercentUsed,
-      apiPercentUsed,
-      totalPercentUsed,
-    });
-    expect(report).toMatchObject({
-      status: "available",
-      windows: [
-        { id: "plan_usage", usedPct: totalPercentUsed, summary: true },
-        { id: "cursor_usage", usedPct: autoPercentUsed },
-        { id: "third_party_usage", usedPct: apiPercentUsed },
-      ],
-      balances: [],
-    });
-  },
-);
-
-it("retains a zero percentage without inventing absent breakdowns", async () => {
-  expect(await reportFor({ totalPercentUsed: "0", autoPercentUsed: null })).toMatchObject({
-    status: "available",
-    windows: [{ id: "plan_usage", usedPct: 0, remainingPct: 100 }],
-    balances: [],
-  });
-});
-
-it("keeps dollar-only reports when the response has no percentages", async () => {
-  expect(await reportFor({ totalSpend: 1500, remaining: 2500, limit: 4000 })).toMatchObject({
-    status: "available",
-    windows: [],
-    balances: [{ id: "plan_usage", used: 15, remaining: 25, limit: 40, unit: "usd" }],
-  });
-});
-
-async function reportFor(planUsage: Record<string, unknown>) {
-  const directory = await mkdtemp(join(tmpdir(), "cursor-usage-pools-"));
-  const locator = join(directory, "auth.json");
-  try {
-    await writeFile(locator, JSON.stringify({ accessToken: "fixture-token" }));
-    return await fetchUsage({ store: "file", locator }, async () => Response.json({ planUsage }));
-  } finally {
-    await rm(directory, { recursive: true, force: true });
-  }
-}
@@ -9,12 +9,10 @@ import {
  toneFromUsedPct,
  usedPctOf,
  unavailable,
-  windowFromUsedPct,
  type UsageAccount,
  type UsageReport,
  type UsageBalance,
  type UsageScope,
-  type UsageWindow,
 } from "@getpaseo/plugin/server/usage";

 const ApiNumberSchema = z.coerce.number().finite();
@@ -62,9 +60,6 @@ const CursorUsageResponseSchema = z.object({
      bonusSpend: ApiNullableNumberSchema,
      remaining: ApiNullableNumberSchema,
      limit: ApiNullableNumberSchema,
-      totalPercentUsed: ApiNullableNumberSchema,
-      autoPercentUsed: ApiNullableNumberSchema,
-      apiPercentUsed: ApiNullableNumberSchema,
    })
    .nullish(),
  billingCycleStart: CursorBillingCycleTimestampSchema,
@@ -182,29 +177,8 @@ export async function fetchUsage(

  const resp = CursorUsageResponseSchema.parse(await res.json());
  const billingCycleEnd = parseCursorBillingCycleTimestamp(resp.billingCycleEnd);
-  const windows: UsageWindow[] = [];
  const balances: UsageBalance[] = [];
  if (resp.planUsage) {
-    // Total spend includes bonus credits; returned percentages measure quota usage.
-    for (const [id, label, usedPct] of [
-      ["plan_usage", "Total", resp.planUsage.totalPercentUsed],
-      ["cursor_usage", "Cursor", resp.planUsage.autoPercentUsed],
-      ["third_party_usage", "Third Party", resp.planUsage.apiPercentUsed],
-    ] as const) {
-      if (usedPct === null) continue;
-      windows.push(
-        windowFromUsedPct({
-          id,
-          label,
-          utilizationPct: usedPct,
-          resetsAt: billingCycleEnd,
-          summary: id === "plan_usage",
-          tone: toneFromUsedPct(usedPct),
-        }),
-      );
-    }
-  }
-  if (resp.planUsage && windows.length === 0) {
    const totalSpend = centsToDollars(resp.planUsage.totalSpend);
    const remaining = centsToDollars(resp.planUsage.remaining);
    const limit = centsToDollars(resp.planUsage.limit);
@@ -223,7 +197,7 @@ export async function fetchUsage(
  return {
    status: "available",
    planLabel: undefined,
-    windows,
+    windows: [],
    balances,
    details: [],
  };
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/builtin-plugins",
-  "version": "0.13.0",
+  "version": "0.13.0-beta.2",
  "private": true,
  "type": "module",
  "scripts": {
@@ -176,9 +176,8 @@ its registration; that registration belongs in the client entry.

 ### UI imports in v0.13

-Use `/client/ui` for all Paseo UI components and UI hooks. The deprecated
-`/client/react-native` entry retains `useRevealedText(text, phase): string` for 0.12 plugins
-until removal after 2027-04-20. The hook is deprecated and is not exported from `/client/ui`.
+Use `/client/ui` for all Paseo UI components and UI hooks. The previous entry remains an
+undocumented compatibility alias until 2027-04-20.

 For paced timeline text, replace `useRevealedText(text, phase)` and the surrounding `Text` with
 `<StreamedText text={text} phase={phase} style={style} />` from `/client/ui`.