Merge branch 'main' into fix/plugin-type-walk-node-builtins

2026-11-03 23:23:21 +00:00 · 2026-10-17 19:05:08 +02:00
parent 555191f95d a4eb0adcf6
commit a9a140f6ea
58 changed files with 2743 additions and 1447 deletions
@@ -8,7 +8,7 @@ Native selection belongs to the library's text view. Keep an assistant message i

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

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

 ## Engine constraints

@@ -105,6 +105,37 @@ async function seedAgentWithFileLink(input: LinkedFile) {
 }

 test.describe("CodeMirror workspace file editing", () => {
+  test("opens explicit screenshot links and explains missing files", async ({ page }) => {
+    const session = await seedMockAgentWorkspace({
+      repoPrefix: "screenshot-markdown-link-",
+      title: "Screenshot file links",
+      initialPrompt: "Show screenshots",
+      featureValues: {
+        mockAssistantResponse:
+          "[Capture](.dev/tablet-review/capture.png) [Missing capture](.dev/tablet-review/missing.png)",
+      },
+    });
+    try {
+      await mkdir(path.join(session.cwd, ".dev/tablet-review"), { recursive: true });
+      await writeFile(path.join(session.cwd, ".dev/tablet-review/capture.png"), RED_PIXEL);
+      await openAgentRoute(page, session);
+      await test.step("Open the linked screenshot", async () => {
+        await openAssistantMarkdownLink(page, "Capture");
+        await expectFileTabOpen(page, ".dev/tablet-review/capture.png");
+        await expect(page.getByTestId("image-file-preview-canvas")).toBeVisible();
+      });
+      await test.step("Explain why the missing screenshot cannot open", async () => {
+        await returnToAssistant(page, session.agentId);
+        await openAssistantMarkdownLink(page, "Missing capture");
+        await expectFileTabOpen(page, ".dev/tablet-review/missing.png");
+        await expect(page.getByText(/ENOENT/)).toBeVisible();
+        await expect(page.getByRole("button", { name: "Retry", exact: true })).toBeVisible();
+      });
+    } finally {
+      await session.cleanup();
+    }
+  });
+
  test("opens the non-ASCII file named by an assistant markdown link", async ({ page }) => {
    const session = await seedMockAgentWorkspace({
      repoPrefix: "encoded-markdown-link-",
@@ -2,6 +2,63 @@ import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { expect, test, type Page } from "../support/fixtures";
 import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import {
+  expectFileTabOpen,
+  openFileExplorer,
+  openFileFromExplorer,
+} from "../support/helpers/file-explorer";
+import { ensureWorkspaceAgentPaneVisible } from "../support/helpers/workspace-tabs";
+
+async function openMarkdownPreview(page: Page) {
+  await openFileExplorer(page);
+  await openFileFromExplorer(page, "README.md");
+  await expectFileTabOpen(page, "README.md");
+  await page
+    .getByTestId("file-panel-bar")
+    .getByRole("button", { name: "Preview", exact: true })
+    .click();
+  await ensureWorkspaceAgentPaneVisible(page);
+}
+
+async function followPreviewLink(page: Page, name: string) {
+  await page
+    .getByTestId("workspace-file-pane")
+    .filter({ visible: true })
+    .getByRole("link", { name, exact: true })
+    .click();
+}
+
+test("Markdown preview folder links reveal Files and file links still open a file", async ({
+  page,
+  withWorkspace,
+}) => {
+  const workspace = await withWorkspace({ prefix: "preview-folder-links-" });
+  await mkdir(path.join(workspace.repoPath, "docs/guides"), { recursive: true });
+  await writeFile(
+    path.join(workspace.repoPath, "docs/guides/guide.md"),
+    "# Folder link destination\n",
+  );
+  await writeFile(
+    path.join(workspace.repoPath, "README.md"),
+    "[Dot](./docs/guides)\n\n[Bare](docs/guides)\n\n[Guide](docs/guides/guide.md)\n",
+  );
+  await workspace.navigateTo();
+
+  await openMarkdownPreview(page);
+  await followPreviewLink(page, "Guide");
+  await expect(page.getByText("Folder link destination", { exact: true })).toBeVisible();
+
+  await openMarkdownPreview(page);
+  await followPreviewLink(page, "Dot");
+  await expectFolderContents(page);
+  await expect(page.getByTestId("workspace-tab-file_docs/guides")).toHaveCount(0);
+
+  await openMarkdownPreview(page);
+  await followPreviewLink(page, "Bare");
+  await expectFolderContents(page);
+  await expect(page.getByTestId("workspace-tab-file_docs/guides")).toHaveCount(0);
+  await page.screenshot({ path: test.info().outputPath("preview-folder-links.png") });
+});

 async function openReportedFolderLink(page: Page, name: string) {
  const link = page.getByTestId("assistant-message").getByRole("link", { name, exact: true });
@@ -16,13 +73,21 @@ async function expectFolderContents(page: Page) {
  ).toBeVisible();
 }

-for (const folder of ["docs/guides", "docs/guides/", "docs/reports.v1", ".github/workflows"]) {
+for (const folder of [
+  "./docs/guides",
+  "./docs/guides/",
+  "./docs/reports.v1",
+  "./.github/workflows",
+  "docs/guides",
+  "docs/guides/",
+  "docs/指南",
+]) {
  test(`chat folder link opens folder contents: ${folder}`, async ({ page }) => {
    const session = await seedMockAgentWorkspace({
      repoPrefix: "folder-link-repro-",
      title: "Folder link reproduction",
      initialPrompt: "Show the folder link",
-      featureValues: { mockAssistantResponse: `[Open folder](./${folder})` },
+      featureValues: { mockAssistantResponse: `[Open folder](${folder})` },
    });
    try {
      await mkdir(path.join(session.cwd, folder), { recursive: true });
@@ -2,9 +2,7 @@ import { test, expect } from "../support/fixtures";
 import type { Locator } from "@playwright/test";
 import {
  gotoWorkspace,
-  assertNewChatTileVisible,
  assertNewTabMenuTriggerVisible,
-  assertSingleNewTabButton,
  openNewTabMenuWithShortcut,
  clickNewChat,
  clickNewTerminal,
@@ -126,6 +124,7 @@ test.describe("Tab creation", () => {
    page,
  }) => {
    await gotoWorkspace(page, workspace.workspaceId);
+    await assertNewTabMenuTriggerVisible(page);
    await pressNewTabShortcut(page);
    const newTabs = page
      .locator('[data-testid^="workspace-tab-tab_"]')
@@ -190,11 +189,18 @@ test.describe("Tab creation", () => {
    await expect(agent).toBeFocused();
  });

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

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

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

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

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

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

 // ═══════════════════════════════════════════════════════════════════════════
@@ -339,37 +343,4 @@ test.describe("Tab transitions (no flash)", () => {
    expect(new Set(snapshots.map(tabIdentityKey)).size).toBeLessThanOrEqual(2);
    await expectTabTitleFits(page, "New Agent", { min: 64, max: 160 });
  });
-
-  test("Terminal transition completes within visual budget", async ({ page }) => {
-    test.setTimeout(30_000);
-    await gotoWorkspace(page, workspace.workspaceId);
-
-    const elapsed = await measureTileTransition(
-      page,
-      () => clickNewTerminal(page),
-      terminalSurfaceLocator(page),
-      20_000,
-    );
-
-    // Terminal surface should appear within a reasonable budget.
-    // Note: terminal creation involves a server round-trip, so we allow more time
-    // than a pure in-memory transition, but it should still be well under 5 seconds.
-    expect(elapsed).toBeLessThan(5_000);
-  });
-
-  test("New agent tab click shows composer without flash", async ({ page }) => {
-    await gotoWorkspace(page, workspace.workspaceId);
-
-    const elapsed = await measureTileTransition(
-      page,
-      () => clickNewChat(page),
-      composerLocator(page),
-      10_000,
-    );
-
-    // Draft creation is fully in-memory — should be fast
-    // We use a generous budget here because CI can be slow, but the key assertion
-    // is that no blank/flash frame appears (tested above).
-    expect(elapsed).toBeLessThan(3_000);
-  });
 });
@@ -1,3 +1,4 @@
+import { existsSync } from "node:fs";
 import overviewCorpus from "../../../protocol/tests/fixtures/plugin-overview.json";
 import { pluginRequirements } from "../support/helpers/plugin-fixture";
 import { execFileSync } from "node:child_process";
@@ -316,6 +317,47 @@ export default function contribute(plugin) {
  return directory;
 }

+/** Build command that holds the plugin lifecycle queue until the test writes the release file. */
+const gatedBuildCommand = [
+  'const fs = require("node:fs");',
+  'fs.writeFileSync(process.argv[1], "started");',
+  "const wait = () => {",
+  "  if (fs.existsSync(process.argv[2])) return;",
+  "  setTimeout(wait, 50);",
+  "};",
+  "wait();",
+].join("\n");
+
+async function createGatedBuildRepository(
+  root: string,
+  gate: { started: string; release: string },
+): Promise<string> {
+  const repository = path.join(root, "gated-repository");
+  await mkdir(repository);
+  await writeFile(
+    path.join(repository, "paseo-plugin.json"),
+    JSON.stringify({
+      id: "gated-build-plugin",
+      description: "Holds the plugin lifecycle queue while its build waits",
+      requirements: pluginRequirements,
+      build: [[process.execPath, "-e", gatedBuildCommand, gate.started, gate.release]],
+    }),
+  );
+  await writeFile(path.join(repository, "index.client.tsx"), pluginSource("Gated build plugin"));
+  execFileSync("git", ["init", "-b", "main"], { cwd: repository, stdio: "ignore" });
+  execFileSync("git", ["config", "user.name", "Paseo Tests"], {
+    cwd: repository,
+    stdio: "ignore",
+  });
+  execFileSync("git", ["config", "user.email", "paseo@example.test"], {
+    cwd: repository,
+    stdio: "ignore",
+  });
+  execFileSync("git", ["add", "-A"], { cwd: repository, stdio: "ignore" });
+  execFileSync("git", ["commit", "-m", "initial"], { cwd: repository, stdio: "ignore" });
+  return repository;
+}
+
 async function installFailedPlugin(
  page: Page,
  client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>,
@@ -680,3 +722,155 @@ async function installPluginWithUntrustedDescription(
  );
  await environment.client.installPluginSource({ source: directory });
 }
+
+/** Waits for the reload request and the daemon's answer on the wire, so a scenario can measure it. */
+function observePluginReload(page: Page) {
+  const requests: number[] = [];
+  const responses: number[] = [];
+  const isSessionMessage = (payload: unknown, type: string): boolean => {
+    if (typeof payload !== "string") return false;
+    try {
+      const envelope = JSON.parse(payload) as { type?: unknown; message?: { type?: unknown } };
+      const message = envelope.type === "session" ? envelope.message : envelope;
+      return message?.type === type;
+    } catch {
+      return false;
+    }
+  };
+  page.on("websocket", (socket) => {
+    // The reload request travels client -> daemon (outbound); the answer comes back inbound.
+    socket.on("framesent", ({ payload }) => {
+      if (isSessionMessage(payload, "plugin.reload.request")) requests.push(Date.now());
+    });
+    socket.on("framereceived", ({ payload }) => {
+      if (isSessionMessage(payload, "plugin.reload.response")) responses.push(Date.now());
+    });
+  });
+  return {
+    waitForRequest: () => expect.poll(() => requests.length, { timeout: 30_000 }).toBe(1),
+    waitForResponse: () => expect.poll(() => responses.length, { timeout: 120_000 }).toBe(1),
+    requestedAt: () => requests[0]!,
+    requestCount: () => requests.length,
+  };
+}
+
+/** Starts a gated git install that holds the daemon's plugin lifecycle queue until it is released. */
+async function holdPluginLifecycleQueue(
+  client: PluginEnvironment["client"],
+  root: string,
+): Promise<{ release: () => Promise<void>; settle: () => Promise<void> }> {
+  const gate = {
+    started: path.join(root, "build-started"),
+    release: path.join(root, "build-release"),
+  };
+  const repository = await createGatedBuildRepository(root, gate);
+  const install = client.installPluginSource({ source: `git:${pathToFileURL(repository).href}` });
+  // The marker wait below can outlive an early failure: a refused preparation, a dropped
+  // connection, or a build command that exits before writing its marker. Handle that rejection now
+  // so it never surfaces as an unhandled one, and drain the same promise in finish().
+  const installDrained = install.catch(() => undefined);
+  // Every path releases the gate and drains the install: a build still polling for its gate holds
+  // the daemon's plugin lifecycle queue open, and the fixture's own plugin removal would stall.
+  const finish = async () => {
+    await writeFile(gate.release, "go").catch(() => undefined);
+    await installDrained;
+  };
+  try {
+    // Whichever comes first decides the scenario: the build reports that it started, or the setup
+    // fails with the daemon's own error instead of a bare marker timeout.
+    await Promise.race([
+      expect.poll(() => existsSync(gate.started), { timeout: 30_000 }).toBe(true),
+      install,
+    ]);
+  } catch (error) {
+    // Setup that never reached the build must not hand the caller a queue it cannot settle.
+    await finish();
+    throw error;
+  }
+  return {
+    release: () => writeFile(gate.release, "go"),
+    settle: finish,
+  };
+}
+
+function pluginRowActions(page: Page, pluginId: string) {
+  return page.getByRole("button", { name: `Actions for ${pluginId}`, exact: true });
+}
+
+async function expectPluginRowPending(page: Page, pluginId: string): Promise<void> {
+  await expect(pluginRowActions(page, pluginId)).toBeDisabled();
+}
+
+async function expectPluginRowSettled(page: Page, pluginId: string): Promise<void> {
+  await expect(pluginRowActions(page, pluginId)).toBeEnabled();
+  await expect(page.getByLabel(`${pluginId} running`)).toBeVisible();
+}
+
+async function capturePluginSurface(page: Page, testInfo: TestInfo, name: string): Promise<void> {
+  await page.screenshot({
+    path: testInfo.outputPath(name),
+    fullPage: true,
+    animations: "disabled",
+  });
+}
+
+/** The wait under test is the daemon's lifecycle queue, so the scenario has to spend real time. */
+async function waitPastFormerReloadDeadline(page: Page, requestedAt: number): Promise<void> {
+  const remaining = 66_000 - (Date.now() - requestedAt);
+  if (remaining > 0) await page.waitForTimeout(remaining);
+}
+
+test("keeps Reload pending past a minute while the plugin queue is busy", async ({
+  page,
+  pluginEnvironment,
+}, testInfo) => {
+  test.setTimeout(180_000);
+  const { client, directory } = pluginEnvironment;
+  const pluginDirectory = await createDirectoryPlugin(
+    directory,
+    "e2e-plugin",
+    "Exercises the complete local plugin lifecycle",
+    "Plugin v1",
+  );
+
+  // Observe before the app loads: its daemon socket comes up with the page.
+  const reload = observePluginReload(page);
+  await gotoAppShell(page);
+  await openPluginSettings(page);
+  // Plugins on is a precondition here, not the subject: set it through the daemon instead of the
+  // switch, whose transient "Plugins enabled" confirmation this scenario must not depend on.
+  await client.patchDaemonConfig({ pluginsEnabled: true });
+  await client.installPluginSource({ source: pluginDirectory });
+  await expectPluginRowSettled(page, "e2e-plugin");
+
+  const queue = await holdPluginLifecycleQueue(client, directory);
+  try {
+    await selectPluginAction(page, "e2e-plugin", "Reload");
+    await reload.waitForRequest();
+    // Pending: the row's actions stay disabled, so a second reload cannot be submitted.
+    await expectPluginRowPending(page, "e2e-plugin");
+    await capturePluginSurface(page, testInfo, "plugin-reload-pending.png");
+
+    await waitPastFormerReloadDeadline(page, reload.requestedAt());
+
+    // Past the former deadline the reload is still pending, the row shows its previous state, and
+    // no timeout error reached the surface.
+    await expectPluginRowPending(page, "e2e-plugin");
+    await expect(page.getByLabel("e2e-plugin running")).toBeVisible();
+    await expect(page.getByTestId("plugin-management-feedback")).toHaveCount(0);
+    await capturePluginSurface(page, testInfo, "plugin-reload-past-deadline.png");
+
+    await queue.release();
+    // The daemon's answer only arrives once the plugin really started again; a request timeout
+    // would have shown up as feedback during the wait above.
+    await reload.waitForResponse();
+    expect(reload.requestCount()).toBe(1);
+    await expect(page.getByTestId("plugin-management-feedback")).toContainText(
+      "Reloaded e2e-plugin",
+    );
+    await expectPluginRowSettled(page, "e2e-plugin");
+    await capturePluginSurface(page, testInfo, "plugin-reload-completed.png");
+  } finally {
+    await queue.settle();
+  }
+});
@@ -223,7 +223,10 @@ test.describe("Projects settings", () => {
    }
  });

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

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

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

-  test("user renames a project from the edit sheet", async ({ page, editableProject }) => {
-    await openProjects(page);
-    await openProjectSettings(page, editableProject.name);
-    await openProjectEditSheet(page);
-    await fillProjectName(page, "Renamed project");
-    await saveProjectEdits(page);
-
-    await expectProjectEditSaved(page);
-    await expectProjectTitle(page, "Renamed project");
-  });
-
-  test("reopening the edit sheet seeds from the saved project", async ({
+  test("renames a project, reopens the saved edit sheet, and adds an icon", async ({
    page,
    editableProject,
  }) => {
@@ -279,26 +278,26 @@ test.describe("Projects settings", () => {
    await openProjectEditSheet(page);
    await fillProjectName(page, "Renamed project");
    await saveProjectEdits(page);
+
    await expectProjectEditSaved(page);
+    await expectProjectTitle(page, "Renamed project");

-    await openProjectEditSheet(page);
-
-    await expectProjectEditName(page, "Renamed project");
-    await expectProjectEditsSaveDisabled(page);
-  });
-
-  test("user picks a custom project icon from a file", async ({ page, editableProject }) => {
-    await openProjects(page);
-    await openProjectSettings(page, editableProject.name);
-    await openProjectEditSheet(page);
-    await chooseProjectIconImage(page, {
-      name: "logo.png",
-      mimeType: "image/png",
-      buffer: PNG_1X1,
+    await test.step("reopening seeds the saved name with no unsaved changes", async () => {
+      await openProjectEditSheet(page);
+      await expectProjectEditName(page, "Renamed project");
+      await expectProjectEditsSaveDisabled(page);
    });
-    await saveProjectEdits(page);

-    await expectProjectEditSaved(page);
+    await test.step("an icon can be saved without another name change", async () => {
+      await chooseProjectIconImage(page, {
+        name: "logo.png",
+        mimeType: "image/png",
+        buffer: PNG_1X1,
+      });
+      await saveProjectEdits(page);
+      await expectProjectEditSaved(page);
+      await expectProjectTitle(page, "Renamed project");
+    });
  });

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

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

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

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

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

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

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

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

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

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

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

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

 function terminalSurface(page: Page) {
@@ -30,3 +31,35 @@ export async function createAgentChatFromLauncher(page: Page): Promise<void> {
  await expect(composerInput(page)).toBeEditable({ timeout: 15_000 });
  await expect(page.getByTestId("agent-loading")).toHaveCount(0);
 }
+
+export async function submitAgentChatAndExpectCwd(
+  page: Page,
+  workspace: { workspaceId: string; repoPath: string },
+): Promise<void> {
+  const client = await connectSeedClient();
+  try {
+    const message = "cwd draft create";
+    await composerInput(page).fill(message);
+    await composerInput(page).press("Enter");
+    await expect(page.getByText(message, { exact: true }).first()).toBeVisible({
+      timeout: 30_000,
+    });
+    await expect(page.locator('[data-testid^="workspace-tab-agent_"]').first()).toBeVisible({
+      timeout: 30_000,
+    });
+    await expect
+      .poll(
+        async () => {
+          const agents = await client.fetchAgents({ scope: "active" });
+          return agents.entries
+            .map((entry) => entry.agent)
+            .filter((agent) => agent.workspaceId === workspace.workspaceId)
+            .map((agent) => ({ workspaceId: agent.workspaceId, cwd: agent.cwd }));
+        },
+        { timeout: 30_000 },
+      )
+      .toEqual([{ workspaceId: workspace.workspaceId, cwd: workspace.repoPath }]);
+  } finally {
+    await client.close();
+  }
+}
@@ -23,6 +23,8 @@ const INLINE_PAREN_LINE_SUFFIX = /^(.+?)\(([0-9]+)(?:,[0-9]+)?(?:-([0-9]+)(?:,[0
 const INLINE_WORD_LINE_SUFFIX = /^(.+?)\s+lines?\s+([0-9]+)(?:-([0-9]+))?$/i;
 export interface AssistantHrefParseOptions {
  workspaceRoot?: string;
+  /** Authored links identify a file; only inferred text needs filename heuristics. */
+  explicitLink?: boolean;
  /**
   * True only when `value` is a markdown href — the renderer percent-encodes
   * non-ASCII and space characters, so the path must be decoded. Raw path
@@ -234,7 +236,7 @@ export function classifyAssistantFileLink(
    return null;
  }

-  if (isAmbiguousWorkspaceCandidate(trimmed, target, options)) {
+  if (!options.explicitLink && isAmbiguousWorkspaceCandidate(trimmed, target, options)) {
    return {
      kind: "ambiguousFileCandidate",
      target,
@@ -278,6 +280,7 @@ export function parseAssistantFileLink(
  const relativeTarget = parseWorkspaceRelativeFileLink(trimmed, {
    workspaceRoot: options.workspaceRoot,
    decodeHref: options.decodeHref,
+    explicitLink: options.explicitLink,
  });
  if (relativeTarget) {
    return relativeTarget;
@@ -411,7 +414,7 @@ function parseWorkspaceRelativeFileLink(

 function parseLocalPathParts(
  value: string,
-  options: Pick<AssistantHrefParseOptions, "decodeHref"> = {},
+  options: Pick<AssistantHrefParseOptions, "decodeHref" | "explicitLink"> = {},
 ): {
  path: string;
  lines: Pick<InlinePathTarget, "lineStart" | "lineEnd">;
@@ -437,7 +440,7 @@ function parseLocalPathParts(
    if (options.decodeHref) {
      pathPart = safeDecodeURIComponent(pathPart);
    }
-    if (!isPlausibleAssistantLocalPath(pathPart)) {
+    if (!options.explicitLink && !isPlausibleAssistantLocalPath(pathPart)) {
      return null;
    }
    return {
@@ -458,7 +461,7 @@ function parseLocalPathParts(
    decodedBeforeHash = safeDecodeURIComponent(beforeHash);
  }
  const plausiblePath = parseInlinePathToken(decodedBeforeHash)?.path ?? decodedBeforeHash;
-  if (!isPlausibleAssistantLocalPath(plausiblePath)) {
+  if (!options.explicitLink && !isPlausibleAssistantLocalPath(plausiblePath)) {
    return null;
  }

@@ -18,6 +18,63 @@ const CONTEXT: AssistantFileLinkContext = {
  workspaceRoot: "/Users/test/project",
 };

+it.each(["docs/guides", "docs/guides/", "docs/%E6%8C%87%E5%8D%97"])(
+  "resolves an explicit extensionless folder href: %s",
+  (href) => {
+    expect(classifyForResolution({ href }, CONTEXT)).toMatchObject({
+      kind: "resolved",
+      value: {
+        kind: "file",
+        target: { path: `${CONTEXT.workspaceRoot}/${decodeURIComponent(href).replace(/\/$/, "")}` },
+      },
+    });
+  },
+);
+
+it.each(["docs/guides", "origin/main"])("leaves extensionless inline code alone: %s", (text) => {
+  expect(classifyForResolution({ href: text, text, sourceType: "inline-code" }, CONTEXT)).toEqual({
+    kind: "resolved",
+    value: { kind: "ignored" },
+  });
+});
+
+it.each([{ markup: "linkify" }, { sourceInfo: "auto" }])(
+  "keeps auto-recognized extensionless text ignored: %j",
+  (origin) => {
+    expect(
+      classifyForResolution({ href: "docs/guides", text: "docs/guides", ...origin }, CONTEXT),
+    ).toEqual({
+      kind: "resolved",
+      value: { kind: "ignored" },
+    });
+  },
+);
+
+it.each(["docs/guides?view=all"])(
+  "does not turn URL-like hrefs into workspace paths: %s",
+  (href) => {
+    expect(classifyForResolution({ href }, CONTEXT)).toEqual({
+      kind: "resolved",
+      value: { kind: "ignored" },
+    });
+  },
+);
+
+it.each([
+  ".dev/tablet-review/tablet-agent-draft.png",
+  "images/capture.jpg",
+  "downloads/archive.custom",
+  "assets/LICENSE",
+  "example.com/guides",
+  "capture.png",
+  "missing.png",
+])("opens explicit file link %s without filename guessing", (href) => {
+  expect(classifyForResolution({ href }, CONTEXT)).toMatchObject({
+    kind: "resolved",
+    value: { kind: "file", target: { path: `${CONTEXT.workspaceRoot}/${href}` } },
+  });
+});
+
 it("opens the existing non-ASCII file named by a rendered markdown link", async () => {
  const workspaceRoot = await mkdtemp(path.join(tmpdir(), "assistant-file-link-"));
  try {
@@ -117,6 +117,7 @@ export function classifyForResolution(
  const classification = classifyAssistantFileLink(token, {
    workspaceRoot: context.workspaceRoot,
    decodeHref: tokenInfo.fromHref,
+    explicitLink: source.sourceType !== "inline-code" && !isLinkifiedSource(source),
  });
  if (!classification) {
    return { kind: "resolved", value: { kind: "ignored" } };
@@ -21,8 +21,14 @@ import { Gesture } from "react-native-gesture-handler";
 import Animated, { runOnJS, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
 import { scheduleOnRN } from "react-native-worklets";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { StyleSheet, useUnistyles, withUnistyles } from "react-native-unistyles";
 import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
+import { HeaderToggleButton } from "@/components/headers/header-toggle-button";
+import {
+  IconButtonChromeProvider,
+  iconButtonChromeGlyphSize,
+  mutedIconColorMapping,
+} from "@/components/ui/icon-button-chrome";
 import { resolveDesktopSidebarWidth } from "@/components/desktop-sidebar-layout";
 import {
  SIDEBAR_RESIZE_ACTIVATION_OFFSET,
@@ -62,6 +68,7 @@ import { usePanelStore } from "@/stores/panel-store";
 import { useOwnsWindowChromeCorner, WindowChromeSafeArea } from "@/utils/desktop-window";
 import { useCloseAgentListGesture } from "@/mobile-panels/gestures";
 import { MobilePanelOverlay } from "@/mobile-panels/presentation";
+import type { ShortcutKey } from "@/utils/format-shortcut";
 import { buildSettingsAddHostRoute, buildSettingsRoute } from "@/utils/host-routes";
 import { openHostOverview } from "@/navigation/settings-navigation";
 import {
@@ -74,6 +81,8 @@ import { SidebarAgentListSkeleton } from "./sidebar-agent-list-skeleton";
 import { SidebarCalloutSlot } from "./sidebar-callout-slot";
 import { SidebarWorkspaceList } from "./sidebar-workspace-list";

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

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

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

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

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

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

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

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

  return (
    <View ref={groupRef} collapsable={false} style={style}>
-      {visibleItems.map((item) => {
-        if (item.kind === "plugin") {
-          return (
-            <PluginSidebarItem
-              key={item.key}
-              group={item.group}
-              section="header"
-              fallbackAnchorRef={groupRef}
-              onBeforeNavigate={onBeforeNavigate}
-            />
-          );
-        }
-        const Row = BUILTIN_ROWS[item.id];
-        return <Row key={item.key} onBeforeNavigate={onBeforeNavigate} />;
-      })}
+      {firstRowTrailing ? (
+        <View style={styles.firstRow}>
+          <View style={styles.firstRowItem}>{firstRow}</View>
+          {firstRowTrailing}
+        </View>
+      ) : (
+        firstRow
+      )}
+      {restRows}
    </View>
  );
 }
@@ -179,3 +192,14 @@ const BUILTIN_ROWS: Record<BuiltinSidebarNavId, ComponentType<SidebarNavRowProps
  search: SidebarSearchRow,
  schedules: SidebarSchedulesRow,
 };
+
+const styles = StyleSheet.create({
+  firstRow: {
+    flexDirection: "row",
+    alignItems: "center",
+  },
+  firstRowItem: {
+    flex: 1,
+    minWidth: 0,
+  },
+});
@@ -2226,7 +2226,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
  },
  // Lifts the composer off the chat it sits under on phones.
  inputWrapperCompact: {
-    boxShadow: "0px 4px 16px rgba(0, 0, 0, 0.2)",
+    ...theme.shadow.sm,
  },
  // Dotted says "this surface is the same box, but there is nothing to type
  // into it" without swapping the border colour, which reads as an error state.
@@ -1334,8 +1334,9 @@ export const ar: TranslationResources = {
    },
    fields: {
      project: "المشروع",
-      base: "الأساس",
+      branch: "الفرع",
      baseNotApplicable: "غير قابل للتطبيق",
+      host: "المضيف",
    },
    titlePlaceholder: "العنوان (اختياري)",
    errors: {
@@ -1342,8 +1342,9 @@ export const en = {
    },
    fields: {
      project: "Project",
-      base: "Base",
+      branch: "Branch",
      baseNotApplicable: "Not applicable",
+      host: "Host",
    },
    titlePlaceholder: "Title (optional)",
    errors: {
@@ -1370,8 +1370,9 @@ export const es: TranslationResources = {
    },
    fields: {
      project: "Proyecto",
-      base: "Base",
+      branch: "Rama",
      baseNotApplicable: "No aplicable",
+      host: "Host",
    },
    titlePlaceholder: "Título (opcional)",
    errors: {
@@ -1363,8 +1363,9 @@ export const fr: TranslationResources = {
    },
    fields: {
      project: "Projet",
-      base: "Base",
+      branch: "Branche",
      baseNotApplicable: "Non applicable",
+      host: "Hôte",
    },
    titlePlaceholder: "Titre (facultatif)",
    errors: {
@@ -1348,8 +1348,9 @@ export const ja: TranslationResources = {
    },
    fields: {
      project: "プロジェクト",
-      base: "ベース",
+      branch: "ブランチ",
      baseNotApplicable: "該当なし",
+      host: "ホスト",
    },
    titlePlaceholder: "タイトル（任意）",
    errors: {
@@ -1341,8 +1341,9 @@ export const ko: TranslationResources = {
    },
    fields: {
      project: "프로젝트",
-      base: "기준",
+      branch: "브랜치",
      baseNotApplicable: "해당 없음",
+      host: "호스트",
    },
    titlePlaceholder: "제목(선택 사항)",
    errors: {
@@ -1360,8 +1360,9 @@ export const ptBR: TranslationResources = {
    },
    fields: {
      project: "Projeto",
-      base: "Base",
+      branch: "Branch",
      baseNotApplicable: "Não aplicável",
+      host: "Host",
    },
    titlePlaceholder: "Título (opcional)",
    errors: {
@@ -1352,8 +1352,9 @@ export const ru: TranslationResources = {
    },
    fields: {
      project: "Проект",
-      base: "Базовая ветка",
+      branch: "Ветка",
      baseNotApplicable: "Неприменимо",
+      host: "Хост",
    },
    titlePlaceholder: "Заголовок (необязательно)",
    errors: {
@@ -1323,8 +1323,9 @@ export const zhCN: TranslationResources = {
    },
    fields: {
      project: "项目",
-      base: "基线",
+      branch: "分支",
      baseNotApplicable: "不适用",
+      host: "主机",
    },
    titlePlaceholder: "标题（可选）",
    errors: {
@@ -1207,6 +1207,60 @@ describe("DirectorySync session readiness", () => {
    directory.dispose();
  });

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

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

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

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

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

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

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

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

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

 const styles = StyleSheet.create((theme) => ({
-  iconBox: {
-    width: theme.iconSize.md,
-    height: theme.iconSize.md,
-    alignItems: "center",
-    justifyContent: "center",
-    flexShrink: 0,
-  },
-  label: {
-    minWidth: 0,
-    fontSize: theme.fontSize.base,
-    color: theme.colors.foregroundMuted,
-    flexShrink: 1,
-  },
  tooltipText: {
    fontSize: theme.fontSize.base,
    color: theme.colors.popoverForeground,
  },
-  profileName: {
-    fontSize: theme.fontSize.base,
-    color: theme.colors.foregroundExtraMuted,
-  },
  command: {
    fontFamily: theme.fontFamily.mono,
    fontSize: theme.fontSize.sm,
@@ -0,0 +1,166 @@
+import { useMemo, type ReactElement } from "react";
+import { Text, View } from "react-native";
+import { useTranslation } from "react-i18next";
+import { StyleSheet } from "react-native-unistyles";
+import { ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
+import { Shortcut } from "@/components/ui/shortcut";
+import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
+import { getHostProjectSourceDirectory, type HostProjectListItem } from "@/projects/host-projects";
+import { pickerItemLabel, type PickerItem } from "../../new-workspace-picker-item";
+import { addProjectIcon, branchIcon, folderIcon, ProjectIcon, pullRequestIcon } from "./icons";
+
+interface OptionRowState {
+  option: ComboboxOption;
+  selected: boolean;
+  active: boolean;
+  onPress: () => void;
+}
+
+function IconBox({ children }: { children: ReactElement }): ReactElement {
+  return <View style={styles.iconBox}>{children}</View>;
+}
+
+export function ProjectOption({
+  option,
+  selected,
+  active,
+  onPress,
+  project,
+  iconDataUri,
+  selectedServerId,
+  disabled,
+}: OptionRowState & {
+  project: HostProjectListItem | undefined;
+  iconDataUri: string | null;
+  selectedServerId: string;
+  disabled: boolean;
+}): ReactElement {
+  const leadingSlot = useMemo(
+    () =>
+      project ? (
+        <IconBox>
+          <ProjectIcon
+            projectViewKey={project.viewKey}
+            projectName={project.projectName}
+            iconDataUri={iconDataUri}
+          />
+        </IconBox>
+      ) : undefined,
+    [iconDataUri, project],
+  );
+  if (!project) return <View key={option.id} />;
+  return (
+    <ComboboxItem
+      testID={`new-workspace-project-picker-option-${project.viewKey}`}
+      label={project.projectName}
+      description={
+        getHostProjectSourceDirectory(project, selectedServerId) ?? project.iconWorkingDir
+      }
+      selected={selected}
+      active={active}
+      disabled={disabled}
+      onPress={onPress}
+      leadingSlot={leadingSlot}
+    />
+  );
+}
+
+export function AddProjectOption({ onPress }: { onPress: () => void }): ReactElement {
+  const { t } = useTranslation();
+  const openProjectKeys = useShortcutKeys("new-agent");
+  const shortcut = useMemo(
+    () => (openProjectKeys ? <Shortcut chord={openProjectKeys} /> : null),
+    [openProjectKeys],
+  );
+  return (
+    <ComboboxItem
+      testID="new-workspace-project-picker-add-project"
+      label={t("sidebar.actions.addProject")}
+      onPress={onPress}
+      leadingSlot={addProjectIcon}
+      trailingSlot={shortcut}
+    />
+  );
+}
+
+const worktreeLeading = <IconBox>{branchIcon}</IconBox>;
+const localLeading = <IconBox>{folderIcon}</IconBox>;
+
+export function IsolationOption({
+  option,
+  selected,
+  active,
+  onPress,
+  disabled,
+}: OptionRowState & { disabled: boolean }): ReactElement {
+  return (
+    <ComboboxItem
+      testID={`workspace-create-isolation-${option.id}`}
+      label={option.label}
+      selected={selected}
+      active={active}
+      disabled={disabled}
+      onPress={onPress}
+      leadingSlot={option.id === "worktree" ? worktreeLeading : localLeading}
+    />
+  );
+}
+
+const branchLeading = <IconBox>{branchIcon}</IconBox>;
+const pullRequestLeading = <IconBox>{pullRequestIcon}</IconBox>;
+
+export function RefOption({
+  option,
+  selected,
+  active,
+  onPress,
+  item,
+  disabled,
+}: OptionRowState & { item: PickerItem | undefined; disabled: boolean }): ReactElement {
+  const { t } = useTranslation();
+  const divergenceLabel = item?.kind === "branch" ? item.divergenceLabel : undefined;
+  const trailingSlot = useMemo(
+    () =>
+      divergenceLabel ? <Text style={styles.divergenceLabel}>{divergenceLabel}</Text> : undefined,
+    [divergenceLabel],
+  );
+  if (!item) return <View key={option.id} />;
+
+  const isBranch = item.kind === "branch";
+  return (
+    <ComboboxItem
+      testID={
+        isBranch
+          ? `new-workspace-ref-picker-branch-${item.name}`
+          : `new-workspace-ref-picker-pr-${item.item.number}`
+      }
+      label={pickerItemLabel(item)}
+      description={
+        !isBranch && item.item.baseRefName
+          ? t("newWorkspace.refPicker.intoBase", { baseRef: item.item.baseRefName })
+          : undefined
+      }
+      selected={selected}
+      active={active}
+      disabled={disabled}
+      onPress={onPress}
+      leadingSlot={isBranch ? branchLeading : pullRequestLeading}
+      trailingSlot={trailingSlot}
+      accessibilityLabel={isBranch ? item.accessibilityLabel : undefined}
+    />
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  iconBox: {
+    width: theme.iconSize.md,
+    height: theme.iconSize.md,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  divergenceLabel: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foregroundMuted,
+    fontVariant: ["tabular-nums"],
+  },
+}));
@@ -5,7 +5,7 @@ import { StyleSheet } from "react-native-unistyles";
 import { Button } from "@/components/ui/button";

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

 const styles = StyleSheet.create((theme) => ({
-  compact: {
-    alignItems: "flex-start",
-  },
  // The composer sits spacing[4] in from the dock and leaves spacing[4] below itself; the pill's
  // border lines up with the composer's border.
  wide: {
@@ -1,4 +1,9 @@
-import { AssistantFileLinkResolverProvider, type InlinePathTarget } from "@/assistant-file-links";
+import {
+  AssistantFileLinkResolverProvider,
+  createInlinePathOpener,
+  type InlinePathTarget,
+} from "@/assistant-file-links";
+import { useFileExplorerActions } from "@/hooks/use-file-explorer-actions";
 import {
  WorkspaceComposerEditingSessionsProvider,
  useComposerTabFullscreen,
@@ -203,6 +208,7 @@ import { PluginHeaderButtons } from "@/plugins";
 import {
  createWorkspaceFileTabTarget,
  normalizeWorkspaceFileLocation,
+  type OpenFileDisposition,
  type WorkspaceFileLocation,
  type WorkspaceFileOpenRequest,
 } from "@/workspace/file-open";
@@ -3658,9 +3664,42 @@ function WorkspaceScreenContent({
    </View>
  );

-  const openMarkdownFile = useStableEvent((target: InlinePathTarget) => {
-    handleOpenPreferredAssistantFile({ location: target, parentTabId: activeTabId });
+  const { revealDirectory } = useFileExplorerActions({
+    serverId: normalizedServerId,
+    workspaceId: normalizedWorkspaceId,
+    workspaceRoot: workspaceDirectory,
  });
+  const openMarkdownFile = useStableEvent((location: WorkspaceFileLocation) => {
+    handleOpenPreferredAssistantFile({ location, parentTabId: activeTabId });
+  });
+  const openMarkdownDirectory = useStableEvent((directoryPath: string) => {
+    void revealDirectory(directoryPath);
+    openExplorerSidebarView({
+      isCompact: isMobile,
+      workspaceKey: persistenceKey,
+      checkout: activeExplorerCheckout,
+      view: "files",
+    });
+  });
+  const markdownPathOpener = useMemo(
+    () =>
+      createInlinePathOpener({
+        workspaceRoot: workspaceDirectory ?? "",
+        client,
+        openFile: openMarkdownFile,
+        openDirectory: openMarkdownDirectory,
+      }),
+    [workspaceDirectory, client, openMarkdownFile, openMarkdownDirectory],
+  );
+  useEffect(() => {
+    if (!isRouteFocused) markdownPathOpener.cancel();
+    return () => markdownPathOpener.cancel();
+  }, [markdownPathOpener, isRouteFocused, activeTabId]);
+  const openMarkdownPath = useStableEvent(
+    (target: InlinePathTarget, disposition: OpenFileDisposition) => {
+      if (isRouteFocused) void markdownPathOpener.open(target, disposition);
+    },
+  );

  const renderedWorkspaceScreen = (
    <RenderProfile id="WorkspaceScreenContent">
@@ -3705,7 +3744,7 @@ function WorkspaceScreenContent({
        client={client}
        serverId={normalizedServerId}
        workspaceRoot={workspaceDirectory ?? undefined}
-        onOpenWorkspaceFile={openMarkdownFile}
+        onOpenWorkspaceFile={openMarkdownPath}
        toast={toast}
      >
        {renderedWorkspaceScreen}
@@ -741,7 +741,7 @@ export const darkPureBlackTheme = buildDarkTheme(pureBlackDarkColors);

 const lightShadow = {
  sm: {
-    shadowColor: "rgba(0, 0, 0, 0.02)",
+    shadowColor: "rgba(0, 0, 0, 0.08)",
    shadowOffset: { width: 0, height: 2 },
    shadowRadius: 8,
    elevation: 2,
@@ -2,6 +2,22 @@ import { describe, expect, it } from "vitest";
 import { createCli } from "./cli.js";

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

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

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

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

    // If --no-wait, return immediately
@@ -29,6 +29,116 @@ async function git(cwd: string, args: string[]): Promise<void> {
  await execFileAsync("git", args, { cwd });
 }

+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function waitFor(
+  condition: () => Promise<boolean>,
+  description: string,
+  timeoutMs = 60_000,
+): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (await condition()) return;
+    await sleep(50);
+  }
+  throw new Error(`Timed out waiting for ${description}`);
+}
+
+interface ObservedRequest {
+  type: string;
+  message: Record<string, unknown>;
+  observedAt: number;
+}
+
+/**
+ * Observes real CLI requests while forwarding them to the isolated daemon.
+ *
+ * Requests are recorded where the CLI sends them, so a scenario can measure a wait from the
+ * request boundary instead of from process start.
+ */
+async function startRequestObserver(upstreamPort: number): Promise<{
+  port: number;
+  requests: ObservedRequest[];
+  waitForRequest: (type: string) => Promise<number>;
+  close: () => Promise<void>;
+}> {
+  const server = new WebSocketServer({ host: "127.0.0.1", port: 0 });
+  const requests: ObservedRequest[] = [];
+  server.on("connection", (socket, request) => {
+    const upstream = new WebSocket(`ws://127.0.0.1:${upstreamPort}${request.url}`, {
+      headers: { authorization: request.headers.authorization ?? "" },
+    });
+    const ready = once(upstream, "open");
+    socket.on("message", async (data, isBinary) => {
+      const frame = JSON.parse(data.toString()) as {
+        type?: string;
+        message?: { type?: string } & Record<string, unknown>;
+      };
+      if (frame.type === "session" && typeof frame.message?.type === "string") {
+        requests.push({
+          type: frame.message.type,
+          message: frame.message,
+          observedAt: Date.now(),
+        });
+      }
+      await ready;
+      upstream.send(data, { binary: isBinary });
+    });
+    upstream.on("message", (data, isBinary) => socket.send(data, { binary: isBinary }));
+    socket.on("close", () => upstream.close());
+    upstream.on("close", () => socket.close());
+  });
+  await once(server, "listening");
+  const address = server.address();
+  assert.ok(address && typeof address !== "string");
+  return {
+    port: address.port,
+    requests,
+    waitForRequest: async (type: string) => {
+      await waitFor(
+        async () => requests.some((entry) => entry.type === type),
+        `${type} to reach the daemon`,
+      );
+      return requests.find((entry) => entry.type === type)!.observedAt;
+    },
+    close: async () => {
+      for (const socket of server.clients) socket.close();
+      await promisify(server.close.bind(server))();
+    },
+  };
+}
+
+/** Build command that blocks the plugin lifecycle queue until the test writes the gate file. */
+const gateWaitBuild = [
+  'const fs = require("node:fs");',
+  'fs.writeFileSync(process.argv[1], "started");',
+  "const wait = () => {",
+  "  if (fs.existsSync(process.argv[2])) return;",
+  "  setTimeout(wait, 50);",
+  "};",
+  "wait();",
+].join("\n");
+
+/** Plugin whose every activation appends one line, so a test can count real reactivations. */
+function activationCountingPlugin(logPath: string): string {
+  return [
+    'import { appendFileSync } from "node:fs";',
+    `const activationLog = ${JSON.stringify(logPath)};`,
+    "export default function contribute(plugin: unknown) {",
+    '  appendFileSync(activationLog, "activate\\n");',
+    "  void plugin;",
+    "  return () => undefined;",
+    "}",
+  ].join("\n");
+}
+
+async function countActivations(logPath: string): Promise<number> {
+  const content = await readFile(logPath, "utf8").catch(() => "");
+  return content.split("\n").filter(Boolean).length;
+}
+
 async function main(): Promise<void> {
  const directory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-cli-e2e-"));
  const gitDirectory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-git-cli-e2e-"));
@@ -48,31 +158,11 @@ async function main(): Promise<void> {
    await writeFile(path.join(directory, "index.server.ts"), pluginSource);

    // Observe real CLI requests while forwarding them to the isolated daemon.
-    const proxy = new WebSocketServer({ host: "127.0.0.1", port: 0 });
-    const sources: string[] = [];
-    proxy.on("connection", (socket, request) => {
-      const upstream = new WebSocket(`ws://127.0.0.1:${context.port}${request.url}`, {
-        headers: { authorization: request.headers.authorization ?? "" },
-      });
-      const ready = once(upstream, "open");
-      socket.on("message", async (data, isBinary) => {
-        const message = JSON.parse(data.toString());
-        if (
-          message.type === "session" &&
-          message.message.type === "plugin.source.install.request"
-        ) {
-          sources.push(message.message.source);
-        }
-        await ready;
-        upstream.send(data, { binary: isBinary });
-      });
-      upstream.on("message", (data, isBinary) => socket.send(data, { binary: isBinary }));
-      socket.on("close", () => upstream.close());
-      upstream.on("close", () => socket.close());
-    });
-    await once(proxy, "listening");
-    const address = proxy.address();
-    assert.ok(address && typeof address !== "string");
+    const observer = await startRequestObserver(context.port);
+    const installedSources = () =>
+      observer.requests
+        .filter((entry) => entry.type === "plugin.source.install.request")
+        .map((entry) => entry.message.source);
    const sibling = path.join(context.workDir, "x");
    const caller = path.join(context.workDir, "caller");
    await mkdir(caller);
@@ -96,12 +186,12 @@ async function main(): Promise<void> {
        ["~", context.paseoHome, context.paseoHome, []],
        ["~/.:.", `${context.paseoHome}:.`, context.paseoHome, []],
      ] as const) {
-        sources.length = 0;
+        observer.requests.length = 0;
        const result = await context.paseo(
-          ["plugin", "add", source, ...extraArgs, "--host", `127.0.0.1:${address.port}`, "--json"],
+          ["plugin", "add", source, ...extraArgs, "--host", `127.0.0.1:${observer.port}`, "--json"],
          { cwd: caller },
        );
-        assert.deepEqual(sources, [expectedSource]);
+        assert.deepEqual(installedSources(), [expectedSource]);
        assert.equal(result.exitCode, 0, result.stderr);
        assert.equal(JSON.parse(result.stdout).path, expectedDirectory);
        const removed = await context.paseo(["plugin", "remove", "relative-cli", "--json"]);
@@ -109,17 +199,16 @@ async function main(): Promise<void> {
      }
      // An absolute path belongs to the daemon's platform, which can differ from the CLI's.
      const windowsSource = `C:\\${path.basename(context.workDir)}\\missing:sub`;
-      sources.length = 0;
+      observer.requests.length = 0;
      const missing = await context.paseo(
-        ["plugin", "add", windowsSource, "--host", `127.0.0.1:${address.port}`, "--json"],
+        ["plugin", "add", windowsSource, "--host", `127.0.0.1:${observer.port}`, "--json"],
        { cwd: caller },
      );
-      assert.deepEqual(sources, [windowsSource]);
+      assert.deepEqual(installedSources(), [windowsSource]);
      assert.equal(missing.exitCode, 1);
      assert.match(missing.stderr, /Plugin directory does not exist/);
    } finally {
-      for (const socket of proxy.clients) socket.close();
-      await promisify(proxy.close.bind(proxy))();
+      await observer.close();
    }

    const install = await context.paseo(["plugin", "install", directory, "--json"]);
@@ -242,6 +331,134 @@ async function main(): Promise<void> {
    assert.equal(enable.exitCode, 0, enable.stderr);
    assert.equal(JSON.parse(enable.stdout).status, "running");

+    // A reload that finishes after the client's former one-minute deadline must still report its
+    // real result. The wait is the daemon's own lifecycle queue, so it runs on real wall-clock time.
+    const gateDirectory = await mkdtemp(path.join(tmpdir(), "paseo-plugin-reload-e2e-"));
+    const buildStarted = path.join(gateDirectory, "build-started");
+    const buildGate = path.join(gateDirectory, "build-gate");
+    const activationLog = path.join(gateDirectory, "activations.log");
+    const targetDirectory = path.join(gateDirectory, "slow-reload-target");
+    const slowRepository = path.join(gateDirectory, "slow-build");
+    const reloadObserver = await startRequestObserver(context.port);
+    let slowInstall: ReturnType<typeof context.paseo> | undefined;
+    let slowReload: ReturnType<typeof context.paseo> | undefined;
+    try {
+      await mkdir(targetDirectory);
+      await writeFile(
+        path.join(targetDirectory, "paseo-plugin.json"),
+        JSON.stringify({
+          id: "slow-reload-target",
+          requirements: { paseo: `>=${resolveCliVersion()}` },
+        }),
+      );
+      await writeFile(
+        path.join(targetDirectory, "index.server.ts"),
+        activationCountingPlugin(activationLog),
+      );
+      const targetInstall = await context.paseo(["plugin", "install", targetDirectory, "--json"]);
+      assert.equal(targetInstall.exitCode, 0, targetInstall.stderr);
+      assert.equal(await countActivations(activationLog), 1);
+
+      await mkdir(slowRepository);
+      await git(slowRepository, ["init", "-b", "main"]);
+      await git(slowRepository, ["config", "user.name", "Paseo Tests"]);
+      await git(slowRepository, ["config", "user.email", "paseo@example.test"]);
+      await writeFile(
+        path.join(slowRepository, "paseo-plugin.json"),
+        JSON.stringify({
+          id: "slow-build",
+          requirements: { paseo: `>=${resolveCliVersion()}` },
+          build: [[process.execPath, "-e", gateWaitBuild, buildStarted, buildGate]],
+        }),
+      );
+      await writeFile(path.join(slowRepository, "index.server.ts"), pluginSource);
+      await git(slowRepository, ["add", "-A"]);
+      await git(slowRepository, ["commit", "-m", "blocking build"]);
+
+      // This install holds the plugin lifecycle queue while its build waits for the gate.
+      slowInstall = context.paseo(
+        ["plugin", "add", `git:${pathToFileURL(slowRepository).href}`, "--json"],
+        { timeout: 180_000 },
+      );
+      // A failed launch must not arrive as an unhandled rejection: that ends this direct Node run
+      // before the finally block below releases the build gate. Its result is still asserted.
+      void slowInstall.catch(() => undefined);
+      await waitFor(
+        async () =>
+          readFile(buildStarted, "utf8").then(
+            () => true,
+            () => false,
+          ),
+        "the blocking build to start",
+      );
+
+      slowReload = context.paseo(
+        [
+          "plugin",
+          "reload",
+          "slow-reload-target",
+          "--host",
+          `127.0.0.1:${reloadObserver.port}`,
+          "--json",
+        ],
+        { timeout: 180_000 },
+      );
+      // Same as the install above: a launch failure must not end the run before the cleanup.
+      void slowReload.catch(() => undefined);
+      const reloadRequestedAt = await reloadObserver.waitForRequest("plugin.reload.request");
+
+      // The interim listing is not the reload's outcome: it still reports the plugin running and
+      // no restart has happened while the reload waits behind the queue.
+      const duringReload = await context.paseo(["plugin", "ls", "slow-reload-target", "--json"]);
+      assert.equal(duringReload.exitCode, 0, duringReload.stderr);
+      assert.equal(JSON.parse(duringReload.stdout)[0].status, "running");
+      assert.equal(await countActivations(activationLog), 1);
+
+      const heldMs = Date.now() - reloadRequestedAt;
+      if (heldMs < 66_000) {
+        await sleep(66_000 - heldMs);
+      }
+      await writeFile(buildGate, "go");
+
+      const [buildResult, reloadResult] = await Promise.all([slowInstall, slowReload]);
+      assert.equal(buildResult.exitCode, 0, buildResult.stderr);
+      assert.equal(reloadResult.exitCode, 0, reloadResult.stderr);
+      assert.equal(JSON.parse(reloadResult.stdout).status, "running");
+      assert.equal(await countActivations(activationLog), 2);
+
+      // A plugin that cannot start still fails its reload with the daemon's error.
+      const brokenDirectory = path.join(gateDirectory, "broken-plugin");
+      await mkdir(brokenDirectory);
+      await writeFile(
+        path.join(brokenDirectory, "paseo-plugin.json"),
+        JSON.stringify({
+          id: "broken-reload",
+          requirements: { paseo: `>=${resolveCliVersion()}` },
+        }),
+      );
+      await writeFile(path.join(brokenDirectory, "index.server.ts"), "export default broken !!!");
+      const brokenInstall = await context.paseo(["plugin", "install", brokenDirectory, "--json"]);
+      assert.equal(brokenInstall.exitCode, 1);
+      assert.match(brokenInstall.stderr, /broken-reload|broken|failed/i);
+      const brokenReload = await context.paseo(["plugin", "reload", "broken-reload", "--json"], {
+        timeout: 60_000,
+      });
+      assert.equal(brokenReload.exitCode, 1);
+      assert.match(brokenReload.stderr, /broken-reload|broken|failed/i);
+
+      for (const pluginId of ["slow-reload-target", "slow-build", "broken-reload"]) {
+        const removed = await context.paseo(["plugin", "remove", pluginId, "--json"]);
+        assert.equal(removed.exitCode, 0, removed.stderr);
+      }
+    } finally {
+      // Release the gate, then let the install and the reload settle before their files go: the
+      // build polls for the gate file, so cleanup must not delete it while the child still waits.
+      await writeFile(buildGate, "go").catch(() => undefined);
+      await Promise.all([slowInstall?.catch(() => undefined), slowReload?.catch(() => undefined)]);
+      await reloadObserver.close();
+      await rm(gateDirectory, { recursive: true, force: true });
+    }
+
    const remove = await context.paseo(["plugin", "remove", "cli-e2e", "--json"]);
    assert.equal(remove.exitCode, 0, remove.stderr);
    const removeGit = await context.paseo(["plugin", "remove", "git-cli-e2e", "--json"]);
@@ -1963,6 +1963,200 @@ test("gets a structured plugin log snapshot", async () => {
  ]);
 });

+test("keeps a plugin reload pending past the session RPC deadline", async () => {
+  useHeartbeatClock();
+  try {
+    const mock = createMockTransport();
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_unit_test",
+      logger: createMockLogger(),
+      reconnect: { enabled: false },
+      transportFactory: () => mock.transport,
+    });
+    clients.push(client);
+
+    const connectPromise = client.connect();
+    mock.triggerOpen();
+    await connectPromise;
+
+    const reload = client.reloadPlugin("example");
+    let settled: "pending" | "resolved" | "rejected" = "pending";
+    void reload.then(
+      () => {
+        settled = "resolved";
+        return null;
+      },
+      () => {
+        settled = "rejected";
+        return null;
+      },
+    );
+
+    const request = parseSentFrame(mock.sent[0]);
+    expect(request).toEqual({
+      type: "plugin.reload.request",
+      requestId: expect.any(String),
+      pluginId: "example",
+    });
+
+    // A daemon that reloads for almost two minutes is still reloading, not a failed request.
+    await vi.advanceTimersByTimeAsync(114_034);
+    expect(settled).toBe("pending");
+
+    // Another plugin's reload finishing early must not settle this request.
+    mock.triggerMessage(
+      wrapSessionMessage({
+        type: "plugin.reload.response",
+        payload: {
+          requestId: "req-other-plugin",
+          plugin: { id: "other", path: "/plugins/other", enabled: true, status: "running" },
+        },
+      }),
+    );
+    await vi.advanceTimersByTimeAsync(0);
+    expect(settled).toBe("pending");
+
+    mock.triggerMessage(
+      wrapSessionMessage({
+        type: "plugin.reload.response",
+        payload: {
+          requestId: request.requestId,
+          plugin: { id: "example", path: "/plugins/example", enabled: true, status: "running" },
+        },
+      }),
+    );
+
+    await expect(reload).resolves.toEqual({
+      id: "example",
+      path: "/plugins/example",
+      enabled: true,
+      status: "running",
+    });
+  } finally {
+    vi.useRealTimers();
+  }
+});
+
+test("keeps enable and disable inside the session RPC deadline", async () => {
+  useHeartbeatClock();
+  try {
+    for (const action of ["enable", "disable"] as const) {
+      const mock = createMockTransport();
+      const client = new DaemonClient({
+        url: "ws://test",
+        clientId: "clsk_unit_test",
+        logger: createMockLogger(),
+        reconnect: { enabled: false },
+        transportFactory: () => mock.transport,
+      });
+      clients.push(client);
+
+      const connectPromise = client.connect();
+      mock.triggerOpen();
+      await connectPromise;
+
+      const pending =
+        action === "enable" ? client.enablePlugin("example") : client.disablePlugin("example");
+      let settled = false;
+      void pending.then(
+        () => {
+          settled = true;
+          return null;
+        },
+        () => {
+          settled = true;
+          return null;
+        },
+      );
+
+      expect(parseSentFrame(mock.sent[0])).toEqual({
+        type: `plugin.${action}.request`,
+        requestId: expect.any(String),
+        pluginId: "example",
+      });
+
+      await vi.advanceTimersByTimeAsync(59_999);
+      expect(settled).toBe(false);
+
+      await vi.advanceTimersByTimeAsync(1);
+      await expect(pending).rejects.toThrow("Timeout waiting for message (60000ms)");
+    }
+  } finally {
+    vi.useRealTimers();
+  }
+});
+
+test("reports a plugin reload failure that arrives after the session RPC deadline", async () => {
+  useHeartbeatClock();
+  try {
+    const mock = createMockTransport();
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_unit_test",
+      logger: createMockLogger(),
+      reconnect: { enabled: false },
+      transportFactory: () => mock.transport,
+    });
+    clients.push(client);
+
+    const connectPromise = client.connect();
+    mock.triggerOpen();
+    await connectPromise;
+
+    const reload = client.reloadPlugin("example");
+    const request = parseSentFrame(mock.sent[0]);
+
+    await vi.advanceTimersByTimeAsync(114_034);
+    mock.triggerMessage(
+      wrapSessionMessage({
+        type: "rpc_error",
+        payload: {
+          requestId: request.requestId,
+          requestType: "plugin.reload.request",
+          error: "Request failed: Plugin failed to start: example",
+          code: "handler_error",
+        },
+      }),
+    );
+
+    await expect(reload).rejects.toThrow(
+      "Request failed: Plugin failed to start: example requestType=plugin.reload.request code=handler_error",
+    );
+  } finally {
+    vi.useRealTimers();
+  }
+});
+
+test("rejects a pending plugin reload when the connection closes", async () => {
+  const mock = createMockTransport();
+  const client = new DaemonClient({
+    url: "ws://test",
+    clientId: "clsk_unit_test",
+    logger: createMockLogger(),
+    reconnect: { enabled: false },
+    transportFactory: () => mock.transport,
+  });
+  clients.push(client);
+
+  const connectPromise = client.connect();
+  mock.triggerOpen();
+  await connectPromise;
+
+  const reload = client.reloadPlugin("example");
+  expect(parseSentFrame(mock.sent[0])).toMatchObject({ type: "plugin.reload.request" });
+
+  mock.triggerClose({ code: 1006, reason: "network lost" });
+
+  await expect(reload).rejects.toThrow(/network lost|disconnected|closed/i);
+
+  // Reconnecting must not resend the lost reload: only the caller decides to reload again.
+  const reconnecting = client.connect();
+  mock.triggerOpen();
+  await reconnecting;
+  expect(mock.sent).toEqual([]);
+});
+
 test("keeps waitForAgentUpsert initial fetch inside the requested deadline", async () => {
  useHeartbeatClock();
  const logger = createMockLogger();
@@ -5692,6 +5692,10 @@ export class DaemonClient {
      requestId,
      message: { type: `plugin.${action}.request`, requestId, pluginId },
      responseType: `plugin.${action}.response`,
+      // Reload tears the plugin down and starts it again before the daemon answers, and it queues
+      // behind other plugin lifecycle work. Wait for that answer instead of failing the reload at
+      // the request deadline while the daemon keeps loading it.
+      ...(action === "reload" ? { timeout: 0 } : {}),
    });
    return payload.plugin;
  }
@@ -402,6 +402,8 @@ export interface SetupFinishNotificationParams {
  childAgentId: string;
  callerAgentId: string;
  requireParentOwnership?: boolean;
+  /** Retain pre-dispatch outcomes only when dispatch keeps the existing turn. */
+  dispatchResult?: Promise<PromptDispatchDisposition | false>;
  /** A replacement must observe its new start, not the displaced running snapshot. */
  waitForTurnStart?: boolean;
  logger: Logger;
@@ -466,10 +468,17 @@ interface NotifySafelyOptions {
  permissionRequest?: AgentPermissionRequest;
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -575,6 +575,36 @@ describe("ClaudeAgentClient binary resolution", () => {
    await expect(resolveClaudeCodeVersion()).resolves.toMatch(/^\d+\.\d+\.\d+$/);
  });

+  test("rejects a wrapper command's own version output instead of reading it as Claude Code's", async () => {
+    const wrapperDir = await fs.mkdtemp(path.join(os.tmpdir(), "paseo-claude-version-"));
+    const wrapperPath = path.join(wrapperDir, "wrapper");
+    await fs.writeFile(wrapperPath, 'console.log("cux 0.4.1");\n');
+    try {
+      await expect(
+        resolveClaudeCodeVersion({
+          command: { mode: "replace", argv: [process.execPath, wrapperPath] },
+        }),
+      ).rejects.toThrow("Unable to parse Claude Code version from --version output");
+    } finally {
+      await fs.rm(wrapperDir, { recursive: true, force: true });
+    }
+  });
+
+  test("resolves the version when the command forwards the Claude Code banner", async () => {
+    const wrapperDir = await fs.mkdtemp(path.join(os.tmpdir(), "paseo-claude-version-"));
+    const wrapperPath = path.join(wrapperDir, "wrapper");
+    await fs.writeFile(wrapperPath, 'console.log("2.1.302 (Claude Code)");\n');
+    try {
+      await expect(
+        resolveClaudeCodeVersion({
+          command: { mode: "replace", argv: [process.execPath, wrapperPath] },
+        }),
+      ).resolves.toBe("2.1.302");
+    } finally {
+      await fs.rm(wrapperDir, { recursive: true, force: true });
+    }
+  });
+
  test("loads user, project, and local Claude settings", async () => {
    const queryReturn = vi.fn();
    queryReturn.mockResolvedValue(undefined);
@@ -1839,7 +1839,13 @@ export async function resolveClaudeCodeVersion(
    timeout: 5_000,
    signal,
  });
-  const version = parseClaudeCodeVersion(`${stdout}\n${stderr}`);
+  // A wrapper command (the `command` provider setting) prints its own version here
+  // instead of Claude Code's. Only trust output that identifies itself as Claude Code,
+  // so a wrapper's version can't mis-gate models behind a minimumClaudeCodeVersion.
+  const rawVersionOutput = `${stdout}\n${stderr}`;
+  const version = /\d+\.\d+\.\d+\s+\(Claude Code\)/i.test(rawVersionOutput)
+    ? parseClaudeCodeVersion(rawVersionOutput)
+    : null;
  if (!version) {
    throw new Error("Unable to parse Claude Code version from --version output");
  }
@@ -559,6 +559,33 @@ describe("ClaudeAgentClient.fetchCatalog", () => {
    expect(models.map((model) => model.id)).not.toContain("claude-opus-5[1m]");
    expect(models.map((model) => model.id)).not.toContain("claude-opus-5");
  });
+
+  it("keeps version-gated models when the probe command cannot identify Claude Code", async () => {
+    const configDir = await createClaudeConfigDir({});
+    const wrapperDir = await fs.mkdtemp(path.join(os.tmpdir(), "paseo-claude-wrapper-"));
+    const wrapperPath = path.join(wrapperDir, "wrapper");
+    await fs.writeFile(wrapperPath, 'console.log("cux 0.4.1");\n');
+    try {
+      const client = new ClaudeAgentClient({
+        logger: createTestLogger(),
+        runtimeSettings: {
+          command: { mode: "replace", argv: [process.execPath, wrapperPath] },
+          env: { CLAUDE_CONFIG_DIR: configDir },
+        },
+        discoverModels: async () => [],
+      });
+
+      const { models } = await client.fetchCatalog({
+        scope: "workspace",
+        cwd: configDir,
+        force: false,
+      });
+
+      expect(models.map((model) => model.id)).toContain("claude-opus-5-5");
+    } finally {
+      await fs.rm(wrapperDir, { recursive: true, force: true });
+    }
+  });
 });

 describe("normalizeClaudeRuntimeModelId", () => {
@@ -209,6 +209,10 @@ export async function writeCopilotProviderMode(
  if (!requestsAllowAll) {
    return { handled: false };
  }
+  await context.connection.setSessionMode({
+    sessionId: context.sessionId,
+    modeId: COPILOT_AGENT_MODE_ID,
+  });
  const response = await context.connection.setSessionConfigOption({
    sessionId: context.sessionId,
    configId: COPILOT_ALLOW_ALL_CONFIG_ID,
@@ -0,0 +1,82 @@
+import { beforeAll, describe, expect, test } from "vitest";
+import { spawn } from "node:child_process";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { Readable, Writable } from "node:stream";
+import { ClientSideConnection, ndJsonStream, PROTOCOL_VERSION } from "@agentclientprotocol/sdk";
+
+import { isCommandAvailable } from "../../../executable-resolution/executable-resolution.js";
+import { createTestLogger } from "../../../test-utils/test-logger.js";
+import { terminateWithTreeKill } from "../../../utils/tree-kill.js";
+import { resolveACPModeSelection } from "./acp-agent.js";
+import {
+  COPILOT_ALLOW_ALL_MODE_ID,
+  COPILOT_MODES,
+  writeCopilotProviderMode,
+} from "./copilot-acp-agent.js";
+
+const AGENT_MODE_ID = "https://agentclientprotocol.com/protocol/session-modes#agent";
+const PLAN_MODE_ID = "https://agentclientprotocol.com/protocol/session-modes#plan";
+
+describe("Copilot ACP provider (real) Allow All mode", () => {
+  let canRun = false;
+
+  beforeAll(async () => {
+    canRun = await isCommandAvailable("copilot");
+  });
+
+  test("selecting Allow All from Plan leaves the real provider in Agent mode", async (context) => {
+    if (!canRun) {
+      context.skip();
+    }
+    const cwd = await mkdtemp(join(tmpdir(), "copilot-allow-all-real-"));
+    const child = spawn("copilot", ["--acp"], { cwd, stdio: ["pipe", "pipe", "ignore"] });
+    const connection = new ClientSideConnection(
+      () => ({
+        sessionUpdate: async () => {},
+        requestPermission: async () => ({ outcome: { outcome: "cancelled" } }),
+      }),
+      ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout)),
+    );
+
+    try {
+      await connection.initialize({ protocolVersion: PROTOCOL_VERSION, clientCapabilities: {} });
+      const session = await connection.newSession({ cwd, mcpServers: [] });
+      const plan = await connection.setSessionConfigOption({
+        sessionId: session.sessionId,
+        configId: "mode",
+        value: PLAN_MODE_ID,
+      });
+      expect(plan.configOptions).toContainEqual(
+        expect.objectContaining({ id: "mode", currentValue: PLAN_MODE_ID }),
+      );
+
+      // This is the same provider writer called by ACPAgentSession. Assert its
+      // untransformed ACP response, since Paseo's displayed mode hides this bug.
+      const result = await writeCopilotProviderMode({
+        connection,
+        sessionId: session.sessionId,
+        requestedModeId: COPILOT_ALLOW_ALL_MODE_ID,
+        currentModeId: PLAN_MODE_ID,
+        selection: resolveACPModeSelection({
+          modeId: COPILOT_ALLOW_ALL_MODE_ID,
+          availableModes: COPILOT_MODES,
+          configOptions: plan.configOptions,
+        }),
+        configOptions: plan.configOptions,
+        logger: createTestLogger(),
+      });
+
+      expect(result.configOptions).toContainEqual(
+        expect.objectContaining({ id: "mode", currentValue: AGENT_MODE_ID }),
+      );
+      expect(result.configOptions).toContainEqual(
+        expect.objectContaining({ id: "allow_all", currentValue: "on" }),
+      );
+    } finally {
+      await terminateWithTreeKill(child, { gracefulTimeoutMs: 1000, forceTimeoutMs: 1000 });
+      await rm(cwd, { recursive: true, force: true });
+    }
+  }, 60_000);
+});
@@ -6,7 +6,7 @@ import type { Logger } from "pino";

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

-      const notifying = Boolean(callerAgentId && notifyOnFinish);
      const { disposition } = await sendPromptToAgent({
        agentManager,
        agentStorage,
@@ -1984,9 +2014,11 @@ export function createPaseoToolCatalog(options: PaseoToolHostDependencies): Pase
        prompt,
        source: callerAgentId ? { kind: "agent-message", agentId: callerAgentId } : undefined,
        sessionMode,
-        onDispatch: armFinishNotification,
+        activeTurnBehavior,
+        onDispatch: confirmDispatch,
        logger: childLogger,
      }).catch((error) => {
+        acceptDispatch(false);
        stopNotification?.();
        if (error instanceof AgentNotFoundError) {
          throw new PaseoToolInputError(error.message);
@@ -244,6 +244,13 @@ paseo plugin enable my-plugin
 paseo plugin remove my-plugin
 ```

+`paseo plugin reload <id>` reports the result of the reload itself: it waits while the daemon stops
+and starts the plugin, however long that takes, and it queues behind the daemon's other plugin work.
+Cancelling the command or losing the connection does not stop the daemon's work, and no listing or
+log entry settles what a cancelled reload did — the [Plugin reference](/docs/plugins/reference)
+covers those interim states. Running the reload again is what reports the result: it waits behind the
+outstanding one, then stops and starts the plugin once more.
+
 Bare `owner/slug` installs a reviewed registry listing. Use `git:owner/repository` for GitHub
 source, or `./plugin` for a local directory. Append `:<directory>` for a plugin in a monorepo.

@@ -282,9 +289,12 @@ Use the recipient's agent ID from `paseo ls`, or [copy it from the agent's tab](
 ```bash
 paseo send <id> "now run the tests"
 paseo send <id> --image screenshot.png "what's wrong here?"
-paseo send <id> --no-wait "queue this task"
+paseo send <id> --no-wait "run this task"
+paseo send <id> --behavior interrupt "stop and do this instead"
 ```

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

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

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

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

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

@@ -2269,6 +2269,12 @@ remove Command Center items and clear the installation's query state. An already
 remains as unavailable until its matching contribution returns or the user closes it. Panel render
 failures stay inside the plugin error boundary.

+Reload queues behind the daemon's other plugin work, such as a running installation or preparation
+command, and the daemon answers when the plugin is running again or has failed. Nothing reads the
+plugin's status as the reload's outcome: while the reload is queued, `plugin ls`, Settings, and the
+logs show the plugin's previous state, and while the daemon stops and starts it, a status read
+reports `failed` because the plugin is absent from the runtime catalog until its start completes.
+
 ## Plugin sources

 Paste one of these source identifiers into **Settings → Plugins**, or pass it to
@@ -63,7 +63,7 @@ Detach is an explicit user action in the subagents track, not an agent tool. A c

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

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

 **`update_agent`** — `{ agentId, name?, labels?, settings? }`. Use `settings` for runtime changes on an existing agent: `modeId`, `model`, `thinkingOptionId`, and provider-specific `features`. For Codex fast mode, pass `settings: { features: { "fast_mode": true } }`.