fix(app): retain checkout selection after workspace failure

Return the submitted checkout through the existing draft failure handoff. Keep client-owned receipt ordering and retries out of app presentation, and retain direct coverage of newer draft cleanup while removing the unused background-agent wrapper.

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.13.1 - 2026-10-26
+
+### Fixed
+
+- Fixed a startup crash with Show background enabled and eight or more workspaces in a project ([#7896](https://github.com/getpaseo/paseo/pull/7896) by [@budivoogt](https://github.com/budivoogt))
+
 ## 0.13.0 - 2026-10-24
 
 Foldable phone layouts, agents that delegate work to other machines, plugin file panels, and plugin translations.

CHANGELOG.zh-CN.md

@@ -1,5 +1,11 @@
 # 更新日志
 
+## 0.13.1 - 2026-10-26
+
+### 修复
+
+- 修复开启“显示后台工作区”且项目包含至少八个工作区时的启动崩溃（[#7896](https://github.com/getpaseo/paseo/pull/7896)，由 [@budivoogt](https://github.com/budivoogt) 贡献）
+
 ## 0.13.0 - 2026-10-24
 
 折叠屏手机布局、可将工作委派给其他机器的 Agent、插件文件面板，以及插件翻译。

docs/agent-lifecycle.md

@@ -25,8 +25,54 @@ 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 agents remain resident indefinitely. Runtime closure happens only through an explicit lifecycle
-action such as archive, replacement, reload, workspace teardown, or daemon shutdown.
+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).
 
 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

docs/architecture.md

@@ -340,11 +340,50 @@ Example: adding a new enum value
 
 ### Creation ownership
 
-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.
+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.
 
 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,12 +221,6 @@ 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: {
@@ -244,8 +238,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: { provider, model, language, confidenceThreshold } },
-    voiceMode: { enabled, llm, stt: { provider, model, language }, turnDetection, tts: { provider, model, voice, speakerId, speed } }
+    dictation: { enabled, stt: SpeechSttConfig },
+    voiceMode: { enabled, llm, stt: SpeechSttConfig, turnDetection, tts: SpeechTtsConfig }
   },
   log: {
     level, format,
@@ -353,42 +347,27 @@ Environment variables override `config.json`:
 after changing `config.json`. Environment changes require a daemon restart; the launch environment
 remains authoritative during reload.
 
-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.
+### Speech configuration
 
-Set these to select OpenAI instead of local speech:
+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.
 
-| 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         |
+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.
 
-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`
+`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.
 
 ---
 

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. 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.
+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.
 
 A `<Pressable>` wrapping a `<Text>` is a sixth variant. It is wrong. `<Button>` accepts `style`, `textStyle`, `leftIcon`, `disabled`, `size`, and `variant`.
 
@@ -126,6 +126,8 @@ 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,6 +94,12 @@ 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,6 +498,11 @@ 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/130011.txt

@@ -0,0 +1,4 @@
+Fixed
+- Fixed a startup crash with Show background enabled and eight or more workspaces in a project
+
+Full notes: https://paseo.sh/changelog

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

@@ -0,0 +1,4 @@
+Fixed
+- Fixed a startup crash with Show background enabled and eight or more workspaces in a project
+
+Full notes: https://paseo.sh/changelog

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

@@ -0,0 +1,4 @@
+Fixed
+- Fixed a startup crash with Show background enabled and eight or more workspaces in a project
+
+Full notes: https://paseo.sh/changelog

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

@@ -0,0 +1,4 @@
+Fixed
+- Fixed a startup crash with Show background enabled and eight or more workspaces in a project
+
+Full notes: https://paseo.sh/changelog

nix/npm-deps.hash

@@ -1 +1 @@
-sha256-DZOPOf81PkUxdD65BrfkTZhs6/DkfDWCFZ/SU+QrZbg=
+sha256-SKL7TMIuuV3imTIaQc66UDf3n6V3FB0nGSBucJ6rlA0=

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -30269,9 +30269,9 @@
       }
     },
     "node_modules/react-native-reanimated": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-4.5.1.tgz",
-      "integrity": "sha512-RnMvtDuR+68ig864gAvZCOdZehqhC5rFmMo0kn+ARfgVSTvFeF6IFLBVgMPUu0KwihaapEyW24WRi6nEyy1kSA==",
+      "version": "4.5.5",
+      "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-4.5.5.tgz",
+      "integrity": "sha512-xtJXZRZ1vkec1AIUVG02St2sbyZS5jc7227TlDu/HonqUYPeZAfiC4RI2jqL1dVMNBu1+7oBx/c9QkjF2kg6Lg==",
       "license": "MIT",
       "dependencies": {
         "react-native-is-edge-to-edge": "^1.3.1",
@@ -30280,7 +30280,7 @@
       "peerDependencies": {
         "react": "*",
         "react-native": "0.83 - 0.86",
-        "react-native-worklets": "0.10.x"
+        "react-native-worklets": "0.10.x - 0.11.x"
       }
     },
     "node_modules/react-native-safe-area-context": {
@@ -30406,9 +30406,9 @@
       }
     },
     "node_modules/react-native-worklets": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/react-native-worklets/-/react-native-worklets-0.10.1.tgz",
-      "integrity": "sha512-62mRM19bDpfpdI8HLkEErcdOsrAPDtE9lA/sw+5lLRpzBHNhxaoj9QyY2KjXqUmirelxkX4zuPGTC3VdA0feJA==",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/react-native-worklets/-/react-native-worklets-0.10.4.tgz",
+      "integrity": "sha512-gbk0CxMrGywEp3SJAHO+2JVaCWtl4WyAYBIxLZy6Y113+mHHuq3FuT6iV+VcaBuJzuuN34mtdZ4j5JIlBDzmeA==",
       "license": "MIT",
       "dependencies": {
         "@babel/plugin-transform-arrow-functions": "^7.27.1",
@@ -35695,7 +35695,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "dependencies": {
         "@codemirror/commands": "6.10.4",
         "@codemirror/language": "6.12.4",
@@ -35715,6 +35715,7 @@
         "@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",
@@ -35780,14 +35781,14 @@
         "react-native-gesture-handler": "~2.32.0",
         "react-native-keyboard-controller": "1.21.12",
         "react-native-nitro-modules": "0.35.5",
-        "react-native-reanimated": "4.5.1",
+        "react-native-reanimated": "4.5.5",
         "react-native-safe-area-context": "~5.7.0",
         "react-native-screens": "~4.26.0",
         "react-native-svg": "15.15.4",
         "react-native-unistyles": "^3.2.4",
         "react-native-web": "~0.21.0",
         "react-native-webview": "13.16.1",
-        "react-native-worklets": "0.10.1",
+        "react-native-worklets": "0.10.4",
         "tiny-invariant": "^1.3.3",
         "turndown": "^7.2.4",
         "turndown-plugin-gfm": "^1.0.2",
@@ -37961,12 +37962,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.13.0",
-        "@getpaseo/protocol": "0.13.0",
-        "@getpaseo/server": "0.13.0",
+        "@getpaseo/client": "0.13.1",
+        "@getpaseo/protocol": "0.13.1",
+        "@getpaseo/server": "0.13.1",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -38213,10 +38214,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "dependencies": {
-        "@getpaseo/protocol": "0.13.0",
-        "@getpaseo/relay": "0.13.0",
+        "@getpaseo/protocol": "0.13.1",
+        "@getpaseo/relay": "0.13.1",
         "ws": "^8.20.0",
         "zod": "^4.4.3"
       },
@@ -38228,7 +38229,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -38472,7 +38473,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -41012,39 +41013,6 @@
         }
       }
     },
