test(acp): start hung-session deadlines after initialization

Wait for the fake agent to receive session/new before advancing its diagnostic deadline. Slow process startup must not turn a session-timeout assertion into an initialization timeout.
fix(pi): settle foreground workflow tools when the process exits
2026-10-21 16:52:40 +00:00 · 2026-10-17 18:56:26 +02:00 · 2026-10-17 18:20:11 +02:00 · 2026-10-17 18:13:17 +02:00 · 2026-10-17 16:41:32 +02:00 · 2026-10-17 16:26:50 +02:00
87 changed files with 3260 additions and 3365 deletions
@@ -1,6 +1,6 @@
 # Changelog

-## 0.12.0-beta.2 - 2026-10-17
+## 0.12.0-beta.1 - 2026-10-16

 Background workspaces, a new Markdown renderer with selection across paragraphs on phones, a reworked phone layout, and close to 100 fixes.

@@ -27,11 +27,8 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Changed phones to open files and subagents in a closable sheet, with Open as tab for subagents ([#6827](https://github.com/getpaseo/paseo/pull/6827), [#6885](https://github.com/getpaseo/paseo/pull/6885), [#6958](https://github.com/getpaseo/paseo/pull/6958))
 - Changed diff comments on phones to open in a sheet instead of an editor inside the code ([#6455](https://github.com/getpaseo/paseo/pull/6455))
 - Changed Settings on phones to large tiles grouped into App and Host ([#7129](https://github.com/getpaseo/paseo/pull/7129))
- Changed the New workspace form on phones to full-width fields, with Import session in the header ([#7239](https://github.com/getpaseo/paseo/pull/7239))
 - Reduced rendering work in long chats while a reply streams ([#7052](https://github.com/getpaseo/paseo/pull/7052) by [@colonelpanic8](https://github.com/colonelpanic8))
 - Made reopening the sidebar about 45% faster ([#7157](https://github.com/getpaseo/paseo/pull/7157))
- Made projects and workspaces load faster after the app reconnects ([#7242](https://github.com/getpaseo/paseo/pull/7242))
- Changed messages one agent sends another through the CLI or MCP to steer its running turn instead of interrupting it ([#5164](https://github.com/getpaseo/paseo/pull/5164) by [@derwells](https://github.com/derwells))
 - Changed Gitea and Forgejo fork PR checkouts to include the fork owner in the branch name, such as `bob/patch-1` ([#6829](https://github.com/getpaseo/paseo/pull/6829) by [@alexanderadam](https://github.com/alexanderadam))

 ### Plugins
@@ -40,7 +37,6 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed `providers.waitForReady` throwing in plugins on the mobile app ([#6760](https://github.com/getpaseo/paseo/pull/6760) by [@GeorgeR](https://github.com/GeorgeR))
 - Fixed the chat outline not jumping to prompts rendered by a timeline plugin ([#6690](https://github.com/getpaseo/paseo/pull/6690) by [@lukeRRD](https://github.com/lukeRRD))
 - Fixed Escape stopping the running agent instead of first closing an open plugin preview ([#7110](https://github.com/getpaseo/paseo/pull/7110) by [@RRD-dev](https://github.com/RRD-dev), [@luoph](https://github.com/luoph))
- Fixed `paseo plugin reload` failing with a 60-second timeout while the reload was still running ([#6306](https://github.com/getpaseo/paseo/pull/6306) by [@Mtuchel](https://github.com/Mtuchel))

 ### Fixed

@@ -55,7 +51,6 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed the Linux desktop window never appearing when the hidden window renders no frames ([#6726](https://github.com/getpaseo/paseo/pull/6726) by [@EhEo](https://github.com/EhEo))
 - Fixed opening another agent or workspace stalling while a different agent on the same host is streaming ([#7074](https://github.com/getpaseo/paseo/pull/7074) by [@colonelpanic8](https://github.com/colonelpanic8))
 - Fixed agent creation showing an error and a retry draft when the provider rejected the first prompt ([#6379](https://github.com/getpaseo/paseo/pull/6379))
- Fixed question cards spinning forever when an answer fails to send; they now show the error and keep your answers ([#7098](https://github.com/getpaseo/paseo/pull/7098) by [@xzthemeofsss](https://github.com/xzthemeofsss))
 - Fixed parent agents missing the finish notification when a child finished its first turn very quickly ([#6008](https://github.com/getpaseo/paseo/pull/6008) by [@ahmet-izgi](https://github.com/ahmet-izgi))
 - Fixed parent agents being told a child finished when its task was stopped or reloaded ([#6660](https://github.com/getpaseo/paseo/pull/6660) by [@Mar-garet](https://github.com/Mar-garet))
 - Fixed Codex chats containing U+2028 or U+2029 failing to reopen on Node 24 ([#5999](https://github.com/getpaseo/paseo/pull/5999) by [@grahameger](https://github.com/grahameger), [@jtsang4](https://github.com/jtsang4), [@kotusenka](https://github.com/kotusenka))
@@ -64,12 +59,7 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed answering multi-select OpenCode v2 questions failing with "Invalid answer" ([#6149](https://github.com/getpaseo/paseo/pull/6149) by [@gammons](https://github.com/gammons))
 - Fixed browser screenshots failing the turn on OpenCode v2 agents ([#6330](https://github.com/getpaseo/paseo/pull/6330))
 - Fixed OpenCode v2 agents receiving "HTTP 500" instead of the Paseo tool error ([#6519](https://github.com/getpaseo/paseo/pull/6519))
- Fixed OpenCode agents receiving "HTTP 500" instead of a readable error when they call a Paseo tool with invalid arguments or an unknown name ([#7183](https://github.com/getpaseo/paseo/pull/7183))
 - Fixed rewinding a Claude conversation failing with "Session not found" when the provider sets `CLAUDE_CONFIG_DIR` ([#6325](https://github.com/getpaseo/paseo/pull/6325))
- Fixed changing a running Claude agent's thinking level and then its mode killing its running command ([#7179](https://github.com/getpaseo/paseo/pull/7179))
- Fixed Claude models that need a recent Claude Code being hidden when the provider command is a wrapper script ([#7209](https://github.com/getpaseo/paseo/pull/7209) by [@SulthanZahran1](https://github.com/SulthanZahran1))
- Fixed background Claude subagent cards staying empty while the subagent works ([#6242](https://github.com/getpaseo/paseo/pull/6242))
- Fixed Copilot staying in Plan mode and refusing edits after you select Allow All ([#7234](https://github.com/getpaseo/paseo/pull/7234))
 - Fixed imported Claude Code sessions taking their first prompt as the name instead of their `/rename` title ([#6930](https://github.com/getpaseo/paseo/pull/6930) by [@platanus-kr](https://github.com/platanus-kr))
 - Fixed a wrongly shaped answer to a Claude question reporting success and discarding the question ([#6936](https://github.com/getpaseo/paseo/pull/6936) by [@thomasvan](https://github.com/thomasvan))
 - Fixed Cursor agents showing no plan usage in their context details ([#6353](https://github.com/getpaseo/paseo/pull/6353) by [@gengjiawen](https://github.com/gengjiawen))
@@ -95,13 +85,9 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed assistant file links with spaces or non-ASCII characters failing with ENOENT ([#6520](https://github.com/getpaseo/paseo/pull/6520) by [@apple-ouyang](https://github.com/apple-ouyang), [@sunshinehomeyu-blip](https://github.com/sunshinehomeyu-blip))
 - Fixed local images in agent replies failing to load when their path contains spaces or non-ASCII characters ([#6877](https://github.com/getpaseo/paseo/pull/6877))
 - Fixed Markdown file previews not showing images referenced by relative paths ([#6750](https://github.com/getpaseo/paseo/pull/6750) by [@apple-ouyang](https://github.com/apple-ouyang))
- Fixed folder links in chats and Markdown previews opening an error tab or doing nothing; they now open Files with the folder's contents visible ([#7205](https://github.com/getpaseo/paseo/pull/7205), [#7210](https://github.com/getpaseo/paseo/pull/7210), [#7229](https://github.com/getpaseo/paseo/pull/7229))
- Fixed Markdown links to files such as `[Capture](capture.png)` doing nothing for some file types ([#7233](https://github.com/getpaseo/paseo/pull/7233))
 - Fixed iOS sidebar rows staying highlighted and swallowing the next tap after a brief hold ([#7159](https://github.com/getpaseo/paseo/pull/7159) by [@kassamkhoja](https://github.com/kassamkhoja))
 - Fixed Android chats scrolling when you long-press to select text ([#7131](https://github.com/getpaseo/paseo/pull/7131) by [@RRD-dev](https://github.com/RRD-dev), [@luoph](https://github.com/luoph))
 - Fixed sidebar rows, footer buttons, and Settings items showing no feedback when tapped on touch devices ([#7150](https://github.com/getpaseo/paseo/pull/7150))
- Fixed home screen actions being cut off on short phone screens ([#7167](https://github.com/getpaseo/paseo/pull/7167))
- Fixed Android dictation stopping with "Dictation was interrupted by another audio source" when another app plays audio ([#7200](https://github.com/getpaseo/paseo/pull/7200))
 - Fixed Page Up and Page Down not scrolling the chat after clicking a message ([#7033](https://github.com/getpaseo/paseo/pull/7033) by [@panta82](https://github.com/panta82))
 - Fixed Add Project keyboard selection moving to directories scrolled out of view ([#7081](https://github.com/getpaseo/paseo/pull/7081) by [@superheher](https://github.com/superheher))
 - Fixed Enter replacing an email address in the composer with a file mention ([#6471](https://github.com/getpaseo/paseo/pull/6471) by [@jasonhnd](https://github.com/jasonhnd))
@@ -122,7 +108,6 @@ Background workspaces, a new Markdown renderer with selection across paragraphs
 - Fixed the Pi thinking level not updating when a Pi extension changes it ([#6741](https://github.com/getpaseo/paseo/pull/6741))
 - Fixed Pi subagents from `@tintinweb/pi-subagents` staying running after their turn limit ([#6594](https://github.com/getpaseo/paseo/pull/6594) by [@Chen-DaYi](https://github.com/Chen-DaYi))
 - Fixed manual `/compact` on OMP agents showing no progress and leaving the context meter stale ([#6106](https://github.com/getpaseo/paseo/pull/6106))
- Fixed follow-ups to idle OMP agents staying queued instead of starting the agent ([#7169](https://github.com/getpaseo/paseo/pull/7169) by [@nhthung](https://github.com/nhthung))
 - Fixed voice mode TTS rejecting model and voice names from OpenAI-compatible servers ([#6060](https://github.com/getpaseo/paseo/pull/6060) by [@khimaros](https://github.com/khimaros))
 - Fixed the xhigh thinking option showing "Extra high" instead of its configured label ([#6005](https://github.com/getpaseo/paseo/pull/6005) by [@EliorFureraj](https://github.com/EliorFureraj))
 - Fixed the Remove button going off screen for long custom model names in provider settings ([#6507](https://github.com/getpaseo/paseo/pull/6507))
@@ -210,7 +210,7 @@ The rows combine two kinds of children:
 parentAgentId === thisAgent.id  AND  !archivedAt
 ```

- **Provider subagents** are child executions owned by Claude, Codex, or OpenCode. They are not inserted into `AgentManager` as managed agents. Providers emit a separate descriptor and timeline stream through `agent.provider_subagents.*`; the client keeps that state outside the normal agent store and merges only the presentation rows into the track. A descriptor's optional `parentSubagentId` identifies its direct provider-subagent parent; an absent value identifies a direct child of the managed agent.
+- **Provider subagents** are child executions owned by Claude, Codex, OpenCode, or Pi. They are not inserted into `AgentManager` as managed agents. Providers emit a separate descriptor and timeline stream through `agent.provider_subagents.*`; the client keeps that state outside the normal agent store and merges only the presentation rows into the track. A descriptor's optional `parentSubagentId` identifies its direct provider-subagent parent; an absent value identifies a direct child of the managed agent.

 Clicking either kind opens a workspace tab. On compact layouts it opens in a [sheet](explorer-sidebar.md#sheets) over the subagents list instead; the sheet hides the composer and shows the agent's model and thinking as one line in its place (`PaneSubtitle`, the row provider subagents already use), and a Paseo subagent's sheet offers **Open as tab** (the full-screen glyph in the header) to get the composer back. A Paseo subagent tab is a normal interactive agent pane. A provider subagent tab is a read-only timeline pane with no composer, archive, detach, rewind, or fork actions. It shows its own direct children in a subagents track. Both panes use `AgentStreamView`, so message, reasoning, tool-call, and layout rendering stay identical.

@@ -8,7 +8,7 @@ Native selection belongs to the library's text view. Keep an assistant message i

 Workspace file links use the shared file-link resolver. The workspace supplies its client, root and open-file action once; chat can supply the agent's more specific context. URLs use the same link press path. Recognized inline-code paths stay tappable. The library callback carries the tapped occurrence’s syntax context. Preserve it when opening files: explicit Markdown links decode URL escapes, while recognized inline-code paths preserve literal percent characters and use suffix lookup. Identical URL strings in different occurrences must stay distinct. Explicit absolute workspace links receive a relative hover title; existing authored titles remain intact.

-Resolve workspace image paths over the existing session RPC, then give the library a cached native file URL or web blob URL. HTTP(S) images pass through unchanged. This preserves relay, SSH and local socket connections, which do not expose a daemon HTTP endpoint. Each mounted renderer owns its image acquisition identity, so a later reply reads a rewritten path again while the earlier mounted reply retains its snapshot. Image taps open the attachment lightbox. File previews resolve relative images against the Markdown file's directory. An image alone on its line becomes its own paragraph before the library sees it, so it renders as a block on every platform; the library only treats sole-child paragraph images as blocks, and with hard soft breaks every newline is a break node, which left own-line images inline on iOS and web. Images that share a line with text stay inline.
+Resolve workspace image paths over the existing session RPC, then give the library a cached native file URL or web blob URL. HTTP(S) images pass through unchanged. This preserves relay, SSH and local socket connections, which do not expose a daemon HTTP endpoint. Each mounted renderer owns its image acquisition identity, so a later reply reads a rewritten path again while the earlier mounted reply retains its snapshot. Image taps open the attachment lightbox. File previews resolve relative images against the Markdown file's directory.

 ## Engine constraints

@@ -1 +1 @@
-sha256-O8sNh6oXFIddUljYiC6RbVZF5/7a7A7W9UWrOd0tIV4=
+sha256-1WmrHvE68Lzyil4On7xtsPMQTODXZ3Jb3/juUg3nHi4=
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "workspaces": [
@@ -36349,7 +36349,7 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "dependencies": {
        "@codemirror/commands": "6.10.4",
        "@codemirror/language": "6.12.4",
@@ -37469,12 +37469,12 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.12.0-beta.2",
-        "@getpaseo/protocol": "0.12.0-beta.2",
-        "@getpaseo/server": "0.12.0-beta.2",
+        "@getpaseo/client": "0.12.0-beta.1",
+        "@getpaseo/protocol": "0.12.0-beta.1",
+        "@getpaseo/server": "0.12.0-beta.1",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -37721,10 +37721,10 @@
    },
    "packages/client": {
      "name": "@getpaseo/client",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "dependencies": {
-        "@getpaseo/protocol": "0.12.0-beta.2",
-        "@getpaseo/relay": "0.12.0-beta.2",
+        "@getpaseo/protocol": "0.12.0-beta.1",
+        "@getpaseo/relay": "0.12.0-beta.1",
        "zod": "^4.4.3"
      },
      "devDependencies": {
@@ -37735,7 +37735,7 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "license": "Apache-2.0",
      "dependencies": {
        "@getpaseo/cli": "*",
@@ -37979,7 +37979,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "license": "MIT",
      "devDependencies": {
        "@types/jest": "^29.5.14",
@@ -38875,7 +38875,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "dependencies": {
        "@codemirror/language": "6.12.4",
        "@codemirror/legacy-modes": "^6.5.3",
@@ -38904,14 +38904,14 @@
    },
    "packages/plugin": {
      "name": "@getpaseo/plugin",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "dependencies": {
        "@agentclientprotocol/sdk": "^1.4.0",
        "use-sync-external-store": "^1.6.0"
      },
      "devDependencies": {
-        "@getpaseo/client": "0.12.0-beta.2",
-        "@getpaseo/protocol": "0.12.0-beta.2",
+        "@getpaseo/client": "0.12.0-beta.1",
+        "@getpaseo/protocol": "0.12.0-beta.1",
        "@types/node": "^20.9.0",
        "@types/react": "~19.2.0",
        "react": "19.1.0",
@@ -38921,8 +38921,8 @@
        "zod": "^4.4.3"
      },
      "peerDependencies": {
-        "@getpaseo/client": "0.12.0-beta.2",
-        "@getpaseo/protocol": "0.12.0-beta.2",
+        "@getpaseo/client": "0.12.0-beta.1",
+        "@getpaseo/protocol": "0.12.0-beta.1",
        "react": "~19.1.0",
        "react-native": ">=0.81.5",
        "zod": "^4.4.3"
@@ -38944,7 +38944,7 @@
    },
    "packages/protocol": {
      "name": "@getpaseo/protocol",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "dependencies": {
        "semver": "^7.8.5",
        "zod": "^4.4.3"
@@ -38971,7 +38971,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "dependencies": {
        "base64-js": "^1.5.1",
        "tweetnacl": "^1.0.3",
@@ -39189,16 +39189,16 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.17.1",
        "@anthropic-ai/claude-agent-sdk": "0.3.246",
        "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.12.0-beta.2",
-        "@getpaseo/highlight": "0.12.0-beta.2",
-        "@getpaseo/plugin": "0.12.0-beta.2",
-        "@getpaseo/protocol": "0.12.0-beta.2",
-        "@getpaseo/relay": "0.12.0-beta.2",
+        "@getpaseo/client": "0.12.0-beta.1",
+        "@getpaseo/highlight": "0.12.0-beta.1",
+        "@getpaseo/plugin": "0.12.0-beta.1",
+        "@getpaseo/protocol": "0.12.0-beta.1",
+        "@getpaseo/relay": "0.12.0-beta.1",
        "@isaacs/ttlcache": "^2.1.4",
        "@modelcontextprotocol/sdk": "1.29.0",
        "@opencode-ai/sdk": "1.14.46",
@@ -40119,7 +40119,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.29.1",
        "@cloudflare/workers-types": "^4.20260317.1",
@@ -41727,7 +41727,7 @@
    },
    "plugins": {
      "name": "@getpaseo/builtin-plugins",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-beta.1",
      "dependencies": {
        "@getpaseo/plugin": "*",
        "zod": "^4.4.3"
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -1,376 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (3.0.8)
-    abbrev (0.1.2)
-    addressable (2.9.0)
-      public_suffix (>= 2.0.2, < 8.0)
-    artifactory (3.0.17)
-    atomos (0.1.3)
-    aws-eventstream (1.4.0)
-    aws-partitions (1.1296.0)
-    aws-sdk-core (3.257.0)
-      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.992.0)
-      aws-sigv4 (~> 1.9)
-      base64
-      bigdecimal
-      jmespath (~> 1, >= 1.6.1)
-      logger
-      rexml (~> 3.4, >= 3.4.2)
-    aws-sdk-kms (1.132.0)
-      aws-sdk-core (~> 3, >= 3.256.0)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.233.2)
-      aws-sdk-core (~> 3, >= 3.256.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.12.1)
-      aws-eventstream (~> 1, >= 1.0.2)
-    babosa (1.0.4)
-    base64 (0.3.0)
-    benchmark (0.5.0)
-    bigdecimal (4.1.3)
-    cgi (0.5.2)
-    claide (1.1.0)
-    colored (1.2)
-    colored2 (3.1.2)
-    commander (4.6.0)
-      highline (~> 2.0.0)
-    csv (3.3.6)
-    declarative (0.0.20)
-    digest-crc (0.7.0)
-      rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.7.20261007)
-    dotenv (2.8.1)
-    emoji_regex (3.2.3)
-    erb (6.0.7)
-    excon (1.7.3)
-      logger
-    faraday (2.15.0)
-      faraday-net_http (>= 2.0, < 3.6)
-      json
-      logger
-    faraday-cookie_jar (0.0.8)
-      faraday (>= 0.8.0)
-      http-cookie (>= 1.0.0)
-    faraday-follow_redirects (0.5.0)
-      faraday (>= 1, < 3)
-    faraday-multipart (1.2.0)
-      multipart-post (~> 2.0)
-    faraday-net_http (3.5.0)
-      net-http (~> 0.5)
-    faraday-retry (2.4.0)
-      faraday (~> 2.0)
-    fastimage (2.4.1)
-    fastlane (2.241.1)
-      CFPropertyList (>= 2.3, < 5.0.0)
-      abbrev (~> 0.1)
-      addressable (>= 2.9.0, < 3.0.0)
-      artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.197)
-      babosa (>= 1.0.3, < 2.0.0)
-      base64 (~> 0.2)
-      benchmark (>= 0.1.0)
-      bundler (>= 2.4.0, < 5.0.0)
-      cgi (~> 0.4)
-      colored (~> 1.2)
-      commander (~> 4.6)
-      csv (~> 3.3)
-      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 4.0)
-      erb (>= 4.0, < 7.0)
-      excon (>= 1.0.0, < 2.0.0)
-      faraday (~> 2.7)
-      faraday-cookie_jar (~> 0.0.8)
-      faraday-follow_redirects (~> 0.3)
-      faraday-multipart (~> 1.0)
-      faraday-retry (~> 2.0)
-      fastimage (>= 2.1.0, < 3.0.0)
-      fastlane-sirp (>= 1.1.0)
-      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-apis-androidpublisher_v3 (~> 0.99)
-      google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-env (>= 1.6.0, < 2.5.0)
-      google-cloud-storage (~> 1.31)
-      highline (~> 2.0)
-      irb (>= 1.8)
-      json (< 3.0.0)
-      jwt (>= 2.10.3, < 4)
-      logger (>= 1.6, < 2.0)
-      mini_magick (>= 4.9.4, < 5.0.0)
-      multi_json (~> 1.12)
-      multipart-post (>= 2.0.0, < 3.0.0)
-      mutex_m (~> 0.3)
-      naturally (~> 2.2)
-      nkf (~> 0.2)
-      optparse (>= 0.1.1, < 1.0.0)
-      ostruct (>= 0.1.0)
-      plist (>= 3.1.0, < 4.0.0)
-      rubyzip (>= 3.4.0, < 4.0.0)
-      security (~> 0.3)
-      simctl (~> 1.6.3)
-      terminal-notifier (>= 3.1.0, < 4.0.0)
-      terminal-table (~> 4)
-      tty-screen (>= 0.6.3, < 1.0.0)
-      tty-spinner (>= 0.8.0, < 1.0.0)
-      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.4.1)
-      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-sirp (1.1.0)
-    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.109.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-core (1.3.1)
-      addressable (~> 2.9)
-      faraday (~> 2.13)
-      faraday-follow_redirects (~> 0.3)
-      googleauth (~> 1.14)
-      mini_mime (~> 1.1)
-      multi_json (~> 1.11)
-      representable (~> 3.0)
-      retriable (>= 3.1, < 5.0)
-    google-apis-iamcredentials_v1 (0.28.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.18.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-storage_v1 (0.69.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-cloud-core (1.9.0)
-      google-cloud-env (>= 1.0, < 3.a)
-      google-cloud-errors (~> 1.0)
-    google-cloud-env (2.4.1)
-      base64 (~> 0.2)
-      faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.7.0)
-    google-cloud-storage (1.62.1)
-      addressable (~> 2.8)
-      digest-crc (~> 0.4)
-      google-apis-core (>= 0.18, < 2)
-      google-apis-iamcredentials_v1 (~> 0.18)
-      google-apis-storage_v1 (>= 0.42)
-      google-cloud-core (~> 1.6)
-      googleauth (~> 1.9)
-      mini_mime (~> 1.0)
-    google-logging-utils (0.2.1)
-    googleauth (1.17.5)
-      faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.2)
-      google-logging-utils (~> 0.1)
-      jwt (>= 1.4, < 4.0)
-      os (>= 0.9, < 2.0)
-      pstore (~> 0.1)
-      signet (>= 0.16, < 2.a)
-    highline (2.0.3)
-    http-cookie (1.1.6)
-      domain_name (~> 0.5)
-    io-console (0.9.4)
-    irb (1.18.0)
-      pp (>= 0.6.0)
-      prism (>= 1.3.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    jmespath (1.6.2)
-    json (2.21.2)
-    jwt (3.3.0)
-      base64
-    logger (1.7.0)
-    mini_magick (4.13.2)
-    mini_mime (1.1.5)
-    multi_json (1.21.2)
-    multipart-post (2.4.1)
-    mutex_m (0.3.0)
-    nanaimo (0.4.0)
-    naturally (2.3.0)
-    net-http (0.10.0)
-      net-protocol (>= 0.3.0)
-      uri (>= 0.11.1)
-    net-protocol (0.4.0)
-      timeout
-    nkf (0.3.0)
-    optparse (0.8.1)
-    os (1.1.4)
-    ostruct (0.6.3)
-    plist (3.7.2)
-    pp (0.6.4)
-      prettyprint
-    prettyprint (0.2.1)
-    prism (1.9.0)
-    pstore (0.2.1)
-    public_suffix (7.0.5)
-    rake (13.4.2)
-    rbs (4.2.0)
-      logger
-      prism (>= 1.6.0)
-      tsort
-    rdoc (8.1.0)
-      erb
-      prism (>= 1.6.0)
-      rbs (>= 4.0.0)
-      tsort
-    reline (0.7.0)
-      io-console (~> 0.5)
-    representable (3.3.1)
-      declarative (< 0.1.0)
-      trailblazer-option (>= 0.1.1, < 0.2.0)
-      uber (< 0.2.0)
-    retriable (4.2.0)
-    rexml (3.4.4)
-    rouge (3.28.0)
-    rubyzip (3.7.0)
-    security (0.3.0)
-    signet (0.22.1)
-      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 4.0)
-    simctl (1.6.10)
-      CFPropertyList
-      naturally
-    terminal-notifier (3.1.0)
-    terminal-table (4.0.0)
-      unicode-display_width (>= 1.1.1, < 4)
-    timeout (0.6.1)
-    trailblazer-option (0.1.2)
-    tsort (0.2.0)
-    tty-cursor (0.7.1)
-    tty-screen (0.8.2)
-    tty-spinner (0.9.3)
-      tty-cursor (~> 0.7)
-    uber (0.1.0)
-    unicode-display_width (3.3.0)
-      unicode-emoji (~> 4.3)
-    unicode-emoji (4.3.0)
-    uri (1.1.2)
-    word_wrap (1.0.0)
-    xcodeproj (1.28.1)
-      CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.3)
-      base64
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.4.0)
-      nkf
-      rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.4.1)
-      rouge (~> 3.28.0)
-    xcpretty-travis-formatter (1.0.1)
-      xcpretty (~> 0.2, >= 0.0.7)
-
-PLATFORMS
-  ruby
-  x86_64-linux-gnu
-
-DEPENDENCIES
-  fastlane (~> 2.234)
-  multi_json
-
-CHECKSUMS
-  CFPropertyList (3.0.8) sha256=2c99d0d980536d3d7ab252f7bd59ac8be50fbdd1ff487c98c949bb66bb114261
-  abbrev (0.1.2) sha256=ad1b4eaaaed4cb722d5684d63949e4bde1d34f2a95e20db93aecfe7cbac74242
-  addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af
-  artifactory (3.0.17) sha256=3023d5c964c31674090d655a516f38ca75665c15084140c08b7f2841131af263
-  atomos (0.1.3) sha256=7d43b22f2454a36bace5532d30785b06de3711399cb1c6bf932573eda536789f
-  aws-eventstream (1.4.0) sha256=116bf85c436200d1060811e6f5d2d40c88f65448f2125bc77ffce5121e6e183b
-  aws-partitions (1.1296.0) sha256=70cc7a44fa4824a9df5652b853dc96aaaf09ec20642cd9d42ed7335a36cc3567
-  aws-sdk-core (3.257.0) sha256=a92ad19c7ff668cec6688ee3200ee562da80647a3bbeed9fda02e8b0ca6492c6
-  aws-sdk-kms (1.132.0) sha256=094b0097bb3be9d5c1ac87e971ca7f5aebb746801dfb5f0f576480bf98dca69c
-  aws-sdk-s3 (1.233.2) sha256=b138737a0de8b02f163ae47a9fc184ac98fc9b90926237c7d7af716a14ea1221
-  aws-sigv4 (1.12.1) sha256=6973ff95cb0fd0dc58ba26e90e9510a2219525d07620c8babeb70ef831826c00
-  babosa (1.0.4) sha256=18dea450f595462ed7cb80595abd76b2e535db8c91b350f6c4b3d73986c5bc99
-  base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
-  benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
-  bigdecimal (4.1.3) sha256=61ebe1e5e559bdc3cc6f2c0ee7f427321fc838f59611c294356eb04d6e21cf66
-  bundler (4.0.23) sha256=407ba8a1d928f412847f819aa5f8b6aef7c59fb51feb517112af8a165487287b
-  cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb
-  claide (1.1.0) sha256=6d3c5c089dde904d96aa30e73306d0d4bd444b1accb9b3125ce14a3c0183f82e
-  colored (1.2) sha256=9d82b47ac589ce7f6cab64b1f194a2009e9fd00c326a5357321f44afab2c1d2c
-  colored2 (3.1.2) sha256=b13c2bd7eeae2cf7356a62501d398e72fde78780bd26aec6a979578293c28b4a
-  commander (4.6.0) sha256=7d1ddc3fccae60cc906b4131b916107e2ef0108858f485fdda30610c0f2913d9
-  csv (3.3.6) sha256=aba61e7e507a66f03d45cb1f3c4b6359861c3504038b422962875dce099e4456
-  declarative (0.0.20) sha256=8021dd6cb17ab2b61233c56903d3f5a259c5cf43c80ff332d447d395b17d9ff9
-  digest-crc (0.7.0) sha256=64adc23a26a241044cbe6732477ca1b3c281d79e2240bcff275a37a5a0d78c07
-  domain_name (0.7.20261007) sha256=0976c6ab837dbde991b433d03acc38fdb91fa8839df31a1ed75ce0318dc0441c
-  dotenv (2.8.1) sha256=c5944793349ae03c432e1780a2ca929d60b88c7d14d52d630db0508c3a8a17d8
-  emoji_regex (3.2.3) sha256=ecd8be856b7691406c6bf3bb3a5e55d6ed683ffab98b4aa531bb90e1ddcc564b
-  erb (6.0.7) sha256=c5ca6dc25b0ef974a44dc8f59fe847577122483b1968a38dec305c60bf91ee92
-  excon (1.7.3) sha256=ea13fabcab2b5f5bb64e2952a0ac018bf9882832fe7a58206630be18ba888fa9
-  faraday (2.15.0) sha256=3be0eff0187ed913a1b4f679e9fcfe845b542cdd4f75b76cd6181a4ae1335fff
-  faraday-cookie_jar (0.0.8) sha256=0140605823f8cc63c7028fccee486aaed8e54835c360cffc1f7c8c07c4299dbb
-  faraday-follow_redirects (0.5.0) sha256=5cde93c894b30943a5d2b93c2fe9284216a6b756f7af406a1e55f211d97d10ad
-  faraday-multipart (1.2.0) sha256=7d89a949693714176f612323ca13746a2ded204031a6ba528adee788694ef757
-  faraday-net_http (3.5.0) sha256=2e7094c34e38754ee048cc3df47376f8657005d9375f8473bce1c3b526a22e36
-  faraday-retry (2.4.0) sha256=7b79c48fb7e56526faf247b12d94a680071ff40c9fda7cf1ec1549439ad11ebe
-  fastimage (2.4.1) sha256=c64bebd46b6fd8943ab70c1e6e85ff728f970f2e48f92ecd249b6bc3a540ad20
-  fastlane (2.241.1) sha256=e8e97f3274d678c74d9e473b98d202621262c40dfce2b43b7a05afde7caa2ea5
-  fastlane-sirp (1.1.0) sha256=10bc94f9682efd8e1badfb31452a76dd8981f1f3a33717c765fde6d75b54d847
-  gh_inspector (1.1.3) sha256=04cca7171b87164e053aa43147971d3b7f500fcb58177698886b48a9fc4a1939
-  google-apis-androidpublisher_v3 (0.109.0) sha256=b4fdbb8af4a0d235e86bd173bd51eccd10effdc5de067ab10c1c0d22048a2a56
-  google-apis-core (1.3.1) sha256=20ce9ee1fde0be87fe30a135dfdbd4b9ee33ba32172794c1f2770e7a45361b2f
-  google-apis-iamcredentials_v1 (0.28.0) sha256=0a92ffe6cc39c569554af2a77a25dfc61519ed8bbb64ab04cffdd352dc5ef106
-  google-apis-playcustomapp_v1 (0.18.0) sha256=44b277b9dee4a59ac5e9d98be1485edc5e382d2f9d73c79ae8908a455786a254
-  google-apis-storage_v1 (0.69.0) sha256=ca5faad4a244c609bb434f81884432c449e34b31a87623f7c32b582e464ca7c8
-  google-cloud-core (1.9.0) sha256=ab55409f51488e8deefb6edcc1ce4771dfb5da2fe7b3bc075709a030c2b682a4
-  google-cloud-env (2.4.1) sha256=987cc58afc50ce2903128ab4dcd442159be4457246b8137e41d49d5c3fc590dd
-  google-cloud-errors (1.7.0) sha256=6e682f42d89aae08689f36f28495de629d756da076bafff0003bac7f8042ebb3
-  google-cloud-storage (1.62.1) sha256=10dbf2ebda3af1b4b841335364cb889827c6cb17bf6c9f8bc5313b6bef7a4d3c
-  google-logging-utils (0.2.1) sha256=73945c3ac6800eba802c26b1744765d5057cc4d89182c7255ee1347b0ca96dc7
-  googleauth (1.17.5) sha256=92498efc6883630a7e011ce4e667f887e314e588d584410ba18df49f1303f3d7
-  highline (2.0.3) sha256=2ddd5c127d4692721486f91737307236fe005352d12a4202e26c48614f719479
-  http-cookie (1.1.6) sha256=ba4b82be64de61dc281243dac70e3c382c45142f20268ed9276a3670c93feaa9
-  io-console (0.9.4) sha256=a403304f32928ee85e56d457b4612ca43f2703b561a3258844992bd24085fbb1
-  irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
-  jmespath (1.6.2) sha256=238d774a58723d6c090494c8879b5e9918c19485f7e840f2c1c7532cf84ebcb1
-  json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
-  jwt (3.3.0) sha256=44cc34fbc341c148233cf66641522b4bce0dfb1ce55e8073f05c56f44f4ee546
-  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
-  mini_magick (4.13.2) sha256=71d6258e0e8a3d04a9a0a09784d5d857b403a198a51dd4f882510435eb95ddd9
-  mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef
-  multi_json (1.21.2) sha256=245531eaf54bdba57aba515ff08b4503505c5e09911daa89c5a561e2f85bea8e
-  multipart-post (2.4.1) sha256=9872d03a8e552020ca096adadbf5e3cb1cd1cdd6acd3c161136b8a5737cdb4a8
-  mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751
-  nanaimo (0.4.0) sha256=faf069551bab17f15169c1f74a1c73c220657e71b6e900919897a10d991d0723
-  naturally (2.3.0) sha256=459923cf76c2e6613048301742363200c3c7e4904c324097d54a67401e179e01
-  net-http (0.10.0) sha256=1a2ff6e37a05724973c43f2bf7bf105f59c36a4cd0a7e9b1c021a0a566987c27
-  net-protocol (0.4.0) sha256=f9f90c8c6f64794a45160bf422177a336db12809de3beeeaa26b88fcd2e8c853
-  nkf (0.3.0) sha256=357a8dbeba38b727b75930f665146546076a394a1c243faf634ff176e3588895
-  optparse (0.8.1) sha256=42bea10d53907ccff4f080a69991441d611fbf8733b60ed1ce9ee365ce03bd1a
-  os (1.1.4) sha256=57816d6a334e7bd6aed048f4b0308226c5fb027433b67d90a9ab435f35108d3f
-  ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912
-  plist (3.7.2) sha256=d37a4527cc1116064393df4b40e1dbbc94c65fa9ca2eec52edf9a13616718a42
-  pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
-  prettyprint (0.2.1) sha256=d555d57ea6d7cf001d4774b693546a6bd88bec1e778ddffb5c60b68ceec4b7d4
-  prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
-  pstore (0.2.1) sha256=03904d0f2c66579e96d1e6704cdabc0c88df7ea8ed8782d9f3569f6f6c702c1a
-  public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623
-  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
-  rdoc (8.1.0) sha256=befc37880a5cfd36dcb176c748b5fd5ee39dd3536a75e81824e4972ce230f60a
-  reline (0.7.0) sha256=5b012d8e55dbf9d450f12bde2cf7d15ff546ae80b3f8f3b30e570d431815583d
-  representable (3.3.1) sha256=8a5fc8eef99f598147eee0390f606386268b429a840419fcfd3f7a8ccc40f566
-  retriable (4.2.0) sha256=90c3b257472a1c02f2a3dfa64dd35a420f7a624cef1a5981e20fdac5730f8cdc
-  rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142
-  rouge (3.28.0) sha256=0d6de482c7624000d92697772ab14e48dca35629f8ddf3f4b21c99183fd70e20
-  rubyzip (3.7.0) sha256=65c19294da75297a939006f3516deacc33185fbd721ff1954f7a231db6d3e121
-  security (0.3.0) sha256=bc9d06718258a96c8552ce4044bfe69144491b10d3403d74c4753a03a720ecf0
-  signet (0.22.1) sha256=6e73e9f2bdc2f038a5fdc8a89d248792b1b55e9ca50ee1ba458d8f1d9f0a2151
-  simctl (1.6.10) sha256=b99077f4d13ad81eace9f86bf5ba4df1b0b893a4d1b368bd3ed59b5b27f9236b
-  terminal-notifier (3.1.0) sha256=073609e9da7bb60176ffadda903c8d9231fcdf18ffa7074dc9478b63fe25c69c
-  terminal-table (4.0.0) sha256=f504793203f8251b2ea7c7068333053f0beeea26093ec9962e62ea79f94301d2
-  timeout (0.6.1) sha256=78f57368a7e7bbadec56971f78a3f5ecbcfb59b7fcbb0a3ed6ddc08a5094accb
-  trailblazer-option (0.1.2) sha256=20e4f12ea4e1f718c8007e7944ca21a329eee4eed9e0fa5dde6e8ad8ac4344a3
-  tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
-  tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48
-  tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50
-  tty-spinner (0.9.3) sha256=0e036f047b4ffb61f2aa45f5a770ec00b4d04130531558a94bfc5b192b570542
-  uber (0.1.0) sha256=5beeb407ff807b5db994f82fa9ee07cfceaa561dad8af20be880bc67eba935dc
-  unicode-display_width (3.3.0) sha256=4b7aa66a4b11db50f6f7e98411215cd0dd10eaecb665d36eec5bcacb3fa0b613
-  unicode-emoji (4.3.0) sha256=11c02fa73290378c066bb0562cd4c87d8e1b706fbbe0059ca12746a4244de8ce
-  uri (1.1.2) sha256=89292e98eabbef6248b0a0ed5e7e398e152f83f17560023a6d94a7f492b169fb
-  word_wrap (1.0.0) sha256=f556d4224c812e371000f12a6ee8102e0daa724a314c3f246afaad76d82accc7
-  xcodeproj (1.28.1) sha256=6f12670f00739d9817ca27ac89d6ef01cc86050e22a0bc08a3131487e5b5cddc
-  xcpretty (0.4.1) sha256=b14c50e721f6589ee3d6f5353e2c2cfcd8541fa1ea16d6c602807dd7327f3892
-  xcpretty-travis-formatter (1.0.1) sha256=aacc332f17cb7b2cba222994e2adc74223db88724fe76341483ad3098e232f93
-
-BUNDLED WITH
-  4.0.23
@@ -5,7 +5,6 @@ import {
  seedMockAgentWorkspace,
  type MockAgentWorkspace,
 } from "../support/helpers/mock-agent";
-import { waitForTimelineGeometryToSettle } from "../support/helpers/timeline-pagination";
 import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
 import {
  expectReconnectingToastGone,
@@ -20,10 +19,6 @@ import {
 } from "../support/helpers/composer";

 import { openCommandCenter, closeCommandCenter } from "../support/helpers/command-center";
-import {
-  expectPromptsDrawnByPlugin,
-  withPromptTimelinePlugin,
-} from "../support/helpers/plugin-timeline";

 const MAC_USER_AGENT =
  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36";
@@ -125,49 +120,6 @@ async function closeFind(page: Page) {
    .toEqual([]);
 }

-async function expectChatKeyboardScroll(page: Page, key: "PageUp" | "PageDown") {
-  // The scrolling surface has no accessible name; use its existing test id.
-  const viewport = page.getByTestId("agent-chat-scroll");
-  await waitForTimelineGeometryToSettle(page);
-  const before = await viewport.evaluate((element) => element.scrollTop);
-  await page.keyboard.press(key);
-  const direction = key === "PageUp" ? -1 : 1;
-  await expect
-    .poll(
-      async () => direction * ((await viewport.evaluate((element) => element.scrollTop)) - before),
-    )
-    .toBeGreaterThan(100);
-}
-
-test("keeps keyboard scrolling the chat after closing Find", async ({ page }, testInfo) => {
-  const agent = await seedMockAgentWorkspace({
-    repoPrefix: "chat-find-scroll-focus-",
-    title: "Chat Find keyboard scrolling",
-    initialPrompt: "Render the response",
-    featureValues: { mockAssistantResponse: TALL_RESPONSE },
-  });
-  try {
-    await agent.client.waitForFinish(agent.agentId, 15_000);
-    await openAgentRoute(page, agent);
-    await expect(page.getByTestId("assistant-message").first()).toBeVisible();
-    await searchChat(page, "Closing paragraph");
-    await expectHighlight(page, "Closing paragraph");
-    await waitForTimelineGeometryToSettle(page);
-    await closeFind(page);
-    await expectChatKeyboardScroll(page, "PageUp");
-    await page.screenshot({ path: testInfo.outputPath("chat-after-find-page-up.png") });
-    await expectChatKeyboardScroll(page, "PageDown");
-    await searchChat(page, "Closing paragraph");
-    await expectHighlight(page, "Closing paragraph");
-    await waitForTimelineGeometryToSettle(page);
-    await page.getByRole("button", { name: "Close Find", exact: true }).click();
-    await expect(query(page)).toHaveCount(0);
-    await expectChatKeyboardScroll(page, "PageUp");
-  } finally {
-    await agent.cleanup();
-  }
-});
-
 test("loads older history through prompt navigation and finds repeated rendered Markdown", async ({
  page,
 }, testInfo) => {
@@ -222,7 +174,7 @@ async function highlightedMessage(page: Page) {
    const range = entry && Array.from(entry[1])[0];
    if (!(range instanceof Range)) return null;
    const message = range.startContainer.parentElement?.closest<HTMLElement>(
-      '[data-testid="user-message"], [data-testid="plugin-prompt"], [data-testid="assistant-message"]',
+      '[data-testid="user-message"], [data-testid="assistant-message"]',
    );
    return message?.dataset.testid ?? null;
  });
@@ -267,34 +219,6 @@ test("counts and steps through every match in the chat, not just the selected me
  }
 });

-test("finds text in a prompt a timeline plugin draws", async ({ page }, testInfo) => {
-  testInfo.setTimeout(120_000);
-  const agent = await seedMockAgentWorkspace({
-    repoPrefix: "chat-find-plugin-prompt-",
-    title: "Chat Find plugin prompt",
-    initialPrompt: ACROSS_PROMPT,
-    featureValues: { mockAssistantResponse: ACROSS_RESPONSE },
-  });
-  try {
-    await agent.client.waitForFinish(agent.agentId, 15_000);
-    await withPromptTimelinePlugin(async () => {
-      await openAgentRoute(page, agent);
-      await expectPromptsDrawnByPlugin(page);
-      await openChatFind(page);
-      await query(page).fill("scope-needle");
-      await expect(status(page)).toHaveText("1 of 3");
-      await expectHighlight(page, "scope-needle");
-      await expectHighlightedMessage(page, "plugin-prompt");
-      await page.screenshot({ path: testInfo.outputPath("chat-find-plugin-prompt.png") });
-      await expectNextMatch(page, "2 of 3", "scope-needle");
-      await expectHighlightedMessage(page, "assistant-message");
-      await closeFind(page);
-    });
-  } finally {
-    await agent.cleanup();
-  }
-});
-
 test("rejects invisible source matches and ignores a late reply after closing", async ({
  page,
 }) => {
@@ -2,7 +2,9 @@ import { test, expect } from "../support/fixtures";
 import type { Locator } from "@playwright/test";
 import {
  gotoWorkspace,
+  assertNewChatTileVisible,
  assertNewTabMenuTriggerVisible,
+  assertSingleNewTabButton,
  openNewTabMenuWithShortcut,
  clickNewChat,
  clickNewTerminal,
@@ -124,7 +126,6 @@ test.describe("Tab creation", () => {
    page,
  }) => {
    await gotoWorkspace(page, workspace.workspaceId);
-    await assertNewTabMenuTriggerVisible(page);
    await pressNewTabShortcut(page);
    const newTabs = page
      .locator('[data-testid^="workspace-tab-tab_"]')
@@ -189,18 +190,11 @@ test.describe("Tab creation", () => {
    await expect(agent).toBeFocused();
  });

-  test("the Agent menu creates a draft and shows its composer within the visual budget", async ({
-    page,
-  }) => {
+  test("clicking new agent tab creates a draft tab", async ({ page }) => {
    await gotoWorkspace(page, workspace.workspaceId);

-    const elapsed = await measureTileTransition(
-      page,
-      () => clickNewChat(page),
-      composerLocator(page),
-      10_000,
-    );
-    expect(elapsed).toBeLessThan(3_000);
+    await clickNewChat(page);
+
    await expectComposerVisible(page);

    const tabsAfter = await getTabTestIds(page);
@@ -208,17 +202,12 @@ test.describe("Tab creation", () => {
    expect(draftCountAfter).toBeGreaterThanOrEqual(1);
  });

-  test("the Terminal menu creates a terminal within the visual budget", async ({ page }) => {
+  test("clicking terminal button creates a standalone terminal", async ({ page }) => {
    test.setTimeout(45_000);
    await gotoWorkspace(page, workspace.workspaceId);

-    const elapsed = await measureTileTransition(
-      page,
-      () => clickNewTerminal(page),
-      terminalSurfaceLocator(page),
-      20_000,
-    );
-    expect(elapsed).toBeLessThan(5_000);
+    await clickNewTerminal(page);
+
    await expectTerminalSurfaceVisible(page);

    const tabsAfter = await getTabTestIds(page);
@@ -306,6 +295,13 @@ test.describe("Tab creation", () => {
      await profileSeed.restore();
    }
  });
+
+  test("tab bar shows action buttons per pane", async ({ page }) => {
+    await gotoWorkspace(page, workspace.workspaceId);
+    await assertSingleNewTabButton(page);
+    await assertNewChatTileVisible(page);
+    await assertNewTabMenuTriggerVisible(page);
+  });
 });

 // ═══════════════════════════════════════════════════════════════════════════
@@ -343,4 +339,37 @@ test.describe("Tab transitions (no flash)", () => {
    expect(new Set(snapshots.map(tabIdentityKey)).size).toBeLessThanOrEqual(2);
    await expectTabTitleFits(page, "New Agent", { min: 64, max: 160 });
  });
+
+  test("Terminal transition completes within visual budget", async ({ page }) => {
+    test.setTimeout(30_000);
+    await gotoWorkspace(page, workspace.workspaceId);
+
+    const elapsed = await measureTileTransition(
+      page,
+      () => clickNewTerminal(page),
+      terminalSurfaceLocator(page),
+      20_000,
+    );
+
+    // Terminal surface should appear within a reasonable budget.
+    // Note: terminal creation involves a server round-trip, so we allow more time
+    // than a pure in-memory transition, but it should still be well under 5 seconds.
+    expect(elapsed).toBeLessThan(5_000);
+  });
+
+  test("New agent tab click shows composer without flash", async ({ page }) => {
+    await gotoWorkspace(page, workspace.workspaceId);
+
+    const elapsed = await measureTileTransition(
+      page,
+      () => clickNewChat(page),
+      composerLocator(page),
+      10_000,
+    );
+
+    // Draft creation is fully in-memory — should be fast
+    // We use a generous budget here because CI can be slow, but the key assertion
+    // is that no blank/flash frame appears (tested above).
+    expect(elapsed).toBeLessThan(3_000);
+  });
 });
@@ -188,74 +188,3 @@ async function measureInlineCode(message: Locator) {
    return { codes, right: paragraph.getBoundingClientRect().right };
  });
 }
-
-test("inline-code paths preserve stable recognition and file navigation", async ({
-  page,
-  context,
-}, testInfo) => {
-  const { writeFile, mkdir } = await import("node:fs/promises");
-  const paths = ["src/app/[id].tsx", "src/app/(tabs)/index.tsx", "src/a$b.ts"];
-  const source =
-    paths.map((path) => `Open \`${path}\`.`).join("\n\n") +
-    "\n\nOpen `.gitignore` and `src/index.ts#L10-L20`. Compare before/after and `before/after`. Keep `word.word` plain.";
-  const session = await seedMockAgentWorkspace({
-    repoPrefix: "inline-path-regression-",
-    title: "Inline path regression",
-    initialPrompt: "Show file paths",
-    featureValues: { mockAssistantResponse: source },
-  });
-  try {
-    await mkdir(`${session.cwd}/src/app/(tabs)`, { recursive: true });
-    for (const path of paths) await writeFile(`${session.cwd}/${path}`, `Opened ${path}`);
-    await writeFile(
-      `${session.cwd}/src/index.ts`,
-      Array.from({ length: 30 }, (_, i) => `export const line${i + 1} = ${i + 1};`).join("\n"),
-    );
-    await session.client.waitForFinish(session.agentId, 30_000);
-    await openAgentRoute(page, session);
-    const message = page.getByTestId("assistant-message");
-    await expect(message.getByRole("link", { name: ".gitignore", exact: true })).toBeVisible();
-    await expect(message.getByRole("link", { name: "before/after", exact: true })).toHaveCount(0);
-    await expect(message.getByRole("link", { name: "word.word", exact: true })).toHaveCount(0);
-    for (const path of paths) {
-      await openInlineRegressionFile(page, path);
-      await expect(page.getByTestId("file-source-editor").filter({ visible: true })).toContainText(
-        `Opened ${path}`,
-      );
-    }
-    await openInlineRegressionFile(page, "src/index.ts#L10-L20");
-    await expect(page.getByLabel("Line 20, column 26")).toBeVisible();
-    await context.grantPermissions(["clipboard-read", "clipboard-write"]);
-    await page
-      .getByTestId("file-source-editor")
-      .filter({ visible: true })
-      .locator(".cm-content")
-      .focus();
-    await page.keyboard.press("ControlOrMeta+c");
-    await expect
-      .poll(() => page.evaluate(() => navigator.clipboard.readText()))
-      .toBe(
-        Array.from({ length: 11 }, (_, i) => `export const line${i + 10} = ${i + 10};`).join("\n"),
-      );
-    await expect(
-      page
-        .getByTestId("file-source-editor")
-        .filter({ visible: true })
-        .locator(".cm-selectionBackground"),
-    ).not.toHaveCount(0);
-    await testInfo.attach("inline-path-line-selection", {
-      body: await page.screenshot(),
-      contentType: "image/png",
-    });
-  } finally {
-    await session.cleanup();
-  }
-});
-
-async function openInlineRegressionFile(page: Page, path: string) {
-  await page.getByRole("button", { name: "Inline path regression", exact: true }).click();
-  await page
-    .getByTestId("assistant-message")
-    .getByRole("link", { name: path, exact: true })
-    .click();
-}
@@ -223,10 +223,7 @@ test.describe("Projects settings", () => {
    }
  });

-  test("edits worktree setup, navigates within the host, and removes a script", async ({
-    page,
-    editableProject,
-  }) => {
+  test("user edits worktree setup from the projects page", async ({ page, editableProject }) => {
    await openProjects(page);
    await openProjectSettings(page, editableProject.name);
    await expectNoUncommittedSetupWarning(page);
@@ -239,22 +236,15 @@ test.describe("Projects settings", () => {
    await returnToProjectsList(page);
    await openProjectSettings(page, editableProject.name);
    await expectNoUncommittedSetupWarning(page);
+  });

-    await test.step("navigation stays inside the selected host", async () => {
-      await expectProjectHostContextHidden(page);
-      await returnToProjectsList(page);
-      await openProjectSettings(page, editableProject.name);
-      await expectProjectSettingsHistoryRoundTrip(page, editableProject.name);
-    });
-
-    await test.step("removing a script leaves the committed setup unchanged", async () => {
-      await expectScriptRowCount(page, 1);
-      await removeProjectScript(page, "dev");
-      await expectScriptRowCount(page, 0);
-      await expectEmptyScriptList(page);
-      await clickSaveProjectSettings(page);
-      await expectNoUncommittedSetupWarning(page);
-    });
+  test("project navigation stays inside the selected host", async ({ page, editableProject }) => {
+    await openProjects(page);
+    await openProjectSettings(page, editableProject.name);
+    await expectProjectHostContextHidden(page);
+    await returnToProjectsList(page);
+    await openProjectSettings(page, editableProject.name);
+    await expectProjectSettingsHistoryRoundTrip(page, editableProject.name);
  });

  test("user edits worktree setup on a non-GitHub remote project", async ({
@@ -269,10 +259,7 @@ test.describe("Projects settings", () => {
    await expectProjectConfigSaved(gitlabRemoteProject);
  });

-  test("renames a project, reopens the saved edit sheet, and adds an icon", async ({
-    page,
-    editableProject,
-  }) => {
+  test("user renames a project from the edit sheet", async ({ page, editableProject }) => {
    await openProjects(page);
    await openProjectSettings(page, editableProject.name);
    await openProjectEditSheet(page);
@@ -281,23 +268,37 @@ test.describe("Projects settings", () => {

    await expectProjectEditSaved(page);
    await expectProjectTitle(page, "Renamed project");
+  });

-    await test.step("reopening seeds the saved name with no unsaved changes", async () => {
-      await openProjectEditSheet(page);
-      await expectProjectEditName(page, "Renamed project");
-      await expectProjectEditsSaveDisabled(page);
-    });
+  test("reopening the edit sheet seeds from the saved project", async ({
+    page,
+    editableProject,
+  }) => {
+    await openProjects(page);
+    await openProjectSettings(page, editableProject.name);
+    await openProjectEditSheet(page);
+    await fillProjectName(page, "Renamed project");
+    await saveProjectEdits(page);
+    await expectProjectEditSaved(page);

-    await test.step("an icon can be saved without another name change", async () => {
-      await chooseProjectIconImage(page, {
-        name: "logo.png",
-        mimeType: "image/png",
-        buffer: PNG_1X1,
-      });
-      await saveProjectEdits(page);
-      await expectProjectEditSaved(page);
-      await expectProjectTitle(page, "Renamed project");
+    await openProjectEditSheet(page);
+
+    await expectProjectEditName(page, "Renamed project");
+    await expectProjectEditsSaveDisabled(page);
+  });
+
+  test("user picks a custom project icon from a file", async ({ page, editableProject }) => {
+    await openProjects(page);
+    await openProjectSettings(page, editableProject.name);
+    await openProjectEditSheet(page);
+    await chooseProjectIconImage(page, {
+      name: "logo.png",
+      mimeType: "image/png",
+      buffer: PNG_1X1,
    });
+    await saveProjectEdits(page);
+
+    await expectProjectEditSaved(page);
  });

  test("user sets a project name and icon in one save", async ({ page, editableProject }) => {
@@ -458,4 +459,31 @@ test.describe("Projects settings — error UX", () => {

    await expectNoEditableTarget(page);
  });
+
+  test("project detail does not render a second host selector", async ({
+    page,
+    editableProject,
+  }) => {
+    await openProjects(page);
+    await openProjectSettings(page, editableProject.name);
+
+    await expectProjectHostContextHidden(page);
+  });
+
+  test("script removal via kebab menu removes the row from the form", async ({
+    page,
+    editableProject,
+  }) => {
+    await openProjects(page);
+    await openProjectSettings(page, editableProject.name);
+
+    await expectScriptRowCount(page, 1);
+
+    await removeProjectScript(page, "dev");
+
+    await expectScriptRowCount(page, 0);
+    await expectEmptyScriptList(page);
+    await clickSaveProjectSettings(page);
+    await expectNoUncommittedSetupWarning(page);
+  });
 });
@@ -116,12 +116,28 @@ async function exerciseProviderSettingsStack(page: Page) {

  await page.getByRole("button", { name: "Refresh", exact: true }).click();
  await expectProviderSettingsVisible(page);
-  await expect(page.getByText("Updated just now", { exact: true })).toBeVisible({
-    timeout: 30_000,
-  });
 }

 test.describe("provider settings overlay stack", () => {
+  test("provider model update age says just now", async ({ page }) => {
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "provider-relative-time-",
+      title: "Provider relative time",
+    });
+    try {
+      await page.clock.install({ time: Date.now() });
+      await page.setViewportSize(MOBILE_VIEWPORT);
+      await openAgentRoute(page, session);
+      await expectComposerVisible(page);
+      await openProviderSettingsFromModelSelector(page);
+      await expect(page.getByText("Updated just now", { exact: true })).toBeVisible({
+        timeout: 30_000,
+      });
+    } finally {
+      await session.cleanup();
+    }
+  });
+
  test("provider settings covers the desktop model selector without closing it", async ({
    page,
  }) => {
@@ -504,17 +504,6 @@ test.describe("Mobile sidebar panelState transition", () => {
    await expectMobileAgentSidebarHidden(page);
  });

-  test("places the close button beside the first nav row instead of over it", async ({ page }) => {
-    await gotoAppShell(page);
-    await openMobileAgentSidebar(page);
-    await expectMobileAgentSidebarVisible(page);
-
-    const firstRow = await page.getByTestId("sidebar-global-new-workspace").boundingBox();
-    const closeButton = await page.getByTestId("sidebar-close").boundingBox();
-    if (!firstRow || !closeButton) throw new Error("first nav row and close button must render");
-    expect(closeButton.x).toBeGreaterThanOrEqual(firstRow.x + firstRow.width);
-  });
-
  test("keeps a pinned workspace rendered while the retained sidebar is closed", async ({
    page,
  }) => {
@@ -0,0 +1,99 @@
+import { expect, test } from "../support/fixtures";
+import { clickNewChat, clickNewTerminal, gotoWorkspace } from "../support/helpers/launcher";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import {
+  expectTerminalSurfaceVisible,
+  focusTerminalSurface,
+  typeInTerminal,
+  setupDeterministicPrompt,
+  waitForTerminalContent,
+} from "../support/helpers/terminal-perf";
+
+interface CreatedAgentCwdAssertion {
+  workspaceId: string;
+  cwd: string | null;
+}
+
+async function fetchSingleAgentForWorkspace(
+  workspace: SeededWorkspace,
+): Promise<CreatedAgentCwdAssertion | null> {
+  const agents = (await workspace.client.fetchAgents({ scope: "active" })).entries
+    .map((entry) => entry.agent)
+    .filter((agent) => agent.workspaceId === workspace.workspaceId);
+  if (agents.length !== 1) {
+    return null;
+  }
+  const [agent] = agents;
+  return {
+    workspaceId: workspace.workspaceId,
+    cwd: agent.cwd,
+  };
+}
+
+test.describe("Workspace cwd correctness", () => {
+  test("main checkout workspace opens terminals in the project root", async ({
+    page,
+    withWorkspace,
+  }) => {
+    test.setTimeout(60_000);
+
+    const workspace = await withWorkspace({ prefix: "workspace-cwd-main-" });
+    await workspace.navigateTo();
+    await clickNewTerminal(page);
+
+    await expectTerminalSurfaceVisible(page);
+    await focusTerminalSurface(page);
+    await setupDeterministicPrompt(page, `PWD_READY_${Date.now()}`);
+    await typeInTerminal(page, "pwd\n");
+    await waitForTerminalContent(page, (text) => text.includes(workspace.repoPath), 10_000);
+  });
+
+  test("draft tab creates an agent in the workspace cwd", async ({ page }) => {
+    test.setTimeout(60_000);
+
+    const workspace = await seedWorkspace({ repoPrefix: "workspace-cwd-draft-agent-" });
+    try {
+      await gotoWorkspace(page, workspace.workspaceId);
+
+      await clickNewChat(page);
+      const composer = page.getByRole("textbox", { name: "Message agent..." }).first();
+      const message = `cwd draft create ${Date.now()}`;
+      await expect(composer).toBeEditable({ timeout: 15_000 });
+      await composer.fill(message);
+      await composer.press("Enter");
+      await expect(page.getByText(message, { exact: true }).first()).toBeVisible({
+        timeout: 30_000,
+      });
+
+      await expect(page.locator('[data-testid^="workspace-tab-agent_"]').first()).toBeVisible({
+        timeout: 30_000,
+      });
+
+      await expect
+        .poll(() => fetchSingleAgentForWorkspace(workspace), { timeout: 30_000 })
+        .toEqual({
+          workspaceId: workspace.workspaceId,
+          cwd: workspace.repoPath,
+        });
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
+  test("worktree workspace opens terminals in the worktree directory", async ({
+    page,
+    withWorkspace,
+  }) => {
+    test.setTimeout(90_000);
+
+    const workspace = await withWorkspace({ worktree: true, prefix: "workspace-cwd-worktree-" });
+    await workspace.navigateTo();
+    await clickNewTerminal(page);
+
+    await expectTerminalSurfaceVisible(page);
+    await focusTerminalSurface(page);
+    await setupDeterministicPrompt(page, `PWD_READY_${Date.now()}`);
+    await typeInTerminal(page, "pwd\n");
+    await waitForTerminalContent(page, (text) => text.includes(workspace.repoPath), 10_000);
+  });
+});
@@ -3,7 +3,6 @@ import {
  createAgentChatFromLauncher,
  createStandaloneTerminalFromLauncher,
  expectTerminalCwd,
-  submitAgentChatAndExpectCwd,
 } from "../support/helpers/workspace-lifecycle";

 test.describe("Workspace lifecycle", () => {
@@ -20,9 +19,8 @@ test.describe("Workspace lifecycle", () => {
    const workspace = await withWorkspace({ prefix: "lifecycle-main-" });
    await workspace.navigateTo();

-    await test.step("submitting a draft creates an agent in the project root", async () => {
+    await test.step("creates an agent chat", async () => {
      await createAgentChatFromLauncher(page);
-      await submitAgentChatAndExpectCwd(page, workspace);
    });

    await test.step("creates a terminal in the project root", async () => {
@@ -80,6 +80,13 @@ export async function pressDirectNewTabShortcut(page: Page, key: string): Promis

 // ─── Tab bar assertions ───────────────────────────────────────────────────

+/** Assert the inline plus button is visible in the tab bar. */
+export async function assertNewChatTileVisible(page: Page): Promise<void> {
+  await expect(
+    page.getByTestId("workspace-new-tab-button").filter({ visible: true }).first(),
+  ).toBeVisible();
+}
+
 /** Assert the New tab button is visible in the tab bar. */
 export async function assertNewTabMenuTriggerVisible(page: Page): Promise<void> {
  await expect(
@@ -125,6 +132,13 @@ export async function waitForTabWithTitle(
  ).toBeVisible({ timeout });
 }

+/** Assert the inline plus button is visible in the tab bar. */
+export async function assertSingleNewTabButton(page: Page): Promise<void> {
+  const buttons = page.getByTestId("workspace-new-tab-button").filter({ visible: true });
+  const count = await buttons.count();
+  expect(count).toBeGreaterThanOrEqual(1);
+}
+
 // ─── No-flash measurement ──────────────────────────────────────────────────

 /**
@@ -1,6 +1,5 @@
 import { expect, type Page } from "@playwright/test";
 import { clickNewChat, clickNewTerminal } from "./launcher";
-import { connectSeedClient } from "./seed-client";
 import { setupDeterministicPrompt, waitForTerminalContent } from "./terminal-perf";

 function terminalSurface(page: Page) {
@@ -31,35 +30,3 @@ export async function createAgentChatFromLauncher(page: Page): Promise<void> {
  await expect(composerInput(page)).toBeEditable({ timeout: 15_000 });
  await expect(page.getByTestId("agent-loading")).toHaveCount(0);
 }
-
-export async function submitAgentChatAndExpectCwd(
-  page: Page,
-  workspace: { workspaceId: string; repoPath: string },
-): Promise<void> {
-  const client = await connectSeedClient();
-  try {
-    const message = "cwd draft create";
-    await composerInput(page).fill(message);
-    await composerInput(page).press("Enter");
-    await expect(page.getByText(message, { exact: true }).first()).toBeVisible({
-      timeout: 30_000,
-    });
-    await expect(page.locator('[data-testid^="workspace-tab-agent_"]').first()).toBeVisible({
-      timeout: 30_000,
-    });
-    await expect
-      .poll(
-        async () => {
-          const agents = await client.fetchAgents({ scope: "active" });
-          return agents.entries
-            .map((entry) => entry.agent)
-            .filter((agent) => agent.workspaceId === workspace.workspaceId)
-            .map((agent) => ({ workspaceId: agent.workspaceId, cwd: agent.cwd }));
-        },
-        { timeout: 30_000 },
-      )
-      .toEqual([{ workspaceId: workspace.workspaceId, cwd: workspace.repoPath }]);
-  } finally {
-    await client.close();
-  }
-}
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -118,8 +118,8 @@ export function ChatFind({
  }, [active, isInteractive, model]);
  const close = useCallback(() => {
    model.close();
-    viewportRef.current?.focus?.();
-  }, [model, viewportRef]);
+    root.current?.focus({ preventScroll: true });
+  }, [model]);
  let status = "";
  if (state.phase === "searching") status = t("paneFind.searching");
  else if (state.phase === "loading") status = t("paneFind.loading");
@@ -76,49 +76,3 @@ it("keeps semantic Markdown paragraphs separate while finding inline matches", (
  ]);
  expect(findRenderedMatches(row, ".another")).toEqual([]);
 });
-
-function pluginRow(html: string) {
-  const row = document.createElement("div");
-  row.dataset.pluginRow = "true";
-  row.dataset.messageId = "message-1";
-  row.innerHTML = html;
-  document.body.append(row);
-  return row;
-}
-
-it("searches a plugin row that sets no text marker, bounding matches by view", () => {
-  const row = pluginRow(
-    "<div><div>Prompt</div><div>find <span>this</span> needle</div><div>needle</div><button>needle</button></div>",
-  );
-  expect(findRenderedMatches(row, "needle").map((range) => range.toString())).toEqual([
-    "needle",
-    "needle",
-  ]);
-  expect(findRenderedMatches(row, "Promptfind")).toEqual([]);
-  expect(findRenderedMatches(row, "find this needle")).toHaveLength(1);
-  expect(findMessageMatches(row.parentElement, "message-1", "needle")).toHaveLength(2);
-});
-
-it("leaves rows without the plugin marker limited to marked message text", () => {
-  const row = document.createElement("div");
-  row.innerHTML = "<div>needle</div>";
-  document.body.append(row);
-  expect(findRenderedMatches(row, "needle")).toEqual([]);
-});
-
-it("counts only drawn text in a plugin row, including an opened popover", () => {
-  const row = pluginRow(
-    '<div><span>visible needle</span><div hidden>hidden needle</div><div style="display:none">display needle</div><span style="visibility:hidden">visibility needle</span><span style="opacity:0">transparent needle</span><div popover="manual">popover needle</div></div>',
-  );
-  expect(findRenderedMatches(row, "needle").map((range) => range.toString())).toEqual(["needle"]);
-  row.querySelector<HTMLElement>("[popover]")!.showPopover();
-  expect(findRenderedMatches(row, "needle")).toHaveLength(2);
-});
-
-it("keeps text around nested plugin blocks in separate occurrences", () => {
-  const row = pluginRow("<div>alpha <div>details</div>beta</div><div>gamma <div></div>delta</div>");
-  expect(findRenderedMatches(row, "alpha beta")).toEqual([]);
-  expect(findRenderedMatches(row, "gamma delta")).toEqual([]);
-  expect(findRenderedMatches(row, "details").map((range) => range.toString())).toEqual(["details"]);
-  expect(findRenderedMatches(row, "beta").map((range) => range.toString())).toEqual(["beta"]);
-});
@@ -21,55 +21,28 @@ export function findMessageMatches(
  return findMessageRows(root, messageId).flatMap((row) => findRenderedMatches(row, query));
 }

-function renderedTextGroups(row: HTMLElement): Text[][] {
-  const groups: Text[][] = [];
-  // A plugin renderer owns the DOM of the message it replaced and sets no markers, so the
-  // whole row is searched and each div (a React Native View or Text) bounds a match.
-  const pluginRow = row.dataset.pluginRow === "true";
-  const blocks = pluginRow ? `${BLOCKS},div` : BLOCKS;
-  const contents = pluginRow
-    ? [row]
-    : row.querySelectorAll<HTMLElement>('[data-message-text="true"]');
-  for (const content of contents) {
-    let group: { block: Element; texts: Text[] } | undefined;
-    const walker = document.createTreeWalker(
-      content,
-      NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_TEXT,
-    );
-    let node: Node | null;
-    while ((node = walker.nextNode())) {
-      if (node instanceof Element) {
-        // Even an empty nested block separates the text before and after it.
-        if (node.matches(blocks)) group = undefined;
-        continue;
-      }
-      if (!(node instanceof Text) || node.parentElement?.closest(IGNORED)) continue;
-      if (
-        pluginRow &&
-        !node.parentElement?.checkVisibility({ opacityProperty: true, visibilityProperty: true })
-      )
-        continue;
-      const block = node.parentElement?.closest(blocks) ?? content;
-      if (group?.block !== block) {
-        group = { block, texts: [] };
-        groups.push(group.texts);
-      }
-      group.texts.push(node);
-    }
-  }
-  return groups;
-}
-
 /** Local offsets belong to the DOM that supplied the text, never to a host parser. */
 export function findRenderedMatches(row: HTMLElement, query: string): Range[] {
  if (!query.trim()) return [];
+  const groups = new Map<Element, Text[]>();
+  for (const content of row.querySelectorAll<HTMLElement>('[data-message-text="true"]')) {
+    const walker = document.createTreeWalker(content, NodeFilter.SHOW_TEXT);
+    let node: Node | null;
+    while ((node = walker.nextNode())) {
+      if (!(node instanceof Text) || node.parentElement?.closest(IGNORED)) continue;
+      const block = node.parentElement?.closest(BLOCKS) ?? content;
+      const texts = groups.get(block) ?? [];
+      texts.push(node);
+      groups.set(block, texts);
+    }
+  }
  const pattern = query
    .trim()
    .split(/\s+/)
    .map((part) => part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
    .join("\\s+");
  const ranges: Range[] = [];
-  for (const texts of renderedTextGroups(row)) {
+  for (const texts of groups.values()) {
    const points = texts.map((node) => ({ node, start: 0, end: 0 }));
    let text = "";
    for (const point of points) {
@@ -1162,7 +1162,6 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool

  useEffect(() => {
    const handle: StreamViewportHandle = {
-      focus: () => scrollContainerRef.current?.focus({ preventScroll: true }),
      scrollToBottom: () => {
        setFollowOutput(true);
        cancelPendingStickToBottom();
@@ -1251,7 +1250,6 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
        key={item.id}
        data-history-row-id={item.id}
        data-message-id={getStreamItemMessageId(item)}
-        data-plugin-row={item.kind === "plugin" ? "true" : undefined}
        style={streamRowStyle}
      >
        <StreamRowContent
@@ -1269,7 +1267,6 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
        key={item.id}
        data-history-row-id={item.id}
        data-message-id={getStreamItemMessageId(item)}
-        data-plugin-row={item.kind === "plugin" ? "true" : undefined}
        style={streamRowStyle}
      >
        <StreamRowContent
@@ -1332,7 +1329,6 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
                    data-index={virtualRow.index}
                    data-history-row-id={item.id}
                    data-message-id={getStreamItemMessageId(item)}
-                    data-plugin-row={item.kind === "plugin" ? "true" : undefined}
                    ref={measureVirtualizedRowElement}
                    style={renderVirtualRowStyle(virtualRow.start)}
                  >
@@ -51,8 +51,6 @@ export interface ScrollToMessageOccurrence {
 }

 export interface StreamViewportHandle {
-  /** Give keyboard navigation back to the scrolling surface on web. */
-  focus?: () => void;
  scrollToBottom: (reason?: BottomAnchorLocalRequest["reason"]) => void;
  prepareForViewportChange: () => void;
  scrollToMessage?: (messageId: string, occurrence?: ScrollToMessageOccurrence) => void;
@@ -21,14 +21,8 @@ import { Gesture } from "react-native-gesture-handler";
 import Animated, { runOnJS, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
 import { scheduleOnRN } from "react-native-worklets";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
-import { HeaderToggleButton } from "@/components/headers/header-toggle-button";
-import {
-  IconButtonChromeProvider,
-  iconButtonChromeGlyphSize,
-  mutedIconColorMapping,
-} from "@/components/ui/icon-button-chrome";
 import { resolveDesktopSidebarWidth } from "@/components/desktop-sidebar-layout";
 import {
  SIDEBAR_RESIZE_ACTIVATION_OFFSET,
@@ -68,7 +62,6 @@ import { usePanelStore } from "@/stores/panel-store";
 import { useOwnsWindowChromeCorner, WindowChromeSafeArea } from "@/utils/desktop-window";
 import { useCloseAgentListGesture } from "@/mobile-panels/gestures";
 import { MobilePanelOverlay } from "@/mobile-panels/presentation";
-import type { ShortcutKey } from "@/utils/format-shortcut";
 import { buildSettingsAddHostRoute, buildSettingsRoute } from "@/utils/host-routes";
 import { openHostOverview } from "@/navigation/settings-navigation";
 import {
@@ -81,8 +74,6 @@ import { SidebarAgentListSkeleton } from "./sidebar-agent-list-skeleton";
 import { SidebarCalloutSlot } from "./sidebar-callout-slot";
 import { SidebarWorkspaceList } from "./sidebar-workspace-list";

-const ThemedX = withUnistyles(X);
-
 type SidebarTheme = ReturnType<typeof useUnistyles>["theme"];

 const DEV_BUILD_LABEL = process.env.EXPO_PUBLIC_PASEO_DEV_BUILD_LABEL?.trim() || null;
@@ -554,11 +545,6 @@ function MobileSidebar({
    closeSidebar();
  }, [closeSidebar]);

-  const closeButton = useMemo(
-    () => <SidebarCloseButton label={labels.closeSidebar} onPress={closeSidebar} />,
-    [labels.closeSidebar, closeSidebar],
-  );
-
  const mobileSidebarInsetStyle = useMemo(
    () => ({
      paddingTop: insetsTop,
@@ -576,11 +562,30 @@ function MobileSidebar({
    >
      <View style={styles.sidebarContent} pointerEvents="auto">
        <WindowChromeSafeArea placement="below" />
-        <SidebarNavRows
-          style={styles.sidebarHeaderGroup}
-          onBeforeNavigate={closeSidebar}
-          firstRowTrailing={closeButton}
-        />
+        <SidebarNavRows style={styles.sidebarHeaderGroup} onBeforeNavigate={closeSidebar} />
+        <WindowChromeSafeArea
+          placement="inline"
+          pointerEvents="box-none"
+          style={styles.mobileCloseButtonRow}
+        >
+          <Pressable
+            style={styles.mobileCloseButton}
+            onPress={closeSidebar}
+            testID="sidebar-close"
+            nativeID="sidebar-close"
+            accessible
+            accessibilityRole="button"
+            accessibilityLabel={labels.closeSidebar}
+            hitSlop={8}
+          >
+            {({ hovered, pressed }) => (
+              <X
+                size={theme.iconSize.md}
+                color={hovered || pressed ? theme.colors.foreground : theme.colors.foregroundMuted}
+              />
+            )}
+          </Pressable>
+        </WindowChromeSafeArea>

        {isInitialLoad && !hasActiveHostFilter ? (
          <SidebarAgentListSkeleton />
@@ -621,34 +626,6 @@ function MobileSidebar({
  );
 }

-const NO_SHORTCUT: ShortcutKey[] = [];
-
-/** The compact header's icon button, so the sidebar's close reads like the header it covers. */
-function SidebarCloseButton({ label, onPress }: { label: string; onPress: () => void }) {
-  return (
-    <IconButtonChromeProvider value="header-island">
-      <HeaderToggleButton
-        onPress={onPress}
-        tooltipLabel={label}
-        tooltipKeys={NO_SHORTCUT}
-        tooltipSide="bottom"
-        style={styles.mobileCloseButton}
-        testID="sidebar-close"
-        nativeID="sidebar-close"
-        accessible
-        accessibilityRole="button"
-        accessibilityLabel={label}
-      >
-        <ThemedX
-          size={iconButtonChromeGlyphSize("large")}
-          strokeWidth={1.5}
-          uniProps={mutedIconColorMapping}
-        />
-      </HeaderToggleButton>
-    </IconButtonChromeProvider>
-  );
-}
-
 function DesktopSidebar({
  theme,
  workspaceGroups,
@@ -879,8 +856,24 @@ const styles = StyleSheet.create((theme) => ({
    flex: 1,
    minHeight: 0,
  },
+  mobileCloseButtonRow: {
+    position: "absolute",
+    top: theme.spacing[3],
+    left: 0,
+    right: 0,
+    zIndex: 2,
+    alignItems: "flex-end",
+  },
  mobileCloseButton: {
-    marginRight: theme.spacing[2],
+    // The 16px X paints farther inside its 32px hit target than the 14px Settings2 glyph.
+    // This optical inset puts their painted right edges on the same sidebar rail.
+    marginRight: theme.spacing[2] + 1.5,
+    width: 32,
+    height: 32,
+    alignItems: "center",
+    justifyContent: "center",
+    borderRadius: theme.borderRadius.lg,
+    backgroundColor: theme.colors.surfaceSidebar,
  },
  desktopSidebarBorder: {
    borderRightWidth: 1,
@@ -1,10 +1,5 @@
 import { fromMarkdown } from "mdast-util-from-markdown";
 import { toNativeLinkRecognition } from "react-native-enriched-markdown/src/utils/regexParser";
-import { parseMarkdown } from "react-native-enriched-markdown/src/web/parseMarkdown";
-import { recognizeTextLinks } from "react-native-enriched-markdown/src/web/recognizeTextLinks";
-import { classifyAssistantFileLink } from "@/assistant-file-links";
-import { markInlineImages } from "react-native-enriched-markdown/src/web/utils";
-import type { ASTNode } from "react-native-enriched-markdown/src/web/types";
 import { QueryClient } from "@tanstack/react-query";
 import { decodeMarkdownImage, getMarkdownImageStatus } from "./image-decoding";
 import { describe, expect, it } from "vitest";
@@ -36,56 +31,6 @@ describe("shared Markdown source adaptation", () => {
      "> - ![Image](<file:///cache/a.png>)\n\n[picture]: ../a.png",
    );
  });
-  it("gives an image alone on its line its own paragraph", () => {
-    expect(
-      prepareMarkdownSource("Before the shot:\n![Shot](https://x/a.png)\nAfter it.").render(),
-    ).toBe("Before the shot:\n\n![Shot](https://x/a.png)\n\nAfter it.");
-    expect(prepareMarkdownSource("![A](https://x/a.png)\n![B](https://x/b.png)").render()).toBe(
-      "![A](https://x/a.png)\n\n![B](https://x/b.png)",
-    );
-    expect(
-      prepareMarkdownSource(
-        "Line one\\\n[![Linked](https://x/a.png)](https://x)\nLine three",
-      ).render(),
-    ).toBe("Line one\n\n[![Linked](https://x/a.png)](https://x)\n\nLine three");
-  });
-  it("keeps images that share a line with text inline", () => {
-    const source = "Icon ![i](https://x/i.png) in text\n![a](https://x/a.png) caption\nNext line";
-    expect(prepareMarkdownSource(source).render()).toBe(source);
-  });
-  it("splits own-line images inside quotes and list items without ending the container", () => {
-    expect(prepareMarkdownSource("> Quote text\n> ![Shot](https://x/a.png)\n> More").render()).toBe(
-      "> Quote text\n>\n> ![Shot](https://x/a.png)\n>\n> More",
-    );
-    expect(
-      prepareMarkdownSource("- Item text\n  ![Shot](https://x/a.png)\n  More\n- Next").render(),
-    ).toBe("- Item text\n\n  ![Shot](https://x/a.png)\n\n  More\n- Next");
-    expect(prepareMarkdownSource("- ![Shot](https://x/a.png)\n  Caption line").render()).toBe(
-      "- ![Shot](https://x/a.png)\n\n  Caption line",
-    );
-  });
-  it("renders own-line images as blocks through the library parser", async () => {
-    const source =
-      "Before:\n![Shot](https://x/a.png)\nIcon ![i](https://x/i.png) in text\n> Quoted\n> ![Q](https://x/q.png)";
-    const tree = await parseMarkdown(prepareMarkdownSource(source).render(), {
-      hardSoftBreaks: true,
-      latexMath: false,
-    });
-    markInlineImages(tree);
-    const images: ASTNode[] = [];
-    const collect = (node: ASTNode) => {
-      if (node.type === "Image") images.push(node);
-      node.children?.forEach(collect);
-    };
-    collect(tree);
-    expect(
-      images.map((image) => [image.attributes?.url, image.attributes?.isInline === true]),
-    ).toEqual([
-      ["https://x/a.png", false],
-      ["https://x/i.png", true],
-      ["https://x/q.png", false],
-    ]);
-  });
  it("escapes spoiler delimiters only in prose", () => {
    expect(prepareMarkdownSource("Show ||words|| and `||code||`.").render()).toBe(
      "Show \\|\\|words\\|\\| and `||code||`.",
@@ -114,7 +59,7 @@ it.each([
  "src/file.ts:10-20",
  "src/file.ts(10,2)",
 ])("recognizes inline paths through the file resolver: %s", (path) => {
-  const prepared = prepareMarkdownSource(`Open \`${path}\`.`, "/repo");
+  const prepared = prepareMarkdownSource(`Open \`${path}\`.`);
  expect(prepared.linkRecognition.inlineCode?.test(path)).toBe(true);
  expect(prepared.linkSource(path, "inline-code")).toEqual({
    href: path,
@@ -123,106 +68,6 @@ it.each([
  });
 });

-it("preserves stable inline-code file classification through the library parser", async () => {
-  const paths = [
-    "src/app/[id].tsx",
-    "src/app/(tabs)/index.tsx",
-    "src/a$b.ts",
-    ".gitignore",
-    "src/index.ts#L10-L20",
-    "src/index.ts:10-20",
-    "src/index.ts:20-10",
-    "src/index.ts#L0",
-    "src/index.ts?raw",
-    "before/after",
-    "word.word",
-    "README.md",
-    "./scripts/run",
-    "src/file.ts(10,2)",
-    "src/file.ts lines 10-20",
-    "/tmp/[route].tsx",
-    "file:///tmp/file.ts#L10-L20",
-  ];
-  const source = paths.map((path) => `\`${path}\``).join(" and ");
-  const prepared = prepareMarkdownSource(source, "/repo");
-  const tree = recognizeTextLinks(
-    await parseMarkdown(prepared.render(), { latexMath: false }),
-    prepared.linkRecognition.text,
-    prepared.linkRecognition.inlineCode,
-  );
-  const links: string[] = [];
-  function collect(node: ASTNode) {
-    if (node.type === "Link") links.push(String(node.attributes?.url));
-    node.children?.forEach(collect);
-  }
-  collect(tree);
-  expect(links).toEqual([
-    "src/app/[id].tsx",
-    "src/app/(tabs)/index.tsx",
-    "src/a$b.ts",
-    ".gitignore",
-    "src/index.ts#L10-L20",
-    "src/index.ts:10-20",
-    "README.md",
-    "./scripts/run",
-    "src/file.ts(10,2)",
-    "/tmp/[route].tsx",
-    "file:///tmp/file.ts#L10-L20",
-  ]);
-  expect(
-    classifyAssistantFileLink("src/index.ts#L10-L20", { workspaceRoot: "/repo" }),
-  ).toMatchObject({ target: { path: "/repo/src/index.ts", lineStart: 10, lineEnd: 20 } });
-});
-
-it("lets the engine own code boundaries while classifying candidate values", async () => {
-  const source = [
-    "```ts\n`src/fenced.ts`\n```",
-    "`` src/app/[id].tsx `` and `  src/spaced.ts  `",
-    "``src/a`b.ts`` and `src/after.ts`",
-    "\\`src/escaped.ts` and `src/final.ts`",
-    "`\nsrc/newline.ts\n`",
-    "[`src/explicit.ts`](https://example.com)",
-  ].join("\n\n");
-  const prepared = prepareMarkdownSource(source, "/repo");
-  const tree = recognizeTextLinks(
-    await parseMarkdown(prepared.render(), { latexMath: false }),
-    prepared.linkRecognition.text,
-    prepared.linkRecognition.inlineCode,
-  );
-  const recognized: string[] = [];
-  function collect(node: ASTNode) {
-    if (node.type === "Link" && node.attributes?.recognizedLink === "true") {
-      recognized.push(String(node.attributes.url));
-    }
-    node.children?.forEach(collect);
-  }
-  collect(tree);
-  expect(recognized).toEqual([
-    "src/app/[id].tsx",
-    " src/spaced.ts ",
-    "src/a`b.ts",
-    "src/after.ts",
-    "src/escaped.ts",
-    "src/final.ts",
-    "src/newline.ts",
-  ]);
-});
-
-it("requires workspace context for relative inline paths and escapes literal regex characters", () => {
-  const source = "`src/app/[id].tsx` and `src/a+b.ts` and `README.md` and `/tmp/file.ts`";
-  const withoutWorkspace = prepareMarkdownSource(source).linkRecognition.inlineCode;
-  expect(withoutWorkspace.test("src/app/[id].tsx")).toBe(false);
-  expect(withoutWorkspace.test("README.md")).toBe(false);
-  expect(withoutWorkspace.test("/tmp/file.ts")).toBe(true);
-  const prepared = prepareMarkdownSource(source, "/repo");
-  const native = toNativeLinkRecognition(prepared.linkRecognition);
-  const pattern = new RegExp(native.inlineCode.pattern);
-  expect(pattern.test("src/app/[id].tsx")).toBe(true);
-  expect(pattern.test("src/a+b.ts")).toBe(true);
-  expect(pattern.test("src/app/i.tsx")).toBe(false);
-  expect(pattern.test("src/ab.ts")).toBe(false);
-});
-
 it("recognizes bare Unicode filenames and preserves inline-code URLs", () => {
  const prepared = prepareMarkdownSource("Read 说明.md, or `https://example.com`.");
  expect([..."说明.md,".matchAll(prepared.linkRecognition.text)].map(([text]) => text)).toEqual([
@@ -591,7 +436,7 @@ it.each([
  "×/÷",
  "２０２４/１０/１６",
 ])("leaves non-path tokens unlinked in prose and inline code: %s", (token) => {
-  const { linkRecognition } = prepareMarkdownSource(`Value ${token}, then \`${token}\`.`, "/repo");
+  const { linkRecognition } = prepareMarkdownSource(`Value ${token}, then continue.`);
  expect([...`Value ${token}, then continue.`.matchAll(linkRecognition.text)]).toEqual([]);
  expect(linkRecognition.inlineCode.test(token)).toBe(false);
 });
@@ -616,11 +461,12 @@ it.each([
  "123.ts",
  "FILE.TS",
  "https://example.com/path",
-])("recognizes complete paths and URLs in prose: %s", (token) => {
-  const { linkRecognition } = prepareMarkdownSource(`Open ${token} then \`${token}\`.`, "/repo");
+])("recognizes complete paths and URLs in prose and inline code: %s", (token) => {
+  const { linkRecognition } = prepareMarkdownSource(`Open ${token} then continue.`);
  expect(
    [...`Open ${token} then continue.`.matchAll(linkRecognition.text)].map(([text]) => text),
  ).toEqual([token]);
+  expect(linkRecognition.inlineCode.test(token)).toBe(true);
 });

 it.each([
@@ -631,13 +477,10 @@ it.each([
  "packages/app",
  "123/file",
  "src/123",
-])("leaves extensionless relative paths unlinked in prose and inline code: %s", (token) => {
-  const { linkRecognition } = prepareMarkdownSource(
-    `Compare ${token}, then \`${token}\`.`,
-    "/repo",
-  );
+])("requires stronger path intent in prose while preserving inline code: %s", (token) => {
+  const { linkRecognition } = prepareMarkdownSource(`Compare ${token}, then continue.`);
  expect([...`Compare ${token}, then continue.`.matchAll(linkRecognition.text)]).toEqual([]);
-  expect(linkRecognition.inlineCode.test(token)).toBe(false);
+  expect(linkRecognition.inlineCode.test(token)).toBe(true);
 });

 it("keeps prose and inline-code recognition enabled through the native regex adapter", () => {
@@ -1,4 +1,3 @@
-import { classifyAssistantFileLink } from "@/assistant-file-links";
 import { ASSISTANT_FILE_EXTENSIONS } from "@/assistant-file-links/extensions";
 import { normalizeMarkdownHtml } from "./html";
 import { gfmTable } from "micromark-extension-gfm-table";
@@ -6,7 +5,7 @@ import { gfmTableFromMarkdown } from "mdast-util-gfm-table";
 import type { AssistantFileLinkSource } from "@/assistant-file-links";
 import { decodeString } from "micromark-util-decode-string";
 import { fromMarkdown } from "mdast-util-from-markdown";
-import type { Link, Nodes, Paragraph, PhrasingContent, Root } from "mdast";
+import type { Link, Nodes, Root } from "mdast";

 // Keep this regex in the syntax shared by JavaScript, ICU and java.util.regex.
 // The Unicode flag makes Metro expand it to escapes rejected by native engines.
@@ -23,6 +22,7 @@ const SEPARATED_PATH = String.raw`${PATH_SEGMENT}(?:[\\/]${PATH_SEGMENT})+`;
 const FILE_NAME = String.raw`${PATH_SEGMENT}\.(?:${FILE_EXTENSIONS})`;
 // Bare prose paths need a known extension, a line suffix, or at least two separators.
 const PROSE_PATH = String.raw`(?:${PATH_PREFIX}${HAS_PATH_LETTER}${SEPARATED_PATH}|${HAS_PATH_LETTER}(?:${PATH_SEGMENT}(?:[\\/]${PATH_SEGMENT})*[\\/]${FILE_NAME}|${PATH_SEGMENT}(?:[\\/]${PATH_SEGMENT}){2,}|${SEPARATED_PATH}(?=:)))`;
+const INLINE_CODE_PATH = String.raw`${PATH_PREFIX}?${HAS_PATH_LETTER}${SEPARATED_PATH}`;

 function createFilePattern(path: string): RegExp {
  // The native adapter mistakes a literal + in lookbehind for a quantifier; use its hex escape.
@@ -33,46 +33,20 @@ function createFilePattern(path: string): RegExp {
 }

 const FILE_PATTERN = createFilePattern(PROSE_PATH);
-function linkMetadata(inlineCodePaths: ReadonlySet<string>) {
-  // The engine accepts regexes on both platforms. Classify complete code spans
-  // first, then pass literal matches rather than maintaining a second path grammar.
-  const alternatives = [...inlineCodePaths].map((path) =>
-    path.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"),
-  );
+const INLINE_CODE_FILE_PATTERN = createFilePattern(INLINE_CODE_PATH);
+
+function linkMetadata() {
  return {
    linkRecognition: {
      text: FILE_PATTERN,
      inlineCode: new RegExp(
-        String.raw`^(?:https?://[^\s<>]+${alternatives.length ? `|${alternatives.join("|")}` : ""})$`,
+        String.raw`^(?:${INLINE_CODE_FILE_PATTERN.source})(?:\(\d+(?:,\d+)?(?:-\d+(?:,\d+)?)?\)| lines? \d+(?:-\d+)?)?$`,
      ),
    },
    linkSource: markdownLinkSource,
  };
 }

-function collectInlineCodePaths(source: string, workspaceRoot?: string): ReadonlySet<string> {
-  const paths = new Set<string>();
-  const previousEnds = new Map<number, number>();
-  // Collect candidates between consecutive runs of equal length. The engine owns
-  // Markdown context (escapes, fences, authored links); extra candidates are harmless
-  // because recognition only applies to complete Code nodes. This avoids an AST
-  // parse on every streaming reveal, including updates inside long code fences.
-  for (const match of source.matchAll(/`+/g)) {
-    const length = match[0].length;
-    const previousEnd = previousEnds.get(length);
-    previousEnds.set(length, match.index + length);
-    if (previousEnd === undefined) continue;
-    let value = source.slice(previousEnd, match.index).replace(/\r\n?|\n/g, " ");
-    // CommonMark code spans replace line endings and strip one surrounding space.
-    if (value.startsWith(" ") && value.endsWith(" ") && /[^ ]/.test(value)) {
-      value = value.slice(1, -1);
-    }
-    const classification = classifyAssistantFileLink(value, { workspaceRoot });
-    if (classification && classification.kind !== "external") paths.add(value);
-  }
-  return paths;
-}
-
 export function markdownLinkSource(
  url: string,
  sourceType?: "markdown" | "text" | "inline-code",
@@ -116,7 +90,6 @@ export function prepareMarkdownSource(
      extensions: [gfmTable()],
      mdastExtensions: [gfmTableFromMarkdown()],
    }));
-  const metadata = linkMetadata(collectInlineCodePaths(source, workspaceRoot));
  const edits: { start: number; end: number; text: string }[] = [];
  if (
    !source.includes("![") &&
@@ -124,7 +97,7 @@ export function prepareMarkdownSource(
    !source.includes("&") &&
    !(workspaceRoot && source.includes("]("))
  ) {
-    return { images, ...metadata, render: () => source };
+    return { images, ...linkMetadata(), render: () => source };
  }

  const definitions = new Map<string, { url: string; title?: string | null }>();
@@ -157,50 +130,10 @@ export function prepareMarkdownSource(
        end,
      });
  }
-  // Line boundaries already turned into paragraph breaks, by offset of their newline.
-  const splitBoundaries = new Set<number>();
-  function isImageLike(node: PhrasingContent): boolean {
-    if (node.type === "image" || node.type === "imageReference") return true;
-    return (
-      (node.type === "link" || node.type === "linkReference") &&
-      node.children.length === 1 &&
-      isImageLike(node.children[0])
-    );
-  }
-  // An image alone on its line becomes its own paragraph, so every platform renders
-  // it as a block. The library only treats sole-child paragraph images as blocks;
-  // with hardSoftBreaks every newline is a break node, which made these inline.
-  function splitStandaloneImages(paragraph: Paragraph, start: number, end: number) {
-    for (const child of paragraph.children) {
-      const childStart = child.position?.start.offset;
-      const childEnd = child.position?.end.offset;
-      if (childStart === undefined || childEnd === undefined || !isImageLike(child)) continue;
-      const lineStart = source.lastIndexOf("\n", childStart - 1) + 1;
-      const newline = source.indexOf("\n", childEnd);
-      const lineEnd = newline === -1 ? source.length : newline;
-      const prefix = source.slice(lineStart, childStart);
-      const suffix = source.slice(childEnd, lineEnd);
-      const aloneBefore = childStart === start || /^[\s>]*$/.test(prefix);
-      const aloneAfter = /^\s*\\?$/.test(suffix);
-      if (!aloneBefore || !aloneAfter) continue;
-      // Continuation lines inside quotes and lists keep their quote markers on the blank line.
-      const blank = prefix.replace(/[^>]/g, " ").trimEnd();
-      const split = (boundary: number) => {
-        if (splitBoundaries.has(boundary)) return;
-        splitBoundaries.add(boundary);
-        // A trailing backslash was a hard break; at a paragraph end it would render literally.
-        const cut = source[boundary - 1] === "\\" ? boundary - 1 : boundary;
-        edits.push({ start: cut, end: boundary + 1, text: `\n${blank}\n` });
-      };
-      if (lineStart > start) split(lineStart - 1);
-      if (lineEnd < end) split(lineEnd);
-    }
-  }
  function visit(node: Nodes) {
    const start = node.position?.start.offset;
    const end = node.position?.end.offset;
    if (start !== undefined && end !== undefined) {
-      if (node.type === "paragraph") splitStandaloneImages(node, start, end);
      if (node.type === "link") {
        const title = workspaceHoverTitle(node, source.slice(start, end), workspaceRoot);
        if (title !== null)
@@ -233,7 +166,7 @@ export function prepareMarkdownSource(
  visit(getTree());
  return {
    images,
-    ...metadata,
+    ...linkMetadata(),
    render(
      urls: ReadonlyMap<string, string> = new Map(),
      unavailableImages: ReadonlySet<string> = new Set(),
@@ -1,9 +1,8 @@
 import { router, usePathname } from "expo-router";
 import { CalendarClock, History, Plus, Search } from "lucide-react-native";
-import { memo, useCallback, useMemo, useRef, type ComponentType, type ReactNode } from "react";
+import { memo, useCallback, useMemo, useRef, type ComponentType } from "react";
 import { useTranslation } from "react-i18next";
 import { View, type StyleProp, type ViewStyle } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
 import { SidebarHeaderRow } from "@/components/sidebar/sidebar-header-row";
 import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
 import { PluginSidebarItem } from "@/plugins/sidebar-items";
@@ -31,49 +30,37 @@ interface SidebarNavRowProps {
 interface SidebarNavRowsProps extends SidebarNavRowProps {
  /** Style for the group wrapper, which the sidebar owns. */
  style?: StyleProp<ViewStyle>;
-  /** Sits to the right of the first row, which shrinks to make room. */
-  firstRowTrailing?: ReactNode;
 }

 /**
 * Top-level sidebar navigation, ordered and filtered by the user's
 * `sidebarNavItems` preference. Renders nothing — not even the bordered group
- * wrapper — when every item is hidden and there is no `firstRowTrailing`.
+ * wrapper — when every item is hidden.
 */
-export function SidebarNavRows({ style, onBeforeNavigate, firstRowTrailing }: SidebarNavRowsProps) {
+export function SidebarNavRows({ style, onBeforeNavigate }: SidebarNavRowsProps) {
  const { items } = useSidebarNavItems("header");
  const visibleItems = useMemo(() => items.filter((item) => item.visible), [items]);
  const groupRef = useRef<View | null>(null);

-  if (visibleItems.length === 0 && !firstRowTrailing) return null;
-
-  const [firstRow, ...restRows] = visibleItems.map((item) => {
-    if (item.kind === "plugin") {
-      return (
-        <PluginSidebarItem
-          key={item.key}
-          group={item.group}
-          section="header"
-          fallbackAnchorRef={groupRef}
-          onBeforeNavigate={onBeforeNavigate}
-        />
-      );
-    }
-    const Row = BUILTIN_ROWS[item.id];
-    return <Row key={item.key} onBeforeNavigate={onBeforeNavigate} />;
-  });
+  if (visibleItems.length === 0) return null;

  return (
    <View ref={groupRef} collapsable={false} style={style}>
-      {firstRowTrailing ? (
-        <View style={styles.firstRow}>
-          <View style={styles.firstRowItem}>{firstRow}</View>
-          {firstRowTrailing}
-        </View>
-      ) : (
-        firstRow
-      )}
-      {restRows}
+      {visibleItems.map((item) => {
+        if (item.kind === "plugin") {
+          return (
+            <PluginSidebarItem
+              key={item.key}
+              group={item.group}
+              section="header"
+              fallbackAnchorRef={groupRef}
+              onBeforeNavigate={onBeforeNavigate}
+            />
+          );
+        }
+        const Row = BUILTIN_ROWS[item.id];
+        return <Row key={item.key} onBeforeNavigate={onBeforeNavigate} />;
+      })}
    </View>
  );
 }
@@ -192,14 +179,3 @@ const BUILTIN_ROWS: Record<BuiltinSidebarNavId, ComponentType<SidebarNavRowProps
  search: SidebarSearchRow,
  schedules: SidebarSchedulesRow,
 };
-
-const styles = StyleSheet.create({
-  firstRow: {
-    flexDirection: "row",
-    alignItems: "center",
-  },
-  firstRowItem: {
-    flex: 1,
-    minWidth: 0,
-  },
-});
@@ -1334,9 +1334,8 @@ export const ar: TranslationResources = {
    },
    fields: {
      project: "المشروع",
-      branch: "الفرع",
+      base: "الأساس",
      baseNotApplicable: "غير قابل للتطبيق",
-      host: "المضيف",
    },
    titlePlaceholder: "العنوان (اختياري)",
    errors: {
@@ -1342,9 +1342,8 @@ export const en = {
    },
    fields: {
      project: "Project",
-      branch: "Branch",
+      base: "Base",
      baseNotApplicable: "Not applicable",
-      host: "Host",
    },
    titlePlaceholder: "Title (optional)",
    errors: {
@@ -1370,9 +1370,8 @@ export const es: TranslationResources = {
    },
    fields: {
      project: "Proyecto",
-      branch: "Rama",
+      base: "Base",
      baseNotApplicable: "No aplicable",
-      host: "Host",
    },
    titlePlaceholder: "Título (opcional)",
    errors: {
@@ -1363,9 +1363,8 @@ export const fr: TranslationResources = {
    },
    fields: {
      project: "Projet",
-      branch: "Branche",
+      base: "Base",
      baseNotApplicable: "Non applicable",
-      host: "Hôte",
    },
    titlePlaceholder: "Titre (facultatif)",
    errors: {
@@ -1348,9 +1348,8 @@ export const ja: TranslationResources = {
    },
    fields: {
      project: "プロジェクト",
-      branch: "ブランチ",
+      base: "ベース",
      baseNotApplicable: "該当なし",
-      host: "ホスト",
    },
    titlePlaceholder: "タイトル（任意）",
    errors: {
@@ -1341,9 +1341,8 @@ export const ko: TranslationResources = {
    },
    fields: {
      project: "프로젝트",
-      branch: "브랜치",
+      base: "기준",
      baseNotApplicable: "해당 없음",
-      host: "호스트",
    },
    titlePlaceholder: "제목(선택 사항)",
    errors: {
@@ -1360,9 +1360,8 @@ export const ptBR: TranslationResources = {
    },
    fields: {
      project: "Projeto",
-      branch: "Branch",
+      base: "Base",
      baseNotApplicable: "Não aplicável",
-      host: "Host",
    },
    titlePlaceholder: "Título (opcional)",
    errors: {
@@ -1352,9 +1352,8 @@ export const ru: TranslationResources = {
    },
    fields: {
      project: "Проект",
-      branch: "Ветка",
+      base: "Базовая ветка",
      baseNotApplicable: "Неприменимо",
-      host: "Хост",
    },
    titlePlaceholder: "Заголовок (необязательно)",
    errors: {
@@ -1323,9 +1323,8 @@ export const zhCN: TranslationResources = {
    },
    fields: {
      project: "项目",
-      branch: "分支",
+      base: "基线",
      baseNotApplicable: "不适用",
-      host: "主机",
    },
    titlePlaceholder: "标题（可选）",
    errors: {
@@ -1,8 +1,8 @@
 import { useCallback, useMemo, useState, type ReactElement } from "react";
-import { Text, View } from "react-native";
+import { Pressable, Text, View } from "react-native";
 import { useTranslation } from "react-i18next";
 import { useRouter } from "expo-router";
-import { MessageCircle, SquareTerminal } from "lucide-react-native";
+import { ChevronDown, MessageCircle, SquareTerminal } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import {
  DropdownMenu,
@@ -30,17 +30,14 @@ import {
  resolveLaunchProfile,
  terminalLaunchTarget,
  type LaunchTarget,
-} from "@/new-workspace-launch/target";
-import {
-  FieldTriggerContent,
-  useFieldTriggerStyle,
-  type FieldTriggerVariant,
-} from "./field-trigger";
+} from "./target";

 const ThemedMessageCircle = withUnistyles(MessageCircle);
 const ThemedSquareTerminal = withUnistyles(SquareTerminal);
+const ThemedChevronDown = withUnistyles(ChevronDown);

 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+const extraMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundExtraMuted });

 const chatIcon = <ThemedMessageCircle size={ICON_SIZE.sm} uniProps={mutedColorMapping} />;
 const blankTerminalIcon = <ThemedSquareTerminal size={ICON_SIZE.sm} uniProps={mutedColorMapping} />;
@@ -86,7 +83,12 @@ export interface LaunchControlProps {
  onChange: (target: LaunchTarget) => void;
  profiles: readonly TerminalProfile[];
  disabled?: boolean;
-  variant: FieldTriggerVariant;
+  /**
+   * The meta row's shared badge style. Passed in rather than redeclared so this
+   * trigger stays pixel-identical to the project, host, and branch triggers it
+   * sits beside; a local copy drifts the moment one of them changes.
+   */
+  badgePressableStyle: React.ComponentProps<typeof Pressable>["style"];
 }

 function TriggerIcon({
@@ -106,8 +108,8 @@ function TriggerIcon({
 }

 /**
- * The form control choosing what New workspace submits to: the chat agent,
- * or a terminal. One trigger shaped like every other field trigger, opening
+ * The meta-row control choosing what New workspace submits to: the chat agent,
+ * or a terminal. One trigger shaped like every other chip on that row, opening
 * a menu whose Chat and Terminal groups are what keep a terminal profile named
 * "Codex" from reading as a chat Codex agent.
 */
@@ -117,18 +119,13 @@ export function LaunchControl({
  onChange,
  profiles,
  disabled = false,
-  variant,
+  badgePressableStyle,
 }: LaunchControlProps) {
  const { t } = useTranslation();
  const router = useRouter();
  const [open, setOpen] = useState(false);

  const selectedProfile = useMemo(() => resolveLaunchProfile(target, profiles), [target, profiles]);
-  const triggerStyle = useFieldTriggerStyle(variant, disabled);
-  const triggerIcon = useMemo(
-    () => <TriggerIcon target={target} profile={selectedProfile} />,
-    [selectedProfile, target],
-  );

  // A profile's own name and logo say nothing about where it runs: a row
  // reading "(openai logo) Codex" is indistinguishable from a chat Codex agent.
@@ -152,26 +149,32 @@ export function LaunchControl({

  return (
    <DropdownMenu open={open} onOpenChange={setOpen} compactMode="sheet">
+      {/* The trigger is the Pressable itself, styled by the meta row's shared
+          badge style, so it lands pixel-identical to the project, host, and
+          branch chips it sits beside. */}
      {/* MenuTrigger is not a forwardRef component and pins its own ref, so the
          tooltip anchors to a wrapping View instead. Suppressed while the menu
          is open so the two surfaces never overlap. */}
-      <Tooltip delayDuration={300} enabledOnDesktop={!open && variant === "badge"}>
+      <Tooltip delayDuration={300} enabledOnDesktop={!open}>
        <TooltipTrigger asChild>
          <View>
            <DropdownMenuTrigger
              testID="new-workspace-launch-trigger"
              disabled={disabled}
-              style={triggerStyle}
+              style={badgePressableStyle}
              accessibilityRole="button"
              accessibilityLabel={t("newWorkspace.tooltips.launch")}
            >
-              <FieldTriggerContent
-                variant={variant}
-                label={t("newWorkspace.launch.title")}
-                icon={triggerIcon}
-                value={triggerLabel}
-                detail={selectedProfile?.name}
-              />
+              <View style={styles.iconBox}>
+                <TriggerIcon target={target} profile={selectedProfile} />
+              </View>
+              <Text style={styles.label} numberOfLines={1}>
+                {triggerLabel}
+                {selectedProfile ? (
+                  <Text style={styles.profileName}> {selectedProfile.name}</Text>
+                ) : null}
+              </Text>
+              <ThemedChevronDown size={ICON_SIZE.sm} uniProps={extraMutedColorMapping} />
            </DropdownMenuTrigger>
          </View>
        </TooltipTrigger>
@@ -229,10 +232,27 @@ export function LaunchControl({
 }

 const styles = StyleSheet.create((theme) => ({
+  iconBox: {
+    width: theme.iconSize.md,
+    height: theme.iconSize.md,
+    alignItems: "center",
+    justifyContent: "center",
+    flexShrink: 0,
+  },
+  label: {
+    minWidth: 0,
+    fontSize: theme.fontSize.base,
+    color: theme.colors.foregroundMuted,
+    flexShrink: 1,
+  },
  tooltipText: {
    fontSize: theme.fontSize.base,
    color: theme.colors.popoverForeground,
  },
+  profileName: {
+    fontSize: theme.fontSize.base,
+    color: theme.colors.foregroundExtraMuted,
+  },
  command: {
    fontFamily: theme.fontFamily.mono,
    fontSize: theme.fontSize.sm,
@@ -1207,60 +1207,6 @@ describe("DirectorySync session readiness", () => {
    directory.dispose();
  });

-  it.each(["projects", "workspaces"] as const)(
-    "requests projects and workspaces together and commits once when %s responds first",
-    async (firstResponse) => {
-      const serverId = `parallel-directory-${firstResponse}`;
-      const { client, directory } = createDirectory(serverId);
-      const store = useSessionStore.getState();
-      store.initializeSession(serverId, client as unknown as DaemonClient, 1);
-      store.updateSessionServerInfo(serverId, {
-        serverId,
-        hostname: null,
-        version: "test",
-        features: { workspaceMultiplicity: true, projectList: true },
-      });
-      const releaseProjects = client.holdProjectFetch();
-      const releaseWorkspaces = client.holdWorkspaceFetch();
-      const project = {
-        projectId: "parallel-project",
-        projectDisplayName: "Project baseline",
-        projectRootPath: "/repo/parallel",
-        projectKind: "git" as const,
-      };
-      const projects: ProjectListResult = { requestId: "projects", projects: [project] };
-      const workspaces: WorkspaceFetchResult = {
-        requestId: "workspaces",
-        entries: [createWorkspaceEntry("parallel-workspace")],
-        emptyProjects: [{ ...project, projectDisplayName: "Newer workspace overlay" }],
-        pageInfo: { hasMore: false, nextCursor: null, prevCursor: null },
-      };
-      const refresh = directory.refreshWorkspaces();
-      try {
-        await expect.poll(() => client.listProjectsCalls).toBe(1);
-        await expect.poll(() => client.fetchWorkspacesCalls).toBe(1);
-        if (firstResponse === "projects") releaseProjects(projects);
-        else releaseWorkspaces(workspaces);
-        await new Promise<void>((resolve) => setTimeout(resolve, 0));
-        expect(useSessionStore.getState().sessions[serverId].workspaces.size).toBe(0);
-        expect(useSessionStore.getState().sessions[serverId].projects.size).toBe(0);
-        releaseProjects(projects);
-        releaseWorkspaces(workspaces);
-        await refresh;
-        const session = useSessionStore.getState().sessions[serverId];
-        expect(session.workspaces.has("parallel-workspace")).toBe(true);
-        expect(session.projects.get(project.projectId)?.projectDisplayName).toBe(
-          "Newer workspace overlay",
-        );
-      } finally {
-        releaseProjects(projects);
-        releaseWorkspaces(workspaces);
-        await refresh;
-        directory.dispose();
-      }
-    },
-  );
-
  it("keeps the accepted baseline when an old connection finishes its workspace request", async () => {
    const serverId = "superseded-workspace-baseline";
    const { client, directory } = createDirectory(serverId);
@@ -563,20 +563,16 @@ export class DirectorySync {
      const serverInfo = useSessionStore.getState().sessions[this.serverId]?.serverInfo;
      const supportsProjectList = serverInfo?.features?.projectList === true;
      const supportsDirectorySync = serverInfo?.features?.directorySync === true;
-      const projectsReady = supportsProjectList
-        ? this.fetchProjectSnapshot(client, source, transaction, supportsDirectorySync)
-        : Promise.resolve();
-      await Promise.all([
-        projectsReady,
-        this.fetchWorkspaceSnapshot(
-          client,
-          source,
-          transaction,
-          input?.subscribe === true,
-          supportsDirectorySync,
-          projectsReady,
-        ),
-      ]);
+      if (supportsProjectList) {
+        await this.fetchProjectSnapshot(client, source, transaction, supportsDirectorySync);
+      }
+      await this.fetchWorkspaceSnapshot(
+        client,
+        source,
+        transaction,
+        input?.subscribe === true,
+        supportsDirectorySync,
+      );
      if (!supportsProjectList) {
        this.buildLegacyProjectSnapshot(transaction.snapshot);
        (transaction.snapshot.syncModes ??= {}).projects =
@@ -596,7 +592,6 @@ export class DirectorySync {
    transaction: DirectoryTransaction<WorkspaceRefreshSnapshot, WorkspaceDirectoryDelta>,
    initialSubscribe: boolean,
    supportsDirectorySync: boolean,
-    projectsReady: Promise<void>,
  ): Promise<void> {
    let cursor: string | null = null;
    let subscribe = initialSubscribe;
@@ -623,9 +618,6 @@ export class DirectorySync {
        });
        payload = await subscription.ready;
      } else payload = await client.fetchWorkspaces(query);
-      // Fetch both directories together, but apply the project baseline before the
-      // workspace page's empty-project overlays, regardless of response order.
-      await projectsReady;
      this.assertWorkspaceTransactionCurrent(client, source, transaction);
      applyWorkspaceSnapshotPage(transaction.snapshot, payload, cursor === null);
      if (!payload.pageInfo.hasMore || !payload.pageInfo.nextCursor) return;
@@ -1,217 +0,0 @@
-import { forwardRef, useCallback, type ReactElement, type ReactNode } from "react";
-import { Text, View, type PressableStateCallbackType } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { ChevronDown } from "lucide-react-native";
-import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
-import { CONTROL_HEIGHTS } from "@/components/ui/control-geometry";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
-
-/**
- * `badge` is the desktop meta row: a borderless pill that names its field in a tooltip.
- * `field` is the compact form: a full-width filled box with the field's label inside, above the
- * value, so the whole field is one tap target.
- */
-export type FieldTriggerVariant = "badge" | "field";
-
-const ThemedChevronDown = withUnistyles(ChevronDown);
-const extraMutedColor = (theme: Theme) => ({ color: theme.colors.foregroundExtraMuted });
-
-// Extra-muted: the chevron is an affordance, not information, and sits behind its label.
-function Chevron(): ReactElement {
-  return (
-    <View style={styles.chevron}>
-      <ThemedChevronDown size={ICON_SIZE.sm} uniProps={extraMutedColor} />
-    </View>
-  );
-}
-
-const chevron = <Chevron />;
-
-export interface FieldTriggerContentProps {
-  variant: FieldTriggerVariant;
-  /** The field's name, shown inside a `field`. */
-  label: string;
-  icon: ReactNode;
-  value: string;
-  /** Secondary text after the value, such as a terminal profile's name. */
-  detail?: string;
-}
-
-export function FieldTriggerContent({
-  variant,
-  label,
-  icon,
-  value,
-  detail,
-}: FieldTriggerContentProps): ReactElement {
-  const valueLine = (
-    <>
-      <View style={styles.iconBox}>{icon}</View>
-      <Text style={variant === "field" ? styles.fieldValue : styles.value} numberOfLines={1}>
-        {value}
-        {detail ? <Text style={styles.detail}> {detail}</Text> : null}
-      </Text>
-    </>
-  );
-  if (variant === "badge") {
-    return (
-      <>
-        {valueLine}
-        {chevron}
-      </>
-    );
-  }
-  return (
-    <>
-      <View style={styles.fieldBody}>
-        <Text style={styles.fieldLabel} numberOfLines={1}>
-          {label}
-        </Text>
-        <View style={styles.fieldValueLine}>{valueLine}</View>
-      </View>
-      {chevron}
-    </>
-  );
-}
-
-/** Pressable style for a field trigger, for triggers that bring their own Pressable. */
-export function useFieldTriggerStyle(variant: FieldTriggerVariant, disabled: boolean) {
-  return useCallback(
-    (state: PressableStateCallbackType & { hovered?: boolean }) => [
-      variant === "field" ? styles.field : styles.badge,
-      !disabled && Boolean(state.hovered) && styles.highlighted,
-      !disabled &&
-        state.pressed &&
-        (variant === "field" ? styles.highlighted : styles.badgePressed),
-      disabled && styles.disabled,
-    ],
-    [disabled, variant],
-  );
-}
-
-export interface FieldTriggerProps extends FieldTriggerContentProps {
-  /** What a screen reader announces; defaults to `label`. */
-  accessibilityLabel?: string;
-  onPress: () => void;
-  disabled?: boolean;
-  /** Desktop hover hint; badges only, since a field shows its label. */
-  tooltip?: string;
-  testID?: string;
-}
-
-/** A field trigger that anchors a Combobox. */
-export const FieldTrigger = forwardRef<View, FieldTriggerProps>(function FieldTrigger(
-  { accessibilityLabel, onPress, disabled = false, tooltip, testID, ...content },
-  ref,
-): ReactElement {
-  const style = useFieldTriggerStyle(content.variant, disabled);
-  const trigger = (
-    <ComboboxTrigger
-      ref={ref}
-      chevron={null}
-      block={content.variant === "field"}
-      testID={testID}
-      onPress={onPress}
-      disabled={disabled}
-      style={style}
-      accessibilityRole="button"
-      accessibilityLabel={accessibilityLabel ?? content.label}
-    >
-      <FieldTriggerContent {...content} />
-    </ComboboxTrigger>
-  );
-  if (content.variant === "field" || !tooltip) return trigger;
-  return (
-    <Tooltip>
-      <TooltipTrigger asChild triggerRefProp="ref">
-        {trigger}
-      </TooltipTrigger>
-      <TooltipContent side="top" align="center" offset={8}>
-        <Text style={styles.tooltipText}>{tooltip}</Text>
-      </TooltipContent>
-    </Tooltip>
-  );
-});
-
-// Height of a badge. The desktop row sizes from it.
-export const FIELD_BADGE_HEIGHT = CONTROL_HEIGHTS.tight;
-// Height of a compact field: label line plus value line. The compact stack reserves rows from it.
-export const FIELD_HEIGHT = 56;
-
-const styles = StyleSheet.create((theme) => ({
-  badge: {
-    flexDirection: "row",
-    alignItems: "center",
-    height: FIELD_BADGE_HEIGHT,
-    maxWidth: 240,
-    overflow: "hidden",
-    paddingHorizontal: theme.spacing[2],
-    borderRadius: theme.borderRadius["2xl"],
-    gap: theme.spacing[1],
-  },
-  field: {
-    flexDirection: "row",
-    alignItems: "center",
-    height: FIELD_HEIGHT,
-    paddingLeft: theme.spacing[3],
-    paddingRight: theme.spacing[3],
-    borderRadius: theme.borderRadius.xl,
-    backgroundColor: theme.colors.surface1,
-    gap: theme.spacing[2],
-  },
-  highlighted: {
-    backgroundColor: theme.colors.surface2,
-  },
-  badgePressed: {
-    backgroundColor: theme.colors.surface0,
-  },
-  disabled: {
-    opacity: 0.6,
-  },
-  // Optical: the chevron's ink sits high in its box.
-  chevron: {
-    flexShrink: 0,
-    transform: [{ translateY: 1 }],
-  },
-  iconBox: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
-    alignItems: "center",
-    justifyContent: "center",
-    flexShrink: 0,
-  },
-  value: {
-    minWidth: 0,
-    flexShrink: 1,
-    fontSize: theme.fontSize.base,
-    color: theme.colors.foregroundMuted,
-  },
-  fieldBody: {
-    flex: 1,
-    minWidth: 0,
-    gap: theme.spacing[0.5],
-  },
-  fieldLabel: {
-    fontSize: theme.fontSize.sm,
-    color: theme.colors.foregroundMuted,
-  },
-  fieldValueLine: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[1.5],
-  },
-  fieldValue: {
-    minWidth: 0,
-    flexShrink: 1,
-    fontSize: theme.fontSize.base,
-    color: theme.colors.foreground,
-  },
-  detail: {
-    color: theme.colors.foregroundExtraMuted,
-  },
-  tooltipText: {
-    fontSize: theme.fontSize.base,
-    color: theme.colors.popoverForeground,
-  },
-}));
@@ -1,49 +0,0 @@
-import type { ReactElement } from "react";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { Folder, FolderPlus, GitBranch, GitPullRequest } from "lucide-react-native";
-import { ProjectIconView } from "@/components/project-icon-view";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
-import { projectIconPlaceholderLabelFromDisplayName } from "@/utils/project-display-name";
-
-const ThemedFolder = withUnistyles(Folder);
-const ThemedFolderPlus = withUnistyles(FolderPlus);
-const ThemedGitBranch = withUnistyles(GitBranch);
-const ThemedGitPullRequest = withUnistyles(GitPullRequest);
-const mutedColor = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-
-export const folderIcon = <ThemedFolder size={ICON_SIZE.sm} uniProps={mutedColor} />;
-export const addProjectIcon = <ThemedFolderPlus size={ICON_SIZE.sm} uniProps={mutedColor} />;
-export const branchIcon = <ThemedGitBranch size={ICON_SIZE.sm} uniProps={mutedColor} />;
-export const pullRequestIcon = <ThemedGitPullRequest size={ICON_SIZE.sm} uniProps={mutedColor} />;
-
-// Single uppercase initial inside an iconSize.md (16px) square — below the smallest font-size
-// token, so it stays a literal sized to the box.
-const PROJECT_ICON_FALLBACK_FONT_SIZE = 10;
-
-export function ProjectIcon({
-  projectViewKey,
-  projectName,
-  iconDataUri,
-}: {
-  projectViewKey: string;
-  projectName: string;
-  iconDataUri: string | null;
-}): ReactElement {
-  const placeholderLabel = projectIconPlaceholderLabelFromDisplayName(projectName);
-  return (
-    <ProjectIconView
-      iconDataUri={iconDataUri}
-      initial={placeholderLabel.charAt(0).toUpperCase() || "?"}
-      projectViewKey={projectViewKey}
-      size={ICON_SIZE.md}
-      textStyle={styles.fallbackText}
-    />
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  fallbackText: {
-    fontSize: PROJECT_ICON_FALLBACK_FONT_SIZE,
-    fontWeight: theme.fontWeight.semibold,
-  },
-}));
@@ -1,392 +0,0 @@
-import { useCallback, useMemo, type ReactElement, type ReactNode, type RefObject } from "react";
-import { View } from "react-native";
-import { useTranslation } from "react-i18next";
-import { StyleSheet } from "react-native-unistyles";
-import type { TerminalProfile } from "@getpaseo/protocol/messages";
-import { Combobox, type ComboboxOption, type ComboboxProps } from "@/components/ui/combobox";
-import { HostStatusDot } from "@/components/host-status-dot";
-import { HostPicker } from "@/components/hosts/host-picker";
-import type { LaunchTarget } from "@/new-workspace-launch/target";
-import type { HostProjectListItem } from "@/projects/host-projects";
-import type { HostProfile } from "@/types/host-connection";
-import type { PickerItem } from "../../new-workspace-picker-item";
-import {
-  FIELD_BADGE_HEIGHT,
-  FIELD_HEIGHT,
-  FieldTrigger,
-  type FieldTriggerVariant,
-} from "./field-trigger";
-import { branchIcon, folderIcon, ProjectIcon, pullRequestIcon } from "./icons";
-import { LaunchControl } from "./launch-control";
-import { AddProjectOption, IsolationOption, ProjectOption, RefOption } from "./options";
-
-type Isolation = "local" | "worktree";
-type RenderOption = NonNullable<ComboboxProps["renderOption"]>;
-
-interface PickerControl {
-  anchorRef: RefObject<View | null>;
-  open: () => void;
-  openState: boolean;
-  onOpenChange: (open: boolean) => void;
-}
-
-export interface NewWorkspaceFormProps {
-  isCompact: boolean;
-  isPending: boolean;
-  project: PickerControl & {
-    options: ComboboxOption[];
-    projectByOptionId: Map<string, HostProjectListItem>;
-    iconDataByProjectViewKey: Map<string, string | null>;
-    selectedProject: HostProjectListItem | null;
-    selectedOptionId: string;
-    triggerLabel: string;
-    selectedServerId: string;
-    /** COMPAT(workspaceMultiplicity): without it only worktree-capable projects are selectable. */
-    supportsWorkspaceMultiplicity: boolean;
-    onSelect: (id: string) => void;
-    onAddProject: () => void;
-  };
-  host: PickerControl & {
-    allHosts: HostProfile[];
-    selectedServerId: string;
-    onSelect: (id: string) => void;
-    onAddHost: () => void;
-  };
-  isolation: PickerControl & {
-    effectiveIsolation: Isolation;
-    canCreateWorktree: boolean;
-    onSelect: (isolation: Isolation) => void;
-  };
-  base: PickerControl & {
-    selectedSourceDirectory: string | null;
-    selectedItem: PickerItem | null;
-    triggerLabel: string;
-    options: ComboboxOption[];
-    itemById: Map<string, PickerItem>;
-    selectedOptionId: string;
-    onSelect: (id: string) => void;
-    setSearchQuery: (query: string) => void;
-    emptyText: string;
-    showRefPicker: boolean;
-  };
-  launch: {
-    serverId: string;
-    target: LaunchTarget;
-    onChange: (target: LaunchTarget) => void;
-    profiles: readonly TerminalProfile[];
-    disabled: boolean;
-  };
-}
-
-function hostOptionTestID(serverId: string): string {
-  return `new-workspace-host-picker-option-${serverId}`;
-}
-
-function isProjectSelectable(
-  project: HostProjectListItem,
-  supportsWorkspaceMultiplicity: boolean,
-): boolean {
-  return (
-    supportsWorkspaceMultiplicity ||
-    project.hosts.some((host) => host.worktreeSupport !== "unsupported")
-  );
-}
-
-function useProjectPicker(
-  project: NewWorkspaceFormProps["project"],
-  isPending: boolean,
-): { renderOption: RenderOption; footer: ReactNode } {
-  const { projectByOptionId, iconDataByProjectViewKey, selectedServerId } = project;
-  const { supportsWorkspaceMultiplicity, onAddProject } = project;
-  const renderOption = useCallback<RenderOption>(
-    (row) => {
-      const item = projectByOptionId.get(row.option.id);
-      return (
-        <ProjectOption
-          {...row}
-          project={item}
-          iconDataUri={item ? (iconDataByProjectViewKey.get(item.viewKey) ?? null) : null}
-          selectedServerId={selectedServerId}
-          disabled={isPending || !item || !isProjectSelectable(item, supportsWorkspaceMultiplicity)}
-        />
-      );
-    },
-    [
-      iconDataByProjectViewKey,
-      isPending,
-      projectByOptionId,
-      selectedServerId,
-      supportsWorkspaceMultiplicity,
-    ],
-  );
-  const footer = useMemo(() => <AddProjectOption onPress={onAddProject} />, [onAddProject]);
-  return { renderOption, footer };
-}
-
-function useIsolationPicker(
-  isolation: NewWorkspaceFormProps["isolation"],
-  isPending: boolean,
-): { options: ComboboxOption[]; onSelect: (id: string) => void; renderOption: RenderOption } {
-  const { t } = useTranslation();
-  const { canCreateWorktree, onSelect, onOpenChange } = isolation;
-  // "New worktree" is omitted entirely (not disabled) when the project isn't a
-  // git checkout, since worktree isolation is impossible there.
-  const options = useMemo<ComboboxOption[]>(() => {
-    const local = { id: "local", label: t("newWorkspace.isolation.local") };
-    if (!canCreateWorktree) return [local];
-    return [local, { id: "worktree", label: t("newWorkspace.isolation.worktree") }];
-  }, [canCreateWorktree, t]);
-  const handleSelect = useCallback(
-    (id: string) => {
-      onSelect(id === "worktree" ? "worktree" : "local");
-      onOpenChange(false);
-    },
-    [onOpenChange, onSelect],
-  );
-  const renderOption = useCallback<RenderOption>(
-    (row) => <IsolationOption {...row} disabled={isPending} />,
-    [isPending],
-  );
-  return { options, onSelect: handleSelect, renderOption };
-}
-
-function useRefRenderOption(itemById: Map<string, PickerItem>, isPending: boolean): RenderOption {
-  return useCallback<RenderOption>(
-    (row) => <RefOption {...row} item={itemById.get(row.option.id)} disabled={isPending} />,
-    [isPending, itemById],
-  );
-}
-
-/**
- * The New workspace setup fields, one trigger per field, each opening its picker. Compact: a stack
- * of full-width fields with the label inside. Desktop: one meta row of badges. Either way, a field
- * that does not apply to the selected project is left out, and Host only shows with a second host.
- */
-export function useNewWorkspaceForm(props: NewWorkspaceFormProps): ReactElement {
-  const { t } = useTranslation();
-  const { isCompact, isPending, project, host, isolation, base, launch } = props;
-  const variant: FieldTriggerVariant = isCompact ? "field" : "badge";
-  const projectPicker = useProjectPicker(project, isPending);
-  const isolationPicker = useIsolationPicker(isolation, isPending);
-  const renderRefOption = useRefRenderOption(base.itemById, isPending);
-
-  const showHost = host.allHosts.length > 1;
-  const selectedHostLabel =
-    host.allHosts.find((h) => h.serverId === host.selectedServerId)?.label ?? "Host";
-  const selectedProject = project.selectedProject;
-  const selectedProjectIconUri = selectedProject
-    ? (project.iconDataByProjectViewKey.get(selectedProject.viewKey) ?? null)
-    : null;
-  const projectIcon = useMemo(
-    () =>
-      selectedProject ? (
-        <ProjectIcon
-          projectViewKey={selectedProject.viewKey}
-          projectName={selectedProject.projectName}
-          iconDataUri={selectedProjectIconUri}
-        />
-      ) : (
-        folderIcon
-      ),
-    [selectedProject, selectedProjectIconUri],
-  );
-  const hostIcon = useMemo(
-    () => <HostStatusDot serverId={host.selectedServerId} />,
-    [host.selectedServerId],
-  );
-  const isWorktree = isolation.effectiveIsolation === "worktree";
-  const isolationValue = isWorktree
-    ? t("newWorkspace.isolation.worktree")
-    : t("newWorkspace.isolation.local");
-  const refIcon = base.selectedItem?.kind === "github-pr" ? pullRequestIcon : branchIcon;
-
-  const projectField = (
-    <FieldTrigger
-      ref={project.anchorRef}
-      variant={variant}
-      label={t("newWorkspace.fields.project")}
-      accessibilityLabel="Workspace project"
-      tooltip={t("newWorkspace.tooltips.project")}
-      icon={projectIcon}
-      value={project.triggerLabel}
-      onPress={project.open}
-      disabled={isPending}
-      testID="new-workspace-project-picker-trigger"
-    />
-  );
-  const hostField = showHost ? (
-    <HostPicker
-      hosts={host.allHosts}
-      value={host.selectedServerId}
-      onSelect={host.onSelect}
-      open={host.openState}
-      onOpenChange={host.onOpenChange}
-      anchorRef={host.anchorRef}
-      includeAddHost={isCompact}
-      onAddHost={host.onAddHost}
-      searchable={false}
-      title={t("newWorkspace.fields.host")}
-      desktopPlacement="bottom-start"
-      desktopMinWidth={200}
-      hostOptionTestID={hostOptionTestID}
-    >
-      <FieldTrigger
-        ref={host.anchorRef}
-        variant={variant}
-        label={t("newWorkspace.fields.host")}
-        tooltip={t("newWorkspace.tooltips.host")}
-        icon={hostIcon}
-        value={selectedHostLabel}
-        onPress={host.open}
-        disabled={isPending}
-        testID="host-picker-trigger"
-      />
-    </HostPicker>
-  ) : null;
-  const isolationField = isolation.canCreateWorktree ? (
-    <FieldTrigger
-      ref={isolation.anchorRef}
-      variant={variant}
-      label={t("newWorkspace.isolation.label")}
-      accessibilityLabel="Workspace isolation"
-      tooltip={t("newWorkspace.tooltips.isolation")}
-      icon={isWorktree ? branchIcon : folderIcon}
-      value={isolationValue}
-      onPress={isolation.open}
-      disabled={isPending}
-      testID="workspace-create-isolation-trigger"
-    />
-  ) : null;
-  const baseField = base.showRefPicker ? (
-    <FieldTrigger
-      ref={base.anchorRef}
-      variant={variant}
-      label={t("newWorkspace.fields.branch")}
-      accessibilityLabel={t("newWorkspace.refPicker.startingRef")}
-      tooltip={t("newWorkspace.tooltips.startingRef")}
-      icon={refIcon}
-      value={base.triggerLabel}
-      onPress={base.open}
-      disabled={isPending || !base.selectedSourceDirectory}
-      testID="new-workspace-ref-picker-trigger"
-    />
-  ) : null;
-  const launchField = (
-    <LaunchControl
-      variant={variant}
-      serverId={launch.serverId}
-      target={launch.target}
-      onChange={launch.onChange}
-      profiles={launch.profiles}
-      disabled={launch.disabled}
-    />
-  );
-
-  const pickers = (
-    <>
-      <Combobox
-        options={project.options}
-        value={project.selectedOptionId}
-        onSelect={project.onSelect}
-        searchable
-        searchPlaceholder="Search projects"
-        title={t("newWorkspace.fields.project")}
-        open={project.openState}
-        onOpenChange={project.onOpenChange}
-        desktopPlacement="bottom-start"
-        desktopMinWidth={360}
-        anchorRef={project.anchorRef}
-        emptyText="No projects available."
-        renderOption={projectPicker.renderOption}
-        footer={projectPicker.footer}
-      />
-      <Combobox
-        options={isolationPicker.options}
-        value={isolation.effectiveIsolation}
-        onSelect={isolationPicker.onSelect}
-        title={t("newWorkspace.isolation.label")}
-        open={isolation.openState}
-        onOpenChange={isolation.onOpenChange}
-        desktopPlacement="bottom-start"
-        anchorRef={isolation.anchorRef}
-        renderOption={isolationPicker.renderOption}
-      />
-      <Combobox
-        options={base.options}
-        value={base.selectedOptionId}
-        onSelect={base.onSelect}
-        searchable
-        searchPlaceholder={t("newWorkspace.refPicker.searchPlaceholder")}
-        title={t("newWorkspace.refPicker.title")}
-        open={base.openState}
-        onOpenChange={base.onOpenChange}
-        onSearchQueryChange={base.setSearchQuery}
-        desktopPlacement="bottom-start"
-        anchorRef={base.anchorRef}
-        emptyText={base.emptyText}
-        renderOption={renderRefOption}
-      />
-    </>
-  );
-
-  if (isCompact) {
-    return (
-      <View testID="new-workspace-ref-picker-row" style={styles.compactStack}>
-        {projectField}
-        {hostField}
-        {isolationField}
-        {baseField}
-        {launchField}
-        {/* Isolation and Base come and go with the project; their rows stay reserved so the
-            stack keeps one height and nothing above the composer jumps. */}
-        {isolationField ? null : <View style={styles.reservedField} pointerEvents="none" />}
-        {baseField ? null : <View style={styles.reservedField} pointerEvents="none" />}
-        {pickers}
-      </View>
-    );
-  }
-
-  return (
-    <View testID="new-workspace-ref-picker-row" style={styles.desktopRow} pointerEvents="box-none">
-      <View style={styles.desktopControl}>{projectField}</View>
-      {hostField ? <View style={styles.desktopControl}>{hostField}</View> : null}
-      {isolationField ? <View style={styles.desktopControl}>{isolationField}</View> : null}
-      {baseField ? <View style={styles.desktopControl}>{baseField}</View> : null}
-      <View style={styles.launchSpacer} pointerEvents="none" />
-      {launchField}
-      {pickers}
-    </View>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  compactStack: {
-    marginBottom: theme.spacing[4],
-    paddingHorizontal: theme.spacing[4],
-    gap: theme.spacing[2],
-  },
-  reservedField: {
-    height: FIELD_HEIGHT,
-  },
-  desktopRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    minHeight: FIELD_BADGE_HEIGHT,
-    // Matches the gap between the composer and the Import session pill below it.
-    marginBottom: theme.spacing[4],
-    // The badge adds its own left padding; offset it so the project icon's left
-    // edge lands exactly on the "New workspace" title's left edge. The trailing
-    // inset mirrors it so the launch chip stops on the composer's inner content
-    // rather than running out to the composer's border.
-    paddingHorizontal: theme.spacing[4],
-    gap: theme.spacing[2],
-  },
-  desktopControl: {
-    minWidth: 0,
-    flexShrink: 1,
-  },
-  // Pushes the launch control to the trailing edge of the desktop meta row.
-  launchSpacer: {
-    flex: 1,
-  },
-}));
@@ -1,166 +0,0 @@
-import { useMemo, type ReactElement } from "react";
-import { Text, View } from "react-native";
-import { useTranslation } from "react-i18next";
-import { StyleSheet } from "react-native-unistyles";
-import { ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
-import { Shortcut } from "@/components/ui/shortcut";
-import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
-import { getHostProjectSourceDirectory, type HostProjectListItem } from "@/projects/host-projects";
-import { pickerItemLabel, type PickerItem } from "../../new-workspace-picker-item";
-import { addProjectIcon, branchIcon, folderIcon, ProjectIcon, pullRequestIcon } from "./icons";
-
-interface OptionRowState {
-  option: ComboboxOption;
-  selected: boolean;
-  active: boolean;
-  onPress: () => void;
-}
-
-function IconBox({ children }: { children: ReactElement }): ReactElement {
-  return <View style={styles.iconBox}>{children}</View>;
-}
-
-export function ProjectOption({
-  option,
-  selected,
-  active,
-  onPress,
-  project,
-  iconDataUri,
-  selectedServerId,
-  disabled,
-}: OptionRowState & {
-  project: HostProjectListItem | undefined;
-  iconDataUri: string | null;
-  selectedServerId: string;
-  disabled: boolean;
-}): ReactElement {
-  const leadingSlot = useMemo(
-    () =>
-      project ? (
-        <IconBox>
-          <ProjectIcon
-            projectViewKey={project.viewKey}
-            projectName={project.projectName}
-            iconDataUri={iconDataUri}
-          />
-        </IconBox>
-      ) : undefined,
-    [iconDataUri, project],
-  );
-  if (!project) return <View key={option.id} />;
-  return (
-    <ComboboxItem
-      testID={`new-workspace-project-picker-option-${project.viewKey}`}
-      label={project.projectName}
-      description={
-        getHostProjectSourceDirectory(project, selectedServerId) ?? project.iconWorkingDir
-      }
-      selected={selected}
-      active={active}
-      disabled={disabled}
-      onPress={onPress}
-      leadingSlot={leadingSlot}
-    />
-  );
-}
-
-export function AddProjectOption({ onPress }: { onPress: () => void }): ReactElement {
-  const { t } = useTranslation();
-  const openProjectKeys = useShortcutKeys("new-agent");
-  const shortcut = useMemo(
-    () => (openProjectKeys ? <Shortcut chord={openProjectKeys} /> : null),
-    [openProjectKeys],
-  );
-  return (
-    <ComboboxItem
-      testID="new-workspace-project-picker-add-project"
-      label={t("sidebar.actions.addProject")}
-      onPress={onPress}
-      leadingSlot={addProjectIcon}
-      trailingSlot={shortcut}
-    />
-  );
-}
-
-const worktreeLeading = <IconBox>{branchIcon}</IconBox>;
-const localLeading = <IconBox>{folderIcon}</IconBox>;
-
-export function IsolationOption({
-  option,
-  selected,
-  active,
-  onPress,
-  disabled,
-}: OptionRowState & { disabled: boolean }): ReactElement {
-  return (
-    <ComboboxItem
-      testID={`workspace-create-isolation-${option.id}`}
-      label={option.label}
-      selected={selected}
-      active={active}
-      disabled={disabled}
-      onPress={onPress}
-      leadingSlot={option.id === "worktree" ? worktreeLeading : localLeading}
-    />
-  );
-}
-
-const branchLeading = <IconBox>{branchIcon}</IconBox>;
-const pullRequestLeading = <IconBox>{pullRequestIcon}</IconBox>;
-
-export function RefOption({
-  option,
-  selected,
-  active,
-  onPress,
-  item,
-  disabled,
-}: OptionRowState & { item: PickerItem | undefined; disabled: boolean }): ReactElement {
-  const { t } = useTranslation();
-  const divergenceLabel = item?.kind === "branch" ? item.divergenceLabel : undefined;
-  const trailingSlot = useMemo(
-    () =>
-      divergenceLabel ? <Text style={styles.divergenceLabel}>{divergenceLabel}</Text> : undefined,
-    [divergenceLabel],
-  );
-  if (!item) return <View key={option.id} />;
-
-  const isBranch = item.kind === "branch";
-  return (
-    <ComboboxItem
-      testID={
-        isBranch
-          ? `new-workspace-ref-picker-branch-${item.name}`
-          : `new-workspace-ref-picker-pr-${item.item.number}`
-      }
-      label={pickerItemLabel(item)}
-      description={
-        !isBranch && item.item.baseRefName
-          ? t("newWorkspace.refPicker.intoBase", { baseRef: item.item.baseRefName })
-          : undefined
-      }
-      selected={selected}
-      active={active}
-      disabled={disabled}
-      onPress={onPress}
-      leadingSlot={isBranch ? branchLeading : pullRequestLeading}
-      trailingSlot={trailingSlot}
-      accessibilityLabel={isBranch ? item.accessibilityLabel : undefined}
-    />
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  iconBox: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
-    alignItems: "center",
-    justifyContent: "center",
-  },
-  divergenceLabel: {
-    fontSize: theme.fontSize.sm,
-    color: theme.colors.foregroundMuted,
-    fontVariant: ["tabular-nums"],
-  },
-}));
@@ -5,7 +5,7 @@ import { StyleSheet } from "react-native-unistyles";
 import { Button } from "@/components/ui/button";

 /**
- * The new workspace screen's way into Import session: a ghost button in the header on compact
+ * The new workspace screen's way into Import session: a ghost button at the top on compact
 * layouts, an outlined pill under the composer otherwise. Both are muted until hovered.
 */
 export function ImportSessionButton({
@@ -17,7 +17,7 @@ export function ImportSessionButton({
 }) {
  const { t } = useTranslation();
  return (
-    <View style={compact ? null : styles.wide}>
+    <View style={compact ? styles.compact : styles.wide}>
      <Button
        // Ghost for its muted text that turns foreground on hover; the pill adds the outline.
        variant="ghost"
@@ -34,6 +34,9 @@ export function ImportSessionButton({
 }

 const styles = StyleSheet.create((theme) => ({
+  compact: {
+    alignItems: "flex-start",
+  },
  // The composer sits spacing[4] in from the dock and leaves spacing[4] below itself; the pill's
  // border lines up with the composer's border.
  wide: {
@@ -41,93 +41,6 @@ function rowWithText(
 }

 describe("native terminal selection", () => {
-  it.each([
-    { startCol: 1, endCol: 8, expected: "한글 문장" },
-    { startCol: 3, endCol: 8, expected: "글 문장" },
-    { startCol: 1, endCol: 1, expected: "한" },
-    { startCol: 0, endCol: 0, expected: "한" },
-    { startCol: 0, endCol: 1, expected: "한" },
-    { startCol: 4, endCol: 6, expected: " 문" },
-  ])(
-    "copies complete wide characters for selected columns $startCol through $endCol",
-    async ({ startCol, endCol, expected }) => {
-      const terminal = createNativeHeadlessTerminal({ rows: 3, cols: 30 });
-      const copied: string[] = [];
-      try {
-        await terminal.write("한글 문장");
-        const bounds = terminal.getBufferBounds();
-        const selection = createTerminalSelectionModel();
-        selection.begin({
-          coordinate: { row: bounds.cursorRow, col: endCol },
-          bounds,
-        });
-        selection.update({
-          coordinate: { row: bounds.cursorRow, col: startCol },
-          bounds,
-        });
-
-        await copyTerminalSelection({
-          terminal,
-          selection: selection.getSnapshot().range,
-          clipboard: {
-            writeText: async (text) => {
-              copied.push(text);
-            },
-          },
-        });
-
-        expect(copied).toEqual([expected]);
-      } finally {
-        terminal.dispose();
-      }
-    },
-  );
-
-  it("copies Korean output without adding spaces for continuation cells", async () => {
-    const terminal = createNativeHeadlessTerminal({ rows: 3, cols: 30 });
-    const copied: string[] = [];
-    try {
-      await terminal.write("한글 문장");
-      const bounds = terminal.getBufferBounds();
-      await copyTerminalSelection({
-        terminal,
-        selection: {
-          start: { row: bounds.cursorRow, col: 0 },
-          end: { row: bounds.cursorRow, col: bounds.cursorCol - 1 },
-          coordinateEpoch: bounds.coordinateEpoch,
-        },
-        clipboard: {
-          writeText: async (text) => {
-            copied.push(text);
-          },
-        },
-      });
-      expect(copied).toEqual(["한글 문장"]);
-    } finally {
-      terminal.dispose();
-    }
-  });
-
-  it("copies Korean text and real spaces without wide-character continuation spaces", async () => {
-    const terminal = createNativeHeadlessTerminal({ rows: 3, cols: 30 });
-    try {
-      await terminal.write("한글 문장 | 성공");
-      const bounds = terminal.getBufferBounds();
-      expect(
-        extractTerminalSelectedText({
-          terminal,
-          selection: {
-            start: { row: bounds.cursorRow, col: 0 },
-            end: { row: bounds.cursorRow, col: bounds.cursorCol - 1 },
-            coordinateEpoch: bounds.coordinateEpoch,
-          },
-        }),
-      ).toBe("한글 문장 | 성공");
-    } finally {
-      terminal.dispose();
-    }
-  });
-
  it("expands a long-press coordinate to the whole terminal word", async () => {
    const terminal = createNativeHeadlessTerminal({ rows: 4, cols: 32, scrollbackLines: 20 });
    await terminal.write("before PASEO_TARGET after\r\n");
@@ -324,17 +324,10 @@ export function extractTerminalSelectedText(input: TerminalSelectedTextInput): s
    const cells = window.rows[offset] ?? [];
    const startsOnThisRow = row === selection.start.row;
    const endsOnThisRow = row === selection.end.row;
-    let startCol = Math.max(0, startsOnThisRow ? selection.start.col : 0);
-    // Selecting either half highlights the whole wide character, so copy its leading cell too.
-    if (startCol > 0 && cells[startCol]?.width === 0) {
-      startCol -= 1;
-    }
+    const startCol = startsOnThisRow ? selection.start.col : 0;
    const endCol = endsOnThisRow ? selection.end.col : cells.length - 1;
-    const selectedCells = cells.slice(startCol, Math.max(0, endCol) + 1);
-    const line = selectedCells
-      .filter((cell) => cell.width !== 0)
-      .map((cell) => cell.char)
-      .join("");
+    const selectedCells = cells.slice(Math.max(0, startCol), Math.max(0, endCol) + 1);
+    const line = selectedCells.map((cell) => cell.char || " ").join("");
    if (offset > 0 && window.wrappedRows[offset] !== true) {
      text += "\n";
    }
@@ -77,90 +77,6 @@ function applySynced(agentId: string, seq: number): void {
 afterEach(() => useSessionStore.getState().clearSession(SERVER_ID));

 describe("viewed timeline persistence", () => {
-  it("keeps one complete reply when live chunks arrive before a cached chat catches up", async () => {
-    useSessionStore.getState().initializeSession(SERVER_ID, null);
-    const partial = "Paragraph 1. Paragraph 2.";
-    const complete = `${partial} Paragraph 3. END`;
-    const owner = createOwner({
-      readTimeline: async () => ({
-        agentId: AGENT_ID,
-        items: [{ ...item("reply-1", partial, 4), messageId: "reply-1" }],
-        range: { epoch: "epoch-1", startSeq: 1, endSeq: 4 },
-        hasOlder: false,
-      }),
-      commitTimeline: () => undefined,
-    });
-    try {
-      owner.replaceVisibleAgentIds("test", [AGENT_ID]);
-      await expect
-        .poll(
-          () =>
-            selectAgentTimelineState(useSessionStore.getState().sessions[SERVER_ID], AGENT_ID)
-              .status,
-        )
-        .toBe("painted");
-      owner.enqueueStreamEvent(AGENT_ID, {
-        event: {
-          type: "timeline",
-          provider: "codex",
-          item: { type: "assistant_message", text: " Paragraph 3.", messageId: "reply-1" },
-        } as AgentStreamEventPayload,
-        seq: 5,
-        epoch: "epoch-1",
-        timestamp: new Date("2026-08-26T10:00:01.000Z"),
-      });
-      owner.flushStreamAgent(AGENT_ID);
-      owner.applyTimelineResponse({
-        requestId: "resume",
-        agentId: AGENT_ID,
-        agent: null,
-        direction: "after",
-        projection: "projected",
-        reset: false,
-        epoch: "epoch-1",
-        window: { minSeq: 1, maxSeq: 6, nextSeq: 7 },
-        startCursor: { epoch: "epoch-1", seq: 5 },
-        endCursor: { epoch: "epoch-1", seq: 6 },
-        entries: [
-          {
-            provider: "codex",
-            item: { type: "assistant_message", text: complete, messageId: "reply-1" },
-            timestamp: "2026-08-26T10:00:02.000Z",
-            seqStart: 2,
-            seqEnd: 6,
-            sourceSeqRanges: [{ startSeq: 2, endSeq: 6 }],
-            collapsed: ["assistant_merge"],
-          },
-        ],
-        error: null,
-        hasNewer: false,
-        hasOlder: false,
-        staleCursor: false,
-        gap: false,
-      });
-      const replyTexts = () => {
-        const session = useSessionStore.getState().sessions[SERVER_ID];
-        return [
-          ...(session?.agentStreamTail.get(AGENT_ID) ?? []),
-          ...(session?.agentStreamHead.get(AGENT_ID) ?? []),
-        ]
-          .filter((entry) => entry.kind === "assistant_message")
-          .map((entry) => entry.text);
-      };
-      expect.soft(replyTexts()).toEqual([complete]);
-      owner.enqueueStreamEvent(AGENT_ID, {
-        event: { type: "turn_completed", provider: "codex" } as AgentStreamEventPayload,
-        seq: 7,
-        epoch: "epoch-1",
-        timestamp: new Date("2026-08-26T10:00:03.000Z"),
-      });
-      owner.flushStreamAgent(AGENT_ID);
-      expect.soft(replyTexts()).toEqual([complete]);
-    } finally {
-      owner.dispose();
-    }
-  });
-
  it("shares an in-flight cache preparation with the viewed owner", async () => {
    useSessionStore.getState().initializeSession(SERVER_ID, null);
    let release!: (value: CachedTimeline) => void;
@@ -811,7 +811,7 @@ function reconcileOverlappingProjectedAssistant(params: {
  };

  const headMatch = findMatch(params.head);
-  const tailMatch = findMatch(params.tail);
+  const tailMatch = headMatch ? null : findMatch(params.tail);
  const match = headMatch ?? tailMatch;
  if (!match) {
    return { tail: params.tail, head: params.head, reconciled: false };
@@ -833,20 +833,8 @@ function reconcileOverlappingProjectedAssistant(params: {
  };

  if (headMatch) {
-    const tailCursor = tailMatch?.current.timelineCursor;
-    const replacesCachedPrefix =
-      tailMatch !== null &&
-      tailCursor?.epoch === params.epoch &&
-      unit.sourceSeqRanges.some(
-        (range) => range.startSeq <= tailCursor.seq && tailCursor.seq <= range.endSeq,
-      );
    return {
-      // Live chunks can arrive before catch-up while their cached prefix is still painted.
-      // The projected reply owns both copies; keeping the prefix would duplicate it and
-      // cause completion to discard the updated head as an already-committed item.
-      tail: replacesCachedPrefix
-        ? [...params.tail.slice(0, tailMatch.index), ...params.tail.slice(tailMatch.index + 1)]
-        : params.tail,
+      tail: params.tail,
      head: replaceMatch(params.head, headMatch.index),
      reconciled: true,
    };
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/cli",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "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.12.0-beta.2",
-    "@getpaseo/protocol": "0.12.0-beta.2",
-    "@getpaseo/server": "0.12.0-beta.2",
+    "@getpaseo/client": "0.12.0-beta.1",
+    "@getpaseo/protocol": "0.12.0-beta.1",
+    "@getpaseo/server": "0.12.0-beta.1",
    "chalk": "^5.3.0",
    "commander": "^12.0.0",
    "mime-types": "^2.1.35",
@@ -2,22 +2,6 @@ import { describe, expect, it } from "vitest";
 import { createCli } from "./cli.js";

 describe("canonical CLI surface", () => {
-  it.each(["send", "agent send"])("%s accepts an explicit behavior override", async (path) => {
-    const cli = createCli();
-    const owner =
-      path === "send" ? cli : cli.commands.find((command) => command.name() === "agent")!;
-    const send = owner.commands.find((command) => command.name() === "send")!;
-    send.action(() => {});
-    await send.parseAsync(["target", "message", "--behavior", "interrupt"], { from: "user" });
-    expect(send.opts().behavior).toBe("interrupt");
-    await send.parseAsync(["target", "message", "--behavior", "steer"], { from: "user" });
-    expect(send.opts().behavior).toBe("steer");
-    send.exitOverride().configureOutput({ writeErr: () => {} });
-    await expect(
-      send.parseAsync(["target", "message", "--behavior", "queue"], { from: "user" }),
-    ).rejects.toThrow();
-  });
-
  it("offers daemon host selection as a global option", () => {
    expect(createCli().helpInformation()).toContain("--host <host>");
  });
@@ -1,5 +1,4 @@
-import { type Command, Option } from "commander";
-import type { ActiveTurnBehavior } from "@getpaseo/protocol/messages";
+import { type Command } from "commander";
 import { collectMultiple } from "../../utils/command-options.js";
 import { connectToDaemon } from "../../utils/client.js";
 import type {
@@ -29,7 +28,6 @@ export const agentSendSchema: OutputSchema<AgentSendResult> = {
 };

 export interface AgentSendOptions extends CommandOptions {
-  behavior?: ActiveTurnBehavior;
  wait?: boolean;
  image?: string[];
  prompt?: string;
@@ -44,12 +42,6 @@ export function addSendOptions(cmd: Command): Command {
    .option("--prompt <text>", "Provide the message inline as a flag")
    .option("--prompt-file <path>", "Read the message from a UTF-8 text file")
    .option("--image <path>", "Attach image(s) to the message", collectMultiple, [])
-    .addOption(
-      new Option(
-        "--behavior <behavior>",
-        "Active-turn behavior (agent default: steer; otherwise: interrupt)",
-      ).choices(["interrupt", "steer"]),
-    )
    .option("--no-wait", "Return immediately without waiting for completion");
 }

@@ -199,12 +191,10 @@ export async function runSendCommand(
    const images =
      options.image && options.image.length > 0 ? await readImageFiles(options.image) : undefined;

-    const sourceAgentId = process.env.PASEO_AGENT_ID?.trim() || undefined;
    // Send the message
    await client.sendAgentMessage(agentIdArg, promptInput, {
      images,
-      sourceAgentId,
-      activeTurnBehavior: options.behavior ?? (sourceAgentId ? "steer" : "interrupt"),
+      sourceAgentId: process.env.PASEO_AGENT_ID?.trim() || undefined,
    });

    // If --no-wait, return immediately
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/client",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "description": "Paseo client SDK package",
  "files": [
    "dist",
@@ -39,8 +39,8 @@
    "test": "vitest run"
  },
  "dependencies": {
-    "@getpaseo/protocol": "0.12.0-beta.2",
-    "@getpaseo/relay": "0.12.0-beta.2",
+    "@getpaseo/protocol": "0.12.0-beta.1",
+    "@getpaseo/relay": "0.12.0-beta.1",
    "zod": "^4.4.3"
  },
  "devDependencies": {
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/desktop",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "private": true,
  "description": "Paseo desktop app (Electron wrapper)",
  "homepage": "https://paseo.sh",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "description": "Native module for two way audio streaming",
  "keywords": [
    "ExpoTwoWayAudio",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/highlight",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "files": [
    "dist",
    "!dist/**/*.map",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/plugin",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "description": "Paseo plugin SDK package",
  "files": [
    "dist",
@@ -70,8 +70,8 @@
    "use-sync-external-store": "^1.6.0"
  },
  "devDependencies": {
-    "@getpaseo/client": "0.12.0-beta.2",
-    "@getpaseo/protocol": "0.12.0-beta.2",
+    "@getpaseo/client": "0.12.0-beta.1",
+    "@getpaseo/protocol": "0.12.0-beta.1",
    "@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.12.0-beta.2",
-    "@getpaseo/protocol": "0.12.0-beta.2",
+    "@getpaseo/client": "0.12.0-beta.1",
+    "@getpaseo/protocol": "0.12.0-beta.1",
    "react": "~19.1.0",
    "react-native": ">=0.81.5",
    "zod": "^4.4.3"
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/protocol",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "description": "Paseo shared protocol schemas and wire types",
  "files": [
    "dist",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/relay",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "description": "Paseo relay for bridging daemon and client connections",
  "files": [
    "dist",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/server",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "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.12.0-beta.2",
-    "@getpaseo/highlight": "0.12.0-beta.2",
-    "@getpaseo/plugin": "0.12.0-beta.2",
-    "@getpaseo/protocol": "0.12.0-beta.2",
-    "@getpaseo/relay": "0.12.0-beta.2",
+    "@getpaseo/client": "0.12.0-beta.1",
+    "@getpaseo/highlight": "0.12.0-beta.1",
+    "@getpaseo/plugin": "0.12.0-beta.1",
+    "@getpaseo/protocol": "0.12.0-beta.1",
+    "@getpaseo/relay": "0.12.0-beta.1",
    "@isaacs/ttlcache": "^2.1.4",
    "@modelcontextprotocol/sdk": "1.29.0",
    "@opencode-ai/sdk": "1.14.46",
@@ -0,0 +1,157 @@
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import pino from "pino";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { createTestLogger } from "../../test-utils/test-logger.js";
+import { AgentManager } from "./agent-manager.js";
+import { PiRpcAgentClient } from "./providers/pi/agent.js";
+import { FakePi } from "./providers/pi/test-utils/fake-pi.js";
+
+const AGENT_ID = "00000000-0000-4000-8000-000000000001";
+async function drainSessionEvents(): Promise<void> {
+  for (let index = 0; index < 10_000; index++) await Promise.resolve();
+}
+async function waitFor(condition: () => boolean): Promise<void> {
+  for (let attempt = 0; attempt < 250; attempt++) {
+    if (condition()) return;
+    await new Promise((resolve) => setTimeout(resolve, 20));
+  }
+  throw new Error("Timed out waiting for Pi subagent output");
+}
+afterEach(() => vi.useRealTimers());
+describe("provider subagent lifecycle ownership", () => {
+  test(
+    "a delayed parent turn end preserves a Pi child until its provider settles it",
+    { timeout: 15_000 },
+    async () => {
+      // Run the real Pi client and adapter with an injected runtime.
+      const pi = new FakePi();
+      const client = new PiRpcAgentClient({
+        logger: pino({ level: "silent" }),
+        runtime: pi,
+        // The injected runtime owns execution; use an existing executable for the real availability
+        // probe so this test does not depend on a Pi installation or replace a client method.
+        runtimeSettings: { command: { mode: "replace", argv: [process.execPath] } },
+      });
+      const workdir = mkdtempSync(join(tmpdir(), "agent-manager-provider-subagent-poll-"));
+      const manager = new AgentManager({
+        clients: { pi: client },
+        idFactory: () => AGENT_ID,
+        logger: createTestLogger(),
+      });
+      try {
+        await manager.createAgent({ provider: "pi", cwd: workdir }, AGENT_ID, {
+          workspaceId: undefined,
+        });
+        const piSession = pi.latestSession();
+        // An async spawn whose status directory never appears: every poll tick is a miss.
+        piSession.emit({
+          type: "tool_execution_start",
+          toolCallId: "call-1",
+          toolName: "subagent",
+          args: { agent: "scout", task: "Inspect", async: true },
+        });
+        piSession.emit({
+          type: "tool_execution_end",
+          toolCallId: "call-1",
+          toolName: "subagent",
+          result: {
+            details: {
+              mode: "single",
+              runId: "run-1",
+              asyncId: "run-1",
+              asyncDir: join(workdir, "gone"),
+              results: [],
+            },
+          },
+        });
+        const row = () => manager.getProviderSubagent(AGENT_ID, "call-1");
+        await waitFor(() => row()?.status === "running");
+
+        // Model delayed delivery of the parent turn end, with no provider cancellation.
+        // Only Date moves: the adapter's real polling interval has not expired its miss budget.
+        vi.useFakeTimers({ toFake: ["Date"] });
+        vi.setSystemTime(new Date(Date.now() + 60_000));
+        piSession.emit({ type: "agent_start" });
+        piSession.emit({ type: "agent_end" });
+        await drainSessionEvents();
+        expect(row()?.status).toBe("running");
+
+        // The provider's completion notice, rather than elapsed time in the manager, settles it.
+        piSession.emit({
+          type: "message_end",
+          message: {
+            role: "custom",
+            customType: "subagent-notify",
+            content: `Background task completed: **scout**\nRetention-managed async directory: ${join(workdir, "gone")}`,
+            display: true,
+          },
+        });
+        await drainSessionEvents();
+        expect(row()?.status).toBe("completed");
+      } finally {
+        try {
+          await manager.closeAgent(AGENT_ID);
+        } catch {
+          // A createAgent failure leaves nothing to close; the workdir cleanup must still run.
+        } finally {
+          rmSync(workdir, { recursive: true, force: true });
+        }
+      }
+    },
+  );
+
+  test("history replay preserves the async status supplied by Pi", async () => {
+    const pi = new FakePi();
+    const client = new PiRpcAgentClient({
+      logger: pino({ level: "silent" }),
+      runtime: pi,
+      // The injected runtime owns execution; use an existing executable for the real availability
+      // probe so this test does not depend on a Pi installation or replace a client method.
+      runtimeSettings: { command: { mode: "replace", argv: [process.execPath] } },
+    });
+    const workdir = mkdtempSync(join(tmpdir(), "agent-manager-provider-subagent-poll-"));
+    const manager = new AgentManager({
+      clients: { pi: client },
+      idFactory: () => AGENT_ID,
+      logger: createTestLogger(),
+    });
+    try {
+      await manager.createAgent({ provider: "pi", cwd: workdir }, AGENT_ID, {
+        workspaceId: undefined,
+      });
+      pi.latestSession().messages = [
+        {
+          role: "assistant",
+          content: [
+            {
+              type: "toolCall",
+              id: "call-replay",
+              name: "subagent",
+              arguments: { workflowScript: "return await runs.all([]);", async: true },
+            },
+          ],
+        },
+        {
+          role: "toolResult",
+          toolCallId: "call-replay",
+          toolName: "subagent",
+          content: [],
+          details: {
+            mode: "workflow",
+            runId: "run-replay",
+            asyncId: "run-replay",
+            asyncDir: join(workdir, "gone"),
+            results: [],
+          },
+        },
+      ];
+      await manager.hydrateTimelineFromProvider(AGENT_ID, { force: true });
+      expect(manager.getProviderSubagent(AGENT_ID, "call-replay")?.status).toBe("running");
+    } finally {
+      await manager.closeAgent(AGENT_ID);
+      rmSync(workdir, { recursive: true, force: true });
+    }
+  });
+});
@@ -402,8 +402,6 @@ export interface SetupFinishNotificationParams {
  childAgentId: string;
  callerAgentId: string;
  requireParentOwnership?: boolean;
-  /** Retain pre-dispatch outcomes only when dispatch keeps the existing turn. */
-  dispatchResult?: Promise<PromptDispatchDisposition | false>;
  /** A replacement must observe its new start, not the displaced running snapshot. */
  waitForTurnStart?: boolean;
  logger: Logger;
@@ -468,17 +466,10 @@ interface NotifySafelyOptions {
  permissionRequest?: AgentPermissionRequest;
 }

-// Pending follow-ups coexist until acknowledgement. A successful dispatch replaces
-// every earlier observation for the caller/child pair; a failure removes only itself.
-interface ArmedFinishNotification {
-  stop(): void;
-  supersedeWhen(accepted: Promise<boolean>): void;
-}
-
-const armedFinishNotifications = new WeakMap<
-  AgentManager,
-  Map<string, Set<ArmedFinishNotification>>
->();
+// A caller waits on a child through one armed notification. Arming again, such as a
+// follow-up prompt while the child still runs, replaces the earlier one so the child's
+// next finish reaches the caller once.
+const armedFinishNotifications = new WeakMap<AgentManager, Map<string, () => void>>();

 export function setupFinishNotification(params: SetupFinishNotificationParams): () => void {
  const {
@@ -500,49 +491,15 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
  const armedByManager = armedFinishNotifications.get(agentManager) ?? new Map();
  armedFinishNotifications.set(agentManager, armedByManager);
  const armedKey = JSON.stringify([childAgentId, callerAgentId]);
-  const registrations = armedByManager.get(armedKey) ?? new Set<ArmedFinishNotification>();
-  armedByManager.set(armedKey, registrations);
-  const previous = [...registrations];
-  let superseded = Promise.resolve(false);
-  let dispatchPending = Boolean(params.dispatchResult);
-  const registration: ArmedFinishNotification = {
-    stop,
-    supersedeWhen(accepted) {
-      superseded = superseded.then(
-        async (alreadySuperseded) => alreadySuperseded || (await accepted),
-      );
-    },
-  };
-  registrations.add(registration);
-  if (params.dispatchResult) {
-    const dispatchAccepted = params.dispatchResult.then((result) => result !== false);
-    for (const observer of previous) observer.supersedeWhen(dispatchAccepted);
-    void params.dispatchResult.then((accepted) => {
-      dispatchPending = false;
-      if (accepted) {
-        for (const observer of previous) observer.stop();
-        if (stopped || accepted === "turn_started") stop();
-      } else {
-        stop();
-      }
-      return undefined;
-    });
-  } else {
-    for (const observer of previous) {
-      observer.supersedeWhen(Promise.resolve(true));
-      observer.stop();
-    }
-  }
+  armedByManager.get(armedKey)?.();
+  armedByManager.set(armedKey, stop);

  function stop(): void {
+    if (stopped) return;
    stopped = true;
    unsubscribe?.();
-    // Pending observations remain visible to overlapping sends until acknowledgement.
-    if (!dispatchPending) {
-      registrations.delete(registration);
-      if (registrations.size === 0 && armedByManager.get(armedKey) === registrations) {
-        armedByManager.delete(armedKey);
-      }
+    if (armedByManager.get(armedKey) === stop) {
+      armedByManager.delete(armedKey);
    }
  }

@@ -550,11 +507,6 @@ export function setupFinishNotification(params: SetupFinishNotificationParams):
    reason: FinishNotificationReason,
    permissionRequest?: AgentPermissionRequest,
  ): Promise<void> {
-    if (params.dispatchResult) {
-      const result = await params.dispatchResult;
-      if (result === false || result === "turn_started") return;
-    }
-    if (await superseded) return;
    const callerRecord = await agentStorage.get(callerAgentId);
    if (callerRecord?.archivedAt) {
      return;
@@ -1,4 +1,3 @@
-import { setupFinishNotification, type PromptDispatchDisposition } from "./agent-prompt.js";
 import { parseAgentMessage } from "./agent-messages/index.js";
 import { execFileSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
@@ -243,7 +242,6 @@ function buildAgentManagerSpies() {
    appendTimelineItem: vi.fn().mockResolvedValue(undefined),
    emitLiveTimelineItem: vi.fn().mockResolvedValue(undefined),
    hasInFlightRun: vi.fn().mockReturnValue(false),
-    steerOrReplaceActiveTurn: async () => ({ status: "inactive" as const }),
    tryRunOutOfBand: vi.fn().mockReturnValue(false),
    subscribe: vi.fn().mockReturnValue(() => {}),
    streamAgent: vi.fn(() => (async function* noop() {})()),
@@ -3862,9 +3860,6 @@ const HELD_TURN_CAPABILITIES = {
 } as const;

 interface HeldTurnOptions {
-  finishDuringSteer?: boolean;
-  rejectSteer?: boolean;
-  steerResult?: "accepted" | "unavailable";
  /** Run the whole turn before the turn-start request returns. */
  finishTurnsDuringStart?: boolean;
 }
@@ -3877,7 +3872,6 @@ class HeldTurnAgentSession implements AgentSession {
  readonly capabilities = HELD_TURN_CAPABILITIES;
  readonly id = randomUUID();
  readonly prompts: string[] = [];
-  readonly steeredPrompts: AgentPromptInput[] = [];
  private readonly subscribers = new Set<(event: AgentStreamEvent) => void>();
  private activeTurnId: string | null = null;
  private turnStartGate: Promise<void> | null = null;
@@ -3910,14 +3904,6 @@ class HeldTurnAgentSession implements AgentSession {
    return prompt === "/side-command" ? { run: async () => {} } : null;
  }

-  async steerActiveTurn(prompt: AgentPromptInput) {
-    const status = this.options.steerResult ?? "unavailable";
-    if (status === "accepted") this.steeredPrompts.push(prompt);
-    if (status === "accepted" && this.options.finishDuringSteer) this.finishTurn();
-    if (this.options.rejectSteer) throw new Error("Steer rejected");
-    return { status };
-  }
-
  async startTurn(prompt: AgentPromptInput): Promise<{ turnId: string }> {
    this.prompts.push(typeof prompt === "string" ? prompt : JSON.stringify(prompt));
    await this.turnStartGate;
@@ -4064,295 +4050,6 @@ class HeldTurnAgentClient implements AgentClient {
 }

 describe("send_agent_prompt MCP tool", () => {
-  it.each([
-    { agentScoped: true, behavior: undefined, available: true, steered: true },
-    { agentScoped: true, behavior: "interrupt", available: true, steered: false },
-    { agentScoped: true, behavior: "steer", available: true, steered: true },
-    { agentScoped: false, behavior: undefined, available: true, steered: false },
-    { agentScoped: false, behavior: "steer", available: true, steered: true },
-    { agentScoped: true, behavior: undefined, available: false, steered: false },
-  ] as const)(
-    "dispatches behavior $behavior for agent-scoped=$agentScoped, steering available=$available",
-    async ({ agentScoped, behavior, available, steered }) => {
-      const workdir = await mkdtemp(join(tmpdir(), "mcp-send-behavior-"));
-      const storage = new AgentStorage(join(workdir, "agents"), logger);
-      const client = new HeldTurnAgentClient("codex", true, {
-        steerResult: available ? "accepted" : "unavailable",
-      });
-      const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
-      try {
-        const parent = await manager.createAgent(
-          { provider: "codex", cwd: existingCwd },
-          undefined,
-          { workspaceId: "wks_parent" },
-        );
-        const child = await manager.createAgent(
-          { provider: "codex", cwd: existingCwd },
-          undefined,
-          { workspaceId: "wks_parent" },
-        );
-        const server = await createAgentMcpServer({
-          agentManager: manager,
-          agentStorage: storage,
-          callerAgentId: agentScoped ? parent.id : undefined,
-          providerSnapshotManager: createOpenCodeManager().manager,
-          logger,
-        });
-        const tool = registeredTool(server, "send_agent_prompt");
-        await invokeToolWithParsedInput(tool, {
-          agentId: child.id,
-          prompt: "Original work",
-          notifyOnFinish: false,
-        });
-        const originalTurn = manager.getAgent(child.id)!.activeTurnId;
-        const response = await invokeToolWithParsedInput(tool, {
-          agentId: child.id,
-          prompt: "New message",
-          notifyOnFinish: false,
-          ...(behavior ? { activeTurnBehavior: behavior } : {}),
-        });
-        expect(response.structuredContent).toMatchObject({
-          success: true,
-          disposition: steered ? "steered" : "turn_started",
-        });
-        expect(client.sessions[1]!.prompts).toHaveLength(steered ? 1 : 2);
-        expect(client.sessions[1]!.steeredPrompts).toHaveLength(steered ? 1 : 0);
-        expect(manager.getAgent(child.id)!.activeTurnId === originalTurn).toBe(steered);
-      } finally {
-        await removeAgentStateDir(manager, storage, workdir);
-      }
-    },
-  );
-
-  it.each([
-    { rejected: false, priorNotification: false },
-    { rejected: true, priorNotification: false },
-    { rejected: false, priorNotification: true },
-  ])(
-    "buffers completion until steer acknowledgement (rejected: $rejected, prior notification: $priorNotification)",
-    async ({ rejected, priorNotification }) => {
-      const workdir = await mkdtemp(join(tmpdir(), "mcp-send-behavior-"));
-      const storage = new AgentStorage(join(workdir, "agents"), logger);
-      const client = new HeldTurnAgentClient("codex", true, {
-        steerResult: "accepted",
-        finishDuringSteer: true,
-        rejectSteer: rejected,
-      });
-      const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
-      let mcpClient: Client | undefined;
-      try {
-        const parent = await manager.createAgent(
-          { provider: "codex", cwd: existingCwd },
-          undefined,
-          { workspaceId: "wks_parent" },
-        );
-        const child = await manager.createAgent(
-          { provider: "codex", cwd: existingCwd },
-          undefined,
-          { workspaceId: "wks_parent" },
-        );
-        const server = await createAgentMcpServer({
-          agentManager: manager,
-          agentStorage: storage,
-          callerAgentId: parent.id,
-          providerSnapshotManager: createOpenCodeManager().manager,
-          logger,
-        });
-        mcpClient = await connectInMemoryMcpClient(server);
-        const send = (input: Record<string, unknown>) =>
-          mcpClient!.callTool({ name: "send_agent_prompt", arguments: input });
-        await send({
-          agentId: child.id,
-          prompt: "Original work",
-          notifyOnFinish: priorNotification,
-        });
-        const sending = send({
-          agentId: child.id,
-          prompt: "New message",
-          notifyOnFinish: true,
-        });
-        if (rejected) {
-          expect(await sending).toMatchObject({
-            isError: true,
-            content: [{ type: "text", text: expect.stringContaining("Steer rejected") }],
-          });
-          // Flush asynchronous notification work before checking that a rejected
-          // dispatch did not notify. Then prove a later successful send still can.
-          await new Promise((resolve) => setTimeout(resolve, 50));
-          expect(client.sessions[0]!.prompts).toHaveLength(0);
-          await send({
-            agentId: child.id,
-            prompt: "Retry after rejection",
-          });
-          client.sessions[1]!.finishTurn();
-        } else {
-          const response = await sending;
-          expect(response.structuredContent).toMatchObject({
-            success: true,
-            disposition: "steered",
-          });
-        }
-        await vi.waitFor(() => expect(client.sessions[0]!.prompts).toHaveLength(1));
-        expect(parseAgentMessage(client.sessions[0]!.prompts[0])).toMatchObject({
-          source: { kind: "agent-notification", agentId: child.id, event: "finished" },
-        });
-      } finally {
-        await mcpClient?.close();
-        await removeAgentStateDir(manager, storage, workdir);
-      }
-    },
-  );
-
-  it.each([false, true])(
-    "preserves the original notification after rejection (completion during send: %s)",
-    async (finishDuringSteer) => {
-      const workdir = await mkdtemp(join(tmpdir(), "mcp-send-behavior-"));
-      const storage = new AgentStorage(join(workdir, "agents"), logger);
-      const client = new HeldTurnAgentClient("codex", true, {
-        steerResult: "accepted",
-        finishDuringSteer,
-        rejectSteer: true,
-      });
-      const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
-      let mcpClient: Client | undefined;
-      try {
-        const parent = await manager.createAgent(
-          { provider: "codex", cwd: existingCwd },
-          undefined,
-          {
-            workspaceId: "wks_parent",
-          },
-        );
-        const child = await manager.createAgent(
-          { provider: "codex", cwd: existingCwd },
-          undefined,
-          {
-            workspaceId: "wks_parent",
-          },
-        );
-        const server = await createAgentMcpServer({
-          agentManager: manager,
-          agentStorage: storage,
-          callerAgentId: parent.id,
-          providerSnapshotManager: createOpenCodeManager().manager,
-          logger,
-        });
-        mcpClient = await connectInMemoryMcpClient(server);
-        const send = (input: Record<string, unknown>) =>
-          mcpClient!.callTool({ name: "send_agent_prompt", arguments: input });
-        await send({
-          agentId: child.id,
-          prompt: "Original work",
-          notifyOnFinish: true,
-        });
-        const sending = send({
-          agentId: child.id,
-          prompt: "New message",
-          notifyOnFinish: true,
-        });
-        expect(await sending).toMatchObject({
-          isError: true,
-          content: [{ type: "text", text: expect.stringContaining("Steer rejected") }],
-        });
-        if (!finishDuringSteer) {
-          await new Promise((resolve) => setTimeout(resolve, 50));
-          expect(client.sessions[0]!.prompts).toHaveLength(0);
-          client.sessions[1]!.finishTurn();
-        }
-        await vi.waitFor(() => expect(client.sessions[0]!.prompts).toHaveLength(1));
-        expect(parseAgentMessage(client.sessions[0]!.prompts[0])).toMatchObject({
-          source: { kind: "agent-notification", agentId: child.id, event: "finished" },
-        });
-      } finally {
-        await mcpClient?.close();
-        await removeAgentStateDir(manager, storage, workdir);
-      }
-    },
-  );
-
-  it.each([
-    [false, true],
-    [true, false],
-    [false, false],
-    [true, true],
-  ])(
-    "overlapping follow-ups notify once (first accepted: %s, second accepted: %s)",
-    async (firstAccepted, secondAccepted) => {
-      const workdir = await mkdtemp(join(tmpdir(), "mcp-send-behavior-"));
-      const storage = new AgentStorage(join(workdir, "agents"), logger);
-      const client = new HeldTurnAgentClient("codex", true, {
-        steerResult: "accepted",
-        finishDuringSteer: false,
-        rejectSteer: true,
-      });
-      const manager = new AgentManager({ clients: { codex: client }, registry: storage, logger });
-      let mcpClient: Client | undefined;
-      try {
-        const parent = await manager.createAgent(
-          { provider: "codex", cwd: existingCwd },
-          undefined,
-          {
-            workspaceId: "wks_parent",
-          },
-        );
-        const child = await manager.createAgent(
-          { provider: "codex", cwd: existingCwd },
-          undefined,
-          {
-            workspaceId: "wks_parent",
-          },
-        );
-        const server = await createAgentMcpServer({
-          agentManager: manager,
-          agentStorage: storage,
-          callerAgentId: parent.id,
-          providerSnapshotManager: createOpenCodeManager().manager,
-          logger,
-        });
-        mcpClient = await connectInMemoryMcpClient(server);
-        const send = (input: Record<string, unknown>) =>
-          mcpClient!.callTool({ name: "send_agent_prompt", arguments: input });
-        await send({
-          agentId: child.id,
-          prompt: "Original work",
-          notifyOnFinish: true,
-        });
-        let firstResolve!: (result: PromptDispatchDisposition | false) => void;
-        let secondResolve!: (result: PromptDispatchDisposition | false) => void;
-        const first = new Promise<PromptDispatchDisposition | false>((resolve) => {
-          firstResolve = resolve;
-        });
-        const second = new Promise<PromptDispatchDisposition | false>((resolve) => {
-          secondResolve = resolve;
-        });
-        for (const dispatchResult of [first, second]) {
-          setupFinishNotification({
-            agentManager: manager,
-            agentStorage: storage,
-            childAgentId: child.id,
-            callerAgentId: parent.id,
-            dispatchResult,
-            logger,
-          });
-        }
-        firstResolve(firstAccepted ? "steered" : false);
-        await first;
-        secondResolve(secondAccepted ? "steered" : false);
-        await second;
-        client.sessions[1]!.finishTurn();
-        await vi.waitFor(() => expect(client.sessions[0]!.prompts).toHaveLength(1));
-        await new Promise((resolve) => setTimeout(resolve, 50));
-        expect(client.sessions[0]!.prompts).toHaveLength(1);
-        expect(parseAgentMessage(client.sessions[0]!.prompts[0])).toMatchObject({
-          source: { kind: "agent-notification", agentId: child.id, event: "finished" },
-        });
-      } finally {
-        await mcpClient?.close();
-        await removeAgentStateDir(manager, storage, workdir);
-      }
-    },
-  );
-
  const logger = createTestLogger();
  const existingCwd = process.cwd();

@@ -4403,7 +4100,7 @@ describe("send_agent_prompt MCP tool", () => {

    const response = await tool.handler(parsed.data as Record<string, unknown>);

-    expect(spies.agentManager.subscribe).toHaveBeenCalled();
+    expect(spies.agentManager.subscribe).toHaveBeenCalledTimes(1);
    expect(spies.agentManager.waitForAgentEvent).not.toHaveBeenCalled();
    expect(response.structuredContent.guidance).toBe(
      "You will get notified when the prompted agent finishes, errors, or needs permission. Do not poll for status; continue with other work until the notification arrives.",
@@ -4573,7 +4270,7 @@ describe("send_agent_prompt MCP tool", () => {
    },
  );

-  it.each(["out_of_band", "out_of_band_interrupt", "startup_failure"] as const)(
+  it.each(["out_of_band", "startup_failure"] as const)(
    "preserves %s dispatch notification semantics",
    async (scenario) => {
      const workdir = await mkdtemp(join(tmpdir(), "mcp-dispatch-notification-"));
@@ -4609,11 +4306,10 @@ describe("send_agent_prompt MCP tool", () => {
          prompt: "Ongoing task",
          notifyOnFinish: false,
        });
-        if (scenario !== "startup_failure") {
+        if (scenario === "out_of_band") {
          const response = await invokeToolWithParsedInput(tool, {
            agentId: child.id,
            prompt: "/side-command",
-            activeTurnBehavior: scenario === "out_of_band_interrupt" ? "interrupt" : "steer",
          });
          expect(response.structuredContent).toMatchObject({
            success: true,
@@ -1617,12 +1617,7 @@ describe("ACPAgentSession Zed parity", () => {
      configId: "allow_all",
      value: "on",
    });
-    // Allow All is agent mode with permissions pre-granted, so it has to leave
-    // whatever mode the session is in, not just flip the flag.
-    expect(setSessionMode).toHaveBeenCalledWith({
-      sessionId: "session-1",
-      modeId: "https://agentclientprotocol.com/protocol/session-modes#agent",
-    });
+    expect(setSessionMode).not.toHaveBeenCalled();
    await expect(session.getCurrentMode()).resolves.toBe(COPILOT_ALLOW_ALL_MODE_ID);
    expect(events.some((event) => event.type === "permission_requested")).toBe(false);
  });
@@ -1653,12 +1648,7 @@ describe("ACPAgentSession Zed parity", () => {
      configId: "allow_all",
      value: "on",
    });
-    // Allow All is agent mode with permissions pre-granted, so it has to leave
-    // whatever mode the session is in, not just flip the flag.
-    expect(setSessionMode).toHaveBeenCalledWith({
-      sessionId: "session-1",
-      modeId: "https://agentclientprotocol.com/protocol/session-modes#agent",
-    });
+    expect(setSessionMode).not.toHaveBeenCalled();
    await expect(session.getCurrentMode()).resolves.toBe(COPILOT_ALLOW_ALL_MODE_ID);
  });

@@ -122,7 +122,7 @@ async function collectTimelineAcrossTurns(
          seq: rows.length + 1,
          timestamp: new Date(Date.UTC(2026, 9, 4, 0, 0, rows.length)).toISOString(),
          item: event.item,
-          ...((event.turnId ?? currentTurnId) ? { turnId: event.turnId ?? currentTurnId } : {}),
+          ...(currentTurnId ? { turnId: currentTurnId } : {}),
        });
      }
      if (event.type === "turn_completed" && ++completedTurns === turnCount) resolve();
@@ -469,145 +469,122 @@ describe("background Claude subagents", () => {
    });
  });

-  test.each(["before", "after"])(
-    "keeps one logged Task card when child tools start %s the parent finishes",
-    async (timing) => {
-      // A child can stream across the main session's turn boundary. Claude opens the next
-      // main-session turn with system/init; bare child frames do not open a turn.
-      queryFactory.mockImplementation(() =>
-        buildQueryMock([
-          { type: "system", subtype: "init", session_id: "bg-session", permissionMode: "default" },
-          {
-            type: "assistant",
-            message: {
-              model: "claude-haiku-4-5",
-              content: [
-                {
-                  type: "tool_use",
-                  id: "toolu_background",
-                  name: "Agent",
-                  input: {
-                    subagent_type: "general-purpose",
-                    description: "Count files here",
-                    prompt: "Run ls and reply with the number of entries.",
-                    run_in_background: true,
-                  },
+  test("keeps one logged Task card when the child streams on after the parent's turn ends", async () => {
+    // A child can stream across the main session's turn boundary. Claude opens the next
+    // main-session turn with system/init; bare child frames do not open a turn.
+    queryFactory.mockImplementation(() =>
+      buildQueryMock([
+        { type: "system", subtype: "init", session_id: "bg-session", permissionMode: "default" },
+        {
+          type: "assistant",
+          message: {
+            model: "claude-haiku-4-5",
+            content: [
+              {
+                type: "tool_use",
+                id: "toolu_background",
+                name: "Agent",
+                input: {
+                  subagent_type: "general-purpose",
+                  description: "Count files here",
+                  prompt: "Run ls and reply with the number of entries.",
+                  run_in_background: true,
                },
-              ],
-            },
+              },
+            ],
          },
-          {
-            type: "system",
-            subtype: "task_started",
-            task_id: "bg-task",
-            tool_use_id: "toolu_background",
-            task_type: "local_agent",
-            subagent_type: "general-purpose",
-            description: "Count files here",
-            prompt: "Run ls and reply with the number of entries.",
-          },
-          {
-            type: "user",
-            message: {
-              role: "user",
-              content: [
-                {
-                  type: "tool_result",
-                  tool_use_id: "toolu_background",
-                  content: "Async agent launched successfully.",
-                },
-              ],
-            },
-          },
-          ...(timing === "after"
-            ? [
-                { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
-                {
-                  type: "system",
-                  subtype: "init",
-                  session_id: "bg-session",
-                  permissionMode: "default",
-                },
-              ]
-            : []),
-          {
-            type: "assistant",
-            parent_tool_use_id: "toolu_background",
-            message: {
-              model: "claude-haiku-4-5",
-              content: [
-                {
-                  type: "tool_use",
-                  id: "toolu_ls",
-                  name: "Bash",
-                  input: { command: "ls -1", description: "List files" },
-                },
-              ],
-            },
-          },
-          ...(timing === "before"
-            ? [
-                { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
-                {
-                  type: "system",
-                  subtype: "init",
-                  session_id: "bg-session",
-                  permissionMode: "default",
-                },
-              ]
-            : []),
-          {
-            type: "user",
-            parent_tool_use_id: "toolu_background",
-            message: {
-              role: "user",
-              content: [{ type: "tool_result", tool_use_id: "toolu_ls", content: "a\nb\nc" }],
-            },
-          },
-          {
-            type: "assistant",
-            parent_tool_use_id: "toolu_background",
-            message: { model: "claude-haiku-4-5", content: [{ type: "text", text: "3" }] },
-          },
-          {
-            type: "system",
-            subtype: "task_updated",
-            task_id: "bg-task",
-            patch: { status: "completed" },
-          },
-          {
-            type: "system",
-            subtype: "task_notification",
-            task_id: "bg-task",
-            tool_use_id: "toolu_background",
-            status: "completed",
-          },
-          { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
-        ]),
-      );
-      const session = await new ClaudeAgentClient({
-        logger: createTestLogger(),
-        queryFactory,
-        resolveBinary: async () => "/test/claude/bin",
-      }).createSession({ provider: "claude", cwd: process.cwd() });
-      const rows = await collectTimelineAcrossTurns(session, "delegate work", 2);
-
-      const cards = projectTimelineRows({ rows, mode: "projected" })
-        .map((entry) => entry.item)
-        .filter((item) => item.type === "tool_call" && item.callId === "toolu_background");
-
-      expect(cards).toHaveLength(1);
-      expect(cards[0]).toMatchObject({
-        status: "completed",
-        detail: {
-          type: "sub_agent",
-          subAgentType: "general-purpose",
-          description: "Count files here",
-          log: "[Bash] ls -1",
        },
-      });
-    },
-  );
+        {
+          type: "system",
+          subtype: "task_started",
+          task_id: "bg-task",
+          tool_use_id: "toolu_background",
+          task_type: "local_agent",
+          subagent_type: "general-purpose",
+          description: "Count files here",
+          prompt: "Run ls and reply with the number of entries.",
+        },
+        {
+          type: "user",
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: "toolu_background",
+                content: "Async agent launched successfully.",
+              },
+            ],
+          },
+        },
+        {
+          type: "assistant",
+          parent_tool_use_id: "toolu_background",
+          message: {
+            model: "claude-haiku-4-5",
+            content: [
+              {
+                type: "tool_use",
+                id: "toolu_ls",
+                name: "Bash",
+                input: { command: "ls -1", description: "List files" },
+              },
+            ],
+          },
+        },
+        { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
+        { type: "system", subtype: "init", session_id: "bg-session", permissionMode: "default" },
+        {
+          type: "user",
+          parent_tool_use_id: "toolu_background",
+          message: {
+            role: "user",
+            content: [{ type: "tool_result", tool_use_id: "toolu_ls", content: "a\nb\nc" }],
+          },
+        },
+        {
+          type: "assistant",
+          parent_tool_use_id: "toolu_background",
+          message: { model: "claude-haiku-4-5", content: [{ type: "text", text: "3" }] },
+        },
+        {
+          type: "system",
+          subtype: "task_updated",
+          task_id: "bg-task",
+          patch: { status: "completed" },
+        },
+        {
+          type: "system",
+          subtype: "task_notification",
+          task_id: "bg-task",
+          tool_use_id: "toolu_background",
+          status: "completed",
+        },
+        { type: "result", subtype: "success", usage: {}, total_cost_usd: 0 },
+      ]),
+    );
+    const session = await new ClaudeAgentClient({
+      logger: createTestLogger(),
+      queryFactory,
+      resolveBinary: async () => "/test/claude/bin",
+    }).createSession({ provider: "claude", cwd: process.cwd() });
+    const rows = await collectTimelineAcrossTurns(session, "delegate work", 2);
+
+    const cards = projectTimelineRows({ rows, mode: "projected" })
+      .map((entry) => entry.item)
+      .filter((item) => item.type === "tool_call" && item.callId === "toolu_background");
+
+    expect(cards).toHaveLength(1);
+    expect(cards[0]).toMatchObject({
+      status: "completed",
+      detail: {
+        type: "sub_agent",
+        subAgentType: "general-purpose",
+        description: "Count files here",
+        log: "[Bash] ls -1",
+      },
+    });
+  });

  test.each([
    {
@@ -2250,7 +2250,7 @@ class ClaudeAgentSession implements AgentSession {
  private readonly sidechainTracker = new ClaudeSidechainTracker({
    getToolInput: (toolUseId) =>
      this.toolUseCache.get(toolUseId)?.input ??
-      this.settledSubagentToolCalls.get(toolUseId)?.input ??
+      this.settledSubagentToolCallInCurrentTurn(toolUseId)?.input ??
      null,
    // Releases that predate the task protocol announce nothing, so the tracker keeps deriving
    // identity and status from frames for them. Detecting the capability beats comparing version
@@ -2258,11 +2258,13 @@ class ClaudeAgentSession implements AgentSession {
    isDescriptorOwnedElsewhere: () => this.taskProtocolSource.isActive,
    // A background child streams its frames after Claude has already answered the call, so its
    // card is rebuilt from the settled call: a running one would replace the settled, labeled card.
-    // Late card updates retain the turn that answered the call.
+    // A card belongs to the turn that answered the call, so frames from a later turn leave it be.
    needsSyntheticParentToolCard: (toolUseId) =>
-      (this.toolUseCache.has(toolUseId) || this.settledSubagentToolCalls.has(toolUseId)) &&
+      (this.toolUseCache.has(toolUseId) ||
+        this.settledSubagentToolCallInCurrentTurn(toolUseId) !== undefined) &&
      this.taskProtocolSource.needsSyntheticParentToolCard(toolUseId),
-    getSettledParentToolCall: (toolUseId) => this.settledSubagentToolCalls.get(toolUseId)?.item,
+    getSettledParentToolCall: (toolUseId) =>
+      this.settledSubagentToolCallInCurrentTurn(toolUseId)?.item,
  });
  private persistedHistory: PersistedTimelineEntry[] = [];
  private persistedProviderSubagentEvents: Extract<
@@ -4488,12 +4490,7 @@ class ClaudeAgentSession implements AgentSession {
      ),
    ).map((event): AgentStreamEvent => ({ type: "provider_subagent", provider: "claude", event }));
    const routedId = canonicalSubagentId ?? parentToolUseId;
-    const settled = this.settledSubagentToolCalls.get(routedId);
-    const sidechainEvents = this.sidechainTracker.handleMessage(message, routedId).map((event) => {
-      if (event.type === "timeline" && settled?.turnId) event.turnId = settled.turnId;
-      return event;
-    });
-    return [...runtimeEvents, ...sidechainEvents];
+    return [...runtimeEvents, ...this.sidechainTracker.handleMessage(message, routedId)];
  }

  /**
@@ -5148,8 +5145,7 @@ class ClaudeAgentSession implements AgentSession {
  }

  private notifySubscribers(event: AgentStreamEvent): void {
-    const turnId =
-      getAgentStreamEventTurnId(event) ?? this.activeForegroundTurnId ?? this.autonomousTurn?.id;
+    const turnId = this.activeForegroundTurnId ?? this.autonomousTurn?.id;
    const tagged = turnId ? { ...event, turnId } : event;
    this.logger.trace(
      {
@@ -5625,12 +5621,17 @@ class ClaudeAgentSession implements AgentSession {
    });
  }

+  private settledSubagentToolCallInCurrentTurn(subagentId: string) {
+    const settled = this.settledSubagentToolCalls.get(subagentId);
+    const currentTurnId = this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? null;
+    return settled && settled.turnId === currentTurnId ? settled : undefined;
+  }
+
  /** A finished child streams no more frames, so its settled call has nothing left to update. */
  private releaseFinishedSubagentToolCalls(observations: SubagentObservation[]): void {
    for (const observation of observations) {
      if (observation.kind === "status" && observation.status !== "running") {
        this.settledSubagentToolCalls.delete(observation.id);
-        this.sidechainTracker.delete(observation.id);
      }
    }
  }
@@ -4,40 +4,6 @@ import type { SDKMessage } from "@anthropic-ai/claude-agent-sdk";
 import { ClaudeSidechainTracker } from "./sidechain-tracker.js";

 describe("ClaudeSidechainTracker", () => {
-  it("retains a background child's actions across the parent finishing", () => {
-    const tracker = new ClaudeSidechainTracker({
-      getToolInput: () => ({ subagent_type: "general-purpose", description: "List files" }),
-      isDescriptorOwnedElsewhere: () => true,
-    });
-    const action = (id: string, command: string) =>
-      ({
-        type: "assistant",
-        parent_tool_use_id: "task-1",
-        message: { content: [{ type: "tool_use", id, name: "Bash", input: { command } }] },
-      }) as unknown as SDKMessage;
-    tracker.handleMessage(action("ls", "ls -1"), "task-1");
-    expect(tracker.finishAll("completed")).toEqual([]);
-    const events = tracker.handleMessage(action("pwd", "pwd"), "task-1");
-    expect(events).toContainEqual(
-      expect.objectContaining({
-        type: "timeline",
-        item: expect.objectContaining({
-          detail: expect.objectContaining({ log: "[Bash] ls -1\n[Bash] pwd" }),
-        }),
-      }),
-    );
-    tracker.delete("task-1");
-    const next = tracker.handleMessage(action("next", "ls"), "task-1");
-    expect(next).toContainEqual(
-      expect.objectContaining({
-        type: "timeline",
-        item: expect.objectContaining({
-          detail: expect.objectContaining({ log: "[Bash] ls" }),
-        }),
-      }),
-    );
-  });
-
  it("uses Claude's native agent name for the provider subagent title", () => {
    const tracker = new ClaudeSidechainTracker({
      getToolInput: () => ({
@@ -199,7 +199,7 @@ export class ClaudeSidechainTracker {
  finishAll(status: "completed" | "failed" | "canceled"): AgentStreamEvent[] {
    const events: AgentStreamEvent[] = [];
    if (this.isDescriptorOwnedElsewhere()) {
-      // The task protocol owns child completion; the parent finishing does not end its children.
+      this.activeSidechains.clear();
      return events;
    }
    for (const [id, state] of this.activeSidechains) {
@@ -209,10 +209,6 @@ export async function writeCopilotProviderMode(
  if (!requestsAllowAll) {
    return { handled: false };
  }
-  await context.connection.setSessionMode({
-    sessionId: context.sessionId,
-    modeId: COPILOT_AGENT_MODE_ID,
-  });
  const response = await context.connection.setSessionConfigOption({
    sessionId: context.sessionId,
    configId: COPILOT_ALLOW_ALL_CONFIG_ID,
@@ -1,82 +0,0 @@
-import { beforeAll, describe, expect, test } from "vitest";
-import { spawn } from "node:child_process";
-import { mkdtemp, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { Readable, Writable } from "node:stream";
-import { ClientSideConnection, ndJsonStream, PROTOCOL_VERSION } from "@agentclientprotocol/sdk";
-
-import { isCommandAvailable } from "../../../executable-resolution/executable-resolution.js";
-import { createTestLogger } from "../../../test-utils/test-logger.js";
-import { terminateWithTreeKill } from "../../../utils/tree-kill.js";
-import { resolveACPModeSelection } from "./acp-agent.js";
-import {
-  COPILOT_ALLOW_ALL_MODE_ID,
-  COPILOT_MODES,
-  writeCopilotProviderMode,
-} from "./copilot-acp-agent.js";
-
-const AGENT_MODE_ID = "https://agentclientprotocol.com/protocol/session-modes#agent";
-const PLAN_MODE_ID = "https://agentclientprotocol.com/protocol/session-modes#plan";
-
-describe("Copilot ACP provider (real) Allow All mode", () => {
-  let canRun = false;
-
-  beforeAll(async () => {
-    canRun = await isCommandAvailable("copilot");
-  });
-
-  test("selecting Allow All from Plan leaves the real provider in Agent mode", async (context) => {
-    if (!canRun) {
-      context.skip();
-    }
-    const cwd = await mkdtemp(join(tmpdir(), "copilot-allow-all-real-"));
-    const child = spawn("copilot", ["--acp"], { cwd, stdio: ["pipe", "pipe", "ignore"] });
-    const connection = new ClientSideConnection(
-      () => ({
-        sessionUpdate: async () => {},
-        requestPermission: async () => ({ outcome: { outcome: "cancelled" } }),
-      }),
-      ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout)),
-    );
-
-    try {
-      await connection.initialize({ protocolVersion: PROTOCOL_VERSION, clientCapabilities: {} });
-      const session = await connection.newSession({ cwd, mcpServers: [] });
-      const plan = await connection.setSessionConfigOption({
-        sessionId: session.sessionId,
-        configId: "mode",
-        value: PLAN_MODE_ID,
-      });
-      expect(plan.configOptions).toContainEqual(
-        expect.objectContaining({ id: "mode", currentValue: PLAN_MODE_ID }),
-      );
-
-      // This is the same provider writer called by ACPAgentSession. Assert its
-      // untransformed ACP response, since Paseo's displayed mode hides this bug.
-      const result = await writeCopilotProviderMode({
-        connection,
-        sessionId: session.sessionId,
-        requestedModeId: COPILOT_ALLOW_ALL_MODE_ID,
-        currentModeId: PLAN_MODE_ID,
-        selection: resolveACPModeSelection({
-          modeId: COPILOT_ALLOW_ALL_MODE_ID,
-          availableModes: COPILOT_MODES,
-          configOptions: plan.configOptions,
-        }),
-        configOptions: plan.configOptions,
-        logger: createTestLogger(),
-      });
-
-      expect(result.configOptions).toContainEqual(
-        expect.objectContaining({ id: "mode", currentValue: AGENT_MODE_ID }),
-      );
-      expect(result.configOptions).toContainEqual(
-        expect.objectContaining({ id: "allow_all", currentValue: "on" }),
-      );
-    } finally {
-      await terminateWithTreeKill(child, { gracefulTimeoutMs: 1000, forceTimeoutMs: 1000 });
-      await rm(cwd, { recursive: true, force: true });
-    }
-  }, 60_000);
-});
@@ -3,7 +3,8 @@ 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 { describe, expect, test, vi } from "vitest";
+import { setTimeout as delay } from "node:timers/promises";

 import { createTestLogger } from "../../../test-utils/test-logger.js";
 import { runProviderRefreshWithDeadline } from "../provider-refresh-deadline.js";
@@ -203,16 +204,28 @@ describe("GenericACPAgentClient diagnostics", () => {
  });

  test("reports a hung ACP session/new phase without failing the diagnostic", async () => {
-    await withFakeACPAgent("hang-session", async (scriptPath, mode) => {
+    await withFakeACPAgent("hang-session", async (scriptPath, mode, testDir) => {
+      const tracePath = path.join(testDir, "phase-trace.jsonl");
      const client = new GenericACPAgentClient({
        logger: createTestLogger(),
-        command: [process.execPath, scriptPath, mode],
+        command: [process.execPath, scriptPath, mode, "", tracePath],
        providerId: "grok",
        label: "Grok",
        diagnosticPhaseTimeoutMs: TEST_ACP_TIMEOUT_MS,
      });

-      const { diagnostic } = await client.getDiagnostic();
+      // Freeze phase deadlines until the child actually reaches session/new. Process startup
+      // and initialize latency must not consume the session timeout this test exercises.
+      vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+      let diagnostic: string;
+      try {
+        const pending = client.getDiagnostic();
+        await waitForSessionNew(tracePath);
+        await vi.advanceTimersByTimeAsync(TEST_ACP_TIMEOUT_MS);
+        ({ diagnostic } = await pending);
+      } finally {
+        vi.useRealTimers();
+      }

      expect(diagnostic).toContain("Grok (ACP)");
      expect(diagnostic).toContain("Provider ID: grok");
@@ -356,6 +369,14 @@ async function withTempDir(prefix: string, run: (testDir: string) => Promise<voi
  }
 }

+async function waitForSessionNew(tracePath: string): Promise<void> {
+  const readyBy = Date.now() + 10_000;
+  while (!(await readFile(tracePath, "utf8").catch(() => "")).includes("session/new")) {
+    if (Date.now() >= readyBy) throw new Error("Fake ACP agent did not reach session/new");
+    await delay(20);
+  }
+}
+
 async function expectProcessExit(pid: number): Promise<void> {
  const deadline = Date.now() + 2_000;
  while (Date.now() < deadline) {
@@ -426,6 +447,7 @@ rl.on("line", (line) => {

  if (message.method === "session/new") {
    if (mode === "hang-session") {
+      if (initializeTracePath) fs.appendFileSync(initializeTracePath, "session/new\\n");
      return;
    }

@@ -2101,6 +2101,52 @@ describe("PiRpcAgentSession", () => {
    });
  });

+  test("fails an unfinished workflow on process exit while preserving detached runs", async () => {
+    const { pi, session, events } = await createSession();
+    onTestFinished(() => session.close());
+    const updates: AgentStreamEvent[] = [];
+    session.subscribe((event) => updates.push(event));
+    await session.startTurn("run workflows");
+    const runtime = pi.latestSession();
+    runtime.emit({
+      type: "tool_execution_start",
+      toolCallId: "detached",
+      toolName: "subagent",
+      args: { workflowScript: "return await runs.all([]);", async: true },
+    });
+    runtime.emit({
+      type: "tool_execution_end",
+      toolCallId: "detached",
+      toolName: "subagent",
+      result: {
+        details: {
+          mode: "workflow",
+          runId: "detached-run",
+          asyncId: "detached-run",
+          asyncDir: "/nonexistent/pi-exit-regression",
+          results: [],
+        },
+      },
+    });
+    runtime.emit({
+      type: "tool_execution_start",
+      toolCallId: "foreground",
+      toolName: "subagent",
+      args: { workflowScript: "return await runs.all([]);", async: false },
+    });
+    runtime.emit({ type: "process_exit", error: "Pi exited" });
+
+    await expect(events.nextTurnFailure()).resolves.toMatchObject({ error: "Pi exited" });
+    const statuses = (id: string) =>
+      updates.flatMap((event) =>
+        event.type === "provider_subagent" && event.event.type === "upsert" && event.event.id === id
+          ? [event.event.status]
+          : [],
+      );
+    expect(statuses("foreground")).toEqual(["running", "failed"]);
+    expect(statuses("detached")).toEqual(["running", "running"]);
+  });
+
  test("fails an autonomous turn when the Pi process exits before settlement", async () => {
    const { pi, events } = await createSession();
    const fakeSession = pi.latestSession();
@@ -2108,6 +2108,15 @@ export class PiRpcAgentSession implements AgentSession {
  }

  private handleProcessExit(error: string): void {
+    for (const [toolCallId, toolCall] of this.activeToolCalls) {
+      this.handleToolExecutionEnd({
+        type: "tool_execution_end",
+        toolCallId,
+        toolName: toolCall.toolName,
+        isError: true,
+        result: { content: [{ type: "text", text: error }] },
+      });
+    }
    this.rejectAllExtensionResults(new Error(error));
    this.interruptingTurn = null;
    if (!this.activeTurnId && !this.activeTurnStarted) {
@@ -0,0 +1,153 @@
+{
+  "provenance": {
+    "package": "pi-subagents",
+    "version": "0.78.0",
+    "sourceCommit": "reconstructed-workflow-launch",
+    "piVersion": "1.2.0",
+    "captureDate": "2026-10-17"
+  },
+  "events": [
+    {
+      "type": "tool_execution_start",
+      "toolCallId": "call_wf1",
+      "toolName": "subagent",
+      "args": {
+        "workflow": "tmp/rigor-ui-test.js",
+        "async": true
+      }
+    },
+    {
+      "type": "tool_execution_end",
+      "toolCallId": "call_wf1",
+      "toolName": "subagent",
+      "result": {
+        "content": [
+          {
+            "type": "text",
+            "text": "Run fan-out: 1/64 used, 63 remaining\nAsync workflow: [eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1]\n\nThe async run is detached and running in the background.\nMission: 3d6d9bb6-1ea3-4b8d-9c56-6a1f0e3b6f88 (active)"
+          }
+        ],
+        "details": {
+          "mode": "workflow",
+          "runId": "eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1",
+          "results": [],
+          "asyncId": "eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1",
+          "asyncDir": "/tmp/pi-subagents-uid-1000/async-subagent-runs/eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1",
+          "workflowGraph": {
+            "lanes": [{ "key": "alpha", "agent": "scout" }]
+          },
+          "context": "fresh",
+          "timeoutMs": 1800000,
+          "deadlineAt": 1790199499998
+        }
+      },
+      "isError": false
+    },
+    {
+      "type": "message_end",
+      "message": {
+        "role": "custom",
+        "customType": "subagent-incremental-child-notify",
+        "content": "Workflow child completed: **alpha**\nWorkflow run: eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1\nChild run: 4cb1c0a2-2f2e-4c31-9c53-0f0d2ad0f3f1\nOutput: /tmp/paseo-pi-extension-phase3/workspace/tmp/alpha.md\nStatus: workflow still running",
+        "display": false,
+        "details": {
+          "childKey": "alpha",
+          "outcome": "completed"
+        },
+        "timestamp": 1790197711046
+      }
+    },
+    {
+      "type": "message_end",
+      "message": {
+        "role": "custom",
+        "customType": "subagent-notify",
+        "content": "Background task completed: **workflow**\n\nWorkflow receipt: /tmp/pi-subagents-uid-1000/async-subagent-runs/eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1/receipt.json\n\nRetention-managed async directory: /tmp/pi-subagents-uid-1000/async-subagent-runs/eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1\n\nSession file: /tmp/paseo-pi-extension-phase3/sessions-nico/2026-10-17T21-08-13-722Z_01a0d018/0f2c1b1e-9d1c-4b0e-8d5b-8e6f27a1c2d3/run-0/session.jsonl",
+        "display": false,
+        "timestamp": 1790197722046
+      }
+    }
+  ],
+  "messages": [
+    {
+      "role": "assistant",
+      "content": [
+        {
+          "type": "toolCall",
+          "id": "call_wf1",
+          "name": "subagent",
+          "arguments": {
+            "workflow": "tmp/rigor-ui-test.js",
+            "async": true
+          }
+        }
+      ],
+      "api": "openai-completions",
+      "provider": "openrouter",
+      "model": "google/gemini-3.6-flash",
+      "usage": {
+        "input": 3303,
+        "output": 114,
+        "cacheRead": 7053,
+        "cacheWrite": 0,
+        "reasoning": 81,
+        "totalTokens": 10470,
+        "cost": {
+          "input": 0.00247725,
+          "output": 0.00042750000000000004,
+          "cacheRead": 0.000528975,
+          "cacheWrite": 0,
+          "total": 0.003433725
+        }
+      },
+      "stopReason": "toolUse",
+      "timestamp": 1790197697608,
+      "responseId": "gen-1790197697-lxluaTrDkdaxjSXsO957",
+      "rawStopReason": "tool_calls"
+    },
+    {
+      "role": "toolResult",
+      "toolCallId": "call_wf1",
+      "toolName": "subagent",
+      "content": [
+        {
+          "type": "text",
+          "text": "Run fan-out: 1/64 used, 63 remaining\nAsync workflow: [eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1]\n\nThe async run is detached and running in the background.\nMission: 3d6d9bb6-1ea3-4b8d-9c56-6a1f0e3b6f88 (active)"
+        }
+      ],
+      "details": {
+        "mode": "workflow",
+        "runId": "eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1",
+        "results": [],
+        "asyncId": "eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1",
+        "asyncDir": "/tmp/pi-subagents-uid-1000/async-subagent-runs/eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1",
+        "workflowGraph": {
+          "lanes": [{ "key": "alpha", "agent": "scout" }]
+        },
+        "context": "fresh",
+        "timeoutMs": 1800000,
+        "deadlineAt": 1790199499998
+      },
+      "isError": false,
+      "timestamp": 1790197700011
+    },
+    {
+      "role": "custom",
+      "customType": "subagent-incremental-child-notify",
+      "content": "Workflow child completed: **alpha**\nWorkflow run: eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1\nChild run: 4cb1c0a2-2f2e-4c31-9c53-0f0d2ad0f3f1\nOutput: /tmp/paseo-pi-extension-phase3/workspace/tmp/alpha.md\nStatus: workflow still running",
+      "display": false,
+      "details": {
+        "childKey": "alpha",
+        "outcome": "completed"
+      },
+      "timestamp": 1790197711046
+    },
+    {
+      "role": "custom",
+      "customType": "subagent-notify",
+      "content": "Background task completed: **workflow**\n\nWorkflow receipt: /tmp/pi-subagents-uid-1000/async-subagent-runs/eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1/receipt.json\n\nRetention-managed async directory: /tmp/pi-subagents-uid-1000/async-subagent-runs/eac895df-6a71-4b4f-9f0a-2ba2b7f0f4a1\n\nSession file: /tmp/paseo-pi-extension-phase3/sessions-nico/2026-10-17T21-08-13-722Z_01a0d018/0f2c1b1e-9d1c-4b0e-8d5b-8e6f27a1c2d3/run-0/session.jsonl",
+      "display": false,
+      "timestamp": 1790197722046
+    }
+  ]
+}
@@ -1,6 +1,6 @@
-import { describe, expect, test } from "vitest";
+import { describe, expect, test, vi } from "vitest";
 import { fileURLToPath } from "node:url";
-import { mkdtemp, writeFile, rm } from "node:fs/promises";
+import { mkdtemp, writeFile, appendFile, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { createPiExtensionHost } from "../index.js";
@@ -45,6 +45,18 @@ function hasCompletedChild(events: AgentStreamEvent[]) {
  );
 }

+function subagentUpserts(events: AgentStreamEvent[]) {
+  return events.flatMap((event) =>
+    event.type === "provider_subagent" && event.event.type === "upsert" ? [event.event] : [],
+  );
+}
+
+function reportedUpsert(events: AgentStreamEvent[], id: string, status?: string) {
+  return subagentUpserts(events).some(
+    (event) => event.id === id && (status === undefined || event.status === status),
+  );
+}
+
 describe("pi-subagents adapter", () => {
  test("follows async status and transcript without bg_wait", async () => {
    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-async-"));
@@ -273,4 +285,858 @@ describe("pi-subagents adapter", () => {
      },
    ]);
  });
+
+  test("maps a reconstructed workflowScript run to a live spawn row and its children", async () => {
+    const fixture = readSubagentFixture(new URL("./fixtures/workflow.json", import.meta.url));
+    const events = await verifySubagentFixture(fixture);
+    const upserts = events
+      .filter((event) => event.event.type === "upsert")
+      .map((event) => (event.event.type === "upsert" ? event.event : null));
+    expect(upserts.map((event) => [event?.id, event?.status])).toEqual([
+      ["call_wf1", "running"],
+      ["call_wf1", "running"],
+      ["call_wf1:alpha", "completed"],
+      ["call_wf1", "completed"],
+    ]);
+    // The workflow call carries no agent/task, so the script file names the run.
+    expect(upserts[0]?.title).toBe("rigor-ui-test.js");
+    expect(upserts[2]?.title).toBeUndefined();
+  });
+
+  test("maps a reported workflowScript run to its reviewer row and saved timeline", async () => {
+    // Reported in #5837: `subagent({ workflow: true })` reaches the adapter as `workflowScript`,
+    // not `workflow`, so a launch check keyed on `workflow` alone drops the whole run.
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-workflow-script-"));
+    const host = createPiExtensionHost();
+    try {
+      const sessionFile = join(dir, "child.jsonl");
+      await writeFile(
+        sessionFile,
+        JSON.stringify({
+          type: "message",
+          message: { role: "assistant", content: [{ type: "text", text: "README summary" }] },
+        }) + "\n",
+      );
+      const args = {
+        workflowScript:
+          "return await runs.run('review', { agent: 'reviewer', task: 'Read README.md' });",
+        async: false,
+      };
+      expect(
+        host.mapToolCall({
+          callId: "reported-workflow",
+          toolName: "subagent",
+          args,
+          status: "running",
+          result: null,
+        })?.subagents,
+      ).toEqual([
+        expect.objectContaining({ id: "reported-workflow", title: "workflow", status: "running" }),
+      ]);
+      const output = host.mapToolCall({
+        callId: "reported-workflow",
+        toolName: "subagent",
+        args,
+        status: "completed",
+        result: {
+          details: {
+            mode: "workflow",
+            runId: "reported-run",
+            results: [{ index: 0, agent: "reviewer", exitCode: 0, sessionFile }],
+          },
+        },
+      });
+      expect(output?.subagents).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ type: "upsert", title: "reviewer", status: "completed" }),
+        ]),
+      );
+      expect(hasChildTimeline(await output!.hydration)).toBe(true);
+    } finally {
+      host.close();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("keys workflow child rows by their childKey while the run reports progress", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-workflow-"));
+    const received: AgentStreamEvent[] = [];
+    const host = createPiExtensionHost();
+    try {
+      host.follow((event) => received.push(event));
+      host.mapToolCall({
+        callId: "call-wf",
+        toolName: "subagent",
+        args: { workflow: "tmp/rigor-ui-test.js", async: true },
+        status: "completed",
+        result: {
+          details: {
+            mode: "workflow",
+            runId: "run-wf",
+            asyncId: "run-wf",
+            asyncDir: dir,
+            results: [],
+          },
+        },
+      });
+      await writeFile(
+        join(dir, "status.json"),
+        JSON.stringify({
+          state: "running",
+          steps: [
+            { agent: "scout", workflowKey: "alpha", status: "complete" },
+            { agent: "reviewer", workflowKey: "beta", status: "running" },
+          ],
+        }),
+      );
+      await expect.poll(() => reportedUpsert(received, "call-wf:beta")).toBe(true);
+      expect(subagentUpserts(received).map((event) => [event.id, event.status])).toEqual(
+        expect.arrayContaining([
+          ["call-wf:alpha", "running"],
+          ["call-wf:beta", "running"],
+          ["call-wf", "running"],
+        ]),
+      );
+
+      await writeFile(
+        join(dir, "status.json"),
+        JSON.stringify({
+          state: "complete",
+          steps: [
+            { agent: "scout", workflowKey: "alpha", status: "complete" },
+            { agent: "reviewer", workflowKey: "beta", status: "complete" },
+          ],
+        }),
+      );
+      await expect.poll(() => reportedUpsert(received, "call-wf", "completed")).toBe(true);
+      expect(
+        subagentUpserts(received).findLast((event) => event.id === "call-wf:alpha")?.status,
+      ).toBe("completed");
+    } finally {
+      host.close();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("keeps a missing status directory's row alive until the miss budget expires", async () => {
+    vi.useFakeTimers();
+    const received: AgentStreamEvent[] = [];
+    const host = createPiExtensionHost();
+    try {
+      host.follow((event) => received.push(event));
+      host.mapToolCall({
+        callId: "call-lost",
+        toolName: "subagent",
+        args: { agent: "scout", task: "Inspect", async: true },
+        status: "completed",
+        result: {
+          details: {
+            mode: "single",
+            runId: "run-1",
+            asyncId: "run-1",
+            asyncDir: "/nonexistent",
+            results: [],
+          },
+        },
+      });
+      await vi.advanceTimersByTimeAsync(250 * 5);
+      // A missing status file supplies no new outcome before the miss budget expires.
+      const duringMisses = subagentUpserts(received);
+      expect(duringMisses).toEqual([]);
+
+      // 60 s of missing ticks, the budget before a status directory counts as gone.
+      await vi.advanceTimersByTimeAsync(250 * 236);
+      // The launch row comes back through the caller; polling reports the give-up exactly once.
+      const afterGiveUp = subagentUpserts(received);
+      expect(afterGiveUp.findLast((event) => event.id === "call-lost")).toEqual({
+        type: "upsert",
+        id: "call-lost",
+        status: "canceled",
+      });
+      expect(afterGiveUp.filter((event) => event.status === "canceled")).toHaveLength(1);
+    } finally {
+      host.close();
+      vi.useRealTimers();
+    }
+  });
+
+  test("a completion notice stops polling so a stale status file cannot revert the card", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-stale-"));
+    const received: AgentStreamEvent[] = [];
+    const host = createPiExtensionHost();
+    try {
+      host.follow((event) => received.push(event));
+      host.mapToolCall({
+        callId: "call-1",
+        toolName: "subagent",
+        args: { agent: "scout", task: "Inspect", async: true },
+        status: "completed",
+        result: {
+          details: { mode: "single", runId: "run-1", asyncId: "run-1", asyncDir: dir, results: [] },
+        },
+      });
+      await writeFile(
+        join(dir, "status.json"),
+        JSON.stringify({ state: "running", steps: [{ agent: "scout", status: "running" }] }),
+      );
+      const statuses = () =>
+        received.flatMap((event) =>
+          event.type === "provider_subagent" && event.event.type === "upsert"
+            ? [event.event.status]
+            : [],
+        );
+      await expect.poll(() => statuses().length).toBeGreaterThan(1);
+
+      host.mapCustomMessage({
+        role: "custom",
+        customType: "subagent-notify",
+        content: [
+          "Background task completed: **scout**",
+          "",
+          `Retention-managed async directory: ${dir}`,
+        ].join("\n"),
+      });
+      const settled = statuses().length;
+
+      // The run's directory is still on disk with a running status; polling must stay off.
+      await new Promise((resolve) => setTimeout(resolve, 400));
+      expect(statuses().length).toBe(settled);
+    } finally {
+      host.close();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("a bg_wait result keeps its verdict while the run's status names no child yet", async () => {
+    vi.useFakeTimers();
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-settled-owner-"));
+    const received: AgentStreamEvent[] = [];
+    const host = createPiExtensionHost();
+    try {
+      host.follow((event) => received.push(event));
+      host.mapToolCall({
+        callId: "call-1",
+        toolName: "subagent",
+        args: { agent: "scout", task: "Inspect", async: true },
+        status: "completed",
+        result: {
+          details: { mode: "single", runId: "run-1", asyncId: "run-1", asyncDir: dir, results: [] },
+        },
+      });
+      // A single unnamed child takes the owner's id, so this result settles the launch row while the
+      // run itself keeps polling.
+      expect(
+        host.mapToolCall({
+          callId: "wait-1",
+          toolName: "bg_wait",
+          args: { runId: "run-1" },
+          status: "completed",
+          result: {
+            details: {
+              mode: "single",
+              results: [],
+              completions: [
+                { runId: "run-1", results: [{ agent: "scout", success: true, exitCode: 0 }] },
+              ],
+            },
+          },
+        })?.subagents,
+      ).toEqual([expect.objectContaining({ id: "call-1", status: "completed" })]);
+
+      // The queue has not started the child yet, so the status file names no step: that tick must
+      // not re-report the owner as running over the verdict it already has.
+      await writeFile(join(dir, "status.json"), JSON.stringify({ state: "running", steps: [] }));
+      const beforeTick = received.length;
+      await vi.advanceTimersByTimeAsync(250 * 2);
+
+      expect(subagentUpserts(received.slice(beforeTick))).toEqual([]);
+    } finally {
+      host.close();
+      vi.useRealTimers();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("a paused run settles as canceled", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-paused-"));
+    const host = createPiExtensionHost();
+    try {
+      host.mapToolCall({
+        callId: "call-1",
+        toolName: "subagent",
+        args: { agent: "scout", task: "Inspect", async: true },
+        status: "completed",
+        result: {
+          details: { mode: "single", runId: "run-1", asyncId: "run-1", asyncDir: dir, results: [] },
+        },
+      });
+      expect(
+        host.mapCustomMessage({
+          role: "custom",
+          customType: "subagent-notify",
+          content: [
+            "Background task paused: **scout**",
+            "",
+            `Retention-managed async directory: ${dir}`,
+          ].join("\n"),
+        })?.subagents,
+      ).toEqual([{ type: "upsert", id: "call-1", status: "canceled" }]);
+    } finally {
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("a paused workflow child notice settles its row as canceled", () => {
+    const host = createPiExtensionHost();
+    host.mapToolCall({
+      callId: "call-wf",
+      toolName: "subagent",
+      args: { workflow: "tmp/rigor-ui-test.js", async: true },
+      status: "completed",
+      result: {
+        details: {
+          mode: "workflow",
+          runId: "run-wf",
+          asyncId: "run-wf",
+          asyncDir: "/nonexistent",
+          results: [],
+        },
+      },
+    });
+    expect(
+      host.mapCustomMessage({
+        role: "custom",
+        customType: "subagent-incremental-child-notify",
+        content: "Workflow child paused (needs attention): **alpha**\nWorkflow run: run-wf",
+      })?.subagents,
+    ).toEqual([{ type: "upsert", id: "call-wf:alpha", status: "canceled" }]);
+  });
+
+  test("partial and rejected runs settle every child instead of leaving a spinner", async () => {
+    for (const [state, expected] of [
+      ["partial", ["completed", "completed", "canceled"]],
+      ["rejected", ["completed", "completed", "failed"]],
+    ] as const) {
+      vi.useFakeTimers();
+      const dir = await mkdtemp(join(tmpdir(), "paseo-pi-partial-"));
+      const received: AgentStreamEvent[] = [];
+      const host = createPiExtensionHost();
+      try {
+        host.mapToolCall({
+          callId: "call-wf",
+          toolName: "subagent",
+          args: { workflow: "tmp/rigor-ui-test.js", async: true },
+          status: "completed",
+          result: {
+            details: {
+              mode: "workflow",
+              runId: "run-wf",
+              asyncId: "run-wf",
+              asyncDir: dir,
+              results: [],
+            },
+          },
+        });
+        await writeFile(
+          join(dir, "status.json"),
+          JSON.stringify({
+            state,
+            steps: [
+              { agent: "scout", workflowKey: "alpha", status: "complete" },
+              // WorkflowNodeStatus spells the same outcome `completed`.
+              { agent: "auditor", workflowKey: "gamma", status: "completed" },
+              {
+                agent: "reviewer",
+                workflowKey: "beta",
+                status: state === "partial" ? "running" : "failed",
+              },
+            ],
+          }),
+        );
+        host.follow((event) => received.push(event));
+        await vi.advanceTimersByTimeAsync(250);
+
+        expect(subagentUpserts(received).map((event) => [event.id, event.status])).toEqual(
+          expect.arrayContaining([
+            ["call-wf:alpha", expected[0]],
+            ["call-wf:gamma", expected[1]],
+            ["call-wf:beta", expected[2]],
+            ["call-wf", "canceled"],
+          ]),
+        );
+        expect(
+          subagentUpserts(received).filter((event) => event.status === "running"),
+        ).toHaveLength(0);
+
+        // The run is terminal, so the poll stops instead of re-reporting fresh rows.
+        const settled = received.length;
+        await vi.advanceTimersByTimeAsync(250 * 4);
+        expect(received.length).toBe(settled);
+      } finally {
+        host.close();
+        vi.useRealTimers();
+        await rm(dir, { recursive: true, force: true });
+      }
+    }
+  });
+
+  test("a child notice keeps its status while the run is still reporting", async () => {
+    vi.useFakeTimers();
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-notice-pin-"));
+    const received: AgentStreamEvent[] = [];
+    const host = createPiExtensionHost();
+    try {
+      host.mapToolCall({
+        callId: "call-wf",
+        toolName: "subagent",
+        args: { workflow: "tmp/rigor-ui-test.js", async: true },
+        status: "completed",
+        result: {
+          details: {
+            mode: "workflow",
+            runId: "run-wf",
+            asyncId: "run-wf",
+            asyncDir: dir,
+            results: [],
+          },
+        },
+      });
+      // The stale step entry still says running; the child's notice is its verdict.
+      await writeFile(
+        join(dir, "status.json"),
+        JSON.stringify({
+          state: "running",
+          steps: [
+            { agent: "scout", workflowKey: "alpha", status: "complete" },
+            { agent: "reviewer", workflowKey: "beta", status: "running" },
+          ],
+        }),
+      );
+      host.follow((event) => received.push(event));
+      await vi.advanceTimersByTimeAsync(250);
+      expect(
+        host.mapCustomMessage({
+          role: "custom",
+          customType: "subagent-incremental-child-notify",
+          content: "Workflow child completed: **alpha**\nWorkflow run: run-wf",
+        })?.subagents,
+      ).toEqual([{ type: "upsert", id: "call-wf:alpha", status: "completed" }]);
+
+      const beforeNotice = received.length;
+      await vi.advanceTimersByTimeAsync(250 * 3);
+      expect(
+        subagentUpserts(received.slice(beforeNotice)).filter(
+          (event) => event.id === "call-wf:alpha",
+        ),
+      ).toEqual([]);
+      // The rest of the run keeps re-reporting, so this is not a poll that simply stopped.
+      expect(reportedUpsert(received.slice(beforeNotice), "call-wf:beta")).toBe(true);
+    } finally {
+      host.close();
+      vi.useRealTimers();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("a child notice's verdict survives the run's terminal tick", async () => {
+    vi.useFakeTimers();
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-notice-terminal-"));
+    const received: AgentStreamEvent[] = [];
+    const host = createPiExtensionHost();
+    try {
+      host.mapToolCall({
+        callId: "call-wf",
+        toolName: "subagent",
+        args: { workflow: "tmp/rigor-ui-test.js", async: true },
+        status: "completed",
+        result: {
+          details: {
+            mode: "workflow",
+            runId: "run-wf",
+            asyncId: "run-wf",
+            asyncDir: dir,
+            results: [],
+          },
+        },
+      });
+      host.follow((event) => received.push(event));
+      // The child's notice settles it before the run itself ends.
+      expect(
+        host.mapCustomMessage({
+          role: "custom",
+          customType: "subagent-incremental-child-notify",
+          content: "Workflow child completed: **alpha**\nWorkflow run: run-wf",
+        })?.subagents,
+      ).toEqual([{ type: "upsert", id: "call-wf:alpha", status: "completed" }]);
+
+      // The run then ends without a verdict for alpha: its step entry still says running, which the
+      // terminal tick would read as canceled if the notice were not the child's verdict.
+      await writeFile(
+        join(dir, "status.json"),
+        JSON.stringify({
+          state: "stopped",
+          steps: [
+            { agent: "scout", workflowKey: "alpha", status: "running" },
+            { agent: "reviewer", workflowKey: "beta", status: "stopped" },
+          ],
+        }),
+      );
+      await vi.advanceTimersByTimeAsync(250);
+
+      expect(
+        subagentUpserts(received).filter((event) => event.id === "call-wf:alpha" && event.status),
+      ).toEqual([expect.objectContaining({ id: "call-wf:alpha", status: "completed" })]);
+      // The child that never reported a verdict of its own is still settled by that tick.
+      expect(
+        subagentUpserts(received).findLast((event) => event.id === "call-wf:beta")?.status,
+      ).toBe("canceled");
+    } finally {
+      host.close();
+      vi.useRealTimers();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("gives up without rewriting a child that already settled", async () => {
+    vi.useFakeTimers();
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-giveup-"));
+    const received: AgentStreamEvent[] = [];
+    const host = createPiExtensionHost();
+    try {
+      host.mapToolCall({
+        callId: "call-wf",
+        toolName: "subagent",
+        args: { workflow: "tmp/rigor-ui-test.js", async: true },
+        status: "completed",
+        result: {
+          details: {
+            mode: "workflow",
+            runId: "run-wf",
+            asyncId: "run-wf",
+            asyncDir: dir,
+            results: [],
+          },
+        },
+      });
+      await writeFile(
+        join(dir, "status.json"),
+        JSON.stringify({
+          state: "running",
+          steps: [
+            { agent: "scout", workflowKey: "alpha", status: "complete" },
+            { agent: "reviewer", workflowKey: "beta", status: "running" },
+          ],
+        }),
+      );
+      host.follow((event) => received.push(event));
+      await vi.advanceTimersByTimeAsync(250);
+      expect(reportedUpsert(received, "call-wf:beta")).toBe(true);
+
+      // The workflow keeps running, so polling continues after the child's own notice.
+      expect(
+        host.mapCustomMessage({
+          role: "custom",
+          customType: "subagent-incremental-child-notify",
+          content: "Workflow child completed: **alpha**\nWorkflow run: run-wf",
+        })?.subagents,
+      ).toEqual([{ type: "upsert", id: "call-wf:alpha", status: "completed" }]);
+
+      await rm(join(dir, "status.json"));
+      await vi.advanceTimersByTimeAsync(250 * 241);
+
+      expect(
+        subagentUpserts(received).some(
+          (event) => event.id === "call-wf:alpha" && event.status === "canceled",
+        ),
+      ).toBe(false);
+      expect(
+        subagentUpserts(received).findLast((event) => event.id === "call-wf:beta")?.status,
+      ).toBe("canceled");
+    } finally {
+      host.close();
+      vi.useRealTimers();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("a run's final notice cancels the children it stopped with", async () => {
+    vi.useFakeTimers();
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-stopped-children-"));
+    const received: AgentStreamEvent[] = [];
+    const host = createPiExtensionHost();
+    try {
+      host.mapToolCall({
+        callId: "call-wf",
+        toolName: "subagent",
+        args: { workflow: "tmp/rigor-ui-test.js", async: true },
+        status: "completed",
+        result: {
+          details: {
+            mode: "workflow",
+            runId: "run-wf",
+            asyncId: "run-wf",
+            asyncDir: dir,
+            results: [],
+          },
+        },
+      });
+      await writeFile(
+        join(dir, "status.json"),
+        JSON.stringify({
+          state: "running",
+          steps: [
+            { agent: "scout", workflowKey: "alpha", status: "running" },
+            { agent: "reviewer", workflowKey: "beta", status: "running" },
+          ],
+        }),
+      );
+      host.follow((event) => received.push(event));
+      await vi.advanceTimersByTimeAsync(250);
+      expect(reportedUpsert(received, "call-wf:beta")).toBe(true);
+
+      // alpha reports its own verdict before the run stops.
+      expect(
+        host.mapCustomMessage({
+          role: "custom",
+          customType: "subagent-incremental-child-notify",
+          content: "Workflow child completed: **alpha**\nWorkflow run: run-wf",
+        })?.subagents,
+      ).toEqual([{ type: "upsert", id: "call-wf:alpha", status: "completed" }]);
+
+      // The run then stops with beta unfinished. The notice ends the poll, so no later tick will
+      // ever report beta: it settles as canceled, never completed. alpha keeps its own verdict.
+      expect(
+        host.mapCustomMessage({
+          role: "custom",
+          customType: "subagent-notify",
+          content: [
+            "Background task stopped: **rigor-ui-test.js**",
+            "",
+            `Retention-managed async directory: ${dir}`,
+          ].join("\n"),
+        })?.subagents,
+      ).toEqual([
+        { type: "upsert", id: "call-wf", status: "canceled" },
+        { type: "upsert", id: "call-wf:beta", status: "canceled" },
+      ]);
+
+      // Polling is off; the status file still says running and must not bring the rows back.
+      const settled = received.length;
+      await vi.advanceTimersByTimeAsync(250 * 3);
+      expect(received.length).toBe(settled);
+    } finally {
+      host.close();
+      vi.useRealTimers();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("names a child a notice settled before the first poll saw it", async () => {
+    vi.useFakeTimers();
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-fast-child-"));
+    const received: AgentStreamEvent[] = [];
+    const host = createPiExtensionHost();
+    try {
+      host.mapToolCall({
+        callId: "call-wf",
+        toolName: "subagent",
+        args: { workflow: "tmp/rigor-ui-test.js", async: true },
+        status: "completed",
+        result: {
+          details: {
+            mode: "workflow",
+            runId: "run-wf",
+            asyncId: "run-wf",
+            asyncDir: dir,
+            results: [],
+          },
+        },
+      });
+      // A fast child reports before any poll tick, so its row is born without a name.
+      expect(
+        host.mapCustomMessage({
+          role: "custom",
+          customType: "subagent-incremental-child-notify",
+          content: "Workflow child completed: **alpha**\nWorkflow run: run-wf",
+        })?.subagents,
+      ).toEqual([{ type: "upsert", id: "call-wf:alpha", status: "completed" }]);
+
+      await writeFile(
+        join(dir, "status.json"),
+        JSON.stringify({
+          state: "running",
+          steps: [{ agent: "scout", workflowKey: "alpha", status: "running" }],
+        }),
+      );
+      host.follow((event) => received.push(event));
+      await vi.advanceTimersByTimeAsync(250);
+
+      // The poll leaves the settled status alone but still fills the name status.json carries.
+      const alphaUpserts = () =>
+        subagentUpserts(received).filter((event) => event.id === "call-wf:alpha");
+      expect(alphaUpserts()).toEqual([
+        {
+          type: "upsert",
+          id: "call-wf:alpha",
+          title: "scout",
+          status: "completed",
+        },
+      ]);
+
+      // Reported once, not on every tick.
+      await vi.advanceTimersByTimeAsync(250 * 2);
+      expect(alphaUpserts()).toHaveLength(1);
+    } finally {
+      host.close();
+      vi.useRealTimers();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("a workflow that reported rows replaces its placeholder with them", () => {
+    const host = createPiExtensionHost();
+    const args = { workflow: true };
+    // The launch placeholder is replaced once the workflow supplies its child rows.
+    expect(
+      host.mapToolCall({
+        callId: "fanout",
+        toolName: "subagent",
+        args,
+        status: "running",
+        result: null,
+      })?.subagents,
+    ).toEqual([expect.objectContaining({ id: "fanout", status: "running" })]);
+    expect(
+      host.mapToolCall({
+        callId: "fanout",
+        toolName: "subagent",
+        args,
+        status: "completed",
+        result: {
+          details: {
+            mode: "workflow",
+            results: [
+              { index: 0, agent: "scout", workflowKey: "alpha", success: true, exitCode: 0 },
+              { index: 1, agent: "reviewer", workflowKey: "beta", success: true, exitCode: 0 },
+            ],
+          },
+        },
+      })?.subagents,
+    ).toEqual([
+      { type: "remove", id: "fanout" },
+      expect.objectContaining({ id: "fanout:alpha", title: "scout", status: "completed" }),
+      expect.objectContaining({ id: "fanout:beta", title: "reviewer", status: "completed" }),
+    ]);
+  });
+  test("replays keyed async workflow child transcripts without a live poll", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-workflow-replay-"));
+    const host = createPiExtensionHost();
+    try {
+      const sessionFile = join(dir, "child.jsonl");
+      await writeFile(
+        sessionFile,
+        JSON.stringify({
+          type: "message",
+          message: {
+            role: "assistant",
+            content: [{ type: "text", text: "Saved reviewer answer" }],
+          },
+        }) + "\n",
+      );
+      await writeFile(
+        join(dir, "status.json"),
+        JSON.stringify({
+          state: "complete",
+          steps: [{ agent: "reviewer", workflowKey: "review", status: "complete", sessionFile }],
+        }),
+      );
+      const output = host.mapToolCall({
+        callId: "replayed-workflow",
+        toolName: "subagent",
+        args: { workflowScript: "return await runs.all(items);", async: true },
+        status: "completed",
+        result: {
+          details: {
+            mode: "workflow",
+            runId: "saved-run",
+            asyncId: "saved-run",
+            asyncDir: dir,
+            results: [],
+          },
+        },
+      });
+      const events = await output!.hydration;
+      expect(
+        events.some(
+          (event) =>
+            event.type === "provider_subagent" &&
+            event.event.type === "timeline" &&
+            event.event.id === "replayed-workflow:review",
+        ),
+      ).toBe(true);
+    } finally {
+      host.close();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("stops following a child whose completion arrived before its transcript was attached", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "paseo-pi-finished-reader-"));
+    const host = createPiExtensionHost();
+    const received: AgentStreamEvent[] = [];
+    try {
+      const sessionFile = join(dir, "child.jsonl");
+      const message = (text: string) =>
+        JSON.stringify({
+          type: "message",
+          message: {
+            role: "assistant",
+            content: [{ type: "text", text }],
+          },
+        }) + "\n";
+      await writeFile(sessionFile, message("Finished child"));
+      host.follow((event) => received.push(event));
+      const spawn = host.mapToolCall({
+        callId: "fast-workflow",
+        toolName: "subagent",
+        args: { workflow: true, async: true },
+        status: "completed",
+        result: {
+          details: {
+            mode: "workflow",
+            runId: "fast-run",
+            asyncId: "fast-run",
+            asyncDir: dir,
+            results: [],
+          },
+        },
+      });
+      await spawn!.hydration;
+      const notice = host.mapCustomMessage({
+        role: "custom",
+        customType: "subagent-incremental-child-notify",
+        content: "Workflow child completed: **review**\nWorkflow run: fast-run",
+      });
+      await notice!.hydration;
+      await writeFile(
+        join(dir, "status.json"),
+        JSON.stringify({
+          state: "running",
+          steps: [{ agent: "reviewer", workflowKey: "review", status: "running", sessionFile }],
+        }),
+      );
+      await expect.poll(() => hasChildTimeline(received)).toBe(true);
+      const timelineCount = () =>
+        received.filter(
+          (event) => event.type === "provider_subagent" && event.event.type === "timeline",
+        ).length;
+      const count = timelineCount();
+      await appendFile(sessionFile, message("Later content must not be followed"));
+      await new Promise((resolve) => setTimeout(resolve, 600));
+      expect(timelineCount()).toBe(count);
+    } finally {
+      host.close();
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
 });
@@ -2,12 +2,20 @@ import { z } from "zod";
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
 import { extractTextFromToolResult } from "../../tool-call-mapper.js";
+import type { PiAgentMessage } from "../../rpc-types.js";
+import type { ProviderSubagentInputEvent } from "../../../../provider-subagents/store.js";
 import type { PiExtension, PiExtensionToolCall, PiExtensionToolMapping } from "../contract.js";

+type CustomMessage = Extract<PiAgentMessage, { role: "custom" }>;
+type SubagentUpsert = Extract<ProviderSubagentInputEvent, { type: "upsert" }>;
+
 const Args = z
  .object({
    agent: z.string().trim().min(1).optional(),
    task: z.string().trim().min(1).optional(),
+    workflow: z.union([z.string().trim().min(1), z.literal(true)]).optional(),
+    // `subagent({ workflow: true })` launches the reply's script; Pi delivers it as this field.
+    workflowScript: z.string().trim().min(1).optional(),
    async: z.boolean().optional(),
    action: z.unknown().optional(),
  })
@@ -16,6 +24,7 @@ const Row = z
  .object({
    index: z.number().int().nonnegative().optional(),
    agent: z.string().trim().min(1),
+    workflowKey: z.string().trim().min(1).optional(),
    exitCode: z.number().optional(),
    success: z.boolean().optional(),
    sessionFile: z.string().trim().min(1).optional(),
@@ -41,6 +50,7 @@ const AsyncStatus = z
      z
        .object({
          agent: z.string().trim().min(1),
+          workflowKey: z.string().trim().min(1).optional(),
          status: z.string().optional(),
          sessionFile: z.string().trim().min(1).optional(),
        })
@@ -49,21 +59,116 @@ const AsyncStatus = z
  })
  .passthrough();

+/**
+ * Run states that will not change again: `paused` waits on the user, and `partial`/`rejected`
+ * still end the run even when some steps never produced a result of their own.
+ */
+const TERMINAL_RUN_STATES = new Set([
+  "complete",
+  "failed",
+  "stopped",
+  "paused",
+  "partial",
+  "rejected",
+]);
+/** The run's status file, or undefined while it is missing or not yet readable. */
+function readAsyncStatus(dir: string): z.infer<typeof AsyncStatus> | undefined {
+  try {
+    const parsed = AsyncStatus.safeParse(
+      JSON.parse(readFileSync(join(dir, "status.json"), "utf8")),
+    );
+    return parsed.success ? parsed.data : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+/** One async run the poll follows, keyed by its async directory. */
+interface AsyncRun {
+  owner: string;
+  polling: boolean;
+  misses: number;
+  deadline: number;
+  rows: Set<string>;
+}
+
+/**
+ * Missing ticks before a status directory counts as gone: 60 s at the 250 ms follow cadence. A live
+ * run can briefly lose its file while the concurrency queue starts it or retention rotates it.
+ */
+const POLL_MISS_LIMIT = 240;
+/**
+ * A run that never reaches a terminal state in its status file must not keep a card spinning
+ * forever. pi-subagents' own default run timeout is 30 minutes; this is the backstop.
+ */
+const POLL_TTL_MS = 6 * 60 * 60 * 1000;
+
 function asyncChildStatus(runState: string, stepStatus?: string) {
-  if (!["complete", "failed", "stopped"].includes(runState)) return "running";
-  if (runState === "stopped" || stepStatus === "stopped") return "canceled";
+  if (!TERMINAL_RUN_STATES.has(runState)) return "running";
+  // A partial or rejected run says nothing about its individual children: read their own outcome,
+  // and treat a step that never reached one as canceled rather than still running.
+  if (runState === "partial" || runState === "rejected") {
+    // Two vocabularies: status.json steps say `complete`, WorkflowNodeStatus says `completed`.
+    if (stepStatus === "complete" || stepStatus === "completed") return "completed";
+    if (stepStatus === "failed" || stepStatus === "error") return "failed";
+    return "canceled";
+  }
+  if (runState === "stopped" || runState === "paused" || stepStatus === "stopped")
+    return "canceled";
  if (runState === "failed" || stepStatus === "failed" || stepStatus === "error") return "failed";
  return "completed";
 }

-/** The `subagent-notify` header; a grouped notice reports every run as completed. */
+/** The status of the run itself, used for the row a launch opened before its children reported. */
+function asyncRunStatus(runState: string) {
+  if (runState === "complete") return "completed" as const;
+  if (runState === "failed") return "failed" as const;
+  return "canceled" as const;
+}
+
+/**
+ * The `subagent-notify` / `subagent-incremental-child-notify` header. A grouped notice reports
+ * every run as completed; a paused run is waiting on the user, which the track shows as canceled.
+ */
 function noticeStatus(header: string) {
  if (/^Background tasks completed \(\d+\):/.test(header)) return "completed";
  const outcome = header.match(
-    /^(?:Background task|Detached foreground task) (completed|failed|stopped): \*\*/,
+    /^(?:Background task|Detached foreground task|Workflow child) (completed|failed|paused|stopped)(?: \([^)]*\))?: \*\*/,
  )?.[1];
-  if (outcome === "stopped") return "canceled";
-  return outcome as "completed" | "failed" | undefined;
+  if (!outcome) return undefined;
+  return outcome === "paused" || outcome === "stopped"
+    ? ("canceled" as const)
+    : (outcome as "completed" | "failed");
+}
+
+/**
+ * A workflow launch carries no `agent`/`task`: the children are declared by the script. Its label
+ * is the script file name, or the bare `workflow` of the reply-block form.
+ */
+function workflowLabel(workflow: string | true | undefined) {
+  if (workflow === undefined) return undefined;
+  if (workflow === true) return "workflow";
+  const segments = workflow.split(/[\\/]/).filter(Boolean);
+  return segments[segments.length - 1] ?? workflow;
+}
+
+/**
+ * A workflow launch carries no agent/task; its children are declared by the script. A reply-scoped
+ * script arrives as `workflowScript` instead of a `workflow` path, so it takes the generic label.
+ */
+function workflowTitle(args: { workflow?: string | true; workflowScript?: string }) {
+  const label = workflowLabel(args.workflow);
+  if (label !== undefined) return label;
+  return args.workflowScript === undefined ? undefined : "workflow";
+}
+
+/**
+ * A row keeps one id from launch to settle: the owner alone for a single unnamed child, otherwise
+ * `owner:key`. Workflow children carry their `workflowKey`, so progress updates, child notices and
+ * final results all land on the same row.
+ */
+function rowId(owner: string, count: number, key: string | undefined, index: number) {
+  return count === 1 && !key ? owner : `${owner}:${key ?? index}`;
 }

 export const piSubagents: PiExtension = {
@@ -71,13 +176,64 @@ export const piSubagents: PiExtension = {
  createSession: () => {
    const callsByRun = new Map<string, string>();
    const readSessions = new Set<string>();
+    /** Rows already reported terminal; a late give-up must not rewrite one of them. */
+    const settledRows = new Map<string, NonNullable<SubagentUpsert["status"]>>();
+    /** Rows whose poll already reported the step's agent. A settled row is still named once. */
+    const namedRows = new Set<string>();
+    const recordTerminal = (id: string, status: NonNullable<SubagentUpsert["status"]>) => {
+      if (status !== "running") settledRows.set(id, status);
+    };
    /** Keyed by async directory, which both status.json and the completion notice carry. */
-    const asyncRuns = new Map<string, { owner: string; polling: boolean }>();
+    const asyncRuns = new Map<string, AsyncRun>();
    const rememberAsyncRun = (details: z.infer<typeof Details>, call: PiExtensionToolCall) => {
      if (details.asyncDir && call.status !== "failed") {
-        asyncRuns.set(details.asyncDir, { owner: call.callId, polling: true });
+        asyncRuns.set(details.asyncDir, {
+          owner: call.callId,
+          polling: true,
+          misses: 0,
+          deadline: Date.now() + POLL_TTL_MS,
+          rows: new Set<string>(),
+        });
      }
    };
+    /**
+     * The run is over and nothing will ever update its rows again, so settle them rather than leave a
+     * spinner. A row that already reported a terminal status keeps it: this is not its verdict.
+     */
+    const giveUpRun = (run: AsyncRun) => {
+      run.polling = false;
+      const subagents: NonNullable<PiExtensionToolMapping["subagents"]> = [];
+      for (const id of new Set([run.owner, ...run.rows])) {
+        if (settledRows.has(id)) continue;
+        subagents.push({ type: "upsert", id, status: "canceled" });
+      }
+      return subagents;
+    };
+    /**
+     * The notice is the run's last word: it ends the poll, settles the launch row, and cancels the
+     * children the run stopped with. No later tick will report those, and nothing here proves they
+     * succeeded, so they settle as canceled. A child that already reported its own verdict keeps it.
+     */
+    const settleRunNotice = (run: AsyncRun, status: "completed" | "failed" | "canceled") => {
+      // A stale status.json must not revert this card either.
+      run.polling = false;
+      recordTerminal(run.owner, status);
+      const subagents: NonNullable<PiExtensionToolMapping["subagents"]> = [
+        { type: "upsert", id: run.owner, status },
+      ];
+      for (const id of run.rows) {
+        if (settledRows.has(id)) continue;
+        subagents.push({ type: "upsert", id, status: "canceled" });
+      }
+      return subagents;
+    };
+    /**
+     * A row id can settle twice: a completion notice records a verdict in `settledRows`, and a
+     * `subagent_wait` result repeats the run's rows with the run's own verdict. Both are terminal, so
+     * a disagreement moves a row terminal-to-terminal (completed → failed) and never resurrects it;
+     * the owner row is what carries the run outcome.
+     */
+    // ponytail: child verdicts can diverge between notice and bg_wait result — unify when one source of truth exists
    const collectRows = (
      owner: string,
      rows: z.infer<typeof Row>[],
@@ -87,17 +243,19 @@ export const piSubagents: PiExtension = {
      const subagents: NonNullable<PiExtensionToolMapping["subagents"]> = [];
      const childSessions: NonNullable<PiExtensionToolMapping["childSessions"]> = [];
      for (const [index, row] of rows.entries()) {
-        const id = rows.length === 1 ? owner : `${owner}:${row.index ?? index}`;
+        const id = rowId(owner, rows.length, row.workflowKey, row.index ?? index);
+        const status =
+          failed || row.success === false || (row.success !== true && row.exitCode !== 0)
+            ? ("failed" as const)
+            : ("completed" as const);
+        recordTerminal(id, status);
        subagents.push({
          type: "upsert",
          id,
          title: row.agent,
          description,
          toolCallId: owner,
-          status:
-            failed || row.success === false || (row.success !== true && row.exitCode !== 0)
-              ? "failed"
-              : "completed",
+          status,
        });
        if (row.sessionFile && !readSessions.has(row.sessionFile)) {
          readSessions.add(row.sessionFile);
@@ -123,66 +281,164 @@ export const piSubagents: PiExtension = {
      }
      return subagents.length ? { subagents, childSessions } : undefined;
    };
-    const mapSpawn = (call: PiExtensionToolCall) => {
-      const args = Args.safeParse(call.args);
-      if (!args.success || args.data.action !== undefined || !args.data.agent || !args.data.task)
-        return undefined;
-      const detail = {
-        type: "sub_agent" as const,
-        subAgentType: args.data.agent,
-        description: args.data.task,
-        log: extractTextFromToolResult(call.result)?.trim() ?? "",
-      };
-      const base = {
-        type: "upsert" as const,
-        id: call.callId,
-        title: args.data.agent,
-        description: args.data.task,
-        toolCallId: call.callId,
-      };
-      if (call.status === "running")
-        return { detail, subagents: [{ ...base, status: "running" as const }] };
+    /** Project a saved status both when replaying a launch and when its live poll advances. */
+    const projectAsyncStatus = (run: AsyncRun, status: z.infer<typeof AsyncStatus>) => {
+      const subagents: NonNullable<PiExtensionToolMapping["subagents"]> = [];
+      const childSessions: NonNullable<PiExtensionToolMapping["childSessions"]> = [];
+      const runTerminal = TERMINAL_RUN_STATES.has(status.state);
+      for (const [index, step] of status.steps.entries()) {
+        const id = rowId(run.owner, status.steps.length, step.workflowKey, index);
+        run.rows.add(id);
+        // A child's notice supplies its verdict even when its saved status is stale. Reuse that
+        // verdict when attaching a transcript or filling its name after the notice arrived.
+        const settledStatus = settledRows.get(id);
+        const childSession =
+          step.sessionFile && !readSessions.has(step.sessionFile)
+            ? { id, file: step.sessionFile }
+            : undefined;
+        if (!settledStatus) {
+          const childStatus = asyncChildStatus(status.state, step.status);
+          recordTerminal(id, childStatus);
+          namedRows.add(id);
+          subagents.push({
+            type: "upsert",
+            id,
+            title: step.agent,
+            status: childStatus,
+          });
+        } else if (!namedRows.has(id) || childSession) {
+          // Attach a late transcript with its known verdict, so the host reads it once instead of
+          // starting a follower that no later terminal update will release.
+          namedRows.add(id);
+          subagents.push({
+            type: "upsert",
+            id,
+            title: step.agent,
+            status: settledStatus,
+          });
+        }
+        if (childSession) {
+          readSessions.add(childSession.file);
+          childSessions.push(childSession);
+        }
+      }
+      if (runTerminal) run.polling = false;
+      // The launch row stands for the whole run, and a single unnamed child already took its
+      // id.
+      // A row that already settled keeps that verdict: a result that landed before the run's
+      // steps named its children must not be reverted to running by the next tick.
+      if (!run.rows.has(run.owner) && !settledRows.has(run.owner)) {
+        const ownerStatus = run.polling ? ("running" as const) : asyncRunStatus(status.state);
+        recordTerminal(run.owner, ownerStatus);
+        subagents.push({
+          type: "upsert",
+          id: run.owner,
+          status: ownerStatus,
+        });
+      }
+      return { subagents, childSessions };
+    };
+    /** A settled spawn: Pi either reports the rows it ran, or an async directory the poll follows. */
+    const mapSettledSpawn = (
+      call: PiExtensionToolCall,
+      base: SubagentUpsert,
+      description: string | undefined,
+      asyncRequested: boolean,
+    ): Pick<PiExtensionToolMapping, "subagents" | "childSessions"> => {
+      const failed = call.status === "failed";
      const details = Details.safeParse(
        typeof call.result === "object" ? call.result?.details : null,
      );
-      if (!details.success || details.data.mode === "management")
-        return call.status === "failed"
-          ? { detail, subagents: [{ ...base, status: "failed" as const }] }
-          : { detail };
+      if (!details.success || details.data.mode === "management") {
+        if (!failed) return { subagents: [] };
+        recordTerminal(call.callId, "failed");
+        return { subagents: [{ ...base, status: "failed" as const }] };
+      }
      if (details.data.runId) callsByRun.set(details.data.runId, call.callId);
-      if (details.data.results.length === 0 && (details.data.asyncId || args.data.async)) {
+      if (details.data.results.length === 0) {
+        if (failed) {
+          recordTerminal(call.callId, "failed");
+          return { subagents: [{ ...base, status: "failed" as const }] };
+        }
+        if (!details.data.asyncId && !asyncRequested) {
+          // ponytail: inferred completion — revisit if pi can return success while a child outlives the call.
+          recordTerminal(call.callId, "completed");
+          return { subagents: [{ ...base, status: "completed" as const }] };
+        }
+        // Follow the async run from its saved status or later poll updates.
        rememberAsyncRun(details.data, call);
+        const dir = details.data.asyncDir;
+        const run = dir ? asyncRuns.get(dir) : undefined;
+        const status = dir ? readAsyncStatus(dir) : undefined;
+        if (run && status) return projectAsyncStatus(run, status);
+        return { subagents: [{ ...base, status: "running" as const }] };
+      }
+      const collected = collectRows(call.callId, details.data.results, description, failed);
+      // A run that reported rows of its own never keeps the placeholder card it opened at launch.
+      if (!collected.subagents.some((event) => event.id === call.callId)) {
+        collected.subagents.unshift({ type: "remove", id: call.callId });
+      }
+      return collected;
+    };
+    const mapSpawn = (call: PiExtensionToolCall) => {
+      const args = Args.safeParse(call.args);
+      if (!args.success || args.data.action !== undefined) return undefined;
+      const single = Boolean(args.data.agent && args.data.task);
+      let workflow: string | undefined;
+      if (!single) workflow = workflowTitle(args.data);
+      if (!single && workflow === undefined) return undefined;
+      const base = {
+        type: "upsert" as const,
+        id: call.callId,
+        title: (single ? args.data.agent : workflow) ?? "workflow",
+        description: args.data.task,
+        toolCallId: call.callId,
+      };
+      const detail = {
+        type: "sub_agent" as const,
+        subAgentType: base.title,
+        description: args.data.task,
+        log: extractTextFromToolResult(call.result)?.trim() ?? "",
+      };
+      // ponytail: replay re-emits running before the settled rows land — one-pass client flip, upgrade when replay maps calls with their results first
+      if (call.status === "running")
        return {
          detail,
-          subagents: [
-            {
-              ...base,
-              status: call.status === "failed" ? ("failed" as const) : ("running" as const),
-            },
-          ],
+          subagents: [{ ...base, status: "running" as const }],
        };
-      }
-      if (details.data.results.length === 0 && call.status === "failed")
-        return { detail, subagents: [{ ...base, status: "failed" as const }] };
      return {
        detail,
-        ...collectRows(call.callId, details.data.results, args.data.task, call.status === "failed"),
+        ...mapSettledSpawn(call, base, args.data.task, Boolean(args.data.async)),
      };
    };
+    const noticeText = (message: CustomMessage) =>
+      typeof message.content === "string"
+        ? message.content
+        : extractTextFromToolResult({ content: message.content });
+    const mapWorkflowChildNotice = (message: CustomMessage) => {
+      const lines = noticeText(message)?.split("\n") ?? [];
+      const status = noticeStatus(lines[0] ?? "");
+      const key = lines[0]?.match(
+        /^Workflow child (?:completed|failed|paused|stopped)(?: \([^)]*\))?: \*\*(.+?)\*\*/,
+      )?.[1];
+      const runId = lines.find((line) => line.startsWith("Workflow run: "))?.slice(14);
+      const owner = runId ? callsByRun.get(runId) : undefined;
+      if (!status || !key || !owner) return undefined;
+      const id = `${owner}:${key}`;
+      recordTerminal(id, status);
+      return { subagents: [{ type: "upsert" as const, id, status }] };
+    };
    return {
      mapToolCall(call) {
        if (call.toolName === "bg_wait") return mapWait(call);
        if (call.toolName === "subagent") return mapSpawn(call);
        return undefined;
      },
-      // The notice is the only completion Pi persists, so replay settles async runs from it.
      mapCustomMessage(message) {
+        if (message.customType === "subagent-incremental-child-notify")
+          return mapWorkflowChildNotice(message);
        if (message.customType !== "subagent-notify") return undefined;
-        const text =
-          typeof message.content === "string"
-            ? message.content
-            : extractTextFromToolResult({ content: message.content });
-        const lines = text?.split("\n") ?? [];
+        const lines = noticeText(message)?.split("\n") ?? [];
        const status = noticeStatus(lines[0] ?? "");
        if (!status) return undefined;
        const subagents: NonNullable<PiExtensionToolMapping["subagents"]> = [];
@@ -192,8 +448,10 @@ export const piSubagents: PiExtension = {
        for (const line of lines) {
          const dir = line.match(/^Retention-managed async directory: (.+)$/)?.[1];
          if (dir) {
-            owner = asyncRuns.get(dir)?.owner;
-            if (owner) subagents.push({ type: "upsert", id: owner, status });
+            const run = asyncRuns.get(dir);
+            owner = run?.owner;
+            if (!run || !owner) continue;
+            subagents.push(...settleRunNotice(run, status));
            continue;
          }
          const file = owner ? line.match(/^Session file: (.+)$/)?.[1] : undefined;
@@ -209,36 +467,26 @@ export const piSubagents: PiExtension = {
      poll() {
        const subagents: NonNullable<PiExtensionToolMapping["subagents"]> = [];
        const childSessions: NonNullable<PiExtensionToolMapping["childSessions"]> = [];
+        const now = Date.now();
        for (const [dir, run] of asyncRuns) {
          if (!run.polling) continue;
-          let raw: unknown;
-          try {
-            raw = JSON.parse(readFileSync(join(dir, "status.json"), "utf8"));
-          } catch {
+          if (now >= run.deadline) {
+            subagents.push(...giveUpRun(run));
            continue;
          }
-          const parsed = AsyncStatus.safeParse(raw);
-          if (!parsed.success) continue;
-          const terminal = ["complete", "failed", "stopped"].includes(parsed.data.state);
-          for (const [index, step] of parsed.data.steps.entries()) {
-            const id = parsed.data.steps.length === 1 ? run.owner : `${run.owner}:${index}`;
-            const status = asyncChildStatus(parsed.data.state, step.status);
-            subagents.push({ type: "upsert", id, title: step.agent, status });
-            if (step.sessionFile && !readSessions.has(step.sessionFile)) {
-              readSessions.add(step.sessionFile);
-              childSessions.push({ id, file: step.sessionFile });
+          const status = readAsyncStatus(dir);
+          if (!status) {
+            run.misses += 1;
+            if (run.misses >= POLL_MISS_LIMIT) {
+              subagents.push(...giveUpRun(run));
+              continue;
            }
+            continue;
          }
-          if (terminal) {
-            if (parsed.data.steps.length === 0) {
-              subagents.push({
-                type: "upsert",
-                id: run.owner,
-                status: parsed.data.state === "complete" ? "completed" : "failed",
-              });
-            }
-            run.polling = false;
-          }
+          run.misses = 0;
+          const output = projectAsyncStatus(run, status);
+          subagents.push(...output.subagents);
+          childSessions.push(...output.childSessions);
        }
        return subagents.length || childSessions.length ? { subagents, childSessions } : undefined;
      },
@@ -6,7 +6,7 @@ import type { Logger } from "pino";

 import type { AgentMode, AgentProvider, AgentSessionConfig } from "../agent-sdk-types.js";
 import type { AgentManager } from "../agent-manager.js";
-import { ActiveTurnBehaviorSchema, AgentProfileSchema } from "@getpaseo/protocol/messages";
+import { AgentProfileSchema } from "@getpaseo/protocol/messages";
 import type { DaemonConfigStore } from "../../daemon-config-store.js";
 import {
  AgentFeatureSchema,
@@ -1209,9 +1209,6 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
    .object(legacyTopLevelCreateAgentInputSchema)
    .strict();
  const commonSendAgentPromptInputSchema = {
-    activeTurnBehavior: ActiveTurnBehaviorSchema.optional().describe(
-      'How to send into a running turn: "steer" joins it, falling back to interrupt when unavailable; "interrupt" replaces it. Defaults to steer for agent callers and interrupt otherwise.',
-    ),
    agentId: z.string(),
    prompt: z.string(),
    sessionMode: z.string().optional().describe("Optional mode to set before running the prompt."),
@@ -1958,55 +1955,28 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
      inputSchema: sendAgentPromptInputSchema,
      outputSchema: {
        success: z.boolean(),
-        disposition: z.enum(["turn_started", "out_of_band", "steered"]).optional(),
+        disposition: z.enum(["turn_started", "out_of_band"]).optional(),
        status: AgentStatusEnum,
        guidance: z.string().optional(),
      },
    },
-    async ({
-      agentId,
-      prompt,
-      sessionMode,
-      notifyOnFinish = Boolean(callerAgentId),
-      activeTurnBehavior = callerAgentId ? "steer" : "interrupt",
-    }) => {
+    async ({ agentId, prompt, sessionMode, notifyOnFinish = Boolean(callerAgentId) }) => {
      let stopNotification: (() => void) | undefined;
-      let acceptDispatch!: (result: PromptDispatchDisposition | false) => void;
-      const dispatchResult = new Promise<PromptDispatchDisposition | false>((resolve) => {
-        acceptDispatch = resolve;
-      });
-      const notifying = Boolean(callerAgentId && notifyOnFinish);
-      if (callerAgentId && notifyOnFinish) {
-        stopNotification = setupFinishNotification({
-          agentManager,
-          agentStorage,
-          childAgentId: agentId,
-          callerAgentId,
-          waitForTurnStart: false,
-          dispatchResult,
-          logger: childLogger,
-        });
-      }
-      function confirmDispatch(disposition: PromptDispatchDisposition): void {
-        // A new turn must ignore outcomes from the displaced turn. Its iterator
-        // has not started yet, so rearm here; steering keeps the early observer.
-        if (disposition !== "turn_started") {
-          acceptDispatch(disposition);
+      function armFinishNotification(disposition: PromptDispatchDisposition): void {
+        if (!callerAgentId || !notifyOnFinish) {
          return;
        }
-        acceptDispatch(disposition);
-        if (!callerAgentId || !notifyOnFinish) return;
-        stopNotification?.();
        stopNotification = setupFinishNotification({
          agentManager,
          agentStorage,
          childAgentId: agentId,
          callerAgentId,
-          waitForTurnStart: true,
+          waitForTurnStart: disposition === "turn_started",
          logger: childLogger,
        });
      }

+      const notifying = Boolean(callerAgentId && notifyOnFinish);
      const { disposition } = await sendPromptToAgent({
        agentManager,
        agentStorage,
@@ -2014,11 +1984,9 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
        prompt,
        source: callerAgentId ? { kind: "agent-message", agentId: callerAgentId } : undefined,
        sessionMode,
-        activeTurnBehavior,
-        onDispatch: confirmDispatch,
+        onDispatch: armFinishNotification,
        logger: childLogger,
      }).catch((error) => {
-        acceptDispatch(false);
        stopNotification?.();
        if (error instanceof AgentNotFoundError) {
          throw new PaseoToolInputError(error.message);
@@ -1,105 +0,0 @@
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
-import { fileURLToPath } from "node:url";
-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 { ClaudeAgentClient } from "../agent/providers/claude/agent.js";
-import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
-import { DaemonClient } from "../test-utils/daemon-client.js";
-
-test("background cards retain child actions after the parent finishes (#6253)", async () => {
-  const cwd = mkdtempSync(path.join(tmpdir(), "paseo-background-card-"));
-  const logger = pino({ level: "silent" });
-  const daemon = await createTestPaseoDaemon({
-    logger,
-    agentClients: { claude: new ClaudeAgentClient({ logger }) },
-  });
-  const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
-  try {
-    await client.connect();
-    await client.fetchAgents({ subscribe: {} });
-    const agent = await client.createAgent({
-      provider: "claude",
-      model: "haiku",
-      modeId: "bypassPermissions",
-      cwd,
-      title: "Background action log reproduction",
-    });
-    await client.sendMessage(
-      agent.id,
-      'In one message, call Agent twice with run_in_background true: first with subagent_type "general-purpose", description "List files", prompt "Run ls -1, then run sleep 20, then reply with the number of entries."; second with subagent_type "general-purpose", description "Print cwd", prompt "Run pwd, then run sleep 20, then reply with the path." After launching both, reply "launched" and end your turn immediately without waiting.',
-    );
-    await client.waitForFinish(agent.id, 180_000);
-    const atFinish = await client.fetchAgentTimeline(agent.id, {
-      direction: "tail",
-      limit: 0,
-      projection: "projected",
-    });
-    await expect
-      .poll(
-        async () => {
-          const { subagents } = await client.listProviderSubagents(agent.id);
-          return subagents.length === 2 && subagents.every((child) => child.status === "completed");
-        },
-        { timeout: 180_000, interval: 1000 },
-      )
-      .toBe(true);
-    const { subagents } = await client.listProviderSubagents(agent.id);
-    const children = await Promise.all(
-      subagents.map(async (child) => ({
-        description: child.description,
-        timeline: await client.fetchProviderSubagentTimeline(agent.id, child.id, {
-          direction: "tail",
-          limit: 0,
-        }),
-      })),
-    );
-    const final = await client.fetchAgentTimeline(agent.id, {
-      direction: "tail",
-      limit: 0,
-      projection: "projected",
-    });
-    const { stdout } = await promisify(execFile)(
-      process.execPath,
-      [
-        "--conditions=source",
-        "--import",
-        "tsx",
-        fileURLToPath(new URL("../../../../cli/src/index.ts", import.meta.url)),
-        "--host",
-        `127.0.0.1:${daemon.port}`,
-        "logs",
-        agent.id,
-      ],
-      { env: { ...process.env, PASEO_HOME: daemon.paseoHome }, timeout: 30_000 },
-    );
-    expect(stdout).toContain("[Bash] ls -1");
-    expect(stdout).toContain("[Bash] pwd");
-    expect(
-      atFinish.entries.filter(
-        (row) => row.item.type === "tool_call" && row.item.detail?.type === "sub_agent",
-      ),
-    ).toHaveLength(2);
-    const cards = final.entries
-      .map((row) => row.item)
-      .filter((item) => item.type === "tool_call" && item.detail?.type === "sub_agent");
-    expect(cards).toHaveLength(2);
-    for (const child of children) {
-      expect(
-        child.timeline.rows.some(
-          (row) => row.item.type === "tool_call" && row.item.name === "Bash",
-        ),
-      ).toBe(true);
-    }
-    for (const card of cards) {
-      expect(card.detail?.type === "sub_agent" ? card.detail.log : "").toContain("[Bash]");
-    }
-  } finally {
-    await client.close();
-    await daemon.close();
-    rmSync(cwd, { recursive: true, force: true });
-  }
-}, 420_000);
@@ -1,5 +1,5 @@
 import { createHook } from "node:async_hooks";
-import { execFileSync, spawn, type ChildProcess } from "node:child_process";
+import { execFileSync } from "node:child_process";
 import {
  mkdtempSync,
  mkdirSync,
@@ -1066,16 +1066,6 @@ describe("relative typed-entry configuration", () => {
  });
 });

-interface SearchProcessExit {
-  code: number | null;
-  signal: string | null;
-}
-
-interface SearchProcess {
-  child: ChildProcess;
-  exited: Promise<SearchProcessExit>;
-}
-
 // Reading a tree is cheap; re-deriving each entry's path state is not. A scan that asks whether
 // every ancestor of every entry is inside the root, or is Git-ignored, costs multiples of the
 // read and is what made large home directories exceed the client request timeout.
@@ -1083,7 +1073,6 @@ describe("home-tree scan cost", () => {
  const DEPTH = 8;
  const CHAINS = 40;
  let scanRoot: string;
-  let searchProcess: SearchProcess | null = null;

  beforeEach(() => {
    scanRoot = realpathSync.native(mkdtempSync(path.join(tmpdir(), "directory-scan-cost-")));
@@ -1094,16 +1083,8 @@ describe("home-tree scan cost", () => {
    }
  });

-  afterEach(async () => {
-    try {
-      if (searchProcess) {
-        searchProcess.child.kill();
-        await searchProcess.exited;
-      }
-    } finally {
-      searchProcess = null;
-      rmSync(scanRoot, { recursive: true, force: true });
-    }
+  afterEach(() => {
+    rmSync(scanRoot, { recursive: true, force: true });
  });

  // Nothing matches, so the scan walks the whole tree instead of stopping at a confident result.
@@ -1121,78 +1102,6 @@ describe("home-tree scan cost", () => {
    return stopPathContainmentMetrics();
  }

-  it("finishes overlapping broad-tree searches within a bounded heap", async () => {
-    const broadRoot = path.join(scanRoot, "broad");
-    mkdirSync(broadRoot);
-    for (let branch = 0; branch < 30; branch += 1) {
-      const branchRoot = path.join(broadRoot, `branch-${branch}`);
-      mkdirSync(branchRoot);
-      for (let group = 0; group < 30; group += 1) {
-        const groupRoot = path.join(branchRoot, `group-${group}`);
-        mkdirSync(groupRoot);
-        for (let leaf = 0; leaf < 30; leaf += 1) {
-          mkdirSync(path.join(groupRoot, `leaf-${leaf}`));
-        }
-      }
-    }
-    // A smaller real tree and explicit heap budget keep the million-directory repro cheap in CI.
-    const moduleUrl = new URL("./directory-suggestions.ts", import.meta.url).href;
-    const source = `
-      const { searchDirectoryEntries } = await import(${JSON.stringify(moduleUrl)});
-      const results = await Promise.all(Array.from({ length: 14 }, (_, index) =>
-        searchDirectoryEntries({
-          root: ${JSON.stringify(broadRoot)},
-          query: "z".repeat(index + 1),
-          pathFormat: "absolute",
-          includeFiles: false,
-          includeDirectories: true,
-          pathQueryPolicy: "rooted",
-          rootAliases: ["~"],
-          blankQueryBehavior: "none",
-          confidentResultScanThreshold: 5000,
-          maxEntriesScanned: 2000,
-          limit: 30,
-        })
-      ));
-      process.stdout.write(JSON.stringify(results));
-    `;
-    const child = spawn(
-      process.execPath,
-      [
-        "--max-old-space-size=128",
-        "--conditions=source",
-        "--import",
-        "tsx",
-        "--input-type=module",
-        "--eval",
-        source,
-      ],
-      { stdio: ["ignore", "pipe", "pipe"], timeout: 20_000 },
-    );
-    let stdout = "";
-    let stderr = "";
-    child.stdout.setEncoding("utf8");
-    child.stderr.setEncoding("utf8");
-    child.stdout.on("data", (chunk: string) => {
-      stdout += chunk;
-    });
-    child.stderr.on("data", (chunk: string) => {
-      stderr += chunk;
-    });
-    const exited = new Promise<SearchProcessExit>((resolve, reject) => {
-      child.on("error", reject);
-      child.on("close", (code, signal) => resolve({ code, signal }));
-    });
-    searchProcess = { child, exited };
-    const exit = await exited;
-    expect({ ...exit, outOfMemory: stderr.includes("heap out of memory") }).toEqual({
-      code: 0,
-      signal: null,
-      outOfMemory: false,
-    });
-    expect(JSON.parse(stdout)).toEqual(Array.from({ length: 14 }, () => []));
-  });
-
  it("derives no containment for a tree that cannot leave the root", async () => {
    const checks = await countContainmentChecks(scanWholeTree);

@@ -63,13 +63,6 @@ interface WalkStart {
  resolvedPath: string;
 }

-interface WalkChildrenOptions {
-  parent: WalkStart;
-  depth: number;
-  input: SearchInput;
-  visited: Set<string>;
-}
-
 interface TraversedEntry extends ChildEntry {
  visiblePath: string;
  depth: number;
@@ -325,18 +318,17 @@ async function searchChildren(input: SearchInput): Promise<RankedEntry[]> {
  const discoveryInput = isInsideExcludedPath(parent, input)
    ? { ...input, excludedDiscoveryPaths: new Set<string>() }
    : input;
-  const ranked: RankedEntry[] = [];
-  for await (const entry of readChildren(parent)) {
+  const entries = await readChildren(parent);
+  return entries.flatMap((entry) => {
    if (!isPathInsideRoot(input.root, entry.resolvedPath) || !shouldDiscover(entry, discoveryInput))
-      continue;
+      return [];
    const candidate: TraversedEntry = {
      ...entry,
      visiblePath: path.join(visibleParent, entry.name),
      depth: 1,
    };
-    if (shouldSuggest(candidate, input)) ranked.push(rank(candidate, input));
-  }
-  return ranked;
+    return shouldSuggest(candidate, input) ? [rank(candidate, input)] : [];
+  });
 }

 async function searchTree(
@@ -344,8 +336,21 @@ async function searchTree(
  start: WalkStart = { visiblePath: input.root, resolvedPath: input.root },
 ): Promise<RankedEntry[]> {
  if (!(input.maxEntriesScanned > 0)) return [];
+  const roots = (await readChildren(start.resolvedPath)).filter((entry) =>
+    staysInsideRoot(entry, input.root),
+  );
  const visited = new Set<string>([start.resolvedPath]);
-  const branches = walkChildren({ parent: start, depth: 1, input, visited });
+  const branches = roots.flatMap((entry) =>
+    shouldDiscover(entry, input)
+      ? [
+          walkBranch(
+            { ...entry, visiblePath: path.join(start.visiblePath, entry.name), depth: 1 },
+            input,
+            visited,
+          ),
+        ]
+      : [],
+  );
  const ranked: RankedEntry[] = [];
  let scanned = 0;
  const threshold = input.confidentResultScanThreshold;
@@ -376,39 +381,38 @@ async function* walkBranch(
  )
    return;
  visited.add(entry.resolvedPath);
-  yield* roundRobin(walkChildren({ parent: entry, depth: entry.depth + 1, input, visited }));
+  const children = (await readChildren(entry.resolvedPath)).filter((child) =>
+    staysInsideRoot(child, input.root),
+  );
+  const branches = children.flatMap((child) =>
+    shouldDiscover(child, input)
+      ? [
+          walkBranch(
+            {
+              ...child,
+              visiblePath: path.join(entry.visiblePath, child.name),
+              depth: entry.depth + 1,
+            },
+            input,
+            visited,
+          ),
+        ]
+      : [],
+  );
+  yield* roundRobin(branches);
 }

-// Create a child's path and iterator only when its branch gets a turn. Eagerly constructing every
-// sibling's subtree retained hundreds of thousands of unvisited children beyond the scan budget.
-async function* walkChildren({
-  parent,
-  depth,
-  input,
-  visited,
-}: WalkChildrenOptions): AsyncGenerator<AsyncGenerator<TraversedEntry>> {
-  for await (const child of readChildren(parent.resolvedPath)) {
-    if (!staysInsideRoot(child, input.root) || !shouldDiscover(child, input)) continue;
-    yield walkBranch(
-      { ...child, visiblePath: path.join(parent.visiblePath, child.name), depth },
-      input,
-      visited,
-    );
-  }
-}
-
-async function* roundRobin<T>(branches: AsyncIterable<AsyncGenerator<T>>): AsyncGenerator<T> {
-  let active: AsyncIterable<AsyncGenerator<T>> | Array<AsyncGenerator<T>> = branches;
-  while (true) {
+async function* roundRobin<T>(branches: Array<AsyncGenerator<T>>): AsyncGenerator<T> {
+  let active = branches;
+  while (active.length) {
    const nextRound: Array<AsyncGenerator<T>> = [];
-    for await (const branch of active) {
+    for (const branch of active) {
      const next = await branch.next();
      if (!next.done) {
        nextRound.push(branch);
        yield next.value;
      }
    }
-    if (!nextRound.length) return;
    active = nextRound;
  }
 }
@@ -738,9 +742,9 @@ async function resolveDirectory(inputPath: string): Promise<string | null> {
  return info?.isDirectory() ? resolved : null;
 }

-async function* readChildren(directory: string): AsyncGenerator<ChildEntry> {
+async function readChildren(directory: string): Promise<ChildEntry[]> {
  const directoryInfo = await stat(directory).catch(() => null);
-  if (!directoryInfo?.isDirectory()) return;
+  if (!directoryInfo?.isDirectory()) return [];

  const cached = CAN_VALIDATE_DIRECTORY_CACHE_FROM_METADATA
    ? directoryListCache.get(directory)
@@ -770,10 +774,9 @@ async function* readChildren(directory: string): AsyncGenerator<ChildEntry> {
    }
  }

-  for (const rawEntry of rawEntries) {
-    const entry = await resolveChild(directory, rawEntry);
-    if (entry) yield entry;
-  }
+  return (await Promise.all(rawEntries.map((entry) => resolveChild(directory, entry))))
+    .filter((entry): entry is ChildEntry => entry !== null)
+    .sort((left, right) => left.name.localeCompare(right.name));
 }

 async function loadGitIgnoredPaths(root: string): Promise<Set<string>> {
@@ -19,6 +19,9 @@ export default defineConfig({
    setupFiles: [path.resolve(__dirname, "./src/test-utils/vitest-setup.ts")],
    pool: "forks",
    fileParallelism: false,
+    // Even two concurrent Git-heavy suites can exhaust Windows test deadlines.
+    // Run files serially so their subprocesses do not compete across suites.
+    maxWorkers: process.platform === "win32" ? 1 : undefined,
    exclude: ["**/node_modules/**", "**/dist/**", "**/.claude/**", "**/.dev/**"],
  },
 });
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/website",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "private": true,
  "type": "module",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/builtin-plugins",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.1",
  "private": true,
  "type": "module",
  "scripts": {
@@ -289,12 +289,9 @@ Use the recipient's agent ID from `paseo ls`, or [copy it from the agent's tab](
 ```bash
 paseo send <id> "now run the tests"
 paseo send <id> --image screenshot.png "what's wrong here?"
-paseo send <id> --no-wait "run this task"
-paseo send <id> --behavior interrupt "stop and do this instead"
+paseo send <id> --no-wait "queue this task"
 ```

-Agent-originated sends (`PASEO_AGENT_ID` set) default to steering the running turn. Other sends default to interrupting it. Use `--behavior steer` or `--behavior interrupt` to override the default. Steering uses the same fallback as the client: if steering is unavailable, the running turn is interrupted and replaced.
-
 ## Viewing logs

 ```bash
@@ -51,7 +51,7 @@ Agents can prompt each other by **agent ID**, the identifier Paseo uses to addre

 > Use Paseo to send this prompt to agent [paste agent ID here]: “Review the parser changes in your workspace and report any missing test cases.”

-The receiving agent gets the prompt in its existing conversation. Agent-originated sends default to steering a running turn, with interruption fallback when steering is unavailable. Set MCP `activeTurnBehavior` or CLI `--behavior` to `steer` or `interrupt` to override that default. To have it send a separate message back, give it the sender's agent ID too.
+The receiving agent gets the prompt in its existing conversation. To have it send a separate message back, give it the sender's agent ID too.

 Underneath, the agent calls `send_agent_prompt` with the recipient's `agentId` and a `prompt`. Agents can also discover IDs with `list_agents`; the CLI uses [`paseo send <id>`](/docs/cli#sending-messages). For another host, use the [remote CLI workflow](#work-on-another-machine).

@@ -1318,13 +1318,6 @@ the source row, so updates to one streaming item do not remount its renderer. Us
 `useRevealedText(text, phase)` hook when a renderer should pace streaming text like Paseo's built-in
 assistant rows.

-Chat find (Ctrl or Cmd+F) finds and highlights text in replacement rows when the query also
-matches the original message. The host searches the original prompt text or the assistant reply
-with Markdown syntax removed, then the app counts matches in the text your renderer draws.
-Text added only by your renderer is not independently indexed. Matches stay within a rendered
-block, and find skips buttons, icons, and anything with `aria-hidden="true"`. Find only runs on
-the web and desktop apps.
-
 ### Append a timeline row from the daemon

 A server handler can add a plugin-owned row to canonical history:
@@ -63,7 +63,7 @@ Detach is an explicit user action in the subagents track, not an agent tool. A c

 Agent-scoped `create_agent` defaults `notifyOnFinish` to true. Set it to `false` only for truly fire-and-forget agents.

-**`send_agent_prompt`** — `{ agentId, prompt, activeTurnBehavior? }`. Use for follow-ups to an existing agent. Agent-scoped calls default to `steer`; top-level calls default to `interrupt`. Set `activeTurnBehavior` to `steer` or `interrupt` to override the default. Steering falls back to interruption when unavailable. CLI agent sends use the same defaults and accept `--behavior steer|interrupt`. Returns after dispatch acknowledgement. Agent-scoped calls default `notifyOnFinish` to true; top-level calls have no parent callback.
+**`send_agent_prompt`** — `{ agentId, prompt }`. Use for follow-ups to an existing agent. Returns after dispatch acknowledgement. Agent-scoped calls default `notifyOnFinish` to true; top-level calls have no parent callback.

 **`update_agent`** — `{ agentId, name?, labels?, settings? }`. Use `settings` for runtime changes on an existing agent: `modeId`, `model`, `thinkingOptionId`, and provider-specific `features`. For Codex fast mode, pass `settings: { features: { "fast_mode": true } }`.
Author	SHA1	Message	Date
paseo-bot[bot]	e26f0339d1	test(acp): start hung-session deadlines after initialization Wait for the fake agent to receive session/new before advancing its diagnostic deadline. Slow process startup must not turn a session-timeout assertion into an initialization timeout.	2026-10-17 18:56:26 +02:00
paseo-bot[bot]	02216d601c	fix(pi): settle foreground workflow tools when the process exits Deliver a failed terminal mapping for calls still owned by the Pi process. Detached runs have already returned their tool result, so their adapter-owned status is preserved.	2026-10-17 18:20:11 +02:00
paseo-bot[bot]	e5f8c7ac25	fix(pi): keep workflow lifecycle in the provider adapter Remove the shared manager sweep and poll marker from the workflow fix. Turn-end timing and history replay do not prove that a Pi child was canceled; preserve its provider status until the adapter supplies an outcome.	2026-10-17 18:13:17 +02:00
paseo-bot[bot]	b38dbf8ae6	fix(pi): restore async workflow transcripts on replay Project saved async status when replaying a launch as well as during live polling. Retain each terminal verdict when a late transcript is attached so the extension host can finish its reader immediately.	2026-10-17 16:41:32 +02:00
paseo-bot[bot]andKushal Bairagya	1ea820ca17	test(pi): verify poll lifecycle without replacing availability The lifecycle fixture injects its Pi runtime, so its executable probe should use a real configured executable rather than depend on an installed provider or replace the availability method. Co-authored-by: Kushal Bairagya <bairagyakushal4@gmail.com>	2026-10-17 16:26:50 +02:00
Kushal Bairagya	9ae7a64aa7	fix(pi): surface workflowScript subagents and finalize stuck rows	2026-10-17 18:46:18 +05:30