chore(release): cut 0.13.2

Worklets 0.10.4 and Reanimated 4.5.5 while keeping the stale-view guard from #7907; backport the Enriched Markdown settled-row measurement fix (upstream #924); release each bottom sheet's Dimensions subscription on unmount.

(cherry picked from commit e277656cbd)

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.13.2 - 2026-10-26
+
+### Fixed
+
+- Fixed repeated Android animation exceptions for views that have already unmounted ([#7907](https://github.com/getpaseo/paseo/pull/7907))
+- Fixed the Android animation run loop continuing while the app is in the background ([#7914](https://github.com/getpaseo/paseo/pull/7914))
+- Fixed finished Android chat messages being remeasured during streaming updates ([#7914](https://github.com/getpaseo/paseo/pull/7914))
+- Fixed bottom sheets retaining window-size listeners after closing ([#7914](https://github.com/getpaseo/paseo/pull/7914))
+
 ## 0.13.1 - 2026-10-26
 
 ### Fixed

CHANGELOG.zh-CN.md

@@ -1,5 +1,14 @@
 # 更新日志
 
+## 0.13.2 - 2026-10-26
+
+### 修复
+
+- 修复 Android 对已卸载视图反复抛出动画异常的问题 ([#7907](https://github.com/getpaseo/paseo/pull/7907))
+- 修复 Android 应用进入后台后动画运行循环仍持续执行的问题 ([#7914](https://github.com/getpaseo/paseo/pull/7914))
+- 修复 Android 在流式更新时反复测量已完成聊天消息的问题 ([#7914](https://github.com/getpaseo/paseo/pull/7914))
+- 修复底部面板关闭后仍保留窗口尺寸监听器的问题 ([#7914](https://github.com/getpaseo/paseo/pull/7914))
+
 ## 0.13.1 - 2026-10-26
 
 ### 修复

docs/agent-lifecycle.md

@@ -25,54 +25,8 @@ Reload releases the old runtime before resuming its durable session: an idle pro
 still own an exclusive writer. A close failure retains that runtime for cleanup and blocks the
 replacement. Once closure succeeds, a failed resume leaves the durable agent closed and retryable.
 
-Idle resumable runtimes are collected after one hour without activity, checked once a minute.
-Collection releases the process and preserves the agent record, conversation, relationships, and
-provider session. The next prompt resumes that session. Set `agents.idleRuntimeCleanup: false` in
-host config to disable automatic collection. The host setting applies immediately; config-file edits
-apply on reload. Disabling invalidates pending safety checks and close admission. A close already
-started finishes. Re-enabling keeps the existing idle timestamps.
-
-Foreground runs, permissions and responses, queued deliveries, lifecycle operations, and working
-managed or native descendants prevent collection. Outstanding local or remote finish subscriptions
-also protect their caller, including registration, recovery and notification dispatch acknowledgment.
-An idle managed child can still own background work.
-
-The daemon baseline always applies. An optional provider `canStopRuntime()` adds a veto: false,
-errors and timeouts retain ownership, while true cannot override daemon blockers. Without a provider
-check, the baseline decides collection after the same one-hour idle period. Once protected work
-finishes, a fresh idle hour starts. There is no deadline that overrides a veto.
-
-The `idle-runtime-cleanup/` module owns the clocks, eligibility policy and sweep lifetime.
-AgentManager supplies captured runtime capabilities and owns atomic revalidation and shutdown.
-Finish subscriptions expose caller protection through their public capability; the collector never
-reads their watches or durable records.
-
-The collector rechecks daemon state after asynchronous probes and event draining, in the existing
-close/load lifecycle lane. A prompt admitted before closure prevents collection. A prompt arriving
-after closure starts waits for release and resumes the saved session.
-
-Provider checks follow the signals their runtimes expose:
-
-- Claude uses its process-local background roster and pending completion notifications. A fresh
-  process starts empty. CLI 2.1.292 or newer is known to support the roster; older binaries must
-  demonstrate support by emitting one. Unknown versions stay resident until then.
-- Codex queries background terminals for loaded threads, including native children, and protects
-  pending provider requests. App servers without the terminal-list RPC stay resident.
-- OpenCode checks active executions and descendants. V1 checks PTYs; v2 also checks shell and
-  inbox inventories. The shared server remains leased while a session vetoes collection.
-- Pi checks streaming, compaction, pending replies, and adapter-owned operations. Known native
-  subagent signals also protect their parent through the daemon's subagent store.
-- OMP additionally requires `get_state.isSettled: true` and `hasPendingAsyncWork: false`.
-  These protect jobs with unsuppressed completion delivery, pending deliveries, queued result
-  injection, and admitted or scheduled continuations that can re-wake the session. Older OMP
-  runtimes without either field stay resident. These signals are not an inventory of arbitrary
-  processes.
-- ACP checks adapter-owned foreground turns, permissions, buffered user messages, and running
-  ACP terminals, including quiet terminals. Exited or failed-to-spawn terminal records do not
-  prevent collection. This does not inspect processes launched internally by the provider.
-
-These checks do not discover arbitrary detached processes or work hidden by third-party
-extensions. A provider plugin adds its own veto through the [runtime safety contract](../public-docs/plugins/providers.md#permit-idle-runtime-cleanup).
+Idle agents remain resident indefinitely. Runtime closure happens only through an explicit lifecycle
+action such as archive, replacement, reload, workspace teardown, or daemon shutdown.
 
 A provider runtime can still die on its own — crash, OOM kill, host suspend. Work the agent parked
 inside that process dies with it: Claude Code's background Bash shells, `Monitor` watches, and
@@ -288,7 +242,7 @@ parentAgentId === thisAgent.id  AND  !archivedAt
 
 - **Provider subagents** are child executions owned by Claude, Codex, or OpenCode. They are not inserted into `AgentManager` as managed agents. Providers emit a separate descriptor and timeline stream through `agent.provider_subagents.*`; the client keeps that state outside the normal agent store and merges only the presentation rows into the track. A descriptor's optional `parentSubagentId` identifies its direct provider-subagent parent; an absent value identifies a direct child of the managed agent.
 
-Clicking either kind opens a workspace tab. On compact layouts it opens in a [sheet](explorer-sidebar.md#sheets) over the subagents list instead; the sheet hides the composer and shows the agent's model and thinking as one line in its place (`PaneSubtitle`, the row provider subagents already use), and a Paseo subagent's sheet offers **Open as tab** (the full-screen glyph in the header) to get the composer back. A Paseo subagent tab is a normal interactive agent pane. A provider subagent tab is a read-only timeline pane with no composer, archive, detach, rewind, or fork actions. It shows its own direct children in a subagents track. Every subagent pane links back to its parent (`packages/app/src/subagents/parent/`): a pill above the composer when there is one, a parent box in the composer's place when there is not. Both panes use `AgentStreamView`, so message, reasoning, tool-call, and layout rendering stay identical.
+Clicking either kind opens a workspace tab. On compact layouts it opens in a [sheet](explorer-sidebar.md#sheets) over the subagents list instead; the sheet hides the composer and shows the agent's model and thinking as one line in its place (`PaneSubtitle`, the row provider subagents already use), and a Paseo subagent's sheet offers **Open as tab** (the full-screen glyph in the header) to get the composer back. A Paseo subagent tab is a normal interactive agent pane. A provider subagent tab is a read-only timeline pane with no composer, archive, detach, rewind, or fork actions. It shows its own direct children in a subagents track. Both panes use `AgentStreamView`, so message, reasoning, tool-call, and layout rendering stay identical.
 
 Provider timelines use the same structural timeline item format but deliberately have a separate lifecycle and transport. A provider thread/session identifier is not a Paseo agent identifier, and closing its tab is always layout-only.
 

docs/architecture.md

@@ -340,50 +340,11 @@ Example: adding a new enum value
 
 ### Creation ownership
 
-Creation execution is owned by the daemon across socket lifetimes. A workspace request
-can include its initial agent and prompt. The app's `workspace-creation/` module owns
-chat submission presentation outside React: it reserves final IDs and a message identity,
-then opens the agent target before asynchronous preparation or a daemon response.
-The New workspace chat entry requires `creationLifecycle`; empty workspaces, terminal
-launches, and existing-workspace agent drafts retain their own entry points.
-
-Pending presentation never enters the directory replica as a fabricated resource.
-Routes, tabs, and the sidebar retain it until the corresponding authoritative resource
-has been observed. Files, terminals, scripts, and agent timeline initialization wait for
-real resources. The creating agent opens in the normal agent panel and composer, showing
-its submitted configuration. Until the host publishes the agent, its destination cwd is
-unknown and its controls are read-only. The host publishes the agent before it starts the
-initial prompt, so prompts wait in the agent's queue until creation completes
-(`isAgentReadyForPrompts`). `composer/actions.ts` applies that to every prompt path: send
-and review feedback queue behind earlier prompts, and send now and queue drain leave the
-queue untouched. The queue drains on adoption or when the initial turn ends. The first
-message uses composer submission reconciliation; creation never sends it again when the
-panel mounts. Completion does not navigate, and draft cleanup checks the captured version
-so it cannot erase newer input.
-
-A failed creation goes to the existing owner of whatever the host did not create, using
-the receipt's resources and `failedStage`. Creation has no failure UI of its own:
-
-- No workspace: the app returns to New workspace with the submitted draft and checkout
-  selection, and shows the error the way that screen shows its own submit errors.
-- Workspace but no agent: the agent tab becomes an existing-workspace agent draft holding
-  the prompt, in the abandoned create-flow state. Its error and Send retry are that draft's
-  own; the retry creates the agent in the kept workspace.
-- An agent that exists or may exist, including a failed first prompt: creation completes
-  and the agent tab keeps the agent's own timeline and turn error. Turning it into a draft
-  would create a second agent on Send.
-
-Queued follow-ups and unsent composer text belong to a composer identity, so they move
-with the creation: from the form to the creating agent, back to the form or the agent draft
-on failure, and to the created agent after retry (`transferComposerFollowUps`). The initial
-prompt stays the form's or draft's input. The agent draft also carries the submitted
-setup and context attachments. The host ignores `config.cwd` when a create request names a
-workspace, so a draft's retry starts at the workspace root, not a nested fork cwd.
-
-Adopted successful attempts release their payloads; a bounded cache of compact receipts
-absorbs duplicate commands from retained forms. The SDK owns reconnect observation; the
-app has no resend loop. Pending views survive navigation and pane remount, not app
-process death. Resource reservations are identities, not ready workspace records.
+Creation is owned by the daemon across socket lifetimes. A workspace request can include
+its initial agent and prompt. Workspace readiness is published before provider startup;
+the app keeps its existing disk-ready navigation and observes the remaining creation.
+Callbacks do not advance the workflow. Resource reservations in acknowledgement are
+identities, not ready workspace records.
 
 The creation journal (`server/creation/`) owns identity and execution for both legacy and
 modern creation RPCs. Requesting progress never selects a different journal. Existing

docs/data-model.md

@@ -221,6 +221,12 @@ snapshot so a mixed edit can apply its live subset and still name the paths that
     }
   },
   providers: {
+    openai: {
+      apiKey?: string,
+      baseUrl?: string,
+      stt?: { apiKey?: string, baseUrl?: string },
+      tts?: { apiKey?: string, baseUrl?: string }
+    },
     local: { modelsDir: string }
   },
   agents: {
@@ -238,8 +244,8 @@ snapshot so a mixed edit can apply its live subset and still name the paths that
   pluginsEnabled: boolean,
   plugins: Record<pluginId, { source: "directory", path: string, enabled?: boolean }>,
   features: {
-    dictation: { enabled, stt: SpeechSttConfig },
-    voiceMode: { enabled, llm, stt: SpeechSttConfig, turnDetection, tts: SpeechTtsConfig }
+    dictation: { enabled, stt: { provider, model, language, confidenceThreshold } },
+    voiceMode: { enabled, llm, stt: { provider, model, language }, turnDetection, tts: { provider, model, voice, speakerId, speed } }
   },
   log: {
     level, format,
@@ -347,27 +353,42 @@ Environment variables override `config.json`:
 after changing `config.json`. Environment changes require a daemon restart; the launch environment
 remains authoritative during reload.
 
-### Speech configuration
+Local speech model ids are intentionally narrow: STT uses `parakeet-tdt-0.6b-v2-int8`, TTS uses `kokoro-en-v0_19`, and turn detection uses the bundled Silero VAD model.
 
-Each use site owns its provider settings: `features.dictation.stt`,
-`features.voiceMode.stt`, and `features.voiceMode.tts`. `provider` selects a strict
-`local` or `openai` variant. Both STT variants carry `language`; normalization preserves
-it regardless of provider. `providers.local.modelsDir` remains shared storage.
-See [Voice configuration](../public-docs/voice.md) for fields, examples and env precedence.
+Set these to select OpenAI instead of local speech:
 
-On load, `persisted-config.ts` folds legacy `providers.openai` credentials and URLs
-into OpenAI sites that lack their own values, using endpoint settings before shared
-settings. A provider-less site becomes local; provider names are lower-cased, and
-fields ignored by the selected speech provider are discarded. The next save writes only the
-inline shape. A legacy key with no site to receive it is discarded with a warning
-that names its path, without logging its value.
+| Env var                        | Applies to                      |
+| ------------------------------ | ------------------------------- |
+| `PASEO_VOICE_STT_PROVIDER`     | Voice mode STT provider         |
+| `PASEO_DICTATION_STT_PROVIDER` | Composer dictation STT provider |
+| `PASEO_VOICE_TTS_PROVIDER`     | Voice mode TTS provider         |
 
-`speech-settings.ts` owns mutable config reads and patches. The wire uses the same
-`features` structure. Reads replace OpenAI keys with `hasApiKey` (saved in config)
-and report effective env sources in `envOverrides`. A site patch that changes
-`provider` replaces the entire object. The same or omitted `provider` merges fields
-into the current variant, preserving the write-only key when a form re-saves it. `null` clears a value. Switching providers discards credentials and
-options from the previous variant.
+OpenAI speech can be configured under `providers.openai`. STT and TTS resolve independently, so they can point at different endpoints:
+
+```json
+{
+  "providers": {
+    "openai": {
+      "stt": {
+        "apiKey": "sk-...",
+        "baseUrl": "https://stt.example.com/v1"
+      },
+      "tts": {
+        "apiKey": "sk-...",
+        "baseUrl": "https://api.openai.com/v1"
+      }
+    }
+  }
+}
+```
+
+`providers.openai.stt` is used for both composer dictation and voice mode speech-to-text; `providers.openai.tts` is used for voice mode text-to-speech. The equivalent env vars are `OPENAI_STT_API_KEY`/`OPENAI_STT_BASE_URL` and `OPENAI_TTS_API_KEY`/`OPENAI_TTS_BASE_URL`. Each feature falls back to `providers.openai.apiKey`/`providers.openai.baseUrl`, then `OPENAI_API_KEY`/`OPENAI_BASE_URL`, when its own fields are unset. These settings apply only to Paseo OpenAI speech features, not to Codex or other OpenAI-backed tools.
+
+Paseo uses these paths under the configured OpenAI base URL:
+
+- dictation STT: `/v1/audio/transcriptions`
+- voice mode STT: `/v1/audio/transcriptions`
+- voice mode TTS: `/v1/audio/speech`
 
 ---
 

docs/design.md

@@ -70,7 +70,7 @@ the sidebar. Apply it as `backgroundColor`; setting `opacity` on the control als
 
 Sizes: `xs` for ultra-tight inline triggers. `sm` for any button sitting in a row. `md` is the page default. `lg` is reserved for large standalone CTAs.
 
-Sizes are a shared contract across control kinds, defined once in `control-geometry.ts`: `xs` = 28px tall with `fontSize.sm` labels, `sm` = 32px with `fontSize.base`, `md`/`lg` = 44px with `fontSize.base`. `<SegmentedControl>` (`packages/app/src/components/ui/segmented-control.tsx`) takes the same `xs`/`sm`/`md` sizes — a segmented control next to a `<Button>` of the same size always matches in height, label size, and corner radius. Its segments run one padding step tighter than a button, because the gap between segments already reads as padding. The selected segment is a `surface3` fill with `foreground` text, not an inverted one — inverting it inside thin chrome puts a white slab in the toolbar. Text fields take `xs`, `sm` and `md`. Thin chrome such as the file toolbar uses `xs`. A settings row sizes the controls in its trailing slot itself, `sm` in a card and `xs` when nested (`packages/app/src/components/ui/control-size.tsx`), so don't pass a size to a button, dropdown or field placed in a row. Never shrink a control's font or padding locally to fit a context — if the context needs a smaller control, the size tier is missing or the wrong one is in use.
+Sizes are a shared contract across control kinds, defined once in `control-geometry.ts`: `xs` = 28px tall with `fontSize.sm` labels, `sm` = 32px with `fontSize.base`, `md`/`lg` = 44px with `fontSize.base`. `<SegmentedControl>` (`packages/app/src/components/ui/segmented-control.tsx`) takes the same `xs`/`sm`/`md` sizes — a segmented control next to a `<Button>` of the same size always matches in height, label size, and corner radius. Its segments run one padding step tighter than a button, because the gap between segments already reads as padding. The selected segment is a `surface3` fill with `foreground` text, not an inverted one — inverting it inside thin chrome puts a white slab in the toolbar. Thin chrome such as the file toolbar uses `xs`; settings rows use `sm`. Never shrink a control's font or padding locally to fit a context — if the context needs a smaller control, the size tier is missing or the wrong one is in use.
 
 A `<Pressable>` wrapping a `<Text>` is a sixth variant. It is wrong. `<Button>` accepts `style`, `textStyle`, `leftIcon`, `disabled`, `size`, and `variant`.
 
@@ -126,8 +126,6 @@ Cards inside a section sit closer than sections. Rows inside a card touch — on
 
 Rows have generous vertical padding: roughly 16px of content plus 16px of vertical padding for settings rows, 8–12px for sidebar list items where many rows must fit. Compressing rows below the established density to fit more on the screen is wrong. Too many rows means more cards or more sections, not smaller rows.
 
-Rows revealed under a `<SettingsCollapsibleRow>` are nested rows, one step smaller than card rows: 8px of vertical padding, `fontSize.sm` text, `xs` controls, and one fixed height so rows with and without a trailing button line up. The collapsible row sets this for everything under it (`packages/app/src/components/settings/row-density.tsx`). Never pass a density to a row, and never pad or resize a nested row by hand.
-
 The whitespace is the design.
 
 ---

docs/mobile-testing.md

@@ -94,12 +94,6 @@ and its Claude provider available. Set `PASEO_COMPOSER_KEYBOARD_SERVER_ID`,
 `_AGENT_ID` (an idle mock chat), and `_WORKSPACE_ID` (its workspace); `_DEVICE`,
 `_SESSION`, and `_DRAFT_ID` are optional. Artifacts go to
 `.dev/agent-device-artifacts/composer-keyboard-ios`.
-With a Codex draft selected, set `_SCENARIO=growth` on a 402pt-wide iPhone to
-check live wrapping, shrinking, the 12pt anchor gap, and command insertion. Set
-`_SCENARIO=previews` on an SE-sized iPhone to check long and short descriptions
-under an eight-line draft, selection with the keyboard shown and hidden, and
-file mentions. These scenarios only need `_SERVER_ID` and `_WORKSPACE_ID`;
-`_UDID` selects an exact simulator and `_ARTIFACTS_DIR` overrides the output path.
 
 The Android sidebar scroll-retention flow requires a connected host with enough
 workspaces to overflow the compact sidebar. Pass `TOP_WORKSPACE` and

docs/plugins.md

@@ -498,11 +498,6 @@ Validate and apply it inside the provider; core does not know your option shape.
 See [provider options](custom-providers.md#provider-options) for configuration and
 merge semantics.
 
-Providers add an optional veto to daemon baseline cleanup through the per-session
-[runtime safety query](../public-docs/plugins/providers.md#permit-idle-runtime-cleanup).
-The daemon calls the same `AgentSession.canStopRuntime()` interface for built-ins and plugins;
-the plugin bridge transports that query through the existing provider request/event protocol.
-
 Agent refresh closes the current provider session and opens it again with current configuration and
 persistence. Re-read credentials and provider-owned configuration on `session.open`; consume the
 daemon launch from `connect` and the per-session env and MCP servers from `session.open`. There is

fastlane/metadata/android/en-US/changelogs/130021.txt

@@ -0,0 +1,7 @@
+Fixed
+- Fixed repeated Android animation exceptions for views that have already unmounted
+- Fixed the Android animation run loop continuing while the app is in the background
+- Fixed finished Android chat messages being remeasured during streaming updates
+- Fixed bottom sheets retaining window-size listeners after closing
+
+Full notes: https://paseo.sh/changelog

fastlane/metadata/android/en-US/changelogs/130022.txt

@@ -0,0 +1,7 @@
+Fixed
+- Fixed repeated Android animation exceptions for views that have already unmounted
+- Fixed the Android animation run loop continuing while the app is in the background
+- Fixed finished Android chat messages being remeasured during streaming updates
+- Fixed bottom sheets retaining window-size listeners after closing
+
+Full notes: https://paseo.sh/changelog

fastlane/metadata/android/en-US/changelogs/130023.txt

@@ -0,0 +1,7 @@
+Fixed
+- Fixed repeated Android animation exceptions for views that have already unmounted
+- Fixed the Android animation run loop continuing while the app is in the background
+- Fixed finished Android chat messages being remeasured during streaming updates
+- Fixed bottom sheets retaining window-size listeners after closing
+
+Full notes: https://paseo.sh/changelog

fastlane/metadata/android/en-US/changelogs/130024.txt

@@ -0,0 +1,7 @@
+Fixed
+- Fixed repeated Android animation exceptions for views that have already unmounted
+- Fixed the Android animation run loop continuing while the app is in the background
+- Fixed finished Android chat messages being remeasured during streaming updates
+- Fixed bottom sheets retaining window-size listeners after closing
+
+Full notes: https://paseo.sh/changelog

nix/npm-deps.hash

@@ -1 +1 @@
-sha256-SKL7TMIuuV3imTIaQc66UDf3n6V3FB0nGSBucJ6rlA0=
+sha256-n6m3m0541/mBbMN1xrh/2uBCRQc62yicK1cdvyyUmmU=

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -35695,7 +35695,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "dependencies": {
         "@codemirror/commands": "6.10.4",
         "@codemirror/language": "6.12.4",
@@ -35715,7 +35715,6 @@
         "@gorhom/portal": "^1.0.14",
         "@marijn/find-cluster-break": "^1.0.2",
         "@mattermost/react-native-paste-input": "2.0.1",
-        "@noble/hashes": "^2.4.0",
         "@react-native-async-storage/async-storage": "2.2.0",
         "@react-native-masked-view/masked-view": "0.3.2",
         "@react-native/normalize-colors": "0.86.3",
@@ -37962,12 +37961,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.13.1",
-        "@getpaseo/protocol": "0.13.1",
-        "@getpaseo/server": "0.13.1",
+        "@getpaseo/client": "0.13.2",
+        "@getpaseo/protocol": "0.13.2",
+        "@getpaseo/server": "0.13.2",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -38214,10 +38213,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "dependencies": {
-        "@getpaseo/protocol": "0.13.1",
-        "@getpaseo/relay": "0.13.1",
+        "@getpaseo/protocol": "0.13.2",
+        "@getpaseo/relay": "0.13.2",
         "ws": "^8.20.0",
         "zod": "^4.4.3"
       },
@@ -38229,7 +38228,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -38473,7 +38472,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -42092,7 +42091,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "dependencies": {
         "@codemirror/language": "6.12.4",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -42121,15 +42120,15 @@
     },
     "packages/plugin": {
       "name": "@getpaseo/plugin",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "dependencies": {
         "@agentclientprotocol/sdk": "^1.4.0",
         "i18next": "^26.3.0",
         "use-sync-external-store": "^1.6.0"
       },
       "devDependencies": {
-        "@getpaseo/client": "0.13.1",
-        "@getpaseo/protocol": "0.13.1",
+        "@getpaseo/client": "0.13.2",
+        "@getpaseo/protocol": "0.13.2",
         "@types/node": "^20.9.0",
         "@types/react": "~19.2.0",
         "react": "19.2.3",
@@ -42139,8 +42138,8 @@
         "zod": "^4.4.3"
       },
       "peerDependencies": {
-        "@getpaseo/client": "0.13.1",
-        "@getpaseo/protocol": "0.13.1",
+        "@getpaseo/client": "0.13.2",
+        "@getpaseo/protocol": "0.13.2",
         "react": ">=19.1.0 <20",
         "react-native": ">=0.81.5",
         "zod": "^4.4.3"
@@ -42162,7 +42161,7 @@
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "dependencies": {
         "semver": "^7.8.5",
         "zod": "^4.4.3"
@@ -42189,7 +42188,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "dependencies": {
         "@noble/ciphers": "^2.4.0",
         "@noble/curves": "^2.4.0",
@@ -42410,16 +42409,16 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "0.3.246",
         "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.13.1",
-        "@getpaseo/highlight": "0.13.1",
-        "@getpaseo/plugin": "0.13.1",
-        "@getpaseo/protocol": "0.13.1",
-        "@getpaseo/relay": "0.13.1",
+        "@getpaseo/client": "0.13.2",
+        "@getpaseo/highlight": "0.13.2",
+        "@getpaseo/plugin": "0.13.2",
+        "@getpaseo/protocol": "0.13.2",
+        "@getpaseo/relay": "0.13.2",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "1.29.0",
         "@opencode-ai/sdk": "1.14.46",
@@ -43340,7 +43339,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",
@@ -44950,7 +44949,7 @@
     },
     "plugins": {
       "name": "@getpaseo/builtin-plugins",
-      "version": "0.13.1",
+      "version": "0.13.2",
       "dependencies": {
         "@getpaseo/plugin": "*",
         "zod": "^4.4.3"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [

packages/app/e2e/browser/agent-message-submission.spec.ts

@@ -18,9 +18,7 @@ import {
   expectComposerVisible,
   cancelAgent,
   composerLocator,
-  expectQueuedMessageButton,
   fillComposerDraft,
-  holdSendButton,
   sendDraftToQueue,
   startRunningMockAgent,
   submitMessage,
@@ -1292,49 +1290,6 @@ test.describe("Agent message submission", () => {
     }
   });
 
-  test("queues a draft by holding Send while a tap still steers", async ({ page }, testInfo) => {
-    test.setTimeout(120_000);
-    const gate = await gateNextAgentMessage(page);
-    const agent = await startRunningMockAgent(page, {
-      prefix: `hold-send-queue-${testInfo.workerIndex}-`,
-      model: "one-minute-stream",
-      prompt: "Keep this turn active while the user holds Send.",
-    });
-    try {
-      await expectComposerVisible(page);
-      await expectAgentReadyToInterrupt(page);
-
-      const queuedPrompt = "Queue this follow-up by holding Send.";
-      await test.step("holding Send queues the draft", async () => {
-        await fillComposerDraft(page, queuedPrompt);
-        await holdSendButton(page, "Send and steer");
-        await expectQueuedMessageButton(page);
-        await expectComposerDraft(page, "");
-        await expectAgentReadyToInterrupt(page);
-        await expect(
-          page.getByTestId("user-message").filter({ hasText: queuedPrompt }),
-        ).toHaveCount(0);
-      });
-
-      await test.step("tapping Send still steers", async () => {
-        const steeredPrompt = "Steer this turn with a tap.";
-        await fillComposerDraft(page, steeredPrompt);
-        await page.getByRole("button", { name: "Send and steer", exact: true }).click();
-
-        const request = await gate.waitForRequest();
-        expect(request.text).toBe(steeredPrompt);
-        expect(request.activeTurnBehavior).toBe("steer");
-        gate.accept();
-        await expect(
-          page.getByTestId("user-message").filter({ hasText: steeredPrompt }),
-        ).toHaveCount(1);
-        await expectQueuedMessageButton(page);
-      });
-    } finally {
-      await agent.cleanup();
-    }
-  });
-
   test("replays Claude-shaped steering inside one active turn", async ({ page }, testInfo) => {
     test.setTimeout(120_000);
     await replaySteeredSleepTurnInBrowser(page, testInfo, "claude");

packages/app/e2e/browser/assistant-file-link-tooltip.spec.ts

@@ -1,69 +0,0 @@
-import { writeFile } from "node:fs/promises";
-import path from "node:path";
-import { test, expect, type Page } from "../support/fixtures";
-import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
-
-async function readFileLinkTooltip(page: Page): Promise<void> {
-  const link = page.getByRole("link", { name: "the guide", exact: true });
-  await link.hover();
-  await expect(page.getByRole("tooltip")).toContainText("guide.md");
-}
-
-async function leaveFileLink(page: Page): Promise<void> {
-  await page.mouse.move(5, 5);
-  await expect(page.getByRole("tooltip")).toHaveCount(0);
-}
-
-async function openLinkedFile(page: Page): Promise<void> {
-  await page.getByRole("link", { name: "the guide", exact: true }).click();
-  await expect(page.getByTestId("markdown-preview-frame")).toContainText("Example guide");
-  await leaveFileLink(page);
-}
-
-async function returnToAgent(page: Page): Promise<void> {
-  await page.getByRole("button", { name: "Tooltip regression", exact: true }).click();
-  await expect(page.getByRole("link", { name: "the guide", exact: true })).toBeVisible();
-  await leaveFileLink(page);
-}
-
-async function switchToFileTab(page: Page): Promise<void> {
-  await page.getByRole("button", { name: "guide.md", exact: true }).click();
-  await expect(page.getByTestId("markdown-preview-frame")).toContainText("Example guide");
-  await leaveFileLink(page);
-}
-
-test("opening an assistant file link dismisses its tooltip over the file tab", async ({
-  page,
-}, testInfo) => {
-  testInfo.setTimeout(120_000);
-  const agent = await seedMockAgentWorkspace({
-    repoPrefix: "tooltip-5811-",
-    title: "Tooltip regression",
-    featureValues: {
-      mockStreamingAssistantResponse: "Read [the guide](./guide.md).",
-      mockStreamingAssistantIntervalMs: 5,
-    },
-  });
-  try {
-    await writeFile(
-      path.join(agent.cwd, "guide.md"),
-      "# Example guide\n\n" + "Plain paragraph.\n\n".repeat(150),
-    );
-    await openAgentRoute(page, agent);
-    await agent.client.sendAgentMessage(agent.agentId, "Show the file link.");
-    await agent.client.waitForFinish(agent.agentId, 30_000);
-
-    await readFileLinkTooltip(page);
-    await leaveFileLink(page);
-    await readFileLinkTooltip(page);
-    await openLinkedFile(page);
-    await returnToAgent(page);
-    await readFileLinkTooltip(page);
-    await switchToFileTab(page);
-    await returnToAgent(page);
-    await readFileLinkTooltip(page);
-    await leaveFileLink(page);
-  } finally {
-    await agent.cleanup();
-  }
-});

packages/app/e2e/browser/changes-pane.spec.ts

@@ -1415,14 +1415,12 @@ test("collapsing and expanding restores the real horizontal scroll offset", asyn
 async function useCodeFont(page: Page, codeFontSize: number): Promise<void> {
   await page.addInitScript(
     ({ settingsKey, fontSize }) => {
-      const settings = JSON.parse(localStorage.getItem(settingsKey) ?? "{}");
-      if (settings.codeFontSize !== undefined) {
+      if (localStorage.getItem(settingsKey)) {
         return;
       }
       localStorage.setItem(
         settingsKey,
         JSON.stringify({
-          ...settings,
           theme: "dark",
           sendBehavior: "interrupt",
           serviceUrlBehavior: "ask",

packages/app/e2e/browser/compact-workspace-sheet.spec.ts

@@ -99,16 +99,6 @@ test("compact opens files and subagents in a sheet, leaving the tabs for agents"
       await expectSubagentRowVisible(page, child.id);
     });
 
-    await test.step("the parent box in a subagent's sheet closes it onto the parent", async () => {
-      await page.getByTestId(`subagents-track-row-${child.id}`).click();
-      const childSheet = sheet(page, child.title);
-      await expectSheetAtSnap(page, child.title);
-      await expect(childSheet.getByTestId("composer-parent-agent-pill")).toHaveCount(0);
-      await childSheet.getByTestId("parent-agent-callout-open").click();
-      await expect(childSheet).toHaveCount(0);
-      await expectOpenTabCount(page, 1);
-    });
-
     await test.step("Open as tab promotes the subagent to a full tab and ends the list", async () => {
       await page.getByTestId(`subagents-track-row-${child.id}`).click();
       await expectSheetAtSnap(page, child.title);

packages/app/e2e/browser/composer-attachments.spec.ts

@@ -13,7 +13,9 @@ import {
   closeImageLightbox,
   pressInterruptShortcut,
   expectComposerDraft,
+  expectComposerDisabled,
   expectComposerEditable,
+  expectAttachButtonDisabled,
   fillComposerDraft,
   dropFileOnComposer,
   sendDraftToQueue,
@@ -266,9 +268,7 @@ test.describe("Composer attachments", () => {
     }
   });
 
-  test("composer and attachments stay available while new workspace agent is being created", async ({
-    page,
-  }) => {
+  test("composer is locked while new workspace agent is being created", async ({ page }) => {
     test.setTimeout(120_000);
     const serverId = getServerId();
 
@@ -298,9 +298,8 @@ test.describe("Composer attachments", () => {
       await agentCreatedDelay.waitForCreateRequest();
       await agentCreatedDelay.waitForDelayedCreatedStatus();
 
-      await expectComposerEditable(page);
-      await attachImageFromMenu(page, TEST_IMAGE);
-      await expectAttachmentPill(page, "composer-image-attachment-pill");
+      await expectComposerDisabled(page);
+      await expectAttachButtonDisabled(page);
 
       agentCreatedDelay.release();
 

packages/app/e2e/browser/composer-recall.spec.ts

@@ -1,81 +0,0 @@
-import { expect, test, type Page } from "../support/fixtures";
-import {
-  composerLocator,
-  expectComposerDraft,
-  expectComposerVisible,
-  submitMessage,
-  typeIntoFocusedComposer,
-} from "../support/helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
-
-function userMessages(page: Page) {
-  return page.getByTestId("user-message");
-}
-
-async function sendAndWaitForMessage(page: Page, text: string, expectedCount: number) {
-  await submitMessage(page, text);
-  await expect(userMessages(page)).toHaveCount(expectedCount, { timeout: 30_000 });
-  await expectComposerDraft(page, "");
-}
-
-async function pressInComposer(page: Page, key: string) {
-  await composerLocator(page).press(key);
-}
-
-test.describe("Composer recall", () => {
-  test("Up and Down walk sent messages from an empty composer", async ({ page }) => {
-    const session = await seedMockAgentWorkspace({
-      repoPrefix: "composer-recall-",
-      title: "Composer recall",
-    });
-    try {
-      await openAgentRoute(page, session);
-      await expectComposerVisible(page);
-      await sendAndWaitForMessage(page, "fix the auth bug", 1);
-      await sendAndWaitForMessage(page, "add tests", 2);
-
-      await pressInComposer(page, "ArrowUp");
-      await expectComposerDraft(page, "add tests");
-      await pressInComposer(page, "ArrowUp");
-      await expectComposerDraft(page, "fix the auth bug");
-      await pressInComposer(page, "ArrowDown");
-      await expectComposerDraft(page, "add tests");
-      await pressInComposer(page, "ArrowDown");
-      await expectComposerDraft(page, "");
-
-      await pressInComposer(page, "ArrowUp");
-      await typeIntoFocusedComposer(page, " for login");
-      await expectComposerDraft(page, "add tests for login");
-      await pressInComposer(page, "ArrowUp");
-      await expectComposerDraft(page, "add tests for login");
-
-      await pressInComposer(page, "Enter");
-      await expect(userMessages(page)).toHaveCount(3, { timeout: 30_000 });
-      await expect(userMessages(page).last()).toContainText("add tests for login");
-    } finally {
-      await session.cleanup();
-    }
-  });
-
-  test("a recalled slash message does not open the command picker", async ({ page }) => {
-    const session = await seedMockAgentWorkspace({
-      repoPrefix: "composer-recall-slash-",
-      title: "Composer recall slash",
-    });
-    try {
-      await openAgentRoute(page, session);
-      await expectComposerVisible(page);
-      await sendAndWaitForMessage(page, "/tdd", 1);
-
-      const popover = page.getByTestId("composer-autocomplete-popover").filter({ visible: true });
-      await pressInComposer(page, "ArrowUp");
-      await expectComposerDraft(page, "/tdd");
-      await expect(popover).toHaveCount(0);
-
-      await typeIntoFocusedComposer(page, "x");
-      await expect(popover.first()).toBeVisible({ timeout: 30_000 });
-    } finally {
-      await session.cleanup();
-    }
-  });
-});

packages/app/e2e/browser/context-window-meter.spec.ts

@@ -42,14 +42,6 @@ const test = base.extend<{ agent: MockAgentSession }>({
   },
 });
 
-// The outer meter owns the accessible usage label; its SVG is decorative.
-async function expectDecorativeContextRing(meter: Locator): Promise<void> {
-  const ring = meter.locator("svg");
-  await expect(ring).toHaveAttribute("aria-hidden", "true");
-  await expect(ring).not.toHaveAttribute("accessibilityElementsHidden");
-  await expect(ring).not.toHaveAttribute("importantForAccessibility");
-}
-
 // Where the progress arc is painted, as its centroid relative to the ring's centre in pixels.
 // Reads the rendered pixels, so any rotation that does not reach the screen counts as none.
 async function progressArcCentroid(meter: Locator): Promise<{ x: number; y: number }> {
@@ -108,7 +100,6 @@ test.describe("context window meter", () => {
       const meter = page.getByTestId("context-window-meter");
       await expect(meter).toHaveAccessibleName(/25%/, { timeout: 30_000 });
 
-      await expectDecorativeContextRing(meter);
       const centroid = await progressArcCentroid(meter);
       expect(centroid.x).toBeGreaterThan(1);
       expect(centroid.y).toBeLessThan(-1);

packages/app/e2e/browser/creation-idempotency.spec.ts

@@ -1,12 +1,4 @@
-import { expectPickerSelected } from "../support/helpers/new-workspace";
-import {
-  hideCreationLifecycle,
-  holdWorkspaceProvisioning,
-  reportUnknownPromptOutcome,
-} from "../support/helpers/creation";
 import type { createCreationScenario } from "../support/helpers/creation";
-import { expectComposerMode, expectComposerModel } from "../support/helpers/agent-profiles";
-import { expectChatHistoryAttachment } from "../support/helpers/assistant-fork";
 import { expect } from "../support/fixtures";
 import { test } from "../support/creation-fixtures";
 
@@ -113,38 +105,26 @@ test("new workspace navigation and optimistic prompt precede agent initializatio
   await creation.expectAgentCount(1);
 });
 
-for (const entry of [
+for (const scenario of [
+  { suffix: "", prepare: async () => {} },
   {
-    name: "an agent draft",
-    open: (creation: Awaited<ReturnType<typeof createCreationScenario>>) =>
-      creation.openAgentDraft(),
-    button: "Send message",
-    expectWorkspace: async (_creation: Awaited<ReturnType<typeof createCreationScenario>>) => {},
-  },
-  {
-    name: "a new workspace",
-    open: (creation: Awaited<ReturnType<typeof createCreationScenario>>) =>
-      creation.openWorkspaceForm("local"),
-    button: "Create",
-    expectWorkspace: (creation: Awaited<ReturnType<typeof createCreationScenario>>) =>
-      creation.expectOneCreatedWorkspace(),
+    suffix: " after remount",
+    prepare: async (creation: Awaited<ReturnType<typeof createCreationScenario>>) =>
+      creation.evictAndReturnToDraft(),
   },
 ]) {
-  test(`a failed agent start in ${entry.name} keeps the draft, its error and its retry`, async ({
+  test(`retrying failed agent initialization preserves its workspace${scenario.suffix}`, async ({
     creation,
     startup,
-    page,
-  }, testInfo) => {
-    const prompt = "Retry this agent after its startup fails.";
-    await entry.open(creation);
-    await creation.submitPrompt(prompt, entry.button);
+  }) => {
+    await creation.openWorkspaceForm("local");
+    await creation.submitPrompt("Retry this workspace and agent together.", "Create");
+    await creation.expectAgentStillStarting();
     await startup.fail();
-    await creation.expectFailedAgentDraft(prompt);
-    await entry.expectWorkspace(creation);
-    await page.screenshot({ path: testInfo.outputPath("failed-agent-draft.png") });
-    await creation.resendFailedDraft();
-    await creation.expectPromptVisible(prompt);
-    await entry.expectWorkspace(creation);
+    await creation.expectStartupFailure();
+    await creation.expectOneCreatedWorkspace();
+    await scenario.prepare(creation);
+    await creation.submitPrompt("Retry this workspace and agent together.");
     await creation.expectAgentCount(1);
   });
 }
@@ -191,356 +171,3 @@ for (const entry of [
     await expect(page.getByText("agent_request_key_conflict", { exact: true })).toHaveCount(0);
   });
 }
-
-for (const isolation of ["local", "worktree"] as const) {
-  test(`a held ${isolation} workspace opens the normal agent panel and queues a follow-up`, async ({
-    creation,
-    page,
-  }, testInfo) => {
-    const prompt = "emit 1 coalesced agent stream updates for the first workspace prompt.";
-    const followUp = "emit 1 coalesced agent stream updates for the queued follow-up.";
-    const draft = "Keep this unsent draft through adoption.";
-    const provisioning = await holdWorkspaceProvisioning(page);
-    await creation.openWorkspaceForm(isolation);
-    await creation.submitPrompt(prompt, "Create");
-    const request = await provisioning.waitForRequest();
-
-    await test.step("the final agent panel paints before any host response", async () => {
-      expect(request.workspaceId).toMatch(/^wks_[a-f0-9]{16}$/);
-      expect(request.agent!.agentId).toMatch(/^[a-f0-9-]{36}$/);
-      await expect(page).toHaveURL(new RegExp(`/workspace/${request.workspaceId}$`));
-      await expect(
-        page.getByTestId(`workspace-tab-agent_${request.agent!.agentId}`).filter({ visible: true }),
-      ).toBeVisible();
-      await creation.expectPromptVisible(prompt);
-      await creation.expectNormalAgentComposer();
-      await expectComposerModel(page, "Ten second stream");
-      await expectComposerMode(page, "Load test");
-    });
-
-    await test.step("a follow-up waits in the queue instead of reaching the agent", async () => {
-      await creation.queueFollowUp(followUp);
-      await creation.typeComposerDraft(draft);
-      expect(provisioning.agentPrompts()).toBe(0);
-      await page.screenshot({ path: testInfo.outputPath("held-normal-panel.png") });
-    });
-
-    await test.step("adoption keeps the same agent, draft and queue order", async () => {
-      provisioning.release();
-      await creation.expectOneCreatedWorkspace();
-      expect(await creation.agentIds()).toEqual([request.agent!.agentId]);
-      await expect(page).toHaveURL(new RegExp(`/workspace/${request.workspaceId}$`));
-      await creation.expectUserMessagesInOrder([prompt, followUp]);
-      expect(provisioning.agentPrompts()).toBe(1);
-      await creation.expectComposerDraft(draft);
-      await creation.expectTimelineSettled();
-      await page.screenshot({ path: testInfo.outputPath("adopted-normal-panel.png") });
-    });
-  });
-}
-
-test("a held workspace on compact shows the final agent prompt and composer", async ({
-  creation,
-  page,
-}, testInfo) => {
-  const provisioning = await holdWorkspaceProvisioning(page);
-  await creation.openWorkspaceForm("worktree");
-  await page.setViewportSize({ width: 390, height: 844 });
-  await creation.submitPrompt("Show my prompt before workspace provisioning.", "Create");
-  const request = await provisioning.waitForRequest();
-  await expect(page).toHaveURL(new RegExp(`/workspace/${request.workspaceId}$`));
-  await creation.expectPromptVisible("Show my prompt before workspace provisioning.");
-  await creation.expectNormalAgentComposer();
-  await creation.expectAgentCannotBeStoppedYet();
-  await page.screenshot({ path: testInfo.outputPath("compact-held.png") });
-  provisioning.release();
-  await creation.expectOneCreatedWorkspace();
-  expect(await creation.agentIds()).toEqual([request.agent!.agentId]);
-  await creation.expectInitialPromptOnce("Show my prompt before workspace provisioning.");
-});
-
-test("workspace creation recovers a lost response without replaying the first prompt", async ({
-  creation,
-  workspacePromptRetry,
-}) => {
-  await creation.openWorkspaceForm("worktree");
-  workspacePromptRetry.holdAcknowledgement();
-  await creation.submitPrompt("Recover this workspace prompt once.", "Create");
-  await workspacePromptRetry.waitForDeliveredPrompt();
-  await creation.expectPromptVisible("Recover this workspace prompt once.");
-  await creation.evictAndReturnToDraft();
-  await workspacePromptRetry.disconnectAndReconnect();
-  await workspacePromptRetry.expectSameAgentAndMessage();
-  await creation.expectOneCreatedWorkspace();
-  await creation.expectAgentCount(1);
-});
-
-test("a pending workspace survives leaving and remounting before any daemon event", async ({
-  creation,
-  page,
-}) => {
-  const provisioning = await holdWorkspaceProvisioning(page);
-  await creation.openWorkspaceForm("worktree");
-  await creation.submitPrompt("Keep this pending workspace across remount.", "Create");
-  await provisioning.waitForRequest();
-  await creation.expectPromptVisible("Keep this pending workspace across remount.");
-  await creation.evictAndReturnToDraft();
-  await creation.expectPromptVisible("Keep this pending workspace across remount.");
-  provisioning.release();
-  await creation.expectOneCreatedWorkspace();
-  await creation.expectAgentCount(1);
-});
-
-test("a failed workspace returns to New workspace with the prompt and its error", async ({
-  creation,
-  provisioningFailure,
-  page,
-}, testInfo) => {
-  const prompt = "Keep my prompt when the workspace fails.";
-  await provisioningFailure.arm();
-  await creation.openWorkspaceForm("local");
-  await creation.submitRepeatedly("Create", prompt);
-  await creation.expectReturnedToNewWorkspace(prompt, "Provisioning outcome is uncertain for test");
-  await page.screenshot({ path: testInfo.outputPath("failed-workspace-returned.png") });
-});
-
-test("a failed workspace preserves its non-default branch through resubmission", async ({
-  creation,
-  provisioningFailure,
-  page,
-}) => {
-  const prompt = "Keep the selected worktree base when provisioning fails.";
-  const provisioning = await holdWorkspaceProvisioning(page);
-  await creation.openWorkspaceForm("worktree");
-  await creation.selectWorktreeBranch("recovery-base");
-  await provisioningFailure.arm();
-  await creation.submitPrompt(prompt, "Create");
-  const first = await provisioning.waitForRequest();
-  expect(first.source).toMatchObject({
-    kind: "worktree",
-    action: "branch-off",
-    refName: "refs/heads/recovery-base",
-  });
-  provisioning.release();
-  await creation.expectReturnedToNewWorkspace(prompt, "Provisioning outcome is uncertain for test");
-
-  await expectPickerSelected(page, "recovery-base");
-  await creation.resubmitWorkspace();
-  const second = await provisioning.waitForRequests(2);
-  expect(second.source).toMatchObject({
-    kind: "worktree",
-    action: "branch-off",
-    refName: "refs/heads/recovery-base",
-  });
-  provisioning.release();
-  await creation.expectOneCreatedWorkspace();
-  await creation.expectAgentCount(1);
-});
-
-test("a failed workspace keeps its queued follow-up and unsent text through resubmission", async ({
-  creation,
-  provisioningFailure,
-  page,
-}, testInfo) => {
-  const prompt = "emit 1 coalesced agent stream updates for the resubmitted workspace.";
-  const followUp = "emit 1 coalesced agent stream updates for the resubmitted follow-up.";
-  const draft = "Keep this unsent text through the failed workspace.";
-  await provisioningFailure.arm();
-  const provisioning = await holdWorkspaceProvisioning(page);
-  await creation.openWorkspaceForm("local");
-  await creation.submitPrompt(prompt, "Create");
-  await provisioning.waitForRequest();
-  await creation.queueFollowUp(followUp);
-  await creation.typeComposerDraft(draft);
-  provisioning.release();
-
-  await test.step("New workspace shows the prompt, its error and the queued follow-up", async () => {
-    await creation.expectReturnedToNewWorkspace(
-      prompt,
-      "Provisioning outcome is uncertain for test",
-    );
-    await creation.expectQueuedFollowUp(followUp);
-    await page.screenshot({ path: testInfo.outputPath("failed-workspace-follow-up.png") });
-  });
-
-  await test.step("resubmitting delivers the prompt, then the follow-up, once", async () => {
-    await creation.resubmitWorkspace();
-    await provisioning.waitForRequests(2);
-    provisioning.release();
-    await creation.expectOneCreatedWorkspace();
-    await creation.expectAgentCount(1);
-    await creation.expectUserMessagesInOrder([prompt, followUp]);
-    await creation.expectComposerDraft(draft);
-    await page.screenshot({ path: testInfo.outputPath("resubmitted-workspace-follow-up.png") });
-  });
-});
-
-test("a failed agent start keeps its queued follow-up and unsent text through retry", async ({
-  creation,
-  startup,
-  page,
-}, testInfo) => {
-  const prompt = "emit 1 coalesced agent stream updates for the retried agent.";
-  const followUp = "emit 1 coalesced agent stream updates for the retried follow-up.";
-  const draft = "Keep this unsent text through the failed agent start.";
-  await creation.openWorkspaceForm("local");
-  await creation.submitPrompt(prompt, "Create");
-  await creation.queueFollowUp(followUp);
-  await creation.typeComposerDraft(draft);
-  await startup.fail();
-
-  await test.step("the agent draft shows the prompt, its error and the queued follow-up", async () => {
-    await creation.expectFailedAgentDraft(prompt);
-    await creation.expectQueuedFollowUp(followUp);
-    await page.screenshot({ path: testInfo.outputPath("failed-agent-follow-up.png") });
-  });
-
-  await test.step("retrying delivers the prompt, then the follow-up, once", async () => {
-    await creation.resendFailedDraft();
-    await creation.expectOneCreatedWorkspace();
-    await creation.expectAgentCount(1);
-    await creation.expectUserMessagesInOrder([prompt, followUp]);
-    await creation.expectComposerDraft(draft);
-    await page.screenshot({ path: testInfo.outputPath("retried-agent-follow-up.png") });
-  });
-});
-
-test("a forked worktree agent that fails to start keeps its setup and context through retry", async ({
-  creation,
-  lateStartup,
-  page,
-}, testInfo) => {
-  const prompt = "Keep this fork's setup, image and history through the retry.";
-  await creation.openNestedAgentFork("worktree");
-  await creation.attachImage();
-  const startup = await lateStartup.arm();
-  await creation.submitPrompt(prompt, "Create");
-  await startup.fail();
-
-  await test.step("the agent draft keeps the fork's configuration and context", async () => {
-    await creation.expectFailedAgentDraft(prompt);
-    await expectComposerModel(page, "e2e-fast-stream");
-    await expectComposerMode(page, "Load test");
-    await creation.expectImageVisible();
-    await expectChatHistoryAttachment(page);
-    await page.screenshot({ path: testInfo.outputPath("failed-fork-draft.png") });
-  });
-
-  // An agent created in an existing workspace starts at the workspace root: the host ignores
-  // config.cwd when the request names a workspace, so the nested cwd is not asserted here.
-  await test.step("retrying creates one agent in the worktree with that configuration and context", async () => {
-    await creation.resendFailedDraft();
-    await creation.expectOneCreatedWorkspace();
-    await creation.expectAgentCount(1);
-    await creation.expectAgentConfig({ model: "e2e-fast-stream", modeId: "load-test" });
-    await creation.expectImageVisible();
-    await expect(
-      page
-        .getByTestId("user-message")
-        .filter({ hasText: "Chat history" })
-        .filter({ visible: true }),
-    ).toHaveCount(1);
-    await page.screenshot({ path: testInfo.outputPath("retried-fork-agent.png") });
-  });
-});
-
-test("a forked worktree whose workspace fails keeps its context through resubmission", async ({
-  creation,
-  provisioningFailure,
-  page,
-}, testInfo) => {
-  const prompt = "Keep this fork's history when its workspace fails.";
-  await creation.openNestedAgentFork("worktree");
-  await provisioningFailure.arm();
-  await creation.submitPrompt(prompt, "Create");
-
-  await test.step("New workspace shows the prompt, its error and the fork's context", async () => {
-    await creation.expectReturnedToNewWorkspace(
-      prompt,
-      "Provisioning outcome is uncertain for test",
-    );
-    await expectChatHistoryAttachment(page);
-    await page.screenshot({ path: testInfo.outputPath("failed-fork-workspace.png") });
-  });
-
-  await test.step("resubmitting creates one agent with that context", async () => {
-    await creation.resubmitWorkspace();
-    await creation.expectOneCreatedWorkspace();
-    await creation.expectAgentCount(1);
-    await expect(
-      page
-        .getByTestId("user-message")
-        .filter({ hasText: "Chat history" })
-        .filter({ visible: true }),
-    ).toHaveCount(1);
-    await page.screenshot({ path: testInfo.outputPath("resubmitted-fork-workspace.png") });
-  });
-});
-
-test("an unsupported host keeps the draft and asks for an update before creating anything", async ({
-  creation,
-  page,
-}) => {
-  const host = await hideCreationLifecycle(page);
-  await creation.openWorkspaceForm("local");
-  await creation.submitPrompt("Retain my unsupported host draft.", "Create");
-  await expect(
-    page
-      .getByText("Update this host to create a workspace with an agent.", { exact: true })
-      .first(),
-  ).toBeVisible();
-  await expect(page).toHaveURL(/\/new\?/);
-  host.expectNoCreationRequest();
-});
-
-for (const isolation of ["local", "worktree"] as const) {
-  test(`a fork keeps its image and nested cwd in the optimistic and real ${isolation} agent`, async ({
-    creation,
-    page,
-  }, testInfo) => {
-    const provisioning = await holdWorkspaceProvisioning(page);
-    const cwd = await creation.openNestedAgentFork(isolation);
-    await creation.attachImage();
-    await creation.submitPrompt("Keep this image and nested cwd.", "Create");
-    const request = await provisioning.waitForRequest();
-    expect(request.agent!.config?.cwd).toBe(cwd);
-    expect(request.agent!.images).toHaveLength(1);
-    await creation.expectPromptVisible("Keep this image and nested cwd.");
-    await creation.expectImageVisible();
-    await page.screenshot({ path: testInfo.outputPath("pending-image-nested-cwd.png") });
-    provisioning.release();
-    await creation.expectOneCreatedWorkspace();
-    await creation.expectNestedAgentCwd();
-    await creation.expectImageVisible();
-    await creation.expectInitialPromptOnce("Keep this image and nested cwd.");
-  });
-}
-
-test("closing the pending agent tab leaves host creation running", async ({ creation, page }) => {
-  const provisioning = await holdWorkspaceProvisioning(page);
-  await creation.openWorkspaceForm("local");
-  await creation.submitPrompt("Finish creation after I close the tab.", "Create");
-  const request = await provisioning.waitForRequest();
-  await creation.expectPromptVisible("Finish creation after I close the tab.");
-  await creation.closePendingAgent(request.agent!.agentId!);
-  provisioning.release();
-  await creation.expectOneCreatedWorkspace();
-  await creation.expectAgentCount(1);
-  await creation.expectInitialPromptOnce("Finish creation after I close the tab.");
-});
-
-test("an uncertain prompt receipt keeps the created agent tab and its timeline", async ({
-  creation,
-  page,
-}) => {
-  await reportUnknownPromptOutcome(page);
-  await creation.openWorkspaceForm("local");
-  const prompt = "emit 1 coalesced agent stream updates for an uncertain first prompt.";
-  await creation.submitPrompt(prompt, "Create");
-  await creation.expectAssistantReply();
-  await creation.expectAgentNotWorking();
-  await creation.expectOneCreatedWorkspace();
-  await creation.expectInitialPromptOnce(prompt);
-  await creation.expectNoCreationRecovery();
-  await creation.expectAgentCount(1);
-});

packages/app/e2e/browser/creation-old-daemon.spec.ts

@@ -92,7 +92,7 @@ for (const version of ["0.2.5", "0.7.2", "0.8.0"]) {
       });
     }
 
-    test("current app requires a host update for chat workspaces and preserves existing-workspace agent creation", async ({
+    test("current app creates a workspace, navigates before agent startup, and creates another agent on an old daemon", async ({
       page,
       project,
       client,
@@ -104,34 +104,49 @@ for (const version of ["0.2.5", "0.7.2", "0.8.0"]) {
       const prompt = "Create this workspace: emit 1 coalesced agent stream updates";
       await fillComposerDraft(page, prompt);
       await pressSubmitBeforeTheNextRender(page, "Create");
+      await gate.waitForRequest();
+      await expect(page).toHaveURL(/\/workspace\//);
       await expect(
-        page
-          .getByText("Update this host to create a workspace with an agent.", { exact: true })
-          .first(),
+        page.getByTestId("user-message").filter({ visible: true }).filter({ hasText: prompt }),
       ).toBeVisible();
-      await expect(page).toHaveURL(/\/new\?/);
       expect((await client.fetchAgents()).entries).toHaveLength(0);
-      expect(
-        (await client.fetchWorkspaces()).entries.filter(
-          (workspace) => workspace.projectId === project.projectId,
-        ),
-      ).toHaveLength(1);
-      await page.goto(buildHostWorkspaceRoute(daemon.serverId, project.workspaceId));
+      const workspaces = (await client.fetchWorkspaces()).entries.filter(
+        (workspace) =>
+          workspace.projectId === project.projectId && workspace.id !== project.workspaceId,
+      );
+      expect(workspaces).toHaveLength(1);
+      gate.release();
+      await gate.waitForCreated();
+      await expect.poll(async () => (await client.fetchAgents()).entries.length).toBe(1);
+      const first = (await client.fetchAgents()).entries[0]!.agent;
+      await client.waitForFinish(first.id, 20_000);
+      await expectPromptOnce(client, first.id, prompt);
+      await expect(
+        page.getByTestId(`workspace-tab-agent_${first.id}`).filter({ visible: true }),
+      ).toHaveText(prompt);
+
       await createAgentTabFromMenu(page);
       const secondPrompt = "Create another agent: emit 1 coalesced agent stream updates";
       await fillComposerDraft(page, secondPrompt);
       await pressSubmitBeforeTheNextRender(page, "Send message");
-      await gate.waitForRequest();
-      gate.release();
       await gate.waitForCreated();
-      await expect.poll(async () => (await client.fetchAgents()).entries.length).toBe(1);
-      const agent = (await client.fetchAgents()).entries[0]!.agent;
-      expect(agent.workspaceId).toBe(project.workspaceId);
-      await client.waitForFinish(agent.id, 20_000);
-      await expectPromptOnce(client, agent.id, secondPrompt);
+      await expect.poll(async () => (await client.fetchAgents()).entries.length).toBe(2);
+      const second = (await client.fetchAgents()).entries.find(
+        ({ agent }) => agent.id !== first.id,
+      )!.agent;
+      expect(second.workspaceId).toBe(first.workspaceId);
+      await client.waitForFinish(second.id, 20_000);
+      await expectPromptOnce(client, second.id, secondPrompt);
       await expect(
-        page.getByTestId(`workspace-tab-agent_${agent.id}`).filter({ visible: true }),
+        page.getByTestId(`workspace-tab-agent_${second.id}`).filter({ visible: true }),
       ).toHaveText(secondPrompt);
+      await expect(
+        page
+          .getByTestId("user-message")
+          .filter({ visible: true })
+          .filter({ hasText: secondPrompt }),
+      ).toBeVisible();
+      await page.screenshot({ path: test.info().outputPath("old-daemon-creation.png") });
     });
 
     async function expectPromptOnce(client: DaemonClient, agentId: string, text: string) {

packages/app/e2e/browser/import-session-flow.spec.ts

@@ -229,143 +229,6 @@ test("captures the desktop import sheet and command-center entry", async ({ page
   });
 });
 
-test("large import lists keep mounted rows bounded and remain scrollable", async ({
-  page,
-}, testInfo) => {
-  const fixtureDirectory = path.join(claudeConfigDirectory, "projects", "virtualization-fixture");
-  await mkdir(fixtureDirectory, { recursive: true });
-  try {
-    const newest = Date.now();
-    for (let index = 0; index < 200; index += 1) {
-      const id = `virtualized-${String(index).padStart(3, "0")}`;
-      const file = path.join(fixtureDirectory, `${id}.jsonl`);
-      await writeFile(
-        file,
-        `${JSON.stringify({
-          type: "user",
-          sessionId: id,
-          cwd: index % 2 === 0 ? scenario.projectRoot : scenario.worktreeDirectory,
-          message: {
-            role: "user",
-            content: `Virtualized session ${index}${index % 3 === 0 ? " with a longer preview that wraps onto a second line in a compact sheet" : ""}`,
-          },
-        })}\n`,
-      );
-      const timestamp = new Date(newest - index * 10);
-      await utimes(file, timestamp, timestamp);
-    }
-    for (const width of [1280, 390]) {
-      const flow = new ImportSessionFlow(page);
-      await flow.openWorkspace(scenario.project.workspaceId, { width, height: 844 });
-      await flow.openGlobally();
-      const rows = page.locator('[data-testid^="import-session-session-"]');
-      const scrollToEnd = async (end = true) => {
-        // Scroll the body's real overflow element. Virtual rows need not exist yet.
-        await rows.first().evaluate((row, atEnd) => {
-          let element = row.parentElement;
-          while (element && !["auto", "scroll"].includes(getComputedStyle(element).overflowY)) {
-            element = element.parentElement;
-          }
-          if (!element) throw new Error("Import list has no scroll owner");
-          element.scrollTop = atEnd ? element.scrollHeight : 0;
-          element.dispatchEvent(new Event("scroll"));
-        }, end);
-      };
-      for (let pageIndex = 0; pageIndex < 3; pageIndex += 1) {
-        const loadMore = page.getByTestId("import-session-load-more");
-        await expect(async () => {
-          await scrollToEnd();
-          await expect(loadMore).toBeInViewport({ timeout: 500 });
-        }).toPass({ timeout: 10_000 });
-        await loadMore.click();
-        if (pageIndex < 2) await expect(loadMore).toBeEnabled();
-      }
-      await expect(async () => {
-        await scrollToEnd();
-        await expect(
-          page.getByTestId("import-session-session-claude-virtualized-199"),
-        ).toBeInViewport({ timeout: 500 });
-      }).toPass({ timeout: 10_000 });
-      await expect.poll(() => rows.count()).toBeLessThan(100);
-      await page.screenshot({ path: testInfo.outputPath(`virtualized-${width}.png`) });
-      if (width === 1280) {
-        const row = (index: number) =>
-          page.getByTestId(
-            `import-session-session-claude-virtualized-${String(index).padStart(3, "0")}`,
-          );
-        await expect(async () => {
-          await scrollToEnd(false);
-          await expect(row(0)).toBeInViewport({ timeout: 500 });
-        }).toPass({ timeout: 10_000 });
-        await row(0).focus();
-        for (let index = 1; index <= 30; index += 1) {
-          await page.keyboard.press("Tab");
-          await expect(row(index)).toBeFocused();
-        }
-        for (let index = 29; index >= 15; index -= 1) {
-          await page.keyboard.press("Shift+Tab");
-          await expect(row(index)).toBeFocused();
-        }
-        const list = page.getByTestId("import-session-list");
-        const scrollWithKey = async (event: "scroll" | "scrollend", key: string) => {
-          const listener = await list.evaluateHandle((node, eventName) => {
-            const promise = new Promise<void>((resolve) => {
-              node.addEventListener(eventName, () => resolve(), { once: true });
-            });
-            return { promise };
-          }, event);
-          try {
-            await page.keyboard.press(key);
-            await listener.evaluate((value) => value.promise);
-          } finally {
-            await listener.dispose();
-          }
-        };
-        const beforePageDown = await list.evaluate((node) => node.scrollTop);
-        await scrollWithKey("scroll", "PageDown");
-        await expect
-          .poll(() => list.evaluate((node) => node.scrollTop))
-          .toBeGreaterThan(beforePageDown);
-        await expect(row(15)).toBeFocused();
-        await page.keyboard.press("End");
-        await expect(row(15)).toBeFocused();
-        await expect(row(199)).toBeInViewport();
-        // Home must remain at the first row after the native page scroll ends.
-        await scrollWithKey("scrollend", "Home");
-        await expect(row(0)).toBeInViewport();
-        await expect(row(15)).toBeFocused();
-
-        await page.keyboard.press("End");
-        await expect(row(199)).toBeInViewport();
-        await row(199).focus();
-        await scrollWithKey("scroll", "PageUp");
-        await page.keyboard.press("Home");
-        await expect(row(0)).toBeInViewport();
-        await scrollWithKey("scrollend", "End");
-        await expect(row(199)).toBeInViewport();
-        await expect(row(199)).toBeFocused();
-        await testInfo.attach("keyboard-scroll-owner", {
-          body: JSON.stringify(
-            await list.evaluate((node) => ({
-              focusedRow: document.activeElement?.getAttribute("data-testid"),
-              scrollTop: node.scrollTop,
-              scrollHeight: node.scrollHeight,
-              clientHeight: node.clientHeight,
-            })),
-          ),
-          contentType: "application/json",
-        });
-        await page.screenshot({ path: testInfo.outputPath("virtualized-keyboard-end.png") });
-        await page.keyboard.press("Home");
-        await expect(row(0)).toBeInViewport();
-      }
-      await flow.close();
-    }
-  } finally {
-    await rm(fixtureDirectory, { recursive: true, force: true });
-  }
-});
-
 async function capture(page: Page, testInfo: TestInfo, name: string): Promise<void> {
   const outputPath = testInfo.outputPath(name);
   await page.screenshot({ path: outputPath, fullPage: true });

packages/app/e2e/browser/new-workspace-composer-draft.spec.ts

@@ -1,8 +1,7 @@
-import { observeCreationRequests } from "../support/helpers/creation";
 import {
   composerLocator,
   enterComposerFullscreen,
-  fillComposerDraft,
+  exitComposerFullscreen,
   resizeComposerViewport,
 } from "../support/helpers/composer";
 import { expect, test } from "../support/fixtures";
@@ -96,7 +95,6 @@ test.describe("New workspace composer draft", () => {
 
   test("does not restore a submitted draft after deferred publication", async ({ page }) => {
     const project = await seedWorkspace({ repoPrefix: "new-workspace-submitted-draft-" });
-    const requests = await observeCreationRequests(page);
 
     try {
       await gotoAppShell(page);
@@ -136,9 +134,6 @@ test.describe("New workspace composer draft", () => {
       }, DRAFT);
 
       await page.waitForURL((url) => url.pathname.includes("/workspace/"), { timeout: 30_000 });
-      // Navigation now precedes creation; wait for success before checking consumed input.
-      await expect.poll(requests.workspaceRequests).toBe(1);
-      await requests.settled();
       await openGlobalNewWorkspaceComposer(page);
       await expectNewWorkspaceDraft(page, "");
     } finally {
@@ -147,11 +142,10 @@ test.describe("New workspace composer draft", () => {
   });
 });
 
-test("fullscreen creation opens the inline agent composer and keeps follow-up editing available", async ({
+test("fullscreen creation returns inline and keeps submission locked when reopened", async ({
   page,
 }) => {
   const project = await seedWorkspace({ repoPrefix: "fullscreen-submit-pending-" });
-  const followUpDraft = `${DRAFT}\nKeep this follow-up draft.`;
   const delay = await delayBrowserWorkspaceCreatedResponse(page);
   try {
     await gotoAppShell(page);
@@ -163,23 +157,25 @@ test("fullscreen creation opens the inline agent composer and keeps follow-up ed
     await page.getByRole("button", { name: "Create", exact: true }).click();
     await delay.waitForCreateRequest();
 
-    await test.step("submission opens the normal agent panel inline", async () => {
-      await expect(page).toHaveURL(/\/workspace\//);
+    await test.step("submission returns inline with the original draft and spinner", async () => {
       await expect(page.getByTestId("composer-fullscreen")).toHaveCount(0);
-      await expect(page.getByTestId("user-message").filter({ visible: true })).toContainText(DRAFT);
-      await expect(composerLocator(page)).toHaveValue("");
-      await expect(composerLocator(page)).toBeEditable();
+      await expect(composerLocator(page)).toHaveValue(DRAFT);
+      await expect(composerLocator(page)).not.toBeEditable();
+      await expect(page.getByRole("button", { name: "Create", exact: true })).toBeDisabled();
+      await expect(page.getByRole("progressbar")).toBeVisible();
     });
-    await test.step("fullscreen can reopen to edit a follow-up while creation is pending", async () => {
-      await fillComposerDraft(page, followUpDraft);
+    await test.step("fullscreen can reopen while pending without unlocking or duplicating submission", async () => {
       await enterComposerFullscreen(page);
       await expect(page.getByTestId("composer-fullscreen")).toBeVisible();
-      await expect(composerLocator(page)).toHaveValue(followUpDraft);
-      await expect(composerLocator(page)).toBeEditable();
+      await expect(composerLocator(page)).toHaveValue(DRAFT);
+      await expect(composerLocator(page)).not.toBeEditable();
+      await expect(page.getByRole("button", { name: "Create", exact: true })).toBeDisabled();
+      await expect(page.getByRole("progressbar")).toBeVisible();
+      await exitComposerFullscreen(page);
     });
     delay.release();
     await page.waitForURL((url) => url.pathname.includes("/workspace/"));
-    await expect(composerLocator(page)).toHaveValue(followUpDraft);
+    await expect(composerLocator(page)).toHaveValue("");
     await expect(composerLocator(page)).toBeEditable();
     expect(delay.agentRequests).toHaveLength(1);
   } finally {

packages/app/e2e/browser/new-workspace-dictation-submit.spec.ts

@@ -192,16 +192,11 @@ test.describe("New Workspace dictation submit", () => {
       await harness.waitForCreateRequest();
 
       const composer = page.getByRole("textbox", { name: "Message agent..." });
-      await expect(page).toHaveURL(/\/workspace\//);
-      await expect(page.getByTestId("user-message").filter({ visible: true })).toContainText(
-        TRANSCRIPT,
-      );
-      await expect(composer).toHaveValue("");
-      await expect(composer).toBeEditable();
+      await expect(composer).toHaveValue(TRANSCRIPT);
+      await expect(composer).not.toBeEditable();
 
       harness.failWorkspaceCreation();
 
-      await expect(page).toHaveURL(/\/new\?/);
       await expect(composer).toBeEditable();
       await expect(composer).toHaveValue(TRANSCRIPT);
       await expect(page.getByText(CREATE_FAILURE).first()).toBeVisible();

packages/app/e2e/browser/new-workspace.spec.ts

@@ -504,7 +504,7 @@ test.describe("New workspace flow", () => {
     }
   });
 
-  test("opens the final agent tab before agent creation resolves", async ({ page }) => {
+  test("redirects to the optimistic draft tab before agent creation resolves", async ({ page }) => {
     const serverId = getServerId();
 
     const tempRepo = await createTempGitRepo("new-workspace-optimistic-");
@@ -568,10 +568,10 @@ test.describe("New workspace flow", () => {
       await expect(activeWorkspaceDeckEntry).toBeVisible({ timeout: 30_000 });
 
       const draftTabs = activeWorkspaceDeckEntry.locator('[data-testid^="workspace-tab-draft_"]');
-      await expect(draftTabs).toHaveCount(0);
+      await expect(draftTabs).toHaveCount(1, { timeout: 30_000 });
       await expect(
         activeWorkspaceDeckEntry.locator('[data-testid^="workspace-tab-agent_"]'),
-      ).toHaveCount(1, { timeout: 30_000 });
+      ).toHaveCount(0);
 
       agentCreatedDelay.release();
       await expect(

packages/app/e2e/browser/provider-subagents.real.spec.ts

@@ -136,8 +136,7 @@ test.describe("real provider subagent timelines", () => {
           panel.getByText("Start chatting with this agent...", { exact: true }),
         ).toHaveCount(0);
 
-        // A provider subagent has no composer; its callout is the way back to the parent.
-        await page.getByTestId("parent-agent-callout-open").click();
+        await page.getByTestId(`workspace-tab-agent_${handle.agentId}`).first().click();
         await expect(
           page.getByTestId("assistant-message").filter({ hasText: "ROOT_DONE" }).last(),
         ).toBeVisible({ timeout: 60_000 });

packages/app/e2e/browser/question-prompt-pagination.spec.ts

@@ -1,6 +1,6 @@
 import { fork } from "node:child_process";
 import path from "node:path";
-import { expect, type BrowserContext, type Locator, type Page } from "@playwright/test";
+import { expect } from "@playwright/test";
 import { z } from "zod";
 import { test } from "../support/fixtures";
 import { expectVisibleAgentSurfacesIdle } from "../support/helpers/agent-stream";
@@ -34,218 +34,8 @@ const ROLLOUT_QUESTION = "Which rollout should we use?";
 const SUCCESS_QUESTION = "What success criteria should we use?";
 const REPO_URL_QUESTION = "What is the GitHub private repo URL to push to?";
 const COMMIT_MESSAGE_QUESTION = "What should the first commit message be?";
-const LINKED_QUESTION = "Sign in at https://example.com/login, then follow the setup guide. Done?";
-
-function selectedText(page: Page) {
-  return page.evaluate(() => window.getSelection()?.toString().trim());
-}
-
-const CHECKS_QUESTION = "Which checks should run?";
-const DONE_DESCRIPTION = "Logs are at https://example.com/logs if sign-in fails.";
-const LINT_DESCRIPTION = "Rules: https://example.com/lint";
-
-async function openLinkedQuestions(page: Page, context: BrowserContext) {
-  await context.route("https://example.com/**", (route) =>
-    route.fulfill({ status: 200, body: "ok" }),
-  );
-  const session = await seedMockAgentWorkspace({
-    repoPrefix: "question-option-links-",
-    title: "Question option links e2e",
-    initialPrompt: "Emit synthetic questions with links.",
-  });
-  await openAgentRoute(page, session);
-  await waitForQuestionPrompt(page, 120_000);
-  return { session, card: page.getByTestId("question-form-card").first() };
-}
-
-async function dragAcross(page: Page, target: Locator) {
-  const bounds = await target.boundingBox();
-  if (!bounds) throw new Error("Text is not visible");
-  const y = bounds.y + bounds.height / 2;
-  await page.mouse.move(bounds.x + 1, y);
-  await page.mouse.down();
-  await page.mouse.move(bounds.x + bounds.width - 1, y, { steps: 12 });
-  await page.mouse.up();
-}
-
-async function clickLinkAndExpectPage(context: BrowserContext, link: Locator, url: string) {
-  const popup = context.waitForEvent("page");
-  await link.click();
-  await expect.poll(async () => (await popup).url()).toBe(url);
-}
-
-async function expectChecked(option: Locator, checked: boolean) {
-  await expect(option).toHaveAttribute("aria-checked", String(checked));
-}
-
-test.describe("Question option text", () => {
-  test("links in an option label or description open without answering", async ({
-    page,
-    context,
-  }) => {
-    test.setTimeout(180_000);
-    const { session, card } = await openLinkedQuestions(page, context);
-    try {
-      const done = card.getByRole("radio", { name: "Done" });
-      const notYet = card.getByRole("radio", { name: "Not yet" });
-
-      await clickLinkAndExpectPage(
-        context,
-        notYet.getByRole("link", { name: "status" }),
-        "https://example.com/status",
-      );
-      await clickLinkAndExpectPage(
-        context,
-        done.getByRole("link", { name: "https://example.com/logs" }),
-        "https://example.com/logs",
-      );
-
-      await expectCurrentQuestion(page, { index: 1, total: 2, question: LINKED_QUESTION });
-      await expectChecked(done, false);
-      await expectChecked(notYet, false);
-    } finally {
-      await session.cleanup();
-    }
-  });
-
-  test("selecting description text never answers, and the label still does", async ({
-    page,
-    context,
-  }) => {
-    test.setTimeout(180_000);
-    const { session, card } = await openLinkedQuestions(page, context);
-    try {
-      const done = card.getByRole("radio", { name: "Done" });
-      const description = done.getByTestId("question-form-option-description");
-
-      await dragAcross(page, description);
-      await expect.poll(() => selectedText(page)).toBe(DONE_DESCRIPTION);
-      await expectChecked(done, false);
-
-      await description.getByText("Logs are at", { exact: false }).dblclick({
-        position: { x: 4, y: 4 },
-      });
-      await expect.poll(() => selectedText(page)).toBe("Logs");
-      await expectCurrentQuestion(page, { index: 1, total: 2, question: LINKED_QUESTION });
-      await expectChecked(done, false);
-
-      await done.getByText("Done", { exact: true }).click();
-      await expectCurrentQuestion(page, { index: 2, total: 2, question: CHECKS_QUESTION });
-      await openQuestion(page, { index: 1, total: 2 });
-      await expectChecked(done, true);
-    } finally {
-      await session.cleanup();
-    }
-  });
-
-  test("double-clicking a single-select label answers once", async ({ page, context }) => {
-    test.setTimeout(180_000);
-    const { session, card } = await openLinkedQuestions(page, context);
-    try {
-      await card.getByRole("radio", { name: "Done" }).getByText("Done", { exact: true }).dblclick();
-
-      await expectCurrentQuestion(page, { index: 2, total: 2, question: CHECKS_QUESTION });
-      await expectChecked(card.getByRole("checkbox", { name: "Lint" }), false);
-      await expectChecked(card.getByRole("checkbox", { name: "Typecheck" }), false);
-      await openQuestion(page, { index: 1, total: 2 });
-      await expectChecked(card.getByRole("radio", { name: "Done" }), true);
-    } finally {
-      await session.cleanup();
-    }
-  });
-
-  test("multi-select description links and selection leave the option unchanged", async ({
-    page,
-    context,
-  }) => {
-    test.setTimeout(180_000);
-    const { session, card } = await openLinkedQuestions(page, context);
-    try {
-      await card.getByRole("radio", { name: "Done" }).getByText("Done", { exact: true }).click();
-      await expectCurrentQuestion(page, { index: 2, total: 2, question: CHECKS_QUESTION });
-
-      const lint = card.getByRole("checkbox", { name: "Lint" });
-      const typecheck = card.getByRole("checkbox", { name: "Typecheck" });
-      const description = lint.getByTestId("question-form-option-description");
-
-      await clickLinkAndExpectPage(
-        context,
-        description.getByRole("link", { name: "https://example.com/lint" }),
-        "https://example.com/lint",
-      );
-      await expectChecked(lint, false);
-
-      await dragAcross(page, description);
-      await expect.poll(() => selectedText(page)).toBe(LINT_DESCRIPTION);
-      await expectChecked(lint, false);
-
-      await description.getByText("Rules:", { exact: false }).dblclick({
-        position: { x: 4, y: 4 },
-      });
-      await expect.poll(() => selectedText(page)).toBe("Rules");
-      await expectChecked(lint, false);
-
-      await typecheck.getByText("Typecheck", { exact: true }).dblclick();
-      await expectChecked(typecheck, true);
-      await lint.getByText("Lint", { exact: true }).click();
-      await expectChecked(lint, true);
-    } finally {
-      await session.cleanup();
-    }
-  });
-});
 
 test.describe("Question prompt pagination", () => {
-  test("question links open without answering, and the question text is selectable", async ({
-    page,
-    context,
-  }) => {
-    test.setTimeout(180_000);
-    await context.route("https://example.com/**", (route) =>
-      route.fulfill({ status: 200, body: "ok" }),
-    );
-
-    const session = await seedMockAgentWorkspace({
-      repoPrefix: "question-links-",
-      title: "Question links e2e",
-      initialPrompt: "Emit synthetic questions with links.",
-    });
-
-    try {
-      await openAgentRoute(page, session);
-      await waitForQuestionPrompt(page, 120_000);
-
-      const card = page.getByTestId("question-form-card").first();
-      const question = card.getByTestId("question-form-current-question");
-      await expect(question).toHaveText(LINKED_QUESTION);
-      await expect(question.getByRole("link", { name: "https://example.com/login" })).toBeVisible();
-      await expect(question.getByRole("link", { name: "the setup guide" })).toBeVisible();
-
-      const bounds = await question.boundingBox();
-      if (!bounds) throw new Error("Question text is not visible");
-      const y = bounds.y + bounds.height / 2;
-      await page.mouse.move(bounds.x + 1, y);
-      await page.mouse.down();
-      await page.mouse.move(bounds.x + bounds.width - 1, y, { steps: 12 });
-      await page.mouse.up();
-      await expect.poll(() => selectedText(page)).toBe(LINKED_QUESTION);
-
-      const popup = context.waitForEvent("page");
-      await question.getByRole("link", { name: "the setup guide" }).click();
-      await expect.poll(async () => (await popup).url()).toBe("https://example.com/setup");
-
-      await expect(page.getByTestId("question-form-card")).toHaveCount(1);
-      for (const option of ["Done", "Not yet"]) {
-        await expect(card.getByRole("radio", { name: option })).toHaveAttribute(
-          "aria-checked",
-          "false",
-        );
-      }
-    } finally {
-      await session.cleanup();
-    }
-  });
-
   test("shows one question at a time with numbered navigation", async ({ page }) => {
     test.setTimeout(180_000);
 

packages/app/e2e/browser/settings-host-page.spec.ts

@@ -1,7 +1,3 @@
-import { readFile, mkdir, rename, rm } from "node:fs/promises";
-import path from "node:path";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
 import { expect, test } from "../support/fixtures";
 import { gotoAppShell, openSettings } from "../support/helpers/app";
 import { getE2EDaemonPort } from "../support/helpers/daemon-port";
@@ -29,8 +25,6 @@ import {
   removeHostFromHostPage,
   addDirectHostFromSettings,
   expectHostOnlineWithoutError,
-  expectIdleAgentRelease,
-  setIdleAgentRelease,
 } from "../support/helpers/settings";
 
 test.describe("Settings host page", () => {
@@ -143,100 +137,6 @@ test.describe("Settings host page", () => {
     }
   });
 
-  test("idle agent release changes live on one host and stays saved without restarting", async ({
-    page,
-  }) => {
-    test.setTimeout(120_000);
-    const primaryServerId = getServerId();
-    const daemon = await startIsolatedHostDaemon("srv_e2e_idle_agent_release");
-    const client = await connectDaemonClient<DaemonClient>({
-      clientIdPrefix: "idle-release-settings",
-      port: daemon.port,
-    });
-    const originalPid = (await client.getDaemonStatus()).pid;
-    const expectLiveSavedSetting = async (enabled: boolean) => {
-      const saved = JSON.parse(await readFile(path.join(daemon.paseoHome, "config.json"), "utf8"));
-      expect(saved.agents.idleRuntimeCleanup).toBe(enabled);
-      expect((await client.getDaemonConfig()).config.idleRuntimeCleanup).toBe(enabled);
-      expect((await client.reloadDaemonConfig()).restartRequiredPaths).toEqual([]);
-      expect((await client.getDaemonStatus()).pid).toBe(originalPid);
-    };
-    const hosts = [
-      {
-        serverId: primaryServerId,
-        label: TEST_HOST_LABEL,
-        endpoint: `127.0.0.1:${getE2EDaemonPort()}`,
-      },
-      {
-        serverId: daemon.serverId,
-        label: "Idle release host",
-        endpoint: `127.0.0.1:${daemon.port}`,
-      },
-    ];
-    const openHostAgentsInFreshApp = async (serverId: string) => {
-      await seedSavedSettingsHosts(page, hosts);
-      await page.reload();
-      await openSettings(page);
-      await selectSettingsHost(page, serverId);
-      await openHostSection(page, serverId, "agents");
-    };
-    try {
-      await test.step("idle agent release starts on and turns off", async () => {
-        await openHostAgentsInFreshApp(daemon.serverId);
-        await expectIdleAgentRelease(page, true);
-        await setIdleAgentRelease(page, false);
-        await expectLiveSavedSetting(false);
-      });
-
-      await test.step("a fresh app reads the saved setting from the same running host", async () => {
-        await openHostAgentsInFreshApp(daemon.serverId);
-        await expectIdleAgentRelease(page, false);
-        await expectLiveSavedSetting(false);
-        await setIdleAgentRelease(page, true);
-        await expectLiveSavedSetting(true);
-        await setIdleAgentRelease(page, false);
-      });
-
-      await test.step("other hosts keep their own setting", async () => {
-        await selectSettingsHost(page, primaryServerId);
-        await openHostSection(page, primaryServerId, "agents");
-        await expectIdleAgentRelease(page, true);
-        await expectLiveSavedSetting(false);
-      });
-    } finally {
-      await client.close();
-      await daemon.close();
-    }
-  });
-
-  test("a failed idle release save stays visible and retry applies it live", async ({ page }) => {
-    const daemon = await startIsolatedHostDaemon("srv_e2e_idle_release_failure");
-    const configPath = path.join(daemon.paseoHome, "config.json");
-    try {
-      await seedSavedSettingsHosts(page, [
-        { serverId: daemon.serverId, label: "Failure host", endpoint: `127.0.0.1:${daemon.port}` },
-      ]);
-      await page.reload();
-      await openSettings(page);
-      await openHostSection(page, daemon.serverId, "agents");
-      await expectIdleAgentRelease(page, true);
-      // A real filesystem failure, with the daemon and RPC path intact.
-      await rename(configPath, `${configPath}.saved`);
-      await mkdir(configPath);
-      await page.getByRole("switch", { name: "Release idle agents" }).click();
-      await expect(page.getByTestId("host-page-idle-runtime-cleanup-error")).toContainText(
-        "Failed to read",
-      );
-      await expectIdleAgentRelease(page, true);
-      await rm(configPath, { recursive: true });
-      await rename(`${configPath}.saved`, configPath);
-      await setIdleAgentRelease(page, false);
-      await expect(page.getByTestId("host-page-idle-runtime-cleanup-error")).toHaveCount(0);
-    } finally {
-      await daemon.close();
-    }
-  });
-
   test("navigating to /settings/hosts/[serverId] redirects to the connections section", async ({
     page,
   }) => {

packages/app/e2e/browser/settings-host-selection.spec.ts

@@ -6,10 +6,7 @@ import {
   addDirectHostFromSettings,
   clickSettingsBackToWorkspace,
   openSettingsHostSection,
-  openSettingsSection,
-  selectSettingsHost,
 } from "../support/helpers/settings";
-import { getServerId } from "../support/helpers/server-id";
 import { seedWorkspace } from "../support/helpers/seed-client";
 import { switchWorkspaceViaSidebar } from "../support/helpers/workspace-ui";
 
@@ -47,14 +44,6 @@ test.describe("Settings host selection", () => {
       await openSettings(page);
 
       await openSettingsHostSection(page, remoteDaemon.serverId, "connections");
-
-      await selectSettingsHost(page, getServerId());
-      await openSettingsSection(page, "appearance");
-      await openSettingsHostSection(page, getServerId(), "connections");
-
-      await clickSettingsBackToWorkspace(page);
-      await openSettings(page);
-      await openSettingsHostSection(page, remoteDaemon.serverId, "connections");
     } finally {
       await remoteWorkspace.cleanup().catch(() => undefined);
       await remoteDaemon.close().catch(() => undefined);

packages/app/e2e/browser/settings-navigation.spec.ts

@@ -10,15 +10,6 @@ import { gotoAppShell, openSettings } from "../support/helpers/app";
 import { getE2EDaemonPort } from "../support/helpers/daemon-port";
 import {
   closeCompactSettings,
-  scrollSettingsSidebarToEnd,
-  revealSettingsSidebarSection,
-  expectSettingsSidebarScrollSettled,
-  scrollSettingsSidebarUp,
-  changeSettingsInterfaceFontSize,
-  selectSettingsHostSectionsRapidly,
-  expectSettingsSidebarScrollOffset,
-  scrollSettingsDetailDown,
-  expectSettingsDetailScrollOffset,
   openSettingsSection,
   expectSettingsHeader,
   openAddHostFlow,
@@ -52,8 +43,6 @@ import {
 } from "../support/helpers/settings";
 import { getServerId } from "../support/helpers/server-id";
 import { expectAppRoute } from "../support/helpers/route-assertions";
-import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
-import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 
 async function openWorkspace(
   page: import("@playwright/test").Page,
@@ -63,167 +52,7 @@ async function openWorkspace(
   await expect(page.getByTestId("menu-button")).toBeVisible();
 }
 
-test.describe("Settings sidebar scroll position", () => {
-  test.use({ viewport: { width: 1000, height: 500 } });
-
-  test("clamps after resizing and starts a fresh visit at the top", async ({ page }) => {
-    await gotoAppShell(page);
-    await openSettings(page);
-    await scrollSettingsSidebarToEnd(page);
-    await page.setViewportSize({ width: 1000, height: 1100 });
-    await expectSettingsSidebarScrollOffset(page, 0);
-    await page.setViewportSize({ width: 1000, height: 500 });
-    await openSettingsSection(page, "appearance");
-    await expectSettingsSidebarScrollOffset(page, 0);
-    await scrollSettingsSidebarToEnd(page);
-    await clickSettingsBackToWorkspace(page);
-    await openSettings(page);
-    await expectSettingsSidebarScrollOffset(page, 0);
-  });
-
-  test("keeps the sidebar position through interface font changes", async ({ page }) => {
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsSection(page, "appearance");
-    const offset = await scrollSettingsSidebarToEnd(page);
-    await changeSettingsInterfaceFontSize(page, 20);
-    await expectSettingsSidebarScrollOffset(page, offset);
-    await openSettingsHostSection(page, getServerId(), "providers");
-    await expectSettingsSidebarScrollOffset(page, offset);
-  });
-
-  test("scrolls the sidebar and detail pane independently", async ({ page }) => {
-    await gotoAppShell(page);
-    await openSettings(page);
-    const sidebarOffset = await scrollSettingsSidebarToEnd(page);
-    await openSettingsHostSection(page, getServerId(), "providers");
-    await expect(page.getByTestId("host-page-providers-card")).toBeVisible();
-    const detailOffset = await scrollSettingsDetailDown(page);
-    await expectSettingsSidebarScrollOffset(page, sidebarOffset);
-
-    await scrollSettingsSidebarUp(page, 60);
-    await expectSettingsSidebarScrollOffset(page, sidebarOffset - 60);
-    await expectSettingsDetailScrollOffset(page, detailOffset);
-  });
-
-  test("keeps the sidebar position after rapid consecutive selections", async ({ page }) => {
-    await gotoAppShell(page);
-    await openSettings(page);
-
-    const scrollTop = await scrollSettingsSidebarToEnd(page);
-
-    await selectSettingsHostSectionsRapidly(page);
-    await expectSettingsSidebarScrollOffset(page, scrollTop);
-
-    await expectSettingsSidebarScrollSettled(page, scrollTop);
-  });
-
-  test("keeps the sidebar position when switching between app and host sections", async ({
-    page,
-  }) => {
-    await gotoAppShell(page);
-    await openSettings(page);
-
-    const hostScrollTop = await scrollSettingsSidebarToEnd(page);
-    await expect(page.getByTestId("settings-host-section-providers")).toBeInViewport();
-
-    for (const section of [
-      "providers",
-      "terminals",
-      "providers",
-      "terminals",
-      "providers",
-    ] as const) {
-      await openSettingsHostSection(page, getServerId(), section);
-      await expect(page.getByTestId("page-title")).toHaveText(
-        section === "providers" ? "Providers" : "Terminals",
-      );
-      await expectSettingsSidebarScrollOffset(page, hostScrollTop);
-    }
-
-    const sidebar = page.getByTestId("settings-sidebar");
-    const appScrollTop = await revealSettingsSidebarSection(page, "diagnostics");
-    await expect(sidebar.getByRole("button", { name: "About", exact: true })).toBeInViewport();
-
-    await openSettingsSection(page, "about");
-    await expectAboutContent(page);
-    await expectSettingsSidebarScrollOffset(page, appScrollTop);
-
-    await openSettingsSection(page, "diagnostics");
-    await expectDiagnosticsContent(page);
-    await expectSettingsSidebarScrollOffset(page, appScrollTop);
-  });
-});
-
 test.describe("Settings sidebar navigation", () => {
-  test("opening Settings closes the composer model selector until it is opened again", async ({
-    page,
-    withWorkspace,
-  }, testInfo) => {
-    const workspace = await withWorkspace({ prefix: "settings-model-selector-" });
-    await gotoWorkspace(page, workspace.workspaceId);
-    await clickNewChat(page);
-
-    const selector = page.getByTestId("combined-model-selector").filter({ visible: true });
-    const popover = page.getByTestId("combobox-desktop-container");
-    await selector.click();
-    await expect(popover).toBeVisible();
-
-    const modifier = process.platform === "darwin" ? "Meta" : "Control";
-    await page.keyboard.press(`${modifier}+,`);
-    await expect(page).toHaveURL(/\/settings\/general$/);
-    await page.screenshot({ path: testInfo.outputPath("settings-after-model-selector.png") });
-    await expect(popover).toHaveCount(0);
-
-    await clickSettingsBackToWorkspace(page);
-    await expect(selector).toBeVisible();
-    await expect(popover).toHaveCount(0);
-
-    await selector.click();
-    await expect(popover).toBeVisible();
-    await page.keyboard.press("Escape");
-    await expect(popover).toHaveCount(0);
-  });
-
-  test("opening Settings closes an existing chat's model selector until it is opened again", async ({
-    page,
-  }, testInfo) => {
-    const workspace = await seedMockAgentWorkspace({
-      repoPrefix: "settings-existing-model-",
-      title: "Settings model selector",
-    });
-    try {
-      await openAgentRoute(page, {
-        workspaceId: workspace.workspaceId,
-        agentId: workspace.agentId,
-      });
-
-      const selector = page.getByTestId("combined-model-selector").filter({ visible: true });
-      const popover = page.getByTestId("combobox-desktop-container");
-      await selector.click();
-      await expect(popover).toBeVisible();
-
-      const modifier = process.platform === "darwin" ? "Meta" : "Control";
-      await page.keyboard.press(`${modifier}+,`);
-      await expect(page).toHaveURL(/\/settings\/general$/);
-      await page.screenshot({
-        path: testInfo.outputPath("settings-after-existing-model-selector.png"),
-      });
-      await expect(popover).toHaveCount(0);
-
-      await clickSettingsBackToWorkspace(page);
-      await expect(selector).toBeVisible();
-      await expect(popover).toHaveCount(0);
-
-      await selector.click();
-      await expect(popover).toBeVisible();
-      await page.keyboard.press("Escape");
-      await expect(popover).toHaveCount(0);
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
   test("clicking a sidebar section updates the URL and renders the section", async ({ page }) => {
     await gotoAppShell(page);
     await openSettings(page);
@@ -248,28 +77,6 @@ test.describe("Settings sidebar navigation", () => {
     await expect(page).not.toHaveURL(/\/settings(\/|$)/);
   });
 
-  test("host choice survives app sections and host screen replacements", async ({ page }) => {
-    const primaryServerId = getServerId();
-    const secondaryServerId = "srv_e2e_settings_secondary";
-    const endpoint = `127.0.0.1:${getE2EDaemonPort()}`;
-    await seedSavedSettingsHosts(page, [
-      { serverId: primaryServerId, label: "First horse", endpoint },
-      { serverId: secondaryServerId, label: "Stable horse", endpoint },
-    ]);
-    await gotoAppShell(page);
-    await openSettings(page);
-    await selectSettingsHost(page, secondaryServerId);
-    await openSettingsHostSection(page, secondaryServerId, "connections");
-    await openSettingsSection(page, "appearance");
-    await expectSettingsHostPickerLabel(page, "Stable horse");
-    await openSettingsSection(page, "general");
-    await expectSettingsHostPickerLabel(page, "Stable horse");
-    await openSettingsHostSection(page, secondaryServerId, "connections");
-    await selectSettingsHost(page, primaryServerId);
-    await openSettingsSection(page, "about");
-    await expectSettingsHostPickerLabel(page, "First horse");
-  });
-
   test("/h/[serverId]/settings redirects to the host connections section", async ({ page }) => {
     await gotoAppShell(page);
     await verifyLegacyHostSettingsRedirect(page);
@@ -340,42 +147,6 @@ test.describe("Settings sidebar navigation", () => {
 test.describe("Settings — compact master-detail", () => {
   test.use({ viewport: { width: 390, height: 844 } });
 
-  test("the compact tab switcher reopens after Settings hides its workspace", async ({ page }) => {
-    const workspace = await seedMockAgentWorkspace({
-      repoPrefix: "settings-tab-switcher-",
-      title: "Compact tab switcher",
-    });
-    try {
-      await openAgentRoute(page, {
-        workspaceId: workspace.workspaceId,
-        agentId: workspace.agentId,
-      });
-
-      const switcher = page.getByTestId("workspace-tab-switcher-trigger").filter({ visible: true });
-      const newAgent = page.getByTestId("workspace-tab-switcher-new-agent");
-      await switcher.click();
-      await expect(newAgent).toBeInViewport();
-
-      // Navigate without dismissing the sheet through its backdrop first.
-      await page
-        .getByTestId("menu-button")
-        .filter({ visible: true })
-        .first()
-        .dispatchEvent("click");
-      await page.getByTestId("sidebar-settings").first().dispatchEvent("click");
-      await expectAppRoute(page, buildSettingsRoute());
-      await expect(newAgent).toHaveCount(0);
-
-      await closeCompactSettings(page);
-      await expect(switcher).toBeVisible();
-      await expect(newAgent).toHaveCount(0);
-      await switcher.click();
-      await expect(newAgent).toBeInViewport();
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-
   test("opens compact app and host details and returns through the settings list", async ({
     page,
   }) => {
@@ -452,15 +223,6 @@ test.describe("Settings — compact master-detail", () => {
     await expectSettingsHostPickerLabel(page, secondaryHostLabel);
 
     await openSettingsHostSection(page, secondaryServerId, "connections");
-    await goBackInSettings(page);
-    await expectSettingsHostPickerLabel(page, secondaryHostLabel);
-
-    await openSettingsSection(page, "appearance");
-    await goBackInSettings(page);
-    await expectSettingsHostPickerLabel(page, secondaryHostLabel);
-    await openSettingsHostSection(page, secondaryServerId, "connections");
-    await goBackInSettings(page);
-    await expectSettingsHostPickerLabel(page, secondaryHostLabel);
   });
 
   test("removing the last active host returns to welcome after settings closes", async ({

packages/app/e2e/browser/subagent-origin-pane.spec.ts

@@ -125,29 +125,6 @@ test("opening an already-tabbed subagent reveals its left tab without a duplicat
   }
 });
 
-test("a subagent's parent pill returns to its parent", async ({ page }) => {
-  const workspace = await seedWorkspace({ repoPrefix: "subagent-parent-pill-" });
-  try {
-    const pair = await seedParentWithSubagent(workspace, {
-      parentTitle: "Refactor auth flow",
-      childTitle: "Write session tests",
-    });
-    await page.setViewportSize({ width: 1400, height: 900 });
-    await openAgentRoute(page, { workspaceId: pair.workspaceId, agentId: pair.child.id });
-
-    const pill = page.getByTestId("composer-parent-agent-pill");
-    await expect(pill).toHaveAccessibleName("Back to Refactor auth flow");
-    await pill.click();
-
-    await expect(page.getByTestId(`workspace-tab-agent_${pair.parent.id}`)).toHaveAttribute(
-      "aria-selected",
-      "true",
-    );
-  } finally {
-    await workspace.cleanup();
-  }
-});
-
 test("a preferred chat file link still opens beside its right-pane agent", async ({ page }) => {
   const target = "linked.ts:3";
   const workspace = await seedMockAgentWorkspace({

packages/app/e2e/browser/tool-call-overview-sheet.spec.ts

@@ -143,7 +143,7 @@ async function configureOverviewToolCalls(page: Page): Promise<void> {
   await page.addInitScript(() => {
     localStorage.setItem(
       "@paseo:app-settings",
-      JSON.stringify({ chatDisplay: "collapseToolCalls" }),
+      JSON.stringify({ toolCallDetailLevel: "overview" }),
     );
   });
 }

packages/app/e2e/browser/tool-call-shimmer.spec.ts

@@ -161,7 +161,7 @@ test("measures an overview heading that becomes loading after its idle mount", a
   await page.addInitScript(() => {
     localStorage.setItem(
       "@paseo:app-settings",
-      JSON.stringify({ chatDisplay: "collapseToolCalls" }),
+      JSON.stringify({ toolCallDetailLevel: "overview" }),
     );
   });
   const agent = await seedMockAgentWorkspace({

packages/app/e2e/browser/turn-collapse.spec.ts

@@ -1,67 +0,0 @@
-import type { Page } from "@playwright/test";
-import { test, expect } from "../support/fixtures";
-import { expectComposerVisible } from "../support/helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
-
-type ChatDisplay = "full" | "collapseToolCalls" | "collapseTurns";
-
-async function useChatDisplay(page: Page, chatDisplay: ChatDisplay): Promise<void> {
-  await page.addInitScript((value) => {
-    localStorage.setItem("@paseo:app-settings", JSON.stringify({ chatDisplay: value }));
-  }, chatDisplay);
-}
-
-async function seedAnsweredAgent(title: string) {
-  const agent = await seedMockAgentWorkspace({
-    repoPrefix: "turn-collapse-",
-    title,
-    model: "ten-second-stream",
-    initialPrompt: "Why does the chat stop following new output?",
-  });
-  await agent.client.waitForFinish(agent.agentId, 30_000);
-  await agent.client.sendAgentMessage(agent.agentId, "Make the fix and run the burst script.");
-  await agent.client.waitForFinish(agent.agentId, 30_000);
-  return agent;
-}
-
-/** Chat rows between the latest turn's summary line and its reply, in document order. */
-async function rowsBetweenLatestSummaryAndReply(page: Page): Promise<number> {
-  return page.evaluate(() => {
-    const rows = [...document.querySelectorAll("[data-message-id]")];
-    const summaryRow = rows.findLastIndex((row) => row.querySelector("[data-testid=turn-summary]"));
-    const replyRow = rows.findLastIndex((row) =>
-      row.querySelector("[data-testid=assistant-message]"),
-    );
-    return replyRow - summaryRow - 1;
-  });
-}
-
-test.describe("Turn collapse", () => {
-  test("folds each answered turn behind a summary line that opens it", async ({ page }) => {
-    test.setTimeout(120_000);
-    await useChatDisplay(page, "collapseTurns");
-    const agent = await seedAnsweredAgent("Turn collapse");
-    try {
-      await openAgentRoute(page, agent);
-      await expectComposerVisible(page);
-
-      const summary = page.getByTestId("turn-summary").last().getByRole("button");
-      await expect(summary).toHaveText(/^Wrote \d+ messages?, edited 1 file/);
-      // Text chunks that stream back to back merge into one message, so the reply holds
-      // at least the stream's last chunk.
-      await expect(page.getByTestId("assistant-message").last()).toHaveText(
-        /\(end of synthetic stream\)$/,
-      );
-      await expect.poll(() => rowsBetweenLatestSummaryAndReply(page)).toBe(0);
-
-      await summary.click();
-      await expect.poll(() => rowsBetweenLatestSummaryAndReply(page)).toBeGreaterThan(0);
-      await expect(summary).toBeInViewport();
-
-      await summary.click();
-      await expect.poll(() => rowsBetweenLatestSummaryAndReply(page)).toBe(0);
-    } finally {
-      await agent.cleanup();
-    }
-  });
-});

packages/app/e2e/browser/voice-settings.spec.ts

@@ -1,93 +0,0 @@
-import { expect, test } from "../support/fixtures";
-import {
-  apiKeyInput,
-  baseUrlInput,
-  expectSheetClosed,
-  expectSpeechSiteSummary,
-  openSpeechSite,
-  openVoiceSettings,
-  providerOption,
-  readSpeechSite,
-  resetSpeechSite,
-  saveSpeechSite,
-  withUnwritableDaemonConfig,
-} from "../support/helpers/voice-settings";
-
-// E2E daemons pin every speech provider to OpenAI through env vars so no test starts a model
-// download. That makes the provider picker read-only here; the env key covers the key fallback.
-const ENV_API_KEY = "sk-e2e-env-fallback";
-const SAVED_API_KEY = "sk-e2e-saved-key";
-const BASE_URL = "http://127.0.0.1:9/v1";
-
-test.use({ e2eDaemonEnvironment: { OPENAI_API_KEY: ENV_API_KEY } });
-
-test("configures an env-pinned OpenAI site and keeps the saved key on later saves", async ({
-  page,
-}) => {
-  try {
-    await openVoiceSettings(page);
-    await expectSpeechSiteSummary(page, "Listening", "OpenAI · whisper-1");
-
-    const sheet = await test.step("the env var decides the provider", async () => {
-      const opened = await openSpeechSite(page, "Listening");
-      await expect(opened.getByText("Set by PASEO_VOICE_STT_PROVIDER")).toBeVisible();
-      await expect(providerOption(opened, "Local")).toBeDisabled();
-      await expect(providerOption(opened, "OpenAI")).toHaveAttribute("aria-selected", "true");
-      await expect(opened.getByText("Set by OPENAI_API_KEY")).toBeVisible();
-      return opened;
-    });
-
-    await test.step("a saved key and base URL win over the env key", async () => {
-      await apiKeyInput(sheet).fill(SAVED_API_KEY);
-      await baseUrlInput(sheet).fill(BASE_URL);
-      await saveSpeechSite(sheet);
-      await expectSheetClosed(page);
-      await expect
-        .poll(() => readSpeechSite("voiceMode.stt"))
-        .toMatchObject({ provider: "openai", hasApiKey: true, baseUrl: BASE_URL });
-    });
-
-    await test.step("reopening shows the key as saved without revealing it", async () => {
-      const reopened = await openSpeechSite(page, "Listening");
-      await expect(apiKeyInput(reopened)).toHaveValue("");
-      await expect(apiKeyInput(reopened)).toHaveAttribute("placeholder", "Saved");
-      await expect(reopened.getByText("Set by OPENAI_API_KEY")).toHaveCount(0);
-      await expect(baseUrlInput(reopened)).toHaveValue(BASE_URL);
-      await expect(reopened.getByRole("button", { name: "Save", exact: true })).toBeDisabled();
-    });
-
-    await test.step("clearing the base URL keeps the saved key", async () => {
-      const sheetAgain = page.getByRole("dialog");
-      await baseUrlInput(sheetAgain).fill("");
-      await saveSpeechSite(sheetAgain);
-      await expectSheetClosed(page);
-      const site = await readSpeechSite("voiceMode.stt");
-      expect(site).toMatchObject({ provider: "openai", hasApiKey: true });
-      expect(site).not.toHaveProperty("baseUrl");
-    });
-  } finally {
-    await resetSpeechSite("voiceMode.stt");
-  }
-});
-
-test("a failed save keeps the sheet open with the user's input", async ({ page }) => {
-  try {
-    await openVoiceSettings(page);
-    const sheet = await openSpeechSite(page, "Speaking");
-    await baseUrlInput(sheet).fill(BASE_URL);
-
-    await withUnwritableDaemonConfig(async () => {
-      await saveSpeechSite(sheet);
-      await expect(page.getByText(/^Unable to update voice settings: /)).toBeVisible();
-    });
-
-    await expect(baseUrlInput(sheet)).toHaveValue(BASE_URL);
-    await saveSpeechSite(sheet);
-    await expectSheetClosed(page);
-    await expect
-      .poll(() => readSpeechSite("voiceMode.tts"))
-      .toMatchObject({ provider: "openai", baseUrl: BASE_URL });
-  } finally {
-    await resetSpeechSite("voiceMode.tts");
-  }
-});

packages/app/e2e/mobile/composer-keyboard/autocomplete-placement.mjs

@@ -28,10 +28,7 @@ function contains(outer, inner) {
  * while suggestions are open, so its callers read the composer from `reference`: a
  * snapshot in the same keyboard state with an empty input.
  */
-export function resolveAutocompletePlacement(
-  snapshot,
-  { expected, keyboardTop, reference, anchorGap },
-) {
+export function resolveAutocompletePlacement(snapshot, { expected, keyboardTop, reference }) {
   if (!snapshot.success || !snapshot.data?.nodes?.length) throw new Error("Empty device snapshot");
   const nodes = snapshot.data.nodes;
   const popover = findById(nodes, "composer-autocomplete-popover").rect;
@@ -43,10 +40,6 @@ export function resolveAutocompletePlacement(
   const keyboardY =
     keyboardTop ?? nodes.find((node) => node.type === "Keyboard" && node.rect)?.rect.y;
   const popoverBottom = bottomOf(popover);
-  const gap = composer.y - popoverBottom;
-  if (anchorGap !== undefined && Math.abs(gap - anchorGap) > 1) {
-    throw new Error(`Autocomplete lost its anchor gap: gap=${gap}, expected=${anchorGap}`);
-  }
   if (popoverBottom > composer.y + 1) {
     throw new Error(
       `Autocomplete overlaps the composer: popover bottom=${popoverBottom}, composer top=${composer.y}`,

packages/app/e2e/mobile/composer-keyboard/ios.mjs

@@ -14,8 +14,7 @@ const env = (name, fallback) => process.env[`PASEO_COMPOSER_KEYBOARD_${name}`] ?
 const serverId = env("SERVER_ID");
 const agentId = env("AGENT_ID");
 const workspaceId = env("WORKSPACE_ID");
-const scenario = env("SCENARIO", "all");
-if (!serverId || !workspaceId || (scenario === "all" && !agentId)) {
+if (!serverId || !agentId || !workspaceId) {
   throw new Error(
     "Set PASEO_COMPOSER_KEYBOARD_SERVER_ID, _AGENT_ID (an idle chat) and _WORKSPACE_ID (its workspace)",
   );
@@ -23,12 +22,7 @@ if (!serverId || !workspaceId || (scenario === "all" && !agentId)) {
 const draftId = env("DRAFT_ID", "composer-keyboard");
 const session = env("SESSION", "composer-keyboard-ios");
 const device = env("DEVICE", "iPhone 16 Pro");
-const udid = env("UDID");
-const deviceArgs = udid ? ["--udid", udid] : ["--device", device];
-const artifactsDir = env(
-  "ARTIFACTS_DIR",
-  path.join(repoRoot, ".dev/agent-device-artifacts/composer-keyboard-ios"),
-);
+const artifactsDir = path.join(repoRoot, ".dev/agent-device-artifacts/composer-keyboard-ios");
 const grownPrefix = "grown line one\ngrown line two\ngrown line three\n";
 // Partial queries with known best matches. `inserted` is the composer text after
 // tapping the best match.
@@ -41,7 +35,7 @@ const chatCommandCase = { text: "/mo", expected: "/mock", inserted: "/mock " };
 fs.mkdirSync(artifactsDir, { recursive: true });
 
 function ad(...args) {
-  return execFileSync("agent-device", [args[0], "--session", session, ...args.slice(1)], {
+  return execFileSync("agent-device", [...args, "--session", session], {
     encoding: "utf8",
     maxBuffer: 64 * 1024 * 1024,
   });
@@ -83,7 +77,7 @@ async function settledPlacement(name, keyboard) {
 }
 
 function assertPlacement(name, snap, expected) {
-  const placement = resolveAutocompletePlacement(snap, { expected, anchorGap: 12 });
+  const placement = resolveAutocompletePlacement(snap, { expected });
   process.stdout.write(
     `PASS ${name}: popover ${Math.round(placement.popover.y)}-${Math.round(
       placement.popover.y + placement.popover.height,
@@ -129,34 +123,21 @@ async function clearInput(name) {
   )?.rect;
   if (!deleteKey) throw new Error("Missing keyboard delete key");
   const length = composerText(keyboard).length;
-  for (let remaining = length + 2; remaining > 0; remaining -= 100) {
-    ad(
-      "press",
-      String(Math.round(deleteKey.x + deleteKey.width / 2)),
-      String(Math.round(deleteKey.y + deleteKey.height / 2)),
-      "--count",
-      String(Math.min(remaining, 100)),
-      "--interval-ms",
-      "40",
-    );
-  }
+  ad(
+    "press",
+    String(Math.round(deleteKey.x + deleteKey.width / 2)),
+    String(Math.round(deleteKey.y + deleteKey.height / 2)),
+    "--count",
+    String(length + 2),
+    "--interval-ms",
+    "40",
+  );
 }
 
 // The accessibility value drops a trailing space.
 const sameText = (actual, expected) => actual.trimEnd() === expected.trimEnd();
 
-async function selectRow(name, row, inserted) {
-  ad("press", String(row.x), String(row.y));
-  const selected = await waitFor(`${name}-selected`, (snap) =>
-    sameText(composerText(snap), inserted),
-  );
-  if (!keyboardShown(selected)) throw new Error(`Selecting ${row.label} closed the keyboard`);
-  process.stdout.write(
-    `PASS ${name}: tapped ${row.label}, composer now ${JSON.stringify(inserted)}\n`,
-  );
-}
-
-async function runCase(host, kind, { text, expected, inserted, selectionKeyboard = "reopened" }) {
+async function runCase(host, kind, { text, expected, inserted }) {
   const name = `${host}-${kind}`;
   await clearInput(name);
   await dismissKeyboard(snapshot(`${name}-empty`));
@@ -170,32 +151,31 @@ async function runCase(host, kind, { text, expected, inserted, selectionKeyboard
   await clearInput(`${name}-settled`);
   await waitFor(`${name}-settled-empty`, (snap) => composerText(snap) === "");
   ad("type", text);
-  const opened = assertPlacement(
+  assertPlacement(
     `${name} opened after keyboard settled`,
     await settledPlacement(`${name}-open`, true),
     expected,
   );
-  if (selectionKeyboard === "shown") {
-    await selectRow(name, opened, inserted);
-    return;
-  }
   await dismissKeyboard(snapshot(`${name}-before-close`));
-  const closed = assertPlacement(
+  assertPlacement(
     `${name} keyboard closed`,
     await settledPlacement(`${name}-closed`, false),
     expected,
   );
-  if (selectionKeyboard === "hidden") {
-    await selectRow(name, closed, inserted);
-    return;
-  }
   focusAtEnd(snapshot(`${name}-before-reopen`));
   const reopened = assertPlacement(
     `${name} keyboard opened under open suggestions`,
     await settledPlacement(`${name}-reopened`, true),
     expected,
   );
-  await selectRow(name, reopened, inserted);
+  ad("press", String(reopened.x), String(reopened.y));
+  const selected = await waitFor(`${name}-selected`, (snap) =>
+    sameText(composerText(snap), inserted),
+  );
+  if (!keyboardShown(selected)) throw new Error(`Selecting ${expected} closed the keyboard`);
+  process.stdout.write(
+    `PASS ${name}: tapped ${expected}, composer now ${JSON.stringify(inserted)}\n`,
+  );
 }
 
 // Drafts list commands for their selected provider, and a fresh install selects none.
@@ -236,104 +216,13 @@ async function runHost(host) {
   await dismissKeyboard(snapshot(`${host}-done`));
 }
 
-// These cases use the selected draft provider's real skills. Run on a 402pt-wide
-// iPhone for growth and a small phone (SE) for previews, with Codex selected.
-async function runLiveGrowth() {
-  await clearInput("live-growth");
-  ad("type", "Please do the following now /paseo");
-  const before = await settledPlacement("live-growth-before", true);
-  assertPlacement("before growth", before, "/paseo");
-  const inputHeight = (snap) =>
-    snap.data.nodes.find((node) => node.type === "TextView").rect.height;
-  ad("type", "--", "-committee");
-  const grown = await settledPlacement("live-growth-after", true);
-  if (inputHeight(grown) <= inputHeight(before))
-    throw new Error("Draft did not wrap onto a new line");
-  assertPlacement("live growth without reopening", grown, "/paseo-committee");
-  const deleteKey = grown.data.nodes.find(
-    (node) => node.type === "Key" && node.label === "delete",
-  ).rect;
-  ad(
-    "press",
-    String(deleteKey.x + deleteKey.width / 2),
-    String(deleteKey.y + deleteKey.height / 2),
-    "--count",
-    "10",
-    "--interval-ms",
-    "40",
-  );
-  const shrunk = await settledPlacement("live-growth-shrunk", true);
-  if (inputHeight(shrunk) !== inputHeight(before))
-    throw new Error("Draft did not shrink back to one line");
-  assertPlacement("live shrink without reopening", shrunk, "/paseo");
-  ad("type", "--", "-committ");
-  const partial = await settledPlacement("live-growth-partial", true);
-  if (!sameText(composerText(partial), "Please do the following now /paseo-committ")) {
-    throw new Error("Could not prepare a partial command for selection");
-  }
-  const row = assertPlacement("partial command after growth", partial, "/paseo-committee");
-  ad("press", String(row.x), String(row.y));
-  await waitFor("live-growth-selected", (snap) =>
-    sameText(composerText(snap), "Please do the following now /paseo-committee "),
-  );
-  await clearInput("live-growth-done");
-}
-
-async function runBoundedPreview() {
-  const prefix =
-    "Please do the following / testing inline selection.\n" +
-    "Line two with details.\nLine three with details.\nLine four with details.\n" +
-    "Line five with details.\nLine six with details.\nLine seven with details.\nPlease use ";
-  await runCase("preview", "long", {
-    text: `${prefix}/openai`,
-    expected: "/openai-docs",
-    inserted: `${prefix}/openai-docs `,
-    selectionKeyboard: "shown",
-  });
-  await runCase("preview", "long-hidden", {
-    text: `${prefix}/openai`,
-    expected: "/openai-docs",
-    inserted: `${prefix}/openai-docs `,
-    selectionKeyboard: "hidden",
-  });
-  await runCase("preview", "longest", {
-    text: `${prefix}/paseo-plug`,
-    expected: "/paseo-plugin",
-    inserted: `${prefix}/paseo-plugin `,
-    selectionKeyboard: "shown",
-  });
-  await runCase("preview", "short", {
-    text: `${prefix}/com`,
-    expected: "/commit",
-    inserted: `${prefix}/commit `,
-    selectionKeyboard: "shown",
-  });
-  await runCase("preview", "files", fileCase);
-}
-
-if (scenario !== "all") {
-  ad(
-    "open",
-    `paseo://h/${serverId}/workspace/${workspaceId}?open=draft%3A${draftId}`,
-    "--platform",
-    "ios",
-    ...deviceArgs,
-  );
-  await waitFor("draft", (snap) => Boolean(nodeById(snap, "message-input-root")), 60_000);
-  if (scenario === "growth") await runLiveGrowth();
-  else if (scenario === "previews") await runBoundedPreview();
-  else throw new Error(`Unknown scenario: ${scenario}`);
-  process.stdout.write(`Composer ${scenario} regression passed. Artifacts: ${artifactsDir}\n`);
-  process.exit(0);
-}
-
 const hosts = [
   ["chat", `paseo://h/${serverId}/agent/${agentId}`],
   ["workspace-draft", `paseo://h/${serverId}/workspace/${workspaceId}?open=draft%3A${draftId}`],
   ["new-workspace", `paseo://new?serverId=${serverId}`],
 ];
 for (const [host, url] of hosts) {
-  ad("open", url, "--platform", "ios", ...deviceArgs);
+  ad("open", url, "--platform", "ios", "--device", device);
   await waitFor(host, (snap) => Boolean(nodeById(snap, "message-input-root")), 60_000);
   await runHost(host);
 }

packages/app/e2e/mobile/markdown-formatting/README.md

@@ -1,25 +0,0 @@
-# Inline code formatting
-
-This fixture renders the production `MarkdownRenderer` with plain, bold, italic,
-combined emphasis, strikethrough and linked code, plus bold code in headings,
-lists and quotes. Toggle regular/compact text. Inline code uses the theme’s
-code-to-body size ratio at every heading level; fenced code keeps the code-size
-token. Bold and links preserve the resulting size. Check the glyphs, not the background height: native backgrounds use
-line metrics.
-
-Use a development client rebuilt from this checkout. Follow the temporary entry
-point and Metro workflow in [status-ring](../status-ring/README.md), importing
-`MarkdownFormattingRegression` from `./e2e/mobile/markdown-formatting/native`.
-Open the same Metro URL in a browser to compare web. Restore `index.ts` afterward.
-
-The package patch contains `InlineCodeFormattingTest`, which exercises actual
-Android spans in Robolectric native graphics mode, covering draw and measurement,
-span order, code inside paragraph/heading sizes, bold/italic composition, and
-links preserving code and emphasized prose fonts.
-It runs in the existing `test:android` CI job. To run only this regression locally,
-from `packages/app/android` after Expo prebuild:
-
-```sh
-./gradlew :react-native-enriched-markdown:testDebugUnitTest \
-  --tests '*InlineCodeFormattingTest' --no-daemon --max-workers=2
-```

packages/app/e2e/mobile/markdown-formatting/native.tsx

@@ -1,52 +0,0 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { useCallback, useState } from "react";
-import { Button, ScrollView, Text } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { GestureHandlerRootView } from "react-native-gesture-handler";
-import { MarkdownRenderer } from "@/components/markdown/renderer";
-
-const styles = StyleSheet.create((theme) => ({
-  root: { flex: 1 },
-  scroll: { backgroundColor: theme.colors.surface0 },
-  content: { padding: 32, paddingTop: 60 },
-  title: { color: theme.colors.foreground },
-}));
-
-const queryClient = new QueryClient();
-
-const source = [
-  "Plain: `MMMMiiii`",
-  "Bold: **`MMMMiiii`**",
-  "Italic: *`MMMMiiii`*",
-  "Both: ***`MMMMiiii`***",
-  "Strike: ~~`MMMMiiii`~~",
-  "Link: [`MMMMiiii`](https://example.com)",
-  "# Heading **`MMMMiiii`**",
-  "## Heading *`MMMMiiii`*",
-  "### Heading [`MMMMiiii`](https://example.com)",
-  "#### Heading ~~`MMMMiiii`~~",
-  "##### Heading ***`MMMMiiii`***",
-  "###### Heading `MMMMiiii`",
-  "- List **`MMMMiiii`**",
-  "> Quote **`MMMMiiii`**",
-  "Normal **bold** and *italic* prose.",
-].join("\n\n");
-
-export default function MarkdownFormattingRegression() {
-  const [compact, setCompact] = useState(false);
-  const toggleCompact = useCallback(() => setCompact((value) => !value), []);
-  return (
-    <QueryClientProvider client={queryClient}>
-      <GestureHandlerRootView style={styles.root}>
-        <ScrollView style={styles.scroll} contentContainerStyle={styles.content}>
-          <Text style={styles.title}>Inline code formatting regression</Text>
-          <Button
-            title={compact ? "Use regular text" : "Use compact text"}
-            onPress={toggleCompact}
-          />
-          <MarkdownRenderer text={source} compact={compact} />
-        </ScrollView>
-      </GestureHandlerRootView>
-    </QueryClientProvider>
-  );
-}

packages/app/e2e/support/creation-fixtures.ts

@@ -11,24 +11,27 @@ import {
 import { installDaemonWebSocketGate } from "./helpers/daemon-websocket-gate";
 import { delayBrowserAgentCreatedStatus } from "./helpers/new-workspace";
 
-interface StartupGate {
-  release(): Promise<void>;
-  fail(): Promise<void>;
-  dispose(): Promise<void>;
-}
-
-/** Holds every later workspace agent's startup until it is released or failed once. */
-async function installStartupGate(): Promise<StartupGate> {
-  const client = await connectNewWorkspaceDaemonClient();
-  const plugin = await copyPluginExample("lifecycle-logger");
-  const gate = path.join(plugin.directory, "startup.txt");
-  const failure = path.join(plugin.directory, "startup-failure.txt");
-  const previous = await client.getDaemonConfig();
-  await writeFile(gate, "hold");
-  await writeFile(failure, "fail");
-  await writeFile(
-    path.join(plugin.directory, "index.server.ts"),
-    `
+export const test = base.extend<{
+  startup: { release(): Promise<void>; fail(): Promise<void> };
+  promptRejection: void;
+  creation: Awaited<ReturnType<typeof createCreationScenario>>;
+  promptRetry: ReturnType<typeof createPromptRetryScenario>;
+  agentRetries: Awaited<ReturnType<typeof retryNextAgentCreation>>;
+  delayedCreation: Awaited<ReturnType<typeof delayBrowserAgentCreatedStatus>>;
+}>({
+  startup: async ({ page }, provide) => {
+    void page;
+    const client = await connectNewWorkspaceDaemonClient();
+    const plugin = await copyPluginExample("lifecycle-logger");
+    const gate = path.join(plugin.directory, "startup.txt");
+    const failure = path.join(plugin.directory, "startup-failure.txt");
+    const previous = await client.getDaemonConfig();
+    try {
+      await writeFile(gate, "hold");
+      await writeFile(failure, "fail");
+      await writeFile(
+        path.join(plugin.directory, "index.server.ts"),
+        `
 import { readFile, rm } from "node:fs/promises";
 export default function contribute(server) {
   return server.before("agent.session_open", async ({ request }) => {
@@ -47,88 +50,17 @@ export default function contribute(server) {
     return request;
   });
 }
-`,
-  );
-  await client.patchDaemonConfig({ pluginsEnabled: true });
-  await client.installDirectoryPlugin(plugin.directory);
-  return {
-    release: () => rm(gate, { force: true }),
-    // Replacing the command must not expose a truncated, empty file to the hook.
-    fail: () => rename(failure, gate),
-    async dispose() {
-      await rm(gate, { force: true });
-      await client.removePlugin("lifecycle-logger");
-      await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
-      await plugin.cleanup();
-      await client.close();
-    },
-  };
-}
-
-export const test = base.extend<{
-  startup: StartupGate;
-  /** A startup gate installed mid-test, after agents that must start normally. */
-  lateStartup: { arm(): Promise<StartupGate> };
-  promptRejection: void;
-  /** Fails the next workspace request once it is armed. */
-  provisioningFailure: { arm(): Promise<void> };
-  creation: Awaited<ReturnType<typeof createCreationScenario>>;
-  promptRetry: ReturnType<typeof createPromptRetryScenario>;
-  workspacePromptRetry: ReturnType<typeof createPromptRetryScenario>;
-  agentRetries: Awaited<ReturnType<typeof retryNextAgentCreation>>;
-  delayedCreation: Awaited<ReturnType<typeof delayBrowserAgentCreatedStatus>>;
-}>({
-  startup: async ({ page }, provide) => {
-    void page;
-    const gate = await installStartupGate();
-    try {
-      await provide(gate);
-    } finally {
-      await gate.dispose();
-    }
-  },
-  lateStartup: async ({ page }, provide) => {
-    void page;
-    const gates: StartupGate[] = [];
-    try {
-      await provide({
-        arm: async () => {
-          const gate = await installStartupGate();
-          gates.push(gate);
-          return gate;
-        },
-      });
-    } finally {
-      for (const gate of gates) await gate.dispose();
-    }
-  },
-  provisioningFailure: async ({ page, creation }, provide) => {
-    void page;
-    void creation;
-    const client = await connectNewWorkspaceDaemonClient();
-    const plugin = await copyPluginExample("lifecycle-logger");
-    const previous = await client.getDaemonConfig();
-    try {
-      const failure = path.join(plugin.directory, "provisioning-failure.txt");
-      // Fails one workspace request per arm, so a resubmission can succeed.
-      await writeFile(
-        path.join(plugin.directory, "index.server.ts"),
-        `
-import { rm, stat } from "node:fs/promises";
-export default function contribute(server) {
-  return server.before("workspace.create", async ({ request }) => {
-    const failure = ${JSON.stringify(failure)};
-    if (!(await stat(failure).catch(() => null))) return request;
-    await rm(failure, { force: true });
-    throw new Error("Provisioning outcome is uncertain for test");
-  });
-}
 `,
       );
       await client.patchDaemonConfig({ pluginsEnabled: true });
       await client.installDirectoryPlugin(plugin.directory);
-      await provide({ arm: () => writeFile(failure, "fail") });
+      await provide({
+        release: () => rm(gate, { force: true }),
+        // Replacing the command must not expose a truncated, empty file to the hook.
+        fail: () => rename(failure, gate),
+      });
     } finally {
+      await rm(gate, { force: true });
       await client.removePlugin("lifecycle-logger");
       await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
       await plugin.cleanup();
@@ -182,14 +114,6 @@ export default function contribute(server) {
       gate.restore();
     }
   },
-  workspacePromptRetry: async ({ page }, provide) => {
-    const gate = await installDaemonWebSocketGate(page);
-    try {
-      await provide(createPromptRetryScenario(page, gate, "workspace"));
-    } finally {
-      gate.restore();
-    }
-  },
   agentRetries: async ({ page }, provide) => {
     await provide(await retryNextAgentCreation(page));
   },

packages/app/e2e/support/fixtures.ts

@@ -180,11 +180,6 @@ const test = daemonTest.extend<{
           localStorage.setItem("@paseo:daemon-registry", JSON.stringify([daemon, ...extraHosts]));
           localStorage.removeItem("@paseo:settings");
           localStorage.setItem("@paseo:create-agent-preferences", JSON.stringify(preferences));
-          // New installs collapse finished turns; specs assert on the rows inside them, so they
-          // start from the full chat unless they seed their own settings.
-          if (!localStorage.getItem("@paseo:app-settings")) {
-            localStorage.setItem("@paseo:app-settings", JSON.stringify({ chatDisplay: "full" }));
-          }
         },
         {
           daemon: testDaemon,

packages/app/e2e/support/helpers/composer.ts

@@ -87,14 +87,6 @@ export async function sendDraftToQueue(page: Page): Promise<void> {
   await composerInput(page).press("Control+Enter");
 }
 
-/** Long-press the Send button: the composer takes the draft while the pointer is still down. */
-export async function holdSendButton(page: Page, label: string): Promise<void> {
-  await page.getByRole("button", { name: label, exact: true }).hover();
-  await page.mouse.down();
-  await expect(composerInput(page)).toHaveValue("", { timeout: 5_000 });
-  await page.mouse.up();
-}
-
 export async function expectQueuedMessageButton(page: Page): Promise<void> {
   await expect(page.getByRole("button", { name: "Send queued message now" })).toBeVisible({
     timeout: 10_000,

packages/app/e2e/support/helpers/creation.ts

@@ -1,17 +1,12 @@
-import { awaitAssistantMessage } from "./agent-stream";
-import { forkMostRecentAssistantTurnToNewWorkspace } from "./assistant-fork";
 import type { WorkspaceCreateRequest } from "@getpaseo/protocol/messages";
 import { expect, type Page } from "@playwright/test";
 import { daemonWsRoutePattern } from "./daemon-port";
 import { gotoAppShell } from "./app";
 import { gotoWorkspace } from "./launcher";
-import { attachComposerTestImage, fillComposerDraft } from "./composer";
+import { fillComposerDraft } from "./composer";
 import { createAgentTabFromMenu } from "./workspace-tabs";
 import {
-  connectNewWorkspaceDaemonClient,
   openNewWorkspaceComposer,
-  openStartingRefPicker,
-  startingRefRow,
   selectWorkspaceIsolation,
   loadSessionMessageReaders,
 } from "./new-workspace";
@@ -49,43 +44,6 @@ export async function captureWorkspaceAgentRequest(page: Page, options: { block:
   return { waitForRequest: () => request };
 }
 
-/** Hold the creation request before the daemon can reserve or provision anything. */
-/** Holds each workspace request with an agent until `release` sends the held requests. */
-export async function holdWorkspaceProvisioning(page: Page) {
-  const frames = await loadSessionMessageReaders();
-  let held: Array<() => void> = [];
-  const requests: WorkspaceCreateRequest[] = [];
-  let agentPrompts = 0;
-  await page.routeWebSocket(daemonWsRoutePattern(), (browser) => {
-    const server = browser.connectToServer();
-    browser.onMessage((frame) => {
-      const message = frames.client(frame);
-      if (message?.type === "send_agent_message_request") agentPrompts++;
-      if (message?.type === "workspace.create.request" && message.agent) {
-        held.push(() => server.send(frame));
-        requests.push(message);
-        return;
-      }
-      server.send(frame);
-    });
-    server.onMessage((frame) => browser.send(frame));
-  });
-  async function waitForRequests(count: number) {
-    await expect.poll(() => requests.length).toBe(count);
-    return requests[count - 1]!;
-  }
-  return {
-    waitForRequest: () => waitForRequests(1),
-    waitForRequests,
-    release: () => {
-      const sending = held;
-      held = [];
-      for (const send of sending) send();
-    },
-    agentPrompts: () => agentPrompts,
-  };
-}
-
 export async function pressSubmitBeforeTheNextRender(page: Page, name: string): Promise<void> {
   const create = page.getByRole("button", { name, exact: true });
   await expect(create).toBeEnabled();
@@ -101,11 +59,9 @@ export async function pressSubmitBeforeTheNextRender(page: Page, name: string):
 export async function observeCreationRequests(page: Page) {
   const frames = await loadSessionMessageReaders();
   const pending = new Set<string>();
-  let workspaceRequests = 0;
   page.on("websocket", (socket) => {
     socket.on("framesent", ({ payload }) => {
       const request = frames.client(payload);
-      if (request?.type === "workspace.create.request") workspaceRequests++;
       if (
         request?.type === "workspace.create.request" ||
         request?.type === "agent.create.request"
@@ -128,7 +84,6 @@ export async function observeCreationRequests(page: Page) {
     });
   });
   return {
-    workspaceRequests: () => workspaceRequests,
     async settled() {
       await expect.poll(() => pending.size).toBe(0);
     },
@@ -183,101 +138,18 @@ export async function retryNextAgentCreation(page: Page) {
   };
 }
 
-function agentComposer(page: Page) {
-  // Retained workspaces keep hidden composers mounted beside the focused one.
-  return page.getByRole("textbox", { name: "Message agent..." }).filter({ visible: true });
-}
-
 export async function createCreationScenario(page: Page) {
   const requests = await observeCreationRequests(page);
-  const project = await seedWorkspace({
-    repoPrefix: "creation-idempotency-",
-    repo: {
-      files: [{ path: "nested/context.txt", content: "Nested agent working directory" }],
-      branches: ["recovery-base"],
-    },
-  });
+  const project = await seedWorkspace({ repoPrefix: "creation-idempotency-" });
   let workspaceId = project.workspaceId;
-  const evictionWorkspaceIds = new Set<string>();
-  const sourceClients: Array<{ close(): Promise<void> }> = [];
   return {
-    cleanup: async () => {
-      for (const client of sourceClients) await client.close();
-      await project.cleanup();
-    },
-    async openNestedAgentFork(isolation: "local" | "worktree") {
-      const cwd = `${project.repoPath}/nested`;
-      const sourceClient = await connectNewWorkspaceDaemonClient();
-      sourceClients.push(sourceClient);
-      const source = await sourceClient.createWorkspace({
-        source: { kind: "directory", path: project.repoPath },
-        agent: {
-          config: { provider: "mock", model: "e2e-fast-stream", modeId: "load-test", cwd },
-          initialPrompt: "emit 1 coalesced agent stream updates for the source conversation.",
-        },
-      });
-      if (!source.agent || !source.workspace)
-        throw new Error(source.error ?? "Missing nested source agent");
-      evictionWorkspaceIds.add(source.workspace.id);
-      await project.client.waitForFinish(source.agent.id, 20_000);
-      await gotoWorkspace(page, source.workspace.id);
-      await awaitAssistantMessage(page);
-      await forkMostRecentAssistantTurnToNewWorkspace(page);
-      await selectWorkspaceIsolation(page, isolation);
-      return cwd;
-    },
-    attachImage: () => attachComposerTestImage(page),
-    async expectImageVisible() {
-      await expect(
-        page
-          .getByRole("button", { name: "Open image attachment", exact: true })
-          .filter({ visible: true }),
-      ).toHaveCount(1);
-    },
-    async expectInitialPromptOnce(prompt: string) {
-      const agents = (await project.client.fetchAgents()).entries.filter(
-        ({ agent }) => agent.workspaceId === workspaceId,
-      );
-      expect(agents).toHaveLength(1);
-      const reader = await connectNewWorkspaceDaemonClient();
-      try {
-        const timeline = await reader.fetchAgentTimeline(agents[0]!.agent.id);
-        expect(timeline.entries.filter(({ item }) => item.type === "user_message")).toHaveLength(1);
-        expect(
-          timeline.entries.filter(
-            ({ item }) => item.type === "user_message" && item.text === prompt,
-          ),
-        ).toHaveLength(1);
-      } finally {
-        await reader.close();
-      }
-    },
-    async expectNestedAgentCwd() {
-      const workspace = (await project.client.fetchWorkspaces()).entries.find(
-        (entry) => entry.id === workspaceId,
-      )!;
-      const nestedAgent = (await project.client.fetchAgents()).entries.find(
-        ({ agent }) => agent.workspaceId === workspaceId,
-      )!.agent;
-      expect(nestedAgent.cwd).toBe(`${workspace.workspaceDirectory}/nested`);
-    },
-    async closePendingAgent(agentId: string) {
-      await page.getByTestId(`workspace-tab-agent_${agentId}`).filter({ visible: true }).hover();
-      await page.getByTestId(`workspace-agent-close-${agentId}`).filter({ visible: true }).click();
-      await expect(
-        page.getByTestId(`workspace-tab-agent_${agentId}`).filter({ visible: true }),
-      ).toHaveCount(0);
-    },
+    cleanup: project.cleanup,
     async openWorkspaceForm(isolation: "local" | "worktree") {
       await gotoAppShell(page);
       await waitForSidebarHydration(page);
       await openNewWorkspaceComposer(page, project);
       await selectWorkspaceIsolation(page, isolation);
     },
-    async selectWorktreeBranch(name: string) {
-      await openStartingRefPicker(page);
-      await startingRefRow(page, `${name}, local branch`).click();
-    },
     async openAgentDraft() {
       await gotoWorkspace(page, project.workspaceId);
       await createAgentTabFromMenu(page);
@@ -293,74 +165,6 @@ export async function createCreationScenario(page: Page) {
       if (prompt) await fillComposerDraft(page, prompt);
       await pressSubmitBeforeTheNextRender(page, button);
     },
-    async expectNormalAgentComposer() {
-      await expect(agentComposer(page)).toBeEditable();
-      // Provisioning belongs to the workspace header and sidebar, not the conversation.
-      await expect(page.getByText("Creating workspace and agent…", { exact: true })).toHaveCount(0);
-    },
-    async expectAgentCannotBeStoppedYet() {
-      await expect(
-        page.getByRole("button", { name: "Stop agent" }).filter({ visible: true }),
-      ).toBeDisabled();
-    },
-    async queueFollowUp(prompt: string) {
-      await agentComposer(page).fill(prompt);
-      await agentComposer(page).press("Enter");
-      await expect(
-        page.getByRole("button", { name: "Send queued message now" }).filter({ visible: true }),
-      ).toBeVisible();
-      await expect(page.getByText(prompt, { exact: true }).filter({ visible: true })).toBeVisible();
-    },
-    async expectQueuedFollowUp(prompt: string) {
-      await expect(
-        page.getByRole("button", { name: "Send queued message now" }).filter({ visible: true }),
-      ).toHaveCount(1);
-      await expect(page.getByText(prompt, { exact: true }).filter({ visible: true })).toBeVisible();
-    },
-    async resubmitWorkspace() {
-      await page.getByRole("button", { name: "Create", exact: true }).click();
-    },
-    async expectAgentConfig(config: { model: string; modeId: string }) {
-      const agent = (await project.client.fetchAgents()).entries.find(
-        (entry) => entry.agent.workspaceId === workspaceId,
-      )!.agent;
-      expect({ model: agent.model, modeId: agent.currentModeId }).toEqual(config);
-    },
-    async typeComposerDraft(text: string) {
-      await agentComposer(page).fill(text);
-      // The composer publishes typed text to its draft after the next paint.
-      await page.evaluate(
-        () => new Promise((resolve) => requestAnimationFrame(() => setTimeout(resolve, 0))),
-      );
-    },
-    async expectComposerDraft(text: string) {
-      await expect(agentComposer(page)).toHaveValue(text);
-    },
-    async expectAgentNotWorking() {
-      await expect(
-        page.getByTestId("turn-working-indicator").filter({ visible: true }),
-      ).toHaveCount(0);
-    },
-    async expectTimelineSettled() {
-      await expect(page.getByText("Updating messages", { exact: true })).toHaveCount(0);
-    },
-    async expectUserMessagesInOrder(prompts: string[]) {
-      const agent = (await project.client.fetchAgents()).entries.find(
-        (entry) => entry.agent.workspaceId === workspaceId,
-      );
-      const reader = await connectNewWorkspaceDaemonClient();
-      try {
-        await expect
-          .poll(async () =>
-            (await reader.fetchAgentTimeline(agent!.agent.id)).entries.flatMap(({ item }) =>
-              item.type === "user_message" ? [item.text] : [],
-            ),
-          )
-          .toEqual(prompts);
-      } finally {
-        await reader.close();
-      }
-    },
     async expectPromptVisible(prompt?: string) {
       // Inactive agent tabs retain their timeline DOM beside the visible draft.
       const rows = page.getByTestId("user-message").filter({ visible: true });
@@ -371,7 +175,7 @@ export async function createCreationScenario(page: Page) {
       await expect(page.getByTestId("user-message").first()).toBeVisible();
       await expect(
         page
-          .locator('[data-testid^="workspace-tab-agent_"][aria-selected="true"]')
+          .locator('[data-testid^="workspace-tab-draft_"][aria-selected="true"]')
           .filter({ visible: true }),
       ).toBeVisible();
     },
@@ -420,57 +224,15 @@ export async function createCreationScenario(page: Page) {
           .first(),
       ).toBeVisible();
     },
-    async expectFailedAgentDraft(prompt: string) {
-      await requests.settled();
-      await expect(
-        page
-          .locator('[data-testid^="workspace-tab-draft_"][aria-selected="true"]')
-          .filter({ visible: true }),
-      ).toBeVisible();
-      await expect(
-        page
-          .getByText(/Creation startup failed for test/)
-          .filter({ visible: true })
-          .first(),
-      ).toBeVisible();
-      await expect(agentComposer(page)).toHaveValue(prompt);
-      await this.expectNoCreationRecovery();
-    },
-    async resendFailedDraft() {
-      await page.getByRole("button", { name: "Send message", exact: true }).click();
-    },
-    async expectReturnedToNewWorkspace(prompt: string, error: string) {
-      await requests.settled();
-      await expect(page).toHaveURL(/\/new\?/);
-      await expect(agentComposer(page)).toHaveValue(prompt);
-      await expect(page.getByText(error).filter({ visible: true }).first()).toBeVisible();
-      await this.expectNoCreationRecovery();
-      expect(requests.workspaceRequests()).toBe(1);
-      expect(
-        (await project.client.fetchWorkspaces()).entries.filter(
-          (workspace) =>
-            workspace.projectId === project.projectId &&
-            workspace.id !== project.workspaceId &&
-            !evictionWorkspaceIds.has(workspace.id),
-        ),
-      ).toHaveLength(0);
-    },
-    async expectNoCreationRecovery() {
-      await expect(page.getByRole("button", { name: "Retry creation", exact: true })).toHaveCount(
-        0,
-      );
-      await expect(page.getByRole("button", { name: "Return to draft", exact: true })).toHaveCount(
-        0,
-      );
+    async expectStartupFailure() {
+      await expect(page.getByText(/Creation startup failed for test/).first()).toBeVisible();
     },
     async expectOneCreatedWorkspace() {
       await expect(page).toHaveURL(/\/workspace\//);
       await requests.settled();
       const workspaces = (await project.client.fetchWorkspaces()).entries.filter(
         (workspace) =>
-          workspace.projectId === project.projectId &&
-          workspace.id !== project.workspaceId &&
-          !evictionWorkspaceIds.has(workspace.id),
+          workspace.projectId === project.projectId && workspace.id !== project.workspaceId,
       );
       expect(workspaces).toHaveLength(1);
       workspaceId = workspaces[0]!.id;
@@ -503,11 +265,8 @@ export async function createCreationScenario(page: Page) {
         .toBe(title);
     },
     async evictAndReturnToDraft() {
-      workspaceId = new URL(page.url()).pathname.split("/workspace/")[1]!;
       const draft = page
-        .locator(
-          '[data-testid^="workspace-tab-draft_"][aria-selected="true"], [data-testid^="workspace-tab-agent_"][aria-selected="true"]',
-        )
+        .locator('[data-testid^="workspace-tab-draft_"][aria-selected="true"]')
         .filter({ visible: true })
         .first();
       const draftTestId = await draft.getAttribute("data-testid");
@@ -517,7 +276,6 @@ export async function createCreationScenario(page: Page) {
           source: { kind: "directory", path: project.repoPath },
         });
         if (!result.workspace) throw new Error(result.error ?? "Failed to seed eviction workspace");
-        evictionWorkspaceIds.add(result.workspace.id);
         await switchWorkspaceViaSidebar({
           page,
           serverId: getServerId(),
@@ -538,18 +296,15 @@ export async function createCreationScenario(page: Page) {
 export function createPromptRetryScenario(
   page: Page,
   gate: Awaited<ReturnType<typeof installDaemonWebSocketGate>>,
-  kind: "agent" | "workspace" = "agent",
 ) {
-  const requestType = `${kind}.create.request`;
-  const responseType = `${kind}.create.response`;
   let firstMessage: ReturnType<typeof gate.getClientRequests>[number] | undefined;
   return {
     holdAcknowledgement() {
-      gate.holdNextServerMessage(responseType);
+      gate.holdNextServerMessage("agent.create.response");
     },
     async waitForDeliveredPrompt() {
-      await gate.waitForHeldServerMessage(responseType);
-      firstMessage = gate.getClientRequests(requestType).at(-1);
+      await gate.waitForHeldServerMessage("agent.create.response");
+      firstMessage = gate.getClientRequests("agent.create.request").at(-1);
     },
     async disconnectAndReconnect() {
       const fetches = gate.getClientRequestCount("fetch_agents_request");
@@ -560,89 +315,13 @@ export function createPromptRetryScenario(
         .toBeGreaterThan(fetches);
     },
     async expectSameAgentAndMessage() {
-      expect(gate.getClientRequestCount(requestType)).toBe(1);
+      expect(gate.getClientRequestCount("agent.create.request")).toBe(1);
       await expect
         .poll(() => gate.getClientRequestCount("creation.subscribe.request"))
         .toBeGreaterThan(0);
-      expect(gate.getClientRequests(requestType).at(-1)).toEqual(firstMessage);
+      expect(gate.getClientRequests("agent.create.request").at(-1)).toEqual(firstMessage);
       expect(gate.getClientRequestCount("send_agent_message_request")).toBe(0);
       await expect(page.getByTestId("user-message").filter({ visible: true })).toHaveCount(1);
     },
   };
 }
-
-export async function hideCreationLifecycle(page: Page) {
-  const frames = await loadSessionMessageReaders();
-  let requests = 0;
-  await page.routeWebSocket(daemonWsRoutePattern(), (browser) => {
-    const server = browser.connectToServer();
-    browser.onMessage((frame) => {
-      if (frames.client(frame)?.type === "workspace.create.request") requests++;
-      server.send(frame);
-    });
-    server.onMessage((frame) => {
-      const message = frames.server(frame);
-      if (
-        message?.type === "status" &&
-        message.payload.status === "server_info" &&
-        typeof message.payload.features === "object" &&
-        message.payload.features !== null
-      ) {
-        browser.send(
-          JSON.stringify({
-            type: "session",
-            message: {
-              ...message,
-              payload: {
-                ...message.payload,
-                features: { ...message.payload.features, creationLifecycle: false },
-              },
-            },
-          }),
-        );
-        return;
-      }
-      browser.send(frame);
-    });
-  });
-  return { expectNoCreationRequest: () => expect(requests).toBe(0) };
-}
-
-/** Simulate an uncertain receipt after the real daemon registered and ran the initial agent. */
-export async function reportUnknownPromptOutcome(page: Page) {
-  const frames = await loadSessionMessageReaders();
-  await page.routeWebSocket(daemonWsRoutePattern(), (browser) => {
-    const server = browser.connectToServer();
-    browser.onMessage((frame) => server.send(frame));
-    server.onMessage((frame) => {
-      const message = frames.server(frame);
-      if (
-        message?.type === "workspace.create.response" &&
-        message.payload.agent &&
-        message.payload.creation
-      ) {
-        const error = "Initial prompt outcome is uncertain for test";
-        browser.send(
-          JSON.stringify({
-            ...JSON.parse(frame.toString()),
-            message: {
-              ...message,
-              payload: {
-                ...message.payload,
-                error,
-                creation: {
-                  ...message.payload.creation,
-                  phase: "failed",
-                  error,
-                  outcomeUnknown: true,
-                },
-              },
-            },
-          }),
-        );
-        return;
-      }
-      browser.send(frame);
-    });
-  });
-}

packages/app/e2e/support/helpers/import-session.ts

@@ -27,7 +27,7 @@ export class ImportSessionFlow {
       await expectMobileAgentSidebarVisible(this.page);
     }
     await openGlobalNewWorkspaceComposer(this.page);
-    const button = this.page.getByTestId("new-workspace-import-session").filter({ visible: true });
+    const button = this.page.getByTestId("new-workspace-import-session");
     await expect(button).toHaveAccessibleName("Import session");
     await expect(button).toBeInViewport();
   }
@@ -36,7 +36,7 @@ export class ImportSessionFlow {
     await this.openFromNewWorkspace();
   }
   async openFromNewWorkspace() {
-    await this.page.getByTestId("new-workspace-import-session").filter({ visible: true }).click();
+    await this.page.getByTestId("new-workspace-import-session").click();
     await this.expectSheetReady();
   }
   async openFromWorkspaceHeader() {
@@ -86,29 +86,7 @@ export class ImportSessionFlow {
     expect((bounds?.x ?? width) + (bounds?.width ?? 1)).toBeLessThanOrEqual(width);
   }
   async revealSession(id: string) {
-    const target = this.page.getByTestId(rowTestId(id));
-    if ((await target.count()) === 0) {
-      await this.scrollList(false);
-      await expect(async () => {
-        if ((await target.count()) === 0) await this.scrollList(true);
-        await expect(target).toHaveCount(1, { timeout: 100 });
-      }).toPass({ timeout: 10_000 });
-    }
-    await target.scrollIntoViewIfNeeded();
-    await expect(target).toBeInViewport();
-  }
-  private async scrollList(forward: boolean) {
-    await this.page
-      .locator('[data-testid^="import-session-session-"]')
-      .first()
-      .evaluate((row, advance) => {
-        let element = row.parentElement;
-        while (element && !["auto", "scroll"].includes(getComputedStyle(element).overflowY))
-          element = element.parentElement;
-        if (!element) throw new Error("Import list has no scroll owner");
-        element.scrollTop = advance ? element.scrollTop + element.clientHeight * 0.8 : 0;
-        element.dispatchEvent(new Event("scroll"));
-      }, forward);
+    await this.page.getByTestId(rowTestId(id)).scrollIntoViewIfNeeded();
   }
   async search(query: string) {
     await this.page.getByTestId("import-session-search").fill(query);
@@ -122,8 +100,7 @@ export class ImportSessionFlow {
   }
   async loadMore() {
     await this.page.getByTestId("import-session-load-more").click();
-    await this.revealSession("fixture-root-20");
-    await expect(this.page.getByText("Root session 20", { exact: true })).toBeInViewport();
+    await expect(this.page.getByText("Root session 20", { exact: true })).toBeVisible();
     await expect(this.page.getByTestId("import-session-load-more")).toHaveCount(0);
   }
   async retryProvider(provider: string, label: string) {
@@ -134,7 +111,6 @@ export class ImportSessionFlow {
     await expect(this.page.getByRole("progressbar")).toHaveCount(0);
   }
   async importSession(id: string) {
-    await this.revealSession(id);
     await this.page.getByTestId(rowTestId(id)).click();
     await expect(this.page.getByTestId("import-session-sheet")).toHaveCount(0, {
       timeout: 30_000,
@@ -162,7 +138,7 @@ export class ImportSessionFlow {
     );
   }
   async close() {
-    await this.page.getByRole("button", { name: "Close", exact: true }).last().click();
+    await this.page.keyboard.press("Escape");
     await expect(this.page.getByTestId("import-session-sheet")).toHaveCount(0);
   }
   async expectCommandCenterMatch() {

packages/app/e2e/support/helpers/new-workspace.ts

@@ -18,7 +18,6 @@ type NewWorkspaceDaemonClient = Pick<
   | "createPaseoWorktree"
   | "createWorkspace"
   | "fetchAgents"
-  | "fetchAgentTimeline"
   | "fetchWorkspaces"
   | "getPaseoWorktreeList"
   | "getDaemonConfig"

packages/app/e2e/support/helpers/plugin-timeline.ts

@@ -116,7 +116,7 @@ export async function withTimelinePlugin(
   await page.addInitScript(() => {
     localStorage.setItem(
       "@paseo:app-settings",
-      JSON.stringify({ chatDisplay: "collapseToolCalls" }),
+      JSON.stringify({ toolCallDetailLevel: "overview" }),
     );
   });
   const agent = await seedMockAgentWorkspace({

packages/app/e2e/support/helpers/settings.ts

@@ -42,7 +42,6 @@ type HostSection =
   | "pair-device"
   | "agents"
   | "metadata"
-  | "voice"
   | "workspaces"
   | "providers"
   | "usage"
@@ -58,92 +57,6 @@ export async function openSettingsSection(page: Page, section: SettingsSection):
   await expectAppRoute(page, buildSettingsSectionRoute(section));
 }
 
-export async function revealSettingsSidebarSection(
-  page: Page,
-  section: SettingsSection,
-): Promise<number> {
-  await page
-    .getByRole("navigation", { name: "Settings" })
-    .getByRole("button", { name: SECTION_LABELS[section], exact: true })
-    .scrollIntoViewIfNeeded();
-  const offset = await page
-    .getByTestId("settings-sidebar-scroll-body")
-    .evaluate((node) => node.scrollTop);
-  expect(offset).toBeGreaterThan(0);
-  return offset;
-}
-
-export async function expectSettingsSidebarScrollSettled(
-  page: Page,
-  offset: number,
-): Promise<void> {
-  // RN Web emits its final scroll callback 100 ms after scrolling stops.
-  await page.waitForTimeout(200);
-  await expectSettingsSidebarScrollOffset(page, offset);
-}
-
-export async function selectSettingsHostSectionsRapidly(page: Page): Promise<void> {
-  for (let selection = 0; selection < 5; selection += 1) {
-    await page
-      .getByRole("navigation", { name: "Settings" })
-      .getByRole("button", { name: "Providers", exact: true })
-      .click();
-    await page
-      .getByRole("navigation", { name: "Settings" })
-      .getByRole("button", { name: "Terminals", exact: true })
-      .click();
-    await expectSettingsHeader(page, "Terminals");
-  }
-}
-
-export async function scrollSettingsSidebarUp(page: Page, pixels: number): Promise<void> {
-  await page.getByTestId("settings-sidebar-scroll-body").hover();
-  await page.mouse.wheel(0, -pixels);
-}
-
-export async function changeSettingsInterfaceFontSize(page: Page, size: number): Promise<void> {
-  const input = page.getByRole("textbox", { name: "Interface font size" });
-  await input.fill(String(size));
-  await input.press("Tab");
-  await expect(input).toHaveValue(String(size));
-}
-
-export async function scrollSettingsSidebarToEnd(page: Page): Promise<number> {
-  const scrollBody = page.locator('[data-testid="settings-sidebar-scroll-body"]:visible');
-  await scrollBody.hover();
-  await page.mouse.wheel(0, 2000);
-  await expect
-    .poll(() =>
-      scrollBody.evaluate((node) => node.scrollHeight - node.clientHeight - node.scrollTop),
-    )
-    .toBe(0);
-  const offset = await scrollBody.evaluate((node) => node.scrollTop);
-  expect(offset).toBeGreaterThan(0);
-  return offset;
-}
-
-export async function expectSettingsSidebarScrollOffset(page: Page, offset: number): Promise<void> {
-  const scrollBody = page.locator('[data-testid="settings-sidebar-scroll-body"]:visible');
-  await expect.poll(() => scrollBody.evaluate((node) => node.scrollTop)).toBe(offset);
-}
-
-export async function scrollSettingsDetailDown(page: Page): Promise<number> {
-  const scrollBody = page.getByTestId("settings-detail-scroll-body");
-  await expect
-    .poll(() => scrollBody.evaluate((node) => node.scrollHeight - node.clientHeight))
-    .toBeGreaterThan(0);
-  await scrollBody.hover();
-  await page.mouse.wheel(0, 1000);
-  await expect.poll(() => scrollBody.evaluate((node) => node.scrollTop)).toBeGreaterThan(0);
-  const offset = await scrollBody.evaluate((node) => node.scrollTop);
-  return offset;
-}
-
-export async function expectSettingsDetailScrollOffset(page: Page, offset: number): Promise<void> {
-  const scrollBody = page.getByTestId("settings-detail-scroll-body");
-  await expect.poll(() => scrollBody.evaluate((node) => node.scrollTop)).toBe(offset);
-}
-
 export async function openSettingsHost(page: Page, serverId: string): Promise<void> {
   // Host sections are now flat top-level rows under the Host group. Navigate by
   // clicking the Connections section row; the picker only matters when >1 host.
@@ -413,25 +326,6 @@ export async function expectHostInjectMcpCard(page: Page): Promise<void> {
   await expect(card.getByRole("switch", { name: "Inject Paseo tools" })).toBeVisible();
 }
 
-function idleAgentReleaseSwitch(page: Page) {
-  return page
-    .getByTestId("host-page-idle-runtime-cleanup-card")
-    .getByRole("switch", { name: "Release idle agents" });
-}
-
-export async function expectIdleAgentRelease(page: Page, enabled: boolean): Promise<void> {
-  const toggle = idleAgentReleaseSwitch(page);
-  await expect(toggle).toBeEnabled();
-  await expect(toggle).toHaveAttribute("aria-checked", String(enabled));
-}
-
-export async function setIdleAgentRelease(page: Page, enabled: boolean): Promise<void> {
-  const toggle = idleAgentReleaseSwitch(page);
-  await expect(toggle).toHaveAttribute("aria-checked", String(!enabled));
-  await toggle.click();
-  await expectIdleAgentRelease(page, enabled);
-}
-
 export async function openHostSection(
   page: Page,
   serverId: string,

packages/app/e2e/support/helpers/sidebar-nav-settings.ts

@@ -63,9 +63,8 @@ export async function seedSidebarFooterPreferences(
 ): Promise<void> {
   await page.addInitScript(
     ({ key, sidebarFooterItems }) => {
-      const settings = JSON.parse(localStorage.getItem(key) ?? "{}");
-      if (settings.sidebarFooterItems) return;
-      localStorage.setItem(key, JSON.stringify({ ...settings, sidebarFooterItems }));
+      if (localStorage.getItem(key)) return;
+      localStorage.setItem(key, JSON.stringify({ sidebarFooterItems }));
     },
     { key: APP_SETTINGS_KEY, sidebarFooterItems: preferences },
   );

packages/app/e2e/support/helpers/subagents.ts

@@ -188,7 +188,7 @@ export async function expectManagedSubagentArchived(
 }
 
 export async function archiveFinishedSubagents(page: Page): Promise<void> {
-  await page.getByRole("menuitem", { name: "Archive finished subagents" }).click();
+  await page.getByRole("button", { name: "Archive finished subagents" }).click();
 }
 
 export async function expectArchiveFinishedInProgress(
@@ -196,7 +196,7 @@ export async function expectArchiveFinishedInProgress(
   completed: number,
   total: number,
 ): Promise<void> {
-  await expect(page.getByRole("menuitem", { name: "Archive finished subagents" })).toBeDisabled();
+  await expect(page.getByRole("button", { name: "Archive finished subagents" })).toBeDisabled();
   await expect(page.getByText(`${completed}/${total}`, { exact: true })).toBeVisible();
 }
 
@@ -206,7 +206,7 @@ export async function expectArchiveFinishedRetry(
   total: number,
 ): Promise<void> {
   await expect(page.getByText(`Retry (${failed}/${total})`, { exact: true })).toBeVisible();
-  await expect(page.getByRole("menuitem", { name: "Archive finished subagents" })).toBeEnabled();
+  await expect(page.getByRole("button", { name: "Archive finished subagents" })).toBeEnabled();
 }
 
 export async function holdManagedSubagentArchiveRequest(

packages/app/e2e/support/helpers/voice-settings.ts

@@ -1,99 +0,0 @@
-import { rename, mkdir, rmdir } from "node:fs/promises";
-import path from "node:path";
-import { expect, type Locator, type Page } from "@playwright/test";
-import { gotoAppShell, openSettings } from "./app";
-import { connectNewWorkspaceDaemonClient } from "./new-workspace";
-import { getServerId } from "./server-id";
-import { expectSettingsHeader, openHostSection, openSettingsHost } from "./settings";
-
-export type SpeechSiteLabel = "Speech-to-text" | "Listening" | "Speaking";
-type SpeechSiteId = "dictation.stt" | "voiceMode.stt" | "voiceMode.tts";
-
-export async function openVoiceSettings(page: Page): Promise<void> {
-  const serverId = getServerId();
-  await gotoAppShell(page);
-  await openSettings(page);
-  await openSettingsHost(page, serverId);
-  await openHostSection(page, serverId, "voice");
-  await expectSettingsHeader(page, "Voice");
-}
-
-function speechSiteRow(page: Page, label: SpeechSiteLabel): Locator {
-  return page.getByRole("button", { name: new RegExp(`^${label}, `) });
-}
-
-export async function expectSpeechSiteSummary(
-  page: Page,
-  label: SpeechSiteLabel,
-  summary: string,
-): Promise<void> {
-  await expect(speechSiteRow(page, label)).toHaveAccessibleName(`${label}, ${summary}`);
-}
-
-/** Opens the provider sheet for one use site and returns it. */
-export async function openSpeechSite(page: Page, label: SpeechSiteLabel): Promise<Locator> {
-  await speechSiteRow(page, label).click();
-  const sheet = page.getByRole("dialog");
-  await expect(sheet.getByText(label, { exact: true })).toBeVisible();
-  return sheet;
-}
-
-export function providerOption(sheet: Locator, provider: "Local" | "OpenAI"): Locator {
-  return sheet.getByRole("button", { name: provider, exact: true });
-}
-
-export function apiKeyInput(sheet: Locator): Locator {
-  return sheet.getByRole("textbox", { name: "API key" });
-}
-
-export function baseUrlInput(sheet: Locator): Locator {
-  return sheet.getByRole("textbox", { name: "Base URL" });
-}
-
-export async function saveSpeechSite(sheet: Locator): Promise<void> {
-  await sheet.getByRole("button", { name: "Save", exact: true }).click();
-}
-
-export async function expectSheetClosed(page: Page): Promise<void> {
-  await expect(page.getByRole("dialog")).toHaveCount(0);
-}
-
-/** The speech site as the daemon reports it; the API key itself never leaves the daemon. */
-export async function readSpeechSite(siteId: SpeechSiteId): Promise<Record<string, unknown>> {
-  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
-  try {
-    const { config } = await client.getDaemonConfig();
-    const features = config.features as Record<string, Record<string, unknown>>;
-    const [feature, site] = siteId.split(".");
-    return features[feature][site] as Record<string, unknown>;
-  } finally {
-    await client.close().catch(() => undefined);
-  }
-}
-
-/** Puts a speech site back to the default provider so later tests start from a known state. */
-export async function resetSpeechSite(siteId: SpeechSiteId): Promise<void> {
-  const client = await connectNewWorkspaceDaemonClient({ ownProjects: false });
-  try {
-    const [feature, site] = siteId.split(".");
-    await client.patchDaemonConfig({ features: { [feature]: { [site]: { provider: "local" } } } });
-  } finally {
-    await client.close().catch(() => undefined);
-  }
-}
-
-/** Makes the daemon's config file unreadable for the duration of `run`. */
-export async function withUnwritableDaemonConfig(run: () => Promise<void>): Promise<void> {
-  const paseoHome = process.env.E2E_PASEO_HOME;
-  if (!paseoHome) throw new Error("E2E_PASEO_HOME is required to break the daemon config");
-  const configPath = path.join(paseoHome, "config.json");
-  const asidePath = `${configPath}.aside`;
-  await rename(configPath, asidePath);
-  await mkdir(configPath);
-  try {
-    await run();
-  } finally {
-    await rmdir(configPath);
-    await rename(asidePath, configPath);
-  }
-}

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "private": true,
   "main": "index.ts",
   "scripts": {
@@ -40,7 +40,7 @@
     "dev:ios": "npm --prefix ../.. run build:client && cross-env APP_VARIANT=development expo run:ios",
     "build:apk": "npm --prefix ../.. run build:apk",
     "build:apk:arm64": "npm --prefix ../.. run build:apk:arm64",
-    "test:android": "expo prebuild --platform android --no-install && cd android && ./gradlew :paseo-native-trace:testReleaseUnitTest :react-native-enriched-markdown:testReleaseUnitTest --tests '*InlineCodeFormattingTest' --no-daemon --max-workers=2 -Dorg.gradle.parallel=false"
+    "test:android": "expo prebuild --platform android --no-install && cd android && ./gradlew :paseo-native-trace:testReleaseUnitTest --no-daemon --max-workers=2 -Dorg.gradle.parallel=false"
   },
   "dependencies": {
     "@codemirror/commands": "6.10.4",
@@ -61,7 +61,6 @@
     "@gorhom/portal": "^1.0.14",
     "@marijn/find-cluster-break": "^1.0.2",
     "@mattermost/react-native-paste-input": "2.0.1",
-    "@noble/hashes": "^2.4.0",
     "@react-native-async-storage/async-storage": "2.2.0",
     "@react-native-masked-view/masked-view": "0.3.2",
     "@react-native/normalize-colors": "0.86.3",

packages/app/src/agent-presentation/index.ts

@@ -1,4 +1,3 @@
-import { useAgentCreation } from "@/workspace-creation";
 import { useShallow } from "zustand/shallow";
 import { useProviderIcon } from "@/components/provider-icons";
 import type { PanelDescriptor } from "@/panels/panel-registry";
@@ -34,7 +33,6 @@ export function useAgentDescriptor(
   target: { kind: "agent"; agentId: string },
   context: { serverId: string },
 ): PanelDescriptor {
-  const creation = useAgentCreation(context.serverId, target.agentId);
   const descriptorState = useSessionStore(
     useShallow((state) => {
       const session = state.sessions[context.serverId];
@@ -51,10 +49,8 @@ export function useAgentDescriptor(
       };
     }),
   );
-  const provider = creation ? creation.provider : descriptorState.provider;
-  const title = creation ? creation.text : descriptorState.title;
-  const icon = useProviderIcon(provider, context.serverId);
-  return buildAgentDescriptor({ ...descriptorState, provider, title, icon });
+  const icon = useProviderIcon(descriptorState.provider, context.serverId);
+  return buildAgentDescriptor({ ...descriptorState, icon });
 }
 
 export function buildAgentDescriptor(input: {

packages/app/src/agent-stream/chat-find/viewport.browser.test.ts

@@ -24,7 +24,6 @@ function viewport(root: HTMLElement, capture: Capture) {
   const handle: StreamViewportHandle = {
     scrollToBottom() {},
     prepareForViewportChange() {},
-    holdReadingPosition() {},
     scrollToMessage(_messageId, occurrence) {
       if (occurrence) capture.occurrence = occurrence;
     },

packages/app/src/agent-stream/chat-outline/use-chat-outline.test.tsx

@@ -265,7 +265,6 @@ describe("useChatOutline", () => {
     const viewport: StreamViewportHandle = {
       scrollToBottom: vi.fn(),
       prepareForViewportChange: vi.fn(),
-      holdReadingPosition: vi.fn(),
       scrollToMessage,
     };
     const viewportRef = { current: viewport };
@@ -317,7 +316,6 @@ describe("useChatOutline", () => {
       current: {
         scrollToBottom: vi.fn(),
         prepareForViewportChange: vi.fn(),
-        holdReadingPosition: vi.fn(),
         scrollToMessage,
       },
     };
@@ -373,7 +371,6 @@ describe("useChatOutline", () => {
     const viewport: StreamViewportHandle = {
       scrollToBottom: vi.fn(),
       prepareForViewportChange: vi.fn(),
-      holdReadingPosition: vi.fn(),
       scrollToMessage,
     };
     const livePrompt = {

packages/app/src/agent-stream/presentation.test.ts

@@ -4,7 +4,6 @@ import { transformTimelineItem, type TimelineItemTransform } from "@/plugins/tim
 import type { InstalledPlugin } from "@/plugins/types";
 import {
   applyStreamEvent,
-  getStreamItemMessageId,
   hydrateStreamState,
   type StreamItem,
   type ToolCallItem,
@@ -14,7 +13,7 @@ import type { AgentStreamEventPayload } from "@getpaseo/protocol/messages";
 import { QueryClient } from "@tanstack/react-query";
 import { describe, expect, it } from "vitest";
 import { buildAgentStreamRenderModel } from "./model";
-import { createStreamPresentation } from "./presentation";
+import { createStreamPresentation, getStreamItemMessageId } from "./presentation";
 
 const runtime = {
   paseo: {},
@@ -98,11 +97,7 @@ function pluginData(items: StreamItem[]): unknown[] {
   return items.flatMap((item) => (item.kind === "plugin" ? [item.data] : []));
 }
 
-const presentationOptions = {
-  display: "collapseToolCalls" as const,
-  expandedTurnHostIds: new Set<string>(),
-  isTurnActive: true,
-};
+const presentationOptions = { level: "overview" as const, isTurnActive: true };
 
 function streamHarness(transform?: TimelineItemTransform) {
   let state: { tail: StreamItem[]; head: StreamItem[] } = { tail: [], head: [] };

packages/app/src/agent-stream/presentation.ts

@@ -1,4 +1,3 @@
-import type { ChatDisplay } from "@/hooks/use-settings";
 import type { TimelineItemTransform } from "@/plugins/timeline/model";
 import { projectPluginTimelineItems } from "@/plugins/timeline/projection";
 import {
@@ -6,32 +5,23 @@ import {
   projectToolCallDetailLevel,
   type PreparedToolCallHistory,
   type ToolCallDetailLevel,
-  type ToolCallDetailProjection,
 } from "@/tool-calls/detail-level/projection";
 import type { StreamItem, UserMessageItem } from "@/types/stream";
-import { collapseTurns, type TurnCollapse } from "./turn-collapse/model";
 
 interface PresentationInput {
   tail: StreamItem[];
   head: StreamItem[];
   transform: TimelineItemTransform | undefined;
-  display: ChatDisplay;
-  /** User messages whose collapsed turn the reader opened. */
-  expandedTurnHostIds: ReadonlySet<string>;
+  level: ToolCallDetailLevel;
   isTurnActive: boolean;
 }
 
-export interface StreamPresentation extends ToolCallDetailProjection {
-  turns: Omit<TurnCollapse, "tail">;
+/** Find and scrolling address a plugin row by the source it replaces. */
+export function getStreamItemMessageId(item: StreamItem): string {
+  if (item.kind === "plugin") return item.sourceId ?? item.id;
+  return item.id;
 }
 
-const NO_COLLAPSED_TURNS: StreamPresentation["turns"] = collapseTurns({
-  tail: [],
-  isLatestTurnOpen: false,
-  expandedHostIds: new Set(),
-  getGroupedCalls: () => undefined,
-});
-
 /** Source messages reach plugins before display projection. */
 export function createStreamPresentation() {
   const userMessageCache = new WeakMap<UserMessageItem, UserMessageItem>();
@@ -57,47 +47,12 @@ export function createStreamPresentation() {
   let preparedTail: StreamItem[] | undefined;
   let preparedLevel: ToolCallDetailLevel | undefined;
   let preparedHistory: PreparedToolCallHistory | null = null;
-  let collapsedSource: StreamItem[] | undefined;
-  let collapsedIsLatestTurnOpen = false;
-  let collapsedExpandedHostIds: ReadonlySet<string> | undefined;
-  let collapsed: TurnCollapse | undefined;
 
   function presentRows(item: StreamItem): StreamItem[] {
     return [item.kind === "user_message" ? presentUserMessage(item) : item];
   }
 
-  function collapse(
-    projection: ToolCallDetailProjection,
-    input: PresentationInput,
-  ): StreamPresentation {
-    if (input.display !== "collapseTurns") {
-      return { ...projection, turns: NO_COLLAPSED_TURNS };
-    }
-    // Live text updates reach the head only, so the folded history is reused until the
-    // retained rows, the latest turn's liveness, or the reader's expanded turns change.
-    const isLatestTurnOpen = input.isTurnActive || projection.head.length > 0;
-    if (
-      !collapsed ||
-      collapsedSource !== projection.tail ||
-      collapsedIsLatestTurnOpen !== isLatestTurnOpen ||
-      collapsedExpandedHostIds !== input.expandedTurnHostIds
-    ) {
-      collapsed = collapseTurns({
-        tail: projection.tail,
-        isLatestTurnOpen,
-        expandedHostIds: input.expandedTurnHostIds,
-        getGroupedCalls: (itemId) => projection.groupsByHostId.get(itemId)?.run.calls,
-      });
-      collapsedSource = projection.tail;
-      collapsedIsLatestTurnOpen = isLatestTurnOpen;
-      collapsedExpandedHostIds = input.expandedTurnHostIds;
-    }
-    const { tail, ...turns } = collapsed;
-    return { ...projection, tail, turns };
-  }
-
-  return (input: PresentationInput): StreamPresentation => {
-    const level: ToolCallDetailLevel = input.display === "full" ? "detailed" : "overview";
+  return (input: PresentationInput) => {
     // Retained history is not reprojected or regrouped on each live text update.
     if (historySource !== input.tail || historyTransform !== input.transform) {
       historyRows = projectPluginTimelineItems(input.tail, input.transform).flatMap<StreamItem>(
@@ -111,20 +66,17 @@ export function createStreamPresentation() {
       const blocks = presentRows(item);
       head.push(...blocks);
     }
-    if (preparedTail !== historyRows || preparedLevel !== level) {
-      preparedHistory = prepareToolCallHistory(level, historyRows);
+    if (preparedTail !== historyRows || preparedLevel !== input.level) {
+      preparedHistory = prepareToolCallHistory(input.level, historyRows);
       preparedTail = historyRows;
-      preparedLevel = level;
+      preparedLevel = input.level;
     }
-    return collapse(
-      projectToolCallDetailLevel({
-        level,
-        tail: historyRows,
-        head,
-        preparedHistory,
-        isTurnActive: input.isTurnActive,
-      }),
-      input,
-    );
+    return projectToolCallDetailLevel({
+      level: input.level,
+      tail: historyRows,
+      head,
+      preparedHistory,
+      isTurnActive: input.isTurnActive,
+    });
   };
 }

packages/app/src/agent-stream/strategy-native.tsx

@@ -361,7 +361,6 @@ function NativeStreamViewport(props: StreamRenderInput & { strategy: StreamStrat
         bottomAnchorController.prepareForStickyViewportChange();
         markNativeViewportSettling();
       },
-      holdReadingPosition: () => bottomAnchorController.detachByUser(),
     };
     viewportRef.current = handle;
     return () => {

packages/app/src/agent-stream/strategy-web.tsx

@@ -20,7 +20,7 @@ import { withUnistyles } from "react-native-unistyles";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { useStableEvent } from "@/hooks/use-stable-event";
-import { getStreamItemMessageId, type StreamItem } from "@/types/stream";
+import type { StreamItem } from "@/types/stream";
 import type { Theme } from "@/styles/theme";
 import { WEB_SCROLLBAR_SIZE_PX } from "@/styles/web-scrollbar";
 import { DomOverlayScrollbar } from "@/components/ui/overlay-scrollbar/dom-overlay-scrollbar";
@@ -44,6 +44,7 @@ import {
   type HistoryStartSettleScheduler,
 } from "./history-start-settle-scheduler";
 import { useChatFindSelectedMessageId } from "@/agent-stream/chat-find";
+import { getStreamItemMessageId } from "./presentation";
 import { useScrollToMessage } from "./use-scroll-to-message.web";
 
 interface CreateWebStreamStrategyInput {
@@ -1173,11 +1174,6 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
         }
         scheduleStickToBottom();
       },
-      holdReadingPosition: () => {
-        cancelPendingStickToBottom();
-        setFollowOutput(false);
-        readingAnchor.scroll(scrollContainerRef.current?.scrollTop ?? 0);
-      },
       scrollToMessage,
     };
     viewportRef.current = handle;
@@ -1190,7 +1186,6 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
   }, [
     cancelPendingStickToBottom,
     forceStickToBottom,
-    readingAnchor,
     scheduleStickToBottom,
     scrollToMessage,
     viewportRef,

packages/app/src/agent-stream/strategy.ts

@@ -55,8 +55,6 @@ export interface StreamViewportHandle {
   focus?: () => void;
   scrollToBottom: (reason?: BottomAnchorLocalRequest["reason"]) => void;
   prepareForViewportChange: () => void;
-  /** Stop following output so the rows on screen stay put while rows below them open or close. */
-  holdReadingPosition: () => void;
   scrollToMessage?: (messageId: string, occurrence?: ScrollToMessageOccurrence) => void;
 }
 

packages/app/src/agent-stream/turn-collapse/model.test.ts

@@ -1,134 +0,0 @@
-import { describe, expect, it } from "vitest";
-import type { StreamItem, ToolCallItem } from "@/types/stream";
-import { collapseTurns, type CollapseTurnsInput } from "./model";
-
-const at = new Date("2026-01-01T00:00:00.000Z");
-
-function user(id: string): StreamItem {
-  return { kind: "user_message", id, text: id, timestamp: at };
-}
-
-function reply(id: string): StreamItem {
-  return { kind: "assistant_message", id, text: id, timestamp: at };
-}
-
-function thought(id: string): StreamItem {
-  return { kind: "thought", id, text: id, timestamp: at, status: "ready" };
-}
-
-function shell(id: string): ToolCallItem {
-  return {
-    kind: "tool_call",
-    id,
-    timestamp: at,
-    payload: {
-      source: "agent",
-      data: {
-        provider: "claude",
-        callId: id,
-        name: "Bash",
-        status: "completed",
-        error: null,
-        detail: { type: "shell", command: "ls" },
-      },
-    },
-  };
-}
-
-function collapse(tail: StreamItem[], options: Partial<CollapseTurnsInput> = {}) {
-  return collapseTurns({
-    tail,
-    isLatestTurnOpen: false,
-    expandedHostIds: new Set(),
-    getGroupedCalls: () => undefined,
-    ...options,
-  });
-}
-
-const ids = (items: StreamItem[]) => items.map((item) => item.id);
-
-describe("collapseTurns", () => {
-  it("folds a finished turn's work into its user message and keeps the reply", () => {
-    const result = collapse([
-      user("u1"),
-      thought("t1"),
-      reply("early"),
-      shell("c1"),
-      shell("c2"),
-      reply("final"),
-    ]);
-
-    expect(ids(result.tail)).toEqual(["u1", "final"]);
-    expect(result.turnsByHostId.get("u1")).toEqual({
-      hostId: "u1",
-      expanded: false,
-      summary: {
-        messageCount: 1,
-        tools: expect.objectContaining({ commandCount: 2 }),
-      },
-    });
-    expect(result.hostIdByFoldedMessageId.get("early")).toBe("u1");
-  });
-
-  it("shows an expanded turn's work as nested rows between the prompt and the reply", () => {
-    const result = collapse([user("u1"), thought("t1"), shell("c1"), reply("final")], {
-      expandedHostIds: new Set(["u1"]),
-    });
-
-    expect(ids(result.tail)).toEqual(["u1", "t1", "c1", "final"]);
-    expect([...result.nestedItemIds]).toEqual(["t1", "c1"]);
-    expect(result.turnsByHostId.get("u1")?.expanded).toBe(true);
-  });
-
-  it("leaves the latest turn alone while it is still producing output", () => {
-    const tail = [user("u1"), shell("c1"), reply("r1"), user("u2"), shell("c2"), reply("r2")];
-
-    const result = collapse(tail, { isLatestTurnOpen: true });
-
-    expect(ids(result.tail)).toEqual(["u1", "r1", "u2", "c2", "r2"]);
-    expect([...result.turnsByHostId.keys()]).toEqual(["u1"]);
-  });
-
-  it("keeps rows after the reply, and turns with no work before the reply, as they are", () => {
-    const result = collapse([
-      user("u1"),
-      shell("c1"),
-      reply("r1"),
-      shell("after"),
-      user("u2"),
-      reply("r2"),
-    ]);
-
-    expect(ids(result.tail)).toEqual(["u1", "r1", "after", "u2", "r2"]);
-    expect([...result.turnsByHostId.keys()]).toEqual(["u1"]);
-  });
-
-  it("does not fold a turn that only thought before its reply", () => {
-    const tail = [user("u1"), thought("t1"), reply("r1")];
-
-    const result = collapse(tail);
-
-    expect(result.tail).toBe(tail);
-    expect(result.turnsByHostId.size).toBe(0);
-  });
-
-  it("does not fold a turn without a reply or whose prompt is above the loaded history", () => {
-    const tail = [shell("c0"), reply("r0"), user("u1"), shell("c1")];
-
-    const result = collapse(tail);
-
-    expect(result.tail).toBe(tail);
-    expect(result.turnsByHostId.size).toBe(0);
-  });
-
-  it("counts every call a tool-call group row stands for", () => {
-    const group = [shell("c1"), shell("c2"), shell("c3")];
-    const result = collapse([user("u1"), group[0]!, reply("final")], {
-      getGroupedCalls: (itemId) => (itemId === "c1" ? group : undefined),
-    });
-
-    expect(result.turnsByHostId.get("u1")?.summary).toMatchObject({
-      tools: { commandCount: 3 },
-    });
-  });
-});

packages/app/src/agent-stream/turn-collapse/model.ts

@@ -1,122 +0,0 @@
-import { getStreamItemMessageId, type StreamItem, type ToolCallItem } from "@/types/stream";
-import { summarizeToolCalls, type OverviewSummary } from "@/tool-calls/detail-level/overview/model";
-
-export interface TurnSummary {
-  messageCount: number;
-  tools: OverviewSummary;
-}
-
-export interface CollapsedTurn {
-  /** The user message the turn answers. Its row carries the turn's summary line. */
-  hostId: string;
-  expanded: boolean;
-  summary: TurnSummary;
-}
-
-export interface TurnCollapse {
-  tail: StreamItem[];
-  turnsByHostId: ReadonlyMap<string, CollapsedTurn>;
-  /** Rows of expanded turns, which render inside the turn's indent rail. */
-  nestedItemIds: ReadonlySet<string>;
-  /** The turn a folded message belongs to, for surfaces that must reveal it. */
-  hostIdByFoldedMessageId: ReadonlyMap<string, string>;
-}
-
-export interface CollapseTurnsInput {
-  tail: StreamItem[];
-  /** The latest turn is still producing output, so it stays unfolded. */
-  isLatestTurnOpen: boolean;
-  expandedHostIds: ReadonlySet<string>;
-  /** The calls a tool-call group row stands for; undefined for a single call. */
-  getGroupedCalls: (itemId: string) => readonly ToolCallItem[] | undefined;
-}
-
-const EMPTY_TURNS: ReadonlyMap<string, CollapsedTurn> = new Map();
-const EMPTY_IDS: ReadonlySet<string> = new Set();
-const EMPTY_HOSTS: ReadonlyMap<string, string> = new Map();
-
-function summarizeTurn(
-  items: readonly StreamItem[],
-  getGroupedCalls: CollapseTurnsInput["getGroupedCalls"],
-): TurnSummary {
-  const calls: ToolCallItem[] = [];
-  let messageCount = 0;
-  for (const item of items) {
-    if (item.kind === "assistant_message") messageCount += 1;
-    else if (item.kind === "tool_call") calls.push(...(getGroupedCalls(item.id) ?? [item]));
-  }
-  return { messageCount, tools: summarizeToolCalls(calls) };
-}
-
-function hasWork(summary: TurnSummary): boolean {
-  return summary.messageCount > 0 || Object.values(summary.tools).some((count) => count > 0);
-}
-
-function findLastAssistantIndex(tail: StreamItem[], start: number, end: number): number {
-  for (let index = end - 1; index >= start; index -= 1) {
-    if (tail[index]?.kind === "assistant_message") return index;
-  }
-  return -1;
-}
-
-/**
- * Folds each answered turn into its user message: everything the agent did before its last
- * message collapses into one summary line, and that message stays in the chat. A turn folds
- * only once it is complete, its user message is loaded, and it sent messages or called tools
- * before its reply. Thoughts fold with the turn but are not counted.
- */
-export function collapseTurns(input: CollapseTurnsInput): TurnCollapse {
-  const { tail } = input;
-  const output: StreamItem[] = [];
-  const turnsByHostId = new Map<string, CollapsedTurn>();
-  const nestedItemIds = new Set<string>();
-  const hostIdByFoldedMessageId = new Map<string, string>();
-
-  let runStart = 0;
-  const flushRun = (runEnd: number) => {
-    const host = tail[runStart - 1];
-    const isClosed = runEnd < tail.length || !input.isLatestTurnOpen;
-    const replyIndex = findLastAssistantIndex(tail, runStart, runEnd);
-    if (host?.kind !== "user_message" || !isClosed || replyIndex <= runStart) {
-      output.push(...tail.slice(runStart, runEnd));
-      return;
-    }
-    const folded = tail.slice(runStart, replyIndex);
-    const summary = summarizeTurn(folded, input.getGroupedCalls);
-    if (!hasWork(summary)) {
-      output.push(...tail.slice(runStart, runEnd));
-      return;
-    }
-    const expanded = input.expandedHostIds.has(host.id);
-    turnsByHostId.set(host.id, { hostId: host.id, expanded, summary });
-    for (const item of folded) {
-      hostIdByFoldedMessageId.set(getStreamItemMessageId(item), host.id);
-      if (expanded) nestedItemIds.add(item.id);
-    }
-    if (expanded) output.push(...folded);
-    output.push(...tail.slice(replyIndex, runEnd));
-  };
-
-  for (let index = 0; index < tail.length; index += 1) {
-    if (tail[index]?.kind !== "user_message") continue;
-    flushRun(index);
-    output.push(tail[index]!);
-    runStart = index + 1;
-  }
-  flushRun(tail.length);
-
-  if (turnsByHostId.size === 0) {
-    return {
-      tail,
-      turnsByHostId: EMPTY_TURNS,
-      nestedItemIds: EMPTY_IDS,
-      hostIdByFoldedMessageId: EMPTY_HOSTS,
-    };
-  }
-  return {
-    tail: output.length === tail.length ? tail : output,
-    turnsByHostId,
-    nestedItemIds,
-    hostIdByFoldedMessageId,
-  };
-}

packages/app/src/agent-stream/turn-collapse/summary-line.tsx

@@ -1,48 +0,0 @@
-import { memo, useCallback, useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { Summary } from "lucide-react-native";
-import { ExpandableBadge } from "@/components/message";
-import { useOverviewSummaryLabel } from "@/tool-calls/detail-level/overview/label";
-import type { CollapsedTurn } from "./model";
-
-/**
- * The row a collapsed turn leaves under its user message, styled like a tool-call group.
- * Pressing it opens the turn's rows beneath it.
- */
-export const TurnSummaryLine = memo(function TurnSummaryLine({
-  turn,
-  onExpandedChange,
-}: {
-  turn: CollapsedTurn;
-  onExpandedChange: (hostId: string, expanded: boolean) => void;
-}) {
-  const { t } = useTranslation();
-  const { messageCount, tools } = turn.summary;
-  const messageParts = useMemo(
-    () =>
-      messageCount > 0
-        ? [
-            t(`turnSummary.messages.${messageCount === 1 ? "one" : "other"}`, {
-              count: messageCount,
-            }),
-          ]
-        : [],
-    [messageCount, t],
-  );
-  const label = useOverviewSummaryLabel(tools, messageParts);
-  const toggle = useCallback(
-    () => onExpandedChange(turn.hostId, !turn.expanded),
-    [onExpandedChange, turn.expanded, turn.hostId],
-  );
-
-  return (
-    <ExpandableBadge
-      testID="turn-summary"
-      label={label}
-      icon={Summary}
-      isExpanded={turn.expanded}
-      onToggle={toggle}
-      borderlessWhenExpanded
-    />
-  );
-});

packages/app/src/agent-stream/use-agent-stream-tail.ts

@@ -1,12 +0,0 @@
-import { useRetainedPanelActive } from "@/components/retained-panel";
-import { useSessionStore } from "@/stores/session-store";
-
-// The view retains its last visible transcript. Selecting a stable value here
-// also prevents incoming chunks from scheduling React work in a hidden panel.
-// Revealing the panel reads the current tail directly from the model.
-export function useAgentStreamTail(serverId: string, agentId: string | undefined) {
-  const active = useRetainedPanelActive();
-  return useSessionStore((state) =>
-    active && agentId ? state.sessions[serverId]?.agentStreamTail.get(agentId) : undefined,
-  );
-}

packages/app/src/agent-stream/use-scroll-to-message.web.ts

@@ -1,7 +1,8 @@
 import type React from "react";
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef } from "react";
 import type { Virtualizer } from "@tanstack/react-virtual";
-import { getStreamItemMessageId, type StreamItem } from "@/types/stream";
+import type { StreamItem } from "@/types/stream";
+import { getStreamItemMessageId } from "./presentation";
 import { createPromptJumpSettleController, PROMPT_JUMP_TOP_INSET_PX } from "./prompt-jump-settle";
 import type { ScrollToMessageOccurrence } from "./strategy";
 

packages/app/src/agent-stream/use-stream-history-window.ts

@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { getStreamItemMessageId, type StreamItem } from "@/types/stream";
+import type { StreamItem } from "@/types/stream";
 import { findMountedWindowStart, getMountedRecentStreamItems } from "./history-window";
+import { getStreamItemMessageId } from "./presentation";
 
 // Callers reveal a message, not a row: an assistant message is several block rows and
 // the window has to open at the first of them.

packages/app/src/agent-stream/view.tsx

@@ -41,7 +41,7 @@ import {
   type InlinePathTarget,
 } from "@/components/message";
 import { PlanCard } from "@/components/plan-card";
-import { getStreamItemMessageId, type StreamItem } from "@/types/stream";
+import type { StreamItem } from "@/types/stream";
 import type { PendingMessageSubmission } from "@/composer/submission/model";
 import type { TurnPresentation } from "@/timeline/turn-liveness";
 import type { PendingPermission } from "@/types/shared";
@@ -62,10 +62,8 @@ import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { ToolCallDetailsContent } from "@/components/tool-call-details";
 import { QuestionFormCard } from "@/components/question-form-card";
 import { ToolCallSheetProvider } from "@/components/tool-call-sheet";
-import { createStreamPresentation } from "./presentation";
+import { createStreamPresentation, getStreamItemMessageId } from "./presentation";
 import { OverviewToolCallGroupView } from "@/tool-calls/detail-level/overview/view";
-import { IndentRail } from "@/components/indent-rail";
-import { TurnSummaryLine } from "./turn-collapse/summary-line";
 import { type AgentStreamRenderModel, buildAgentStreamRenderModel } from "./model";
 import { resolveStreamRenderStrategy } from "./strategy-resolver";
 import { type StreamSegmentRenderers, type StreamViewportHandle } from "./strategy";
@@ -150,16 +148,9 @@ function renderPendingPermissionsNode(input: {
   );
 }
 
-/**
- * Where a row sits in an opened turn: its summary line's row, a row inside the turn, or the
- * turn's last row. The rail runs through the gaps between them so the turn reads as one block.
- */
-type TurnIndent = "none" | "openedHost" | "nested" | "lastNested";
-
 function renderStreamItemWithTurnFooter(input: {
   content: ReactNode;
   layoutItem: StreamLayoutItem;
-  turnIndent: TurnIndent;
   strategy: TurnContentStrategy;
   supportsTimelineCursor: boolean;
   onForkAssistantTurn?: AssistantTurnForkHandler;
@@ -180,7 +171,7 @@ function renderStreamItemWithTurnFooter(input: {
     />
   ) : null;
   const content = (
-    <StreamItemWrapper gapBelow={input.layoutItem.gapBelow} turnIndent={input.turnIndent}>
+    <StreamItemWrapper itemId={input.layoutItem.item.id} gapBelow={input.layoutItem.gapBelow}>
       {input.content}
     </StreamItemWrapper>
   );
@@ -342,7 +333,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
   ) {
     const { t } = useTranslation();
     const autoExpandReasoning = useSettings((settings) => settings.autoExpandReasoning);
-    const chatDisplay = useSettings((settings) => settings.chatDisplay);
+    const toolCallDetailLevel = useSettings((settings) => settings.toolCallDetailLevel);
     const chatOutlineEnabled = useSettings((settings) => settings.chatOutlineEnabled);
     const contentMaxWidth = useSettings(resolveContentMaxWidth);
     const viewportRef = useRef<StreamViewportHandle | null>(null);
@@ -366,7 +357,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     const [expandedToolCallGroupIds, setExpandedToolCallGroupIds] = useState<Set<string>>(
       new Set(),
     );
-    const [expandedTurnHostIds, setExpandedTurnHostIds] = useState<ReadonlySet<string>>(new Set());
 
     // Get serverId (fallback to agent's serverId if not provided)
     const resolvedServerId = serverId ?? context.serverId ?? "";
@@ -431,7 +421,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       setIsNearBottom(true);
       setExpandedInlineToolCallIds(new Set());
       setExpandedToolCallGroupIds(new Set());
-      setExpandedTurnHostIds(new Set());
     }, [agentId]);
 
     const isActive = useRetainedPanelActive();
@@ -523,8 +512,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
           tail: effectiveStreamItems,
           head: effectiveStreamHead ?? EMPTY_STREAM_HEAD,
           transform: transformTimelineItem,
-          display: chatDisplay,
-          expandedTurnHostIds,
+          level: toolCallDetailLevel,
           isTurnActive,
         }),
       [
@@ -532,8 +520,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
         effectiveStreamItems,
         effectiveStreamHead,
         transformTimelineItem,
-        chatDisplay,
-        expandedTurnHostIds,
+        toolCallDetailLevel,
         isTurnActive,
       ],
     );
@@ -664,43 +651,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
       [streamRenderStrategy],
     );
 
-    const setTurnExpanded = useCallback((hostId: string, expanded: boolean) => {
-      // A turn opens below its summary line; keep that line under the reader's pointer.
-      viewportRef.current?.holdReadingPosition();
-      setExpandedTurnHostIds((previous) => {
-        if (previous.has(hostId) === expanded) return previous;
-        const next = new Set(previous);
-        if (expanded) {
-          next.add(hostId);
-        } else {
-          next.delete(hostId);
-        }
-        return next;
-      });
-    }, []);
-    // Chat find reveals a match inside a collapsed turn by opening the turn first.
-    const revealLoadedMessage = useStableEvent((messageId: string): boolean => {
-      const hostId = presentation.turns.hostIdByFoldedMessageId.get(messageId);
-      if (hostId && !expandedTurnHostIds.has(hostId)) {
-        setTurnExpanded(hostId, true);
-        return true;
-      }
-      return revealLoadedHistory(messageId);
-    });
-    // Read through stable events so a collapse rerun does not change the renderer identity;
-    // rows whose turn state changed are revised through `historyRowRevision`.
-    const getCollapsedTurn = useStableEvent((hostId: string) =>
-      presentation.turns.turnsByHostId.get(hostId),
-    );
-    const getTurnIndent = useStableEvent((layoutItem: StreamLayoutItem): TurnIndent => {
-      const { nestedItemIds } = presentation.turns;
-      if (nestedItemIds.has(layoutItem.item.id)) {
-        const below = layoutItem.belowItem;
-        return below && nestedItemIds.has(below.id) ? "nested" : "lastNested";
-      }
-      return getCollapsedTurn(layoutItem.item.id)?.expanded ? "openedHost" : "none";
-    });
-
     const setToolCallGroupExpanded = useCallback((groupId: string, expanded: boolean) => {
       setExpandedToolCallGroupIds((previous) => {
         const next = new Set(previous);
@@ -715,8 +665,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
 
     const renderUserMessageItem = useCallback(
       (layoutItem: StreamLayoutItem, item: Extract<StreamItem, { kind: "user_message" }>) => {
-        const collapsedTurn = getCollapsedTurn(item.id);
-        const message = (
+        return (
           <UserMessage
             serverId={resolvedServerId}
             agentId={agentId}
@@ -735,25 +684,8 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
             }
           />
         );
-        if (!collapsedTurn) {
-          return message;
-        }
-        return (
-          <>
-            {message}
-            <TurnSummaryLine turn={collapsedTurn} onExpandedChange={setTurnExpanded} />
-          </>
-        );
       },
-      [
-        context.capabilities,
-        agentId,
-        client,
-        getCollapsedTurn,
-        pendingClientMessageIds,
-        resolvedServerId,
-        setTurnExpanded,
-      ],
+      [context.capabilities, agentId, client, pendingClientMessageIds, resolvedServerId],
     );
 
     const renderAssistantMessageItem = useCallback(
@@ -961,14 +893,12 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
         return renderStreamItemWithTurnFooter({
           content,
           layoutItem,
-          turnIndent: getTurnIndent(layoutItem),
           strategy: streamRenderStrategy,
           supportsTimelineCursor: supportsAgentForkContextCursor,
           onForkAssistantTurn: readOnly ? undefined : handleForkAssistantTurn,
         });
       },
       [
-        getTurnIndent,
         handleForkAssistantTurn,
         readOnly,
         renderStreamItemContent,
@@ -1130,25 +1060,13 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
     const streamScrollEnabled =
       !streamRenderStrategy.shouldDisableParentScrollOnInlineDetailsExpansion() ||
       expandedInlineToolCallIds.size === 0;
-    const { nestedItemIds } = presentation.turns;
     const historyRowRevision = useMemo(
       () => ({
         contentById: presentation.historyGroupUpdatesByHostId,
-        displayStateById: {
-          has: (id: string) =>
-            expandedToolCallGroupIds.has(id) ||
-            expandedTurnHostIds.has(id) ||
-            nestedItemIds.has(id),
-        },
+        displayStateById: expandedToolCallGroupIds,
         globalDisplayState: isMobile,
       }),
-      [
-        expandedToolCallGroupIds,
-        expandedTurnHostIds,
-        isMobile,
-        nestedItemIds,
-        presentation.historyGroupUpdatesByHostId,
-      ],
+      [expandedToolCallGroupIds, isMobile, presentation.historyGroupUpdatesByHostId],
     );
 
     const findItems = useMemo(
@@ -1162,7 +1080,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
         epoch={timelineEpoch}
         items={findItems}
         viewportRef={viewportRef}
-        revealLoadedMessage={revealLoadedMessage}
+        revealLoadedMessage={revealLoadedHistory}
         visibleMessageIds={mountedMessageIds}
       >
         <ToolCallSheetProvider>
@@ -1845,41 +1763,15 @@ const permissionStyles = StyleSheet.create((theme) => ({
 }));
 
 interface StreamItemWrapperProps {
+  itemId: string;
   gapBelow: number;
-  turnIndent: TurnIndent;
   children: ReactNode;
 }
 
-function StreamItemWrapper({ gapBelow, turnIndent, children }: StreamItemWrapperProps) {
+function StreamItemWrapper({ gapBelow, children }: StreamItemWrapperProps) {
   const wrapperStyle = useMemo(
-    () => [
-      stylesheet.streamItemWrapper,
-      { marginBottom: turnIndent === "nested" || turnIndent === "openedHost" ? 0 : gapBelow },
-    ],
-    [gapBelow, turnIndent],
+    () => [stylesheet.streamItemWrapper, { marginBottom: gapBelow }],
+    [gapBelow],
   );
-  const gapStyle = useMemo(() => ({ paddingBottom: gapBelow }), [gapBelow]);
-  switch (turnIndent) {
-    case "none":
-      return <View style={wrapperStyle}>{children}</View>;
-    case "openedHost":
-      return (
-        <View style={wrapperStyle}>
-          {children}
-          <IndentRail style={gapStyle} />
-        </View>
-      );
-    case "nested":
-      return (
-        <View style={wrapperStyle}>
-          <IndentRail style={gapStyle}>{children}</IndentRail>
-        </View>
-      );
-    case "lastNested":
-      return (
-        <View style={wrapperStyle}>
-          <IndentRail>{children}</IndentRail>
-        </View>
-      );
-  }
+  return <View style={wrapperStyle}>{children}</View>;
 }

packages/app/src/app/_layout.tsx

@@ -72,7 +72,6 @@ import {
   type StartupBlocker,
 } from "@/navigation/host-runtime-bootstrap";
 import { registerWorkspaceRouteNavigationRef } from "@/navigation/workspace-route-navigation";
-import { useSettingsRouteEntry } from "@/navigation/settings-presentation";
 import { ThemedStack } from "@/navigation/themed-stack";
 import { shouldUseDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
 import { AgentNavigationListener } from "@/desktop/agent-navigation";
@@ -760,7 +759,6 @@ function OpenProjectListener() {
 }
 
 function AppWithSidebar({ children }: { children: ReactNode }) {
-  useSettingsRouteEntry();
   const pathname = usePathname();
   const hosts = useHosts();
   const storeReady = useStoreReady();

packages/app/src/app/h/[serverId]/agent/[agentId].tsx

@@ -5,7 +5,6 @@ import { useFetchQuery } from "@/data/query";
 import { resolveAgentRoute, type AgentRouteLookup } from "@/navigation/agent-route-resolution";
 import { AgentRouteResolutionView } from "@/navigation/agent-route-resolution-view";
 import { useHasHydratedWorkspaces } from "@/stores/session-store-hooks";
-import { useDirectoryDemand } from "@/hooks/use-directory-demand";
 import { useWorkspaceLayoutStoreHydrated } from "@/stores/workspace-layout-store";
 import { useSessionStore } from "@/stores/session-store";
 import { getHostRuntimeStore, useHostRuntimeSnapshot, useHosts } from "@/runtime/host-runtime";
@@ -88,7 +87,11 @@ function HostAgentReadyRouteContent() {
   ]);
   const hasHydratedWorkspaces = useHasHydratedWorkspaces(serverId);
   const hasHydratedLayout = useWorkspaceLayoutStoreHydrated();
-  useDirectoryDemand(serverId);
+  useEffect(() => {
+    if (!serverId) return;
+    // A compact app can open this route before its sidebar has demanded the directory.
+    return getHostRuntimeStore().acquireDirectoryDemand(serverId);
+  }, [serverId]);
   const resolution = resolveAgentRoute({
     hasHydratedWorkspaces,
     hasHydratedLayout,

packages/app/src/app/h/[serverId]/workspace/[workspaceId]/index.tsx

@@ -9,7 +9,6 @@ import {
   useActiveWorkspaceSelection,
 } from "@/stores/navigation-active-workspace-store";
 import { useHasHydratedWorkspaces, useWorkspaceExists } from "@/stores/session-store-hooks";
-import { useDirectoryDemand } from "@/hooks/use-directory-demand";
 import type { WorkspaceTabTarget } from "@/workspace-tabs/model";
 import { WorkspaceScreen } from "@/screens/workspace/workspace-screen";
 import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
@@ -111,10 +110,6 @@ function HostWorkspaceRouteContent() {
     ? (decodeWorkspaceIdFromPathSegment(workspaceValue) ?? "")
     : "";
   const openValue = getParamValue(params.open);
-  // A restored workspace with no open chat has nothing else demanding its host's directory on a
-  // phone, where the sidebar only demands while its panel is active. Without demand the deck
-  // waits on workspace hydration that never starts.
-  useDirectoryDemand(serverId);
   useEffect(() => {
     if (!serverId || !workspaceId) {
       return;

packages/app/src/components/context-window-meter.tsx

@@ -112,9 +112,8 @@ const ContextWindowRing = withUnistyles(function ContextWindowRing({
       width={size}
       height={size}
       viewBox={`0 0 ${size} ${size}`}
-      {...(isNative
-        ? { accessibilityElementsHidden: true, importantForAccessibility: "no-hide-descendants" }
-        : { "aria-hidden": true })}
+      accessibilityElementsHidden
+      importantForAccessibility="no-hide-descendants"
     >
       <Circle
         cx={center}

packages/app/src/components/file-explorer-pane.tsx

@@ -77,7 +77,6 @@ import { useWorkspaceFileDragSource } from "@/attachments/use-workspace-file-dra
 import { confirmDialog } from "@/utils/confirm-dialog";
 import { useToast } from "@/contexts/toast-context";
 import { openDesktopTarget, useDesktopOpenTargets } from "@/workspace/desktop-open-targets";
-import { useWorkspaceFields } from "@/stores/session-store-hooks";
 import { useOpenDirectoryInEditor } from "@/workspace/open-in-editor/directory";
 
 const SORT_OPTIONS: { value: SortOption }[] = [
@@ -451,15 +450,9 @@ export function FileExplorerPane({
     isLocalExecution: isLocalDaemon,
   });
   const fileManagerTarget = desktopOpenTargets.find((target) => target.kind === "file-manager");
-  const projectId = useWorkspaceFields(
-    serverId,
-    workspaceId ?? null,
-    (workspace) => workspace.projectId,
-  );
   const openDirectoryInEditor = useOpenDirectoryInEditor({
     serverId,
     workspaceDirectory: normalizedWorkspaceRoot,
-    projectId,
   });
   // COMPAT(fsEntryOps): added in v0.3.0, remove gate after 2027-02-08.
   const fsEntryOpsEnabled = useSessionStore(

packages/app/src/components/import-session-list.tsx

@@ -1,4 +0,0 @@
-import type { ImportSessionListComponent } from "./import-session-list.types";
-
-// Native keeps the sheet-owned ScrollView until its gestures and keyboard are verified.
-export const ImportSessionList: ImportSessionListComponent | null = null;

packages/app/src/components/import-session-list.types.ts

@@ -1,13 +0,0 @@
-import type { ReactElement, ReactNode } from "react";
-
-export interface ImportSessionListProps<Item> {
-  data: ReadonlyArray<Item>;
-  keyExtractor: (item: Item) => string;
-  renderItem: (item: Item) => ReactNode;
-  header: ReactElement | null;
-  footer: ReactElement | null;
-}
-
-export type ImportSessionListComponent = <Item>(
-  props: ImportSessionListProps<Item>,
-) => ReactElement;

packages/app/src/components/import-session-list.web.tsx

@@ -1,141 +0,0 @@
-import React, {
-  useCallback,
-  useMemo,
-  useRef,
-  useState,
-  type CSSProperties,
-  type FocusEvent,
-  type KeyboardEvent,
-} from "react";
-import { View, type LayoutChangeEvent } from "react-native";
-import { defaultRangeExtractor, useVirtualizer, type Range } from "@tanstack/react-virtual";
-import type { ImportSessionListProps } from "./import-session-list.types";
-
-const SCROLLER_STYLE: CSSProperties = {
-  flex: 1,
-  minHeight: 0,
-  overflowY: "auto",
-  overflowX: "hidden",
-  overscrollBehavior: "contain",
-};
-const CONTENT_STYLE: CSSProperties = { width: "100%", position: "relative" };
-
-export function ImportSessionList<Item>({
-  data,
-  keyExtractor,
-  renderItem,
-  header,
-  footer,
-}: ImportSessionListProps<Item>) {
-  const scrollRef = useRef<HTMLDivElement>(null);
-  const [headerHeight, setHeaderHeight] = useState(0);
-  const [focusedKey, setFocusedKey] = useState<string | null>(null);
-  const indexByKey = useMemo(
-    () => new Map(data.map((item, index) => [keyExtractor(item), index])),
-    [data, keyExtractor],
-  );
-  const focusedIndex = focusedKey === null ? undefined : indexByKey.get(focusedKey);
-  const rangeExtractor = useCallback(
-    (range: Range) => {
-      const visible = defaultRangeExtractor(range);
-      if (focusedIndex === undefined) return visible;
-      // Keep focus and its Tab neighbours mounted when PageDown/End moves the window.
-      const focused = [focusedIndex - 1, focusedIndex, focusedIndex + 1].filter(
-        (index) => index >= 0 && index < data.length,
-      );
-      return [...new Set([...visible, ...focused])].sort((left, right) => left - right);
-    },
-    [data.length, focusedIndex],
-  );
-  const handleFocus = useCallback((event: FocusEvent<HTMLDivElement>) => {
-    const row = event.target.closest<HTMLElement>("[data-session-key]");
-    setFocusedKey(row?.dataset.sessionKey ?? null);
-  }, []);
-  const handleBlur = useCallback((event: FocusEvent<HTMLDivElement>) => {
-    if (!event.currentTarget.contains(event.relatedTarget)) setFocusedKey(null);
-  }, []);
-  const handleHeaderLayout = useCallback((event: LayoutChangeEvent) => {
-    setHeaderHeight(event.nativeEvent.layout.height);
-  }, []);
-  const getScrollElement = useCallback(() => scrollRef.current, []);
-  const getItemKey = useCallback(
-    (index: number) => keyExtractor(data[index]!),
-    [data, keyExtractor],
-  );
-  const estimateSize = useCallback(() => 88, []);
-  const virtualizer = useVirtualizer({
-    count: data.length,
-    getScrollElement,
-    getItemKey,
-    estimateSize,
-    scrollMargin: headerHeight,
-    overscan: 5,
-    rangeExtractor,
-  });
-  const handleKeyDown = useCallback(
-    (event: KeyboardEvent<HTMLDivElement>) => {
-      const target = event.target;
-      if (
-        event.defaultPrevented ||
-        !(target instanceof HTMLElement) ||
-        !event.currentTarget.contains(target) ||
-        target.isContentEditable ||
-        target.closest("input, textarea, select")
-      )
-        return;
-      if (event.key === "End") {
-        event.preventDefault();
-        // Reconcile the landing position as variable-height rows are measured.
-        virtualizer.scrollToIndex(data.length - 1, { align: "end" });
-      } else if (event.key === "Home") {
-        event.preventDefault();
-        virtualizer.scrollToOffset(0);
-      } else if (event.key === "PageDown" || event.key === "PageUp") {
-        event.preventDefault();
-        // Native page-scroll animations can keep moving after Home or End.
-        const direction = event.key === "PageDown" ? 1 : -1;
-        virtualizer.scrollBy(direction * event.currentTarget.clientHeight);
-      }
-    },
-    [data.length, virtualizer],
-  );
-  const virtualRows = virtualizer.getVirtualItems();
-  const totalSize = virtualizer.getTotalSize();
-  const contentStyle = useMemo(() => ({ ...CONTENT_STYLE, height: totalSize }), [totalSize]);
-  const rowStyle = useCallback(
-    (offset: number): CSSProperties => ({
-      ...CONTENT_STYLE,
-      position: "absolute",
-      top: 0,
-      transform: `translateY(${offset}px)`,
-    }),
-    [],
-  );
-
-  return (
-    <div
-      ref={scrollRef}
-      style={SCROLLER_STYLE}
-      data-testid="import-session-list"
-      onFocusCapture={handleFocus}
-      onBlurCapture={handleBlur}
-      onKeyDown={handleKeyDown}
-    >
-      <View onLayout={handleHeaderLayout}>{header}</View>
-      <div style={contentStyle}>
-        {virtualRows.map((row) => (
-          <div
-            key={row.key}
-            data-index={row.index}
-            data-session-key={row.key}
-            ref={virtualizer.measureElement}
-            style={rowStyle(row.start - headerHeight)}
-          >
-            {renderItem(data[row.index]!)}
-          </div>
-        ))}
-      </div>
-      <div>{footer}</div>
-    </div>
-  );
-}

packages/app/src/components/import-session-sheet.tsx

@@ -1,4 +1,4 @@
-import React, { type ReactNode, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Pressable, type PressableStateCallbackType, Text, View } from "react-native";
 import { keepPreviousData, useMutation, useQueries, useQueryClient } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
@@ -11,7 +11,6 @@ import { ChevronDown, Inbox, Layers, RotateCw } from "lucide-react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";
-import { ImportSessionList } from "@/components/import-session-list";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
 import { useProviderIcon, useProviderIcons } from "@/components/provider-icons";
@@ -372,33 +371,7 @@ function ImportSessionActivityTime({ date }: { date: string }) {
   return <Text style={styles.rowMeta}>{label}</Text>;
 }
 
-function getSessionRowKey(entry: FetchRecentProviderSessionEntry): string {
-  return `${entry.providerId}:${entry.providerHandleId}`;
-}
-
-function hasListHeader(
-  input: SheetStatusMessagesProps & {
-    showFilter: boolean;
-    hasProviderErrors: boolean;
-  },
-): boolean {
-  return (
-    input.showFilter ||
-    !input.isClientReady ||
-    input.isSnapshotUnsupported ||
-    input.hasNoImportableProviders ||
-    (input.isLoadingSessions && !input.hasRows) ||
-    input.importErrored ||
-    input.hasProviderErrors
-  );
-}
-
 function SessionRows({
-  visible,
-  onClose,
-  header,
-  listHeader,
-  listFooter,
   serverId,
   entries,
   disabled,
@@ -406,11 +379,6 @@ function SessionRows({
   resolveFolder,
   onImportSession,
 }: {
-  visible: boolean;
-  onClose: () => void;
-  header: SheetHeader;
-  listHeader: ReactNode;
-  listFooter: ReactNode;
   serverId: string | null;
   entries: ReadonlyArray<FetchRecentProviderSessionEntry>;
   disabled: boolean;
@@ -418,69 +386,20 @@ function SessionRows({
   resolveFolder: (entry: FetchRecentProviderSessionEntry) => string | null;
   onImportSession: (entry: FetchRecentProviderSessionEntry) => void;
 }) {
-  // Keep short results content-sized; only long lists need a bounded viewport.
-  const virtualized = ImportSessionList !== null && entries.length > 8;
-  const renderSessionRow = useCallback(
-    (entry: FetchRecentProviderSessionEntry) => (
-      <ImportSessionSheetRow
-        key={getSessionRowKey(entry)}
-        serverId={serverId}
-        entry={entry}
-        disabled={disabled}
-        importing={importingSessionKey === getSessionRowKey(entry)}
-        folder={resolveFolder(entry)}
-        onImportSession={onImportSession}
-      />
-    ),
-    [serverId, disabled, importingSessionKey, resolveFolder, onImportSession],
-  );
-  const renderItem = useCallback(
-    (item: FetchRecentProviderSessionEntry) => (
-      <View style={styles.listRow}>{renderSessionRow(item)}</View>
-    ),
-    [renderSessionRow],
-  );
-  const virtualHeader = useMemo(
-    () => (listHeader ? <View style={styles.listHeader}>{listHeader}</View> : null),
-    [listHeader],
-  );
-  const virtualFooter = useMemo(
-    () => <View style={styles.listFooter}>{listFooter}</View>,
-    [listFooter],
-  );
-
   return (
-    <AdaptiveModalSheet
-      visible={visible}
-      onClose={onClose}
-      header={header}
-      testID="import-session-sheet"
-      desktopMaxWidth={560}
-      desktopHeight={virtualized ? "85%" : undefined}
-      snapPoints={IMPORT_SHEET_SNAP_POINTS}
-      scrollable={!virtualized}
-      contentStyle={virtualized ? styles.listBody : undefined}
-    >
-      {ImportSessionList && virtualized ? (
-        <View style={styles.list}>
-          <ImportSessionList
-            data={entries}
-            keyExtractor={getSessionRowKey}
-            renderItem={renderItem}
-            header={virtualHeader}
-            footer={virtualFooter}
-          />
-        </View>
-      ) : (
-        <>
-          {listHeader}
-          {entries.length > 0 ? (
-            <View style={styles.smallList}>{entries.map(renderSessionRow)}</View>
-          ) : null}
-          {listFooter}
-        </>
-      )}
-    </AdaptiveModalSheet>
+    <View style={styles.list}>
+      {entries.map((entry) => (
+        <ImportSessionSheetRow
+          key={`${entry.providerId}:${entry.providerHandleId}`}
+          serverId={serverId}
+          entry={entry}
+          disabled={disabled}
+          importing={importingSessionKey === `${entry.providerId}:${entry.providerHandleId}`}
+          folder={resolveFolder(entry)}
+          onImportSession={onImportSession}
+        />
+      ))}
+    </View>
   );
 }
 
@@ -807,124 +726,85 @@ export function ImportSessionSheet({
   });
   const showFilter = filterProviders.length > 1;
   const showLoadMore = hasMoreSessions(queries, pageLimit);
-  const showListHeader = hasListHeader({
-    showFilter,
-    isClientReady: Boolean(client),
-    isSnapshotUnsupported,
-    hasNoImportableProviders,
-    isLoadingSessions,
-    hasRows: visibleEntries.length > 0,
-    importErrored: importMutation.isError,
-    hasProviderErrors: providerErrorRows.length > 0,
-  });
-  const listHeader = useMemo(
-    () =>
-      showListHeader ? (
-        <View style={styles.listHeaderContent}>
-          {showFilter ? (
-            <View ref={filterAnchorRef} collapsable={false} style={styles.filterTriggerWrap}>
-              <Pressable
-                onPress={handleFilterOpen}
-                style={filterTriggerStyle}
-                testID="import-session-filter-trigger"
-                accessibilityRole="button"
-                accessibilityLabel={`Filter: ${selectedProviderLabel}`}
-              >
-                {selectedProvider === ALL_FILTER_VALUE ? (
-                  <Layers size={14} color={theme.colors.foregroundMuted} />
-                ) : (
-                  <SelectedProviderIcon size={14} color={theme.colors.foregroundMuted} />
-                )}
-                <Text style={styles.filterTriggerText} numberOfLines={1}>
-                  {selectedProviderLabel}
-                </Text>
-                <ChevronDown size={14} color={theme.colors.foregroundMuted} />
-              </Pressable>
-              <Combobox
-                options={filterComboboxOptions}
-                value={selectedProvider}
-                onSelect={handleFilterSelect}
-                renderOption={renderFilterOption}
-                searchable={false}
-                title="Filter by provider"
-                open={isFilterOpen}
-                onOpenChange={setIsFilterOpen}
-                anchorRef={filterAnchorRef}
-                desktopPlacement="bottom-start"
-                desktopPreventInitialFlash
-              />
-            </View>
-          ) : null}
-          <SheetStatusMessages
-            isClientReady={Boolean(client)}
-            isSnapshotUnsupported={isSnapshotUnsupported}
-            hasNoImportableProviders={hasNoImportableProviders}
-            isLoadingSessions={isLoadingSessions}
-            hasRows={visibleEntries.length > 0}
-            importErrored={importMutation.isError}
-          />
-          {providerErrorRows.length > 0 ? (
-            <ProviderErrorBanner rows={providerErrorRows} onRetry={handleRetryProvider} />
-          ) : null}
-        </View>
-      ) : null,
-    [
-      showListHeader,
-      showFilter,
-      filterTriggerStyle,
-      handleFilterOpen,
-      selectedProvider,
-      theme.colors.foregroundMuted,
-      SelectedProviderIcon,
-      selectedProviderLabel,
-      filterComboboxOptions,
-      handleFilterSelect,
-      renderFilterOption,
-      isFilterOpen,
-      client,
-      isSnapshotUnsupported,
-      hasNoImportableProviders,
-      isLoadingSessions,
-      visibleEntries.length,
-      importMutation.isError,
-      providerErrorRows,
-      handleRetryProvider,
-    ],
-  );
-  const listFooter = useMemo(
-    () => (
-      <>
-        {showLoadMore ? (
-          <View style={styles.footer}>
-            <Button
-              variant="ghost"
-              onPress={handleLoadMore}
-              disabled={isRefreshing}
-              testID="import-session-load-more"
-            >
-              {t("importSession.actions.loadMore")}
-            </Button>
-          </View>
-        ) : null}
-        {showEmptyState ? <SheetEmptyState title={emptyStateTitle} /> : null}
-      </>
-    ),
-    [showLoadMore, handleLoadMore, isRefreshing, t, showEmptyState, emptyStateTitle],
-  );
+
   return (
-    <SessionRows
+    <AdaptiveModalSheet
       visible={visible}
       onClose={onClose}
       header={header}
-      listHeader={listHeader}
-      listFooter={listFooter}
-      serverId={serverId}
-      entries={visibleEntries}
-      disabled={importMutation.isPending}
-      importingSessionKey={importingSessionKey}
-      resolveFolder={resolveFolder}
-      onImportSession={handleImportSession}
-    />
+      testID="import-session-sheet"
+      desktopMaxWidth={560}
+      snapPoints={IMPORT_SHEET_SNAP_POINTS}
+    >
+      {showFilter ? (
+        <View ref={filterAnchorRef} collapsable={false} style={styles.filterTriggerWrap}>
+          <Pressable
+            onPress={handleFilterOpen}
+            style={filterTriggerStyle}
+            testID="import-session-filter-trigger"
+            accessibilityRole="button"
+            accessibilityLabel={`Filter: ${selectedProviderLabel}`}
+          >
+            {selectedProvider === ALL_FILTER_VALUE ? (
+              <Layers size={14} color={theme.colors.foregroundMuted} />
+            ) : (
+              <SelectedProviderIcon size={14} color={theme.colors.foregroundMuted} />
+            )}
+            <Text style={styles.filterTriggerText} numberOfLines={1}>
+              {selectedProviderLabel}
+            </Text>
+            <ChevronDown size={14} color={theme.colors.foregroundMuted} />
+          </Pressable>
+          <Combobox
+            options={filterComboboxOptions}
+            value={selectedProvider}
+            onSelect={handleFilterSelect}
+            renderOption={renderFilterOption}
+            searchable={false}
+            title="Filter by provider"
+            open={isFilterOpen}
+            onOpenChange={setIsFilterOpen}
+            anchorRef={filterAnchorRef}
+            desktopPlacement="bottom-start"
+            desktopPreventInitialFlash
+          />
+        </View>
+      ) : null}
+      <SheetStatusMessages
+        isClientReady={Boolean(client)}
+        isSnapshotUnsupported={isSnapshotUnsupported}
+        hasNoImportableProviders={hasNoImportableProviders}
+        isLoadingSessions={isLoadingSessions}
+        hasRows={visibleEntries.length > 0}
+        importErrored={importMutation.isError}
+      />
+      {providerErrorRows.length > 0 ? (
+        <ProviderErrorBanner rows={providerErrorRows} onRetry={handleRetryProvider} />
+      ) : null}
+      {visibleEntries.length > 0 ? (
+        <SessionRows
+          serverId={serverId}
+          entries={visibleEntries}
+          disabled={importMutation.isPending}
+          importingSessionKey={importingSessionKey}
+          resolveFolder={resolveFolder}
+          onImportSession={handleImportSession}
+        />
+      ) : null}
+      {showLoadMore ? (
+        <View style={styles.footer}>
+          <Button
+            variant="ghost"
+            onPress={handleLoadMore}
+            disabled={isRefreshing}
+            testID="import-session-load-more"
+          >
+            {t("importSession.actions.loadMore")}
+          </Button>
+        </View>
+      ) : null}
+      {showEmptyState ? <SheetEmptyState title={emptyStateTitle} /> : null}
+    </AdaptiveModalSheet>
   );
 }
 
@@ -973,31 +853,9 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.base,
     fontWeight: theme.fontWeight.medium,
   },
-  listBody: {
-    gap: 0,
-  },
   list: {
-    flex: 1,
-    minHeight: 0,
-    marginHorizontal: -theme.spacing[2],
-  },
-  listHeader: {
-    marginHorizontal: theme.spacing[2],
-    paddingBottom: theme.spacing[4],
-  },
-  listHeaderContent: {
-    gap: theme.spacing[4],
-  },
-  smallList: {
     gap: theme.spacing[1],
   },
-  listFooter: {
-    marginHorizontal: theme.spacing[2],
-  },
-  listRow: {
-    marginHorizontal: theme.spacing[2],
-    paddingBottom: theme.spacing[1],
-  },
   footer: {
     paddingTop: theme.spacing[2],
     alignItems: "center",

packages/app/src/components/indent-rail.tsx

@@ -1,32 +0,0 @@
-import type { ReactNode } from "react";
-import { View, type StyleProp, type ViewStyle } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-
-/**
- * Collapsed chat rows badge their summary with an icon whose center sits 7px into the content
- * column (`ExpandableBadge` bleeds 13px left, then 1px border, 8px padding, 22px icon). The rail
- * hangs from that center so opened rows read as children of the line that opened them.
- */
-const RAIL_LEFT = 7;
-const RAIL_WIDTH = 1;
-export const INDENT_RAIL_CONTENT_OFFSET = 21;
-
-/** Indents opened chat rows under the summary that collapsed them, behind a vertical line. */
-export function IndentRail({
-  children,
-  style,
-}: {
-  children?: ReactNode;
-  style?: StyleProp<ViewStyle>;
-}) {
-  return <View style={[styles.rail, style]}>{children}</View>;
-}
-
-const styles = StyleSheet.create((theme) => ({
-  rail: {
-    marginLeft: RAIL_LEFT,
-    paddingLeft: INDENT_RAIL_CONTENT_OFFSET - RAIL_LEFT - RAIL_WIDTH,
-    borderLeftWidth: RAIL_WIDTH,
-    borderLeftColor: theme.colors.border,
-  },
-}));

packages/app/src/components/markdown/renderer.test.ts

@@ -249,35 +249,6 @@ describe("bare URL sentence punctuation", () => {
     ]);
   });
 
-  it.each([
-    ["http://127.0.0.1:8059/?token=t-1", ""],
-    ["http://example.com:8080/a", "."],
-    ["http://localhost:8059/?token=t-1", "."],
-    ["http://localhost:8059/?token=t-1", ")"],
-    ["http://user@127.0.0.1:8059/?token=t-1", '"'],
-    ["http://user:pass@127.0.0.1:8059/?token=t-1", ""],
-    ["http://localhost", ":"],
-    ["http://[::1]:8059/?token=t-1", "'"],
-    ["https://github.com/o/r/compare/main...user:repo:fix/branch", ""],
-    ["https://example.com/a:b/c", ":"],
-  ])("links %s whole and leaves %j outside", async (url, punctuation) => {
-    const prepared = prepareMarkdownSource(`See ${url}${punctuation} now`);
-    const tree = recognizeTextLinks(
-      await parseMarkdown(prepared.render(), { latexMath: false }),
-      prepared.linkRecognition.text,
-      prepared.linkRecognition.inlineCode,
-    );
-    expect(tree.children?.[0]?.children).toEqual([
-      { type: "Text", content: "See " },
-      {
-        type: "Link",
-        attributes: expect.objectContaining({ url }),
-        children: [{ type: "Text", content: url }],
-      },
-      { type: "Text", content: `${punctuation} now` },
-    ]);
-  });
-
   it.each(["[Authored](https://example.com/a.)", "<https://example.com/a.>"])(
     "preserves punctuation in explicit destinations: %s",
     async (source) => {
@@ -804,18 +775,3 @@ it("makes the web Markdown container selectable in Safari as well as unprefixed
     WebkitUserSelect: "text",
   });
 });
-
-it.each([false, true])(
-  "scales inline code from theme tokens with its surrounding block (compact: %s)",
-  (compact) => {
-    const theme = {
-      ...darkTheme,
-      fontSize: { ...darkTheme.fontSize, code: 13, content: 17, base: 16 },
-    };
-    const { markdownStyle } = createMarkdownStyles(theme, { compact, blockGap: 16 });
-    const bodySize = compact ? theme.fontSize.base : theme.fontSize.content;
-    expect(markdownStyle.code).not.toHaveProperty("fontSize");
-    expect(markdownStyle.code).toHaveProperty("fontScale", theme.fontSize.code / bodySize);
-    expect(markdownStyle.codeBlock?.fontSize).toBe(theme.fontSize.code);
-  },
-);

packages/app/src/components/markdown/renderer.tsx

@@ -23,29 +23,14 @@ const ThemedMarkdown = withUnistyles(EnrichedMarkdownText);
 const MD4C_FLAGS = { latexMath: false, hardSoftBreaks: true, admonitions: true };
 
 // Reading the breakpoint here makes Unistyles restyle the text when the layout crosses it.
-const markdownStyle =
-  (compact: boolean, muted = false) =>
-  (theme: Theme, rt: { breakpoint?: string }) =>
-    createMarkdownStyles(theme, {
-      compact,
-      muted,
-      blockGap: resolveDensity(rt, density.blockGap),
-    });
+const markdownStyle = (compact: boolean) => (theme: Theme, rt: { breakpoint?: string }) =>
+  createMarkdownStyles(theme, { compact, blockGap: resolveDensity(rt, density.blockGap) });
 const regularStyle = markdownStyle(false);
 const compactStyle = markdownStyle(true);
-const compactMutedStyle = markdownStyle(true, true);
-
-function pickMarkdownStyle(compact: boolean, muted: boolean) {
-  if (!compact) return regularStyle;
-  return muted ? compactMutedStyle : compactStyle;
-}
 
 export interface MarkdownRendererProps extends MarkdownImageContext {
   text: string;
   compact?: boolean;
-  /** Muted text colour. Compact surfaces only. */
-  muted?: boolean;
-  selectable?: boolean;
   streaming?: boolean;
   onLinkPress?: (url: string) => unknown;
 }
@@ -71,8 +56,6 @@ export const MarkdownRenderer = memo(function MarkdownRenderer(props: MarkdownRe
 const MarkdownPart = memo(function MarkdownPart({
   text,
   compact = false,
-  muted = false,
-  selectable = true,
   streaming = false,
   onLinkPress,
   ...imageContext
@@ -115,9 +98,9 @@ const MarkdownPart = memo(function MarkdownPart({
             <ThemedMarkdown
               key={`${segment.kind}:${segment.id}`}
               markdown={segment.source}
-              uniProps={pickMarkdownStyle(compact, muted)}
+              uniProps={compact ? compactStyle : regularStyle}
               flavor="github"
-              selectable={selectable}
+              selectable
               md4cFlags={MD4C_FLAGS}
               linkRecognition={linkRecognition}
               enableTaskListItemToggle={false}

packages/app/src/components/markdown/source.ts

@@ -27,17 +27,11 @@ const PROSE_PATH = String.raw`(?:${PATH_PREFIX}${HAS_PATH_LETTER}${SEPARATED_PAT
 function createFilePattern(path: string): RegExp {
   // The native adapter mistakes a literal + in lookbehind for a quantifier; use its hex escape.
   return new RegExp(
-    String.raw`(?:${BARE_URL}|(?<![a-zA-Z0-9\u0080-\uFFFF_@.%\x2b~:/\\-])(?:${path}|${FILE_NAME})${LINE_SUFFIX}(?![a-zA-Z0-9\u0080-\uFFFF_@%+:/\\-]|\.${PATH_CHARACTER}))`,
+    String.raw`(?:https?://[^\s<>]+|(?<![a-zA-Z0-9\u0080-\uFFFF_@.%\x2b~:/\\-])(?:${path}|${FILE_NAME})${LINE_SUFFIX}(?![a-zA-Z0-9\u0080-\uFFFF_@%+:/\\-]|\.${PATH_CHARACTER}))`,
     "g",
   );
 }
 
-// Matches bare URLs that MD4C does not autolink, like single-label or bracketed hosts.
-// Quotes and unbalanced closing parentheses end the URL. Trailing sentence punctuation stays outside.
-const URL_CHARACTER = String.raw`[^\s<>()"'\x60]`;
-const URL_GROUP = String.raw`\(${URL_CHARACTER}*\)`;
-const BARE_URL = String.raw`https?://(?:${URL_CHARACTER}|${URL_GROUP})*(?:[^\s<>()"'\x60.,;:!?]|${URL_GROUP})`;
-
 const FILE_PATTERN = createFilePattern(PROSE_PATH);
 function linkMetadata(inlineCodePaths: ReadonlySet<string>) {
   // The engine accepts regexes on both platforms. Classify complete code spans

packages/app/src/components/markdown/styles.ts

@@ -7,11 +7,7 @@ const WEB_CONTAINER = { userSelect: "text", WebkitUserSelect: "text" } as const;
 
 export function createMarkdownStyles(
   theme: Theme,
-  {
-    compact = false,
-    muted = false,
-    blockGap,
-  }: { compact?: boolean; muted?: boolean; blockGap: number },
+  { compact = false, blockGap }: { compact?: boolean; blockGap: number },
 ): { markdownStyle: MarkdownStyle; selectionColor: string; containerStyle?: typeof WEB_CONTAINER } {
   const fontSize = compact ? theme.fontSize.base : theme.fontSize.content;
   // Every block is followed by the same gap; the library drops it after the last block.
@@ -20,7 +16,7 @@ export function createMarkdownStyles(
     fontSize,
     fontFamily: theme.fontFamily.ui,
     lineHeight: Math.round(fontSize * 1.4),
-    color: muted ? theme.colors.foregroundMuted : theme.colors.foreground,
+    color: theme.colors.foreground,
     ...block,
   };
   const heading = (scale: number) => ({
@@ -72,7 +68,7 @@ export function createMarkdownStyles(
       },
       code: {
         fontFamily: theme.fontFamily.mono === "ui-monospace" && !isWeb ? "" : theme.fontFamily.mono,
-        fontScale: theme.fontSize.code / fontSize,
+        fontSize: theme.fontSize.code,
         color: theme.colors.foreground,
         backgroundColor: theme.colors.surface2,
         borderColor: "transparent",

packages/app/src/components/message.tsx

@@ -971,10 +971,6 @@ const expandableBadgeStylesheet = StyleSheet.create((theme) => ({
     borderBottomLeftRadius: 0,
     borderBottomRightRadius: 0,
   },
-  // Details that do not sit in a card leave the header as a lone highlighted pill.
-  pressableExpandedDetached: {
-    borderRadius: theme.borderRadius.full,
-  },
   detailWrapperBorderless: {
     borderWidth: 0,
   },
@@ -2052,10 +2048,7 @@ export const ExpandableBadge = memo(function ExpandableBadge({
       expandableBadgeStylesheet.pressable,
       isPressed && isInteractive ? expandableBadgeStylesheet.pressablePressed : null,
       isExpanded && expandableBadgeStylesheet.pressableExpanded,
-      isExpanded &&
-        (borderlessWhenExpanded
-          ? expandableBadgeStylesheet.pressableExpandedDetached
-          : expandableBadgeStylesheet.pressableExpandedAttached),
+      isExpanded && !borderlessWhenExpanded && expandableBadgeStylesheet.pressableExpandedAttached,
     ],
     [borderlessWhenExpanded, isExpanded, isInteractive, isPressed],
   );

packages/app/src/components/question-form-card.browser.test.tsx

@@ -10,12 +10,6 @@ import { QuestionFormCard } from "./question-form-card";
 // Load translations so controls expose their real accessible names.
 void testI18n;
 
-// The Markdown engine does not load in this harness; question and option text are covered by
-// e2e/browser/question-prompt-pagination.spec.ts. Plain text keeps these tests on the answers.
-vi.mock("@/components/markdown/renderer", () => ({
-  MarkdownRenderer: ({ text }: { text: string }) => <span>{text}</span>,
-}));
-
 // App sources compile against the classic JSX runtime, which expects React on the global.
 beforeEach(() => vi.stubGlobal("React", React));
 

packages/app/src/components/question-form-card.tsx

@@ -1,13 +1,7 @@
 import { Alert } from "@/components/ui/alert";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { useState, useCallback, useMemo, useRef, type RefObject } from "react";
-import {
-  View,
-  Text,
-  Pressable,
-  type GestureResponderEvent,
-  type PressableStateCallbackType,
-} from "react-native";
+import { View, Text, Pressable, type PressableStateCallbackType } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { Check, X } from "lucide-react-native";
@@ -18,7 +12,6 @@ import { isWeb } from "@/constants/platform";
 import { EditingTextInput as TextInput } from "@/components/ui/text-input";
 import type { EditingTextInputHandle } from "@/components/ui/text-input/types";
 import { ScrollableCodeSurface } from "@/components/ui/scrollable-code-surface";
-import { MarkdownRenderer } from "@/components/markdown/renderer";
 import {
   areQuestionsAnswered,
   buildQuestionFormAnswers,
@@ -43,20 +36,6 @@ const IS_WEB = isWeb;
 // drag to the preview's nested scroll, so lines past a cap would be unreachable.
 const OPTION_PREVIEW_MAX_HEIGHT = IS_WEB ? 240 : undefined;
 
-// Web clicks that must not answer: a link in the label, anything in the description, and the
-// second click of a double-click, which would otherwise land on the next question's options.
-function isNonAnsweringClick(event: GestureResponderEvent, description: View | null): boolean {
-  if (!IS_WEB) return false;
-  const click = event.nativeEvent as unknown as MouseEvent;
-  if (click.detail > 1) return true;
-  const target = click.target as Element | null;
-  const descriptionElement = description as unknown as Element | null;
-  return Boolean(target?.closest("a") || descriptionElement?.contains(target));
-}
-
-// The description is selectable text, so a touch on it belongs to the text, not the option.
-const claimResponder = () => true;
-
 function getQuestionInputPlaceholder({
   question,
   answerPlaceholder,
@@ -92,14 +71,9 @@ function QuestionOptionRow({
 }: QuestionOptionRowProps) {
   const { theme } = useUnistyles();
 
-  const descriptionRef = useRef<View>(null);
-  const handlePress = useCallback(
-    (event: GestureResponderEvent) => {
-      if (isNonAnsweringClick(event, descriptionRef.current)) return;
-      onToggle(qIndex, optIndex, multiSelect);
-    },
-    [onToggle, qIndex, optIndex, multiSelect],
-  );
+  const handlePress = useCallback(() => {
+    onToggle(qIndex, optIndex, multiSelect);
+  }, [onToggle, qIndex, optIndex, multiSelect]);
 
   const pressableStyle = useCallback(
     ({ pressed, hovered }: PressableStateCallbackType & { hovered?: boolean }) => [
@@ -112,6 +86,17 @@ function QuestionOptionRow({
     [isSelected, theme.colors.surface2],
   );
 
+  const optionLabelStyle = useMemo(
+    () => [
+      styles.optionLabel,
+      { color: isSelected ? theme.colors.foreground : theme.colors.foregroundMuted },
+    ],
+    [isSelected, theme.colors.foreground, theme.colors.foregroundMuted],
+  );
+  const optionDescriptionStyle = useMemo(
+    () => [styles.optionDescription, { color: theme.colors.foregroundMuted }],
+    [theme.colors.foregroundMuted],
+  );
   const accessibilityState = useMemo(() => ({ checked: isSelected }), [isSelected]);
 
   // Static left-side control: square for multi-select, circle for single-select.
@@ -150,15 +135,9 @@ function QuestionOptionRow({
           {isSelected && !multiSelect ? <View style={radioDotStyle} /> : null}
         </View>
         <View style={styles.optionTextBlock}>
-          <MarkdownRenderer text={option.label} compact muted={!isSelected} selectable={false} />
+          <Text style={optionLabelStyle}>{option.label}</Text>
           {option.description ? (
-            <View
-              ref={descriptionRef}
-              testID="question-form-option-description"
-              onStartShouldSetResponder={claimResponder}
-            >
-              <MarkdownRenderer text={option.description} compact muted />
-            </View>
+            <Text style={optionDescriptionStyle}>{option.description}</Text>
           ) : null}
           {option.preview ? (
             // Shown for every option at once so they can be compared before picking.
@@ -543,6 +522,10 @@ export function QuestionFormCard({
     ],
     [theme.colors.surface1, theme.colors.border],
   );
+  const questionTextStyle = useMemo(
+    () => [styles.questionText, { color: theme.colors.foreground }],
+    [theme.colors.foreground],
+  );
   // Single-select radios need a group; checkboxes are valid standalone.
   const optionsGroupAccessibility = useMemo(
     () =>
@@ -587,9 +570,9 @@ export function QuestionFormCard({
         onSelect={handleSelectQuestion}
       />
       <View style={styles.questionHeader}>
-        <View testID="question-form-current-question" style={styles.questionText}>
-          <MarkdownRenderer text={questions[resolvedActiveQuestionIndex].question} compact />
-        </View>
+        <Text testID="question-form-current-question" style={questionTextStyle}>
+          {activeQuestion?.question}
+        </Text>
       </View>
 
       {activeQuestion ? (
@@ -692,6 +675,9 @@ const styles = StyleSheet.create((theme) => ({
   },
   questionText: {
     flex: 1,
+    fontSize: theme.fontSize.base,
+    fontWeight: theme.fontWeight.normal,
+    lineHeight: 22,
   },
   optionsWrap: {
     gap: theme.spacing[1],
@@ -737,6 +723,15 @@ const styles = StyleSheet.create((theme) => ({
     flex: 1,
     gap: theme.spacing[1],
   },
+  optionLabel: {
+    fontSize: theme.fontSize.base,
+    fontWeight: theme.fontWeight.normal,
+    lineHeight: 22,
+  },
+  optionDescription: {
+    fontSize: theme.fontSize.base,
+    lineHeight: 20,
+  },
   optionPreviewText: {
     lineHeight: 20,
     ...(isWeb ? { whiteSpace: "pre-wrap", overflowWrap: "break-word" } : null),

packages/app/src/components/settings/collapsible-row.tsx

@@ -1,18 +1,20 @@
+import { ChevronRight } from "lucide-react-native";
 import { Children, isValidElement, useCallback, useMemo, useState, type ReactNode } from "react";
-import { View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
+import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { mutedIconColorMapping } from "@/components/ui/icon-color";
 import { isWeb } from "@/constants/platform";
 import { settingsStyles } from "@/styles/settings";
-import { NestedSettingsRows } from "./row-density";
-import { SettingsRowHeader } from "./row-header";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
+
+const ThemedChevron = withUnistyles(ChevronRight);
+const hoveredIconColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
 
 interface SettingsCollapsibleRowProps {
   label: string;
-  /** A short status shown before the chevron, so the row says something while collapsed. */
-  summary?: string;
   defaultExpanded?: boolean;
   testID?: string;
-  /** The rows revealed underneath, separated like the rows of a `SettingsCard` and laid out as nested rows. */
+  /** The rows revealed underneath, separated like the rows of a `SettingsCard`. */
   children: ReactNode;
 }
 
@@ -23,7 +25,6 @@ interface SettingsCollapsibleRowProps {
  */
 export function SettingsCollapsibleRow({
   label,
-  summary,
   defaultExpanded = false,
   testID,
   children,
@@ -36,39 +37,66 @@ export function SettingsCollapsibleRow({
     () => (isWeb ? ({ "aria-expanded": expanded } as const) : null),
     [expanded],
   );
+  const headerStyle = useCallback(
+    ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
+      settingsStyles.row,
+      hovered && styles.headerHovered,
+      pressed && styles.headerPressed,
+    ],
+    [],
+  );
+  const chevronStyle = useMemo(
+    () => [styles.chevron, expanded && styles.chevronExpanded],
+    [expanded],
+  );
 
   return (
     <View testID={testID}>
-      <SettingsRowHeader
-        label={label}
-        summary={summary}
-        onPress={toggle}
-        expanded={expanded}
+      <Pressable
+        {...webExpandedProps}
+        accessibilityRole="button"
+        accessibilityLabel={label}
         accessibilityState={accessibilityState}
-        webAccessibilityProps={webExpandedProps}
+        onPress={toggle}
+        style={headerStyle}
         testID={testID ? `${testID}-toggle` : undefined}
-      />
-      {expanded ? (
-        <View style={styles.children}>
-          <NestedSettingsRows>
-            {Children.toArray(children).map((child, index) => (
-              <View
-                key={isValidElement(child) ? child.key : index}
-                style={settingsStyles.rowBorder}
-              >
-                {child}
-              </View>
-            ))}
-          </NestedSettingsRows>
-        </View>
-      ) : null}
+      >
+        {({ hovered }: PressableStateCallbackType & { hovered?: boolean }) => (
+          <>
+            <View style={settingsStyles.rowContent}>
+              <Text style={settingsStyles.rowTitle}>{label}</Text>
+            </View>
+            <View style={chevronStyle}>
+              <ThemedChevron
+                size={ICON_SIZE.sm}
+                uniProps={hovered ? hoveredIconColorMapping : mutedIconColorMapping}
+              />
+            </View>
+          </>
+        )}
+      </Pressable>
+      {expanded
+        ? Children.toArray(children).map((child, index) => (
+            <View key={isValidElement(child) ? child.key : index} style={settingsStyles.rowBorder}>
+              {child}
+            </View>
+          ))
+        : null}
     </View>
   );
 }
 
 const styles = StyleSheet.create((theme) => ({
-  // The revealed rows keep the card's rails; the tint is what groups them under their header.
-  children: {
-    backgroundColor: theme.colors.surface0,
+  headerHovered: {
+    backgroundColor: theme.colors.surface2,
+  },
+  headerPressed: {
+    backgroundColor: theme.colors.surface3,
+  },
+  // Optical: the chevron's ink sits about 4px inside its box whether it points right or down; this
+  // puts the ink on the card's trailing rail, where the switch and the reports' refresh buttons end.
+  chevron: { marginRight: -theme.spacing[1] },
+  chevronExpanded: {
+    transform: [{ rotate: "90deg" }],
   },
 }));

packages/app/src/components/settings/detail-row.tsx

@@ -1,33 +0,0 @@
-import { SettingsRowHeader } from "./row-header";
-
-interface SettingsDetailRowProps {
-  label: string;
-  /** What the detail is set to, so the row says it without being opened. */
-  summary?: string;
-  onPress: () => void;
-  /** A row that cannot be opened keeps its summary and drops the chevron. */
-  disabled?: boolean;
-  testID?: string;
-}
-
-/**
- * A settings row that opens a detail, such as a sheet, for one setting. The label, a one-line
- * summary of the current value and a chevron pointing right. Sits inside a `SettingsCard`.
- */
-export function SettingsDetailRow({
-  label,
-  summary,
-  onPress,
-  disabled,
-  testID,
-}: SettingsDetailRowProps) {
-  return (
-    <SettingsRowHeader
-      label={label}
-      summary={summary}
-      onPress={onPress}
-      disabled={disabled}
-      testID={testID}
-    />
-  );
-}

packages/app/src/components/settings/headings/settings-info-tip.tsx

@@ -1,4 +1,4 @@
-import type { ComponentType, ReactNode } from "react";
+import type { ReactNode } from "react";
 import { Pressable, Text } from "react-native";
 import { useTranslation } from "react-i18next";
 import { Info } from "lucide-react-native";
@@ -6,13 +6,7 @@ import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 
-type TipIconComponent = ComponentType<{ size: number; color: string }>;
-
-function TipIcon({ icon: Icon, color }: { icon: TipIconComponent; color: string }) {
-  return <Icon size={ICON_SIZE.sm} color={color} />;
-}
-
-const ThemedTipIcon = withUnistyles(TipIcon);
+const ThemedInfo = withUnistyles(Info);
 
 const mutedIconMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 
@@ -20,37 +14,27 @@ interface SettingsInfoTipProps {
   /** Header the tip belongs to; used for the accessibility label. */
   title: string;
   info: ReactNode;
-  /** Defaults to the info icon. */
-  icon?: TipIconComponent;
-  /** Defaults to "About {title}". */
-  accessibilityLabel?: string;
   testID?: string;
 }
 
 /**
  * The one way a settings group or section explains itself: an info icon on the
  * header that opens a tooltip. Never a paragraph under the header — see
- * docs/design.md §7. Rows use it the same way to keep secondary details on one line.
+ * docs/design.md §7.
  */
-export function SettingsInfoTip({
-  title,
-  info,
-  icon = Info,
-  accessibilityLabel,
-  testID,
-}: SettingsInfoTipProps) {
+export function SettingsInfoTip({ title, info, testID }: SettingsInfoTipProps) {
   const { t } = useTranslation();
   return (
     <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile>
       <TooltipTrigger asChild>
         <Pressable
           accessibilityRole="button"
-          accessibilityLabel={accessibilityLabel ?? t("settings.groupInfo", { title })}
+          accessibilityLabel={t("settings.groupInfo", { title })}
           testID={testID}
           hitSlop={8}
           style={styles.button}
         >
-          <ThemedTipIcon icon={icon} uniProps={mutedIconMapping} />
+          <ThemedInfo size={ICON_SIZE.sm} uniProps={mutedIconMapping} />
         </Pressable>
       </TooltipTrigger>
       <TooltipContent side="top" align="start" offset={8}>

packages/app/src/components/settings/index.tsx

@@ -24,21 +24,13 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuItem } from "@/component
 import { DropdownTrigger } from "@/components/ui/dropdown-trigger";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { settingsStyles } from "@/styles/settings";
-import { ControlSizeProvider } from "@/components/ui/control-size";
-import { useSettingsRowLayout } from "./row-density";
 export { SettingsGroup } from "./headings/settings-group";
 export { SettingsSection } from "./headings/settings-section";
 export { SettingsCollapsibleRow } from "./collapsible-row";
-export { SettingsDetailRow } from "./detail-row";
-export { SettingsInfoTip } from "./headings/settings-info-tip";
 
-/** What app screens can add to a plugin-facing row: an accessory beside the label, such as an info tip. */
-interface AppRowExtras {
-  labelAccessory?: ReactNode;
-}
-
-interface AppSettingsRowProps extends Omit<SettingsRowProps, "hint">, AppRowExtras {
+interface AppSettingsRowProps extends Omit<SettingsRowProps, "hint"> {
   hint?: ReactNode;
+  labelAccessory?: ReactNode;
 }
 
 export function SettingsCard({ children, testID }: { children: ReactNode; testID?: string }) {
@@ -65,32 +57,26 @@ export function SettingsRow({
   testID,
 }: AppSettingsRowProps) {
   const compact = useIsCompactFormFactor();
-  const layout = useSettingsRowLayout();
-  const rowStyle = useMemo(() => [layout.row, compact && styles.compactRow], [compact, layout]);
-  const accessoryTitleStyle = useMemo(() => [layout.title, styles.accessoryLabel], [layout]);
+  const rowStyle = useMemo(() => [settingsStyles.row, compact && styles.compactRow], [compact]);
   return (
     <View style={rowStyle} testID={testID}>
       <View style={styles.label}>
         {labelAccessory ? (
           <View style={styles.labelRow}>
-            <Text style={accessoryTitleStyle}>{label}</Text>
+            <Text style={[settingsStyles.rowTitle, styles.accessoryLabel]}>{label}</Text>
             {labelAccessory}
           </View>
         ) : (
-          <Text style={layout.title}>{label}</Text>
+          <Text style={settingsStyles.rowTitle}>{label}</Text>
         )}
-        {typeof hint === "string" ? <Text style={layout.hint}>{hint}</Text> : hint}
+        {typeof hint === "string" ? <Text style={settingsStyles.rowHint}>{hint}</Text> : hint}
         {error ? (
           <Text accessibilityRole="alert" style={settingsStyles.rowError}>
             {error}
           </Text>
         ) : null}
       </View>
-      {children ? (
-        <View style={styles.control}>
-          <ControlSizeProvider size={layout.controlSize}>{children}</ControlSizeProvider>
-        </View>
-      ) : null}
+      {children ? <View style={styles.control}>{children}</View> : null}
     </View>
   );
 }
@@ -131,7 +117,7 @@ export function SettingsSelect<Value extends string>({
   onValueChange,
   disabled,
   ...row
-}: SettingsSelectProps<Value> & AppRowExtras) {
+}: SettingsSelectProps<Value>) {
   const selectedLabel = options.find((option) => option.value === value)?.label ?? value;
   return (
     <SettingsRow {...row}>
@@ -166,7 +152,7 @@ export function SettingsInput({
   secureTextEntry,
   ref,
   ...row
-}: SettingsInputProps & AppRowExtras) {
+}: SettingsInputProps) {
   const compact = useIsCompactFormFactor();
   const input = useRef<EditingTextInputHandle>(null);
   useImperativeHandle(
@@ -189,7 +175,7 @@ export function SettingsInput({
         editable={!disabled}
         secureTextEntry={secureTextEntry}
         accessibilityLabel={row.label}
-        size={compact ? "md" : undefined}
+        size={compact ? "md" : "sm"}
         style={styles.input}
       />
     </SettingsRow>
@@ -199,7 +185,7 @@ export function SettingsInput({
 export function SettingsAction({ actionLabel, onPress, disabled, ...row }: SettingsActionProps) {
   return (
     <SettingsRow {...row}>
-      <Button variant="outline" onPress={onPress} disabled={disabled}>
+      <Button variant="outline" size="sm" onPress={onPress} disabled={disabled}>
         {actionLabel}
       </Button>
     </SettingsRow>

packages/app/src/components/settings/row-density.browser.test.tsx

@@ -1,77 +0,0 @@
-import React, { act } from "react";
-import { createRoot, type Root } from "react-dom/client";
-import { afterEach, describe, expect, it } from "vitest";
-import { Button } from "@/components/ui/button";
-import { SettingsCard, SettingsCollapsibleRow, SettingsRow } from "@/components/settings";
-
-let root: Root | null = null;
-let container: HTMLDivElement | null = null;
-
-afterEach(() => {
-  act(() => root?.unmount());
-  container?.remove();
-  root = null;
-  container = null;
-});
-
-function mountRows() {
-  container = document.createElement("div");
-  document.body.appendChild(container);
-  root = createRoot(container);
-  act(() =>
-    root?.render(
-      <SettingsCard>
-        <SettingsRow label="Card row" testID="card-row">
-          <Button variant="outline" testID="card-button">
-            Download
-          </Button>
-        </SettingsRow>
-        <SettingsCollapsibleRow label="Group" defaultExpanded testID="group">
-          <SettingsRow label="Nested with a button" testID="nested-with-button">
-            <Button variant="outline" testID="nested-button">
-              Download
-            </Button>
-          </SettingsRow>
-          <SettingsRow label="Nested without a button" testID="nested-without-button" />
-        </SettingsCollapsibleRow>
-      </SettingsCard>,
-    ),
-  );
-}
-
-function element(testID: string): HTMLElement {
-  const found = document.querySelector(`[data-testid="${testID}"]`);
-  if (!(found instanceof HTMLElement)) throw new Error(`Nothing rendered as ${testID}`);
-  return found;
-}
-
-function heightOf(testID: string): number {
-  return element(testID).getBoundingClientRect().height;
-}
-
-function titleFontSize(rowTestID: string, label: string): number {
-  const title = [...element(rowTestID).querySelectorAll("div")].find(
-    (node) => node.textContent === label && node.children.length === 0,
-  );
-  if (!title) throw new Error(`No title ${label}`);
-  return Number.parseFloat(getComputedStyle(title).fontSize);
-}
-
-describe("settings row density", () => {
-  it("lines up nested rows with and without a button, tighter than card rows", () => {
-    mountRows();
-
-    expect(heightOf("nested-with-button")).toBe(heightOf("nested-without-button"));
-    expect(heightOf("nested-with-button")).toBeLessThan(heightOf("card-row"));
-    expect(heightOf("group-toggle")).toBeGreaterThan(heightOf("nested-without-button"));
-  });
-
-  it("sizes nested text and controls one step below card rows", () => {
-    mountRows();
-
-    expect(heightOf("nested-button")).toBeLessThan(heightOf("card-button"));
-    expect(titleFontSize("nested-with-button", "Nested with a button")).toBeLessThan(
-      titleFontSize("card-row", "Card row"),
-    );
-  });
-});

packages/app/src/components/settings/row-density.tsx

@@ -1,57 +0,0 @@
-import { createContext, useContext, useMemo, type ReactNode } from "react";
-import type { StyleProp, TextStyle, ViewStyle } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { CONTROL_HEIGHTS } from "@/components/ui/control-geometry";
-import type { ContainedControlSize } from "@/components/ui/control-size";
-import { settingsStyles } from "@/styles/settings";
-
-// Rows revealed under a collapsible row belong to it, so they sit one step smaller than the rows
-// of the card: tighter padding, smaller text, smaller controls. The container decides; a row
-// never knows on its own that it is nested.
-const NestedRowsContext = createContext(false);
-
-export function NestedSettingsRows({ children }: { children: ReactNode }) {
-  return <NestedRowsContext.Provider value>{children}</NestedRowsContext.Provider>;
-}
-
-export interface SettingsRowLayout {
-  row: StyleProp<ViewStyle>;
-  title: StyleProp<TextStyle>;
-  hint: StyleProp<TextStyle>;
-  /** The size of the controls in the row's trailing slot. */
-  controlSize: ContainedControlSize;
-}
-
-/** How a row lays out where it is rendered: in a card, or nested under a collapsible row. */
-export function useSettingsRowLayout(): SettingsRowLayout {
-  const nested = useContext(NestedRowsContext);
-  return useMemo(
-    () =>
-      nested
-        ? {
-            row: [settingsStyles.row, styles.nestedRow],
-            title: [settingsStyles.rowTitle, styles.nestedText],
-            hint: [settingsStyles.rowHint, styles.nestedText],
-            controlSize: "xs",
-          }
-        : {
-            row: settingsStyles.row,
-            title: settingsStyles.rowTitle,
-            hint: settingsStyles.rowHint,
-            controlSize: "sm",
-          },
-    [nested],
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  // Every nested row is as tall as one holding an `xs` control, so rows with and without a
-  // trailing button line up.
-  nestedRow: {
-    paddingVertical: theme.spacing[2],
-    minHeight: CONTROL_HEIGHTS.tight + theme.spacing[2] * 2,
-  },
-  nestedText: {
-    fontSize: theme.fontSize.sm,
-  },
-}));

packages/app/src/components/settings/row-header.tsx

@@ -1,113 +0,0 @@
-import { ChevronRight } from "lucide-react-native";
-import { useCallback, useMemo } from "react";
-import { Text, View, type AccessibilityState, type PressableStateCallbackType } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { mutedIconColorMapping } from "@/components/ui/icon-color";
-import { PressHighlight } from "@/components/ui/press-highlight";
-import { settingsStyles } from "@/styles/settings";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
-import { useSettingsRowLayout } from "./row-density";
-
-const ThemedChevron = withUnistyles(ChevronRight);
-const hoveredIconColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
-
-type HoverState = PressableStateCallbackType & { hovered?: boolean };
-
-export interface SettingsRowHeaderProps {
-  label: string;
-  /** A short status shown before the chevron. */
-  summary?: string;
-  onPress: () => void;
-  disabled?: boolean;
-  /** Turns the chevron down, for a row whose children are revealed in place. */
-  expanded?: boolean;
-  accessibilityState?: AccessibilityState;
-  /** Props React Native Web does not derive from `accessibilityState`, such as `aria-expanded`. */
-  webAccessibilityProps?: Record<string, unknown> | null;
-  testID?: string;
-}
-
-/**
- * The pressable line shared by settings rows that lead somewhere: a label, an optional summary and
- * a trailing chevron. A collapsible row turns the chevron down; a row that opens a sheet keeps it
- * pointing right.
- */
-export function SettingsRowHeader({
-  label,
-  summary,
-  onPress,
-  disabled,
-  expanded = false,
-  accessibilityState,
-  webAccessibilityProps,
-  testID,
-}: SettingsRowHeaderProps) {
-  const layout = useSettingsRowLayout();
-  const rowStyle = useCallback(
-    ({ hovered, pressed }: HoverState) => [
-      layout.row,
-      !disabled && hovered && styles.hovered,
-      !disabled && pressed && styles.pressed,
-    ],
-    [disabled, layout],
-  );
-  const chevronStyle = useMemo(
-    () => [styles.chevron, expanded && styles.chevronExpanded],
-    [expanded],
-  );
-  return (
-    <PressHighlight
-      {...webAccessibilityProps}
-      accessibilityRole="button"
-      accessibilityLabel={summary ? `${label}, ${summary}` : label}
-      accessibilityState={accessibilityState}
-      disabled={disabled}
-      onPress={onPress}
-      style={rowStyle}
-      highlightStyle={styles.pressed}
-      testID={testID}
-    >
-      {({ hovered }: HoverState) => (
-        <>
-          <View style={settingsStyles.rowContent}>
-            <Text style={layout.title}>{label}</Text>
-          </View>
-          {summary ? (
-            <Text style={styles.summary} numberOfLines={1}>
-              {summary}
-            </Text>
-          ) : null}
-          {disabled ? null : (
-            <View style={chevronStyle}>
-              <ThemedChevron
-                size={ICON_SIZE.sm}
-                uniProps={hovered ? hoveredIconColorMapping : mutedIconColorMapping}
-              />
-            </View>
-          )}
-        </>
-      )}
-    </PressHighlight>
-  );
-}
-
-const styles = StyleSheet.create((theme) => ({
-  summary: {
-    flexShrink: 1,
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-    marginRight: theme.spacing[2],
-  },
-  hovered: {
-    backgroundColor: theme.colors.surface2,
-  },
-  pressed: {
-    backgroundColor: theme.colors.surface3,
-  },
-  // Optical: the chevron's ink sits about 4px inside its box whether it points right or down; this
-  // puts the ink on the card's trailing rail, where the switch and the reports' refresh buttons end.
-  chevron: { marginRight: -theme.spacing[1] },
-  chevronExpanded: {
-    transform: [{ rotate: "90deg" }],
-  },
-}));

packages/app/src/components/sidebar/sidebar-workspace-row.tsx

@@ -1,5 +1,3 @@
-import { useWorkspaceCreation } from "@/workspace-creation";
-import { CreatingWorkspaceRow } from "@/workspace-creation/ui";
 import { memo, useCallback, useMemo, useState, type Ref } from "react";
 import { useTranslation } from "react-i18next";
 import { View, Text, type GestureResponderEvent } from "react-native";
@@ -60,16 +58,7 @@ interface SidebarWorkspaceRowProps {
   dragHandleProps?: DraggableListDragHandleProps;
 }
 
-export function SidebarWorkspaceRow(props: SidebarWorkspaceRowProps) {
-  const creation = useWorkspaceCreation(props.workspace.serverId, props.workspace.workspaceId);
-  if (creation && !creation.workspaceObserved)
-    return (
-      <CreatingWorkspaceRow attempt={creation} onPress={props.onPress} selected={props.selected} />
-    );
-  return <ReadySidebarWorkspaceRow {...props} />;
-}
-
-function ReadySidebarWorkspaceRow({
+export function SidebarWorkspaceRow({
   workspace,
   selected,
   shortcutNumber,

packages/app/src/components/ui/autocomplete-popover.tsx

@@ -5,9 +5,9 @@ import {
   useRef,
   useState,
   type ReactElement,
-  type ReactNode,
+  type RefObject,
 } from "react";
-import { View, useWindowDimensions, type StyleProp, type ViewStyle } from "react-native";
+import { View, useWindowDimensions } from "react-native";
 import { Portal } from "@gorhom/portal";
 import Animated, { useAnimatedReaction, useAnimatedStyle } from "react-native-reanimated";
 import { scheduleOnRN } from "react-native-worklets";
@@ -32,8 +32,7 @@ interface RelativeAnchorRect {
 
 interface AutocompletePopoverProps {
   visible: boolean;
-  children: ReactNode;
-  anchorStyle?: StyleProp<ViewStyle>;
+  anchorRef: RefObject<View | null>;
   options: readonly AutocompleteOption[];
   selectedIndex: number;
   onSelect: (option: AutocompleteOption) => void;
@@ -45,8 +44,7 @@ interface AutocompletePopoverProps {
 
 export function AutocompletePopover({
   visible,
-  children,
-  anchorStyle,
+  anchorRef,
   options,
   selectedIndex,
   onSelect,
@@ -57,7 +55,6 @@ export function AutocompletePopover({
 }: AutocompletePopoverProps): ReactElement | null {
   "use no memo";
   // React Compiler memoizes effect captures by reading SharedValue.value during render.
-  const anchorRef = useRef<View>(null);
   const [relativeAnchorRect, setRelativeAnchorRect] = useState<RelativeAnchorRect | null>(null);
   const windowDimensions = useWindowDimensions();
   const safeAreaInsets = useSafeAreaInsets();
@@ -140,29 +137,25 @@ export function AutocompletePopover({
     [anchorY, reservedLift, safeAreaInsets.top],
   );
 
-  const showPopover = canMeasure && relativeAnchorRect && baseStyle;
+  if (!visible || !relativeAnchorRect || !baseStyle) return null;
+  if (options.length > 0 && selectedIndex < 0) return null;
 
   // The translate view is the popover's own frame, so it lifts only the popover.
   return (
-    <View ref={anchorRef} onLayout={remeasure} style={anchorStyle} collapsable={false}>
-      {children}
-      {showPopover ? (
-        <Portal hostName={portalHostName}>
-          <KeyboardTranslateView {...anchor.translation} style={baseStyle}>
-            <Animated.View testID="composer-autocomplete-popover" style={heightStyle}>
-              <Autocomplete
-                options={options}
-                selectedIndex={selectedIndex}
-                onSelect={onSelect}
-                isLoading={isLoading}
-                errorMessage={errorMessage}
-                loadingText={loadingText}
-                emptyText={emptyText}
-              />
-            </Animated.View>
-          </KeyboardTranslateView>
-        </Portal>
-      ) : null}
-    </View>
+    <Portal hostName={portalHostName}>
+      <KeyboardTranslateView {...anchor.translation} style={baseStyle}>
+        <Animated.View testID="composer-autocomplete-popover" style={heightStyle}>
+          <Autocomplete
+            options={options}
+            selectedIndex={selectedIndex}
+            onSelect={onSelect}
+            isLoading={isLoading}
+            errorMessage={errorMessage}
+            loadingText={loadingText}
+            emptyText={emptyText}
+          />
+        </Animated.View>
+      </KeyboardTranslateView>
+    </Portal>
   );
 }

packages/app/src/components/ui/autocomplete.tsx

@@ -247,16 +247,14 @@ export function Autocomplete({
     <View style={styles.outerWrapper}>
       {selectedOption?.kind === "command" && selectedOption.description ? (
         <View style={styles.detailCard}>
-          <Text style={styles.detailLabel} numberOfLines={1}>
+          <Text style={styles.detailLabel}>
             {removeBoltGlyphs(selectedOption.label) ?? selectedOption.label}
           </Text>
-          <Text style={styles.detailDescription} numberOfLines={2} ellipsizeMode="tail">
+          <Text style={styles.detailDescription}>
             {removeBoltGlyphs(selectedOption.description)}
           </Text>
           {selectedOption.detail ? (
-            <Text style={styles.detailHint} numberOfLines={1}>
-              {removeBoltGlyphs(selectedOption.detail)}
-            </Text>
+            <Text style={styles.detailHint}>{removeBoltGlyphs(selectedOption.detail)}</Text>
           ) : null}
         </View>
       ) : null}
@@ -295,9 +293,6 @@ const styles = StyleSheet.create((theme: Theme) => ({
     gap: theme.spacing[1],
   },
   detailCard: {
-    flexShrink: 1,
-    minHeight: 0,
-    overflow: "hidden",
     backgroundColor: theme.colors.surface1,
     borderWidth: theme.borderWidth[1],
     borderColor: theme.colors.borderAccent,
@@ -323,8 +318,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
   },
   container: {
     flexShrink: 1,
-    // Keep a complete selectable row (36), list padding (8), and borders (2).
-    minHeight: 46,
+    minHeight: 0,
     backgroundColor: theme.colors.surface1,
     borderWidth: theme.borderWidth[1],
     borderColor: theme.colors.borderAccent,

packages/app/src/components/ui/button.tsx

@@ -1,5 +1,4 @@
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
-import { useContainedControlSize } from "@/components/ui/control-size";
 import {
   default as React,
   useCallback,
@@ -163,7 +162,7 @@ const styles = StyleSheet.create((theme) => {
 export function Button({
   children,
   variant = "secondary",
-  size: sizeProp,
+  size = "md",
   leftIcon,
   trailing,
   style,
@@ -186,8 +185,6 @@ export function Button({
   }
 >) {
   const [hovered, setHovered] = useState(false);
-  const containedSize = useContainedControlSize();
-  const size = sizeProp ?? containedSize ?? "md";
   const isDisabled = disabled || loading;
 
   let variantStyle: ViewStyle;

packages/app/src/components/ui/combobox.tsx

@@ -28,7 +28,6 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import type { EditingTextInputHandle } from "@/components/ui/text-input";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { useRetainedPanelActive } from "@/components/retained-panel";
 import { BottomSheetScrollView, type BottomSheetBackgroundProps } from "@gorhom/bottom-sheet";
 import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
@@ -911,9 +910,13 @@ function resolveInitialActiveIndex(
   return selectedIndex >= 0 ? selectedIndex : fallbackIndex;
 }
 
+type BottomSheetVisibility = ReturnType<typeof useIsolatedBottomSheetVisibility>;
+
 interface MobileBodyProps {
-  isOpen: boolean;
+  bottomSheetRef: BottomSheetVisibility["sheetRef"];
   snapPoints: string[];
+  handleSheetChange: BottomSheetVisibility["handleSheetChange"];
+  handleSheetDismiss: BottomSheetVisibility["handleSheetDismiss"];
   handleIndicatorStyle: { backgroundColor: string };
   titleColor: string;
   title: string;
@@ -941,22 +944,7 @@ interface MobileBodyProps {
   safeAreaBottom: number;
 }
 
-function MobileComboboxBody(props: MobileBodyProps): ReactElement | null {
-  const active = useRetainedPanelActive();
-  if (!active) return null;
-  // The visibility tracker must leave the tree with its sheet.
-  return <MobileComboboxSheet {...props} />;
-}
-
-function MobileComboboxSheet(props: MobileBodyProps): ReactElement {
-  const {
-    sheetRef: bottomSheetRef,
-    handleSheetChange,
-    handleSheetDismiss,
-  } = useIsolatedBottomSheetVisibility({
-    visible: props.isOpen,
-    onClose: props.onClose,
-  });
+function MobileComboboxBody(props: MobileBodyProps): ReactElement {
   const comboboxTitleStyle = useMemo(
     () => [styles.comboboxTitle, { color: props.titleColor }],
     [props.titleColor],
@@ -991,13 +979,13 @@ function MobileComboboxSheet(props: MobileBodyProps): ReactElement {
 
   return (
     <IsolatedBottomSheetModal
-      ref={bottomSheetRef}
+      ref={props.bottomSheetRef}
       contextBridge={null}
       snapPoints={props.snapPoints}
       index={0}
       enableDynamicSizing={false}
-      onChange={handleSheetChange}
-      onDismiss={handleSheetDismiss}
+      onChange={props.handleSheetChange}
+      onDismiss={props.handleSheetDismiss}
       backdropOpacity={0.45}
       enablePanDownToClose
       backgroundComponent={ComboboxSheetBackground}
@@ -1180,8 +1168,7 @@ function DesktopComboboxOptionsBody(props: {
   );
 }
 
-function DesktopComboboxBody(props: DesktopBodyProps): ReactElement | null {
-  const active = useRetainedPanelActive();
+function DesktopComboboxBody(props: DesktopBodyProps): ReactElement {
   const handleDesktopKey = props.handleDesktopKey;
   const handleWebOverlayKeyDown = useCallback(
     (event: KeyboardEvent) => {
@@ -1203,9 +1190,6 @@ function DesktopComboboxBody(props: DesktopBodyProps): ReactElement | null {
     [props.refs, setWebOverlayScope],
   );
 
-  // Remove the portal before a retained chat can freeze its closing update.
-  if (!active) return null;
-
   const overlay = (
     <OverlayLayerProvider layer={props.overlayLayer}>
       <View
@@ -1325,7 +1309,6 @@ export function Combobox({
   const resolvedEmptyText = emptyText ?? t("common.empty.noOptionsMatchSearch");
   const resolvedTitle = title ?? t("common.actions.select");
   const isMobile = useIsCompactFormFactor();
-  const active = useRetainedPanelActive();
   const floatingLayer = useOverlayLayer("floating");
   const safeAreaInsets = useSafeAreaInsets();
   const titleColor = theme.colors.foreground;
@@ -1365,10 +1348,6 @@ export function Combobox({
     bumpSearchResetKey();
   }, [setOpen, setSearchQueryWithCallback]);
 
-  useEffect(() => {
-    if (!active && isOpen) handleClose();
-  }, [active, isOpen, handleClose]);
-
   useResetSearchOnOpen(isOpen, setSearchQueryWithCallback, bumpSearchResetKey);
 
   const collisionPadding = useMemo(computeCollisionPadding, []);
@@ -1434,6 +1413,16 @@ export function Combobox({
     referenceWidth,
   });
 
+  const {
+    sheetRef: bottomSheetRef,
+    handleSheetChange,
+    handleSheetDismiss,
+  } = useIsolatedBottomSheetVisibility({
+    visible: isOpen,
+    isEnabled: isMobile,
+    onClose: handleClose,
+  });
+
   const normalizedSearch = searchable ? searchQuery.trim().toLowerCase() : "";
   const sanitizedSearchValue = searchQuery.trim();
   const showCustomOption = useMemo(
@@ -1583,8 +1572,10 @@ export function Combobox({
   if (isMobile) {
     return (
       <MobileComboboxBody
-        isOpen={isOpen}
+        bottomSheetRef={bottomSheetRef}
         snapPoints={snapPoints}
+        handleSheetChange={handleSheetChange}
+        handleSheetDismiss={handleSheetDismiss}
         handleIndicatorStyle={handleIndicatorStyle}
         titleColor={titleColor}
         title={resolvedTitle}

packages/app/src/components/ui/control-geometry.test.ts

@@ -81,8 +81,6 @@ describe("control geometry", () => {
   it("keeps field text sizing tied to control size", () => {
     const geometry = createControlGeometry(theme);
 
-    expect(geometry.fieldTextXs.fontSize).toBe(12);
-    expect(geometry.fieldTextXs.lineHeight).toBe(17);
     expect(geometry.fieldTextSm.fontSize).toBe(14);
     expect(geometry.fieldTextSm.lineHeight).toBe(20);
     expect(geometry.fieldTextMd.fontSize).toBe(14);
@@ -97,13 +95,6 @@ describe("control geometry", () => {
     const geometry = createControlGeometry(theme);
     const borderWidth = theme.borderWidth[1];
 
-    expect(geometry.fieldControlXs.minHeight).toBe(28);
-    expect(
-      geometry.fieldTextXs.lineHeight +
-        geometry.fieldControlXs.paddingVertical * 2 +
-        borderWidth * 2,
-    ).toBe(geometry.fieldControlXs.minHeight);
-
     expect(geometry.fieldControlSm.minHeight).toBe(32);
     expect(geometry.fieldControlSm.paddingVertical).toBe(5);
     expect(

packages/app/src/components/ui/control-geometry.ts

@@ -2,7 +2,7 @@ import type { StyleProp, ViewStyle } from "react-native";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 
 export type ButtonControlSize = "xs" | "sm" | "md" | "lg";
-export type FieldControlSize = "xs" | "sm" | "md";
+export type FieldControlSize = "sm" | "md";
 export type SegmentedControlSize = "xs" | "sm" | "md";
 export type ControlInteractionPhase = "rest" | "hover" | "active";
 
@@ -188,19 +188,8 @@ export function resolveControlInteractionStyles(
 
 export function createControlGeometry(theme: Theme) {
   const controlBorderWidth = theme.borderWidth[1];
-  const fieldTextXsLineHeight = fieldLineHeight(theme.fontSize.sm);
   const fieldTextSmLineHeight = fieldLineHeight(theme.fontSize.base);
   const fieldTextMdLineHeight = fieldLineHeight(theme.fontSize.base);
-  const fieldControlXs = {
-    minHeight: CONTROL_HEIGHTS.tight,
-    paddingHorizontal: theme.spacing[2],
-    paddingVertical: fieldVerticalPadding(
-      CONTROL_HEIGHTS.tight,
-      fieldTextXsLineHeight,
-      controlBorderWidth,
-    ),
-    borderRadius: theme.borderRadius.md,
-  };
   const fieldControlSm = {
     minHeight: CONTROL_HEIGHTS.compact,
     paddingHorizontal: theme.spacing[3],
@@ -221,10 +210,6 @@ export function createControlGeometry(theme: Theme) {
     ),
     borderRadius: theme.borderRadius.lg,
   };
-  const fieldTextXs = {
-    fontSize: theme.fontSize.sm,
-    lineHeight: fieldTextXsLineHeight,
-  };
   const fieldTextSm = {
     fontSize: theme.fontSize.base,
     lineHeight: fieldTextSmLineHeight,
@@ -267,10 +252,6 @@ export function createControlGeometry(theme: Theme) {
       fontSize: theme.fontSize.sm,
     },
     alert,
-    formTextInputXs: {
-      ...fieldControlXs,
-      ...fieldTextXs,
-    },
     formTextInputSm: {
       ...fieldControlSm,
       ...fieldTextSm,
@@ -283,10 +264,8 @@ export function createControlGeometry(theme: Theme) {
       ...fieldControlMd,
       ...fieldTextMd,
     },
-    fieldControlXs,
     fieldControlSm,
     fieldControlMd,
-    fieldTextXs,
     fieldTextSm,
     fieldTextMd,
     controlRest: {