test(app): retain separate initial theme journeys

test(app): consolidate browser setup and rebalance CI shards
test(app): control hidden turn completion explicitly
2026-10-22 17:22:47 +00:00 · 2026-10-17 21:20:46 +02:00 · 2026-10-17 21:12:13 +02:00 · 2026-10-17 18:54:16 +02:00 · 2026-10-17 18:37:38 +02:00
71 changed files with 1789 additions and 3286 deletions
@@ -405,9 +405,9 @@ jobs:
        run: npm run test:e2e --workspace=@getpaseo/app -- --shard=${{ env.PLAYWRIGHT_SHARD }}
        env:
          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          # Weight file groups by observed duration; raw test counts overload
-          # early agent/Changes specs. Required check names remain unchanged.
-          PWTEST_SHARD_WEIGHTS: "111:172:137:160"
+          # Balance contiguous file groups using CI durations and the trimmed
+          # inventory. Required check names and worker counts stay unchanged.
+          PWTEST_SHARD_WEIGHTS: "187:183:184:201"

      - name: Upload test artifacts
        uses: actions/upload-artifact@v4
@@ -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))
@@ -154,6 +154,8 @@ npm run test:e2e:browser-tabs --workspace=@getpaseo/desktop
 - Extract complex setup into reusable helpers
 - Test bodies should read like plain English
 - Build a vocabulary of test helpers that make complex flows simple
+- Use one browser test per causal user journey, with named `test.step()` blocks for behaviors reached along the way. Reuse the open form, workspace, and browser state. Start another test for a distinct initial state, failure injection, race ordering, viewport, or destructive branch.
+- Keep pure test-helper checks in `packages/app/e2e/support/helpers/*.test.ts`; the app unit job runs them without Metro, a daemon, or a browser.

 ### File naming

