Rerun CI after the website dev server timed out at startup

Keep OpenCode chats working after switching to a model without the current variant
Switching an OpenCode v2 chat to another model carried the previous model's variant over. OpenCode rejects a prompt whose variant the model does not offer, so every message after the switch failed with "Variant unavailable for <model>: medium". The variant now carries over only when the new model offers it; otherwise it is cleared and the cleared thinking option is reported to the agent. Closes #5578
2026-10-20 16:22:43 +00:00 · 2026-09-28 21:56:14 +02:00 · 2026-09-28 21:36:21 +02:00
180 changed files with 1675 additions and 9159 deletions
@@ -1,33 +1,5 @@
 # Changelog

-## 0.10.2 - 2026-09-30
-
-### Fixed
-
- Fixed OpenCode v2 turns longer than five minutes failing with `UND_ERR_HEADERS_TIMEOUT` ([#5674](https://github.com/getpaseo/paseo/pull/5674))
- Fixed the context meter staying empty during OpenCode v2 turns and disappearing after them ([#5710](https://github.com/getpaseo/paseo/pull/5710) by [@mcowger](https://github.com/mcowger))
- Fixed OpenCode v2 question cards showing only the header and offering no typed answer ([#5679](https://github.com/getpaseo/paseo/pull/5679))
- Fixed OpenCode v2 patch edits from GPT models showing as a raw Patch card instead of an edit diff ([#5696](https://github.com/getpaseo/paseo/pull/5696))
- Fixed completed OpenCode v2 edits showing no diff ([#5609](https://github.com/getpaseo/paseo/pull/5609))
-
-## 0.10.1 - 2026-09-29
-
-### Added
-
- Added Claude Sonnet 5.5 for Claude Code 2.1.284 and newer ([#5583](https://github.com/getpaseo/paseo/pull/5583) by [@yangqi](https://github.com/yangqi))
-
-### Fixed
-
- Fixed OpenCode chats failing with "Variant unavailable" after switching to a model without the selected thinking level ([#5587](https://github.com/getpaseo/paseo/pull/5587))
- Fixed rewinding a Codex chat dropping its custom provider and Paseo tools ([#5345](https://github.com/getpaseo/paseo/pull/5345) by [@zbaibg](https://github.com/zbaibg))
- Fixed streamed replies joining lines of code blocks and Mermaid diagrams until the chat reloads ([#5577](https://github.com/getpaseo/paseo/pull/5577))
- Fixed a subagent opened from a split pane opening in a different pane ([#5451](https://github.com/getpaseo/paseo/pull/5451))
- Fixed archiving a custom Codex provider's agent leaving its session in Import session ([#5572](https://github.com/getpaseo/paseo/pull/5572))
- Fixed the `/` menu of a custom Codex provider with its own `CODEX_HOME` listing the daemon's prompts instead of its own ([#5450](https://github.com/getpaseo/paseo/pull/5450))
- Fixed a background `send_agent_prompt` returning `idle` for a prompt the agent accepted ([#5386](https://github.com/getpaseo/paseo/pull/5386))
- Fixed Windows file-link tooltips showing the full path for files inside the workspace ([#1987](https://github.com/getpaseo/paseo/pull/1987))
- Fixed terminal profiles that run `cursor-agent` showing the generic terminal icon ([#5379](https://github.com/getpaseo/paseo/pull/5379))
-
 ## 0.10.0 - 2026-09-28

 ### Added
@@ -34,8 +34,8 @@ workflows all live in the CLI process, and the completion notification that woul
 agent never arrives. A runtime that dies mid-turn is reported by whatever is draining its stream, but
 between turns nothing is watching, so the agent sits at `idle` looking healthy while its background
 work is gone. Report that exit as a turn failure so the agent lands in `error` with a timeline entry.
-Claude and OMP report exits between turns. OMP relaunches from its session file on the next prompt;
-the unfinished turn is lost.
+Only the Claude provider does this today; the others still report a death only when a turn happens to
+be in flight.

 ### Cancellation

@@ -193,7 +193,7 @@ Terminology:

 Loading is inline by default. `<LoadingSpinner size={14} color={foregroundMuted} />` sits next to the thing it relates to (`packages/app/src/screens/settings/providers-section.tsx:227-231`). Page-level loading is a centered `<LoadingSpinner size="large">` (`packages/app/src/screens/sessions-screen.tsx:69-72`). Card-level loading is a single short line, not a spinner. In-row dropdown items use `<DropdownMenuItem status="pending" pendingLabel="Removing...">`; the menu item handles its own pending state.

-Screen-level empty states use a centered, muted noun phrase and at most one ghost button (`packages/app/src/screens/sessions-screen.tsx`). Sidebar list empty states use a quiet bordered card with a left-aligned `sm` title, a muted `sm` description, and `xs` `<Button>` actions. Use `secondary` for the primary action and `outline` for a secondary action (`packages/app/src/components/sidebar/empty-states.tsx`). Keep both forms short and free of illustrations.
+Empty states are short noun phrases. Centered, muted, one or two lines. Sessions screen pairs the empty noun with a single ghost button to navigate back (`packages/app/src/screens/sessions-screen.tsx:74-81`); that pairing is the maximum elaboration. Illustrations and CTAs disguised as empty states are wrong.

 Inline errors are a single sentence in `palette.red[300]` `xs`, sitting under the field or inside the card it relates to (`packages/app/src/screens/settings/providers-section.tsx:115-119`).

@@ -99,8 +99,6 @@ Pi RPC extension UI dialog requests (`select`, `input`, `editor`, `confirm`) are

 OpenCode adapters target v1.14.46 and v2.0.10. V2 rejects binaries older than the tested 2.0.10 SDK at runtime selection. Runtime selection uses the configured command and environment. A recognized version is cached until provider configuration reload; a failed, timed-out, or unrecognized probe retains the v1 path and retries detection on the next operation. Load v2 code and materialize its plugin only after positive v2 selection; v1 sessions remain undecorated. Keep upstream SDK types inside the version-specific adapter. OpenCode owns storage migration; a missing native session must fail resume rather than create a replacement. V2 has no native archive/unarchive operation: archiving affects Paseo only. V1 retains native archiving.

-Use OpenCode v2 execution events to trigger turn completion, with active-state and durable-log reconciliation after admission, reconnect, and while a turn remains active. Do not use `session.wait`: a healthy turn exceeding Node's HTTP headers deadline produces a transport error while OpenCode keeps working. The live event feed has no replay, and shutdown interruption preserves the previous idle outcome, so the session snapshot alone cannot recover missed execution events. Quiet streams are healthy: v2 heartbeats are SSE comments, not application events.
-
 V2.0.4 also removed the activation endpoint that gated a cold location, and a cold location registers its config-derived commands, skills, and providers asynchronously. Wait until `plugin.list` returns a populated inventory before reading the catalog or commands; an empty inventory means the location is still warming. Fail when the readiness deadline expires, including when an inventory request stalls.

 Paseo installs its OpenCode tool bridge through `OPENCODE_CONFIG_CONTENT`. V1 accepts a plugin file; v2 silently skips configured files and requires a package directory with a server entry point. Both versions use the daemon's private loopback bridge for caller-scoped tools. Bridge context lives only in daemon memory and is removed when the Paseo session closes. The content-addressed plugin artifacts contain no session data or secrets. V2 also needs this plugin when native Paseo tools are disabled: its prompt API has no structured-output format, so the plugin supplies a schema-validated final-answer tool.
@@ -17,14 +17,12 @@ import {
  hoverChatOutlinePrompt,
  chatOutlineRail,
  movePointerOffChatOutline,
-  observePromptIndexRequests,
  pointAtChatOutlineRowEdge,
  pressEnterOnFocusedPrompt,
  splitCurrentPanelRight,
  withStreamingMarkdownOutline,
  expectReadingStreamedMarkdown,
 } from "../support/helpers/chat-outline";
-import { createCreationScenario } from "../support/helpers/creation";
 import {
  expectTimelineAtMaximumScrollWithPromptVisible,
  expectTimelinePromptNotMounted,
@@ -268,21 +266,3 @@ test.describe("desktop chat outline", () => {
    }
  });
 });
-
-test("indexes a new agent's prompts only once the agent exists", async ({ page }) => {
-  const promptIndex = await observePromptIndexRequests(page);
-  const creation = await createCreationScenario(page);
-  try {
-    await page.setViewportSize(WIDE_VIEWPORT);
-    await creation.openAgentDraft();
-    await creation.submitPrompt("Start an agent with an outline.");
-    await creation.expectPromptVisible();
-
-    const agentIds = await creation.agentIds();
-    expect(agentIds).toHaveLength(1);
-    await promptIndex.waitForRequestFor(agentIds[0]!);
-    expect(promptIndex.requestedAgentIds()).toEqual(agentIds);
-  } finally {
-    await creation.cleanup();
-  }
-});
@@ -1,122 +0,0 @@
-import path from "node:path";
-import { expect, test, type Page } from "../support/fixtures";
-import { seedWorkspace } from "../support/helpers/seed-client";
-import { openAgentRoute } from "../support/helpers/mock-agent";
-import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
-
-// This fixture catalog advertises Ultrafast on Sol; another model offers Fast only.
-// The real daemon discovers both through the same Codex model/list boundary.
-test.use({
-  e2eDaemonConfig: {
-    version: 1,
-    agents: {
-      providers: {
-        codex: {
-          enabled: true,
-          command: [process.execPath, path.resolve("e2e/fixtures/catalog-codex.mjs")],
-        },
-        claude: { enabled: false },
-        copilot: { enabled: false },
-        opencode: { enabled: false },
-        pi: { enabled: false },
-        omp: { enabled: false },
-      },
-    },
-  },
-});
-
-async function openSpeedSelector(page: Page): Promise<void> {
-  const speed = page.getByRole("button", { name: /^(Select speed|Speed: .+)$/ });
-  const features = page.getByRole("button", { name: "Open agent features", exact: true });
-  const modelSettings = page.getByRole("button", { name: /^Select model \(/ });
-  await expect(speed.or(features).or(modelSettings).filter({ visible: true }).first()).toBeVisible({
-    timeout: 30_000,
-  });
-  if (!(await speed.isVisible())) {
-    if (await features.isVisible()) await features.click();
-    else await modelSettings.click();
-  }
-  await expect(speed).toBeVisible({ timeout: 30_000 });
-  await speed.click();
-  await expect(page.getByText("Normal", { exact: true }).last()).toBeVisible();
-}
-
-async function selectSpeed(page: Page, label: string): Promise<void> {
-  await page.getByRole("button", { name: label, exact: true }).last().click();
-  const toolbarTrigger = page.getByRole("button", { name: `Speed: ${label}`, exact: true });
-  const sheetTrigger = page.getByRole("button", { name: "Select speed", exact: true });
-  await expect(toolbarTrigger.or(sheetTrigger)).toBeVisible();
-  if (await toolbarTrigger.isVisible()) await expect(toolbarTrigger).toHaveText("");
-  else await expect(sheetTrigger).toContainText(label);
-}
-
-async function expectSpeedChoices(page: Page, choices: string[]): Promise<void> {
-  for (const choice of ["Normal", "Fast", "Ultrafast"]) {
-    const option = page.getByText(choice, { exact: true }).last();
-    if (choices.includes(choice)) {
-      await expect(option).toBeVisible();
-      await expect(option).toBeInViewport({ ratio: 1 });
-    } else await expect(option).not.toBeVisible();
-  }
-}
-
-async function switchAgentModel(agentId: string, modelId: string): Promise<void> {
-  const client = await connectDaemonClient<
-    Pick<DaemonClient, "setAgentModel" | "close" | "connect">
-  >({
-    clientIdPrefix: "codex-speed-model",
-  });
-  try {
-    await client.setAgentModel(agentId, modelId);
-  } finally {
-    await client.close();
-  }
-}
-
-for (const viewport of [
-  { name: "desktop", width: 1280, height: 850 },
-  { name: "compact", width: 390, height: 844 },
-]) {
-  test(`Codex catalog drives speed choices on ${viewport.name}`, async ({ page }, testInfo) => {
-    test.setTimeout(180_000);
-    await page.setViewportSize(viewport);
-    const workspace = await seedWorkspace({ repoPrefix: "codex-speed-" });
-    try {
-      const agent = await workspace.client.createAgent({
-        provider: "codex",
-        cwd: workspace.repoPath,
-        workspaceId: workspace.workspaceId,
-        title: "Speed settings",
-        model: "gpt-6.1-sol",
-        modeId: "full-access",
-        initialPrompt: "Get ready to work on this project.",
-      });
-      await openAgentRoute(page, { workspaceId: workspace.workspaceId, agentId: agent.id });
-      if (viewport.name === "desktop") {
-        const trigger = page.getByRole("button", { name: "Speed: Normal", exact: true });
-        await expect(trigger).toBeVisible({ timeout: 30_000 });
-        await expect(trigger).toHaveText("");
-        await page.screenshot({ path: testInfo.outputPath("desktop-normal-trigger.png") });
-      }
-      await openSpeedSelector(page);
-      await expectSpeedChoices(page, ["Normal", "Fast", "Ultrafast"]);
-      await page.screenshot({ path: testInfo.outputPath(`${viewport.name}-speed-options.png`) });
-      await selectSpeed(page, "Ultrafast");
-      await openSpeedSelector(page);
-      await expectSpeedChoices(page, ["Normal", "Fast", "Ultrafast"]);
-      await page.screenshot({
-        path: testInfo.outputPath(`${viewport.name}-ultrafast-selected.png`),
-      });
-      await selectSpeed(page, "Normal");
-      if (viewport.name === "desktop") {
-        await switchAgentModel(agent.id, "gpt-6-sol");
-        await openSpeedSelector(page);
-        await expectSpeedChoices(page, ["Normal", "Fast"]);
-        await page.screenshot({ path: testInfo.outputPath("desktop-fast-only.png") });
-      }
-    } finally {
-      await workspace.cleanup();
-    }
-  });
-}
@@ -10,7 +10,6 @@ import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
 import { getServerId } from "../support/helpers/server-id";
 import { switchWorkspaceViaSidebar } from "../support/helpers/workspace-ui";
 import { expectMobileAgentSidebarVisible } from "../support/helpers/sidebar";
-import { expectNewWorkspaceProjectSelected } from "../support/helpers/new-workspace";

 const TEST_COMMANDS = [
  {
@@ -339,16 +338,6 @@ function expectPopoverFramesStable(frames: PopoverFrame[]): void {
  ).toBeUndefined();
 }

-function recordCommandRequestsByAgentId(page: Page): string[] {
-  const requests: string[] = [];
-  const record = ({ payload }: { payload: string | Buffer }) => {
-    if (typeof payload !== "string" || !payload.includes("list_commands_request")) return;
-    if (!payload.includes("draftConfig")) requests.push(payload);
-  };
-  page.on("websocket", (socket) => socket.on("framesent", record));
-  return requests;
-}
-
 function expectPopoverDoesNotDisappearAfterFirstVisible(frames: PopoverFrame[]): void {
  const firstVisibleIndex = frames.findIndex(
    (frame) =>
@@ -370,25 +359,6 @@ function expectPopoverDoesNotDisappearAfterFirstVisible(frames: PopoverFrame[]):
 }

 test.describe("Composer autocomplete", () => {
-  test("keeps New workspace off the running-agent command list before a project is chosen", async ({
-    page,
-  }) => {
-    const commandRequestsByAgentId = recordCommandRequestsByAgentId(page);
-
-    await page.goto("/new");
-    await expectNewWorkspaceProjectSelected(page, "Choose project");
-    await composerLocator(page).fill("/");
-
-    const popover = page
-      .getByTestId("composer-autocomplete-popover")
-      .filter({ visible: true })
-      .first();
-    await expect(popover).toContainText("Choose a project to see commands", { timeout: 30_000 });
-    await expect(popover).not.toContainText("/clear");
-    await expect(popover).not.toContainText("/exit");
-    expect(commandRequestsByAgentId).toEqual([]);
-  });
-
  test("stays visible after returning from app-wide routes", async ({ page }) => {
    await installListCommandsStub(page);
    const serverId = getServerId();
@@ -1,70 +0,0 @@
-import { test } from "../support/fixtures";
-import {
-  expectContentColumnWidth,
-  expectCustomContentWidthSetting,
-  expectDefaultContentWidthSetting,
-  openAppearanceSettings,
-  resetContentWidth,
-  setContentWidth,
-} from "../support/helpers/content-width";
-import { openFileExplorer, openFileFromExplorer } from "../support/helpers/file-explorer";
-import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
-
-const ULTRAWIDE_VIEWPORT = { width: 2560, height: 1080 };
-
-test("widens chat and Markdown files to the chosen content width and resets to the default", async ({
-  page,
-}, testInfo) => {
-  test.setTimeout(120_000);
-  const agent = await seedMockAgentWorkspace({
-    repoPrefix: "content-width-",
-    title: "Content width",
-    initialPrompt: "Write a long paragraph.",
-  });
-
-  try {
-    await agent.client.waitForFinish(agent.agentId, 30_000);
-    await page.setViewportSize(ULTRAWIDE_VIEWPORT);
-    const assistantMessage = page.getByTestId("assistant-message").first();
-    const markdownPreview = page.getByTestId("markdown-preview-frame").first();
-
-    await test.step("chat starts at the default width", async () => {
-      await openAgentRoute(page, agent);
-      await expectContentColumnWidth(assistantMessage, { max: 820 });
-    });
-
-    await test.step("settings show the default without a reset", async () => {
-      await openAppearanceSettings(page);
-      await expectDefaultContentWidthSetting(page, 820);
-    });
-
-    await test.step("a custom width is saved and offers a reset", async () => {
-      await setContentWidth(page, 1600);
-      await expectCustomContentWidthSetting(page, 1600);
-      await page.screenshot({ path: testInfo.outputPath("settings-custom-width.png") });
-    });
-
-    await test.step("chat and Markdown files use the custom width", async () => {
-      await openAgentRoute(page, agent);
-      await expectContentColumnWidth(assistantMessage, { min: 1200, max: 1600 });
-      await page.screenshot({ path: testInfo.outputPath("chat-custom-width.png") });
-
-      await openFileExplorer(page);
-      await openFileFromExplorer(page, "README.md");
-      await expectContentColumnWidth(markdownPreview, { min: 1200, max: 1600 });
-      await page.screenshot({ path: testInfo.outputPath("markdown-custom-width.png") });
-    });
-
-    await test.step("reset returns to the default without storing it", async () => {
-      await openAppearanceSettings(page);
-      await resetContentWidth(page);
-      await expectDefaultContentWidthSetting(page, 820);
-
-      await openAgentRoute(page, agent);
-      await expectContentColumnWidth(assistantMessage, { max: 820 });
-      await page.screenshot({ path: testInfo.outputPath("chat-default-width.png") });
-    });
-  } finally {
-    await agent.cleanup();
-  }
-});
@@ -1,71 +0,0 @@
-import type { Locator } from "@playwright/test";
-import { expect, test } from "../support/fixtures";
-import { expectComposerVisible } from "../support/helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
-
-// Where the progress arc is painted, as its centroid relative to the ring's centre in pixels.
-// Reads the rendered pixels, so any rotation that does not reach the screen counts as none.
-async function progressArcCentroid(meter: Locator): Promise<{ x: number; y: number }> {
-  const ring = meter.locator("svg");
-  const progressColor = await ring
-    .locator("circle")
-    .last()
-    .evaluate((circle) => getComputedStyle(circle).stroke);
-  const screenshot = await ring.screenshot();
-  return ring.evaluate(
-    async (_svg, { png, color }) => {
-      const image = await createImageBitmap(
-        await (await fetch(`data:image/png;base64,${png}`)).blob(),
-      );
-      const canvas = new OffscreenCanvas(image.width, image.height);
-      const context = canvas.getContext("2d")!;
-      context.drawImage(image, 0, 0);
-      const { data } = context.getImageData(0, 0, image.width, image.height);
-      const [r, g, b] = color.match(/\d+/g)!.map(Number);
-      let sumX = 0;
-      let sumY = 0;
-      let count = 0;
-      for (let y = 0; y < image.height; y += 1) {
-        for (let x = 0; x < image.width; x += 1) {
-          const i = (y * image.width + x) * 4;
-          const distance =
-            Math.abs(data[i] - r) + Math.abs(data[i + 1] - g) + Math.abs(data[i + 2] - b);
-          if (distance < 40) {
-            sumX += x;
-            sumY += y;
-            count += 1;
-          }
-        }
-      }
-      if (count === 0) {
-        throw new Error(`No pixels painted in the progress colour ${color}`);
-      }
-      return { x: sumX / count - image.width / 2, y: sumY / count - image.height / 2 };
-    },
-    { png: screenshot.toString("base64"), color: progressColor },
-  );
-}
-
-test.describe("context window meter", () => {
-  test("draws usage clockwise from twelve o'clock", async ({ page }) => {
-    test.setTimeout(180_000);
-    // 32,000 of the mock's 128,000-token window: a quarter, from twelve to three o'clock.
-    const session = await seedMockAgentWorkspace({
-      repoPrefix: "context-window-meter-",
-      title: "Context window meter e2e",
-      initialPrompt: "emit 32000 byte file agent stream payload",
-    });
-    try {
-      await openAgentRoute(page, session);
-      await expectComposerVisible(page);
-      const meter = page.getByTestId("context-window-meter");
-      await expect(meter).toHaveAccessibleName(/25%/, { timeout: 30_000 });
-
-      const centroid = await progressArcCentroid(meter);
-      expect(centroid.x).toBeGreaterThan(1);
-      expect(centroid.y).toBeLessThan(-1);
-    } finally {
-      await session.cleanup();
-    }
-  });
-});
@@ -1,51 +0,0 @@
-import { test, expect } from "../support/fixtures";
-import { openSettings } from "../support/helpers/app";
-import { expectAppRoute } from "../support/helpers/route-assertions";
-import {
-  buildPairingLink,
-  cancelHostConfirmation,
-  connectToConfirmedHost,
-  expectHostConfirmationFor,
-  expectHostInHostPicker,
-  hostConfirmation,
-  openPairingLink,
-  saveLinkedHostBeforeLoad,
-  type LinkedHost,
-} from "../support/helpers/host-confirmation";
-
-// An unreachable relay: the link saves the host without connecting first.
-const linkedHost: LinkedHost = {
-  serverId: "srv_link_confirmation",
-  relayEndpoint: "127.0.0.1:59998",
-  daemonPublicKeyB64: "bGlua0NvbmZpcm1hdGlvbktleQ",
-};
-
-test("a pairing link for a new host asks before saving it", async ({ page }) => {
-  const link = buildPairingLink(linkedHost);
-
-  await test.step("Cancel saves nothing and stays on the page", async () => {
-    await openPairingLink(page, link);
-    await expectHostConfirmationFor(page, linkedHost);
-    await cancelHostConfirmation(page);
-    await expectAppRoute(page, "/settings/general");
-    await expectHostInHostPicker(page, linkedHost.serverId, "not listed");
-  });
-
-  await test.step("Connect saves the host and opens a project", async () => {
-    await openPairingLink(page, link);
-    await expectHostConfirmationFor(page, linkedHost);
-    await connectToConfirmedHost(page);
-    await expectAppRoute(page, "/open-project");
-    await openSettings(page);
-    await expectHostInHostPicker(page, linkedHost.serverId, "listed");
-  });
-});
-
-test("a pairing link for a saved host connects without asking", async ({ page }) => {
-  await saveLinkedHostBeforeLoad(page, linkedHost);
-
-  await openPairingLink(page, buildPairingLink(linkedHost));
-
-  await expectAppRoute(page, "/open-project", { timeout: 30_000 });
-  await expect(hostConfirmation(page)).toHaveCount(0);
-});
@@ -1,78 +0,0 @@
-import { mkdtempSync } from "node:fs";
-import { tmpdir } from "node:os";
-import path from "node:path";
-import { test, expect, type Page } from "../support/fixtures";
-import { launchAgent, cleanupRewindFlow, type AgentHandle } from "../support/helpers/rewind-flow";
-import { submitMessage } from "../support/helpers/composer";
-
-const binary = process.env.OPENCODE_TEST_BINARY ?? "opencode";
-test.use({
-  e2eDaemonConfig: {
-    version: 1,
-    agents: { providers: { opencode: { enabled: true, command: [binary] } } },
-  },
-});
-
-async function selectMedium(page: Page) {
-  await page
-    .getByRole("button", { name: /^Select thinking option/ })
-    .filter({ visible: true })
-    .click();
-  await page.getByText("Medium", { exact: true }).filter({ visible: true }).click();
-  await expect(
-    page
-      .getByRole("button", { name: "Select thinking option (Medium)", exact: true })
-      .filter({ visible: true }),
-  ).toBeVisible();
-}
-async function selectLongcat(page: Page) {
-  await page
-    .getByRole("button", { name: /^Select model \(/ })
-    .filter({ visible: true })
-    .click();
-  await page
-    .getByText("LongCat 2.5 Preview Free", { exact: true })
-    .filter({ visible: true })
-    .click();
-}
-async function askForReply(handle: AgentHandle) {
-  await submitMessage(handle.page, "Reply exactly OK. Do not use tools.");
-  return handle.client.waitForFinish(handle.agentId, 120_000);
-}
-
-test("switching an existing OpenCode session clears unsupported thinking", async ({
-  page,
-}, testInfo) => {
-  test.setTimeout(240_000);
-  const cwd = mkdtempSync(path.join(tmpdir(), "paseo-variant-ui-"));
-  let handle: AgentHandle | undefined;
-  try {
-    handle = await launchAgent({
-      page,
-      cwd,
-      provider: "opencode",
-      mode: "full-access",
-      providerConfig: { model: "opencode/space-bunny-free" },
-    });
-    await selectMedium(page);
-    expect((await askForReply(handle)).status).toBe("idle");
-    await selectLongcat(page);
-    await expect(
-      page.getByRole("button", { name: /^Select thinking option/ }).filter({ visible: true }),
-    ).toHaveCount(0);
-    const finish = await askForReply(handle);
-    const screenshot = testInfo.outputPath("model-switch.png");
-    await page.screenshot({ path: screenshot });
-    await testInfo.attach("After switching to Longcat", {
-      path: screenshot,
-      contentType: "image/png",
-    });
-    expect(finish.status).toBe("idle");
-    expect(finish.final?.lastError).toBeFalsy();
-    await expect(
-      page.getByTestId("assistant-message").filter({ visible: true }).last(),
-    ).toContainText("OK");
-  } finally {
-    await cleanupRewindFlow({ handle, cwd });
-  }
-});
@@ -14,7 +14,6 @@ import {
  expectConflictPreservesDraft,
  discardTitle,
  returnAndReopenSettings,
-  returnToPluginsPage,
  expectSettingsUnavailable,
 } from "../support/helpers/plugin-settings";

@@ -44,11 +43,6 @@ test("another client's save preserves a conflicting draft", async ({ page }) =>
  await discardTitle(page);
 });

-test("Back to plugins returns from a plugin settings screen", async ({ page }) => {
-  await openDisplaySettings(page);
-  await returnToPluginsPage(page);
-});
-
 test.describe("compact plugin settings", () => {
  test.use({ viewport: { width: 390, height: 844 } });

@@ -1,7 +1,6 @@
 import { randomUUID } from "node:crypto";
 import { execFileSync } from "node:child_process";
-import { existsSync, mkdirSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
+import { existsSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import {
  restoreArchivedWorkspace,
@@ -355,88 +354,6 @@ test.describe("Worktree restore", () => {
      .toBeNull();
  });

-  test("restores a branchless workspace so its archived agent can be used again", async ({
-    page,
-  }) => {
-    const project = await openProjectViaDaemon(worktreeClient, tempRepo.path);
-    createdProjectIds.add(project.projectKey);
-    const backingWorktree = await createWorktreeViaDaemon(worktreeClient, {
-      cwd: tempRepo.path,
-      slug: `branchless-${randomUUID().slice(0, 8)}`,
-    });
-    createdProjectIds.add(backingWorktree.projectKey);
-    createdWorktreeDirectories.add(backingWorktree.workspaceDirectory);
-
-    execFileSync("git", ["switch", "--detach", "main"], {
-      cwd: backingWorktree.workspaceDirectory,
-      stdio: "pipe",
-    });
-    const created = await worktreeClient.createWorkspace({
-      source: { kind: "directory", path: backingWorktree.workspaceDirectory },
-      title: "Sample workspace",
-    });
-    if (!created.workspace) {
-      throw new Error(created.error ?? "Could not create the branchless workspace");
-    }
-    const workspaceId = created.workspace.id;
-    const agent = await createIdleAgent(client, {
-      cwd: backingWorktree.workspaceDirectory,
-      workspaceId,
-      title: "Archived agent",
-    });
-
-    await archiveWorkspaceFromDaemon(worktreeClient, backingWorktree.workspaceDirectory, {
-      scope: "worktree",
-    });
-    await expect
-      .poll(() => existsSync(backingWorktree.workspaceDirectory), { timeout: 30_000 })
-      .toBe(false);
-    await expect.poll(() => fetchAgentArchivedAt(client, agent.id)).not.toBeNull();
-
-    await gotoAppShell(page);
-    await waitForSidebarHydration(page);
-    await openSessions(page);
-    await page.getByTestId(`agent-row-${getServerId()}-${agent.id}`).click();
-    await expect(page.getByText("Workspace archived", { exact: true })).toBeVisible();
-    await expect(
-      page.getByText(
-        "Restore Sample workspace to return to its agents. A new branch will start from the saved base or the repository default.",
-        { exact: true },
-      ),
-    ).toBeVisible();
-    await captureBranchlessRestoreStep(page, "01-restore-workspace.png");
-
-    await page.getByRole("button", { name: "Restore", exact: true }).click();
-    await expect
-      .poll(() => existsSync(backingWorktree.workspaceDirectory), { timeout: 30_000 })
-      .toBe(true);
-    await expect(page.getByRole("button", { name: "Unarchive", exact: true })).toBeVisible({
-      timeout: 30_000,
-    });
-    await captureBranchlessRestoreStep(page, "02-unarchive-agent.png");
-
-    await page.getByRole("button", { name: "Unarchive", exact: true }).click();
-    await expect.poll(() => fetchAgentArchivedAt(client, agent.id)).toBeNull();
-    await expect(page.getByRole("textbox", { name: "Message agent..." })).toBeEditable();
-    await captureBranchlessRestoreStep(page, "03-agent-ready.png");
-
-    const restoredHead = execFileSync("git", ["rev-parse", "HEAD"], {
-      cwd: backingWorktree.workspaceDirectory,
-      encoding: "utf8",
-    }).trim();
-    const defaultHead = execFileSync("git", ["rev-parse", "main"], {
-      cwd: tempRepo.path,
-      encoding: "utf8",
-    }).trim();
-    expect(restoredHead).toBe(defaultHead);
-    expect(
-      execFileSync("git", ["branch", "--show-current"], {
-        cwd: backingWorktree.workspaceDirectory,
-        encoding: "utf8",
-      }).trim(),
-    ).toMatch(/^restored\//);
-  });
-
  test("restore failure stays visible and permits a successful retry", async ({ page }) => {
    const { agent, worktree } = await openArchivedWorkspaceFromHistory(page, "restore-retry");
    const displacedProjectPath = `${tempRepo.path}-temporarily-unavailable`;
@@ -505,12 +422,6 @@ test.describe("Worktree restore", () => {
  });
 });

-async function captureBranchlessRestoreStep(page: Page, filename: string): Promise<void> {
-  const screenshotDirectory = path.join(tmpdir(), "paseo-branchless-restore-evidence");
-  mkdirSync(screenshotDirectory, { recursive: true });
-  await page.screenshot({ path: path.join(screenshotDirectory, filename), fullPage: true });
-}
-
 function commitRestorableChange(cwd: string): void {
  writeFileSync(path.join(cwd, "restored-change.txt"), "preserved after restore\n");
  execFileSync("git", ["add", "restored-change.txt"], { cwd, stdio: "pipe" });
@@ -1,88 +0,0 @@
-import readline from "node:readline";
-import { randomUUID } from "node:crypto";
-
-const fast = { id: "priority", name: "Fast", description: "Faster processing, increased usage" };
-const ultra = {
-  id: "ultrafast",
-  name: "Ultrafast",
-  description: "Lowest latency, increased usage",
-};
-const models = [
-  { id: "gpt-6.1-sol", displayName: "GPT-6.1 Sol", isDefault: true, serviceTiers: [fast, ultra] },
-  { id: "gpt-6-sol", displayName: "GPT-6 Sol", serviceTiers: [fast] },
-].map((model) =>
-  Object.assign(model, {
-    model: model.id,
-    defaultReasoningEffort: "medium",
-    supportedReasoningEfforts: [{ reasoningEffort: "medium", description: "Medium" }],
-  }),
-);
-
-function send(message) {
-  process.stdout.write(JSON.stringify(message) + "\n");
-}
-function respond(method, params) {
-  switch (method) {
-    case "initialize":
-      return {};
-    case "model/list":
-      return { data: models };
-    case "config/read":
-      return { config: { model: models[0].id, model_reasoning_effort: "medium" } };
-    case "collaborationMode/list":
-      return { data: [] };
-    case "skills/list":
-      return { data: [] };
-    case "thread/list":
-    case "thread/loaded/list":
-      return { data: [] };
-    case "thread/start":
-      return { thread: { id: randomUUID() }, model: params.model };
-    case "thread/resume":
-      return { thread: { id: params.threadId } };
-    case "thread/read":
-      return { thread: { id: params.threadId, turns: [] } };
-    case "turn/start": {
-      const turnId = randomUUID();
-      setTimeout(() => {
-        send({
-          method: "turn/started",
-          params: { threadId: params.threadId, turn: { id: turnId } },
-        });
-        send({
-          method: "item/completed",
-          params: {
-            threadId: params.threadId,
-            turnId,
-            item: {
-              id: randomUUID(),
-              type: "agentMessage",
-              text: "Ready to work on this project.",
-            },
-          },
-        });
-        send({
-          method: "turn/completed",
-          params: { threadId: params.threadId, turn: { id: turnId, status: "completed" } },
-        });
-      }, 50);
-      return { turn: { id: turnId } };
-    }
-    default:
-      throw new Error(`Unsupported Codex fixture request: ${method}`);
-  }
-}
-
-if (process.argv.includes("--version")) {
-  console.log("codex-cli 0.159.0");
-} else {
-  readline.createInterface({ input: process.stdin }).on("line", (line) => {
-    const request = JSON.parse(line);
-    if (request.id === undefined) return;
-    try {
-      send({ id: request.id, result: respond(request.method, request.params ?? {}) });
-    } catch (error) {
-      send({ id: request.id, error: { code: -32601, message: error.message } });
-    }
-  });
-}
@@ -90,48 +90,3 @@ a failed provider tap leaves its modal open, so dismiss it before the next run.
 journeys remain outside the default mobile suite, alongside the compact sheet journeys above.

 Keep generated screenshots, recordings, and run logs outside the repository.
-
-## Stacked adaptive sheets
-
-`stacked-pairing.ad` opens the welcome screen's pairing sheet and then the root-mounted host
-confirmation. It first types without tapping the input to verify autofocus, then cancels the
-confirmation, closes and reopens the underlying sheet, confirms again,
-and completes the password retry. `stacked-settings.ad` checks the same return and retry through
-Settings → add host → Direct connection → Advanced. Run both on phones and tablets so both the
-bottom sheet and centered dialog are exercised.
-
-Use a fresh English app with notification permission granted and first-use keyboard prompts
-already dismissed. Load this checkout from an isolated Metro. Start an isolated password-protected
-daemon and a local Wrangler relay with `--var 'PASEO_RELAY_UPSTREAM:'`; the checked-in upstream
-setting otherwise forwards traffic to the hosted relay, which drops password rejection replies.
-Set `PAIRING_LINK` to the daemon's `relay://` URI with an intentionally incorrect `password` query
-parameter, and `PASSWORD` to its correct password. This exercises password retry even while the
-daemon accepts relay connections with no credential.
-
-```sh
-agent-device replay packages/app/e2e/mobile/modal-sheet/stacked-pairing.ad \
-  --state-dir "$SHEET_QA_DEVICE_STATE" --session stacked-ipad --platform ios \
-  --udid "$SHEET_QA_IOS_UDID" \
-  --env PAIRING_LINK="$SHEET_QA_LINK" --env PASSWORD="$SHEET_QA_PASSWORD" \
-  --env OUT="$SHEET_QA_OUTPUT"
-```
-
-For Settings, first open Settings with Add host visible. With a saved host, open Switch host
-first. Use a second loopback spelling
-(`localhost` instead of `127.0.0.1`) for the same local relay so the saved host asks for confirmation
-of its changed connection. Pass that link to `stacked-settings.ad` with the same arguments.
-For an app with no saved hosts, use the original link; Add host is visible directly in Settings.
-
-Android uses the same journeys: copy each script outside the repository, change its context's
-`platform=ios` to `platform=android`, and pass `--serial` instead of `--udid`. Reverse both Metro
-(including the port advertised by its manifest) and the local relay ports. Keep driver state,
-artifacts, and sessions separate from other runs. These host-dependent journeys remain outside the
-default mobile suite, alongside the existing modal-sheet scripts.
-
-On iPhone, bulk replacement or bulk keyboard entry of the advanced URI field triggers a
-repeated-update error with both the parent and stacked-sheet implementations. Entering the complete
-URI one character at a time passed with both implementations; faster typing remains unverified.
-On iPad, replacing the field a second time appends text. For this Settings journey, use the
-native clipboard Paste menu, then continue the assertions manually. Dismiss the password keyboard
-with Done to submit when the Connect button is below the keyboard. The welcome pairing regression
-runs end to end without these adjustments.
@@ -1,50 +0,0 @@
-# Fresh English app at Welcome, local relay host with PASSWORD, see README.md.
-# Run on phones and tablets: the confirmation lives at the root, outside the pairing sheet.
-context platform=ios timeout=180000 retries=0
-env APP_ID=sh.paseo.debug
-
-open "${APP_ID}"
-wait "id=\"welcome-paste-pairing-link\"" 20000
-screenshot "${OUT}/01-welcome.png"
-press "id=\"welcome-paste-pairing-link\""
-wait stable
-# Type without tapping the input: opening the sheet must retain its autofocus.
-wait "id=\"pair-link-input\"" 10000
-type "relay://"
-wait "id=\"pair-link-input\" value=\"relay://\"" 5000
-screenshot "${OUT}/20-pairing-autofocus-without-tap.png"
-fill "id=\"pair-link-input\"" "${PAIRING_LINK}"
-wait stable
-screenshot "${OUT}/02-pairing-input.png"
-press "id=\"pair-link-submit\""
-wait stable
-wait "id=\"host-confirmation-connect\"" 10000
-screenshot "${OUT}/03-confirmation-on-top.png"
-press "id=\"host-confirmation-cancel\""
-wait stable
-wait "id=\"pair-link-submit\" enabled=true" 10000
-screenshot "${OUT}/04-cancel-returns-to-pairing.png"
-# Close and reopen the underlying sheet, then edit it and submit again.
-press "id=\"pair-link-cancel\""
-wait stable
-wait "id=\"welcome-paste-pairing-link\"" 10000
-screenshot "${OUT}/05-underlying-sheet-closes.png"
-press "id=\"welcome-paste-pairing-link\""
-wait stable
-wait "id=\"pair-link-input\"" 10000
-fill "id=\"pair-link-input\"" "${PAIRING_LINK}"
-wait stable
-press "id=\"pair-link-submit\""
-wait stable
-wait "id=\"host-confirmation-connect\"" 10000
-screenshot "${OUT}/06-confirmation-reopens.png"
-press "id=\"host-confirmation-connect\""
-wait stable
-wait "id=\"pair-link-password-input\"" 20000
-screenshot "${OUT}/07-password-after-connect.png"
-fill "id=\"pair-link-password-input\"" "${PASSWORD}"
-wait stable
-press "id=\"pair-link-submit\""
-wait stable
-wait text "Open a folder on your machine" 30000
-screenshot "${OUT}/08-connected.png"
@@ -1,46 +0,0 @@
-# Settings with Add host visible: no saved hosts, or the host picker already open.
-context platform=ios timeout=180000 retries=0
-env APP_ID=sh.paseo.debug
-open "${APP_ID}"
-wait "id=\"settings-add-host\"" 20000
-screenshot "${OUT}/09-settings.png"
-press "id=\"settings-add-host\""
-wait stable
-wait "id=\"add-host-method-direct\"" 10000
-screenshot "${OUT}/10-add-host-methods.png"
-press "id=\"add-host-method-direct\""
-wait stable
-press "id=\"direct-host-advanced-toggle\""
-wait stable
-fill "id=\"direct-host-uri-input\"" "${PAIRING_LINK}"
-wait stable
-screenshot "${OUT}/11-add-host-relay-input.png"
-press "id=\"direct-host-submit\""
-wait stable
-wait "id=\"host-confirmation-connect\"" 10000
-screenshot "${OUT}/12-add-host-confirmation-on-top.png"
-press "id=\"host-confirmation-cancel\""
-wait stable
-wait "id=\"direct-host-submit\" enabled=true" 10000
-screenshot "${OUT}/13-cancel-returns-to-add-host.png"
-# Editing the underlying sheet proves it still accepts input after closing the top sheet.
-fill "id=\"direct-host-uri-input\"" "${PAIRING_LINK}"
-wait stable
-press "id=\"direct-host-submit\""
-wait stable
-wait "id=\"host-confirmation-connect\"" 10000
-screenshot "${OUT}/14-add-host-confirmation-reopens.png"
-press "id=\"host-confirmation-connect\""
-wait stable
-wait "id=\"direct-password-input\"" 20000
-screenshot "${OUT}/15-add-host-password.png"
-fill "id=\"direct-password-input\"" "${PASSWORD}"
-wait stable
-press "id=\"direct-host-submit\""
-wait stable
-open "${APP_ID}" "paseo://settings"
-wait "label=\"Connections\"" 10000
-press "label=\"Connections\""
-wait stable
-wait "id=\"host-page-connections-card\"" 30000
-screenshot "${OUT}/16-settings-connected.png"
@@ -3,7 +3,6 @@ import { openSettings } from "./app";
 import { openSettingsSection } from "./settings";
 import { runWorkspaceActionFromCommandCenter } from "./command-center-workspace-actions";
 import { seedMockAgentWorkspace, type MockAgentWorkspace } from "./mock-agent";
-import { loadSessionMessageReaders } from "./new-workspace";

 export async function withStreamingMarkdownOutline(
  run: (agent: MockAgentWorkspace) => Promise<void>,
@@ -230,22 +229,3 @@ async function requireBoundingBox(
  }
  return box;
 }
-
-export async function observePromptIndexRequests(page: Page) {
-  const frames = await loadSessionMessageReaders();
-  const agentIds: string[] = [];
-  page.on("websocket", (socket) => {
-    socket.on("framesent", ({ payload }) => {
-      const request = frames.client(payload);
-      if (request?.type === "agent.timeline.list_prompts.request") {
-        agentIds.push(request.agentId);
-      }
-    });
-  });
-  return {
-    async waitForRequestFor(agentId: string) {
-      await expect.poll(() => agentIds).toContain(agentId);
-    },
-    requestedAgentIds: () => [...new Set(agentIds)],
-  };
-}
@@ -1,63 +0,0 @@
-import { expect, type Locator, type Page } from "@playwright/test";
-import { openSettings } from "./app";
-import { openSettingsSection } from "./settings";
-
-const APP_SETTINGS_KEY = "@paseo:app-settings";
-
-function contentWidthInput(page: Page): Locator {
-  return page.getByLabel("Content width in pixels", { exact: true });
-}
-
-function resetContentWidthButton(page: Page): Locator {
-  return page.getByRole("button", { name: "Reset content width to default", exact: true });
-}
-
-export async function openAppearanceSettings(page: Page): Promise<void> {
-  await openSettings(page);
-  await openSettingsSection(page, "appearance");
-}
-
-export async function setContentWidth(page: Page, width: number): Promise<void> {
-  const input = contentWidthInput(page);
-  await input.fill(String(width));
-  await input.press("Tab");
-}
-
-export async function resetContentWidth(page: Page): Promise<void> {
-  await resetContentWidthButton(page).click();
-}
-
-export async function expectDefaultContentWidthSetting(page: Page, width: number): Promise<void> {
-  await expect(contentWidthInput(page)).toHaveValue(String(width));
-  await expect(resetContentWidthButton(page)).toHaveCount(0);
-  await expect.poll(() => readStoredContentWidth(page)).toBeNull();
-}
-
-export async function expectCustomContentWidthSetting(page: Page, width: number): Promise<void> {
-  await expect(contentWidthInput(page)).toHaveValue(String(width));
-  await expect(resetContentWidthButton(page)).toBeVisible();
-  await expect.poll(() => readStoredContentWidth(page)).toBe(width);
-}
-
-/** Asserts the rendered width of a content-column element stays within `max` and above `min`. */
-export async function expectContentColumnWidth(
-  element: Locator,
-  bounds: { min?: number; max: number },
-): Promise<void> {
-  await expect(element).toBeVisible({ timeout: 30_000 });
-  await expect
-    .poll(async () => (await element.boundingBox())?.width ?? 0)
-    .toBeLessThanOrEqual(bounds.max);
-  await expect
-    .poll(async () => (await element.boundingBox())?.width ?? 0)
-    .toBeGreaterThan(bounds.min ?? 0);
-}
-
-async function readStoredContentWidth(page: Page): Promise<unknown> {
-  return page.evaluate((key) => {
-    const raw = localStorage.getItem(key);
-    return raw === null
-      ? undefined
-      : (JSON.parse(raw) as { contentMaxWidth?: unknown }).contentMaxWidth;
-  }, APP_SETTINGS_KEY);
-}
@@ -206,12 +206,6 @@ export async function createCreationScenario(page: Page) {
        )
        .toBe(count);
    },
-    async agentIds() {
-      await requests.settled();
-      return (await project.client.fetchAgents()).entries
-        .filter(({ agent }) => agent.workspaceId === workspaceId)
-        .map(({ agent }) => agent.id);
-    },
    async expectAgentTitle(title: string) {
      await expect
        .poll(
@@ -1,95 +0,0 @@
-import { expect, type Locator, type Page } from "@playwright/test";
-
-const EXTRA_HOSTS_KEY = "@paseo:e2e-extra-hosts";
-
-export interface LinkedHost {
-  serverId: string;
-  relayEndpoint: string;
-  daemonPublicKeyB64: string;
-}
-
-/**
- * A pairing link that opens on the settings page. `/` redirects to
- * `/open-project` on its own, so starting in settings leaves the pairing link
- * as the only thing that can move the app to `/open-project`.
- */
-export function buildPairingLink(host: LinkedHost): string {
-  const offer = {
-    v: 2,
-    serverId: host.serverId,
-    daemonPublicKeyB64: host.daemonPublicKeyB64,
-    relay: { endpoint: host.relayEndpoint, useTls: false },
-  };
-  const encoded = Buffer.from(JSON.stringify(offer), "utf8").toString("base64url");
-  return `/settings/general#offer=${encoded}`;
-}
-
-/** Loads the app from a pairing link, the way opening the link in a browser does. */
-export async function openPairingLink(page: Page, link: string): Promise<void> {
-  // Leave the link's page first so the link always loads the app from scratch.
-  await page.goto("/");
-  await page.goto(link);
-}
-
-/** Saves a relay host before the app loads, as if it had been paired in an earlier session. */
-export async function saveLinkedHostBeforeLoad(page: Page, host: LinkedHost): Promise<void> {
-  await page.goto("/");
-  const nowIso = new Date().toISOString();
-  const connectionId = `relay:${host.relayEndpoint}`;
-  const savedHost = {
-    serverId: host.serverId,
-    label: host.serverId,
-    connections: [
-      {
-        id: connectionId,
-        type: "relay",
-        relayEndpoint: host.relayEndpoint,
-        useTls: false,
-        daemonPublicKeyB64: host.daemonPublicKeyB64,
-      },
-    ],
-    preferredConnectionId: connectionId,
-    createdAt: nowIso,
-    updatedAt: nowIso,
-  };
-  await page.evaluate(({ key, hosts }) => localStorage.setItem(key, JSON.stringify(hosts)), {
-    key: EXTRA_HOSTS_KEY,
-    hosts: [savedHost],
-  });
-}
-
-export function hostConfirmation(page: Page): Locator {
-  return page.getByTestId("host-confirmation");
-}
-
-export async function expectHostConfirmationFor(page: Page, host: LinkedHost): Promise<void> {
-  const sheet = hostConfirmation(page);
-  await expect(sheet.getByText("Connect to this host?", { exact: true })).toBeVisible({
-    timeout: 30_000,
-  });
-  await expect(sheet.getByTestId("host-confirmation-server-id")).toHaveText(host.serverId);
-  await expect(sheet.getByTestId("host-confirmation-relay")).toHaveText(host.relayEndpoint);
-}
-
-export async function cancelHostConfirmation(page: Page): Promise<void> {
-  await hostConfirmation(page).getByRole("button", { name: "Cancel", exact: true }).click();
-  await expect(hostConfirmation(page)).toHaveCount(0);
-}
-
-export async function connectToConfirmedHost(page: Page): Promise<void> {
-  await hostConfirmation(page).getByRole("button", { name: "Connect", exact: true }).click();
-  await expect(hostConfirmation(page)).toHaveCount(0);
-}
-
-/** Checks the host picker on the settings page the app is already showing. */
-export async function expectHostInHostPicker(
-  page: Page,
-  serverId: string,
-  expected: "listed" | "not listed",
-): Promise<void> {
-  await page.getByTestId("settings-host-picker").click();
-  await expect(page.getByTestId(`settings-host-picker-item-${serverId}`)).toHaveCount(
-    expected === "listed" ? 1 : 0,
-  );
-  await page.keyboard.press("Escape");
-}
@@ -3,8 +3,6 @@ import { expect, test as base, type Page } from "../fixtures";
 import { gotoAppShell, openSettings } from "./app";
 import { goBackInSettings, openCompactSettings, openHostSection } from "./settings";
 import { getServerId } from "./server-id";
-import { expectAppRoute } from "./route-assertions";
-import { buildSettingsHostSectionRoute } from "@/utils/host-routes";
 import { connectNewWorkspaceDaemonClient } from "./new-workspace";

 type SettingsClient = Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
@@ -107,13 +105,6 @@ export async function returnAndReopenSettings(page: Page) {
  await page.getByRole("menuitem", { name: "Display", exact: true }).click();
  await expect(page.getByRole("switch", { name: "Show metadata" })).toBeVisible();
 }
-export async function returnToPluginsPage(page: Page) {
-  await page.getByRole("button", { name: "Back to plugins", exact: true }).click();
-  await expectAppRoute(page, buildSettingsHostSectionRoute(getServerId(), "plugins"));
-  await expect(
-    page.getByRole("button", { name: "Actions for settings-example", exact: true }),
-  ).toBeVisible();
-}
 export async function expectSettingsUnavailable(page: Page) {
  await expect(
    page.getByText("This plugin settings screen is unavailable.", { exact: true }),
@@ -12,6 +12,7 @@ describe("chat outline prompt index epoch", () => {
  it("accepts only the authoritative timeline epoch", () => {
    expect(shouldAcceptPromptIndexEpoch("epoch-2", "epoch-2")).toBe(true);
    expect(shouldAcceptPromptIndexEpoch("epoch-2", "epoch-1")).toBe(false);
+    expect(shouldAcceptPromptIndexEpoch(null, "epoch-1")).toBe(true);
  });
 });

@@ -2,8 +2,11 @@ import type { AgentTimelinePromptIndexPayload } from "@getpaseo/client/internal/

 export type ChatOutlinePrompt = AgentTimelinePromptIndexPayload["prompts"][number];

-export function shouldAcceptPromptIndexEpoch(timelineEpoch: string, indexEpoch: string): boolean {
-  return timelineEpoch === indexEpoch;
+export function shouldAcceptPromptIndexEpoch(
+  timelineEpoch: string | null,
+  indexEpoch: string,
+): boolean {
+  return timelineEpoch === null || timelineEpoch === indexEpoch;
 }

 /**
@@ -37,31 +37,6 @@ describe("useChatOutline", () => {
    runtime.subscribeAgentTimeline.mockClear();
  });

-  it("waits for a served timeline before requesting its prompt index", async () => {
-    runtime.listAgentTimelinePrompts.mockResolvedValue({ epoch: "epoch-1", prompts: [] });
-    const viewportRef = createRef<StreamViewportHandle>();
-    const { rerender } = renderHook(
-      ({ agentId, timelineEpoch }) =>
-        useChatOutline({
-          agentId,
-          serverId: "server-1",
-          timelineEpoch,
-          tail: [],
-          head: [],
-          enabled: true,
-          viewportRef,
-          onJumpError: vi.fn(),
-        }),
-      { initialProps: { agentId: "draft_msg_1", timelineEpoch: null as string | null } },
-    );
-
-    expect(runtime.listAgentTimelinePrompts).not.toHaveBeenCalled();
-
-    rerender({ agentId: "agent-1", timelineEpoch: "epoch-1" });
-    await waitFor(() => expect(runtime.listAgentTimelinePrompts).toHaveBeenCalledTimes(1));
-    expect(runtime.listAgentTimelinePrompts).toHaveBeenCalledWith("agent-1");
-  });
-
  it("drops a late prompt index after the authoritative timeline epoch changes", async () => {
    const first = deferred<{ epoch: string; prompts: [] }>();
    const second = deferred<{
@@ -77,10 +77,8 @@ export function useChatOutline({

  useEffect(() => setIndex(null), [agentId, enabled, serverId, timelineEpoch]);

-  // Only a timeline the daemon has served can be indexed. A draft's optimistic stream has no
-  // epoch, and its id names no agent the daemon knows.
  useEffect(() => {
-    if (!isWeb || !enabled || timelineEpoch === null) {
+    if (!isWeb || !enabled) {
      setIndex(null);
      return;
    }
@@ -210,17 +210,6 @@ describe("stream presentation through installed plugins", () => {
    expect(result.head).toMatchObject([{ text: "```ts\nconst a = 1;\n\nconst b = 2;" }]);
  });

-  // Codex streams a line break and the next line's indent as their own chunks.
-  it("keeps a line break when a chunk ends in the next line's indent", () => {
-    const harness = streamHarness();
-    harness.send(assistant("```mermaid\nflowchart TD\n    A[Start] --> B[Review]\n"));
-    harness.send(assistant("   "));
-    const result = harness.send(assistant(" B --> C[Finish]\n```"));
-    expect(result.head).toMatchObject([
-      { text: "```mermaid\nflowchart TD\n    A[Start] --> B[Review]\n    B --> C[Finish]\n```" },
-    ]);
-  });
-
  // One rendering path: a fetched message is the same block group as a streamed one,
  // which is what lets find, scroll-to-message and history reveal address it by id.
  // A link reference definition stays with the paragraph that uses it, so the split
@@ -112,10 +112,8 @@ export function createStreamPresentation() {
      const index = prefix.length + offset;
      let blockText = text;
      if (offset === textBlocks.length - 1) {
-        // The split drops trailing blank lines, including a line break followed only
-        // by the next line's indent. Keep them so the next append continues that line.
-        const trailingBlankLines = /\n\s*$/.exec(item.text)?.[0] ?? "";
-        blockText += trailingBlankLines;
+        const trailingNewlines = /\n+$/.exec(item.text)?.[0] ?? "";
+        blockText += trailingNewlines;
      }
      const existing = previous?.[index];
      const id = `${item.id}:block:${index}`;
@@ -1,7 +1,6 @@
 /**
 * @vitest-environment jsdom
 */
-import { DEFAULT_CONTENT_MAX_WIDTH } from "@/styles/theme";
 import React from "react";
 import { act } from "react";
 import { createRoot, type Root } from "react-dom/client";
@@ -145,7 +144,6 @@ describe("createWebStreamStrategy", () => {
            listStyle: null,
            baseListContentContainerStyle: null,
            forwardListContentContainerStyle: null,
-            contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
          })}
        </>,
      );
@@ -189,7 +187,6 @@ describe("createWebStreamStrategy", () => {
          listStyle: null,
          baseListContentContainerStyle: null,
          forwardListContentContainerStyle: null,
-          contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
        }),
      );
    });
@@ -236,7 +233,6 @@ describe("createWebStreamStrategy", () => {
      listStyle: null,
      baseListContentContainerStyle: null,
      forwardListContentContainerStyle: null,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
    };
    container = document.createElement("div");
    document.body.appendChild(container);
@@ -295,7 +291,6 @@ describe("createWebStreamStrategy", () => {
      listStyle: null,
      baseListContentContainerStyle: null,
      forwardListContentContainerStyle: null,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
    };
    const unrevised = {
      contentById: new Set<string>(),
@@ -359,7 +354,6 @@ describe("createWebStreamStrategy", () => {
      listStyle: null,
      baseListContentContainerStyle: null,
      forwardListContentContainerStyle: null,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
    };
    container = document.createElement("div");
    document.body.appendChild(container);
@@ -435,7 +429,6 @@ describe("createWebStreamStrategy", () => {
          listStyle: null,
          baseListContentContainerStyle: null,
          forwardListContentContainerStyle: null,
-          contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
        }),
      );
    });
@@ -480,7 +473,6 @@ describe("createWebStreamStrategy", () => {
          listStyle: null,
          baseListContentContainerStyle: null,
          forwardListContentContainerStyle: null,
-          contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
        }),
      );
    });
@@ -561,7 +553,6 @@ describe("createWebStreamStrategy", () => {
      listStyle: null,
      baseListContentContainerStyle: null,
      forwardListContentContainerStyle: null,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
    };
    container = document.createElement("div");
    document.body.appendChild(container);
@@ -655,7 +646,6 @@ describe("createWebStreamStrategy", () => {
      listStyle: null,
      baseListContentContainerStyle: null,
      forwardListContentContainerStyle: null,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
    };
    container = document.createElement("div");
    document.body.appendChild(container);
@@ -765,7 +755,6 @@ describe("createWebStreamStrategy", () => {
      listStyle: null,
      baseListContentContainerStyle: null,
      forwardListContentContainerStyle: null,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
    };
    container = document.createElement("div");
    document.body.appendChild(container);
@@ -871,7 +860,6 @@ describe("createWebStreamStrategy", () => {
      listStyle: null,
      baseListContentContainerStyle: null,
      forwardListContentContainerStyle: null,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
    };
    container = document.createElement("div");
    document.body.appendChild(container);
@@ -971,7 +959,6 @@ describe("createWebStreamStrategy", () => {
      listStyle: null,
      baseListContentContainerStyle: null,
      forwardListContentContainerStyle: null,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
    };
    container = document.createElement("div");
    document.body.appendChild(container);
@@ -1069,7 +1056,6 @@ describe("createWebStreamStrategy", () => {
      listStyle: null,
      baseListContentContainerStyle: null,
      forwardListContentContainerStyle: null,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
    };
    container = document.createElement("div");
    document.body.appendChild(container);
@@ -1189,7 +1175,6 @@ describe("createWebStreamStrategy", () => {
      listStyle: null,
      baseListContentContainerStyle: null,
      forwardListContentContainerStyle: null,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
    };
    container = document.createElement("div");
    document.body.appendChild(container);
@@ -1423,7 +1408,6 @@ describe("createWebStreamStrategy", () => {
      listStyle: null,
      baseListContentContainerStyle: null,
      forwardListContentContainerStyle: null,
-      contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
    };
    const renderWithActivity = (active: boolean, input: StreamRenderInput = renderInput) => (
      <RetainedPanelActivity active={active}>{strategy.render(input)}</RetainedPanelActivity>
@@ -303,7 +303,6 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
    hasOlderHistory,
    olderHistoryProgressKey,
    scrollEnabled,
-    contentMaxWidth,
    isMobileBreakpoint,
  } = props;
  const historyVirtualized = useRevisedHistoryRows(
@@ -404,7 +403,7 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
    getItemKey: (index: number) => segments.historyVirtualized[index]?.id ?? index,
    estimateSize: (index: number) => {
      const row = segments.historyVirtualized[index];
-      return row ? estimateStreamItemHeight(row, contentMaxWidth) : 120;
+      return row ? estimateStreamItemHeight(row) : 120;
    },
    measureElement: measureVirtualElement,
    rangeExtractor,
@@ -92,8 +92,6 @@ export interface StreamRenderInput {
  listStyle: StyleProp<ViewStyle>;
  baseListContentContainerStyle: StyleProp<ViewStyle>;
  forwardListContentContainerStyle: StyleProp<ViewStyle>;
-  // The chat column's max width. The web viewport estimates unmeasured row heights with it.
-  contentMaxWidth: number;
 }

 export interface ResolveStreamRenderStrategyInput {
@@ -1,6 +1,7 @@
 import React, { memo, useCallback, useMemo, type ReactNode } from "react";
 import { View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { MAX_CONTENT_WIDTH } from "@/constants/layout";
 import { SPACING, type Theme } from "@/styles/theme";
 import type { TurnTiming } from "@/timeline/turn-time";
 import type { StreamItem } from "@/types/stream";
@@ -214,7 +215,7 @@ function TurnFooterRow({ children }: { children: ReactNode }) {
 const stylesheet = StyleSheet.create((theme) => ({
  streamItemWrapper: {
    width: "100%",
-    maxWidth: theme.contentMaxWidth,
+    maxWidth: MAX_CONTENT_WIDTH,
    alignSelf: "center",
    paddingHorizontal: theme.spacing[2],
  },
@@ -23,7 +23,7 @@ import {
  type ViewStyle,
 } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
-import { useIsCompactFormFactor } from "@/constants/layout";
+import { MAX_CONTENT_WIDTH, useIsCompactFormFactor } from "@/constants/layout";
 import { useMutation } from "@tanstack/react-query";
 import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
 import { Check, ChevronDown, X } from "lucide-react-native";
@@ -55,7 +55,7 @@ import { useSessionStore } from "@/stores/session-store";
 import { useRevealedText } from "@/hooks/use-revealed-text";
 import { useFileExplorerActions } from "@/hooks/use-file-explorer-actions";
 import { useLoadOlderAgentHistory } from "@/hooks/use-load-older-agent-history";
-import { resolveContentMaxWidth, useSettings } from "@/hooks/use-settings";
+import { useSettings } from "@/hooks/use-settings";
 import type { ToastApi } from "@/components/toast-host";
 import { returnToTimelineTail } from "./timeline-tail-navigation";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
@@ -349,7 +349,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
    const autoExpandReasoning = useSettings((settings) => settings.autoExpandReasoning);
    const toolCallDetailLevel = useSettings((settings) => settings.toolCallDetailLevel);
    const chatOutlineEnabled = useSettings((settings) => settings.chatOutlineEnabled);
-    const contentMaxWidth = useSettings(resolveContentMaxWidth);
    const viewportRef = useRef<StreamViewportHandle | null>(null);
    const pendingClientMessageIds = useMemo(
      () => new Set(pendingMessageSubmissions.map((submission) => submission.clientMessageId)),
@@ -1130,7 +1129,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
                listStyle: stylesheet.list,
                baseListContentContainerStyle: stylesheet.listContentContainer,
                forwardListContentContainerStyle: stylesheet.forwardListContentContainer,
-                contentMaxWidth,
              })}
            </MessageOuterSpacingProvider>
            <ChatOutlineRail
@@ -1624,7 +1622,7 @@ const stylesheet = StyleSheet.create((theme) => ({
  },
  contentWrapper: {
    width: "100%",
-    maxWidth: theme.contentMaxWidth,
+    maxWidth: MAX_CONTENT_WIDTH,
    alignSelf: "center",
    paddingHorizontal: theme.spacing[2],
  },
@@ -1645,7 +1643,7 @@ const stylesheet = StyleSheet.create((theme) => ({
  },
  streamItemWrapper: {
    width: "100%",
-    maxWidth: theme.contentMaxWidth,
+    maxWidth: MAX_CONTENT_WIDTH,
    alignSelf: "center",
    paddingHorizontal: theme.spacing[2],
  },
@@ -1,5 +1,4 @@
 import { describe, expect, it } from "vitest";
-import { DEFAULT_CONTENT_MAX_WIDTH } from "@/styles/theme";
 import type { StreamItem } from "@/types/stream";
 import {
  clearAssistantImageMetadataCache,
@@ -124,8 +123,8 @@ describe("splitWebVirtualizedHistory", () => {

 describe("estimateStreamItemHeight", () => {
  it("uses compact estimates for collapsed tool sequence rows", () => {
-    expect(estimateStreamItemHeight(toolCall("tool", 1), DEFAULT_CONTENT_MAX_WIDTH)).toBe(40);
-    expect(estimateStreamItemHeight(thought("thought", 2), DEFAULT_CONTENT_MAX_WIDTH)).toBe(40);
+    expect(estimateStreamItemHeight(toolCall("tool", 1))).toBe(40);
+    expect(estimateStreamItemHeight(thought("thought", 2))).toBe(40);
  });

  it("uses a larger estimate for user messages with image attachments", () => {
@@ -147,7 +146,7 @@ describe("estimateStreamItemHeight", () => {
      ],
    };

-    expect(estimateStreamItemHeight(item, DEFAULT_CONTENT_MAX_WIDTH)).toBe(220);
+    expect(estimateStreamItemHeight(item)).toBe(220);
  });

  it("uses cached assistant image metadata when available", () => {
@@ -166,7 +165,7 @@ describe("estimateStreamItemHeight", () => {
      timestamp: createTimestamp(2),
    };

-    expect(estimateStreamItemHeight(item, DEFAULT_CONTENT_MAX_WIDTH)).toBeGreaterThan(220);
+    expect(estimateStreamItemHeight(item)).toBeGreaterThan(220);
  });
 });

@@ -58,12 +58,12 @@ export interface WebVirtualizedHistoryWindow {
  mountedEntries: IndexedStreamItem[];
 }

-export function estimateStreamItemHeight(item: StreamItem, contentMaxWidth: number): number {
+export function estimateStreamItemHeight(item: StreamItem): number {
  switch (item.kind) {
    case "user_message":
      return item.images && item.images.length > 0 ? 220 : 96;
    case "assistant_message":
-      return estimateAssistantMessageHeightFromCache(item.text, contentMaxWidth) ?? 220;
+      return estimateAssistantMessageHeightFromCache(item.text) ?? 220;
    case "tool_call":
      return COLLAPSED_TOOL_SEQUENCE_ROW_HEIGHT_ESTIMATE;
    case "thought":
@@ -45,7 +45,6 @@ import { WorkspaceSetupDialog } from "@/components/workspace-setup-dialog";
 import { WorkspaceShortcutTargetsSubscriber } from "@/components/workspace-shortcut-targets-subscriber";
 import { FloatingPanelPortalHost } from "@/components/ui/floating-panel-portal";
 import { HostChooserModal, useHostChooser } from "@/hosts/host-chooser";
-import { HostConfirmationSheet } from "@/hosts/host-confirmation-sheet";
 import {
  getIsElectronRuntime,
  HEADER_INNER_HEIGHT,
@@ -607,7 +606,6 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
        <CommandCenter />
        <AddProjectFlowHost />
        <HostChooserModal />
-        <HostConfirmationSheet />
        <ProviderSettingsHost />
        <WorkspaceSetupDialog />
        <KeyboardShortcutsDialog />
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState, useSyncExternalStore } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Pressable, Text, View } from "react-native";
 import { useLocalSearchParams, useRouter, type Href } from "expo-router";
@@ -7,12 +7,10 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { CameraView, useCameraPermissions } from "expo-camera";
 import type { BarcodeScanningResult, BarcodeSettings } from "expo-camera";
 import { getHostRuntimeStore } from "@/runtime/host-runtime";
-import { openPairScan } from "@/hosts/pair-scan-model";
 import { buildHostRootRoute, buildSettingsHostRoute } from "@/utils/host-routes";
 import { isWeb } from "@/constants/platform";
 import { BackHeader } from "@/components/headers/back-header";
 import { PairLinkModal } from "@/components/pair-link-modal";
-import { Button } from "@/components/ui/button";

 const styles = StyleSheet.create((theme) => ({
  container: {
@@ -75,9 +73,6 @@ const styles = StyleSheet.create((theme) => ({
    borderBottomWidth: 4,
    borderBottomRightRadius: 12,
  },
-  scanAgainButton: {
-    marginTop: theme.spacing[6],
-  },
  helperText: {
    marginTop: theme.spacing[6],
    color: theme.colors.foregroundMuted,
@@ -113,6 +108,16 @@ const styles = StyleSheet.create((theme) => ({
  },
 }));

+function extractOfferUrlFromScan(result: BarcodeScanningResult): string | null {
+  const raw = typeof result.data === "string" ? result.data.trim() : "";
+  if (!raw) return null;
+
+  if (raw.includes("#offer=") || raw.includes("#connect=") || raw.startsWith("relay://"))
+    return raw;
+
+  return null;
+}
+
 export default function PairScanScreen() {
  const { theme } = useUnistyles();
  const { t } = useTranslation();
@@ -124,6 +129,9 @@ export default function PairScanScreen() {
  const source = typeof params.source === "string" ? params.source : "settings";

  const [permission, requestPermission] = useCameraPermissions();
+  const [isPairing, setIsPairing] = useState(false);
+  const [scanError, setScanError] = useState<string | null>(null);
+  const [passwordOfferUrl, setPasswordOfferUrl] = useState<string | null>(null);

  const navigateToPairedHost = useCallback(
    (serverId: string) => {
@@ -136,19 +144,6 @@ export default function PairScanScreen() {
    [router, source],
  );

-  const [scan] = useState(() =>
-    openPairScan({
-      importConnectionLink: (link) =>
-        getHostRuntimeStore().importConnectionLink(
-          link,
-          source === "onboarding" ? "hostRoot" : "hostSettings",
-        ),
-      onConnected: navigateToPairedHost,
-    }),
-  );
-  const scanState = useSyncExternalStore(scan.subscribe, scan.getState, scan.getState);
-  useEffect(() => () => scan.close(), [scan]);
-
  const closeToSource = useCallback(() => {
    try {
      router.back();
@@ -164,12 +159,30 @@ export default function PairScanScreen() {
  }, [permission, requestPermission]);

  const handleScan = useCallback(
-    (result: BarcodeScanningResult) =>
-      scan.scan(typeof result.data === "string" ? result.data : ""),
-    [scan],
+    (result: BarcodeScanningResult) => {
+      if (isPairing) return;
+      const offerUrl = extractOfferUrlFromScan(result);
+      if (!offerUrl) return;
+
+      const store = getHostRuntimeStore();
+      if (passwordOfferUrl) return;
+      setIsPairing(true);
+      setScanError(null);
+      void store
+        .importConnectionLink(offerUrl, source === "onboarding" ? "hostRoot" : "hostSettings")
+        .then((outcome) => {
+          if (outcome.status === "connected") navigateToPairedHost(outcome.serverId);
+          else setPasswordOfferUrl(offerUrl);
+          return outcome;
+        })
+        .catch((error) => setScanError(error instanceof Error ? error.message : String(error)))
+        .finally(() => setIsPairing(false));
+    },
+    [isPairing, navigateToPairedHost, passwordOfferUrl, source],
  );

  const handleRouterBack = useCallback(() => router.back(), [router]);
+  const closePasswordModal = useCallback(() => setPasswordOfferUrl(null), []);
  const savePasswordPairing = useCallback(
    ({ serverId }: { serverId: string }) => navigateToPairedHost(serverId),
    [navigateToPairedHost],
@@ -227,38 +240,24 @@ export default function PairScanScreen() {
              barcodeScannerSettings={BARCODE_SCANNER_SETTINGS}
              onBarcodeScanned={handleScan}
            />
-            <View style={styles.overlay} pointerEvents="box-none">
+            <View style={styles.overlay} pointerEvents="none">
              <View style={styles.scanFrame}>
                <View style={[styles.corner, styles.cornerTL]} />
                <View style={[styles.corner, styles.cornerTR]} />
                <View style={[styles.corner, styles.cornerBL]} />
                <View style={[styles.corner, styles.cornerBR]} />
              </View>
-              {scanState.status === "pairing" ? (
-                <Text style={helperTextStyle}>{t("pairing.scan.pairing")}</Text>
-              ) : null}
-              {scanState.status === "stopped" && scanState.error ? (
-                <Text style={helperTextStyle}>{scanState.error}</Text>
-              ) : null}
-              {scanState.status === "stopped" ? (
-                <Button
-                  style={styles.scanAgainButton}
-                  onPress={scan.scanAgain}
-                  testID="pair-scan-again"
-                >
-                  {t("pairing.connectionMethods.scanQr.title")}
-                </Button>
-              ) : null}
+              {isPairing ? <Text style={helperTextStyle}>{t("pairing.scan.pairing")}</Text> : null}
+              {scanError ? <Text style={helperTextStyle}>{scanError}</Text> : null}
            </View>
          </View>
        )}
      </View>
      <PairLinkModal
-        visible={scanState.status === "passwordRequired"}
-        passwordRequired={
-          scanState.status === "passwordRequired" ? scanState.passwordRequired : undefined
-        }
-        onClose={scan.closePassword}
+        visible={passwordOfferUrl !== null}
+        initialUrl={passwordOfferUrl ?? undefined}
+        initialPasswordRequired
+        onClose={closePasswordModal}
        onSaved={savePasswordPairing}
      />
    </View>
@@ -37,7 +37,6 @@ interface FakeTheme {
    "4xl": number;
  };
  lineHeight: { diff: number };
-  contentMaxWidth: number;
  colors: { foreground: string; syntax: Record<string, string> };
 }

@@ -57,7 +56,6 @@ function makeFakeTheme(): FakeTheme {
      "4xl": 26,
    },
    lineHeight: { diff: 22 },
-    contentMaxWidth: 820,
    colors: { foreground: "#fff", syntax: {} },
  };
 }
@@ -69,7 +67,6 @@ function makeInput(overrides: Partial<AppearanceInput> = {}): AppearanceInput {
    uiBaseFontSize: 14,
    contentFontSize: 15,
    codeFontSize: 12,
-    contentMaxWidth: 820,
    syntaxTheme: "one",
    ...overrides,
  };
@@ -105,12 +102,6 @@ describe("applyAppearance", () => {
    ]);
  });

-  it("patches the content max width into the theme", () => {
-    applyAppearance(makeInput({ contentMaxWidth: 1600 }));
-
-    expect(runCapturedUpdater().contentMaxWidth).toBe(1600);
-  });
-
  it("resolves an empty UI font family to the default stack", () => {
    applyAppearance(makeInput({ uiFontFamily: "" }));

@@ -17,7 +17,6 @@ export interface AppearanceInput {
  uiBaseFontSize: number; // already clamped
  contentFontSize: number; // already clamped
  codeFontSize: number; // already clamped
-  contentMaxWidth: number; // already clamped, default resolved
  syntaxTheme: SyntaxThemeId;
 }

@@ -56,7 +55,7 @@ function scaleFontSize(
 * always current and makes ordering vs `setTheme`/`setAdaptiveThemes` irrelevant.
 *
 * The updater preserves the active theme wholesale (surfaces, accents,
- * terminal) and only patches the font ramp, content width, and syntax palette.
+ * terminal) and only patches the font ramp and syntax palette.
 * `updateTheme` replaces the stored theme rather than merging, so we spread
 * `...t` first.
 */
@@ -87,7 +86,6 @@ export function applyAppearance(input: AppearanceInput): void {
          fontFamily,
          fontSize,
          lineHeight,
-          contentMaxWidth: input.contentMaxWidth,
          colors: { ...t.colors, syntax: resolveSyntaxColors(input.syntaxTheme, t.colorScheme) },
        };
      }
@@ -96,7 +94,6 @@ export function applyAppearance(input: AppearanceInput): void {
        fontFamily,
        fontSize,
        lineHeight,
-        contentMaxWidth: input.contentMaxWidth,
        colors: { ...t.colors, syntax: resolveSyntaxColors(input.syntaxTheme, t.colorScheme) },
      };
    });
@@ -8,12 +8,7 @@ import {
  useState,
 } from "react";
 import { UnistylesRuntime } from "react-native-unistyles";
-import {
-  DEFAULT_THEME_PREFERENCE,
-  resolveContentMaxWidth,
-  useAppSettings,
-  type AppSettings,
-} from "@/hooks/use-settings";
+import { DEFAULT_THEME_PREFERENCE, useAppSettings, type AppSettings } from "@/hooks/use-settings";
 import {
  rememberPluginThemeHost,
  usePluginThemeCatalog,
@@ -73,7 +68,6 @@ export function AppearanceProvider({ children }: { children: ReactNode }) {
      uiBaseFontSize: settings.uiBaseFontSize,
      contentFontSize: settings.contentFontSize,
      codeFontSize: settings.codeFontSize,
-      contentMaxWidth: resolveContentMaxWidth({ contentMaxWidth: settings.contentMaxWidth }),
      syntaxTheme: settings.syntaxTheme,
    });
    setHasAppliedAppearance(true);
@@ -86,7 +80,6 @@ export function AppearanceProvider({ children }: { children: ReactNode }) {
    settings.uiBaseFontSize,
    settings.contentFontSize,
    settings.codeFontSize,
-    settings.contentMaxWidth,
    settings.syntaxTheme,
  ]);

@@ -1,8 +1,8 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { ReactNode } from "react";
 import { createPortal } from "react-dom";
 import { useTranslation } from "react-i18next";
-import { Keyboard, Pressable, Text, View } from "react-native";
+import { Modal, Platform, Pressable, Text, View } from "react-native";
 import type { DimensionValue, StyleProp, ViewStyle } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -19,6 +19,7 @@ import {
  type BottomSheetBackgroundProps,
 } from "@gorhom/bottom-sheet";
 import Animated, { useAnimatedStyle } from "react-native-reanimated";
+import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { ArrowLeft, Search, X } from "lucide-react-native";
 import {
  IsolatedBottomSheetModal,
@@ -74,15 +75,11 @@ export interface SheetHeader {

 const SCROLL_CONTENT_GROW = { flexGrow: 1 };
 const ABSOLUTE_FILL_STYLE = { ...StyleSheet.absoluteFillObject };
-const NATIVE_DIALOG_SNAP_POINTS = ["100%"];

 const styles = StyleSheet.create((theme) => ({
-  nativeDialogSurface: {
+  nativeModalRoot: {
    flex: 1,
  },
-  nativeDialogBackground: {
-    backgroundColor: "transparent",
-  },
  desktopOverlay: {
    ...StyleSheet.absoluteFillObject,
    backgroundColor: "rgba(0,0,0,0.55)",
@@ -474,7 +471,7 @@ export interface AdaptiveModalSheetProps {
  contentStyle?: StyleProp<ViewStyle>;
  /** Size compact sheet content to the live snap height instead of its largest snap point. */
  sizeContentToCurrentSnapPoint?: boolean;
-  /** Re-establishes caller-owned contexts inside the native or compact sheet portal. */
+  /** Re-establishes caller-owned contexts inside the compact bottom-sheet portal. */
  contextBridge?: ContextBridge | null;
 }

@@ -529,26 +526,26 @@ export function AdaptiveModalSheet({
    () => ({ backgroundColor: theme.colors.palette.zinc[600] }),
    [theme.colors.palette.zinc],
  );
-  useEffect(() => {
-    if (!isWeb && visible) {
-      // A newly opened sheet owns input. A keyboard belonging to the sheet below
-      // would cover controls in the new sheet, which has no focused input yet.
-      Keyboard.dismiss();
-    }
-  }, [visible]);
-
  const { sheetRef, handleSheetChange, handleSheetDismiss } = useIsolatedBottomSheetVisibility({
    visible,
-    isEnabled: isMobile || !isWeb,
+    isEnabled: isMobile,
    onClose,
  });
  const [shouldRenderWeb, setShouldRenderWeb] = useState(visible);
  const [isWebClosing, setIsWebClosing] = useState(false);
  const modalLayer = useGlobalWebOverlayLayer("modal", isWeb && !isMobile && shouldRenderWeb);
+  const nativeModalDismissNotifiedRef = useRef(!visible);
  const handleDismiss = useCallback(() => {
    handleSheetDismiss();
    onDismiss?.();
  }, [handleSheetDismiss, onDismiss]);
+  const notifyNativeModalDismiss = useCallback(() => {
+    if (nativeModalDismissNotifiedRef.current) {
+      return;
+    }
+    nativeModalDismissNotifiedRef.current = true;
+    onDismiss?.();
+  }, [onDismiss]);

  const renderBackdrop = useCallback(
    (props: React.ComponentProps<typeof BottomSheetBackdrop>) => (
@@ -595,6 +592,12 @@ export function AdaptiveModalSheet({
    onKeyDown: handleWebOverlayKeyDown,
  });

+  useEffect(() => {
+    if (visible) {
+      nativeModalDismissNotifiedRef.current = false;
+    }
+  }, [visible]);
+
  useEffect(() => {
    if (!isWeb || isMobile) return;
    if (visible) {
@@ -612,6 +615,12 @@ export function AdaptiveModalSheet({
    return () => window.clearTimeout(timeout);
  }, [visible, isMobile, onDismiss, shouldRenderWeb]);

+  useEffect(() => {
+    if (isWeb || isMobile || visible || Platform.OS !== "android") return;
+    const timeout = setTimeout(notifyNativeModalDismiss, 0);
+    return () => clearTimeout(timeout);
+  }, [visible, isMobile, notifyNativeModalDismiss]);
+
  if (isMobile) {
    const sheetContent = (
      <>
@@ -716,28 +725,18 @@ export function AdaptiveModalSheet({
  }

  return (
-    // Both native presentations share Gorhom's app-wide stack. Independent RN Modals
-    // present from their React ancestor's controller, so a root-owned sibling dialog
-    // cannot present while that controller already has a dialog open on iOS.
-    <IsolatedBottomSheetModal
-      ref={sheetRef}
-      contextBridge={contextBridge}
-      snapPoints={NATIVE_DIALOG_SNAP_POINTS}
-      index={0}
-      enableDynamicSizing={false}
-      onChange={handleSheetChange}
-      onDismiss={handleDismiss}
-      handleComponent={null}
-      backgroundStyle={styles.nativeDialogBackground}
-      enablePanDownToClose={false}
-      enableHandlePanningGesture={false}
-      enableContentPanningGesture={false}
-      keyboardBehavior="extend"
-      keyboardBlurBehavior="restore"
-      accessible={false}
-      presentation={presentation}
+    <Modal
+      transparent
+      animationType="fade"
+      visible={visible}
+      onRequestClose={onClose}
+      onDismiss={notifyNativeModalDismiss}
+      hardwareAccelerated
    >
-      <View style={styles.nativeDialogSurface}>{desktopContent}</View>
-    </IsolatedBottomSheetModal>
+      {/* Android Modal opens a separate window outside the app's gesture root. */}
+      <GestureHandlerRootView style={styles.nativeModalRoot}>
+        {desktopContent}
+      </GestureHandlerRootView>
+    </Modal>
  );
 }
@@ -294,23 +294,11 @@ export interface AddHostModalProps {
 }

 export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostModalProps) {
-  return (
-    <AddHostModalContent
-      key={String(visible)}
-      visible={visible}
-      onClose={onClose}
-      onCancel={onCancel}
-      onSaved={onSaved}
-    />
-  );
-}
-
-function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostModalProps) {
  const { theme } = useUnistyles();
  const { t } = useTranslation();
  const daemons = useHosts();
-  const { probeAndUpsertDirectConnection, beginLinkPairing } = useHostMutations();
-  const [linkPairing] = useState(() => beginLinkPairing());
+  const { probeAndUpsertDirectConnection, probeAndUpsertConnectionFromOfferUrl } =
+    useHostMutations();
  const isMobile = useIsCompactFormFactor();

  const [isSaving, setIsSaving] = useState(false);
@@ -325,6 +313,18 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
  const [inputResetKey, bumpInputResetKey] = useReducer((key: number) => key + 1, 0);
  const advancedTarget = useRef(new PairingTargetTracker("", true));

+  const clearInput = useCallback(() => {
+    setHost("");
+    setPort("6767");
+    setUseTls(false);
+    setPassword("");
+    setIsPasswordVisible(false);
+    setIsAdvancedOpen(false);
+    setAdvancedUri("");
+    advancedTarget.current = new PairingTargetTracker("", true);
+    bumpInputResetKey();
+  }, []);
+
  const connectIcon = useMemo(
    () => <Link2 size={16} color={theme.colors.accentForeground} />,
    [theme.colors.accentForeground],
@@ -358,25 +358,29 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
  );
  const header = useMemo<SheetHeader>(() => ({ title: t("pairing.direct.title") }), [t]);

-  // Each open mounts a fresh form (see AddHostModal), so closing needs no reset.
  const handleClose = useCallback(() => {
    if (isSaving) return;
+    clearInput();
+    setErrorMessage("");
    onClose();
-  }, [isSaving, onClose]);
+  }, [isSaving, clearInput, onClose]);

  const handleCancel = useCallback(() => {
    if (isSaving) return;
+    clearInput();
+    setErrorMessage("");
    (onCancel ?? onClose)();
-  }, [isSaving, onCancel, onClose]);
+  }, [isSaving, clearInput, onCancel, onClose]);

  const handleSaveRelay = useCallback(
    async (relayUri: string) => {
      try {
        setIsSaving(true);
        setErrorMessage("");
-        const result = await linkPairing.submit(relayUri, password || undefined);
-        if (result.status === "cancelled") return;
-        const { profile, serverId, hostname } = result;
+        const { profile, serverId, hostname } = await probeAndUpsertConnectionFromOfferUrl(
+          relayUri,
+          password || undefined,
+        );
        const isNewHost = !daemons.some((daemon) => daemon.serverId === serverId);
        onSaved?.({ profile, serverId, hostname, isNewHost });
        handleClose();
@@ -392,9 +396,9 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
      daemons,
      directConnectionLabels.invalidConnection,
      handleClose,
-      linkPairing,
      onSaved,
      password,
+      probeAndUpsertConnectionFromOfferUrl,
    ],
  );

@@ -2,7 +2,7 @@ import { useCallback, useState } from "react";
 import { View, Text } from "react-native";
 import { useTranslation } from "react-i18next";
 import { StyleSheet } from "react-native-unistyles";
-import { FOOTER_HEIGHT } from "@/constants/layout";
+import { FOOTER_HEIGHT, MAX_CONTENT_WIDTH } from "@/constants/layout";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import { KeyboardTranslateView } from "@/keyboard/shift";
 import { Button } from "@/components/ui/button";
@@ -77,7 +77,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
  },
  inputAreaContent: {
    width: "100%",
-    maxWidth: theme.contentMaxWidth,
+    maxWidth: MAX_CONTENT_WIDTH,
  },
  callout: {
    flexDirection: "row",
@@ -117,6 +117,7 @@ export function ContextWindowMeter({
          width={geometry.svgSize}
          height={geometry.svgSize}
          viewBox={`0 0 ${geometry.svgSize} ${geometry.svgSize}`}
+          style={styles.svg}
          accessibilityElementsHidden
          importantForAccessibility="no-hide-descendants"
        >
@@ -157,6 +158,7 @@ export function ContextWindowMeter({
            width={svgSize}
            height={svgSize}
            viewBox={`0 0 ${svgSize} ${svgSize}`}
+            style={styles.svg}
            accessibilityElementsHidden
            importantForAccessibility="no-hide-descendants"
          >
@@ -178,8 +180,6 @@ export function ContextWindowMeter({
              strokeLinecap="round"
              strokeDasharray={circumference}
              strokeDashoffset={dashOffset}
-              // SVG strokes start at three o'clock; the ring reads clockwise from twelve.
-              transform={`rotate(-90 ${center} ${center})`}
            />
          </Svg>
          {showPercentage ? (
@@ -226,6 +226,9 @@ const styles = StyleSheet.create((theme) => ({
    gap: theme.spacing[1],
    borderRadius: theme.borderRadius.full,
  },
+  svg: {
+    transform: [{ rotate: "-90deg" }],
+  },
  percentageLabel: {
    color: theme.colors.foregroundMuted,
    fontSize: theme.fontSize.base,
@@ -5,7 +5,7 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
 import { Link } from "lucide-react-native";
 import type { HostProfile } from "@/types/host-connection";
-import { useHosts, useHostMutations, type PasswordRequiredPairing } from "@/runtime/host-runtime";
+import { useHosts, useHostMutations } from "@/runtime/host-runtime";
 import { parseRelayConnectionUri } from "@/utils/daemon-endpoints";
 import { parseConnectionOfferFromUrl } from "@getpaseo/protocol/connection-offer";
 import { AdaptiveModalSheet, AdaptiveTextInput, type SheetHeader } from "./adaptive-modal-sheet";
@@ -62,8 +62,8 @@ const styles = StyleSheet.create((theme) => ({

 export interface PairLinkModalProps {
  visible: boolean;
-  /** Continues a confirmed pairing whose host asked for a password. */
-  passwordRequired?: PasswordRequiredPairing;
+  initialUrl?: string;
+  initialPasswordRequired?: boolean;
  onClose: () => void;
  onCancel?: () => void;
  onSaved?: (result: {
@@ -76,16 +76,18 @@ export interface PairLinkModalProps {

 export function PairLinkModal({
  visible,
-  passwordRequired,
+  initialUrl,
+  initialPasswordRequired = false,
  onClose,
  onCancel,
  onSaved,
 }: PairLinkModalProps) {
  return (
    <PairLinkModalContent
-      key={`${visible}:${passwordRequired?.link ?? ""}`}
+      key={`${visible}:${initialUrl ?? ""}:${initialPasswordRequired}`}
      visible={visible}
-      passwordRequired={passwordRequired}
+      initialUrl={initialUrl}
+      initialPasswordRequired={initialPasswordRequired}
      onClose={onClose}
      onCancel={onCancel}
      onSaved={onSaved}
@@ -95,7 +97,8 @@ export function PairLinkModal({

 function PairLinkModalContent({
  visible,
-  passwordRequired,
+  initialUrl,
+  initialPasswordRequired = false,
  onClose,
  onCancel,
  onSaved,
@@ -103,9 +106,7 @@ function PairLinkModalContent({
  const { theme } = useUnistyles();
  const { t } = useTranslation();
  const daemons = useHosts();
-  const { beginLinkPairing } = useHostMutations();
-  const [pairing] = useState(() => passwordRequired?.pairing ?? beginLinkPairing());
-  const initialUrl = passwordRequired?.link;
+  const { probeAndUpsertConnectionFromOfferUrl } = useHostMutations();
  const isMobile = useIsCompactFormFactor();

  const offerUrlRef = useRef(initialUrl ?? "");
@@ -114,7 +115,7 @@ function PairLinkModalContent({
  const [isSaving, setIsSaving] = useState(false);
  const [errorMessage, setErrorMessage] = useState("");
  const [password, setPassword] = useState("");
-  const [needsPassword, setNeedsPassword] = useState(passwordRequired !== undefined);
+  const [needsPassword, setNeedsPassword] = useState(initialPasswordRequired);
  const [passwordResetKey, resetPasswordInput] = useReducer((key: number) => key + 1, 0);

  const clearInput = useCallback(() => {
@@ -161,9 +162,10 @@ function PairLinkModalContent({
      try {
        setIsSaving(true);
        setErrorMessage("");
-        const result = await pairing.submit(raw, password || undefined);
-        if (result.status === "cancelled") return;
-        const { profile, serverId, hostname } = result;
+        const { profile, serverId, hostname } = await probeAndUpsertConnectionFromOfferUrl(
+          raw,
+          password || undefined,
+        );
        const isNewHost = !daemons.some((daemon) => daemon.serverId === serverId);
        onSaved?.({ profile, serverId, hostname, isNewHost });
        handleClose();
@@ -182,7 +184,16 @@ function PairLinkModalContent({
        setIsSaving(false);
      }
    },
-    [daemons, handleClose, isMobile, isSaving, onSaved, password, t, pairing],
+    [
+      daemons,
+      handleClose,
+      isMobile,
+      isSaving,
+      onSaved,
+      password,
+      t,
+      probeAndUpsertConnectionFromOfferUrl,
+    ],
  );

  const handleChangeOfferUrl = useCallback((next: string) => {
@@ -1,4 +1,4 @@
-import { type ReactNode, useCallback } from "react";
+import { useCallback } from "react";
 import { Import, Plus } from "lucide-react-native";
 import { useTranslation } from "react-i18next";
 import { Text, View } from "react-native";
@@ -6,28 +6,6 @@ import { StyleSheet } from "react-native-unistyles";
 import { Button } from "@/components/ui/button";
 import { useSidebarViewStore } from "@/stores/sidebar-view-store";

-function SidebarEmptyStateCard({
-  testID,
-  title,
-  description,
-  children,
-}: {
-  testID: string;
-  title: string;
-  description: string;
-  children: ReactNode;
-}) {
-  return (
-    <View style={styles.card} testID={testID}>
-      <View style={styles.copy}>
-        <Text style={styles.title}>{title}</Text>
-        <Text style={styles.description}>{description}</Text>
-      </View>
-      <View style={styles.actions}>{children}</View>
-    </View>
-  );
-}
-
 /**
 * The two things the sidebar's workspace list says when it has no rows.
 *
@@ -49,15 +27,13 @@ export function SidebarFilterEmptyState() {
  }, [clearLabelFilter, clearProjectFilters]);

  return (
-    <SidebarEmptyStateCard
-      testID="sidebar-filter-empty-state"
-      title={t("sidebar.filterEmpty.title")}
-      description={t("sidebar.filterEmpty.description")}
-    >
-      <Button variant="secondary" size="xs" onPress={clearFilters}>
+    <View style={styles.container} testID="sidebar-filter-empty-state">
+      <Text style={styles.title}>{t("sidebar.filterEmpty.title")}</Text>
+      <Text style={styles.description}>{t("sidebar.filterEmpty.description")}</Text>
+      <Button variant="ghost" size="sm" onPress={clearFilters}>
        {t("sidebar.filterEmpty.clear")}
      </Button>
-    </SidebarEmptyStateCard>
+    </View>
  );
 }

@@ -71,44 +47,40 @@ export function SidebarProjectEmptyState({
  const { t } = useTranslation();

  return (
-    <SidebarEmptyStateCard
-      testID="sidebar-project-empty-state"
-      title={t("sidebar.project.empty.title")}
-      description={t("sidebar.project.empty.description")}
-    >
-      <Button variant="secondary" size="xs" leftIcon={Plus} onPress={onAddProject}>
+    <View style={styles.container} testID="sidebar-project-empty-state">
+      <Text style={styles.title}>{t("sidebar.project.empty.title")}</Text>
+      <Text style={styles.description}>{t("sidebar.project.empty.description")}</Text>
+      <Button variant="ghost" size="sm" leftIcon={Plus} onPress={onAddProject}>
        {t("sidebar.actions.addProject")}
      </Button>
-      <Button variant="outline" size="xs" leftIcon={Import} onPress={onImportSession}>
+      <Button variant="ghost" size="sm" leftIcon={Import} onPress={onImportSession}>
        {t("importSession.title")}
      </Button>
-    </SidebarEmptyStateCard>
+    </View>
  );
 }

 const styles = StyleSheet.create((theme) => ({
-  card: {
-    marginTop: theme.spacing[3],
-    padding: theme.spacing[4],
-    borderWidth: 1,
-    borderColor: theme.colors.border,
-    borderRadius: theme.borderRadius.lg,
-  },
-  copy: {
-    gap: theme.spacing[1],
-  },
-  actions: {
-    flexDirection: "row",
-    gap: theme.spacing[2],
+  container: {
+    marginHorizontal: theme.spacing[2],
    marginTop: theme.spacing[4],
+    paddingTop: theme.spacing[6],
+    paddingBottom: theme.spacing[4],
+    paddingHorizontal: theme.spacing[4],
+    borderRadius: theme.borderRadius.lg,
+    backgroundColor: theme.colors.surface0,
+    alignItems: "center",
+    gap: theme.spacing[3],
  },
  title: {
    color: theme.colors.foreground,
    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.normal,
+    fontWeight: theme.fontWeight.medium,
+    textAlign: "center",
  },
  description: {
    color: theme.colors.foregroundMuted,
    fontSize: theme.fontSize.sm,
+    textAlign: "center",
  },
 }));
@@ -462,7 +462,7 @@ export function WorkspaceSetupDialog() {
            cwd={sourceDirectory}
            clearDraft={chatDraft.clear}
            autoFocus
-            commandDraft={composerState?.commandDraft}
+            commandDraftConfig={composerState?.commandDraftConfig}
            agentControls={agentControlsWithDisabled}
            inputWrapperStyle={styles.composerInputWrapper}
          />
@@ -1357,10 +1357,6 @@ function DesktopFeatureItem({
  if (feature.type === "select") {
    const FeatureIcon = getAgentFeatureIcon(feature.icon);
    const selectedOption = feature.options.find((o) => o.id === feature.value);
-    const iconOnly = feature.desktopTrigger === "icon";
-    const tooltip = iconOnly
-      ? `${feature.label}: ${selectedOption?.label ?? feature.label}`
-      : getFeatureTooltip(feature);
    return (
      <>
        <Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile={false}>
@@ -1371,16 +1367,15 @@ function DesktopFeatureItem({
              surface="toolbar"
              label={feature.label}
              value={selectedOption?.label ?? feature.label}
-              showToolbarLabel={!iconOnly}
              open={openSelector === featureSelector}
              disabled={disabled}
              onPress={handleSelectPress}
-              accessibilityLabel={tooltip}
+              accessibilityLabel={getFeatureTooltip(feature)}
              testID={`agent-feature-${feature.id}`}
            />
          </TooltipTrigger>
          <TooltipContent side="top" align="center" offset={8}>
-            <Text style={styles.tooltipText}>{tooltip}</Text>
+            <Text style={styles.tooltipText}>{getFeatureTooltip(feature)}</Text>
          </TooltipContent>
        </Tooltip>
        <Combobox
@@ -2,8 +2,7 @@ import { ComposerDockBackground } from "./internal/background";
 export { ComposerDockBackground } from "./internal/background";
 import { ScrollView } from "@/components/ui/scroll-view";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { HEADER_INNER_HEIGHT } from "@/constants/layout";
-import { resolveContentMaxWidth, useAppSettings } from "@/hooks/use-settings";
+import { HEADER_INNER_HEIGHT, MAX_CONTENT_WIDTH } from "@/constants/layout";
 import { KeyboardTranslateView } from "@/keyboard/shift";
 import { createContext, useCallback, useContext, type ReactNode } from "react";
 import { View, type LayoutChangeEvent, type ViewProps, StyleSheet } from "react-native";
@@ -90,7 +89,6 @@ export function ComposerDock({
  centered = false,
 }: ComposerDockProps) {
  const insets = useSafeAreaInsets();
-  const contentMaxWidth = resolveContentMaxWidth(useAppSettings().settings);
  // Preserve the existing centered form's visual balance on tablets.
  const bottomInset = centered ? HEADER_INNER_HEIGHT + 24 : 0;
  if (centered) {
@@ -100,7 +98,7 @@ export function ComposerDock({
        bottomInset={bottomInset}
        centered
      >
-        <KeyboardTranslateView style={[dockStyles.centered, { maxWidth: contentMaxWidth }]}>
+        <KeyboardTranslateView style={dockStyles.centered}>
          <ComposerViewportContent style={dockStyles.composer}>
            <ScrollView style={dockStyles.setup} keyboardShouldPersistTaps="handled">
              {content}
@@ -139,15 +137,13 @@ export function ComposerDock({
  );
 }

-// Plain React Native styles: these land on Reanimated views, which must not carry
-// theme-driven Unistyles (docs/unistyles.md). The content width arrives inline.
 const dockStyles = StyleSheet.create({
  viewport: { flex: 1, overflow: "hidden" },
  surface: { flex: 1 },
  content: { flex: 1, justifyContent: "flex-end" },
  composer: { width: "100%", flexShrink: 1 },
  centeredViewport: { flex: 1, alignItems: "center", justifyContent: "center" },
-  centered: { flexShrink: 1, width: "100%" },
+  centered: { flexShrink: 1, width: "100%", maxWidth: MAX_CONTENT_WIDTH },
  // Reserve the composer's own capped height before the setup scroll view shrinks.
  centeredComposer: { width: "100%", flexShrink: 0 },
  setup: { flexGrow: 0, flexShrink: 1, minHeight: 0 },
@@ -1,9 +1,8 @@
 export { ComposerDockBackground } from "./internal/background";
 import { ScrollView } from "@/components/ui/scroll-view";
 import type { ReactNode } from "react";
-import { View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { HEADER_INNER_HEIGHT } from "@/constants/layout";
+import { View, StyleSheet } from "react-native";
+import { HEADER_INNER_HEIGHT, MAX_CONTENT_WIDTH } from "@/constants/layout";

 interface ComposerDockProps {
  children: [ReactNode, ReactNode, ReactNode?];
@@ -36,7 +35,7 @@ export function ComposerDock({
  );
 }

-const styles = StyleSheet.create((theme) => ({
+const styles = StyleSheet.create({
  surface: { flex: 1, overflow: "hidden" },
  content: { flex: 1, justifyContent: "flex-end" },
  composer: { width: "100%", flexShrink: 1 },
@@ -46,7 +45,7 @@ const styles = StyleSheet.create((theme) => ({
    justifyContent: "center",
    paddingBottom: HEADER_INNER_HEIGHT + 24,
  },
-  form: { flexShrink: 1, width: "100%", maxWidth: theme.contentMaxWidth },
+  form: { flexShrink: 1, width: "100%", maxWidth: MAX_CONTENT_WIDTH },
  centeredComposer: { flexShrink: 0 },
  setup: { flexGrow: 0, flexShrink: 1, minHeight: 0 },
-}));
+});
@@ -198,15 +198,12 @@ describe("useAgentInputDraft live contract", () => {
    });

    expect(getLatest().composerState?.agentControls.selectedProvider).toBe("codex");
-    expect(getLatest().composerState?.commandDraft).toEqual({
-      status: "ready",
-      config: {
-        provider: "codex",
-        cwd: "/repo",
-        modeId: "auto",
-        model: "gpt-5.4",
-        thinkingOptionId: "high",
-      },
+    expect(getLatest().composerState?.commandDraftConfig).toEqual({
+      provider: "codex",
+      cwd: "/repo",
+      modeId: "auto",
+      model: "gpt-5.4",
+      thinkingOptionId: "high",
    });

    const hydratedTextReplacement = getLatest().textReplacement;
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 import { hasDraftContent, resolveDraftKey } from "./input-draft-core";
 import {
-  buildDraftCommandTarget,
+  buildDraftCommandConfig,
  resolveEffectiveComposerModelId,
  resolveEffectiveComposerThinkingOptionId,
 } from "@/provider-selection/provider-selection";
@@ -124,55 +124,46 @@ describe("resolveEffectiveComposerThinkingOptionId", () => {
  });
 });

-describe("buildDraftCommandTarget", () => {
-  const codexSelection = {
-    provider: "codex",
-    modelId: "gpt-5.4",
-    modeId: "auto",
-    thinkingOptionId: "high",
-    availableModels: [],
-    modeOptions: [{ id: "auto", label: "Auto" }],
-  };
-
-  it("needs a project when cwd is empty", () => {
+describe("buildDraftComposerCommandConfig", () => {
+  it("returns undefined when cwd is empty", () => {
    expect(
-      buildDraftCommandTarget({
-        selection: codexSelection,
+      buildDraftCommandConfig({
+        selection: {
+          provider: "codex",
+          modelId: "gpt-5.4",
+          modeId: "",
+          thinkingOptionId: "",
+          availableModels: [],
+          modeOptions: [],
+        },
        cwd: "  ",
        effectiveModelId: "gpt-5.4",
        effectiveThinkingOptionId: "high",
      }),
-    ).toEqual({ status: "needs-project" });
-  });
-
-  it("needs a provider when none is selected", () => {
-    expect(
-      buildDraftCommandTarget({
-        selection: { ...codexSelection, provider: null },
-        cwd: "/repo",
-        effectiveModelId: "",
-        effectiveThinkingOptionId: "",
-      }),
-    ).toEqual({ status: "needs-provider" });
+    ).toBeUndefined();
  });

  it("builds the draft command config from derived composer state", () => {
    expect(
-      buildDraftCommandTarget({
-        selection: codexSelection,
+      buildDraftCommandConfig({
+        selection: {
+          provider: "codex",
+          modelId: "gpt-5.4",
+          modeId: "auto",
+          thinkingOptionId: "high",
+          availableModels: [],
+          modeOptions: [{ id: "auto", label: "Auto" }],
+        },
        cwd: "/repo",
        effectiveModelId: "gpt-5.4",
        effectiveThinkingOptionId: "high",
      }),
    ).toEqual({
-      status: "ready",
-      config: {
-        provider: "codex",
-        cwd: "/repo",
-        modeId: "auto",
-        model: "gpt-5.4",
-        thinkingOptionId: "high",
-      },
+      provider: "codex",
+      cwd: "/repo",
+      modeId: "auto",
+      model: "gpt-5.4",
+      thinkingOptionId: "high",
    });
  });
 });
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { UserComposerAttachment } from "@/attachments/types";
 import type { TextReplacement } from "@/composer/types";
 import type { DraftAgentControlsProps } from "@/composer/agent-controls";
-import type { DraftCommandTarget } from "@/hooks/use-agent-commands-query";
+import type { DraftCommandConfig } from "@/hooks/use-agent-commands-query";
 import {
  useAgentFormState,
  type CreateAgentInitialValues,
@@ -16,7 +16,7 @@ import {
  type DraftKeyInput,
 } from "@/composer/draft/input-draft-core";
 import {
-  buildDraftCommandTarget,
+  buildDraftCommandConfig,
  resolveEffectiveComposerModelId,
  resolveEffectiveComposerThinkingOptionId,
  type ProviderSelectionState,
@@ -50,7 +50,7 @@ type DraftComposerState = UseAgentFormStateResult & {
  effectiveThinkingOptionId: string;
  featureValues: Record<string, unknown> | undefined;
  agentControls: DraftAgentControlsProps;
-  commandDraft: DraftCommandTarget;
+  commandDraftConfig: DraftCommandConfig | undefined;
 };

 export interface AgentInputDraft {
@@ -287,16 +287,19 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
    [applyProfileFeatureValues, formState],
  );

-  const commandDraft = useMemo(
+  const commandDraftConfig = useMemo(
    () =>
-      buildDraftCommandTarget({
-        selection: providerSelection,
-        cwd: workingDir,
-        effectiveModelId,
-        effectiveThinkingOptionId,
-        featureValues: draftFeatureValues,
-      }),
+      composerOptions
+        ? buildDraftCommandConfig({
+            selection: providerSelection,
+            cwd: workingDir,
+            effectiveModelId,
+            effectiveThinkingOptionId,
+            featureValues: draftFeatureValues,
+          })
+        : undefined,
    [
+      composerOptions,
      effectiveModelId,
      effectiveThinkingOptionId,
      draftFeatureValues,
@@ -322,10 +325,10 @@ export function useAgentInputDraft(input: UseAgentInputDraftInput): AgentInputDr
        onSetFeature: setDraftFeatureValue,
        onApplyAgentProfile: applyDraftAgentProfile,
      }),
-      commandDraft,
+      commandDraftConfig,
    };
  }, [
-    commandDraft,
+    commandDraftConfig,
    composerOptions,
    effectiveModelId,
    effectiveThinkingOptionId,
@@ -355,6 +358,7 @@ export const __private__ = {
  resolveDraftKey,
  resolveEffectiveComposerModelId,
  resolveEffectiveComposerThinkingOptionId,
-  buildDraftCommandTarget,
+  buildDraftCommandConfig,
+  buildDraftComposerCommandConfig: buildDraftCommandConfig,
  buildDraftAgentControls,
 };
@@ -40,7 +40,11 @@ import {
  useWorkspaceAttachmentsStore,
 } from "@/attachments/workspace-attachments-store";
 import type { UserMessageImageAttachment } from "@/types/stream";
-import { COMPACT_FORM_FACTOR_WIDTH, useIsCompactFormFactor } from "@/constants/layout";
+import {
+  COMPACT_FORM_FACTOR_WIDTH,
+  MAX_CONTENT_WIDTH,
+  useIsCompactFormFactor,
+} from "@/constants/layout";
 import { isWeb } from "@/constants/platform";
 import {
  buildWorkspaceTabPersistenceKey,
@@ -678,7 +682,7 @@ export function WorkspaceDraftAgentTab({
            autoFocus={shouldAutoFocusWorkspaceDraftComposer({ isPaneFocused, isSubmitting })}
            autoFocusKey={String(draftInput.attachmentFocusRequestId)}
            onFocusInput={handleFocusInputCallback}
-            commandDraft={composerState.commandDraft}
+            commandDraftConfig={composerState.commandDraftConfig}
            agentControls={composerAgentControls}
            isCompactLayout={isCompactComposerLayout}
          />
@@ -733,7 +737,7 @@ const styles = StyleSheet.create((theme) => ({
  },
  importPillContent: {
    width: "100%",
-    maxWidth: theme.contentMaxWidth,
+    maxWidth: MAX_CONTENT_WIDTH,
    flexDirection: "row",
  },
  errorContainer: {
@@ -41,7 +41,7 @@ import {
  Paperclip,
 } from "lucide-react-native";
 import * as Clipboard from "expo-clipboard";
-import { FOOTER_HEIGHT } from "@/constants/layout";
+import { FOOTER_HEIGHT, MAX_CONTENT_WIDTH } from "@/constants/layout";
 import {
  AgentControls,
  DraftAgentControls,
@@ -62,7 +62,7 @@ import {
 } from "./input/input";
 import type { ImageAttachment, MessagePayload, TextReplacement } from "./types";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
-import type { DraftCommandTarget } from "@/hooks/use-agent-commands-query";
+import type { DraftCommandConfig } from "@/hooks/use-agent-commands-query";
 import { encodeImages } from "@/utils/encode-images";
 import { focusWithRetries } from "@/utils/web-focus";
 import {
@@ -973,8 +973,8 @@ interface ComposerProps {
  autoFocusKey?: string;
  /** Callback to expose a focus function to parent components (desktop only). */
  onFocusInput?: (focus: () => void) => void;
-  /** Draft context for listing commands before an agent exists. Omitted for running agents. */
-  commandDraft?: DraftCommandTarget;
+  /** Optional draft context for listing commands before an agent exists. */
+  commandDraftConfig?: DraftCommandConfig;
  /** Called when a message is about to be sent (any path: keyboard, dictation, queued). */
  onMessageSent?: () => void;
  onComposerHeightChange?: (height: number) => void;
@@ -1264,7 +1264,7 @@ function ComposerContentImpl({
  autoFocus = false,
  autoFocusKey,
  onFocusInput,
-  commandDraft,
+  commandDraftConfig,
  onMessageSent,
  onComposerHeightChange,
  onAttentionInputFocus,
@@ -2346,7 +2346,7 @@ function ComposerContentImpl({
      setUserInput: replaceUserInput,
      serverId,
      agentId,
-      draft: commandDraft,
+      draftConfig: commandDraftConfig,
      canExecuteClientSlashCommand: buildOutgoingAttachments(attachments).length === 0,
      onClientSlashCommand: runClientSlashCommand,
      pluginClientSlashCommands,
@@ -2355,7 +2355,7 @@ function ComposerContentImpl({
      replaceUserInput,
      serverId,
      agentId,
-      commandDraft,
+      commandDraftConfig,
      buildOutgoingAttachments,
      attachments,
      runClientSlashCommand,
@@ -2542,7 +2542,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
  inputAreaContent: {
    flexShrink: 1,
    width: "100%",
-    maxWidth: theme.contentMaxWidth,
+    maxWidth: MAX_CONTENT_WIDTH,
    gap: theme.spacing[3],
  },
  messageInputContainer: {
@@ -11,6 +11,7 @@ import {
 } from "@/components/ui/menu";
 import { StatusRing } from "@/components/status-ring";
 import { STATUS_RING_HALO_INSET } from "@/components/status-ring/geometry";
+import { MAX_CONTENT_WIDTH } from "@/constants/layout";
 import { isWeb } from "@/constants/platform";
 import { getStatusDotColor } from "@/utils/status-dot-color";
 import { STATUS_INDICATOR_FILLED_DOT_SIZE } from "@/utils/status-indicator-geometry";
@@ -327,7 +328,7 @@ const styles = StyleSheet.create((theme) => {
    },
    track: {
      width: "100%",
-      maxWidth: theme.contentMaxWidth,
+      maxWidth: MAX_CONTENT_WIDTH,
      flexDirection: "row",
      alignItems: "center",
      gap: theme.spacing[1],
@@ -11,6 +11,8 @@ export const HEADER_INNER_HEIGHT_MOBILE = 56;
 export const WORKSPACE_SECONDARY_HEADER_HEIGHT = 36;
 export const HEADER_TOP_PADDING_MOBILE = 8;

+// Max width for chat content (stream view, input area, new agent form)
+export const MAX_CONTENT_WIDTH = 820;
 export const COMPACT_FORM_FACTOR_WIDTH = 500;

 // Settings uses the canonical desktop list + detail layout. Its sidebar and
@@ -2,6 +2,7 @@ import { useMemo } from "react";
 import { Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { MarkdownRenderer } from "@/components/markdown/renderer";
+import { MAX_CONTENT_WIDTH } from "@/constants/layout";
 import { parseMarkdownPreviewDocument } from "./document";

 export function FileMarkdownPreview({ source }: { source: string }) {
@@ -9,7 +10,7 @@ export function FileMarkdownPreview({ source }: { source: string }) {

  return (
    <View style={styles.outerGutter}>
-      <View style={styles.readingFrame} testID="markdown-preview-frame">
+      <View style={styles.readingFrame}>
        {document.frontMatter.length > 0 ? (
          <View style={styles.frontMatterTable} testID="markdown-front-matter">
            {document.frontMatter.map((row, index) => (
@@ -48,7 +49,7 @@ const styles = StyleSheet.create((theme) => ({
  },
  readingFrame: {
    width: "100%",
-    maxWidth: theme.contentMaxWidth,
+    maxWidth: MAX_CONTENT_WIDTH,
    alignSelf: "center",
    paddingHorizontal: theme.spacing[2],
  },
@@ -7,7 +7,6 @@ import {
  useAgentCommandsQuery,
  type AgentSlashCommand,
  type DraftCommandConfig,
-  type DraftCommandTarget,
 } from "./use-agent-commands-query";
 import { orderAutocompleteOptions } from "@/components/ui/autocomplete-utils";
 import { useAutocomplete } from "./use-autocomplete";
@@ -35,7 +34,7 @@ interface UseAgentAutocompleteInput {
  setUserInput: (nextValue: string) => void;
  serverId: string;
  agentId: string;
-  draft?: DraftCommandTarget;
+  draftConfig?: DraftCommandConfig;
  onAutocompleteApplied?: () => void;
  onClientSlashCommand?: (command: ClientSlashCommand) => void;
  canExecuteClientSlashCommand?: boolean;
@@ -118,13 +117,18 @@ type AvailableCommand =
  | { source: "plugin"; command: PluginClientSlashCommand }
  | { source: "provider"; command: AgentSlashCommand };

-function resolveDraftQueryConfig(draft?: DraftCommandTarget): DraftCommandConfig | undefined {
-  if (draft?.status !== "ready") {
+function normalizeDraftCommandConfig(
+  draftConfig?: DraftCommandConfig,
+): DraftCommandConfig | undefined {
+  if (!draftConfig) {
    return undefined;
  }

-  const draftConfig = draft.config;
  const cwd = draftConfig.cwd.trim();
+  if (!cwd) {
+    return undefined;
+  }
+
  const modeId = draftConfig.modeId?.trim() ?? "";
  const model = draftConfig.model?.trim() ?? "";
  const thinkingOptionId = draftConfig.thinkingOptionId?.trim() ?? "";
@@ -333,35 +337,6 @@ function resolveAutocompleteErrorMessage(args: {
  return undefined;
 }

-// A draft's agentId is a draft key the daemon does not know, so a draft lists
-// commands by its config only, and not at all until that config is complete.
-function resolveDraftCommandContext(draft: DraftCommandTarget | undefined) {
-  const queryDraftConfig = resolveDraftQueryConfig(draft);
-  const isDraftContext = draft !== undefined;
-  return {
-    isDraftContext,
-    queryDraftConfig,
-    canListCommands: !isDraftContext || queryDraftConfig !== undefined,
-  };
-}
-
-function resolveAutocompleteEmptyText(args: {
-  mode: AutocompleteMode;
-  draft: DraftCommandTarget | undefined;
-  t: TFunction;
-}): string {
-  if (args.mode === "file") {
-    return args.t("agentAutocomplete.noFiles");
-  }
-  if (args.draft?.status === "needs-project") {
-    return args.t("agentAutocomplete.chooseProjectForCommands");
-  }
-  if (args.draft?.status === "needs-provider") {
-    return args.t("agentAutocomplete.chooseModelForCommands");
-  }
-  return args.t("agentAutocomplete.noCommands");
-}
-
 export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAutocompleteResult {
  const { t } = useTranslation();
  const {
@@ -370,7 +345,7 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
    setUserInput,
    serverId,
    agentId,
-    draft,
+    draftConfig,
    onAutocompleteApplied,
    onClientSlashCommand,
    canExecuteClientSlashCommand,
@@ -405,10 +380,13 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
    return () => clearTimeout(timer);
  }, [fileFilterQuery]);

-  const { isDraftContext, queryDraftConfig, canListCommands } = useMemo(
-    () => resolveDraftCommandContext(draft),
-    [draft],
+  const normalizedDraftConfig = useMemo(
+    () => normalizeDraftCommandConfig(draftConfig),
+    [draftConfig],
  );
+
+  const isDraftContext = normalizedDraftConfig !== undefined;
+  const queryDraftConfig = normalizedDraftConfig;
  const canLoadCommands = resolveCanLoadCommands({ serverId, agentId, isDraftContext });

  const agentCwd = useSessionStore(
@@ -432,14 +410,17 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
    autocompleteCwd,
  });

-  const commandsQuery = useAgentCommandsQuery({
+  const {
+    commands,
+    isLoading: isCommandsLoading,
+    isError,
+    error,
+  } = useAgentCommandsQuery({
    serverId,
    agentId,
-    enabled: mode === "command" && canLoadCommands && canListCommands,
+    enabled: mode === "command" && canLoadCommands,
    draftConfig: queryDraftConfig,
  });
-  const { commands, isError, error } = commandsQuery;
-  const isCommandsLoading = canListCommands && commandsQuery.isLoading;

  const isVisible = canShowAutocomplete && !(mode === "command" && isCommandsLoading);

@@ -606,7 +587,8 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
    mode === "file"
      ? t("agentAutocomplete.searchingWorkspace")
      : t("agentAutocomplete.loadingCommands");
-  const emptyText = resolveAutocompleteEmptyText({ mode, draft, t });
+  const emptyText =
+    mode === "file" ? t("agentAutocomplete.noFiles") : t("agentAutocomplete.noCommands");

  return {
    isVisible,
@@ -17,12 +17,6 @@ export interface AgentSlashCommand {

 export type DraftCommandConfig = AgentCommandsDraftConfig;

-/** What a draft composer can list commands for, before an agent exists. */
-export type DraftCommandTarget =
-  | { status: "ready"; config: DraftCommandConfig }
-  | { status: "needs-project" }
-  | { status: "needs-provider" };
-
 interface ListAgentCommandsOptions {
  agentId: string;
  draftConfig?: DraftCommandConfig;
@@ -17,27 +17,22 @@ import {
  DEFAULT_CLIENT_SETTINGS,
  DEFAULT_CODE_FONT_SIZE,
  DEFAULT_CONTENT_FONT_SIZE,
-  DEFAULT_CONTENT_MAX_WIDTH,
  DEFAULT_TERMINAL_SCROLLBACK_LINES,
  DEFAULT_THEME_PREFERENCE,
  DEFAULT_UI_BASE_FONT_SIZE,
  MAX_CODE_FONT_SIZE,
  MAX_CONTENT_FONT_SIZE,
-  MAX_CONTENT_MAX_WIDTH,
  MAX_TERMINAL_SCROLLBACK_LINES,
  MAX_UI_BASE_FONT_SIZE,
  MIN_CODE_FONT_SIZE,
  MIN_CONTENT_FONT_SIZE,
-  MIN_CONTENT_MAX_WIDTH,
  MIN_TERMINAL_SCROLLBACK_LINES,
  MIN_UI_BASE_FONT_SIZE,
  loadAppSettingsFromStorage as loadAppSettingsFromStoragePure,
  loadSettingsFromStorage as loadSettingsFromStoragePure,
  normalizeAppSettings,
  parseClampedFontSize,
-  parseContentMaxWidth,
  parseTerminalScrollbackLines,
-  resolveContentMaxWidth,
  sanitizeFontFamily,
  saveAppSettings as saveAppSettingsPure,
  type AppSettings,
@@ -61,24 +56,19 @@ export {
  DEFAULT_CLIENT_SETTINGS,
  DEFAULT_CODE_FONT_SIZE,
  DEFAULT_CONTENT_FONT_SIZE,
-  DEFAULT_CONTENT_MAX_WIDTH,
  DEFAULT_TERMINAL_SCROLLBACK_LINES,
  DEFAULT_THEME_PREFERENCE,
  DEFAULT_UI_BASE_FONT_SIZE,
  MAX_CODE_FONT_SIZE,
  MAX_CONTENT_FONT_SIZE,
-  MAX_CONTENT_MAX_WIDTH,
  MAX_TERMINAL_SCROLLBACK_LINES,
  MAX_UI_BASE_FONT_SIZE,
  MIN_CODE_FONT_SIZE,
  MIN_CONTENT_FONT_SIZE,
-  MIN_CONTENT_MAX_WIDTH,
  MIN_TERMINAL_SCROLLBACK_LINES,
  MIN_UI_BASE_FONT_SIZE,
  parseClampedFontSize,
-  parseContentMaxWidth,
  parseTerminalScrollbackLines,
-  resolveContentMaxWidth,
  sanitizeFontFamily,
 };
 export type {
@@ -14,7 +14,6 @@ import {
  loadSettingsFromStorage,
  parseClampedFontSize,
  parseTerminalScrollbackLines,
-  resolveContentMaxWidth,
  saveAppSettings,
  type SettingsDeps,
 } from "./storage";
@@ -23,7 +22,7 @@ import {
  DEFAULT_SIDEBAR_ROW_ITEMS,
  SIDEBAR_ROW_ITEMS,
 } from "@/components/sidebar/display-preferences/row-items";
-import { DEFAULT_CONTENT_MAX_WIDTH, THEME_OPTIONS } from "@/styles/theme";
+import { THEME_OPTIONS } from "@/styles/theme";

 const LEGACY_SETTINGS_KEY = "@paseo:settings";

@@ -956,49 +955,3 @@ describe("parseClampedFontSize", () => {
    expect(parseClampedFontSize("abc", { min: 11, max: 24 })).toBeNull();
  });
 });
-
-describe("content max width", () => {
-  it("follows the current default until the user picks a width", async () => {
-    const deps = makeDeps();
-    const queryClient = new QueryClient();
-
-    await saveAppSettings({ queryClient, updates: { codeFontSize: 14 }, deps });
-
-    const stored = JSON.parse(deps.storage.entries.get(APP_SETTINGS_KEY) ?? "null");
-    expect(stored.contentMaxWidth).toBeNull();
-    expect(resolveContentMaxWidth(await loadAppSettingsFromStorage(deps))).toBe(
-      DEFAULT_CONTENT_MAX_WIDTH,
-    );
-  });
-
-  it("keeps a picked width and returns to the default when reset", async () => {
-    const deps = makeDeps();
-    const queryClient = new QueryClient();
-
-    await saveAppSettings({ queryClient, updates: { contentMaxWidth: 1600 }, deps });
-    expect(resolveContentMaxWidth(await loadAppSettingsFromStorage(deps))).toBe(1600);
-
-    await saveAppSettings({ queryClient, updates: { contentMaxWidth: null }, deps });
-    expect(JSON.parse(deps.storage.entries.get(APP_SETTINGS_KEY) ?? "null").contentMaxWidth).toBe(
-      null,
-    );
-    expect(resolveContentMaxWidth(await loadAppSettingsFromStorage(deps))).toBe(
-      DEFAULT_CONTENT_MAX_WIDTH,
-    );
-  });
-
-  it("clamps stored widths and drops malformed ones to the default", async () => {
-    const load = (contentMaxWidth: unknown) =>
-      loadAppSettingsFromStorage(
-        makeDeps({
-          storage: createInMemoryKeyValueStorage({
-            [APP_SETTINGS_KEY]: JSON.stringify({ contentMaxWidth }),
-          }),
-        }),
-      );
-
-    expect((await load(100_000)).contentMaxWidth).toBe(4000);
-    expect((await load(10)).contentMaxWidth).toBe(600);
-    expect((await load("wide")).contentMaxWidth).toBeNull();
-  });
-});
@@ -15,7 +15,6 @@ import {
 } from "@/components/sidebar/display-preferences/row-items";
 import { isNative } from "@/constants/platform";
 import {
-  DEFAULT_CONTENT_MAX_WIDTH,
  FONT_SIZE,
  PLUGIN_THEME_PREFERENCE,
  THEME_OPTIONS,
@@ -64,9 +63,6 @@ export const DEFAULT_CODE_FONT_SIZE = 12; // == FONT_SIZE.code
 export const MIN_CODE_FONT_SIZE = 9;
 export const MAX_CODE_FONT_SIZE = 22; // line-height 1.5×22=33 stays safe
 export const MAX_FONT_FAMILY_LENGTH = 200;
-export { DEFAULT_CONTENT_MAX_WIDTH };
-export const MIN_CONTENT_MAX_WIDTH = 600;
-export const MAX_CONTENT_MAX_WIDTH = 4000;

 export interface AppSettings {
  theme: ThemePreference;
@@ -82,8 +78,6 @@ export interface AppSettings {
  uiBaseFontSize: number; // clamped px, platform default 14 or 15
  contentFontSize: number; // clamped px, platform default 15 or 16
  codeFontSize: number; // clamped px, default 12
-  /** Max width of chat and markdown content in px; null follows the current default. */
-  contentMaxWidth: number | null;
  syntaxTheme: SyntaxThemeId; // default "one"
  workspaceTitleSource: WorkspaceTitleSource;
  sidebarWorkspaceTrailing: SidebarWorkspaceTrailing;
@@ -138,7 +132,6 @@ export const DEFAULT_CLIENT_SETTINGS: AppSettings = {
  uiBaseFontSize: DEFAULT_UI_BASE_FONT_SIZE,
  contentFontSize: DEFAULT_CONTENT_FONT_SIZE,
  codeFontSize: DEFAULT_CODE_FONT_SIZE,
-  contentMaxWidth: null,
  syntaxTheme: "one",
  workspaceTitleSource: "title",
  sidebarWorkspaceTrailing: "diff",
@@ -225,10 +218,6 @@ const StoredAppSettingsSchema = z
    codeFontSize: clampedNumber(MIN_CODE_FONT_SIZE, MAX_CODE_FONT_SIZE).catch(
      DEFAULT_CODE_FONT_SIZE,
    ),
-    contentMaxWidth: z
-      .null()
-      .or(clampedNumber(MIN_CONTENT_MAX_WIDTH, MAX_CONTENT_MAX_WIDTH))
-      .catch(null),
    syntaxTheme: z.string().refine(isSyntaxThemeId).catch("one"),
    workspaceTitleSource: z.enum(["title", "branch"]).catch("title"),
    sidebarWorkspaceTrailing: z.enum(["diff", "timestamp", "none"]).catch("diff"),
@@ -468,14 +457,6 @@ export function parseTerminalScrollbackLines(value: unknown): number | null {
  );
 }

-export function parseContentMaxWidth(value: unknown): number | null {
-  return parseClampedFontSize(value, { min: MIN_CONTENT_MAX_WIDTH, max: MAX_CONTENT_MAX_WIDTH });
-}
-
-export function resolveContentMaxWidth(settings: Pick<AppSettings, "contentMaxWidth">): number {
-  return settings.contentMaxWidth ?? DEFAULT_CONTENT_MAX_WIDTH;
-}
-
 export function parseClampedFontSize(
  value: unknown,
  bounds: { min: number; max: number },
@@ -1,109 +0,0 @@
-import { useCallback, useMemo } from "react";
-import { Text, View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import { useTranslation } from "react-i18next";
-import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
-import { Button } from "@/components/ui/button";
-import { settingsStyles } from "@/styles/settings";
-import { useHostConfirmation } from "@/runtime/host-runtime";
-
-/** Shows the host confirmation the host runtime is waiting on. Mount once at the app root. */
-export function HostConfirmationSheet() {
-  const { t } = useTranslation();
-  const { pending, answer } = useHostConfirmation();
-
-  const cancel = useCallback(() => answer(false), [answer]);
-  const connect = useCallback(() => answer(true), [answer]);
-  const header = useMemo<SheetHeader>(() => ({ title: t("pairing.hostConfirmation.title") }), [t]);
-
-  if (!pending) return null;
-
-  return (
-    <AdaptiveModalSheet header={header} visible onClose={cancel} testID="host-confirmation">
-      <Text style={styles.confirmText}>
-        {pending.kind === "changedConnection"
-          ? t("pairing.hostConfirmation.descriptionChanged")
-          : t("pairing.hostConfirmation.description")}
-      </Text>
-      <View style={settingsStyles.card}>
-        <DetailRow
-          label={t("pairing.hostConfirmation.hostLabel")}
-          value={pending.serverId}
-          testID="host-confirmation-server-id"
-        />
-        <DetailRow
-          label={t("pairing.hostConfirmation.fingerprintLabel")}
-          value={pending.keyFingerprint}
-          testID="host-confirmation-fingerprint"
-          showBorder
-        />
-        <DetailRow
-          label={t("pairing.hostConfirmation.relayLabel")}
-          value={pending.relayEndpoint}
-          testID="host-confirmation-relay"
-          showBorder
-        />
-      </View>
-      <View style={styles.confirmActions}>
-        <Button
-          variant="secondary"
-          size="sm"
-          style={FLEX_1_STYLE}
-          onPress={cancel}
-          testID="host-confirmation-cancel"
-        >
-          {t("common.actions.cancel")}
-        </Button>
-        <Button
-          variant="default"
-          size="sm"
-          style={FLEX_1_STYLE}
-          onPress={connect}
-          testID="host-confirmation-connect"
-        >
-          {t("pairing.hostConfirmation.connect")}
-        </Button>
-      </View>
-    </AdaptiveModalSheet>
-  );
-}
-
-function DetailRow({
-  label,
-  value,
-  showBorder = false,
-  testID,
-}: {
-  label: string;
-  value: string;
-  showBorder?: boolean;
-  testID?: string;
-}) {
-  return (
-    <View style={[settingsStyles.row, showBorder && settingsStyles.rowBorder]}>
-      <View style={settingsStyles.rowContent}>
-        <Text style={settingsStyles.rowTitle}>{label}</Text>
-        <Text style={settingsStyles.rowHint} selectable testID={testID}>
-          {value}
-        </Text>
-      </View>
-    </View>
-  );
-}
-
-// Same shape as the remove-host and remove-connection confirm sheets in
-// screens/settings/host-page.tsx.
-const styles = StyleSheet.create((theme) => ({
-  confirmText: {
-    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.base,
-  },
-  confirmActions: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    marginTop: theme.spacing[4],
-  },
-}));
-
-const FLEX_1_STYLE = { flex: 1 };
@@ -1,116 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import type { ConnectionLinkImport, LinkPairing } from "@/runtime/host-runtime";
-import { openPairScan, type PairScanModel } from "./pair-scan-model";
-
-const LINK = "https://app.paseo.sh/#offer=abc";
-const PAIRING: LinkPairing = { submit: async () => ({ status: "cancelled" }) };
-
-/** The host runtime's side of a scan: each import resolves with the next queued outcome. */
-function createScanner(outcomes: Array<ConnectionLinkImport | Error>) {
-  const imports: string[] = [];
-  const connected: string[] = [];
-  const scan = openPairScan({
-    importConnectionLink: async (link) => {
-      imports.push(link);
-      const outcome = outcomes.shift();
-      if (!outcome) throw new Error("No outcome queued for this import");
-      if (outcome instanceof Error) throw outcome;
-      return outcome;
-    },
-    onConnected: (serverId) => connected.push(serverId),
-  });
-  return { scan, imports, connected };
-}
-
-async function settled(scan: PairScanModel): Promise<void> {
-  await vi.waitFor(() => expect(scan.getState().status).not.toBe("pairing"));
-}
-
-describe("openPairScan", () => {
-  it("stops scanning after Cancel until the user scans again", async () => {
-    const { scan, imports } = createScanner([{ status: "cancelled" }, { status: "cancelled" }]);
-
-    scan.scan(LINK);
-    await settled(scan);
-
-    // The code is still in front of the camera.
-    scan.scan(LINK);
-    scan.scan(LINK);
-    await Promise.resolve();
-    expect(imports).toEqual([LINK]);
-    expect(scan.getState()).toEqual({ status: "stopped", error: null });
-
-    scan.scanAgain();
-    scan.scan(LINK);
-    await settled(scan);
-    expect(imports).toEqual([LINK, LINK]);
-  });
-
-  it("starts one attempt per code while pairing, and ignores codes that are not pairing links", async () => {
-    const { scan, imports, connected } = createScanner([
-      { status: "connected", serverId: "srv_scan" },
-    ]);
-
-    scan.scan("https://example.com/not-a-pairing-link");
-    expect(scan.getState()).toEqual({ status: "scanning" });
-
-    scan.scan(LINK);
-    scan.scan(LINK);
-    await settled(scan);
-
-    expect(imports).toEqual([LINK]);
-    expect(connected).toEqual(["srv_scan"]);
-    scan.scan(LINK);
-    expect(imports).toEqual([LINK]);
-  });
-
-  it("ends the attempt when the password prompt closes", async () => {
-    const { scan, imports } = createScanner([
-      { status: "password_required", link: LINK, pairing: PAIRING },
-    ]);
-
-    scan.scan(LINK);
-    await settled(scan);
-    expect(scan.getState()).toEqual({
-      status: "passwordRequired",
-      passwordRequired: { link: LINK, pairing: PAIRING },
-    });
-    scan.scan(LINK);
-
-    scan.closePassword();
-    scan.scan(LINK);
-
-    expect(scan.getState()).toEqual({ status: "stopped", error: null });
-    expect(imports).toEqual([LINK]);
-  });
-
-  it("stops with the error when an attempt fails", async () => {
-    const { scan, imports } = createScanner([new Error("Server disconnected")]);
-
-    scan.scan(LINK);
-    await settled(scan);
-    scan.scan(LINK);
-
-    expect(scan.getState()).toEqual({ status: "stopped", error: "Server disconnected" });
-    expect(imports).toEqual([LINK]);
-  });
-
-  it("does not navigate for an attempt that finishes after the screen closed", async () => {
-    let finish: (outcome: ConnectionLinkImport) => void = () => {};
-    const connected: string[] = [];
-    const scan = openPairScan({
-      importConnectionLink: () =>
-        new Promise((resolve) => {
-          finish = resolve;
-        }),
-      onConnected: (serverId) => connected.push(serverId),
-    });
-
-    scan.scan(LINK);
-    scan.close();
-    finish({ status: "connected", serverId: "srv_scan" });
-    await Promise.resolve();
-
-    expect(connected).toEqual([]);
-  });
-});
@@ -1,103 +0,0 @@
-import type { ConnectionLinkImport, PasswordRequiredPairing } from "@/runtime/host-runtime";
-
-/**
- * One visit to the QR scan screen. The camera reports every frame that shows
- * a code, so an attempt that ends (Cancel on the host confirmation, a closed
- * password prompt, or an error) stops scanning until the user taps scan again.
- * Without that, the code still in front of the camera starts a new attempt on
- * the next frame.
- */
-export type PairScanState =
-  | { status: "scanning" }
-  | { status: "pairing" }
-  | { status: "passwordRequired"; passwordRequired: PasswordRequiredPairing }
-  | { status: "stopped"; error: string | null }
-  | { status: "connected" };
-
-export interface PairScanModel {
-  getState: () => PairScanState;
-  subscribe: (listener: () => void) => () => void;
-  /** Data from a QR code the camera saw. Only a scanning session starts an attempt. */
-  scan: (data: string) => void;
-  /** The user asked to scan again after an attempt ended. */
-  scanAgain: () => void;
-  /** The user closed the password prompt, which ends the attempt. */
-  closePassword: () => void;
-  close: () => void;
-}
-
-export interface PairScanDependencies {
-  importConnectionLink: (link: string) => Promise<ConnectionLinkImport>;
-  onConnected: (serverId: string) => void;
-}
-
-export function openPairScan(deps: PairScanDependencies): PairScanModel {
-  let state: PairScanState = { status: "scanning" };
-  let closed = false;
-  const listeners = new Set<() => void>();
-
-  function publish(next: PairScanState): void {
-    if (closed) return;
-    state = next;
-    for (const listener of listeners) {
-      listener();
-    }
-  }
-
-  async function pair(link: string): Promise<void> {
-    publish({ status: "pairing" });
-    try {
-      const outcome = await deps.importConnectionLink(link);
-      if (closed) return;
-      if (outcome.status === "connected") {
-        publish({ status: "connected" });
-        deps.onConnected(outcome.serverId);
-        return;
-      }
-      if (outcome.status === "password_required") {
-        const { link: passwordLink, pairing } = outcome;
-        publish({ status: "passwordRequired", passwordRequired: { link: passwordLink, pairing } });
-        return;
-      }
-      publish({ status: "stopped", error: null });
-    } catch (error) {
-      publish({ status: "stopped", error: error instanceof Error ? error.message : String(error) });
-    }
-  }
-
-  return {
-    getState: () => state,
-    subscribe(listener) {
-      listeners.add(listener);
-      return () => {
-        listeners.delete(listener);
-      };
-    },
-    scan(data) {
-      if (state.status !== "scanning") return;
-      const link = pairingLinkFromScan(data);
-      if (!link) return;
-      void pair(link);
-    },
-    scanAgain() {
-      if (state.status !== "stopped") return;
-      publish({ status: "scanning" });
-    },
-    closePassword() {
-      if (state.status !== "passwordRequired") return;
-      publish({ status: "stopped", error: null });
-    },
-    close() {
-      closed = true;
-      listeners.clear();
-    },
-  };
-}
-
-function pairingLinkFromScan(data: string): string | null {
-  const raw = data.trim();
-  if (raw.includes("#offer=") || raw.includes("#connect=") || raw.startsWith("relay://")) {
-    return raw;
-  }
-  return null;
-}
@@ -439,9 +439,7 @@ export const ar: TranslationResources = {
      recovery: {
        archivedTitle: "مساحة العمل مؤرشفة",
        restoreDescription:
-          "استعد {{workspaceName}} للعودة إلى وكلائها. ستستخدم شجرة العمل الفرع {{branch}}.",
-        restoreWithoutBranchDescription:
-          "استعد {{workspaceName}} للعودة إلى وكلائها. سيبدأ فرع جديد من الفرع الأساسي المحفوظ أو الفرع الافتراضي للمستودع.",
+          "تمت أرشفة {{workspaceName}} وإزالة شجرة العمل الخاصة بها. استعد الفرع {{branch}} لفتحها مجددًا.",
        unarchiveDescription: "{{workspaceName}} مؤرشفة. ألغِ أرشفتها لفتحها مجددًا.",
        restoreAction: "استعادة",
        unarchiveAction: "إلغاء الأرشفة",
@@ -1524,8 +1522,6 @@ export const ar: TranslationResources = {
    noFiles: "لم يتم العثور على ملفات أو أدلة",
    noCommands: "لم يتم العثور على أي أوامر",
    failedToLoad: "فشل التحميل",
-    chooseProjectForCommands: "اختر مشروعًا لعرض الأوامر",
-    chooseModelForCommands: "اختر نموذجًا لعرض الأوامر",
  },
  loadOlderHistory: {
    failed: "تعذر تحميل السجل الأقدم",
@@ -1621,17 +1617,6 @@ export const ar: TranslationResources = {
      title: "كلمة المرور لـ {{host}}",
      label: "كلمة مرور المضيف",
    },
-    hostConfirmation: {
-      title: "الاتصال بهذا المضيف؟",
-      description:
-        "سيتمكن هذا المضيف من تشغيل تعليمات برمجية في هذا التطبيق والوصول إلى مضيفيك الآخرين المتصلين. اتصل فقط إذا كنت تعرفه.",
-      descriptionChanged:
-        "يغيّر هذا الرابط طريقة اتصالك بهذا المضيف. سيتمكن المضيف من تشغيل تعليمات برمجية في هذا التطبيق والوصول إلى مضيفيك الآخرين المتصلين. اتصل فقط إذا كنت تعرفه.",
-      hostLabel: "المضيف",
-      fingerprintLabel: "بصمة المفتاح",
-      relayLabel: "المُرحّل",
-      connect: "اتصال",
-    },
    connectionMethods: {
      title: "إضافة اتصال",
      direct: {
@@ -2204,14 +2189,6 @@ export const ar: TranslationResources = {
        codeSizeHint: "يُستخدم للكود والفروقات ومخرجات الطرفية",
        codeSizeAccessibility: "حجم خط الكود",
      },
-      layout: {
-        title: "التخطيط",
-        contentWidth: "عرض المحتوى",
-        contentWidthHint: "أقصى عرض للمحادثة وملفات Markdown على الشاشات العريضة",
-        contentWidthAccessibility: "عرض المحتوى بالبكسل",
-        reset: "إعادة تعيين",
-        resetAccessibility: "إعادة عرض المحتوى إلى الافتراضي",
-      },
      syntax: {
        title: "بناء الجملة",
        highlightTheme: "تسليط الضوء على الموضوع",
@@ -436,9 +436,7 @@ export const en = {
      recovery: {
        archivedTitle: "Workspace archived",
        restoreDescription:
-          "Restore {{workspaceName}} to return to its agents. Its worktree will use branch {{branch}}.",
-        restoreWithoutBranchDescription:
-          "Restore {{workspaceName}} to return to its agents. A new branch will start from the saved base or the repository default.",
+          "{{workspaceName}} was archived and its worktree was removed. Restore branch {{branch}} to open it again.",
        unarchiveDescription: "{{workspaceName}} is archived. Unarchive it to open it again.",
        restoreAction: "Restore",
        unarchiveAction: "Unarchive",
@@ -1549,8 +1547,6 @@ export const en = {
    noFiles: "No files or directories found",
    noCommands: "No commands found",
    failedToLoad: "Failed to load",
-    chooseProjectForCommands: "Choose a project to see commands",
-    chooseModelForCommands: "Select a model to see commands",
  },
  loadOlderHistory: {
    failed: "Couldn't load older history",
@@ -1646,17 +1642,6 @@ export const en = {
      title: "Password for {{host}}",
      label: "Host password",
    },
-    hostConfirmation: {
-      title: "Connect to this host?",
-      description:
-        "This host will be able to run code in this app and reach your other connected hosts. Only connect if you recognize it.",
-      descriptionChanged:
-        "This link changes how you connect to this host. The host will be able to run code in this app and reach your other connected hosts. Only connect if you recognize it.",
-      hostLabel: "Host",
-      fingerprintLabel: "Key fingerprint",
-      relayLabel: "Relay",
-      connect: "Connect",
-    },
    connectionMethods: {
      title: "Add connection",
      direct: {
@@ -2084,7 +2069,6 @@ export const en = {
        offline: "Connect to this host to open plugin settings.",
        update: "Update this host to use plugin settings.",
        unavailable: "This plugin settings screen is unavailable.",
-        backToPlugins: "Back to plugins",
      },
      trustedTitle: "Plugins are trusted code",
      trustedDescription:
@@ -2328,14 +2312,6 @@ export const en = {
        codeSizeHint: "Used for code, diffs, and terminal output",
        codeSizeAccessibility: "Code font size",
      },
-      layout: {
-        title: "Layout",
-        contentWidth: "Content width",
-        contentWidthHint: "Max width of chat and Markdown files on wide screens",
-        contentWidthAccessibility: "Content width in pixels",
-        reset: "Reset",
-        resetAccessibility: "Reset content width to default",
-      },
      syntax: {
        title: "Syntax",
        highlightTheme: "Highlight theme",
@@ -444,9 +444,7 @@ export const es: TranslationResources = {
      recovery: {
        archivedTitle: "Espacio de trabajo archivado",
        restoreDescription:
-          "Restaura {{workspaceName}} para volver a sus agentes. Su worktree usará la rama {{branch}}.",
-        restoreWithoutBranchDescription:
-          "Restaura {{workspaceName}} para volver a sus agentes. Se creará una rama nueva desde la base guardada o la rama predeterminada del repositorio.",
+          "{{workspaceName}} se archivó y se eliminó su worktree. Restaura la rama {{branch}} para volver a abrirlo.",
        unarchiveDescription:
          "{{workspaceName}} está archivado. Desarchívalo para volver a abrirlo.",
        restoreAction: "Restaurar",
@@ -1570,8 +1568,6 @@ export const es: TranslationResources = {
    noFiles: "No se encontraron archivos ni directorios",
    noCommands: "No se encontraron comandos",
    failedToLoad: "No se pudo cargar",
-    chooseProjectForCommands: "Elige un proyecto para ver los comandos",
-    chooseModelForCommands: "Selecciona un modelo para ver los comandos",
  },
  loadOlderHistory: {
    failed: "No se pudo cargar el historial anterior",
@@ -1667,17 +1663,6 @@ export const es: TranslationResources = {
      title: "Contraseña de {{host}}",
      label: "Contraseña del host",
    },
-    hostConfirmation: {
-      title: "¿Conectar con este host?",
-      description:
-        "Este host podrá ejecutar código en esta app y acceder a tus otros hosts conectados. Conéctate solo si lo reconoces.",
-      descriptionChanged:
-        "Este enlace cambia cómo te conectas a este host. El host podrá ejecutar código en esta app y acceder a tus otros hosts conectados. Conéctate solo si lo reconoces.",
-      hostLabel: "Host",
-      fingerprintLabel: "Huella de la clave",
-      relayLabel: "Relay",
-      connect: "Conectar",
-    },
    connectionMethods: {
      title: "Agregar conexión",
      direct: {
@@ -2258,14 +2243,6 @@ export const es: TranslationResources = {
        codeSizeHint: "Se usa en código, diferencias y la salida del terminal",
        codeSizeAccessibility: "Tamaño de fuente del código",
      },
-      layout: {
-        title: "Diseño",
-        contentWidth: "Ancho del contenido",
-        contentWidthHint: "Ancho máximo del chat y de los archivos Markdown en pantallas anchas",
-        contentWidthAccessibility: "Ancho del contenido en píxeles",
-        reset: "Restablecer",
-        resetAccessibility: "Restablecer el ancho del contenido",
-      },
      syntax: {
        title: "Sintaxis",
        highlightTheme: "Tema destacado",
@@ -445,9 +445,7 @@ export const fr: TranslationResources = {
      recovery: {
        archivedTitle: "Espace de travail archivé",
        restoreDescription:
-          "Restaurez {{workspaceName}} pour retrouver ses agents. Son worktree utilisera la branche {{branch}}.",
-        restoreWithoutBranchDescription:
-          "Restaurez {{workspaceName}} pour retrouver ses agents. Une nouvelle branche partira de la base enregistrée ou de la branche par défaut du dépôt.",
+          "{{workspaceName}} a été archivé et son worktree supprimé. Restaurez la branche {{branch}} pour le rouvrir.",
        unarchiveDescription: "{{workspaceName}} est archivé. Désarchivez-le pour le rouvrir.",
        restoreAction: "Restaurer",
        unarchiveAction: "Désarchiver",
@@ -1574,8 +1572,6 @@ export const fr: TranslationResources = {
    noFiles: "Aucun fichier ou répertoire trouvé",
    noCommands: "Aucune commande trouvée",
    failedToLoad: "Échec du chargement",
-    chooseProjectForCommands: "Choisissez un projet pour voir les commandes",
-    chooseModelForCommands: "Sélectionnez un modèle pour voir les commandes",
  },
  loadOlderHistory: {
    failed: "Impossible de charger l'ancien historique",
@@ -1671,17 +1667,6 @@ export const fr: TranslationResources = {
      title: "Mot de passe pour {{host}}",
      label: "Mot de passe de l’hôte",
    },
-    hostConfirmation: {
-      title: "Se connecter à cet hôte ?",
-      description:
-        "Cet hôte pourra exécuter du code dans cette application et accéder à vos autres hôtes connectés. Connectez-vous uniquement si vous le reconnaissez.",
-      descriptionChanged:
-        "Ce lien modifie la façon dont vous vous connectez à cet hôte. L'hôte pourra exécuter du code dans cette application et accéder à vos autres hôtes connectés. Connectez-vous uniquement si vous le reconnaissez.",
-      hostLabel: "Hôte",
-      fingerprintLabel: "Empreinte de la clé",
-      relayLabel: "Relais",
-      connect: "Se connecter",
-    },
    connectionMethods: {
      title: "Ajouter une connexion",
      direct: {
@@ -2261,14 +2246,6 @@ export const fr: TranslationResources = {
        codeSizeHint: "Utilisée pour le code, les diffs et la sortie du terminal",
        codeSizeAccessibility: "Taille de la police du code",
      },
-      layout: {
-        title: "Mise en page",
-        contentWidth: "Largeur du contenu",
-        contentWidthHint: "Largeur maximale du chat et des fichiers Markdown sur les grands écrans",
-        contentWidthAccessibility: "Largeur du contenu en pixels",
-        reset: "Réinitialiser",
-        resetAccessibility: "Réinitialiser la largeur du contenu",
-      },
      syntax: {
        title: "Syntaxe",
        highlightTheme: "Thème de surbrillance",
@@ -444,9 +444,7 @@ export const ja: TranslationResources = {
      recovery: {
        archivedTitle: "ワークスペースはアーカイブ済みです",
        restoreDescription:
-          "{{workspaceName}} を復元してエージェントに戻ります。worktree ではブランチ {{branch}} を使用します。",
-        restoreWithoutBranchDescription:
-          "{{workspaceName}} を復元してエージェントに戻ります。保存されたベース、またはリポジトリのデフォルトブランチから新しいブランチを作成します。",
+          "{{workspaceName}} はアーカイブされ、worktree が削除されました。ブランチ {{branch}} を復元して再度開きます。",
        unarchiveDescription:
          "{{workspaceName}} はアーカイブされています。再度開くにはアーカイブを解除してください。",
        restoreAction: "復元",
@@ -1541,8 +1539,6 @@ export const ja: TranslationResources = {
    noFiles: "ファイルまたはディレクトリが見つかりません",
    noCommands: "コマンドが見つかりません",
    failedToLoad: "読み込みに失敗しました",
-    chooseProjectForCommands: "コマンドを表示するにはプロジェクトを選択してください",
-    chooseModelForCommands: "コマンドを表示するにはモデルを選択してください",
  },
  loadOlderHistory: {
    failed: "古い履歴を読み込めませんでした",
@@ -1638,17 +1634,6 @@ export const ja: TranslationResources = {
      title: "{{host}} のパスワード",
      label: "ホストのパスワード",
    },
-    hostConfirmation: {
-      title: "このホストに接続しますか？",
-      description:
-        "このホストはこのアプリ内でコードを実行し、接続中の他のホストにアクセスできるようになります。心当たりがある場合のみ接続してください。",
-      descriptionChanged:
-        "このリンクはこのホストへの接続方法を変更します。ホストはこのアプリ内でコードを実行し、接続中の他のホストにアクセスできるようになります。心当たりがある場合のみ接続してください。",
-      hostLabel: "ホスト",
-      fingerprintLabel: "鍵のフィンガープリント",
-      relayLabel: "リレー",
-      connect: "接続",
-    },
    connectionMethods: {
      title: "接続を追加",
      direct: {
@@ -2224,14 +2209,6 @@ export const ja: TranslationResources = {
        codeSizeHint: "コード、差分、ターミナル出力に使用されます",
        codeSizeAccessibility: "コードフォントサイズ",
      },
-      layout: {
-        title: "レイアウト",
-        contentWidth: "コンテンツ幅",
-        contentWidthHint: "ワイド画面でのチャットと Markdown ファイルの最大幅",
-        contentWidthAccessibility: "コンテンツ幅 (ピクセル)",
-        reset: "リセット",
-        resetAccessibility: "コンテンツ幅をデフォルトに戻す",
-      },
      syntax: {
        title: "構文ハイライト",
        highlightTheme: "ハイライトテーマ",
@@ -440,9 +440,7 @@ export const ko: TranslationResources = {
      recovery: {
        archivedTitle: "워크스페이스가 보관되었습니다",
        restoreDescription:
-          "{{workspaceName}}를 복원하여 에이전트로 돌아갑니다. 워크트리는 {{branch}} 브랜치를 사용합니다.",
-        restoreWithoutBranchDescription:
-          "{{workspaceName}}를 복원하여 에이전트로 돌아갑니다. 저장된 기반 브랜치 또는 저장소 기본 브랜치에서 새 브랜치를 만듭니다.",
+          "{{workspaceName}}가 보관되고 워크트리가 제거되었습니다. 다시 열려면 {{branch}} 브랜치를 복원하세요.",
        unarchiveDescription: "{{workspaceName}}가 보관되었습니다. 다시 열려면 보관을 취소하세요.",
        restoreAction: "복원",
        unarchiveAction: "보관 취소",
@@ -1534,8 +1532,6 @@ export const ko: TranslationResources = {
    noFiles: "파일 또는 디렉터리를 찾을 수 없습니다",
    noCommands: "명령을 찾을 수 없습니다",
    failedToLoad: "불러오지 못했습니다",
-    chooseProjectForCommands: "명령을 보려면 프로젝트를 선택하세요",
-    chooseModelForCommands: "명령을 보려면 모델을 선택하세요",
  },
  loadOlderHistory: {
    failed: "이전 기록을 불러올 수 없습니다",
@@ -1631,17 +1627,6 @@ export const ko: TranslationResources = {
      title: "{{host}}의 비밀번호",
      label: "호스트 비밀번호",
    },
-    hostConfirmation: {
-      title: "이 호스트에 연결할까요?",
-      description:
-        "이 호스트는 이 앱에서 코드를 실행하고 연결된 다른 호스트에 접근할 수 있게 됩니다. 알고 있는 호스트인 경우에만 연결하세요.",
-      descriptionChanged:
-        "이 링크는 이 호스트에 연결하는 방식을 변경합니다. 호스트는 이 앱에서 코드를 실행하고 연결된 다른 호스트에 접근할 수 있게 됩니다. 알고 있는 호스트인 경우에만 연결하세요.",
-      hostLabel: "호스트",
-      fingerprintLabel: "키 지문",
-      relayLabel: "릴레이",
-      connect: "연결",
-    },
    connectionMethods: {
      title: "연결 추가",
      direct: {
@@ -2215,14 +2200,6 @@ export const ko: TranslationResources = {
        codeSizeHint: "코드, diff 및 터미널 출력에 사용됩니다",
        codeSizeAccessibility: "코드 글꼴 크기",
      },
-      layout: {
-        title: "레이아웃",
-        contentWidth: "콘텐츠 너비",
-        contentWidthHint: "와이드 화면에서 채팅과 Markdown 파일의 최대 너비",
-        contentWidthAccessibility: "콘텐츠 너비(픽셀)",
-        reset: "재설정",
-        resetAccessibility: "콘텐츠 너비를 기본값으로 재설정",
-      },
      syntax: {
        title: "구문",
        highlightTheme: "강조 테마",
@@ -18,7 +18,6 @@ export const pluginSettings = {
      offline: "اتصل بهذا المضيف لفتح إعدادات الإضافة.",
      update: "حدّث هذا المضيف لاستخدام إعدادات الإضافة.",
      unavailable: "شاشة إعدادات الإضافة هذه غير متاحة.",
-      backToPlugins: "العودة إلى الإضافات",
    },
    title: "الإضافات",
    trustedTitle: "الإضافات تعليمات برمجية موثوقة",
@@ -73,7 +72,6 @@ export const pluginSettings = {
      offline: "Conéctate a este host para abrir los ajustes del plugin.",
      update: "Actualiza este host para usar los ajustes del plugin.",
      unavailable: "Esta pantalla de ajustes del plugin no está disponible.",
-      backToPlugins: "Volver a plugins",
    },
    title: "Plugins",
    trustedTitle: "Los plugins son código de confianza",
@@ -128,7 +126,6 @@ export const pluginSettings = {
      offline: "Connectez-vous à cet hôte pour ouvrir les paramètres du plugin.",
      update: "Mettez à jour cet hôte pour utiliser les paramètres du plugin.",
      unavailable: "Cet écran de paramètres du plugin est indisponible.",
-      backToPlugins: "Retour aux plugins",
    },
    title: "Plugins",
    trustedTitle: "Les plugins sont du code de confiance",
@@ -183,7 +180,6 @@ export const pluginSettings = {
      offline: "このホストに接続してプラグイン設定を開いてください。",
      update: "プラグイン設定を使用するには、このホストを更新してください。",
      unavailable: "このプラグイン設定画面は利用できません。",
-      backToPlugins: "プラグインに戻る",
    },
    title: "プラグイン",
    trustedTitle: "プラグインは信頼済みコードです",
@@ -238,7 +234,6 @@ export const pluginSettings = {
      offline: "플러그인 설정을 열려면 이 호스트에 연결하세요.",
      update: "플러그인 설정을 사용하려면 이 호스트를 업데이트하세요.",
      unavailable: "이 플러그인 설정 화면을 사용할 수 없습니다.",
-      backToPlugins: "플러그인으로 돌아가기",
    },
    title: "플러그인",
    trustedTitle: "플러그인은 신뢰하는 코드입니다",
@@ -292,7 +287,6 @@ export const pluginSettings = {
      offline: "Conecte-se a este host para abrir as configurações do plugin.",
      update: "Atualize este host para usar as configurações do plugin.",
      unavailable: "Esta tela de configurações do plugin está indisponível.",
-      backToPlugins: "Voltar para plugins",
    },
    title: "Plugins",
    trustedTitle: "Plugins são código confiável",
@@ -347,7 +341,6 @@ export const pluginSettings = {
      offline: "Подключитесь к этому хосту, чтобы открыть настройки плагина.",
      update: "Обновите этот хост, чтобы использовать настройки плагина.",
      unavailable: "Этот экран настроек плагина недоступен.",
-      backToPlugins: "Вернуться к плагинам",
    },
    title: "Плагины",
    trustedTitle: "Плагины — доверенный код",
@@ -402,7 +395,6 @@ export const pluginSettings = {
      offline: "连接到此主机以打开插件设置。",
      update: "更新此主机以使用插件设置。",
      unavailable: "此插件设置页面不可用。",
-      backToPlugins: "返回插件",
    },
    title: "插件",
    trustedTitle: "插件是受信任的代码",
@@ -443,9 +443,7 @@ export const ptBR: TranslationResources = {
      recovery: {
        archivedTitle: "Workspace arquivado",
        restoreDescription:
-          "Restaure {{workspaceName}} para voltar aos seus agentes. A worktree usará a branch {{branch}}.",
-        restoreWithoutBranchDescription:
-          "Restaure {{workspaceName}} para voltar aos seus agentes. Uma nova branch partirá da base salva ou da branch padrão do repositório.",
+          "{{workspaceName}} foi arquivado e sua worktree foi removida. Restaure a branch {{branch}} para abri-lo novamente.",
        unarchiveDescription:
          "{{workspaceName}} está arquivado. Desarquive-o para abri-lo novamente.",
        restoreAction: "Restaurar",
@@ -1555,8 +1553,6 @@ export const ptBR: TranslationResources = {
    noFiles: "Nenhum arquivo ou diretório encontrado",
    noCommands: "Nenhum comando encontrado",
    failedToLoad: "Falha ao carregar",
-    chooseProjectForCommands: "Escolha um projeto para ver os comandos",
-    chooseModelForCommands: "Selecione um modelo para ver os comandos",
  },
  loadOlderHistory: {
    failed: "Não foi possível carregar o histórico mais antigo",
@@ -1652,17 +1648,6 @@ export const ptBR: TranslationResources = {
      title: "Senha de {{host}}",
      label: "Senha do host",
    },
-    hostConfirmation: {
-      title: "Conectar a este host?",
-      description:
-        "Este host poderá executar código neste app e acessar seus outros hosts conectados. Conecte apenas se você o reconhecer.",
-      descriptionChanged:
-        "Este link muda como você se conecta a este host. O host poderá executar código neste app e acessar seus outros hosts conectados. Conecte apenas se você o reconhecer.",
-      hostLabel: "Host",
-      fingerprintLabel: "Impressão da chave",
-      relayLabel: "Relay",
-      connect: "Conectar",
-    },
    connectionMethods: {
      title: "Adicionar conexão",
      direct: {
@@ -2239,14 +2224,6 @@ export const ptBR: TranslationResources = {
        codeSizeHint: "Usado em código, diffs e saída do terminal",
        codeSizeAccessibility: "Tamanho da fonte de código",
      },
-      layout: {
-        title: "Layout",
-        contentWidth: "Largura do conteúdo",
-        contentWidthHint: "Largura máxima do chat e dos arquivos Markdown em telas largas",
-        contentWidthAccessibility: "Largura do conteúdo em pixels",
-        reset: "Redefinir",
-        resetAccessibility: "Redefinir a largura do conteúdo",
-      },
      syntax: {
        title: "Sintaxe",
        highlightTheme: "Tema de destaque",
@@ -443,9 +443,7 @@ export const ru: TranslationResources = {
      recovery: {
        archivedTitle: "Рабочая область в архиве",
        restoreDescription:
-          "Восстановите «{{workspaceName}}», чтобы вернуться к его агентам. Worktree будет использовать ветку {{branch}}.",
-        restoreWithoutBranchDescription:
-          "Восстановите «{{workspaceName}}», чтобы вернуться к его агентам. Новая ветка будет создана от сохранённой базовой или ветки репозитория по умолчанию.",
+          "Рабочее пространство «{{workspaceName}}» было архивировано, а его worktree удалён. Восстановите ветку {{branch}}, чтобы снова открыть рабочее пространство.",
        unarchiveDescription:
          "Рабочее пространство «{{workspaceName}}» находится в архиве. Разархивируйте его, чтобы снова открыть.",
        restoreAction: "Восстановить",
@@ -1553,8 +1551,6 @@ export const ru: TranslationResources = {
    noFiles: "Файлы и каталоги не найдены",
    noCommands: "Команды не найдены",
    failedToLoad: "Не удалось загрузить",
-    chooseProjectForCommands: "Выберите проект, чтобы увидеть команды",
-    chooseModelForCommands: "Выберите модель, чтобы увидеть команды",
  },
  loadOlderHistory: {
    failed: "Не удалось загрузить старую историю.",
@@ -1650,17 +1646,6 @@ export const ru: TranslationResources = {
      title: "Пароль для {{host}}",
      label: "Пароль хоста",
    },
-    hostConfirmation: {
-      title: "Подключиться к этому хосту?",
-      description:
-        "Этот хост сможет выполнять код в приложении и обращаться к другим вашим подключённым хостам. Подключайтесь, только если узнаёте его.",
-      descriptionChanged:
-        "Эта ссылка меняет способ подключения к этому хосту. Хост сможет выполнять код в приложении и обращаться к другим вашим подключённым хостам. Подключайтесь, только если узнаёте его.",
-      hostLabel: "Хост",
-      fingerprintLabel: "Отпечаток ключа",
-      relayLabel: "Реле",
-      connect: "Подключить",
-    },
    connectionMethods: {
      title: "Добавить подключение",
      direct: {
@@ -2244,14 +2229,6 @@ export const ru: TranslationResources = {
        codeSizeHint: "Используется для кода, диффов и вывода терминала",
        codeSizeAccessibility: "Размер шрифта кода",
      },
-      layout: {
-        title: "Макет",
-        contentWidth: "Ширина содержимого",
-        contentWidthHint: "Максимальная ширина чата и файлов Markdown на широких экранах",
-        contentWidthAccessibility: "Ширина содержимого в пикселях",
-        reset: "Сбросить",
-        resetAccessibility: "Сбросить ширину содержимого",
-      },
      syntax: {
        title: "Синтаксис",
        highlightTheme: "Тема подсветки",
@@ -439,9 +439,7 @@ export const zhCN: TranslationResources = {
      recovery: {
        archivedTitle: "Workspace 已归档",
        restoreDescription:
-          "恢复 {{workspaceName}} 以返回其中的代理。worktree 将使用分支 {{branch}}。",
-        restoreWithoutBranchDescription:
-          "恢复 {{workspaceName}} 以返回其中的代理。新分支将从保存的基准分支或仓库默认分支创建。",
+          "{{workspaceName}} 已归档，其 worktree 已移除。恢复分支 {{branch}} 以重新打开。",
        unarchiveDescription: "{{workspaceName}} 已归档。取消归档以重新打开。",
        restoreAction: "恢复",
        unarchiveAction: "取消归档",
@@ -1507,8 +1505,6 @@ export const zhCN: TranslationResources = {
    noFiles: "没有找到文件或目录",
    noCommands: "没有找到 commands",
    failedToLoad: "加载失败",
-    chooseProjectForCommands: "选择项目以查看命令",
-    chooseModelForCommands: "选择模型以查看命令",
  },
  loadOlderHistory: {
    failed: "无法加载更早历史",
@@ -1604,16 +1600,6 @@ export const zhCN: TranslationResources = {
      title: "{{host}} 的密码",
      label: "主机密码",
    },
-    hostConfirmation: {
-      title: "连接到此主机？",
-      description: "此主机将能在此应用中运行代码，并访问你其他已连接的主机。仅在你认识它时才连接。",
-      descriptionChanged:
-        "此链接会改变你连接此主机的方式。该主机将能在此应用中运行代码，并访问你其他已连接的主机。仅在你认识它时才连接。",
-      hostLabel: "主机",
-      fingerprintLabel: "密钥指纹",
-      relayLabel: "中继",
-      connect: "连接",
-    },
    connectionMethods: {
      title: "添加连接",
      direct: {
@@ -2178,14 +2164,6 @@ export const zhCN: TranslationResources = {
        codeSizeHint: "用于代码、差异和终端输出",
        codeSizeAccessibility: "代码字号",
      },
-      layout: {
-        title: "布局",
-        contentWidth: "内容宽度",
-        contentWidthHint: "宽屏上聊天和 Markdown 文件的最大宽度",
-        contentWidthAccessibility: "内容宽度（像素）",
-        reset: "重置",
-        resetAccessibility: "将内容宽度重置为默认值",
-      },
      syntax: {
        title: "语法",
        highlightTheme: "高亮主题",
@@ -38,7 +38,11 @@ import { getProviderIcon } from "@/components/provider-icons";
 import { useToastHost, type ToastApi, type ToastState } from "@/components/toast-host";
 import type { WorkspaceComposerAttachment } from "@/attachments/types";
 import { useWorkspaceAttachmentScopeKey } from "@/attachments/workspace-attachments-store";
-import { COMPACT_FORM_FACTOR_WIDTH, useIsCompactFormFactor } from "@/constants/layout";
+import {
+  COMPACT_FORM_FACTOR_WIDTH,
+  MAX_CONTENT_WIDTH,
+  useIsCompactFormFactor,
+} from "@/constants/layout";
 import { isNative, isWeb } from "@/constants/platform";
 import { useAgentAttentionClear } from "@/hooks/use-agent-attention-clear";
 import { useAgentInputDraft, type AgentInputDraft } from "@/composer/draft/input-draft";
@@ -1746,7 +1750,7 @@ const styles = StyleSheet.create((theme) => ({
  },
  timelineSyncCalloutContent: {
    width: "100%",
-    maxWidth: theme.contentMaxWidth,
+    maxWidth: MAX_CONTENT_WIDTH,
  },
  timelineSyncCallout: {
    flexDirection: "row",
@@ -3,7 +3,6 @@ import { useTranslation } from "react-i18next";
 import { Platform, Text, View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { router } from "expo-router";
-import { ArrowLeft } from "lucide-react-native";
 import type { PluginHostProps } from "@getpaseo/plugin/client";
 import { Button } from "@/components/ui/button";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
@@ -128,30 +127,7 @@ function SettingsContent({
 }
 const ThemedSettingsContent = withUnistyles(SettingsContent);
 const themeMapping = (theme: Theme) => ({ theme: toPluginTheme(theme) });
-export function PluginSettingsContent({
-  onBackToPlugins,
-  showBackToPlugins,
-  ...identity
-}: SettingsIdentity & { onBackToPlugins: () => void; showBackToPlugins: boolean }) {
-  const { t } = useTranslation();
-  return (
-    <View>
-      {showBackToPlugins ? (
-        <Button
-          onPress={onBackToPlugins}
-          variant="ghost"
-          size="sm"
-          leftIcon={ArrowLeft}
-          style={styles.backButton}
-        >
-          {t("settings.plugins.screens.backToPlugins")}
-        </Button>
-      ) : null}
-      <ThemedSettingsContent {...identity} uniProps={themeMapping} />
-    </View>
-  );
+export function PluginSettingsContent(props: SettingsIdentity) {
+  return <ThemedSettingsContent {...props} uniProps={themeMapping} />;
 }
-const styles = StyleSheet.create((theme) => ({
-  message: { color: theme.colors.foregroundMuted },
-  backButton: { alignSelf: "flex-start", paddingHorizontal: 0, marginBottom: theme.spacing[4] },
-}));
+const styles = StyleSheet.create((theme) => ({ message: { color: theme.colors.foregroundMuted } }));
@@ -5,7 +5,7 @@ import type {
  ProviderSnapshotEntry,
 } from "@getpaseo/protocol/agent-types";
 import type { AgentProviderDefinition } from "@getpaseo/protocol/provider-manifest";
-import type { DraftCommandTarget } from "@/hooks/use-agent-commands-query";
+import type { DraftCommandConfig } from "@/hooks/use-agent-commands-query";
 import { i18n } from "@/i18n/i18next";
 import { compareMatchScores, scoreTextFields } from "@getpaseo/protocol/search/text-match";
 import { filterSelectableModels } from "./model-catalog";
@@ -286,22 +286,19 @@ export function resolveEffectiveComposerThinkingOptionId(
  return selectedModelDefinition?.defaultThinkingOptionId ?? "";
 }

-export function buildDraftCommandTarget(input: {
+export function buildDraftCommandConfig(input: {
  selection: ProviderSelectionState;
  cwd: string;
  effectiveModelId: string;
  effectiveThinkingOptionId: string;
  featureValues?: Record<string, unknown>;
-}): DraftCommandTarget {
+}): DraftCommandConfig | undefined {
  const cwd = input.cwd.trim();
-  if (!cwd) {
-    return { status: "needs-project" };
-  }
-  if (!input.selection.provider) {
-    return { status: "needs-provider" };
+  if (!input.selection.provider || !cwd) {
+    return undefined;
  }

-  const config = {
+  return {
    provider: input.selection.provider,
    cwd,
    ...(input.selection.modeOptions.length > 0 && input.selection.modeId !== ""
@@ -313,7 +310,6 @@ export function buildDraftCommandTarget(input: {
      : {}),
    ...(input.featureValues ? { featureValues: input.featureValues } : {}),
  };
-  return { status: "ready", config };
 }

 export function resolveSubmissionReadiness(input: {
@@ -1,97 +0,0 @@
-import type { ConnectionOffer } from "@getpaseo/protocol/connection-offer";
-import {
-  hostHasConnection,
-  relayConnectionFromOffer,
-  type HostProfile,
-} from "@/types/host-connection";
-
-/**
- * The question shown before a pairing link adds a host that is not saved, or
- * changes the key, relay, or TLS setting of a saved one.
- */
-export interface HostConfirmationRequest {
-  /** Identifies this question, so an answer shown for it never answers a newer one. */
-  id: number;
-  serverId: string;
-  /** Grouped daemon public key the user can compare with the one their daemon shows. */
-  keyFingerprint: string;
-  relayEndpoint: string;
-  kind: "newHost" | "changedConnection";
-}
-
-interface PendingConfirmation {
-  request: HostConfirmationRequest;
-  resolve: (approved: boolean) => void;
-}
-
-/**
- * Owns the one host confirmation the app is waiting on. The host runtime asks
- * through `confirmLink`; the view reads `getPending` and replies with `answer`.
- * A question waits until it is answered, whether or not a view is showing it.
- */
-export class HostConfirmations {
-  private pending: PendingConfirmation | null = null;
-  private nextRequestId = 1;
-  private listeners = new Set<() => void>();
-
-  getPending(): HostConfirmationRequest | null {
-    return this.pending?.request ?? null;
-  }
-
-  subscribe(listener: () => void): () => void {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  }
-
-  /** Answers the request with `requestId`; an answer for any other request is ignored. */
-  answer(requestId: number, approved: boolean): void {
-    const current = this.pending;
-    if (!current || current.request.id !== requestId) return;
-    this.pending = null;
-    this.emit();
-    current.resolve(approved);
-  }
-
-  /** Resolves true without asking when the link matches a saved host exactly. */
-  confirmLink(offer: ConnectionOffer, savedHosts: HostProfile[]): Promise<boolean> {
-    const connection = relayConnectionFromOffer(offer);
-    const savedHost = savedHosts.find((host) => host.serverId === offer.serverId);
-    if (savedHost && hostHasConnection(savedHost, connection)) return Promise.resolve(true);
-    return this.ask({
-      id: this.nextRequestId++,
-      serverId: offer.serverId,
-      keyFingerprint: formatDaemonKeyFingerprint(connection.daemonPublicKeyB64),
-      relayEndpoint: connection.relayEndpoint,
-      kind: savedHost ? "changedConnection" : "newHost",
-    });
-  }
-
-  private ask(request: HostConfirmationRequest): Promise<boolean> {
-    // One question at a time: a newer one cancels the unanswered one.
-    this.pending?.resolve(false);
-    return new Promise<boolean>((resolve) => {
-      this.pending = { request, resolve };
-      this.emit();
-    });
-  }
-
-  private emit(): void {
-    for (const listener of this.listeners) {
-      listener();
-    }
-  }
-}
-
-/**
- * Shows the key material itself (not a re-hash) in groups of four. Keys longer
- * than 16 characters show only their first and last 8, so two keys that share
- * both ends show the same value.
- */
-function formatDaemonKeyFingerprint(daemonPublicKeyB64: string): string {
-  const normalized = daemonPublicKeyB64.replace(/[^A-Za-z0-9]/g, "");
-  const group = (value: string): string => value.replace(/(.{4})/g, "$1 ").trim();
-  if (normalized.length <= 16) return group(normalized);
-  return `${group(normalized.slice(0, 8))} … ${group(normalized.slice(-8))}`;
-}
@@ -31,7 +31,6 @@ import type { ReplicaRow, ReplicaRowStore } from "./replica-cache/row-store";

 import { subscriptionFixture } from "./subscription-fixture";
 import { readDesktopManagedLocalCredential } from "@/desktop/daemon/local-credential";
-import type { HostConfirmationRequest } from "./host-confirmation";

 it("requests the managed connection credential through desktop main without a web hint", async () => {
  const requests: string[] = [];
@@ -508,63 +507,6 @@ function makeConnectedProbeClient(latencyMs: number): FakeDaemonClient {
  return client;
 }

-/**
- * Answers every host confirmation the store asks, the way the sheet does, and
- * records each request.
- */
-function answerHostConfirmations(
-  store: HostRuntimeStore,
-  answer: boolean | ((request: HostConfirmationRequest, index: number) => boolean),
-): HostConfirmationRequest[] {
-  const requests: HostConfirmationRequest[] = [];
-  store.subscribeHostConfirmation(() => {
-    const pending = store.getPendingHostConfirmation();
-    if (!pending) return;
-    requests.push(pending);
-    store.answerHostConfirmation(
-      pending.id,
-      typeof answer === "function" ? answer(pending, requests.length - 1) : answer,
-    );
-  });
-  return requests;
-}
-
-function requirePendingConfirmation(store: HostRuntimeStore): HostConfirmationRequest {
-  const pending = store.getPendingHostConfirmation();
-  if (!pending) throw new Error("Expected a pending host confirmation");
-  return pending;
-}
-
-function createPairingStore(
-  input: {
-    hostname?: string;
-    password?: string;
-    connectAttempts?: string[];
-    serverIdForHost?: (host: HostProfile) => string;
-    storage?: HostRuntimeStorage;
-  } = {},
-): HostRuntimeStore {
-  return new HostRuntimeStore({
-    storage: input.storage ?? createMemoryHostRuntimeStorage(),
-    deps: {
-      createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
-      connectToDaemon: async ({ host, connection }) => {
-        input.connectAttempts?.push(connection.id);
-        if (input.password && host.password !== input.password) {
-          throw new DaemonAuthenticationError("password_required");
-        }
-        return {
-          client: makeConnectedProbeClient(5) as unknown as DaemonClient,
-          serverId: input.serverIdForHost?.(host) ?? host.serverId,
-          hostname: input.hostname ?? "paired",
-        };
-      },
-      getClientId: async () => "cid_pairing",
-      readInitialConnectionHint: () => null,
-    },
-  });
-}
-
 function createMemoryHostRuntimeStorage(entries: Record<string, string> = {}): HostRuntimeStorage {
  const values = new Map(Object.entries(entries));
  return {
@@ -3605,10 +3547,19 @@ describe("HostRuntimeStore", () => {
  });

  it("uses the advertised hostname when adding a relay host from a pairing offer", async () => {
-    const store = createPairingStore({ hostname: "mbp" });
-    answerHostConfirmations(store, true);
+    const store = new HostRuntimeStore({
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async ({ host }) => ({
+          client: makeConnectedProbeClient(5) as unknown as DaemonClient,
+          serverId: host.serverId,
+          hostname: host.label ?? null,
+        }),
+        getClientId: async () => "cid_test_runtime",
+      },
+    });

-    await store.beginLinkPairing().submit(encodeOfferUrl(makeOffer()));
+    await store.upsertConnectionFromOffer(makeOffer(), "mbp");

    const pairedHost = store.getHosts().find((host) => host.serverId === "srv_offer");
    expect(pairedHost?.label).toBe("mbp");
@@ -3617,14 +3568,27 @@ describe("HostRuntimeStore", () => {
  });

  it("stores relay TLS from a pairing offer", async () => {
-    const store = createPairingStore();
-    answerHostConfirmations(store, true);
+    const store = new HostRuntimeStore({
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async ({ host }) => ({
+          client: makeConnectedProbeClient(5) as unknown as DaemonClient,
+          serverId: host.serverId,
+          hostname: host.label ?? null,
+        }),
+        getClientId: async () => "cid_test_runtime",
+      },
+    });

-    await store
-      .beginLinkPairing()
-      .submit(
-        encodeOfferUrl(makeOffer({ relay: { endpoint: "relay.example.com:443", useTls: true } })),
-      );
+    await store.upsertConnectionFromOffer(
+      makeOffer({
+        relay: {
+          endpoint: "relay.example.com:443",
+          useTls: true,
+        },
+      }),
+      "tls relay",
+    );

    const pairedHost = store.getHosts().find((host) => host.serverId === "srv_offer");
    expect(pairedHost?.connections).toEqual([
@@ -3641,8 +3605,17 @@ describe("HostRuntimeStore", () => {
  });

  it("uses TLS for old pairing URLs that omit relay TLS on port 443", async () => {
-    const store = createPairingStore();
-    answerHostConfirmations(store, true);
+    const store = new HostRuntimeStore({
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async ({ host }) => ({
+          client: makeConnectedProbeClient(5) as unknown as DaemonClient,
+          serverId: host.serverId,
+          hostname: host.label ?? null,
+        }),
+        getClientId: async () => "cid_test_runtime",
+      },
+    });
    const oldPairingUrl = encodeOfferUrl({
      v: 2,
      serverId: "srv_offer",
@@ -3650,7 +3623,7 @@ describe("HostRuntimeStore", () => {
      relay: { endpoint: "relay.paseo.sh:443" },
    });

-    await store.importConnectionLink(oldPairingUrl, "openProject");
+    await store.upsertConnectionFromOfferUrl(oldPairingUrl, "old relay");

    const pairedHost = store.getHosts().find((host) => host.serverId === "srv_offer");
    expect(pairedHost?.connections).toEqual([
@@ -3667,266 +3640,54 @@ describe("HostRuntimeStore", () => {
  });

  it("probes a pairing link immediately and saves only after admission", async () => {
-    const store = createPairingStore({ password: "correct-password" });
-    answerHostConfirmations(store, true);
+    const store = new HostRuntimeStore({
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async ({ host }) => {
+          if (host.password !== "correct-password")
+            throw new DaemonAuthenticationError("password_required");
+          return {
+            client: makeConnectedProbeClient(5) as unknown as DaemonClient,
+            serverId: host.serverId,
+            hostname: "paired host",
+          };
+        },
+        getClientId: async () => "cid_pairing",
+      },
+    });
    const offerUrl = encodeOfferUrl(makeOffer());
-    const pairing = store.beginLinkPairing();
-
-    await expect(pairing.submit(offerUrl)).rejects.toThrow("Password required");
+    await expect(store.probeAndUpsertConnectionFromOfferUrl(offerUrl)).rejects.toThrow(
+      "Password required",
+    );
    expect(store.getHosts()).toHaveLength(0);
-    const result = await pairing.submit(offerUrl, "correct-password");
-    expect(result).toMatchObject({ status: "connected", serverId: "srv_offer" });
+    const result = await store.probeAndUpsertConnectionFromOfferUrl(offerUrl, "correct-password");
+    expect(result.serverId).toBe("srv_offer");
    expect(store.getHosts()[0]?.password).toBe("correct-password");
    store.syncHosts([]);
  });

-  it("asks before a pairing link adds a new host, and Cancel saves and connects nothing", async () => {
-    const connectAttempts: string[] = [];
-    const store = createPairingStore({ connectAttempts });
-    const requests = answerHostConfirmations(store, false);
-    const offerUrl = encodeOfferUrl(makeOffer());
-    const relayLink = "relay://relay.example:443/srv_relay?key=AAAA&ssl=true";
-
-    // `#offer=` in the app URL, then a QR scan, then the pair-link and add-host modals.
-    await expect(store.importConnectionLink(offerUrl, "openProject")).resolves.toEqual({
-      status: "cancelled",
-    });
-    await expect(store.importConnectionLink(offerUrl, "hostRoot")).resolves.toEqual({
-      status: "cancelled",
-    });
-    await expect(store.beginLinkPairing().submit(offerUrl)).resolves.toEqual({
-      status: "cancelled",
-    });
-    await expect(store.beginLinkPairing().submit(relayLink)).resolves.toEqual({
-      status: "cancelled",
-    });
-
-    expect(requests).toEqual([
-      ...Array.from({ length: 3 }, () => ({
-        id: expect.any(Number),
-        serverId: "srv_offer",
-        keyFingerprint: "pkte stof fer",
-        relayEndpoint: "relay.paseo.sh:443",
-        kind: "newHost",
-      })),
-      {
-        id: expect.any(Number),
-        serverId: "srv_relay",
-        keyFingerprint: "AAAA",
-        relayEndpoint: "relay.example:443",
-        kind: "newHost",
-      },
-    ]);
-    expect(store.getHosts()).toEqual([]);
-    expect(connectAttempts).toEqual([]);
-    store.syncHosts([]);
-  });
-
-  it("connects a saved host from a matching pairing link without asking", async () => {
-    const store = createPairingStore();
-    const requests = answerHostConfirmations(store, true);
-    const offerUrl = encodeOfferUrl(makeOffer());
-    await store.beginLinkPairing().submit(offerUrl);
-    expect(requests).toHaveLength(1);
-
-    await expect(store.importConnectionLink(offerUrl, "openProject")).resolves.toEqual({
-      status: "connected",
-      serverId: "srv_offer",
-    });
-    await expect(store.importConnectionLink(offerUrl, "hostRoot")).resolves.toEqual({
-      status: "connected",
-      serverId: "srv_offer",
-    });
-    await expect(store.beginLinkPairing().submit(offerUrl)).resolves.toMatchObject({
-      status: "connected",
-    });
-
-    expect(requests).toHaveLength(1);
-    expect(store.getHosts()).toHaveLength(1);
-    store.syncHosts([]);
-  });
-
-  it("asks when a pairing link changes a saved host's key, relay, or TLS setting", async () => {
-    const store = createPairingStore();
-    const requests = answerHostConfirmations(store, (_request, index) => index === 0);
-    await store.beginLinkPairing().submit(encodeOfferUrl(makeOffer()));
-    const savedHosts = store.getHosts();
-
-    const changedLinks = [
-      makeOffer({ daemonPublicKeyB64: "pk_other_key" }),
-      makeOffer({ relay: { endpoint: "relay.example:443", useTls: false } }),
-      makeOffer({ relay: { endpoint: "relay.paseo.sh:443", useTls: true } }),
-    ].map(encodeOfferUrl);
-    for (const link of changedLinks) {
-      await expect(store.importConnectionLink(link, "openProject")).resolves.toEqual({
-        status: "cancelled",
-      });
-      await expect(store.beginLinkPairing().submit(link)).resolves.toEqual({
-        status: "cancelled",
-      });
-    }
-
-    expect(requests.map((request) => request.kind)).toEqual([
-      "newHost",
-      ...Array.from({ length: 6 }, () => "changedConnection"),
-    ]);
-    expect(store.getHosts()).toEqual(savedHosts);
-    store.syncHosts([]);
-  });
-
-  it("asks once per pairing flow and link when the host asks for a password", async () => {
-    const store = createPairingStore({ password: "correct-password" });
-    const requests = answerHostConfirmations(store, (_request, index) => index < 2);
-    const offerUrl = encodeOfferUrl(makeOffer());
-    const pairing = store.beginLinkPairing();
-
-    await expect(pairing.submit(offerUrl)).rejects.toThrow("Password required");
-    await expect(pairing.submit(offerUrl, "wrong-password")).rejects.toThrow();
-    expect(requests).toHaveLength(1);
-
-    // A new pairing flow for the same link asks again.
-    await expect(store.beginLinkPairing().submit(offerUrl, "wrong-password")).rejects.toThrow();
-    expect(requests).toHaveLength(2);
-
-    await expect(pairing.submit(offerUrl, "correct-password")).resolves.toMatchObject({
-      status: "connected",
-    });
-    expect(requests).toHaveLength(2);
-    expect(store.getHosts()[0]).toMatchObject({
-      serverId: "srv_offer",
-      password: "correct-password",
-    });
-
-    // A different link in the same flow asks again.
-    const otherKeyUrl = encodeOfferUrl(makeOffer({ daemonPublicKeyB64: "pk_other_key" }));
-    await expect(pairing.submit(otherKeyUrl, "correct-password")).resolves.toEqual({
-      status: "cancelled",
-    });
-    expect(requests).toHaveLength(3);
-    store.syncHosts([]);
-  });
-
-  it("continues a scanned link's password retry without asking again", async () => {
-    const store = createPairingStore({ password: "correct-password" });
-    const requests = answerHostConfirmations(store, true);
-    const link = "relay://relay.example:443/srv_pair?key=AAAA&ssl=true";
-
-    const outcome = await store.importConnectionLink(link, "hostRoot");
-    expect(outcome).toMatchObject({ status: "password_required", link });
-    expect(store.getHosts()).toHaveLength(0);
-    if (outcome.status !== "password_required") throw new Error("expected password_required");
-
-    await outcome.pairing.submit(outcome.link, "correct-password");
-    expect(requests).toHaveLength(1);
-    expect(store.getHosts()[0]).toMatchObject({
-      serverId: "srv_pair",
-      password: "correct-password",
-    });
-    store.syncHosts([]);
-  });
-
-  it("keeps a host confirmation pending until it is answered, and a newer one cancels it", async () => {
-    const store = createPairingStore();
-    const first = store.importConnectionLink(encodeOfferUrl(makeOffer()), "openProject");
-    await vi.waitFor(() =>
-      expect(store.getPendingHostConfirmation()).toMatchObject({ serverId: "srv_offer" }),
-    );
-
-    const second = store.importConnectionLink(
-      encodeOfferUrl(makeOffer({ serverId: "srv_second" })),
-      "openProject",
-    );
-    await expect(first).resolves.toEqual({ status: "cancelled" });
-    await vi.waitFor(() =>
-      expect(store.getPendingHostConfirmation()).toMatchObject({ serverId: "srv_second" }),
-    );
-
-    store.answerHostConfirmation(requirePendingConfirmation(store).id, true);
-    await expect(second).resolves.toEqual({ status: "connected", serverId: "srv_second" });
-    expect(store.getPendingHostConfirmation()).toBeNull();
-    expect(store.getHosts().map((host) => host.serverId)).toEqual(["srv_second"]);
-    store.syncHosts([]);
-  });
-
-  it("ignores an answer for a host confirmation that a newer one replaced", async () => {
-    const store = createPairingStore();
-    const first = store.importConnectionLink(encodeOfferUrl(makeOffer()), "openProject");
-    await vi.waitFor(() =>
-      expect(store.getPendingHostConfirmation()).toMatchObject({ serverId: "srv_offer" }),
-    );
-    const firstRequest = requirePendingConfirmation(store);
-    const second = store.importConnectionLink(
-      encodeOfferUrl(makeOffer({ serverId: "srv_second" })),
-      "openProject",
-    );
-    await expect(first).resolves.toEqual({ status: "cancelled" });
-
-    // Connect tapped on the first sheet as the second link arrives.
-    store.answerHostConfirmation(firstRequest.id, true);
-
-    const secondRequest = requirePendingConfirmation(store);
-    expect(secondRequest.serverId).toBe("srv_second");
-    store.answerHostConfirmation(secondRequest.id, false);
-    await expect(second).resolves.toEqual({ status: "cancelled" });
-    expect(store.getHosts()).toEqual([]);
-  });
-
-  it("waits for saved hosts to load before deciding whether a pairing link asks", async () => {
-    const savedHost = makeHost({
-      serverId: "srv_offer",
-      connections: [
-        {
-          id: "relay:relay.paseo.sh:443",
-          type: "relay",
-          relayEndpoint: "relay.paseo.sh:443",
-          useTls: false,
-          daemonPublicKeyB64: "pk_test_offer",
-        },
-      ],
-    });
-    const store = createPairingStore({
-      storage: createMemoryHostRuntimeStorage({
-        "@paseo:daemon-registry": JSON.stringify([savedHost]),
-        "@paseo:e2e": "1",
-      }),
-    });
-    const requests = answerHostConfirmations(store, true);
-
-    await expect(
-      store.importConnectionLink(encodeOfferUrl(makeOffer()), "openProject"),
-    ).resolves.toEqual({ status: "connected", serverId: "srv_offer" });
-
-    expect(requests).toEqual([]);
-    expect(store.getHosts().map((host) => host.serverId)).toEqual(["srv_offer"]);
-    store.syncHosts([]);
-  });
-
-  it("adds hosts by address and the default localhost without asking", async () => {
-    const store = createPairingStore({
-      serverIdForHost: (host) =>
-        host.connections[0]?.type === "directTcp" ? `srv_${host.connections[0].endpoint}` : "",
-    });
-    const requests = answerHostConfirmations(store, false);
-
-    await store.boot();
-    await store.probeAndUpsertDirectConnection({ endpoint: "10.0.0.5:6767" });
-
-    expect(requests).toEqual([]);
-    expect(store.getHosts().map((host) => host.serverId)).toEqual([
-      "srv_localhost:6767",
-      "srv_10.0.0.5:6767",
-    ]);
-    store.syncHosts([]);
-  });
-
  it("preserves the existing host label when re-pairing an existing relay host", async () => {
-    const store = createPairingStore({ hostname: "mbp" });
-    answerHostConfirmations(store, true);
+    const store = new HostRuntimeStore({
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async ({ host }) => ({
+          client: makeConnectedProbeClient(5) as unknown as DaemonClient,
+          serverId: host.serverId,
+          hostname: host.label ?? null,
+        }),
+        getClientId: async () => "cid_test_runtime",
+      },
+      storage: createMemoryHostRuntimeStorage(),
+    });

-    await store.beginLinkPairing().submit(encodeOfferUrl(makeOffer()));
-    await store.renameHost("srv_offer", "Custom name");
+    await store.upsertRelayConnection({
+      serverId: "srv_offer",
+      relayEndpoint: "relay.paseo.sh:443",
+      daemonPublicKeyB64: "pk_test_offer",
+      label: "Custom name",
+    });

-    await store.beginLinkPairing().submit(encodeOfferUrl(makeOffer()));
+    await store.upsertConnectionFromOffer(makeOffer(), "mbp");

    const pairedHost = store.getHosts().find((host) => host.serverId === "srv_offer");
    expect(pairedHost?.label).toBe("Custom name");
@@ -4202,6 +3963,35 @@ describe("HostRuntimeStore initial connection hint bootstrap", () => {
    expect(probeAttempts).toBe(attemptsBeforeRetry);
    store.syncHosts([]);
  });
+  it("imports a pairing link after a password retry in the add flow", async () => {
+    const store = new HostRuntimeStore({
+      storage: createMemoryHostRuntimeStorage(),
+      deps: {
+        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
+        connectToDaemon: async ({ host }) => {
+          if (host.password !== "correct-password")
+            throw new DaemonAuthenticationError("password_required");
+          return {
+            client: makeConnectedProbeClient(5) as unknown as DaemonClient,
+            serverId: host.serverId,
+            hostname: "paired",
+          };
+        },
+        getClientId: async () => "cid_link_import",
+      },
+    });
+    const link = "relay://relay.example:443/srv_pair?key=AAAA&ssl=true";
+    await expect(store.importConnectionLink(link, "hostRoot")).resolves.toEqual({
+      status: "password_required",
+    });
+    expect(store.getHosts()).toHaveLength(0);
+    await store.probeAndUpsertConnectionFromOfferUrl(link, "correct-password");
+    expect(store.getHosts()[0]).toMatchObject({
+      serverId: "srv_pair",
+      password: "correct-password",
+    });
+    store.syncHosts([]);
+  });
  it("imports a deep link without waiting for admission, then leaves a rejected saved host red", async () => {
    const store = new HostRuntimeStore({
      storage: createMemoryHostRuntimeStorage(),
@@ -4213,7 +4003,6 @@ describe("HostRuntimeStore initial connection hint bootstrap", () => {
        getClientId: async () => "cid_deep_link",
      },
    });
-    answerHostConfirmations(store, true);
    const link = "relay://relay.example:443/srv_deep?key=AAAA&ssl=true";
    await expect(store.importConnectionLink(link, "openProject")).resolves.toEqual({
      status: "connected",
@@ -4228,38 +4017,6 @@ describe("HostRuntimeStore initial connection hint bootstrap", () => {
    expect(store.getSnapshot("srv_deep")?.connectionStatus).toBe("error");
    store.syncHosts([]);
  });
-  it("stops connecting to a host removed while its first probe is pending", async () => {
-    useHostRuntimeClock();
-    const firstProbe = createDeferred<void>();
-    let connectCalls = 0;
-    const store = new HostRuntimeStore({
-      storage: createMemoryHostRuntimeStorage(),
-      deps: {
-        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
-        connectToDaemon: async ({ host }) => {
-          connectCalls += 1;
-          if (connectCalls === 1) await firstProbe.promise;
-          return {
-            client: makeConnectedProbeClient(5) as unknown as DaemonClient,
-            serverId: host.serverId,
-            hostname: host.label ?? null,
-          };
-        },
-        getClientId: async () => "cid_test_removed_host",
-      },
-    });
-    await store.upsertDirectConnection({ serverId: "srv_removed", endpoint: "lan:6767" });
-    await vi.waitFor(() => expect(connectCalls).toBe(1));
-
-    await store.removeHost("srv_removed");
-    firstProbe.resolve();
-    await vi.advanceTimersByTimeAsync(60_000);
-
-    expect(connectCalls).toBe(1);
-    expect(store.getSnapshot("srv_removed")).toBeNull();
-    expect(useSessionStore.getState().sessions["srv_removed"]).toBeUndefined();
-  });
-
  it("saves and reconnects a rejected saved host after changing its password", async () => {
    const store = new HostRuntimeStore({
      storage: createMemoryHostRuntimeStorage(),
@@ -14,7 +14,6 @@ import {
  normalizeStoredHostProfile,
  upsertHostConnectionInProfiles,
  registryHasConnection,
-  relayConnectionFromOffer,
  StoredHostRegistrySchema,
  type HostConnection,
  type HostProfile,
@@ -30,7 +29,6 @@ import {
 } from "@/utils/daemon-endpoints";
 import { resolveAppVersion } from "@/utils/app-version";
 import { ConnectionOfferSchema, type ConnectionOffer } from "@getpaseo/protocol/connection-offer";
-import { HostConfirmations, type HostConfirmationRequest } from "./host-confirmation";
 import { shouldUseDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
 import { isWeb } from "@/constants/platform";
 import { connectToDaemon, getConnectionAuthFailureReason } from "@/utils/test-daemon-connection";
@@ -91,27 +89,6 @@ export type HostRuntimeConnectionStatus = "idle" | "connecting" | "online" | "of
 export type PairingNavigationTarget = "openProject" | "hostRoot" | "hostSettings";
 export type HostRegistryStatus = "loading" | "ready";

-/** One pairing flow started with `HostRuntimeStore.beginLinkPairing`. */
-export interface LinkPairing {
-  /** Probes the linked host and saves it. Connection and password errors throw. */
-  submit(link: string, password?: string): Promise<LinkPairingResult>;
-}
-
-export type LinkPairingResult =
-  | { status: "connected"; profile: HostProfile; serverId: string; hostname: string | null }
-  | { status: "cancelled" };
-
-/** A pairing link the user confirmed whose host then asked for a password. */
-export interface PasswordRequiredPairing {
-  link: string;
-  pairing: LinkPairing;
-}
-
-export type ConnectionLinkImport =
-  | { status: "connected"; serverId: string }
-  | ({ status: "password_required" } & PasswordRequiredPairing)
-  | { status: "cancelled" };
-
 export type ActiveConnection =
  | { type: "directTcp"; endpoint: string; display: string }
  | { type: "directSocket"; endpoint: string; display: "socket" }
@@ -700,15 +677,8 @@ export class HostRuntimeController {
        connectionId: options.initialConnection.connectionId,
        existingClient: options.initialConnection.existingClient,
      });
-      if (!this.started) {
-        return;
-      }
    }
    await this.runProbeCycleNow();
-    // stop() can run while startup is pending; a stopped controller never probes again.
-    if (!this.started) {
-      return;
-    }
    if (options?.autoProbe !== false) {
      this.probeIntervalHandle = setInterval(() => {
        void this.runProbeCycleNow();
@@ -1438,13 +1408,6 @@ function readConfiguredLocalDaemonOverride(): string | null {
  return value && value.length > 0 ? value : null;
 }

-function isSameLinkedConnection(left: ConnectionOffer, right: ConnectionOffer): boolean {
-  return (
-    left.serverId === right.serverId &&
-    equal(relayConnectionFromOffer(left), relayConnectionFromOffer(right))
-  );
-}
-
 function parseOfferConnectionUrl(input: string): { offer: ConnectionOffer; password?: string } {
  if (input.trim().startsWith("relay://") || input.includes("#connect=")) {
    return parseRelayConnectionUri(input);
@@ -1506,8 +1469,6 @@ export class HostRuntimeStore {
  private timelineReplicaByServer = new Map<string, TimelineReplica>();
  private configuredOverrideBootstrapInFlight: Promise<void> | null = null;
  private bootPromise: Promise<void> | null = null;
-  private registryLoad: Promise<void> | null = null;
-  private readonly hostConfirmations = new HostConfirmations();
  private storage: HostRuntimeStorage;
  private replicaCache: ReplicaCache;
  private readonly revokePushNotifications: typeof revokePushNotifications;
@@ -1558,7 +1519,8 @@ export class HostRuntimeStore {

  private async runBoot(): Promise<void> {
    const override = readConfiguredLocalDaemonOverride();
-    await this.loadRegistry();
+    await this.loadFromStorage();
+    this.markHostRegistryLoaded();

    let isE2E: string | null = null;
    try {
@@ -1591,13 +1553,6 @@ export class HostRuntimeStore {
    }
  }

-  private loadRegistry(): Promise<void> {
-    if (!this.registryLoad) {
-      this.registryLoad = this.loadFromStorage().then(() => this.markHostRegistryLoaded());
-    }
-    return this.registryLoad;
-  }
-
  private async loadFromStorage(): Promise<void> {
    let shouldPersistHosts = false;
    let profiles: HostProfile[] = [];
@@ -1924,7 +1879,7 @@ export class HostRuntimeStore {
    });
  }

-  private async upsertRelayConnection(input: {
+  async upsertRelayConnection(input: {
    serverId: string;
    relayEndpoint: string;
    useTls?: boolean;
@@ -1957,91 +1912,51 @@ export class HostRuntimeStore {
    return profile;
  }

-  // A pairing link (a URL, a QR code, or a pasted link) asks the user to
-  // confirm when it adds a new host or changes a saved host's key, relay, or
-  // TLS setting. The answer needs the saved hosts, so it waits for them to load.
-  private async confirmLink(offer: ConnectionOffer): Promise<boolean> {
-    await this.loadRegistry();
-    return this.hostConfirmations.confirmLink(offer, this.hosts);
-  }
-
-  getPendingHostConfirmation(): HostConfirmationRequest | null {
-    return this.hostConfirmations.getPending();
-  }
-
-  subscribeHostConfirmation(listener: () => void): () => void {
-    return this.hostConfirmations.subscribe(listener);
-  }
-
-  answerHostConfirmation(requestId: number, approved: boolean): void {
-    this.hostConfirmations.answer(requestId, approved);
-  }
-
-  /**
-   * Starts one pairing flow, such as one open pairing modal. Once the user
-   * confirms a link, submitting the same link again in this flow (the
-   * password retry) does not ask again. A new flow asks again.
-   */
-  beginLinkPairing(): LinkPairing {
-    let approvedOffer: ConnectionOffer | null = null;
-    return {
-      submit: async (link, password) => {
-        const { offer, password: linkPassword } = parseOfferConnectionUrl(link);
-        if (!approvedOffer || !isSameLinkedConnection(approvedOffer, offer)) {
-          if (!(await this.confirmLink(offer))) return { status: "cancelled" };
-          approvedOffer = offer;
-        }
-        const result = await this.probeAndUpsertOffer(offer, password ?? linkPassword);
-        return { status: "connected", ...result };
-      },
-    };
-  }
-
-  async importConnectionLink(
-    url: string,
-    target: PairingNavigationTarget,
-  ): Promise<ConnectionLinkImport> {
-    if (target === "openProject") {
-      const { offer, password } = parseOfferConnectionUrl(url);
-      if (!(await this.confirmLink(offer))) return { status: "cancelled" };
-      const profile = await this.upsertConnectionFromOffer(offer, undefined, password);
-      return { status: "connected", serverId: profile.serverId };
-    }
-    const pairing = this.beginLinkPairing();
-    try {
-      const result = await pairing.submit(url);
-      if (result.status === "cancelled") return result;
-      return { status: "connected", serverId: result.serverId };
-    } catch (error) {
-      if (!getConnectionAuthFailureReason(error)) throw error;
-      return { status: "password_required", link: url, pairing };
-    }
-  }
-
-  private async upsertConnectionFromOffer(
+  async upsertConnectionFromOffer(
    offer: ConnectionOffer,
    label?: string,
    password?: string,
  ): Promise<HostProfile> {
-    const connection = relayConnectionFromOffer(offer);
+    // COMPAT(oldRelayOfferTls): added in v0.1.73, remove after 2026-11-10.
+    const useTls = offer.relay.useTls ?? shouldUseTlsForDefaultHostedRelay(offer.relay.endpoint);
    return this.upsertRelayConnection({
      serverId: offer.serverId,
-      relayEndpoint: connection.relayEndpoint,
-      useTls: connection.useTls,
-      daemonPublicKeyB64: connection.daemonPublicKeyB64,
+      relayEndpoint: offer.relay.endpoint,
+      useTls,
+      daemonPublicKeyB64: offer.daemonPublicKeyB64,
      label,
      password,
    });
  }

-  private async probeAndUpsertOffer(
-    offer: ConnectionOffer,
-    password: string | undefined,
+  async upsertConnectionFromOfferUrl(
+    offerUrlOrFragment: string,
+    label?: string,
+    password?: string,
+  ): Promise<HostProfile> {
+    const parsed = parseOfferConnectionUrl(offerUrlOrFragment);
+    return this.upsertConnectionFromOffer(parsed.offer, label, password ?? parsed.password);
+  }
+
+  async probeAndUpsertConnectionFromOfferUrl(
+    offerUrlOrFragment: string,
+    password?: string,
  ): Promise<{ profile: HostProfile; serverId: string; hostname: string | null }> {
-    const connection = relayConnectionFromOffer(offer);
+    const parsed = parseOfferConnectionUrl(offerUrlOrFragment);
+    const offer = parsed.offer;
+    const credential = password ?? parsed.password;
+    const useTls = offer.relay.useTls ?? shouldUseTlsForDefaultHostedRelay(offer.relay.endpoint);
+    const relayEndpoint = normalizeHostPort(offer.relay.endpoint);
+    const connection: HostConnection = {
+      id: useTls ? `relay:wss:${relayEndpoint}` : `relay:${relayEndpoint}`,
+      type: "relay",
+      relayEndpoint,
+      useTls,
+      daemonPublicKeyB64: offer.daemonPublicKeyB64,
+    };
    const probeHost: HostProfile = {
      serverId: offer.serverId,
-      ...(password ? { password } : {}),
+      ...(credential ? { password: credential } : {}),
      label: offer.serverId,
      appearance: defaultHostAppearance(),
      lifecycle: {},
@@ -2052,10 +1967,27 @@ export class HostRuntimeStore {
    };
    const { client, hostname } = await this.deps.connectToDaemon({ host: probeHost, connection });
    await client.close().catch(() => undefined);
-    const profile = await this.upsertConnectionFromOffer(offer, hostname ?? undefined, password);
+    const profile = await this.upsertConnectionFromOffer(offer, hostname ?? undefined, credential);
    return { profile, serverId: offer.serverId, hostname };
  }

+  async importConnectionLink(
+    url: string,
+    target: PairingNavigationTarget,
+  ): Promise<{ status: "connected"; serverId: string } | { status: "password_required" }> {
+    if (target === "openProject") {
+      const profile = await this.upsertConnectionFromOfferUrl(url);
+      return { status: "connected", serverId: profile.serverId };
+    }
+    try {
+      const { serverId } = await this.probeAndUpsertConnectionFromOfferUrl(url);
+      return { status: "connected", serverId };
+    } catch (error) {
+      if (!getConnectionAuthFailureReason(error)) throw error;
+      return { status: "password_required" };
+    }
+  }
+
  async upsertConnectionFromListen(input: {
    listenAddress: string;
    serverId: string;
@@ -2803,29 +2735,6 @@ export function useHostRegistryLoaded(): boolean {
  );
 }

-export function useHostConfirmation(): {
-  pending: HostConfirmationRequest | null;
-  answer: (approved: boolean) => void;
-} {
-  const store = getHostRuntimeStore();
-  const pending = useSyncExternalStore(
-    (onStoreChange) => store.subscribeHostConfirmation(onStoreChange),
-    () => store.getPendingHostConfirmation(),
-    () => store.getPendingHostConfirmation(),
-  );
-  // The answer is bound to the request this render shows, so a tap never
-  // answers a request that replaced it.
-  return useMemo(
-    () => ({
-      pending,
-      answer: (approved: boolean) => {
-        if (pending) store.answerHostConfirmation(pending.id, approved);
-      },
-    }),
-    [pending, store],
-  );
-}
-
 export interface HostMutations {
  upsertDirectConnection: (input: {
    serverId: string;
@@ -2846,7 +2755,24 @@ export interface HostMutations {
    daemonPort?: number;
    label?: string;
  }) => Promise<{ profile: HostProfile; serverId: string; hostname: string | null }>;
-  beginLinkPairing: () => LinkPairing;
+  upsertRelayConnection: (input: {
+    serverId: string;
+    relayEndpoint: string;
+    useTls?: boolean;
+    daemonPublicKeyB64: string;
+    label?: string;
+    password?: string;
+  }) => Promise<HostProfile>;
+  upsertConnectionFromOffer: (offer: ConnectionOffer, label?: string) => Promise<HostProfile>;
+  upsertConnectionFromOfferUrl: (
+    offerUrlOrFragment: string,
+    label?: string,
+    password?: string,
+  ) => Promise<HostProfile>;
+  probeAndUpsertConnectionFromOfferUrl: (
+    offerUrlOrFragment: string,
+    password?: string,
+  ) => Promise<{ profile: HostProfile; serverId: string; hostname: string | null }>;
  renameHost: (serverId: string, label: string) => Promise<void>;
  setHostColor: (serverId: string, color: HostColor) => Promise<void>;
  setHostBadgeDisplay: (serverId: string, badgeDisplay: HostBadgeDisplay) => Promise<void>;
@@ -2861,7 +2787,12 @@ export function useHostMutations(): HostMutations {
      upsertDirectConnection: (input) => store.upsertDirectConnection(input),
      probeAndUpsertDirectConnection: (input) => store.probeAndUpsertDirectConnection(input),
      probeAndUpsertRemoteSshConnection: (input) => store.probeAndUpsertRemoteSshConnection(input),
-      beginLinkPairing: () => store.beginLinkPairing(),
+      upsertRelayConnection: (input) => store.upsertRelayConnection(input),
+      upsertConnectionFromOffer: (offer, label) => store.upsertConnectionFromOffer(offer, label),
+      upsertConnectionFromOfferUrl: (url, label, password) =>
+        store.upsertConnectionFromOfferUrl(url, label, password),
+      probeAndUpsertConnectionFromOfferUrl: (url, password) =>
+        store.probeAndUpsertConnectionFromOfferUrl(url, password),
      renameHost: (serverId, label) => store.renameHost(serverId, label),
      setHostColor: (serverId, color) => store.setHostColor(serverId, color),
      setHostBadgeDisplay: (serverId, badgeDisplay) =>
@@ -2422,7 +2422,7 @@ export function NewWorkspaceScreen({
      clearDraft={handleClearDraft}
      autoFocus
      autoFocusKey={launchFocusKey}
-      commandDraft={composerState?.commandDraft}
+      commandDraftConfig={composerState?.commandDraftConfig}
      agentControls={agentControlsWithDisabled}
    />
  );
@@ -1333,8 +1333,6 @@ export default function SettingsScreen({ view, openAddHostIntent = null }: Setti
          serverId={view.serverId}
          pluginId={view.pluginId}
          screenId={view.screenId}
-          onBackToPlugins={handleBackFromDetail}
-          showBackToPlugins={!isCompactLayout}
        />
      );
    if (view.kind === "host") {
@@ -1,4 +1,4 @@
-import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { Fragment, useCallback, useEffect, useMemo, useState } from "react";
 import type { TFunction } from "i18next";
 import { useTranslation } from "react-i18next";
 import { Text, View } from "react-native";
@@ -18,11 +18,7 @@ import {
 import { DropdownTrigger } from "@/components/ui/dropdown-trigger";
 import { SettingsSection } from "@/components/settings/headings/settings-section";
 import { useContributedThemes } from "@/appearance/provider";
-import { Button } from "@/components/ui/button";
-import {
-  EditingTextInput as TextInput,
-  type EditingTextInputHandle,
-} from "@/components/ui/text-input";
+import { EditingTextInput as TextInput } from "@/components/ui/text-input";
 import {
  MAX_CODE_FONT_SIZE,
  MAX_CONTENT_FONT_SIZE,
@@ -31,8 +27,6 @@ import {
  MIN_CONTENT_FONT_SIZE,
  MIN_UI_BASE_FONT_SIZE,
  parseClampedFontSize,
-  parseContentMaxWidth,
-  resolveContentMaxWidth,
  sanitizeFontFamily,
  useAppSettings,
  type AppSettings,
@@ -332,74 +326,6 @@ function FontSizeRow({
  );
 }

-// ---------------------------------------------------------------------------
-// Content width: numeric field (commit on blur/submit) + reset to the default
-// ---------------------------------------------------------------------------
-
-interface ContentWidthRowProps {
-  value: AppSettings["contentMaxWidth"];
-  onChange: (value: AppSettings["contentMaxWidth"]) => void;
-}
-
-function ContentWidthRow({ value, onChange }: ContentWidthRowProps) {
-  const { t } = useTranslation();
-  const width = resolveContentMaxWidth({ contentMaxWidth: value });
-  // The field is uncontrolled, so a saved or reset width is written into it directly.
-  const input = useRef<EditingTextInputHandle>(null);
-
-  useEffect(() => {
-    input.current?.replaceText(String(width));
-  }, [width]);
-
-  const commit = useCallback(() => {
-    const next = parseContentMaxWidth(input.current?.getText()) ?? width;
-    input.current?.replaceText(String(next));
-    // Typing the width already in effect keeps following the default.
-    if (next !== width) {
-      onChange(next);
-    }
-  }, [onChange, width]);
-
-  const reset = useCallback(() => {
-    onChange(null);
-  }, [onChange]);
-
-  return (
-    <View style={settingsStyles.row}>
-      <View style={settingsStyles.rowContent}>
-        <Text style={settingsStyles.rowTitle}>{t("settings.appearance.layout.contentWidth")}</Text>
-        <Text style={settingsStyles.rowHint}>
-          {t("settings.appearance.layout.contentWidthHint")}
-        </Text>
-      </View>
-      <View style={styles.sizeField}>
-        {value === null ? null : (
-          <Button
-            variant="ghost"
-            size="sm"
-            onPress={reset}
-            accessibilityLabel={t("settings.appearance.layout.resetAccessibility")}
-          >
-            {t("settings.appearance.layout.reset")}
-          </Button>
-        )}
-        <TextInput
-          ref={input}
-          initialValue={String(width)}
-          onBlur={commit}
-          onSubmitEditing={commit}
-          keyboardType="number-pad"
-          inputMode="numeric"
-          selectTextOnFocus
-          style={styles.widthInput}
-          accessibilityLabel={t("settings.appearance.layout.contentWidthAccessibility")}
-        />
-        <Text style={styles.unit}>px</Text>
-      </View>
-    </View>
-  );
-}
-
 // ---------------------------------------------------------------------------
 // Syntax highlight theme picker (commits immediately)
 // ---------------------------------------------------------------------------
@@ -514,13 +440,6 @@ export function AppearanceSection() {
    [selectPluginTheme],
  );

-  const handleContentMaxWidthChange = useCallback(
-    (contentMaxWidth: AppSettings["contentMaxWidth"]) => {
-      void updateSettings({ contentMaxWidth });
-    },
-    [updateSettings],
-  );
-
  const handleSyntaxThemeChange = useCallback(
    (syntaxTheme: SyntaxThemeId) => {
      void updateSettings({ syntaxTheme });
@@ -684,14 +603,6 @@ export function AppearanceSection() {
          />
        </View>
      </SettingsSection>
-      <SettingsSection title={t("settings.appearance.layout.title")}>
-        <View style={settingsStyles.card}>
-          <ContentWidthRow
-            value={settings.contentMaxWidth}
-            onChange={handleContentMaxWidthChange}
-          />
-        </View>
-      </SettingsSection>
      <SettingsSection title={t("settings.appearance.syntax.title")}>
        <View style={settingsStyles.card}>
          <SyntaxRow value={settings.syntaxTheme} onChange={handleSyntaxThemeChange} />
@@ -757,19 +668,6 @@ const styles = StyleSheet.create((theme) => ({
    fontSize: theme.fontSize.base,
    textAlign: "right",
  },
-  widthInput: {
-    width: 80,
-    minHeight: 36,
-    paddingVertical: theme.spacing[2],
-    paddingHorizontal: theme.spacing[3],
-    borderRadius: theme.borderRadius.md,
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
-    backgroundColor: theme.colors.surface2,
-    color: theme.colors.foreground,
-    fontSize: theme.fontSize.base,
-    textAlign: "right",
-  },
  unit: {
    color: theme.colors.foregroundMuted,
    fontSize: theme.fontSize.base,
@@ -126,21 +126,15 @@ function ArchivedWorkspaceRecovery({
  if (recovery.phase === "failed") {
    actionLabel = t("common.actions.retry");
  }
-  let description: string;
-  if (recovery.recovery.action === "restore" && recovery.recovery.branch) {
-    description = t("workspace.route.recovery.restoreDescription", {
-      workspaceName: recovery.recovery.workspaceName,
-      branch: recovery.recovery.branch,
-    });
-  } else if (recovery.recovery.action === "restore") {
-    description = t("workspace.route.recovery.restoreWithoutBranchDescription", {
-      workspaceName: recovery.recovery.workspaceName,
-    });
-  } else {
-    description = t("workspace.route.recovery.unarchiveDescription", {
-      workspaceName: recovery.recovery.workspaceName,
-    });
-  }
+  const description =
+    recovery.recovery.action === "restore"
+      ? t("workspace.route.recovery.restoreDescription", {
+          workspaceName: recovery.recovery.workspaceName,
+          branch: recovery.recovery.branch,
+        })
+      : t("workspace.route.recovery.unarchiveDescription", {
+          workspaceName: recovery.recovery.workspaceName,
+        });

  return (
    <View style={styles.emptyState}>
@@ -642,10 +642,7 @@ export const DEFAULT_MONO_FONT_STACK: string = Platform.select({
  web: "SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace",
 });

-// Chat and markdown content column; the appearance updater patches the user's width in.
-export const DEFAULT_CONTENT_MAX_WIDTH = 820;
-
-// `fontSize`, `fontFamily`, `lineHeight`, and `contentMaxWidth` are deliberately widened to plain
+// `fontSize`, `fontFamily`, and `lineHeight` are deliberately widened to plain
 // `number`/`string` (not narrowed by `as const`) so the appearance updater can patch
 // them at runtime via `UnistylesRuntime.updateTheme`. The remaining tokens keep their
 // literal types.
@@ -654,7 +651,6 @@ interface CommonTheme {
  fontSize: Record<keyof typeof FONT_SIZE, number>;
  fontFamily: { ui: string; mono: string };
  lineHeight: Record<keyof typeof LINE_HEIGHT, number>;
-  contentMaxWidth: number;
  iconSize: typeof ICON_SIZE;
  fontWeight: typeof FONT_WEIGHT;
  borderRadius: typeof BORDER_RADIUS;
@@ -667,7 +663,6 @@ const commonTheme: CommonTheme = {
  fontSize: FONT_SIZE,
  fontFamily: { ui: DEFAULT_UI_FONT_STACK, mono: DEFAULT_MONO_FONT_STACK },
  lineHeight: LINE_HEIGHT,
-  contentMaxWidth: DEFAULT_CONTENT_MAX_WIDTH,
  iconSize: ICON_SIZE,
  fontWeight: FONT_WEIGHT,
  borderRadius: BORDER_RADIUS,
@@ -1,8 +1,6 @@
-import type { ConnectionOffer } from "@getpaseo/protocol/connection-offer";
 import {
  normalizeHostPort,
  normalizeLoopbackToLocalhost,
-  shouldUseTlsForDefaultHostedRelay,
 } from "@getpaseo/protocol/daemon-endpoints";
 import {
  DirectTcpHostConnectionSchema,
@@ -356,19 +354,6 @@ export function connectionFromListen(listen: string): HostConnection | null {
  }
 }

-export function relayConnectionFromOffer(offer: ConnectionOffer): RelayHostConnection {
-  // COMPAT(oldRelayOfferTls): added in v0.1.73, remove after 2026-11-10.
-  const useTls = offer.relay.useTls ?? shouldUseTlsForDefaultHostedRelay(offer.relay.endpoint);
-  const relayEndpoint = normalizeHostPort(offer.relay.endpoint);
-  return {
-    id: useTls ? `relay:wss:${relayEndpoint}` : `relay:${relayEndpoint}`,
-    type: "relay",
-    relayEndpoint,
-    useTls,
-    daemonPublicKeyB64: offer.daemonPublicKeyB64.trim(),
-  };
-}
-
 export function createRemoteSshHostConnection(input: {
  host: string;
  sshPort?: number;
@@ -1,5 +1,4 @@
 import { beforeEach, describe, expect, it } from "vitest";
-import { DEFAULT_CONTENT_MAX_WIDTH } from "@/styles/theme";
 import {
  clearAssistantImageMetadataCache,
  estimateAssistantMessageHeightFromCache,
@@ -53,7 +52,6 @@ describe("assistant image metadata", () => {
    expect(
      estimateAssistantMessageHeightFromCache(
        "Here is the screenshot\n\n![Screenshot](https://example.com/landscape.png)",
-        DEFAULT_CONTENT_MAX_WIDTH,
      ),
    ).toBeGreaterThan(220);
  });
@@ -62,14 +60,8 @@ describe("assistant image metadata", () => {
    const source = `data:image/png;base64,${"a".repeat(512)}`;
    setAssistantImageMetadata({ source }, { width: 1200, height: 800 });

-    const imageOnlyHeight = estimateAssistantMessageHeightFromCache(
-      `![Screenshot](${source})`,
-      DEFAULT_CONTENT_MAX_WIDTH,
-    );
-    const mixedHeight = estimateAssistantMessageHeightFromCache(
-      `Text\n\n![Screenshot](${source})`,
-      DEFAULT_CONTENT_MAX_WIDTH,
-    );
+    const imageOnlyHeight = estimateAssistantMessageHeightFromCache(`![Screenshot](${source})`);
+    const mixedHeight = estimateAssistantMessageHeightFromCache(`Text\n\n![Screenshot](${source})`);

    expect(imageOnlyHeight).toBeGreaterThan(220);
    expect(mixedHeight).toBeGreaterThan(imageOnlyHeight ?? 0);
@@ -1,3 +1,4 @@
+import { MAX_CONTENT_WIDTH } from "@/constants/layout";
 import { resolveAssistantImageSource } from "@/utils/assistant-image-source";
 import { createImageSourceCacheKey } from "@/attachments/utils";

@@ -13,7 +14,7 @@ const ASSISTANT_IMAGE_METADATA_CACHE_LIMIT = 500;
 const ASSISTANT_IMAGE_PARSE_CACHE_LIMIT = 500;

 const MARKDOWN_IMAGE_PATTERN = /!\[[^\]]*]\((<[^>]+>|[^)\n]+)\)/g;
-const ASSISTANT_IMAGE_INSET = 8;
+const ASSISTANT_IMAGE_ESTIMATE_WIDTH = MAX_CONTENT_WIDTH - 8;
 const ASSISTANT_IMAGE_MIN_HEIGHT = 160;
 const ASSISTANT_IMAGE_BLOCK_GAP = 24;
 const ASSISTANT_MESSAGE_BASE_HEIGHT = 96;
@@ -176,10 +177,7 @@ export function extractAssistantImageSources(markdown: string): string[] {
  return parsed.sources;
 }

-export function estimateAssistantMessageHeightFromCache(
-  markdown: string,
-  contentMaxWidth: number,
-): number | null {
+export function estimateAssistantMessageHeightFromCache(markdown: string): number | null {
  const parsed = assistantImageParseCache.get(markdown) ?? parseAssistantImageMarkdown(markdown);
  if (parsed.sources.length === 0) {
    return null;
@@ -191,7 +189,7 @@ export function estimateAssistantMessageHeightFromCache(
    .map((metadata) =>
      Math.max(
        ASSISTANT_IMAGE_MIN_HEIGHT,
-        Math.round((contentMaxWidth - ASSISTANT_IMAGE_INSET) / metadata.aspectRatio),
+        Math.round(ASSISTANT_IMAGE_ESTIMATE_WIDTH / metadata.aspectRatio),
      ),
    );

@@ -1,5 +1,4 @@
 import { beforeEach, describe, expect, it } from "vitest";
-import { DEFAULT_CONTENT_MAX_WIDTH } from "@/styles/theme";
 import {
  clearAssistantMessageHeightEstimateCache,
  estimateAssistantMessageHeightFromCache,
@@ -28,21 +27,7 @@ describe("assistant message height estimate", () => {
      height: 41.1,
    });

-    expect(
-      estimateAssistantMessageHeightFromCache(
-        "First paragraph\n\nSecond paragraph",
-        DEFAULT_CONTENT_MAX_WIDTH,
-      ),
-    ).toBe(97);
-  });
-
-  it("reads block heights measured at the configured content width", () => {
-    setAssistantMarkdownBlockHeight({ block: "Wide paragraph", width: 1584, height: 20 });
-
-    expect(estimateAssistantMessageHeightFromCache("Wide paragraph", 1600)).toBe(44);
-    expect(
-      estimateAssistantMessageHeightFromCache("Wide paragraph", DEFAULT_CONTENT_MAX_WIDTH),
-    ).toBeNull();
+    expect(estimateAssistantMessageHeightFromCache("First paragraph\n\nSecond paragraph")).toBe(97);
  });

  it("falls back to image metadata when markdown blocks are not measured", () => {
@@ -56,7 +41,6 @@ describe("assistant message height estimate", () => {
    expect(
      estimateAssistantMessageHeightFromCache(
        "Here is the screenshot\n\n![Screenshot](https://example.com/landscape.png)",
-        DEFAULT_CONTENT_MAX_WIDTH,
      ),
    ).toBeGreaterThan(220);
  });
@@ -1,8 +1,9 @@
+import { MAX_CONTENT_WIDTH } from "@/constants/layout";
 import { estimateAssistantMessageHeightFromCache as estimateAssistantImageMessageHeightFromCache } from "@/utils/assistant-image-metadata";
 import { splitMarkdownBlocks } from "@/utils/split-markdown-blocks";

 const ASSISTANT_MARKDOWN_BLOCK_HEIGHT_CACHE_LIMIT = 1000;
-const ASSISTANT_MARKDOWN_BLOCK_INSET = 16;
+const ASSISTANT_MARKDOWN_BLOCK_ESTIMATE_WIDTH = MAX_CONTENT_WIDTH - 16;
 const ASSISTANT_MESSAGE_VERTICAL_PADDING = 24;
 const ASSISTANT_MARKDOWN_BLOCK_GAP = 12;

@@ -77,10 +78,7 @@ export function setAssistantMarkdownBlockHeight(input: {
  return height;
 }

-function estimateAssistantMarkdownBlockHeightFromCache(
-  markdown: string,
-  contentMaxWidth: number,
-): number | null {
+function estimateAssistantMarkdownBlockHeightFromCache(markdown: string): number | null {
  const blocks = splitMarkdownBlocks(markdown);
  if (blocks.length === 0) {
    return null;
@@ -90,7 +88,7 @@ function estimateAssistantMarkdownBlockHeightFromCache(
  for (const block of blocks) {
    const key = createMarkdownBlockHeightKey({
      block,
-      width: contentMaxWidth - ASSISTANT_MARKDOWN_BLOCK_INSET,
+      width: ASSISTANT_MARKDOWN_BLOCK_ESTIMATE_WIDTH,
    });
    const cachedHeight = key ? assistantMarkdownBlockHeightCache.get(key) : undefined;
    if (cachedHeight === undefined) {
@@ -106,13 +104,10 @@ function estimateAssistantMarkdownBlockHeightFromCache(
  );
 }

-export function estimateAssistantMessageHeightFromCache(
-  markdown: string,
-  contentMaxWidth: number,
-): number | null {
+export function estimateAssistantMessageHeightFromCache(markdown: string): number | null {
  return (
-    estimateAssistantMarkdownBlockHeightFromCache(markdown, contentMaxWidth) ??
-    estimateAssistantImageMessageHeightFromCache(markdown, contentMaxWidth)
+    estimateAssistantMarkdownBlockHeightFromCache(markdown) ??
+    estimateAssistantImageMessageHeightFromCache(markdown)
  );
 }

@@ -1,6 +1,5 @@
 import type { Command } from "commander";
 import { connectToDaemon } from "../../utils/client.js";
-import type { AgentDeepLinkTarget } from "@getpaseo/protocol/agent-deep-link";
 import { openDesktopWithAgent } from "../open.js";
 import type {
  CommandError,
@@ -31,21 +30,10 @@ export function addOpenOptions(command: Command): Command {
    .option("--server <server-id>", "Server ID (defaults to the local daemon)");
 }

-function toOpenError(err: unknown): CommandError {
-  if (err && typeof err === "object" && "code" in err) {
-    return err as CommandError;
-  }
-  const message = err instanceof Error ? err.message : String(err);
-  return { code: "OPEN_FAILED", message: `Failed to open agent: ${message}` };
-}
-
-async function resolveAgentTarget(
-  agentId: string,
-  options: CommandOptions,
-): Promise<AgentDeepLinkTarget> {
+async function resolveServerId(options: CommandOptions): Promise<string> {
  const explicitServerId = typeof options.server === "string" ? options.server.trim() : "";
  if (explicitServerId) {
-    return { serverId: explicitServerId, agentId };
+    return explicitServerId;
  }

  const client = await connectToDaemon({ target: options.daemonTarget });
@@ -58,19 +46,7 @@ async function resolveAgentTarget(
      };
      throw error;
    }
-
-    const fetchResult = await client.fetchAgent({ agentId });
-    if (!fetchResult) {
-      const error: CommandError = {
-        code: "AGENT_NOT_FOUND",
-        message: `Agent not found: ${agentId}`,
-        details: 'Use "paseo ls" to list available agents',
-      };
-      throw error;
-    }
-    return { serverId, agentId: fetchResult.agent.id };
-  } catch (err) {
-    throw toOpenError(err);
+    return serverId;
  } finally {
    await client.close().catch(() => {});
  }
@@ -90,12 +66,12 @@ export async function runOpenCommand(
    throw error;
  }

-  const target = await resolveAgentTarget(agentId, options);
-  await openDesktopWithAgent(target);
+  const serverId = await resolveServerId(options);
+  await openDesktopWithAgent({ serverId, agentId });

  return {
    type: "single",
-    data: { ...target, status: "opened" },
+    data: { agentId, serverId, status: "opened" },
    schema: openAgentSchema,
  };
 }
@@ -82,15 +82,10 @@ const EXPECTED_CLAUDE_MODELS = [
    model: "Opus 4.8",
    descriptionFragment: "Previous release",
  },
-  {
-    id: "claude-sonnet-5-5",
-    model: "Sonnet 5.5",
-    descriptionFragment: "Best for everyday tasks",
-  },
  {
    id: "claude-sonnet-5",
    model: "Sonnet 5",
-    descriptionFragment: "Previous release",
+    descriptionFragment: "Best for everyday tasks",
  },
  {
    id: "claude-opus-4-7[1m]",
@@ -435,7 +430,7 @@ try {
      "--quiet should print the same ordered model IDs returned by --json",
    );
    assert(
-      claudeModelsFromJson.some((m) => m.id === "claude-sonnet-5-5"),
+      claudeModelsFromJson.some((m) => m.id === "claude-sonnet-5"),
      "captured --json output should include the current Claude everyday model id",
    );
    console.log("✓ provider models --quiet outputs model IDs only\n");
@@ -1,52 +0,0 @@
-#!/usr/bin/env npx tsx
-
-import assert from "node:assert";
-import { chmod, mkdir, readFile, writeFile } from "node:fs/promises";
-import { existsSync } from "node:fs";
-import { join } from "node:path";
-import { runPaseoCli, startTestDaemon } from "./helpers/test-daemon.ts";
-
-console.log("=== Agent Open Command Tests ===\n");
-
-if (process.platform !== "linux") {
-  console.log("Skipped: the fake Desktop app is a Linux AppImage path.");
-  process.exit(0);
-}
-
-const daemon = await startTestDaemon();
-
-// runPaseoCli sets HOME to the daemon's home, where the CLI looks for
-// ~/Applications/Paseo.AppImage on Linux. The fake app records its launch.
-const launchRecord = join(daemon.paseoHome, "desktop-launches.txt");
-const fakeDesktop = join(daemon.paseoHome, "Applications", "Paseo.AppImage");
-await mkdir(join(daemon.paseoHome, "Applications"), { recursive: true });
-await writeFile(fakeDesktop, `#!/bin/sh\necho "$@" >> "${launchRecord}"\n`);
-await chmod(fakeDesktop, 0o755);
-
-try {
-  {
-    console.log("Test 1: an unknown agent ID fails without opening Desktop");
-    const result = await runPaseoCli(daemon, [
-      "agent",
-      "open",
-      "does-not-exist",
-      "--host",
-      `127.0.0.1:${daemon.port}`,
-      "--json",
-    ]);
-
-    assert.notStrictEqual(result.exitCode, 0, "open should fail for an unknown agent");
-    assert.match(JSON.parse(result.stderr).error.message, /Agent not found: does-not-exist/);
-    // Give a wrongly spawned detached app time to write its record.
-    await new Promise((resolve) => setTimeout(resolve, 500));
-    assert.ok(
-      !existsSync(launchRecord),
-      `Desktop should not open, but was launched with: ${existsSync(launchRecord) ? await readFile(launchRecord, "utf8") : ""}`,
-    );
-    console.log("✓ unknown agent ID fails without opening Desktop\n");
-  }
-} finally {
-  await daemon.stop();
-}
-
-console.log("=== All agent open tests passed ===");
--- a/Show More
+++ b/Show More