test(opencode): reproduction attempt for #6006 , model list after OpenCode's catalog changes

Co-Authored-By: Claude <noreply@anthropic.com>
2026-10-21 16:52:40 +00:00 · 2026-10-06 16:32:26 +02:00
178 changed files with 1464 additions and 8066 deletions
@@ -1,28 +1,12 @@
 # Changelog

-## 0.11.1 - 2026-10-07
-
-### Added
-
- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer ([#6332](https://github.com/getpaseo/paseo/pull/6332))
-
-### Fixed
-
- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents ([#6308](https://github.com/getpaseo/paseo/pull/6308))
- Fixed subagents that finish while the app is disconnected staying "working" until one is opened ([#6316](https://github.com/getpaseo/paseo/pull/6316))
- Fixed a Claude agent's history showing "No activity to display" after a daemon restart when its transcript is in another project folder, such as after moving the daemon or running Windows Claude Code from WSL ([#6301](https://github.com/getpaseo/paseo/pull/6301))
-
-## 0.11.0 - 2026-10-07
-
-Paseo 0.11 adds support for the [plugin registry](https://paseo.sh/plugins). Browse community plugins there, install one with `paseo plugin add owner/slug`, or [submit your own](https://paseo.sh/docs/plugins/publishing#plugin-registry).
-
-**Before upgrading:** `paseo plugin add owner/repo` now installs from the registry, so use `github:owner/repo` to install straight from GitHub and `./path` for a local directory.
+## 0.11.0-beta.5 - 2026-10-06

 ### Added

 - Added Muse Code as a provider, with model, approval mode, and reasoning effort controls ([#5719](https://github.com/getpaseo/paseo/pull/5719), [#5775](https://github.com/getpaseo/paseo/pull/5775) by [@millerben95](https://github.com/millerben95))
 - Added Antigravity as a provider that drives the installed `agy` CLI, always in Full access ([#5714](https://github.com/getpaseo/paseo/pull/5714), [#5795](https://github.com/getpaseo/paseo/pull/5795))
- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh ([#5465](https://github.com/getpaseo/paseo/pull/5465), [#5685](https://github.com/getpaseo/paseo/pull/5685), [#5786](https://github.com/getpaseo/paseo/pull/5786), [#5805](https://github.com/getpaseo/paseo/pull/5805), [#5921](https://github.com/getpaseo/paseo/pull/5921), [#6216](https://github.com/getpaseo/paseo/pull/6216))
+- Added a Usage screen, opened from the sidebar footer, showing each subscription account's quota windows with Refresh ([#5465](https://github.com/getpaseo/paseo/pull/5465), [#5685](https://github.com/getpaseo/paseo/pull/5685), [#5786](https://github.com/getpaseo/paseo/pull/5786), [#5805](https://github.com/getpaseo/paseo/pull/5805), [#5921](https://github.com/getpaseo/paseo/pull/5921))
 - Added an opt-in Usage summary to the sidebar footer that shows the windows you pin ([#5903](https://github.com/getpaseo/paseo/pull/5903), [#5975](https://github.com/getpaseo/paseo/pull/5975), [#6089](https://github.com/getpaseo/paseo/pull/6089))
 - Added Usage discovery of ChatGPT logins from Codex CLI, OpenCode, Pi, and OMP ([#5844](https://github.com/getpaseo/paseo/pull/5844))
 - Added Usage discovery of Claude logins from the Claude Code credential file, the macOS keychain, Pi, and OMP ([#5844](https://github.com/getpaseo/paseo/pull/5844))
@@ -32,26 +16,19 @@ Paseo 0.11 adds support for the [plugin registry](https://paseo.sh/plugins). Bro
 - Added Fast mode and an Auto thinking level to OMP ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@n24q02m](https://github.com/n24q02m), [@abhi-wan-kenobi](https://github.com/abhi-wan-kenobi))
 - Added MCP servers to OMP schedules and Hub runs ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@omercnet](https://github.com/omercnet))
 - Added a Content width setting for the maximum width of chat and Markdown files on wide screens ([#5680](https://github.com/getpaseo/paseo/pull/5680))
- Added syntax highlighting for Vue files ([#6205](https://github.com/getpaseo/paseo/pull/6205) by [@Davnn1](https://github.com/Davnn1))
 - Added `agents.providers.<id>.options` in `config.json` as default options for every provider, with per-agent overrides ([#5780](https://github.com/getpaseo/paseo/pull/5780))
 - Added the terminal key bar and Paste to terminal panes on iPad and Android tablets ([#5712](https://github.com/getpaseo/paseo/pull/5712) by [@lardissone](https://github.com/lardissone))
-
-### Plugins
-
- Changed `paseo plugin add owner/slug` to install the reviewed plugin from the plugin registry, so local directories need a path such as `./slug` and direct GitHub installs need `github:owner/repo` ([#6224](https://github.com/getpaseo/paseo/pull/6224))
- Added [screens and sidebar header and footer items](https://paseo.sh/docs/plugins/reference#screens-and-sidebar-items) to the plugin SDK ([#5685](https://github.com/getpaseo/paseo/pull/5685))
+- Added screens and sidebar header and footer items to the plugin SDK ([#5685](https://github.com/getpaseo/paseo/pull/5685))
 - Added usage sources to the plugin SDK ([#5465](https://github.com/getpaseo/paseo/pull/5465), [#5876](https://github.com/getpaseo/paseo/pull/5876))
 - Added `spawnProcess()`, `execCommand()`, and `terminateProcess()` to the plugin SDK for launching CLIs, including Windows `.cmd` and `.bat` scripts ([#6151](https://github.com/getpaseo/paseo/pull/6151))
 - Added `client.playAudio()` to the plugin SDK for playing audio on every client ([#5976](https://github.com/getpaseo/paseo/pull/5976))
 - Added an `agent.closed` plugin lifecycle event ([#5971](https://github.com/getpaseo/paseo/pull/5971) by [@ilteoood](https://github.com/ilteoood))
 - Added command and environment overrides and availability diagnostics for plugin providers ([#5707](https://github.com/getpaseo/paseo/pull/5707))
- Added a display name, icon, screenshots, and videos to the plugin manifest ([#6263](https://github.com/getpaseo/paseo/pull/6263))
- Added an `OVERVIEW.md` template to `paseo plugin init` for plugin registry listings ([#6226](https://github.com/getpaseo/paseo/pull/6226))

 ### Changed

 - Changed the context window details to show usage for the account the agent runs under, including custom `CLAUDE_CONFIG_DIR` and `CODEX_HOME` homes ([#5465](https://github.com/getpaseo/paseo/pull/5465))
- Changed the context window details on desktop to a hover card with Refresh ([#5975](https://github.com/getpaseo/paseo/pull/5975), [#6185](https://github.com/getpaseo/paseo/pull/6185))
+- Changed the context window details on desktop to a hover card with Refresh ([#5975](https://github.com/getpaseo/paseo/pull/5975))
 - Changed the context window meter to show before an agent's first turn ([#6089](https://github.com/getpaseo/paseo/pull/6089))
 - Changed Codex Fast to a Speed menu listing the Normal, Fast, and Ultrafast speeds each model offers, shown as a lightning bolt on desktop that turns yellow while Fast or Ultrafast is selected ([#5708](https://github.com/getpaseo/paseo/pull/5708), [#6152](https://github.com/getpaseo/paseo/pull/6152) by [@Nurshot](https://github.com/Nurshot))
 - Changed Explorer tabs to work like workspace tabs, with a + menu, drag and drop, and Close for Files and Changes ([#5942](https://github.com/getpaseo/paseo/pull/5942))
@@ -67,18 +44,12 @@ Paseo 0.11 adds support for the [plugin registry](https://paseo.sh/plugins). Bro
 ### Fixed

 - Fixed Claude agents never showing Thought rows on Claude Opus 4.7 and later ([#4355](https://github.com/getpaseo/paseo/pull/4355) by [@ThePharmer](https://github.com/ThePharmer))
- Fixed a Claude agent showing as running while only its background helpers worked, and a send or Stop killing those helpers ([#6295](https://github.com/getpaseo/paseo/pull/6295) by [@IsakPersson](https://github.com/IsakPersson))
- Fixed a Claude agent in Auto mode failing to switch modes when Claude Code uses Bedrock or Vertex ([#6272](https://github.com/getpaseo/paseo/pull/6272))
- Fixed a Claude subagent's auto-mode report showing as a raw SubagentHandback tool card instead of markdown ([#6248](https://github.com/getpaseo/paseo/pull/6248))
- Fixed background Claude subagent cards showing as a bare "Task" that stayed running, as "Agent" after a daemon restart, or unlabeled when two launch together ([#6067](https://github.com/getpaseo/paseo/pull/6067), [#6100](https://github.com/getpaseo/paseo/pull/6100), [#6268](https://github.com/getpaseo/paseo/pull/6268))
+- Fixed a background Claude subagent's card showing as a bare "Task" that stayed running, or as "Agent" after a daemon restart ([#6067](https://github.com/getpaseo/paseo/pull/6067), [#6100](https://github.com/getpaseo/paseo/pull/6100))
 - Fixed Claude Code terminals not showing as needing input when Claude is idle ([#6022](https://github.com/getpaseo/paseo/pull/6022))
 - Fixed Claude usage calling a rate-limited login again before its retry time ([#6089](https://github.com/getpaseo/paseo/pull/6089))
 - Fixed a Claude agent that entered plan mode on its own still showing and storing its previous mode ([#6074](https://github.com/getpaseo/paseo/pull/6074))
 - Fixed a resumed agent returning to its creation-time mode after its mode was changed in the session ([#5140](https://github.com/getpaseo/paseo/pull/5140) by [@ThePlenkov](https://github.com/ThePlenkov))
 - Fixed ACP plugin providers failing to launch a `.cmd` or `.bat` CLI on Windows ([#6151](https://github.com/getpaseo/paseo/pull/6151))
- Fixed ACP agents running on their default model when the configured model is one the agent does not advertise ([#6273](https://github.com/getpaseo/paseo/pull/6273))
- Fixed archiving an ACP agent leaving its provider running when the provider never answers close ([#6213](https://github.com/getpaseo/paseo/pull/6213) by [@apple-ouyang](https://github.com/apple-ouyang))
- Fixed an archived ACP agent showing an empty chat after its worktree was removed ([#6228](https://github.com/getpaseo/paseo/pull/6228))
 - Fixed ACP agents rejecting every following message after a turn failed with a permission request open ([#6045](https://github.com/getpaseo/paseo/pull/6045))
 - Fixed the context window meter never appearing for ACP agents that report context usage ([#4848](https://github.com/getpaseo/paseo/pull/4848) by [@apple-ouyang](https://github.com/apple-ouyang))
 - Fixed schedule runs and workspace metadata recording `[object Object]` when an ACP agent rejects a session setting ([#5765](https://github.com/getpaseo/paseo/pull/5765))
@@ -93,14 +64,12 @@ Paseo 0.11 adds support for the [plugin registry](https://paseo.sh/plugins). Bro
 - Fixed opening an archived OMP agent starting an `omp` process that stayed running ([#5550](https://github.com/getpaseo/paseo/pull/5550) by [@thomasvan](https://github.com/thomasvan))
 - Fixed an OMP turn staying running forever when the run contains a message Paseo does not show, such as an OMP rule reminder ([#6112](https://github.com/getpaseo/paseo/pull/6112))
 - Fixed a prompt OMP rejects, such as for a missing API key, ending as a completed turn with no error ([#6110](https://github.com/getpaseo/paseo/pull/6110), [#6115](https://github.com/getpaseo/paseo/pull/6115))
- Fixed reopened OMP chats showing "Custom message" rows for compactions and other entries OMP writes on its own ([#6198](https://github.com/getpaseo/paseo/pull/6198), [#6215](https://github.com/getpaseo/paseo/pull/6215))
 - Fixed Pi and OMP sessions whose model was removed failing to import or reopen ([#6061](https://github.com/getpaseo/paseo/pull/6061))
 - Fixed Pi agents on Pi 0.99 starting without Paseo's MCP servers when `pi-mcp-adapter` is not installed ([#5762](https://github.com/getpaseo/paseo/pull/5762) by [@ArietidsZ](https://github.com/ArietidsZ))
 - Fixed a running Pi subagent showing an empty transcript until it finished ([#5755](https://github.com/getpaseo/paseo/pull/5755))
 - Fixed a grouped Tintinweb pi-subagents completion marking only its first agent completed and leaving the rest on working ([#5826](https://github.com/getpaseo/paseo/pull/5826))
 - Fixed OpenCode `ask` rules for `paseo_*` tools running the tool without a prompt ([#5801](https://github.com/getpaseo/paseo/pull/5801) by [@ymarcus93](https://github.com/ymarcus93))
 - Fixed the first OpenCode prompt waiting for the event stream timeout when the OpenCode server was slow to become ready ([#5873](https://github.com/getpaseo/paseo/pull/5873) by [@axsuul](https://github.com/axsuul))
- Fixed OpenCode v2 agents staying running after a question is dismissed or a tool permission is denied ([#6177](https://github.com/getpaseo/paseo/pull/6177), [#6188](https://github.com/getpaseo/paseo/pull/6188))
 - Fixed the Nix packages failing to start the daemon and to open terminals ([#5523](https://github.com/getpaseo/paseo/pull/5523) by [@wongcallum](https://github.com/wongcallum))
 - Fixed OpenCode v2 agents failing to start on the Nix packages ([#5988](https://github.com/getpaseo/paseo/pull/5988))
 - Fixed each Paseo skill appearing twice in Codex's skill list ([#5827](https://github.com/getpaseo/paseo/pull/5827) by [@3ae3ae](https://github.com/3ae3ae))
@@ -114,18 +83,12 @@ Paseo 0.11 adds support for the [plugin registry](https://paseo.sh/plugins). Bro
 - Fixed Codex terminal rows reading only "Terminal" without the command on current Codex ([#5774](https://github.com/getpaseo/paseo/pull/5774))
 - Fixed the composer showing the catalog default thinking level instead of the one the agent runs on ([#5804](https://github.com/getpaseo/paseo/pull/5804))
 - Fixed the composer showing another model's label when the agent's model is missing from the loaded catalog ([#5796](https://github.com/getpaseo/paseo/pull/5796))
- Fixed the chat jumping back by several screens when scrolling up through older history on web and desktop ([#5945](https://github.com/getpaseo/paseo/pull/5945), [#5970](https://github.com/getpaseo/paseo/pull/5970), [#6172](https://github.com/getpaseo/paseo/pull/6172))
+- Fixed the chat jumping back by several screens when scrolling up through older history on web and desktop ([#5945](https://github.com/getpaseo/paseo/pull/5945), [#5970](https://github.com/getpaseo/paseo/pull/5970))
 - Fixed images in chat shifting the text below them when they finish loading ([#5970](https://github.com/getpaseo/paseo/pull/5970))
 - Fixed copying all the code in a chat code block sometimes including its ``` fence lines ([#6138](https://github.com/getpaseo/paseo/pull/6138))
 - Fixed copying across a code block nested in a numbered list item renumbering the next item ([#6158](https://github.com/getpaseo/paseo/pull/6158))
- Fixed copying a chat selection across an image losing its alt text and source, or including the image when the selection started below it ([#6181](https://github.com/getpaseo/paseo/pull/6181), [#6195](https://github.com/getpaseo/paseo/pull/6195))
 - Fixed relative `path:line` file links in chat opening at the first line referenced for that file ([#5653](https://github.com/getpaseo/paseo/pull/5653) by [@3ae3ae](https://github.com/3ae3ae))
 - Fixed PR comments with linked pictures showing raw HTML tags and losing the image link ([#5968](https://github.com/getpaseo/paseo/pull/5968))
- Fixed text typed by the browser tool appearing in your message box instead of the browser tab ([#6207](https://github.com/getpaseo/paseo/pull/6207))
- Fixed Astro expressions losing their colors after a nested template string ([#6219](https://github.com/getpaseo/paseo/pull/6219))
- Fixed downloading files whose names contain non-ASCII characters ([#6278](https://github.com/getpaseo/paseo/pull/6278), [#6281](https://github.com/getpaseo/paseo/pull/6281) by [@dillonzq](https://github.com/dillonzq), [@jasonhnd](https://github.com/jasonhnd))
- Fixed the PR panel, sidebar workspace status, and "Worked for" line showing English in other app languages ([#6196](https://github.com/getpaseo/paseo/pull/6196), [#6208](https://github.com/getpaseo/paseo/pull/6208), [#6225](https://github.com/getpaseo/paseo/pull/6225) by [@dillonzq](https://github.com/dillonzq))
- Fixed French translations that read as word-for-word machine translation ([#6004](https://github.com/getpaseo/paseo/pull/6004) by [@fxlelouarn](https://github.com/fxlelouarn))
 - Fixed the desktop window not dragging from the workspace header after scrolling a long chat ([#5233](https://github.com/getpaseo/paseo/pull/5233) by [@Zhou-Ruichen](https://github.com/Zhou-Ruichen))
 - Fixed opening an agent on a touch screen in the desktop layout raising the on-screen keyboard ([#5477](https://github.com/getpaseo/paseo/pull/5477) by [@dinhphieu](https://github.com/dinhphieu))
 - Fixed Option+arrow, Cmd+arrow, and Cmd+Backspace line editing in the macOS terminal ([#3339](https://github.com/getpaseo/paseo/pull/3339) by [@gpambrozio](https://github.com/gpambrozio))
@@ -133,16 +96,12 @@ Paseo 0.11 adds support for the [plugin registry](https://paseo.sh/plugins). Bro
 - Fixed a new worktree workspace being archived when its `paseo.json` cannot be parsed ([#6036](https://github.com/getpaseo/paseo/pull/6036) by [@3ae3ae](https://github.com/3ae3ae))
 - Fixed workspace script status not updating in other connected clients ([#6007](https://github.com/getpaseo/paseo/pull/6007) by [@swbiggart](https://github.com/swbiggart))
 - Fixed agents and terminals inheriting the voice library path, which truncated Git Bash's PATH on Windows ([#5987](https://github.com/getpaseo/paseo/pull/5987) by [@hanh9898](https://github.com/hanh9898))
- Fixed dictation failing until the model was deleted by hand when the daemon stopped while extracting a local speech model ([#6210](https://github.com/getpaseo/paseo/pull/6210) by [@3ae3ae](https://github.com/3ae3ae))
 - Fixed macOS hosts showing as `UNKNOWN` when the network supplies no hostname ([#5922](https://github.com/getpaseo/paseo/pull/5922))
- Fixed `paseo daemon status` reporting a daemon in a Linux VM as stopped after the host wakes from sleep ([#6279](https://github.com/getpaseo/paseo/pull/6279))
- Fixed relay reconnects being ignored after a relay connection stalled before its handshake ([#5648](https://github.com/getpaseo/paseo/pull/5648) by [@3ae3ae](https://github.com/3ae3ae))
 - Fixed `paseo daemon run` exiting with "Daemon failed to start" when the program that launched it stops reading its output ([#6117](https://github.com/getpaseo/paseo/pull/6117))
 - Fixed CLI commands crashing with `EPIPE`, and the Windows desktop app showing an error dialog, when their output stops being read ([#6097](https://github.com/getpaseo/paseo/pull/6097))
 - Fixed daemon self-update on a linked global install giving the wrong reason for refusing ([#6095](https://github.com/getpaseo/paseo/pull/6095))
 - Fixed daemon self-update failing for an npm install under a prefix other than npm's global prefix ([#5649](https://github.com/getpaseo/paseo/pull/5649) by [@3ae3ae](https://github.com/3ae3ae))
 - Fixed opening an archived agent whose worktree was removed showing "Workspace unavailable" when the workspace had no recorded branch ([#5694](https://github.com/getpaseo/paseo/pull/5694))
- Fixed a failed send to an archived agent whose directory was removed taking it out of History ([#6255](https://github.com/getpaseo/paseo/pull/6255))
 - Fixed a host's version staying stale on the host page after its daemon restarts ([#5351](https://github.com/getpaseo/paseo/pull/5351) by [@bashrusakh](https://github.com/bashrusakh))
 - Fixed Remote SSH hosts failing to connect to a password-protected daemon, with a new Daemon password field ([#6081](https://github.com/getpaseo/paseo/pull/6081) by [@royenheart](https://github.com/royenheart))
 - Fixed removing a host during its first connection attempt not stopping the connection ([#5722](https://github.com/getpaseo/paseo/pull/5722))
@@ -162,7 +121,6 @@ Paseo 0.11 adds support for the [plugin registry](https://paseo.sh/plugins). Bro
 - Fixed `paseo schedule update --no-max-runs` and `--no-expires-in` failing before reaching the daemon ([#5973](https://github.com/getpaseo/paseo/pull/5973) by [@Mar-garet](https://github.com/Mar-garet))
 - Fixed `daemon.log` saying nothing when a resumed Claude agent's transcript is missing or cannot be read ([#5818](https://github.com/getpaseo/paseo/pull/5818) by [@gabrielgiordan](https://github.com/gabrielgiordan))
 - Fixed reloading a plugin adding `[System Error] Provider connection closed` to finished chats on its provider ([#5579](https://github.com/getpaseo/paseo/pull/5579))
- Fixed `paseo plugin add .` looking for the plugin in the daemon's directory instead of the CLI's ([#6239](https://github.com/getpaseo/paseo/pull/6239))
 - Fixed plugin settings screens on desktop having no way back to the Plugins page ([#5620](https://github.com/getpaseo/paseo/pull/5620))
 - Fixed plugin client code failing to import npm packages that declare only `main` or `module` ([#5838](https://github.com/getpaseo/paseo/pull/5838))
 - Fixed the SDK's `send()` and `run()` rejecting `activeTurnBehavior` in TypeScript ([#5605](https://github.com/getpaseo/paseo/pull/5605) by [@wjxdy](https://github.com/wjxdy))
@@ -39,33 +39,21 @@
  <img src="https://paseo.sh/mobile-mockup.png" alt="Paseo mobile app" width="100%">
 </p>

-Paseo is a desktop, mobile, web, and CLI app for coding agents. Open the desktop app and work: agents, editor, terminals, diffs, pull requests, and a browser in one window. Run many agents at once, each in its own worktree, on one machine or several. The mobile app is the full app, native on iOS and Android.
+Run agents in parallel on your own machines. Ship from your phone or your desk.

- **Parallel agents:** Run many agents at once, each in its own worktree.
- **Built-in orchestration:** Agents in Paseo can create worktrees, launch other agents, and talk to them, across providers.
- **Full IDE:** Edit files, review diffs, open pull requests, and run terminals, in split panes you arrange how you want.
 - **Self-hosted:** Agents run on your machine with your full dev environment. Use your tools, your configs, and your skills.
 - **Multi-provider:** Claude Code, Codex, Copilot, OpenCode, Pi, Antigravity, and Muse Code through the same interface. Pick the right model for each job.
 - **Voice control:** Dictate tasks or talk through problems in voice mode. Hands-free when you need it.
 - **Cross-device:** iOS, Android, desktop, web, and CLI. Start work at your desk, check in from your phone, script it from the terminal.
 - **Privacy-first:** Paseo doesn't have any telemetry, tracking, or forced log-ins.

-[Run parallel tasks in Paseo](https://paseo.sh/docs/parallel-development): start agents in separate worktrees, review their diffs, run each app, and check it in the built-in browser.
-
 ## Plugins

-Plugins run on the daemon and show up in every client you connect, with the same UI on desktop, web,
-iOS, and Android. Write a plugin once and it is on your phone.
+Add themes, workspace panels, commands, settings screens, and coding-agent providers with trusted
+TypeScript plugins. Install from npm, Git, or a local directory with `paseo plugin install <source>`.

- **UI:** screens, sidebar items, workspace panels, Command Center items, slash commands, composer pills, attachment sources, timeline items, themes.
- **Agent lifecycle:** change configuration, environment, and MCP servers, answer permissions, follow up when a turn ends.
- **Providers:** add a coding agent as a provider.
-
-Install from the registry with `paseo plugin add owner/slug`, or from Git or a local directory.
-
-**[Browse plugins](https://paseo.sh/plugins)** · **[Plugin docs](https://paseo.sh/docs/plugins)**
-
-Plugins run with access to your daemon machine and inside connected clients; install only code you trust.
+Start with the [plugin quickstart](https://paseo.sh/docs/plugins). Plugins run with access to your daemon
+machine and inside connected clients; install only code you trust.

 ## Getting Started

@@ -89,16 +77,16 @@ Download it from [paseo.sh/download](https://paseo.sh/download) or the [GitHub r

 To connect from your phone, open **Settings → your host → Pair Device**.

-### Server
+### CLI / headless

-For a server, a VM, or any machine without the desktop app. Install the CLI and start the daemon:
+Install the CLI and start Paseo:

 ```bash
 npm install -g @getpaseo/cli
 paseo
 ```

-Paseo starts, then asks whether to enable the end-to-end encrypted relay for device pairing. If you decline, connect directly over TCP, Tailscale, or another VPN. The desktop, mobile, and web apps connect to this daemon like any other host.
+Paseo starts locally, then asks whether to enable the end-to-end encrypted relay for device pairing. If you decline, connect directly over TCP, Tailscale, or another VPN. This path is useful for servers and remote machines.

 For full setup and configuration, see:

@@ -209,7 +197,7 @@ npm run typecheck

 ## Sponsors

-Paseo is an independent project used by tens of thousands of developers daily, built by one person and funded by the people who use it. Support the work on [GitHub Sponsors](https://github.com/sponsors/boudra). Companies can [sponsor Paseo](https://paseo.sh/sponsor#spot) monthly and have their logo shown here and on the paseo.sh homepage.
+Paseo is built by one person and funded by the people who use it. Support the work on [GitHub Sponsors](https://github.com/sponsors/boudra). Companies can [sponsor Paseo](https://paseo.sh/sponsor#spot) monthly and have their logo shown here and on the paseo.sh homepage.

 <!-- Sponsor logos go here, in the same order as packages/website/src/data/sponsors.ts -->

@@ -197,11 +197,10 @@ Claude Code announces subagent lifecycle on the SDK stream (`task_started` / `ta

 - **Not every announced task belongs in the track.** Task subagents announce as `local_agent` and workflows as `local_workflow`; a backgrounded shell announces as `local_bash` with the same `tool_use_id` shape, and ambient housekeeping sets `skip_transcript`. The Claude provider normalizes a workflow to a generic provider-subagent descriptor titled `Workflow`, using Claude's summary as its description and timeline opener. Shared storage, protocol, and UI do not distinguish it from another provider subagent.
 - **A task that was never declared gets no descriptor, by any route.** Filtered tasks still emit `task_notification`s carrying a `tool_use_id`, and still emit frames carrying `parent_tool_use_id`. Attributing either produces a descriptor with no identity and a defaulted `running` status — a nameless row that never finishes. Status, presentation updates, and sidechain frames all route through the declaration table.
- **Task ids are session-scoped, not turn-scoped.** Cancelling a turn must not clear the routing table: a backgrounded child settles after the interrupt and needs its descriptor to still exist. Cancellation instead terminalizes the declared children that were running in the foreground, and a later `task_notification` is free to correct that guess. Backgrounded children are identified by `is_backgrounded` on `task_started` (set at spawn; a resumed subagent is always background) or, when moved there later, on `task_updated.patch`.
+- **Task ids are session-scoped, not turn-scoped.** Cancelling a turn must not clear the routing table: a backgrounded child settles after the interrupt and needs its descriptor to still exist. Cancellation instead terminalizes the declared children that were running in the foreground, and a later `task_notification` is free to correct that guess. Backgrounded children are identified by `task_updated.patch.is_backgrounded`.
 - **A resumed task can be announced again with a new `tool_use_id`.** The first Task tool id remains the canonical descriptor and later ids are routing aliases for the same session-scoped task. The resumed prompt is added to that child timeline.
 - **Effort is only reachable through hooks.** It appears nowhere on the message stream at any depth, and the level Paseo requests is not necessarily the level that runs — a model that does not support it is silently downgraded. A hook firing inside a subagent reports the active post-downgrade level next to its `agent_id`, which is the same id `task_started` calls `task_id`.
 - **Backgrounded subagents emit no frames carrying `parent_tool_use_id` at all.** Everything keyed off that field sees nothing for one; they are visible only because the task protocol announces them.
- **Only `system/init` and `result` bracket a main-session turn.** Background subagents emit neither on the main stream, while their task frames, their own background jobs' `task_notification`, and `rate_limit_event` arrive with no `parent_tool_use_id`, the same shape as main-session work. `session_state_changed` stays `running` for as long as any background subagent lives (Claude Code 2.1.280), so it cannot open a turn; its `idle` can close one.
 - **Nested ownership comes from the launching sidechain, not `spawn_depth` alone.** A sidechain's Agent or Bash tool call records the direct owner of that `tool_use_id`; the following `task_started` inherits it. This routes a grandchild descriptor and child-owned background notifications without relying on labels or flattening them into the managed parent.
 - **On replay, `<session>/subagents/` holds every descendant beside the root.** Resolve the tree one proven generation at a time: the root transcript admits direct children, then each admitted sidechain transcript admits its children by `toolUseId`. `spawnDepth` orders candidates but does not establish ownership. Unresolved sidecars remain excluded as ambient or unrelated work.
 - **Replay `totalTokens` is a context-size reading, not cumulative spend.** Claude Code finalizes a subagent by summing the _last_ assistant message's usage block and shipping that as `usage.total_tokens`. Summing per-entry usage instead multiplies the cached prefix by the turn count and reports a number several times larger than the live path.
@@ -117,19 +117,15 @@ the bundled integration; an entry with `extends` shadows it with a custom provid

 ## Install from a registry

-`paseo plugin add owner/slug` installs the registry's reviewed artifact by default.
-Browse published plugins at [paseo.sh/plugins](https://paseo.sh/plugins).
-Use `git:owner/repository` or a full Git URL for a Git source. Registry installs
+Registry installs are off by default. Set `pluginRegistryEnabled: true` in daemon config or
+`PASEO_PLUGIN_REGISTRY_ENABLED=1`, then restart the daemon. While they are off, bare
+`owner/repo` is GitHub shorthand and the daemon never contacts a registry.
+
+With registry installs on, `paseo plugin install owner/slug` installs the registry's reviewed
+artifact, and GitHub shorthand requires `github:`. Registry installs
 keep the registry URL and ID, so update checks use its approved pin. Explicit version/ref
 selection is unavailable for registry installs; install an explicit source to select your own.

-Registry overviews are untrusted author content, even before installation. Render them with
-`@getpaseo/protocol/plugin-overview`: no raw HTML, HTTPS-only links and images, no relative
-URLs, and isolated external links. The website adapter and corpus tests live in
-`packages/website/src/plugins/overview.tsx` and `overview.test.tsx`; the reusable corpus is
-`packages/protocol/tests/fixtures/plugin-overview.json`. A future app overview must share
-this policy. Installed-plugin descriptions in the app remain plain text.
-
 Use `host/owner/slug` for a registry at `https://host`, or set
 `PASEO_PLUGIN_REGISTRY` to change the default base (including a path prefix).
 Private registry credentials live in daemon config under
@@ -142,13 +138,13 @@ owns static hosting, record shapes, pins, and advisory install counts.

 ## Install a Git source

-GitHub repositories use `git:owner/repository` or `github:owner/repository`. Other hosts use a Git
-URL.
+GitHub repositories use `owner/repository` or `github:owner/repository`. Other hosts use a Git
+URL. An existing directory still wins over source resolution.

 ```bash
-paseo plugin install git:owner/repository
+paseo plugin install owner/repository
 paseo plugin install https://gitlab.com/group/repository.git
-paseo plugin install git:owner/monorepo:plugins/review
+paseo plugin install owner/monorepo:plugins/review
 paseo plugin install github:owner/repository --ref main
 ```

@@ -159,9 +155,8 @@ and ask for approval. `ls` reports the installed commit without contacting the r
 ## Managed source ownership

 The [public source reference](../public-docs/plugins/reference.md#plugin-sources) owns identifier
-syntax and npm prerequisites; the [publishing guide](../public-docs/plugins/publishing.md) owns distribution. The CLI resolves directory sources before
-calling `installPluginSource`; see the public source reference for CLI and app path semantics.
-Only the daemon reads plugin files and acquires sources.
+syntax and npm prerequisites; the [publishing guide](../public-docs/plugins/publishing.md) owns distribution. Both clients send the source unchanged
+through `installPluginSource`; only the daemon resolves host paths and acquires sources.

 `ManagedPluginSources` owns acquisition and offline source description. Config stores the active
 directory; sources.json stores managed kind and the Git acquisition remote. The remote is needed
@@ -103,7 +103,7 @@ OpenCode owns user message IDs. Do not pass Paseo-generated IDs to OpenCode prom

 Active-turn steering is an optional `AgentSession.steerActiveTurn` operation. The manager owns admission against its exact foreground turn, canonical user-message creation, echo reconciliation, and falls back to the normal interrupt-and-replace path only when the adapter reports `unavailable`. An adapter error leaves the steer's fate ambiguous and must surface without an interrupt or retry. Codex calls `turn/steer` with the native expected turn and Paseo client user-message ID. Claude pushes an admitted steer into the exact active SDK query input; isolated control commands remain unavailable. OpenCode calls `session/prompt_async` with an OpenCode-generated message ID; the server queues the prompt while busy and the next LLM call in the same Paseo turn includes it. Pi sends its native `steer` RPC, which queues the message for delivery after the in-flight assistant turn's tool calls. Slash-command inputs report `unavailable` because pi rejects extension commands on the steer path, and echo identity is correlated by message text because pi's steer RPC takes no message ID. A missing session reports `unavailable` and uses the normal interrupt fallback.

-A steering adapter also owes its interrupt: stopping a turn must discard the steers the provider has not read yet, or one of them resumes the turn the user just stopped. Codex clears pending input when it aborts a turn; Claude does not, so its adapter cancels the SDK messages it queued before calling `query.interrupt()`. It calls `query.interrupt()` only while a main-session turn is in flight (between `system/init` and that turn's `result`): with the main session idle, an interrupt reaches only background subagents and no result follows it, so the adapter withdraws its unstarted messages and stops there. The adapter also declares `perTaskStopAffordance`, because without it the CLI kills every background subagent on interrupt. Pi requires `clear_queue` before `abort`; older binaries without that RPC retain their native queue behavior until the pi compatibility floor reaches 0.84.4.
+A steering adapter also owes its interrupt: stopping a turn must discard the steers the provider has not read yet, or one of them resumes the turn the user just stopped. Codex clears pending input when it aborts a turn; Claude does not, so its adapter cancels the SDK messages it queued before calling `query.interrupt()`. Pi requires `clear_queue` before `abort`; older binaries without that RPC retain their native queue behavior until the pi compatibility floor reaches 0.84.4.

 `SteerActiveTurnOptions.clearPendingPermissions` makes permission release part of the provider contract. A provider that accepts such a steer queues it first, denies permissions blocking its delivery, and stops once the steer is read. Steers without the flag leave permissions open. A denied plan remains in the timeline because the pending card was the only other copy of its text.

@@ -1,7 +0,0 @@
-Added
- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls
- Added Antigravity as a provider that drives the installed agy CLI, always in Full access
- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh
- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin
-
-Full notes: https://paseo.sh/changelog
@@ -1,7 +0,0 @@
-Added
- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls
- Added Antigravity as a provider that drives the installed agy CLI, always in Full access
- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh
- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin
-
-Full notes: https://paseo.sh/changelog
@@ -1,7 +0,0 @@
-Added
- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls
- Added Antigravity as a provider that drives the installed agy CLI, always in Full access
- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh
- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin
-
-Full notes: https://paseo.sh/changelog
@@ -1,7 +0,0 @@
-Added
- Added Muse Code as a provider, with model, approval mode, and reasoning effort controls
- Added Antigravity as a provider that drives the installed agy CLI, always in Full access
- Added Usage, opened from the sidebar footer as a dialog on desktop and a sheet on mobile, showing each subscription account's quota windows with Refresh
- Added an opt-in Usage summary to the sidebar footer that shows the windows you pin
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Added
- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer
-
-Fixed
- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents
- Fixed subagents that finish while the app is disconnected staying "working" until one is opened
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Added
- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer
-
-Fixed
- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents
- Fixed subagents that finish while the app is disconnected staying "working" until one is opened
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Added
- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer
-
-Fixed
- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents
- Fixed subagents that finish while the app is disconnected staying "working" until one is opened
-
-Full notes: https://paseo.sh/changelog
@@ -1,8 +0,0 @@
-Added
- Added Claude Haiku 5.5 for Claude Code 2.1.293 and newer
-
-Fixed
- Fixed Claude tool calls that run longer than 30 seconds, such as WebFetch or MCP tools, showing up as subagents
- Fixed subagents that finish while the app is disconnected staying "working" until one is opened
-
-Full notes: https://paseo.sh/changelog
@@ -1 +1 @@
-sha256-AKY6OMZgHeyn/To/2zsmtfb5C4fKniUp8gvpEYaR7/o=
+sha256-mQOyGIvwVt45hldUnYuZTKJg4mLPm7d8jXXNlSQnExE=
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.11.1",
+  "version": "0.11.0-beta.5",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "workspaces": [
@@ -36413,7 +36413,7 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "dependencies": {
        "@codemirror/commands": "6.10.4",
        "@codemirror/language": "6.12.4",
@@ -37496,12 +37496,12 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.11.1",
-        "@getpaseo/protocol": "0.11.1",
-        "@getpaseo/server": "0.11.1",
+        "@getpaseo/client": "0.11.0-beta.5",
+        "@getpaseo/protocol": "0.11.0-beta.5",
+        "@getpaseo/server": "0.11.0-beta.5",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -37748,10 +37748,10 @@
    },
    "packages/client": {
      "name": "@getpaseo/client",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "dependencies": {
-        "@getpaseo/protocol": "0.11.1",
-        "@getpaseo/relay": "0.11.1",
+        "@getpaseo/protocol": "0.11.0-beta.5",
+        "@getpaseo/relay": "0.11.0-beta.5",
        "zod": "^4.4.3"
      },
      "devDependencies": {
@@ -37762,7 +37762,7 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "license": "Apache-2.0",
      "dependencies": {
        "@getpaseo/cli": "*",
@@ -38006,7 +38006,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "license": "MIT",
      "devDependencies": {
        "@types/jest": "^29.5.14",
@@ -38902,7 +38902,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "dependencies": {
        "@codemirror/language": "6.12.4",
        "@codemirror/legacy-modes": "^6.5.3",
@@ -38931,14 +38931,14 @@
    },
    "packages/plugin": {
      "name": "@getpaseo/plugin",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "dependencies": {
        "@agentclientprotocol/sdk": "^1.4.0",
        "use-sync-external-store": "^1.6.0"
      },
      "devDependencies": {
-        "@getpaseo/client": "0.11.1",
-        "@getpaseo/protocol": "0.11.1",
+        "@getpaseo/client": "0.11.0-beta.5",
+        "@getpaseo/protocol": "0.11.0-beta.5",
        "@types/node": "^20.9.0",
        "@types/react": "~19.2.0",
        "react": "19.1.0",
@@ -38948,8 +38948,8 @@
        "zod": "^4.4.3"
      },
      "peerDependencies": {
-        "@getpaseo/client": "0.11.1",
-        "@getpaseo/protocol": "0.11.1",
+        "@getpaseo/client": "0.11.0-beta.5",
+        "@getpaseo/protocol": "0.11.0-beta.5",
        "react": "~19.1.0",
        "react-native": ">=0.81.5",
        "zod": "^4.4.3"
@@ -38971,7 +38971,7 @@
    },
    "packages/protocol": {
      "name": "@getpaseo/protocol",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "dependencies": {
        "semver": "^7.8.5",
        "zod": "^4.4.3"
@@ -38998,7 +38998,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "dependencies": {
        "base64-js": "^1.5.1",
        "tweetnacl": "^1.0.3",
@@ -39216,16 +39216,16 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.17.1",
        "@anthropic-ai/claude-agent-sdk": "0.3.246",
        "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.11.1",
-        "@getpaseo/highlight": "0.11.1",
-        "@getpaseo/plugin": "0.11.1",
-        "@getpaseo/protocol": "0.11.1",
-        "@getpaseo/relay": "0.11.1",
+        "@getpaseo/client": "0.11.0-beta.5",
+        "@getpaseo/highlight": "0.11.0-beta.5",
+        "@getpaseo/plugin": "0.11.0-beta.5",
+        "@getpaseo/protocol": "0.11.0-beta.5",
+        "@getpaseo/relay": "0.11.0-beta.5",
        "@isaacs/ttlcache": "^2.1.4",
        "@modelcontextprotocol/sdk": "1.29.0",
        "@opencode-ai/sdk": "1.14.46",
@@ -40146,7 +40146,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.29.1",
        "@cloudflare/workers-types": "^4.20260317.1",
@@ -40174,7 +40174,6 @@
        "@types/react": "^19.1.6",
        "@types/react-dom": "^19.1.5",
        "@vitejs/plugin-react": "^4.5.1",
-        "parse5": "^7.3.0",
        "typescript": "^5.9.3",
        "vite": "^7.3.3",
        "vite-tsconfig-paths": "^5.1.4",
@@ -41754,7 +41753,7 @@
    },
    "plugins": {
      "name": "@getpaseo/builtin-plugins",
-      "version": "0.11.1",
+      "version": "0.11.0-beta.5",
      "dependencies": {
        "@getpaseo/plugin": "*",
        "zod": "^4.4.3"
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.11.1",
+  "version": "0.11.0-beta.5",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -1,4 +1,3 @@
-import overviewCorpus from "../../../protocol/tests/fixtures/plugin-overview.json";
 import { pluginRequirements } from "../support/helpers/plugin-fixture";
 import { execFileSync } from "node:child_process";
 import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
@@ -558,7 +557,7 @@ async function retryGitInstallAndInspectRows(

  await installPlugin(page, missingSource);
  await expect(page.getByTestId("plugin-management-feedback")).toContainText(
-    `Plugin directory does not exist: ${missingSource}`,
+    "Plugin source is neither an existing directory nor a Git URL",
  );
  await expect(page.getByLabel("Plugin source")).toHaveValue(missingSource);
  await capturePluginInstallForm(page, testInfo, "compact-error");
@@ -656,27 +655,3 @@ async function reloadAndRemoveNpmPlugin(page: Page) {
  await expect(page.getByText("Removed npm-review", { exact: true })).toBeVisible();
  await expect(page.getByLabel("npm-review running")).toHaveCount(0);
 }
-
-test("renders installed-plugin descriptions as plain text", async ({ page, pluginEnvironment }) => {
-  const description = overviewCorpus.map(({ markdown }) => markdown).join("\n\n");
-  await installPluginWithUntrustedDescription(pluginEnvironment, description);
-  await gotoAppShell(page);
-  await openPluginSettings(page);
-  const text = page.getByText(description, { exact: true });
-  await expect(text).toBeVisible();
-  // This field must remain a text node, with no Markdown links, images, or HTML children.
-  expect(await text.evaluate((element) => element.childElementCount)).toBe(0);
-});
-
-async function installPluginWithUntrustedDescription(
-  environment: PluginEnvironment,
-  description: string,
-) {
-  const directory = await createDirectoryPlugin(
-    environment.directory,
-    "plain-text-plugin",
-    description,
-    "Plain text plugin",
-  );
-  await environment.client.installPluginSource({ source: directory });
-}
@@ -1,5 +1,5 @@
 import { expect, type Page } from "@playwright/test";
-import { en } from "@/i18n/resources/en";
+import { getStateLabel } from "@/git/pull-request-panel/data";
 import { openPullRequestPanel } from "./workspace-tabs";

 export async function openPrPane(page: Page): Promise<void> {
@@ -14,7 +14,7 @@ export async function expectPrPaneState(
  page: Page,
  state: "open" | "merged" | "closed" | "draft",
 ): Promise<void> {
-  await expect(page.getByTestId("pr-pane-state")).toHaveText(en.workspace.git.pr.states[state], {
+  await expect(page.getByTestId("pr-pane-state")).toHaveText(getStateLabel(state), {
    timeout: 15_000,
  });
 }
@@ -244,16 +244,13 @@ const FOOTER_GEOMETRY_TOLERANCE = 0.01;
 * Settings together at the end.
 */
 export async function expectFooterIconRow(page: Page): Promise<void> {
-  // Read one browser-frame snapshot: the compact drawer can translate between separate RPCs.
-  const boxes = await page
-    .locator(FOOTER_ICON_TEST_IDS.map((testID) => `[data-testid="${testID}"]:visible`).join(","))
-    .evaluateAll((elements) =>
-      elements.map((element) => {
-        const { x, y, width, height } = element.getBoundingClientRect();
-        return { testID: element.getAttribute("data-testid"), x, y, width, height };
-      }),
-    );
-  expect(boxes.map((box) => box.testID)).toEqual(FOOTER_ICON_TEST_IDS);
+  const boxes = (
+    await Promise.all(
+      FOOTER_ICON_TEST_IDS.map((testID) =>
+        page.locator(`[data-testid="${testID}"]:visible`).first().boundingBox(),
+      ),
+    )
+  ).map((box) => box!);
  const [first] = boxes;
  for (const box of boxes) {
    expect(Math.abs(box.y + box.height / 2 - first!.y - first!.height / 2)).toBeLessThan(2);
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.11.1",
+  "version": "0.11.0-beta.5",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -50,7 +50,7 @@ import { useToast } from "@/contexts/toast-context";
 import { toErrorMessage } from "@/utils/error-messages";
 import { showProviderNoticeToast } from "@/utils/provider-notice-toast";
 import { applyCheckoutStatusUpdateFromEvent } from "@/git/checkout-status-cache";
-import { resyncProviderSubagents, useProviderSubagentStore } from "@/subagents/provider-store";
+import { useProviderSubagentStore } from "@/subagents/provider-store";

 // Re-export types from session-store and draft-store for backward compatibility
 export type { DraftInput } from "@/stores/draft-store";
@@ -532,14 +532,9 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
      }
    });

-    const unsubProviderSubagentUpdate = feeds.subscribe({
-      snapshot: () => {
-        void resyncProviderSubagents(client, serverId);
-      },
-      update: (message) => {
-        if (message.type !== "agent.provider_subagents.update") return;
-        useProviderSubagentStore.getState().applyUpdate(serverId, message.payload);
-      },
+    const unsubProviderSubagentUpdate = onFeed("agent.provider_subagents.update", (message) => {
+      if (message.type !== "agent.provider_subagents.update") return;
+      useProviderSubagentStore.getState().applyUpdate(serverId, message.payload);
    });

    const unsubCheckoutStatusUpdate = onFeed("checkout_status_update", (message) => {
@@ -9,13 +9,12 @@ import {
  isPipelineActiveStatus,
  mapPipelineStatus,
 } from "@/git/forges/gitlab";
-import { i18n } from "@/i18n/i18next";
 import { IDENTITY_COLOR_NAMES, identityColor } from "@/styles/identity-colors";
 import {
  deriveAvatarColor,
  formatAge,
-  getActivityVerbKey,
-  getStateLabelKey,
+  getActivityVerb,
+  getStateLabel,
  mapPrPaneData,
 } from "./data";

@@ -780,34 +779,37 @@ describe("formatAge", () => {
  });
 });

-const english = i18n.getFixedT("en");
-const french = i18n.getFixedT("fr");
-
-describe("getStateLabelKey", () => {
+describe("getStateLabel", () => {
  it.each([
-    ["open", "Open", "Ouverte"],
-    ["draft", "Draft", "Brouillon"],
-    ["merged", "Merged", "Fusionnée"],
-    ["closed", "Closed", "Fermée"],
-  ] as const)("labels %s as %s, and %s in French", (state, englishLabel, frenchLabel) => {
-    expect(english(getStateLabelKey(state))).toBe(englishLabel);
-    expect(french(getStateLabelKey(state))).toBe(frenchLabel);
+    ["open", "Open"],
+    ["draft", "Draft"],
+    ["merged", "Merged"],
+    ["closed", "Closed"],
+  ] as const)("maps %s → %s", (state, expected) => {
+    expect(getStateLabel(state)).toBe(expected);
  });
 });

-describe("getActivityVerbKey", () => {
-  it.each([
-    [{ kind: "comment" }, "Commented", "A commenté"],
-    [{ kind: "review", reviewState: "approved" }, "Approved", "A approuvé"],
-    [
-      { kind: "review", reviewState: "changes_requested" },
+describe("getActivityVerb", () => {
+  it("returns Commented for comment kind", () => {
+    expect(getActivityVerb({ kind: "comment" })).toBe("Commented");
+  });
+
+  it("returns Approved for approved review", () => {
+    expect(getActivityVerb({ kind: "review", reviewState: "approved" })).toBe("Approved");
+  });
+
+  it("returns Requested changes for changes_requested review", () => {
+    expect(getActivityVerb({ kind: "review", reviewState: "changes_requested" })).toBe(
      "Requested changes",
-      "A demandé des modifications",
-    ],
-    [{ kind: "review", reviewState: "commented" }, "Reviewed", "A relu"],
-    [{ kind: "review" }, "Reviewed", "A relu"],
-  ] as const)("labels %o as %s, and %s in French", (item, englishVerb, frenchVerb) => {
-    expect(english(getActivityVerbKey(item))).toBe(englishVerb);
-    expect(french(getActivityVerbKey(item))).toBe(frenchVerb);
+    );
+  });
+
+  it("returns Reviewed for a commented review with body (generic case)", () => {
+    expect(getActivityVerb({ kind: "review", reviewState: "commented" })).toBe("Reviewed");
+  });
+
+  it("returns Reviewed when reviewState is undefined", () => {
+    expect(getActivityVerb({ kind: "review" })).toBe("Reviewed");
  });
 });
@@ -318,18 +318,16 @@ function parsePullRequestNumber(url: string): number | null {
  }
 }

-export function getStateLabelKey(state: PrState) {
-  if (state === "draft") return "workspace.git.pr.states.draft";
-  if (state === "merged") return "workspace.git.pr.states.merged";
-  if (state === "closed") return "workspace.git.pr.states.closed";
-  return "workspace.git.pr.states.open";
+export function getStateLabel(state: PrState): string {
+  if (state === "draft") return "Draft";
+  if (state === "merged") return "Merged";
+  if (state === "closed") return "Closed";
+  return "Open";
 }

-export function getActivityVerbKey(item: Pick<PrPaneActivity, "kind" | "reviewState">) {
-  if (item.kind === "comment") return "workspace.git.pr.activity.commented";
-  if (item.reviewState === "approved") return "workspace.git.pr.activity.approved";
-  if (item.reviewState === "changes_requested") {
-    return "workspace.git.pr.activity.requestedChanges";
-  }
-  return "workspace.git.pr.activity.reviewed";
+export function getActivityVerb(item: Pick<PrPaneActivity, "kind" | "reviewState">): string {
+  if (item.kind === "comment") return "Commented";
+  if (item.reviewState === "approved") return "Approved";
+  if (item.reviewState === "changes_requested") return "Requested changes";
+  return "Reviewed";
 }
@@ -63,7 +63,7 @@ import {
  canAddPullRequestActivityToChat,
 } from "./context-attachment";
 import { ChecksSection, getCheckIdentity } from "./checks-section";
-import { getActivityVerbKey, getStateLabelKey } from "./data";
+import { getActivityVerb, getStateLabel } from "./data";
 import type { PrPaneActivity, PrPaneCheck, PrPaneData, PrState } from "./data";
 import type { ForgeSpecificStatusFacts } from "@/git/merge-capability";
 import { CheckPresentationIcon } from "@/git/check-presentation.view";
@@ -538,7 +538,7 @@ export function PullRequestPane({
              <View style={styles.metaLine}>
                <StateIcon size={14} uniProps={statePresentation.iconColor} />
                <Text style={stateLabelStyle(data.state)} testID="pr-pane-state">
-                  {t(getStateLabelKey(data.state))}
+                  {getStateLabel(data.state)}
                </Text>
                {nativeHeaderMeta}
                {repoIdentity ? (
@@ -760,8 +760,7 @@ function ActivityAvatar({ activity, size }: { activity: PrPaneActivity; size: nu
 }

 function ActivityVerb({ activity }: { activity: PrPaneActivity }) {
-  const { t } = useTranslation();
-  const verb = t(getActivityVerbKey(activity)).toLowerCase();
+  const verb = getActivityVerb(activity).toLowerCase();
  if (activity.kind === "review" && activity.reviewState === "approved") {
    return (
      <View style={styles.verbGroup}>
@@ -1066,12 +1065,8 @@ function ThreadBlock({
            ? formatPullRequestThreadPath(thread.location)
            : t("workspace.git.pr.thread.discussion")}
        </Text>
-        {thread.isResolved ? (
-          <StatusBadge label={t("workspace.git.pr.thread.resolved")} variant="success" />
-        ) : null}
-        {thread.location?.isOutdated ? (
-          <StatusBadge label={t("workspace.git.pr.thread.outdated")} />
-        ) : null}
+        {thread.isResolved ? <StatusBadge label="Resolved" variant="success" /> : null}
+        {thread.location?.isOutdated ? <StatusBadge label="Outdated" /> : null}
        <View style={styles.headerTrailing}>
          {collapsed ? (
            <View style={styles.threadCount}>
@@ -76,7 +76,6 @@ const untranslatedLocalFallbacks = [

 const pullRequestPanelSources = [
  "git/pull-request-panel/pane.tsx",
-  "git/pull-request-panel/data.ts",
  "git/pull-request-panel/checks-section.tsx",
  "components/sidebar/sidebar-status-list.tsx",
 ] as const;
@@ -88,16 +87,6 @@ const untranslatedPullRequestPanelLabels = [
  "Adding...",
  "Comment actions",
  "Thread actions",
-  "Commented",
-  "Approved",
-  "Requested changes",
-  "Reviewed",
-  "Draft",
-  "Merged",
-  "Closed",
-  "Open",
-  "Resolved",
-  "Outdated",
 ] as const;

 function findUntranslatedPullRequestPanelLabels(): string[] {
@@ -255,14 +244,6 @@ describe("translation resources", () => {
      expect(pr.actions.addingToChat).not.toBe(englishPr.actions.addingToChat);
      expect(pr.accessibility.commentActions).not.toBe(englishPr.accessibility.commentActions);
      expect(pr.accessibility.threadActions).not.toBe(englishPr.accessibility.threadActions);
-      for (const verb of Object.keys(englishPr.activity) as (keyof typeof englishPr.activity)[]) {
-        expect(pr.activity[verb]).not.toBe(englishPr.activity[verb]);
-      }
-      for (const state of Object.keys(englishPr.states) as (keyof typeof englishPr.states)[]) {
-        expect(pr.states[state]).not.toBe(englishPr.states[state]);
-      }
-      expect(pr.thread.resolved).not.toBe(englishPr.thread.resolved);
-      expect(pr.thread.outdated).not.toBe(englishPr.thread.outdated);
      expect(resource.sidebar.statusGroupAccessibility).not.toBe(
        en.sidebar.statusGroupAccessibility,
      );
@@ -1070,8 +1070,6 @@ export const ar: TranslationResources = {
        },
        thread: {
          discussion: "سلسلة المناقشة",
-          resolved: "تم الحل",
-          outdated: "قديم",
        },
        errors: {
          statusLoadFailed: "غير قادر على تحميل حالة طلب السحب",
@@ -1078,8 +1078,6 @@ export const en = {
        },
        thread: {
          discussion: "Discussion thread",
-          resolved: "Resolved",
-          outdated: "Outdated",
        },
        errors: {
          statusLoadFailed: "Unable to load pull request status",
@@ -2162,7 +2160,7 @@ export const en = {
      globalTitle: "Enable plugins",
      globalHint: "Global switch for every configured plugin",
      sourceLabel: "Plugin source",
-      sourcePlaceholder: "owner/slug, directory, Git URL, or npm package",
+      sourcePlaceholder: "Directory, Git URL, or npm package",
      docs: "Docs",
      install: "Install plugin",
      installing: "Installing…",
@@ -1093,18 +1093,16 @@ export const es: TranslationResources = {
          open: "Abierto",
        },
        activity: {
-          commented: "Comentó",
-          approved: "Aprobó",
-          requestedChanges: "Solicitó cambios",
-          reviewed: "Revisó",
+          commented: "Comentado",
+          approved: "Aprobado",
+          requestedChanges: "Cambios solicitados",
+          reviewed: "Revisado",
        },
        time: {
          justNow: "En este momento",
        },
        thread: {
          discussion: "Hilo de discusión",
-          resolved: "Resuelto",
-          outdated: "Desactualizado",
        },
        errors: {
          statusLoadFailed: "No se puede cargar el estado de la solicitud de extracción",
@@ -1094,8 +1094,6 @@ export const fr: TranslationResources = {
        },
        thread: {
          discussion: "Fil de discussion",
-          resolved: "Résolu",
-          outdated: "Obsolète",
        },
        errors: {
          statusLoadFailed: "Impossible de charger le statut de la pull request",
@@ -1083,8 +1083,6 @@ export const ja: TranslationResources = {
        },
        thread: {
          discussion: "ディスカッションスレッド",
-          resolved: "解決済み",
-          outdated: "古い",
        },
        errors: {
          statusLoadFailed: "プルリクエストのステータスを読み込めません",
@@ -1077,8 +1077,6 @@ export const ko: TranslationResources = {
        },
        thread: {
          discussion: "토론 스레드",
-          resolved: "해결됨",
-          outdated: "오래됨",
        },
        errors: {
          statusLoadFailed: "풀 리퀘스트 상태를 불러올 수 없습니다",
@@ -27,7 +27,7 @@ export const pluginSettings = {
    globalTitle: "تفعيل الإضافات",
    globalHint: "مفتاح عام لكل الإضافات المضبوطة",
    sourceLabel: "مصدر الإضافة",
-    sourcePlaceholder: "owner/slug, مجلد أو رابط Git أو حزمة npm",
+    sourcePlaceholder: "مجلد أو رابط Git أو حزمة npm",
    docs: "الوثائق",
    install: "تثبيت الإضافة",
    installing: "جارٍ التثبيت…",
@@ -82,7 +82,7 @@ export const pluginSettings = {
    globalTitle: "Activar plugins",
    globalHint: "Interruptor global para todos los plugins configurados",
    sourceLabel: "Fuente del plugin",
-    sourcePlaceholder: "owner/slug, Directorio, URL de Git o paquete npm",
+    sourcePlaceholder: "Directorio, URL de Git o paquete npm",
    docs: "Documentación",
    install: "Instalar plugin",
    installing: "Instalando…",
@@ -137,7 +137,7 @@ export const pluginSettings = {
    globalTitle: "Activer les plugins",
    globalHint: "Interrupteur global pour tous les plugins configurés",
    sourceLabel: "Source du plugin",
-    sourcePlaceholder: "owner/slug, Dossier, URL Git ou paquet npm",
+    sourcePlaceholder: "Dossier, URL Git ou paquet npm",
    docs: "Documentation",
    install: "Installer le plugin",
    installing: "Installation…",
@@ -192,7 +192,7 @@ export const pluginSettings = {
    globalTitle: "プラグインを有効化",
    globalHint: "設定済みプラグインすべての共通スイッチ",
    sourceLabel: "プラグインソース",
-    sourcePlaceholder: "owner/slug, ディレクトリ、Git URL、npm パッケージ",
+    sourcePlaceholder: "ディレクトリ、Git URL、npm パッケージ",
    docs: "ドキュメント",
    install: "プラグインをインストール",
    installing: "インストール中…",
@@ -246,7 +246,7 @@ export const pluginSettings = {
    globalTitle: "플러그인 활성화",
    globalHint: "설정된 모든 플러그인의 전역 스위치",
    sourceLabel: "플러그인 소스",
-    sourcePlaceholder: "owner/slug, 디렉터리, Git URL 또는 npm 패키지",
+    sourcePlaceholder: "디렉터리, Git URL 또는 npm 패키지",
    docs: "문서",
    install: "플러그인 설치",
    installing: "설치 중…",
@@ -301,7 +301,7 @@ export const pluginSettings = {
    globalTitle: "Ativar plugins",
    globalHint: "Controle global para todos os plugins configurados",
    sourceLabel: "Fonte do plugin",
-    sourcePlaceholder: "owner/slug, Diretório, URL Git ou pacote npm",
+    sourcePlaceholder: "Diretório, URL Git ou pacote npm",
    docs: "Documentação",
    install: "Instalar plugin",
    installing: "Instalando…",
@@ -356,7 +356,7 @@ export const pluginSettings = {
    globalTitle: "Включить плагины",
    globalHint: "Общий переключатель для всех настроенных плагинов",
    sourceLabel: "Источник плагина",
-    sourcePlaceholder: "owner/slug, Каталог, URL Git или пакет npm",
+    sourcePlaceholder: "Каталог, URL Git или пакет npm",
    docs: "Документация",
    install: "Установить плагин",
    installing: "Установка…",
@@ -410,7 +410,7 @@ export const pluginSettings = {
    globalTitle: "启用插件",
    globalHint: "所有已配置插件的全局开关",
    sourceLabel: "插件来源",
-    sourcePlaceholder: "owner/slug, 目录、Git URL 或 npm 包",
+    sourcePlaceholder: "目录、Git URL 或 npm 包",
    docs: "文档",
    install: "安装插件",
    installing: "正在安装…",
@@ -1084,17 +1084,15 @@ export const ptBR: TranslationResources = {
        },
        activity: {
          commented: "Comentou",
-          approved: "Aprovou",
+          approved: "Aprovado",
          requestedChanges: "Solicitou alterações",
-          reviewed: "Revisou",
+          reviewed: "Revisado",
        },
        time: {
          justNow: "agora mesmo",
        },
        thread: {
          discussion: "Tópico de discussão",
-          resolved: "Resolvido",
-          outdated: "Desatualizado",
        },
        errors: {
          statusLoadFailed: "Não foi possível carregar o status da pull request",
@@ -1087,8 +1087,6 @@ export const ru: TranslationResources = {
        },
        thread: {
          discussion: "Ветка обсуждения",
-          resolved: "Решено",
-          outdated: "Устарело",
        },
        errors: {
          statusLoadFailed: "Не удалось загрузить статус PR",
@@ -1046,24 +1046,22 @@ export const zhCN: TranslationResources = {
          },
        },
        states: {
-          draft: "草稿",
-          merged: "已合并",
+          draft: "Draft",
+          merged: "已 merge",
          closed: "已关闭",
-          open: "开放",
+          open: "Open",
        },
        activity: {
          commented: "已评论",
          approved: "已批准",
          requestedChanges: "请求修改",
-          reviewed: "已审查",
+          reviewed: "已 review",
        },
        time: {
          justNow: "刚刚",
        },
        thread: {
          discussion: "讨论主题",
-          resolved: "已解决",
-          outdated: "已过时",
        },
        errors: {
          statusLoadFailed: "无法加载 Pull Request 状态",
@@ -3047,34 +3047,6 @@ describe("HostRuntimeStore", () => {
    useSessionStore.getState().clearSession(host.serverId);
  });

-  it("drains a queued message as a steer so a turn the agent just started is not interrupted", async () => {
-    const host = makeHost({ serverId: "srv_steer_queue_drain" });
-    const fakeClient = new FakeDaemonClient();
-    const store = new HostRuntimeStore({
-      deps: {
-        createClient: () => fakeClient as unknown as DaemonClient,
-        connectToDaemon: async () => ({
-          client: fakeClient as unknown as DaemonClient,
-          serverId: host.serverId,
-          hostname: null,
-        }),
-        getClientId: async () => "cid_steer_queue_drain",
-      },
-    });
-    const sessionStore = useSessionStore.getState();
-    sessionStore.initializeSession(host.serverId, fakeClient as unknown as DaemonClient, 1);
-    sessionStore.setQueuedMessages(
-      host.serverId,
-      new Map([["agent", [{ id: "queued", text: "next task", attachments: [] }]]]),
-    );
-
-    store.drainQueuedAgentMessage(host.serverId, "agent");
-    await fakeClient.waitForSentMessages(1);
-
-    expect(fakeClient.sentAgentMessages[0]?.[2]?.activeTurnBehavior).toBe("steer");
-    sessionStore.clearSession(host.serverId);
-  });
-
  it("uses legacy GitHub attachments when draining a queue for an old daemon", async () => {
    const host = makeHost({ serverId: "srv_legacy_queue_attachment" });
    const fakeClient = new FakeDaemonClient();
@@ -2426,11 +2426,6 @@ export class HostRuntimeStore {
          }),
          encodeImages,
          submission: createMessageSubmissionWriter(serverId),
-          // The queue drains when the agent goes idle, but the agent can start a turn of its own
-          // in that same moment (a wake-up after background work). Steering folds the message
-          // into that turn instead of interrupting it; with no turn running, the daemon starts
-          // a normal one.
-          activeTurnBehavior: "steer",
        });
      },
    })
@@ -1,11 +1,8 @@
 import { DaemonConnectionError } from "@getpaseo/client/internal/daemon-client";
 import { afterEach, describe, expect, test } from "vitest";
-import type { ProviderSubagentDescriptorPayload } from "@getpaseo/protocol/messages";
 import {
  observeProviderSubagentTimeline,
  providerSubagentKey,
-  refreshProviderSubagents,
-  resyncProviderSubagents,
  useProviderSubagentStore,
 } from "./provider-store";

@@ -18,7 +15,6 @@ afterEach(() => {
    descriptors: new Map(),
    timelines: new Map(),
    hiddenFromTrack: new Set(),
-    trackedParents: new Set(),
  });
 });

@@ -731,96 +727,3 @@ describe("projected child history", () => {
    expect(current().lastSeq).toBe(2000);
  });
 });
-
-describe("resyncing after the update feed resubscribes", () => {
-  function child(
-    id: string,
-    parentAgentId: string,
-    status: ProviderSubagentDescriptorPayload["status"],
-  ): ProviderSubagentDescriptorPayload {
-    return {
-      id,
-      parentAgentId,
-      provider: "claude",
-      title: "Explore",
-      description: null,
-      status,
-      createdAt: "2026-10-07T10:00:00.000Z",
-      updatedAt: "2026-10-07T10:00:00.000Z",
-      toolCallId: id,
-    };
-  }
-
-  function fakeDaemon(lists: Record<string, ProviderSubagentDescriptorPayload[]>) {
-    const requested: string[] = [];
-    return {
-      requested,
-      lists,
-      client: {
-        listProviderSubagents: async (parentAgentId: string) => {
-          requested.push(parentAgentId);
-          return {
-            requestId: "list",
-            parentAgentId,
-            subagents: lists[parentAgentId] ?? [],
-            error: null,
-          };
-        },
-      },
-    };
-  }
-
-  const status = (parentAgentId: string, subagentId: string) =>
-    useProviderSubagentStore
-      .getState()
-      .descriptors.get(providerSubagentKey(SERVER_ID, parentAgentId, subagentId))?.status;
-
-  test("catches up on children that finished or started while updates were not delivered", async () => {
-    const daemon = fakeDaemon({ [PARENT_ID]: [child("child-1", PARENT_ID, "running")] });
-    await refreshProviderSubagents(daemon.client, SERVER_ID, PARENT_ID);
-    expect(status(PARENT_ID, "child-1")).toBe("running");
-
-    // The connection dropped: the daemon finished child-1 and ran child-2 without telling us.
-    daemon.lists[PARENT_ID] = [
-      child("child-1", PARENT_ID, "completed"),
-      child("child-2", PARENT_ID, "completed"),
-    ];
-    await resyncProviderSubagents(daemon.client, SERVER_ID);
-
-    expect(status(PARENT_ID, "child-1")).toBe("completed");
-    expect(status(PARENT_ID, "child-2")).toBe("completed");
-  });
-
-  test("catches up on a parent whose first list failed while disconnected", async () => {
-    const daemon = fakeDaemon({});
-    const disconnected = {
-      listProviderSubagents: async () => {
-        throw new DaemonConnectionError("Transport not connected");
-      },
-    };
-    await expect(
-      refreshProviderSubagents(disconnected, SERVER_ID, PARENT_ID),
-    ).rejects.toBeInstanceOf(DaemonConnectionError);
-    useProviderSubagentStore.getState().applyUpdate(SERVER_ID, {
-      kind: "upsert",
-      subagent: child("child-1", PARENT_ID, "running"),
-    });
-
-    // The connection dropped again: the daemon finished child-1 without telling us.
-    daemon.lists[PARENT_ID] = [child("child-1", PARENT_ID, "completed")];
-    await resyncProviderSubagents(daemon.client, SERVER_ID);
-
-    expect(status(PARENT_ID, "child-1")).toBe("completed");
-  });
-
-  test("lists again only the parents this server was showing", async () => {
-    const daemon = fakeDaemon({});
-    await refreshProviderSubagents(daemon.client, SERVER_ID, PARENT_ID);
-    await refreshProviderSubagents(daemon.client, "server-2", "other-parent");
-    daemon.requested.length = 0;
-
-    await resyncProviderSubagents(daemon.client, SERVER_ID);
-
-    expect(daemon.requested).toEqual([PARENT_ID]);
-  });
-});
@@ -28,9 +28,6 @@ interface ProviderSubagentState {
  descriptors: Map<string, ProviderSubagentDescriptorPayload>;
  timelines: Map<string, ProviderSubagentTimelineState>;
  hiddenFromTrack: Set<string>;
-  /** Parents whose list this client asked for, so a resubscribed update feed can catch them up. */
-  trackedParents: Set<string>;
-  trackParent(serverId: string, parentAgentId: string): void;
  hideFromTrack(serverId: string, parentAgentId: string, subagentIds: readonly string[]): void;
  replaceList(
    serverId: string,
@@ -87,7 +84,6 @@ export function refreshProviderSubagents(
  const pending = clientRequests.get(requestKey);
  if (pending) return pending;

-  useProviderSubagentStore.getState().trackParent(serverId, parentAgentId);
  const request = client
    .listProviderSubagents(parentAgentId)
    .then((payload) => {
@@ -105,27 +101,6 @@ function parentPrefix(serverId: string, parentAgentId: string): string {
  return `${serverId}\0${parentAgentId}\0`;
 }

-/**
- * Updates are not replayed across a reconnect, so a child that finished or started while the
- * update feed was down stays stale until its parent is listed again. Call this once the feed has
- * resubscribed, so every update after the list is delivered.
- */
-export async function resyncProviderSubagents(
-  client: ProviderSubagentListClient,
-  serverId: string,
-): Promise<void> {
-  const serverPrefix = `${serverId}\0`;
-  const parentAgentIds = [...useProviderSubagentStore.getState().trackedParents]
-    .filter((key) => key.startsWith(serverPrefix))
-    .map((key) => key.slice(serverPrefix.length, -1));
-  await Promise.all(
-    parentAgentIds.map((parentAgentId) =>
-      // A parent that was archived meanwhile has nothing left to catch up.
-      refreshProviderSubagents(client, serverId, parentAgentId).catch(() => undefined),
-    ),
-  );
-}
-
 const EMPTY_TIMELINE: ProviderSubagentTimelineState = {
  tail: [],
  head: [],
@@ -172,14 +147,6 @@ export const useProviderSubagentStore = create<ProviderSubagentState>((set) => (
  descriptors: new Map(),
  timelines: new Map(),
  hiddenFromTrack: new Set(),
-  trackedParents: new Set(),
-  trackParent(serverId, parentAgentId) {
-    set((state) => {
-      const prefix = parentPrefix(serverId, parentAgentId);
-      if (state.trackedParents.has(prefix)) return state;
-      return { trackedParents: new Set(state.trackedParents).add(prefix) };
-    });
-  },
  hideFromTrack(serverId, parentAgentId, subagentIds) {
    set((state) => {
      const hiddenFromTrack = new Set(state.hiddenFromTrack);
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/cli",
-  "version": "0.11.1",
+  "version": "0.11.0-beta.5",
  "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.11.1",
-    "@getpaseo/protocol": "0.11.1",
-    "@getpaseo/server": "0.11.1",
+    "@getpaseo/client": "0.11.0-beta.5",
+    "@getpaseo/protocol": "0.11.0-beta.5",
+    "@getpaseo/server": "0.11.0-beta.5",
    "chalk": "^5.3.0",
    "commander": "^12.0.0",
    "mime-types": "^2.1.35",
@@ -358,21 +358,14 @@ test.skipIf(process.platform === "win32").each([["start"], ["daemon", "run"]])(
        stdio: "ignore",
      });
      const exited = new Promise((resolve) => child!.once("exit", resolve));
-      // The lock file exists before its contents identify the supervisor.
-      let supervisorPid: number | undefined;
      await expect
-        .poll(
-          async () => {
-            supervisorPid = (await readDaemonInstance(home))?.pid;
-            return supervisorPid;
-          },
-          { timeout: 10_000 },
-        )
-        .toBeTypeOf("number");
+        .poll(async () => existsSync(path.join(home, "paseo.pid")), { timeout: 10_000 })
+        .toBe(true);
+      const lock = JSON.parse(await readFile(path.join(home, "paseo.pid"), "utf8"));
      await f.ok(["status", "--home", home]);
      child.kill("SIGINT");
      await exited;
-      expect(() => process.kill(supervisorPid!, 0)).toThrow();
+      expect(() => process.kill(lock.pid, 0)).toThrow();
      expect((await f.ok(["status", "--home", home])).localDaemon).toBe("stopped");
    } finally {
      child?.kill("SIGTERM");
@@ -255,12 +255,12 @@ describe("plugin management commands", () => {
    const stderr = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
    const command = createPluginCommand();

-    await command.parseAsync(["install", "git:owner/monorepo", "--path", "plugins/review"], {
+    await command.parseAsync(["install", "owner/monorepo", "--path", "plugins/review"], {
      from: "user",
    });

    expect(installPluginSource).toHaveBeenCalledWith({
-      source: "git:owner/monorepo:plugins/review",
+      source: "owner/monorepo:plugins/review",
    });
    stderr.mockRestore();
  });
@@ -1,12 +1,9 @@
-import path from "node:path";
-import { expandUserPath } from "../../classify.js";
 import { createInterface } from "node:readline/promises";
 import { reviewPluginUpdates, type UpdateOutcome } from "./update.js";
 import { Command } from "commander";
 import type { PluginListItem, PluginLogEntry } from "@getpaseo/protocol/messages";
 import {
  formatPluginSourceReference,
-  parsePluginSourceReference,
  formatPluginIdentity,
 } from "@getpaseo/protocol/plugin-source-reference";
 import type { CommandOptions, ListResult, OutputSchema, SingleResult } from "../../output/index.js";
@@ -128,18 +125,7 @@ export async function runPluginInstallCommand(
  process.stderr.write(
    "Trusting plugin code: server code and preparation commands run unsandboxed on the daemon host; client code runs inside Paseo. Dependencies and future updates are part of the codebase you trust.\n",
  );
-  const reference = parsePluginSourceReference(source);
-  let resolvedSource = source;
-  if (reference.kind === "directory") {
-    const directory = expandUserPath(reference.source);
-    // An absolute path can target a daemon on a different operating system.
-    const absoluteDirectory =
-      path.posix.isAbsolute(directory) || path.win32.isAbsolute(directory)
-        ? directory
-        : path.resolve(directory);
-    resolvedSource = formatPluginSourceReference(absoluteDirectory, reference.pluginPath);
-  }
-  const sourceReference = formatPluginSourceReference(resolvedSource, options.path);
+  const sourceReference = formatPluginSourceReference(source, options.path);
  const data = await withPluginSourceClient(options.daemonTarget, (client) =>
    client.installPluginSource({
      source: sourceReference,
@@ -229,12 +215,10 @@ export function createPluginCommand(): Command {
    plugin
      .command("install")
      .alias("add")
-      .description(
-        "Trust and install a plugin from a registry, directory, Git repository, or npm package",
-      )
+      .description("Trust and install a plugin from a directory, Git repository, or npm package")
      .argument(
        "<source>",
-        "Registry owner/slug or host/owner/slug, host directory, explicit git:owner/repo or Git URL, or npm: source",
+        "Host directory, GitHub owner/repo, git: or npm: source, optionally followed by :plugin/path",
      )
      .option("--id <id>", "Runtime plugin ID (defaults to paseo-plugin.json id)")
      .option("--ref <ref>", "Git branch, tag, or commit")
@@ -1,4 +1,4 @@
-import { exec, execFile } from "node:child_process";
+import { execFile } from "node:child_process";
 import { mkdtemp, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import path from "node:path";
@@ -9,7 +9,6 @@ import { scaffoldPluginDirectory } from "./scaffold.js";

 const directories: string[] = [];
 const execFileAsync = promisify(execFile);
-const execAsync = promisify(exec);
 const tscPath = createRequire(import.meta.url).resolve("typescript/bin/tsc");

 async function typecheckPlugin(directory: string): Promise<void> {
@@ -29,47 +28,6 @@ afterEach(async () => {
 });

 describe("plugin scaffold", () => {
-  it("creates an author overview beside the manifest", async () => {
-    const parent = await mkdtemp(path.join(tmpdir(), "paseo-plugin-scaffold-"));
-    directories.push(parent);
-    const directory = path.join(parent, "hello-plugin");
-    await scaffoldPluginDirectory(directory);
-
-    const overview = await readFile(path.join(directory, "OVERVIEW.md"), "utf8");
-    const comments = overview.match(/<!--[\s\S]*?-->/g) ?? [];
-    expect(comments).toHaveLength(1);
-    expect(overview.replace(/<!--[\s\S]*?-->/g, "").trim()).toBe("");
-    expect(overview).toContain("required to list");
-    expect(overview).toContain("README");
-    expect(overview).toContain("choosing a plugin in Paseo");
-    expect(overview).toContain("Length follows complexity");
-    expect(overview).toContain("1. Describe what your plugin is and does");
-    expect(overview).toContain("2. Explain how it works only when it is not obvious");
-    expect(overview).toContain("3. Explain setup when needed");
-    expect(overview).toContain("4. Explain capabilities and settings");
-    expect(overview).toContain("permissions");
-    expect(overview).toContain("known limits");
-    expect(overview).not.toContain("This plugin entry was imported");
-    const packageJson = JSON.parse(await readFile(path.join(directory, "package.json"), "utf8"));
-    expect(packageJson.files).toContain("OVERVIEW.md");
-    expect(await readdir(directory)).toContain("paseo-plugin.json");
-  });
-
-  it("includes the author overview in the packed npm artifact", async () => {
-    const parent = await mkdtemp(path.join(tmpdir(), "paseo-plugin-scaffold-"));
-    directories.push(parent);
-    const directory = path.join(parent, "packed-plugin");
-    await scaffoldPluginDirectory(directory);
-
-    const { stdout } = await execAsync("npm pack --dry-run --ignore-scripts --json", {
-      cwd: directory,
-    });
-    const [artifact] = JSON.parse(stdout) as { files: { path: string }[] }[];
-    expect(artifact.files.map((file) => file.path)).toEqual(
-      expect.arrayContaining(["OVERVIEW.md", "paseo-plugin.json"]),
-    );
-  });
-
  it(
    "creates a standalone split-runtime project that typechecks",
    { timeout: 15_000 },
@@ -93,8 +51,6 @@ describe("plugin scaffold", () => {
      expect(JSON.parse(await readFile(path.join(directory, "paseo-plugin.json"), "utf8"))).toEqual(
        {
          id: "hello-plugin",
-          $comment: expect.stringContaining('"icon": "assets/icon.png"'),
-          media: [],
          requirements: { paseo: `>=${cliPackageJson.version}` },
        },
      );
@@ -104,7 +60,6 @@ describe("plugin scaffold", () => {
        version: "0.0.0",
        files: [
          "paseo-plugin.json",
-          "OVERVIEW.md",
          "index.client.ts",
          "index.client.tsx",
          "index.server.ts",
@@ -3,34 +3,6 @@ import path from "node:path";
 import { PluginIdSchema } from "@getpaseo/protocol/messages";
 import { resolveCliVersion } from "../../version.js";

-const OVERVIEW = `<!--
-OVERVIEW.md is required to list your plugin in the registry. Keep it beside
-paseo-plugin.json in your repository at the pinned commit and in your npm package.
-Replace this comment with useful facts before publishing.
-
-This overview is for people choosing a plugin in Paseo, on the plugin page under
-its install command. README assumes a GitHub audience and includes technical
-details, installation instructions, and badges. Long, AI-generated READMEs leave
-people reading past that material to understand what the plugin does.
-
-Write these parts in order, including only what helps someone decide to install:
-
-1. Describe what your plugin is and does in plain terms first.
-2. Explain how it works only when it is not obvious.
-3. Explain setup when needed: settings, accounts, tokens, providers, tools, or
-   other plugins. Include applicable daemon version and operating system
-   requirements. Setup guidance is allowed; installation instructions are not.
-4. Explain capabilities and settings worth understanding, what each option does,
-   what the plugin reads or sends and where, permissions, and known limits.
-
-Length follows complexity; a theme needs one paragraph. Choose headings only
-when they help. Use sentence case and plain factual language, with no em dashes.
-Omit installation commands, badges, changelog, contributing or license sections,
-marketing, and unsupported claims. Avoid implementation filler such as empty
-cleanup functions, theme-token field lists, or lists of absent features.
-->
-`;
-
 const TSCONFIG = {
  compilerOptions: {
    target: "ES2020",
@@ -183,7 +155,6 @@ export async function scaffoldPluginDirectory(
    version: "0.0.0",
    files: [
      "paseo-plugin.json",
-      "OVERVIEW.md",
      "index.client.ts",
      "index.client.tsx",
      "index.server.ts",
@@ -206,19 +177,8 @@ export async function scaffoldPluginDirectory(
  const files = new Map<string, string>([
    [
      "paseo-plugin.json",
-      `${JSON.stringify(
-        {
-          id,
-          $comment:
-            'Add "name": "My plugin" to set a display name. Add "icon": "assets/icon.png" for a PNG inside the package. Add image or video paths (relative to this manifest) or HTTPS URLs to media. Include local assets in package.json files.',
-          media: [],
-          requirements: { paseo: `>=${version}` },
-        },
-        null,
-        2,
-      )}\n`,
+      `${JSON.stringify({ id, requirements: { paseo: `>=${version}` } }, null, 2)}\n`,
    ],
-    ["OVERVIEW.md", OVERVIEW],
    ["package.json", `${JSON.stringify(packageJson, null, 2)}\n`],
    ["tsconfig.json", `${JSON.stringify(TSCONFIG, null, 2)}\n`],
    ["index.client.tsx", CLIENT_ENTRY],
@@ -122,15 +122,10 @@ const EXPECTED_CLAUDE_MODELS = [
    model: "Opus 4.6",
    descriptionFragment: "Most capable",
  },
-  {
-    id: "claude-haiku-5-5",
-    model: "Haiku 5.5",
-    descriptionFragment: "Fastest",
-  },
  {
    id: "claude-haiku-4-5",
    model: "Haiku 4.5",
-    descriptionFragment: "Previous release",
+    descriptionFragment: "Fastest",
  },
 ] as const;

@@ -440,8 +435,8 @@ try {
      "--quiet should print the same ordered model IDs returned by --json",
    );
    assert(
-      claudeModelsFromJson.some((m) => m.id === "claude-haiku-5-5"),
-      "captured --json output should include the current Claude quick-answer model id",
+      claudeModelsFromJson.some((m) => m.id === "claude-sonnet-5-5"),
+      "captured --json output should include the current Claude everyday model id",
    );
    console.log("✓ provider models --quiet outputs model IDs only\n");
  }
@@ -8,13 +8,11 @@ import {
 } from "../../../../scripts/test-support/npm-registry.mjs";
 import assert from "node:assert/strict";
 import { execFile } from "node:child_process";
-import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { promisify } from "node:util";
-import { once } from "node:events";
-import { WebSocket, WebSocketServer } from "ws";
 import { connectToDaemon } from "../../src/utils/client.ts";
 import { createE2ETestContext } from "../helpers/test-daemon.ts";

@@ -47,81 +45,6 @@ async function main(): Promise<void> {
    );
    await writeFile(path.join(directory, "index.server.ts"), pluginSource);

-    // Observe real CLI requests while forwarding them to the isolated daemon.
-    const proxy = new WebSocketServer({ host: "127.0.0.1", port: 0 });
-    const sources: string[] = [];
-    proxy.on("connection", (socket, request) => {
-      const upstream = new WebSocket(`ws://127.0.0.1:${context.port}${request.url}`, {
-        headers: { authorization: request.headers.authorization ?? "" },
-      });
-      const ready = once(upstream, "open");
-      socket.on("message", async (data, isBinary) => {
-        const message = JSON.parse(data.toString());
-        if (
-          message.type === "session" &&
-          message.message.type === "plugin.source.install.request"
-        ) {
-          sources.push(message.message.source);
-        }
-        await ready;
-        upstream.send(data, { binary: isBinary });
-      });
-      upstream.on("message", (data, isBinary) => socket.send(data, { binary: isBinary }));
-      socket.on("close", () => upstream.close());
-      upstream.on("close", () => socket.close());
-    });
-    await once(proxy, "listening");
-    const address = proxy.address();
-    assert.ok(address && typeof address !== "string");
-    const sibling = path.join(context.workDir, "x");
-    const caller = path.join(context.workDir, "caller");
-    await mkdir(caller);
-    await mkdir(path.join(sibling, "sub"), { recursive: true });
-    for (const target of [caller, path.join(sibling, "sub"), context.paseoHome]) {
-      await writeFile(
-        path.join(target, "paseo-plugin.json"),
-        JSON.stringify({
-          id: "relative-cli",
-          requirements: { paseo: `>=${resolveCliVersion()}` },
-        }),
-      );
-      await writeFile(path.join(target, "index.server.ts"), pluginSource);
-    }
-    assert.notEqual(caller, process.cwd()); // The daemon inherits the test runner's cwd.
-    try {
-      for (const [source, expectedSource, expectedDirectory, extraArgs] of [
-        [".", caller, caller, []],
-        ["../x:sub", `${sibling}:sub`, path.join(sibling, "sub"), []],
-        ["../x", `${sibling}:sub`, path.join(sibling, "sub"), ["--path", "sub"]],
-        ["~", context.paseoHome, context.paseoHome, []],
-        ["~/.:.", `${context.paseoHome}:.`, context.paseoHome, []],
-      ] as const) {
-        sources.length = 0;
-        const result = await context.paseo(
-          ["plugin", "add", source, ...extraArgs, "--host", `127.0.0.1:${address.port}`, "--json"],
-          { cwd: caller },
-        );
-        assert.deepEqual(sources, [expectedSource]);
-        assert.equal(result.exitCode, 0, result.stderr);
-        assert.equal(JSON.parse(result.stdout).path, expectedDirectory);
-        const removed = await context.paseo(["plugin", "remove", "relative-cli", "--json"]);
-        assert.equal(removed.exitCode, 0, removed.stderr);
-      }
-      // An absolute path belongs to the daemon's platform, which can differ from the CLI's.
-      const windowsSource = `C:\\${path.basename(context.workDir)}\\missing:sub`;
-      sources.length = 0;
-      const missing = await context.paseo(
-        ["plugin", "add", windowsSource, "--host", `127.0.0.1:${address.port}`, "--json"],
-        { cwd: caller },
-      );
-      assert.deepEqual(sources, [windowsSource]);
-      assert.equal(missing.exitCode, 1);
-      assert.match(missing.stderr, /Plugin directory does not exist/);
-    } finally {
-      for (const socket of proxy.clients) socket.close();
-      await promisify(proxy.close.bind(proxy))();
-    }
-
    const install = await context.paseo(["plugin", "install", directory, "--json"]);
    assert.equal(install.exitCode, 0, install.stderr);
    assert.equal(JSON.parse(install.stdout).id, "cli-e2e");
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/client",
-  "version": "0.11.1",
+  "version": "0.11.0-beta.5",
  "description": "Paseo client SDK package",
  "files": [
    "dist",
@@ -39,8 +39,8 @@
    "test": "vitest run"
  },
  "dependencies": {
-    "@getpaseo/protocol": "0.11.1",
-    "@getpaseo/relay": "0.11.1",
+    "@getpaseo/protocol": "0.11.0-beta.5",
+    "@getpaseo/relay": "0.11.0-beta.5",
    "zod": "^4.4.3"
  },
  "devDependencies": {
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/desktop",
-  "version": "0.11.1",
+  "version": "0.11.0-beta.5",
  "private": true,
  "description": "Paseo desktop app (Electron wrapper)",
  "homepage": "https://paseo.sh",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.11.1",
+  "version": "0.11.0-beta.5",
  "description": "Native module for two way audio streaming",
  "keywords": [
    "ExpoTwoWayAudio",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/highlight",
-  "version": "0.11.1",
+  "version": "0.11.0-beta.5",
  "files": [
    "dist",
    "!dist/**/*.map",
@@ -144,19 +144,6 @@ const title = "Hello";
    );
  });

-  it("keeps an Astro expression open through nested template strings", () => {
-    const code = "<p>{`a ${`}`} b`}</p>";
-
-    const tokens = highlightCode(code, "Nested.astro").flat();
-
-    expect(tokens).toEqual(
-      expect.arrayContaining([
-        { text: "`}`", style: "string" },
-        { text: " b`", style: "string" },
-      ]),
-    );
-  });
-
  it("highlights Vue SFCs across script, template, and style", () => {
    const code = [
      '<script lang="ts">',
@@ -14,7 +14,6 @@ import {
 import { parser as cssParser } from "@lezer/css";
 import { parser as htmlParser } from "@lezer/html";
 import { parser as jsParser } from "@lezer/javascript";
-import { findClosingBrace } from "../js-scanner.js";

 interface Range {
  from: number;
@@ -24,11 +23,88 @@ interface Range {
 const jsxParser = jsParser.configure({ dialect: "ts jsx" });
 const typescriptParser = jsParser.configure({ dialect: "ts" });

+function isSpace(code: number): boolean {
+  return code === 32 || code === 9 || code === 10 || code === 13;
+}
+
+function isRegexStart(text: string, position: number): boolean {
+  let previous = position - 1;
+  while (previous >= 0 && isSpace(text.charCodeAt(previous))) previous--;
+  if (previous < 0) return true;
+
+  const character = text[previous];
+  if (/[)\]}<"'`\d]/.test(character)) return false;
+  const code = text.charCodeAt(previous);
+  if (code === 62) return previous > 0 && text.charCodeAt(previous - 1) === 61;
+  if (!/[A-Za-z_$]/.test(character)) return true;
+
+  let start = previous;
+  while (start >= 0 && /[A-Za-z0-9_$]/.test(text[start])) start--;
+  const keyword = text.slice(start + 1, previous + 1);
+  return /^(return|typeof|instanceof|in|of|new|void|delete|yield|await|case|do|else|throw|extends|assert|with)$/.test(
+    keyword,
+  );
+}
+
+function skipQuotedText(text: string, opening: number): number {
+  const quote = text.charCodeAt(opening);
+  for (let position = opening + 1; position < text.length; position++) {
+    const code = text.charCodeAt(position);
+    if (code === 92) position++;
+    else if (code === quote) return position;
+  }
+  return text.length - 1;
+}
+
+function skipLineComment(text: string, opening: number): number {
+  const newline = text.indexOf("\n", opening + 2);
+  return newline >= 0 ? newline : text.length - 1;
+}
+
+function skipBlockComment(text: string, opening: number): number {
+  const closing = text.indexOf("*/", opening + 2);
+  return closing >= 0 ? closing + 1 : text.length - 1;
+}
+
+function skipRegex(text: string, opening: number): number {
+  let isInCharacterClass = false;
+  for (let position = opening + 1; position < text.length; position++) {
+    const code = text.charCodeAt(position);
+    if (code === 10 || code === 13) return position;
+    if (code === 92) position++;
+    else if (isInCharacterClass && code === 93) isInCharacterClass = false;
+    else if (!isInCharacterClass && code === 91) isInCharacterClass = true;
+    else if (!isInCharacterClass && code === 47) return position;
+  }
+  return text.length - 1;
+}
+
+function findClosingBrace(text: string, opening: number): number {
+  let depth = 0;
+  for (let position = opening; position < text.length; position++) {
+    const code = text.charCodeAt(position);
+    if (code === 47 && text.charCodeAt(position + 1) === 47) {
+      position = skipLineComment(text, position);
+    } else if (code === 47 && text.charCodeAt(position + 1) === 42) {
+      position = skipBlockComment(text, position);
+    } else if (code === 47 && isRegexStart(text, position)) {
+      position = skipRegex(text, position);
+    } else if (code === 34 || code === 39 || code === 96) {
+      position = skipQuotedText(text, position);
+    } else if (code === 123) {
+      depth++;
+    } else if (code === 125 && --depth === 0) {
+      return position;
+    }
+  }
+  return -1;
+}
+
 function findExpressions(text: string): Range[] {
  const ranges: Range[] = [];
  for (let position = 0; position < text.length; position++) {
    if (text.charCodeAt(position) !== 123) continue;
-    const closing = findClosingBrace(text, position + 1);
+    const closing = findClosingBrace(text, position);
    if (closing < 0) break;
    ranges.push({ from: position, to: closing });
    position = closing;
@@ -1,100 +0,0 @@
-// Scans JavaScript embedded in a template (Astro `{ }` expressions, Vue `{{ }}`
-// interpolations) for the brace that closes it, without parsing the code.
-
-function isSpace(code: number): boolean {
-  return code === 32 || code === 9 || code === 10 || code === 13;
-}
-
-function isRegexStart(text: string, position: number): boolean {
-  let previous = position - 1;
-  while (previous >= 0 && isSpace(text.charCodeAt(previous))) previous--;
-  if (previous < 0) return true;
-
-  const character = text[previous];
-  if (/[)\]}<"'`\d]/.test(character)) return false;
-  const code = text.charCodeAt(previous);
-  if (code === 62) return previous > 0 && text.charCodeAt(previous - 1) === 61;
-  if (!/[A-Za-z_$]/.test(character)) return true;
-
-  let start = previous;
-  while (start >= 0 && /[A-Za-z0-9_$]/.test(text[start])) start--;
-  const keyword = text.slice(start + 1, previous + 1);
-  return /^(return|typeof|instanceof|in|of|new|void|delete|yield|await|case|do|else|throw|extends|assert|with)$/.test(
-    keyword,
-  );
-}
-
-// Template strings nested deeper than this are treated as running to the end.
-const MAX_TEMPLATE_NESTING = 32;
-
-function skipQuotedText(text: string, opening: number, nesting = 0): number {
-  const quote = text.charCodeAt(opening);
-  for (let position = opening + 1; position < text.length; position++) {
-    const code = text.charCodeAt(position);
-    if (code === 92) position++;
-    else if (code === quote) return position;
-    else if (quote === 96 && code === 36 && text.charCodeAt(position + 1) === 123) {
-      position = skipTemplateSubstitution(text, position + 2, nesting);
-    }
-  }
-  return text.length - 1;
-}
-
-function skipTemplateSubstitution(text: string, start: number, nesting: number): number {
-  if (nesting >= MAX_TEMPLATE_NESTING) return text.length - 1;
-  const closing = findClosingBrace(text, start, () => true, nesting + 1);
-  return closing >= 0 ? closing : text.length - 1;
-}
-
-function skipLineComment(text: string, opening: number): number {
-  const newline = text.indexOf("\n", opening + 2);
-  return newline >= 0 ? newline : text.length - 1;
-}
-
-function skipBlockComment(text: string, opening: number): number {
-  const closing = text.indexOf("*/", opening + 2);
-  return closing >= 0 ? closing + 1 : text.length - 1;
-}
-
-function skipRegex(text: string, opening: number): number {
-  let isInCharacterClass = false;
-  for (let position = opening + 1; position < text.length; position++) {
-    const code = text.charCodeAt(position);
-    if (code === 10 || code === 13) return position;
-    if (code === 92) position++;
-    else if (isInCharacterClass && code === 93) isInCharacterClass = false;
-    else if (!isInCharacterClass && code === 91) isInCharacterClass = true;
-    else if (!isInCharacterClass && code === 47) return position;
-  }
-  return text.length - 1;
-}
-
-// Finds the first `}` outside nested braces, strings, comments, and regexes
-// for which `isEnd` holds.
-export function findClosingBrace(
-  text: string,
-  start: number,
-  isEnd: (position: number) => boolean = () => true,
-  nesting = 0,
-): number {
-  let depth = 0;
-  for (let position = start; position < text.length; position++) {
-    const code = text.charCodeAt(position);
-    if (code === 47 && text.charCodeAt(position + 1) === 47) {
-      position = skipLineComment(text, position);
-    } else if (code === 47 && text.charCodeAt(position + 1) === 42) {
-      position = skipBlockComment(text, position);
-    } else if (code === 47 && isRegexStart(text, position)) {
-      position = skipRegex(text, position);
-    } else if (code === 34 || code === 39 || code === 96) {
-      position = skipQuotedText(text, position, nesting);
-    } else if (code === 123) {
-      depth++;
-    } else if (code === 125 && depth === 0) {
-      if (isEnd(position)) return position;
-    } else if (code === 125) {
-      depth--;
-    }
-  }
-  return -1;
-}
@@ -8,7 +8,6 @@ import {
 import { parser as cssParser } from "@lezer/css";
 import { parser as htmlParser } from "@lezer/html";
 import { parser as jsParser } from "@lezer/javascript";
-import { findClosingBrace } from "../js-scanner.js";

 interface Range {
  from: number;
@@ -18,6 +17,104 @@ interface Range {
 const typescriptParser = jsParser.configure({ dialect: "ts" });
 const expressionParser = jsParser.configure({ top: "SingleExpression" });

+function isSpace(code: number): boolean {
+  return code === 32 || code === 9 || code === 10 || code === 13;
+}
+
+function isRegexStart(text: string, position: number): boolean {
+  let previous = position - 1;
+  while (previous >= 0 && isSpace(text.charCodeAt(previous))) previous--;
+  if (previous < 0) return true;
+
+  const character = text[previous];
+  if (/[)\]}<"'`\d]/.test(character)) return false;
+  const code = text.charCodeAt(previous);
+  if (code === 62) return previous > 0 && text.charCodeAt(previous - 1) === 61;
+  if (!/[A-Za-z_$]/.test(character)) return true;
+
+  let start = previous;
+  while (start >= 0 && /[A-Za-z0-9_$]/.test(text[start])) start--;
+  const keyword = text.slice(start + 1, previous + 1);
+  return /^(return|typeof|instanceof|in|of|new|void|delete|yield|await|case|do|else|throw|extends|assert|with)$/.test(
+    keyword,
+  );
+}
+
+// Template strings nested deeper than this are treated as running to the end.
+const MAX_TEMPLATE_NESTING = 32;
+
+function skipQuotedText(text: string, opening: number, nesting = 0): number {
+  const quote = text.charCodeAt(opening);
+  for (let position = opening + 1; position < text.length; position++) {
+    const code = text.charCodeAt(position);
+    if (code === 92) position++;
+    else if (code === quote) return position;
+    else if (quote === 96 && code === 36 && text.charCodeAt(position + 1) === 123) {
+      position = skipTemplateSubstitution(text, position + 2, nesting);
+    }
+  }
+  return text.length - 1;
+}
+
+function skipTemplateSubstitution(text: string, start: number, nesting: number): number {
+  if (nesting >= MAX_TEMPLATE_NESTING) return text.length - 1;
+  const closing = findClosingBrace(text, start, () => true, nesting + 1);
+  return closing >= 0 ? closing : text.length - 1;
+}
+
+function skipLineComment(text: string, opening: number): number {
+  const newline = text.indexOf("\n", opening + 2);
+  return newline >= 0 ? newline : text.length - 1;
+}
+
+function skipBlockComment(text: string, opening: number): number {
+  const closing = text.indexOf("*/", opening + 2);
+  return closing >= 0 ? closing + 1 : text.length - 1;
+}
+
+function skipRegex(text: string, opening: number): number {
+  let isInCharacterClass = false;
+  for (let position = opening + 1; position < text.length; position++) {
+    const code = text.charCodeAt(position);
+    if (code === 10 || code === 13) return position;
+    if (code === 92) position++;
+    else if (isInCharacterClass && code === 93) isInCharacterClass = false;
+    else if (!isInCharacterClass && code === 91) isInCharacterClass = true;
+    else if (!isInCharacterClass && code === 47) return position;
+  }
+  return text.length - 1;
+}
+
+// Finds the first `}` outside nested braces, strings, comments, and regexes
+// for which `isEnd` holds.
+function findClosingBrace(
+  text: string,
+  start: number,
+  isEnd: (position: number) => boolean,
+  nesting = 0,
+): number {
+  let depth = 0;
+  for (let position = start; position < text.length; position++) {
+    const code = text.charCodeAt(position);
+    if (code === 47 && text.charCodeAt(position + 1) === 47) {
+      position = skipLineComment(text, position);
+    } else if (code === 47 && text.charCodeAt(position + 1) === 42) {
+      position = skipBlockComment(text, position);
+    } else if (code === 47 && isRegexStart(text, position)) {
+      position = skipRegex(text, position);
+    } else if (code === 34 || code === 39 || code === 96) {
+      position = skipQuotedText(text, position, nesting);
+    } else if (code === 123) {
+      depth++;
+    } else if (code === 125 && depth === 0) {
+      if (isEnd(position)) return position;
+    } else if (code === 125) {
+      depth--;
+    }
+  }
+  return -1;
+}
+
 function findInterpolationEnd(text: string, start: number): number {
  return findClosingBrace(text, start, (position) => text.charCodeAt(position + 1) === 125);
 }
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/plugin",
-  "version": "0.11.1",
+  "version": "0.11.0-beta.5",
  "description": "Paseo plugin SDK package",
  "files": [
    "dist",
@@ -70,8 +70,8 @@
    "use-sync-external-store": "^1.6.0"
  },
  "devDependencies": {
-    "@getpaseo/client": "0.11.1",
-    "@getpaseo/protocol": "0.11.1",
+    "@getpaseo/client": "0.11.0-beta.5",
+    "@getpaseo/protocol": "0.11.0-beta.5",
    "@types/node": "^20.9.0",
    "@types/react": "~19.2.0",
    "react": "19.1.0",
@@ -81,8 +81,8 @@
    "zod": "^4.4.3"
  },
  "peerDependencies": {
-    "@getpaseo/client": "0.11.1",
-    "@getpaseo/protocol": "0.11.1",
+    "@getpaseo/client": "0.11.0-beta.5",
+    "@getpaseo/protocol": "0.11.0-beta.5",
    "react": "~19.1.0",
    "react-native": ">=0.81.5",
    "zod": "^4.4.3"
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/protocol",
-  "version": "0.11.1",
+  "version": "0.11.0-beta.5",
  "description": "Paseo shared protocol schemas and wire types",
  "files": [
    "dist",
@@ -23,27 +23,6 @@ describe("plugin protocol compatibility", () => {
      expect(SessionOutboundMessageSchema.parse(message)).toEqual(message);
    },
  );
-  it("preserves manifest metadata in plugin list responses", () => {
-    const message = {
-      type: "plugin.list.response",
-      payload: {
-        requestId: "metadata",
-        plugins: [
-          {
-            id: "review",
-            name: "Review tools",
-            icon: "assets/icon.png",
-            media: ["screenshot.png", "https://example.com/demo.mp4"],
-            path: "/plugins/review",
-            enabled: false,
-            status: "disabled",
-          },
-        ],
-      },
-    };
-    expect(SessionOutboundMessageSchema.parse(message)).toEqual(message);
-  });
-
  it("parses plugin timeline append messages and advertises the capability", () => {
    expect(
      SessionInboundMessageSchema.parse({
@@ -6632,9 +6632,6 @@ export const PluginNpmInstallationSchema = z.object({

 export const PluginListItemSchema = z.object({
  id: PluginIdSchema,
-  name: z.string().optional(),
-  icon: z.string().optional(),
-  media: z.array(z.string()).optional(),
  description: z.string().optional(),
  path: z.string(),
  enabled: z.boolean(),
@@ -1,42 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { pluginOverviewUrl } from "./plugin-overview.js";
-
-describe("plugin overview destinations", () => {
-  it.each([
-    undefined,
-    "",
-    "./docs",
-    "../docs",
-    "/login",
-    "//example.com",
-    "#section",
-    "?login",
-    "http://example.com",
-    "mailto:hello@example.com",
-    "ftp://example.com",
-    "javascript:alert(1)",
-    "data:image/png;base64,AAAA",
-    "vbscript:msgbox(1)",
-    "javascript&#58;alert(1)",
-    "javascript%3Aalert(1)",
-    "javascript%253Aalert(1)",
-    "java\tscript:alert(1)",
-    " https://example.com",
-    "https://example.com\n",
-    "https:example.com",
-    "https:///example.com",
-    "https://paseo.sh@evil.example",
-    "https://example.com\\@evil.example",
-    "https://",
-  ])("leaves %s as text", (url) => {
-    expect(pluginOverviewUrl(url)).toBeUndefined();
-  });
-
-  it.each([
-    "https://example.com/path?q=a&b=c#section",
-    "HTTPS://example.com/path",
-    "https://example.com/%3Cscript%3E",
-  ])("allows %s without decoding it again", (url) => {
-    expect(pluginOverviewUrl(url)).toBe(url);
-  });
-});
@@ -1,49 +0,0 @@
-/** Presentation contract for author-controlled registry content, independent of the UI runtime. */
-export const pluginOverviewPolicy = {
-  rawHtml: false,
-  elements: [
-    "p",
-    "br",
-    "hr",
-    "h1",
-    "h2",
-    "h3",
-    "h4",
-    "h5",
-    "h6",
-    "blockquote",
-    "ul",
-    "ol",
-    "li",
-    "strong",
-    "em",
-    "del",
-    "pre",
-    "code",
-    "a",
-    "img",
-    "table",
-    "thead",
-    "tbody",
-    "tr",
-    "th",
-    "td",
-  ],
-  link: { rel: "noopener noreferrer nofollow", target: "_blank" },
-} as const;
-
-/** Validate decoded Markdown destinations; never resolve against the reader's page or repository. */
-export function pluginOverviewUrl(value: string | undefined): string | undefined {
-  // URL parsers discard controls and normalize backslashes; reject those ambiguous spellings.
-  // eslint-disable-next-line no-control-regex
-  if (!value || !/^https:\/\/[^/?#]/i.test(value) || /[\u0000-\u0020\u007f\\]/.test(value))
-    return undefined;
-  try {
-    const url = new URL(value);
-    if (url.protocol !== "https:" || !url.hostname || url.username || url.password)
-      return undefined;
-    return value;
-  } catch {
-    return undefined;
-  }
-}
@@ -1,18 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { pluginMediaKind } from "./plugin-registry.js";
-
-describe("plugin media kind", () => {
-  it.each([
-    ["https://cdn.example.com/a/preview.png", "image"],
-    ["https://cdn.example.com/a/preview.JPG", "image"],
-    ["https://cdn.example.com/a/preview.jpeg", "image"],
-    ["https://cdn.example.com/a/preview.webp", "image"],
-    ["https://cdn.example.com/a/preview.gif", "image"],
-    ["https://cdn.example.com/a/demo.mp4", "video"],
-    ["https://cdn.example.com/a/demo.WebM", "video"],
-    ["https://cdn.example.com/a/demo.mp4?raw=true#t=2", "video"],
-    ["https://cdn.example.com/mp4/preview.png?format=mp4", "image"],
-  ] as const)("reads %s as %s from its path extension", (url, kind) => {
-    expect(pluginMediaKind(url)).toBe(kind);
-  });
-});
@@ -39,21 +39,13 @@ export const PublishedPluginSchema = z.object({
  repository: z.object({ url: z.string().url(), commit: z.string().optional() }),
  artifact: PluginRegistryArtifactSchema,
  icon: z.string().url().optional(),
-  /** Images and videos in display order; see `pluginMediaKind`. */
-  media: z.array(z.string().url()),
+  screenshots: z.array(z.string().url()),
  submittedAt: z.string(),
  reviewedAt: z.string(),
  updatedAt: z.string(),
  publishedAt: z.string(),
  installs: z.number().int().nonnegative().optional(),
 });
-const VIDEO_EXTENSIONS = new Set(["mp4", "webm"]);
-
-/** Whether a registry media entry is a video or an image, from its path extension. */
-export function pluginMediaKind(url: string): "image" | "video" {
-  const extension = new URL(url).pathname.split(".").pop()?.toLowerCase() ?? "";
-  return VIDEO_EXTENSIONS.has(extension) ? "video" : "image";
-}
 export const PublishedPluginDetailSchema = PublishedPluginSchema.extend({ readme: z.string() });
 export const PluginRegistryIndexSchema = z.object({
  schemaVersion: z.literal(1),
@@ -62,8 +54,6 @@ export const PluginRegistryIndexSchema = z.object({
    z.object({ slug: z.string(), label: z.string(), description: z.string().optional() }),
  ),
  plugins: z.array(PublishedPluginSchema),
-  /** Plugin IDs the maintainer features, in display order. An ID may name a plugin that is not listed. */
-  featured: z.array(z.string()),
  generatedAt: z.string(),
 });
 export type PluginRegistryIdentity = z.infer<typeof PluginRegistryIdentitySchema>;
@@ -3,35 +3,6 @@ import { describe, expect, it } from "vitest";
 import { parsePluginSourceReference } from "./plugin-source-reference.js";

 describe("plugin source references", () => {
-  it.each([
-    ".",
-    "..",
-    "./owner/slug",
-    "../owner/slug",
-    "/owner/slug",
-    "~/owner/slug",
-    "~",
-    "C:\\",
-    "C:/",
-    "D:\\plugins\\repository",
-    "D:/plugins/repository",
-    "\\\\server\\share",
-    "\\\\server\\share\\plugins\\review",
-    ".\\plugins\\review",
-    "..\\plugins\\review",
-  ])("recognizes the explicit directory %s by shape", (source) => {
-    expect(parsePluginSourceReference(source)).toEqual({
-      kind: "directory",
-      source,
-      pluginPath: undefined,
-    });
-    expect(parsePluginSourceReference(`${source}:plugins/review`)).toEqual({
-      kind: "directory",
-      source,
-      pluginPath: "plugins/review",
-    });
-  });
-
  it.each([
    ["npm:review@1.2.0:nested", "npm:review@1.2.0", "nested"],
    ["npm:review@^1.2.0", "npm:review@^1.2.0", undefined],
@@ -45,7 +16,6 @@ describe("plugin source references", () => {
    ["git:file:///repo:plugins/main", "git:file:///repo", "plugins/main"],
    ["plugins.example.com:8443/owner/slug", "plugins.example.com:8443/owner/slug", undefined],
    ["owner/repository", "owner/repository", undefined],
-    ["plugins/foo", "plugins/foo", undefined],
    ["owner/repository:plugins/review", "owner/repository", "plugins/review"],
    [
      "https://example.test:8443/owner/repository.git",
@@ -69,8 +39,10 @@ describe("plugin source references", () => {
      "file:///D:/plugins/repository",
      "plugins/review",
    ],
+    ["D:\\plugins\\repository", "D:\\plugins\\repository", undefined],
+    ["D:\\plugins\\repository:plugins/review", "D:\\plugins\\repository", "plugins/review"],
  ])("parses %s", (reference, source, pluginPath) => {
-    expect(parsePluginSourceReference(reference)).toEqual({ kind: "managed", source, pluginPath });
+    expect(parsePluginSourceReference(reference)).toEqual({ source, pluginPath });
  });
 });

@@ -1,27 +1,19 @@
 import { parsePluginRegistryReference } from "./plugin-registry.js";
 import type { PluginInstallation } from "./messages.js";
 export interface PluginSourceReference {
-  kind: "directory" | "managed";
  source: string;
  pluginPath: string | undefined;
 }

 export function parsePluginSourceReference(reference: string): PluginSourceReference {
+  if (parsePluginRegistryReference(reference)) return { source: reference, pluginPath: undefined };
  const prefix = /^(npm:|github:|git:(?!\/\/))/.exec(reference)?.[0];
  const source = prefix ? reference.slice(prefix.length) : reference;
  const parsed = splitPluginPath(source, { scp: prefix !== "npm:" });
-  if (!prefix && /^(\.\.?(?:[/\\]|$)|\/|~|[A-Za-z]:[/\\]|\\\\)/.test(parsed.source)) {
-    return { kind: "directory", ...parsed };
-  }
-  if (parsePluginRegistryReference(reference))
-    return { kind: "managed", source: reference, pluginPath: undefined };
-  return { kind: "managed", ...parsed, source: `${prefix ?? ""}${parsed.source}` };
+  return { ...parsed, source: `${prefix ?? ""}${parsed.source}` };
 }

-function splitPluginPath(
-  reference: string,
-  options: { scp: boolean },
-): Pick<PluginSourceReference, "source" | "pluginPath"> {
+function splitPluginPath(reference: string, options: { scp: boolean }): PluginSourceReference {
  const separator = reference.lastIndexOf(":");
  if (separator === -1) return { source: reference, pluginPath: undefined };

@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/relay",
-  "version": "0.11.1",
+  "version": "0.11.0-beta.5",
  "description": "Paseo relay for bridging daemon and client connections",
  "files": [
    "dist",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/server",
-  "version": "0.11.1",
+  "version": "0.11.0-beta.5",
  "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.11.1",
-    "@getpaseo/highlight": "0.11.1",
-    "@getpaseo/plugin": "0.11.1",
-    "@getpaseo/protocol": "0.11.1",
-    "@getpaseo/relay": "0.11.1",
+    "@getpaseo/client": "0.11.0-beta.5",
+    "@getpaseo/highlight": "0.11.0-beta.5",
+    "@getpaseo/plugin": "0.11.0-beta.5",
+    "@getpaseo/protocol": "0.11.0-beta.5",
+    "@getpaseo/relay": "0.11.0-beta.5",
    "@isaacs/ttlcache": "^2.1.4",
    "@modelcontextprotocol/sdk": "1.29.0",
    "@opencode-ai/sdk": "1.14.46",
@@ -309,30 +309,18 @@ export async function sendPromptToAgent(
  const unarchive = params.unarchive ?? true;

  const record = await params.agentStorage.get(params.agentId);
-  let archivedAtToRestore: string | null = null;
  if (record?.archivedAt) {
    if (!unarchive) {
      return { disposition: "turn_started" };
    }
-    if (await unarchiveAgentState(params.agentStorage, params.agentManager, params.agentId)) {
-      archivedAtToRestore = record.archivedAt;
-    }
+    await unarchiveAgentState(params.agentStorage, params.agentManager, params.agentId);
  }

-  try {
-    await ensureAgentLoaded(params.agentId, {
-      agentManager: params.agentManager,
-      agentStorage: params.agentStorage,
-      logger: params.logger,
-    });
-  } catch (error) {
-    // A send that could not load the agent leaves it where it was: still archived.
-    // Concurrent sends share this load, so none of them holds a live session.
-    if (archivedAtToRestore) {
-      await params.agentManager.archiveSnapshot(params.agentId, archivedAtToRestore);
-    }
-    throw error;
-  }
+  await ensureAgentLoaded(params.agentId, {
+    agentManager: params.agentManager,
+    agentStorage: params.agentStorage,
+    logger: params.logger,
+  });

  if (params.sessionMode) {
    await params.agentManager.setAgentMode(params.agentId, params.sessionMode);
@@ -628,11 +628,6 @@ export interface AgentCreateSessionOptions {
   * Defaults to true. Providers that cannot honor false should no-op.
   */
  persistSession?: boolean;
-  /**
-   * Model ids added by provider configuration (`models` / `additionalModels`).
-   * Providers that validate against runtime-advertised models must accept these.
-   */
-  configuredModelIds?: readonly string[];
 }

 /** What a resumed session is for: driving the agent, or reading what it already did. */
@@ -642,8 +637,6 @@ export type AgentResumePurpose = "interactive" | "history";
 export interface AgentResumeSessionOptions {
  /** Defaults to interactive. History loading may be read-only for archived native sessions. */
  purpose?: AgentResumePurpose;
-  /** See AgentCreateSessionOptions.configuredModelIds. */
-  configuredModelIds?: readonly string[];
 }

 /**
@@ -723,57 +723,6 @@ describe("AgentStreamCoalescer", () => {
    ]);
  });

-  test("keeps a known tool call detail when a later update in the window has none", () => {
-    const { coalescer, flushes } = createHarness();
-    primeLeadingEdge(coalescer, flushes);
-
-    coalescer.handle(
-      "agent-1",
-      timeline({
-        type: "tool_call",
-        callId: "agent-call",
-        name: "Task",
-        status: "running",
-        error: null,
-        detail: {
-          type: "sub_agent",
-          subAgentType: "general-purpose",
-          description: "List files",
-          log: "",
-          actions: [],
-        },
-      }),
-    );
-    coalescer.handle(
-      "agent-1",
-      timeline({
-        type: "tool_call",
-        callId: "agent-call",
-        name: "Agent",
-        status: "completed",
-        error: null,
-        detail: { type: "unknown", input: { description: "List files" }, output: null },
-      }),
-    );
-
-    expect(flushes.map((flush) => flush.item)).toEqual([
-      {
-        type: "tool_call",
-        callId: "agent-call",
-        name: "Agent",
-        status: "completed",
-        error: null,
-        detail: {
-          type: "sub_agent",
-          subAgentType: "general-purpose",
-          description: "List files",
-          log: "",
-          actions: [],
-        },
-      },
-    ]);
-  });
-
  test("preserves mixed text and tool call arrival order within a flush", async () => {
    const { coalescer, flushes } = createHarness();
    primeLeadingEdge(coalescer, flushes);
@@ -1,5 +1,4 @@
 import type { AgentProvider, AgentStreamEvent, AgentTimelineItem } from "./agent-sdk-types.js";
-import { mergeToolCallItems } from "./timeline-projection.js";

 export const AGENT_STREAM_COALESCE_DEFAULT_WINDOW_MS = 60;

@@ -184,16 +183,9 @@ export class AgentStreamCoalescer {
    }

    const existingIndex = buffer.toolCallEntryIndexes.get(event.item.callId);
-    const existing = existingIndex !== undefined ? buffer.entries[existingIndex] : undefined;
-    // Merge rather than replace, so an update that carries less (an unknown detail after a
-    // labeled one) cannot erase what the timeline would have kept had both been flushed.
-    let item = event.item;
-    if (existing?.kind === "tool_call") {
-      item = mergeToolCallItems(existing.item, event.item);
-    }
    const entry: PendingToolCallEntry = {
      kind: "tool_call",
-      item,
+      item: event.item,
      provider: event.provider,
      ...(event.turnId !== undefined ? { turnId: event.turnId } : {}),
    };
@@ -492,7 +492,6 @@ function wrapClientProvider(
  const listFeatures = inner.listFeatures?.bind(inner);
  const archiveNativeSession = inner.archiveNativeSession?.bind(inner);
  const unarchiveNativeSession = inner.unarchiveNativeSession?.bind(inner);
-  const configuredModelIds = [...profileModels, ...additionalModels].map((model) => model.id);

  return {
    provider,
@@ -510,7 +509,7 @@ function wrapClientProvider(
            providerOptions: mergeProviderOptions(providerOptions, config.providerOptions),
          },
          launchContext,
-          { ...options, configuredModelIds },
+          options,
        ),
      ),
    resumeSession: async (handle, overrides, launchContext, options) =>
@@ -527,7 +526,7 @@ function wrapClientProvider(
            providerOptions: mergeProviderOptions(providerOptions, overrides?.providerOptions),
          },
          launchContext,
-          { ...options, configuredModelIds },
+          options,
        ),
      ),
    fetchCatalog: async (options, context) => {
@@ -5,7 +5,7 @@ import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { afterEach, describe, expect, test, vi } from "vitest";
 import {
  AgentSideConnection,
  ClientSideConnection,
@@ -54,10 +54,8 @@ import type { AgentStreamEvent } from "../agent-sdk-types.js";
 import type {
  AgentCapabilityFlags,
  AgentPersistenceHandle,
-  AgentSession,
  ProviderRefreshContext,
 } from "../agent-sdk-types.js";
-import { buildProviderRegistry } from "../provider-registry.js";
 import { createTestLogger } from "../../../test-utils/test-logger.js";
 import { buildStringCommandShellInvocation } from "../../../utils/string-command-shell.js";
 import { asInternals } from "../../test-utils/class-mocks.js";
@@ -4372,151 +4370,3 @@ describe("ACPAgentSession close() with an unresponsive provider", () => {
    expect(isProcessAlive(pid)).toBe(false);
  }, 15_000);
 });
-
-// An ACP agent that advertises two models (or none, with ACP_ADVERTISE_MODELS=none) but,
-// like Cline, runs any model id it is given.
-const PERMISSIVE_MODEL_ACP_AGENT = `
-import { Readable, Writable } from "node:stream";
-const { AgentSideConnection, PROTOCOL_VERSION, ndJsonStream } = await import(process.env.ACP_SDK_URL);
-let currentModelId = "advertised-default";
-const modelState = () =>
-  process.env.ACP_ADVERTISE_MODELS === "none"
-    ? undefined
-    : {
-        currentModelId,
-        availableModels: [
-          { modelId: "advertised-default", name: "Advertised default" },
-          { modelId: "advertised-other", name: "Advertised other" },
-        ],
-      };
-new AgentSideConnection(
-  () => ({
-    async initialize() {
-      return { protocolVersion: PROTOCOL_VERSION, agentCapabilities: { loadSession: true } };
-    },
-    async newSession() {
-      return { sessionId: "permissive-session", models: modelState() };
-    },
-    async loadSession() {
-      return { models: modelState() };
-    },
-    async unstable_setSessionModel({ modelId }) {
-      currentModelId = modelId;
-      return {};
-    },
-    async authenticate() {},
-    async cancel() {},
-    async prompt() {
-      return { stopReason: "end_turn" };
-    },
-  }),
-  ndJsonStream(Writable.toWeb(process.stdout), Readable.toWeb(process.stdin)),
-);
-`;
-
-describe("custom ACP provider with configured models", () => {
-  let dir: string;
-  let agentScript: string;
-  let session: AgentSession | null = null;
-
-  beforeEach(async () => {
-    dir = await mkdtemp(path.join(tmpdir(), "paseo-acp-configured-models-"));
-    agentScript = path.join(dir, "agent.mjs");
-    await writeFile(agentScript, PERMISSIVE_MODEL_ACP_AGENT);
-  });
-
-  afterEach(async () => {
-    await session?.close();
-    session = null;
-    await rm(dir, { recursive: true, force: true });
-  });
-
-  function buildRegistry(
-    override: {
-      models?: Array<{ id: string; label: string }>;
-      additionalModels?: Array<{ id: string; label: string }>;
-    },
-    agentEnv: Record<string, string> = {},
-  ) {
-    return buildProviderRegistry(createTestLogger(), {
-      providerOverrides: {
-        permissive: {
-          extends: "acp",
-          label: "Permissive",
-          command: [process.execPath, agentScript],
-          env: {
-            ACP_SDK_URL: pathToFileURL(
-              createRequire(import.meta.url).resolve("@agentclientprotocol/sdk"),
-            ).href,
-            ...agentEnv,
-          },
-          ...override,
-        },
-      },
-    });
-  }
-
-  async function createSessionOnModel(
-    registry: ReturnType<typeof buildRegistry>,
-    model: string,
-  ): Promise<AgentSession> {
-    const client = registry.permissive.createClient(createTestLogger());
-    session = await client.createSession({ provider: "permissive", cwd: dir, model });
-    return session;
-  }
-
-  test("runs on a model added through additionalModels that the agent does not advertise", async () => {
-    const registry = buildRegistry({
-      additionalModels: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }],
-    });
-
-    const created = await createSessionOnModel(registry, "stealth/pixel-canary");
-
-    expect((await created.getRuntimeInfo()).model).toBe("stealth/pixel-canary");
-  });
-
-  test("runs on a model from a replacement models list that the agent does not advertise", async () => {
-    const registry = buildRegistry({
-      models: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }],
-    });
-
-    const created = await createSessionOnModel(registry, "stealth/pixel-canary");
-
-    expect((await created.getRuntimeInfo()).model).toBe("stealth/pixel-canary");
-  });
-
-  test("runs on a model from additionalModels when the agent advertises no models", async () => {
-    const registry = buildRegistry(
-      { additionalModels: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }] },
-      { ACP_ADVERTISE_MODELS: "none" },
-    );
-
-    const created = await createSessionOnModel(registry, "stealth/pixel-canary");
-
-    expect((await created.getRuntimeInfo()).model).toBe("stealth/pixel-canary");
-  });
-
-  test("resumes on a model added through additionalModels that the agent does not advertise", async () => {
-    const registry = buildRegistry({
-      additionalModels: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }],
-    });
-    const client = registry.permissive.createClient(createTestLogger());
-
-    session = await client.resumeSession(
-      { provider: "permissive", sessionId: "permissive-session", metadata: { cwd: dir } },
-      { model: "stealth/pixel-canary" },
-    );
-
-    expect((await session.getRuntimeInfo()).model).toBe("stealth/pixel-canary");
-  });
-
-  test("keeps the agent's model when the requested model is neither advertised nor configured", async () => {
-    const registry = buildRegistry({
-      additionalModels: [{ id: "stealth/pixel-canary", label: "Pixel Canary" }],
-    });
-
-    const created = await createSessionOnModel(registry, "stale/removed-model");
-
-    expect((await created.getRuntimeInfo()).model).toBe("advertised-default");
-  });
-});
@@ -76,9 +76,6 @@ import {
  type AgentPersistenceHandle,
  type AgentPromptContentBlock,
  type AgentPromptInput,
-  type AgentResumePurpose,
-  type AgentCreateSessionOptions,
-  type AgentResumeSessionOptions,
  type AgentRunOptions,
  type AgentRunResult,
  type AgentRuntimeInfo,
@@ -151,18 +148,6 @@ function rejectOnSpawnError(child: ChildProcess, stderrChunks: string[]): Promis
  });
 }

-async function isDirectory(target: string): Promise<boolean> {
-  try {
-    return (await fs.stat(target)).isDirectory();
-  } catch (error) {
-    const code = (error as NodeJS.ErrnoException).code;
-    if (code === "ENOENT" || code === "ENOTDIR") {
-      return false;
-    }
-    throw error;
-  }
-}
-
 function isRecord(value: unknown): value is Record<string, unknown> {
  return value != null && typeof value === "object" && !Array.isArray(value);
 }
@@ -512,8 +497,6 @@ interface ACPAgentSessionOptions {
  capabilities: AgentCapabilityFlags;
  extensionCommandsParser?: ACPExtensionCommandsParser;
  handle?: AgentPersistenceHandle;
-  resumePurpose?: AgentResumePurpose;
-  configuredModelIds?: readonly string[];
  agentId?: string;
  launchEnv?: Record<string, string>;
  waitForInitialCommands?: boolean;
@@ -981,7 +964,6 @@ export class ACPAgentClient implements AgentClient {
  async createSession(
    config: AgentSessionConfig,
    launchContext?: AgentLaunchContext,
-    options?: AgentCreateSessionOptions,
  ): Promise<AgentSession> {
    this.assertProvider(config);
    const providerOptions = ACPProviderOptionsSchema.parse(config.providerOptions ?? {});
@@ -1009,7 +991,6 @@ export class ACPAgentClient implements AgentClient {
          supportsMcpServers:
            providerOptions.supportsMcpServers ?? this.capabilities.supportsMcpServers,
        },
-        configuredModelIds: options?.configuredModelIds,
        agentId: launchContext?.agentId,
        launchEnv: launchContext?.env,
        extensionCommandsParser: this.extensionCommandsParser,
@@ -1025,7 +1006,6 @@ export class ACPAgentClient implements AgentClient {
    handle: AgentPersistenceHandle,
    overrides?: Partial<AgentSessionConfig>,
    launchContext?: AgentLaunchContext,
-    options?: AgentResumeSessionOptions,
  ): Promise<AgentSession> {
    if (handle.provider !== this.provider) {
      throw new Error(`Cannot resume ${handle.provider} handle with ${this.provider} provider`);
@@ -1067,8 +1047,6 @@ export class ACPAgentClient implements AgentClient {
          providerOptions.supportsMcpServers ?? this.capabilities.supportsMcpServers,
      },
      handle,
-      resumePurpose: options?.purpose,
-      configuredModelIds: options?.configuredModelIds,
      agentId: launchContext?.agentId,
      launchEnv: launchContext?.env,
      extensionCommandsParser: this.extensionCommandsParser,
@@ -1697,7 +1675,6 @@ export class ACPAgentSession implements AgentSession, ACPClient {
    configOptions: SessionConfigOption[],
  ) => SessionConfigOption[];
  private readonly configFeatureOptions: ACPConfigFeatureOption[];
-  private readonly configuredModelIds: ReadonlySet<string>;
  private readonly clientCapabilities?: ACPClientCapabilities;
  private readonly clientCapabilityMeta?: ACPClientCapabilityMeta;
  private readonly modeIdTransformer?: (modeId: string) => string | null;
@@ -1723,7 +1700,6 @@ export class ACPAgentSession implements AgentSession, ACPClient {
  private readonly terminalEntries = new Map<string, TerminalEntry>();
  private readonly persistedHistory: AgentTimelineItem[] = [];
  private readonly initialHandle?: AgentPersistenceHandle;
-  private readonly resumePurpose: AgentResumePurpose;

  private readonly config: AgentSessionConfig;
  private child: ChildProcessWithoutNullStreams | null = null;
@@ -1766,7 +1742,6 @@ export class ACPAgentSession implements AgentSession, ACPClient {
    this.sessionResponseTransformer = options.sessionResponseTransformer;
    this.configOptionsTransformer = options.configOptionsTransformer;
    this.configFeatureOptions = options.configFeatureOptions ?? [];
-    this.configuredModelIds = new Set(options.configuredModelIds);
    this.clientCapabilities = options.clientCapabilities;
    this.clientCapabilityMeta = options.clientCapabilityMeta;
    this.modeIdTransformer = options.modeIdTransformer;
@@ -1778,7 +1753,6 @@ export class ACPAgentSession implements AgentSession, ACPClient {
    this.agentId = options.agentId;
    this.launchEnv = options.launchEnv;
    this.initialHandle = options.handle;
-    this.resumePurpose = options.resumePurpose ?? "interactive";
    this.config = { ...config, provider: options.provider };
    this.currentMode = config.modeId ?? null;
    this.currentModel = config.model ?? null;
@@ -2201,20 +2175,12 @@ export class ACPAgentSession implements AgentSession, ACPClient {
      return;
    }

-    await this.setModelWithSelection({ modelId, selection: this.resolveModelSelection(modelId) });
-  }
-
-  private resolveModelSelection(modelId: string): ACPModelSelection {
    const selection = resolveACPModelSelection({
      modelId,
      availableModels: this.availableModels,
      configOptions: this.configOptions,
    });
-    if (selection.availableModel || !this.configuredModelIds.has(modelId)) {
-      return selection;
-    }
-    // A model the user added in provider config is applied even when the agent does not advertise it.
-    return { ...selection, availableModel: { modelId, name: modelId } };
+    await this.setModelWithSelection({ modelId, selection });
  }

  private async setModelWithSelection({
@@ -2228,20 +2194,21 @@ export class ACPAgentSession implements AgentSession, ACPClient {
      throw new Error("ACP session not initialized");
    }

-    if (selection.hasAvailableModels && !selection.availableModel) {
-      this.warnInvalidSelection(
-        modelId,
-        `is not a valid ${this.provider} model. Available options: ${this.availableModels
-          ?.map((model) => model.modelId)
-          .join(", ")}`,
-      );
-      return;
-    }
+    if (selection.hasAvailableModels) {
+      if (!selection.availableModel) {
+        this.warnInvalidSelection(
+          modelId,
+          `is not a valid ${this.provider} model. Available options: ${this.availableModels
+            ?.map((model) => model.modelId)
+            .join(", ")}`,
+        );
+        return;
+      }
+
+      if (typeof this.connection.unstable_setSessionModel !== "function") {
+        throw new Error(this.modelSelectionUnavailableMessage());
+      }

-    if (
-      selection.availableModel &&
-      typeof this.connection.unstable_setSessionModel === "function"
-    ) {
      try {
        await this.connection.unstable_setSessionModel({
          sessionId: this.sessionId,
@@ -2803,16 +2770,6 @@ export class ACPAgentSession implements AgentSession, ACPClient {
    return {};
  }

-  // Loading an archived agent's history runs nothing in its working directory, which
-  // may have been removed with its worktree. session/load still names the original
-  // directory; only the process starts from the home directory.
-  private async resolveProcessCwd(): Promise<string> {
-    if (this.resumePurpose !== "history" || (await isDirectory(this.config.cwd))) {
-      return this.config.cwd;
-    }
-    return homedir();
-  }
-
  private async spawnProcess(): Promise<SpawnedACPProcess> {
    const prefix = await resolveProviderLaunch({
      commandConfig: this.runtimeSettings?.command,
@@ -2826,7 +2783,7 @@ export class ACPAgentSession implements AgentSession, ACPClient {
    const command = prefix.command;
    const args = [...prefix.args, ...this.defaultCommand.slice(1)];
    const child = spawnProcess(command, args, {
-      cwd: await this.resolveProcessCwd(),
+      cwd: this.config.cwd,
      ...createProviderEnvSpec({
        runtimeSettings: this.runtimeSettings,
        overlays: [this.launchEnv],
@@ -2936,11 +2893,13 @@ export class ACPAgentSession implements AgentSession, ACPClient {
    const configuredModelId = this.config.model;
    let switchedModel = false;
    if (configuredModelId && configuredModelId !== this.currentModel) {
+      const selection = resolveACPModelSelection({
+        modelId: configuredModelId,
+        availableModels: this.availableModels,
+        configOptions: this.configOptions,
+      });
      try {
-        await this.setModelWithSelection({
-          modelId: configuredModelId,
-          selection: this.resolveModelSelection(configuredModelId),
-        });
+        await this.setModelWithSelection({ modelId: configuredModelId, selection });
        switchedModel = true;
      } catch (error) {
        if (!this.isModelSelectionUnavailableError(error)) {
@@ -31,7 +31,6 @@ function createQueryMock(events: unknown[]): Query {
 describe("Claude SDK env", () => {
  test("forwards launch-context env through Claude process env", async () => {
    let capturedEnv: Record<string, string | undefined> | undefined;
-    let capturedPerTaskStopAffordance: boolean | undefined;
    const launchContext: AgentLaunchContext = {
      env: {
        PASEO_AGENT_ID: "00000000-0000-4000-8000-000000000201",
@@ -40,7 +39,6 @@ describe("Claude SDK env", () => {
    };
    const queryFactory = vi.fn(({ options }: ClaudeQueryInput) => {
      capturedEnv = options.env;
-      capturedPerTaskStopAffordance = options.perTaskStopAffordance;
      return createQueryMock([
        {
          type: "system",
@@ -93,10 +91,6 @@ describe("Claude SDK env", () => {
      expect(capturedEnv?.MCP_TIMEOUT).toBe("claude-startup-timeout");
      expect(capturedEnv?.MCP_TOOL_TIMEOUT).toBe("claude-tool-timeout");
      expect(session.usageSession?.()?.env).toBe(capturedEnv);
-      // Paseo reads session_state_changed to know when an autonomous turn is over.
-      expect(capturedEnv?.CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS).toBe("1");
-      // Without it, Stop and replace kill every background subagent along with the turn.
-      expect(capturedPerTaskStopAffordance).toBe(true);
    } finally {
      await session.close();
      expect(session.usageSession?.()).toBeNull();
@@ -1,4 +1,4 @@
-import { chmodSync, mkdirSync, mkdtempSync, rmSync } from "node:fs";
+import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import pino from "pino";
@@ -90,29 +90,4 @@ describe("ClaudeAgentSession persisted history load", () => {
      }),
    );
  });
-
-  // chmod does not remove read access on Windows, or for root.
-  test.skipIf(process.platform === "win32" || process.getuid?.() === 0)(
-    "logs a warning with the error when Claude's project folders cannot be listed",
-    async () => {
-      // The transcript is not under cwd's folder, so the lookup lists the other project folders.
-      mkdirSync(path.join(configDir, "projects"), { recursive: true });
-      chmodSync(path.join(configDir, "projects"), 0o000);
-
-      try {
-        await resume();
-      } finally {
-        chmodSync(path.join(configDir, "projects"), 0o755);
-      }
-
-      expect(records).toContainEqual(
-        expect.objectContaining({
-          level: pino.levels.values.warn,
-          msg: "Failed to load Claude history from transcript",
-          sessionId: SESSION_ID,
-          err: expect.objectContaining({ message: expect.stringContaining("EACCES") }),
-        }),
-      );
-    },
-  );
 });
@@ -91,17 +91,6 @@ function buildUsage() {
  };
 }

-/** Claude opening a turn of its own. Every main-session turn starts with one. */
-function buildTurnInit(sessionId: string) {
-  return {
-    type: "system",
-    subtype: "init",
-    session_id: sessionId,
-    permissionMode: "default",
-    model: "opus",
-  };
-}
-
 function buildSuccessResult(sessionId: string) {
  return {
    type: "result",
@@ -164,7 +153,13 @@ function createScriptedQuery(params: {
    },
  } satisfies ScriptedQuery;

-  scriptedQuery.emit(buildTurnInit(params.sessionId));
+  scriptedQuery.emit({
+    type: "system",
+    subtype: "init",
+    session_id: params.sessionId,
+    permissionMode: "default",
+    model: "opus",
+  });

  void (async () => {
    for await (const prompt of params.prompt) {
@@ -257,21 +252,6 @@ async function waitFor(
  }
 }

-/**
- * Paseo interrupts Claude only while a main-session turn is in flight, which it learns from the
- * init. The pump asks for its next frame only after routing the last one, so a second next() call
- * proves the init was read.
- */
-async function waitForInitRouted(
-  query: () => { next: ReturnType<typeof vi.fn> } | null | undefined,
-) {
-  await waitFor(() => (query()?.next.mock.calls.length ?? 0) >= 2);
-}
-
-function buildCommandLifecycle(commandUuid: string | null | undefined, state: string) {
-  return { type: "command_lifecycle", command_uuid: commandUuid, state };
-}
-
 afterEach(() => {
  queryFactory.mockReset();
 });
@@ -302,7 +282,6 @@ test("interrupt only calls query.interrupt and leaves the query open", async ()
  const firstTurn = streamSession(session, "first prompt");
  await firstTurn.next();
  await waitFor(() => queries[0]?.prompts.length === 1);
-  await waitForInitRouted(() => queries[0]);

  await session.interrupt();
  await waitFor(() => queries[0]?.interrupt.mock.calls.length === 1);
@@ -343,7 +322,6 @@ async function startSteeredTurn(sessionId: string): Promise<{
    throw new Error("Expected the original Claude turn to start");
  }
  await waitFor(() => query?.prompts.length === 1);
-  await waitForInitRouted(() => query);

  const steered = await session.steerActiveTurn!("queued steer", {
    expectedTurnId: start.value.turnId,
@@ -393,8 +371,11 @@ test("interrupt still stops the turn when Claude has already dequeued the steer"
 test("a steer Claude has already read is no longer discardable on interrupt", async () => {
  const { session, query, turn } = await startSteeredTurn("queued-steer-completed-session");

-  query()?.emit(buildCommandLifecycle(query()?.prompts[0]?.uuid, "started"));
-  query()?.emit(buildCommandLifecycle(query()?.prompts[1]?.uuid, "completed"));
+  query()?.emit({
+    type: "command_lifecycle",
+    command_uuid: query()?.prompts[1]?.uuid,
+    state: "completed",
+  });
  // Frames are translated in order, so the marker landing proves the lifecycle frame was read.
  query()?.emit({ type: "assistant", message: { content: "STEER_READ" } });
  await consumeUntil(turn, (event) => collectAssistantText([event]).includes("STEER_READ"));
@@ -407,23 +388,6 @@ test("a steer Claude has already read is no longer discardable on interrupt", as
  await session.close();
 });

-test("a steer Claude cancelled is no longer withdrawn on interrupt", async () => {
-  const { session, query, turn } = await startSteeredTurn("queued-steer-cancelled-session");
-
-  query()?.emit(buildCommandLifecycle(query()?.prompts[0]?.uuid, "started"));
-  // "cancelled" is terminal: API errors, interrupts and "now" pre-emption all end a message.
-  query()?.emit(buildCommandLifecycle(query()?.prompts[1]?.uuid, "cancelled"));
-  query()?.emit({ type: "assistant", message: { content: "STEER_CANCELLED" } });
-  await consumeUntil(turn, (event) => collectAssistantText([event]).includes("STEER_CANCELLED"));
-
-  await session.interrupt();
-  await waitFor(() => query()?.interrupt.mock.calls.length === 1);
-
-  expect(query()?.cancelAsyncMessage).not.toHaveBeenCalled();
-  await collectUntilTerminal(turn);
-  await session.close();
-});
-
 function buildStoppedTaskNotification(sessionId: string) {
  return {
    type: "system",
@@ -509,7 +473,6 @@ async function startInterruptedToolTurn(sessionId: string): Promise<{
  const turn = streamSession(session, "run the slow tool");
  await turn.next();
  await waitFor(() => query?.prompts.length === 1);
-  await waitForInitRouted(() => query);

  await session.interrupt();
  await collectUntilTerminal(turn);
@@ -560,7 +523,6 @@ test("Claude can still wake into an autonomous turn once the interrupted request

  query()?.emit(buildStoppedTaskNotification(sessionId));
  query()?.emit(buildAbortedResult(sessionId));
-  query()?.emit(buildTurnInit(sessionId));
  query()?.emit({
    type: "assistant",
    message: { content: "AUTONOMOUS_WAKE_RESPONSE" },
@@ -617,7 +579,6 @@ test("reuses the existing query after interrupt before starting the next prompt"
  const firstTurn = streamSession(session, "first prompt");
  await firstTurn.next();
  await waitFor(() => queries[0]?.prompts.length === 1);
-  await waitForInitRouted(() => queries[0]);

  await session.interrupt();
  await collectUntilTerminal(firstTurn);
@@ -691,7 +652,6 @@ test("recovers when the query pump sees a single interrupt abort before the next
  const output = createAsyncQueue<Record<string, unknown>>();
  const prompts: PromptRecord[] = [];
  let throwAbortOnNext = false;
-  let queryRef: Pick<ScriptedQuery, "next"> | null = null;

  queryFactory.mockImplementation(({ prompt }: { prompt: AsyncIterable<unknown> }) => {
    const scriptedQuery = {
@@ -725,8 +685,13 @@ test("recovers when the query pump sees a single interrupt abort before the next
      },
    } satisfies ScriptedQuery;

-    queryRef = scriptedQuery;
-    scriptedQuery.emit(buildTurnInit("interrupt-abort-recovery-session"));
+    scriptedQuery.emit({
+      type: "system",
+      subtype: "init",
+      session_id: "interrupt-abort-recovery-session",
+      permissionMode: "default",
+      model: "opus",
+    });

    void (async () => {
      for await (const promptMessage of prompt) {
@@ -765,7 +730,6 @@ test("recovers when the query pump sees a single interrupt abort before the next

  const firstTurn = streamSession(session, "first prompt");
  await firstTurn.next();
-  await waitForInitRouted(() => queryRef);
  await session.interrupt();
  await collectUntilTerminal(firstTurn);

@@ -804,7 +768,6 @@ test("stale abort result after replacement start does not poison the new foregro
  const firstTurn = streamSession(session, "first prompt");
  const firstStarted = await firstTurn.next();
  await waitFor(() => queryRef?.prompts.length === 1);
-  await waitForInitRouted(() => queryRef);

  await session.interrupt();
  const firstTurnEvents = [firstStarted.value!, ...(await collectUntilTerminal(firstTurn))];
@@ -849,7 +812,7 @@ test("stale abort result after replacement start does not poison the new foregro
  await session.close();
 });

-test("creates an autonomous live turn when Claude starts a turn without a foreground run", async () => {
+test("creates an autonomous live turn when assistant output arrives without a foreground run", async () => {
  const logger = createTestLogger();
  let queryRef: ScriptedQuery | null = null;

@@ -885,7 +848,6 @@ test("creates an autonomous live turn when Claude starts a turn without a foregr
  await collectUntilTerminal(streamSession(session, "seed prompt"));

  const subscribedEvents = subscribeToEvents(session);
-  queryRef?.emit(buildTurnInit("autonomous-live-session"));
  queryRef?.emit({
    type: "assistant",
    message: { content: "AUTONOMOUS_WAKE_RESPONSE" },
@@ -954,7 +916,6 @@ test("steers an autonomous turn through its existing query without restarting it

  await collectUntilTerminal(streamSession(session, "seed prompt"));
  const autonomousEvents = subscribeToEvents(session);
-  queryRef?.emit(buildTurnInit("autonomous-steer-session"));
  queryRef?.emit({
    type: "assistant",
    message: { content: "AUTONOMOUS_RESPONSE" },
@@ -1038,7 +999,6 @@ test("auto-completes an open autonomous turn when a foreground prompt starts", a
  await collectUntilTerminal(streamSession(session, "seed prompt"));

  const subscribedEvents = subscribeToEvents(session);
-  queryRef?.emit(buildTurnInit("autonomous-handoff-session"));
  queryRef?.emit({
    type: "assistant",
    message: { content: "BACKGROUND_ONLY_RESPONSE" },
@@ -327,57 +327,6 @@ test("fails an auto mode turn when Claude Code uses Vertex", async () => {
  }
 });

-test("switches an auto mode session to another mode when Claude Code uses Bedrock", async () => {
-  const previousBedrock = process.env.CLAUDE_CODE_USE_BEDROCK;
-  process.env.CLAUDE_CODE_USE_BEDROCK = "1";
-  const queryMock = createBaseQueryMock(vi.fn(async () => ({ done: true, value: undefined })));
-  sdkQueryFactory.mockImplementation(() => queryMock);
-  const client = new ClaudeAgentClient({
-    logger: createTestLogger(),
-    queryFactory: sdkQueryFactory,
-    resolveBinary: async () => "/test/claude/bin",
-  });
-  const session = await client.createSession({
-    provider: "claude",
-    cwd: process.cwd(),
-    modeId: "auto",
-  });
-
-  try {
-    await session.setMode("acceptEdits");
-
-    expect(await session.getCurrentMode()).toBe("acceptEdits");
-    expect(sdkQueryFactory).toHaveBeenCalledTimes(1);
-    expect(sdkQueryFactory.mock.calls[0]?.[0]?.options?.permissionMode).toBe("acceptEdits");
-  } finally {
-    restoreEnvValue("CLAUDE_CODE_USE_BEDROCK", previousBedrock);
-    await session.close();
-  }
-});
-
-test("does not keep a query started in a mode that Claude Code rejected", async () => {
-  const launchedModes: Array<string | undefined> = [];
-  sdkQueryFactory.mockImplementation(({ options }: { options: { permissionMode?: string } }) => {
-    launchedModes.push(options.permissionMode);
-    const queryMock = createBaseQueryMock(vi.fn(async () => ({ done: true, value: undefined })));
-    if (launchedModes.length === 1) {
-      queryMock.setPermissionMode.mockRejectedValue(new Error("bypass refused"));
-    }
-    return queryMock;
-  });
-  const session = await createSession();
-
-  try {
-    await expect(session.setMode("bypassPermissions")).rejects.toThrow("bypass refused");
-    await session.listCommands();
-
-    expect(await session.getCurrentMode()).toBe("default");
-    expect(launchedModes).toEqual(["bypassPermissions", "default"]);
-  } finally {
-    await session.close();
-  }
-});
-
 test("logs redacted query summary and never leaks sentinel secrets", async () => {
  const envSecret = "PASEO_ENV_SENTINEL_SECRET";
  const runtimeSecret = "PASEO_RUNTIME_SENTINEL_SECRET";
@@ -486,7 +435,6 @@ test("interruptActiveTurn only interrupts the active query without info logs", a
    } | null;
    input: { end: () => void } | null;
    queryRestartNeeded: boolean;
-    mainTurnInFlight: boolean;
    interruptActiveTurn: () => Promise<void>;
  } = asInternals(session);
  const interrupt = vi.fn(async () => undefined);
@@ -499,7 +447,6 @@ test("interruptActiveTurn only interrupts the active query without info logs", a
  };
  internal.input = { end };
  internal.queryRestartNeeded = false;
-  internal.mainTurnInFlight = true;

  try {
    await internal.interruptActiveTurn();
@@ -1090,11 +1037,11 @@ test("preserves bypass capability across query restarts triggered by thinking ch

    expect(capturedOptions).toHaveLength(2);
    expect(capturedOptions[0]).toMatchObject({
-      permissionMode: "bypassPermissions",
+      permissionMode: "default",
      allowDangerouslySkipPermissions: true,
    });
    expect(capturedOptions[1]).toMatchObject({
-      permissionMode: "bypassPermissions",
+      permissionMode: "acceptEdits",
      allowDangerouslySkipPermissions: true,
      effort: "high",
    });
@@ -1193,7 +1140,6 @@ test("reuses one autonomous run for unbound stream_event bursts with no foregrou
  const queryMock = createBaseQueryMock(vi.fn(async () => ({ done: true, value: undefined })));

  internal.turnState = "idle";
-  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
  await internal.routeSdkMessageFromPump(
    {
      type: "stream_event",
@@ -1236,468 +1182,6 @@ test("reuses one autonomous run for unbound stream_event bursts with no foregrou
  await session.close();
 });

-interface SessionStateInternals {
-  turnState: "idle" | "foreground" | "autonomous";
-  routeSdkMessageFromPump: (
-    message: Record<string, unknown>,
-    activeQuery: QueryMock,
-  ) => Promise<void>;
-  autonomousTurn: { id: string } | null;
-  activeForegroundTurnId: string | null;
-}
-
-function sessionState(state: "idle" | "running" | "requires_action") {
-  return {
-    type: "system",
-    subtype: "session_state_changed",
-    state,
-    uuid: `state-${state}`,
-    session_id: "sess-1",
-  };
-}
-
-/** Claude opening a turn of its own. Every main-session turn starts with one. */
-function claudeTurnInit() {
-  return {
-    type: "system",
-    subtype: "init",
-    session_id: "sess-1",
-    permissionMode: "default",
-    model: "opus",
-  };
-}
-
-function successResult() {
-  return { type: "result", subtype: "success", usage: buildUsage(), total_cost_usd: 0 };
-}
-
-function commandLifecycle(
-  commandUuid: string,
-  state: "queued" | "started" | "completed" | "cancelled",
-) {
-  return { type: "command_lifecycle", command_uuid: commandUuid, state };
-}
-
-function unboundTextDelta(text: string) {
-  return {
-    type: "stream_event",
-    parent_tool_use_id: null,
-    event: { type: "content_block_delta", delta: { type: "text_delta", text } },
-  };
-}
-
-// What a background subagent emits on the main stream with no parent tool use id, so by frame
-// shape alone each looks like main-session work. Verified on the wire: none arrives inside a turn
-// Claude opened, and no result follows any of them.
-const helperTaskStarted = {
-  type: "system",
-  subtype: "task_started",
-  task_id: "helper-task",
-  tool_use_id: "toolu_helper",
-  task_type: "local_agent",
-  subagent_type: "general-purpose",
-  description: "Background helper",
-  is_backgrounded: true,
-  uuid: "uuid-task-started",
-  session_id: "sess-1",
-};
-const helperTaskProgress = {
-  type: "system",
-  subtype: "task_progress",
-  task_id: "helper-task",
-  tool_use_id: "toolu_helper",
-  description: "Background helper",
-  usage: { total_tokens: 1200, tool_uses: 3, duration_ms: 900 },
-  last_tool_name: "Bash",
-  uuid: "uuid-task-progress",
-  session_id: "sess-1",
-};
-// A subagent's own background Bash job completing.
-const subagentOwnedTaskNotification = {
-  type: "system",
-  subtype: "task_notification",
-  task_id: "bg-job-of-subagent",
-  tool_use_id: "toolu_subagent_bash",
-  status: "completed",
-  summary: "Background command completed",
-  output_file: "/tmp/bg-job-of-subagent.output",
-  uuid: "uuid-task-notification",
-  session_id: "sess-1",
-};
-const helperCompleted = {
-  type: "system",
-  subtype: "task_notification",
-  task_id: "helper-task",
-  tool_use_id: "toolu_helper",
-  status: "completed",
-  summary: "Background helper finished",
-  output_file: "/tmp/helper-task.output",
-  uuid: "uuid-helper-completed",
-  session_id: "sess-1",
-};
-const rateLimitEvent = {
-  type: "rate_limit_event",
-  rate_limit_info: { status: "allowed" },
-  uuid: "uuid-rate-limit",
-  session_id: "sess-1",
-};
-
-function createPendingQueryMock(): QueryMock {
-  return createBaseQueryMock(vi.fn(() => new Promise<never>(() => {})));
-}
-
-test("a main-session frame opens no turn until Claude starts one", async () => {
-  const session = await createSession();
-  const internal: SessionStateInternals = asInternals(session);
-  const queryMock = createPendingQueryMock();
-
-  // Main-session output only ever arrives inside a turn Claude opened with system/init, so a
-  // stray unbound frame is not the start of one.
-  await internal.routeSdkMessageFromPump(unboundTextDelta("stray"), queryMock);
-  expect(internal.autonomousTurn).toBeNull();
-
-  // The wake-up case autonomous turns exist for: a completed background subagent makes the main
-  // session start a turn of its own, with no prompt from the user.
-  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
-  await internal.routeSdkMessageFromPump(unboundTextDelta("picking this up"), queryMock);
-  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-1");
-
-  await internal.routeSdkMessageFromPump(successResult(), queryMock);
-  expect(internal.autonomousTurn).toBeNull();
-
-  await session.close();
-});
-
-test("a background subagent's frames never open a turn while the main session is idle", async () => {
-  sdkQueryFactory.mockImplementation(() => createPendingQueryMock());
-  const session = await createSession();
-  const internal: SessionStateInternals = asInternals(session);
-  const queryMock = createPendingQueryMock();
-
-  // Claude Code 2.1.280 reports "running" for as long as any background subagent is alive.
-  await internal.routeSdkMessageFromPump(sessionState("running"), queryMock);
-  for (const frame of [
-    helperTaskStarted,
-    helperTaskProgress,
-    subagentOwnedTaskNotification,
-    rateLimitEvent,
-    helperCompleted,
-  ]) {
-    await internal.routeSdkMessageFromPump(frame, queryMock);
-    expect(internal.autonomousTurn).toBeNull();
-    expect(internal.turnState).toBe("idle");
-  }
-
-  // The next user message starts its own foreground turn rather than landing on a phantom one.
-  const { turnId } = await session.startTurn("PING");
-  expect(internal.activeForegroundTurnId).toBe(turnId);
-  expect(internal.autonomousTurn).toBeNull();
-  expect(internal.turnState).toBe("foreground");
-
-  await session.close();
-});
-
-test("Claude waking up after a helper finishes gets an autonomous turn that its result closes", async () => {
-  const session = await createSession();
-  const internal: SessionStateInternals = asInternals(session);
-  const queryMock = createPendingQueryMock();
-  const events: AgentStreamEvent[] = [];
-  session.subscribe((event) => events.push(event));
-
-  // The helper's completion arrives outside any turn. Claude then starts one to react to it.
-  await internal.routeSdkMessageFromPump(helperTaskStarted, queryMock);
-  await internal.routeSdkMessageFromPump(helperCompleted, queryMock);
-  expect(internal.autonomousTurn).toBeNull();
-
-  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
-  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-1");
-  expect(internal.turnState).toBe("autonomous");
-
-  await internal.routeSdkMessageFromPump(unboundTextDelta("the helper is done"), queryMock);
-  await internal.routeSdkMessageFromPump(successResult(), queryMock);
-  expect(internal.autonomousTurn).toBeNull();
-  expect(internal.turnState).toBe("idle");
-  expect(events.filter((event) => event.type === "turn_started")).toHaveLength(1);
-  expect(events.filter((event) => event.type === "turn_completed")).toHaveLength(1);
-
-  await session.close();
-});
-
-test("a steer folded into a turn keeps one turn, and a turn Claude starts after it gets its own", async () => {
-  sdkQueryFactory.mockImplementation(() => createPendingQueryMock());
-  const session = await createSession();
-  const internal: SessionStateInternals = asInternals(session);
-  const queryMock = createPendingQueryMock();
-  const events: AgentStreamEvent[] = [];
-  session.subscribe((event) => events.push(event));
-
-  const { turnId } = await session.startTurn("hello");
-  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
-  // A message pushed mid-turn is folded in at the next tool boundary: Claude acknowledges it, but
-  // starts no new turn.
-  await internal.routeSdkMessageFromPump(commandLifecycle("folded-steer", "queued"), queryMock);
-  await internal.routeSdkMessageFromPump(commandLifecycle("folded-steer", "started"), queryMock);
-  expect(internal.activeForegroundTurnId).toBe(turnId);
-  expect(internal.autonomousTurn).toBeNull();
-
-  await internal.routeSdkMessageFromPump(successResult(), queryMock);
-  expect(internal.activeForegroundTurnId).toBeNull();
-  expect(internal.turnState).toBe("idle");
-
-  // A message that arrived while Claude wrote its final answer runs as a turn of its own.
-  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
-  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-2");
-  await internal.routeSdkMessageFromPump(successResult(), queryMock);
-  expect(internal.autonomousTurn).toBeNull();
-  expect(internal.turnState).toBe("idle");
-  expect(events.filter((event) => event.type === "turn_started")).toHaveLength(2);
-  expect(events.filter((event) => event.type === "turn_completed")).toHaveLength(2);
-
-  await session.close();
-});
-
-test("session state never opens a turn", async () => {
-  const session = await createSession();
-  const internal: SessionStateInternals = asInternals(session);
-  const queryMock = createPendingQueryMock();
-  const events: AgentStreamEvent[] = [];
-  session.subscribe((event) => events.push(event));
-
-  // "running" covers background subagents too, so it says nothing about the main session.
-  for (const state of ["idle", "running", "requires_action", "idle"] as const) {
-    await internal.routeSdkMessageFromPump(sessionState(state), queryMock);
-    expect(internal.autonomousTurn).toBeNull();
-    expect(internal.turnState).toBe("idle");
-  }
-  // State frames are bookkeeping, never timeline content.
-  expect(events).toEqual([]);
-
-  await session.close();
-});
-
-test("an idle session state closes an autonomous turn that no result closed", async () => {
-  const session = await createSession();
-  const internal: SessionStateInternals = asInternals(session);
-  const queryMock = createPendingQueryMock();
-  const events: AgentStreamEvent[] = [];
-  session.subscribe((event) => events.push(event));
-
-  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
-  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-1");
-
-  // Safety net: Claude says nothing at all is running any more.
-  await internal.routeSdkMessageFromPump(sessionState("idle"), queryMock);
-  expect(internal.autonomousTurn).toBeNull();
-  expect(internal.turnState).toBe("idle");
-  expect(events.filter((event) => event.type === "turn_completed")).toHaveLength(1);
-
-  await session.close();
-});
-
-test("session state never opens or closes a foreground turn", async () => {
-  sdkQueryFactory.mockImplementation(() => createPendingQueryMock());
-  const session = await createSession();
-  const internal: SessionStateInternals = asInternals(session);
-  const queryMock = createPendingQueryMock();
-
-  await internal.routeSdkMessageFromPump(sessionState("idle"), queryMock);
-  const { turnId } = await session.startTurn("hello");
-
-  // The send's own running, then an idle that trails the previous turn and lands late.
-  await internal.routeSdkMessageFromPump(sessionState("running"), queryMock);
-  await internal.routeSdkMessageFromPump(sessionState("idle"), queryMock);
-  expect(internal.activeForegroundTurnId).toBe(turnId);
-  expect(internal.autonomousTurn).toBeNull();
-  expect(internal.turnState).toBe("foreground");
-
-  await internal.routeSdkMessageFromPump(
-    { type: "result", subtype: "success", usage: buildUsage(), total_cost_usd: 0 },
-    queryMock,
-  );
-  expect(internal.activeForegroundTurnId).toBeNull();
-  expect(internal.turnState).toBe("idle");
-
-  await session.close();
-});
-
-interface InterruptInternals extends SessionStateInternals {
-  pendingInterruptAbort: boolean;
-}
-
-type InterruptibleQueryMock = QueryMock & { cancelAsyncMessage: ReturnType<typeof vi.fn> };
-
-function createInterruptibleQueryMock(): InterruptibleQueryMock {
-  return Object.assign(createPendingQueryMock(), {
-    cancelAsyncMessage: vi.fn(async () => true),
-  });
-}
-
-/** The uuid Paseo stamped on the first message it pushed into the SDK input. */
-async function readFirstPromptUuid(): Promise<string | null> {
-  const input = sdkQueryFactory.mock.calls[0]?.[0] as { prompt: AsyncIterable<unknown> };
-  return await createPromptUuidReader(input.prompt)();
-}
-
-function abortedResult() {
-  return {
-    type: "result",
-    subtype: "error_during_execution",
-    errors: [],
-    usage: buildUsage(),
-    total_cost_usd: 0,
-  };
-}
-
-test("an interrupt before Claude starts the message withdraws it instead of interrupting", async () => {
-  const queryMock = createInterruptibleQueryMock();
-  sdkQueryFactory.mockImplementation(() => queryMock);
-  const session = await createSession();
-  const internal: InterruptInternals = asInternals(session);
-  const events: AgentStreamEvent[] = [];
-  session.subscribe((event) => events.push(event));
-
-  await session.startTurn("hello");
-  // Claude has not acknowledged the message yet: no init, no command_lifecycle "started".
-  await session.interrupt();
-
-  await vi.waitFor(() => expect(queryMock.cancelAsyncMessage).toHaveBeenCalledTimes(1));
-  expect(queryMock.cancelAsyncMessage).toHaveBeenCalledWith(await readFirstPromptUuid());
-  expect(queryMock.interrupt).not.toHaveBeenCalled();
-  // No result follows an interrupt that never happened, so no flag may wait for one.
-  expect(internal.pendingInterruptAbort).toBe(false);
-  expect(events.filter((event) => event.type === "turn_canceled")).toHaveLength(1);
-
-  await session.close();
-});
-
-test("an interrupt after Claude took the message but before it started stops it", async () => {
-  const queryMock = createInterruptibleQueryMock();
-  // Claude has dequeued the message for its next turn, so withdrawing it is a no-op.
-  queryMock.cancelAsyncMessage.mockImplementation(async () => false);
-  sdkQueryFactory.mockImplementation(() => queryMock);
-  const session = await createSession();
-  const internal: InterruptInternals = asInternals(session);
-
-  await session.startTurn("hello");
-  // No command_lifecycle "started" or init has reached Paseo yet.
-  await session.interrupt();
-
-  await vi.waitFor(() => expect(queryMock.interrupt).toHaveBeenCalledTimes(1));
-  expect(queryMock.cancelAsyncMessage).toHaveBeenCalledWith(await readFirstPromptUuid());
-  expect(internal.pendingInterruptAbort).toBe(true);
-
-  await session.close();
-});
-
-test("a prompt sent while a stopped prompt is being withdrawn is not withdrawn too", async () => {
-  const queryMock = createInterruptibleQueryMock();
-  let settleWithdrawal: (cancelled: boolean) => void = () => {};
-  queryMock.cancelAsyncMessage.mockImplementationOnce(
-    () => new Promise<boolean>((resolve) => (settleWithdrawal = resolve)),
-  );
-  sdkQueryFactory.mockImplementation(() => queryMock);
-  const session = await createSession();
-
-  await session.startTurn("first");
-  const firstUuid = await readFirstPromptUuid();
-  await session.interrupt();
-  await vi.waitFor(() => expect(queryMock.cancelAsyncMessage).toHaveBeenCalledTimes(1));
-
-  await session.startTurn("second");
-  settleWithdrawal(false);
-
-  await vi.waitFor(() => expect(queryMock.interrupt).toHaveBeenCalledTimes(1));
-  expect(queryMock.cancelAsyncMessage).toHaveBeenCalledTimes(1);
-  expect(queryMock.cancelAsyncMessage).toHaveBeenCalledWith(firstUuid);
-
-  await session.close();
-});
-
-test("an interrupt while only background subagents run never reaches Claude", async () => {
-  const queryMock = createInterruptibleQueryMock();
-  sdkQueryFactory.mockImplementation(() => queryMock);
-  const session = await createSession();
-  const internal: InterruptInternals = asInternals(session);
-
-  await session.startTurn("delegate to a helper");
-  const promptUuid = await readFirstPromptUuid();
-  await internal.routeSdkMessageFromPump(commandLifecycle(promptUuid ?? "", "started"), queryMock);
-  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
-  await internal.routeSdkMessageFromPump(helperTaskStarted, queryMock);
-  await internal.routeSdkMessageFromPump(successResult(), queryMock);
-  // The main session is done; its helper keeps working.
-  await internal.routeSdkMessageFromPump(sessionState("running"), queryMock);
-  await internal.routeSdkMessageFromPump(helperTaskProgress, queryMock);
-
-  // Without perTaskStopAffordance, an interrupt here kills every running helper.
-  await session.interrupt();
-
-  expect(queryMock.interrupt).not.toHaveBeenCalled();
-  expect(queryMock.cancelAsyncMessage).not.toHaveBeenCalled();
-  expect(internal.pendingInterruptAbort).toBe(false);
-
-  await session.close();
-});
-
-test("an interrupt during a main turn interrupts Claude once and drops the aborted result", async () => {
-  const queryMock = createInterruptibleQueryMock();
-  sdkQueryFactory.mockImplementation(() => queryMock);
-  const session = await createSession();
-  const internal: InterruptInternals = asInternals(session);
-  const events: AgentStreamEvent[] = [];
-  session.subscribe((event) => events.push(event));
-
-  await session.startTurn("long task");
-  const promptUuid = await readFirstPromptUuid();
-  await internal.routeSdkMessageFromPump(commandLifecycle(promptUuid ?? "", "started"), queryMock);
-  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
-
-  await session.interrupt();
-  await vi.waitFor(() => expect(queryMock.interrupt).toHaveBeenCalledTimes(1));
-  // Claude already started the message, so there is nothing to withdraw.
-  expect(queryMock.cancelAsyncMessage).not.toHaveBeenCalled();
-  expect(internal.pendingInterruptAbort).toBe(true);
-
-  // A replacement starts before the aborted turn reports its result.
-  const { turnId } = await session.startTurn("replacement");
-  await internal.routeSdkMessageFromPump(abortedResult(), queryMock);
-  expect(internal.activeForegroundTurnId).toBe(turnId);
-  expect(internal.pendingInterruptAbort).toBe(false);
-  expect(events.filter((event) => event.type === "turn_failed")).toHaveLength(0);
-
-  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
-  await internal.routeSdkMessageFromPump(successResult(), queryMock);
-  expect(internal.activeForegroundTurnId).toBeNull();
-  expect(queryMock.interrupt).toHaveBeenCalledTimes(1);
-
-  await session.close();
-});
-
-test("a new turn clears an interrupt flag no result will consume", async () => {
-  const session = await createSession();
-  const internal: InterruptInternals = asInternals(session);
-  const queryMock = createPendingQueryMock();
-  const events: AgentStreamEvent[] = [];
-  session.subscribe((event) => events.push(event));
-
-  // An interrupt that landed just after its turn had ended: Claude emits no result for it.
-  internal.pendingInterruptAbort = true;
-
-  await internal.routeSdkMessageFromPump(claudeTurnInit(), queryMock);
-  expect(internal.pendingInterruptAbort).toBe(false);
-  expect(internal.autonomousTurn?.id).toBe("autonomous-turn-1");
-
-  // This turn's own failure is reported, not swallowed as the interrupted turn's leftover.
-  await internal.routeSdkMessageFromPump(
-    { ...abortedResult(), errors: ["API Error: 500 upstream failure"] },
-    queryMock,
-  );
-  expect(events.filter((event) => event.type === "turn_failed")).toHaveLength(1);
-  expect(internal.autonomousTurn).toBeNull();
-
-  await session.close();
-});
-
 test("tracks run lifecycle transitions for success, error, and interrupt", async () => {
  const session = await createSession();
  let streamCase: "success" | "error" | "interrupt" = "success";
@@ -712,56 +712,4 @@ describe("ClaudeAgentSession persisted subagent replay", () => {
    expect(timeline.length).toBeGreaterThan(0);
    expect(timeline[0]).toMatchObject({ id: TOOL_USE_ID });
  });
-
-  test("replays a SubagentHandback report as the subagent's final message", async () => {
-    const handbackId = "toolu_handback";
-    const report = "## Verdict\n\n- **Coherent**";
-    writeSession({
-      parentLines: [taskToolUse(), taskToolResult()],
-      meta: JSON.stringify({ toolUseId: TOOL_USE_ID }),
-      sidechainLines: [
-        JSON.stringify({
-          type: "assistant",
-          isSidechain: true,
-          agentId: AGENT_ID,
-          message: {
-            role: "assistant",
-            content: [
-              {
-                type: "tool_use",
-                id: handbackId,
-                name: "SubagentHandback",
-                input: { message: report },
-              },
-            ],
-          },
-        }),
-        JSON.stringify({
-          type: "user",
-          isSidechain: true,
-          agentId: AGENT_ID,
-          message: {
-            role: "user",
-            content: [
-              {
-                type: "tool_result",
-                tool_use_id: handbackId,
-                content: [
-                  {
-                    type: "text",
-                    text: '{"success":true,"message":"Report delivered to your caller."}',
-                  },
-                ],
-              },
-            ],
-          },
-        }),
-      ],
-    });
-
-    const items = (await replayDescriptors()).flatMap((event) =>
-      event.event.type === "timeline" ? [event.event.item] : [],
-    );
-    expect(items).toEqual([{ type: "assistant_message", text: report }]);
-  });
 });
@@ -587,75 +587,4 @@ describe("ClaudeAgentSession sub-agent sidechain updates", () => {
    expect(latest.detail.log).toContain("[Read] file-6.md");
    expect(latest.detail.log).toContain("[Read] file-205.md");
  });
-
-  test("keeps a long main-thread tool call out of the subagents track", async () => {
-    // Claude Code sends a heartbeat every 30 s while a tool runs, with the tool's own id as
-    // parent_tool_use_id. Frames captured from Claude Code 2.1.291 for a 40 s MCP call.
-    queryFactory.mockImplementation(() =>
-      buildQueryMock([
-        {
-          type: "system",
-          subtype: "init",
-          session_id: "heartbeat-session",
-          permissionMode: "bypassPermissions",
-          model: "opus",
-        },
-        {
-          type: "assistant",
-          parent_tool_use_id: null,
-          message: {
-            id: "msg-heartbeat-1",
-            role: "assistant",
-            content: [
-              { type: "tool_use", id: "toolu_slow", name: "mcp__slow__slow_check", input: {} },
-            ],
-          },
-        },
-        {
-          type: "tool_progress",
-          tool_use_id: "toolu_slow-heartbeat-0",
-          tool_name: "mcp__slow__slow_check",
-          parent_tool_use_id: "toolu_slow",
-          elapsed_time_seconds: 30,
-          heartbeat: true,
-        },
-        {
-          type: "user",
-          parent_tool_use_id: null,
-          message: {
-            role: "user",
-            content: [
-              {
-                type: "tool_result",
-                tool_use_id: "toolu_slow",
-                content: [{ type: "text", text: "SLOW_CHECK_OK" }],
-                is_error: false,
-              },
-            ],
-          },
-        },
-        {
-          type: "result",
-          subtype: "success",
-          usage: { input_tokens: 1, cache_read_input_tokens: 0, output_tokens: 1 },
-          total_cost_usd: 0,
-        },
-      ]),
-    );
-    const session = await new ClaudeAgentClient({
-      logger,
-      queryFactory,
-      resolveBinary: async () => "/test/claude/bin",
-    }).createSession({ provider: "claude", cwd: process.cwd() });
-
-    const events = await collectUntilTerminal(streamSession(session, "run the slow check"));
-    await session.close();
-
-    expect(events.filter((event) => event.type === "provider_subagent")).toEqual([]);
-    const toolCallNames = events.flatMap((event) =>
-      event.type === "timeline" && event.item.type === "tool_call" ? [event.item.name] : [],
-    );
-    expect(toolCallNames).toContain("mcp__slow__slow_check");
-    expect(toolCallNames).not.toContain("Task");
-  });
 });
@@ -1,56 +0,0 @@
-import { mkdtempSync, rmSync } from "node:fs";
-import { tmpdir } from "node:os";
-import path from "node:path";
-
-import pino from "pino";
-import { expect, test } from "vitest";
-
-import type { AgentStreamEvent, AgentTimelineItem } from "../../agent-sdk-types.js";
-import { collectSessionTurnEvents } from "../test-utils/session-stream-adapter.js";
-import { ClaudeAgentClient } from "./agent.js";
-
-const ROOT_PROMPT = `Use Claude Code's native Agent tool exactly once, never Paseo tools, with this complete task:
-
-Do not use any tools. Reply with exactly this markdown report and nothing else:
-## HANDBACK_HEADING
- **HANDBACK_BOLD** item
-
-Then reply exactly ROOT_DONE.`;
-
-function subagentItems(events: AgentStreamEvent[]): AgentTimelineItem[] {
-  return events.flatMap((event) =>
-    event.type === "provider_subagent" && event.event.type === "timeline" ? [event.event.item] : [],
-  );
-}
-
-function expectHandbackAsReport(items: AgentTimelineItem[]): void {
-  expect(items.filter((item) => item.type === "tool_call")).toEqual([]);
-  expect(
-    items.flatMap((item) => (item.type === "assistant_message" ? [item.text] : [])).join(""),
-  ).toContain("## HANDBACK_HEADING\n- **HANDBACK_BOLD** item");
-}
-
-test("an auto-mode Claude subagent's handback report shows as its final message", async () => {
-  const cwd = mkdtempSync(path.join(tmpdir(), "paseo-claude-subagent-handback-"));
-  const client = new ClaudeAgentClient({ logger: pino({ level: "warn" }) });
-  const session = await client.createSession({ provider: "claude", cwd, modeId: "auto" });
-  try {
-    const events = await collectSessionTurnEvents(session, ROOT_PROMPT);
-    expectHandbackAsReport(subagentItems(events));
-
-    const persistence = session.describePersistence();
-    expect(persistence).not.toBeNull();
-    await session.close();
-    const restored = await client.resumeSession(persistence!, { cwd });
-    try {
-      const replayed: AgentStreamEvent[] = [];
-      for await (const event of restored.streamHistory()) replayed.push(event);
-      expectHandbackAsReport(subagentItems(replayed));
-    } finally {
-      await restored.close();
-    }
-  } finally {
-    await session.close();
-    rmSync(cwd, { recursive: true, force: true });
-  }
-}, 240_000);
@@ -78,7 +78,7 @@ describe("subagent lifecycle across an interrupt", () => {
    queryFactory.mockReset();
  });

-  async function startInterruptibleTurn(taskStarted: Record<string, unknown> = {}) {
+  async function startInterruptibleTurn() {
    const channel = buildOpenQueryMock();
    queryFactory.mockImplementation(() => channel.query);
    const session = await new ClaudeAgentClient({
@@ -107,7 +107,6 @@ describe("subagent lifecycle across an interrupt", () => {
      task_type: "local_agent",
      subagent_type: "general-purpose",
      description: "Reply with banana",
-      ...taskStarted,
    });
    await vi.waitFor(() => expect(subagentEvents.length).toBeGreaterThan(0));

@@ -170,31 +169,6 @@ describe("subagent lifecycle across an interrupt", () => {
    await session.close();
  });

-  test("a child spawned in the background is not canceled with the turn that spawned it", async () => {
-    // Claude announces a background spawn on task_started itself and sends no task_updated patch.
-    const { channel, session, subagentEvents } = await startInterruptibleTurn({
-      is_backgrounded: true,
-    });
-
-    await session.interrupt();
-    channel.push({
-      type: "system",
-      subtype: "task_notification",
-      task_id: TASK_ID,
-      tool_use_id: SUBAGENT_ID,
-      status: "completed",
-    });
-
-    await vi.waitFor(() =>
-      expect(subagentEvents).toContainEqual(
-        expect.objectContaining({ id: SUBAGENT_ID, status: "completed" }),
-      ),
-    );
-    expect(statuses(subagentEvents, SUBAGENT_ID)).toEqual(["running", "completed"]);
-
-    await session.close();
-  });
-
  test("a foreground child is canceled with the turn that spawned it", async () => {
    const { session, subagentEvents } = await startInterruptibleTurn();

@@ -496,7 +496,7 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
      const client = new ClaudeAgentClient({
        logger,
        resolveBinary: async () => "/test/claude/bin",
-        resolveVersion: async () => "2.1.293",
+        resolveVersion: async () => "2.1.284",
        runtimeSettings: { env: { CLAUDE_CONFIG_DIR: emptyConfigDir } },
      });
      const { models } = await client.fetchCatalog({
@@ -515,15 +515,6 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
      expect(getThinkingIds("claude-opus-4-8")).toContain("ultracode");
      expect(getThinkingIds("claude-sonnet-5")).toContain("xhigh");
      expect(getThinkingIds("claude-sonnet-5")).toContain("ultracode");
-      expect(getThinkingIds("claude-haiku-5-5")).toEqual([
-        "off",
-        "low",
-        "medium",
-        "high",
-        "xhigh",
-        "max",
-        "ultracode",
-      ]);
      expect(getThinkingIds("claude-sonnet-5-5")).toContain("xhigh");
      expect(getThinkingIds("claude-sonnet-5-5")).not.toContain("off");
      expect(getThinkingIds("claude-opus-4-7[1m]")).toContain("ultracode");
@@ -1232,7 +1223,6 @@ describe("ClaudeAgentSession features", () => {

  test.each([
    ["supported model", "claude-opus-4-8", { type: "disabled" }, undefined],
-    ["Haiku 5.5", "claude-haiku-5-5", { type: "disabled" }, undefined],
    ["unsupported model", "claude-fable-5", { type: "adaptive", display: "summarized" }, "high"],
    ["custom model", "openrouter/anthropic/claude-opus-4-8", undefined, undefined],
    ["provider default", null, undefined, undefined],
@@ -3170,15 +3160,10 @@ describe("ClaudeAgentSession context window usage", () => {
  });

  test("a compaction abandoned in an autonomous turn does not suppress the next marker", async () => {
-    // Claude starts a turn of its own after the foreground result, which starts compacting and is
-    // then ended by the next foreground turn, never reaching a boundary.
+    // Trailing output after the foreground result opens an autonomous turn, which starts
+    // compacting and is then ended by the next foreground turn, never reaching a boundary.
    const session = await createSessionForTurns([
-      [
-        createSuccessResult(),
-        createInitMessage(),
-        createMessageStartEvent(),
-        createCompactingStatus(),
-      ],
+      [createSuccessResult(), createMessageStartEvent(), createCompactingStatus()],
      [createCompactingStatus(), createSuccessResult()],
    ]);

@@ -44,7 +44,6 @@ import {
 } from "./model-manifest.js";
 import { parsePartialJsonObject } from "./partial-json.js";
 import { ClaudeSidechainTracker } from "./sidechain-tracker.js";
-import { readClaudeSubagentHandback } from "./subagent-handback.js";
 import { ClaudeTaskState } from "./task-state.js";
 import {
  ClaudeTaskProtocolSource,
@@ -84,7 +83,7 @@ import {
  type ClaudeRewindSdk,
 } from "./rewind.js";
 import { normalizeProviderReplayTimestamp } from "../../provider-history-timestamps.js";
-import { claudeConfigDir, claudeProjectDirSync, claudeTranscriptPathSync } from "./project-dir.js";
+import { claudeConfigDir, claudeProjectDirSync } from "./project-dir.js";
 import { THINKING_APPLIES_NEXT_TURN_NOTICE } from "../../provider-notices.js";
 import {
  isProviderImageMarkdown,
@@ -452,15 +451,6 @@ function errorToMessageString(error: unknown): string {
  return "";
 }

-/**
- * Claude opens every main-session turn with system/init and closes it with exactly one result:
- * a prompt, a wake-up after background work, a slash command, an API error. Background subagents
- * never emit either on the main stream.
- */
-function isClaudeTurnInit(message: SDKMessage): boolean {
-  return message.type === "system" && message.subtype === "init";
-}
-
 function firstStringField(
  input: Record<string, unknown>,
  primaryKey: string,
@@ -1916,11 +1906,6 @@ function readClaudeParentToolUseId(message: SDKMessage): string | null {
  if (!("parent_tool_use_id" in message)) {
    return null;
  }
-  // Claude Code's liveness tick for a tool still running after 30 s names that tool as its
-  // parent, so a long main-thread call would otherwise read as a subagent.
-  if (message.type === "tool_progress" && message.heartbeat === true) {
-    return null;
-  }
  const parentToolUseId = (message as { parent_tool_use_id?: unknown }).parent_tool_use_id;
  return typeof parentToolUseId === "string" && parentToolUseId.length > 0 ? parentToolUseId : null;
 }
@@ -2084,12 +2069,11 @@ class ClaudeAgentSession implements AgentSession {
  private activeForegroundQuery: Query | null = null;
  private activeForegroundInput: AsyncMessageInput<SDKUserMessage> | null = null;
  /**
-   * Messages pushed into the live SDK input (steers, and a foreground turn's own prompt) whose
-   * command_lifecycle has not reached "started". Interrupting has to withdraw them, or the SDK
-   * dequeues one and resumes the turn we just stopped. SDK user UUIDs are provider-private; never
-   * let them escape the adapter boundary.
+   * Steers pushed into the live SDK input that Claude may not have read yet. Interrupting the turn
+   * has to discard them, or the SDK dequeues one and resumes the turn we just stopped. SDK user
+   * UUIDs are provider-private; never let them escape the adapter boundary.
   */
-  private readonly unstartedMessageUuids = new Set<string>();
+  private readonly queuedSteerUuids = new Set<string>();
  /** Human steers whose text has not reached Claude yet and therefore supersede blocking cards. */
  private readonly permissionClearingSteerUuids = new Set<string>();
  private claudeSessionId: string | null;
@@ -2100,7 +2084,6 @@ class ClaudeAgentSession implements AgentSession {
  private toolUseCache = new Map<string, ToolUseCacheEntry>();
  private toolUseIndexToId = new Map<number, string>();
  private toolUseInputBuffers = new Map<string, string>();
-  private subagentHandbackIds = new Set<string>();
  private pendingPermissions = new Map<string, PendingPermission>();
  private activeForegroundTurnId: string | null = null;
  private autonomousTurn: AutonomousTurnState | null = null;
@@ -2141,12 +2124,6 @@ class ClaudeAgentSession implements AgentSession {
  private queryPumpPromise: Promise<void> | null = null;
  private queryRestartNeeded = false;
  private pendingInterruptAbort = false;
-  /**
-   * Whether Claude's main session is inside one of its own turns: set by system/init and by a
-   * pushed message's command_lifecycle "started" (/compact works for seconds before its init),
-   * cleared by the turn's result or an idle session state. See observeMainTurnBracket.
-   */
-  private mainTurnInFlight = false;
  private foregroundHasVisibleActivity = false;
  private activeTurnHasAssistantText = false;
  private readonly contextUsage: ClaudeContextUsageState;
@@ -2293,7 +2270,6 @@ class ClaudeAgentSession implements AgentSession {
    this.contextUsage.beginTurn();
    this.transitionTurnState("foreground", "foreground turn started");
    this.clearRecentStderr();
-    if (sdkUserMessageId) this.unstartedMessageUuids.add(sdkUserMessageId);

    let cancelIssued = false;
    const requestCancel = () => {
@@ -2304,18 +2280,13 @@ class ClaudeAgentSession implements AgentSession {
      if (this.cancelCurrentTurn === requestCancel) {
        this.cancelCurrentTurn = null;
      }
-      // Whether Claude has this message in hand. A late idle from the previous turn can clear
-      // mainTurnInFlight after Claude started it, so the message's own lifecycle counts too.
-      const claudeStartedTurn =
-        this.mainTurnInFlight ||
-        (sdkUserMessageId !== null && !this.unstartedMessageUuids.has(sdkUserMessageId));
      this.rejectAllPendingPermissions(new Error("Permission request canceled"));
      this.finishForegroundTurn({
        type: "turn_canceled",
        provider: "claude",
        reason: "Interrupted",
      });
-      void this.interruptActiveTurn(claudeStartedTurn).catch((error) => {
+      void this.interruptActiveTurn().catch((error) => {
        this.logger.warn({ err: error }, "Failed to interrupt during cancel");
      });
    };
@@ -2325,11 +2296,6 @@ class ClaudeAgentSession implements AgentSession {

    try {
      await this.ensureQuery();
-      if (cancelIssued) {
-        // Stopped while Claude was still starting up: withdrawn by never sending it.
-        if (sdkUserMessageId) this.unstartedMessageUuids.delete(sdkUserMessageId);
-        return { turnId };
-      }
      if (!this.input) {
        throw new Error("Claude session input stream not initialized");
      }
@@ -2343,7 +2309,6 @@ class ClaudeAgentSession implements AgentSession {
        }
      }, 0);
    } catch (error) {
-      if (sdkUserMessageId) this.unstartedMessageUuids.delete(sdkUserMessageId);
      this.finishForegroundTurn(
        this.buildTurnFailedEvent(error instanceof Error ? error.message : "Claude stream failed"),
      );
@@ -2392,7 +2357,7 @@ class ClaudeAgentSession implements AgentSession {
    clearPendingPermissions: boolean,
  ): void {
    const uuid = message.uuid;
-    if (uuid) this.unstartedMessageUuids.add(uuid);
+    if (uuid) this.queuedSteerUuids.add(uuid);
    if (uuid && clearPendingPermissions) {
      this.permissionClearingSteerUuids.add(uuid);
    }
@@ -2403,7 +2368,7 @@ class ClaudeAgentSession implements AgentSession {
      }
    } catch (error) {
      if (uuid) {
-        this.unstartedMessageUuids.delete(uuid);
+        this.queuedSteerUuids.delete(uuid);
        this.permissionClearingSteerUuids.delete(uuid);
      }
      throw error;
@@ -2474,15 +2439,8 @@ class ClaudeAgentSession implements AgentSession {
    const normalized = isPermissionMode(modeId) ? modeId : "default";
    assertClaudeModeCanRun(normalized, this.harnessEnvironment);
    const previousMode = this.currentMode;
-    const launchesQuery = !this.query || this.queryRestartNeeded;
-    const activeQuery = await this.ensureQuery(normalized);
-    try {
-      await activeQuery.setPermissionMode(normalized);
-    } catch (error) {
-      // The query was launched in the rejected mode; relaunch in the current mode next time.
-      if (launchesQuery) this.queryRestartNeeded = true;
-      throw error;
-    }
+    const activeQuery = await this.ensureQuery();
+    await activeQuery.setPermissionMode(normalized);
    if (normalized === "plan") {
      if (previousMode !== "plan") {
        this.planResumeMode = previousMode;
@@ -3168,7 +3126,7 @@ class ClaudeAgentSession implements AgentSession {
    return { kind: "fresh-session" };
  }

-  private async ensureQuery(launchMode: PermissionMode = this.currentMode): Promise<Query> {
+  private async ensureQuery(): Promise<Query> {
    if (this.query && !this.queryRestartNeeded) {
      return this.query;
    }
@@ -3212,11 +3170,9 @@ class ClaudeAgentSession implements AgentSession {
    this.persistence = null;

    const input = createAsyncMessageInput<SDKUserMessage>();
-    const options = await this.buildOptions(launchMode);
+    const options = await this.buildOptions();
    this.logger.debug({ options: summarizeClaudeOptionsForLog(options) }, "claude query");
    this.input = input;
-    // A fresh Claude process has no turn of its own in flight.
-    this.mainTurnInFlight = false;
    this.query = claudeQuery(
      { prompt: input.iterable, options },
      {
@@ -3336,16 +3292,11 @@ class ClaudeAgentSession implements AgentSession {
    return createProviderEnv({
      baseEnv: process.env,
      runtimeSettings: this.runtimeSettings,
-      overlays: [
-        this.launchEnv,
-        // Makes the CLI announce session_state_changed, whose "idle" is the safety net that closes
-        // an autonomous turn (see consumeSessionStateChange).
-        { CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS: "1" },
-      ],
+      overlays: [this.launchEnv],
    });
  }

-  private async buildOptions(permissionMode: PermissionMode): Promise<ClaudeOptions> {
+  private async buildOptions(): Promise<ClaudeOptions> {
    const { thinking, effort, ultracode } = this.resolveThinkingConfig();
    const appendedSystemPrompt = this.buildAppendedSystemPrompt();
    const providerOptions = applyClaudeToolPolicy(
@@ -3354,7 +3305,7 @@ class ClaudeAgentSession implements AgentSession {
    );
    const settingsOptions = this.buildSettingsOptions(providerOptions, { ultracode });
    const sdkEnv = this.harnessEnvironment;
-    assertClaudeModeCanRun(permissionMode, sdkEnv);
+    assertClaudeModeCanRun(this.currentMode, sdkEnv);

    const claudeBinary = await this.resolveBinary();
    this.logger.debug(
@@ -3377,7 +3328,7 @@ class ClaudeAgentSession implements AgentSession {
    const base: ClaudeOptions = {
      cwd: this.config.cwd,
      includePartialMessages: true,
-      permissionMode,
+      permissionMode: this.currentMode,
      // Dynamic mode switching can recreate the underlying Claude query. Keep the
      // bypass launch capability available so later setPermissionMode("bypassPermissions")
      // calls do not fail after a model/thinking/rewind-driven restart.
@@ -3408,10 +3359,6 @@ class ClaudeAgentSession implements AgentSession {
      ...settingsOptions,
      // Provider subagent panes render the child's nested transcript.
      forwardSubagentText: true,
-      // Stop and replace abort only the main turn, like Esc in Claude Code, and background
-      // subagents keep running. Without this declaration an interrupt kills every one of them.
-      // Claude stops a helper itself with its TaskStop tool.
-      perTaskStopAffordance: true,
      hooks: this.buildSubagentEffortHooks(),
      ...(this.persistSession === undefined ? {} : { persistSession: this.persistSession }),
      env: sdkEnv,
@@ -3942,67 +3889,35 @@ class ClaudeAgentSession implements AgentSession {
    return false;
  }

+  private isAssistantishMessage(message: SDKMessage): boolean {
+    return (
+      message.type === "assistant" ||
+      message.type === "stream_event" ||
+      message.type === "tool_progress" ||
+      (message.type === "system" && message.subtype === "task_notification")
+    );
+  }
+
  /**
-   * Claude's account of whether anything in the session is working, which is not the same as the
-   * main session working: Claude Code 2.1.280 stays "running" for as long as any background
-   * subagent is alive. So "running" never opens a turn.
-   *
-   * "idle" means nothing at all is running, so it closes an autonomous turn whatever opened it.
-   * It never closes a foreground turn: an idle can trail the previous turn and land just after a
-   * new send, and it must not end that send.
-   *
-   * Returns true when the frame was a state change, which is bookkeeping and never reaches the
-   * timeline.
+   * Claude keeps talking about the request it was told to kill — the notification for the tool it
+   * just stopped, trailing assistant output. That is not new work, so it must not open a turn: the
+   * only message that would close that turn is the result shouldSuppressStaleResult drops, leaving
+   * the agent stuck reporting "running" forever.
   */
-  private consumeSessionStateChange(message: SDKMessage): boolean {
-    if (message.type !== "system" || message.subtype !== "session_state_changed") {
+  private shouldStartAutonomousTurn(message: SDKMessage): boolean {
+    if (this.activeForegroundTurnId || this.pendingInterruptAbort) {
      return false;
    }
-    if (message.state === "idle") {
-      this.mainTurnInFlight = false;
-      this.completeAutonomousTurn();
-    }
-    return true;
-  }
-
-  /** Tracks mainTurnInFlight from Claude's own turn brackets (isClaudeTurnInit). */
-  private observeMainTurnBracket(message: SDKMessage): void {
-    if (message.type === "result") {
-      this.mainTurnInFlight = false;
-      return;
-    }
-    if (isClaudeTurnInit(message)) {
-      this.mainTurnInFlight = true;
-      // A new turn has begun, so the interrupted one is over. An interrupt that landed after its
-      // turn had already ended gets no result, and the leftover flag would swallow this turn's.
-      this.pendingInterruptAbort = false;
-      return;
-    }
-    if (readClaudeCommandLifecycle(message)?.state === "started") {
-      this.mainTurnInFlight = true;
-    }
-  }
-
-  /**
-   * Only the main session's own turn start opens an autonomous turn. Everything a background
-   * subagent emits (its task frames, its own background jobs' notifications, rate limit events)
-   * arrives outside one, and no result would ever close a turn it opened.
-   */
-  private opensAutonomousTurn(message: SDKMessage): boolean {
-    return isClaudeTurnInit(message) && !this.activeForegroundTurnId;
+    return this.isAssistantishMessage(message);
  }

  private async routeSdkMessageFromPump(message: SDKMessage): Promise<void> {
-    if (this.consumeSessionStateChange(message)) {
-      return;
-    }
-    this.observeMainTurnBracket(message);
    if (this.shouldSuppressStaleResult(message)) {
      return;
    }

    const isForeground = Boolean(this.activeForegroundTurnId);
-    if (this.opensAutonomousTurn(message)) {
+    if (this.shouldStartAutonomousTurn(message)) {
      this.startAutonomousTurn();
    }
    if (!isForeground && !this.autonomousTurn && message.type === "result") {
@@ -4144,13 +4059,7 @@ class ClaudeAgentSession implements AgentSession {
    return true;
  }

-  /**
-   * Interrupts Claude only when a turn of its main session is running. With nothing running there
-   * is nothing to stop but our own queued messages, so those are withdrawn instead: an interrupt
-   * would reach only background helpers (and kill them on a CLI that ignores
-   * perTaskStopAffordance), and no result would follow to consume pendingInterruptAbort.
-   */
-  private async interruptActiveTurn(claudeStartedTurn = this.mainTurnInFlight): Promise<void> {
+  private async interruptActiveTurn(): Promise<void> {
    const queryToInterrupt = this.query;
    if (!queryToInterrupt || typeof queryToInterrupt.interrupt !== "function") {
      this.logger.trace(
@@ -4164,16 +4073,8 @@ class ClaudeAgentSession implements AgentSession {
      );
      return;
    }
-    if (claudeStartedTurn) {
-      this.pendingInterruptAbort = true;
-      await this.withdrawUnstartedMessages(queryToInterrupt);
-    } else {
-      // Claude can dequeue a message for its next turn before announcing it started; withdrawing
-      // it is then a no-op, and only an interrupt stops it. Withdraw once: a prompt sent while
-      // this withdrawal was in flight belongs to the next turn.
-      if (await this.withdrawUnstartedMessages(queryToInterrupt)) return;
-      this.pendingInterruptAbort = true;
-    }
+    this.pendingInterruptAbort = true;
+    await this.discardQueuedSteers(queryToInterrupt);
    try {
      await this.awaitWithTimeout(
        queryToInterrupt.interrupt(),
@@ -4185,15 +4086,14 @@ class ClaudeAgentSession implements AgentSession {
  }

  /**
-   * Interrupt means interrupt: a message Claude never started dies with the turn instead of
-   * resuming it. One already dequeued cannot be recalled, and does not need to be, since the
-   * interrupt kills it. Returns whether Claude confirmed every message withdrawn.
+   * Interrupt means interrupt: a steer Claude never read dies with the turn instead of resuming it.
+   * A steer already dequeued cannot be recalled, and does not need to be — the interrupt kills it.
   */
-  private async withdrawUnstartedMessages(query: Query): Promise<boolean> {
-    const uuids = [...this.unstartedMessageUuids];
-    this.unstartedMessageUuids.clear();
+  private async discardQueuedSteers(query: Query): Promise<void> {
+    const uuids = [...this.queuedSteerUuids];
+    this.queuedSteerUuids.clear();
    this.permissionClearingSteerUuids.clear();
-    if (uuids.length === 0) return true;
+    if (uuids.length === 0) return;
    // The SDK runtime supports this, but its public Query type has not caught up. Keep the
    // compatibility escape hatch inside the Claude adapter.
    const cancelAsyncMessage = (
@@ -4201,17 +4101,14 @@ class ClaudeAgentSession implements AgentSession {
        cancelAsyncMessage?: (uuid: string) => Promise<boolean>;
      }
    ).cancelAsyncMessage;
-    if (!cancelAsyncMessage) return false;
-    let withdrewAll = true;
+    if (!cancelAsyncMessage) return;
    for (const uuid of uuids) {
      try {
-        if (!(await cancelAsyncMessage.call(query, uuid))) withdrewAll = false;
+        await cancelAsyncMessage.call(query, uuid);
      } catch (error) {
-        withdrewAll = false;
-        this.logger.warn({ err: error }, "Failed to withdraw a queued Claude message");
+        this.logger.warn({ err: error }, "Failed to discard a queued Claude steer");
      }
    }
-    return withdrewAll;
  }

  private translateMessageToEvents(
@@ -4260,7 +4157,7 @@ class ClaudeAgentSession implements AgentSession {
      }
    }

-    this.forgetStartedMessage(message);
+    this.forgetReadSteer(message);

    switch (message.type) {
      case "system":
@@ -4294,14 +4191,11 @@ class ClaudeAgentSession implements AgentSession {
    return events;
  }

-  /**
-   * Once Claude has started a message, or cancelled it, there is nothing left to withdraw on
-   * interrupt.
-   */
-  private forgetStartedMessage(message: unknown): void {
+  /** Once Claude has read a steer there is nothing left to discard on interrupt. */
+  private forgetReadSteer(message: unknown): void {
    const lifecycle = readClaudeCommandLifecycle(message);
    if (!lifecycle || lifecycle.state === "queued") return;
-    this.unstartedMessageUuids.delete(lifecycle.commandUuid);
+    this.queuedSteerUuids.delete(lifecycle.commandUuid);
    this.permissionClearingSteerUuids.delete(lifecycle.commandUuid);
  }

@@ -5221,11 +5115,26 @@ class ClaudeAgentSession implements AgentSession {
  private resolveHistoryPath(sessionId: string): string | null {
    const cwd = this.config.cwd;
    if (!cwd) return null;
-    return claudeTranscriptPathSync({
-      cwd,
-      sessionId,
-      configDir: claudeConfigDir(this.harnessEnvironment),
-    });
+    const configDir = claudeConfigDir(this.harnessEnvironment);
+    const candidates = [cwd];
+    try {
+      const realCwd = fs.realpathSync(cwd);
+      if (realCwd !== cwd) {
+        candidates.push(realCwd);
+      }
+    } catch {
+      // Fall back to the configured cwd when the path has already disappeared.
+    }
+    for (const candidate of candidates) {
+      const historyPath = path.join(
+        claudeProjectDirSync(candidate, { configDir }),
+        `${sessionId}.jsonl`,
+      );
+      if (fs.existsSync(historyPath)) {
+        return historyPath;
+      }
+    }
+    return path.join(claudeProjectDirSync(cwd, { configDir }), `${sessionId}.jsonl`);
  }

  private convertHistoryEntry(entry: ClaudeHistoryEntry): AgentTimelineItem[] {
@@ -5275,7 +5184,7 @@ class ClaudeAgentSession implements AgentSession {
    // User SDK entries can arrive as multiple text blocks, but Paseo treats them as one message.
    const userTextParts: string[] = [];
    for (const block of content) {
-      if (!isClaudeContentChunk(block) || this.mapSubagentHandbackBlock(block, items)) {
+      if (!isClaudeContentChunk(block)) {
        continue;
      }
      this.mapBlockToTimeline(block, {
@@ -5363,24 +5272,6 @@ class ClaudeAgentSession implements AgentSession {
    }
  }

-  // A subagent's handback call is its final message, and the call's result is only an
-  // acknowledgement, so neither becomes a tool call.
-  private mapSubagentHandbackBlock(block: ClaudeContentChunk, items: AgentTimelineItem[]): boolean {
-    if (typeof block.tool_use_id === "string" && this.subagentHandbackIds.has(block.tool_use_id)) {
-      this.subagentHandbackIds.delete(block.tool_use_id);
-      return true;
-    }
-    const handback = readClaudeSubagentHandback(block);
-    if (!handback) {
-      return false;
-    }
-    this.subagentHandbackIds.add(handback.callId);
-    if (handback.report) {
-      items.push({ type: "assistant_message", text: handback.report });
-    }
-    return true;
-  }
-
  private handleToolUseStart(block: ClaudeContentChunk, items: AgentTimelineItem[]): void {
    const entry = this.upsertToolUseEntry(block);
    if (!entry) {
@@ -6601,8 +6492,7 @@ function extractClaudeUserText(messageRaw: unknown): string | null {

 interface ClaudeCommandLifecycle {
  commandUuid: string;
-  /** "cancelled" is terminal too: API errors, interrupts and "now" pre-emption end a message. */
-  state: "queued" | "started" | "completed" | "cancelled";
+  state: "queued" | "started" | "completed";
 }

 /** Runtime-only Claude frames are validated here because the SDK's public union omits them. */
@@ -6611,7 +6501,7 @@ function readClaudeCommandLifecycle(message: unknown): ClaudeCommandLifecycle |
  if (record?.type !== "command_lifecycle") return null;
  if (
    typeof record.command_uuid !== "string" ||
-    !["queued", "started", "completed", "cancelled"].includes(String(record.state))
+    !["queued", "started", "completed"].includes(String(record.state))
  ) {
    return null;
  }
@@ -170,20 +170,10 @@ export const CLAUDE_MODEL_MANIFEST = [
    effortLevels: CLAUDE_EFFORT_LEVELS.standard,
    supportsThinkingDisabled: true,
  },
-  {
-    id: "claude-haiku-5-5",
-    label: "Haiku 5.5",
-    description: "Haiku 5.5 · Fastest for quick answers",
-    minimumClaudeCodeVersion: "2.1.293",
-    defaultThinkingOptionId: "medium",
-    contextWindowMaxTokens: 1_000_000,
-    effortLevels: CLAUDE_EFFORT_LEVELS.xhigh,
-    supportsThinkingDisabled: true,
-  },
  {
    id: "claude-haiku-4-5",
    label: "Haiku 4.5",
-    description: "Haiku 4.5 · Previous release",
+    description: "Haiku 4.5 · Fastest for quick answers",
    contextWindowMaxTokens: 200_000,
  },
 ] as const satisfies readonly ClaudeModelManifestEntry[];
@@ -39,7 +39,7 @@ async function createClaudeConfigDirWithRawSettings(settings: string): Promise<s
  return configDir;
 }

-function createCatalogClient(claudeCodeVersion = "2.1.293"): ClaudeAgentClient {
+function createCatalogClient(claudeCodeVersion = "2.1.284"): ClaudeAgentClient {
  return new ClaudeAgentClient({
    logger: createTestLogger(),
    resolveVersion: async () => claudeCodeVersion,
@@ -66,7 +66,6 @@ describe("getClaudeModels", () => {
      "claude-opus-4-6",
      "claude-sonnet-4-6[1m]",
      "claude-sonnet-4-6",
-      "claude-haiku-5-5",
      "claude-haiku-4-5",
    ]);
  });
@@ -101,7 +100,6 @@ describe("getClaudeModels", () => {
        ["claude-opus-4-6", 200_000],
        ["claude-sonnet-4-6[1m]", 1_000_000],
        ["claude-sonnet-4-6", 200_000],
-        ["claude-haiku-5-5", 1_000_000],
        ["claude-haiku-4-5", 200_000],
      ]),
    );
@@ -125,12 +123,6 @@ describe("getClaudeModels", () => {
    expect(getClaudeModels("2.1.284").map((model) => model.id)).toContain("claude-sonnet-5-5");
  });

-  it("gates Haiku 5.5 on Claude Code 2.1.293 without changing the default", () => {
-    expect(getClaudeModels("2.1.292").map((model) => model.id)).not.toContain("claude-haiku-5-5");
-    expect(getClaudeModels("2.1.293").map((model) => model.id)).toContain("claude-haiku-5-5");
-    expect(getClaudeModels("2.1.293").find((model) => model.isDefault)?.id).toBe("claude-opus-5-5");
-  });
-
  it("derives thinking options from model effort capabilities", () => {
    const models = new Map(getClaudeModels().map((model) => [model.id, model]));

@@ -200,8 +192,6 @@ describe("getClaudeModels", () => {
    ["claude-sonnet-5-20260101", true, "high"],
    ["claude-fable-5", false, "high"],
    ["claude-fable-5-1", false, "high"],
-    ["claude-haiku-5-5", true, "medium"],
-    ["claude-haiku-5-5-20261007", true, "medium"],
    ["claude-haiku-4-5", false, undefined],
    ["openrouter/anthropic/claude-opus-4-8", false, undefined],
    [null, false, undefined],
@@ -663,51 +653,6 @@ describe("Claude Sonnet 5.5 catalog", () => {
  });
 });

-describe("Claude Haiku 5.5 catalog", () => {
-  it("offers one Haiku 5.5 entry with a 1M context window", () => {
-    const haiku55Models = getClaudeModels()
-      .filter((model) => model.id.startsWith("claude-haiku-5-5"))
-      .map(({ id, label, contextWindowMaxTokens }) => ({ id, label, contextWindowMaxTokens }));
-
-    expect(haiku55Models).toEqual([
-      { id: "claude-haiku-5-5", label: "Haiku 5.5", contextWindowMaxTokens: 1_000_000 },
-    ]);
-  });
-
-  it("offers Off and every effort level with medium as the default", () => {
-    const haiku55 = getClaudeModels().find((model) => model.id === "claude-haiku-5-5");
-
-    expect(haiku55?.thinkingOptions?.map((option) => option.id)).toEqual([
-      CLAUDE_DISABLED_THINKING_OPTION_ID,
-      "low",
-      "medium",
-      "high",
-      "xhigh",
-      "max",
-      CLAUDE_ULTRACODE_THINKING_OPTION_ID,
-    ]);
-    expect(haiku55?.defaultThinkingOptionId).toBe("medium");
-    expect(
-      haiku55?.thinkingOptions?.filter((option) => option.isDefault).map((option) => option.id),
-    ).toEqual(["medium"]);
-  });
-
-  it("normalizes provider-prefixed runtime IDs", () => {
-    expect(normalizeClaudeRuntimeModelId("anthropic/claude-haiku-5-5")).toBe("claude-haiku-5-5");
-    expect(normalizeClaudeRuntimeModelId("us.anthropic.claude-haiku-5-5-v1:0")).toBe(
-      "claude-haiku-5-5",
-    );
-    expect(claudeManifestModelSupportsFastMode("claude-haiku-5-5")).toBe(false);
-  });
-
-  it("resolves suffixed and dated Haiku 5.5 IDs to the single catalog entry", () => {
-    expect(findClaudeModel("claude-haiku-5-5[1m]")?.id).toBe("claude-haiku-5-5");
-    expect(findClaudeModel("claude-haiku-5-5-20261007")?.id).toBe("claude-haiku-5-5");
-    expect(findClaudeModel("claude-haiku-5-5-20261007[1m]")?.id).toBe("claude-haiku-5-5");
-    expect(findClaudeModel("claude-haiku-5-5[1m]")?.contextWindowMaxTokens).toBe(1_000_000);
-  });
-});
-
 describe("claudeManifestModelSupportsFastMode", () => {
  it("keeps fast mode strict to first-party manifest model IDs", () => {
    expect(normalizeClaudeManifestModelId("openrouter/anthropic/claude-opus-4-8")).toBeNull();
@@ -1,4 +1,4 @@
-import { existsSync, readdirSync, realpathSync } from "node:fs";
+import { realpathSync } from "node:fs";
 import { realpath } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -30,46 +30,6 @@ export function claudeProjectDirSync(cwd: string, options?: ClaudeProjectDirOpti
  return join(projectsRoot, encode(canonical));
 }

-// Claude Code resumes a session by id from any working directory and keeps appending to the
-// transcript in the project folder where the session started. That folder differs from the
-// one `cwd` encodes to when the project moved, the daemon migrated, or Claude Code sees the
-// cwd under another name (a Windows binary under WSL). Returns the expected path when no
-// transcript exists anywhere.
-export function claudeTranscriptPathSync(input: {
-  cwd: string;
-  sessionId: string;
-  configDir?: string;
-}): string {
-  const options = { configDir: input.configDir };
-  const fileName = `${input.sessionId}.jsonl`;
-  const expected = join(claudeProjectDirSync(input.cwd, options), fileName);
-  if (existsSync(expected)) {
-    return expected;
-  }
-  const projectsRoot = join(resolveConfigDir(options), "projects");
-  let projectDirs: string[];
-  try {
-    projectDirs = readdirSync(projectsRoot);
-  } catch (error) {
-    if (isMissingDirectoryError(error)) {
-      return expected;
-    }
-    throw error;
-  }
-  for (const projectDir of projectDirs) {
-    const candidate = join(projectsRoot, projectDir, fileName);
-    if (existsSync(candidate)) {
-      return candidate;
-    }
-  }
-  return expected;
-}
-
-function isMissingDirectoryError(error: unknown): boolean {
-  const code = (error as NodeJS.ErrnoException | null)?.code;
-  return code === "ENOENT" || code === "ENOTDIR";
-}
-
 async function canonicalize(input: string): Promise<string> {
  try {
    return normalizeProjectPath(await realpath(input));
@@ -35,64 +35,4 @@ describe("ClaudeSidechainTracker", () => {
      },
    });
  });
-
-  it("shows a SubagentHandback report as the subagent's final message", () => {
-    const tracker = new ClaudeSidechainTracker({ getToolInput: () => null });
-    const report = "    indented code\n\n## Verdict\n\n- **Coherent**";
-    const frames = [
-      {
-        type: "stream_event",
-        parent_tool_use_id: "task-1",
-        event: {
-          type: "content_block_start",
-          index: 0,
-          content_block: {
-            type: "tool_use",
-            id: "handback-1",
-            name: "SubagentHandback",
-            input: {},
-          },
-        },
-      },
-      {
-        type: "assistant",
-        parent_tool_use_id: "task-1",
-        message: {
-          id: "msg-1",
-          content: [
-            {
-              type: "tool_use",
-              id: "handback-1",
-              name: "SubagentHandback",
-              input: { message: report },
-            },
-          ],
-        },
-      },
-      {
-        type: "user",
-        parent_tool_use_id: "task-1",
-        message: {
-          content: [
-            {
-              type: "tool_result",
-              tool_use_id: "handback-1",
-              tool_name: "SubagentHandback",
-              content: [{ type: "text", text: '{"success":true}' }],
-            },
-          ],
-        },
-      },
-    ];
-
-    const childItems = frames
-      .flatMap((frame) => tracker.handleMessage(frame as unknown as SDKMessage, "task-1"))
-      .flatMap((event) =>
-        event.type === "provider_subagent" && event.event.type === "timeline"
-          ? [event.event.item]
-          : [],
-      );
-
-    expect(childItems).toEqual([{ type: "assistant_message", text: report, messageId: "msg-1" }]);
-  });
 });
@@ -6,10 +6,6 @@ import {
  mapClaudeRunningToolCall,
 } from "./tool-call-mapper.js";
 import { buildToolCallDisplayModel } from "@getpaseo/protocol/tool-call-display";
-import {
-  isClaudeSubagentHandbackToolName,
-  readClaudeSubagentHandback,
-} from "./subagent-handback.js";

 import type { AgentMetadata, AgentStreamEvent, AgentTimelineItem } from "../../agent-sdk-types.js";

@@ -95,7 +91,7 @@ export class ClaudeSidechainTracker {
    const contextUpdated = this.updateSubAgentContextFromTaskInput(state, parentToolUseId);
    const actionCandidates = this.extractSubAgentActionCandidates(message);
    const childTimelineItems = [
-      ...this.extractSubAgentTimelineItems(message, state),
+      ...this.extractSubAgentTimelineItems(message),
      ...this.extractSubAgentToolResults(message, state),
    ];
    let actionUpdated = false;
@@ -237,10 +233,7 @@ export class ClaudeSidechainTracker {
    this.activeSidechains.clear();
  }

-  private extractSubAgentTimelineItems(
-    message: SDKMessage,
-    state: SubAgentActivityState,
-  ): AgentTimelineItem[] {
+  private extractSubAgentTimelineItems(message: SDKMessage): AgentTimelineItem[] {
    if (message.type !== "assistant" || !Array.isArray(message.message?.content)) {
      return [];
    }
@@ -260,18 +253,6 @@ export class ClaudeSidechainTracker {
      } else if (block.type === "thinking") {
        const text = readTrimmedString(block.thinking);
        if (text) items.push({ type: "reasoning", text });
-      } else {
-        const handback = readClaudeSubagentHandback(block);
-        if (!handback) continue;
-        // The handback's result is only an acknowledgement, never a tool card.
-        state.completedActionKeys.add(handback.callId);
-        if (handback.report) {
-          items.push({
-            type: "assistant_message",
-            text: handback.report,
-            ...(messageId ? { messageId } : {}),
-          });
-        }
      }
    }
    return items;
@@ -410,12 +391,6 @@ export class ClaudeSidechainTracker {
  }

  private extractSubAgentActionCandidates(message: SDKMessage): SubAgentActionCandidate[] {
-    return this.extractToolActionCandidates(message).filter(
-      (action) => !isClaudeSubagentHandbackToolName(action.toolName),
-    );
-  }
-
-  private extractToolActionCandidates(message: SDKMessage): SubAgentActionCandidate[] {
    if (message.type === "assistant") {
      return this.extractAssistantMessageActions(message);
    }
@@ -1,27 +0,0 @@
-/**
- * Since Claude Code 2.1.271, a subagent in auto mode delivers its report to its caller through a
- * `SubagentHandback` tool call instead of its final text. The report is the subagent's final
- * message, so Paseo shows it as one and hides the call and its acknowledgement.
- */
-const SUBAGENT_HANDBACK_TOOL_NAME = "SubagentHandback";
-
-export interface ClaudeSubagentHandback {
-  callId: string;
-  /** Null while the call is still streaming its input. */
-  report: string | null;
-}
-
-export function isClaudeSubagentHandbackToolName(name: unknown): boolean {
-  return name === SUBAGENT_HANDBACK_TOOL_NAME;
-}
-
-export function readClaudeSubagentHandback(block: {
-  type: string;
-  [key: string]: unknown;
-}): ClaudeSubagentHandback | null {
-  if (block.type !== "tool_use" || !isClaudeSubagentHandbackToolName(block.name)) return null;
-  if (typeof block.id !== "string" || block.id.length === 0) return null;
-  const input = block.input as { message?: unknown } | null | undefined;
-  const report = typeof input?.message === "string" ? input.message : "";
-  return { callId: block.id, report: report.trim().length > 0 ? report : null };
-}
@@ -511,33 +511,6 @@ describe("ClaudeTaskProtocolSource", () => {
    expect(source.cancelRunningForegroundTasks()).toEqual([]);
  });

-  it("does not cancel a subagent announced as backgrounded at spawn", () => {
-    // Claude sets is_backgrounded on task_started for a child spawned in the background, and
-    // sends no task_updated patch for it.
-    const source = new ClaudeTaskProtocolSource();
-    source.observe(taskStarted({ is_backgrounded: true }));
-
-    expect(source.cancelRunningForegroundTasks()).toEqual([]);
-  });
-
-  it("does not cancel a resumed subagent, which Claude always runs in the background", () => {
-    const source = new ClaudeTaskProtocolSource();
-    source.observe(taskStarted({ tool_use_id: "toolu_original", is_backgrounded: false }));
-    source.observe(taskUpdated("completed"));
-    source.observe(taskStarted({ tool_use_id: "toolu_resumed", is_backgrounded: true }));
-
-    expect(source.cancelRunningForegroundTasks()).toEqual([]);
-  });
-
-  it("still cancels a subagent announced in the foreground", () => {
-    const source = new ClaudeTaskProtocolSource();
-    source.observe(taskStarted({ is_backgrounded: false }));
-
-    expect(source.cancelRunningForegroundTasks()).toEqual([
-      { kind: "status", id: "toolu_01DgLoPMW9", status: "canceled" },
-    ]);
-  });
-
  it("still routes a backgrounded subagent that settles after the interrupt", () => {
    // The headline case: interrupt, continue, and the child that was told to outlive the turn
    // reports completion later. Wiping the routing table on cancel drops this on the floor and
@@ -16,8 +16,7 @@ import {
 *
 * Verified on the wire (Claude Code 2.1.220, Paseo's own query options):
 *
- *   task_started       task_id, tool_use_id, description, subagent_type, task_type,
- *                      is_backgrounded
+ *   task_started       task_id, tool_use_id, description, subagent_type, task_type
 *   task_updated       task_id, patch.status, patch.is_backgrounded
 *   task_notification  task_id, tool_use_id, status
 *
@@ -40,11 +39,6 @@ interface TaskStartedMessage {
  task_type?: string;
  prompt?: string;
  skip_transcript?: boolean;
-  /**
-   * Set at spawn: true for a task registered in the background. A resumed subagent is always
-   * registered in the background.
-   */
-  is_backgrounded?: boolean;
 }

 /** Task-tool subagents. Backgrounded shell commands announce as `local_bash`. */
@@ -77,8 +71,8 @@ interface TaskUpdatedMessage {
  task_id: string;
  /**
   * `is_backgrounded` is declared on `SDKTaskUpdatedMessage["patch"]`: it flips when a foreground
-   * task is moved to the background after `task_started`. Together with `task_started`'s own
-   * flag it separates a child that dies with its turn from one told to outlive it.
+   * task is backgrounded, which is the only signal that separates a child that dies with its turn
+   * from one that was explicitly told to outlive it.
   */
  patch?: { status?: string; is_backgrounded?: boolean };
 }
@@ -177,8 +171,8 @@ export class ClaudeTaskProtocolSource {
  /** Workflow invocations already own a real Workflow card in the parent timeline. */
  private readonly idsWithExistingParentToolCard = new Set<string>();
  /**
-   * Declared subagents running in the background, whether spawned there or moved there later.
-   * They outlive the turn that spawned them, so a turn ending is not evidence that they stopped.
+   * Declared subagents that were moved to the background. They outlive the turn that spawned
+   * them, so a turn ending is not evidence that they stopped.
   */
  private readonly backgroundedIds = new Set<string>();
  /** Last status emitted per subagent, so a redundant announcement is not re-broadcast. */
@@ -337,7 +331,6 @@ export class ClaudeTaskProtocolSource {

    this.sawTaskStarted = true;
    const existingId = this.subagentIdByTaskId.get(message.task_id);
-    this.recordBackgrounded(existingId ?? id, message.is_backgrounded);
    if (existingId) {
      return this.observeExistingTaskStart(message, id, existingId);
    }
@@ -421,15 +414,14 @@ export class ClaudeTaskProtocolSource {

  private observeTaskUpdated(message: TaskUpdatedMessage): SubagentObservation[] {
    const id = this.subagentIdByTaskId.get(message.task_id);
-    if (id) this.recordBackgrounded(id, message.patch?.is_backgrounded);
+    const backgrounded = message.patch?.is_backgrounded;
+    if (id && typeof backgrounded === "boolean") {
+      if (backgrounded) this.backgroundedIds.add(id);
+      else this.backgroundedIds.delete(id);
+    }
    return this.observeStatus(message.task_id, message.patch?.status);
  }

-  private recordBackgrounded(id: string, backgrounded: boolean | undefined): void {
-    if (backgrounded === true) this.backgroundedIds.add(id);
-    else if (backgrounded === false) this.backgroundedIds.delete(id);
-  }
-
  private observeTaskNotification(message: TaskNotificationMessage): SubagentObservation[] {
    const observations = this.observeWorkflowResult(message);
    observations.push(...this.observeUsage(message.task_id, message.usage));
@@ -1,154 +0,0 @@
-import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import path from "node:path";
-
-import { describe, expect, test } from "vitest";
-
-import { createTestLogger } from "../../../test-utils/test-logger.js";
-import type { AgentStreamEvent } from "../agent-sdk-types.js";
-import { GenericACPAgentClient } from "./generic-acp-agent.js";
-
-describe("GenericACPAgentClient archived history", () => {
-  test("replays an archived session whose working directory was removed", async () => {
-    await withFakeACPAgent(async ({ command, removedCwd, loadRequestsPath }) => {
-      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
-
-      const session = await client.resumeSession(
-        { provider: "acp", sessionId: "archived-session", metadata: { cwd: removedCwd } },
-        undefined,
-        undefined,
-        { purpose: "history" },
-      );
-      try {
-        expect(await collectTimelineText(session.streamHistory())).toEqual([
-          "user_message:What is in the README?",
-          "assistant_message:It describes the project.",
-        ]);
-        const loadRequests = JSON.parse(await readFile(loadRequestsPath, "utf8"));
-        expect(loadRequests).toEqual([{ sessionId: "archived-session", cwd: removedCwd }]);
-      } finally {
-        await session.close();
-      }
-    });
-  });
-
-  test("replays an archived session whose working directory path is now a file", async () => {
-    await withFakeACPAgent(async ({ command, removedCwd }) => {
-      await writeFile(removedCwd, "not a directory", "utf8");
-      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
-
-      const session = await client.resumeSession(
-        { provider: "acp", sessionId: "archived-session", metadata: { cwd: removedCwd } },
-        undefined,
-        undefined,
-        { purpose: "history" },
-      );
-      try {
-        expect(await collectTimelineText(session.streamHistory())).toEqual([
-          "user_message:What is in the README?",
-          "assistant_message:It describes the project.",
-        ]);
-      } finally {
-        await session.close();
-      }
-    });
-  });
-
-  test("still requires the working directory to resume a session that will run", async () => {
-    await withFakeACPAgent(async ({ command, removedCwd }) => {
-      const client = new GenericACPAgentClient({ logger: createTestLogger(), command });
-
-      await expect(
-        client.resumeSession(
-          { provider: "acp", sessionId: "archived-session", metadata: { cwd: removedCwd } },
-          undefined,
-          undefined,
-          { purpose: "interactive" },
-        ),
-      ).rejects.toThrow("ENOENT");
-    });
-  });
-});
-
-async function collectTimelineText(events: AsyncGenerator<AgentStreamEvent>): Promise<string[]> {
-  const text: string[] = [];
-  for await (const event of events) {
-    if (event.type !== "timeline") {
-      continue;
-    }
-    if (event.item.type === "user_message" || event.item.type === "assistant_message") {
-      text.push(`${event.item.type}:${event.item.text}`);
-    }
-  }
-  return text;
-}
-
-async function withFakeACPAgent(
-  run: (input: {
-    command: [string, ...string[]];
-    removedCwd: string;
-    loadRequestsPath: string;
-  }) => Promise<void>,
-): Promise<void> {
-  const testDir = await mkdtemp(path.join(tmpdir(), "paseo-acp-archived-history-"));
-  try {
-    const scriptPath = path.join(testDir, "fake-acp-agent.cjs");
-    const loadRequestsPath = path.join(testDir, "load-requests.json");
-    await writeFile(scriptPath, fakeACPAgentScript, "utf8");
-    await run({
-      command: [process.execPath, scriptPath, loadRequestsPath],
-      removedCwd: path.join(testDir, "removed-worktree"),
-      loadRequestsPath,
-    });
-  } finally {
-    await rm(testDir, { recursive: true, force: true });
-  }
-}
-
-const fakeACPAgentScript = `
-const fs = require("node:fs");
-const readline = require("node:readline");
-
-const loadRequestsPath = process.argv[2];
-const loadRequests = [];
-const rl = readline.createInterface({ input: process.stdin });
-
-function write(message) {
-  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", ...message }) + "\\n");
-}
-
-function replay(sessionId, sessionUpdate, text) {
-  write({
-    method: "session/update",
-    params: { sessionId, update: { sessionUpdate, content: { type: "text", text } } },
-  });
-}
-
-rl.on("line", (line) => {
-  const message = JSON.parse(line);
-  if (message.method === "initialize") {
-    write({
-      id: message.id,
-      result: {
-        protocolVersion: message.params?.protocolVersion ?? 1,
-        agentCapabilities: { loadSession: true, sessionCapabilities: { close: {} } },
-      },
-    });
-    return;
-  }
-
-  if (message.method === "session/load") {
-    const { sessionId, cwd } = message.params;
-    loadRequests.push({ sessionId, cwd });
-    fs.writeFileSync(loadRequestsPath, JSON.stringify(loadRequests));
-    replay(sessionId, "user_message_chunk", "What is in the README?");
-    replay(sessionId, "agent_message_chunk", "It describes the project.");
-    write({ id: message.id, result: {} });
-    return;
-  }
-
-  if (message.id !== undefined) {
-    write({ id: message.id, result: {} });
-  }
-});
-`;
@@ -459,9 +459,7 @@ describe("OMP agent client and session", () => {

  test("fails a turn when the provider idle gate passes its deadline", async () => {
    const scheduler = new ManualIdleScheduler();
-    // Long enough that the gate's first check, made right after the turn ends, cannot already
-    // be past it on a slow runner.
-    const omp = new OmpHarness({ providerIdleScheduler: scheduler, providerIdleDeadlineMs: 50 });
+    const omp = new OmpHarness({ providerIdleScheduler: scheduler, providerIdleDeadlineMs: 1 });
    await omp.start();
    const { completion } = await omp.startPromptUntilProviderIdle("first", "first done", {
      isStreaming: true,
@@ -475,7 +473,7 @@ describe("OMP agent client and session", () => {
      args: { command: "sleep 30" },
    });
    expect(omp.runningToolCallIds()).toEqual(["tool-at-deadline"]);
-    await new Promise((resolve) => setTimeout(resolve, 60));
+    await new Promise((resolve) => setTimeout(resolve, 2));
    scheduler.retry();
    await expect(completion).rejects.toThrow(/provider idle/i);
    expect(omp.runningToolCallIds()).toEqual([]);
@@ -87,8 +87,7 @@ function mergeToolCallDetail(existing: ToolCallDetail, incoming: ToolCallDetail)
  return incoming;
 }

-/** Fold a later update for the same tool call into the one it follows. */
-export function mergeToolCallItems(
+function mergeToolCallItems(
  existing: Extract<AgentTimelineItem, { type: "tool_call" }>,
  incoming: Extract<AgentTimelineItem, { type: "tool_call" }>,
 ): Extract<AgentTimelineItem, { type: "tool_call" }> {
@@ -126,7 +126,6 @@ import { createPaseoWorktree as createRegisteredPaseoWorktree } from "./paseo-wo
 import { createWorkspaceProvisioningService } from "./session/workspace-provisioning/workspace-provisioning-service.js";
 import { createPaseoWorktreeWorkflow } from "./worktree-session.js";
 import { DownloadTokenStore } from "./file-download/token-store.js";
-import { formatAttachmentContentDisposition } from "./file-download/content-disposition.js";
 import type { OpenAiSpeechProviderConfig } from "./speech/providers/openai/config.js";
 import type { LocalSpeechProviderConfig } from "./speech/providers/local/config.js";
 import type { RequestedSpeechProviders } from "./speech/speech-types.js";
@@ -415,6 +414,7 @@ export interface PaseoDaemonConfig {
  plugins?: Record<string, PluginSource>;
  pluginRegistries?: PluginRegistries;
  pluginRegistryUrl?: string;
+  pluginRegistryEnabled?: boolean;
  staticDir: string;
  mcpDebug: boolean;
  isDev?: boolean;
@@ -625,6 +625,7 @@ export async function createPaseoDaemon(
      usageSession: (id) => agentManager.usageSession(id),
    },
    managedSources: new ManagedPluginSources(config.paseoHome, {
+      enabled: config.pluginRegistryEnabled ?? false,
      registries: config.pluginRegistries,
      defaultUrl: config.pluginRegistryUrl,
    }),
@@ -837,8 +838,9 @@ export async function createPaseoDaemon(
        return;
      }

+      const safeFileName = entry.fileName.replace(/["\r\n]/g, "_");
      res.setHeader("Content-Type", entry.mimeType);
-      res.setHeader("Content-Disposition", formatAttachmentContentDisposition(entry.fileName));
+      res.setHeader("Content-Disposition", `attachment; filename="${safeFileName}"`);
      res.setHeader("Content-Length", fileStats.size.toString());

      const stream = fileHandle.createReadStream();
@@ -30,6 +30,7 @@ export const DAEMON_SETTING_ENV_KEYS = [
  "PASEO_LOG_ROTATE_SIZE",
  "PASEO_PASSWORD",
  "PASEO_PLUGIN_REGISTRY",
+  "PASEO_PLUGIN_REGISTRY_ENABLED",
  "PASEO_RELAY_ENABLED",
  "PASEO_RELAY_ENDPOINT",
  "PASEO_RELAY_PUBLIC_ENDPOINT",
@@ -211,6 +211,15 @@ test("loads private plugin registry settings through the configuration boundary"
    });
    expect(config.pluginRegistryUrl).toBe("https://plugins.example.test/internal");
    expect(config.pluginRegistries).toEqual(pluginRegistries);
+    expect(config.pluginRegistryEnabled).toBe(false);
+    await writeFile(
+      path.join(home, "config.json"),
+      JSON.stringify({ pluginRegistries, pluginRegistryEnabled: true }),
+    );
+    expect(loadConfig(home, { env: {} }).pluginRegistryEnabled).toBe(true);
+    expect(
+      loadConfig(home, { env: { PASEO_PLUGIN_REGISTRY_ENABLED: "false" } }).pluginRegistryEnabled,
+    ).toBe(false);
  } finally {
    await rm(home, { recursive: true, force: true });
  }
@@ -628,6 +628,10 @@ export function resolveConfigFromPersisted(
    plugins: persisted.plugins,
    pluginRegistries: persisted.pluginRegistries,
    pluginRegistryUrl: env.PASEO_PLUGIN_REGISTRY,
+    pluginRegistryEnabled:
+      parseBooleanEnv(env.PASEO_PLUGIN_REGISTRY_ENABLED) ??
+      persisted.pluginRegistryEnabled ??
+      false,
    mcpDebug: env.MCP_DEBUG === "1",
    isDev: resolvePaseoNodeEnv(env) === "development",
    agentStoragePath: path.join(paseoHome, "agents"),
--- a/Show More
+++ b/Show More