-    "packages/expo-two-way-audio/node_modules/expo-module-scripts/node_modules/react-native-worklets": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/react-native-worklets/-/react-native-worklets-0.13.0.tgz",
-      "integrity": "sha512-1OrhAeAKaZF4XrBa4YbPQbKzNOpjh52HDlId8e6ete1OCHNdAlrQHzG4gznJ225EAj3dgQXHViJvK51M9B52jQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@babel/generator": "^7.27.1",
-        "@babel/plugin-transform-arrow-functions": "^7.27.1",
-        "@babel/plugin-transform-class-properties": "^7.28.6",
-        "@babel/plugin-transform-classes": "^7.28.6",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.28.6",
-        "@babel/plugin-transform-optional-chaining": "^7.28.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.27.1",
-        "@babel/plugin-transform-template-literals": "^7.27.1",
-        "@babel/plugin-transform-unicode-regex": "^7.27.1",
-        "@babel/preset-typescript": "^7.28.5",
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1",
-        "@jridgewell/remapping": "^2.3.5",
-        "convert-source-map": "^2.0.0",
-        "semver": "^7.7.4",
-        "whatwg-fetch": "^3.6.20"
-      },
-      "peerDependencies": {
-        "@babel/core": "*",
-        "@react-native/metro-config": "*",
-        "react": "*",
-        "react-native": "0.86 - 0.88"
-      }
-    },
     "packages/expo-two-way-audio/node_modules/expo-module-scripts/node_modules/react-native/node_modules/pretty-format": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -42124,7 +42092,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "dependencies": {
         "@codemirror/language": "6.12.4",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -42153,15 +42121,15 @@
     },
     "packages/plugin": {
       "name": "@getpaseo/plugin",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "dependencies": {
         "@agentclientprotocol/sdk": "^1.4.0",
         "i18next": "^26.3.0",
         "use-sync-external-store": "^1.6.0"
       },
       "devDependencies": {
-        "@getpaseo/client": "0.13.0",
-        "@getpaseo/protocol": "0.13.0",
+        "@getpaseo/client": "0.13.1",
+        "@getpaseo/protocol": "0.13.1",
         "@types/node": "^20.9.0",
         "@types/react": "~19.2.0",
         "react": "19.2.3",
@@ -42171,8 +42139,8 @@
         "zod": "^4.4.3"
       },
       "peerDependencies": {
-        "@getpaseo/client": "0.13.0",
-        "@getpaseo/protocol": "0.13.0",
+        "@getpaseo/client": "0.13.1",
+        "@getpaseo/protocol": "0.13.1",
         "react": ">=19.1.0 <20",
         "react-native": ">=0.81.5",
         "zod": "^4.4.3"
@@ -42194,7 +42162,7 @@
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "dependencies": {
         "semver": "^7.8.5",
         "zod": "^4.4.3"
@@ -42221,7 +42189,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "dependencies": {
         "@noble/ciphers": "^2.4.0",
         "@noble/curves": "^2.4.0",
@@ -42442,16 +42410,16 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "0.3.246",
         "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.13.0",
-        "@getpaseo/highlight": "0.13.0",
-        "@getpaseo/plugin": "0.13.0",
-        "@getpaseo/protocol": "0.13.0",
-        "@getpaseo/relay": "0.13.0",
+        "@getpaseo/client": "0.13.1",
+        "@getpaseo/highlight": "0.13.1",
+        "@getpaseo/plugin": "0.13.1",
+        "@getpaseo/protocol": "0.13.1",
+        "@getpaseo/relay": "0.13.1",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "1.29.0",
         "@opencode-ai/sdk": "1.14.46",
@@ -43372,7 +43340,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",
@@ -44982,7 +44950,7 @@
     },
     "plugins": {
       "name": "@getpaseo/builtin-plugins",
-      "version": "0.13.0",
+      "version": "0.13.1",
       "dependencies": {
         "@getpaseo/plugin": "*",
         "zod": "^4.4.3"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [
@@ -154,7 +154,7 @@
     "react-dom": "19.2.3",
     "react-native": "0.86.3",
     "react-native-gesture-handler": "~2.32.0",
-    "react-native-reanimated": "4.5.1",
-    "react-native-worklets": "0.10.1"
+    "react-native-reanimated": "4.5.5",
+    "react-native-worklets": "0.10.4"
   }
 }

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

@@ -18,7 +18,9 @@ import {
   expectComposerVisible,
   cancelAgent,
   composerLocator,
+  expectQueuedMessageButton,
   fillComposerDraft,
+  holdSendButton,
   sendDraftToQueue,
   startRunningMockAgent,
   submitMessage,
@@ -1290,6 +1292,49 @@ 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/composer-attachments.spec.ts

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

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

@@ -0,0 +1,81 @@
+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,6 +42,14 @@ 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 }> {
@@ -100,6 +108,7 @@ 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,4 +1,12 @@
+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";
 
@@ -105,26 +113,38 @@ test("new workspace navigation and optimistic prompt precede agent initializatio
   await creation.expectAgentCount(1);
 });
 
-for (const scenario of [
-  { suffix: "", prepare: async () => {} },
+for (const entry of [
   {
-    suffix: " after remount",
-    prepare: async (creation: Awaited<ReturnType<typeof createCreationScenario>>) =>
-      creation.evictAndReturnToDraft(),
+    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(),
   },
 ]) {
-  test(`retrying failed agent initialization preserves its workspace${scenario.suffix}`, async ({
+  test(`a failed agent start in ${entry.name} keeps the draft, its error and its retry`, async ({
     creation,
     startup,
-  }) => {
-    await creation.openWorkspaceForm("local");
-    await creation.submitPrompt("Retry this workspace and agent together.", "Create");
-    await creation.expectAgentStillStarting();
+    page,
+  }, testInfo) => {
+    const prompt = "Retry this agent after its startup fails.";
+    await entry.open(creation);
+    await creation.submitPrompt(prompt, entry.button);
     await startup.fail();
-    await creation.expectStartupFailure();
-    await creation.expectOneCreatedWorkspace();
-    await scenario.prepare(creation);
-    await creation.submitPrompt("Retry this workspace and agent together.");
+    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.expectAgentCount(1);
   });
 }
@@ -171,3 +191,356 @@ 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 creates a workspace, navigates before agent startup, and creates another agent on an old daemon", async ({
+    test("current app requires a host update for chat workspaces and preserves existing-workspace agent creation", async ({
       page,
       project,
       client,
@@ -104,49 +104,34 @@ 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.getByTestId("user-message").filter({ visible: true }).filter({ hasText: prompt }),
+        page
+          .getByText("Update this host to create a workspace with an agent.", { exact: true })
+          .first(),
       ).toBeVisible();
+      await expect(page).toHaveURL(/\/new\?/);
       expect((await client.fetchAgents()).entries).toHaveLength(0);
-      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);
-
+      expect(
+        (await client.fetchWorkspaces()).entries.filter(
+          (workspace) => workspace.projectId === project.projectId,
+        ),
+      ).toHaveLength(1);
+      await page.goto(buildHostWorkspaceRoute(daemon.serverId, project.workspaceId));
       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(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.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(
-        page.getByTestId(`workspace-tab-agent_${second.id}`).filter({ visible: true }),
+        page.getByTestId(`workspace-tab-agent_${agent.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/new-workspace-composer-draft.spec.ts

@@ -1,7 +1,8 @@
+import { observeCreationRequests } from "../support/helpers/creation";
 import {
   composerLocator,
   enterComposerFullscreen,
-  exitComposerFullscreen,
+  fillComposerDraft,
   resizeComposerViewport,
 } from "../support/helpers/composer";
 import { expect, test } from "../support/fixtures";
@@ -95,6 +96,7 @@ 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);
@@ -134,6 +136,9 @@ 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 {
@@ -142,10 +147,11 @@ test.describe("New workspace composer draft", () => {
   });
 });
 
-test("fullscreen creation returns inline and keeps submission locked when reopened", async ({
+test("fullscreen creation opens the inline agent composer and keeps follow-up editing available", 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);
@@ -157,25 +163,23 @@ test("fullscreen creation returns inline and keeps submission locked when reopen
     await page.getByRole("button", { name: "Create", exact: true }).click();
     await delay.waitForCreateRequest();
 
-    await test.step("submission returns inline with the original draft and spinner", async () => {
+    await test.step("submission opens the normal agent panel inline", async () => {
+      await expect(page).toHaveURL(/\/workspace\//);
       await expect(page.getByTestId("composer-fullscreen")).toHaveCount(0);
-      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 expect(page.getByTestId("user-message").filter({ visible: true })).toContainText(DRAFT);
+      await expect(composerLocator(page)).toHaveValue("");
+      await expect(composerLocator(page)).toBeEditable();
     });
-    await test.step("fullscreen can reopen while pending without unlocking or duplicating submission", async () => {
+    await test.step("fullscreen can reopen to edit a follow-up while creation is pending", async () => {
+      await fillComposerDraft(page, followUpDraft);
       await enterComposerFullscreen(page);
       await expect(page.getByTestId("composer-fullscreen")).toBeVisible();
-      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);
+      await expect(composerLocator(page)).toHaveValue(followUpDraft);
+      await expect(composerLocator(page)).toBeEditable();
     });
     delay.release();
     await page.waitForURL((url) => url.pathname.includes("/workspace/"));
-    await expect(composerLocator(page)).toHaveValue("");
+    await expect(composerLocator(page)).toHaveValue(followUpDraft);
     await expect(composerLocator(page)).toBeEditable();
     expect(delay.agentRequests).toHaveLength(1);
   } finally {

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

@@ -192,11 +192,16 @@ test.describe("New Workspace dictation submit", () => {
       await harness.waitForCreateRequest();
 
       const composer = page.getByRole("textbox", { name: "Message agent..." });
-      await expect(composer).toHaveValue(TRANSCRIPT);
-      await expect(composer).not.toBeEditable();
+      await expect(page).toHaveURL(/\/workspace\//);
+      await expect(page.getByTestId("user-message").filter({ visible: true })).toContainText(
+        TRANSCRIPT,
+      );
+      await expect(composer).toHaveValue("");
+      await expect(composer).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("redirects to the optimistic draft tab before agent creation resolves", async ({ page }) => {
+  test("opens the final agent 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(1, { timeout: 30_000 });
+      await expect(draftTabs).toHaveCount(0);
       await expect(
         activeWorkspaceDeckEntry.locator('[data-testid^="workspace-tab-agent_"]'),
-      ).toHaveCount(0);
+      ).toHaveCount(1, { timeout: 30_000 });
 
       agentCreatedDelay.release();
       await expect(

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

@@ -1,3 +1,7 @@
+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";
@@ -25,6 +29,8 @@ import {
   removeHostFromHostPage,
   addDirectHostFromSettings,
   expectHostOnlineWithoutError,
+  expectIdleAgentRelease,
+  setIdleAgentRelease,
 } from "../support/helpers/settings";
 
 test.describe("Settings host page", () => {
@@ -137,6 +143,100 @@ 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,7 +6,10 @@ 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";
 
@@ -44,6 +47,14 @@ 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,6 +10,15 @@ 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,
@@ -54,6 +63,98 @@ 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,
@@ -147,6 +248,28 @@ 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);
@@ -329,6 +452,15 @@ 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/voice-settings.spec.ts

@@ -0,0 +1,93 @@
+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,7 +28,10 @@ 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 }) {
+export function resolveAutocompletePlacement(
+  snapshot,
+  { expected, keyboardTop, reference, anchorGap },
+) {
   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;
@@ -40,6 +43,10 @@ export function resolveAutocompletePlacement(snapshot, { expected, keyboardTop,
   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,7 +14,8 @@ 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");
-if (!serverId || !agentId || !workspaceId) {
+const scenario = env("SCENARIO", "all");
+if (!serverId || !workspaceId || (scenario === "all" && !agentId)) {
   throw new Error(
     "Set PASEO_COMPOSER_KEYBOARD_SERVER_ID, _AGENT_ID (an idle chat) and _WORKSPACE_ID (its workspace)",
   );
@@ -22,7 +23,12 @@ if (!serverId || !agentId || !workspaceId) {
 const draftId = env("DRAFT_ID", "composer-keyboard");
 const session = env("SESSION", "composer-keyboard-ios");
 const device = env("DEVICE", "iPhone 16 Pro");
-const artifactsDir = path.join(repoRoot, ".dev/agent-device-artifacts/composer-keyboard-ios");
+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 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.
@@ -35,7 +41,7 @@ const chatCommandCase = { text: "/mo", expected: "/mock", inserted: "/mock " };
 fs.mkdirSync(artifactsDir, { recursive: true });
 
 function ad(...args) {
-  return execFileSync("agent-device", [...args, "--session", session], {
+  return execFileSync("agent-device", [args[0], "--session", session, ...args.slice(1)], {
     encoding: "utf8",
     maxBuffer: 64 * 1024 * 1024,
   });
@@ -77,7 +83,7 @@ async function settledPlacement(name, keyboard) {
 }
 
 function assertPlacement(name, snap, expected) {
-  const placement = resolveAutocompletePlacement(snap, { expected });
+  const placement = resolveAutocompletePlacement(snap, { expected, anchorGap: 12 });
   process.stdout.write(
     `PASS ${name}: popover ${Math.round(placement.popover.y)}-${Math.round(
       placement.popover.y + placement.popover.height,
@@ -123,21 +129,34 @@ async function clearInput(name) {
   )?.rect;
   if (!deleteKey) throw new Error("Missing keyboard delete key");
   const length = composerText(keyboard).length;
-  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",
-  );
+  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",
+    );
+  }
 }
 
 // The accessibility value drops a trailing space.
 const sameText = (actual, expected) => actual.trimEnd() === expected.trimEnd();
 
-async function runCase(host, kind, { text, expected, inserted }) {
+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" }) {
   const name = `${host}-${kind}`;
   await clearInput(name);
   await dismissKeyboard(snapshot(`${name}-empty`));
@@ -151,31 +170,32 @@ async function runCase(host, kind, { text, expected, inserted }) {
   await clearInput(`${name}-settled`);
   await waitFor(`${name}-settled-empty`, (snap) => composerText(snap) === "");
   ad("type", text);
-  assertPlacement(
+  const opened = 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`));
-  assertPlacement(
+  const closed = 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,
   );
-  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`,
-  );
+  await selectRow(name, reopened, inserted);
 }
 
 // Drafts list commands for their selected provider, and a fresh install selects none.
@@ -216,13 +236,104 @@ 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", "--device", device);
+  ad("open", url, "--platform", "ios", ...deviceArgs);
   await waitFor(host, (snap) => Boolean(nodeById(snap, "message-input-root")), 60_000);
   await runHost(host);
 }

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

@@ -0,0 +1,25 @@
+# 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

@@ -0,0 +1,52 @@
+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,27 +11,24 @@ import {
 import { installDaemonWebSocketGate } from "./helpers/daemon-websocket-gate";
 import { delayBrowserAgentCreatedStatus } from "./helpers/new-workspace";
 
-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"),
-        `
+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"),
+    `
 import { readFile, rm } from "node:fs/promises";
 export default function contribute(server) {
   return server.before("agent.session_open", async ({ request }) => {
@@ -50,17 +47,88 @@ 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({
-        release: () => rm(gate, { force: true }),
-        // Replacing the command must not expose a truncated, empty file to the hook.
-        fail: () => rename(failure, gate),
-      });
+      await provide({ arm: () => writeFile(failure, "fail") });
     } finally {
-      await rm(gate, { force: true });
       await client.removePlugin("lifecycle-logger");
       await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
       await plugin.cleanup();
@@ -114,6 +182,14 @@ 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/helpers/composer.ts

@@ -87,6 +87,14 @@ 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,12 +1,17 @@
+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 { fillComposerDraft } from "./composer";
+import { attachComposerTestImage, fillComposerDraft } from "./composer";
 import { createAgentTabFromMenu } from "./workspace-tabs";
 import {
+  connectNewWorkspaceDaemonClient,
   openNewWorkspaceComposer,
+  openStartingRefPicker,
+  startingRefRow,
   selectWorkspaceIsolation,
   loadSessionMessageReaders,
 } from "./new-workspace";
@@ -44,6 +49,43 @@ 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();
@@ -59,9 +101,11 @@ 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"
@@ -84,6 +128,7 @@ export async function observeCreationRequests(page: Page) {
     });
   });
   return {
+    workspaceRequests: () => workspaceRequests,
     async settled() {
       await expect.poll(() => pending.size).toBe(0);
     },
@@ -138,18 +183,101 @@ 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-" });
+  const project = await seedWorkspace({
+    repoPrefix: "creation-idempotency-",
+    repo: {
+      files: [{ path: "nested/context.txt", content: "Nested agent working directory" }],
+      branches: ["recovery-base"],
+    },
+  });
   let workspaceId = project.workspaceId;
+  const evictionWorkspaceIds = new Set<string>();
+  const sourceClients: Array<{ close(): Promise<void> }> = [];
   return {
-    cleanup: project.cleanup,
+    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);
+    },
     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);
@@ -165,6 +293,74 @@ 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 });
@@ -175,7 +371,7 @@ export async function createCreationScenario(page: Page) {
       await expect(page.getByTestId("user-message").first()).toBeVisible();
       await expect(
         page
-          .locator('[data-testid^="workspace-tab-draft_"][aria-selected="true"]')
+          .locator('[data-testid^="workspace-tab-agent_"][aria-selected="true"]')
           .filter({ visible: true }),
       ).toBeVisible();
     },
@@ -224,15 +420,57 @@ export async function createCreationScenario(page: Page) {
           .first(),
       ).toBeVisible();
     },
-    async expectStartupFailure() {
-      await expect(page.getByText(/Creation startup failed for test/).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 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,
+          workspace.projectId === project.projectId &&
+          workspace.id !== project.workspaceId &&
+          !evictionWorkspaceIds.has(workspace.id),
       );
       expect(workspaces).toHaveLength(1);
       workspaceId = workspaces[0]!.id;
@@ -265,8 +503,11 @@ 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"]')
+        .locator(
+          '[data-testid^="workspace-tab-draft_"][aria-selected="true"], [data-testid^="workspace-tab-agent_"][aria-selected="true"]',
+        )
         .filter({ visible: true })
         .first();
       const draftTestId = await draft.getAttribute("data-testid");
@@ -276,6 +517,7 @@ 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(),
@@ -296,15 +538,18 @@ 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("agent.create.response");
+      gate.holdNextServerMessage(responseType);
     },
     async waitForDeliveredPrompt() {
-      await gate.waitForHeldServerMessage("agent.create.response");
-      firstMessage = gate.getClientRequests("agent.create.request").at(-1);
+      await gate.waitForHeldServerMessage(responseType);
+      firstMessage = gate.getClientRequests(requestType).at(-1);
     },
     async disconnectAndReconnect() {
       const fetches = gate.getClientRequestCount("fetch_agents_request");
@@ -315,13 +560,89 @@ export function createPromptRetryScenario(
         .toBeGreaterThan(fetches);
     },
     async expectSameAgentAndMessage() {
-      expect(gate.getClientRequestCount("agent.create.request")).toBe(1);
+      expect(gate.getClientRequestCount(requestType)).toBe(1);
       await expect
         .poll(() => gate.getClientRequestCount("creation.subscribe.request"))
         .toBeGreaterThan(0);
-      expect(gate.getClientRequests("agent.create.request").at(-1)).toEqual(firstMessage);
+      expect(gate.getClientRequests(requestType).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/new-workspace.ts

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

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

@@ -42,6 +42,7 @@ type HostSection =
   | "pair-device"
   | "agents"
   | "metadata"
+  | "voice"
   | "workspaces"
   | "providers"
   | "usage"
@@ -57,6 +58,92 @@ 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.
@@ -326,6 +413,25 @@ 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/subagents.ts

@@ -188,7 +188,7 @@ export async function expectManagedSubagentArchived(
 }
 
 export async function archiveFinishedSubagents(page: Page): Promise<void> {
-  await page.getByRole("button", { name: "Archive finished subagents" }).click();
+  await page.getByRole("menuitem", { 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("button", { name: "Archive finished subagents" })).toBeDisabled();
+  await expect(page.getByRole("menuitem", { 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("button", { name: "Archive finished subagents" })).toBeEnabled();
+  await expect(page.getByRole("menuitem", { name: "Archive finished subagents" })).toBeEnabled();
 }
 
 export async function holdManagedSubagentArchiveRequest(

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

@@ -0,0 +1,99 @@
+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.0",
+  "version": "0.13.1",
   "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 --no-daemon --max-workers=2 -Dorg.gradle.parallel=false"
+    "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"
   },
   "dependencies": {
     "@codemirror/commands": "6.10.4",
@@ -61,6 +61,7 @@
     "@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",
@@ -126,14 +127,14 @@
     "react-native-gesture-handler": "~2.32.0",
     "react-native-keyboard-controller": "1.21.12",
     "react-native-nitro-modules": "0.35.5",
-    "react-native-reanimated": "4.5.1",
+    "react-native-reanimated": "4.5.5",
     "react-native-safe-area-context": "~5.7.0",
     "react-native-screens": "~4.26.0",
     "react-native-svg": "15.15.4",
     "react-native-unistyles": "^3.2.4",
     "react-native-web": "~0.21.0",
     "react-native-webview": "13.16.1",
-    "react-native-worklets": "0.10.1",
+    "react-native-worklets": "0.10.4",
     "tiny-invariant": "^1.3.3",
     "turndown": "^7.2.4",
     "turndown-plugin-gfm": "^1.0.2",
@@ -198,6 +199,14 @@
     ],
     "enableVideo": false
   },
+  "expo": {
+    "install": {
+      "exclude": [
+        "react-native-reanimated",
+        "react-native-worklets"
+      ]
+    }
+  },
   "reanimated": {
     "staticFeatureFlags": {
       "FORCE_REACT_RENDER_FOR_SETTLED_ANIMATIONS": false

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

@@ -1,3 +1,4 @@
+import { useAgentCreation } from "@/workspace-creation";
 import { useShallow } from "zustand/shallow";
 import { useProviderIcon } from "@/components/provider-icons";
 import type { PanelDescriptor } from "@/panels/panel-registry";
@@ -33,6 +34,7 @@ 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];
@@ -49,8 +51,10 @@ export function useAgentDescriptor(
       };
     }),
   );
-  const icon = useProviderIcon(descriptorState.provider, context.serverId);
-  return buildAgentDescriptor({ ...descriptorState, icon });
+  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 });
 }
 
 export function buildAgentDescriptor(input: {

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

@@ -0,0 +1,12 @@
+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/app/_layout.tsx

@@ -72,6 +72,7 @@ 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";
@@ -759,6 +760,7 @@ 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,6 +5,7 @@ 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";
@@ -87,11 +88,7 @@ function HostAgentReadyRouteContent() {
   ]);
   const hasHydratedWorkspaces = useHasHydratedWorkspaces(serverId);
   const hasHydratedLayout = useWorkspaceLayoutStoreHydrated();
-  useEffect(() => {
-    if (!serverId) return;
-    // A compact app can open this route before its sidebar has demanded the directory.
-    return getHostRuntimeStore().acquireDirectoryDemand(serverId);
-  }, [serverId]);
+  useDirectoryDemand(serverId);
   const resolution = resolveAgentRoute({
     hasHydratedWorkspaces,
     hasHydratedLayout,

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

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

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

@@ -77,6 +77,7 @@ 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 }[] = [
@@ -450,9 +451,15 @@ 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/markdown/renderer.test.ts

@@ -804,3 +804,18 @@ 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/styles.ts

@@ -72,7 +72,7 @@ export function createMarkdownStyles(
       },
       code: {
         fontFamily: theme.fontFamily.mono === "ui-monospace" && !isWeb ? "" : theme.fontFamily.mono,
-        fontSize: theme.fontSize.code,
+        fontScale: theme.fontSize.code / fontSize,
         color: theme.colors.foreground,
         backgroundColor: theme.colors.surface2,
         borderColor: "transparent",

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

@@ -1,20 +1,18 @@
-import { ChevronRight } from "lucide-react-native";
 import { Children, isValidElement, useCallback, useMemo, useState, type ReactNode } from "react";
-import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
-import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { mutedIconColorMapping } from "@/components/ui/icon-color";
+import { View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
 import { isWeb } from "@/constants/platform";
 import { settingsStyles } from "@/styles/settings";
-import { ICON_SIZE, type Theme } from "@/styles/theme";
-
-const ThemedChevron = withUnistyles(ChevronRight);
-const hoveredIconColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
+import { NestedSettingsRows } from "./row-density";
+import { SettingsRowHeader } from "./row-header";
 
 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`. */
+  /** The rows revealed underneath, separated like the rows of a `SettingsCard` and laid out as nested rows. */
   children: ReactNode;
 }
 
@@ -25,6 +23,7 @@ interface SettingsCollapsibleRowProps {
  */
 export function SettingsCollapsibleRow({
   label,
+  summary,
   defaultExpanded = false,
   testID,
   children,
@@ -37,66 +36,39 @@ 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}>
-      <Pressable
-        {...webExpandedProps}
-        accessibilityRole="button"
-        accessibilityLabel={label}
-        accessibilityState={accessibilityState}
+      <SettingsRowHeader
+        label={label}
+        summary={summary}
         onPress={toggle}
-        style={headerStyle}
+        expanded={expanded}
+        accessibilityState={accessibilityState}
+        webAccessibilityProps={webExpandedProps}
         testID={testID ? `${testID}-toggle` : undefined}
-      >
-        {({ 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}
+      />
+      {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}
     </View>
   );
 }
 
 const styles = StyleSheet.create((theme) => ({
-  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" }],
+  // The revealed rows keep the card's rails; the tint is what groups them under their header.
+  children: {
+    backgroundColor: theme.colors.surface0,
   },
 }));

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

@@ -0,0 +1,33 @@
+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 { ReactNode } from "react";
+import type { ComponentType, ReactNode } from "react";
 import { Pressable, Text } from "react-native";
 import { useTranslation } from "react-i18next";
 import { Info } from "lucide-react-native";
@@ -6,7 +6,13 @@ import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 
-const ThemedInfo = withUnistyles(Info);
+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 mutedIconMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 
@@ -14,27 +20,37 @@ 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.
+ * docs/design.md §7. Rows use it the same way to keep secondary details on one line.
  */
-export function SettingsInfoTip({ title, info, testID }: SettingsInfoTipProps) {
+export function SettingsInfoTip({
+  title,
+  info,
+  icon = Info,
+  accessibilityLabel,
+  testID,
+}: SettingsInfoTipProps) {
   const { t } = useTranslation();
   return (
     <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile>
       <TooltipTrigger asChild>
         <Pressable
           accessibilityRole="button"
-          accessibilityLabel={t("settings.groupInfo", { title })}
+          accessibilityLabel={accessibilityLabel ?? t("settings.groupInfo", { title })}
           testID={testID}
           hitSlop={8}
           style={styles.button}
         >
-          <ThemedInfo size={ICON_SIZE.sm} uniProps={mutedIconMapping} />
+          <ThemedTipIcon icon={icon} uniProps={mutedIconMapping} />
         </Pressable>
       </TooltipTrigger>
       <TooltipContent side="top" align="start" offset={8}>

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

@@ -24,15 +24,23 @@ 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";
 
-interface AppSettingsRowProps extends Omit<SettingsRowProps, "hint"> {
-  hint?: ReactNode;
+/** 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 {
+  hint?: ReactNode;
+}
+
 export function SettingsCard({ children, testID }: { children: ReactNode; testID?: string }) {
   return (
     <View style={settingsStyles.card} testID={testID}>
@@ -57,26 +65,32 @@ export function SettingsRow({
   testID,
 }: AppSettingsRowProps) {
   const compact = useIsCompactFormFactor();
-  const rowStyle = useMemo(() => [settingsStyles.row, compact && styles.compactRow], [compact]);
+  const layout = useSettingsRowLayout();
+  const rowStyle = useMemo(() => [layout.row, compact && styles.compactRow], [compact, layout]);
+  const accessoryTitleStyle = useMemo(() => [layout.title, styles.accessoryLabel], [layout]);
   return (
     <View style={rowStyle} testID={testID}>
       <View style={styles.label}>
         {labelAccessory ? (
           <View style={styles.labelRow}>
-            <Text style={[settingsStyles.rowTitle, styles.accessoryLabel]}>{label}</Text>
+            <Text style={accessoryTitleStyle}>{label}</Text>
             {labelAccessory}
           </View>
         ) : (
-          <Text style={settingsStyles.rowTitle}>{label}</Text>
+          <Text style={layout.title}>{label}</Text>
         )}
-        {typeof hint === "string" ? <Text style={settingsStyles.rowHint}>{hint}</Text> : hint}
+        {typeof hint === "string" ? <Text style={layout.hint}>{hint}</Text> : hint}
         {error ? (
           <Text accessibilityRole="alert" style={settingsStyles.rowError}>
             {error}
           </Text>
         ) : null}
       </View>
-      {children ? <View style={styles.control}>{children}</View> : null}
+      {children ? (
+        <View style={styles.control}>
+          <ControlSizeProvider size={layout.controlSize}>{children}</ControlSizeProvider>
+        </View>
+      ) : null}
     </View>
   );
 }
@@ -117,7 +131,7 @@ export function SettingsSelect<Value extends string>({
   onValueChange,
   disabled,
   ...row
-}: SettingsSelectProps<Value>) {
+}: SettingsSelectProps<Value> & AppRowExtras) {
   const selectedLabel = options.find((option) => option.value === value)?.label ?? value;
   return (
     <SettingsRow {...row}>
@@ -152,7 +166,7 @@ export function SettingsInput({
   secureTextEntry,
   ref,
   ...row
-}: SettingsInputProps) {
+}: SettingsInputProps & AppRowExtras) {
   const compact = useIsCompactFormFactor();
   const input = useRef<EditingTextInputHandle>(null);
   useImperativeHandle(
@@ -175,7 +189,7 @@ export function SettingsInput({
         editable={!disabled}
         secureTextEntry={secureTextEntry}
         accessibilityLabel={row.label}
-        size={compact ? "md" : "sm"}
+        size={compact ? "md" : undefined}
         style={styles.input}
       />
     </SettingsRow>
@@ -185,7 +199,7 @@ export function SettingsInput({
 export function SettingsAction({ actionLabel, onPress, disabled, ...row }: SettingsActionProps) {
   return (
     <SettingsRow {...row}>
-      <Button variant="outline" size="sm" onPress={onPress} disabled={disabled}>
+      <Button variant="outline" onPress={onPress} disabled={disabled}>
         {actionLabel}
       </Button>
     </SettingsRow>

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

@@ -0,0 +1,77 @@
+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

@@ -0,0 +1,57 @@
+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

@@ -0,0 +1,113 @@
+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-workspace-list.test.tsx

@@ -2,6 +2,7 @@
  * @vitest-environment jsdom
  */
 import { act, renderHook } from "@testing-library/react";
+import { createWorkspaceVisibilityPolicy } from "@/components/sidebar/sidebar-group-visibility";
 import { useLimitedSidebarGroup } from "@/components/sidebar/use-limited-sidebar-group";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import type { WorkspaceScriptPayload } from "@getpaseo/protocol/messages";
@@ -486,6 +487,20 @@ describe("sidebar group visibility", () => {
     },
   );
 
+  it("treats placements without a hydrated entry as Done", () => {
+    const items = entries([...Array(8).fill("done"), "running", "done"]);
+    const hydrated = new Map(items.slice(0, 9).map((item) => [item.workspaceKey, item]));
+    for (const entriesByKey of [new Map(), hydrated]) {
+      const { result } = renderHook(() =>
+        useLimitedSidebarGroup(items, createWorkspaceVisibilityPolicy(entriesByKey)),
+      );
+      expect(result.current.canToggle).toBe(true);
+      expect(names(result.current.visibleItems)).toEqual(
+        entriesByKey.size === 0 ? names(items.slice(0, 7)) : [...names(items.slice(0, 7)), "row-9"],
+      );
+    }
+  });
+
   it("shows eight active rows once with no redundant toggle", () => {
     const items = entries([
       "running",

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

@@ -99,6 +99,7 @@ import {
 import { useLongPressDragInteraction } from "@/components/sidebar/use-long-press-drag-interaction";
 import { SidebarSectionHeader } from "@/components/sidebar/sidebar-section-header";
 import { SidebarGroupToggleRow } from "@/components/sidebar/sidebar-group-toggle-row";
+import { createWorkspaceVisibilityPolicy } from "@/components/sidebar/sidebar-group-visibility";
 import { useLimitedSidebarGroup } from "@/components/sidebar/use-limited-sidebar-group";
 import {
   SidebarWorkspaceRowFrame,
@@ -1593,11 +1594,7 @@ function ProjectBlock({
   onToggleWorkspacePin: ToggleSidebarWorkspacePin;
 }) {
   const visibilityPolicy = useMemo(
-    () => ({
-      kind: "workspaces" as const,
-      getStatusBucket: (workspace: SidebarWorkspacePlacement) =>
-        workspaceEntriesByKey.get(workspace.workspaceKey)!.statusBucket,
-    }),
+    () => createWorkspaceVisibilityPolicy<SidebarWorkspacePlacement>(workspaceEntriesByKey),
     [workspaceEntriesByKey],
   );
   const {

packages/app/src/components/sidebar/sidebar-group-visibility.ts

@@ -4,6 +4,18 @@ export type SidebarGroupVisibilityPolicy<T> =
   | { kind: "pinned" }
   | { kind: "workspaces"; getStatusBucket: (item: T) => SidebarStateBucket };
 
+// A placement can outrun its entry: a retained sidebar that is inactive (compact layout with the
+// sidebar closed) or still waiting for sessions keeps an empty entry map. A missing entry renders
+// no row, so it counts as Done and claims no slot past the limit.
+export function createWorkspaceVisibilityPolicy<T extends { workspaceKey: string }>(
+  entriesByKey: ReadonlyMap<string, { statusBucket: SidebarStateBucket }>,
+): SidebarGroupVisibilityPolicy<T> {
+  return {
+    kind: "workspaces",
+    getStatusBucket: (item) => entriesByKey.get(item.workspaceKey)?.statusBucket ?? "done",
+  };
+}
+
 export function selectSidebarGroupVisibility<T>(
   items: readonly T[],
   expanded: boolean,

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

@@ -1,3 +1,5 @@
+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";
@@ -58,7 +60,16 @@ interface SidebarWorkspaceRowProps {
   dragHandleProps?: DraggableListDragHandleProps;
 }
 
-export function SidebarWorkspaceRow({
+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({
   workspace,
   selected,
   shortcutNumber,

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

@@ -5,9 +5,9 @@ import {
   useRef,
   useState,
   type ReactElement,
-  type RefObject,
+  type ReactNode,
 } from "react";
-import { View, useWindowDimensions } from "react-native";
+import { View, useWindowDimensions, type StyleProp, type ViewStyle } from "react-native";
 import { Portal } from "@gorhom/portal";
 import Animated, { useAnimatedReaction, useAnimatedStyle } from "react-native-reanimated";
 import { scheduleOnRN } from "react-native-worklets";
@@ -32,7 +32,8 @@ interface RelativeAnchorRect {
 
 interface AutocompletePopoverProps {
   visible: boolean;
-  anchorRef: RefObject<View | null>;
+  children: ReactNode;
+  anchorStyle?: StyleProp<ViewStyle>;
   options: readonly AutocompleteOption[];
   selectedIndex: number;
   onSelect: (option: AutocompleteOption) => void;
@@ -44,7 +45,8 @@ interface AutocompletePopoverProps {
 
 export function AutocompletePopover({
   visible,
-  anchorRef,
+  children,
+  anchorStyle,
   options,
   selectedIndex,
   onSelect,
@@ -55,6 +57,7 @@ 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();
@@ -137,25 +140,29 @@ export function AutocompletePopover({
     [anchorY, reservedLift, safeAreaInsets.top],
   );
 
-  if (!visible || !relativeAnchorRect || !baseStyle) return null;
-  if (options.length > 0 && selectedIndex < 0) return null;
+  const showPopover = canMeasure && relativeAnchorRect && baseStyle;
 
   // The translate view is the popover's own frame, so it lifts only the popover.
   return (
-    <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>
+    <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>
   );
 }

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

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

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

@@ -1,4 +1,5 @@
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
+import { useContainedControlSize } from "@/components/ui/control-size";
 import {
   default as React,
   useCallback,
@@ -162,7 +163,7 @@ const styles = StyleSheet.create((theme) => {
 export function Button({
   children,
   variant = "secondary",
-  size = "md",
+  size: sizeProp,
   leftIcon,
   trailing,
   style,
@@ -185,6 +186,8 @@ 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/control-geometry.test.ts

@@ -81,6 +81,8 @@ 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);
@@ -95,6 +97,13 @@ 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 = "sm" | "md";
+export type FieldControlSize = "xs" | "sm" | "md";
 export type SegmentedControlSize = "xs" | "sm" | "md";
 export type ControlInteractionPhase = "rest" | "hover" | "active";
 
@@ -188,8 +188,19 @@ 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],
@@ -210,6 +221,10 @@ 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,
@@ -252,6 +267,10 @@ export function createControlGeometry(theme: Theme) {
       fontSize: theme.fontSize.sm,
     },
     alert,
+    formTextInputXs: {
+      ...fieldControlXs,
+      ...fieldTextXs,
+    },
     formTextInputSm: {
       ...fieldControlSm,
       ...fieldTextSm,
@@ -264,8 +283,10 @@ export function createControlGeometry(theme: Theme) {
       ...fieldControlMd,
       ...fieldTextMd,
     },
+    fieldControlXs,
     fieldControlSm,
     fieldControlMd,
+    fieldTextXs,
     fieldTextSm,
     fieldTextMd,
     controlRest: {

packages/app/src/components/ui/control-size.tsx

@@ -0,0 +1,23 @@
+import { createContext, useContext, type ReactNode } from "react";
+
+/** The control sizes a container can ask of the controls placed in it. */
+export type ContainedControlSize = "xs" | "sm";
+
+// A row decides how big its controls are, so a button or field placed in it needs no size of
+// its own. A size passed to the control still wins.
+const ControlSizeContext = createContext<ContainedControlSize | null>(null);
+
+export function ControlSizeProvider({
+  size,
+  children,
+}: {
+  size: ContainedControlSize;
+  children: ReactNode;
+}) {
+  return <ControlSizeContext.Provider value={size}>{children}</ControlSizeContext.Provider>;
+}
+
+/** The size the surrounding container asks for, or null outside one. */
+export function useContainedControlSize(): ContainedControlSize | null {
+  return useContext(ControlSizeContext);
+}

packages/app/src/components/ui/dropdown-trigger.tsx

@@ -9,6 +9,7 @@ import {
 } from "@/components/ui/control-geometry";
 import type { Theme } from "@/styles/theme";
 import { DropdownMenuTrigger, type DropdownMenuTriggerProps } from "@/components/ui/dropdown-menu";
+import { useContainedControlSize } from "@/components/ui/control-size";
 
 const ThemedChevronDown = withUnistyles(ChevronDown);
 
@@ -32,10 +33,12 @@ interface DropdownTriggerProps extends Omit<DropdownMenuTriggerProps, "children"
 export function DropdownTrigger({
   children,
   leading,
-  size = "sm",
+  size: sizeProp,
   disabled,
   ...props
 }: DropdownTriggerProps): ReactElement {
+  const containedSize = useContainedControlSize();
+  const size = sizeProp ?? containedSize ?? "sm";
   let sizeStyle: ViewStyle;
   if (size === "xs") {
     sizeStyle = styles.xs;

packages/app/src/components/ui/form-field.tsx

@@ -23,6 +23,16 @@ import {
   resolveControlInteractionStyles,
   type FieldControlSize,
 } from "@/components/ui/control-geometry";
+import { useContainedControlSize } from "@/components/ui/control-size";
+
+const FIELD_CHROME = { xs: "chromeXs", sm: "chromeSm", md: "chromeMd" } as const satisfies Record<
+  FieldControlSize,
+  string
+>;
+const FIELD_TEXT = { xs: "inputXs", sm: "inputSm", md: "inputMd" } as const satisfies Record<
+  FieldControlSize,
+  string
+>;
 
 interface FieldProps {
   label: string;
@@ -159,11 +169,13 @@ function assignTextInputRef(
 }
 
 export const FormTextInput = forwardRef<EditingTextInputHandle, FormTextInputProps>(
-  function FormTextInput({ size = "md", style, onFocus, onBlur, editable, ...props }, ref) {
+  function FormTextInput({ size: sizeProp, style, onFocus, onBlur, editable, ...props }, ref) {
     const [focused, setFocused] = useState(false);
+    const containedSize = useContainedControlSize();
+    const size = sizeProp ?? containedSize ?? "md";
     const isDisabled = editable === false;
-    const chromeSizeStyle = size === "sm" ? formInputStyles.chromeSm : formInputStyles.chromeMd;
-    const inputSizeStyle = size === "sm" ? formInputStyles.inputSm : formInputStyles.inputMd;
+    const chromeSizeStyle = formInputStyles[FIELD_CHROME[size]];
+    const inputSizeStyle = formInputStyles[FIELD_TEXT[size]];
     const splitStyle = useMemo(() => splitFormTextInputStyle(style), [style]);
     const setInputRef = useCallback(
       (node: EditingTextInputHandle | null) => {
@@ -262,6 +274,9 @@ const formInputStyles = StyleSheet.create((theme) => {
     chrome: {
       backgroundColor: theme.colors.surface2,
     },
+    chromeXs: {
+      ...geometry.fieldControlXs,
+    },
     chromeSm: {
       ...geometry.fieldControlSm,
     },
@@ -289,6 +304,9 @@ const formInputStyles = StyleSheet.create((theme) => {
       outlineColor: "transparent",
       outlineWidth: 0,
     },
+    inputXs: {
+      ...geometry.fieldTextXs,
+    },
     inputSm: {
       ...geometry.fieldTextSm,
     },

packages/app/src/components/ui/icon-color.ts

@@ -1,5 +1,9 @@
 import type { Theme } from "@/styles/theme";
 
+export const foregroundIconColorMapping = (theme: Theme) => ({
+  color: theme.colors.foreground,
+});
+
 export const mutedIconColorMapping = (theme: Theme) => ({
   color: theme.colors.foregroundMuted,
 });

packages/app/src/components/ui/isolated-bottom-sheet-modal/index.test.tsx

@@ -58,6 +58,7 @@ vi.mock("@gorhom/bottom-sheet", async () => {
 });
 
 import { IsolatedBottomSheetModal, type ContextBridge } from ".";
+import { useAnimatedLayout } from "@gorhom/bottom-sheet/src/hooks/useAnimatedLayout";
 import { useIsInsideBottomSheet } from "@/components/ui/bottom-sheet-scope";
 
 /** Renders whatever the portal is currently holding, from its own place in the tree. */
@@ -200,3 +201,35 @@ describe("IsolatedBottomSheetModal context bridging", () => {
     ).toEqual(["false", "true"]);
   });
 });
+
+describe("bottom sheet layout subscription", () => {
+  it("stops updating a dismissed sheet when the window resizes", () => {
+    const container = document.createElement("div");
+    const root = createRoot(container);
+    let layout: ReturnType<typeof useAnimatedLayout> | undefined;
+    const viewport = document.documentElement;
+    const originalWidth = Object.getOwnPropertyDescriptor(viewport, "clientWidth");
+    function resize(width: number) {
+      Object.defineProperty(viewport, "clientWidth", { configurable: true, value: width });
+      act(() => window.dispatchEvent(new Event("resize")));
+    }
+    function LayoutProbe() {
+      layout = useAnimatedLayout(undefined, 0, 0);
+      return null;
+    }
+    try {
+      act(() => root.render(<LayoutProbe />));
+      if (!layout) throw new Error("Sheet layout did not mount");
+      const mountedLayout = layout;
+      resize(640);
+      expect(mountedLayout.get().window.width).toBe(640);
+      act(() => root.render(null));
+      resize(960);
+      expect(mountedLayout.get().window.width).toBe(640);
+    } finally {
+      act(() => root.unmount());
+      if (originalWidth) Object.defineProperty(viewport, "clientWidth", originalWidth);
+      else Reflect.deleteProperty(viewport, "clientWidth");
+    }
+  });
+});

packages/app/src/components/ui/segmented-control.tsx

@@ -7,6 +7,7 @@ import {
   segmentedIconSize,
   type SegmentedControlSize,
 } from "@/components/ui/control-geometry";
+import { useContainedControlSize } from "@/components/ui/control-size";
 import type { Theme } from "@/styles/theme";
 
 type SegmentedControlIconRenderer = (props: { color: string; size: number }) => ReactNode;
@@ -48,11 +49,13 @@ export function SegmentedControl<T extends string>({
   options,
   value,
   onValueChange,
-  size = "md",
+  size: sizeProp,
   hideLabels = false,
   style,
   testID,
 }: SegmentedControlProps<T>) {
+  const containedSize = useContainedControlSize();
+  const size = sizeProp ?? containedSize ?? "md";
   const sizeStyles = {
     xs: { container: styles.containerXs, segment: styles.segmentXs, label: styles.labelXs },
     sm: { container: styles.containerSm, segment: styles.segmentSm, label: styles.labelSm },

packages/app/src/composer/actions.test.ts

@@ -296,6 +296,7 @@ describe("cancelComposerAgent", () => {
   function baseInput(): {
     client: ComposerCancelClient & { canceledIds: string[] };
     agentId: string;
+    isAgentPublished: boolean;
     isAgentRunning: boolean;
     isCancellingAgent: boolean;
     isConnected: boolean;
@@ -309,6 +310,7 @@ describe("cancelComposerAgent", () => {
         },
       },
       agentId: "agent",
+      isAgentPublished: true,
       isAgentRunning: true,
       isCancellingAgent: false,
       isConnected: true,
@@ -340,6 +342,13 @@ describe("cancelComposerAgent", () => {
     expect(input.client.canceledIds).toEqual([]);
   });
 
+  it("does nothing while the host has not published the agent", () => {
+    const input = baseInput();
+    const result = cancelComposerAgent({ ...input, isAgentPublished: false });
+    expect(result).toBeNull();
+    expect(input.client.canceledIds).toEqual([]);
+  });
+
   it("does nothing when the agent is already being canceled", () => {
     const input = baseInput();
     const result = cancelComposerAgent({ ...input, isCancellingAgent: true });
@@ -419,6 +428,29 @@ describe("pickAndPersistImages", () => {
 });
 
 describe("dispatchComposerAgentMessage", () => {
+  it("queues a prompt behind earlier ones without sending while the agent is not ready", async () => {
+    const client = createFakeSendClient();
+    const stream = createFakeStream();
+    const queued: QueuedComposerMessage = { id: "later", text: "later", attachments: [] };
+    const queue = createFakeQueue(new Map([["agent", [queued]]]));
+
+    const outcome = await dispatchComposerAgentMessage({
+      client,
+      agentId: "agent",
+      text: "next follow-up",
+      attachments: [],
+      encodeImages: passthroughEncodeImages,
+      submission: stream,
+      isAgentReady: false,
+      queue,
+    });
+
+    expect(outcome).toBe("queued");
+    expect(client.calls).toEqual([]);
+    expect(stream.tail.get("agent") ?? []).toEqual([]);
+    expect(queue.read("agent").map((item) => item.text)).toEqual(["later", "next follow-up"]);
+  });
+
   it("forwards the configured active-turn intent without provider capability checks", async () => {
     const client = createFakeSendClient();
     const stream = createFakeStream();
@@ -430,6 +462,8 @@ describe("dispatchComposerAgentMessage", () => {
       attachments: [],
       encodeImages: async () => [],
       submission: stream,
+      isAgentReady: true,
+      queue: createFakeQueue(),
       activeTurnBehavior: "steer",
     });
 
@@ -446,6 +480,8 @@ describe("dispatchComposerAgentMessage", () => {
       attachments: [],
       encodeImages: async () => [],
       submission: stream,
+      isAgentReady: true,
+      queue: createFakeQueue(),
       activeTurnBehavior: "steer",
       activeTurnId: "turn-1",
     });
@@ -458,6 +494,8 @@ describe("dispatchComposerAgentMessage", () => {
       attachments: [],
       encodeImages: async () => [],
       submission: legacy,
+      isAgentReady: true,
+      queue: createFakeQueue(),
       activeTurnBehavior: "steer",
     });
     expect(legacy.tail.get("legacy")?.[0]?.turnId).toBeUndefined();
@@ -476,6 +514,8 @@ describe("dispatchComposerAgentMessage", () => {
         attachments: [],
         encodeImages: passthroughEncodeImages,
         submission: stream,
+        isAgentReady: true,
+        queue: createFakeQueue(),
       }),
     ).rejects.toBe(rejection);
 
@@ -496,6 +536,8 @@ describe("dispatchComposerAgentMessage", () => {
         attachments: [],
         encodeImages: passthroughEncodeImages,
         submission: stream,
+        isAgentReady: true,
+        queue: createFakeQueue(),
       }),
     ).rejects.toBe(transportError);
 
@@ -519,6 +561,8 @@ describe("dispatchComposerAgentMessage", () => {
         attachments: [],
         encodeImages: passthroughEncodeImages,
         submission,
+        isAgentReady: true,
+        queue: createFakeQueue(),
       }),
     ).rejects.toBe(transportError);
   });
@@ -540,6 +584,8 @@ describe("dispatchComposerAgentMessage", () => {
         attachments: [],
         encodeImages: passthroughEncodeImages,
         submission,
+        isAgentReady: true,
+        queue: createFakeQueue(),
         activeTurnBehavior: "steer",
       }),
     ).rejects.toBe(transportError);
@@ -560,6 +606,8 @@ describe("dispatchComposerAgentMessage", () => {
       ],
       encodeImages: passthroughEncodeImages,
       submission: stream,
+      isAgentReady: true,
+      queue: createFakeQueue(),
     });
 
     expect(client.calls).toHaveLength(1);
@@ -606,6 +654,8 @@ describe("dispatchComposerAgentMessage", () => {
       attachmentSubmitFormat: "legacy-github",
       encodeImages: passthroughEncodeImages,
       submission: stream,
+      isAgentReady: true,
+      queue: createFakeQueue(),
     });
 
     expect(client.calls[0].options.attachments).toEqual([
@@ -639,6 +689,8 @@ describe("dispatchComposerAgentMessage", () => {
       attachments: [],
       encodeImages: passthroughEncodeImages,
       submission: stream,
+      isAgentReady: true,
+      queue: createFakeQueue(),
     });
 
     expect(stream.head.get("agent")).toHaveLength(2);
@@ -656,6 +708,8 @@ describe("dispatchComposerAgentMessage", () => {
       attachments: [],
       encodeImages: passthroughEncodeImages,
       submission: stream,
+      isAgentReady: true,
+      queue: createFakeQueue(),
     });
 
     expect(client.calls[0]?.options).toMatchObject({
@@ -676,6 +730,8 @@ describe("dispatchComposerAgentMessage", () => {
       attachments: [review],
       encodeImages: passthroughEncodeImages,
       submission: stream,
+      isAgentReady: true,
+      queue: createFakeQueue(),
     });
 
     expect(client.calls[0]?.options.attachments).toEqual([review.attachment]);
@@ -694,6 +750,8 @@ describe("dispatchComposerAgentMessage", () => {
       attachments: [browserElement],
       encodeImages: passthroughEncodeImages,
       submission: stream,
+      isAgentReady: true,
+      queue: createFakeQueue(),
     });
 
     expect(client.calls[0]?.options.attachments).toEqual([
@@ -796,6 +854,7 @@ describe("sendQueuedComposerMessageNow", () => {
     const submitted: Array<{ text: string; attachments: ComposerAttachment[] }> = [];
     const result = await sendQueuedComposerMessageNow({
       agentId: "agent",
+      isAgentReady: true,
       messageId: "msg-1",
       queue,
       submitMessage: async (input) => {
@@ -814,6 +873,7 @@ describe("sendQueuedComposerMessageNow", () => {
     const submitted: Array<{ text: string; attachments: ComposerAttachment[] }> = [];
     const result = await sendQueuedComposerMessageNow({
       agentId: "agent",
+      isAgentReady: true,
       messageId: "msg-1",
       queue,
       submitMessage: async (input) => {
@@ -825,6 +885,27 @@ describe("sendQueuedComposerMessageNow", () => {
     expect(submitted).toEqual([{ text: "send me", attachments: [review] }]);
   });
 
+  it("leaves the queue untouched while the agent is not ready", async () => {
+    const queued: QueuedComposerMessage[] = [
+      { id: "msg-1", text: "first", attachments: [] },
+      { id: "msg-2", text: "second", attachments: [] },
+    ];
+    const queue = createFakeQueue(new Map([["agent", queued]]));
+    const submitted: Array<{ text: string; attachments: ComposerAttachment[] }> = [];
+    const result = await sendQueuedComposerMessageNow({
+      agentId: "agent",
+      isAgentReady: false,
+      messageId: "msg-2",
+      queue,
+      submitMessage: async (input) => {
+        submitted.push(input);
+      },
+    });
+    expect(result).toEqual({ status: "waiting" });
+    expect(submitted).toEqual([]);
+    expect(queue.state.get("agent")).toBe(queued);
+  });
+
   it("restores the queued entry to the front and surfaces the error message on failure", async () => {
     const queue = createFakeQueue(
       new Map([
@@ -839,6 +920,7 @@ describe("sendQueuedComposerMessageNow", () => {
     );
     const result = await sendQueuedComposerMessageNow({
       agentId: "agent",
+      isAgentReady: true,
       messageId: "msg-1",
       queue,
       submitMessage: async () => {

packages/app/src/composer/actions.ts

@@ -170,13 +170,14 @@ export function removeComposerAttachmentAtIndex<T extends ComposerAttachment>(in
 export interface CancelComposerAgentInput {
   client: ComposerCancelClient | null;
   agentId: string;
+  isAgentPublished: boolean;
   isAgentRunning: boolean;
   isCancellingAgent: boolean;
   isConnected: boolean;
 }
 
 export function cancelComposerAgent(input: CancelComposerAgentInput): Promise<void> | null {
-  if (!input.isAgentRunning || input.isCancellingAgent) return null;
+  if (!input.isAgentPublished || !input.isAgentRunning || input.isCancellingAgent) return null;
   if (!input.isConnected || !input.client) return null;
   try {
     return Promise.resolve(input.client.cancelAgent(input.agentId));
@@ -188,6 +189,9 @@ export function cancelComposerAgent(input: CancelComposerAgentInput): Promise<vo
 export interface DispatchComposerAgentMessageInput {
   client: ComposerSendClient;
   agentId: string;
+  /** See isAgentReadyForPrompts. Prompts for an agent that is not ready wait in its queue. */
+  isAgentReady: boolean;
+  queue: QueueWriter;
   text: string;
   attachments: ComposerAttachment[];
   attachmentSubmitFormat?: ComposerAttachmentSubmitFormat;
@@ -201,7 +205,12 @@ export interface DispatchComposerAgentMessageInput {
 
 export async function dispatchComposerAgentMessage(
   input: DispatchComposerAgentMessageInput,
-): Promise<void> {
+): Promise<"sent" | "queued"> {
+  if (!input.isAgentReady) {
+    // A creating agent takes prompts after its initial one; this waits behind it in the queue.
+    queueComposerMessage(input);
+    return "queued";
+  }
   const wirePayload = splitComposerAttachmentsForSubmit(input.attachments, {
     format: input.attachmentSubmitFormat,
   });
@@ -226,6 +235,7 @@ export async function dispatchComposerAgentMessage(
       attachments: wirePayload.attachments,
     });
     input.submission.accept(input.agentId, clientMessageId);
+    return "sent";
   } catch (error) {
     input.submission.reject(input.agentId, clientMessageId);
     throw error;
@@ -293,6 +303,8 @@ export function editQueuedComposerMessage(
 
 export interface SendQueuedComposerMessageNowInput {
   agentId: string;
+  /** See DispatchComposerAgentMessageInput. A queued prompt stays in place until then. */
+  isAgentReady: boolean;
   messageId: string;
   queue: QueueWriter;
   submitMessage: (input: { text: string; attachments: ComposerAttachment[] }) => Promise<void>;
@@ -301,6 +313,7 @@ export interface SendQueuedComposerMessageNowInput {
 
 export type SendQueuedComposerMessageNowResult =
   | { status: "missing" }
+  | { status: "waiting" }
   | { status: "submitted" }
   | { status: "failed"; errorMessage: string };
 
@@ -309,6 +322,7 @@ export async function sendQueuedComposerMessageNow(
 ): Promise<SendQueuedComposerMessageNowResult> {
   const item = input.queue.read(input.agentId).find((q) => q.id === input.messageId);
   if (!item) return { status: "missing" };
+  if (!input.isAgentReady) return { status: "waiting" };
   input.queue.write((prev) => {
     const next = new Map(prev);
     next.set(

packages/app/src/composer/agent-controls/index.tsx

@@ -35,6 +35,7 @@ import {
 } from "@/provider-selection/provider-selection";
 import { filterSelectableModels } from "@/provider-selection/model-catalog";
 import { useSessionStore } from "@/stores/session-store";
+import { useAgentCreation } from "@/workspace-creation";
 import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
 import { resolveProviderDefinition } from "@/utils/provider-definitions";
 import { mergeProviderPreferences, useFormPreferences } from "@/hooks/use-form-preferences";
@@ -420,6 +421,56 @@ function selectAgentControlsSlice(
   };
 }
 
+/** A creating agent shows its submitted configuration, read-only, until the host publishes it. */
+function useAgentControlsSource(serverId: string, agentId: string) {
+  const publishedAgent = useSessionStore(
+    useShallow((state) => selectAgentControlsSlice(state, serverId, agentId)),
+  );
+  const creation = useAgentCreation(serverId, agentId);
+  const hasClient = useSessionStore((state) => Boolean(state.sessions[serverId]?.client));
+  const agent = useMemo<AgentControlsSlice>(() => {
+    if (publishedAgent || !creation) return publishedAgent;
+    return {
+      provider: creation.provider,
+      // The destination is not known yet; never stand in the source directory for it.
+      cwd: null,
+      runtimeModelId: null,
+      model: creation.config.model,
+      features: undefined,
+      runtimeThinkingOptionId: null,
+      thinkingOptionId: creation.config.thinkingOptionId,
+      lastUsage: undefined,
+    };
+  }, [creation, publishedAgent]);
+  return {
+    agent,
+    isPublished: publishedAgent !== null,
+    canEdit: hasClient && publishedAgent !== null,
+    submittedModeId: creation?.config.modeId ?? null,
+  };
+}
+
+function ignoreModeSelection(): void {}
+
+function resolveModeControl(input: {
+  live: AgentModeControlValue | null;
+  isPublished: boolean;
+  submittedModeId: string | null;
+  entry: ReturnType<typeof resolveSnapshotSelectedEntry>;
+  providerDefinitions: AgentProviderDefinition[];
+}): AgentModeControlValue | null {
+  if (input.isPublished) return input.live;
+  if (input.entry?.status !== "ready" || !input.entry.modes?.length) return null;
+  return {
+    provider: input.entry.provider,
+    providerDefinitions: input.providerDefinitions,
+    modeOptions: input.entry.modes,
+    selectedModeId: input.submittedModeId,
+    onSelectMode: ignoreModeSelection,
+    disabled: true,
+  };
+}
+
 function resolveSnapshotSelectedEntry(
   snapshotEntries: ReturnType<typeof useProvidersSnapshot>["entries"],
   agentProvider: string | undefined,
@@ -1556,14 +1607,13 @@ export const AgentControls = memo(function AgentControls({
   isCompactLayout,
 }: AgentControlsProps) {
   const { updatePreferences } = useFormPreferences();
-  const agent = useSessionStore(
-    useShallow((state) => selectAgentControlsSlice(state, serverId, agentId)),
+  const { agent, isPublished, canEdit, submittedModeId } = useAgentControlsSource(
+    serverId,
+    agentId,
   );
   const client = useSessionStore((state) => state.sessions[serverId]?.client ?? null);
   const toast = useToast();
-  const modeControl = useLiveAgentModeControl(serverId, agentId);
-  const commandCenterModes = toCommandCenterModes(modeControl);
-  const modeProviderDefinitions = getModeProviderDefinitions(modeControl);
+  const liveModeControl = useLiveAgentModeControl(serverId, agentId);
 
   const {
     entries: snapshotEntries,
@@ -1586,6 +1636,26 @@ export const AgentControls = memo(function AgentControls({
     [agent?.provider, snapshotEntries],
   );
 
+  const modeControl = useMemo(
+    () =>
+      resolveModeControl({
+        live: liveModeControl,
+        isPublished,
+        submittedModeId,
+        entry: snapshotSelectedEntry,
+        providerDefinitions: agentProviderDefinitions,
+      }),
+    [
+      agentProviderDefinitions,
+      isPublished,
+      liveModeControl,
+      snapshotSelectedEntry,
+      submittedModeId,
+    ],
+  );
+  const commandCenterModes = toCommandCenterModes(modeControl);
+  const modeProviderDefinitions = getModeProviderDefinitions(modeControl);
+
   const agentProviderModels = useMemo(
     () => buildAgentProviderModels(agent?.provider, models),
     [agent?.provider, models],
@@ -1769,7 +1839,7 @@ export const AgentControls = memo(function AgentControls({
   const commandCenterRegistration = (
     <AgentControlCommandCenterRegistration
       sourceId={`agent:${serverId}:${agentId}`}
-      enabled={Boolean(client)}
+      enabled={canEdit}
       controls={commandCenterControls}
     />
   );
@@ -1814,7 +1884,7 @@ export const AgentControls = memo(function AgentControls({
         onRetryModelProvider={handleRetryModelProvider}
         isRetryingModelProvider={snapshotIsRefreshing}
         onDropdownClose={onDropdownClose}
-        disabled={!client}
+        disabled={!canEdit}
         modeControl={modeControl}
         modelSelectorServerId={serverId}
         isCompactLayout={isCompactLayout}

packages/app/src/composer/draft/input-draft.ts

@@ -63,6 +63,7 @@ export interface AgentInputDraft {
   attachments: UserComposerAttachment[];
   setAttachments: (updater: AttachmentUpdater) => void;
   clear: (lifecycle: "sent" | "abandoned") => void;
+  flush: () => void;
   isHydrated: boolean;
   attachmentFocusRequestId: number;
   composerState: DraftComposerState | null;
@@ -172,6 +173,8 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
     [draftKey, textPublication],
   );
 
+  const flushDraft = useCallback(() => textPublication.flush(), [textPublication]);
+
   const replaceText = useCallback(
     (nextText: string) => {
       textPublication.cancel();
@@ -351,6 +354,7 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
   return {
     textSource,
     editText,
+    flush: flushDraft,
     replaceText,
     textReplacement,
     attachments,

packages/app/src/composer/draft/workspace-tab.tsx

@@ -49,6 +49,7 @@ import {
 } from "@/workspace-tabs/model";
 import { openWorkspaceChanges } from "@/workspace-tabs/open-supporting-view";
 import { useSettings } from "@/hooks/use-settings";
+import { transferComposerFollowUps } from "@/composer/submission/writer";
 
 const EMPTY_PENDING_PERMISSIONS = new Map();
 const DRAFT_CAPABILITIES: AgentCapabilityFlags = {
@@ -184,8 +185,7 @@ async function submitDraftCreateRequest(input: {
     ...(imagesData && imagesData.length > 0 ? { images: imagesData } : {}),
     ...(attachmentsArray && attachmentsArray.length > 0 ? { attachments: attachmentsArray } : {}),
   };
-  const creation = useWorkspaceDraftSubmissionStore.getState().creationByDraftId[input.draftId];
-  const result = creation ? await creation.retry(options) : await client.createAgent(options);
+  const result = await client.createAgent(options);
 
   return {
     agentId: result.id,
@@ -466,10 +466,6 @@ export function WorkspaceDraftAgentTab({
         selectModelMessage: t("workspaceSetup.errors.selectModel"),
       }),
     createRequest: async ({ attempt, text, images, attachments, cwd }) => {
-      if (pendingAutoSubmit?.agentCreation) {
-        const result = await pendingAutoSubmit.agentCreation.result;
-        return { agentId: result.id, result };
-      }
       return submitDraftCreateRequest({
         draftId,
         attempt,
@@ -491,6 +487,7 @@ export function WorkspaceDraftAgentTab({
       clearWorkspaceAttachments({ scopeKey: draftAttachmentScopeKey });
       useWorkspaceDraftSubmissionStore.getState().clearDraftSetup({ draftId });
       onCreated(result);
+      transferComposerFollowUps(serverId, tabId, result.id);
     },
   });
   const turnPresentation = useMemo(

packages/app/src/composer/index.tsx

@@ -55,7 +55,12 @@ import {
 } from "@/composer/agent-controls";
 import { ContextWindowMeter } from "@/components/context-window-meter";
 import { useImageAttachmentPicker } from "@/hooks/use-image-attachment-picker";
-import { selectAgentTurnPresentation, useSessionStore } from "@/stores/session-store";
+import {
+  selectAgentSentMessages,
+  selectAgentTurnPresentation,
+  selectIsAgentPublished,
+  useSessionStore,
+} from "@/stores/session-store";
 import { useFilePicker } from "@/hooks/use-file-picker";
 import { useFileDrop } from "@/components/file-drop/use-file-drop";
 import type { DroppedItem } from "@/components/file-drop/types";
@@ -84,9 +89,9 @@ import {
   toggleForgeAttachmentFromPicker,
   uploadFileAttachments,
   type AttachmentPersister,
-  type QueueWriter,
   type QueuedComposerMessage,
 } from "@/composer/actions";
+import { isAgentReadyForPrompts } from "@/workspace-creation";
 import { useVoiceOptional } from "@/contexts/voice-context";
 import { useToast } from "@/contexts/toast-context";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
@@ -118,7 +123,11 @@ import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
 import type { KeyboardActionDefinition } from "@/keyboard/keyboard-action-dispatcher";
 import type { MessageInputKeyboardActionKind } from "@/keyboard/actions";
 import { submitAgentInput } from "@/composer/submit";
-import { createMessageSubmissionWriter } from "@/composer/submission/writer";
+import { ComposerRecall } from "@/composer/recall";
+import {
+  createAgentMessageQueueWriter,
+  createMessageSubmissionWriter,
+} from "@/composer/submission/writer";
 import { ComposerKeyboardScopeProvider, useComposerKeyboardScope } from "@/composer/keyboard-scope";
 import { useAppSettings } from "@/hooks/use-settings";
 import { RenderProfile } from "@/utils/render-profiler";
@@ -253,8 +262,8 @@ function resolveCheckoutRemoteUrl(
   return checkoutStatus?.remoteUrl ?? null;
 }
 
-function buildCancelButtonStyle(isConnected: boolean, isCancellingAgent: boolean): object[] {
-  const disabled = !isConnected || isCancellingAgent ? styles.buttonDisabled : undefined;
+function buildCancelButtonStyle(canCancel: boolean, isCancellingAgent: boolean): object[] {
+  const disabled = !canCancel || isCancellingAgent ? styles.buttonDisabled : undefined;
   return [styles.cancelButton, disabled].filter((value): value is object => Boolean(value));
 }
 
@@ -995,20 +1004,24 @@ interface ComposerAutocompleteHandle {
 function ComposerAutocompleteBinding({
   text,
   cursor,
+  recall,
   configuration,
   inputRef,
-  anchorRef,
+  children,
+  anchorStyle,
   show,
   ref,
 }: {
   text: ComposerTextSource;
   cursor: StoreApi<number>;
+  recall: ComposerRecall;
   configuration: Omit<
     Parameters<typeof useAgentAutocomplete>[0],
     "userInput" | "cursorIndex" | "onAutocompleteApplied"
   >;
   inputRef: React.RefObject<MessageInputRef | null>;
-  anchorRef: React.RefObject<View | null>;
+  children: React.ReactNode;
+  anchorStyle: React.ComponentProps<typeof View>["style"];
   show: boolean;
   ref: React.Ref<ComposerAutocompleteHandle>;
 }) {
@@ -1020,9 +1033,11 @@ function ComposerAutocompleteBinding({
     cursorIndex: Math.min(cursorIndex, userInput.length),
     onAutocompleteApplied: () => inputRef.current?.focus(),
   });
+  // A recalled message is sent as is; its leading `/command` must not open the picker.
+  const isShown = show && !recall.isShowing(userInput);
   const handleKeyPress = autocomplete.onKeyPress;
-  useImperativeHandle(ref, () => ({ onKeyPress: (event) => show && handleKeyPress(event) }), [
-    show,
+  useImperativeHandle(ref, () => ({ onKeyPress: (event) => isShown && handleKeyPress(event) }), [
+    isShown,
     handleKeyPress,
   ]);
   const selectOption = autocomplete.onSelectOption;
@@ -1032,8 +1047,8 @@ function ComposerAutocompleteBinding({
   );
   return (
     <ComposerAutocomplete
-      visible={autocomplete.isVisible && show}
-      anchorRef={anchorRef}
+      visible={autocomplete.isVisible && isShown}
+      anchorStyle={anchorStyle}
       options={autocomplete.options}
       selectedIndex={autocomplete.selectedIndex}
       onSelect={onSelect}
@@ -1041,7 +1056,9 @@ function ComposerAutocompleteBinding({
       errorMessage={autocomplete.errorMessage}
       loadingText={autocomplete.loadingText}
       emptyText={autocomplete.emptyText}
-    />
+    >
+      {children}
+    </ComposerAutocomplete>
   );
 }
 
@@ -1070,7 +1087,7 @@ interface ComposerCancelButtonProps {
   buttonIconSize: number;
   cancelButtonStyle: (object | undefined)[];
   handleCancelAgent: () => void;
-  isConnected: boolean;
+  canCancel: boolean;
   isCancellingAgent: boolean;
   agentInterruptKeys: ReturnType<typeof useShortcutKeys>;
   t: TFunction;
@@ -1080,7 +1097,7 @@ function ComposerCancelButton({
   buttonIconSize,
   cancelButtonStyle,
   handleCancelAgent,
-  isConnected,
+  canCancel,
   isCancellingAgent,
   agentInterruptKeys,
   t,
@@ -1098,7 +1115,7 @@ function ComposerCancelButton({
     <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile={false}>
       <TooltipTrigger
         onPress={handleCancelAgent}
-        disabled={!isConnected || isCancellingAgent}
+        disabled={!canCancel || isCancellingAgent}
         accessibilityLabel={accessibilityLabel}
         accessibilityRole="button"
         style={cancelButtonStyle}
@@ -1293,8 +1310,6 @@ function ComposerContentImpl({
   );
   const queuedMessages = queuedMessagesRaw ?? EMPTY_ARRAY;
 
-  const setQueuedMessages = useSessionStore((state) => state.setQueuedMessages);
-
   const isCompactFormFactor = useIsCompactFormFactor();
   const isCompactLayout = resolveCompactLayout(isCompactLayoutOverride, isCompactFormFactor);
   const isDesktopWebBreakpoint = resolveIsDesktopWebBreakpoint(isCompactFormFactor);
@@ -1362,6 +1377,7 @@ function ComposerContentImpl({
   );
   useEffect(() => () => cursorPublication.cancel(), [cursorPublication]);
   const autocompleteRef = useRef<ComposerAutocompleteHandle>(null);
+  const recall = useMemo(() => new ComposerRecall(), []);
   const [isProcessing, setIsProcessing] = useState(false);
   const [pendingFiles, setPendingFiles] = useState<PendingFileAttachment[]>([]);
   const nextPendingFileId = useRef(0);
@@ -1556,9 +1572,12 @@ function ComposerContentImpl({
       if (!client) {
         throw new Error(t("workspace.terminal.hostDisconnected"));
       }
+      const session = useSessionStore.getState().sessions[serverId];
       await dispatchComposerAgentMessage({
         client,
         agentId: targetAgentId,
+        isAgentReady: isAgentReadyForPrompts(serverId, targetAgentId),
+        queue: createAgentMessageQueueWriter(serverId),
         text,
         attachments: sendAttachments,
         attachmentSubmitFormat: resolveComposerAttachmentSubmitFormat({
@@ -1569,10 +1588,7 @@ function ComposerContentImpl({
         activeTurnBehavior,
         activeTurnId:
           activeTurnBehavior === "steer"
-            ? (selectAgentTurnPresentation(
-                useSessionStore.getState().sessions[serverId],
-                targetAgentId,
-              ).turnId ?? undefined)
+            ? (selectAgentTurnPresentation(session, targetAgentId).turnId ?? undefined)
             : undefined,
       });
       onAttentionPromptSend?.();
@@ -1606,13 +1622,7 @@ function ComposerContentImpl({
   );
   const hasAgent = agentState.status !== null;
 
-  const queueWriter = useMemo<QueueWriter>(
-    () => ({
-      read: (id) => useSessionStore.getState().sessions[serverId]?.queuedMessages?.get(id) ?? [],
-      write: (updater) => setQueuedMessages(serverId, updater),
-    }),
-    [serverId, setQueuedMessages],
-  );
+  const queueWriter = useMemo(() => createAgentMessageQueueWriter(serverId), [serverId]);
 
   const queueMessage = useCallback(
     (queuedMessage: string, queuedAttachments: ComposerAttachment[]) => {
@@ -1882,6 +1892,10 @@ function ComposerContentImpl({
     const cancellation = cancelComposerAgent({
       client,
       agentId: targetAgentId,
+      isAgentPublished: selectIsAgentPublished(
+        useSessionStore.getState().sessions[serverId],
+        targetAgentId,
+      ),
       isAgentRunning,
       isCancellingAgent,
       isConnected,
@@ -1938,6 +1952,7 @@ function ComposerContentImpl({
       // Reuse the regular send path; server-side send atomically interrupts any active run.
       const result = await sendQueuedComposerMessageNow({
         agentId,
+        isAgentReady: isAgentReadyForPrompts(serverId, agentId),
         messageId: id,
         queue: queueWriter,
         submitMessage: ({ text, attachments: queuedAttachments }) =>
@@ -1948,7 +1963,7 @@ function ComposerContentImpl({
         setSendError(result.errorMessage);
       }
     },
-    [agentId, queueWriter, submitMessage, t],
+    [agentId, queueWriter, serverId, submitMessage, t],
   );
 
   const handleQueue = useCallback(
@@ -1981,15 +1996,29 @@ function ComposerContentImpl({
 
   const hasSendableContent = hasText || selectedAttachments.length > 0;
 
-  // Handle keyboard navigation for command autocomplete.
+  // An open autocomplete owns the arrows; otherwise they may recall sent messages.
   const handleCommandKeyPress = useCallback(
-    (event: ComposerKeyPressEvent) => autocompleteRef.current?.onKeyPress(event) ?? false,
-    [],
+    (event: ComposerKeyPressEvent) => {
+      if (autocompleteRef.current?.onKeyPress(event)) return true;
+      const recalledText = recall.handleKeyPress(event, () =>
+        selectAgentSentMessages(useSessionStore.getState().sessions[serverId], agentId),
+      );
+      if (recalledText === null) return false;
+      event.preventDefault();
+      replaceUserInput(recalledText);
+      return true;
+    },
+    [agentId, recall, replaceUserInput, serverId],
   );
 
+  const isAgentPublished = useSessionStore((state) =>
+    selectIsAgentPublished(state.sessions[serverId], agentId),
+  );
+  // A creating agent cannot be stopped until the host publishes it.
+  const canCancelAgent = isConnected && isAgentPublished;
   const cancelButtonStyle = useMemo(
-    () => buildCancelButtonStyle(isConnected, isCancellingAgent),
-    [isConnected, isCancellingAgent],
+    () => buildCancelButtonStyle(canCancelAgent, isCancellingAgent),
+    [canCancelAgent, isCancellingAgent],
   );
 
   const isVoiceSwitching = voice?.isVoiceSwitching ?? false;
@@ -2006,7 +2035,7 @@ function ComposerContentImpl({
         buttonIconSize={buttonIconSize}
         cancelButtonStyle={cancelButtonStyle}
         handleCancelAgent={handleCancelAgent}
-        isConnected={isConnected}
+        canCancel={canCancelAgent}
         isCancellingAgent={isCancellingAgent}
         agentInterruptKeys={agentInterruptKeys}
         t={t}
@@ -2016,9 +2045,9 @@ function ComposerContentImpl({
       agentInterruptKeys,
       buttonIconSize,
       cancelButtonStyle,
+      canCancelAgent,
       handleCancelAgent,
       isCancellingAgent,
-      isConnected,
       t,
     ],
   );
@@ -2360,7 +2389,6 @@ function ComposerContentImpl({
       pluginClientSlashCommands,
     ],
   );
-  const messageInputContainerRef = useRef<View>(null);
 
   const isSubmitLoadingVisible =
     isProcessing || isSubmitLoading || isUploadingFile || pendingNativeImagePastes > 0;
@@ -2419,16 +2447,16 @@ function ComposerContentImpl({
             {isFullscreen ? null : queueList}
             {!isFullscreen && sendErrorNode}
 
-            <View ref={messageInputContainerRef} style={messageInputContainerStyle}>
-              <ComposerAutocompleteBinding
-                text={textSource}
-                cursor={cursor}
-                inputRef={messageInputRef}
-                anchorRef={messageInputContainerRef}
-                show={mode.showAutocomplete && !isFullscreen}
-                ref={autocompleteRef}
-                configuration={autocompleteConfiguration}
-              />
+            <ComposerAutocompleteBinding
+              text={textSource}
+              cursor={cursor}
+              recall={recall}
+              inputRef={messageInputRef}
+              anchorStyle={messageInputContainerStyle}
+              show={mode.showAutocomplete && !isFullscreen}
+              ref={autocompleteRef}
+              configuration={autocompleteConfiguration}
+            >
               <ComposerForgeBinding
                 text={textSource}
                 configuration={forgeConfiguration}
@@ -2508,7 +2536,7 @@ function ComposerContentImpl({
                 renderOption={renderGithubPickerOption}
               />
               {pluginAttachments.picker}
-            </View>
+            </ComposerAutocompleteBinding>
           </View>
         </View>
       </View>

packages/app/src/composer/input/input.tsx

@@ -27,6 +27,7 @@ import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
 import { ArrowUp, Mic, MicOff, CornerDownLeft, Plus, Square } from "lucide-react-native";
+import * as Haptics from "expo-haptics";
 import { useDictation } from "@/hooks/use-dictation";
 import { hasFinePointer } from "@/hooks/use-fine-pointer";
 import { DictationOverlay } from "@/components/dictation-controls";
@@ -57,7 +58,7 @@ import { formatShortcut, type ShortcutKey } from "@/utils/format-shortcut";
 import { getShortcutOs } from "@/utils/shortcut-platform";
 import type { MessageInputKeyboardActionKind } from "@/keyboard/actions";
 import { isImeComposingKeyboardEvent } from "@/utils/keyboard-ime";
-import { isWeb } from "@/constants/platform";
+import { isNative, isWeb } from "@/constants/platform";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { useComposerKeyboardScope } from "@/composer/keyboard-scope";
 import { RenderProfile } from "@/utils/render-profiler";
@@ -76,6 +77,7 @@ const ComposerTextInput = withUnistyles(EditingTextInput, (theme) => ({
 }));
 import {
   resolveSendTooltipLabel,
+  resolveSubmitAccessibilityHint,
   resolveSubmitAccessibilityLabel,
   resolveVoiceAccessibilityLabel,
   resolveVoiceTooltipText,
@@ -83,6 +85,7 @@ import {
 import {
   applyDictationTranscript,
   computeCanStartDictation,
+  resolveAlternateSendAction,
   resolveComposerSurfacePresentation,
   resolveComposerSurfaceText,
   resolveRetainedSelection,
@@ -110,6 +113,8 @@ export interface ComposerInputSnapshot {
 
 export interface ComposerKeyPressEvent {
   key: string;
+  /** Shift, Alt, Ctrl, or Meta was held. */
+  hasModifier: boolean;
   preventDefault: () => void;
   input: ComposerInputSnapshot;
 }
@@ -210,6 +215,7 @@ type WebTextInputKeyPressEvent = NativeSyntheticEvent<
     metaKey?: boolean;
     ctrlKey?: boolean;
     shiftKey?: boolean;
+    altKey?: boolean;
     // Web-only: present on DOM KeyboardEvent during IME composition (CJK input).
     isComposing?: boolean;
     keyCode?: number;
@@ -396,8 +402,6 @@ interface DesktopKeyPressContext {
   onKeyPressCallback: ((event: ComposerKeyPressEvent) => boolean) | undefined;
   input: ComposerKeyPressEvent["input"];
   submitOnEnter: boolean;
-  isAgentRunning: boolean;
-  onQueue: ((payload: MessagePayload) => void) | undefined;
   isSubmitDisabled: boolean;
   isSubmitLoading: boolean;
   disabled: boolean;
@@ -411,30 +415,28 @@ function handleDesktopKeyPressImpl(
 ): void {
   if (isImeComposingKeyboardEvent(event.nativeEvent)) return;
 
+  const { shiftKey, metaKey, ctrlKey, altKey } = event.nativeEvent;
+
   if (ctx.onKeyPressCallback) {
     const handled = ctx.onKeyPressCallback({
       key: event.nativeEvent.key,
+      hasModifier: Boolean(shiftKey || metaKey || ctrlKey || altKey),
       preventDefault: () => event.preventDefault(),
       input: ctx.input,
     });
     if (handled) return;
   }
 
-  const { shiftKey, metaKey, ctrlKey } = event.nativeEvent;
-
   if (event.nativeEvent.key !== "Enter") return;
   if (!ctx.submitOnEnter) return;
   if (shiftKey) return;
 
-  if ((metaKey || ctrlKey) && ctx.isAgentRunning && ctx.onQueue) {
-    if (ctx.isSubmitDisabled || ctx.isSubmitLoading || ctx.disabled) return;
-    event.preventDefault();
+  if (ctx.isSubmitDisabled || ctx.isSubmitLoading || ctx.disabled) return;
+  event.preventDefault();
+  if (metaKey || ctrlKey) {
     ctx.handleAlternateSendAction();
     return;
   }
-
-  if (ctx.isSubmitDisabled || ctx.isSubmitLoading || ctx.disabled) return;
-  event.preventDefault();
   ctx.handleDefaultSendAction();
 }
 
@@ -765,8 +767,10 @@ function SendButtonTooltip({
   canPressLoadingButton,
   onSubmitLoadingPress,
   onDefaultSendAction,
+  onLongPressSend,
   isSendButtonDisabled,
   submitAccessibilityLabel,
+  submitAccessibilityHint,
   sendButtonCombinedStyle,
   isSubmitLoading,
   submitIcon,
@@ -780,8 +784,10 @@ function SendButtonTooltip({
   canPressLoadingButton: boolean;
   onSubmitLoadingPress: (() => void) | undefined;
   onDefaultSendAction: () => void;
+  onLongPressSend: () => void;
   isSendButtonDisabled: boolean;
   submitAccessibilityLabel: string;
+  submitAccessibilityHint: string | undefined;
   sendButtonCombinedStyle: React.ComponentProps<typeof TooltipTrigger>["style"];
   isSubmitLoading: boolean;
   submitIcon: "arrow" | "return";
@@ -796,8 +802,10 @@ function SendButtonTooltip({
     <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile={false}>
       <TooltipTrigger
         onPress={canPressLoadingButton ? onSubmitLoadingPress : onDefaultSendAction}
+        onLongPress={canPressLoadingButton ? undefined : onLongPressSend}
         disabled={isSendButtonDisabled}
         accessibilityLabel={submitAccessibilityLabel}
+        accessibilityHint={submitAccessibilityHint}
         accessibilityRole="button"
         testID={submitButtonTestID}
         style={sendButtonCombinedStyle}
@@ -1701,6 +1709,19 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       });
     }, [defaultSendBehavior, isAgentRunning, handleSendMessage, handleQueueMessage, onQueue]);
 
+    const alternateSendAction = resolveAlternateSendAction({
+      defaultSendBehavior,
+      isAgentRunning,
+      onQueue,
+    });
+
+    const handleLongPressSend = useCallback(() => {
+      if (alternateSendAction && isNative) {
+        void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium).catch(() => {});
+      }
+      handleAlternateSendAction();
+    }, [alternateSendAction, handleAlternateSendAction]);
+
     usePasteImagesEffect({
       textarea: webTextArea,
       isConnected,
@@ -1734,8 +1755,6 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
             selectionRef.current,
           ),
           submitOnEnter: shouldSubmitOnEnter,
-          isAgentRunning,
-          onQueue,
           isSubmitDisabled,
           isSubmitLoading,
           disabled,
@@ -1747,8 +1766,6 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         shouldHandleWebKeyPress,
         onKeyPressCallback,
         shouldSubmitOnEnter,
-        isAgentRunning,
-        onQueue,
         isSubmitDisabled,
         isSubmitLoading,
         disabled,
@@ -1788,6 +1805,11 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
       isAgentRunning,
       t,
     });
+    const submitAccessibilityHint = resolveSubmitAccessibilityHint({
+      canPressLoadingButton,
+      alternateSendAction,
+      t,
+    });
 
     const voiceButtonAccessibilityLabel = resolveVoiceAccessibilityLabel({
       isRealtimeVoiceForCurrentAgent,
@@ -1948,8 +1970,10 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
           canPressLoadingButton={canPressLoadingButton}
           onSubmitLoadingPress={onSubmitLoadingPress}
           onDefaultSendAction={handleDefaultSendAction}
+          onLongPressSend={handleLongPressSend}
           isSendButtonDisabled={isPresentedSendDisabled}
           submitAccessibilityLabel={submitAccessibilityLabel}
+          submitAccessibilityHint={submitAccessibilityHint}
           sendButtonCombinedStyle={sendButtonCombinedStyle}
           isSubmitLoading={isSubmitLoading}
           submitIcon={submitIcon}
@@ -1967,8 +1991,10 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
         canPressLoadingButton,
         onSubmitLoadingPress,
         handleDefaultSendAction,
+        handleLongPressSend,
         isPresentedSendDisabled,
         submitAccessibilityLabel,
+        submitAccessibilityHint,
         sendButtonCombinedStyle,
         isSubmitLoading,
         submitIcon,

packages/app/src/composer/input/labels.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
   resolveSendTooltipLabel,
+  resolveSubmitAccessibilityHint,
   resolveSubmitAccessibilityLabel,
   resolveVoiceAccessibilityLabel,
   resolveVoiceTooltipText,
@@ -12,6 +13,8 @@ const translations: Record<string, string> = {
   "composer.input.sendAndInterrupt": "Send and interrupt",
   "composer.input.sendAndSteer": "Send and steer",
   "composer.input.sendMessage": "Send message",
+  "composer.input.longPressToQueue": "Long press to queue",
+  "composer.input.longPressToSendNow": "Long press to send now",
   "composer.input.queue": "Queue",
   "composer.input.send": "Send",
   "composer.voice.unmuteVoiceMode": "Unmute Voice mode",
@@ -26,6 +29,37 @@ const translations: Record<string, string> = {
 const t = ((key: string) => translations[key] ?? key) as never;
 
 describe("composer input labels", () => {
+  it("names the long-press action in the submit hint only when one exists", () => {
+    expect(
+      resolveSubmitAccessibilityHint({
+        canPressLoadingButton: false,
+        alternateSendAction: "queue",
+        t,
+      }),
+    ).toBe("Long press to queue");
+    expect(
+      resolveSubmitAccessibilityHint({
+        canPressLoadingButton: false,
+        alternateSendAction: "send",
+        t,
+      }),
+    ).toBe("Long press to send now");
+    expect(
+      resolveSubmitAccessibilityHint({
+        canPressLoadingButton: false,
+        alternateSendAction: null,
+        t,
+      }),
+    ).toBeUndefined();
+    expect(
+      resolveSubmitAccessibilityHint({
+        canPressLoadingButton: true,
+        alternateSendAction: "queue",
+        t,
+      }),
+    ).toBeUndefined();
+  });
+
   it("resolves submit accessibility labels from translations", () => {
     expect(
       resolveSubmitAccessibilityLabel({

packages/app/src/composer/input/labels.ts

@@ -1,5 +1,6 @@
 import type { TFunction } from "i18next";
 import type { SendBehavior } from "@/hooks/use-settings/storage";
+import type { AlternateSendAction } from "./state";
 
 export function resolveSubmitAccessibilityLabel(input: {
   submitButtonAccessibilityLabel: string | undefined;
@@ -22,6 +23,19 @@ export function resolveSubmitAccessibilityLabel(input: {
   return input.t("composer.input.sendMessage");
 }
 
+export function resolveSubmitAccessibilityHint(input: {
+  canPressLoadingButton: boolean;
+  alternateSendAction: AlternateSendAction | null;
+  t: TFunction;
+}): string | undefined {
+  if (input.canPressLoadingButton || !input.alternateSendAction) return undefined;
+  return input.t(
+    input.alternateSendAction === "queue"
+      ? "composer.input.longPressToQueue"
+      : "composer.input.longPressToSendNow",
+  );
+}
+
 export function resolveVoiceAccessibilityLabel(input: {
   isRealtimeVoiceForCurrentAgent: boolean;
   isMuted: boolean;

packages/app/src/composer/input/state.test.ts

@@ -7,6 +7,7 @@ import {
   resolveComposerSurfaceText,
   resolveGlyphRailOffset,
   resolveRetainedSelection,
+  resolveAlternateSendAction,
   runAlternateSendAction,
   runDefaultSendAction,
   runMessageInputKeyboardAction,
@@ -276,6 +277,47 @@ describe("composer send behavior", () => {
     expect(defaultAction.calls).toEqual(["queue"]);
     expect(alternateAction.calls).toEqual(["send"]);
   });
+
+  it("sends with the alternate action while no turn is running", () => {
+    for (const defaultSendBehavior of ["steer", "interrupt", "queue"] as const) {
+      const alternateAction = actions();
+      runAlternateSendAction({
+        defaultSendBehavior,
+        isAgentRunning: false,
+        onQueue: alternateAction.onQueue,
+        handleSendMessage: alternateAction.handleSendMessage,
+        handleQueueMessage: alternateAction.handleQueueMessage,
+      });
+      expect(alternateAction.calls).toEqual(["send"]);
+    }
+  });
+
+  it("offers an alternate action only while a turn runs and the composer can queue", () => {
+    const onQueue = () => undefined;
+    expect(
+      resolveAlternateSendAction({ defaultSendBehavior: "steer", isAgentRunning: true, onQueue }),
+    ).toBe("queue");
+    expect(
+      resolveAlternateSendAction({
+        defaultSendBehavior: "interrupt",
+        isAgentRunning: true,
+        onQueue,
+      }),
+    ).toBe("queue");
+    expect(
+      resolveAlternateSendAction({ defaultSendBehavior: "queue", isAgentRunning: true, onQueue }),
+    ).toBe("send");
+    expect(
+      resolveAlternateSendAction({ defaultSendBehavior: "steer", isAgentRunning: false, onQueue }),
+    ).toBeNull();
+    expect(
+      resolveAlternateSendAction({
+        defaultSendBehavior: "queue",
+        isAgentRunning: true,
+        onQueue: undefined,
+      }),
+    ).toBeNull();
+  });
 });
 
 describe("stopRealtimeVoice", () => {

packages/app/src/composer/input/state.ts

@@ -125,14 +125,30 @@ export function runDefaultSendAction(ctx: SendActionContext): void {
   ctx.handleSendMessage();
 }
 
+export type AlternateSendAction = "queue" | "send";
+
+/**
+ * What Mod+Enter and a long-press on Send do instead of the default send. Null while
+ * no turn is running, where both fall back to the default send.
+ */
+export function resolveAlternateSendAction(
+  ctx: Pick<SendActionContext, "defaultSendBehavior" | "isAgentRunning" | "onQueue">,
+): AlternateSendAction | null {
+  if (!ctx.isAgentRunning || !ctx.onQueue) return null;
+  return ctx.defaultSendBehavior === "queue" ? "send" : "queue";
+}
+
 export function runAlternateSendAction(ctx: SendActionContext): void {
-  if (ctx.defaultSendBehavior === "queue") {
+  const action = resolveAlternateSendAction(ctx);
+  if (action === "queue") {
+    ctx.handleQueueMessage();
+    return;
+  }
+  if (action === "send") {
     ctx.handleSendMessage();
     return;
   }
-  if (ctx.isAgentRunning && ctx.onQueue) {
-    ctx.handleQueueMessage();
-  }
+  runDefaultSendAction(ctx);
 }
 
 export function runMessageInputKeyboardAction(

packages/app/src/composer/recall.test.ts

@@ -0,0 +1,109 @@
+import { describe, expect, it } from "vitest";
+import type { ComposerKeyPressEvent } from "@/composer/input/input";
+import { ComposerRecall } from "@/composer/recall";
+
+const SENT = ["add tests", "fix the auth bug"];
+
+function press(
+  key: string,
+  text: string,
+  options: { caret?: number; selectionEnd?: number; hasModifier?: boolean } = {},
+): ComposerKeyPressEvent {
+  const caret = options.caret ?? text.length;
+  return {
+    key,
+    hasModifier: options.hasModifier ?? false,
+    preventDefault: () => undefined,
+    input: { text, selection: { start: caret, end: options.selectionEnd ?? caret } },
+  };
+}
+
+/** Drives recall the way the composer does: each result becomes the composer text, caret at the end. */
+function composerWithRecall(sent: readonly string[] = SENT) {
+  const recall = new ComposerRecall();
+  let text = "";
+  return {
+    recall,
+    get text() {
+      return text;
+    },
+    type(next: string) {
+      text = next;
+    },
+    press(key: string, options: { caret?: number; hasModifier?: boolean } = {}) {
+      const result = recall.handleKeyPress(press(key, text, options), () => sent);
+      if (result !== null) text = result;
+      return result;
+    },
+  };
+}
+
+describe("ComposerRecall", () => {
+  it("walks back through sent messages and forward to an empty composer", () => {
+    const composer = composerWithRecall();
+
+    expect(composer.press("ArrowUp")).toBe("add tests");
+    expect(composer.press("ArrowUp")).toBe("fix the auth bug");
+    expect(composer.press("ArrowDown")).toBe("add tests");
+    expect(composer.press("ArrowDown")).toBe("");
+    expect(composer.recall.isShowing(composer.text)).toBe(false);
+  });
+
+  it("leaves the caret to the input past the oldest message", () => {
+    const composer = composerWithRecall();
+    composer.press("ArrowUp");
+    composer.press("ArrowUp");
+
+    expect(composer.press("ArrowUp")).toBeNull();
+    expect(composer.text).toBe("fix the auth bug");
+  });
+
+  it("only starts from an empty composer", () => {
+    const composer = composerWithRecall();
+    composer.type("half written");
+
+    expect(composer.press("ArrowUp")).toBeNull();
+    expect(composer.press("ArrowDown")).toBeNull();
+  });
+
+  it("ignores Down from an empty composer and Up with no history", () => {
+    expect(composerWithRecall().press("ArrowDown")).toBeNull();
+    expect(composerWithRecall([]).press("ArrowUp")).toBeNull();
+  });
+
+  it("hands the arrows back to the caret once the recalled message is edited", () => {
+    const composer = composerWithRecall();
+    composer.press("ArrowUp");
+    composer.type("add tests for login");
+
+    expect(composer.recall.isShowing(composer.text)).toBe(false);
+    expect(composer.press("ArrowUp")).toBeNull();
+    expect(composer.press("ArrowDown")).toBeNull();
+  });
+
+  it("moves between lines of a multi-line message before changing message", () => {
+    const composer = composerWithRecall(["first line\nsecond line", "older"]);
+    composer.press("ArrowUp");
+
+    expect(composer.press("ArrowUp", { caret: "first line\nsec".length })).toBeNull();
+    expect(composer.press("ArrowUp", { caret: 3 })).toBe("older");
+    expect(composer.press("ArrowDown")).toBe("first line\nsecond line");
+    expect(composer.press("ArrowDown", { caret: 3 })).toBeNull();
+    expect(composer.press("ArrowDown")).toBe("");
+  });
+
+  it("ignores modified arrows, other keys, and a selection", () => {
+    const composer = composerWithRecall();
+
+    expect(composer.press("ArrowUp", { hasModifier: true })).toBeNull();
+    expect(composer.press("Enter")).toBeNull();
+    composer.press("ArrowUp");
+    const recall = composer.recall;
+    expect(
+      recall.handleKeyPress(
+        press("ArrowUp", "add tests", { caret: 0, selectionEnd: 3 }),
+        () => SENT,
+      ),
+    ).toBeNull();
+  });
+});

packages/app/src/composer/recall.ts

@@ -0,0 +1,68 @@
+import type { ComposerKeyPressEvent } from "@/composer/input/input";
+
+interface RecalledMessage {
+  index: number;
+  text: string;
+}
+
+/**
+ * Walks the messages already sent to an agent from an empty composer, like a
+ * shell's Up/Down history. A message stays recalled only while the composer
+ * still holds its exact text; the first edit hands the arrows back to the caret.
+ */
+export class ComposerRecall {
+  private recalled: RecalledMessage | null = null;
+
+  /** True while the composer shows a recalled message the user has not edited. */
+  isShowing(text: string): boolean {
+    return this.recalled !== null && this.recalled.text === text;
+  }
+
+  /**
+   * Returns the text the composer should show for this key press, or null to
+   * leave the key to the input. `readSentMessages` is newest first and is only
+   * read for keys recall acts on.
+   */
+  handleKeyPress(
+    event: ComposerKeyPressEvent,
+    readSentMessages: () => readonly string[],
+  ): string | null {
+    if (event.key !== "ArrowUp" && event.key !== "ArrowDown") return null;
+    if (event.hasModifier) return null;
+    const { text, selection } = event.input;
+    if (selection.start !== selection.end) return null;
+
+    const recalled = this.isShowing(text) ? this.recalled : null;
+    if (!recalled) {
+      this.recalled = null;
+      if (event.key !== "ArrowUp" || text.length > 0) return null;
+      return this.show(readSentMessages(), 0);
+    }
+
+    if (event.key === "ArrowUp") {
+      if (!isCaretOnFirstLine(text, selection.start)) return null;
+      return this.show(readSentMessages(), recalled.index + 1);
+    }
+    if (!isCaretOnLastLine(text, selection.start)) return null;
+    if (recalled.index === 0) {
+      this.recalled = null;
+      return "";
+    }
+    return this.show(readSentMessages(), recalled.index - 1);
+  }
+
+  private show(messages: readonly string[], index: number): string | null {
+    const text = messages[index];
+    if (text === undefined) return null;
+    this.recalled = { index, text };
+    return text;
+  }
+}
+
+function isCaretOnFirstLine(text: string, caret: number): boolean {
+  return !text.slice(0, caret).includes("\n");
+}
+
+function isCaretOnLastLine(text: string, caret: number): boolean {
+  return !text.slice(caret).includes("\n");
+}

packages/app/src/composer/submission/writer.test.ts

@@ -2,7 +2,9 @@ import { afterEach, expect, test } from "vitest";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { useSessionStore } from "@/stores/session-store";
 import type { UserMessageItem } from "@/types/stream";
-import { createMessageSubmissionWriter } from "./writer";
+import { useDraftStore } from "@/stores/draft-store";
+import { buildDraftStoreKey } from "@/stores/draft-keys";
+import { createMessageSubmissionWriter, transferComposerFollowUps } from "./writer";
 
 const CANONICAL_ONLY_SERVER_ID = "canonical-only";
 
@@ -47,3 +49,59 @@ test("tracks submissions when canonical prompts are supported", () => {
 
   expect(submissionIds(CANONICAL_ONLY_SERVER_ID)).toEqual(["canonical-only-message"]);
 });
+
+const TRANSFER_SERVER_ID = "transfer";
+
+function queued(id: string) {
+  return { id, text: `follow-up ${id}`, attachments: [] };
+}
+function queueIds(agentId: string): string[] {
+  return (
+    useSessionStore.getState().sessions[TRANSFER_SERVER_ID]?.queuedMessages.get(agentId) ?? []
+  ).map((item) => item.id);
+}
+function draftText(agentId: string): string | undefined {
+  return useDraftStore
+    .getState()
+    .getDraftInput(buildDraftStoreKey({ serverId: TRANSFER_SERVER_ID, agentId }))?.text;
+}
+function typeDraft(agentId: string, text: string): void {
+  useDraftStore.getState().saveDraftInput({
+    draftKey: buildDraftStoreKey({ serverId: TRANSFER_SERVER_ID, agentId }),
+    draft: { text, attachments: [] },
+  });
+}
+
+test("follow-ups move with their IDs and order behind the destination's, and only once", () => {
+  initializeSession(TRANSFER_SERVER_ID, {});
+  useSessionStore.getState().setQueuedMessages(
+    TRANSFER_SERVER_ID,
+    new Map([
+      ["optimistic", [queued("a"), queued("b")]],
+      ["recovery", [queued("earlier")]],
+    ]),
+  );
+  typeDraft("optimistic", "typed but unsent");
+
+  transferComposerFollowUps(TRANSFER_SERVER_ID, "optimistic", "recovery");
+  transferComposerFollowUps(TRANSFER_SERVER_ID, "optimistic", "recovery");
+  transferComposerFollowUps(TRANSFER_SERVER_ID, "recovery", "recovery");
+
+  expect(queueIds("recovery")).toEqual(["earlier", "a", "b"]);
+  expect(queueIds("optimistic")).toEqual([]);
+  expect(draftText("recovery")).toBe("typed but unsent");
+  expect(draftText("optimistic")).toBeUndefined();
+  useSessionStore.getState().clearSession(TRANSFER_SERVER_ID);
+});
+
+test("unsent text never replaces a destination draft and stays at its source", () => {
+  initializeSession(TRANSFER_SERVER_ID, {});
+  typeDraft("source", "typed on the source");
+  typeDraft("destination", "already typed here");
+
+  transferComposerFollowUps(TRANSFER_SERVER_ID, "source", "destination");
+
+  expect(draftText("destination")).toBe("already typed here");
+  expect(draftText("source")).toBe("typed on the source");
+  useSessionStore.getState().clearSession(TRANSFER_SERVER_ID);
+});

packages/app/src/composer/submission/writer.ts

@@ -1,5 +1,7 @@
-import type { MessageSubmissionWriter } from "@/composer/actions";
+import type { MessageSubmissionWriter, QueueWriter } from "@/composer/actions";
 import { useSessionStore } from "@/stores/session-store";
+import { useDraftStore, type DraftInput } from "@/stores/draft-store";
+import { buildDraftStoreKey } from "@/stores/draft-keys";
 import {
   appendSubmittedUserMessage,
   removeSubmittedUserMessage,
@@ -63,6 +65,14 @@ export function createMessageSubmissionWriter(serverId: string): MessageSubmissi
   };
 }
 
+export function createAgentMessageQueueWriter(serverId: string): QueueWriter {
+  return {
+    read: (agentId) =>
+      useSessionStore.getState().sessions[serverId]?.queuedMessages.get(agentId) ?? [],
+    write: (update) => useSessionStore.getState().setQueuedMessages(serverId, update),
+  };
+}
+
 export function handoffCreatedAgentMessageSubmission(
   serverId: string,
   agentId: string,
@@ -70,3 +80,41 @@ export function handoffCreatedAgentMessageSubmission(
 ): boolean {
   return useSessionStore.getState().handoffCreatedAgentUserMessage(serverId, agentId, message);
 }
+
+function isEmptyDraft(draft: DraftInput | undefined): boolean {
+  return !draft || (!draft.text.trim() && draft.attachments.length === 0);
+}
+
+/**
+ * Moves the queued follow-ups and the unsent agent draft of one composer identity to the identity
+ * that now owns them, such as a recovery draft or the agent it creates. Queued messages keep their
+ * IDs and order, after any already queued there; an idle destination agent drains them. The unsent
+ * draft moves only into an empty slot, and otherwise stays where it is. Repeating is harmless.
+ */
+export function transferComposerFollowUps(serverId: string, from: string, to: string): void {
+  if (from === to) return;
+  const session = useSessionStore.getState().sessions[serverId];
+  if (session?.queuedMessages.get(from)?.length) {
+    useSessionStore.getState().setQueuedMessages(serverId, (queues) => {
+      const moving = queues.get(from);
+      if (!moving?.length) return queues;
+      const next = new Map(queues);
+      next.set(to, [...(queues.get(to) ?? []), ...moving]);
+      next.delete(from);
+      return next;
+    });
+    const agent = session.agents.get(to) ?? session.agentDetails.get(to);
+    if (agent?.turn.phase === "idle") {
+      void import("@/runtime/host-runtime").then(({ getHostRuntimeStore }) =>
+        getHostRuntimeStore().drainQueuedAgentMessage(serverId, to),
+      );
+    }
+  }
+  const drafts = useDraftStore.getState();
+  const source = buildDraftStoreKey({ serverId, agentId: from });
+  const destination = buildDraftStoreKey({ serverId, agentId: to });
+  const draft = drafts.getDraftInput(source);
+  if (!draft || isEmptyDraft(draft) || !isEmptyDraft(drafts.getDraftInput(destination))) return;
+  drafts.saveDraftInput({ draftKey: destination, draft });
+  drafts.clearDraftInput({ draftKey: source });
+}

packages/app/src/composer/tracks-panel.browser.test.tsx

@@ -162,12 +162,34 @@ describe("composer track panel", () => {
     );
 
     openPanel();
+    expect(document.querySelector("button button")).toBeNull();
+    expect(row("row")?.getAttribute("role")).toBe("menuitem");
     click(row("row-archive") as Element);
 
     expect(onAction).toHaveBeenCalledTimes(1);
     expect(onPress).not.toHaveBeenCalled();
     expect(isPanelOpen()).toBe(true);
   });
+
+  it.each(["Enter", " "])("selects a track row with %j", (key) => {
+    const select = vi.fn();
+    mount(
+      <ComposerTrackPill testID="pill" segments={SUBAGENT_SEGMENTS} panelTitle="Subagents">
+        <ComposerTrackRow accessibilityLabel="Subagent one" testID="row" onPress={select}>
+          <Text>Subagent one</Text>
+        </ComposerTrackRow>
+      </ComposerTrackPill>,
+    );
+    openPanel();
+    const target = row("row") as HTMLElement;
+    act(() => {
+      target.focus();
+      target.dispatchEvent(new KeyboardEvent("keydown", { key, bubbles: true }));
+      target.dispatchEvent(new KeyboardEvent("keyup", { key, bubbles: true }));
+    });
+    expect(select).toHaveBeenCalledTimes(1);
+    expect(isPanelOpen()).toBe(false);
+  });
 });
 
 describe("composer track pill status mark", () => {

packages/app/src/composer/tracks.tsx

@@ -233,6 +233,11 @@ export function ComposerTrackRow({
     [closeOnSelect, onPress, selectItem],
   );
 
+  const itemDataSet = useMemo(
+    () => ({ menuItem: "true", menuDisabled: disabled ? "true" : "false" }),
+    [disabled],
+  );
+
   const renderRow = useCallback(
     (active: boolean) => (
       <View style={active ? styles.rowActive : styles.row}>
@@ -253,7 +258,8 @@ export function ComposerTrackRow({
   return (
     <View onPointerEnter={handlePointerEnter} onPointerLeave={handlePointerLeave}>
       <Pressable
-        accessibilityRole="button"
+        accessibilityRole="menuitem"
+        dataSet={itemDataSet}
         accessibilityLabel={accessibilityLabel}
         testID={testID}
         disabled={disabled}

packages/app/src/desktop/host.ts

@@ -80,7 +80,7 @@ export interface DesktopEditorOpenTargetInput {
 }
 
 export interface DesktopEditorBridge {
-  listTargets?: () => Promise<DesktopEditorTargetDescriptor[]>;
+  listTargets?: (input?: { workspacePath?: string }) => Promise<DesktopEditorTargetDescriptor[]>;
   openTarget?: (input: DesktopEditorOpenTargetInput) => Promise<void>;
 }
 

packages/app/src/git/pull-request-panel/checks-ring.tsx

@@ -1,3 +1,4 @@
+import { isNative } from "@/constants/platform";
 import Svg, { Circle } from "react-native-svg";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import type { Theme } from "@/styles/theme";
@@ -75,8 +76,9 @@ function ChecksRingSvg({
       height={size}
       viewBox={`0 0 ${VIEW_BOX} ${VIEW_BOX}`}
       style={ringStyles.svg}
-      accessibilityElementsHidden
-      importantForAccessibility="no-hide-descendants"
+      {...(isNative
+        ? { accessibilityElementsHidden: true, importantForAccessibility: "no-hide-descendants" }
+        : { "aria-hidden": true })}
     >
       <Circle
         cx={CENTER}

packages/app/src/hooks/sidebar-workspaces-view-model.ts

@@ -1,3 +1,4 @@
+import type { CreationAttempt } from "@/workspace-creation/model";
 import { deriveEffectiveWorkspaceStatus } from "@/workspace-status";
 import equal from "fast-deep-equal";
 import type { PrHint } from "@/git/pr-hint";
@@ -146,6 +147,7 @@ export function createSidebarWorkspaceEntry(input: {
   workspace: WorkspaceDescriptor;
   projectViewKey?: string;
   pendingCreateAttempts?: Record<string, PendingCreateAttempt>;
+  workspaceCreations?: readonly CreationAttempt[];
   workspaceAgentActivity?: ReadonlyMap<string, WorkspaceAgentActivity>;
 }): SidebarWorkspaceEntry {
   const projectViewKey = input.projectViewKey ?? input.workspace.projectId;
@@ -203,6 +205,7 @@ export function deriveProjectStatusBucket(input: {
   workspaces: readonly SidebarWorkspacePlacement[];
   sessions: Record<string, ProjectStatusSession | undefined>;
   pendingCreateAttempts?: Record<string, PendingCreateAttempt>;
+  workspaceCreations?: readonly CreationAttempt[];
 }): SidebarStateBucket {
   const workspaceIdsByServer = new Map<string, string[]>();
   for (const placement of input.workspaces) {
@@ -230,6 +233,7 @@ export function deriveProjectStatusBucket(input: {
           serverId,
           workspace,
           pendingCreateAttempts: input.pendingCreateAttempts,
+          workspaceCreations: input.workspaceCreations,
           workspaceAgentActivity: session.workspaceAgentActivity,
         }).status,
       );
@@ -348,6 +352,7 @@ export function buildSidebarWorkspaceEntries(input: {
   placements: readonly SidebarWorkspacePlacement[];
   sessions: SidebarWorkspaceSession[];
   pendingCreateAttempts?: Record<string, PendingCreateAttempt>;
+  workspaceCreations?: readonly CreationAttempt[];
   previousEntries?: ReadonlyMap<string, SidebarWorkspaceEntry>;
 }): ReadonlyMap<string, SidebarWorkspaceEntry> {
   if (input.placements.length === 0 || input.sessions.length === 0) {
@@ -374,6 +379,7 @@ export function buildSidebarWorkspaceEntries(input: {
       workspace,
       projectViewKey: placement.projectViewKey,
       pendingCreateAttempts: input.pendingCreateAttempts,
+      workspaceCreations: input.workspaceCreations,
       workspaceAgentActivity: session.workspaceAgentActivity,
     });
     const previousEntry = input.previousEntries?.get(placement.workspaceKey);

packages/app/src/hooks/use-directory-demand.test.tsx

@@ -0,0 +1,40 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
+import { useDirectoryDemand } from "./use-directory-demand";
+
+function Probe({ serverId }: { serverId: string | null }) {
+  useDirectoryDemand(serverId);
+  return null;
+}
+
+describe("useDirectoryDemand", () => {
+  let root: Root | null = null;
+  afterEach(() => {
+    act(() => root?.unmount());
+    root = null;
+    vi.restoreAllMocks();
+  });
+
+  it("demands the host directory while mounted and releases it on unmount", () => {
+    const release = vi.fn();
+    const acquire = vi
+      .spyOn(getHostRuntimeStore(), "acquireDirectoryDemand")
+      .mockImplementation(() => release);
+    const container = document.createElement("div");
+    root = createRoot(container);
+
+    act(() => root?.render(<Probe serverId="srv_a" />));
+    expect(acquire).toHaveBeenCalledTimes(1);
+    expect(acquire).toHaveBeenCalledWith("srv_a");
+    expect(release).not.toHaveBeenCalled();
+
+    act(() => root?.render(<Probe serverId={null} />));
+    expect(release).toHaveBeenCalledTimes(1);
+    expect(acquire).toHaveBeenCalledTimes(1);
+  });
+});

packages/app/src/hooks/use-directory-demand.ts

@@ -0,0 +1,16 @@
+import { useEffect } from "react";
+import { getHostRuntimeStore } from "@/runtime/host-runtime";
+
+/**
+ * Keeps a host's directory demanded while the caller is mounted.
+ *
+ * The sidebar only demands the directory while its panel is active, so a compact app that
+ * restores straight into a workspace or agent route has nothing else asking the host for
+ * workspaces and agents. Without demand the route waits on hydration that never starts.
+ */
+export function useDirectoryDemand(serverId: string | null | undefined): void {
+  useEffect(() => {
+    if (!serverId) return;
+    return getHostRuntimeStore().acquireDirectoryDemand(serverId);
+  }, [serverId]);
+}

packages/app/src/hooks/use-preferred-editor.test.ts

@@ -1,5 +1,7 @@
 import { describe, expect, it } from "vitest";
-import { resolvePreferredEditorId } from "./use-preferred-editor";
+import { QueryClient } from "@tanstack/react-query";
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import { createPreferredEditorPreference, resolvePreferredEditorId } from "./use-preferred-editor";
 
 describe("resolvePreferredEditorId", () => {
   it("keeps the stored editor when it is still available", () => {
@@ -30,3 +32,78 @@ describe("resolvePreferredEditorId", () => {
     expect(resolvePreferredEditorId([], "cursor")).toBeNull();
   });
 });
+
+describe("project editor preferences", () => {
+  it("changing one project leaves another project's cached and persisted choice unchanged", async () => {
+    await AsyncStorage.clear();
+    await AsyncStorage.setItem("@paseo:preferred-editor", "vscode");
+    const queryClient = new QueryClient();
+    const projectA = createPreferredEditorPreference({
+      scope: { serverId: "host", projectId: "project-a" },
+      queryClient,
+      storage: AsyncStorage,
+    });
+    const projectB = createPreferredEditorPreference({
+      scope: { serverId: "host", projectId: "project-b" },
+      queryClient,
+      storage: AsyncStorage,
+    });
+    expect(await queryClient.fetchQuery(projectA.queryOptions)).toBe("vscode");
+    expect(await queryClient.fetchQuery(projectB.queryOptions)).toBe("vscode");
+    await projectA.update("cursor");
+    expect(await queryClient.fetchQuery(projectA.queryOptions)).toBe("cursor");
+    expect(await queryClient.fetchQuery(projectB.queryOptions)).toBe("vscode");
+    queryClient.clear();
+    expect(await queryClient.fetchQuery(projectA.queryOptions)).toBe("cursor");
+    expect(await queryClient.fetchQuery(projectB.queryOptions)).toBe("vscode");
+    expect(await AsyncStorage.getItem("@paseo:preferred-editor")).toBe("vscode");
+    queryClient.clear();
+  });
+  it("shares a choice across workspaces of the same project while isolating hosts", async () => {
+    await AsyncStorage.clear();
+    const queryClient = new QueryClient();
+    const root = createPreferredEditorPreference({
+      scope: { serverId: "host-a", projectId: "project" },
+      queryClient,
+      storage: AsyncStorage,
+    });
+    const worktree = createPreferredEditorPreference({
+      scope: { serverId: "host-a", projectId: "project" },
+      queryClient,
+      storage: AsyncStorage,
+    });
+    const otherHost = createPreferredEditorPreference({
+      scope: { serverId: "host-b", projectId: "project" },
+      queryClient,
+      storage: AsyncStorage,
+    });
+    await root.update("zed");
+    expect(await queryClient.fetchQuery(worktree.queryOptions)).toBe("zed");
+    expect(await queryClient.fetchQuery(otherHost.queryOptions)).toBeNull();
+    queryClient.clear();
+    expect(await queryClient.fetchQuery(worktree.queryOptions)).toBe("zed");
+    expect(await queryClient.fetchQuery(otherHost.queryOptions)).toBeNull();
+    queryClient.clear();
+  });
+
+  it("preserves the previous choice when saving fails", async () => {
+    await AsyncStorage.clear();
+    await AsyncStorage.setItem("@paseo:preferred-editor", "vscode");
+    const queryClient = new QueryClient();
+    const preference = createPreferredEditorPreference({
+      scope: { serverId: "host", projectId: "project" },
+      queryClient,
+      storage: {
+        getItem: AsyncStorage.getItem,
+        removeItem: AsyncStorage.removeItem,
+        async setItem() {
+          throw new Error("Storage is full");
+        },
+      },
+    });
+    expect(await queryClient.fetchQuery(preference.queryOptions)).toBe("vscode");
+    await expect(preference.update("cursor")).rejects.toThrow("Storage is full");
+    expect(await queryClient.fetchQuery(preference.queryOptions)).toBe("vscode");
+    queryClient.clear();
+  });
+});

packages/app/src/hooks/use-preferred-editor.ts

@@ -1,16 +1,57 @@
-import { useCallback } from "react";
+import { useMemo } from "react";
 import AsyncStorage from "@react-native-async-storage/async-storage";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { QueryClient, useQuery, useQueryClient } from "@tanstack/react-query";
 import { z } from "zod";
-import { readValidatedString } from "@/storage/validated-storage";
+import { readValidatedString, type ValidatedStorage } from "@/storage/validated-storage";
 
 type EditorTargetId = string;
 
 const PREFERRED_EDITOR_STORAGE_KEY = "@paseo:preferred-editor";
-const PREFERRED_EDITOR_QUERY_KEY = ["preferred-editor"];
 
-async function loadPreferredEditor(): Promise<EditorTargetId | null> {
-  return readValidatedString(AsyncStorage, PREFERRED_EDITOR_STORAGE_KEY, z.string().trim().min(1));
+interface EditorPreferenceStorage extends ValidatedStorage {
+  setItem(key: string, value: string): Promise<void>;
+}
+
+interface ProjectEditorScope {
+  serverId: string;
+  projectId: string | null;
+}
+
+export function createPreferredEditorPreference({
+  scope,
+  queryClient,
+  storage,
+}: {
+  scope: ProjectEditorScope;
+  queryClient: QueryClient;
+  storage: EditorPreferenceStorage;
+}) {
+  const queryKey = ["preferred-editor", scope.serverId, scope.projectId];
+  const storageKey = `${PREFERRED_EDITOR_STORAGE_KEY}:${JSON.stringify([scope.serverId, scope.projectId])}`;
+  async function load() {
+    if (scope.projectId === null) return null;
+    const projectEditor = await readValidatedString(storage, storageKey, z.string().trim().min(1));
+    if (projectEditor !== null) return projectEditor;
+    return readValidatedString(storage, PREFERRED_EDITOR_STORAGE_KEY, z.string().trim().min(1));
+  }
+  return {
+    queryOptions: {
+      queryKey,
+      queryFn: load,
+      enabled: scope.projectId !== null,
+      staleTime: Infinity,
+      gcTime: Infinity,
+    },
+    async update(editorId: EditorTargetId | null) {
+      if (scope.projectId === null) return;
+      if (editorId) {
+        await storage.setItem(storageKey, editorId);
+      } else {
+        await storage.removeItem(storageKey);
+      }
+      queryClient.setQueryData(queryKey, await load());
+    },
+  };
 }
 
 export function resolvePreferredEditorId(
@@ -29,30 +70,24 @@ export function resolvePreferredEditorId(
   return availableEditorIds[0] ?? null;
 }
 
-export function usePreferredEditor() {
+export function usePreferredEditor(scope: ProjectEditorScope) {
   const queryClient = useQueryClient();
-  const { data, isPending } = useQuery({
-    queryKey: PREFERRED_EDITOR_QUERY_KEY,
-    queryFn: loadPreferredEditor,
-    staleTime: Infinity,
-    gcTime: Infinity,
-  });
-
-  const updatePreferredEditor = useCallback(
-    async (editorId: EditorTargetId | null) => {
-      queryClient.setQueryData(PREFERRED_EDITOR_QUERY_KEY, editorId);
-      if (editorId) {
-        await AsyncStorage.setItem(PREFERRED_EDITOR_STORAGE_KEY, editorId);
-        return;
-      }
-      await AsyncStorage.removeItem(PREFERRED_EDITOR_STORAGE_KEY);
-    },
-    [queryClient],
+  const { serverId, projectId } = scope;
+  const preference = useMemo(
+    () =>
+      createPreferredEditorPreference({
+        scope: { serverId, projectId },
+        queryClient,
+        storage: AsyncStorage,
+      }),
+    [queryClient, serverId, projectId],
   );
+  const { data, isPending } = useQuery(preference.queryOptions);
 
+  const isLoading = projectId !== null && isPending;
   return {
-    preferredEditorId: isPending ? undefined : (data ?? null),
-    isLoading: isPending,
-    updatePreferredEditor,
+    preferredEditorId: isLoading ? undefined : (data ?? null),
+    isLoading,
+    updatePreferredEditor: preference.update,
   };
 }

packages/app/src/hooks/use-sidebar-workspace-entries.ts

@@ -1,3 +1,6 @@
+import { useTranslation } from "react-i18next";
+import { useWorkspaceCreations } from "@/workspace-creation";
+import { creatingSidebarEntry } from "@/workspace-creation/presentation";
 import { useMemo, useRef } from "react";
 import { useStoreWithEqualityFn } from "zustand/traditional";
 import { useCreateFlowStore } from "@/stores/create-flow-store";
@@ -19,6 +22,7 @@ export function useSidebarWorkspaceEntries(
   placements: readonly SidebarWorkspacePlacement[],
   enabled = true,
 ): ReadonlyMap<string, SidebarWorkspaceEntry> {
+  const { t } = useTranslation();
   const serverIds = useMemo(
     () => Array.from(new Set(placements.map((placement) => placement.serverId))),
     [placements],
@@ -32,6 +36,7 @@ export function useSidebarWorkspaceEntries(
   const pendingCreateAttempts = useCreateFlowStore((state) =>
     enabled ? state.pendingByDraftId : EMPTY_PENDING_CREATE_ATTEMPTS,
   );
+  const creations = useWorkspaceCreations();
   const previousEntriesRef = useRef<ReadonlyMap<string, SidebarWorkspaceEntry>>(EMPTY_ENTRIES);
 
   // Collection ownership is intentional: retained sidebars have one cheap
@@ -45,13 +50,26 @@ export function useSidebarWorkspaceEntries(
       previousEntriesRef.current = EMPTY_ENTRIES;
       return EMPTY_ENTRIES;
     }
-    const entries = buildSidebarWorkspaceEntries({
-      placements,
-      sessions,
-      pendingCreateAttempts,
-      previousEntries: previousEntriesRef.current,
-    });
+    const entries = new Map(
+      buildSidebarWorkspaceEntries({
+        placements,
+        sessions,
+        pendingCreateAttempts,
+        workspaceCreations: creations,
+        previousEntries: previousEntriesRef.current,
+      }),
+    );
+    for (const placement of placements) {
+      if (entries.has(placement.workspaceKey)) continue;
+      const creating = creations.some(
+        (creation) =>
+          creation.serverId === placement.serverId &&
+          creation.workspaceId === placement.workspaceId &&
+          !creation.workspaceObserved,
+      );
+      if (creating) entries.set(placement.workspaceKey, creatingSidebarEntry(placement, t));
+    }
     previousEntriesRef.current = entries;
     return entries;
-  }, [enabled, pendingCreateAttempts, placements, sessions]);
+  }, [enabled, pendingCreateAttempts, placements, sessions, creations, t]);
 }

packages/app/src/hooks/use-sidebar-workspaces-list.ts

@@ -1,3 +1,6 @@
+import { useTranslation } from "react-i18next";
+import { useWorkspaceCreations } from "@/workspace-creation";
+import { addCreatingSidebarWorkspaces } from "@/workspace-creation/presentation";
 import { useHostFeatureMap } from "@/runtime/host-features";
 import { useCallback, useEffect, useMemo } from "react";
 import { useStoreWithEqualityFn } from "zustand/traditional";
@@ -59,6 +62,7 @@ export function useSidebarProjectStatusBucket(input: {
   enabled: boolean;
 }): SidebarStateBucket | null {
   const { workspaces, enabled } = input;
+  const workspaceCreations = useWorkspaceCreations();
   const pendingCreateAttempts = useStoreWithEqualityFn(
     useCreateFlowStore,
     (state) => state.pendingByDraftId,
@@ -72,9 +76,10 @@ export function useSidebarProjectStatusBucket(input: {
         workspaces,
         sessions: state.sessions,
         pendingCreateAttempts,
+        workspaceCreations,
       });
     },
-    [enabled, pendingCreateAttempts, workspaces],
+    [enabled, pendingCreateAttempts, workspaces, workspaceCreations],
   );
 
   return useStoreWithEqualityFn(useSessionStore, selector, Object.is);
@@ -150,10 +155,12 @@ export function useSidebarWorkspacesList(options?: {
       : undefined;
   const { projects: hostProjects } = useWorkspaceStructure(directoryServerIds, sort);
 
+  const { t } = useTranslation();
+  const creations = useWorkspaceCreations();
   const selectPlacements = useMemo(createSidebarWorkspacePlacementSelector, []);
   const sidebarModel = useMemo(
-    () => selectPlacements(hostProjects),
-    [hostProjects, selectPlacements],
+    () => addCreatingSidebarWorkspaces(selectPlacements(hostProjects), creations, t),
+    [hostProjects, selectPlacements, creations, t],
   );
 
   const projects = sidebarModel.projects.length > 0 ? sidebarModel.projects : EMPTY_PROJECTS;

packages/app/src/i18n/resources/ar.ts

@@ -133,6 +133,8 @@ export const ar: TranslationResources = {
       sendAndInterrupt: "إرسال ومقاطعة",
       sendAndSteer: "إرسال وتوجيه",
       sendMessage: "أرسل رسالة",
+      longPressToQueue: "اضغط مطولًا لإضافتها إلى الطابور",
+      longPressToSendNow: "اضغط مطولًا للإرسال الآن",
       queue: "طابور",
       send: "يرسل",
     },
@@ -1337,6 +1339,15 @@ export const ar: TranslationResources = {
     },
   },
   newWorkspace: {
+    creation: {
+      creatingWorkspace: "جارٍ إنشاء مساحة العمل…",
+      creatingLabel: "جارٍ إنشاء مساحة العمل",
+      updateHost: "حدّث هذا المضيف لإنشاء مساحة عمل تتضمن وكيلاً.",
+      chooseProjectHost: "اختر مشروعًا ومضيفًا",
+      projectUnavailable: "المشروع غير متاح على المضيف المحدد",
+      workspacePending: "لا يزال إنشاء مساحة العمل جاريًا.",
+      agentPending: "لا يزال إنشاء الوكيل جاريًا.",
+    },
     title: "مساحة عمل جديدة",
     create: "يخلق",
     isolation: {
@@ -2258,6 +2269,7 @@ export const ar: TranslationResources = {
       connections: "اتصالات",
       agents: "Agents",
       metadata: "البيانات الوصفية",
+      voice: "الصوت",
       workspaces: "Workspaces",
       providers: "مقدمي الخدمات",
       usage: "الاستخدام",
@@ -2280,6 +2292,69 @@ export const ar: TranslationResources = {
       docs: "الوثائق",
       saveError: "تعذر تحديث إنشاء البيانات الوصفية",
     },
+    voice: {
+      offline: "اتصل بهذا المضيف لضبط الصوت.",
+      updateHost: "حدّث المضيف لضبط الصوت.",
+      saveError: "تعذّر تحديث إعدادات الصوت",
+      provider: "المزوّد",
+      providers: {
+        local: "محلي",
+        openai: "OpenAI",
+      },
+      voice: "الصوت",
+      save: "حفظ",
+      retry: "إعادة المحاولة",
+      cancel: "إلغاء",
+      model: "النموذج",
+      language: "اللغة",
+      languagePlaceholder: "اكتشاف تلقائي",
+      setBy: "محدد بواسطة {{name}}",
+      unknownProvider: "حدّث التطبيق لإعداد {{provider}}",
+      sites: {
+        dictationStt: "تحويل الكلام إلى نص",
+        voiceModeStt: "الاستماع",
+        voiceModeTts: "التحدث",
+      },
+      dictation: {
+        title: "الإملاء",
+        enabled: "الإملاء",
+        enabledHint: "تحدّث في مربع الرسالة بدلًا من الكتابة",
+      },
+      voiceMode: {
+        title: "وضع الصوت",
+        info: "يحوّل وضع الصوت كلامك إلى نص ويقرأ ردود الوكيل بصوت عالٍ.",
+        enabled: "وضع الصوت",
+        enabledHint: "تحدّث مع وكلائك دون استخدام يديك",
+      },
+      openai: {
+        apiKey: "مفتاح API",
+        apiKeyHint: "يُحفظ على المضيف ولا يُعرض مرة أخرى.",
+        keyPlaceholder: "sk-...",
+        savedKeyPlaceholder: "محفوظ",
+        missingKey: "مفتاح API مفقود",
+        baseUrl: "عنوان URL الأساسي",
+        baseUrlHint: "للخوادم المتوافقة مع OpenAI. اتركه فارغًا لاستخدام OpenAI.",
+      },
+      models: {
+        loading: "جارٍ تحميل النماذج...",
+        loadError: "تعذّر تحميل النماذج المحلية",
+        none: "لا توجد نماذج متاحة",
+        downloaded: "منزّل",
+        inUse: "قيد الاستخدام",
+        recommended: "موصى به",
+        download: "تنزيل",
+        downloadAction: "تنزيل {{label}}",
+        downloading: "جارٍ التنزيل...",
+        downloadingPercent: "جارٍ التنزيل {{percent}}%",
+        extracting: "جارٍ الاستخراج...",
+        delete: "حذف",
+        deleteAction: "حذف {{label}}",
+        deleteTitle: "حذف {{label}}؟",
+        deleteMessage: "سيؤدي هذا إلى تحرير {{size}}. يمكنك تنزيله مرة أخرى لاحقًا.",
+        languages: "لغات {{label}}",
+        moreLanguages: "{{languages}} و{{count}} أخرى",
+      },
+    },
     general: {
       title: "عام",
       sending: "الإرسال",
@@ -2698,6 +2773,11 @@ export const ar: TranslationResources = {
       },
       agents: {
         unavailable: "Connect to this host to manage agents",
+        idleRuntimeCleanup: {
+          title: "تحرير الوكلاء الخاملين",
+          hint: "تحرير الذاكرة بعد ساعة من الخمول.",
+          info: "يوقف عملية الوكيل مع الاحتفاظ بمحادثته. أرسل رسالة لاستئنافها.\n\nيمنع العمل النشط والإشعارات المعلّقة وفحوصات أمان المزوّد عملية التنظيف.",
+        },
       },
       workspaces: {
         unavailable: "Connect to this host to manage workspaces",

packages/app/src/i18n/resources/en.ts

@@ -129,6 +129,8 @@ export const en = {
       sendAndInterrupt: "Send and interrupt",
       sendAndSteer: "Send and steer",
       sendMessage: "Send message",
+      longPressToQueue: "Long press to queue",
+      longPressToSendNow: "Long press to send now",
       queue: "Queue",
       send: "Send",
     },
@@ -1345,6 +1347,15 @@ export const en = {
     },
   },
   newWorkspace: {
+    creation: {
+      creatingWorkspace: "Creating workspace…",
+      creatingLabel: "Creating workspace",
+      updateHost: "Update this host to create a workspace with an agent.",
+      chooseProjectHost: "Choose a project and host",
+      projectUnavailable: "Project is not available on the selected host",
+      workspacePending: "Workspace is still being created.",
+      agentPending: "Agent is still being created.",
+    },
     title: "New workspace",
     create: "Create",
     isolation: {
@@ -2285,6 +2296,7 @@ export const en = {
       connections: "Connections",
       agents: "Agents",
       metadata: "Metadata",
+      voice: "Voice",
       workspaces: "Workspaces",
       providers: "Providers",
       usage: "Usage",
@@ -2369,6 +2381,69 @@ export const en = {
       docs: "Docs",
       saveError: "Unable to update metadata generation",
     },
+    voice: {
+      offline: "Connect to this host to configure voice.",
+      updateHost: "Update the host to configure voice.",
+      saveError: "Unable to update voice settings",
+      provider: "Provider",
+      providers: {
+        local: "Local",
+        openai: "OpenAI",
+      },
+      voice: "Voice",
+      save: "Save",
+      retry: "Retry",
+      cancel: "Cancel",
+      model: "Model",
+      language: "Language",
+      languagePlaceholder: "Auto-detect",
+      setBy: "Set by {{name}}",
+      unknownProvider: "Update the app to configure {{provider}}",
+      sites: {
+        dictationStt: "Speech-to-text",
+        voiceModeStt: "Listening",
+        voiceModeTts: "Speaking",
+      },
+      dictation: {
+        title: "Dictation",
+        enabled: "Dictation",
+        enabledHint: "Speak into the message box instead of typing",
+      },
+      voiceMode: {
+        title: "Voice mode",
+        info: "Voice mode transcribes what you say and reads agent replies aloud.",
+        enabled: "Voice mode",
+        enabledHint: "Talk with your agents hands-free",
+      },
+      openai: {
+        apiKey: "API key",
+        apiKeyHint: "Saved on the host and never shown again.",
+        keyPlaceholder: "sk-...",
+        savedKeyPlaceholder: "Saved",
+        missingKey: "API key missing",
+        baseUrl: "Base URL",
+        baseUrlHint: "For OpenAI-compatible servers. Leave empty to use OpenAI.",
+      },
+      models: {
+        loading: "Loading models...",
+        loadError: "Couldn't load local models",
+        none: "No models available",
+        downloaded: "Downloaded",
+        inUse: "In use",
+        recommended: "Recommended",
+        download: "Download",
+        downloadAction: "Download {{label}}",
+        downloading: "Downloading...",
+        downloadingPercent: "Downloading {{percent}}%",
+        extracting: "Extracting...",
+        delete: "Delete",
+        deleteAction: "Delete {{label}}",
+        deleteTitle: "Delete {{label}}?",
+        deleteMessage: "This frees {{size}}. You can download it again later.",
+        languages: "{{label}} languages",
+        moreLanguages: "{{languages}} and {{count}} more",
+      },
+    },
     general: {
       title: "General",
       sending: "Sending",
@@ -2789,6 +2864,11 @@ export const en = {
       },
       agents: {
         unavailable: "Connect to this host to manage agents",
+        idleRuntimeCleanup: {
+          title: "Release idle agents",
+          hint: "Free up memory after an hour of inactivity.",
+          info: "Stops the agent's process while keeping its conversation. Send a message to resume.\n\nActive work, pending notifications, and provider safety checks prevent cleanup.",
+        },
       },
       workspaces: {
         unavailable: "Connect to this host to manage workspaces",

packages/app/src/i18n/resources/es.ts

@@ -134,6 +134,8 @@ export const es: TranslationResources = {
       sendAndInterrupt: "Enviar e interrumpir",
       sendAndSteer: "Enviar y orientar",
       sendMessage: "enviar mensaje",
+      longPressToQueue: "Mantén pulsado para poner en cola",
+      longPressToSendNow: "Mantén pulsado para enviar ahora",
       queue: "Cola",
       send: "Enviar",
     },
@@ -1373,6 +1375,15 @@ export const es: TranslationResources = {
     },
   },
   newWorkspace: {
+    creation: {
+      creatingWorkspace: "Creando espacio de trabajo…",
+      creatingLabel: "Creando espacio de trabajo",
+      updateHost: "Actualiza este host para crear un espacio de trabajo con un agente.",
+      chooseProjectHost: "Elige un proyecto y un host",
+      projectUnavailable: "El proyecto no está disponible en el host seleccionado",
+      workspacePending: "El espacio de trabajo aún se está creando.",
+      agentPending: "El agente aún se está creando.",
+    },
     title: "Nuevo espacio de trabajo",
     create: "Crear",
     isolation: {
@@ -2270,6 +2281,7 @@ export const es: TranslationResources = {
       connections: "Conexiones",
       agents: "Agents",
       metadata: "Metadatos",
+      voice: "Voz",
       workspaces: "Workspaces",
       providers: "Proveedores",
       usage: "Uso",
@@ -2292,6 +2304,69 @@ export const es: TranslationResources = {
       docs: "Documentación",
       saveError: "No se pudo actualizar la generación de metadatos",
     },
+    voice: {
+      offline: "Conéctate a este host para configurar la voz.",
+      updateHost: "Actualiza el host para configurar la voz.",
+      saveError: "No se pudo actualizar la configuración de voz",
+      provider: "Proveedor",
+      providers: {
+        local: "Local",
+        openai: "OpenAI",
+      },
+      voice: "Voz",
+      save: "Guardar",
+      retry: "Reintentar",
+      cancel: "Cancelar",
+      model: "Modelo",
+      language: "Idioma",
+      languagePlaceholder: "Detección automática",
+      setBy: "Definido por {{name}}",
+      unknownProvider: "Actualiza la app para configurar {{provider}}",
+      sites: {
+        dictationStt: "Voz a texto",
+        voiceModeStt: "Escucha",
+        voiceModeTts: "Habla",
+      },
+      dictation: {
+        title: "Dictado",
+        enabled: "Dictado",
+        enabledHint: "Habla en el cuadro de mensaje en lugar de escribir",
+      },
+      voiceMode: {
+        title: "Modo de voz",
+        info: "El modo de voz transcribe lo que dices y lee en voz alta las respuestas del agente.",
+        enabled: "Modo de voz",
+        enabledHint: "Habla con tus agentes sin usar las manos",
+      },
+      openai: {
+        apiKey: "Clave de API",
+        apiKeyHint: "Se guarda en el host y no se vuelve a mostrar.",
+        keyPlaceholder: "sk-...",
+        savedKeyPlaceholder: "Guardada",
+        missingKey: "Falta la clave de API",
+        baseUrl: "URL base",
+        baseUrlHint: "Para servidores compatibles con OpenAI. Déjala vacía para usar OpenAI.",
+      },
+      models: {
+        loading: "Cargando modelos...",
+        loadError: "No se pudieron cargar los modelos locales",
+        none: "No hay modelos disponibles",
+        downloaded: "Descargado",
+        inUse: "En uso",
+        recommended: "Recomendado",
+        download: "Descargar",
+        downloadAction: "Descargar {{label}}",
+        downloading: "Descargando...",
+        downloadingPercent: "Descargando {{percent}} %",
+        extracting: "Extrayendo...",
+        delete: "Eliminar",
+        deleteAction: "Eliminar {{label}}",
+        deleteTitle: "¿Eliminar {{label}}?",
+        deleteMessage: "Esto libera {{size}}. Puedes volver a descargarlo más tarde.",
+        languages: "Idiomas de {{label}}",
+        moreLanguages: "{{languages}} y {{count}} más",
+      },
+    },
     general: {
       title: "General",
       sending: "Envío",
@@ -2718,6 +2793,11 @@ export const es: TranslationResources = {
       },
       agents: {
         unavailable: "Connect to this host to manage agents",
+        idleRuntimeCleanup: {
+          title: "Liberar agentes inactivos",
+          hint: "Libera memoria tras una hora de inactividad.",
+          info: "Detiene el proceso del agente y conserva la conversación. Envía un mensaje para reanudarla.\n\nEl trabajo activo, las notificaciones pendientes y las comprobaciones de seguridad del proveedor impiden la limpieza.",
+        },
       },
       workspaces: {
         unavailable: "Connect to this host to manage workspaces",