@@ -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
@@ -460,7 +460,7 @@ async function expectHiddenStreamingSubmissionOrderAfterWorkspaceEviction(
  const target = await seedMockAgentWorkspace({
    repoPrefix: `submission-hidden-stream-${testInfo.workerIndex}-`,
    title: "Hidden streaming submission",
-    model: "ten-second-stream",
+    model: "e2e-fast-stream",
  });
  const evictionAgents = await Promise.all(
    Array.from({ length: WORKSPACE_DECK_MAX_MOUNTED_WORKSPACES }, (_unused, index) =>
@@ -549,7 +549,7 @@ async function expectCompletedSubmissionClearsAfterMissedRunningTransition(
  const agent = await seedMockAgentWorkspace({
    repoPrefix: `submission-missed-running-${testInfo.workerIndex}-`,
    title: "Submission missed running transition",
-    model: "ten-second-stream",
+    model: "e2e-fast-stream",
  });
  try {
    await openAgentRoute(page, { workspaceId: agent.workspaceId, agentId: agent.agentId });
@@ -700,7 +700,7 @@ async function expectCanonicalOrderWinsAcrossOverlappingClients(
  const agent = await seedMockAgentWorkspace({
    repoPrefix: `submission-cross-client-order-${testInfo.workerIndex}-`,
    title: "Cross-client submission order",
-    model: "ten-second-stream",
+    model: "e2e-fast-stream",
  });
  const localPrompt = "Send this after the other client turn.";
  const remotePrompt = "Commit this other client turn first.";
@@ -36,15 +36,25 @@ test.describe("Host agent skills", () => {
    page,
    skills,
  }) => {
+    await page.setViewportSize({ width: 1280, height: 900 });
    const custom = skills.available.slice(0, 2);
    const cancelledAddition = skills.available[2]!;
    await openAgentSkillsSettings(page, skills);

    await openSkillSelection(page);
+    await test.step("the desktop sheet gives the bundled label its intended inset", async () => {
+      await expectBundledSkillsInset(page);
+    });
    await chooseCustomSkills(page, custom);
    await saveSkillSelection(page);
    await expectInstalledSkills(skills, custom);
    await expectSavedSelection(skills, { mode: "custom", skills: custom });
+    await test.step("installation ignores agent config environment overrides", async () => {
+      await expect(access(`${skills.home}/../ignored-claude-config/skills`)).rejects.toThrow(
+        "ENOENT",
+      );
+      await expect(access(`${skills.home}/../ignored-codex-home/skills`)).rejects.toThrow("ENOENT");
+    });

    await openSkillSelection(page);
    await toggleSkill(page, cancelledAddition);
@@ -150,23 +160,6 @@ test.describe("Host agent skills", () => {
    await expectInstalledSkills(skills, secondSelection.skills);
    await expectSavedSelection(skills, secondSelection);
  });
-
-  test("ignores agent config environment overrides", async ({ skills }) => {
-    await skills.install({ mode: "custom", skills: [skills.available[0]!] });
-
-    await expect(
-      access(`${skills.home}/../ignored-claude-config/skills`).then(
-        () => true,
-        () => false,
-      ),
-    ).resolves.toBe(false);
-    await expect(
-      access(`${skills.home}/../ignored-codex-home/skills`).then(
-        () => true,
-        () => false,
-      ),
-    ).resolves.toBe(false);
-  });
 });

 function allSkillsCard(page: Parameters<typeof openSkillSelection>[0]) {
@@ -192,24 +185,14 @@ test.describe("Agent skills sheet inset", () => {
      await openSkillSelection(page);
      await waitForSettledPosition(page.getByTestId("skill-selection-sheet"));

-      expect({
-        aboveLabel: await readVerticalGap(allSkillsCard(page), bundledSkillsLabel(page)),
-        belowLabel: await readVerticalGap(bundledSkillsLabel(page), skillListCard(page)),
-      }).toEqual({ aboveLabel: 16, belowLabel: 12 });
-    });
-  });
-
-  test.describe("desktop", () => {
-    test.use({ viewport: { width: 1280, height: 900 } });
-
-    test("keeps more space above the bundled skills label than below", async ({ page, skills }) => {
-      await openAgentSkillsSettings(page, skills);
-      await openSkillSelection(page);
-
-      expect({
-        aboveLabel: await readVerticalGap(allSkillsCard(page), bundledSkillsLabel(page)),
-        belowLabel: await readVerticalGap(bundledSkillsLabel(page), skillListCard(page)),
-      }).toEqual({ aboveLabel: 16, belowLabel: 12 });
+      await expectBundledSkillsInset(page);
    });
  });
 });
+
+async function expectBundledSkillsInset(page: Parameters<typeof openSkillSelection>[0]) {
+  expect({
+    aboveLabel: await readVerticalGap(allSkillsCard(page), bundledSkillsLabel(page)),
+    belowLabel: await readVerticalGap(bundledSkillsLabel(page), skillListCard(page)),
+  }).toEqual({ aboveLabel: 16, belowLabel: 12 });
+}
@@ -1,9 +1,7 @@
 import { test } from "../support/fixtures";
 import { expect } from "@playwright/test";
 import {
-  findScrollJumps,
  expectImageSpaceReserved,
-  type ScrollFrame,
  observeTimelinePages,
  openOnlyTimelineTail,
  recordUpwardTraversal,
@@ -14,179 +12,6 @@ import {
  holdParagraphThroughCompletion,
 } from "../support/helpers/timeline-scroll-smoothness";

-test("scroll detector distinguishes entered image growth from a simultaneous viewport jump", () => {
-  const before: ScrollFrame = {
-    at: 1000,
-    scrollTop: 1000,
-    scrollHeight: 5000,
-    viewportHeight: 800,
-    virtualized: true,
-    loading: false,
-    rows: [
-      { id: "image", top: -150, height: 150 },
-      { id: "reading", top: 0, height: 100 },
-    ],
-    anchor: "reading",
-    wheelTotal: 0,
-    lastWheelAt: 0,
-    inputFinishedAt: null,
-    imageLoads: 0,
-    mounted: 0,
-    unmounted: 0,
-  };
-  const after: ScrollFrame = {
-    ...before,
-    at: 1400,
-    scrollTop: 900,
-    wheelTotal: 100,
-    lastWheelAt: 1050,
-    rows: [
-      { id: "image", top: -50, height: 1150 },
-      { id: "reading", top: 1100, height: 100 },
-    ],
-  };
-  expect(findScrollJumps([before, after])).toEqual([]);
-  expect(
-    findScrollJumps([
-      { ...before, scrollTop: 200 },
-      {
-        ...after,
-        wheelTotal: 1000,
-        scrollTop: 0,
-        rows: after.rows.map((row) => ({ ...row, top: row.top + 100 })),
-      },
-    ]),
-  ).toEqual([]);
-  expect(
-    findScrollJumps([
-      before,
-      { ...after, rows: after.rows.map((row) => ({ ...row, top: row.top - 500 })) },
-    ]),
-  ).toHaveLength(1);
-  expect(
-    findScrollJumps([
-      { ...before, anchor: "image", rows: [{ id: "image", top: 0, height: 150 }] },
-      { ...after, rows: [{ id: "image", top: 600, height: 1150 }] },
-    ]),
-  ).toHaveLength(1);
-});
-
-test("scroll detector accounts for delayed wheel input and growth below the new reader", () => {
-  const before: ScrollFrame = {
-    at: 1000,
-    scrollTop: 2000,
-    scrollHeight: 5000,
-    viewportHeight: 800,
-    virtualized: true,
-    loading: false,
-    rows: [
-      { id: "new-reader", top: -520, height: 278 },
-      { id: "image", top: -242, height: 184 },
-      { id: "old-reader", top: -58, height: 130 },
-    ],
-    anchor: "old-reader",
-    wheelTotal: 0,
-    lastWheelAt: 0,
-    inputFinishedAt: null,
-    imageLoads: 0,
-    mounted: 0,
-    unmounted: 0,
-  };
-  const wheel = { ...before, at: 1100, wheelTotal: 480, lastWheelAt: 1099 };
-  const after: ScrollFrame = {
-    ...wheel,
-    at: 1220,
-    scrollTop: 1520,
-    scrollHeight: 5041,
-    anchor: "new-reader",
-    rows: [
-      { id: "new-reader", top: -40, height: 278 },
-      { id: "image", top: 238, height: 225 },
-      { id: "old-reader", top: 463, height: 130 },
-    ],
-  };
-  expect(findScrollJumps([before, wheel, after])).toEqual([]);
-  // The previous 480 px input has already moved the viewport; the recent
-  // budget includes it, but only the next 480 px belongs to this frame.
-  const steadyBefore = { ...before, at: 1050, wheelTotal: 480, lastWheelAt: 1049 };
-  const steadyAfter = {
-    ...after,
-    at: 1100,
-    wheelTotal: 960,
-    lastWheelAt: 1099,
-    scrollHeight: 6000,
-    rows: [
-      { id: "new-reader", top: -40, height: 278 },
-      { id: "image", top: 238, height: 1184 },
-      { id: "old-reader", top: 1422, height: 130 },
-    ],
-  };
-  expect(findScrollJumps([steadyBefore, steadyAfter])).toEqual([]);
-
-  expect(
-    findScrollJumps([
-      before,
-      wheel,
-      {
-        ...after,
-        rows: after.rows.map((row) => ({ id: row.id, height: row.height, top: row.top + 100 })),
-      },
-    ]),
-  ).toHaveLength(1);
-});
-
-test("scroll detector follows the entered image through resize and virtual offset correction", () => {
-  for (const height of [225, 1632]) {
-    const before: ScrollFrame = {
-      at: 1000,
-      scrollTop: 2208,
-      scrollHeight: 5000,
-      viewportHeight: 516,
-      virtualized: true,
-      loading: false,
-      rows: [
-        { id: "image", top: -704, height: 560 },
-        { id: "caption", top: -144, height: 100 },
-        { id: "old-reader", top: -44, height: 127 },
-      ],
-      anchor: "old-reader",
-      wheelTotal: 0,
-      lastWheelAt: 0,
-      inputFinishedAt: null,
-      imageLoads: 0,
-      mounted: 3,
-      unmounted: 0,
-    };
-    const resize = height - 560;
-    const after: ScrollFrame = {
-      ...before,
-      at: 1060,
-      // The virtualizer corrects 110px of estimates while the wheel moves 160px.
-      scrollTop: 1938,
-      scrollHeight: 5000 + resize - 110,
-      wheelTotal: 160,
-      lastWheelAt: 1020,
-      imageLoads: 1,
-      rows: [
-        { id: "image", top: -544, height },
-        { id: "caption", top: 16 + resize, height: 100 },
-        { id: "old-reader", top: 116 + resize, height: 127 },
-      ],
-    };
-    expect(findScrollJumps([before, after])).toEqual([]);
-    // Resizing must not excuse additional viewport movement.
-    expect(
-      findScrollJumps([
-        before,
-        {
-          ...after,
-          rows: after.rows.map((row) => ({ id: row.id, height: row.height, top: row.top + 100 })),
-        },
-      ]),
-    ).toHaveLength(1);
-  }
-});
-
 for (const cadence of scrollCadences) {
  test(`varied timeline preserves reading position during ${cadence.name} upward scrolling`, async ({
    page,
@@ -51,7 +51,9 @@ test.describe("Archive tab reconciliation", () => {
    await tempRepo?.cleanup();
  });

-  test("non-UI archive prunes the archived tab across open pages and reload", async ({ page }) => {
+  test("non-UI archive prunes open tabs and keeps the session archived when reopened", async ({
+    page,
+  }) => {
    const archived = await createIdleAgent(client, {
      cwd: tempRepo.path,
      workspaceId,
@@ -65,28 +67,51 @@ test.describe("Archive tab reconciliation", () => {
    const passivePage = await page.context().newPage();

    try {
-      await primeAdditionalPage(passivePage);
-      await resetSeededPageState(page);
-      await resetSeededPageState(passivePage);
-      await openSessions(page);
-      await expectSessionRowVisible(page, archived.title);
-      await expectSessionRowVisible(page, surviving.title);
-      await openSessions(passivePage);
-      await expectSessionRowVisible(passivePage, archived.title);
-      await expectSessionRowVisible(passivePage, surviving.title);
-      await openWorkspaceWithAgents(page, [archived, surviving]);
-      await openWorkspaceWithAgents(passivePage, [archived, surviving]);
+      await test.step("open both sessions in two pages", async () => {
+        await primeAdditionalPage(passivePage);
+        await resetSeededPageState(page);
+        await resetSeededPageState(passivePage);
+        await openSessions(page);
+        await expectSessionRowVisible(page, archived.title);
+        await expectSessionRowVisible(page, surviving.title);
+        await openSessions(passivePage);
+        await expectSessionRowVisible(passivePage, archived.title);
+        await expectSessionRowVisible(passivePage, surviving.title);
+        await openWorkspaceWithAgents(page, [archived, surviving]);
+        await openWorkspaceWithAgents(passivePage, [archived, surviving]);
+      });
+
      await archiveAgentFromDaemon(client, archived.id);
-      await expectWorkspaceArchiveOutcome(page, {
-        archivedAgentId: archived.id,
-        survivingAgentId: surviving.id,
+      const archivedAt = await fetchAgentArchivedAt(client, archived.id);
+      expect(archivedAt).not.toBeNull();
+
+      await test.step("prune the archived tab across both pages and reload", async () => {
+        await expectWorkspaceArchiveOutcome(page, {
+          archivedAgentId: archived.id,
+          survivingAgentId: surviving.id,
+        });
+        await expectWorkspaceArchiveOutcome(passivePage, {
+          archivedAgentId: archived.id,
+          survivingAgentId: surviving.id,
+        });
+        await reloadWorkspace(passivePage, surviving.workspaceId);
+        await expectWorkspaceTabHidden(passivePage, archived.id);
      });
-      await expectWorkspaceArchiveOutcome(passivePage, {
-        archivedAgentId: archived.id,
-        survivingAgentId: surviving.id,
+
+      await test.step("reopen the archived session without unarchiving it", async () => {
+        await openSessions(page);
+        await expectSessionRowArchived(page, archived.title);
+
+        await clickSessionRow(page, archived.title);
+
+        await expectArchivedAgentFocused(page, archived.id);
+        await expectAgentTabActive(page, archived.id);
+        expect(await fetchAgentArchivedAt(client, archived.id)).toBe(archivedAt);
+
+        await expect(page).toHaveURL(buildHostWorkspaceRoute(getServerId(), archived.workspaceId), {
+          timeout: 30_000,
+        });
      });
-      await reloadWorkspace(passivePage, surviving.workspaceId);
-      await expectWorkspaceTabHidden(passivePage, archived.id);
    } finally {
      await passivePage.close();
    }
@@ -123,35 +148,4 @@ test.describe("Archive tab reconciliation", () => {
      await passivePage.close();
    }
  });
-
-  test("clicking an archived session navigates without unarchiving it", async ({ page }) => {
-    const archived = await createIdleAgent(client, {
-      cwd: tempRepo.path,
-      workspaceId,
-      title: `unarchive-archived-${randomUUID().slice(0, 8)}`,
-    });
-    const surviving = await createIdleAgent(client, {
-      cwd: tempRepo.path,
-      workspaceId,
-      title: `unarchive-control-${randomUUID().slice(0, 8)}`,
-    });
-
-    await resetSeededPageState(page);
-    await openWorkspaceWithAgents(page, [archived, surviving]);
-    await archiveAgentFromDaemon(client, archived.id);
-    const archivedAt = await fetchAgentArchivedAt(client, archived.id);
-    expect(archivedAt).not.toBeNull();
-    await openSessions(page);
-    await expectSessionRowArchived(page, archived.title);
-
-    await clickSessionRow(page, archived.title);
-
-    await expectArchivedAgentFocused(page, archived.id);
-    await expectAgentTabActive(page, archived.id);
-    expect(await fetchAgentArchivedAt(client, archived.id)).toBe(archivedAt);
-
-    await expect(page).toHaveURL(buildHostWorkspaceRoute(getServerId(), archived.workspaceId), {
-      timeout: 30_000,
-    });
-  });
 });
@@ -90,7 +90,7 @@ test.describe("Assistant fork menu", () => {
    await expectLiveAssistantText(page, visibleAfterFork);
  });

-  test("focuses a forked assistant turn in a new workspace draft tab", async ({
+  test("focuses an existing-workspace fork draft and keeps its attachment after submission", async ({
    page,
    seedForkWorkspace,
  }) => {
@@ -101,55 +101,44 @@ test.describe("Assistant fork menu", () => {
      model: "ten-second-stream",
    });

-    await openAgentRoute(page, session);
-    await expectComposerVisible(page);
-    await awaitAssistantMessage(page);
-    await session.client.waitForFinish(session.agentId, 45_000);
+    await test.step("complete a second assistant turn in the visible source tab", async () => {
+      await openAgentRoute(page, session);
+      await expectComposerVisible(page);
+      await awaitAssistantMessage(page);
+      await session.client.waitForFinish(session.agentId, 45_000);

-    await submitMessage(page, "emit 1 coalesced agent stream updates while this tab is visible.");
-    await session.client.waitForFinish(session.agentId, 45_000);
-    await awaitAssistantMessage(page);
-
-    const agentTab = page.getByTestId(`workspace-tab-agent_${session.agentId}`);
-    await expect(agentTab).toHaveAttribute("aria-selected", "true");
-
-    await forkMostRecentAssistantTurnToNewTab(page);
-
-    const selectedTab = page
-      .getByTestId("workspace-tabs-row")
-      .getByRole("button")
-      .and(page.locator('[aria-selected="true"]'));
-    await expect(selectedTab).toHaveAttribute("data-testid", /^workspace-tab-draft_/, {
-      timeout: 30_000,
-    });
-    await expect(agentTab).toHaveAttribute("aria-selected", "false");
-    await expectChatHistoryAttachment(page);
-  });
-
-  test("keeps the fork attachment after submitting an existing-workspace draft tab", async ({
-    page,
-    seedForkWorkspace,
-  }) => {
-    const session = await seedForkWorkspace({
-      repoPrefix: "assistant-fork-tab-submit-",
-      title: "Assistant fork tab submit",
-      initialPrompt: "emit 1 coalesced agent stream updates for assistant fork tab submit.",
-      model: "ten-second-stream",
+      await submitMessage(page, "emit 1 coalesced agent stream updates while this tab is visible.");
+      await session.client.waitForFinish(session.agentId, 45_000);
+      await awaitAssistantMessage(page);
    });

-    await openAgentRoute(page, session);
-    await expectComposerVisible(page);
-    await awaitAssistantMessage(page);
-    await session.client.waitForFinish(session.agentId, 45_000);
+    await test.step("fork the latest turn into the selected draft tab", async () => {
+      const agentTab = page.getByTestId(`workspace-tab-agent_${session.agentId}`);
+      await expect(agentTab).toHaveAttribute("aria-selected", "true");

-    await forkMostRecentAssistantTurnToNewTab(page);
-    await expectChatHistoryAttachment(page);
+      await forkMostRecentAssistantTurnToNewTab(page);

-    await submitMessage(page, "");
+      const selectedTab = page
+        .getByTestId("workspace-tabs-row")
+        .getByRole("button")
+        .and(page.locator('[aria-selected="true"]'));
+      await expect(selectedTab).toHaveAttribute("data-testid", /^workspace-tab-draft_/, {
+        timeout: 30_000,
+      });
+      await expect(agentTab).toHaveAttribute("aria-selected", "false");
+      await expectChatHistoryAttachment(page);
+    });

-    const userMessage = page.getByTestId("user-message").filter({ hasText: "Chat history" }).last();
-    await expect(userMessage).toBeVisible({ timeout: 30_000 });
-    await expect(userMessage).not.toContainText("Source agent:");
+    await test.step("submit that draft with its chat-history attachment", async () => {
+      await submitMessage(page, "");
+
+      const userMessage = page
+        .getByTestId("user-message")
+        .filter({ hasText: "Chat history" })
+        .last();
+      await expect(userMessage).toBeVisible({ timeout: 30_000 });
+      await expect(userMessage).not.toContainText("Source agent:");
+    });
  });

  test("forks an assistant turn into New Workspace and keeps the attachment across host changes", async ({
@@ -262,15 +262,54 @@ test.afterEach(async () => {
  }
 });

-test("Changes opens the populated committed comparison for a clean checkout", async ({ page }) => {
+test("clean Changes opens committed changes and navigates an empty comparison", async ({
+  page,
+}) => {
  const workspace = await createWorkspaceWithCommittedDiff();
-
  await openWorkspaceChangesSurface(page, workspace, 90_000);

-  const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
-  const tree = page.getByTestId("changes-tree-panel").filter({ visible: true });
-  await expect(tree.getByTestId("changes-diff-status-trigger")).toContainText("Committed");
-  await expect(panel.getByTestId("diff-file-0")).toHaveAccessibleName("committed-only.ts, +1, -0");
+  await test.step("Changes opens the populated committed comparison for a clean checkout", async () => {
+    const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
+    const tree = page.getByTestId("changes-tree-panel").filter({ visible: true });
+    await expect(tree.getByTestId("changes-diff-status-trigger")).toContainText("Committed");
+    await expect(panel.getByTestId("diff-file-0")).toHaveAccessibleName(
+      "committed-only.ts, +1, -0",
+    );
+  });
+
+  await test.step("an empty Changes comparison links to the populated comparison", async () => {
+    const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
+    const tree = page.getByTestId("changes-tree-panel").filter({ visible: true });
+    const mode = tree.getByTestId("changes-diff-status-trigger");
+    await mode.click();
+    await page.getByTestId("changes-diff-mode-committed").click();
+    await expect(panel.getByTestId("diff-file-0")).toHaveAccessibleName(
+      "committed-only.ts, +1, -0",
+    );
+
+    await mode.click();
+    await page.getByTestId("changes-diff-mode-uncommitted").click();
+
+    await expect(tree.getByText("No changes to display", { exact: true })).toBeVisible();
+    await expect(panel.getByText("No changes to display", { exact: true })).toBeVisible();
+    const seeCommitted = tree.getByRole("button", { name: "See committed changes" });
+    await expect(seeCommitted).toBeVisible();
+    await seeCommitted.click();
+    await expect(mode).toContainText("Committed");
+    await expect(panel.getByTestId("diff-file-0")).toHaveAccessibleName(
+      "committed-only.ts, +1, -0",
+    );
+  });
+
+  await test.step("Jump to file stays out of the desktop diff and of an empty comparison", async () => {
+    await expect(page.getByRole("button", { name: "Jump to file" })).toHaveCount(0);
+
+    const explorer = await openCompactChanges(page, workspace);
+    await expect(explorer.getByRole("button", { name: "Jump to file" })).toBeVisible();
+
+    await selectEmptyUncommittedComparison(page, explorer);
+    await expect(page.getByRole("button", { name: "Jump to file" })).toHaveCount(0);
+  });
 });

 test("Changes expires a manual comparison when checkout dirtiness changes", async ({ page }) => {
@@ -297,29 +336,6 @@ test("Changes expires a manual comparison when checkout dirtiness changes", asyn
  await expect(mode).toContainText("Uncommitted", { timeout: 30_000 });
 });

-test("an empty Changes comparison links to the populated comparison", async ({ page }) => {
-  const workspace = await createWorkspaceWithCommittedDiff();
-  await openWorkspaceChangesSurface(page, workspace);
-
-  const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
-  const tree = page.getByTestId("changes-tree-panel").filter({ visible: true });
-  const mode = tree.getByTestId("changes-diff-status-trigger");
-  await mode.click();
-  await page.getByTestId("changes-diff-mode-committed").click();
-  await expect(panel.getByTestId("diff-file-0")).toHaveAccessibleName("committed-only.ts, +1, -0");
-
-  await mode.click();
-  await page.getByTestId("changes-diff-mode-uncommitted").click();
-
-  await expect(tree.getByText("No changes to display", { exact: true })).toBeVisible();
-  await expect(panel.getByText("No changes to display", { exact: true })).toBeVisible();
-  const seeCommitted = tree.getByRole("button", { name: "See committed changes" });
-  await expect(seeCommitted).toBeVisible();
-  await seeCommitted.click();
-  await expect(mode).toContainText("Committed");
-  await expect(panel.getByTestId("diff-file-0")).toHaveAccessibleName("committed-only.ts, +1, -0");
-});
-
 test("Changes comparison controls the working diff and tree selection focuses its file", async ({
  page,
 }) => {
@@ -335,223 +351,109 @@ test("Changes comparison controls the working diff and tree selection focuses it
  await selectChangedFileAndExpectFocused(page, "uncommitted/50-target.ts");
 });

-test("changes file actions open below the right-click without a reserved kebab", async ({
+test("horizontal diff scrolling preserves its header and offset across collapse", async ({
  page,
 }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff({ includeDeletedFile: true });
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-
-  const deletedFileName = page.getByTestId("diff-file-1");
-  await expect(deletedFileName).toHaveAccessibleName(/zz-deleted\.ts/);
-  await deletedFileName.dblclick();
-  expect(await page.evaluate(() => window.getSelection()?.toString() ?? "")).toBe("");
-  await expect(page.getByTestId(/diff-file-\d+-actions/)).toHaveCount(0);
-  await page.getByTestId("diff-file-1-toggle").click({ button: "right" });
-  await expect(page.getByText("Copy path")).toBeVisible();
-  await page.getByText("Copy path", { exact: true }).click({ button: "right" });
-  await expect(page.getByText("Copy path")).toBeVisible();
-  await expect(page.getByTestId("diff-file-1-open-file")).toHaveCount(0);
-  await page.keyboard.press("Escape");
-
-  const fileRow = page.getByTestId("diff-file-0-toggle");
-  const fileRowBounds = await fileRow.boundingBox();
-  expect(fileRowBounds).not.toBeNull();
-  await fileRow.click({ button: "right", position: { x: 80, y: 10 } });
-  await expect(page.getByTestId("diff-file-0-open-file")).toBeVisible();
-  const menuBounds = await page.getByTestId("diff-file-0-context-menu").boundingBox();
-  expect(menuBounds).not.toBeNull();
-  expect(Math.abs(menuBounds!.x - (fileRowBounds!.x + 80))).toBeLessThanOrEqual(1);
-  expect(menuBounds!.y).toBeGreaterThan(fileRowBounds!.y + 10);
-  await page.getByTestId("diff-file-0-open-file").click();
-
-  await expect(page.getByTestId("workspace-file-pane")).toBeVisible();
-  await expect(page.getByTestId("workspace-tab-file_src/use-mounted-tab-set.ts")).toBeVisible();
-});
-
-test("canvas file headers select without toggling for context menu and long press", async ({
-  page,
-}) => {
-  const workspace = await createWorkspaceWithMountedTabDiff({ includeDeletedFile: true });
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-
-  const firstFile = page.getByTestId("diff-file-0-toggle");
-  const deletedFile = page.getByTestId("diff-file-1-toggle");
-  await deletedFile.click({ button: "right" });
-  await expect(deletedFile).toHaveAttribute("aria-selected", "true");
-  await expect(deletedFile).toHaveAttribute("aria-expanded", "true");
-  await expect(page.getByText("Copy path")).toBeVisible();
-  await page.keyboard.press("Escape");
-
-  await longPressFileHeader(page, firstFile);
-  await expect(firstFile).toHaveAttribute("aria-selected", "true");
-  await expect(deletedFile).toHaveAttribute("aria-selected", "false");
-  await expect(firstFile).toHaveAttribute("aria-expanded", "true");
-});
-
-test("every interactive file header has the same hover feedback", async ({ page }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff({ includeDeletedFile: true });
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-
-  const first = page.getByTestId("diff-file-0-toggle");
-  const second = page.getByTestId("diff-file-1-toggle");
-  const firstCanvas = page.getByTestId("git-diff-sticky-header-0");
-  const secondCanvas = page.getByTestId("git-diff-sticky-header-1");
-  const normalBackground = await headerCanvasPixel(firstCanvas, first, 10);
-
-  await first.hover();
-  await expect.poll(() => headerCanvasPixel(firstCanvas, first, 10)).not.toBe(normalBackground);
-  const hoverBackground = await headerCanvasPixel(firstCanvas, first, 10);
-
-  await first.click();
-  await page.mouse.move(0, 0);
-  await expect(first).toHaveAttribute("aria-expanded", "false");
-  await expect.poll(() => headerCanvasPixel(firstCanvas, first, 10)).toBe(normalBackground);
-
-  await first.hover();
-  await expect.poll(() => headerCanvasPixel(firstCanvas, first, 10)).toBe(hoverBackground);
-  await second.hover();
-  await expect.poll(() => headerCanvasPixel(firstCanvas, first, 10)).toBe(normalBackground);
-  await expect.poll(() => headerCanvasPixel(secondCanvas, second, 10)).toBe(hoverBackground);
-});
-
-test("horizontal body scrolling never moves or repaints the canvas header", async ({ page }) => {
  const wideLine = `export const wide = "${"wide".repeat(160)}";`;
  const workspace = await createWorkspaceWithExactSelectionDiff(wideLine);
  await useUnwrappedDiffLines(page);
  await openSelectionWorkspaceChanges(page, workspace);

-  const headerCanvas = page.getByTestId("git-diff-canvas");
-  const header = page.getByTestId("diff-file-0-toggle");
-  const beforePixel = await headerCanvasPixel(headerCanvas, header, 10);
-  const beforeBounds = await header.boundingBox();
+  await test.step("horizontal body scrolling never moves or repaints the canvas header", async () => {
+    const headerCanvas = page.getByTestId("git-diff-canvas");
+    const header = page.getByTestId("diff-file-0-toggle");
+    const beforePixel = await headerCanvasPixel(headerCanvas, header, 10);
+    const beforeBounds = await header.boundingBox();

-  await horizontallyScrollFirstFile(page, 320);
-  await page.waitForTimeout(50);
+    await horizontallyScrollFirstFile(page, 320);
+    await page.waitForTimeout(50);

-  expect(await headerCanvasPixel(headerCanvas, header, 10)).toBe(beforePixel);
-  expect(await header.boundingBox()).toEqual(beforeBounds);
+    expect(await headerCanvasPixel(headerCanvas, header, 10)).toBe(beforePixel);
+    expect(await header.boundingBox()).toEqual(beforeBounds);
+  });
+
+  await test.step("collapsing and expanding restores the real horizontal scroll offset", async () => {
+    const retainedOffset = await horizontallyScrollFirstFile(page, 320);
+    await page.getByTestId("diff-file-0-toggle").click();
+    await expect(page.getByTestId("diff-file-0-horizontal-scroll")).toHaveCount(0);
+    await page.getByTestId("diff-file-0-toggle").click();
+
+    await expect.poll(() => readHorizontalDiffOffset(page)).toBe(retainedOffset);
+  });
 });

-test("in-flow file headers move with the diff document", async ({ page }) => {
-  const workspace = await createWorkspaceWithStickyTransitionDiff();
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChangesSurface(page, workspace);
-
-  const motion = await measureInFlowHeaderMotion(page);
-
-  expect(motion).toEqual({ headerSurface: -120, shell: -120 });
-});
-
-test("the outgoing sticky header hands off without a gap or overlap", async ({
+test("file headers scroll with the document and hand off without gaps", async ({
  page,
 }, testInfo) => {
  const workspace = await createWorkspaceWithStickyTransitionDiff();
  await useUnwrappedDiffLines(page);
  await openWorkspaceChangesSurface(page, workspace);

-  const scroller = page.getByTestId("git-diff-scroll");
-  const first = page.getByTestId("diff-file-0-toggle");
-  const second = page.getByTestId("diff-file-1-toggle");
-  const secondTop = await second.evaluate((element) => {
-    const scrollElement = element.closest<HTMLElement>('[data-testid="git-diff-scroll"]');
-    if (!scrollElement) return Number.NaN;
-    return (
-      scrollElement.scrollTop +
-      element.getBoundingClientRect().top -
-      scrollElement.getBoundingClientRect().top
-    );
-  });
-  expect(secondTop).toBeGreaterThan(30);
-  await scroller.evaluate((element, scrollTop) => {
-    element.scrollTop = scrollTop;
-    element.dispatchEvent(new Event("scroll", { bubbles: false }));
-  }, secondTop - 15);
-  await expect(first).toBeAttached();
-  await expect(second).toBeAttached();
+  await test.step("in-flow file headers move with the diff document", async () => {
+    const motion = await measureInFlowHeaderMotion(page);

-  const [scrollBounds, firstBounds, secondBounds] = await Promise.all([
-    scroller.boundingBox(),
-    first.boundingBox(),
-    second.boundingBox(),
-  ]);
-  if (!scrollBounds || !firstBounds || !secondBounds) {
-    throw new Error("Sticky transition geometry is unavailable");
-  }
-  expect(firstBounds.y - scrollBounds.y).toBeCloseTo(-15, 0);
-  expect(secondBounds.y - scrollBounds.y).toBeCloseTo(15, 0);
-  const transitionHits = await scroller.evaluate((element) => {
-    const bounds = element.getBoundingClientRect();
-    return [14, 16].map(
-      (y) =>
+    expect(motion).toEqual({ headerSurface: -120, shell: -120 });
+  });
+
+  await test.step("the outgoing sticky header hands off without a gap or overlap", async () => {
+    const scroller = page.getByTestId("git-diff-scroll");
+    const first = page.getByTestId("diff-file-0-toggle");
+    const second = page.getByTestId("diff-file-1-toggle");
+    const secondTop = await second.evaluate((element) => {
+      const scrollElement = element.closest<HTMLElement>('[data-testid="git-diff-scroll"]');
+      if (!scrollElement) return Number.NaN;
+      return (
+        scrollElement.scrollTop +
+        element.getBoundingClientRect().top -
+        scrollElement.getBoundingClientRect().top
+      );
+    });
+    expect(secondTop).toBeGreaterThan(30);
+    await scroller.evaluate((element, scrollTop) => {
+      element.scrollTop = scrollTop;
+      element.dispatchEvent(new Event("scroll", { bubbles: false }));
+    }, secondTop - 15);
+    await expect(first).toBeAttached();
+    await expect(second).toBeAttached();
+
+    const [scrollBounds, firstBounds, secondBounds] = await Promise.all([
+      scroller.boundingBox(),
+      first.boundingBox(),
+      second.boundingBox(),
+    ]);
+    if (!scrollBounds || !firstBounds || !secondBounds) {
+      throw new Error("Sticky transition geometry is unavailable");
+    }
+    expect(firstBounds.y - scrollBounds.y).toBeCloseTo(-15, 0);
+    expect(secondBounds.y - scrollBounds.y).toBeCloseTo(15, 0);
+    const transitionHits = await scroller.evaluate((element) => {
+      const bounds = element.getBoundingClientRect();
+      const headerAt = (y: number) =>
        document
          .elementFromPoint(bounds.left + bounds.width / 2, bounds.top + y)
-          ?.closest<HTMLElement>("[data-diff-header]")?.dataset.diffHeaderPath ?? null,
-    );
-  });
-  expect(transitionHits).toEqual(["src/first.ts", "src/second.ts"]);
-  await testInfo.attach("canvas-header-sticky-handoff", {
-    body: await page.getByTestId("git-diff-canvas-root").screenshot(),
-    contentType: "image/png",
-  });
+          ?.closest<HTMLElement>("[data-diff-header]")?.dataset.diffHeaderPath ?? null;
+      return [headerAt(14), headerAt(16)];
+    });
+    expect(transitionHits).toEqual(["src/first.ts", "src/second.ts"]);
+    await testInfo.attach("canvas-header-sticky-handoff", {
+      body: await page.getByTestId("git-diff-canvas-root").screenshot(),
+      contentType: "image/png",
+    });

-  await scroller.evaluate((element, scrollTop) => {
-    element.scrollTop = scrollTop;
-    element.dispatchEvent(new Event("scroll", { bubbles: false }));
-  }, secondTop);
-  await expect
-    .poll(async () => {
-      const bounds = await second.boundingBox();
-      return bounds ? bounds.y - scrollBounds.y : Number.NaN;
-    })
-    .toBeCloseTo(0, 0);
+    await scroller.evaluate((element, scrollTop) => {
+      element.scrollTop = scrollTop;
+      element.dispatchEvent(new Event("scroll", { bubbles: false }));
+    }, secondTop);
+    await expect
+      .poll(async () => {
+        const bounds = await second.boundingBox();
+        return bounds ? bounds.y - scrollBounds.y : Number.NaN;
+      })
+      .toBeCloseTo(0, 0);
+  });
 });

-test("changes context menus duplicate files and folders", async ({ page }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-
-  await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
-  await page.getByTestId("diff-file-0-duplicate").click();
-  await expect
-    .poll(() => readFileIfPresent(path.join(workspace.repoPath, "src/use-mounted-tab-set copy.ts")))
-    .toBe(AFTER);
-
-  await changesTree(page).getByTestId("diff-folder-src-toggle").click({ button: "right" });
-  await page.getByTestId("diff-folder-src-duplicate").click();
-  await expect
-    .poll(() => readFileIfPresent(path.join(workspace.repoPath, "src copy/use-mounted-tab-set.ts")))
-    .toBe(AFTER);
-});
-
-test("changes tree aligns every file status after its diff stat", async ({ page }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff({
-    includeDeletedFile: true,
-    includeUntrackedFile: true,
-  });
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-  const tree = changesTree(page);
-  const modifiedRow = tree.getByTestId("diff-tree-file-0");
-  const deletedRow = tree.getByTestId("diff-tree-file-1");
-  const addedRow = tree.getByTestId("diff-tree-file-2");
-  const modifiedStatus = modifiedRow.getByRole("img", { name: "Modified" });
-  await expect(modifiedStatus).toBeVisible();
-  await expect(deletedRow.getByRole("img", { name: "Deleted" })).toBeVisible();
-  await expect(addedRow.getByRole("img", { name: "New" })).toBeVisible();
-
-  const [statBounds, statusBounds] = await Promise.all([
-    modifiedRow.getByTestId("diff-tree-file-0-stat").boundingBox(),
-    modifiedStatus.boundingBox(),
-  ]);
-  if (!statBounds || !statusBounds) throw new Error("Changes tree trailing status has no bounds");
-  expect(statusBounds.x - (statBounds.x + statBounds.width)).toBeGreaterThanOrEqual(8);
-});
-
-test("the scrolling diff lists files in changes tree order", async ({ page }) => {
+test("browse the ordered changes tree and recursively collapse its folders", async ({ page }) => {
  const workspace = await createWorkspaceWithMountedTabDiff({
    includeNestedFolders: true,
    includeRootFileSortingFirst: true,
@@ -559,72 +461,70 @@ test("the scrolling diff lists files in changes tree order", async ({ page }) =>
  await useUnwrappedDiffLines(page);
  await openWorkspaceChanges(page, workspace);

-  const tree = changesTree(page);
-  const treeNames = tree.locator('[data-testid^="diff-tree-file-"][data-testid$="-name"]');
-  const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
-  const diffHeaders = panel.getByTestId(/^diff-file-\d+$/);
+  await test.step("the scrolling diff lists files in changes tree order", async () => {
+    const tree = changesTree(page);
+    const treeNames = tree.locator('[data-testid^="diff-tree-file-"][data-testid$="-name"]');
+    const panel = page.getByTestId("working-diff-panel").filter({ visible: true });
+    const diffHeaders = panel.getByTestId(/^diff-file-\d+$/);

-  // Directories sort before files at every level, so the root note lands last
-  // even though "a-root-note.txt" compares below "src/..." as a whole string.
-  const expected = ["changed.ts", "root.ts", "use-mounted-tab-set.ts", "a-root-note.txt"];
+    // Directories sort before files at every level, so the root note lands last
+    // even though "a-root-note.txt" compares below "src/..." as a whole string.
+    const expected = ["changed.ts", "root.ts", "use-mounted-tab-set.ts", "a-root-note.txt"];

-  // Equal counts also prove no folder is collapsed: flattenDiffTree drops the
-  // descendants of a collapsed folder, which would make the tree a subsequence
-  // of the diff rather than a match, and mask a real ordering difference.
-  await expect(treeNames).toHaveCount(expected.length);
-  await expect(diffHeaders).toHaveCount(expected.length);
-  await expect(treeNames).toHaveText(expected);
-  const expectedHeaderNames = [
-    "src/zz-folder/nested/changed.ts, +1, -1",
-    "src/zz-folder/root.ts, +1, -1",
-    "src/use-mounted-tab-set.ts, +37, -1",
-    "a-root-note.txt, +1, -0",
-  ];
-  for (const [index, accessibleName] of expectedHeaderNames.entries()) {
-    await expect(diffHeaders.nth(index)).toHaveAccessibleName(accessibleName);
-  }
-});
+    // Equal counts also prove no folder is collapsed: flattenDiffTree drops the
+    // descendants of a collapsed folder, which would make the tree a subsequence
+    // of the diff rather than a match, and mask a real ordering difference.
+    await expect(treeNames).toHaveCount(expected.length);
+    await expect(diffHeaders).toHaveCount(expected.length);
+    await expect(treeNames).toHaveText(expected);
+    const expectedHeaderNames = [
+      "src/zz-folder/nested/changed.ts, +1, -1",
+      "src/zz-folder/root.ts, +1, -1",
+      "src/use-mounted-tab-set.ts, +37, -1",
+      "a-root-note.txt, +1, -0",
+    ];
+    for (const [index, accessibleName] of expectedHeaderNames.entries()) {
+      await expect(diffHeaders.nth(index)).toHaveAccessibleName(accessibleName);
+    }
+  });

-test("changes context menu recursively collapses descendant folders", async ({ page }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff({ includeNestedFolders: true });
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
+  await test.step("changes context menu recursively collapses descendant folders", async () => {
+    const tree = changesTree(page);
+    await expect(tree.getByTestId("diff-folder-src/zz-folder")).toBeVisible();
+    await expect(tree.getByTestId("diff-folder-src/zz-folder/nested")).toBeVisible();
+    const rootRow = tree.getByTestId("diff-folder-src-toggle");
+    const rootLabel = tree.getByTestId("diff-folder-src-toggle").getByText("src", { exact: true });
+    await expect(rootRow).toHaveCSS("opacity", "1");
+    await expect(rootLabel).toHaveCSS("opacity", "0.76");
+    await rootRow.hover();
+    await expect(rootLabel).toHaveCSS("opacity", "1");
+    await page.mouse.move(0, 0);
+    const nestedLabel = tree
+      .getByTestId("diff-folder-src/zz-folder-toggle")
+      .getByText("zz-folder", { exact: true });
+    const [rootBounds, nestedBounds] = await Promise.all([
+      rootLabel.boundingBox(),
+      nestedLabel.boundingBox(),
+    ]);
+    if (!rootBounds || !nestedBounds) throw new Error("Changes tree rows have no bounds");
+    expect(nestedBounds.x - rootBounds.x).toBe(12);

-  const tree = changesTree(page);
-  await expect(tree.getByTestId("diff-folder-src/zz-folder")).toBeVisible();
-  await expect(tree.getByTestId("diff-folder-src/zz-folder/nested")).toBeVisible();
-  const rootRow = tree.getByTestId("diff-folder-src-toggle");
-  const rootLabel = tree.getByTestId("diff-folder-src-toggle").getByText("src", { exact: true });
-  await expect(rootRow).toHaveCSS("opacity", "1");
-  await expect(rootLabel).toHaveCSS("opacity", "0.76");
-  await rootRow.hover();
-  await expect(rootLabel).toHaveCSS("opacity", "1");
-  await page.mouse.move(0, 0);
-  const nestedLabel = tree
-    .getByTestId("diff-folder-src/zz-folder-toggle")
-    .getByText("zz-folder", { exact: true });
-  const [rootBounds, nestedBounds] = await Promise.all([
-    rootLabel.boundingBox(),
-    nestedLabel.boundingBox(),
-  ]);
-  if (!rootBounds || !nestedBounds) throw new Error("Changes tree rows have no bounds");
-  expect(nestedBounds.x - rootBounds.x).toBe(12);
+    await tree.getByTestId("diff-folder-src-toggle").click({ button: "right" });
+    await page.getByTestId("diff-folder-src-collapse-folder").click();
+    await expect(tree.getByTestId("diff-folder-src/zz-folder")).toHaveCount(0);

-  await tree.getByTestId("diff-folder-src-toggle").click({ button: "right" });
-  await page.getByTestId("diff-folder-src-collapse-folder").click();
-  await expect(tree.getByTestId("diff-folder-src/zz-folder")).toHaveCount(0);
+    await tree.getByTestId("diff-folder-src-toggle").click();
+    await expect(tree.getByTestId("diff-folder-src/zz-folder")).toBeVisible();
+    await expect(tree.getByText("root.ts", { exact: true })).toHaveCount(0);

-  await tree.getByTestId("diff-folder-src-toggle").click();
-  await expect(tree.getByTestId("diff-folder-src/zz-folder")).toBeVisible();
-  await expect(tree.getByText("root.ts", { exact: true })).toHaveCount(0);
+    await tree.getByTestId("diff-folder-src/zz-folder-toggle").click();
+    await expect(tree.getByText("root.ts", { exact: true })).toBeVisible();
+    await expect(tree.getByTestId("diff-folder-src/zz-folder/nested")).toBeVisible();
+    await expect(tree.getByText("changed.ts", { exact: true })).toHaveCount(0);

-  await tree.getByTestId("diff-folder-src/zz-folder-toggle").click();
-  await expect(tree.getByText("root.ts", { exact: true })).toBeVisible();
-  await expect(tree.getByTestId("diff-folder-src/zz-folder/nested")).toBeVisible();
-  await expect(tree.getByText("changed.ts", { exact: true })).toHaveCount(0);
-
-  await tree.getByTestId("diff-folder-src/zz-folder/nested-toggle").click();
-  await expect(tree.getByText("changed.ts", { exact: true })).toBeVisible();
+    await tree.getByTestId("diff-folder-src/zz-folder/nested-toggle").click();
+    await expect(tree.getByText("changed.ts", { exact: true })).toBeVisible();
+  });
 });

 test("changes context menus expose folder revert and restore a file after confirmation", async ({
@@ -761,70 +661,25 @@ test("shows a revert error returned by the daemon", async ({ page }) => {
    .toBe(AFTER);
 });

-test("Changes keeps review navigation and controls inside its workspace tab", async ({ page }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff({ includeDeletedFile: true });
+test("inspect, review, open, and duplicate changed files in the workspace", async ({ page }) => {
+  const workspace = await createWorkspaceWithMountedTabDiff({
+    includeDeletedFile: true,
+    includeUntrackedFile: true,
+  });
  await useUnwrappedDiffLines(page);
  await openWorkspaceChanges(page, workspace);
-
-  const visiblePanel = page.getByTestId("working-diff-panel").filter({ visible: true });
-  await expect(visiblePanel).toBeVisible();
-  await expect(visiblePanel.getByTestId("changes-repository-header")).toHaveCount(0);
-  await expect(visiblePanel.getByTestId("changes-branch-switcher")).toHaveCount(0);
-  await expect(visiblePanel.getByTestId("changes-diff-status-trigger")).toHaveCount(0);
-  await expect(visiblePanel.getByTestId("changes-selected-diff-stat")).toHaveCount(0);
-  await expect(visiblePanel.getByTestId("changes-header")).toHaveCount(1);
-  await expect(diffHeaderForPath(visiblePanel, "src/use-mounted-tab-set.ts")).toHaveAccessibleName(
-    "src/use-mounted-tab-set.ts, +37, -1",
-  );
-  await expect(diffHeaderForPath(visiblePanel, "src/zz-deleted.ts")).toHaveAccessibleName(
-    "src/zz-deleted.ts, +0, -1",
-  );
-  await expect(visiblePanel.getByTestId("changes-primary-cta")).toHaveCount(0);
-  await expect(page.getByTestId("changes-primary-cta")).toHaveCount(1);
-  await expect(page.getByTestId("changes-primary-cta")).toContainText("Commit");
-  await expect(visiblePanel.getByTestId("diff-file-0-body")).toBeVisible();
-  await visiblePanel.getByTestId("diff-file-0-toggle").click();
-  await expect(visiblePanel.getByTestId("diff-file-0-body")).not.toBeVisible();
-
-  await expect(visiblePanel.getByRole("button", { name: "Diff options" })).toHaveCount(0);
-  await expect(page.getByTestId("changes-open-tab")).toHaveCount(0);
-  const collapseFiles = visiblePanel.getByTestId("changes-toggle-collapse-all");
-  await expect(collapseFiles).toHaveAttribute("aria-label", "Collapse all files");
-  await collapseFiles.click();
-  await expect(collapseFiles).toHaveAttribute("aria-label", "Expand all files");
-  await collapseFiles.click();
-  await expect(visiblePanel.getByTestId("diff-file-0-body")).toBeVisible();
-
-  const layout = visiblePanel.getByTestId("changes-toggle-layout");
-  await expect(layout).toHaveAttribute("aria-label", "Switch to side-by-side diff");
-  await layout.click();
-  await expect(layout).toHaveAttribute("aria-label", "Switch to unified diff");
-
-  const whitespace = visiblePanel.getByTestId("changes-toggle-whitespace");
-  await expect(whitespace).toHaveAttribute("aria-label", "Hide whitespace");
-  const wrapLines = visiblePanel.getByTestId("changes-toggle-wrap-lines");
-  await expect(wrapLines).toHaveAttribute("aria-label", "Wrap long lines");
-  await expect(visiblePanel.getByTestId("changes-refresh")).toHaveAttribute(
-    "aria-label",
-    "Refresh",
-  );
-  await wrapLines.click();
-  await expect(wrapLines).toHaveAttribute("aria-label", "Scroll long lines");
-  await expect(page.getByTestId(/^workspace-working-diff-close-/)).toHaveCount(1);
-
-  await writeFile(path.join(workspace.repoPath, "src/use-mounted-tab-set.ts"), BEFORE);
-  await expect(
-    visiblePanel.locator('[data-diff-header-path="src/use-mounted-tab-set.ts"]'),
-  ).toHaveCount(0, { timeout: 30_000 });
-  await expect(visiblePanel.locator('[data-diff-header-path="src/zz-deleted.ts"]')).toBeVisible();
-  await writeFile(path.join(workspace.repoPath, "src/use-mounted-tab-set.ts"), AFTER);
-  await expect(diffHeaderForPath(visiblePanel, "src/use-mounted-tab-set.ts")).toHaveAccessibleName(
-    "src/use-mounted-tab-set.ts, +37, -1",
-    { timeout: 30_000 },
-  );
-  await expect(diffHeaderForPath(visiblePanel, "src/zz-deleted.ts")).toHaveAccessibleName(
-    "src/zz-deleted.ts, +0, -1",
-  );
+  await test.step("workspace controls update the comparison and presentation", async () => {
+    await inspectChangesWorkspaceControls(page, workspace);
+  });
+  await setOpenChangesPresentation(page, { layout: "unified", wrapLines: false });
+  await scrollDiffToTop(page);
+  await reviewChangedLine(page);
+  await scrollDiffToTop(page);
+  await inspectChangedFileHeaders(page);
+  await test.step("duplicate the file and its folder from Changes", async () => {
+    await page.getByTestId("workspace-tab-working_diff").filter({ visible: true }).click();
+    await duplicateChangedFiles(page, workspace);
+  });
 });

 test("compact Changes keeps its actions compact and menu-only", async ({ page }) => {
@@ -890,18 +745,6 @@ test("compact Changes jumps to a file from the changed-files sheet", async ({ pa
  });
 });

-test("Jump to file stays out of the desktop diff and of an empty comparison", async ({ page }) => {
-  const committed = await createWorkspaceWithCommittedDiff();
-  await openWorkspaceChangesSurface(page, committed, 90_000);
-  await expect(page.getByRole("button", { name: "Jump to file" })).toHaveCount(0);
-
-  const explorer = await openCompactChanges(page, committed);
-  await expect(explorer.getByRole("button", { name: "Jump to file" })).toBeVisible();
-
-  await selectEmptyUncommittedComparison(page, explorer);
-  await expect(page.getByRole("button", { name: "Jump to file" })).toHaveCount(0);
-});
-
 test("canvas diff stays sharp while its workspace pane is resized", async ({ page }) => {
  const workspace = await createWorkspaceWithMountedTabDiff();
  await useUnwrappedDiffLines(page);
@@ -1013,33 +856,6 @@ test("changes diff waits for configured fonts, then applies code typography chan
  expect(after.canvasPixels).not.toEqual(before.canvasPixels);
 });

-test("creates, cancels, edits, and deletes a review while keeping Changes focused", async ({
-  page,
-}) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-  const changesTab = page.getByTestId("workspace-tab-working_diff").filter({ visible: true });
-  const focusedBackground = await changesTab.evaluate(
-    (element) => getComputedStyle(element).backgroundColor,
-  );
-
-  await test.step("start a focused review with the browser text menu", async () => {
-    await startReviewOnFirstChangedLine(page);
-    await expect(page.getByTestId("inline-review-editor-input")).toBeFocused();
-    await expect(changesTab).toHaveCSS("background-color", focusedBackground);
-    await page.getByTestId("inline-review-editor-input").click({ button: "right" });
-    await expect(page.getByTestId("diff-source-context-menu")).toHaveCount(0);
-    await cancelInlineReview(page);
-  });
-  await test.step("save, edit, and delete the review", async () => {
-    await startReviewOnFirstChangedLine(page);
-    await saveInlineReview(page, "Please keep this branch explicit");
-    await editInlineReview(page, "Please keep this branch named explicitly");
-    await deleteInlineReview(page);
-  });
-});
-
 test("split canvas creates a review on the changed side and keeps it in that column", async ({
  page,
 }) => {
@@ -1058,21 +874,6 @@ test("split canvas creates a review on the changed side and keeps it in that col
  await cancelInlineReview(page);
 });

-test("scrolling clears the hovered review affordance", async ({ page }) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-
-  await hoverFirstChangedGutter(page);
-  await expect(page.getByRole("button", { name: "Add review comment" })).toBeVisible();
-  await page.getByTestId("git-diff-scroll").evaluate((element) => {
-    element.scrollTop += 80;
-    element.dispatchEvent(new Event("scroll", { bubbles: false }));
-  });
-
-  await expect(page.getByRole("button", { name: "Add review comment" })).toHaveCount(0);
-});
-
 test("canvas diff uses the overlay scrollbar and its thumb controls vertical scrolling", async ({
  page,
 }) => {
@@ -1120,33 +921,6 @@ test("canvas headers keep a many-file diff bounded while scrolling end to end",
  await expect(root.locator('[data-testid^="git-diff-sticky-header-"]')).toHaveCount(2);
 });

-test("the whole reviewable row reveals the gutter affordance and uses a text cursor", async ({
-  page,
-}) => {
-  const workspace = await createWorkspaceWithMountedTabDiff();
-  await useUnwrappedDiffLines(page);
-  await openWorkspaceChanges(page, workspace);
-
-  const body = page.getByTestId("diff-file-0-body");
-  const canvas = page.getByTestId("git-diff-canvas");
-  const [bodyBounds, fontSize] = await Promise.all([
-    body.boundingBox(),
-    canvas.evaluate((element) => Number.parseFloat(getComputedStyle(element).fontSize)),
-  ]);
-  if (!bodyBounds) throw new Error("Expanded diff body has no bounds");
-  const lineHeight = Math.round(fontSize * 1.5);
-  await page.mouse.move(bodyBounds.x + bodyBounds.width - 32, bodyBounds.y + lineHeight * 1.5);
-
-  const affordance = page.getByRole("button", { name: "Add review comment" });
-  await expect(affordance).toBeVisible();
-  await expect(affordance.locator("svg")).toBeVisible();
-  const affordanceBounds = await affordance.boundingBox();
-  expect(affordanceBounds?.width).toBeCloseTo(22, 0);
-  expect(affordanceBounds?.height).toBeCloseTo(22, 0);
-  await expect(affordance).not.toHaveCSS("background-color", "rgba(0, 0, 0, 0)");
-  await expect(page.getByTestId("git-diff-scroll")).toHaveCSS("cursor", "text");
-});
-
 test("selects, preserves, copies, and dismisses diff text without opening a review", async ({
  page,
 }) => {
@@ -1297,23 +1071,6 @@ test("dragging within one wide grapheme or outside its cell never opens a review
  await expect(page.getByTestId("inline-review-editor")).toHaveCount(0);
 });

-test("collapsing and expanding restores the real horizontal scroll offset", async ({ page }) => {
-  const workspace = await createWorkspaceWithExactSelectionDiff("x".repeat(400));
-  await useUnwrappedDiffLines(page);
-  await openSelectionWorkspaceChanges(page, workspace);
-
-  const retainedOffset = await horizontallyScrollFirstFile(page, 320);
-  await page.getByTestId("diff-file-0-toggle").click();
-  await expect(page.getByTestId("diff-file-0-horizontal-scroll")).toHaveCount(0);
-  await page.getByTestId("diff-file-0-toggle").click();
-
-  await expect
-    .poll(() =>
-      page.getByTestId("diff-file-0-horizontal-scroll").evaluate((element) => element.scrollLeft),
-    )
-    .toBe(retainedOffset);
-});
-
 async function useCodeFont(page: Page, codeFontSize: number): Promise<void> {
  await page.addInitScript(
    ({ settingsKey, fontSize }) => {
@@ -2218,3 +1975,242 @@ async function scrollToLowerUnwrappedDiffRows(page: Page): Promise<void> {
  });
  await expect(page.getByTestId("git-diff-canvas")).toBeVisible();
 }
+
+async function readHorizontalDiffOffset(page: Page): Promise<number> {
+  return page
+    .getByTestId("diff-file-0-horizontal-scroll")
+    .evaluate((element) => element.scrollLeft);
+}
+
+async function inspectChangesWorkspaceControls(
+  page: Page,
+  workspace: DirtyWorkspace,
+): Promise<void> {
+  const visiblePanel = page.getByTestId("working-diff-panel").filter({ visible: true });
+  await expect(visiblePanel).toBeVisible();
+  await expect(visiblePanel.getByTestId("changes-repository-header")).toHaveCount(0);
+  await expect(visiblePanel.getByTestId("changes-branch-switcher")).toHaveCount(0);
+  await expect(visiblePanel.getByTestId("changes-diff-status-trigger")).toHaveCount(0);
+  await expect(visiblePanel.getByTestId("changes-selected-diff-stat")).toHaveCount(0);
+  await expect(visiblePanel.getByTestId("changes-header")).toHaveCount(1);
+  await expect(diffHeaderForPath(visiblePanel, "src/use-mounted-tab-set.ts")).toHaveAccessibleName(
+    "src/use-mounted-tab-set.ts, +37, -1",
+  );
+  await expect(diffHeaderForPath(visiblePanel, "src/zz-deleted.ts")).toHaveAccessibleName(
+    "src/zz-deleted.ts, +0, -1",
+  );
+  await expect(visiblePanel.getByTestId("changes-primary-cta")).toHaveCount(0);
+  await expect(page.getByTestId("changes-primary-cta")).toHaveCount(1);
+  await expect(page.getByTestId("changes-primary-cta")).toContainText("Commit");
+  await expect(visiblePanel.getByTestId("diff-file-0-body")).toBeVisible();
+  await visiblePanel.getByTestId("diff-file-0-toggle").click();
+  await expect(visiblePanel.getByTestId("diff-file-0-body")).not.toBeVisible();
+
+  await expect(visiblePanel.getByRole("button", { name: "Diff options" })).toHaveCount(0);
+  await expect(page.getByTestId("changes-open-tab")).toHaveCount(0);
+  const collapseFiles = visiblePanel.getByTestId("changes-toggle-collapse-all");
+  await expect(collapseFiles).toHaveAttribute("aria-label", "Collapse all files");
+  await collapseFiles.click();
+  await expect(collapseFiles).toHaveAttribute("aria-label", "Expand all files");
+  await collapseFiles.click();
+  await expect(visiblePanel.getByTestId("diff-file-0-body")).toBeVisible();
+
+  const layout = visiblePanel.getByTestId("changes-toggle-layout");
+  await expect(layout).toHaveAttribute("aria-label", "Switch to side-by-side diff");
+  await layout.click();
+  await expect(layout).toHaveAttribute("aria-label", "Switch to unified diff");
+
+  const whitespace = visiblePanel.getByTestId("changes-toggle-whitespace");
+  await expect(whitespace).toHaveAttribute("aria-label", "Hide whitespace");
+  const wrapLines = visiblePanel.getByTestId("changes-toggle-wrap-lines");
+  await expect(wrapLines).toHaveAttribute("aria-label", "Wrap long lines");
+  await expect(visiblePanel.getByTestId("changes-refresh")).toHaveAttribute(
+    "aria-label",
+    "Refresh",
+  );
+  await wrapLines.click();
+  await expect(wrapLines).toHaveAttribute("aria-label", "Scroll long lines");
+  await expect(page.getByTestId(/^workspace-working-diff-close-/)).toHaveCount(1);
+
+  await writeFile(path.join(workspace.repoPath, "src/use-mounted-tab-set.ts"), BEFORE);
+  await expect(
+    visiblePanel.locator('[data-diff-header-path="src/use-mounted-tab-set.ts"]'),
+  ).toHaveCount(0, { timeout: 30_000 });
+  await expect(visiblePanel.locator('[data-diff-header-path="src/zz-deleted.ts"]')).toBeVisible();
+  await writeFile(path.join(workspace.repoPath, "src/use-mounted-tab-set.ts"), AFTER);
+  await expect(diffHeaderForPath(visiblePanel, "src/use-mounted-tab-set.ts")).toHaveAccessibleName(
+    "src/use-mounted-tab-set.ts, +37, -1",
+    { timeout: 30_000 },
+  );
+  await expect(diffHeaderForPath(visiblePanel, "src/zz-deleted.ts")).toHaveAccessibleName(
+    "src/zz-deleted.ts, +0, -1",
+  );
+}
+
+async function reviewChangedLine(page: Page): Promise<void> {
+  await test.step("the whole reviewable row reveals the gutter affordance and uses a text cursor", async () => {
+    const body = page.getByTestId("diff-file-0-body");
+    const canvas = page.getByTestId("git-diff-canvas");
+    const [bodyBounds, fontSize] = await Promise.all([
+      body.boundingBox(),
+      canvas.evaluate((element) => Number.parseFloat(getComputedStyle(element).fontSize)),
+    ]);
+    if (!bodyBounds) throw new Error("Expanded diff body has no bounds");
+    const lineHeight = Math.round(fontSize * 1.5);
+    await page.mouse.move(bodyBounds.x + bodyBounds.width - 32, bodyBounds.y + lineHeight * 1.5);
+
+    const affordance = page.getByRole("button", { name: "Add review comment" });
+    await expect(affordance).toBeVisible();
+    await expect(affordance.locator("svg")).toBeVisible();
+    const affordanceBounds = await affordance.boundingBox();
+    expect(affordanceBounds?.width).toBeCloseTo(22, 0);
+    expect(affordanceBounds?.height).toBeCloseTo(22, 0);
+    await expect(affordance).not.toHaveCSS("background-color", "rgba(0, 0, 0, 0)");
+    await expect(page.getByTestId("git-diff-scroll")).toHaveCSS("cursor", "text");
+  });
+
+  await test.step("creates, cancels, edits, and deletes a review while keeping Changes focused", async () => {
+    const changesTab = page.getByTestId("workspace-tab-working_diff").filter({ visible: true });
+    const focusedBackground = await changesTab.evaluate(
+      (element) => getComputedStyle(element).backgroundColor,
+    );
+
+    await test.step("start a focused review with the browser text menu", async () => {
+      await startReviewOnFirstChangedLine(page);
+      await expect(page.getByTestId("inline-review-editor-input")).toBeFocused();
+      await expect(changesTab).toHaveCSS("background-color", focusedBackground);
+      await page.getByTestId("inline-review-editor-input").click({ button: "right" });
+      await expect(page.getByTestId("diff-source-context-menu")).toHaveCount(0);
+      await cancelInlineReview(page);
+    });
+    await test.step("save, edit, and delete the review", async () => {
+      await startReviewOnFirstChangedLine(page);
+      await saveInlineReview(page, "Please keep this branch explicit");
+      await editInlineReview(page, "Please keep this branch named explicitly");
+      await deleteInlineReview(page);
+    });
+  });
+
+  await test.step("scrolling clears the hovered review affordance", async () => {
+    await hoverFirstChangedGutter(page);
+    await expect(page.getByRole("button", { name: "Add review comment" })).toBeVisible();
+    await page.getByTestId("git-diff-scroll").evaluate((element) => {
+      element.scrollTop += 80;
+      element.dispatchEvent(new Event("scroll", { bubbles: false }));
+    });
+
+    await expect(page.getByRole("button", { name: "Add review comment" })).toHaveCount(0);
+  });
+}
+
+async function inspectChangedFileHeaders(page: Page): Promise<void> {
+  await test.step("file statuses follow their diff stats", async () => {
+    const tree = changesTree(page);
+    const modifiedRow = tree.getByTestId("diff-tree-file-0");
+    const deletedRow = tree.getByTestId("diff-tree-file-1");
+    const addedRow = tree.getByTestId("diff-tree-file-2");
+    const modifiedStatus = modifiedRow.getByRole("img", { name: "Modified" });
+    await expect(modifiedStatus).toBeVisible();
+    await expect(deletedRow.getByRole("img", { name: "Deleted" })).toBeVisible();
+    await expect(addedRow.getByRole("img", { name: "New" })).toBeVisible();
+
+    const [statBounds, statusBounds] = await Promise.all([
+      modifiedRow.getByTestId("diff-tree-file-0-stat").boundingBox(),
+      modifiedStatus.boundingBox(),
+    ]);
+    if (!statBounds || !statusBounds) throw new Error("Changes tree trailing status has no bounds");
+    expect(statusBounds.x - (statBounds.x + statBounds.width)).toBeGreaterThanOrEqual(8);
+  });
+
+  await test.step("every interactive file header has the same hover feedback", async () => {
+    const first = page.getByTestId("diff-file-0-toggle");
+    const second = page.getByTestId("diff-file-1-toggle");
+    const firstCanvas = page.getByTestId("git-diff-sticky-header-0");
+    const secondCanvas = page.getByTestId("git-diff-sticky-header-1");
+    const normalBackground = await headerCanvasPixel(firstCanvas, first, 10);
+
+    await first.hover();
+    await expect.poll(() => headerCanvasPixel(firstCanvas, first, 10)).not.toBe(normalBackground);
+    const hoverBackground = await headerCanvasPixel(firstCanvas, first, 10);
+
+    await first.click();
+    await page.mouse.move(0, 0);
+    await expect(first).toHaveAttribute("aria-expanded", "false");
+    await expect.poll(() => headerCanvasPixel(firstCanvas, first, 10)).toBe(normalBackground);
+
+    await first.hover();
+    await expect.poll(() => headerCanvasPixel(firstCanvas, first, 10)).toBe(hoverBackground);
+    await second.hover();
+    await expect.poll(() => headerCanvasPixel(firstCanvas, first, 10)).toBe(normalBackground);
+    await expect.poll(() => headerCanvasPixel(secondCanvas, second, 10)).toBe(hoverBackground);
+    await first.click();
+    await page.mouse.move(0, 0);
+    await expect(first).toHaveAttribute("aria-expanded", "true");
+  });
+
+  await test.step("canvas file headers select without toggling for context menu and long press", async () => {
+    const firstFile = page.getByTestId("diff-file-0-toggle");
+    const deletedFile = page.getByTestId("diff-file-1-toggle");
+    await deletedFile.click({ button: "right" });
+    await expect(deletedFile).toHaveAttribute("aria-selected", "true");
+    await expect(deletedFile).toHaveAttribute("aria-expanded", "true");
+    await expect(page.getByText("Copy path")).toBeVisible();
+    await page.keyboard.press("Escape");
+
+    await longPressFileHeader(page, firstFile);
+    await expect(firstFile).toHaveAttribute("aria-selected", "true");
+    await expect(deletedFile).toHaveAttribute("aria-selected", "false");
+    await expect(firstFile).toHaveAttribute("aria-expanded", "true");
+  });
+
+  await test.step("changes file actions open below the right-click without a reserved kebab", async () => {
+    const deletedFileName = page.getByTestId("diff-file-1");
+    await expect(deletedFileName).toHaveAccessibleName(/zz-deleted\.ts/);
+    await deletedFileName.dblclick();
+    expect(await page.evaluate(() => window.getSelection()?.toString() ?? "")).toBe("");
+    await expect(page.getByTestId(/diff-file-\d+-actions/)).toHaveCount(0);
+    await page.getByTestId("diff-file-1-toggle").click({ button: "right" });
+    await expect(page.getByText("Copy path")).toBeVisible();
+    await page.getByText("Copy path", { exact: true }).click({ button: "right" });
+    await expect(page.getByText("Copy path")).toBeVisible();
+    await expect(page.getByTestId("diff-file-1-open-file")).toHaveCount(0);
+    await page.keyboard.press("Escape");
+
+    const fileRow = page.getByTestId("diff-file-0-toggle");
+    const fileRowBounds = await fileRow.boundingBox();
+    expect(fileRowBounds).not.toBeNull();
+    await fileRow.click({ button: "right", position: { x: 80, y: 10 } });
+    await expect(page.getByTestId("diff-file-0-open-file")).toBeVisible();
+    const menuBounds = await page.getByTestId("diff-file-0-context-menu").boundingBox();
+    expect(menuBounds).not.toBeNull();
+    expect(Math.abs(menuBounds!.x - (fileRowBounds!.x + 80))).toBeLessThanOrEqual(1);
+    expect(menuBounds!.y).toBeGreaterThan(fileRowBounds!.y + 10);
+    await page.getByTestId("diff-file-0-open-file").click();
+
+    await expect(page.getByTestId("workspace-file-pane")).toBeVisible();
+    await expect(page.getByTestId("workspace-tab-file_src/use-mounted-tab-set.ts")).toBeVisible();
+  });
+}
+
+async function duplicateChangedFiles(page: Page, workspace: DirtyWorkspace): Promise<void> {
+  await page.getByTestId("diff-file-0-toggle").click({ button: "right" });
+  await page.getByTestId("diff-file-0-duplicate").click();
+  await expect
+    .poll(() => readFileIfPresent(path.join(workspace.repoPath, "src/use-mounted-tab-set copy.ts")))
+    .toBe(AFTER);
+
+  await changesTree(page).getByTestId("diff-folder-src-toggle").click({ button: "right" });
+  await page.getByTestId("diff-folder-src-duplicate").click();
+  await expect
+    .poll(() => readFileIfPresent(path.join(workspace.repoPath, "src copy/use-mounted-tab-set.ts")))
+    .toBe(AFTER);
+}
+
+async function scrollDiffToTop(page: Page): Promise<void> {
+  const scroll = page.getByTestId("git-diff-scroll");
+  await scroll.evaluate((element) => {
+    element.scrollTop = 0;
+    element.dispatchEvent(new Event("scroll", { bubbles: false }));
+  });
+  await expect.poll(() => scroll.evaluate((element) => element.scrollTop)).toBe(0);
+}
@@ -5,13 +5,14 @@ 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,
  expectReconnectingToastVisible,
 } from "../support/helpers/workspace-ui";
 import { trackPromptJumpRequests } from "../support/helpers/agent-timeline-gate";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { createControlledStream } from "../support/helpers/controlled-stream";
 import {
  composerLocator,
  fillComposerDraft,
@@ -20,20 +21,18 @@ 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";

 const FILLER = Array.from({ length: 400 }, (_, index) => `filler${index}`).join(" ");
-const STREAMED_RESPONSE = [
+const STREAMED_TAIL = "STREAMED-REPLY-FINAL-TAIL";
+const HYDRATED_PARTIAL = "Hydrated partial continuation";
+const STREAMED_PREFIX = [
  "First paragraph with alpha-needle and pair-needle inside.",
  "Second paragraph with beta-needle and pair-needle inside.",
  `Third paragraph ${FILLER}`,
-].join("\n\n");
+].map((paragraph) => `${paragraph}\n\n`);

 const RESPONSE =
  'İ😀hello **world**; hello *world*.\n\n[hello &amp; world](https://example.com/hidden-destination)\n\n```ts\nconst a = "a.b";\n```\n\n- first cell\n- second cell';
@@ -125,49 +124,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 +178,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 +223,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,
 }) => {
@@ -358,50 +286,90 @@ test("shows a disconnected search failure and recovers with Retry", async ({ pag
  }
 });

-interface StreamedReplyChat extends MockAgentWorkspace {
-  /** Resolves once the streamed reply has finished arriving. */
+interface StreamedReplyChat {
+  cleanup(): Promise<void>;
+  advancePastVisiblePrefix(): Promise<void>;
+  expectHydratedPartial(): Promise<void>;
  replyFinished(): Promise<void>;
 }

-/**
- * Opens the chat first, then streams a multi-block reply into it and waits for a
- * later block, so the block holding the early needles is no longer the growing row.
- */
+/** The provider owns the pause, so both search and hydration see incomplete output. */
 async function openChatStreamingMultiBlockReply(page: Page): Promise<StreamedReplyChat> {
-  const agent = await seedMockAgentWorkspace({
-    repoPrefix: "chat-find-live-blocks-",
-    title: "Chat Find live blocks",
-    featureValues: {
-      mockStreamingAssistantResponse: STREAMED_RESPONSE,
-      mockStreamingAssistantIntervalMs: 60,
+  const stream = await createControlledStream();
+  const workspace = await seedWorkspace({ repoPrefix: "chat-find-live-blocks-" }).catch(
+    async (error) => {
+      await stream.cleanup();
+      throw error;
    },
-  });
+  );
+  const gate = await installDaemonWebSocketGate(page);
+  const cleanup = async () => {
+    try {
+      await stream.cleanup();
+    } finally {
+      await workspace.cleanup();
+    }
+  };
  try {
-    await openAgentRoute(page, agent);
-    await agent.client.sendAgentMessage(agent.agentId, "Stream a multi block answer");
-    await expect(page.getByText("beta-needle", { exact: false }).last()).toBeVisible({
-      timeout: 30_000,
+    const agent = await workspace.client.createAgent({
+      provider: stream.provider,
+      cwd: workspace.repoPath,
+      workspaceId: workspace.workspaceId,
+      title: "Chat Find live blocks",
    });
+    await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: agent.id });
+    await workspace.client.sendAgentMessage(agent.id, "Stream a multi block answer");
+    await stream.append(STREAMED_PREFIX);
+    await expect(page.getByText("beta-needle", { exact: false }).last()).toBeVisible();
    return {
-      ...agent,
+      cleanup,
+      advancePastVisiblePrefix: async () => {
+        const count = gate.getAgentStreamItemCount("assistant_message");
+        gate.setAgentStreamSuppressed(true);
+        await stream.append([HYDRATED_PARTIAL]);
+        await gate.waitForAgentStreamItem("assistant_message", count + 1);
+        await expect(page.getByTestId("assistant-message").last()).not.toContainText(
+          HYDRATED_PARTIAL,
+        );
+      },
+      expectHydratedPartial: async () => {
+        // A newer daemon row forces Find to fetch the real timeline instead of
+        // matching only the browser's streamed prefix.
+        await expect(page.getByTestId("assistant-message").last()).toContainText(HYDRATED_PARTIAL);
+        expect(gate.getTimelineRequestCount("before", agent.id)).toBeGreaterThan(0);
+      },
      replyFinished: async () => {
-        await agent.client.waitForFinish(agent.agentId, 60_000);
+        gate.setAgentStreamSuppressed(false);
+        await stream.finish([`\n\n${STREAMED_TAIL}`]);
+        await workspace.client.waitForFinish(agent.id, 15_000);
      },
    };
  } catch (error) {
-    await agent.cleanup();
+    await cleanup();
    throw error;
  }
 }

+async function expectIncompleteStreamedReply(page: Page): Promise<void> {
+  await expect(page.getByTestId("assistant-message").last()).toContainText("beta-needle");
+  await expect(page.getByTestId("assistant-message").last()).toContainText("filler399");
+  await expect(page.getByTestId("assistant-message").last()).not.toContainText(STREAMED_TAIL);
+  await expect(page.getByRole("button", { name: "Stop agent", exact: true })).toBeVisible();
+}
+
 test("finds a hit in a message that streamed while the chat was open", async ({ page }) => {
  test.setTimeout(120_000);
  const chat = await openChatStreamingMultiBlockReply(page);
  try {
+    await expectIncompleteStreamedReply(page);
+    await chat.advancePastVisiblePrefix();
    await openChatFind(page);
    // The first-paragraph hit must remain searchable while the same message grows.
    await expectFindStatus(page, "alpha-needle", "1 of 1");
+    await chat.expectHydratedPartial();
+    await expectIncompleteStreamedReply(page);
    await chat.replyFinished();
+    await expect(page.getByTestId("assistant-message").last()).toContainText(STREAMED_TAIL);
    await expectFindStatus(page, "beta-needle", "1 of 1");
    // One message, two paragraphs, one count across both.
    await expectFindStatus(page, "pair-needle", "1 of 2");
@@ -1,4 +1,4 @@
-import { expect, test } from "../support/fixtures";
+import { expect, test, type Page } from "../support/fixtures";
 import { trackPromptJumpRequests } from "../support/helpers/agent-timeline-gate";
 import {
  clickChatOutlineRowEdge,
@@ -50,6 +50,43 @@ import {
 const WIDE_VIEWPORT = { width: 1440, height: 900 };
 const LOADED_TURNS = 16;

+async function navigateLoadedOutline(page: Page, agent: LongTimelineAgent): Promise<void> {
+  await test.step("preview across the row", async () => {
+    await expectOneActiveChatOutlinePrompt(page);
+    await hoverChatOutlinePrompt(page, 2);
+    await expectChatOutlinePreview(page, agent.prompts[1]);
+
+    await pointAtChatOutlineRowEdge(page, 7);
+    await expectChatOutlinePreview(page, agent.prompts[6]);
+
+    await movePointerOffChatOutline(page);
+    await expectNoChatOutlinePreview(page);
+  });
+  await test.step("jump, dismiss preview, and retain bare selection", async () => {
+    await clickChatOutlineRowEdge(page, 4);
+    await expectChatOutlinePromptToRemainBare(page, 4);
+    await expectTimelinePromptLandedBelowTop(page, agent.prompts[3]);
+    await expectActiveChatOutlinePrompt(page, 4);
+    await movePointerOffChatOutline(page);
+    await expectNoChatOutlinePreview(page);
+  });
+  await test.step("track the active prompt while jumping and scrolling", async () => {
+    await expectOneActiveChatOutlinePrompt(page);
+    await scrollTimelineToNewestLoadedEdge(page);
+    await expectTimelinePromptVisible(page, agent.newestPrompt);
+    await expectActiveChatOutlinePromptMovedFrom(page, 4);
+  });
+  await test.step("clamp the newest prompt at maximum scroll", async () => {
+    await clickChatOutlineRowEdge(page, LOADED_TURNS);
+    await expectTimelineAtMaximumScrollWithPromptVisible(page, agent.newestPrompt);
+  });
+}
+
+async function jumpToNewerLoadedPrompt(page: Page, agent: LongTimelineAgent): Promise<void> {
+  await clickChatOutlineRowEdge(page, 60);
+  await expectTimelinePromptLandedBelowTop(page, agent.prompts[59]);
+}
+
 test.describe("desktop chat outline", () => {
  test("keeps the prompt marked while reading split Markdown blocks and after completion", async ({
    page,
@@ -183,28 +220,14 @@ test.describe("desktop chat outline", () => {
      await expectChatOutlinePrompts(page, LOADED_TURNS);
    });

-    test("previews the prompt under the pointer, anywhere across its row", async ({ page }) => {
-      await hoverChatOutlinePrompt(page, 2);
-      await expectChatOutlinePreview(page, agent.prompts[1]);
-
-      await pointAtChatOutlineRowEdge(page, 7);
-      await expectChatOutlinePreview(page, agent.prompts[6]);
-
-      await movePointerOffChatOutline(page);
-      await expectNoChatOutlinePreview(page);
+    test("previews, jumps, and tracks the reader through loaded prompts", async ({ page }) => {
+      await navigateLoadedOutline(page, agent);
    });

    test("does not preview while crossing the rail toward the sidebar", async ({ page }) => {
      await expectNoChatOutlinePreviewWhileCrossingToSidebar(page);
    });

-    test("closes the preview when the pointer leaves after a jump", async ({ page }) => {
-      await clickChatOutlineRowEdge(page, 4);
-      await movePointerOffChatOutline(page);
-
-      await expectNoChatOutlinePreview(page);
-    });
-
    test("previews and jumps to the focused prompt from the keyboard", async ({ page }) => {
      await focusChatOutlinePrompt(page, 1);
      await expectChatOutlinePreview(page, agent.prompts[0]);
@@ -215,32 +238,6 @@ test.describe("desktop chat outline", () => {
      await expectActiveChatOutlinePrompt(page, 1);
    });

-    test("moves the active mark as the reader jumps and scrolls", async ({ page }) => {
-      await expectOneActiveChatOutlinePrompt(page);
-
-      await clickChatOutlineRowEdge(page, 4);
-      await expectTimelinePromptLandedBelowTop(page, agent.prompts[3]);
-      await expectActiveChatOutlinePrompt(page, 4);
-
-      await scrollTimelineToNewestLoadedEdge(page);
-      await expectTimelinePromptVisible(page, agent.newestPrompt);
-      await expectActiveChatOutlinePromptMovedFrom(page, 4);
-    });
-
-    test("keeps a clicked prompt free of persistent selection chrome", async ({ page }) => {
-      await clickChatOutlineRowEdge(page, 4);
-
-      await expectChatOutlinePromptToRemainBare(page, 4);
-    });
-
-    test("clamps the newest prompt at maximum scroll while keeping it visible", async ({
-      page,
-    }) => {
-      await clickChatOutlineRowEdge(page, LOADED_TURNS);
-
-      await expectTimelineAtMaximumScrollWithPromptVisible(page, agent.newestPrompt);
-    });
-
    test("keeps the current prompt active throughout a long live assistant turn", async ({
      page,
    }) => {
@@ -282,21 +279,11 @@ test.describe("desktop chat outline", () => {
      await expectTimelinePromptLandedBelowTop(page, agent.prompts[29]);

      expect(history.requestCount()).toBe(requestsBeforeJump);
-    });

-    test("pins a newer loaded prompt when jumping downward from old history", async ({ page }) => {
-      const history = await holdOlderHistoryPages(page, agent);
-      await openAgentTimeline(page, agent);
-      await expectChatOutlinePrompts(page, 80);
-      await scrollThroughOlderHistoryPages(page, 2, history);
-      await scrollTimelineToNewestLoadedEdge(page);
-
-      await clickChatOutlineRowEdge(page, 30);
-      await expectTimelinePromptLandedBelowTop(page, agent.prompts[29]);
-
-      await clickChatOutlineRowEdge(page, 60);
-
-      await expectTimelinePromptLandedBelowTop(page, agent.prompts[59]);
+      await test.step(
+        "jump downward from old history to a newer loaded prompt",
+        jumpToNewerLoadedPrompt.bind(null, page, agent),
+      );
    });
  });

@@ -4,7 +4,6 @@ import { closeCommandCenter, openCommandCenter } from "../support/helpers/comman
 import {
  applyCommandCenterAgentControls,
  chooseCommandCenterAgentControl,
-  openCommandCenterForAgent,
  expectCommandCenterAgentControlSelected,
  expectFocusedAgentControls,
  expectWorkspaceAgentConfiguration,
@@ -42,37 +41,93 @@ async function seedMockDraftPreferences(page: import("@playwright/test").Page):
 test.describe("Command Center agent controls", () => {
  test.describe.configure({ timeout: 180_000 });

-  test("changes a running agent setting and preserves its selected row", async ({ page }) => {
+  test("search, select, and re-rank live agent controls before navigating to an action", async ({
+    page,
+  }) => {
    const workspace = await seedMockAgentWorkspace({
      repoPrefix: "command-center-live-controls-",
      title: "Command Center live controls",
      model: "five-minute-stream",
    });
    try {
-      // A stale runtime mode makes selecting the provider's supported mode
-      // exercise the live setting RPC instead of the selected-row no-op.
      await workspace.client.setAgentMode(workspace.agentId, "legacy-mode");
-      await openAgentRoute(page, {
-        workspaceId: workspace.workspaceId,
-        agentId: workspace.agentId,
+      await openAgentRoute(page, workspace);
+      await test.step("changes a running agent setting and preserves its selected row", async () => {
+        await openCommandCenter(page);
+        await chooseCommandCenterAgentControl({
+          page,
+          query: "load test",
+          choice: "Mode › Load test",
+        });
+        await expectWorkspaceAgentConfiguration(workspace, {
+          id: workspace.agentId,
+          provider: "mock",
+          model: "five-minute-stream",
+          modeId: "load-test",
+        });
+        await openCommandCenter(page);
+        await expectCommandCenterAgentControlSelected({
+          page,
+          query: "load test",
+          choice: "Mode › Load test",
+        });
+
+        await closeCommandCenter(page);
      });
-      await openCommandCenter(page);
-      await chooseCommandCenterAgentControl({
-        page,
-        query: "load test",
-        choice: "Mode › Load test",
+      await test.step("matches query tokens in any order", async () => {
+        await workspace.client.setAgentMode(workspace.agentId, "legacy-mode");
+        await openCommandCenter(page);
+        await chooseCommandCenterAgentControl({
+          page,
+          query: "test load",
+          choice: "Mode › Load test",
+        });
+
+        await expectWorkspaceAgentConfiguration(workspace, {
+          id: workspace.agentId,
+          provider: "mock",
+          model: "five-minute-stream",
+          modeId: "load-test",
+        });
      });
-      await expectWorkspaceAgentConfiguration(workspace, {
-        id: workspace.agentId,
-        provider: "mock",
-        model: "five-minute-stream",
-        modeId: "load-test",
+      await test.step("activates the best-matching row, not the highest-ranked group", async () => {
+        await workspace.client.setAgentMode(workspace.agentId, "approval-test");
+        const panel = await openCommandCenter(page);
+        const input = panel.getByTestId("command-center-input");
+        await input.fill("load");
+        await page.keyboard.press("Enter");
+
+        await expectWorkspaceAgentConfiguration(workspace, {
+          id: workspace.agentId,
+          provider: "mock",
+          model: "five-minute-stream",
+          modeId: "load-test",
+        });
      });
-      await openCommandCenter(page);
-      await expectCommandCenterAgentControlSelected({
-        page,
-        query: "load test",
-        choice: "Mode › Load test",
+      await test.step("drops an arrow-key selection once the query changes", async () => {
+        await workspace.client.setAgentMode(workspace.agentId, "approval-test");
+        const panel = await openCommandCenter(page);
+        const input = panel.getByTestId("command-center-input");
+        await input.fill("loa");
+        // Moves the highlight onto a model row, which still matches after the next keystroke.
+        await page.keyboard.press("ArrowDown");
+        await input.fill("load");
+        await page.keyboard.press("Enter");
+
+        await expectWorkspaceAgentConfiguration(workspace, {
+          id: workspace.agentId,
+          provider: "mock",
+          model: "five-minute-stream",
+          modeId: "load-test",
+        });
+      });
+      await test.step("keeps an action first when the action is the best match", async () => {
+        const panel = await openCommandCenter(page);
+        const input = panel.getByTestId("command-center-input");
+        await input.fill("sched");
+        await page.keyboard.press("Enter");
+
+        await expectAppRoute(page, buildSchedulesRoute(), { timeout: 30_000 });
      });
    } finally {
      await workspace.cleanup();
@@ -100,107 +155,6 @@ test.describe("Command Center agent controls", () => {
    }
  });

-  test("activates the best-matching row, not the highest-ranked group", async ({ page }) => {
-    // "Mode › Load Test" matches "load" at offset 0; every "Model › Mock Load Test › …" row
-    // matches at offset 5. Models used to outrank modes by fixed group rank, so Enter picked a
-    // model. Asserting both model and mode catches either row winning.
-    const workspace = await seedMockAgentWorkspace({
-      repoPrefix: "command-center-relevance-",
-      title: "Command Center relevance",
-      model: "five-minute-stream",
-    });
-    try {
-      await workspace.client.setAgentMode(workspace.agentId, "approval-test");
-      const input = await openCommandCenterForAgent(page, workspace);
-      await input.fill("load");
-      await page.keyboard.press("Enter");
-
-      await expectWorkspaceAgentConfiguration(workspace, {
-        id: workspace.agentId,
-        provider: "mock",
-        model: "five-minute-stream",
-        modeId: "load-test",
-      });
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
-  test("matches query tokens in any order", async ({ page }) => {
-    // "Mode › Load test" flattens to "mode load test", so the reversed query "test load" is never
-    // a substring of it. Only per-token matching finds this row.
-    const workspace = await seedMockAgentWorkspace({
-      repoPrefix: "command-center-tokenized-",
-      title: "Command Center tokenized search",
-      model: "five-minute-stream",
-    });
-    try {
-      await workspace.client.setAgentMode(workspace.agentId, "legacy-mode");
-      await openAgentRoute(page, {
-        workspaceId: workspace.workspaceId,
-        agentId: workspace.agentId,
-      });
-      await openCommandCenter(page);
-      await chooseCommandCenterAgentControl({
-        page,
-        query: "test load",
-        choice: "Mode › Load test",
-      });
-
-      await expectWorkspaceAgentConfiguration(workspace, {
-        id: workspace.agentId,
-        provider: "mock",
-        model: "five-minute-stream",
-        modeId: "load-test",
-      });
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
-  test("keeps an action first when the action is the best match", async ({ page }) => {
-    const workspace = await seedMockAgentWorkspace({
-      repoPrefix: "command-center-action-priority-",
-      title: "Command Center action priority",
-      model: "five-minute-stream",
-    });
-    try {
-      const input = await openCommandCenterForAgent(page, workspace);
-      await input.fill("sched");
-      await page.keyboard.press("Enter");
-
-      await expectAppRoute(page, buildSchedulesRoute(), { timeout: 30_000 });
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
-  test("drops an arrow-key selection once the query changes", async ({ page }) => {
-    const workspace = await seedMockAgentWorkspace({
-      repoPrefix: "command-center-active-reset-",
-      title: "Command Center active reset",
-      model: "five-minute-stream",
-    });
-    try {
-      await workspace.client.setAgentMode(workspace.agentId, "approval-test");
-      const input = await openCommandCenterForAgent(page, workspace);
-      await input.fill("loa");
-      // Moves the highlight onto a model row, which still matches after the next keystroke.
-      await page.keyboard.press("ArrowDown");
-      await input.fill("load");
-      await page.keyboard.press("Enter");
-
-      await expectWorkspaceAgentConfiguration(workspace, {
-        id: workspace.agentId,
-        provider: "mock",
-        model: "five-minute-stream",
-        modeId: "load-test",
-      });
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
  test("applies draft model and setting choices to the created agent", async ({ page }) => {
    const workspace = await seedWorkspace({ repoPrefix: "command-center-draft-controls-" });
    await seedMockDraftPreferences(page);
@@ -82,31 +82,20 @@ test("workspace file search stays geometrically stable through delayed loading a

    await row.click();
    await expectFileTabOpen(page, FILE_PATH);
-  } finally {
-    await seeded.cleanup();
-  }
-});
+    await test.step("dropping the files scope leaves the search row the same height", async () => {
+      await page.keyboard.press("Meta+P");

-test("dropping the files scope leaves the search row the same height", async ({ page }) => {
-  const seeded = await seedWorkspace({
-    repoPrefix: "command-center-file-search-scope-",
-    title: "Scope chip height",
-  });
+      const reopenedPanel = page.getByTestId("command-center-panel");
+      await expect(reopenedPanel).toBeVisible({ timeout: 30_000 });
+      const header = reopenedPanel.getByTestId("command-center-header");
+      const scoped = await header.boundingBox();

-  try {
-    await gotoWorkspace(page, seeded.workspaceId);
-    await page.keyboard.press("Meta+P");
+      await page.getByTestId("command-center-files-scope").click();
+      await expect(page.getByTestId("command-center-files-scope")).toHaveCount(0);
+      const unscoped = await header.boundingBox();

-    const panel = page.getByTestId("command-center-panel");
-    await expect(panel).toBeVisible({ timeout: 30_000 });
-    const header = panel.getByTestId("command-center-header");
-    const scoped = await header.boundingBox();
-
-    await page.getByTestId("command-center-files-scope").click();
-    await expect(page.getByTestId("command-center-files-scope")).toHaveCount(0);
-    const unscoped = await header.boundingBox();
-
-    expect(scoped?.height).toBe(unscoped?.height);
+      expect(scoped?.height).toBe(unscoped?.height);
+    });
  } finally {
    await seeded.cleanup();
  }
@@ -1,58 +0,0 @@
-import { expect, test, type Page } from "../support/fixtures";
-import { gotoAppShell } from "../support/helpers/app";
-import { openCommandCenter } from "../support/helpers/command-center";
-import { seedWorkspace } from "../support/helpers/seed-client";
-
-const GROUP_BY_STATUS = "Group by status";
-const GROUP_BY_PROJECT = "Group by project";
-
-// Result rows carry no testID of their own, so the entries are addressed by their visible label.
-async function runGroupingEntry(page: Page, label: string, absent: string): Promise<void> {
-  const panel = await openCommandCenter(page);
-  await panel.getByTestId("command-center-input").fill("group");
-
-  const entry = panel.getByText(label, { exact: true });
-  await expect(entry).toBeVisible({ timeout: 30_000 });
-  // The entry always names the mode you are not in, so its opposite must never be listed.
-  await expect(panel.getByText(absent, { exact: true })).toHaveCount(0);
-
-  await entry.click();
-  await expect(page.getByTestId("command-center-panel")).not.toBeVisible({ timeout: 30_000 });
-}
-
-test.describe("Command center sidebar grouping", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("flips sidebar grouping and persists the choice across a reload", async ({ page }) => {
-    const seeded = await seedWorkspace({ repoPrefix: "command-center-grouping-" });
-
-    try {
-      await gotoAppShell(page);
-      const projectList = page.getByTestId("sidebar-project-workspace-list-scroll");
-      const statusList = page.getByTestId("sidebar-status-list-scroll");
-      await expect(projectList).toBeVisible({ timeout: 30_000 });
-
-      // Query-only: the grouping entry stays out of the default empty-query list.
-      const panel = await openCommandCenter(page);
-      await expect(panel.getByText(GROUP_BY_STATUS, { exact: true })).toHaveCount(0);
-      await expect(panel.getByText(GROUP_BY_PROJECT, { exact: true })).toHaveCount(0);
-      await page.keyboard.press("Escape");
-      await expect(panel).not.toBeVisible({ timeout: 30_000 });
-
-      await runGroupingEntry(page, GROUP_BY_STATUS, GROUP_BY_PROJECT);
-      await expect(statusList).toBeVisible({ timeout: 30_000 });
-      await expect(projectList).toHaveCount(0);
-
-      // The only assertion that catches a flip which never reached persisted storage.
-      await page.reload();
-      await expect(statusList).toBeVisible({ timeout: 30_000 });
-
-      // Grouping persists, so the run must leave the sidebar back in project mode.
-      await runGroupingEntry(page, GROUP_BY_PROJECT, GROUP_BY_STATUS);
-      await expect(projectList).toBeVisible({ timeout: 30_000 });
-      await expect(statusList).toHaveCount(0);
-    } finally {
-      await seeded.cleanup().catch(() => undefined);
-    }
-  });
-});
@@ -107,73 +107,122 @@ async function rejectNextLabelAssignment(page: Page): Promise<void> {
  });
 }

+const GROUP_BY_STATUS = "Group by status";
+const GROUP_BY_PROJECT = "Group by project";
+
+// Result rows carry no testID of their own, so the entries are addressed by their visible label.
+async function runGroupingEntry(page: Page, label: string, absent: string): Promise<void> {
+  const panel = await openCommandCenter(page);
+  await panel.getByTestId("command-center-input").fill("group");
+
+  const entry = panel.getByText(label, { exact: true });
+  await expect(entry).toBeVisible({ timeout: 30_000 });
+  // The entry always names the mode you are not in, so its opposite must never be listed.
+  await expect(panel.getByText(absent, { exact: true })).toHaveCount(0);
+
+  await entry.click();
+  await expect(page.getByTestId("command-center-panel")).not.toBeVisible({ timeout: 30_000 });
+}
+
 test.describe("Command center workspace management", () => {
-  test("renames the active workspace while its sidebar row is unmounted", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "cc-rename-" });
-
+  test("manage the active workspace and scope its commands when leaving the route", async ({
+    page,
+  }) => {
+    const workspace = await seedWorkspace({ repoPrefix: "cc-manage-" });
    try {
      await gotoAppShell(page);
      await openWorkspace(page, workspace.workspaceId);
-      await collapseProjectSection(page, workspace);
+      await test.step("renames the active workspace while its sidebar row is unmounted", async () => {
+        await collapseProjectSection(page, workspace);

-      await runCommand(page, "rename", "Rename workspace");
+        await runCommand(page, "rename", "Rename workspace");

-      // Focused, not merely visible. A modal that mounts behind the closing palette, or loses the
-      // focus race with its focus-restore, still renders — you just cannot type into it.
-      const input = page.getByTestId("workspace-rename-modal-global-input");
-      await expect(input).toBeFocused({ timeout: 15_000 });
-      await expect(input).toHaveValue(workspace.workspaceName);
+        // Focused, not merely visible. A modal that mounts behind the closing palette, or loses the
+        // focus race with its focus-restore, still renders — you just cannot type into it.
+        const input = page.getByTestId("workspace-rename-modal-global-input");
+        await expect(input).toBeFocused({ timeout: 15_000 });
+        await expect(input).toHaveValue(workspace.workspaceName);

-      const customTitle = "Renamed From Palette";
-      await input.fill(customTitle);
-      await page.getByTestId("workspace-rename-modal-global-submit").click();
-      await expect(input).toHaveCount(0, { timeout: 15_000 });
+        const customTitle = "Renamed From Palette";
+        await input.fill(customTitle);
+        await page.getByTestId("workspace-rename-modal-global-submit").click();
+        await expect(input).toHaveCount(0, { timeout: 15_000 });

-      // Re-expand the section to read the row back.
-      const header = page
-        .locator('[data-testid^="sidebar-project-row-"]')
-        .filter({ hasText: workspace.projectDisplayName });
-      await header.click();
-      await expect(workspaceRow(page, workspace.workspaceId)).toContainText(customTitle, {
-        timeout: 15_000,
+        // Re-expand the section to read the row back.
+        const header = page
+          .locator('[data-testid^="sidebar-project-row-"]')
+          .filter({ hasText: workspace.projectDisplayName });
+        await header.click();
+        await expect(workspaceRow(page, workspace.workspaceId)).toContainText(customTitle, {
+          timeout: 15_000,
+        });
      });
-    } finally {
-      await workspace.cleanup();
-    }
-  });
+      await test.step("copies the workspace path and confirms with a toast", async () => {
+        await runCommand(page, "copy path", "Copy workspace path");

-  test("copies the workspace path and confirms with a toast", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "cc-copy-path-" });
-
-    try {
-      await gotoAppShell(page);
-      await openWorkspace(page, workspace.workspaceId);
-
-      await runCommand(page, "copy path", "Copy workspace path");
-
-      // toast.copied wraps its label: "Copied {{label}}" with label "Path copied".
-      await expect(page.getByText("Copied Path copied", { exact: true })).toBeVisible({
-        timeout: 15_000,
+        // toast.copied wraps its label: "Copied {{label}}" with label "Path copied".
+        await expect(page.getByText("Copied Path copied", { exact: true })).toBeVisible({
+          timeout: 15_000,
+        });
      });
-    } finally {
-      await workspace.cleanup();
-    }
-  });
+      await test.step("flips the pin entry to Unpin after pinning from the palette", async () => {
+        await runCommand(page, "pin", "Pin to top");
+        await expect(page.getByTestId("sidebar-pinned-section")).toBeVisible({ timeout: 15_000 });

-  test("flips the pin entry to Unpin after pinning from the palette", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "cc-pin-" });
+        const panel = await openCommandCenter(page);
+        await panel.getByTestId("command-center-input").fill("pin");
+        await expect(action(panel, "Unpin")).toBeVisible({ timeout: 15_000 });
+        await expect(action(panel, "Pin to top")).toHaveCount(0);

-    try {
-      await gotoAppShell(page);
-      await openWorkspace(page, workspace.workspaceId);
+        await action(panel, "Unpin").click();
+        await expect(page.getByTestId("sidebar-pinned-section")).toHaveCount(0);
+      });
+      await test.step("grouping commands persist across reload and switch back", async () => {
+        const projectList = page.getByTestId("sidebar-project-workspace-list-scroll");
+        const statusList = page.getByTestId("sidebar-status-list-scroll");
+        await expect(projectList).toBeVisible({ timeout: 30_000 });
+        // Query-only: the grouping entry stays out of the default empty-query list.
+        const panel = await openCommandCenter(page);
+        await expect(panel.getByText(GROUP_BY_STATUS, { exact: true })).toHaveCount(0);
+        await expect(panel.getByText(GROUP_BY_PROJECT, { exact: true })).toHaveCount(0);
+        await page.keyboard.press("Escape");
+        await expect(panel).not.toBeVisible({ timeout: 30_000 });

-      await runCommand(page, "pin", "Pin to top");
-      await expect(page.getByTestId("sidebar-pinned-section")).toBeVisible({ timeout: 15_000 });
+        await runGroupingEntry(page, GROUP_BY_STATUS, GROUP_BY_PROJECT);
+        await expect(statusList).toBeVisible({ timeout: 30_000 });
+        await expect(projectList).toHaveCount(0);

-      const panel = await openCommandCenter(page);
-      await panel.getByTestId("command-center-input").fill("pin");
-      await expect(action(panel, "Unpin")).toBeVisible({ timeout: 15_000 });
-      await expect(action(panel, "Pin to top")).toHaveCount(0);
+        // The only assertion that catches a flip which never reached persisted storage.
+        await page.reload();
+        await expect(statusList).toBeVisible({ timeout: 30_000 });
+
+        // Grouping persists, so the run must leave the sidebar back in project mode.
+        await runGroupingEntry(page, GROUP_BY_PROJECT, GROUP_BY_STATUS);
+        await expect(projectList).toBeVisible({ timeout: 30_000 });
+        await expect(statusList).toHaveCount(0);
+      });
+      await test.step("lists only the globally-handled toggle off a workspace route", async () => {
+        // All three are listed while a workspace route owns the handlers.
+        const workspacePanel = await openCommandCenter(page);
+        await workspacePanel.getByTestId("command-center-input").fill("toggle");
+        await expect(action(workspacePanel, "Toggle left sidebar")).toBeVisible({
+          timeout: 15_000,
+        });
+        await expect(action(workspacePanel, "Toggle Explorer sidebar")).toBeVisible();
+        await expect(action(workspacePanel, "Toggle focus mode")).toBeVisible();
+        await page.keyboard.press("Escape");
+        await expect(page.getByTestId("command-center-panel")).toHaveCount(0);
+
+        await page.locator('[data-testid="sidebar-settings"]:visible').first().click();
+        await expect(page.getByTestId("settings-sidebar")).toBeVisible({ timeout: 30_000 });
+
+        const panel = await openCommandCenter(page);
+        await panel.getByTestId("command-center-input").fill("toggle");
+
+        await expect(action(panel, "Toggle left sidebar")).toBeVisible({ timeout: 15_000 });
+        await expect(action(panel, "Toggle Explorer sidebar")).toHaveCount(0);
+        await expect(action(panel, "Toggle focus mode")).toHaveCount(0);
+      });
    } finally {
      await workspace.cleanup();
    }
@@ -183,35 +232,6 @@ test.describe("Command center workspace management", () => {
  // handled only by workspace-screen.tsx behind `enabled: isRouteFocused && ...`, so listing them
  // off a workspace route would give the user two entries that close the palette and do nothing.
  // Toggle left sidebar calls the panel store directly and works everywhere, so it stays listed.
-  test("lists only the globally-handled toggle off a workspace route", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "cc-toggle-scope-" });
-
-    try {
-      await gotoAppShell(page);
-      await openWorkspace(page, workspace.workspaceId);
-
-      // All three are listed while a workspace route owns the handlers.
-      const workspacePanel = await openCommandCenter(page);
-      await workspacePanel.getByTestId("command-center-input").fill("toggle");
-      await expect(action(workspacePanel, "Toggle left sidebar")).toBeVisible({ timeout: 15_000 });
-      await expect(action(workspacePanel, "Toggle Explorer sidebar")).toBeVisible();
-      await expect(action(workspacePanel, "Toggle focus mode")).toBeVisible();
-      await page.keyboard.press("Escape");
-      await expect(page.getByTestId("command-center-panel")).toHaveCount(0);
-
-      await page.locator('[data-testid="sidebar-settings"]:visible').first().click();
-      await expect(page.getByTestId("settings-sidebar")).toBeVisible({ timeout: 30_000 });
-
-      const panel = await openCommandCenter(page);
-      await panel.getByTestId("command-center-input").fill("toggle");
-
-      await expect(action(panel, "Toggle left sidebar")).toBeVisible({ timeout: 15_000 });
-      await expect(action(panel, "Toggle Explorer sidebar")).toHaveCount(0);
-      await expect(action(panel, "Toggle focus mode")).toHaveCount(0);
-    } finally {
-      await workspace.cleanup();
-    }
-  });

  test("toggles a label on the active workspace from the palette", async ({ page }) => {
    const workspace = await seedWorkspace({ repoPrefix: "cc-label-" });
@@ -44,6 +44,16 @@ test.describe("Command center workspaces", () => {
      });

      await gotoAppShell(page);
+      await test.step("single-host results show project and branch without a host label", async () => {
+        const singleHostPanel = await openCommandCenter(page);
+        const singleHostRow = singleHostPanel.getByTestId(
+          `command-center-workspace-${getServerId()}:${seeded.workspaceId}`,
+        );
+        await expect(singleHostRow.getByTestId("command-center-workspace-subtitle")).toHaveText(
+          `${seeded.projectDisplayName} · ${WORKSPACE_BRANCH}`,
+        );
+        await page.keyboard.press("Escape");
+      });
      await addOfflineHostAndReload(page, {
        serverId: SECONDARY_HOST_ID,
        label: "Secondary Host",
@@ -121,38 +131,4 @@ test.describe("Command center workspaces", () => {
      await seeded.cleanup();
    }
  });
-
-  test("single-host workspace subtitle omits the host and shows project · branch", async ({
-    page,
-  }) => {
-    const seeded = await seedWorkspace({
-      repoPrefix: "command-center-workspace-single-",
-      title: WORKSPACE_TITLE,
-    });
-
-    try {
-      execFileSync("git", ["checkout", "-b", WORKSPACE_BRANCH], {
-        cwd: seeded.repoPath,
-        stdio: "ignore",
-      });
-      const refreshed = await seeded.client.checkoutRefresh(seeded.repoPath);
-      if (!refreshed.success) {
-        throw new Error(`Failed to refresh checkout: ${JSON.stringify(refreshed.error)}`);
-      }
-
-      // No secondary host: with a single host, the host label is gated away.
-      await gotoAppShell(page);
-
-      const panel = await openCommandCenter(page);
-      const row = panel.getByTestId(
-        `command-center-workspace-${getServerId()}:${seeded.workspaceId}`,
-      );
-      await expect(row).toBeVisible({ timeout: 30_000 });
-
-      const subtitle = row.getByTestId("command-center-workspace-subtitle");
-      await expect(subtitle).toHaveText(`${seeded.projectDisplayName} · ${WORKSPACE_BRANCH}`);
-    } finally {
-      await seeded.cleanup();
-    }
-  });
 });
@@ -420,36 +420,38 @@ test("context details support keyboard entry and dismiss when the viewport moves
  await expect(details).toHaveCount(0);
 });

-test("pointer hovering context details preserves composer focus", async ({ page, agent }) => {
+test("context details preserve composer focus on hover and leave Find available after keyboard dismissal", async ({
+  page,
+  agent,
+}) => {
  const usage = await scriptAgentUsage(page);
  await page.setViewportSize(DESKTOP);
  await openAgent(page, agent);
  const [claude] = claudeAndCodexReports();
-  usage.answerNext([onPersonalLogin(claude!)]);
-  const input = composerLocator(page);
-  await input.focus();
-  await hoverContextWindowMeter(page);
-  await expect(input).toBeFocused();
-  await leaveContextWindowMeter(page);
-  await expect(input).toBeFocused();
-});

-test("Find remains available after dismissing context details", async ({ page, agent }) => {
-  const usage = await scriptAgentUsage(page);
-  await page.setViewportSize(DESKTOP);
-  await openAgent(page, agent);
-  const [claude] = claudeAndCodexReports();
-  usage.answerNext([onPersonalLogin(claude!)]);
-  const meter = page.getByTestId("context-window-meter");
-  const trigger = page.getByRole("button", {
-    name: (await meter.getAttribute("aria-label"))!,
-    exact: true,
+  await test.step("pointer entry and dismissal preserve composer focus", async () => {
+    usage.answerNext([onPersonalLogin(claude!)]);
+    const input = composerLocator(page);
+    await input.focus();
+    await hoverContextWindowMeter(page);
+    await expect(input).toBeFocused();
+    await leaveContextWindowMeter(page);
+    await expect(input).toBeFocused();
+  });
+
+  await test.step("keyboard dismissal restores trigger focus and Find remains available", async () => {
+    usage.answerNext([onPersonalLogin(claude!)]);
+    const meter = page.getByTestId("context-window-meter");
+    const trigger = page.getByRole("button", {
+      name: (await meter.getAttribute("aria-label"))!,
+      exact: true,
+    });
+    await trigger.focus();
+    await expect(contextWindowDetails(page)).toBeVisible();
+    await page.keyboard.press("Escape");
+    await expect(contextWindowDetails(page)).toHaveCount(0);
+    await expect(trigger).toBeFocused();
+    await page.keyboard.press("ControlOrMeta+f");
+    await expect(page.getByRole("textbox", { name: "Find in pane", exact: true })).toBeFocused();
  });
-  await trigger.focus();
-  await expect(contextWindowDetails(page)).toBeVisible();
-  await page.keyboard.press("Escape");
-  await expect(contextWindowDetails(page)).toHaveCount(0);
-  await expect(trigger).toBeFocused();
-  await page.keyboard.press("ControlOrMeta+f");
-  await expect(page.getByRole("textbox", { name: "Find in pane", exact: true })).toBeFocused();
 });
@@ -105,25 +105,41 @@ async function seedAgentWithFileLink(input: LinkedFile) {
 }

 test.describe("CodeMirror workspace file editing", () => {
-  test("opens explicit screenshot links and explains missing files", async ({ page }) => {
+  test("opens screenshot and non-ASCII Markdown links and explains missing files", async ({
+    page,
+  }) => {
    const session = await seedMockAgentWorkspace({
      repoPrefix: "screenshot-markdown-link-",
      title: "Screenshot file links",
      initialPrompt: "Show screenshots",
      featureValues: {
        mockAssistantResponse:
-          "[Capture](.dev/tablet-review/capture.png) [Missing capture](.dev/tablet-review/missing.png)",
+          "[Capture](.dev/tablet-review/capture.png) [报告](docs/reports/开户赠金.md) [Missing capture](.dev/tablet-review/missing.png)",
      },
    });
    try {
      await mkdir(path.join(session.cwd, ".dev/tablet-review"), { recursive: true });
      await writeFile(path.join(session.cwd, ".dev/tablet-review/capture.png"), RED_PIXEL);
+      await mkdir(path.join(session.cwd, "docs/reports"), { recursive: true });
+      await writeFile(path.join(session.cwd, "docs/reports/开户赠金.md"), "# Report opened\n");
      await openAgentRoute(page, session);
      await test.step("Open the linked screenshot", async () => {
        await openAssistantMarkdownLink(page, "Capture");
        await expectFileTabOpen(page, ".dev/tablet-review/capture.png");
        await expect(page.getByTestId("image-file-preview-canvas")).toBeVisible();
      });
+      await test.step("Open the non-ASCII report named by its Markdown link", async () => {
+        await returnToAssistant(page, session.agentId);
+        await openAssistantMarkdownLink(page, "报告");
+        await expectFileTabOpen(page, "docs/reports/开户赠金.md");
+        await expect(
+          page
+            .getByTestId("workspace-file-pane")
+            .filter({ visible: true })
+            .getByText("Report opened", { exact: true }),
+        ).toBeVisible();
+        await page.screenshot({ path: test.info().outputPath("non-ascii-file-opened.png") });
+      });
      await test.step("Explain why the missing screenshot cannot open", async () => {
        await returnToAssistant(page, session.agentId);
        await openAssistantMarkdownLink(page, "Missing capture");
@@ -136,31 +152,6 @@ test.describe("CodeMirror workspace file editing", () => {
    }
  });

-  test("opens the non-ASCII file named by an assistant markdown link", async ({ page }) => {
-    const session = await seedMockAgentWorkspace({
-      repoPrefix: "encoded-markdown-link-",
-      title: "Non-ASCII file link",
-      initialPrompt: "Show the report link",
-      featureValues: { mockAssistantResponse: "[报告](docs/reports/开户赠金.md)" },
-    });
-    try {
-      await mkdir(path.join(session.cwd, "docs/reports"), { recursive: true });
-      await writeFile(path.join(session.cwd, "docs/reports/开户赠金.md"), "# Report opened\n");
-      await openAgentRoute(page, session);
-      await openAssistantMarkdownLink(page, "报告");
-      await expectFileTabOpen(page, "docs/reports/开户赠金.md");
-      await expect(
-        page
-          .getByTestId("workspace-file-pane")
-          .filter({ visible: true })
-          .getByText("Report opened", { exact: true }),
-      ).toBeVisible();
-      await page.screenshot({ path: test.info().outputPath("non-ascii-file-opened.png") });
-    } finally {
-      await session.cleanup();
-    }
-  });
-
  for (const order of ["raw-first", "href-first"] as const) {
    test(`opens literal and encoded percent filenames independently ${order}`, async ({ page }) => {
      const session = await seedMockAgentWorkspace({
@@ -690,7 +681,37 @@ test.describe("CodeMirror workspace file editing", () => {
    const imagePath = path.join(workspace.repoPath, "pixel.png");
    await writeFile(markdownPath, "# First heading\n", "utf8");
    await writeFile(imagePath, RED_PIXEL);
+    await mkdir(path.join(workspace.repoPath, "docs"), { recursive: true });
+    await mkdir(path.join(workspace.repoPath, "data", "cache"), { recursive: true });
+    await writeFile(path.join(workspace.repoPath, "docs", "sibling.png"), RED_PIXEL);
+    await writeFile(path.join(workspace.repoPath, "data", "cache", "hero.png"), RED_PIXEL);
+    await writeFile(
+      path.join(workspace.repoPath, "docs", "guide.md"),
+      [
+        "# Guide",
+        "",
+        "![sibling](./sibling.png)",
+        "",
+        "![hero](../data/cache/hero.png?v=2#preview)",
+        "",
+      ].join("\n"),
+      "utf8",
+    );
    await workspace.navigateTo();
+    await test.step("render sibling and parent-relative images in Markdown preview", async () => {
+      await openFileExplorer(page);
+      await expandFolder(page, "docs");
+      await openFileFromExplorer(page, "guide.md");
+      await expectFileTabOpen(page, "docs/guide.md");
+
+      const guidePane = page.getByTestId("workspace-file-pane").filter({ visible: true });
+      await expect(guidePane.getByText("Guide", { exact: true })).toBeVisible();
+      await expectMarkdownImageLoaded(page, "sibling");
+      await expectMarkdownImageLoaded(page, "hero");
+      await guidePane.screenshot({
+        path: test.info().outputPath("markdown-relative-images.png"),
+      });
+    });
    await openWorkspaceFile(page, "notes.md");

    const visibleFilePane = page.getByTestId("workspace-file-pane").filter({ visible: true });
@@ -724,84 +745,30 @@ test.describe("CodeMirror workspace file editing", () => {
    await expect.poll(() => image.getAttribute("src")).not.toBe(initialSource);
  });

-  test("renders local relative images inside Markdown preview", async ({ page, withWorkspace }) => {
-    test.setTimeout(90_000);
-    const workspace = await withWorkspace({ prefix: "file-md-relative-image-" });
-    await mkdir(path.join(workspace.repoPath, "docs"), { recursive: true });
-    await mkdir(path.join(workspace.repoPath, "data", "cache"), { recursive: true });
-    await writeFile(path.join(workspace.repoPath, "docs", "sibling.png"), RED_PIXEL);
-    await writeFile(path.join(workspace.repoPath, "data", "cache", "hero.png"), RED_PIXEL);
-    await writeFile(
-      path.join(workspace.repoPath, "docs", "guide.md"),
-      [
-        "# Guide",
-        "",
-        "![sibling](./sibling.png)",
-        "",
-        "![hero](../data/cache/hero.png?v=2#preview)",
-        "",
-      ].join("\n"),
-      "utf8",
-    );
-    await workspace.navigateTo();
-    await openFileExplorer(page);
-    await expandFolder(page, "docs");
-    await openFileFromExplorer(page, "guide.md");
-    await expectFileTabOpen(page, "docs/guide.md");
-
-    const visibleFilePane = page.getByTestId("workspace-file-pane").filter({ visible: true });
-    await expect(visibleFilePane.getByText("Guide", { exact: true })).toBeVisible();
-    await expectMarkdownImageLoaded(page, "sibling");
-    await expectMarkdownImageLoaded(page, "hero");
-    await visibleFilePane.screenshot({
-      path: test.info().outputPath("markdown-relative-images.png"),
-    });
-  });
-
-  test("previews and refreshes an HTML plan while preserving source access", async ({
+  test("isolates an HTML preview, blocks fetch egress, and refreshes while retaining source access", async ({
    page,
    withWorkspace,
  }) => {
-    test.setTimeout(90_000);
-    const workspace = await withWorkspace({ prefix: "file-editing-html-preview-" });
-    const htmlPath = path.join(workspace.repoPath, "plan.html");
-    await writeFile(
-      htmlPath,
-      "<!doctype html><html><body><h1>Visual plan</h1></body></html>",
-      "utf8",
-    );
-    await workspace.navigateTo();
-    await openWorkspaceFile(page, "plan.html");
-
-    const preview = htmlPreview(page);
-    await expect(preview.host).toBeVisible();
-    await expect(preview.host).toHaveAttribute("sandbox", /allow-scripts/);
-    await expect(preview.host).not.toHaveAttribute("sandbox", /allow-same-origin/);
-    await expect(preview.document.getByRole("heading", { name: "Visual plan" })).toBeVisible();
-
-    await writeFile(
-      htmlPath,
-      "<!doctype html><html><body><h1>Updated plan</h1></body></html>",
-      "utf8",
-    );
-    await expect(preview.document.getByRole("heading", { name: "Updated plan" })).toBeVisible();
-
-    await selectFileView(page, "Source");
-    await expect(page.getByTestId("file-source-editor")).toBeVisible();
-    await expect(preview.host).toHaveCount(0);
-    await selectFileView(page, "Preview");
-    await expect(preview.host).toBeVisible();
-  });
-
-  test("runs inline scripts without allowing fetch egress", async ({ page, withWorkspace }) => {
    test.setTimeout(90_000);
    const workspace = await withWorkspace({ prefix: "file-editing-html-csp-" });
    await writeFile(
      path.join(workspace.repoPath, "probe.html"),
      `<!doctype html><html><head><title>probe</title></head><body>
+<h1>Visual plan</h1>
 <h1 id="script-result">Inline script did not run</h1>
 <p id="network-result">Network request not attempted</p>
 <p id="document-mode">Standards mode not detected</p>
+<p id="parent">?</p><p id="storage">?</p><p id="cookie">?</p>
+<script>
+  function report(id, label, probe) {
+    try { probe(); document.getElementById(id).textContent = label + " reachable"; }
+    catch (error) { document.getElementById(id).textContent = label + " blocked"; }
+  }
+  report("parent", "Parent DOM", function () { return parent.document.body; });
+  report("storage", "Storage", function () { return localStorage.length; });
+  report("cookie", "Cookies", function () { return document.cookie; });
+</script>
+
 <script>
  document.getElementById("script-result").textContent = "Inline script ran";
  if (document.compatMode === "CSS1Compat") {
@@ -822,6 +789,8 @@ test.describe("CodeMirror workspace file editing", () => {
    await openWorkspaceFile(page, "probe.html");

    const preview = htmlPreview(page);
+    await expect(preview.host).toBeVisible();
+    await expect(preview.document.getByRole("heading", { name: "Visual plan" })).toBeVisible();
    await expect(
      preview.document.getByRole("heading", { name: "Inline script ran" }),
    ).toBeVisible();
@@ -832,34 +801,26 @@ test.describe("CodeMirror workspace file editing", () => {
      preview.document.getByText("Network request blocked", { exact: true }),
    ).toBeVisible();
    expect(blockedRequests).toEqual([]);
-  });
-
-  test("isolates HTML plans from the app origin and storage", async ({ page, withWorkspace }) => {
-    test.setTimeout(90_000);
-    const workspace = await withWorkspace({ prefix: "file-editing-html-origin-" });
-    await writeFile(
-      path.join(workspace.repoPath, "origin.html"),
-      `<!doctype html><html><body>
-<p id="parent">?</p><p id="storage">?</p><p id="cookie">?</p>
-<script>
-  function report(id, label, probe) {
-    try { probe(); document.getElementById(id).textContent = label + " reachable"; }
-    catch (error) { document.getElementById(id).textContent = label + " blocked"; }
-  }
-  report("parent", "Parent DOM", function () { return parent.document.body; });
-  report("storage", "Storage", function () { return localStorage.length; });
-  report("cookie", "Cookies", function () { return document.cookie; });
-</script>
-</body></html>`,
-      "utf8",
-    );
-    await workspace.navigateTo();
-    await openWorkspaceFile(page, "origin.html");
-
-    const preview = htmlPreview(page);
-    await expect(preview.document.getByText("Parent DOM blocked", { exact: true })).toBeVisible();
-    await expect(preview.document.getByText("Storage blocked", { exact: true })).toBeVisible();
-    await expect(preview.document.getByText("Cookies blocked", { exact: true })).toBeVisible();
+    await test.step("isolate the preview from app origin and storage", async () => {
+      await expect(preview.host).toHaveAttribute("sandbox", /allow-scripts/);
+      await expect(preview.host).not.toHaveAttribute("sandbox", /allow-same-origin/);
+      await expect(preview.document.getByText("Parent DOM blocked", { exact: true })).toBeVisible();
+      await expect(preview.document.getByText("Storage blocked", { exact: true })).toBeVisible();
+      await expect(preview.document.getByText("Cookies blocked", { exact: true })).toBeVisible();
+    });
+    await test.step("refresh a changed HTML plan and switch to source and back", async () => {
+      await writeFile(
+        path.join(workspace.repoPath, "probe.html"),
+        "<!doctype html><html><body><h1>Updated plan</h1></body></html>",
+        "utf8",
+      );
+      await expect(preview.document.getByRole("heading", { name: "Updated plan" })).toBeVisible();
+      await selectFileView(page, "Source");
+      await expect(page.getByTestId("file-source-editor")).toBeVisible();
+      await expect(preview.host).toHaveCount(0);
+      await selectFileView(page, "Preview");
+      await expect(preview.host).toBeVisible();
+    });
  });

  test("persists Vim keybindings and reports Vim mode with cursor position", async ({
@@ -6,20 +6,14 @@ import {
 } from "../support/helpers/composer";
 import { expect, test } from "../support/fixtures";
 import { gotoAppShell } from "../support/helpers/app";
-import { getE2EDaemonPort } from "../support/helpers/daemon-port";
 import {
  delayBrowserWorkspaceCreatedResponse,
  expectNewWorkspaceDraft,
-  expectNewWorkspaceProjectSelected,
  fillNewWorkspaceDraft,
  openGlobalNewWorkspaceComposer,
  openNewWorkspaceComposer,
-  selectNewWorkspaceHost,
-  selectNewWorkspaceProject,
 } from "../support/helpers/new-workspace";
-import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
-import { getServerId } from "../support/helpers/server-id";
-import { seedSavedSettingsHosts } from "../support/helpers/settings";
+import { seedWorkspace } from "../support/helpers/seed-client";
 import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 const DRAFT = `Please investigate the workspace startup failure.
@@ -29,70 +23,6 @@ Trace the request from the app through the daemon, preserve the existing behavio
 test.describe("New workspace composer draft", () => {
  test.describe.configure({ timeout: 240_000 });

-  test("keeps the draft when the project changes", async ({ page }) => {
-    const firstProject: SeededWorkspace = await seedWorkspace({
-      repoPrefix: "new-workspace-draft-project-a-",
-    });
-    const secondProject: SeededWorkspace = await seedWorkspace({
-      repoPrefix: "new-workspace-draft-project-b-",
-    });
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await openNewWorkspaceComposer(page, {
-        projectKey: firstProject.projectKey,
-        projectDisplayName: firstProject.projectDisplayName,
-      });
-      await expectNewWorkspaceProjectSelected(page, firstProject.projectDisplayName);
-
-      await fillNewWorkspaceDraft(page, DRAFT);
-
-      await selectNewWorkspaceProject(page, {
-        projectKey: secondProject.projectKey,
-        projectDisplayName: secondProject.projectDisplayName,
-      });
-
-      await expectNewWorkspaceDraft(page, DRAFT);
-    } finally {
-      await secondProject.cleanup();
-      await firstProject.cleanup();
-    }
-  });
-
-  test("keeps the draft when the host changes", async ({ page }) => {
-    const project: SeededWorkspace = await seedWorkspace({
-      repoPrefix: "new-workspace-draft-host-",
-    });
-    const secondaryServerId = "new-workspace-draft-secondary-host";
-
-    try {
-      await seedSavedSettingsHosts(page, [
-        {
-          serverId: getServerId(),
-          label: "Primary host",
-          endpoint: `127.0.0.1:${getE2EDaemonPort()}`,
-        },
-        {
-          serverId: secondaryServerId,
-          label: "Secondary host",
-          endpoint: "127.0.0.1:9",
-        },
-      ]);
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await openGlobalNewWorkspaceComposer(page);
-
-      await fillNewWorkspaceDraft(page, DRAFT);
-      await selectNewWorkspaceHost(page, "Secondary host");
-
-      await expectNewWorkspaceDraft(page, DRAFT);
-    } finally {
-      await project.cleanup();
-    }
-  });
-
  test("does not restore a submitted draft after deferred publication", async ({ page }) => {
    const project = await seedWorkspace({ repoPrefix: "new-workspace-submitted-draft-" });

@@ -3,6 +3,9 @@ import { gotoAppShell } from "../support/helpers/app";
 import {
  connectNewWorkspaceDaemonClient,
  expectNewWorkspaceControlsEnabled,
+  expectNewWorkspaceDraft,
+  fillNewWorkspaceDraft,
+  selectNewWorkspaceHost,
  expectNewWorkspaceProjectSelected,
  expectNewWorkspaceTriggerLabelsAligned,
  openGlobalNewWorkspaceComposer,
@@ -90,6 +93,11 @@ test.describe("New workspace entry points", () => {
        projectLabel: seeded.projectDisplayName,
        hostLabel: "localhost",
      });
+      await test.step("changing hosts preserves the draft", async () => {
+        await fillNewWorkspaceDraft(page, "Keep this draft while choosing a host");
+        await selectNewWorkspaceHost(page, "Secondary host");
+        await expectNewWorkspaceDraft(page, "Keep this draft while choosing a host");
+      });
    } finally {
      await seeded.cleanup();
    }
@@ -121,6 +129,9 @@ test.describe("New workspace entry points", () => {
        timeout: 30_000,
      });
      await expect(page.getByTestId("host-picker-trigger")).toHaveCount(0);
+      await test.step("Ctrl+P opens the project picker with search focused", async () => {
+        await openNewWorkspaceProjectPickerWithShortcut(page);
+      });
    } finally {
      await seeded.cleanup();
    }
@@ -137,20 +148,6 @@ test.describe("New workspace entry points", () => {
    await expectNewWorkspaceControlsEnabled(page);
  });

-  test("Ctrl+P opens the project picker with search focused", async ({ page }) => {
-    const seeded: SeededWorkspace = await seedWorkspace({ repoPrefix: "entry-shortcut-" });
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await openGlobalNewWorkspaceComposer(page);
-
-      await openNewWorkspaceProjectPickerWithShortcut(page);
-    } finally {
-      await seeded.cleanup();
-    }
-  });
-
  test("keeps the in-progress form when the remembered workspace is archived elsewhere", async ({
    page,
  }) => {
@@ -220,6 +217,8 @@ test.describe("New workspace entry points", () => {
      });
      await expectNewWorkspaceProjectSelected(page, projectA.projectDisplayName);

+      await fillNewWorkspaceDraft(page, "Keep this draft while choosing a project");
+
      // Manually override the selection to C from inside A's screen. This stale
      // manualProjectKey is what the reused 'new' screen must reset when the next
      // route-driven navigation targets a different project.
@@ -230,6 +229,9 @@ test.describe("New workspace entry points", () => {
      await expect(optionC).toBeVisible({ timeout: 30_000 });
      await optionC.click();
      await expectNewWorkspaceProjectSelected(page, projectC.projectDisplayName);
+      await test.step("changing projects preserves the draft", async () => {
+        await expectNewWorkspaceDraft(page, "Keep this draft while choosing a project");
+      });

      // Navigate via B's row icon. B must be preselected — the route project wins
      // because the stale manual choice (C) was reset on the route change. If the
@@ -88,11 +88,23 @@ async function openNewWorkspaceFromContextProject(
  await expectNewWorkspaceProjectSelected(page, "Context project");
 }

-const test = base.extend<{ crossHostProject: CrossHostProjectScenario }>({
-  crossHostProject: async ({ page: _page }, provide) => {
-    const secondaryDaemon: IsolatedHostDaemon = await startIsolatedHostDaemon(
-      "new-workspace-project-preservation-secondary",
-    );
+const test = base.extend<
+  { crossHostProject: CrossHostProjectScenario },
+  { secondaryDaemon: IsolatedHostDaemon }
+>({
+  secondaryDaemon: [
+    async ({ e2eWorker }, provide) => {
+      void e2eWorker;
+      const daemon = await startIsolatedHostDaemon("new-workspace-project-preservation-secondary");
+      try {
+        await provide(daemon);
+      } finally {
+        await daemon.close();
+      }
+    },
+    { scope: "worker" },
+  ],
+  crossHostProject: async ({ page: _page, secondaryDaemon }, provide) => {
    const contextRepo = await createTempGitRepo("new-workspace-context-");
    const primarySharedRepo = await createTempGitRepo("new-workspace-paseo-primary-", {
      originUrl: SHARED_REMOTE_URL,
@@ -177,7 +189,6 @@ const test = base.extend<{ crossHostProject: CrossHostProjectScenario }>({
      await primaryDuplicateRepo.cleanup().catch(() => undefined);
      await secondaryFallbackRepo.cleanup().catch(() => undefined);
      await secondarySharedRepo.cleanup().catch(() => undefined);
-      await secondaryDaemon.close().catch(() => undefined);
    }
  },
 });
@@ -1,100 +0,0 @@
-import { expect, test } from "../support/fixtures";
-import { gotoAppShell } from "../support/helpers/app";
-import {
-  archiveLocalWorkspaceFromDaemon,
-  archiveWorkspaceFromDaemon,
-  assertNewWorkspaceSidebarAndHeader,
-  connectNewWorkspaceDaemonClient,
-  expectWorkspaceIsolationSelected,
-  openNewWorkspaceComposer,
-  openProjectViaDaemon,
-  openStartingRefPicker,
-  selectBranchInPicker,
-} from "../support/helpers/new-workspace";
-import { expectNoTruncation } from "../support/helpers/no-truncation";
-import { createTempGitRepo } from "../support/helpers/workspace";
-import { getServerId } from "../support/helpers/server-id";
-import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
-
-// Regression for "the local / worktree selection in the new workspace is not
-// remembered." The isolation choice persists in the create-form preferences
-// (FormPreferences.isolation), so it must survive the create→reopen remount:
-// creating a worktree workspace navigates away from /new and unmounts it, and
-// reopening New Workspace has to still show "New worktree".
-test.describe("New workspace isolation memory", () => {
-  let client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
-  const localWorkspaceIds = new Set<string>();
-  const createdWorktreeDirectories = new Set<string>();
-
-  test.describe.configure({ timeout: 240_000 });
-
-  test.beforeEach(async () => {
-    client = await connectNewWorkspaceDaemonClient();
-  });
-
-  test.afterEach(async () => {
-    if (client) {
-      for (const workspaceDirectory of createdWorktreeDirectories) {
-        await archiveWorkspaceFromDaemon(client, workspaceDirectory).catch(() => undefined);
-      }
-      for (const workspaceId of localWorkspaceIds) {
-        await archiveLocalWorkspaceFromDaemon(client, workspaceId).catch(() => undefined);
-      }
-    }
-    createdWorktreeDirectories.clear();
-    localWorkspaceIds.clear();
-    await client?.close().catch(() => undefined);
-  });
-
-  test("remembers the worktree isolation choice after creating a workspace", async ({ page }) => {
-    const serverId = getServerId();
-    const tempRepo = await createTempGitRepo("isolation-memory-", { branches: ["main", "dev"] });
-
-    try {
-      const openedProject = await openProjectViaDaemon(client, tempRepo.path);
-      localWorkspaceIds.add(openedProject.workspaceId);
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-
-      // First visit: the screen opens on Local, switch it to New worktree and create.
-      await openNewWorkspaceComposer(page, {
-        projectKey: openedProject.projectKey,
-        projectDisplayName: openedProject.projectDisplayName,
-      });
-      await expectWorkspaceIsolationSelected(page, "local");
-      await page.getByTestId("workspace-create-isolation-trigger").click();
-      const isolationPopup = page.getByTestId("combobox-desktop-container").last();
-      await expect(isolationPopup).toBeVisible({ timeout: 30_000 });
-      await expectNoTruncation(isolationPopup);
-      await page.getByTestId("workspace-create-isolation-worktree").click();
-      await expectWorkspaceIsolationSelected(page, "worktree");
-
-      await openStartingRefPicker(page);
-      await selectBranchInPicker(page, "dev");
-
-      const createButton = page
-        .getByTestId("message-input-root")
-        .getByRole("button", { name: "Create" });
-      await expect(createButton).toBeVisible({ timeout: 30_000 });
-      await createButton.click();
-
-      const createdWorkspace = await assertNewWorkspaceSidebarAndHeader(page, {
-        serverId,
-        client,
-        previousWorkspaceId: openedProject.workspaceId,
-        projectDisplayName: openedProject.projectDisplayName,
-      });
-      createdWorktreeDirectories.add(createdWorkspace.workspaceDirectory);
-
-      // Second visit (fresh mount of /new): the worktree choice must stick.
-      await openNewWorkspaceComposer(page, {
-        projectKey: openedProject.projectKey,
-        projectDisplayName: openedProject.projectDisplayName,
-      });
-      await expectWorkspaceIsolationSelected(page, "worktree");
-    } finally {
-      await tempRepo.cleanup();
-    }
-  });
-});
@@ -1,86 +0,0 @@
-import { expect, test } from "../support/fixtures";
-import { gotoAppShell } from "../support/helpers/app";
-import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
-import {
-  expectNewWorkspaceDraft,
-  fillNewWorkspaceDraft,
-  openNewWorkspaceComposer,
-} from "../support/helpers/new-workspace";
-import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
-import {
-  attachButton,
-  expectChatComposerActive,
-  expectTerminalComposerActive,
-  fillTerminalPrompt,
-  seedTerminalProfiles,
-  selectChatLaunch,
-  selectLaunchOption,
-  terminalPromptInput,
-  type TerminalProfile,
-  type TerminalProfileSeed,
-} from "../support/helpers/new-workspace-launch";
-
-const PROFILE: TerminalProfile = {
-  id: "e2e-composer-profile",
-  name: "Composer Profile",
-  command: "/bin/echo",
-  args: ["{{{prompt}}}"],
-};
-
-test.describe("New workspace: the composer is one control in two modes", () => {
-  let workspace: SeededWorkspace;
-  let profileSeed: TerminalProfileSeed;
-
-  test.beforeEach(async () => {
-    workspace = await seedWorkspace({ repoPrefix: "launch-composer-" });
-    profileSeed = await seedTerminalProfiles([PROFILE]);
-  });
-
-  test.afterEach(async () => {
-    await profileSeed.restore();
-    await workspace?.cleanup();
-  });
-
-  test("switching launch target does not leak draft text between chat and terminal, and drops the chat-only controls", async ({
-    page,
-  }) => {
-    test.setTimeout(60_000);
-    await gotoAppShell(page);
-    await waitForSidebarHydration(page);
-
-    await openNewWorkspaceComposer(page, {
-      projectKey: workspace.projectKey,
-      projectDisplayName: workspace.projectDisplayName,
-    });
-
-    await test.step("a chat draft does not leak into the terminal prompt", async () => {
-      await fillNewWorkspaceDraft(page, "a chat-only draft");
-      await selectLaunchOption(page, PROFILE.id);
-      await expectTerminalComposerActive(page);
-      await expect(terminalPromptInput(page)).toHaveValue("");
-    });
-
-    await test.step("the attachment button and mic are absent in terminal mode, and the submit button is inside the same surface", async () => {
-      await expect(attachButton(page)).toHaveCount(0);
-      await expect(page.getByRole("button", { name: "Start dictation" })).toHaveCount(0);
-      await expect(
-        page.locator('[data-testid="message-input-root"]:visible').getByRole("button", {
-          name: "Launch",
-        }),
-      ).toBeVisible();
-    });
-
-    await test.step("a terminal draft does not leak back into chat, which keeps its own draft", async () => {
-      await fillTerminalPrompt(page, "a terminal-only draft");
-      await selectChatLaunch(page);
-      await expectChatComposerActive(page);
-      await expectNewWorkspaceDraft(page, "a chat-only draft");
-    });
-
-    await test.step("each side keeps its own draft across toggles, without either leaking into the other", async () => {
-      await selectLaunchOption(page, PROFILE.id);
-      await expectTerminalComposerActive(page);
-      await expect(terminalPromptInput(page)).toHaveValue("a terminal-only draft");
-    });
-  });
-});
@@ -1,103 +0,0 @@
-import { test } from "../support/fixtures";
-import { gotoAppShell } from "../support/helpers/app";
-import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
-import {
-  openNewWorkspaceComposer,
-  submitNewWorkspacePrompt,
-} from "../support/helpers/new-workspace";
-import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
-import {
-  expectChatLaunchSelected,
-  expectTerminalLaunchSelected,
-  expectTerminalOutputContains,
-  expectWorkspaceOpensWithTerminalTab,
-  fillTerminalPrompt,
-  patchTerminalProfiles,
-  seedTerminalProfiles,
-  selectChatLaunch,
-  selectLaunchOption,
-  submitTerminalLaunch,
-  type TerminalProfile,
-  type TerminalProfileSeed,
-} from "../support/helpers/new-workspace-launch";
-
-// Wait for input until project cleanup kills the terminal. A fixed lifetime
-// can expire before a busy browser attaches or finishes revisiting the composer.
-const PROMPT_PROFILE: TerminalProfile = {
-  id: "e2e-memory-profile",
-  name: "Memory Profile",
-  command: "/bin/sh",
-  args: ["-c", 'echo remembered: "$0"; exec cat', "{{{prompt}}}"],
-};
-
-function hasLeftNewWorkspaceRoute(url: URL): boolean {
-  return !/\/new(?:\?.*)?$/.test(`${url.pathname}${url.search}`);
-}
-
-test.describe("New workspace: launch target memory", () => {
-  let workspace: SeededWorkspace;
-  let profileSeed: TerminalProfileSeed;
-
-  test.beforeEach(async () => {
-    workspace = await seedWorkspace({ repoPrefix: "launch-memory-" });
-    profileSeed = await seedTerminalProfiles([PROMPT_PROFILE]);
-  });
-
-  test.afterEach(async () => {
-    await profileSeed.restore();
-    await workspace?.cleanup();
-  });
-
-  test("remembers the launch target across visits, and a removed profile falls back to chat instead of a dead entry", async ({
-    page,
-  }) => {
-    test.setTimeout(90_000);
-    await gotoAppShell(page);
-    await waitForSidebarHydration(page);
-
-    const openNewWorkspace = () =>
-      openNewWorkspaceComposer(page, {
-        projectKey: workspace.projectKey,
-        projectDisplayName: workspace.projectDisplayName,
-      });
-
-    await test.step("launching a terminal profile preselects it the next time New workspace opens", async () => {
-      await openNewWorkspace();
-      await selectLaunchOption(page, PROMPT_PROFILE.id);
-      await expectTerminalLaunchSelected(page, PROMPT_PROFILE.name);
-      await fillTerminalPrompt(page, "remember me");
-      await submitTerminalLaunch(page);
-      await expectWorkspaceOpensWithTerminalTab(page);
-      await expectTerminalOutputContains(page, "remembered: remember me");
-
-      await openNewWorkspace();
-      await expectTerminalLaunchSelected(page, PROMPT_PROFILE.name);
-    });
-
-    await test.step("switching to Chat and submitting preselects Chat the next time", async () => {
-      await selectChatLaunch(page);
-      await expectChatLaunchSelected(page);
-      await submitNewWorkspacePrompt(page, "hello from chat");
-      // The chat handoff navigates asynchronously (draft -> created agent). Let
-      // it fully settle before moving on, so it can't fire a late redirect
-      // that races the next step's navigation.
-      await page.waitForURL(hasLeftNewWorkspaceRoute, { timeout: 30_000 });
-
-      await openNewWorkspace();
-      await expectChatLaunchSelected(page);
-    });
-
-    await test.step("re-selecting the terminal profile, then removing it daemon-side, falls back to Chat rather than a dead entry", async () => {
-      await selectLaunchOption(page, PROMPT_PROFILE.id);
-      await expectTerminalLaunchSelected(page, PROMPT_PROFILE.name);
-      await fillTerminalPrompt(page, "second run");
-      await submitTerminalLaunch(page);
-      await expectWorkspaceOpensWithTerminalTab(page);
-
-      await patchTerminalProfiles([]);
-
-      await openNewWorkspace();
-      await expectChatLaunchSelected(page);
-    });
-  });
-});
@@ -5,6 +5,7 @@ import {
  expectNewWorkspaceDraft,
  fillNewWorkspaceDraft,
  openNewWorkspaceComposer,
+  submitNewWorkspacePrompt,
 } from "../support/helpers/new-workspace";
 import {
  composerLocator,
@@ -15,6 +16,12 @@ import {
 } from "../support/helpers/composer";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
 import {
+  attachButton,
+  expectChatComposerActive,
+  expectTerminalComposerActive,
+  expectChatLaunchSelected,
+  patchTerminalProfiles,
+  selectChatLaunch,
  expectTerminalLaunchSelected,
  expectTerminalOutputContains,
  expectTerminalPreviewCommand,
@@ -67,21 +74,50 @@ test.describe("New workspace: launching a terminal", () => {
    await workspace?.cleanup();
  });

-  test("a profile that takes a prompt launches with it as its trailing argument; a profile without the sentinel launches bare from Launch", async ({
+  test("switch launch modes, run prompt and bare profiles, and remember successful targets", async ({
    page,
  }) => {
    test.setTimeout(90_000);
    await gotoAppShell(page);
    await waitForSidebarHydration(page);

-    await test.step("pick a profile that takes a prompt, type one, and submit", async () => {
+    await test.step("open New workspace to choose a launch target", async () => {
      await openNewWorkspaceComposer(page, {
        projectKey: workspace.projectKey,
        projectDisplayName: workspace.projectDisplayName,
      });
+    });
+    await test.step("a chat draft does not leak into the terminal prompt", async () => {
+      await fillNewWorkspaceDraft(page, "a chat-only draft");
      await selectLaunchOption(page, PROMPT_PROFILE.id);
-      await expectTerminalLaunchSelected(page, PROMPT_PROFILE.name);
+      await expectTerminalComposerActive(page);
+      await expect(terminalPromptInput(page)).toHaveValue("");
+    });

+    await test.step("the attachment button and mic are absent in terminal mode, and the submit button is inside the same surface", async () => {
+      await expect(attachButton(page)).toHaveCount(0);
+      await expect(page.getByRole("button", { name: "Start dictation" })).toHaveCount(0);
+      await expect(
+        page.locator('[data-testid="message-input-root"]:visible').getByRole("button", {
+          name: "Launch",
+        }),
+      ).toBeVisible();
+    });
+
+    await test.step("a terminal draft does not leak back into chat, which keeps its own draft", async () => {
+      await fillTerminalPrompt(page, "a terminal-only draft");
+      await selectChatLaunch(page);
+      await expectChatComposerActive(page);
+      await expectNewWorkspaceDraft(page, "a chat-only draft");
+    });
+
+    await test.step("each side keeps its own draft across toggles, without either leaking into the other", async () => {
+      await selectLaunchOption(page, PROMPT_PROFILE.id);
+      await expectTerminalComposerActive(page);
+      await expect(terminalPromptInput(page)).toHaveValue("a terminal-only draft");
+    });
+    await test.step("submit the prompt profile", async () => {
+      await expectTerminalLaunchSelected(page, PROMPT_PROFILE.name);
      await fillTerminalPrompt(page, "fix the flaky test");
      await submitTerminalLaunch(page);
    });
@@ -96,6 +132,7 @@ test.describe("New workspace: launching a terminal", () => {
        projectKey: workspace.projectKey,
        projectDisplayName: workspace.projectDisplayName,
      });
+      await expectTerminalLaunchSelected(page, PROMPT_PROFILE.name);
      await selectLaunchOption(page, BARE_PROFILE.id);
      await expect(terminalPromptInput(page)).toHaveCount(0);
      await expectTerminalPreviewCommand(page, "/bin/sh -c echo bare-launch-static-line; exec cat");
@@ -107,6 +144,31 @@ test.describe("New workspace: launching a terminal", () => {
      await expectWorkspaceOpensWithTerminalTab(page);
      await expectTerminalOutputContains(page, "bare-launch-static-line");
    });
+    await test.step("successful launches remember their target across visits", async () => {
+      await openNewWorkspaceComposer(page, workspace);
+      await expectTerminalLaunchSelected(page, BARE_PROFILE.name);
+      await selectChatLaunch(page);
+      await expectChatLaunchSelected(page);
+      await submitNewWorkspacePrompt(page, "hello from chat");
+      await page.waitForURL(hasLeftNewWorkspaceRoute, {
+        timeout: 30_000,
+      });
+      await openNewWorkspaceComposer(page, workspace);
+      await expectChatLaunchSelected(page);
+    });
+    await test.step("a removed remembered terminal profile falls back to Chat", async () => {
+      await selectLaunchOption(page, PROMPT_PROFILE.id);
+      await fillTerminalPrompt(page, "second run");
+      await submitTerminalLaunch(page);
+      await expectWorkspaceOpensWithTerminalTab(page);
+      try {
+        await patchTerminalProfiles([]);
+        await openNewWorkspaceComposer(page, workspace);
+        await expectChatLaunchSelected(page);
+      } finally {
+        await patchTerminalProfiles([PROMPT_PROFILE, BARE_PROFILE]);
+      }
+    });
  });

  test("switching terminal profiles restores the prompt and its fullscreen affordance", async ({
@@ -157,6 +219,10 @@ test.describe("New workspace: launching a terminal", () => {
  });
 });

+function hasLeftNewWorkspaceRoute(url: URL): boolean {
+  return !/\/new(?:\?.*)?$/.test(`${url.pathname}${url.search}`);
+}
+
 async function expectNewWorkspaceHeaderHidden(page: Page): Promise<void> {
  await expect(page.getByTestId("menu-button").filter({ visible: true })).toHaveCount(0);
 }
@@ -172,7 +172,9 @@ test.describe("New workspace preselects the open workspace's project", () => {
    await projectB?.cleanup();
  });

-  test("Cmd+N preselects the project you are looking at", async ({ page }) => {
+  test("workspace button and shortcut follow the active project across visits", async ({
+    page,
+  }) => {
    await gotoAppShell(page);
    await waitForSidebarHydration(page);

@@ -183,6 +185,15 @@ test.describe("New workspace preselects the open workspace's project", () => {
    });
    await pressNewWorkspaceShortcut(page);
    await expectNewWorkspaceProjectSelected(page, projectB.projectDisplayName);
+    await switchWorkspaceViaSidebar({
+      page,
+      serverId: getServerId(),
+      workspaceId: projectB.workspaceId,
+    });
+    await test.step("global button follows project B", async () => {
+      await openGlobalNewWorkspaceComposer(page);
+      await expectNewWorkspaceProjectSelected(page, projectB.projectDisplayName);
+    });

    await switchWorkspaceViaSidebar({
      page,
@@ -191,27 +202,15 @@ test.describe("New workspace preselects the open workspace's project", () => {
    });
    await pressNewWorkspaceShortcut(page);
    await expectNewWorkspaceProjectSelected(page, projectA.projectDisplayName);
-  });
-
-  test("New workspace button preselects the project you are looking at", async ({ page }) => {
-    await gotoAppShell(page);
-    await waitForSidebarHydration(page);
-
-    await switchWorkspaceViaSidebar({
-      page,
-      serverId: getServerId(),
-      workspaceId: projectB.workspaceId,
-    });
-    await openGlobalNewWorkspaceComposer(page);
-    await expectNewWorkspaceProjectSelected(page, projectB.projectDisplayName);
-
    await switchWorkspaceViaSidebar({
      page,
      serverId: getServerId(),
      workspaceId: projectA.workspaceId,
    });
-    await openGlobalNewWorkspaceComposer(page);
-    await expectNewWorkspaceProjectSelected(page, projectA.projectDisplayName);
+    await test.step("global button follows project A", async () => {
+      await openGlobalNewWorkspaceComposer(page);
+      await expectNewWorkspaceProjectSelected(page, projectA.projectDisplayName);
+    });
  });

  test("Cmd+N preselects the connected host project when an offline saved host is first", async ({
@@ -1,3 +1,4 @@
+import { expectNoTruncation } from "../support/helpers/no-truncation";
 import { existsSync } from "node:fs";
 import path from "node:path";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";
@@ -33,6 +34,7 @@ import {
  selectGitHubPrInPicker,
  selectPickerOptionByKeyboard,
  selectWorkspaceIsolation,
+  expectWorkspaceIsolationSelected,
  submitNewWorkspacePrompt,
 } from "../support/helpers/new-workspace";
 import {
@@ -723,9 +725,26 @@ test.describe("New workspace flow", () => {
        projectKey: openedProject.projectKey,
        projectDisplayName: openedProject.projectDisplayName,
      });
-      await selectWorkspaceIsolation(page, "worktree");
-      await openStartingRefPicker(page);
-      await selectBranchInPicker(page, "dev");
+      await expectWorkspaceIsolationSelected(page, "local");
+      await page.getByTestId("workspace-create-isolation-trigger").click();
+      const isolationPopup = page.getByTestId("combobox-desktop-container").last();
+      await expect(isolationPopup).toBeVisible({ timeout: 30_000 });
+      await expectNoTruncation(isolationPopup);
+      await page.getByTestId("workspace-create-isolation-worktree").click();
+      await expectWorkspaceIsolationSelected(page, "worktree");
+      await test.step("cancel the branch picker without changing the selection", async () => {
+        await openBranchPicker(page);
+        await expectPickerOpen(page);
+        await closeBranchPicker(page);
+        await expectPickerClosed(page);
+      });
+      await test.step("select the filtered starting branch with the keyboard", async () => {
+        await openBranchPicker(page);
+        await expectPickerOpen(page);
+        await selectPickerOptionByKeyboard(page, "dev");
+        await expectPickerSelected(page, "dev");
+        await expectPickerClosed(page);
+      });

      const createButton = page
        .getByTestId("message-input-root")
@@ -749,6 +768,10 @@ test.describe("New workspace flow", () => {
      expect(branchInfo.currentBranch).toBe(path.basename(createdWorkspace.workspaceDirectory));
      expect(branchInfo.hasAncestor(tempRepo.branchHeads.main)).toBe(true);
      expect(branchInfo.hasAncestor(tempRepo.branchHeads.dev)).toBe(true);
+      await test.step("the worktree choice survives creating and reopening New workspace", async () => {
+        await openNewWorkspaceComposer(page, openedProject);
+        await expectWorkspaceIsolationSelected(page, "worktree");
+      });
    } finally {
      await tempRepo.cleanup();
    }
@@ -890,57 +913,6 @@ test.describe("New workspace flow", () => {
    });
  });

-  test("branch picker opens via keyboard and selects the filtered option on Enter", async ({
-    page,
-  }) => {
-    const tempRepo = await createTempGitRepo("picker-keyboard-", { branches: ["main", "dev"] });
-
-    try {
-      const openedProject = await openProjectViaDaemon(client, tempRepo.path);
-      localWorkspaceIds.add(openedProject.workspaceId);
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await openNewWorkspaceComposer(page, {
-        projectKey: openedProject.projectKey,
-        projectDisplayName: openedProject.projectDisplayName,
-      });
-      await selectWorkspaceIsolation(page, "worktree");
-
-      await openBranchPicker(page);
-      await expectPickerOpen(page);
-      await selectPickerOptionByKeyboard(page, "dev");
-      await expectPickerSelected(page, "dev");
-      await expectPickerClosed(page);
-    } finally {
-      await tempRepo.cleanup();
-    }
-  });
-
-  test("branch picker closes on Escape without selecting an option", async ({ page }) => {
-    const tempRepo = await createTempGitRepo("picker-escape-");
-
-    try {
-      const openedProject = await openProjectViaDaemon(client, tempRepo.path);
-      localWorkspaceIds.add(openedProject.workspaceId);
-
-      await gotoAppShell(page);
-      await waitForSidebarHydration(page);
-      await openNewWorkspaceComposer(page, {
-        projectKey: openedProject.projectKey,
-        projectDisplayName: openedProject.projectDisplayName,
-      });
-      await selectWorkspaceIsolation(page, "worktree");
-
-      await openBranchPicker(page);
-      await expectPickerOpen(page);
-      await closeBranchPicker(page);
-      await expectPickerClosed(page);
-    } finally {
-      await tempRepo.cleanup();
-    }
-  });
-
  test("selected GitHub PR shows PR context in the trigger and composer", async ({ page }) => {
    test.skip(!hasGithubAuth(), "Requires GitHub authentication (gh auth login)");

@@ -226,10 +226,19 @@ test.describe("narrow touch browser", () => {
    await source(page).press("ControlOrMeta+f");
    await expect(query(page)).toBeFocused();
    await query(page).fill("needle");
-    await page.getByRole("button", { name: "Next match" }).tap();
-    await expect(status(page)).toHaveText("2 of 2");
-    await expectFindInsidePane(page);
-    await page.screenshot({ path: testInfo.outputPath("touch-find.png") });
+    await test.step("reveal the first match below the floating Find widget", async () => {
+      await expect(status(page)).toHaveText("1 of 2");
+      await expectActiveMatchUncovered(page);
+    });
+    await test.step("tap the next uncovered match while controls stay inside the pane", async () => {
+      await page.getByRole("button", { name: "Next match" }).tap();
+      await expect(status(page)).toHaveText("2 of 2");
+      await expectActiveMatchUncovered(page);
+      await expectFindInsidePane(page);
+      await page.screenshot({ path: testInfo.outputPath("touch-find.png") });
+      await page.screenshot({ path: testInfo.outputPath("touch-match-uncovered.png") });
+      await expect(query(page)).toHaveValue("needle");
+    });
    await page.getByRole("button", { name: "Close Find" }).tap();
    await expect(source(page)).toBeFocused();
  });
@@ -332,33 +341,6 @@ for (const startingField of ["Find in pane", "Replace with"] as const) {
 }

 test.describe("the active match stays visible under the floating widget", () => {
-  test.describe("narrow touch browser", () => {
-    test.use({ hasTouch: true });
-    test("reveals a short file's match that the widget would cover", async ({
-      page,
-      withWorkspace,
-    }, testInfo) => {
-      const workspace = await withWorkspace({ prefix: "pane-find-cover-touch-" });
-      await writeFile(path.join(workspace.repoPath, "touch.txt"), "touch needle\nnext needle\n");
-      await workspace.navigateTo();
-      await openSource(page, "touch.txt");
-      await page.setViewportSize({ width: 390, height: 844 });
-      await source(page).focus();
-      await source(page).press("ControlOrMeta+f");
-      await expect(query(page)).toBeFocused();
-      await query(page).fill("needle");
-      await expect(status(page)).toHaveText("1 of 2");
-      await expectActiveMatchUncovered(page);
-      await page.getByRole("button", { name: "Next match" }).tap();
-      await expect(status(page)).toHaveText("2 of 2");
-      await expectActiveMatchUncovered(page);
-      await page.screenshot({ path: testInfo.outputPath("touch-match-uncovered.png") });
-      await expect(query(page)).toHaveValue("needle");
-      await page.getByRole("button", { name: "Close Find" }).tap();
-      await expect(source(page)).toBeFocused();
-    });
-  });
-
  test("reveals a match beneath the top-right widget in a narrow desktop pane", async ({
    page,
    withWorkspace,
@@ -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();
-}
@@ -749,7 +749,6 @@ function observePluginReload(page: Page) {
  return {
    waitForRequest: () => expect.poll(() => requests.length, { timeout: 30_000 }).toBe(1),
    waitForResponse: () => expect.poll(() => responses.length, { timeout: 120_000 }).toBe(1),
-    requestedAt: () => requests[0]!,
    requestCount: () => requests.length,
  };
 }
@@ -814,12 +813,6 @@ async function capturePluginSurface(page: Page, testInfo: TestInfo, name: string
  });
 }

-/** The wait under test is the daemon's lifecycle queue, so the scenario has to spend real time. */
-async function waitPastFormerReloadDeadline(page: Page, requestedAt: number): Promise<void> {
-  const remaining = 66_000 - (Date.now() - requestedAt);
-  if (remaining > 0) await page.waitForTimeout(remaining);
-}
-
 test("keeps Reload pending past a minute while the plugin queue is busy", async ({
  page,
  pluginEnvironment,
@@ -833,6 +826,9 @@ test("keeps Reload pending past a minute while the plugin queue is busy", async
    "Plugin v1",
  );

+  // Advance the real browser client's RPC timers while the daemon's build gate
+  // remains held on its own clock.
+  await page.clock.install();
  // Observe before the app loads: its daemon socket comes up with the page.
  const reload = observePluginReload(page);
  await gotoAppShell(page);
@@ -851,7 +847,7 @@ test("keeps Reload pending past a minute while the plugin queue is busy", async
    await expectPluginRowPending(page, "e2e-plugin");
    await capturePluginSurface(page, testInfo, "plugin-reload-pending.png");

-    await waitPastFormerReloadDeadline(page, reload.requestedAt());
+    await page.clock.fastForward(66_000);

    // Past the former deadline the reload is still pending, the row shows its previous state, and
    // no timeout error reached the surface.
@@ -316,7 +316,9 @@ test.describe("Sidebar workspace list", () => {
    }
  });

-  test("project with GitHub remote shows its selected folder name in sidebar", async ({ page }) => {
+  test("opens a GitHub-backed workspace with folder metadata and pointer and keyboard hover cards", async ({
+    page,
+  }) => {
    const workspace = await seedWorkspace({
      repoPrefix: "sidebar-remote-",
      repo: { withRemote: true, originUrl: GITHUB_REMOTE_URL },
@@ -335,6 +337,46 @@ test.describe("Sidebar workspace list", () => {

      await expect(projectRow).toBeVisible({ timeout: 30_000 });
      await expect(projectRow).not.toContainText("test-owner/test-repo");
+      expect(workspace.workspaceName).toBe("main");
+      const row = await waitForSidebarWorkspace(page, workspace.workspaceId);
+      await expect(row).toContainText("main");
+
+      await test.step("inspect host metadata before opening the workspace", async () => {
+        const hoverCard = await openWorkspaceHoverCard(page, workspace.workspaceId);
+        await expect(page.getByTestId("hover-card-workspace-host")).toHaveText("localhost");
+        await expect(hoverCard).not.toContainText(/\b(Online|Connecting|Offline|Error|Idle)\b/);
+      });
+
+      await test.step("open the workspace and inspect its selected folder header", async () => {
+        await openWorkspaceFromSidebar(page, workspace.workspaceId);
+        await expectWorkspaceHeader(page, {
+          title: workspace.workspaceName,
+          subtitle: projectName,
+        });
+        await movePointerAwayFromWorkspaceHoverCard(page);
+        await expectWorkspaceHoverCardClosed(page);
+      });
+
+      await test.step("dismiss a clicked row's hover card when the pointer leaves", async () => {
+        await row.click();
+        await expect(row).toBeFocused();
+        await expectWorkspaceHoverCardOpen(page);
+        await movePointerAwayFromWorkspaceHoverCard(page);
+        await expectWorkspaceHoverCardClosed(page);
+      });
+
+      await test.step("retain keyboard preview until Escape or focus leaves the row", async () => {
+        await focusWorkspaceRowWithKeyboard(page, workspace.workspaceId);
+        await expectWorkspaceHoverCardOpen(page);
+        await movePointerAwayFromWorkspaceHoverCard(page);
+        await expectWorkspaceHoverCardStaysOpen(page);
+        await page.keyboard.press("Escape");
+        await expectWorkspaceHoverCardClosed(page);
+        await focusWorkspaceRowWithKeyboard(page, workspace.workspaceId);
+        await expectWorkspaceHoverCardOpen(page);
+        await page.keyboard.press("Tab");
+        await expectWorkspaceHoverCardClosed(page);
+      });
    } finally {
      await workspace.cleanup();
    }
@@ -354,107 +396,6 @@ test.describe("Sidebar workspace list", () => {
    }
  });

-  test("workspace header uses the selected folder name instead of its GitHub remote", async ({
-    page,
-  }) => {
-    const workspace = await seedWorkspace({
-      repoPrefix: "sidebar-header-",
-      repo: { withRemote: true, originUrl: GITHUB_REMOTE_URL },
-    });
-
-    try {
-      const projectName = path.basename(workspace.repoPath);
-      await gotoAppShell(page);
-      await waitForSidebarProject(page, projectName);
-      await waitForSidebarWorkspace(page, workspace.workspaceId);
-      await openWorkspaceFromSidebar(page, workspace.workspaceId);
-
-      await expectWorkspaceHeader(page, {
-        title: workspace.workspaceName,
-        subtitle: projectName,
-      });
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
-  test("git project shows branch name in workspace row", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "sidebar-branch-" });
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarProject(page, path.basename(workspace.repoPath));
-
-      expect(workspace.workspaceName).toBe("main");
-      await expect(await waitForSidebarWorkspace(page, workspace.workspaceId)).toContainText(
-        "main",
-      );
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
-  test("workspace hover card shows host as metadata", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "sidebar-hover-host-" });
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarProject(page, path.basename(workspace.repoPath));
-
-      const hoverCard = await openWorkspaceHoverCard(page, workspace.workspaceId);
-      await expect(page.getByTestId("hover-card-workspace-host")).toHaveText("localhost");
-      await expect(hoverCard).not.toContainText(/\b(Online|Connecting|Offline|Error|Idle)\b/);
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
-  test("workspace hover card closes when the pointer leaves a clicked row", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "sidebar-hover-click-leave-" });
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarProject(page, path.basename(workspace.repoPath));
-      const row = await openWorkspaceFromSidebar(page, workspace.workspaceId);
-      await movePointerAwayFromWorkspaceHoverCard(page);
-      await expectWorkspaceHoverCardClosed(page);
-
-      await row.click();
-      await expect(row).toBeFocused();
-      await expectWorkspaceHoverCardOpen(page);
-      await movePointerAwayFromWorkspaceHoverCard(page);
-      await expectWorkspaceHoverCardClosed(page);
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
-  test("workspace hover card follows keyboard focus on a row", async ({ page }) => {
-    const workspace = await seedWorkspace({ repoPrefix: "sidebar-hover-keyboard-" });
-
-    try {
-      await gotoAppShell(page);
-      await waitForSidebarProject(page, path.basename(workspace.repoPath));
-      await openWorkspaceFromSidebar(page, workspace.workspaceId);
-      await movePointerAwayFromWorkspaceHoverCard(page);
-      await expectWorkspaceHoverCardClosed(page);
-
-      await focusWorkspaceRowWithKeyboard(page, workspace.workspaceId);
-      await expectWorkspaceHoverCardOpen(page);
-      await movePointerAwayFromWorkspaceHoverCard(page);
-      await expectWorkspaceHoverCardStaysOpen(page);
-      await page.keyboard.press("Escape");
-      await expectWorkspaceHoverCardClosed(page);
-
-      await focusWorkspaceRowWithKeyboard(page, workspace.workspaceId);
-      await expectWorkspaceHoverCardOpen(page);
-      await page.keyboard.press("Tab");
-      await expectWorkspaceHoverCardClosed(page);
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
  test("marks a finished workspace unread until it is opened again", async ({ page }) => {
    const workspace = await seedMockAgentWorkspace({
      repoPrefix: "sidebar-mark-unread-",
@@ -495,26 +436,21 @@ test.describe("Sidebar workspace list", () => {
 test.describe("Mobile sidebar panelState transition", () => {
  test.use({ viewport: { width: 390, height: 844 } });

-  test("showMobileAgent open and close transition", async ({ page }) => {
+  test("opens mobile navigation beside the close button and closes it again", async ({ page }) => {
    await gotoAppShell(page);
    await expectMobileAgentSidebarHidden(page);
    await openMobileAgentSidebar(page);
    await expectMobileAgentSidebarVisible(page);
+    await test.step("place the close button beside the first navigation row", async () => {
+      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);
+    });
    await closeMobileAgentSidebar(page);
    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,
  }) => {
@@ -587,15 +523,14 @@ test.describe("Half-screen desktop layout", () => {
    }
  });

-  test("keeps the pinned sidebar at half of a 14-inch Mac display", async ({ page }) => {
-    await gotoAppShell(page);
-    await expect(page.getByTestId("sidebar-global-new-workspace")).toBeVisible();
-    await expect(page.getByTestId("agent-list-backdrop")).not.toBeVisible();
-  });
-
  test("keeps the left toggle center-owned without left window controls", async ({ page }) => {
    await gotoAppShell(page);

+    await test.step("start with pinned navigation at half of a 14-inch Mac display", async () => {
+      await expect(page.getByTestId("sidebar-global-new-workspace")).toBeVisible();
+      await expect(page.getByTestId("agent-list-backdrop")).not.toBeVisible();
+    });
+
    const openToggle = page.getByTestId("menu-button");
    const openIcon = openToggle.locator("svg").first();
    await expect(openIcon).toBeVisible();
@@ -1,6 +1,7 @@
 import { expect, type Page } from "@playwright/test";
 import { buildHostAgentDetailRoute } from "@/utils/host-routes";
 import { test } from "../support/fixtures";
+import { createControlledStream } from "../support/helpers/controlled-stream";
 import { seedWorkspace, type SeedDaemonClient } from "../support/helpers/seed-client";
 import { getServerId } from "../support/helpers/server-id";
 import { observeTimelineSubscriptions } from "../support/helpers/timeline-delivery";
@@ -27,31 +28,46 @@ interface ViewedTimelineScenario {
  cleanup(): Promise<void>;
 }

+type ViewedAgentConfig = Pick<
+  Parameters<SeedDaemonClient["createAgent"]>[0],
+  "provider" | "modeId" | "model"
+>;
+
 async function seedViewedTimelineScenario(
-  options: { firstAgentModel?: string } = {},
+  options: { firstAgent?: ViewedAgentConfig } = {},
 ): Promise<ViewedTimelineScenario> {
  const workspace = await seedWorkspace({ repoPrefix: "viewed-timelines-" });
-  const createAgent = (title: string, model = "ten-second-stream") =>
-    workspace.client.createAgent({
+  const createAgent = (
+    title: string,
+    config: ViewedAgentConfig = {
      provider: "mock",
+      modeId: "load-test",
+      model: "e2e-fast-stream",
+    },
+  ) =>
+    workspace.client.createAgent({
+      ...config,
      cwd: workspace.repoPath,
      workspaceId: workspace.workspaceId,
      title,
-      modeId: "load-test",
-      model,
    });
-  const [firstAgent, secondAgent] = await Promise.all([
-    createAgent("First viewed chat", options.firstAgentModel),
-    createAgent("Second viewed chat"),
-  ]);
-  return {
-    client: workspace.client,
-    workspaceId: workspace.workspaceId,
-    repoPath: workspace.repoPath,
-    firstAgentId: firstAgent.id,
-    secondAgentId: secondAgent.id,
-    cleanup: workspace.cleanup,
-  };
+  try {
+    const [firstAgent, secondAgent] = await Promise.all([
+      createAgent("First viewed chat", options.firstAgent),
+      createAgent("Second viewed chat"),
+    ]);
+    return {
+      client: workspace.client,
+      workspaceId: workspace.workspaceId,
+      repoPath: workspace.repoPath,
+      firstAgentId: firstAgent.id,
+      secondAgentId: secondAgent.id,
+      cleanup: workspace.cleanup,
+    };
+  } catch (error) {
+    await workspace.cleanup();
+    throw error;
+  }
 }

 interface RestoredLayoutChat {
@@ -306,19 +322,39 @@ test.describe("Viewed agent timelines", () => {
  }) => {
    test.setTimeout(150_000);
    const subscriptions = observeTimelineSubscriptions(page);
-    const scenario = await seedViewedTimelineScenario({ firstAgentModel: "one-minute-stream" });
+    const stream = await createControlledStream();
+    const scenario = await seedViewedTimelineScenario({
+      firstAgent: { provider: stream.provider },
+    }).catch(async (error) => {
+      await stream.cleanup();
+      throw error;
+    });
    try {
      await openAgent(page, scenario, scenario.firstAgentId);
      await startVisibleTurn(page, scenario, "Finish after this chat becomes hidden.");
+      await stream.append(["The first chat is still producing output."]);
+      await expect(
+        page.getByText("The first chat is still producing output.", { exact: true }),
+      ).toBeVisible();
      await selectAgent(page, "Second viewed chat");
      await subscriptions.waitForSubscribedAgents([scenario.firstAgentId, scenario.secondAgentId]);
-      const finish = await scenario.client.waitForFinish(scenario.firstAgentId, 90_000);
+      const agents = await scenario.client.fetchAgents();
+      expect(
+        agents.entries.find((entry) => entry.agent.id === scenario.firstAgentId)?.agent.status,
+      ).toBe("running");
+      await stream.finish([" Completed while hidden."]);
+      const finish = await scenario.client.waitForFinish(scenario.firstAgentId, 30_000);
      expect(finish.status).toBe("idle");

      await selectAgent(page, "First viewed chat");
      await expectAgentConsistentlyIdle(page, "First viewed chat");
+      await expect(page.getByText("Completed while hidden.", { exact: false })).toBeVisible();
    } finally {
-      await scenario.cleanup();
+      try {
+        await stream.cleanup();
+      } finally {
+        await scenario.cleanup();
+      }
    }
  });

@@ -0,0 +1,79 @@
+import { defineRpc } from "@getpaseo/plugin";
+import type { PluginServerContext } from "@getpaseo/plugin/server";
+import { runAcpProvider, type AcpStreamMessage } from "@getpaseo/plugin/server/acp";
+import { z } from "zod";
+
+/** A single-turn producer controlled through the daemon, before timeline persistence. */
+export default function contribute(server: PluginServerContext) {
+  let startTurn!: (append: (chunks: string[], finish: boolean) => void) => void;
+  const turn = new Promise<(chunks: string[], finish: boolean) => void>((resolve) => {
+    startTurn = resolve;
+  });
+  server.handle(
+    defineRpc({
+      name: "append",
+      input: z.object({ chunks: z.array(z.string()), finish: z.boolean() }),
+      output: z.null(),
+    }),
+    async ({ chunks, finish }) => {
+      const append = await turn;
+      append(chunks, finish);
+      return null;
+    },
+  );
+  server.registerProvider(
+    runAcpProvider({ id: "controlled-stream", label: "Controlled stream", connector: connect }),
+  );
+  return () => {};
+
+  function connect() {
+    let controller: ReadableStreamDefaultController<AcpStreamMessage>;
+    return {
+      readable: new ReadableStream<AcpStreamMessage>({
+        start(value) {
+          controller = value;
+        },
+      }),
+      writable: new WritableStream<AcpStreamMessage>({
+        write(message) {
+          if (!("method" in message) || !("id" in message)) return;
+          if (message.method === "session/prompt") {
+            let finished = false;
+            startTurn((chunks, finish) => {
+              if (finished) return;
+              for (const text of chunks) {
+                controller.enqueue({
+                  jsonrpc: "2.0",
+                  method: "session/update",
+                  params: {
+                    sessionId: "controlled",
+                    update: {
+                      sessionUpdate: "agent_message_chunk",
+                      content: { type: "text", text },
+                    },
+                  },
+                });
+              }
+              if (finish) {
+                finished = true;
+                controller.enqueue({
+                  jsonrpc: "2.0",
+                  id: message.id,
+                  result: { stopReason: "end_turn" },
+                });
+              }
+            });
+            return;
+          }
+          let result: unknown = {};
+          if (message.method === "initialize") {
+            result = { protocolVersion: 1, agentCapabilities: {} };
+          } else if (message.method === "session/new") {
+            result = { sessionId: "controlled" };
+          }
+          controller.enqueue({ jsonrpc: "2.0", id: message.id, result });
+        },
+      }),
+    };
+  }
+}
@@ -0,0 +1 @@
+{ "id": "controlled-stream-test", "requirements": { "paseo": ">=0.8.0" } }
@@ -0,0 +1,57 @@
+import path from "node:path";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { connectDaemonClient } from "./daemon-client-loader";
+
+type ControlledStreamClient = Pick<
+  DaemonClient,
+  | "connect"
+  | "close"
+  | "getDaemonConfig"
+  | "patchDaemonConfig"
+  | "installDirectoryPlugin"
+  | "removePlugin"
+  | "invokePluginRpc"
+>;
+
+/** Owns one real provider turn whose completion the test explicitly releases. */
+export async function createControlledStream() {
+  const client = await connectDaemonClient<ControlledStreamClient>({
+    clientIdPrefix: "controlled-stream",
+  });
+  const previous = await client.getDaemonConfig();
+  let appended = false;
+  const emit = (chunks: string[], finish: boolean) =>
+    client.invokePluginRpc("controlled-stream-test", "append", { chunks, finish });
+  const cleanup = async () => {
+    try {
+      if (appended) await emit([], true);
+      await client.removePlugin("controlled-stream-test");
+    } finally {
+      try {
+        await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
+      } finally {
+        await client.close();
+      }
+    }
+  };
+  try {
+    await client.patchDaemonConfig({ pluginsEnabled: true });
+    await client.installDirectoryPlugin(
+      path.resolve(__dirname, "../fixtures/controlled-stream-plugin"),
+    );
+    return {
+      provider: "controlled-stream",
+      append: async (chunks: string[]) => {
+        await emit(chunks, false);
+        appended = true;
+      },
+      finish: async (chunks: string[] = []) => {
+        await emit(chunks, true);
+      },
+      cleanup,
+    };
+  } catch (error) {
+    await cleanup();
+    throw error;
+  }
+}
@@ -0,0 +1,175 @@
+import { expect, test } from "vitest";
+import { findScrollJumps, type ScrollFrame } from "./scroll-jumps";
+
+test("scroll detector distinguishes entered image growth from a simultaneous viewport jump", () => {
+  const before: ScrollFrame = {
+    at: 1000,
+    scrollTop: 1000,
+    scrollHeight: 5000,
+    viewportHeight: 800,
+    virtualized: true,
+    loading: false,
+    rows: [
+      { id: "image", top: -150, height: 150 },
+      { id: "reading", top: 0, height: 100 },
+    ],
+    anchor: "reading",
+    wheelTotal: 0,
+    lastWheelAt: 0,
+    inputFinishedAt: null,
+    imageLoads: 0,
+    mounted: 0,
+    unmounted: 0,
+  };
+  const after: ScrollFrame = {
+    ...before,
+    at: 1400,
+    scrollTop: 900,
+    wheelTotal: 100,
+    lastWheelAt: 1050,
+    rows: [
+      { id: "image", top: -50, height: 1150 },
+      { id: "reading", top: 1100, height: 100 },
+    ],
+  };
+  expect(findScrollJumps([before, after])).toEqual([]);
+  expect(
+    findScrollJumps([
+      { ...before, scrollTop: 200 },
+      {
+        ...after,
+        wheelTotal: 1000,
+        scrollTop: 0,
+        rows: after.rows.map((row) => ({ ...row, top: row.top + 100 })),
+      },
+    ]),
+  ).toEqual([]);
+  expect(
+    findScrollJumps([
+      before,
+      { ...after, rows: after.rows.map((row) => ({ ...row, top: row.top - 500 })) },
+    ]),
+  ).toHaveLength(1);
+  expect(
+    findScrollJumps([
+      { ...before, anchor: "image", rows: [{ id: "image", top: 0, height: 150 }] },
+      { ...after, rows: [{ id: "image", top: 600, height: 1150 }] },
+    ]),
+  ).toHaveLength(1);
+});
+
+test("scroll detector accounts for delayed wheel input and growth below the new reader", () => {
+  const before: ScrollFrame = {
+    at: 1000,
+    scrollTop: 2000,
+    scrollHeight: 5000,
+    viewportHeight: 800,
+    virtualized: true,
+    loading: false,
+    rows: [
+      { id: "new-reader", top: -520, height: 278 },
+      { id: "image", top: -242, height: 184 },
+      { id: "old-reader", top: -58, height: 130 },
+    ],
+    anchor: "old-reader",
+    wheelTotal: 0,
+    lastWheelAt: 0,
+    inputFinishedAt: null,
+    imageLoads: 0,
+    mounted: 0,
+    unmounted: 0,
+  };
+  const wheel = { ...before, at: 1100, wheelTotal: 480, lastWheelAt: 1099 };
+  const after: ScrollFrame = {
+    ...wheel,
+    at: 1220,
+    scrollTop: 1520,
+    scrollHeight: 5041,
+    anchor: "new-reader",
+    rows: [
+      { id: "new-reader", top: -40, height: 278 },
+      { id: "image", top: 238, height: 225 },
+      { id: "old-reader", top: 463, height: 130 },
+    ],
+  };
+  expect(findScrollJumps([before, wheel, after])).toEqual([]);
+  // The previous 480 px input has already moved the viewport; the recent
+  // budget includes it, but only the next 480 px belongs to this frame.
+  const steadyBefore = { ...before, at: 1050, wheelTotal: 480, lastWheelAt: 1049 };
+  const steadyAfter = {
+    ...after,
+    at: 1100,
+    wheelTotal: 960,
+    lastWheelAt: 1099,
+    scrollHeight: 6000,
+    rows: [
+      { id: "new-reader", top: -40, height: 278 },
+      { id: "image", top: 238, height: 1184 },
+      { id: "old-reader", top: 1422, height: 130 },
+    ],
+  };
+  expect(findScrollJumps([steadyBefore, steadyAfter])).toEqual([]);
+
+  expect(
+    findScrollJumps([
+      before,
+      wheel,
+      {
+        ...after,
+        rows: after.rows.map((row) => ({ id: row.id, height: row.height, top: row.top + 100 })),
+      },
+    ]),
+  ).toHaveLength(1);
+});
+
+test("scroll detector follows the entered image through resize and virtual offset correction", () => {
+  for (const height of [225, 1632]) {
+    const before: ScrollFrame = {
+      at: 1000,
+      scrollTop: 2208,
+      scrollHeight: 5000,
+      viewportHeight: 516,
+      virtualized: true,
+      loading: false,
+      rows: [
+        { id: "image", top: -704, height: 560 },
+        { id: "caption", top: -144, height: 100 },
+        { id: "old-reader", top: -44, height: 127 },
+      ],
+      anchor: "old-reader",
+      wheelTotal: 0,
+      lastWheelAt: 0,
+      inputFinishedAt: null,
+      imageLoads: 0,
+      mounted: 3,
+      unmounted: 0,
+    };
+    const resize = height - 560;
+    const after: ScrollFrame = {
+      ...before,
+      at: 1060,
+      // The virtualizer corrects 110px of estimates while the wheel moves 160px.
+      scrollTop: 1938,
+      scrollHeight: 5000 + resize - 110,
+      wheelTotal: 160,
+      lastWheelAt: 1020,
+      imageLoads: 1,
+      rows: [
+        { id: "image", top: -544, height },
+        { id: "caption", top: 16 + resize, height: 100 },
+        { id: "old-reader", top: 116 + resize, height: 127 },
+      ],
+    };
+    expect(findScrollJumps([before, after])).toEqual([]);
+    // Resizing must not excuse additional viewport movement.
+    expect(
+      findScrollJumps([
+        before,
+        {
+          ...after,
+          rows: after.rows.map((row) => ({ id: row.id, height: row.height, top: row.top + 100 })),
+        },
+      ]),
+    ).toHaveLength(1);
+  }
+});
@@ -0,0 +1,95 @@
+interface RowFrame {
+  id: string;
+  top: number;
+  height: number;
+}
+export interface ScrollFrame {
+  at: number;
+  scrollTop: number;
+  scrollHeight: number;
+  viewportHeight: number;
+  virtualized: boolean;
+  loading: boolean;
+  rows: RowFrame[];
+  anchor: string | null;
+  wheelTotal: number;
+  lastWheelAt: number;
+  inputFinishedAt: number | null;
+  imageLoads: number;
+  mounted: number;
+  unmounted: number;
+}
+
+export function findScrollJumps(frames: ScrollFrame[]) {
+  return frames.flatMap((current, index) => {
+    const previous = frames[index - 1];
+    if (!previous?.anchor) return [];
+    // Wheel input can move the reading line onto an image before it expands.
+    // Follow that intended row, not text now below the image.
+    const recent = frames.findLast((frame) => frame.at <= previous.at - 100);
+    const wheelBudget = current.wheelTotal - (recent?.wheelTotal ?? 0);
+    const currentRows = new Map(current.rows.map((row) => [row.id, row]));
+    const anchor = previous.anchor;
+    const before = currentRows.has(anchor)
+      ? previous.rows.find((row) => row.id === anchor)!
+      : previous.rows
+          .filter((row) => currentRows.has(row.id))
+          .sort((left, right) => Math.abs(left.top - 8) - Math.abs(right.top - 8))[0];
+    if (!before) {
+      throw new Error(`No shared reading geometry between frames ${index - 1} and ${index}`);
+    }
+    const after = currentRows.get(before.id)!;
+    const movement = after.top - before.top;
+    // A busy main thread can deliver wheel movement hundreds of milliseconds
+    // after its event. Only assert idle stability after the driver stops input.
+    const idle = current.inputFinishedAt !== null && previous.at - current.inputFinishedAt > 250;
+    // scrollTop also includes virtualizer estimate corrections. Locate the row
+    // entered by wheel input from its viewport movement instead. Its old height
+    // identifies the reader before a simultaneous image resize takes effect.
+    const intendedRow = previous.rows.find((row) => {
+      const next = currentRows.get(row.id);
+      if (!next || idle || wheelBudget <= 0) return false;
+      const travel = next.top - row.top;
+      return (
+        travel >= -8 &&
+        travel <= Math.min(wheelBudget, previous.scrollTop) + 32 &&
+        (next.top <= 8 || current.scrollTop === 0) &&
+        next.top + row.height > 8
+      );
+    });
+    const enteredRowResize = intendedRow
+      ? previous.rows.reduce((growth, row) => {
+          if (row.top < intendedRow.top || row.top >= before.top) return growth;
+          const height = currentRows.get(row.id)?.height ?? row.height;
+          return growth + height - row.height;
+        }, 0)
+      : 0;
+    const readingMovement = movement - enteredRowResize;
+    const excessForward = readingMovement > wheelBudget + 32;
+    // Upward wheel input moves the same text DOWN the viewport. A negative move
+    // is a reversal, independent of legitimate scrollTop compensation on prepend.
+    if (readingMovement >= -8 && (!idle || Math.abs(readingMovement) <= 8) && !excessForward)
+      return [];
+    return [
+      {
+        frame: index,
+        at: current.at,
+        row: before.id,
+        movement,
+        idle,
+        excessForward,
+        resizedRows: current.rows.flatMap((row) => {
+          const old = previous.rows.find((candidate) => candidate.id === row.id);
+          return old && old.height !== row.height
+            ? [{ id: row.id, before: old.height, after: row.height }]
+            : [];
+        }),
+        loading: current.loading || previous.loading,
+        virtualized: current.virtualized,
+        heightChange: current.scrollHeight - previous.scrollHeight,
+        imageLoads: current.imageLoads - previous.imageLoads,
+        frameGapMs: current.at - previous.at,
+      },
+    ];
+  });
+}
@@ -1,3 +1,4 @@
+import { findScrollJumps, type ScrollFrame } from "./scroll-jumps";
 import { writeFile } from "node:fs/promises";
 import { createServer } from "node:http";
 import { expect, type Page, type TestInfo } from "@playwright/test";
@@ -12,27 +13,6 @@ export const scrollCadences = [
 ] as const;

 type Cadence = (typeof scrollCadences)[number];
-interface RowFrame {
-  id: string;
-  top: number;
-  height: number;
-}
-export interface ScrollFrame {
-  at: number;
-  scrollTop: number;
-  scrollHeight: number;
-  viewportHeight: number;
-  virtualized: boolean;
-  loading: boolean;
-  rows: RowFrame[];
-  anchor: string | null;
-  wheelTotal: number;
-  lastWheelAt: number;
-  inputFinishedAt: number | null;
-  imageLoads: number;
-  mounted: number;
-  unmounted: number;
-}
 interface Recording {
  frames: ScrollFrame[];
  finishInput(): void;
@@ -404,80 +384,6 @@ export async function recordUpwardTraversal(
  });
 }

-export function findScrollJumps(frames: ScrollFrame[]) {
-  return frames.flatMap((current, index) => {
-    const previous = frames[index - 1];
-    if (!previous?.anchor) return [];
-    // Wheel input can move the reading line onto an image before it expands.
-    // Follow that intended row, not text now below the image.
-    const recent = frames.findLast((frame) => frame.at <= previous.at - 100);
-    const wheelBudget = current.wheelTotal - (recent?.wheelTotal ?? 0);
-    const currentRows = new Map(current.rows.map((row) => [row.id, row]));
-    const anchor = previous.anchor;
-    const before = currentRows.has(anchor)
-      ? previous.rows.find((row) => row.id === anchor)!
-      : previous.rows
-          .filter((row) => currentRows.has(row.id))
-          .sort((left, right) => Math.abs(left.top - 8) - Math.abs(right.top - 8))[0];
-    if (!before) {
-      throw new Error(`No shared reading geometry between frames ${index - 1} and ${index}`);
-    }
-    const after = currentRows.get(before.id)!;
-    const movement = after.top - before.top;
-    // A busy main thread can deliver wheel movement hundreds of milliseconds
-    // after its event. Only assert idle stability after the driver stops input.
-    const idle = current.inputFinishedAt !== null && previous.at - current.inputFinishedAt > 250;
-    // scrollTop also includes virtualizer estimate corrections. Locate the row
-    // entered by wheel input from its viewport movement instead. Its old height
-    // identifies the reader before a simultaneous image resize takes effect.
-    const intendedRow = previous.rows.find((row) => {
-      const next = currentRows.get(row.id);
-      if (!next || idle || wheelBudget <= 0) return false;
-      const travel = next.top - row.top;
-      return (
-        travel >= -8 &&
-        travel <= Math.min(wheelBudget, previous.scrollTop) + 32 &&
-        (next.top <= 8 || current.scrollTop === 0) &&
-        next.top + row.height > 8
-      );
-    });
-    const enteredRowResize = intendedRow
-      ? previous.rows.reduce((growth, row) => {
-          if (row.top < intendedRow.top || row.top >= before.top) return growth;
-          const height = currentRows.get(row.id)?.height ?? row.height;
-          return growth + height - row.height;
-        }, 0)
-      : 0;
-    const readingMovement = movement - enteredRowResize;
-    const excessForward = readingMovement > wheelBudget + 32;
-    // Upward wheel input moves the same text DOWN the viewport. A negative move
-    // is a reversal, independent of legitimate scrollTop compensation on prepend.
-    if (readingMovement >= -8 && (!idle || Math.abs(readingMovement) <= 8) && !excessForward)
-      return [];
-    return [
-      {
-        frame: index,
-        at: current.at,
-        row: before.id,
-        movement,
-        idle,
-        excessForward,
-        resizedRows: current.rows.flatMap((row) => {
-          const old = previous.rows.find((candidate) => candidate.id === row.id);
-          return old && old.height !== row.height
-            ? [{ id: row.id, before: old.height, after: row.height }]
-            : [];
-        }),
-        loading: current.loading || previous.loading,
-        virtualized: current.virtualized,
-        heightChange: current.scrollHeight - previous.scrollHeight,
-        imageLoads: current.imageLoads - previous.imageLoads,
-        frameGapMs: current.at - previous.at,
-      },
-    ];
-  });
-}
-
 export async function reportScrollJumps(
  page: Page,
  testInfo: TestInfo,
@@ -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;
@@ -1,8 +1,6 @@
 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";
@@ -114,7 +112,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 +121,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 +489,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 +514,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 +530,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";
@@ -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 }>();
@@ -233,7 +206,7 @@ export function prepareMarkdownSource(
  visit(getTree());
  return {
    images,
-    ...metadata,
+    ...linkMetadata(),
    render(
      urls: ReadonlyMap<string, string> = new Map(),
      unavailableImages: ReadonlySet<string> = new Set(),
@@ -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,
    };
@@ -18,7 +18,7 @@ const resolvePackageEntry = (packageName: string) => {
 export default defineConfig({
  test: {
    environment: "node",
-    exclude: [...configDefaults.exclude, "e2e/**"],
+    exclude: configDefaults.exclude,
    projects: [
      {
        extends: true,
@@ -27,12 +27,13 @@ export default defineConfig({
          environment: "node",
          include: [
            "src/**/*.{test,spec}.{ts,tsx}",
+            "e2e/support/helpers/*.test.ts",
            "native-release-version.test.ts",
            "app.config.test.ts",
            "vitest-environment.test.ts",
          ],
          setupFiles: [path.resolve(__dirname, "vitest.setup.ts")],
-          exclude: [...configDefaults.exclude, "e2e/**", "src/**/*.browser.{test,spec}.{ts,tsx}"],
+          exclude: [...configDefaults.exclude, "src/**/*.browser.{test,spec}.{ts,tsx}"],
        },
      },
      {
@@ -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",
@@ -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"
@@ -1246,49 +1246,6 @@ describe("runAcpProvider streamed chunks without messageId (#4699)", () => {
    messageId?: string;
  }

-  it("keeps reasoning separate from a reply sharing its native message ID", async () => {
-    const harness = connectorHarness({
-      promptUpdates: () => [
-        textChunk("private reasoning", "agent_thought_chunk", "shared-id"),
-        textChunk("public reply", "agent_message_chunk", "shared-id"),
-      ],
-    });
-    const registration = runAcpProvider({
-      id: "chunk-acp",
-      label: "Chunk ACP",
-      connector: harness.connector,
-    });
-    const connection = await registration.connect({
-      versions: [1],
-      capabilities: ["prompt.message"],
-    });
-    const events: ProviderEvent[] = [];
-    connection.onEvent((event) => events.push(event));
-    try {
-      await connection.send(openInput());
-      await waitForEvent(events, (event) => event.type === "session.ready");
-      await connection.send({
-        type: "session.prompt",
-        sessionId: "session-1",
-        prompt: {
-          clientMessageId: "same-id",
-          delivery: "auto",
-          input: { type: "message", content: [{ type: "text", text: "hello" }] },
-        },
-      });
-      await waitForEvent(
-        events,
-        (event) => event.type === "session.turn" && event.state === "completed",
-      );
-      const reply = events.findLast(
-        (event) => event.type === "timeline.item" && event.item.type === "assistant_message",
-      );
-      expect(reply).toMatchObject({ item: { text: "public reply" } });
-    } finally {
-      await connection.close();
-    }
-  });
-
  it("continues one timeline item per turn instead of one per chunk", async () => {
    const chunksByPrompt: Record<string, Chunk[]> = {
      first: [
@@ -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",
@@ -287,45 +287,6 @@ function expectNestedChildren(events: AgentStreamEvent[]) {
 }

 describe("PluginAgentClientRegistry", () => {
-  test("returns unavailable when steering a provider without prompt.steer capability", async () => {
-    const harness = createProviderHarness();
-    const registry = new PluginAgentClientRegistry(createTestLogger());
-    registry.replace([harness.registration]);
-    const session = await registry.clients()[harness.registration.id]!.createSession({
-      provider: harness.registration.id,
-      cwd: "/tmp",
-    });
-    try {
-      await expect(
-        session.steerActiveTurn!("follow up", { expectedTurnId: "turn-1" }),
-      ).resolves.toEqual({ status: "unavailable" });
-      expect(harness.inputs.filter((input) => input.type === "session.prompt")).toHaveLength(0);
-    } finally {
-      await session.close();
-      registry.replace([]);
-    }
-  });
-
-  test("resumes a native ACP handle after the same provider ID moves to a plugin", async () => {
-    const harness = createProviderHarness();
-    const registry = new PluginAgentClientRegistry(createTestLogger());
-    registry.replace([harness.registration]);
-    try {
-      const session = await registry.clients()[harness.registration.id]!.resumeSession(
-        {
-          provider: harness.registration.id,
-          sessionId: "native-session-id",
-          nativeHandle: "native-session-id",
-          metadata: { provider: "acp", cwd: "/tmp" },
-        },
-        { provider: harness.registration.id, cwd: "/tmp" },
-      );
-      await session.close();
-    } finally {
-      registry.replace([]);
-    }
-  });
-
  test("stores only agent options while the plugin receives merged defaults", async () => {
    const logger = createTestLogger();
    const harness = createProviderHarness();
@@ -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>> {
@@ -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": {
@@ -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:
Author	SHA1	Message	Date
Mohamed Boudra	79de2540fd	test(app): retain separate initial theme journeys	2026-10-17 21:20:46 +02:00
Mohamed Boudra	213c78e819	test(app): consolidate browser setup and rebalance CI shards	2026-10-17 21:12:13 +02:00
Mohamed Boudra	941c890744	test(app): control hidden turn completion explicitly	2026-10-17 18:54:16 +02:00
Mohamed Boudra	e109b866ab	test(app): trim repeated browser journeys and scripted waits	2026-10-17 18:37:38 +02:00
				`@@ -0,0 +1 @@`
				`{ "id": "controlled-stream-test", "requirements": { "paseo": ">=0.8.0" } }`